Refactor command logic for improved reliability and readability, update dependencies, and add new tests for edge cases.

Author: daniel-cannon

app/.gitkeep

@@ -20,11 +20,11 @@
   },
   "require": {
     "php": "^8.2",
-    "laravel/framework": ">=9.0"
+    "laravel/framework": "^11.0|^12.0"
   },
   "require-dev": {
     "larastan/larastan": "^2.0|^3.0",
-    "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
+    "orchestra/testbench": "^9.0|^10.0",
     "php-parallel-lint/php-parallel-lint": "^1.4",
     "phpstan/extension-installer": "^1.4",
     "phpunit/phpunit": "^9.0|^10.0|^11.0",
@@ -79,4 +79,4 @@
       "phpstan/extension-installer": true
     }
   }
-}
+}

composer.json

@@ -20,8 +20,11 @@ public function __construct(
     protected function preprocess(): void
     {
         $path = $this->option('output');
+        $basePath = $this->base();
 
-        $this->files->ensureDirectoryExists(dirname($this->option('input')));
+        if (!$this->files->isDirectory($basePath) || !$this->files->isReadable($basePath)) {
+            throw new \RuntimeException("Input path [{$basePath}] does not exist or is not readable.");
+        }
 
         if ($this->files->exists($path)) {
             $this->files->deleteDirectory($path);
@@ -114,7 +117,7 @@ protected function classInfoFromPath(string $path): array
             return [
                 'namespace' => '',
                 'class' => '',
-                'fqcn' => '\\',
+                'fqcn' => '',
                 'extends' => '',
                 'implements' => [],
             ];
@@ -133,7 +136,7 @@ protected function classInfoFromPath(string $path): array
             return [
                 'namespace' => '',
                 'class' => '',
-                'fqcn' => '\\',
+                'fqcn' => '',
                 'extends' => '',
                 'implements' => [],
             ];
@@ -163,7 +166,7 @@ protected function classInfoFromPath(string $path): array
         return [
             'namespace' => $namespace,
             'class' => $class,
-            'fqcn' => $namespace . '\\' . $class,
+            'fqcn' => trim($namespace . '\\' . $class, '\\'),
             'extends' => $extends,
             'implements' => $implements,
         ];
@@ -219,6 +222,10 @@ protected function readClassDeclaration(string $path): string
 
         $handle = fopen($path, 'r');
 
+        if ($handle === false) {
+            return '';
+        }
+
         while (!feof($handle)) {
             $buffer .= fread($handle, 512);
 
@@ -457,11 +464,18 @@ protected function appendImport(array &$imports, string $prefix, string $name, s
 
         $resolvedAlias = $alias !== ''
             ? $alias
-            : substr($fqcn, strrpos($fqcn, '\\') + 1);
+            : $this->defaultImportAlias($fqcn);
 
         $imports[$resolvedAlias] = $fqcn;
     }
 
+    protected function defaultImportAlias(string $fqcn): string
+    {
+        $position = strrpos($fqcn, '\\');
+
+        return $position === false ? $fqcn : substr($fqcn, $position + 1);
+    }
+
     protected function parseImplementedInterfaces(array $tokens, int $index, string $namespace, array $imports): array
     {
         $implements = [];

src/Commands/BaseCommand.php

@@ -56,8 +56,20 @@ protected function readInterfaces(string $path, array $interfaces)
         $rootNamespace = $this->determineRootNamespace($interfaces);
 
         $classes = collect($paths)
-            ->reject(fn ($i) => !$i->isFile() || !str_ends_with($i->getRealPath(), '.php'))
-            ->map(fn ($item) => $this->classInfoFromPath($item->getRealPath()))
+            ->map(function ($item) {
+                if (!$item->isFile()) {
+                    return null;
+                }
+
+                $realPath = $item->getRealPath();
+
+                if ($realPath === false || !str_ends_with($realPath, '.php')) {
+                    return null;
+                }
+
+                return $this->classInfoFromPath($realPath);
+            })
+            ->filter(fn ($info) => is_array($info) && $info['fqcn'] !== '')
             ->keyBy('fqcn');
 
         return collect($interfaces)

src/Commands/GenerateInterfaceUnionsCommand.php

@@ -104,6 +104,24 @@ public function testParserExtractsInheritedParentClass(): void
         $this->assertSame([], $info['implements']);
     }
 
+    public function testParserResolvesSingleSegmentImports(): void
+    {
+        $info = $this->makeParserCommand()->classInfo('./workbench/app/Models/GlobalImportArrayAccessible.php');
+
+        $this->assertSame(['ArrayAccess'], $info['implements']);
+    }
+
+    public function testCommandFailsForInvalidInputPath(): void
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('does not exist or is not readable');
+
+        $command = $this->artisan('synergi-types:interface-unions --input=app/DoesNotExist --output=invalid-models');
+
+        $this->assertInstanceOf(PendingCommand::class, $command);
+        $command->run();
+    }
+
     protected function makeParserCommand(): TestableGenerateInterfaceUnionsCommand
     {
         return new TestableGenerateInterfaceUnionsCommand(new Filesystem());

tests/Commands/GenerateInterfaceUnionsCommandTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models;
+
+use ArrayAccess;
+
+class GlobalImportArrayAccessible implements ArrayAccess
+{
+    public function offsetExists(mixed $offset): bool
+    {
+        return false;
+    }
+
+    public function offsetGet(mixed $offset): mixed
+    {
+        return null;
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+    }
+}