Detect promoted properties (#1049)

zircote · Jan 1, 2022 · 47bc50f · 47bc50f
1 parent 2bc19e4
commit 47bc50f
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 4 deletions.
diff --git a/src/Analysers/TokenScanner.php b/src/Analysers/TokenScanner.php
@@ -148,14 +148,18 @@ protected function scanTokens(array $tokens): array
                     $token = $this->nextToken($tokens);
 
                     if (($unitLevel + 1) == count($stack) && $currentName) {
+                        $units[$currentName]['methods'][] = $token[1];
                         if (!$isInterface) {
                             // more nesting
+                            $units[$currentName]['properties'] = array_merge(
+                                $units[$currentName]['properties'],
+                                $this->parsePromotedProperties($tokens)
+                            );
                             $this->skipTo($tokens, '{', true);
                         } else {
                             // no function body
                             $this->skipTo($tokens, ';');
                         }
-                        $units[$currentName]['methods'][] = $token[1];
                     }
                     break;
 
@@ -295,4 +299,44 @@ protected function parseFQNStatement(array &$tokens, &$token): array
 
         return $statements;
     }
+
+    protected function parsePromotedProperties(array &$tokens): array
+    {
+        $properties = [];
+
+        $this->skipTo($tokens, '(');
+        $round = 1;
+        $promoted = false;
+        while (false !== ($token = $this->nextToken($tokens))) {
+            if (is_string($token)) {
+                switch ($token) {
+                    case '(':
+                        ++$round;
+                        break;
+                    case ')':
+                        --$round;
+                        if (0 == $round) {
+                            return $properties;
+                        }
+                }
+            }
+            if (is_array($token)) {
+                switch ($token[0]) {
+                    case T_PUBLIC:
+                    case T_PROTECTED:
+                    case T_PRIVATE:
+                        $promoted = true;
+                        break;
+                    case T_VARIABLE:
+                        if ($promoted) {
+                            $properties[] = ltrim($token[1], '$');
+                            $promoted = false;
+                        }
+                        break;
+                }
+            }
+        }
+
+        return $properties;
+    }
 }
diff --git a/tests/Analysers/TokenScannerTest.php b/tests/Analysers/TokenScannerTest.php
@@ -151,11 +151,14 @@ public function scanCases()
                 'PHP/Php8NamedProperty.php',
                 [
                     'OpenApi\\Tests\\Fixtures\\PHP\\Php8NamedProperty' => [
-                        'uses' => ['Label' => 'OpenApi\\Tests\\Fixtures\\PHP\\Label'],
+                        'uses' => [
+                            'Label' => 'OpenApi\\Tests\\Fixtures\\PHP\\Label',
+                            'Property' => 'OpenApi\\Attributes\\Property',
+                        ],
                         'interfaces' => [],
                         'traits' => [],
                         'methods' => ['__construct'],
-                        'properties' => [],
+                        'properties' => ['labels', 'id'],
                     ],
                 ],
             ],

diff --git a/tests/Fixtures/PHP/Php8NamedProperty.php b/tests/Fixtures/PHP/Php8NamedProperty.php
@@ -6,6 +6,7 @@
 
 namespace OpenApi\Tests\Fixtures\PHP;
 
+use OpenApi\Attributes\Property;
 use OpenApi\Tests\Fixtures\PHP\Label;
 
 /**
@@ -20,7 +21,9 @@ public function __construct(
          * @var Label[]|null $labels
          * @OA\Property()
          */
-        public ?array $labels
+        public ?array $labels,
+        #[Property()]
+        public int $id,
     )
     {
     }