Prevent invalid [] brackets in tree

Fixes #3246
vimeo · Apr 28, 2020 · 05ff8d0 · 05ff8d0
1 parent a402d45
commit 05ff8d0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/ParseTree.php b/src/Psalm/Internal/Type/ParseTree.php
@@ -103,6 +103,10 @@ public static function createFromTokens(array $type_tokens)
 
                         $new_parent_leaf = new ParseTree\IndexedAccessTree($next_token[0], $current_parent);
                     } else {
+                        if ($current_leaf instanceof ParseTree\ObjectLikePropertyTree) {
+                            throw new TypeParseTreeException('Unexpected token ' . $type_token[0]);
+                        }
+
                         $new_parent_leaf = new ParseTree\GenericTree('array', $current_parent);
                     }
 

diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -424,6 +424,15 @@ public function testObjectLikeWithoutClosingBracket()
         Type::parseString('array{a: int, b: string');
     }
 
+    /**
+     * @return void
+     */
+    public function testObjectLikeArrayInType()
+    {
+        $this->expectException(\Psalm\Exception\TypeParseTreeException::class);
+        Type::parseString('array{a:[]}');
+    }
+
     /**
      * @return void
      */