fix: bugs in ServerVariableToRequestFacadeRector (#392)

Author: calebdw

src/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector.php

@@ -4,8 +4,14 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\Isset_;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Scalar\InterpolatedString;
+use PhpParser\Node\Stmt\Unset_;
+use PhpParser\NodeVisitor;
 use RectorLaravel\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -32,19 +38,32 @@ public function getRuleDefinition(): RuleDefinition
 
     public function getNodeTypes(): array
     {
-        return [ArrayDimFetch::class];
+        return [Assign::class, Isset_::class, Unset_::class, InterpolatedString::class, ArrayDimFetch::class];
     }
 
     /**
-     * @param  ArrayDimFetch  $node
+     * @param  ArrayDimFetch|Assign|Isset_|Unset_|InterpolatedString  $node
+     * @return StaticCall|NodeVisitor::DONT_TRAVERSE_CHILDREN|null
      */
-    public function refactor(Node $node): ?StaticCall
+    public function refactor(Node $node): StaticCall|int|null
     {
+        if (! $node instanceof ArrayDimFetch) {
+            if (! $node instanceof Assign) {
+                return NodeVisitor::DONT_TRAVERSE_CHILDREN;
+            }
+
+            if (! $node->var instanceof ArrayDimFetch || ! $this->isName($node->var->var, '_SERVER')) {
+                return null;
+            }
+
+            return NodeVisitor::DONT_TRAVERSE_CHILDREN;
+        }
+
         if (! $this->isName($node->var, '_SERVER')) {
             return null;
         }
 
-        if ($node->dim === null) {
+        if (! $node->dim instanceof Expr) {
             return null;
         }
 

tests/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector/Fixture/fixture.php.inc

@@ -4,6 +4,8 @@ namespace RectorLaravel\Tests\Rector\ArrayDimFetch\ServerVariableToRequestFacade
 
 $_SERVER['VARIABLE'];
 
+$variable = $_SERVER['VARIABLE'];
+
 ?>
 -----
 <?php
@@ -12,4 +14,6 @@ namespace RectorLaravel\Tests\Rector\ArrayDimFetch\ServerVariableToRequestFacade
 
 \Illuminate\Support\Facades\Request::server('VARIABLE');
 
+$variable = \Illuminate\Support\Facades\Request::server('VARIABLE');
+
 ?>

tests/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector/Fixture/skip_assign.php.inc

@@ -0,0 +1,5 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\ArrayDimFetch\ServerVariableToRequestFacadeRector\Fixture;
+
+$_SERVER['APP_ENV'] = 'production';

tests/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector/Fixture/skip_interpolated_string.php.inc

@@ -0,0 +1,5 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\ArrayDimFetch\ServerVariableToRequestFacadeRector\Fixture;
+
+"string{$_SERVER['APP_ENV']}";

tests/Rector/ArrayDimFetch/ServerVariableToRequestFacadeRector/Fixture/skip_isset_and_unset.php.inc

@@ -0,0 +1,6 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\ArrayDimFetch\ServerVariableToRequestFacadeRector\Fixture;
+
+isset($_SERVER['APP_ENV']);
+unset($_SERVER['APP_ENV']);