Merge branch 'stevebauman/8.x' into 8.x

Author: taylorotwell

src/Illuminate/Validation/Validator.php

@@ -15,6 +15,7 @@
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\Str;
 use Illuminate\Support\ValidatedInput;
+use InvalidArgumentException;
 use RuntimeException;
 use stdClass;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -275,6 +276,13 @@ class Validator implements ValidatorContract
      */
     protected $dotPlaceholder;
 
+    /**
+     * The exception to throw upon failure.
+     *
+     * @var string
+     */
+    protected $exception = ValidationException::class;
+
     /**
      * Create a new Validator instance.
      *
@@ -475,9 +483,7 @@ protected function removeAttribute($attribute)
      */
     public function validate()
     {
-        if ($this->fails()) {
-            throw new ValidationException($this);
-        }
+        throw_if($this->fails(), $this->exception, $this);
 
         return $this->validated();
     }
@@ -520,9 +526,7 @@ public function safe()
      */
     public function validated()
     {
-        if ($this->invalid()) {
-            throw new ValidationException($this);
-        }
+        throw_if($this->invalid(), $this->exception, $this);
 
         $results = [];
 
@@ -1375,6 +1379,27 @@ public function setPresenceVerifier(PresenceVerifierInterface $presenceVerifier)
         $this->presenceVerifier = $presenceVerifier;
     }
 
+    /**
+     * Set the exception to throw upon failed validation.
+     *
+     * @param  string  $exception
+     * @return $this
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setException($exception)
+    {
+        if (! is_a($exception, ValidationException::class, true)) {
+            throw new InvalidArgumentException(
+                sprintf('Exception [%s] is invalid. It must extend [%s].', $exception, ValidationException::class)
+            );
+        }
+
+        $this->exception = $exception;
+
+        return $this;
+    }
+
     /**
      * Get the Translator implementation.
      *

tests/Validation/ValidationValidatorTest.php

@@ -627,6 +627,34 @@ public function testCustomValidationLinesAreRespectedWithAsterisks()
         $this->assertSame('english is required!', $v->messages()->first('lang.en'));
     }
 
+    public function testCustomException()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+
+        $v = new Validator($trans, ['name' => ''], ['name' => 'required']);
+
+        $exception = new class($v) extends ValidationException {};
+        $v->setException($exception);
+
+        try {
+            $v->validate();
+        } catch (ValidationException $e) {
+            $this->assertSame($exception, $e);
+        }
+    }
+
+    public function testCustomExceptionMustExtendValidationException()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+
+        $v = new Validator($trans, [], []);
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Exception [RuntimeException] is invalid. It must extend [Illuminate\Validation\ValidationException].');
+
+        $v->setException(\RuntimeException::class);
+    }
+
     public function testValidationDotCustomDotAnythingCanBeTranslated()
     {
         $trans = $this->getIlluminateArrayTranslator();