Don’t make test reliant on knowing about Exception

vimeo · Aug 26, 2019 · d09a427 · d09a427
1 parent 781e711
commit d09a427
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
@@ -275,10 +275,23 @@ public function analyze(
 
                 if (isset($comments['specials']['psalm-scope-this'])) {
                     $trimmed = trim(\reset($comments['specials']['psalm-scope-this']));
-                    $this_type = Type::parseString($trimmed);
-                    $context->self = $trimmed;
-                    $context->vars_in_scope['$this'] = $this_type;
-                    $this->setFQCLN($trimmed);
+
+                    if (!$codebase->classExists($trimmed)) {
+                        if (IssueBuffer::accepts(
+                            new \Psalm\Issue\UndefinedDocblockClass(
+                                'Scope class ' . $trimmed . ' does not exist',
+                                new CodeLocation($this->getSource(), $stmt, null, true),
+                                $trimmed
+                            )
+                        )) {
+                            // fall through
+                        }
+                    } else {
+                        $this_type = Type::parseString($trimmed);
+                        $context->self = $trimmed;
+                        $context->vars_in_scope['$this'] = $this_type;
+                        $this->setFQCLN($trimmed);
+                    }
                 }
 
                 if (isset($comments['specials']['psalm-suppress'])) {

diff --git a/tests/ScopeTest.php b/tests/ScopeTest.php
@@ -254,6 +254,7 @@ function a(): ?int {
             ],
             'psalmScopeThisInTemplate' => [
                 '<?php
+                    $e = new Exception(); // necessary to trick Psalm’s scanner for test
                     /** @psalm-scope-this Exception */
                 ?>
                 <h1><?= $this->getMessage() ?></h1>',