Fix token parser skip closing curly brace (#1468)

zircote · Aug 30, 2023 · e1062da · e1062da
1 parent 6279683
commit e1062da
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/src/Analysers/TokenScanner.php b/src/Analysers/TokenScanner.php
@@ -52,7 +52,7 @@ protected function scanTokens(array $tokens): array
         while (false !== ($token = $this->nextToken($tokens))) {
             // named arguments
             $nextToken = $this->nextToken($tokens);
-            if ($nextToken === ':' || $nextToken === false) {
+            if (($token !== '}' && $nextToken === ':') || $nextToken === false) {
                 continue;
             }
             do {

diff --git a/tests/Analysers/TokenScannerTest.php b/tests/Analysers/TokenScannerTest.php
@@ -297,6 +297,25 @@ public function scanCases(): iterable
             ],
         ];
 
+        yield 'CurlyBrace' => [
+            'PHP/MultipleFunctions.php',
+            [
+                'OpenApi\Tests\Fixtures\PHP\MultipleFunctions' => [
+                    'uses' => [
+                        'OA' => 'OpenApi\Annotations',
+                    ],
+                    'interfaces' => [],
+                    'traits' => [],
+                    'enums' => [],
+                    'methods' => [
+                        'first',
+                        'second',
+                    ],
+                    'properties' => [],
+                ],
+            ],
+        ];
+
         yield 'namespaces1' => [
             'PHP/namespaces1.php',
             [

diff --git a/tests/Fixtures/PHP/MultipleFunctions.php b/tests/Fixtures/PHP/MultipleFunctions.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+/**
+ * @license Apache 2.0
+ */
+
+namespace OpenApi\Tests\Fixtures\PHP;
+
+use OpenApi\Annotations as OA;
+
+/**
+ * @OA\Info(title="Test", version="1.0")
+ */
+class MultipleFunctions
+{
+    public function first()
+    {
+        $category = new \stdClass();
+        $prefix = '1';
+        $category->name = '1';
+
+        return isset($category->{'name' . $prefix}) && $category->{'name' . $prefix}
+            ? $category->{'name' . $prefix}
+            : $category->name;
+    }
+
+    public function second()
+    {
+
+    }
+}