Make rules method in FormRequest optional (laravel#46846)

bert-w · Apr 21, 2023 · 0c9b3e9 · 0c9b3e9
1 parent 9747b8c
commit 0c9b3e9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Illuminate/Foundation/Http/FormRequest.php b/src/Illuminate/Foundation/Http/FormRequest.php
@@ -109,7 +109,7 @@ protected function getValidatorInstance()
      */
     protected function createDefaultValidator(ValidationFactory $factory)
     {
-        $rules = $this->container->call([$this, 'rules']);
+        $rules = method_exists($this, 'rules') ? $this->container->call([$this, 'rules']) : [];
 
         $validator = $factory->make(
             $this->validationData(), $rules,

diff --git a/tests/Foundation/FoundationFormRequestTest.php b/tests/Foundation/FoundationFormRequestTest.php
@@ -149,6 +149,15 @@ public function testValidatedMethodReturnsOnlyRequestedNestedValidatedData()
         $this->assertSame('bar', $request->validated('nested.foo'));
     }
 
+    public function testRequestCanPassWithoutRulesMethod()
+    {
+        $request = $this->createRequest([], FoundationTestFormRequestWithoutRulesMethod::class);
+
+        $request->validateResolved();
+
+        $this->assertEquals([], $request->all());
+    }
+
     /**
      * Catch the given exception thrown from the executor, and return it.
      *
@@ -377,3 +386,11 @@ public function authorize()
         return Response::allow('baz');
     }
 }
+
+class FoundationTestFormRequestWithoutRulesMethod extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+}