remove node visitor stop from DowngradeHashAlgorithmXxHashRector

Author: TomasVotruba

phpstan.neon

@@ -99,3 +99,7 @@ parameters:
         -
             identifier: symplify.seeAnnotationToTest
             path:  rules/DowngradePhp85/Rector/StmtsAwareInterface/DowngradePipeOperatorRector.php
+
+        -
+            identifier: rector.noIntegerRefactorReturn
+            path:  rules/DowngradePhp82/Rector/FuncCall/DowngradeIteratorCountToArrayRector.php

rules/DowngradePhp81/Rector/FuncCall/DowngradeHashAlgorithmXxHashRector.php

@@ -6,20 +6,12 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
-use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Scalar\String_;
-use PhpParser\Node\Stmt\Expression;
-use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\Return_;
-use PhpParser\NodeVisitor;
 use PHPStan\Type\IntegerRangeType;
-use Rector\DeadCode\ConditionResolver;
-use Rector\DeadCode\ValueObject\VersionCompareCondition;
 use Rector\NodeAnalyzer\ArgsAnalyzer;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
@@ -48,7 +40,6 @@ final class DowngradeHashAlgorithmXxHashRector extends AbstractRector
     public function __construct(
         private readonly ArgsAnalyzer $argsAnalyzer,
         private readonly ValueResolver $valueResolver,
-        private readonly ConditionResolver $conditionResolver
     ) {
     }
 
@@ -87,32 +78,19 @@ public function run()
      */
     public function getNodeTypes(): array
     {
-        return [If_::class, Ternary::class, FuncCall::class];
+        return [FuncCall::class];
     }
 
     /**
-     * @param If_|Ternary|FuncCall $node
-     * @return null|NodeVisitor::DONT_TRAVERSE_CHILDREN|Node
+     * @param FuncCall $node
      */
-    public function refactor(Node $node): null|int|Node
+    public function refactor(Node $node): ?FuncCall
     {
-        if ($node instanceof If_) {
-            if ($this->isVersionCompareIf($node)) {
-                return NodeVisitor::DONT_TRAVERSE_CHILDREN;
-            }
-
-            return null;
-        }
-
-        if ($node instanceof Ternary) {
-            if ($this->isVersionCompareTernary($node)) {
-                return NodeVisitor::DONT_TRAVERSE_CHILDREN;
-            }
-
+        if ($this->shouldSkip($node)) {
             return null;
         }
 
-        if ($this->shouldSkip($node)) {
+        if ($node->getAttribute(AttributeKey::PHP_VERSION_CONDITIONED)) {
             return null;
         }
 
@@ -134,54 +112,6 @@ public function refactor(Node $node): null|int|Node
         return $node;
     }
 
-    private function isVersionCompareIf(If_ $if): bool
-    {
-        if ($if->cond instanceof FuncCall) {
-            // per use case reported only
-            if (count($if->stmts) !== 1) {
-                return false;
-            }
-
-            $versionCompare = $this->conditionResolver->resolveFromExpr($if->cond);
-
-            if (! $versionCompare instanceof VersionCompareCondition || $versionCompare->getSecondVersion() !== 80100) {
-                return false;
-            }
-
-            if ($versionCompare->getCompareSign() !== '>=') {
-                return false;
-            }
-
-            if ($if->stmts[0] instanceof Expression && $if->stmts[0]->expr instanceof Assign && $if->stmts[0]->expr->expr instanceof FuncCall) {
-                return $this->isName($if->stmts[0]->expr->expr, 'hash');
-            }
-
-            if ($if->stmts[0] instanceof Return_ && $if->stmts[0]->expr instanceof FuncCall) {
-                return $this->isName($if->stmts[0]->expr, 'hash');
-            }
-        }
-
-        return false;
-    }
-
-    private function isVersionCompareTernary(Ternary $ternary): bool
-    {
-        if ($ternary->if instanceof Expr && $ternary->cond instanceof FuncCall) {
-            $versionCompare = $this->conditionResolver->resolveFromExpr($ternary->cond);
-            if ($versionCompare instanceof VersionCompareCondition && $versionCompare->getSecondVersion() === 80100) {
-                if ($versionCompare->getCompareSign() === '>=') {
-                    return $ternary->if instanceof FuncCall && $this->isName($ternary->if, 'hash');
-                }
-
-                if ($versionCompare->getCompareSign() === '<') {
-                    return $ternary->else instanceof FuncCall && $this->isName($ternary->else, 'hash');
-                }
-            }
-        }
-
-        return false;
-    }
-
     private function shouldSkip(FuncCall $funcCall): bool
     {
         if ($funcCall->isFirstClassCallable()) {

rules/DowngradePhp82/Rector/FuncCall/DowngradeIteratorCountToArrayRector.php

@@ -68,8 +68,9 @@ function test(array|Traversable $data) {
 
     /**
      * @param Ternary|FuncCall $node
+     * @return null|FuncCall|NodeVisitor::DONT_TRAVERSE_CHILDREN
      */
-    public function refactor(Node $node): null|FuncCall
+    public function refactor(Node $node): null|FuncCall|int
     {
         if ($node instanceof Ternary) {
             $hasIsArrayCheck = (bool) $this->betterNodeFinder->findFirst(