Refactor GenerateInterfaceUnionsCommand to improve type safety and extend functionality, update parsing logic in BaseCommand, and add tests for new attribute handling.

Author: daniel-cannon

src/Commands/BaseCommand.php

@@ -179,7 +179,23 @@ protected function findClassTokenIndex(array $tokens): ?int
                 continue;
             }
 
-            return $index;
+            for ($lookahead = $index + 1; isset($tokens[$lookahead]); $lookahead++) {
+                $nextToken = $tokens[$lookahead];
+
+                if (!is_array($nextToken)) {
+                    continue;
+                }
+
+                if (in_array($nextToken[0], [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], true)) {
+                    continue;
+                }
+
+                if ($nextToken[0] === T_STRING) {
+                    return $index;
+                }
+
+                break;
+            }
         }
 
         return null;

src/Commands/GenerateInterfaceUnionsCommand.php

@@ -3,6 +3,7 @@
 namespace SynergiTech\ExportTypes\Commands;
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -55,6 +56,7 @@ protected function readInterfaces(string $path, array $interfaces)
 
         $rootNamespace = $this->determineRootNamespace($interfaces);
 
+        /** @var Collection<string, array{namespace:string,class:string,fqcn:string,extends:string,implements:array<int,string>}> $classes */
         $classes = collect($paths)
             ->map(function ($item) {
                 if (!$item->isFile()) {
@@ -83,7 +85,14 @@ protected function readInterfaces(string $path, array $interfaces)
             ->toArray();
     }
 
-    protected function classImplementsInterface(array $info, string $interface, $classes): bool
+    /**
+     * @param array{namespace:string,class:string,fqcn:string,extends:string,implements:array<int,string>} $info
+     * @param Collection<
+     *     string,
+     *     array{namespace:string,class:string,fqcn:string,extends:string,implements:array<int,string>}
+     * > $classes
+     */
+    protected function classImplementsInterface(array $info, string $interface, Collection $classes): bool
     {
         if (in_array($interface, $info['implements'], true)) {
             return true;

tests/Commands/GenerateInterfaceUnionsCommandTest.php

@@ -22,6 +22,7 @@ public function testCommandExports(): void
 
         $this->assertIsString($output);
         $this->assertStringContainsString('"App\\\\Models\\\\AliasAnimal"', $output);
+        $this->assertStringContainsString('"App\\\\Models\\\\AttributeClassReferenceAnimal"', $output);
         $this->assertStringContainsString('"App\\\\Models\\\\FullyQualifiedAnimal"', $output);
         $this->assertStringContainsString('"App\\\\Models\\\\GroupedUseAnimal"', $output);
         $this->assertStringContainsString('"App\\\\Models\\\\InheritedAnimal"', $output);
@@ -111,6 +112,15 @@ public function testParserResolvesSingleSegmentImports(): void
         $this->assertSame(['ArrayAccess'], $info['implements']);
     }
 
+    public function testParserIgnoresClassConstantReferencesBeforeClassDeclaration(): void
+    {
+        $info = $this->makeParserCommand()->classInfo('./workbench/app/Models/AttributeClassReferenceAnimal.php');
+
+        $this->assertSame('AttributeClassReferenceAnimal', $info['class']);
+        $this->assertSame('App\\Models\\AttributeClassReferenceAnimal', $info['fqcn']);
+        $this->assertSame(['App\\Interfaces\\AnimalInterface'], $info['implements']);
+    }
+
     public function testCommandFailsForInvalidInputPath(): void
     {
         $this->expectException(\RuntimeException::class);

workbench/app/Models/AttributeClassReferenceAnimal.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use App\Interfaces\AnimalInterface;
+
+#[\AllowDynamicProperties(ParentAnimal::class)]
+class AttributeClassReferenceAnimal implements AnimalInterface
+{
+}