diff --git a/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php b/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php index 9b76303ad9cd..598ef666a8ad 100644 --- 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 index 44585084c515..7e365465f8fb 100644 --- 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;