Merge pull request #13 from MichaelGooden/feature/nested-values-prese…

…rve-keys Optionally preserve keys in Field nested values
DASPRiD · Apr 19, 2017 · 665f78f · 665f78f
2 parents 94ebc0b + 79c43a7
commit 665f78f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/Field.php b/src/Field.php
@@ -66,15 +66,19 @@ public function getIndexes() : array
     /**
      * @return string[]
      */
-    public function getNestedValues() : array
+    public function getNestedValues(bool $preserveKeys = false) : array
     {
         $values = [];
 
         foreach ($this->getIndexes() as $index) {
             $key = $this->key . '[' . $index . ']';
 
             if ($this->data->hasKey($key)) {
-                $values[] = $this->data->getValue($key);
+                if ($preserveKeys) {
+                    $values[$index] = $this->data->getValue($key);
+                } else {
+                    $values[] = $this->data->getValue($key);
+                }
             }
         }
 

diff --git a/test/FieldTest.php b/test/FieldTest.php
@@ -68,4 +68,29 @@ public function testGetNestedValues()
 
         $this->assertSame(['bar0', 'bar1'], $field->getNestedValues());
     }
+
+    public function testGetNestedValuesPreserveKeys()
+    {
+        $field = new Field('foo', '', new FormErrorSequence(), Data::fromFlatArray([
+            'foo[bar]' => 'bar0',
+            'foo[baz]' => 'baz0',
+            'foo[1][baz]' => 'bar2',
+        ]));
+
+        $this->assertSame([
+            'bar' => 'bar0',
+            'baz' => 'baz0'
+        ], $field->getNestedValues(true));
+    }
+
+    public function testGetNestedValuesNoPreserveKeys()
+    {
+        $field = new Field('foo', '', new FormErrorSequence(), Data::fromFlatArray([
+            'foo[bar]' => 'bar0',
+            'foo[baz]' => 'baz0',
+            'foo[1][baz]' => 'bar2',
+        ]));
+
+        $this->assertSame(['bar0', 'baz0'], $field->getNestedValues());
+    }
 }