Move JSON validation to derived class.

srmklive · Sep 27, 2023 · 7860237 · 7860237
1 parent 9a8f5f8
commit 7860237
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -22,6 +22,7 @@
     <exclude>
       <file>src/PayPalFacadeAccessor.php</file>
       <file>src/Traits/PayPalVerifyIPN.php</file>
+      <file>src/Services/Str.php</file>
       <directory suffix=".php">src/Facades/</directory>
       <directory suffix=".php">src/Providers/</directory>
     </exclude>

diff --git a/phpunit.xml.dist.php72 b/phpunit.xml.dist.php72
@@ -19,7 +19,8 @@
       <directory suffix=".php">src/</directory>
       <exclude>
         <file>src/PayPalFacadeAccessor.php</file>
-        <file suffix=".php">src/Traits/PayPalVerifyIPN.php</file>
+        <file>src/Traits/PayPalVerifyIPN.php</file>
+        <file>src/Services/Str.php</file>
         <directory suffix=".php">src/Facades/</directory>
         <directory suffix=".php">src/Providers/</directory>
       </exclude>

diff --git a/phpunit.xml.dist.php8 b/phpunit.xml.dist.php8
@@ -7,6 +7,7 @@
     <exclude>
       <file>src/PayPalFacadeAccessor.php</file>
       <file>src/Traits/PayPalVerifyIPN.php</file>
+      <file>src/Services/Str.php</file>
       <directory suffix=".php">src/Facades/</directory>
       <directory suffix=".php">src/Providers/</directory>
     </exclude>

diff --git a/src/Services/Str.php b/src/Services/Str.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Srmklive\PayPal\Services;
+
+use GuzzleHttp\Utils;
+
+class Str extends \Illuminate\Support\Str
+{
+    /**
+     * Determine if a given value is valid JSON.
+     *
+     * @param  mixed  $value
+     *
+     * @return bool
+     */
+    public static function isJson($value): bool
+    {
+        if (! is_string($value)) {
+            return false;
+        }
+
+        if (function_exists('json_validate')) {
+            return json_validate($value, 512);
+        }
+
+        try {
+            Utils::jsonDecode($value, true, 512, 4194304);
+        } catch (\JsonException) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/src/Traits/PayPalHttpClient.php b/src/Traits/PayPalHttpClient.php
@@ -5,9 +5,9 @@
 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;
+use Srmklive\PayPal\Services\Str;
 
 trait PayPalHttpClient
 {