symfony · T-Philipp · Aug 14, 2014 · Aug 8, 2014 · Aug 18, 2014 · Aug 15, 2014
diff --git a/ButtonBuilder.php b/ButtonBuilder.php
@@ -425,7 +425,7 @@ public function setType(ResolvedFormTypeInterface $type)
     *
     * This method should not be invoked.
     *
-     * @param array $data
+     * @param mixed $data
     *
     * @throws BadMethodCallException
     */

diff --git a/Extension/Validator/ViolationMapper/ViolationPath.php b/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -70,9 +70,17 @@ public function __construct($violationPath)
                        break;
                    }

-                    $this->elements[] = $elements[$i];
-                    $this->isIndex[] = true;
-                    $this->mapsForm[] = true;
+                    // All the following index items (regardless if .children is
+                    // explicitly used) are children and grand-children
+                    for (; $i < $l && $path->isIndex($i); ++$i) {
+                        $this->elements[] = $elements[$i];
+                        $this->isIndex[] = true;
+                        $this->mapsForm[] = true;
+                    }
+
+                    // Rewind the pointer as the last element above didn't match
+                    // (even if the pointer was moved forward)
+                    --$i;
                } elseif ('data' === $elements[$i] && $path->isProperty($i)) {
                    // Skip element "data"
                    ++$i;

diff --git a/FormBuilder.php b/FormBuilder.php
@@ -242,7 +242,7 @@ public function getIterator()
            throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
        }

-        return new \ArrayIterator($this->children);
+        return new \ArrayIterator($this->all());
    }

    /**

diff --git a/FormConfigBuilderInterface.php b/FormConfigBuilderInterface.php
@@ -212,7 +212,7 @@ public function setType(ResolvedFormTypeInterface $type);
    /**
     * Sets the initial data of the form.
     *
-     * @param array $data The data of the form in application format.
+     * @param mixed $data The data of the form in application format.
     *
     * @return self The configuration object.
     */

diff --git a/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -761,14 +761,14 @@ public function provideDefaultTests()
            array(self::LEVEL_2, 'address', '[address]', 'street', '[office][street]', 'data[address][office][street].prop'),

            // Edge cases which must not occur
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', 'street', 'children[address][street].prop'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address][street]'),
-            array(self::LEVEL_1, 'address', 'address', 'street', '[street]', 'children[address][street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', 'street', 'children[address][street].prop'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address][street]'),
-            array(self::LEVEL_1, 'address', '[address]', 'street', '[street]', 'children[address][street].prop'),
+            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address][street]'),
+            array(self::LEVEL_2, 'address', 'address', 'street', 'street', 'children[address][street].prop'),
+            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address][street]'),
+            array(self::LEVEL_2, 'address', 'address', 'street', '[street]', 'children[address][street].prop'),
+            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address][street]'),
+            array(self::LEVEL_2, 'address', '[address]', 'street', 'street', 'children[address][street].prop'),
+            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address][street]'),
+            array(self::LEVEL_2, 'address', '[address]', 'street', '[street]', 'children[address][street].prop'),

            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].children[address].children[street]'),
            array(self::LEVEL_0, 'address', 'person.address', 'street', 'street', 'children[person].children[address].data.street'),

diff --git a/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php b/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
@@ -30,7 +30,8 @@ public function providePaths()
            )),
            array('children[address][street]', array(
                array('address', true, true),
-            ), 'children[address]'),
+                array('street', true, true),
+            ), 'children[address].children[street]'),
            array('children[address].data', array(
                array('address', true, true),
            ), 'children[address]'),