Cleanup phpstan errors (#3748)

rectorphp · May 6, 2023 · 14fa8c9 · 14fa8c9
1 parent 3c592b0
commit 14fa8c9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 170 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
@@ -392,7 +392,7 @@ public function getTemplateTagValueNodes(): array
     }
 
     /**
-     * @deprecated
+     * @internal
      * Should be handled by attributes of phpdoc node - if stard_and_end is missing in one of nodes, it has been changed
      * Similar to missing original node in php-aprser
      */

diff --git a/packages/ChangesReporting/Collector/RectorChangeCollector.php b/packages/ChangesReporting/Collector/RectorChangeCollector.php
@@ -20,7 +20,7 @@ public function __construct(
     }
 
     /**
-     * @deprecated Use file-> method instead
+     * @internal Use file-> method instead
      */
     public function notifyNodeFileInfo(Node $node): void
     {

diff --git a/packages/PostRector/Collector/NodesToAddCollector.php b/packages/PostRector/Collector/NodesToAddCollector.php
@@ -44,7 +44,7 @@ public function isActive(): bool
     }
 
     /**
-     * @deprecated Return created nodes right in refactor() method to keep context instead.
+     * @internal Return created nodes right in refactor() method to keep context instead.
      */
     public function addNodeBeforeNode(Node $addedNode, Node $positionNode): void
     {
@@ -66,7 +66,7 @@ public function addNodeBeforeNode(Node $addedNode, Node $positionNode): void
     /**
      * @api
      * @param Node[] $addedNodes
-     * @deprecated Return created nodes right in refactor() method to keep context instead.
+     * @internal Return created nodes right in refactor() method to keep context instead.
      */
     public function addNodesAfterNode(array $addedNodes, Node $positionNode): void
     {
@@ -81,7 +81,7 @@ public function addNodesAfterNode(array $addedNodes, Node $positionNode): void
 
     /**
      * Better return created nodes right in refactor() method to keep context
-     * @deprecated
+     * @internal
      */
     public function addNodeAfterNode(Node $addedNode, Node $positionNode): void
     {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,20 +1,9 @@
 includes:
     - vendor/symplify/phpstan-rules/config/symplify-rules.neon
-    - phpstan-baseline.neon
 
 parameters:
     reportUnmatchedIgnoredErrors: false
 
-    unused_public:
-        properties: true
-        constants: true
-        methods: true
-
-    type_coverage:
-        param_type: 99
-        return_type: 99
-        property_type: 99
-
     cognitive_complexity:
         class: 50
         function: 10
@@ -24,10 +13,6 @@ parameters:
     # requires exact closure types
     checkMissingCallableSignature: true
 
-    parallel:
-        # to prevent full thread lagging pc
-        maximumNumberOfProcesses: 15
-
     paths:
         - rector.php
         - bin
@@ -244,8 +229,6 @@ parameters:
             path: src/Bootstrap/RectorConfigsResolver.php
             message: '#Method Rector\\Core\\Bootstrap\\RectorConfigsResolver\:\:resolveFromInput\(\) should return string\|null but returns string\|false#'
 
-        - '#Cognitive complexity for "Rector\\Core\\NodeManipulator\\ClassMethodAssignManipulator\:\:collectReferenceVariableNames\(\)" is 13, keep it under 10#'
-
         # known value object, nullable due to typed property
         -
             message: '#Cannot call method (.*?)\(\) on (.*?)\\ProcessPool\|null#'
@@ -692,10 +675,6 @@ parameters:
             message: '#Anonymous (variable|variables) in#'
             path: utils/ChangelogGenerator
 
-        -
-            message: '#Separate function "sprintf\(\)" in method call to standalone row to improve readability#'
-            path: utils/ChangelogGenerator
-
         # std class api
         -
             message: '#Function "property_exists\(\)" cannot be used/left in the code\: use ReflectionProvider\->has\*\(\) instead#'
@@ -757,11 +736,6 @@ parameters:
                 - src/Console/Command/AbstractProcessCommand.php
                 - src/Rector/AbstractRector.php
 
-        # allow PHPUnit 10 attributes without keys
-        -
-            message: '#Attribute must have all names explicitly defined#'
-            path: '*Test.php'
-
         # useless
         - '#Parameter \#1 \$suffix of method PHPUnit\\Framework\\Assert\:\:assertStringEndsWith\(\) expects non\-empty\-string, string given#'
 

diff --git a/...nts/Rector/MethodCall/SwapMethodCallArgumentsRector/SwapMethodCallArgumentsRectorTest.php b/...nts/Rector/MethodCall/SwapMethodCallArgumentsRector/SwapMethodCallArgumentsRectorTest.php
@@ -18,9 +18,7 @@ public function test(string $filePath): void
 
     public static function provideData(): Iterator
     {
-        foreach (self::yieldFilesFromDirectory(__DIR__ . '/Fixture') as $filePath) {
-            yield basename((string) $filePath[0]) => $filePath;
-        }
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php b/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php
@@ -81,8 +81,10 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return null;
         }
 
-        /** @var Expr $assignVariable */
         $assignVariable = $this->foreachAnalyzer->matchAssignItemsOnlyForeachArrayVariable($node);
+        if (! $assignVariable instanceof Expr) {
+            return null;
+        }
 
         return new Assign($assignVariable, $node->expr);
     }

diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -77,7 +77,7 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
     protected BetterNodeFinder $betterNodeFinder;
 
     /**
-     * @deprecated Use service directly or return changes nodes
+     * @internal Use service directly or return changes nodes
      */
     protected NodeRemover $nodeRemover;