Updated Rector to commit 45c91eb8ba874853d5717d7267c85776b2502f9d

45c91eb8ba [DeadCode] Add RemoveJustVariableAssignRector (#2618)

config/set/early-return.php

@@ -4,6 +4,7 @@ declare (strict_types=1);
 namespace RectorPrefix202207;
 
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\StmtsAwareInterface\RemoveJustVariableAssignRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\Foreach_\ReturnAfterToEarlyOnBreakRector;
 use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
@@ -17,16 +18,5 @@ use Rector\EarlyReturn\Rector\Return_\ReturnBinaryAndToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
 return static function (RectorConfig $rectorConfig) : void {
-    $rectorConfig->rule(ChangeNestedForeachIfsToEarlyContinueRector::class);
-    $rectorConfig->rule(ChangeAndIfToEarlyReturnRector::class);
-    $rectorConfig->rule(ChangeIfElseValueAssignToEarlyReturnRector::class);
-    $rectorConfig->rule(ChangeNestedIfsToEarlyReturnRector::class);
-    $rectorConfig->rule(RemoveAlwaysElseRector::class);
-    $rectorConfig->rule(ReturnBinaryAndToEarlyReturnRector::class);
-    $rectorConfig->rule(ChangeOrIfReturnToEarlyReturnRector::class);
-    $rectorConfig->rule(ChangeOrIfContinueToMultiContinueRector::class);
-    $rectorConfig->rule(ReturnAfterToEarlyOnBreakRector::class);
-    $rectorConfig->rule(PreparedValueToEarlyReturnRector::class);
-    $rectorConfig->rule(ReturnBinaryOrToEarlyReturnRector::class);
-    $rectorConfig->rule(ReturnEarlyIfVariableRector::class);
+    $rectorConfig->rules([ChangeNestedForeachIfsToEarlyContinueRector::class, ChangeAndIfToEarlyReturnRector::class, ChangeIfElseValueAssignToEarlyReturnRector::class, ChangeNestedIfsToEarlyReturnRector::class, RemoveAlwaysElseRector::class, ReturnBinaryAndToEarlyReturnRector::class, ChangeOrIfReturnToEarlyReturnRector::class, ChangeOrIfContinueToMultiContinueRector::class, ReturnAfterToEarlyOnBreakRector::class, PreparedValueToEarlyReturnRector::class, ReturnBinaryOrToEarlyReturnRector::class, ReturnEarlyIfVariableRector::class]);
 };

rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchRector.php

@@ -138,7 +138,7 @@ CODE_SAMPLE
             $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
             if ($parentNode instanceof ClosureUse) {
                 // remove closure use which will be replaced by a property fetch
-                $this->nodesToRemoveCollector->addNodeToRemove($parentNode);
+                $this->removeNode($parentNode);
                 return null;
             }
             return $propertyFetch;

rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustVariableAssignRector.php

@@ -0,0 +1,167 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\DeadCode\Rector\StmtsAwareInterface;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\BinaryOp\Concat;
+use PhpParser\Node\Expr\Ternary;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\Expression;
+use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
+use Rector\Core\NodeAnalyzer\VariableAnalyzer;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+/**
+ * @see \Rector\Tests\DeadCode\Rector\StmtsAwareInterface\RemoveJustVariableAssignRector\RemoveJustVariableAssignRectorTest
+ */
+final class RemoveJustVariableAssignRector extends AbstractRector
+{
+    /**
+     * @readonly
+     * @var \Rector\Core\NodeAnalyzer\VariableAnalyzer
+     */
+    private $variableAnalyzer;
+    public function __construct(VariableAnalyzer $variableAnalyzer)
+    {
+        $this->variableAnalyzer = $variableAnalyzer;
+    }
+    public function getRuleDefinition() : RuleDefinition
+    {
+        return new RuleDefinition('Remove variable just to assign value or return value', [new CodeSample(<<<'CODE_SAMPLE'
+final class SomeClass
+{
+    public function run()
+    {
+        $result = 100;
+
+        $this->temporaryValue = $result;
+    }
+}
+CODE_SAMPLE
+, <<<'CODE_SAMPLE'
+final class SomeClass
+{
+    public function run()
+    {
+        $this->temporaryValue = 100;
+    }
+}
+CODE_SAMPLE
+)]);
+    }
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes() : array
+    {
+        return [StmtsAwareInterface::class];
+    }
+    /**
+     * @param StmtsAwareInterface $node
+     */
+    public function refactor(Node $node) : ?Node
+    {
+        $stmts = (array) $node->stmts;
+        if ($stmts === []) {
+            return null;
+        }
+        $originalStmts = $stmts;
+        foreach ($stmts as $key => $stmt) {
+            $nextStmt = $stmts[$key + 1] ?? null;
+            if (!$nextStmt instanceof Stmt) {
+                continue;
+            }
+            $currentAssign = $this->matchExpressionAssign($stmt);
+            if (!$currentAssign instanceof Assign) {
+                continue;
+            }
+            $nextAssign = $this->matchExpressionAssign($nextStmt);
+            if (!$nextAssign instanceof Assign) {
+                continue;
+            }
+            if ($this->areTooComplexAssignsToShorten($currentAssign, $nextAssign)) {
+                continue;
+            }
+            if (!$this->areTwoVariablesCrossAssign($currentAssign, $nextAssign, $node)) {
+                continue;
+            }
+            // ...
+            $currentAssign->var = $nextAssign->var;
+            unset($stmts[$key + 1]);
+        }
+        if ($originalStmts === $stmts) {
+            return null;
+        }
+        $node->stmts = $stmts;
+        return $node;
+    }
+    /**
+     * This detects if two variables are cross assigned:
+     *
+     * $<some> = 1000;
+     * $this->value = $<some>;
+     *
+     * + not used $<some> bellow, so removal will not break it
+     */
+    private function areTwoVariablesCrossAssign(Assign $currentAssign, Assign $nextAssign, StmtsAwareInterface $stmtsAware) : bool
+    {
+        // is just re-assign to variable
+        if (!$currentAssign->var instanceof Variable) {
+            return \false;
+        }
+        if (!$nextAssign->expr instanceof Variable) {
+            return \false;
+        }
+        if (!$this->nodeComparator->areNodesEqual($currentAssign->var, $nextAssign->expr)) {
+            return \false;
+        }
+        if ($this->variableAnalyzer->isUsedByReference($currentAssign->var)) {
+            return \false;
+        }
+        if ($this->variableAnalyzer->isUsedByReference($nextAssign->expr)) {
+            return \false;
+        }
+        $currentVariable = $currentAssign->var;
+        $nextVariable = $nextAssign->expr;
+        // is variable used later?
+        $nextUsedVariable = $this->betterNodeFinder->findFirst($stmtsAware, function (Node $node) use($currentVariable, $nextVariable) : bool {
+            if (\in_array($node, [$currentVariable, $nextVariable], \true)) {
+                return \false;
+            }
+            if (!$node instanceof Variable) {
+                return \false;
+            }
+            // is variable name?
+            return $this->nodeNameResolver->areNamesEqual($node, $currentVariable);
+        });
+        return !$nextUsedVariable instanceof Variable;
+    }
+    /**
+     * Shortening should not make code less readable.
+     */
+    private function areTooComplexAssignsToShorten(Assign $currentAssign, Assign $nextAssign) : bool
+    {
+        if ($currentAssign->expr instanceof Ternary) {
+            return \true;
+        }
+        if ($currentAssign->expr instanceof Concat) {
+            return \true;
+        }
+        return $nextAssign->var instanceof ArrayDimFetch;
+    }
+    private function matchExpressionAssign(Stmt $stmt) : ?Assign
+    {
+        if (!$stmt instanceof Expression) {
+            return null;
+        }
+        if (!$stmt->expr instanceof Assign) {
+            return null;
+        }
+        return $stmt->expr;
+    }
+}

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'b45066c505a7bd3569819cee71706ebf0f763b6e';
+    public const PACKAGE_VERSION = '45c91eb8ba874853d5717d7267c85776b2502f9d';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-07-03 14:09:32';
+    public const RELEASE_DATE = '2022-07-03 14:37:43';
     /**
      * @var int
      */

src/Rector/AbstractRector.php

@@ -101,10 +101,6 @@ CODE_SAMPLE;
      * @var \Rector\Core\PhpParser\Comparing\NodeComparator
      */
     protected $nodeComparator;
-    /**
-     * @var \Rector\PostRector\Collector\NodesToRemoveCollector
-     */
-    protected $nodesToRemoveCollector;
     /**
      * @var \Rector\Core\ValueObject\Application\File
      */
@@ -125,6 +121,10 @@ CODE_SAMPLE;
      * @var \Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory
      */
     protected $scopeFactory;
+    /**
+     * @var \Rector\PostRector\Collector\NodesToRemoveCollector
+     */
+    private $nodesToRemoveCollector;
     /**
      * @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
      */

vendor/autoload.php

@@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit5efc915aaba0ea1bf59e274752d51ea9::getLoader();
+return ComposerAutoloaderInitdf03a708997154c9a8b37699a741603b::getLoader();

vendor/composer/autoload_classmap.php

@@ -1735,6 +1735,7 @@ return array(
     'Rector\\DeadCode\\Rector\\Stmt\\RemoveUnreachableStatementRector' => $baseDir . '/rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php',
     'Rector\\DeadCode\\Rector\\StmtsAwareInterface\\RemoveJustPropertyFetchForAssignRector' => $baseDir . '/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchForAssignRector.php',
     'Rector\\DeadCode\\Rector\\StmtsAwareInterface\\RemoveJustPropertyFetchRector' => $baseDir . '/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchRector.php',
+    'Rector\\DeadCode\\Rector\\StmtsAwareInterface\\RemoveJustVariableAssignRector' => $baseDir . '/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustVariableAssignRector.php',
     'Rector\\DeadCode\\Rector\\Switch_\\RemoveDuplicatedCaseInSwitchRector' => $baseDir . '/rules/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector.php',
     'Rector\\DeadCode\\Rector\\Ternary\\TernaryToBooleanOrFalseToBooleanAndRector' => $baseDir . '/rules/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector.php',
     'Rector\\DeadCode\\Rector\\TryCatch\\RemoveDeadTryCatchRector' => $baseDir . '/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit5efc915aaba0ea1bf59e274752d51ea9
+class ComposerAutoloaderInitdf03a708997154c9a8b37699a741603b
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInit5efc915aaba0ea1bf59e274752d51ea9
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit5efc915aaba0ea1bf59e274752d51ea9', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitdf03a708997154c9a8b37699a741603b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit5efc915aaba0ea1bf59e274752d51ea9', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitdf03a708997154c9a8b37699a741603b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitdf03a708997154c9a8b37699a741603b::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitdf03a708997154c9a8b37699a741603b::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire5efc915aaba0ea1bf59e274752d51ea9($fileIdentifier, $file);
+            composerRequiredf03a708997154c9a8b37699a741603b($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInit5efc915aaba0ea1bf59e274752d51ea9
  * @param string $file
  * @return void
  */
-function composerRequire5efc915aaba0ea1bf59e274752d51ea9($fileIdentifier, $file)
+function composerRequiredf03a708997154c9a8b37699a741603b($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9
+class ComposerStaticInitdf03a708997154c9a8b37699a741603b
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -2042,6 +2042,7 @@ class ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9
         'Rector\\DeadCode\\Rector\\Stmt\\RemoveUnreachableStatementRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php',
         'Rector\\DeadCode\\Rector\\StmtsAwareInterface\\RemoveJustPropertyFetchForAssignRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchForAssignRector.php',
         'Rector\\DeadCode\\Rector\\StmtsAwareInterface\\RemoveJustPropertyFetchRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchRector.php',
+        'Rector\\DeadCode\\Rector\\StmtsAwareInterface\\RemoveJustVariableAssignRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustVariableAssignRector.php',
         'Rector\\DeadCode\\Rector\\Switch_\\RemoveDuplicatedCaseInSwitchRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector.php',
         'Rector\\DeadCode\\Rector\\Ternary\\TernaryToBooleanOrFalseToBooleanAndRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Ternary/TernaryToBooleanOrFalseToBooleanAndRector.php',
         'Rector\\DeadCode\\Rector\\TryCatch\\RemoveDeadTryCatchRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php',
@@ -3415,9 +3416,9 @@ class ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit5efc915aaba0ea1bf59e274752d51ea9::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitdf03a708997154c9a8b37699a741603b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitdf03a708997154c9a8b37699a741603b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitdf03a708997154c9a8b37699a741603b::$classMap;
 
         }, null, ClassLoader::class);
     }