[Php70] Handle ArrayDimFetch on WrapVariableVariableNameInCurlyBraces…

…Rector (#6533)

* [Php70] Handle ArrayDimFetch on WrapVariableVariableNameInCurlyBracesRector

* check only on variable, ensure patch on target

rules-tests/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/skip_wrapped_array_dim_fetch_variable_variables.php.inc

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+final class SkipWrappedArrayDimFetchVariableVariables
+{
+    public function run()
+    {
+        $baz = 'bat';
+        $foo = array('bar' => 'baz');
+
+        echo ${$foo['bar']};
+    }
+}

rules-tests/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector/Fixture/with_array_dim_fetch.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+final class WithArrayDimFetch
+{
+    public function run()
+    {
+        $baz = 'bat';
+        $foo = array('bar' => 'baz');
+
+        echo $$foo['bar'];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php70\Rector\Variable\WrapVariableVariableNameInCurlyBracesRector\Fixture;
+
+final class WithArrayDimFetch
+{
+    public function run()
+    {
+        $baz = 'bat';
+        $foo = array('bar' => 'baz');
+
+        echo ${$foo['bar']};
+    }
+}
+
+?>

rules/Php70/Rector/Variable/WrapVariableVariableNameInCurlyBracesRector.php

@@ -5,6 +5,7 @@
 namespace Rector\Php70\Rector\Variable;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\Variable;
 use Rector\Rector\AbstractRector;
@@ -52,14 +53,29 @@ function run($foo)
      */
     public function getNodeTypes(): array
     {
-        return [Variable::class];
+        return [ArrayDimFetch::class, Variable::class];
     }
 
     /**
-     * @param Variable $node
+     * @param ArrayDimFetch|Variable $node
      */
     public function refactor(Node $node): ?Node
     {
+        if ($node instanceof ArrayDimFetch) {
+            if (! $node->var instanceof Variable) {
+                return null;
+            }
+
+            if (is_string($node->var->name)) {
+                return null;
+            }
+
+            return new Variable(new ArrayDimFetch(
+                $node->var->name,
+                $node->dim
+            ));
+        }
+
         $nodeName = $node->name;
 
         if (! $nodeName instanceof PropertyFetch && ! $nodeName instanceof Variable) {