Refactors

Author: jasonmccreary

src/Console/Commands/CurlCommand.php

@@ -26,24 +26,24 @@ public function handle()
     private function gatherOptions()
     {
         return [
-            'method' => $this->option('get') ? 'GET' : $this->option('request'),
-            'url' => $this->argument('url'),
-            'headers' => $this->option('header'),
+            'basic' => $this->option('basic'),
+            'cert' => $this->option('cert'),
+            'compressed' => $this->option('compressed'),
+            'connectTimeout' => $this->option('connect-timeout'),
             'data' => $this->option('data'),
-            'rawData' => $this->option('data-raw'),
             'dataUrlEncode' => $this->option('data-urlencode'),
-            'fields' => $this->option('form'),
             'digest' => $this->option('digest'),
-            'basic' => $this->option('basic'),
-            'connectTimeout' => $this->option('connect-timeout'),
+            'fields' => $this->option('form'),
+            'headers' => $this->option('header'),
+            'insecure' => $this->option('insecure'),
+            'key' => $this->option('key'),
             'maxTimeout' => $this->option('max-timeout'),
+            'method' => $this->option('get') ? 'GET' : $this->option('request'),
+            'rawData' => $this->option('data-raw'),
             'retry' => $this->option('retry'),
             'silent' => $this->option('curl-silent'),
+            'url' => $this->argument('url'),
             'user' => $this->option('user'),
-            'compressed' => $this->option('compressed'),
-            'insecure' => $this->option('insecure'),
-            'cert' => $this->option('cert'),
-            'key' => $this->option('key'),
         ];
     }
 }

src/Models/Request.php

@@ -7,29 +7,29 @@
 
 class Request
 {
-    private string $url;
+    private ?int $connectTimeout = null;
 
-    private string $method;
+    private array $data = [];
 
     private array $headers = [];
 
-    private array $data = [];
+    private bool $insecure = false;
 
-    private bool $rawData = false;
+    private ?int $maxTimeout = null;
+
+    private string $method;
 
     private bool $multipartFormData = false;
 
-    private ?string $username = null;
+    private array $guzzleOptions = [];
 
     private ?string $password = null;
 
-    private ?int $maxTimeout = null;
-
-    private ?int $connectTimeout = null;
+    private bool $rawData = false;
 
-    private array $options = [];
+    private string $url;
 
-    private bool $insecure = false;
+    private ?string $username = null;
 
     private function __construct($url, $method)
     {
@@ -114,14 +114,14 @@ public static function create(array $data): self
             @[$certificate, $password] = explode(':', $data['cert'], 2);
 
             if (isset($password)) {
-                $request->options['cert'] = [$certificate, $password];
+                $request->guzzleOptions['cert'] = [$certificate, $password];
             } else {
-                $request->options['cert'] = $certificate;
+                $request->guzzleOptions['cert'] = $certificate;
             }
         }
 
         if (isset($data['key'])) {
-            $request->options['ssl_key'] = $data['key'];
+            $request->guzzleOptions['ssl_key'] = $data['key'];
         }
 
         if ($data['insecure']) {
@@ -131,96 +131,79 @@ public static function create(array $data): self
         return $request;
     }
 
+    public function connectTimeout(): int
+    {
+        return $this->connectTimeout;
+    }
+
     public function data(): array
     {
         return $this->data;
     }
 
-    public function hasUsernameOrPassword(): bool
+    public function hasConnectTimeout(): bool
     {
-        return isset($this->username) || isset($this->password);
+        return isset($this->connectTimeout);
     }
 
     public function hasMaxTimeout(): bool
     {
         return isset($this->maxTimeout);
     }
 
-    public function hasConnectTimeout(): bool
+    public function hasUsernameOrPassword(): bool
     {
-        return isset($this->connectTimeout);
+        return isset($this->username) || isset($this->password);
     }
 
     public function headers(): array
     {
         return $this->headers;
     }
 
-    public function isRawData(): bool
-    {
-        return $this->rawData;
-    }
-
-    public function method(): string
-    {
-        return $this->method;
-    }
-
-    public function url(): string
+    public function isInsecure(): bool
     {
-        return $this->url;
+        return $this->insecure;
     }
 
     public function isMultipartFormData(): bool
     {
         return $this->multipartFormData;
     }
 
-    public function username(): string
-    {
-        return $this->username ?? '';
-    }
-
-    public function password(): string
+    public function isRawData(): bool
     {
-        return $this->password ?? '';
+        return $this->rawData;
     }
 
     public function maxTimeout(): int
     {
         return $this->maxTimeout;
     }
 
-    public function connectTimeout(): int
+    public function method(): string
     {
-        return $this->connectTimeout;
+        return $this->method;
     }
 
     public function options(): array
     {
-        return $this->options;
+        return $this->guzzleOptions;
     }
 
-    public function isInsecure(): bool
+    public function password(): string
     {
-        return $this->insecure;
+        return $this->password ?? '';
     }
 
-    private static function convertDataType(string $value)
+    public function url(): string
     {
-        return preg_match('/^[1-9]\d*$/', $value) ? intval($value) : $value;
+        return $this->url;
     }
 
-    private static function parseData(array $data): array
+    public function username(): string
     {
-        parse_str(implode('&', $data), $data);
-        array_walk_recursive($data, function (&$value) {
-            if (is_string($value)) {
-                $value = self::convertDataType($value);
-            }
-        });
-
-        return $data;
+        return $this->username ?? '';
     }
 
     private static function buildUrl(array $url): string
@@ -237,4 +220,21 @@ private static function buildUrl(array $url): string
 
         return $output;
     }
+
+    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;
+    }
 }