CollectionType alterFieldValues() items indexes/keys bugfix (#694)

kristijanhusak · May 18, 2022 · f070631 · f070631
1 parent 61bb1a2
commit f070631
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Kris/LaravelFormBuilder/Fields/CollectionType.php b/src/Kris/LaravelFormBuilder/Fields/CollectionType.php
@@ -79,10 +79,13 @@ public function getAllAttributes()
      */
     public function alterFieldValues(array &$values)
     {
-        foreach ($this->children as $i => $child) {
+        $stripLeft = strlen($this->getName()) + 1;
+        $stripRight = 1;
+        foreach ($this->children as $child) {
             if (method_exists($child, 'alterFieldValues')) {
-                if (isset($values[$i])) {
-                    $child->alterFieldValues($values[$i]);
+                $itemKey = substr($child->getName(), $stripLeft, -$stripRight);
+                if (isset($values[$itemKey])) {
+                    $child->alterFieldValues($values[$itemKey]);
                 }
             }
         }

diff --git a/tests/FormTest.php b/tests/FormTest.php
@@ -352,8 +352,8 @@ public function it_returns_altered_field_values()
         $this->request['name'] = 'lower case';
         $this->request['subcustom'] = ['title' => 'Bar foo', 'body' => 'Foo bar'];
         $this->request['subcustom_collection'] = [
-            ['title' => 'Item 1 title', 'body' => 'Item 1 body'],
-            ['title' => 'Item 2 title', 'body' => 'Item 2 body'],
+            5 => ['title' => 'Item 1 title', 'body' => 'Item 1 body'],
+            17 => ['title' => 'Item 2 title', 'body' => 'Item 2 body'],
         ];
 
         $customForm = $this->formBuilder->create('CustomNesterDummyForm');
@@ -364,8 +364,8 @@ public function it_returns_altered_field_values()
                 'options' => ['x'],
                 'subcustom' => ['title' => 'Bar foo', 'body' => 'FOO BAR'],
                 'subcustom_collection' => [
-                    ['title' => 'Item 1 title', 'body' => 'ITEM 1 BODY'],
-                    ['title' => 'Item 2 title', 'body' => 'ITEM 2 BODY'],
+                    5 => ['title' => 'Item 1 title', 'body' => 'ITEM 1 BODY'],
+                    17 => ['title' => 'Item 2 title', 'body' => 'ITEM 2 BODY'],
                 ],
             ],
             $customForm->getFieldValues()