merged branch bschussek/bugfix (PR #6630)

fabpot · fabpot · commit b981a6fa6081 · 2013-01-09T10:47:19.000+01:00
This PR was merged into the master branch. Commits ------- c1aff96 [Form] Fixed regression introduced when merging 2.1 into master Discussion ---------- [Form] Fixed regression introduced when merging 2.1 into master Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - License of the code: MIT Documentation PR: -
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
@@ -211,7 +211,6 @@ public function getFormConfig()
     {
         $config = parent::getFormConfig();
 
-        $config->factory = null;
         $config->parent = null;
         $config->children = array();
         $config->unresolvedChildren = array();
diff --git a/src/Symfony/Component/Form/Tests/FormBuilderTest.php b/src/Symfony/Component/Form/Tests/FormBuilderTest.php
@@ -247,17 +247,14 @@ public function testGetFormConfigErasesReferences()
 
         $config = $builder->getFormConfig();
         $reflClass = new \ReflectionClass($config);
-        $factory = $reflClass->getProperty('factory');
         $parent = $reflClass->getProperty('parent');
         $children = $reflClass->getProperty('children');
         $unresolvedChildren = $reflClass->getProperty('unresolvedChildren');
 
-        $factory->setAccessible(true);
         $parent->setAccessible(true);
         $children->setAccessible(true);
         $unresolvedChildren->setAccessible(true);
 
-        $this->assertNull($factory->getValue($config));
         $this->assertNull($parent->getValue($config));
         $this->assertEmpty($children->getValue($config));
         $this->assertEmpty($unresolvedChildren->getValue($config));

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,6 @@ public function getFormConfig()`
`211`	`211`	`{`
`212`	`212`	`$config = parent::getFormConfig();`
`213`	`213`
`214`		`- $config->factory = null;`
`215`	`214`	`$config->parent = null;`
`216`	`215`	`$config->children = array();`
`217`	`216`	`$config->unresolvedChildren = array();`