Merge pull request #27 from stevebauman/anonymous-class-fix

Fix parsing classes containing anonymous classes

src/TokenParsers/FileTokenParser.php

@@ -5,7 +5,6 @@
 use Spatie\StructureDiscoverer\Collections\TokenCollection;
 use Spatie\StructureDiscoverer\Collections\UsageCollection;
 use Spatie\StructureDiscoverer\Data\DiscoveredStructure;
-use Spatie\StructureDiscoverer\Data\Token;
 use Spatie\StructureDiscoverer\Enums\DiscoveredStructureType;
 use Spatie\StructureDiscoverer\Exceptions\CouldNotParseFile;
 use Throwable;
@@ -40,7 +39,6 @@ public function execute(
 
         $index = 0;
 
-
         try {
             do {
                 if ($tokens->get($index)->is(T_NAMESPACE)) {
@@ -74,6 +72,15 @@ public function execute(
                     continue;
                 }
 
+                if (
+                    $type === DiscoveredStructureType::ClassDefinition
+                    && $this->isAnonymousClass($tokens, $index)
+                ) {
+                    $index++;
+
+                    continue;
+                }
+
                 $discoveredStructure = $this->discoveredDataResolver->execute(
                     $index + 1,
                     $tokens,
@@ -97,4 +104,21 @@ public function execute(
 
         return $found;
     }
+
+    private function isAnonymousClass(TokenCollection $tokens, int $index): bool
+    {
+        $prevIndex = $index - 1;
+
+        // find the previous non-whitespace token
+        while ($prevIndex >= 0 && $tokens->get($prevIndex)->is(T_WHITESPACE)) {
+            $prevIndex--;
+        }
+
+        // if the token before T_CLASS is T_NEW, it's an anonymous class
+        if ($prevIndex >= 0 && $tokens->get($prevIndex)->is(T_NEW)) {
+            return true;
+        }
+
+        return false;
+    }
 }

tests/Fakes/FakeWithAnonymousClass.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Spatie\StructureDiscoverer\Tests\Fakes;
+
+class FakeWithAnonymousClass
+{
+    public function foo(): object
+    {
+        return new class() {
+            public function bar(): string {
+                return 'baz';
+            }
+        };
+    }
+}

tests/Fakes/FakeWithMultipleClasses.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Spatie\StructureDiscoverer\Tests\Fakes;
+
+class FakeWithMultipleClasses
+{
+}
+
+class FakeWithMultipleClassesSub
+{
+}

tests/ReflectionTest.php

@@ -21,6 +21,8 @@
 use Spatie\StructureDiscoverer\Tests\Fakes\FakeSubChildClass;
 use Spatie\StructureDiscoverer\Tests\Fakes\FakeSubChildInterface;
 use Spatie\StructureDiscoverer\Tests\Fakes\FakeTrait;
+use Spatie\StructureDiscoverer\Tests\Fakes\FakeWithAnonymousClass;
+use Spatie\StructureDiscoverer\Tests\Fakes\FakeWithMultipleClasses;
 use Spatie\StructureDiscoverer\Tests\Fakes\Nested\FakeNestedClass;
 use Spatie\StructureDiscoverer\Tests\Fakes\Nested\FakeNestedInterface;
 use Spatie\StructureDiscoverer\Tests\Fakes\OtherNested\FakeOtherNestedClass;
@@ -116,7 +118,9 @@
         FakeOtherNestedClass::class,
         FakeSubChildInterface::class,
         FakeSubChildClass::class,
+        FakeWithMultipleClasses::class,
         FakeClassDepender::class,
         FakeInterfaceDepender::class,
+        FakeWithAnonymousClass::class,
     ]);
 });

tests/StructureDiscovererTest.php

@@ -30,6 +30,9 @@
 use Spatie\StructureDiscoverer\Tests\Fakes\Nested\FakeNestedInterface;
 use Spatie\StructureDiscoverer\Tests\Fakes\OtherNested\FakeOtherNestedClass;
 use Spatie\StructureDiscoverer\Tests\Stubs\StubStructureScout;
+use Spatie\StructureDiscoverer\Tests\Fakes\FakeWithAnonymousClass;
+use Spatie\StructureDiscoverer\Tests\Fakes\FakeWithMultipleClasses;
+use Spatie\StructureDiscoverer\Tests\Fakes\FakeWithMultipleClassesSub;
 
 beforeEach(function () {
     StaticDiscoverCacheDriver::clear();
@@ -55,6 +58,9 @@
         FakeSubChildClass::class,
         FakeClassDepender::class,
         FakeInterfaceDepender::class,
+        FakeWithAnonymousClass::class,
+        FakeWithMultipleClasses::class,
+        FakeWithMultipleClassesSub::class,
     ]);
 });
 
@@ -77,6 +83,9 @@
                 FakeOtherNestedClass::class,
                 FakeSubChildClass::class,
                 FakeClassDepender::class,
+                FakeWithAnonymousClass::class,
+                FakeWithMultipleClasses::class,
+                FakeWithMultipleClassesSub::class,
             ],
         ],
         'interfaces' => [
@@ -310,6 +319,9 @@ public function satisfies(DiscoveredStructure $discoveredData): bool
                 FakeChildClass::class,
                 FakeRootClass::class,
                 FakeSubChildClass::class,
+                FakeWithAnonymousClass::class,
+                FakeWithMultipleClasses::class,
+                FakeWithMultipleClassesSub::class,
                 FakeNestedClass::class,
                 FakeOtherNestedClass::class,
             ],
@@ -331,6 +343,9 @@ public function satisfies(DiscoveredStructure $discoveredData): bool
             [
                 FakeOtherNestedClass::class,
                 FakeNestedClass::class,
+                FakeWithMultipleClasses::class,
+                FakeWithMultipleClassesSub::class,
+                FakeWithAnonymousClass::class,
                 FakeSubChildClass::class,
                 FakeRootClass::class,
                 FakeChildClass::class,
@@ -507,3 +522,15 @@ public function satisfies(DiscoveredStructure $discoveredData): bool
         FakeIntEnum::class,
     ]);
 });
+
+it('can parse anonymous classes', function () {
+    $found = Discover::in(__DIR__.'/Fakes')->get();
+
+    expect($found)->not->toContain("Spatie\StructureDiscoverer\Tests\Fakes\(");
+});
+
+it('can parse multiple nested classes', function () {
+    $found = Discover::in(__DIR__.'/Fakes')->get();
+
+    expect($found)->toContain("Spatie\StructureDiscoverer\Tests\Fakes\FakeWithMultipleClassesSub");
+});