Merge pull request #9391 from weirdan/allow-array-as-magic-method-name

vimeo · Feb 24, 2023 · 5f765a9 · 5f765a9
2 parents c0d5d21 + 5f59f07
commit 5f765a9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeDocblockParser.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeDocblockParser.php
@@ -356,7 +356,12 @@ public static function parse(
 
                     $method_tree = $parse_tree_creator->create();
                 } catch (TypeParseTreeException $e) {
-                    throw new DocblockParseException($method_entry . ' is not a valid method');
+                    throw new DocblockParseException(
+                        $method_entry . ' is not a valid method: '
+                        . $e->getMessage(),
+                        0,
+                        $e,
+                    );
                 }
 
                 if (!$method_tree instanceof MethodWithReturnTypeTree

diff --git a/src/Psalm/Internal/Type/ParseTreeCreator.php b/src/Psalm/Internal/Type/ParseTreeCreator.php
@@ -780,8 +780,7 @@ private function handleValue(array $type_token): void
                         $type_token[0],
                         $new_parent,
                     );
-                } elseif ($type_token[0] !== 'array'
-                    && $type_token[0][0] !== '\\'
+                } elseif ($type_token[0][0] !== '\\'
                     && $this->current_leaf instanceof Root
                 ) {
                     $new_leaf = new MethodTree(

diff --git a/tests/MagicMethodAnnotationTest.php b/tests/MagicMethodAnnotationTest.php
@@ -939,6 +939,14 @@ class D extends C {}
                     '$e' => 'B',
                 ],
             ],
+            'arrayAsMethodName' => [
+                'code' => <<<'PHP'
+                    <?php
+                    /** @method static void array() */
+                    class C {}
+                    //C::array();
+                    PHP,
+            ],
         ];
     }