execute方法调整

zwell · Sep 2, 2024 · 2fb4da6 · 2fb4da6
1 parent 553b1fb
commit 2fb4da6
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/src/Http/GuzzleClient.php b/src/Http/GuzzleClient.php
@@ -60,20 +60,23 @@ public function execute(RequestInterface $request): Response
             return new Response($res);
         } catch (RequestException $e) {
             $response = $e->getResponse();
-            $statusCode = $response ? $response->getStatusCode() : 0;
-            if ($statusCode >= 400 && $statusCode < 500) {
-                $errorResponse = new Response($e->getResponse());
-                throw (new InvalidArgumentException($e->getMessage(), $statusCode))
-                    ->setResponse($errorResponse);
-            } elseif ($statusCode >= 500) {
-                $errorResponse = new Response($e->getResponse());
-                throw (new ServerException($e->getMessage(), $statusCode))
-                    ->setResponse($errorResponse);
-            } else {
-                $errorResponse = new Response($e->getResponse());
-                throw (new UnknownException($e->getMessage(), $statusCode))
-                    ->setResponse($errorResponse);
+            if ($response instanceof ResponseInterface) {
+                $statusCode = $response->getStatusCode();
+                if ($statusCode >= 400 && $statusCode < 500) {
+                    $errorResponse = new Response($response);
+                    throw (new InvalidArgumentException($e->getMessage(), $statusCode))
+                        ->setResponse($errorResponse);
+                } elseif ($statusCode >= 500) {
+                    $errorResponse = new Response($response);
+                    throw (new ServerException($e->getMessage(), $statusCode))
+                        ->setResponse($errorResponse);
+                } else {
+                    $errorResponse = new Response($response);
+                    throw (new UnknownException($e->getMessage(), $statusCode))
+                        ->setResponse($errorResponse);
+                }
             }
+            throw $e;
         }
     }
 }