Merge pull request #309 from kynx/nested-validation-group

Fix error validating form with nested custom fieldset

Author: Slamdunk

src/Form.php

@@ -22,6 +22,7 @@
 use function in_array;
 use function is_array;
 use function is_object;
+use function iterator_to_array;
 use function sprintf;
 
 /**
@@ -536,12 +537,24 @@ public function getValidationGroup(): ?array
      */
     protected function prepareValidationGroup(Fieldset $formOrFieldset, array $data, array &$validationGroup): void
     {
-        foreach ($validationGroup as $key => &$value) {
-            $fieldset = $formOrFieldset->iterator->get((string) $key);
+        $this->prepareFieldsetValidationGroup($formOrFieldset, $data, $validationGroup);
+    }
 
-            if (! $fieldset) {
+    /**
+     * @fixme This is here to preserve BC on `prepareValidationGroup` and can be removed on next major if that method's
+     *        signature is changed to accept a `FieldsetInterface`
+     */
+    private function prepareFieldsetValidationGroup(
+        FieldsetInterface $formOrFieldset,
+        array $data,
+        array &$validationGroup
+    ): void {
+        $elements = iterator_to_array($formOrFieldset->getIterator());
+        foreach ($validationGroup as $key => &$value) {
+            if (! isset($elements[$key])) {
                 continue;
             }
+            $fieldset = $elements[$key];
 
             if ($fieldset instanceof CollectionInterface) {
                 if (! isset($data[$key]) && $fieldset->getCount() === 0) {
@@ -563,7 +576,7 @@ protected function prepareValidationGroup(Fieldset $formOrFieldset, array $data,
             if (! isset($data[$key])) {
                 $data[$key] = [];
             }
-            $this->prepareValidationGroup($fieldset, $data[$key], $validationGroup[$key]);
+            $this->prepareFieldsetValidationGroup($fieldset, $data[$key], $validationGroup[$key]);
         }
     }
 

test/FormTest.php

@@ -25,6 +25,7 @@
 use Laminas\InputFilter\InputFilter;
 use Laminas\InputFilter\InputFilterInterface;
 use Laminas\InputFilter\InputInterface;
+use Laminas\Stdlib\PriorityList;
 use LaminasTest\Form\TestAsset\Entity\Category;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
@@ -607,6 +608,54 @@ public function testFormWithCollectionAndValidationGroupBindValuesToModel(): voi
         self::assertFalse(isset($model->foobar));
     }
 
+    public function testFormWithNestedCustomCollectionAndValidationGroupBindValuesToModel(): void
+    {
+        $model = new stdClass();
+        $data  = [
+            'foo'       => 'abcde',
+            'top_level' => [
+                'categories' => [
+                    [
+                        'name' => 'category',
+                    ],
+                ],
+            ],
+        ];
+        $this->populateForm();
+
+        $collection = self::createStub(CollectionInterface::class);
+        $collection->method('getName')
+            ->willReturn('categories');
+        $collection->method('getIterator')
+            ->willReturn(new PriorityList());
+        $collection->method('getTargetElement')
+            ->willReturn(new TestAsset\CategoryFieldset());
+
+        $fieldset = new Fieldset('top_level');
+        $fieldset->add($collection);
+
+        $this->form->add($fieldset);
+        $this->form->setHydrator(new ObjectPropertyHydrator());
+        $this->form->bind($model);
+        $this->form->setData($data);
+        $this->form->setValidationGroup([
+            'foo',
+            'top_level' => [
+                'categories' => [
+                    'name',
+                ],
+            ],
+        ]);
+        $this->form->isValid();
+
+        self::assertTrue(isset($model->top_level));
+        self::assertIsArray($model->top_level);
+        self::assertTrue(isset($model->top_level['categories']));
+        self::assertIsArray($model->top_level['categories']);
+        self::assertIsArray($model->top_level['categories'][0]);
+        self::assertEquals('category', $model->top_level['categories'][0]['name']);
+    }
+
     public function testSettingValidationGroupWithoutCollectionBindsOnlyThoseValuesToModel(): void
     {
         $model                 = new stdClass();