Updated Rector to commit dd217d9d2a02a69eb55aa9a5f66f3f6914d74b2b

rectorphp/rector-src@dd217d9 [Php80] Handle dynamic bool expr on ChangeSwitchToMatchRector (#6961)

Author: TomasVotruba

rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php

@@ -15,11 +15,13 @@
 use PhpParser\Node\Stmt\Switch_;
 use PHPStan\Type\ObjectType;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
+use Rector\NodeAnalyzer\ExprAnalyzer;
 use Rector\Php80\NodeAnalyzer\MatchSwitchAnalyzer;
 use Rector\Php80\NodeFactory\MatchFactory;
 use Rector\Php80\NodeResolver\SwitchExprsResolver;
 use Rector\Php80\ValueObject\CondAndExpr;
 use Rector\Php80\ValueObject\MatchResult;
+use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -42,11 +44,21 @@ final class ChangeSwitchToMatchRector extends AbstractRector implements MinPhpVe
      * @readonly
      */
     private MatchFactory $matchFactory;
-    public function __construct(SwitchExprsResolver $switchExprsResolver, MatchSwitchAnalyzer $matchSwitchAnalyzer, MatchFactory $matchFactory)
+    /**
+     * @readonly
+     */
+    private ValueResolver $valueResolver;
+    /**
+     * @readonly
+     */
+    private ExprAnalyzer $exprAnalyzer;
+    public function __construct(SwitchExprsResolver $switchExprsResolver, MatchSwitchAnalyzer $matchSwitchAnalyzer, MatchFactory $matchFactory, ValueResolver $valueResolver, ExprAnalyzer $exprAnalyzer)
     {
         $this->switchExprsResolver = $switchExprsResolver;
         $this->matchSwitchAnalyzer = $matchSwitchAnalyzer;
         $this->matchFactory = $matchFactory;
+        $this->valueResolver = $valueResolver;
+        $this->exprAnalyzer = $exprAnalyzer;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -114,6 +126,7 @@ public function refactor(Node $node) : ?Node
             $assignVar = $this->resolveAssignVar($condAndExprs);
             $hasDefaultValue = $this->matchSwitchAnalyzer->hasDefaultValue($match);
             $this->castMatchCond($match);
+            $this->mirrorDynamicBoolExpr($match);
             if ($assignVar instanceof Expr) {
                 if (!$hasDefaultValue) {
                     continue;
@@ -176,6 +189,32 @@ private function castMatchCond(Match_ $match) : void
             $match->cond = $newMatchCond;
         }
     }
+    private function mirrorDynamicBoolExpr(Match_ $match) : void
+    {
+        if ($this->valueResolver->isTrue($match->cond)) {
+            return;
+        }
+        $isChanged = \false;
+        foreach ($match->arms as $arm) {
+            if ($arm->conds === null) {
+                continue;
+            }
+            foreach ($arm->conds as $cond) {
+                $type = $this->nodeTypeResolver->getNativeType($cond);
+                if (!$this->exprAnalyzer->isDynamicExpr($cond) || !$type->isBoolean()->yes()) {
+                    // return early here, as condition is mixed
+                    // we need another real use case for mixed conditions of dynamic + non-dynamic case expr
+                    return;
+                }
+                $isChanged = \true;
+                // dont' stop lookup for dynamic conditions
+                // continue verify other condition, in case of mixed condition
+            }
+        }
+        if ($isChanged) {
+            $match->cond = $this->nodeFactory->createTrue();
+        }
+    }
     /**
      * @param CondAndExpr[] $condAndExprs
      */

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'a4c6684402ac40cd79fdd2f00de98f041fac13a0';
+    public const PACKAGE_VERSION = 'dd217d9d2a02a69eb55aa9a5f66f3f6914d74b2b';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-06-08 00:41:26';
+    public const RELEASE_DATE = '2025-06-08 13:08:47';
     /**
      * @var int
      */