Updated Rector to commit 8d22cedbbd93a4945cf0fd97da07c486488b533a

rectorphp/rector-src@8d22ced [dead-code] Add RemoveUnusedVariableUseRector (#7430)

Author: TomasVotruba

rules/DeadCode/Rector/Concat/RemoveUnusedClosureVariableUseRector.php

@@ -0,0 +1,79 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\DeadCode\Rector\Concat;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\Closure;
+use Rector\PhpParser\Node\BetterNodeFinder;
+use Rector\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+/**
+ * @see \Rector\Tests\DeadCode\Rector\Closure\RemoveUnusedClosureVariableUseRector\RemoveUnusedClosureVariableUseRectorTest
+ */
+final class RemoveUnusedClosureVariableUseRector extends AbstractRector
+{
+    /**
+     * @readonly
+     */
+    private BetterNodeFinder $betterNodeFinder;
+    public function __construct(BetterNodeFinder $betterNodeFinder)
+    {
+        $this->betterNodeFinder = $betterNodeFinder;
+    }
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Remove unused variable in use() of closure', [new CodeSample(<<<'CODE_SAMPLE'
+$var = 1;
+
+$closure = function() use ($var) {
+    echo 'Hello World';
+};
+
+CODE_SAMPLE
+, <<<'CODE_SAMPLE'
+$var = 1;
+$closure = function() {
+    echo 'Hello World';
+};
+
+CODE_SAMPLE
+)]);
+    }
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [Closure::class];
+    }
+    /**
+     * @param Closure $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if ($node->uses === []) {
+            return null;
+        }
+        $hasChanged = \false;
+        foreach ($node->uses as $key => $useVariable) {
+            $useVariableName = $this->getName($useVariable->var);
+            if (!is_string($useVariableName)) {
+                continue;
+            }
+            $isUseUsed = (bool) $this->betterNodeFinder->findVariableOfName($node->stmts, $useVariableName);
+            if ($isUseUsed) {
+                continue;
+            }
+            unset($node->uses[$key]);
+            $hasChanged = \true;
+        }
+        if ($hasChanged) {
+            // reset keys, to keep as expected
+            $node->uses = array_values($node->uses);
+            return $node;
+        }
+        return null;
+    }
+}

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '3b1717892dd2502a9ecdd67c8e498fe118ed687a';
+    public const PACKAGE_VERSION = '8d22cedbbd93a4945cf0fd97da07c486488b533a';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-10-05 15:33:37';
+    public const RELEASE_DATE = '2025-10-05 15:49:11';
     /**
      * @var int
      */

src/Config/Level/DeadCodeLevel.php

@@ -26,6 +26,7 @@
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnExprInConstructRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
 use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
+use Rector\DeadCode\Rector\Concat\RemoveUnusedClosureVariableUseRector;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
 use Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector;
 use Rector\DeadCode\Rector\Expression\SimplifyMirrorAssignRector;
@@ -110,6 +111,7 @@ final class DeadCodeLevel
         ReduceAlwaysFalseIfOrRector::class,
         RemoveUnusedPrivateClassConstantRector::class,
         RemoveUnusedPrivatePropertyRector::class,
+        RemoveUnusedClosureVariableUseRector::class,
         RemoveDuplicatedCaseInSwitchRector::class,
         RemoveDeadInstanceOfRector::class,
         RemoveDeadCatchRector::class,

vendor/composer/autoload_classmap.php

@@ -1376,6 +1376,7 @@
     'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnExprInConstructRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnExprInConstructRector.php',
     'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnTagRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php',
     'Rector\\DeadCode\\Rector\\Concat\\RemoveConcatAutocastRector' => $baseDir . '/rules/DeadCode/Rector/Concat/RemoveConcatAutocastRector.php',
+    'Rector\\DeadCode\\Rector\\Concat\\RemoveUnusedClosureVariableUseRector' => $baseDir . '/rules/DeadCode/Rector/Concat/RemoveUnusedClosureVariableUseRector.php',
     'Rector\\DeadCode\\Rector\\ConstFetch\\RemovePhpVersionIdCheckRector' => $baseDir . '/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php',
     'Rector\\DeadCode\\Rector\\Expression\\RemoveDeadStmtRector' => $baseDir . '/rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php',
     'Rector\\DeadCode\\Rector\\Expression\\SimplifyMirrorAssignRector' => $baseDir . '/rules/DeadCode/Rector/Expression/SimplifyMirrorAssignRector.php',

vendor/composer/autoload_static.php

@@ -1624,6 +1624,7 @@ class ComposerStaticInitaec8d909b4f5341922f1774ccd2ec774
         'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnExprInConstructRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnExprInConstructRector.php',
         'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUselessReturnTagRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector.php',
         'Rector\\DeadCode\\Rector\\Concat\\RemoveConcatAutocastRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Concat/RemoveConcatAutocastRector.php',
+        'Rector\\DeadCode\\Rector\\Concat\\RemoveUnusedClosureVariableUseRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Concat/RemoveUnusedClosureVariableUseRector.php',
         'Rector\\DeadCode\\Rector\\ConstFetch\\RemovePhpVersionIdCheckRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php',
         'Rector\\DeadCode\\Rector\\Expression\\RemoveDeadStmtRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php',
         'Rector\\DeadCode\\Rector\\Expression\\SimplifyMirrorAssignRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Expression/SimplifyMirrorAssignRector.php',