Merge pull request vimeo#9030 from kkmuffme/psalm-scope-this-doesnt-w…

…ork-with-FQCN-leading-backslash fix @psalm-scope-this not working with FQCN with leading backslash
jack-worman · Dec 31, 2022 · ef1264b · ef1264b
2 parents 0107876 + 82f71a7
commit ef1264b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
@@ -76,6 +76,7 @@
 use function get_class;
 use function in_array;
 use function is_string;
+use function ltrim;
 use function preg_split;
 use function reset;
 use function round;
@@ -793,6 +794,7 @@ private function parseStatementDocblock(
 
         if (isset($comments->tags['psalm-scope-this'])) {
             $trimmed = trim(reset($comments->tags['psalm-scope-this']));
+            $trimmed = ltrim($trimmed, '\\');
 
             if (!$codebase->classExists($trimmed)) {
                 IssueBuffer::maybeAdd(

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