Correcting 'defaults' functionality, and add tests for it

Author: emsifa

src/Validation.php

@@ -21,7 +21,8 @@ class Validation
 
     protected $messageSeparator = ':';
 
-    protected $validata = [];
+    protected $validData = [];
+    protected $invalidData = [];
 
     public function __construct(Validator $validator, array $inputs, array $rules, array $messages = array())
     {
@@ -75,27 +76,34 @@ protected function validateAttribute(Attribute $attribute)
         $value = $this->getValue($attributeKey);
         $isEmptyValue = $this->isEmptyValue($value);
 
+        $isValid = true;
         foreach($rules as $ruleValidator) {
             if ($isEmptyValue && $ruleValidator instanceof Defaults) {
-                $default = $ruleValidator->check(null);
-                $this->validata[$attributeKey] = $default;
-            } else {
-                $this->validata[$attributeKey] = $value;
+                $value = $ruleValidator->check(null);
+                $isEmptyValue = $this->isEmptyValue($value);
+                continue;
             }
+
             if ($isEmptyValue AND $this->ruleIsOptional($attribute, $ruleValidator)) {
                 continue;
             }
 
             $valid = $ruleValidator->check($value);
 
             if (!$valid) {
+                $isValid = false;
                 $this->addError($attribute, $value, $ruleValidator);
-
                 if ($ruleValidator->isImplicit()) {
                     break;
                 }
             }
         }
+
+        if ($isValid) {
+            $this->validData[$attributeKey] = $value;
+        } else {
+            $this->invalidData[$attributeKey] = $value;
+        }
     }
 
     protected function isArrayAttribute(Attribute $attribute)
@@ -431,8 +439,18 @@ protected function resolveInputAttributes(array $inputs)
         return $resolvedInputs;
     }
 
-    public function getValidata() {
-        return $this->validata;
+    public function getValidatedData() {
+        return array_merge($this->validData, $this->invalidData);
+    }
+
+    public function getValidData()
+    {
+        return $this->validData;
+    }
+
+    public function getInvalidData()
+    {
+        return $this->invalidData;
     }
 
 }

src/Validator.php

@@ -105,6 +105,7 @@ protected function registerBaseValidators()
             'before'                    => new Rules\Before,
             'after'                     => new Rules\After,
             'defaults'                  => new Rules\Defaults,
+            'default'                   => new Rules\Defaults, // alias of defaults
         ];
 
         foreach($baseValidator as $key => $validator) {

tests/Rules/DefaultsTest.php

@@ -0,0 +1,20 @@
+<?php
+
+use Rakit\Validation\Rules\Defaults;
+
+class DefaultsTest extends PHPUnit_Framework_TestCase
+{
+
+    public function setUp()
+    {
+        $this->rule = new Defaults;
+    }
+
+    public function testDefaults()
+    {
+        $this->assertEquals($this->rule->fillParameters([10])->check(null), 10);
+        $this->assertEquals($this->rule->fillParameters(['something'])->check(null), 'something');
+        $this->assertEquals($this->rule->fillParameters([[1,2,3]])->check('anything'), [1,2,3]);
+    }
+
+}

tests/ValidatorTest.php

@@ -709,4 +709,44 @@ public function testSetAttributeAliases()
         $this->assertEquals($errors->first('something:numeric'), 'Baz baz');
         $this->assertEquals($errors->first('comments.0.text:required'), 'Qux qux');
     }
+
+    public function testUsingDefaults()
+    {
+        $validation = $this->validator->validate([
+            'is_active' => null,
+            'is_published' => 'invalid-value'
+        ], [
+            'is_active' => 'defaults:0|required|in:0,1',
+            'is_enabled' => 'defaults:1|required|in:0,1',
+            'is_published' => 'required|in:0,1'
+        ]);
+
+        $this->assertFalse($validation->passes());
+
+        $errors = $validation->errors();
+        $this->assertNull($errors->first('is_active'));
+        $this->assertNull($errors->first('is_enabled'));
+        $this->assertNotNull($errors->first('is_published'));
+
+        // Getting (all) validated data
+        $validatedData = $validation->getValidatedData();
+        $this->assertEquals($validatedData, [
+            'is_active' => '0',
+            'is_enabled' => '1',
+            'is_published' => 'invalid-value'
+        ]);
+        
+        // Getting only valid data
+        $validData = $validation->getValidData();
+        $this->assertEquals($validData, [
+            'is_active' => '0',
+            'is_enabled' => '1'
+        ]);
+
+        // Getting only invalid data
+        $invalidData = $validation->getInvalidData();
+        $this->assertEquals($invalidData, [
+            'is_published' => 'invalid-value',
+        ]);
+    }
 }