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.

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

Deprecated Template Classes are not ignored by @psalm-suppress DeprecatedClass #10518

Merged
merged 4 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Psalm/Internal/Analyzer/ClassAnalyzer.php
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ public function analyze(
null,
true,
),
$this->getSuppressedIssues(),
$storage->getSuppressedIssuesForTemplateExtendParams() + $this->getSuppressedIssues(),
);
}
}
Expand Down
20 changes: 20 additions & 0 deletions src/Psalm/Storage/ClassLikeStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
use Psalm\Internal\MethodIdentifier;
use Psalm\Internal\Type\TypeAlias\ClassTypeAlias;
use Psalm\Issue\CodeIssue;
use Psalm\Issue\DeprecatedClass;
use Psalm\Type\Atomic\TNamedObject;
use Psalm\Type\Atomic\TTemplateParam;
use Psalm\Type\Union;

use function array_values;
use function in_array;

final class ClassLikeStorage implements HasAttributesInterface
{
Expand Down Expand Up @@ -550,4 +552,22 @@ private function hasAttribute(string $fq_class_name): bool

return false;
}

/**
* @return array<int, string>
*/
public function getSuppressedIssuesForTemplateExtendParams(): array
{
$allowed_issue_types = [
DeprecatedClass::getIssueType(),
];
$suppressed_issues_for_template_extend_params = [];
foreach ($this->suppressed_issues as $offset => $suppressed_issue) {
if (!in_array($suppressed_issue, $allowed_issue_types, true)) {
continue;
}
$suppressed_issues_for_template_extend_params[$offset] = $suppressed_issue;
}
return $suppressed_issues_for_template_extend_params;
}
}
18 changes: 18 additions & 0 deletions tests/DeprecatedAnnotationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,24 @@ class A {
public $property;
}
'],
'suppressDeprecatedClassOnTemplateType' => [
'code' => '<?php
/**
* @deprecated
*/
class TheDeprecatedClass {}

/**
* @template T
*/
class TheParentClass {}

/**
* @extends TheParentClass<TheDeprecatedClass>
* @psalm-suppress DeprecatedClass
*/
class TheChildClass extends TheParentClass {}
'],
];
}

Expand Down
Loading