Updated Rector to commit 580b374ea3638fd50cf9b98b84445cd9fe53768e

rectorphp/rector-src@580b374 [DeadCode] Avoid scan whole new stmts on RemoveAlwaysTrueIfConditionRector on dynamic variable check (#8057)

Author: TomasVotruba

rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php

@@ -137,14 +137,10 @@ private function shouldSkipFromVariable(Expr $expr): bool
     {
         /** @var Variable[] $variables */
         $variables = $this->betterNodeFinder->findInstancesOf($expr, [Variable::class]);
-        $hasPlainVariable = \false;
         foreach ($variables as $variable) {
             if ($this->exprAnalyzer->isNonTypedFromParam($variable)) {
                 return \true;
             }
-            if (!$variable->name instanceof Expr) {
-                $hasPlainVariable = \true;
-            }
             $type = $this->nodeTypeResolver->getNativeType($variable);
             if ($type instanceof IntersectionType) {
                 foreach ($type->getTypes() as $subType) {
@@ -154,13 +150,7 @@ private function shouldSkipFromVariable(Expr $expr): bool
                 }
             }
         }
-        // a dynamic variable assignment, e.g. ${$name} = ..., is invisible to native type inference, so the
-        // condition variable may be overwritten at runtime and is not safe to evaluate as always true
-        return $hasPlainVariable && $this->hasDynamicVariable();
-    }
-    private function hasDynamicVariable(): bool
-    {
-        return (bool) $this->betterNodeFinder->findFirst($this->getFile()->getNewStmts(), static fn(Node $node): bool => $node instanceof Variable && $node->name instanceof Expr);
+        return \false;
     }
     private function shouldSkipExpr(Expr $expr): bool
     {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2.5.0';
+    public const PACKAGE_VERSION = '580b374ea3638fd50cf9b98b84445cd9fe53768e';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-20 18:37:50';
+    public const RELEASE_DATE = '2026-06-21 00:26:52';
     /**
      * @var int
      */

src/NodeAnalyzer/ExprAnalyzer.php

@@ -49,6 +49,7 @@
 use PhpParser\Node\Scalar\InterpolatedString;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\UnionType;
@@ -119,10 +120,20 @@ public function isNonTypedFromParam(Expr $expr): bool
         if (!$scope->hasVariableType((string) $this->nodeNameResolver->getName($expr))->yes()) {
             return \true;
         }
-        if ($nativeType instanceof UnionType) {
-            return !$nativeType->equals($type);
+        if ($nativeType instanceof UnionType && !$nativeType->equals($type)) {
+            return \true;
+        }
+        if (!$nativeType->isSuperTypeOf($type)->yes()) {
+            return \true;
         }
-        return !$nativeType->isSuperTypeOf($type)->yes();
+        $definedVariables = $scope->getDefinedVariables();
+        foreach ($definedVariables as $definedVariable) {
+            $variableType = $scope->getVariableType($definedVariable);
+            if ($variableType instanceof ConstantStringType && in_array($variableType->getValue(), $definedVariables, \true)) {
+                return \true;
+            }
+        }
+        return \false;
     }
     public function isDynamicExpr(Expr $expr): bool
     {