Fix JsonCallToExplicitJsonCallRector by skipping GET requests with data, headers, or options present (#211)

Author: GeniJaho

Diff for: src/Rector/MethodCall/JsonCallToExplicitJsonCallRector.php

@@ -65,22 +65,31 @@ private function updateCall(MethodCall $methodCall): ?MethodCall
             return null;
         }
 
-        $arg = $methodCall->getArgs()[0];
-        $argValue = $arg->value;
+        $methodCallArgs = $methodCall->getArgs();
 
-        if (! $argValue instanceof String_) {
+        if (count($methodCallArgs) < 2) {
+            return null;
+        }
+
+        $firstArg = $methodCallArgs[0]->value;
+
+        if (! $firstArg instanceof String_) {
             return null;
         }
 
         $supportedMethods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'];
 
-        if (in_array($argValue->value, $supportedMethods, true)) {
-            $methodCall->name = new Identifier(strtolower($argValue->value) . 'Json');
-            $methodCall->args = array_slice($methodCall->args, 1);
+        if (! in_array($firstArg->value, $supportedMethods, true)) {
+            return null;
+        }
 
-            return $methodCall;
+        if ($firstArg->value === 'GET' && count($methodCallArgs) > 2) {
+            return null;
         }
 
-        return null;
+        $methodCall->name = new Identifier(strtolower($firstArg->value) . 'Json');
+        $methodCall->args = array_slice($methodCall->args, 1);
+
+        return $methodCall;
     }
 }

Diff for: tests/Rector/MethodCall/JsonCallToExplicitJsonCallRector/Fixture/fixture_with_json_calls_to_skip.php.inc

@@ -18,31 +18,12 @@ class FixtureWithJsonCalls
     {
         $http->json('connect', '/');
     }
-}
-
-?>
----
-<?php
-
-namespace RectorLaravel\Tests\Rector\MethodCall\AssertStatusToAssertMethodRector\Fixture;
-
-class FixtureWithJsonCalls
-{
-    public function testHead(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
-    {
-        $http->json('head', '/');
-    }
-
-    public function testTrace(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
-    {
-        $http->json('trace', '/');
-    }
 
-    public function testConnect(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
+    public function testNotEnoughArgs(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
     {
-        $http->json('connect', '/');
+        $http->json('GET');
+        $http->json();
     }
 }
 
 ?>
-

Diff for: tests/Rector/MethodCall/JsonCallToExplicitJsonCallRector/Fixture/skip_invalid_get_json_calls.php.inc

@@ -0,0 +1,23 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\MethodCall\JsonCallToExplicitJsonCallRector\Fixture;
+
+class FixtureWithGetJsonCalls
+{
+    public function testGetWithAllParams(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
+    {
+        $http->json('GET', '/', ['data'], ['headers'], 1);
+    }
+
+    public function testGetWithoutOptions(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
+    {
+        $http->json('GET', '/', ['data'], ['headers']);
+    }
+
+    public function testGetWithoutHeaders(\Illuminate\Foundation\Testing\Concerns\MakesHttpRequests $http)
+    {
+        $http->json('GET', '/', ['data']);
+    }
+}
+
+?>