rename isJson->jsonValidate

Author: [email protected]

_ide_helper.php

@@ -12,7 +12,7 @@
 
 namespace Illuminate\Support {
     /**
-     * @method static bool isJson($value)
+     * @method static bool jsonValidate(string $json, int $depth = 512, int $flags = 0)
      *
      * @mixin \Illuminate\Support\Str
      */
@@ -21,7 +21,7 @@ final class Str
     }
 
     /**
-     * @method bool isJson()
+     * @method bool jsonValidate(int $depth = 512, int $flags = 0)
      *
      * @mixin \Illuminate\Support\Stringable
      */

app/Commands/CommitCommand.php

@@ -84,7 +84,7 @@ function ($attempts) use ($cachedDiff): string {
                         ->driver($this->option('generator'))
                         ->generate($this->getPrompt($cachedDiff));
                     $message = $this->tryFixMessage($originalMessage);
-                    if (! str($message)->isJson()) {
+                    if (! str($message)->jsonValidate()) {
                         throw new TaskException(sprintf(
                             'The generated commit message(%s) is an invalid JSON.',
                             var_export($originalMessage, true)

app/Commands/ConfigCommand.php

@@ -227,7 +227,7 @@ private function argToValue(string $arg)
             return str_contains($arg, '.') ? (float) $arg : (int) $arg;
         }
 
-        if (str($arg)->isJson()) {
+        if (str($arg)->jsonValidate()) {
             return json_decode($arg, true, 512, JSON_THROW_ON_ERROR);
         }
 

app/ConfigManager.php

@@ -227,7 +227,7 @@ public static function readFrom(...$files): array
             }
 
             if ($ext->is('json')) {
-                if (! str($contents = file_get_contents($file))->isJson()) {
+                if (! str($contents = file_get_contents($file))->jsonValidate()) {
                     throw InvalidJsonFileException::make($file);
                 }
 

app/Macros/StrMacro.php

@@ -21,20 +21,25 @@ final class StrMacro
      * @psalm-suppress UnusedFunctionCall
      * @noinspection BadExceptionsProcessingInspection
      */
-    public static function isJson(): \Closure
+    public static function jsonValidate(): \Closure
     {
-        return static function ($value): bool {
-            if (! \is_string($value)) {
-                return false;
+        return static function (string $json, int $depth = 512, int $flags = 0): bool {
+            if (0 !== $flags && \defined('JSON_INVALID_UTF8_IGNORE') && JSON_INVALID_UTF8_IGNORE !== $flags) {
+                throw new \ValueError('json_validate(): Argument #3 ($flags) must be a valid flag (allowed flags: JSON_INVALID_UTF8_IGNORE)');
             }
 
-            try {
-                json_decode($value, true, 512, JSON_THROW_ON_ERROR);
-            } catch (\JsonException $jsonException) {
-                return false;
+            if ($depth <= 0) {
+                throw new \ValueError('json_validate(): Argument #2 ($depth) must be greater than 0');
             }
 
-            return true;
+            // see https://www.php.net/manual/en/function.json-decode.php
+            if ($depth > ($jsonMaxDepth = 0x7FFFFFFF)) {
+                throw new \ValueError(sprintf('json_validate(): Argument #2 ($depth) must be less than %d', $jsonMaxDepth));
+            }
+
+            json_decode($json, null, $depth, $flags);
+
+            return JSON_ERROR_NONE === json_last_error();
         };
     }
 }

app/Macros/StringableMacro.php

@@ -22,10 +22,10 @@ final class StringableMacro
     /**
      * @psalm-suppress InaccessibleProperty
      */
-    public function isJson(): \Closure
+    public function jsonValidate(): \Closure
     {
-        return function (): bool {
-            return Str::isJson($this->value);
+        return function (int $depth = 512, int $flags = 0): bool {
+            return Str::jsonValidate($this->value, $depth, $flags);
         };
     }
 }

app/Support/OpenAI.php

@@ -264,7 +264,7 @@ static function (PendingRequest $pendingRequest) use (&$rowData, $writer): Pendi
             //         $contents = $response->getBody()->getContents();
             //
             //         // $parameters['stream'] === true && $writer === null
-            //         if ($contents && ! \str($contents)->isJson()) {
+            //         if ($contents && ! \str($contents)->jsonValidate()) {
             //             $data = \str($contents)
             //                 ->explode("\n\n")
             //                 ->reverse()

phpstan.neon

@@ -31,5 +31,5 @@ parameters:
 #        noVariableVariables: false
     ignoreErrors:
         - "#^Call to an undefined method #"
-        - "#^Call to an undefined static method Illuminate\\\\Support\\\\Str\\:\\:isJson\\(\\)\\.$#"
+        - "#^Call to an undefined static method Illuminate\\\\Support\\\\Str\\:\\:jsonValidate\\(\\)\\.$#"
         - "#^Undefined variable\\: \\$this$#"

tests/Unit/Macros/StrMacroTest.php

@@ -13,5 +13,5 @@
 use Illuminate\Support\Str;
 
 it('will return false', function (): void {
-    expect(Str::isJson(null))->toBeFalse();
+    expect(Str::jsonValidate(''))->toBeFalse();
 })->group(__DIR__, __FILE__);