🐛 FIX: Do not change value on error #8

elie29 · Feb 23, 2019 · 42b3fda · 42b3fda
1 parent eba7efe
commit 42b3fda
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/Rule/ArrayRule.php b/src/Rule/ArrayRule.php
@@ -64,10 +64,11 @@ public function __construct(string $key, $value, array $params = [])
 
     public function getValue()
     {
-        if (! $this->value) {
-            return [];
+        // don't change value on error or if it is not empty
+        if ($this->value || $this->error) {
+            return $this->value;
         }
-        return $this->value;
+        return [];
     }
 
     public function validate(): int

diff --git a/src/Rule/BicRule.php b/src/Rule/BicRule.php
@@ -29,7 +29,7 @@ class BicRule extends AbstractRule
      * Params could have the following structure:
      * [
      *   'required' => {bool:optional:false by default},
-     *    'trim' => {bool:optional:true by default},
+     *   'trim' => {bool:optional:true by default},
      *   'messages' => {array:optional:key/value message patterns}
      * ]
      */

diff --git a/src/Rule/BooleanRule.php b/src/Rule/BooleanRule.php
@@ -51,7 +51,7 @@ public function __construct(string $key, $value, array $params = [])
 
     public function getValue()
     {
-        if ($this->cast) {
+        if ($this->cast && ! $this->error) {
             return (bool) $this->value;
         }
         return $this->value;

diff --git a/src/Rule/NumericRule.php b/src/Rule/NumericRule.php
@@ -78,7 +78,7 @@ public function __construct(string $key, $value, array $params = [])
 
     public function getValue()
     {
-        if ($this->cast) {
+        if ($this->cast && ! $this->error) {
             // float or int and empty value
             return $this->value ? 0 + $this->value : 0;
         }