Move existing Rector from the coding-style set to the php70 set

config/set/coding-style.php

@@ -31,7 +31,6 @@ use Rector\CodingStyle\Rector\Ternary\TernaryConditionVariableAssignmentRector;
 use Rector\CodingStyle\Rector\Use_\RemoveUnusedAliasRector;
 use Rector\CodingStyle\Rector\Use_\SplitGroupedUseImportsRector;
 use Rector\CodingStyle\Rector\Variable\UnderscoreToPascalCaseVariableNameRector;
-use Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -100,7 +99,5 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 
     $services->set(UnderscoreToPascalCaseVariableNameRector::class);
 
-    $services->set(WrapVariableVariableNameInCurlyBracesRector::class);
-
     $services->set(RemoveDoubleUnderscoreInMethodNameRector::class);
 };

config/set/php70.php

@@ -20,6 +20,7 @@ use Rector\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector;
 use Rector\Php70\Rector\Switch_\ReduceMultipleDefaultSwitchRector;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
 use Rector\Php70\Rector\Ternary\TernaryToSpaceshipRector;
+use Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -52,6 +53,8 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 
     $services->set(TernaryToSpaceshipRector::class);
 
+    $services->set(WrapVariableVariableNameInCurlyBracesRector::class);
+
     $services->set(IfToSpaceshipRector::class);
 
     $services->set(StaticCallOnNonStaticToInstanceCallRector::class);

docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# All 526 Rectors Overview
+# All 527 Rectors Overview
 
 - [Projects](#projects)
 - [General](#general)
@@ -11,7 +11,7 @@
 - [CakePHP](#cakephp) (6)
 - [Celebrity](#celebrity) (3)
 - [CodeQuality](#codequality) (54)
-- [CodingStyle](#codingstyle) (36)
+- [CodingStyle](#codingstyle) (35)
 - [DeadCode](#deadcode) (40)
 - [Decomplex](#decomplex) (1)
 - [Decouple](#decouple) (1)
@@ -49,7 +49,7 @@
 - [Php54](#php54) (2)
 - [Php55](#php55) (2)
 - [Php56](#php56) (2)
-- [Php70](#php70) (18)
+- [Php70](#php70) (19)
 - [Php71](#php71) (9)
 - [Php72](#php72) (11)
 - [Php73](#php73) (10)
@@ -2332,25 +2332,6 @@ Use ++ increment instead of `$var += 1`
 
 <br><br>
 
-### `WrapVariableVariableNameInCurlyBracesRector`
-
-- class: [`Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector`](/../master/rules/coding-style/src/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php)
-- [test fixtures](/../master/rules/coding-style/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture)
-
-Ensure variable variables are wrapped in curly braces
-
-```diff
-function run($foo)
-{
--    // Valid in PHP 5 only
--    global $$foo->bar;
-+    // Valid in PHP 5 and 7
-+    global ${$foo->bar};
-}
-```
-
-<br><br>
-
 ### `VersionCompareFuncCallToConstantRector`
 
 - class: [`Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector`](/../master/rules/coding-style/src/Rector/FuncCall/VersionCompareFuncCallToConstantRector.php)
@@ -8026,6 +8007,25 @@ Changes `$this->call()` to static method to static call
 
 <br><br>
 
+### `WrapVariableVariableNameInCurlyBracesRector`
+
+- class: [`Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector`](/../master/rules/php70/src/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture)
+
+Ensure variable variables are wrapped in curly braces
+
+```diff
+function run($foo)
+{
+-    // Valid in PHP 5 only
+-    global $$foo->bar;
++    // Valid in PHP 5 and 7
++    global ${$foo->bar};
+}
+```
+
+<br><br>
+
 ## Php71
 
 ### `AssignArrayToStringRector`

rules/coding-style/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_global_variable_variables_with_braces.php.inc

@@ -1,8 +0,0 @@
-<?php
-
-namespace Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
-
-function skip_global_variable_variables_with_braces($foo)
-{
-    global ${$foo->bar};
-}

rules/coding-style/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_property_fetch_variable.php.inc

@@ -1,8 +0,0 @@
-<?php
-
-namespace Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
-
-function skip_property_fetch_variable($foo)
-{
-    return $foo->bar;
-}

rules/coding-style/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_variable.php.inc

@@ -1,8 +0,0 @@
-<?php
-
-namespace Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
-
-function skip_variable($foo)
-{
-    return $foo;
-}

rules/coding-style/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_variable_variables_with_braces.php.inc

@@ -1,8 +0,0 @@
-<?php
-
-namespace Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
-
-function skip_variable_variables_with_braces($value)
-{
-    ${$value} = true;
-}

rules/coding-style/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/variable_variables.php.inc

@@ -1,21 +0,0 @@
-<?php
-
-namespace Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
-
-function variable_variables($value)
-{
-    $$value = true;
-}
-
-?>
------
-<?php
-
-namespace Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
-
-function variable_variables($value)
-{
-    ${$value} = true;
-}
-
-?>

rules/php70/src/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\CodingStyle\Rector\Variable;
+namespace Rector\Php70\Rector\Variable;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -12,7 +12,7 @@ use Rector\Core\RectorDefinition\CodeSample;
 use Rector\Core\RectorDefinition\RectorDefinition;
 
 /**
- * @see \Rector\CodingStyle\Tests\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\WrapVariableVariableNameInCurlyBracesRectorTest
+ * @see \Rector\Php70\Tests\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\WrapVariableVariableNameInCurlyBracesRectorTest
  * @see https://www.php.net/manual/en/language.variables.variable.php
  */
 final class WrapVariableVariableNameInCurlyBracesRector extends AbstractRector

rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_global_variable_variables_with_braces.php.inc

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+function skip_global_variable_variables_with_braces($foo)
+{
+    global ${$foo->bar};
+}

rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_property_fetch_variable.php.inc

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+function skip_property_fetch_variable($foo)
+{
+    return $foo->bar;
+}

rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_variable.php.inc

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+function skip_variable($foo)
+{
+    return $foo;
+}

rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_variable_variables_with_braces.php.inc

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+function skip_variable_variables_with_braces($value)
+{
+    ${$value} = true;
+}

rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/variable_variables.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+function variable_variables($value)
+{
+    $$value = true;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+function variable_variables($value)
+{
+    ${$value} = true;
+}
+
+?>

rules/php70/tests/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/WrapVariableVariableNameInCurlyBracesRectorTest.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Rector\CodingStyle\Tests\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
+namespace Rector\Php70\Tests\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
 
 use Iterator;
-use Rector\CodingStyle\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
 use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
 final class WrapVariableVariableNameInCurlyBracesRectorTest extends AbstractRectorTestCase