Refactor SymplifyUselessVariableRector to avoid using PREVIOUS_NODE, …

…use current scope instead (#2045)
rectorphp · Apr 10, 2022 · a2ee46d · a2ee46d
1 parent b9a912b
commit a2ee46d
Show file tree

Hide file tree

Showing 23 changed files with 248 additions and 274 deletions.
diff --git a/build/target-repository/docs/rector_rules_overview.md b/build/target-repository/docs/rector_rules_overview.md
@@ -1496,7 +1496,7 @@ Simplify tautology ternary to value
 
 Removes useless variable assigns
 
-- class: [`Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector`](../rules/CodeQuality/Rector/Return_/SimplifyUselessVariableRector.php)
+- class: [`Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector`](../rules/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector.php)
 
 ```diff
  function () {

diff --git a/config/set/code-quality.php b/config/set/code-quality.php
@@ -42,6 +42,7 @@
 use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
 use Rector\CodeQuality\Rector\FuncCall\UnwrapSprintfOneArgumentRector;
 use Rector\CodeQuality\Rector\FunctionLike\RemoveAlwaysTrueConditionSetInConstructorRector;
+use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Identical\BooleanNotIdenticalToNotIdenticalRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\CodeQuality\Rector\Identical\GetClassToInstanceOfRector;
@@ -65,7 +66,6 @@
 use Rector\CodeQuality\Rector\New_\NewStaticToNewSelfRector;
 use Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector;
 use Rector\CodeQuality\Rector\PropertyFetch\ExplicitMethodCallOverMagicGetSetRector;
-use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Switch_\SingularSwitchToIfRector;
 use Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector;
 use Rector\CodeQuality\Rector\Ternary\SimplifyDuplicatedTernaryRector;

diff --git a/config/set/dead-code.php b/config/set/dead-code.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
+use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector;
 use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;

diff --git a/phpstan.neon b/phpstan.neon
@@ -570,3 +570,6 @@ parameters:
         -
             message: '#Call to static method Webmozart\\Assert\\Assert\:\:allString\(\) with array<string> will always evaluate to true#'
             path: packages/Config/RectorConfig.php
+
+        # foreaching all stmts
+        - '#Cognitive complexity for "Rector\\CodeQuality\\Rector\\FunctionLike\\SimplifyUselessVariableRector\:\:refactor\(\)" is 1\d+, keep it under 10#'
diff --git a/.../CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/Fixture/assign_ops.php.inc b/.../CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/Fixture/assign_ops.php.inc
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
+
+function () {
+    $b += 1;
+    return $b;
+};
+
+function () {
+    $e /= 1;
+    return $e;
+};
+
+function () {
+    $f **= 1;
+    return $f;
+};
+
+function () {
+    $m .= 1;
+    return $m;
+};
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
+
+function () {
+    return $b + 1;
+};
+
+function () {
+    return $e / 1;
+};
+
+function () {
+    return $f ** 1;
+};
+
+function () {
+    return $m . 1;
+};
+
+?>
diff --git a/...ture/closure_use_not_by_reference.php.inc → ...ture/closure_use_not_by_reference.php.inc b/...ture/closure_use_not_by_reference.php.inc → ...ture/closure_use_not_by_reference.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function ClosureUseNOTByReference()
 {
@@ -21,7 +21,7 @@ function ClosureUseNOTByReference()
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function ClosureUseNOTByReference()
 {

diff --git a/...sts/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/Fixture/fixture.php.inc b/...sts/CodeQuality/Rector/FunctionLike/SimplifyUselessVariableRector/Fixture/fixture.php.inc
@@ -0,0 +1,88 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
+
+function () {
+    $a = true;
+    return $a;
+};
+
+function sameVariableInDifferentScope()
+{
+    $n = array_map(function () {
+        return $n + 1;
+    }, []);
+
+    return $n;
+}
+
+function moreVariableOneWithoutAssigment() {
+    $o++;
+    $o = 10;
+
+    return $o;
+}
+
+function assigmentAsFunctionParametr() {
+    doSomething($p = 0);
+    return $p;
+}
+
+function assigmentAfterAssignment() {
+    doSomething($qq = $q = 0);
+    return $q;
+}
+
+function () {
+    $a = 1;
+    $b = 1;
+    $c = [
+        $b-- => $a++,
+        --$b => ++$a,
+    ];
+    return $c;
+};
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
+
+function () {
+    return true;
+};
+
+function sameVariableInDifferentScope()
+{
+    return array_map(function () {
+        return $n + 1;
+    }, []);
+}
+
+function moreVariableOneWithoutAssigment() {
+    $o++;
+
+    return 10;
+}
+
+function assigmentAsFunctionParametr() {
+    doSomething($p = 0);
+    return $p;
+}
+
+function assigmentAfterAssignment() {
+    doSomething($qq = $q = 0);
+    return $q;
+}
+
+function () {
+    $a = 1;
+    $b = 1;
+    return [
+        $b-- => $a++,
+        --$b => ++$a,
+    ];
+};
+
+?>
diff --git a/...ssVariableRector/Fixture/fixture3.php.inc → ...ssVariableRector/Fixture/fixture3.php.inc b/...ssVariableRector/Fixture/fixture3.php.inc → ...ssVariableRector/Fixture/fixture3.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function simplifyUselessVariable3()
 {
@@ -24,7 +24,7 @@ function simplifyUselessVariable3()
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function simplifyUselessVariable3()
 {

diff --git a/...iableRector/Fixture/in_a_function.php.inc → ...iableRector/Fixture/in_a_function.php.inc b/...iableRector/Fixture/in_a_function.php.inc → ...iableRector/Fixture/in_a_function.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function simplifyUselessVariable4()
 {
@@ -17,7 +17,7 @@ function simplifyUselessVariable4()
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function simplifyUselessVariable4()
 {

diff --git a/...riableRector/Fixture/keep_var_doc.php.inc → ...riableRector/Fixture/keep_var_doc.php.inc b/...riableRector/Fixture/keep_var_doc.php.inc → ...riableRector/Fixture/keep_var_doc.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 class KeepVarDoc
 {

diff --git a/...ariableRector/Fixture/keep_visual.php.inc → ...ariableRector/Fixture/keep_visual.php.inc b/...ariableRector/Fixture/keep_visual.php.inc → ...ariableRector/Fixture/keep_visual.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 // covers https://github.com/Sylius/Sylius/pull/9902/files#r231437165
 function simplifyUselessVariable5()

diff --git a/...ure/skip_closure_use_by_reference.php.inc → ...ure/skip_closure_use_by_reference.php.inc b/...ure/skip_closure_use_by_reference.php.inc → ...ure/skip_closure_use_by_reference.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 function SkipClosureUseByReference()
 {
@@ -15,4 +15,4 @@ function SkipClosureUseByReference()
     }
 
     return false;
-}
+}
diff --git a/...iableRector/Fixture/skip_fixture2.php.inc → ...iableRector/Fixture/skip_fixture2.php.inc b/...iableRector/Fixture/skip_fixture2.php.inc → ...iableRector/Fixture/skip_fixture2.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 class SkipFixture2
 {

diff --git a/...ctor/Fixture/skip_global_variable.php.inc → ...ctor/Fixture/skip_global_variable.php.inc b/...ctor/Fixture/skip_global_variable.php.inc → ...ctor/Fixture/skip_global_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 $conn = new \stdClass;
 

diff --git a/...Rector/Fixture/skip_return_by_ref.php.inc → ...Rector/Fixture/skip_return_by_ref.php.inc b/...Rector/Fixture/skip_return_by_ref.php.inc → ...Rector/Fixture/skip_return_by_ref.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 class Foobar {
     function & test()

diff --git a/...ctor/Fixture/skip_static_variable.php.inc → ...ctor/Fixture/skip_static_variable.php.inc b/...ctor/Fixture/skip_static_variable.php.inc → ...ctor/Fixture/skip_static_variable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 class SkipStaticVariable
 {

diff --git a/...ble_used_with_date_time_immutable.php.inc → ...ble_used_with_date_time_immutable.php.inc b/...ble_used_with_date_time_immutable.php.inc → ...ble_used_with_date_time_immutable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 use DateTimeImmutable;
 

diff --git a/...l_class_name_with_anonymous_class.php.inc → ...l_class_name_with_anonymous_class.php.inc b/...l_class_name_with_anonymous_class.php.inc → ...l_class_name_with_anonymous_class.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 use Exception;
 
@@ -24,7 +24,7 @@ final class SpecialClassNameWithAnonymousClass
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector\Fixture;
 
 use Exception;
 

diff --git a/...tor/SimplifyUselessVariableRectorTest.php → ...tor/SimplifyUselessVariableRectorTest.php b/...tor/SimplifyUselessVariableRectorTest.php → ...tor/SimplifyUselessVariableRectorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
+namespace Rector\Tests\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;

diff --git a/...VariableRector/config/configured_rule.php → ...VariableRector/config/configured_rule.php b/...VariableRector/config/configured_rule.php → ...VariableRector/config/configured_rule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
+use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {