Stops validation if a custom rule specifies it

Author: peterfox

src/Illuminate/Contracts/Validation/StopUponFailure.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Illuminate\Contracts\Validation;
+
+interface StopUponFailure
+{
+    /**
+     * Trigger the validation of the field to no longer continue.
+     *
+     * @return bool
+     */
+    public function shouldStop(): bool;
+}

src/Illuminate/Validation/Validator.php

@@ -8,6 +8,8 @@
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\ImplicitRule;
 use Illuminate\Contracts\Validation\Rule as RuleContract;
+use Illuminate\Contracts\Validation\StopUponFailure;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 use Illuminate\Support\Arr;
@@ -480,7 +482,7 @@ public function passes()
                     break;
                 }
 
-                if ($this->shouldStopValidating($attribute)) {
+                if ($this->shouldStopValidating($attribute, $rule)) {
                     break;
                 }
             }
@@ -907,16 +909,21 @@ protected function validateUsingCustomRule($attribute, $value, $rule)
      * Check if we should stop further validations on a given attribute.
      *
      * @param  string  $attribute
+     * @param  string|ValidationRule
      * @return bool
      */
-    protected function shouldStopValidating($attribute)
+    protected function shouldStopValidating($attribute, $rule)
     {
         $cleanedAttribute = $this->replacePlaceholderInString($attribute);
 
         if ($this->hasRule($attribute, ['Bail'])) {
             return $this->messages->has($cleanedAttribute);
         }
 
+        if ($rule instanceof InvokableValidationRule && $rule->invokable() instanceof StopUponFailure) {
+            return $rule->invokable()->shouldStop();
+        }
+
         if (isset($this->failedRules[$cleanedAttribute]) &&
             array_key_exists('uploaded', $this->failedRules[$cleanedAttribute])) {
             return true;

tests/Validation/ValidationStopOnFailureTest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Illuminate\Tests\Validation;
+
+use Closure;
+use Illuminate\Contracts\Validation\StopUponFailure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Translation\ArrayLoader;
+use Illuminate\Translation\Translator;
+use Illuminate\Validation\Validator;
+use PHPUnit\Framework\TestCase;
+
+class ValidationStopOnFailureTest extends TestCase
+{
+    public function testFailingStopsFurtherValidation()
+    {
+        $trans = new Translator(new ArrayLoader, 'en');
+        $v = new Validator(
+            $trans,
+            ['foo' => 'foobar'],
+            ['foo' =>  [new StoppingValidationRule(), 'numeric']],
+        );
+        $this->assertFalse($v->passes());
+        $this->assertEquals(
+            ['foo' => ['Illuminate\Tests\Validation\StoppingValidationRule' => []]],
+            $v->failed()
+        );
+    }
+}
+
+class StoppingValidationRule implements ValidationRule, StopUponFailure
+{
+    public function shouldStop(): bool
+    {
+        return true;
+    }
+
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $fail('failed');
+    }
+}