[10.x] Use ValidationException class from Validator Property (#48736)

* Use ValidationException class from Validator Property * Remove unused import * Update Validator.php --------- Co-authored-by: Taylor Otwell <[email protected]>
laravel · Oct 16, 2023 · 73ab11e · 73ab11e
1 parent 0d23fb3
commit 73ab11e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/src/Illuminate/Foundation/Http/FormRequest.php b/src/Illuminate/Foundation/Http/FormRequest.php
@@ -11,7 +11,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Validation\ValidatesWhenResolvedTrait;
-use Illuminate\Validation\ValidationException;
 
 class FormRequest extends Request implements ValidatesWhenResolved
 {
@@ -152,7 +151,9 @@ public function validationData()
      */
     protected function failedValidation(Validator $validator)
     {
-        throw (new ValidationException($validator))
+        $exception = $validator->getException();
+
+        throw (new $exception($validator))
                     ->errorBag($this->errorBag)
                     ->redirectTo($this->getRedirectUrl());
     }

diff --git a/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php b/src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
@@ -75,7 +75,9 @@ protected function passedValidation()
      */
     protected function failedValidation(Validator $validator)
     {
-        throw new ValidationException($validator);
+        $exception = $validator->getException();
+
+        throw new $exception($validator);
     }
 
     /**

diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1481,6 +1481,16 @@ public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
         $this->presenceVerifier = $presenceVerifier;
     }
 
+    /**
+     * Get the exception to throw upon failed validation.
+     *
+     * @return string
+     */
+    public function getException()
+    {
+        return $this->exception;
+    }
+
     /**
      * Set the exception to throw upon failed validation.
      *

diff --git a/tests/Validation/ValidationExceptionTest.php b/tests/Validation/ValidationExceptionTest.php
@@ -87,11 +87,26 @@ public function testExceptionGetResponseOneError()
         $this->assertNull($exception->getResponse());
     }
 
+    public function testGetExceptionClassFromValidator()
+    {
+        $validator = $this->getValidator();
+
+        $exception = $validator->getException();
+
+        $this->assertEquals(ValidationException::class, $exception);
+    }
+
     protected function getException($data = [], $rules = [])
     {
-        $translator = new Translator(new ArrayLoader, 'en');
-        $validator = new Validator($translator, $data, $rules);
+        $validator = $this->getValidator($data, $rules);
 
         return new ValidationException($validator);
     }
+
+    protected function getValidator($data = [], $rules = [])
+    {
+        $translator = new Translator(new ArrayLoader, 'en');
+
+        return new Validator($translator, $data, $rules);
+    }
 }