fix: FormRequest class authorization validation priority (#24369)

Signed-off-by: Bruno Gaspar <brunofgaspar1@gmail.com>
laravel · May 30, 2018 · 1ec69a8 · 1ec69a8
1 parent 5337149
commit 1ec69a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php b/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
@@ -16,11 +16,13 @@ public function validateResolved()
     {
         $this->prepareForValidation();
 
-        $instance = $this->getValidatorInstance();
-
         if (! $this->passesAuthorization()) {
             $this->failedAuthorization();
-        } elseif (! $instance->passes()) {
+        }
+
+        $instance = $this->getValidatorInstance();
+
+        if (! $instance->passes()) {
             $this->failedValidation($instance);
         }
     }

diff --git a/tests/Foundation/FoundationFormRequestTest.php b/tests/Foundation/FoundationFormRequestTest.php
@@ -176,11 +176,6 @@ public function authorize()
 
 class FoundationTestFormRequestForbiddenStub extends FormRequest
 {
-    public function rules()
-    {
-        return ['name' => 'required'];
-    }
-
     public function authorize()
     {
         return false;