added "skipOnError" ability & minor changes

src/Rule.php

@@ -15,20 +15,26 @@ abstract class Rule
     private ?string $translationDomain = null;
     private ?string $translationLocale = null;
     private bool $skipOnEmpty = false;
+    private bool $skipOnError = true;
 
     /**
      * Validates the value
      *
      * @param mixed $value value to be validated
      * @param DataSetInterface|null $dataSet optional data set that could be used for contextual validation
+     * @param bool $previousRulesErrored set to true if rule is part of a group of rules and one of the previous validations failed
      * @return Result
      */
-    final public function validate($value, DataSetInterface $dataSet = null): Result
+    final public function validate($value, DataSetInterface $dataSet = null, bool $previousRulesErrored = false): Result
     {
         if ($this->skipOnEmpty && $this->isEmpty($value)) {
             return new Result();
         }
 
+        if ($this->skipOnError && $previousRulesErrored) {
+            return new Result();
+        }
+
         return $this->validateValue($value, $dataSet);
     }
 
@@ -41,22 +47,25 @@ final public function validate($value, DataSetInterface $dataSet = null): Result
      */
     abstract protected function validateValue($value, DataSetInterface $dataSet = null): Result;
 
-    public function setTranslator(TranslatorInterface $translator): self
+    public function withTranslator(TranslatorInterface $translator): self
     {
-        $this->translator = $translator;
-        return $this;
+        $new = clone $this;
+        $new->translator = $translator;
+        return $new;
     }
 
-    public function setTranslationDomain(string $translation): self
+    public function withTranslationDomain(string $translation): self
     {
-        $this->translationDomain = $translation;
-        return $this;
+        $new = clone $this;
+        $new->translationDomain = $translation;
+        return $new;
     }
 
-    public function setTranslationLocale(string $locale): self
+    public function withTranslationLocale(string $locale): self
     {
-        $this->translationLocale = $locale;
-        return $this;
+        $new = clone $this;
+        $new->translationLocale = $locale;
+        return $new;
     }
 
     public function translateMessage(string $message, array $arguments = []): string
@@ -73,6 +82,13 @@ public function translateMessage(string $message, array $arguments = []): string
         );
     }
 
+    public function skipOnError(bool $value): self
+    {
+        $new = clone $this;
+        $new->skipOnError = $value;
+        return $new;
+    }
+
     /**
      * @param bool $value if validation should be skipped if value validated is empty
      * @return self

src/Rules.php

@@ -46,15 +46,15 @@ private function normalizeRule($rule): Rule
         }
 
         if ($this->translator !== null) {
-            $rule->setTranslator($this->translator);
+            $rule->withTranslator($this->translator);
         }
 
         if ($this->translationDomain !== null) {
-            $rule->setTranslationDomain($this->translationDomain);
+            $rule->withTranslationDomain($this->translationDomain);
         }
 
         if ($this->translationLocale !== null) {
-            $rule->setTranslationLocale($this->translationLocale);
+            $rule->withTranslationLocale($this->translationLocale);
         }
 
         return $rule;
@@ -65,12 +65,16 @@ public function add(Rule $rule): void
         $this->rules[] = $this->normalizeRule($rule);
     }
 
-    public function validate($value, DataSetInterface $dataSet = null): Result
+    public function validate($value, DataSetInterface $dataSet = null, bool $previousRulesErrored = false): Result
     {
         $compoundResult = new Result();
+        /**
+         * @var $rule Rule
+         */
         foreach ($this->rules as $rule) {
-            $ruleResult = $rule->validate($value, $dataSet);
+            $ruleResult = $rule->validate($value, $dataSet, $previousRulesErrored);
             if ($ruleResult->isValid() === false) {
+                $previousRulesErrored = true;
                 foreach ($ruleResult->getErrors() as $message) {
                     $compoundResult->addError($message);
                 }

src/Validator.php

@@ -44,11 +44,10 @@ public function __construct(
     public function validate(DataSetInterface $dataSet): ResultSet
     {
         $results = new ResultSet();
-
         foreach ($this->attributeRules as $attribute => $rules) {
             $results->addResult(
                 $attribute,
-                $rules->validate($dataSet->getAttributeValue($attribute))
+                $rules->validate($dataSet->getAttributeValue($attribute), $dataSet)
             );
         }
         return $results;

tests/RulesTest.php

@@ -55,4 +55,20 @@ static function ($value): Result {
         $this->assertFalse($result->isValid());
         $this->assertCount(1, $result->getErrors());
     }
+
+    public function testSkipOnError()
+    {
+        $rules = new Rules(
+            [
+                (new Number())->min(10),
+                (new Number())->min(10)->skipOnError(false),
+                (new Number())->min(10)
+            ]
+        );
+
+        $result = $rules->validate(1);
+
+        $this->assertFalse($result->isValid());
+        $this->assertCount(2, $result->getErrors());
+    }
 }

tests/ValidatorTest.php

@@ -72,7 +72,7 @@ static function ($value): Result {
 
         $intResult = $results->getResult('int');
         $this->assertFalse($intResult->isValid());
-        $this->assertCount(2, $intResult->getErrors());
+        $this->assertCount(1, $intResult->getErrors());
     }
 
     public function testAddingRulesOneByOne(): void