fix: handle edge case where no response body is recieved

FriendsOfFlarum · Jun 15, 2024 · 418ba2e · 418ba2e
1 parent 015d072
commit 418ba2e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/Api/Services/BaseGeoService.php b/src/Api/Services/BaseGeoService.php
@@ -63,7 +63,7 @@ public function get(string $ip): ?ServiceResponse
                 $this->updateRateLimitsFromResponse($response);
             }
 
-            $body = json_decode($response->getBody());
+            $body = json_decode($response->getBody()->getContents());
 
             if ($this->hasError($response, $body)) {
                 $this->logger->error("Error detected in response from {$this->host}");
@@ -140,7 +140,7 @@ abstract protected function buildBatchUrl(array $ips, ?string $apiKey): string;
 
     abstract protected function getRequestOptions(?string $apiKey, array $ips = null): array;
 
-    abstract protected function hasError(ResponseInterface $response, object $body): bool;
+    abstract protected function hasError(ResponseInterface $response, mixed $body): bool;
 
     abstract protected function handleError(ResponseInterface $response, object $body): ?ServiceResponse;
 

diff --git a/src/Api/Services/IPApi.php b/src/Api/Services/IPApi.php
@@ -92,11 +92,11 @@ protected function getRequestOptions(?string $apiKey, array $ips = null): array
         ];
     }
 
-    protected function hasError(ResponseInterface $response, object $body): bool
+    protected function hasError(ResponseInterface $response, mixed $body): bool
     {
         $allowedFailures = ['reserved range', 'private range'];
 
-        return $body->status === 'fail' && !in_array($body->message, $allowedFailures);
+        return $body?->status === 'fail' && !in_array($body->message, $allowedFailures);
     }
 
     protected function handleError(ResponseInterface $response, object $body): ?ServiceResponse

diff --git a/src/Api/Services/IPData.php b/src/Api/Services/IPData.php
@@ -82,9 +82,9 @@ protected function getRequestOptions(?string $apiKey, array $ips = null): array
         ];
     }
 
-    protected function hasError(ResponseInterface $response, object $body): bool
+    protected function hasError(ResponseInterface $response, mixed $body): bool
     {
-        return isset($body->error) || ($response->getStatusCode() >= 400 && !Str::contains($body->message, ['is a reserved IP address']));
+        return isset($body?->error) || ($response->getStatusCode() >= 400 && !Str::contains($body?->message, ['is a reserved IP address']));
     }
 
     protected function handleError(ResponseInterface $response, object $body): ?ServiceResponse

diff --git a/src/Api/Services/IPLocation.php b/src/Api/Services/IPLocation.php
@@ -55,9 +55,9 @@ public function isRateLimited(): bool
         return false;
     }
 
-    protected function hasError(ResponseInterface $response, object $body): bool
+    protected function hasError(ResponseInterface $response, mixed $body): bool
     {
-        return $body->response_code !== '200';
+        return $body?->response_code !== '200';
     }
 
     protected function handleError(ResponseInterface $response, object $body): ?ServiceResponse

diff --git a/src/Api/Services/IPSevenEx.php b/src/Api/Services/IPSevenEx.php
@@ -50,7 +50,7 @@ protected function getRequestOptions(?string $apiKey, array $ips = null): array
         ];
     }
 
-    protected function hasError(ResponseInterface $response, object $body): bool
+    protected function hasError(ResponseInterface $response, mixed $body): bool
     {
         return $response->getStatusCode() > 200;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             ];
         }
-        protected function hasError(ResponseInterface $response, object $body): bool
+        protected function hasError(ResponseInterface $response, mixed $body): bool
         {
             return $response->getStatusCode() > 200;
         }
@@ Expand Down @@