Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix @psalm-scope-this not working with FQCN with leading backslash #9030

Merged
merged 2 commits into from
Dec 31, 2022
Merged

fix @psalm-scope-this not working with FQCN with leading backslash #9030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcf4284
fix @psalm-scope-this not working with FQCN with leading backslash
kkmuffme Dec 30, 2022
82f71a7
add test
kkmuffme Dec 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
7 changes: 7 additions & 0 deletions tests/TypeReconciliation/ScopeTest.php
View file
Open in desktop
Expand Up @@ -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
Expand Down