Handle automatic POST requests

Author: jasonmccreary

app/Models/Request.php

@@ -25,7 +25,7 @@ class Request
     private function __construct($url, $method)
     {
         $this->url = $url;
-        $this->method = strtoupper($method);
+        $this->method = Str::upper($method);
     }
 
     public static function create(array $data): self
@@ -56,6 +56,10 @@ public static function create(array $data): self
             $request->multipartFormData = true;
         }
 
+        if (!empty($request->data) && $request->method === 'GET') {
+            $request->method = 'POST';
+        }
+
         if ($data['user']) {
             [$request->username, $request->password] = explode(':', $data['user'], 2);
         }

app/Support/HttpCall.php

@@ -39,11 +39,17 @@ private static function collapseHelpers(array $headers, array &$options): array
             ->all();
     }
 
-    private static function filterHeaders(array $headers): array
+    private static function filterHeaders(Request $request): array
     {
-        return collect($headers)
-            ->reject(function ($value, $header) {
-                // has header to match multipart or ascii form data
+        return collect($request->headers())
+            ->reject(function ($value, $header) use ($request) {
+                if ($request->data() && $header === 'Content-Type') {
+                    if ($request->isMultipartFormData() && Str::lower($value) === 'multipart/form-data') {
+                        return true;
+                    } elseif (Str::lower($value) === 'application/x-www-form-urlencoded') {
+                        return true;
+                    }
+                }
 
                 if ($header === 'Content-Type' && Str::lower($value) === 'application/json') {
                     return true;
@@ -68,7 +74,7 @@ private static function generateOptions(Request $request): string
             }
         }
 
-        $headers = self::filterHeaders($request->headers());
+        $headers = self::filterHeaders($request);
         $headers = self::collapseHelpers($headers, $options);
 
         if ($request->hasUsernameOrPassword()) {

tests/Feature/Console/Commands/CurlCommandTest.php

@@ -28,6 +28,10 @@ public function curlCommandFixtures()
             'POST request with data' => ['post-with-data'],
             'POST request with JSON data' => ['post-json'],
             'POST request with multipart/form-data' => ['post-with-form-data'],
+            'Request with data defaults to POST' => ['request-with-data'],
+            'Request with form fields defaults to POST' => ['request-with-form-data'],
+            'Request with collapsable headers' => ['with-collapsable-headers'],
+            'PUT request with data' => ['put-with-data'],
             'GET request with headers' => ['with-headers'],
             'Mailgun example request' => ['mailgun-example'],
             'Digital Ocean example request' => ['digital-ocean-example'],

tests/fixtures/accept-json-response.in

@@ -1 +1 @@
-curl -H 'Accept: application/json' -d 'format=json' https://example.com
+curl -H 'Accept: application/json' https://example.com

tests/fixtures/accept-json-response.out

@@ -1,4 +1,2 @@
 Http::acceptJson()
-    ->get('https://example.com' [
-        'format' => 'json',
-    ]);
+    ->get('https://example.com');

tests/fixtures/put-with-data.in

@@ -0,0 +1 @@
+curl -X PUT -d 'foo=bar&baz=qui' https://example.com

tests/fixtures/put-with-data.out

@@ -0,0 +1,5 @@
+Http::asForm()
+    ->put('https://example.com', [
+        'foo' => 'bar',
+        'baz' => 'qui',
+    ]);

tests/fixtures/request-with-data.in

@@ -0,0 +1 @@
+curl -H 'Content-Type: application/x-www-form-urlencoded' -d 'foo=bar&baz=qui' https://example.com

tests/fixtures/request-with-data.out

@@ -0,0 +1,5 @@
+Http::asForm()
+    ->post('https://example.com', [
+        'foo' => 'bar',
+        'baz' => 'qui',
+    ]);

tests/fixtures/request-with-form-data.in

@@ -0,0 +1 @@
+curl -H 'Content-Type: multipart/form-data' -F 'foo=bar' https://example.com