Revert "Make rules method in FormRequest optional (laravel#46846)"

This reverts commit 0c9b3e9.
snarcraft · Apr 26, 2023 · 51746ac · 51746ac
1 parent 09ca3f2
commit 51746ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
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 = method_exists($this, 'rules') ? $this->container->call([$this, 'rules']) : [];
+        $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,15 +149,6 @@ 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.
      *
@@ -386,11 +377,3 @@ public function authorize()
         return Response::allow('baz');
     }
 }
-
-class FoundationTestFormRequestWithoutRulesMethod extends FormRequest
-{
-    public function authorize()
-    {
-        return true;
-    }
-}