Decouple deprecated PHPStan ignores to phpstan-deprecated.neon

phpstan-deprecated.neon

@@ -0,0 +1,35 @@
+# deprecated code kept temporarily, ignores to drop once the deprecated API is removed
+parameters:
+    ignoreErrors:
+        # deprecated, to be removed
+        -
+            message: '#^Unused Rector\\Set\\Contract\\SetInterface\:\:(.*?)$#'
+            identifier: shipmonk.deadMethod
+            path: src/Set/Contract/SetInterface.php
+
+        # the deprecated set objects are still resolved internally, until every extension bonds its rules
+        -
+            message: '#deprecated (class|interface) Rector\\(Set|Bridge)\\#'
+            path: src/Configuration/RectorConfigBuilder.php
+
+        # EARLY_RETURN set is deprecated (empty, merged into code-quality), still mapped internally until removed
+        -
+            identifier: classConstant.deprecated
+            paths:
+                - src/Configuration/RectorConfigBuilder.php
+
+        # the deprecated SetList::PHP_* constants are still resolved internally by the level sets and their tests
+        -
+            identifier: classConstant.deprecated
+            paths:
+                - config/set/level
+                - tests/Bridge/SetRectorsResolverTest.php
+
+        # the deprecated github/gitlab output formatters are still tested until removed in next minor version
+        -
+            identifier: new.deprecatedClass
+            path: tests/ChangesReporting/Output/GitHubOutputFormatterTest.php
+
+        -
+            identifier: method.deprecatedClass
+            path: tests/ChangesReporting/Output/GitHubOutputFormatterTest.php

phpstan.neon

@@ -1,5 +1,6 @@
 includes:
     - vendor/symplify/phpstan-rules/config/rector-rules.neon
+    - phpstan-deprecated.neon
 
 rules:
     - Rector\Utils\PHPStan\Rule\RegisterRelatedPolyfillRectorRule
@@ -56,6 +57,7 @@ parameters:
         phpunit: true
         mocks: true
         ctor: true
+        modern: true
 
     # see https://github.com/TomasVotruba/type-coverage
     type_coverage:
@@ -81,39 +83,6 @@ parameters:
             identifier: shipmonk.deadMethod
             path: src/PhpParser/Printer/BetterStandardPrinter.php
 
-        # deprecated, to be removed
-        -
-            message: '#^Unused Rector\\Set\\Contract\\SetInterface\:\:(.*?)$#'
-            identifier: shipmonk.deadMethod
-            path: src/Set/Contract/SetInterface.php
-
-        # the deprecated set objects are still resolved internally, until every extension bonds its rules
-        -
-            message: '#deprecated (class|interface) Rector\\(Set|Bridge)\\#'
-            path: src/Configuration/RectorConfigBuilder.php
-
-        # EARLY_RETURN set is deprecated (empty, merged into code-quality), still mapped internally until removed
-        -
-            identifier: classConstant.deprecated
-            paths:
-                - src/Configuration/RectorConfigBuilder.php
-
-        # the deprecated SetList::PHP_* constants are still resolved internally by the level sets and their tests
-        -
-            identifier: classConstant.deprecated
-            paths:
-                - config/set/level
-                - tests/Bridge/SetRectorsResolverTest.php
-
-        # the deprecated github/gitlab output formatters are still tested until removed in next minor version
-        -
-            identifier: new.deprecatedClass
-            path: tests/ChangesReporting/Output/GitHubOutputFormatterTest.php
-
-        -
-            identifier: method.deprecatedClass
-            path: tests/ChangesReporting/Output/GitHubOutputFormatterTest.php
-
         -
             identifier: argument.templateType
             path: rules/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayReduceRector.php

tests/Issues/PrintCrash/Fixture/skip_with_interpolated_string_part_used.php.inc → rules-tests/DeadCode/Rector/Foreach_/RemoveUnusedForeachKeyRector/Fixture/skip_with_interpolated_string_part_used.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Issues\IndentationCrash\PrintCrash;
+namespace Rector\Tests\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector\Fixture;
 
 final class WithInterpolatedStringPart
 {
@@ -11,4 +11,3 @@ final class WithInterpolatedStringPart
         }
     }
 }
-

tests/Issues/RenameClassInCallbackFromAssertAnnotation/Fixture/callback_with_curly_braces.php.inc → rules-tests/Renaming/Rector/Name/RenameClassRector/Fixture/callback_with_curly_braces.php.inc

@@ -1,13 +1,13 @@
 <?php
 
-namespace Rector\Tests\Issues\AliasedImportDouble\Fixture;
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Fixture;
 
 use Symfony\Component\Validator\Constraints as Assert;
 
 final class CallbackWithCurlyBraces
 {
     /**
-     * @Assert\Choice(callback={"Some\Random\Class_", "getChoices"})
+     * @Assert\Choice(callback={"MyNamespace\MylegacyClass", "getChoices"})
      */
     private $attribute;
 }
@@ -16,14 +16,14 @@ final class CallbackWithCurlyBraces
 -----
 <?php
 
-namespace Rector\Tests\Issues\AliasedImportDouble\Fixture;
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Fixture;
 
 use Symfony\Component\Validator\Constraints as Assert;
 
 final class CallbackWithCurlyBraces
 {
     /**
-     * @Assert\Choice(callback={"Some\Other\Random\Class_", "getChoices"})
+     * @Assert\Choice(callback={"MyNewNamespace\MyNewClass", "getChoices"})
      */
     private $attribute;
 }

tests/Issues/RenameClassInCallbackFromAssertAnnotation/Fixture/callback_with_string_value.php.inc → rules-tests/Renaming/Rector/Name/RenameClassRector/Fixture/skip_callback_with_string_value.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Issues\AliasedImportDouble\Fixture;
+namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Fixture;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php

@@ -88,7 +88,7 @@ public function refactor(Node $node): ?Node
         $this->hasChanged = false;
 
         // skip class without parents/interfaces, there is no param type to mimic
-        if ($node instanceof Class_ && !$node->extends instanceof Name && $node->implements === []) {
+        if ($node instanceof Class_ && ! $node->extends instanceof Name && $node->implements === []) {
             return null;
         }
 

rules/TypeDeclaration/Rector/Class_/ChildDoctrineRepositoryClassTypeRector.php

@@ -96,7 +96,7 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         // entity type is resolved from the @extends docblock, bail early when absent
-        if (!$node->getDocComment() instanceof Doc) {
+        if (! $node->getDocComment() instanceof Doc) {
             return null;
         }