Merge branch 'master' into 3.2-merge

Author: limingxinleo

composer.json

@@ -8,27 +8,28 @@
         "hyperf"
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "egulias/email-validator": "^3.0",
-        "hyperf/collection": "~3.1.0",
-        "hyperf/conditionable": "~3.1.0",
-        "hyperf/context": "~3.1.0",
-        "hyperf/contract": "~3.1.0",
-        "hyperf/di": "~3.1.0",
-        "hyperf/framework": "~3.1.0",
-        "hyperf/macroable": "~3.1.0",
-        "hyperf/stringable": "~3.1.0",
-        "hyperf/support": "~3.1.0",
-        "hyperf/tappable": "~3.1.0",
-        "hyperf/translation": "~3.1.0",
-        "nesbot/carbon": "^2.21",
+        "hyperf/collection": "~3.2.0",
+        "hyperf/conditionable": "~3.2.0",
+        "hyperf/context": "~3.2.0",
+        "hyperf/contract": "~3.2.0",
+        "hyperf/di": "~3.2.0",
+        "hyperf/framework": "~3.2.0",
+        "hyperf/macroable": "~3.2.0",
+        "hyperf/stringable": "~3.2.0",
+        "hyperf/support": "~3.2.0",
+        "hyperf/tappable": "~3.2.0",
+        "hyperf/translation": "~3.2.0",
+        "nesbot/carbon": "^2.21 || ^3.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/event-dispatcher": "^1.0",
-        "psr/http-message": "^1.0 || ^2.0"
+        "psr/http-message": "^1.0 || ^2.0",
+        "symfony/polyfill-php83": "^1.33"
     },
     "suggest": {
-        "hyperf/database": "Required if you want to use the database validation rule (~3.1.0).",
-        "hyperf/http-server": "Required if you want to use the request validation rule (~3.1.0)."
+        "hyperf/database": "Required if you want to use the database validation rule (~3.2.0).",
+        "hyperf/http-server": "Required if you want to use the request validation rule (~3.2.0)."
     },
     "autoload": {
         "psr-4": {
@@ -45,7 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1-dev"
+            "dev-master": "3.2-dev"
         },
         "hyperf": {
             "config": "Hyperf\\Validation\\ConfigProvider"

src/Concerns/ValidatesAttributes.php

@@ -960,17 +960,7 @@ public function validateJson(string $attribute, $value): bool
             return false;
         }
 
-        if (function_exists('json_validate')) {
-            return json_validate($value);
-        }
-
-        try {
-            json_decode($value, flags: JSON_THROW_ON_ERROR);
-        } catch (Throwable) {
-            return false;
-        }
-
-        return true;
+        return json_validate($value);
     }
 
     /**

src/ValidationRuleParser.php

@@ -266,7 +266,7 @@ protected static function parseParameters(string $rule, string $parameter): arra
             return [$parameter];
         }
 
-        return str_getcsv($parameter, escape: '\\');
+        return str_getcsv($parameter, escape: '');
     }
 
     /**

src/Validator.php

@@ -189,22 +189,20 @@ public function __construct(
     /**
      * Handle dynamic calls to class methods.
      *
-     * @param mixed $method
-     * @param mixed $parameters
      * @throws BadMethodCallException when method does not exist
      */
-    public function __call($method, $parameters)
+    public function __call(string $name, array $arguments): mixed
     {
-        $rule = StrCache::snake(substr($method, 8));
+        $rule = StrCache::snake(substr($name, 8));
 
         if (isset($this->extensions[$rule])) {
-            return $this->callExtension($rule, $parameters);
+            return $this->callExtension($rule, $arguments);
         }
 
         throw new BadMethodCallException(sprintf(
             'Method %s::%s does not exist.',
             static::class,
-            $method
+            $name
         ));
     }
 

tests/Cases/Stub/ValidationRuleParserStub.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+
+namespace HyperfTest\Validation\Cases\Stub;
+
+use Hyperf\Validation\ValidationRuleParser;
+
+class ValidationRuleParserStub extends ValidationRuleParser
+{
+    public static function parseParameters(string $rule, string $parameter): array
+    {
+        return parent::parseParameters($rule, $parameter);
+    }
+}

tests/Cases/ValidationRuleTest.php

@@ -13,6 +13,7 @@
 namespace HyperfTest\Validation\Cases;
 
 use Hyperf\Validation\Rule;
+use HyperfTest\Validation\Cases\Stub\ValidationRuleParserStub;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
 
@@ -32,4 +33,14 @@ public function testMacroable()
         $c = Rule::phone();
         $this->assertSame('regex:/^([0-9\s\-\+\(\)]*)$/', $c);
     }
+
+    public function testParseParameters()
+    {
+        $res = ValidationRuleParserStub::parseParameters('in', '1,2,3,4');
+        $this->assertSame(['1', '2', '3', '4'], $res);
+        $res = ValidationRuleParserStub::parseParameters('in', '1,2,3,\4');
+        $this->assertSame(['1', '2', '3', '\4'], $res);
+        $res = ValidationRuleParserStub::parseParameters('in', '1,2,3,\\\4');
+        $this->assertSame(['1', '2', '3', '\\\4'], $res);
+    }
 }