Support to rewrite the rules for scene when using validation. (#7469)

Author: limit81995

src/Request/FormRequest.php

@@ -12,7 +12,6 @@
 
 namespace Hyperf\Validation\Request;
 
-use Hyperf\Collection\Arr;
 use Hyperf\Context\Context;
 use Hyperf\Context\ResponseContext;
 use Hyperf\Contract\ValidatorInterface;
@@ -205,7 +204,15 @@ protected function getRules(): array
         $rules = $this->rules();
         $scene = $this->getScene();
         if ($scene && isset($this->scenes[$scene]) && is_array($this->scenes[$scene])) {
-            return Arr::only($rules, $this->scenes[$scene]);
+            $result = [];
+            foreach ($this->scenes[$scene] as $key => $value) {
+                if (is_string($key)) {
+                    $result[$key] = $value;
+                } elseif (is_numeric($key) && is_string($value)) {
+                    $result[$value] = $rules[$value];
+                }
+            }
+            return $result;
         }
         return $rules;
     }

tests/Cases/FormRequestTest.php

@@ -19,6 +19,7 @@
 use Hyperf\Coroutine\Waiter;
 use Hyperf\HttpMessage\Server\Response;
 use Hyperf\HttpMessage\Upload\UploadedFile;
+use Hyperf\Support\Reflection\ClassInvoker;
 use Hyperf\Translation\ArrayLoader;
 use Hyperf\Translation\Translator;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
@@ -117,6 +118,20 @@ public function testRewriteGetRules()
         }
     }
 
+    public function testRewriteRules()
+    {
+        $container = Mockery::mock(ContainerInterface::class);
+
+        $request = new FooSceneRequest($container);
+        $invoker = new ClassInvoker($request);
+        $rules = $invoker->getRules();
+        $this->assertSame(['mobile' => 'required', 'name' => 'required'], $rules);
+
+        $invoker->scene('get');
+        $rules = $invoker->getRules();
+        $this->assertSame(['mobile' => 'string|required'], $rules);
+    }
+
     public function testSceneForFormRequest()
     {
         $psrRequest = Mockery::mock(ServerRequestPlusInterface::class);

tests/Cases/Stub/FooSceneRequest.php

@@ -19,6 +19,7 @@ class FooSceneRequest extends FormRequest
     public array $scenes = [
         'save' => ['mobile', 'name'],
         'info' => ['mobile'],
+        'get' => ['mobile' => 'string|required'],
     ];
 
     public function authorize(): bool