Check for valid JSON error response (fixes #577).

srmklive · Sep 27, 2023 · 9a8f5f8 · 9a8f5f8
1 parent 9dc9454
commit 9a8f5f8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Traits/PayPalHttpClient.php b/src/Traits/PayPalHttpClient.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Exception\ClientException as HttpClientException;
 use GuzzleHttp\Utils;
+use Illuminate\Support\Str;
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
 
@@ -211,7 +212,7 @@ private function doPayPalRequest(bool $decode = true)
 
             return ($decode === false) ? $response->getContents() : Utils::jsonDecode($response, true);
         } catch (RuntimeException $t) {
-            $error = ($decode === false) ? $t->getMessage() : Utils::jsonDecode($t->getMessage(), true);
+            $error = ($decode === false) || (Str::isJson($t->getMessage()) === false) ? $t->getMessage() : Utils::jsonDecode($t->getMessage(), true);
 
             return ['error' => $error];
         }