Revert "Prevent TypeParseException when dealing with nested template …

…in assertion" This reverts commit 196f24a.
vimeo · Feb 17, 2021 · 9d6d391 · 9d6d391
1 parent 686f9fc
commit 9d6d391
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
@@ -510,9 +510,7 @@ private static function getAssertionParts(
                     $self_fqcln,
                     null,
                     true
-                ),
-                null,
-                $function_template_types + $class_template_types
+                )
             );
         } catch (TypeParseTreeException $e) {
             $storage->docblock_issues[] = new InvalidDocblock(

diff --git a/tests/Template/FunctionTemplateAssertTest.php b/tests/Template/FunctionTemplateAssertTest.php
@@ -767,17 +767,6 @@ function validateUsername(string $username): void {
                         }
                     }'
             ],
-            'noCrashWhenAssertingTemplatedKeyOf' => [
-                '<?php
-                    /**
-                     * @template TArray as array
-                     * @template TCandidateKey as array-key
-                     * @param TArray $arr
-                     * @param array-key $key
-                     * @psalm-assert key-of<TArray> $key
-                     */
-                    function keyExists(array $arr, $key) : void {}'
-            ],
         ];
     }