Merge pull request vimeo#10806 from weirdan/9596-dont-crash-on-invali…

…d-templates
issidorov · Mar 11, 2024 · ae1d510 · ae1d510
2 parents c511185 + 4a2cf93
commit ae1d510
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php
@@ -434,9 +434,11 @@ public function start(PhpParser\Node\Stmt\ClassLike $node): ?bool
                             try {
                                 $type_string = CommentAnalyzer::splitDocLine($type_string)[0];
                             } catch (DocblockParseException $e) {
-                                throw new DocblockParseException(
-                                    $type_string . ' is not a valid type: ' . $e->getMessage(),
+                                $storage->docblock_issues[] = new InvalidDocblock(
+                                    $e->getMessage() . ' in docblock for ' . $fq_classlike_name,
+                                    $name_location ?? $class_location,
                                 );
+                                continue;
                             }
                             $type_string = CommentAnalyzer::sanitizeDocblockType($type_string);
                             try {

diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -5025,6 +5025,16 @@ function getMixedCollection(MyCollection $c): MyCollection {
                     }',
                 'error_message' => 'InvalidReturnStatement',
             ],
+            'noCrashOnBrokenTemplate' => [
+                'code' => <<<'PHP'
+                <?php
+                /**
+                 * @template TValidationRule of callable>|string
+                 */
+                class C {}
+                PHP,
+                'error_message' => 'InvalidDocblock',
+            ],
         ];
     }
 }