Prevent TypeParseException when dealing with nested template in asser…

…tion
vimeo · Feb 17, 2021 · 196f24a · 196f24a
1 parent 7b24552
commit 196f24a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
@@ -510,7 +510,9 @@ 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,6 +767,17 @@ 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 {}'
+            ],
         ];
     }