Support -G and --data-urlencode

Author: jasonmccreary

src/Console/Commands/CurlCommand.php

@@ -7,7 +7,7 @@
 
 class CurlCommand extends Command
 {
-    protected $signature = 'shift:curl {--X|request=GET} {--H|header=*} {--d|data=*} {--F|form=*} {--digest} {--basic} {--connect-timeout=} {--max-timeout=} {--retry=} {--s|silent} {--u|user=} {url}';
+    protected $signature = 'shift:curl {--X|request=} {--G|get} {--H|header=*} {--d|data=*} {--data-urlencode=*} {--F|form=*} {--digest} {--basic} {--connect-timeout=} {--max-timeout=} {--retry=} {--s|silent} {--u|user=} {url}';
 
     protected $description = 'Convert a UNIX curl request to an HTTP Client request';
 
@@ -26,10 +26,11 @@ public function handle()
     private function gatherOptions()
     {
         return [
-            'method' => $this->option('request'),
+            'method' => $this->option('get') ? 'GET' : $this->option('request'),
             'url' => $this->argument('url'),
             'headers' => $this->option('header'),
             'data' => $this->option('data'),
+            'dataUrlEncode' => $this->option('data-urlencode'),
             'fields' => $this->option('form'),
             'digest' => $this->option('digest'),
             'basic' => $this->option('basic'),
@@ -38,7 +39,6 @@ private function gatherOptions()
             'retry' => $this->option('retry'),
             'silent' => $this->option('silent'),
             'user' => $this->option('user'),
-            // TODO: map more options...
         ];
     }
 }

src/Models/Request.php

@@ -36,7 +36,7 @@ public static function create(array $data): self
     {
         $url = parse_url($data['url']);
 
-        $request = new self(self::buildUrl($url), $data['method']);
+        $request = new self(self::buildUrl($url), $data['method'] ?? 'GET');
 
         if (isset($url['query'])) {
             parse_str($url['query'], $request->data);
@@ -66,7 +66,11 @@ public static function create(array $data): self
             $request->multipartFormData = true;
         }
 
-        if ($request->method === 'GET' && (!empty($data['data']) || !empty($data['fields']))) {
+        if (!empty($data['dataUrlEncode'])) {
+            $request->data = self::parseData($data['dataUrlEncode']);
+        }
+
+        if (is_null($data['method']) && (!empty($data['data']) || !empty($data['fields']))) {
             $request->method = 'POST';
         }
 

tests/Feature/Console/Commands/CurlCommandTest.php

@@ -37,6 +37,7 @@ public function curlCommandFixtures()
             'Mailgun example request' => ['mailgun-example'],
             'Digital Ocean example request' => ['digital-ocean-example'],
             'Stripe example request' => ['stripe-example'],
+            'Stripe query params' => ['stripe-query-params'],
             'Initial connection timeout' => ['connect-timeout'],
             'Entire transaction timeout' => ['max-timeout'],
         ];

tests/fixtures/stripe-query-params.in

@@ -0,0 +1 @@
+curl https://api.stripe.com/v1/customers/search -u sk_test_sabcdef0987654321: --data-urlencode query="name:'fakename' AND metadata['foo']:'bar'" -G

tests/fixtures/stripe-query-params.out

@@ -0,0 +1,4 @@
+Http::withBasicAuth('sk_test_sabcdef0987654321', '')
+    ->get('https://api.stripe.com/v1/customers/search', [
+        'query' => 'name:\'fakename\' AND metadata[\'foo\']:\'bar\'',
+    ]);