skip remove node, only allowed

Author: TomasVotruba

phpstan.neon

@@ -387,3 +387,14 @@ parameters:
         -
             path: rules/TypeDeclaration/Rector/StmtsAwareInterface/IncreaseDeclareStrictTypesRector.php
             identifier: rector.noOnlyNullReturnInRefactor
+
+        -
+            identifier: rector.noIntegerRefactorReturn
+            paths:
+                - rules/Transform/Rector/ArrayDimFetch/ArrayDimFetchToMethodCallRector.php
+
+                # valid, as use REMOVE_NODE
+                - rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php
+                - rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php
+                - rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php
+                - rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php

rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php

@@ -80,7 +80,7 @@ public function getNodeTypes(): array
 
     /**
      * @param If_ $node
-     * @return null|int|Stmt[]
+     * @return null|NodeVisitor::REMOVE_NODE|Stmt[]
      */
     public function refactor(Node $node): null|array|int
     {
@@ -112,7 +112,7 @@ public function refactor(Node $node): null|array|int
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorSmaller(ConstFetch $constFetch, Smaller $smaller, If_ $if): null|array|int
     {
@@ -128,7 +128,7 @@ private function refactorSmaller(ConstFetch $constFetch, Smaller $smaller, If_ $
     }
 
     /**
-     * @return null|int|Stmt[]
+     * @return null|NodeVisitor::REMOVE_NODE|Stmt[]
      */
     private function processGreaterOrEqual(
         ConstFetch $constFetch,
@@ -146,6 +146,9 @@ private function processGreaterOrEqual(
         return null;
     }
 
+    /**
+     * @return null|NodeVisitor::REMOVE_NODE
+     */
     private function refactorSmallerLeft(Smaller $smaller): ?int
     {
         $value = $smaller->right;
@@ -161,7 +164,7 @@ private function refactorSmallerLeft(Smaller $smaller): ?int
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorSmallerRight(Smaller $smaller, If_ $if): null|array|int
     {
@@ -182,7 +185,7 @@ private function refactorSmallerRight(Smaller $smaller, If_ $if): null|array|int
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorGreaterOrEqualLeft(GreaterOrEqual $greaterOrEqual, If_ $if): null|array|int
     {
@@ -202,6 +205,9 @@ private function refactorGreaterOrEqualLeft(GreaterOrEqual $greaterOrEqual, If_
         return $if->stmts;
     }
 
+    /**
+     * @return NodeVisitor::REMOVE_NODE|null
+     */
     private function refactorGreaterOrEqualRight(GreaterOrEqual $greaterOrEqual): ?int
     {
         $value = $greaterOrEqual->left;
@@ -217,7 +223,7 @@ private function refactorGreaterOrEqualRight(GreaterOrEqual $greaterOrEqual): ?i
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorGreater(ConstFetch $constFetch, Greater $greater, If_ $if): null|array|int
     {
@@ -233,7 +239,7 @@ private function refactorGreater(ConstFetch $constFetch, Greater $greater, If_ $
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorGreaterLeft(Greater $greater, If_ $if): null|array|int
     {
@@ -253,6 +259,9 @@ private function refactorGreaterLeft(Greater $greater, If_ $if): null|array|int
         return $if->stmts;
     }
 
+    /**
+     * @return NodeVisitor::REMOVE_NODE|null
+     */
     private function refactorGreaterRight(Greater $greater): ?int
     {
         $value = $greater->left;
@@ -268,7 +277,7 @@ private function refactorGreaterRight(Greater $greater): ?int
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorConstFetch(ConstFetch $constFetch, If_ $if, BinaryOp $binaryOp): null|array|int
     {

rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php

@@ -59,7 +59,7 @@ public function getNodeTypes(): array
 
     /**
      * @param Expression $node
-     * @return Node[]|Node|null|int
+     * @return Node[]|Node|null|NodeVisitor::REMOVE_NODE
      */
     public function refactor(Node $node): array|Node|null|int
     {
@@ -106,6 +106,9 @@ private function hasGetMagic(Expression $expression): bool
         return ! $phpPropertyReflection instanceof PhpPropertyReflection;
     }
 
+    /**
+     * @return NodeVisitor::REMOVE_NODE|Node
+     */
     private function removeNodeAndKeepComments(Expression $expression): int|Node
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($expression);

rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php

@@ -74,7 +74,7 @@ public function getNodeTypes(): array
 
     /**
      * @param If_ $node
-     * @return Stmt[]|null|int|If_
+     * @return Stmt[]|null|NodeVisitor::REMOVE_NODE|If_
      */
     public function refactor(Node $node): array|null|int|If_
     {
@@ -98,7 +98,7 @@ public function refactor(Node $node): array|null|int|If_
     }
 
     /**
-     * @return null|Stmt[]|int
+     * @return null|Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorStmtAndInstanceof(If_ $if, Instanceof_ $instanceof): null|array|int
     {

rules/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector.php

@@ -61,7 +61,7 @@ public function getNodeTypes(): array
 
     /**
      * @param If_ $node
-     * @return Stmt[]|null|int
+     * @return Stmt[]|null|NodeVisitor::REMOVE_NODE
      */
     public function refactor(Node $node): array|int|null
     {
@@ -104,7 +104,7 @@ private function refactorIsMatch(If_ $if): ?array
     }
 
     /**
-     * @return Stmt[]|int
+     * @return Stmt[]|NodeVisitor::REMOVE_NODE
      */
     private function refactorIsNotMatch(If_ $if): array|int
     {