Fix #4264 - prevent crash when analysing file with duplicate classes

vimeo · Oct 7, 2020 · 8375890 · 8375890
1 parent 52ffe7d
commit 8375890
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php b/src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
@@ -146,6 +146,11 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
      */
     private $classlike_type_aliases = [];
 
+    /**
+     * @var array<int, bool>
+     */
+    private $bad_classes = [];
+
     public function __construct(
         Codebase $codebase,
         FileStorage $file_storage,
@@ -285,7 +290,8 @@ public function enterNode(PhpParser\Node $node): ?int
             }
 
             if ($this->registerClassLike($node) === false) {
-                return PhpParser\NodeTraverser::STOP_TRAVERSAL;
+                $this->bad_classes[\spl_object_id($node)] = true;
+                return PhpParser\NodeTraverser::DONT_TRAVERSE_CHILDREN;
             }
         } elseif (($node instanceof PhpParser\Node\Expr\New_
                 || $node instanceof PhpParser\Node\Expr\Instanceof_
@@ -575,6 +581,10 @@ public function leaveNode(PhpParser\Node $node)
                 return null;
             }
 
+            if (isset($this->bad_classes[\spl_object_id($node)])) {
+                return null;
+            }
+
             if (!$this->fq_classlike_names) {
                 throw new \LogicException('$this->fq_classlike_names should not be empty');
             }

diff --git a/tests/IncludeTest.php b/tests/IncludeTest.php
@@ -599,6 +599,28 @@ function bar(): void {}
                     getcwd() . DIRECTORY_SEPARATOR . 'file2.php',
                 ],
             ],
+            'noCrash' => [
+                'files' => [
+                    getcwd() . DIRECTORY_SEPARATOR . 'classes.php' => '<?php
+                        // one.php
+
+                        if (true) {
+                            class One {}
+                        }
+                        else {
+                            class One {}
+                        }
+
+                        class Two {}',
+                    getcwd() . DIRECTORY_SEPARATOR . 'user.php' => '<?php
+                        include("classes.php");
+
+                        new Two();',
+                ],
+                'files_to_check' => [
+                    getcwd() . DIRECTORY_SEPARATOR . 'user.php',
+                ],
+            ],
         ];
     }