UsedSymbolExtractor: fix incorrect detection of attribute (#121)

shipmonk-rnd · Apr 11, 2024 · 82b9f82 · 82b9f82
1 parent da9eb49
commit 82b9f82
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/UsedSymbolExtractor.php b/src/UsedSymbolExtractor.php
@@ -11,6 +11,7 @@
 use function token_get_all;
 use const PHP_VERSION_ID;
 use const T_AS;
+use const T_ATTRIBUTE;
 use const T_CLASS;
 use const T_COMMENT;
 use const T_CONST;
@@ -337,9 +338,13 @@ private function getFqnSymbolKind(int $pointerBeforeName, int $pointerAfterName)
             break;
         } while ($pointerAfterName < $this->numTokens);
 
+        // phpcs:disable Squiz.PHP.CommentedOutCode.Found
         if (
             $tokenAfterName === '('
-            && $tokenBeforeName[0] !== T_NEW // eliminate new \ClassName( syntax
+            && !(
+                $tokenBeforeName[0] === T_NEW // eliminate new \ClassName(
+                || (PHP_VERSION_ID > 80000 && $tokenBeforeName[0] === T_ATTRIBUTE) // eliminate #[\AttributeName(
+            )
         ) {
             return SymbolKind::FUNCTION;
         }

diff --git a/tests/UsedSymbolExtractorTest.php b/tests/UsedSymbolExtractorTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use function file_get_contents;
+use const PHP_VERSION_ID;
 
 class UsedSymbolExtractorTest extends TestCase
 {
@@ -112,6 +113,17 @@ public function provideVariants(): iterable
             __DIR__ . '/data/not-autoloaded/used-symbols/curly-braces.php',
             []
         ];
+
+        yield 'attribute' => [
+            __DIR__ . '/data/not-autoloaded/used-symbols/attribute.php',
+            PHP_VERSION_ID >= 80000
+                ? [
+                    SymbolKind::CLASSLIKE => [
+                        'SomeAttribute' => [3],
+                    ],
+                ]
+                : []
+        ];
     }
 
 }
diff --git a/tests/data/not-autoloaded/used-symbols/attribute.php b/tests/data/not-autoloaded/used-symbols/attribute.php
@@ -0,0 +1,4 @@
+<?php
+
+#[\SomeAttribute()]
+class ClassWithAttribute {}