Merge pull request #7494 from zoonru/deprecate_template_extended_count

Deprecate template_extended_count
vimeo · Jan 26, 2022 · 5cd5255 · 5cd5255
2 parents e7ac047 + d2d151c
commit 5cd5255
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -51,14 +51,16 @@
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/Analyzer/ClassAnalyzer.php">
-    <DeprecatedProperty occurrences="7">
+    <DeprecatedProperty occurrences="9">
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_minor_version</code>
       <code>$codebase-&gt;php_minor_version</code>
       <code>$codebase-&gt;php_minor_version</code>
+      <code>$storage-&gt;template_extended_count</code>
+      <code>$storage-&gt;template_extended_count</code>
     </DeprecatedProperty>
     <PossiblyUndefinedIntArrayOffset occurrences="3">
       <code>$comments[0]</code>
@@ -501,7 +503,8 @@
     </PossiblyUndefinedIntArrayOffset>
   </file>
   <file src="src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php">
-    <DeprecatedProperty occurrences="2">
+    <DeprecatedProperty occurrences="3">
+      <code>$storage-&gt;template_extended_count</code>
       <code>$this-&gt;codebase-&gt;php_major_version</code>
       <code>$this-&gt;codebase-&gt;php_minor_version</code>
     </DeprecatedProperty>

diff --git a/src/Psalm/Storage/ClassLikeStorage.php b/src/Psalm/Storage/ClassLikeStorage.php
@@ -361,6 +361,7 @@ class ClassLikeStorage
     public $template_extended_params;
 
     /**
+     * @deprecated Will be replaced with $template_type_extends_count in Psalm v5
      * @var ?int
      */
     public $template_extended_count;