Merge branch 'master' into 3.1

# Conflicts:
#	src/redis/composer.json
#	src/validation/tests/Cases/ValidateAttributesTest.php

Author: limingxinleo

src/Concerns/ValidatesAttributes.php

@@ -29,6 +29,7 @@
 use Hyperf\Validation\ValidationData;
 use InvalidArgumentException;
 use SplFileInfo;
+use Stringable;
 use Throwable;
 
 use function Hyperf\Collection\last;
@@ -888,13 +889,17 @@ public function validateMacAddress(string $attribute, mixed $value): bool
      */
     public function validateJson(string $attribute, $value): bool
     {
-        if (! is_scalar($value) && ! method_exists($value, '__toString')) {
-            return false;
+        if ($value instanceof Stringable) {
+            $value = (string) $value;
         }
 
-        json_decode($value);
+        try {
+            json_decode($value, flags: JSON_THROW_ON_ERROR);
+        } catch (Throwable) {
+            return false;
+        }
 
-        return json_last_error() === JSON_ERROR_NONE;
+        return true;
     }
 
     /**

tests/Cases/ValidateAttributesTest.php

@@ -14,6 +14,7 @@
 use HyperfTest\Validation\Cases\Stub\ValidatesAttributesStub;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
+use Stringable;
 
 /**
  * @internal
@@ -93,4 +94,41 @@ public function testValidateAscii()
         $this->assertFalse($validator->validateAscii('', 'ユニコードを基盤技術と-_123'));
         $this->assertFalse($validator->validateAscii('', 'नमस्कार-_'));
     }
+
+    public function testValidateJson()
+    {
+        $validator = new ValidatesAttributesStub();
+        // null
+        $this->assertFalse($validator->validateJson('', null));
+        $this->assertTrue($validator->validateJson('', 'null'));
+        // int
+        $this->assertTrue($validator->validateJson('', '3'));
+        $this->assertFalse($validator->validateJson('', 3));
+        // float
+        $this->assertTrue($validator->validateJson('', '3.14'));
+        $this->assertFalse($validator->validateJson('', 3.14));
+        // string
+        $this->assertFalse($validator->validateJson('', 'plain_text'));
+        $this->assertTrue($validator->validateJson('', '{"foo": "bar"}'));
+        $this->assertFalse($validator->validateJson('', '{"foo": "bar",a}'));
+        // array
+        $this->assertTrue($validator->validateJson('', '[3.14]'));
+        $this->assertFalse($validator->validateJson('', [3.14]));
+        $this->assertTrue($validator->validateJson('', '["a"]'));
+        // object
+        $this->assertFalse($validator->validateJson('', new class() {}));
+        $this->assertTrue($validator->validateJson('', new class() implements Stringable {
+            public function __toString(): string
+            {
+                return json_encode(['foo' => 'bar'], JSON_UNESCAPED_UNICODE);
+            }
+        }));
+
+        $this->assertTrue($validator->validateJson('', new class() {
+            public function __toString(): string
+            {
+                return json_encode(['foo' => 'bar'], JSON_UNESCAPED_UNICODE);
+            }
+        }));
+    }
 }