Merge pull request #38 from rakit/fix-get-valid-data-on-array-attr

Fix getValidData and getInvalidData on array attribute

Author: emsifa

src/Validation.php

@@ -103,9 +103,9 @@ protected function validateAttribute(Attribute $attribute)
         }
 
         if ($isValid) {
-            $this->validData[$attributeKey] = $value;
+            $this->setValidData($attribute, $value);
         } else {
-            $this->invalidData[$attributeKey] = $value;
+            $this->setInvalidData($attribute, $value);
         }
     }
 
@@ -462,11 +462,31 @@ public function getValidatedData() {
         return array_merge($this->validData, $this->invalidData);
     }
 
+    protected function setValidData(Attribute $attribute, $value)
+    {
+        $key = $attribute->getKey();
+        if ($attribute->isArrayAttribute()) {
+            Helper::arraySet($this->validData, $key, $value);   
+        } else {
+            $this->validData[$key] = $value;
+        }
+    }
+
     public function getValidData()
     {
         return $this->validData;
     }
 
+    protected function setInvalidData(Attribute $attribute, $value)
+    {
+        $key = $attribute->getKey();
+        if ($attribute->isArrayAttribute()) {
+            Helper::arraySet($this->invalidData, $key, $value);   
+        } else {
+            $this->invalidData[$key] = $value;
+        }
+    }
+
     public function getInvalidData()
     {
         return $this->invalidData;

tests/ValidatorTest.php

@@ -900,4 +900,63 @@ public function testSameRuleOnArrayAttribute()
         $this->assertNotNull($errors->first('users.1.password_confirmation:same'));
     }
 
+    public function testGetValidData()
+    {
+        $validation = $this->validator->validate([
+            'items' => [
+                [
+                    'product_id' => 1,
+                    'qty' => 'invalid'
+                ]
+            ],
+            'thing' => 'exists',
+        ], [
+            'thing' => 'required',
+            'items.*.product_id' => 'required|numeric',
+            'items.*.qty' => 'required|numeric',
+            'something' => 'default:on|required|in:on,off'
+        ]);
+
+        $validData = $validation->getValidData();
+
+        $this->assertEquals([
+            'items' => [
+                [
+                    'product_id' => 1
+                ]
+            ],
+            'thing' => 'exists',
+            'something' => 'on'
+        ], $validData);
+    }
+
+    public function testGetInvalidData()
+    {
+        $validation = $this->validator->validate([
+            'items' => [
+                [
+                    'product_id' => 1,
+                    'qty' => 'invalid'
+                ]
+            ],
+            'thing' => 'exists',
+        ], [
+            'thing' => 'required',
+            'items.*.product_id' => 'required|numeric',
+            'items.*.qty' => 'required|numeric',
+            'something' => 'required|in:on,off'
+        ]);
+
+        $invalidData = $validation->getInvalidData();
+
+        $this->assertEquals([
+            'items' => [
+                [
+                    'qty' => 'invalid'
+                ]
+            ],
+            'something' => null
+        ], $invalidData);
+    }
+
 }