Handle multipart/form data

Author: jasonmccreary

app/Models/Request.php

@@ -43,17 +43,12 @@ public static function create(array $data): self
                 $request->data = $data['data'];
                 $request->jsonData = true;
             } else {
-                parse_str(implode('&', $data['data']), $request->data);
-                array_walk_recursive($request->data, function (&$value) {
-                    if (is_string($value)) {
-                        $value = self::convertDataType($value);
-                    }
-                });
+                $request->data = self::parseData($data['data']);
             }
         }
 
         if (!empty($data['fields'])) {
-            $request->data = $data['fields'];
+            $request->data = self::parseData($data['data']);
             $request->multipartFormData = true;
         }
 
@@ -94,4 +89,16 @@ private static function convertDataType(string $value)
     {
         return preg_match('/^[1-9]\d*$/', $value) ? intval($value) : $value;
     }
+
+    private static function parseData(array $data): array
+    {
+        parse_str(implode('&', $data), $data);
+        array_walk_recursive($data, function (&$value) {
+            if (is_string($value)) {
+                $value = self::convertDataType($value);
+            }
+        });
+
+        return $data;
+    }
 }

app/Support/HttpCall.php

@@ -22,13 +22,20 @@ private static function generateOptions(Request $request): string
         $options = [];
 
         if (!empty($request->data()) && $request->method() !== 'GET') {
-            $options[] = $request->isJsonData() ? 'withBody(\'' . $request->data()[0] . '\')'
-                : 'asForm()';
+            if ($request->isMultipartFormData()) {
+                $options[] = 'asMultipart()';
+            } elseif ($request->isJsonData()) {
+                $options[] = 'withBody(\'' . $request->data()[0] . '\')';
+            } else {
+                $options[] = 'asForm()';
+            }
         }
 
-        if ($request->headers()) {
-            // TODO: what about headers that have Http helper methods, for example: `acceptJson`
-            $options[] = 'withHeaders(' . self::prettyPrintArray($request->headers()) . ')';
+        // TODO: filter out headers that have Http helper methods, for example: `acceptJson`
+        $headers = $request->headers();
+
+        if ($headers) {
+            $options[] = 'withHeaders(' . self::prettyPrintArray($headers) . ')';
         }
 
         if (empty($options)) {

tests/Feature/Console/Commands/CurlCommandTest.php

@@ -25,8 +25,9 @@ public function curlCommandFixtures()
         return [
             'GET request' => ['basic-get'],
             'POST request' => ['basic-post'],
-            'POST request with multiple data' => ['post-with-multiple-data'],
+            'POST request with data' => ['post-with-data'],
             'POST request with JSON data' => ['post-json'],
+            'POST request with multipart/form-data' => ['post-with-form-data'],
             'GET request with headers' => ['with-headers'],
         ];
     }

tests/fixtures/post-with-multiple-data.in renamed to tests/fixtures/post-with-data.in

@@ -0,0 +1 @@
+curl -X POST -F 'foo=bar' -F 'rho[]=1' -F 'baz=qui&rho[]=2' https://example.com

tests/fixtures/post-with-multiple-data.out renamed to tests/fixtures/post-with-data.out

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