Refactor Client

Ticketpark · Oct 12, 2023 · f8c1495 · f8c1495
1 parent 9bc1669
commit f8c1495
Showing 1 changed file with 36 additions and 23 deletions.
diff --git a/lib/ApiClient/Http/Client.php b/lib/ApiClient/Http/Client.php
@@ -58,29 +58,14 @@ private function execute(
         array $formData = []
     ): Response {
         try {
-            if ($formData) {
-                /** @var GuzzleResponse $response */
-                $guzzleResponse = $this->guzzle->request(
-                    $method,
-                    $url,
-                    [
-                        'headers' => $headers,
-                        'form_params' => $formData,
-                        'timeout' => 30
-                    ]
-                );
-            } else {
-                /** @var GuzzleResponse $response */
-                $guzzleResponse = $this->guzzle->request(
-                    $method,
-                    $url,
-                    [
-                        'headers' => $headers,
-                        'body' => $content,
-                        'timeout' => 30
-                    ]
-                );
-            }
+            $guzzleResponse = $this->doExecute(
+                $method,
+                $url,
+                $headers,
+                $content,
+                $formData
+            );
+
         } catch (ConnectException $e) {
             if (str_contains($e->getMessage(), 'cURL error 28')) {
                 throw new HttpTimeOutException();
@@ -100,4 +85,32 @@ private function execute(
             $guzzleResponse->getHeaders()
         );
     }
+
+    private function doExecute(
+        string $method,
+        string $url,
+        array $headers = [],
+        string $content = null,
+        array $formData = []
+    ): GuzzleResponse {
+        $requestData = [
+            'headers' => $headers,
+            'timeout' => 30
+        ];
+
+        if ($formData) {
+            $requestData['form_params'] = $formData;
+        } else {
+            $requestData['body'] = $content;
+        }
+
+        /** @var GuzzleResponse $response */
+        $guzzleResponse = $this->guzzle->request(
+            $method,
+            $url,
+            $requestData
+        );
+
+        return $guzzleResponse;
+    }
 }