symfony · Burgov · Mar 6, 2012
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -51,6 +51,7 @@ public function getDefaultOptions(array $options)
            'query_builder'     => null,
            'loader'            => null,
            'group_by'          => null,
+            'choices'           => null,
        );

        $options = array_replace($defaultOptions, $options);

diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -222,31 +222,38 @@ public function createNamedBuilder($type, $name, $data = null, array $options =
        $defaultOptions = array();
        $optionValues = array();
        $passedOptions = $options;
+        $parentOptions = $options;

        // Bottom-up determination of the type hierarchy
        // Start with the actual type and look for the parent type
        // The complete hierarchy is saved in $types, the first entry being
        // the root and the last entry being the leaf (the concrete type)
        while (null !== $type) {
            if ($type instanceof FormTypeInterface) {
-                if ($type->getName() == $type->getParent($options)) {
-                    throw new FormException(sprintf('The form type name "%s" for class "%s" cannot be the same as the parent type.', $type->getName(), get_class($type)));
-                }
-
                $this->addType($type);
            } elseif (is_string($type)) {
                $type = $this->getType($type);
            } else {
                throw new UnexpectedTypeException($type, 'string or Symfony\Component\Form\FormTypeInterface');
            }

+            $parentOptions = array_replace($type->getDefaultOptions($parentOptions), $parentOptions);
+            foreach ($type->getExtensions() as $typeExtension) {
+                $parentOptions = array_replace($typeExtension->getDefaultOptions($parentOptions), $parentOptions);
+            }
+
+            $parentType = $type->getParent($parentOptions);
+            if ($type->getName() == $parentType) {
+                throw new FormException(sprintf('The form type name "%s" for class "%s" cannot be the same as the parent type.', $type->getName(), get_class($type)));
+            }
+
            array_unshift($types, $type);

            // getParent() cannot see default options set by this type nor
            // default options set by parent types
            // As a result, the options always have to be checked for
            // existence with isset() before using them in this method.
-            $type = $type->getParent($options);
+            $type = $parentType;
        }

        // Top-down determination of the options and default options

diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/FooChildType.php b/tests/Symfony/Tests/Component/Form/Fixtures/FooChildType.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Tests\Component\Form\Fixtures;
+
+use Symfony\Component\Form\AbstractType;
+
+class FooChildType extends AbstractType
+{
+
+    public function getName()
+    {
+        return 'foo_child';
+    }
+
+    public function getParent(array $options)
+    {
+        return new FooType();
+    }
+
+    public function getDefaultOptions(array $options)
+    {
+        return array(
+            'parent' => new FooParentType()
+        );
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/FooParentType.php b/tests/Symfony/Tests/Component/Form/Fixtures/FooParentType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Symfony\Tests\Component\Form\Fixtures;
+
+use Symfony\Component\Form\AbstractType;
+
+class FooParentType extends AbstractType
+{
+
+    public function getName()
+    {
+        return 'foo_parent';
+    }
+
+    public function getParent(array $options)
+    {
+        return null;
+    }
+}
diff --git a/tests/Symfony/Tests/Component/Form/Fixtures/FooType.php b/tests/Symfony/Tests/Component/Form/Fixtures/FooType.php
@@ -32,6 +32,7 @@ public function getDefaultOptions(array $options)
            'required' => false,
            'max_length' => null,
            'a_or_b' => 'a',
+            'parent' => null
        );
    }

@@ -44,6 +45,6 @@ public function getAllowedOptionValues(array $options)

    public function getParent(array $options)
    {
-        return null;
+        return $options['parent'];
    }
 }
diff --git a/tests/Symfony/Tests/Component/Form/FormFactoryTest.php b/tests/Symfony/Tests/Component/Form/FormFactoryTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Form\Guess\TypeGuess;
 use Symfony\Tests\Component\Form\Fixtures\TestExtension;
 use Symfony\Tests\Component\Form\Fixtures\FooType;
+use Symfony\Tests\Component\Form\Fixtures\FooChildType;
 use Symfony\Tests\Component\Form\Fixtures\FooTypeBarExtension;
 use Symfony\Tests\Component\Form\Fixtures\FooTypeBazExtension;

@@ -530,6 +531,17 @@ public function testUnknownOption()
        );
        $factory->createNamedBuilder($type, "text", "value", array("unknown" => "opt"));
    }
+
+    public function testChildDefaultOptionIsPassedToChildsGetParentMethod()
+    {
+        $type = new FooChildType();
+
+        $builder = $this->factory->createNamedBuilder($type, 'foo_child');
+        $this->assertEquals(3, count($builder->getTypes()));
+
+        $builder = $this->factory->createNamedBuilder($type, 'foo_child', null, array('parent'=>null));
+        $this->assertEquals(2, count($builder->getTypes()));
+    }

    private function createMockFactory(array $methods = array())
    {