Merge pull request #10518 from samlitowitz/issue-10490

Deprecated Template Classes are not ignored by @psalm-suppress DeprecatedClass
vimeo · Jan 10, 2024 · 17cd6a7 · 17cd6a7
2 parents 06b71be + c3a41d1
commit 17cd6a7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -350,7 +350,7 @@ public function analyze(
                             null,
                             true,
                         ),
-                        $this->getSuppressedIssues(),
+                        $storage->getSuppressedIssuesForTemplateExtendParams() + $this->getSuppressedIssues(),
                     );
                 }
             }

diff --git a/src/Psalm/Storage/ClassLikeStorage.php b/src/Psalm/Storage/ClassLikeStorage.php
@@ -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
 {
@@ -551,4 +553,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;
+    }
 }
diff --git a/tests/DeprecatedAnnotationTest.php b/tests/DeprecatedAnnotationTest.php
@@ -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 {}
+                '],
         ];
     }