From c1aff96eb05cb681ba0a78cd1ff36d4bea6a207a Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Wed, 9 Jan 2013 10:35:45 +0100
Subject: [PATCH] [Form] Fixed regression introduced when merging 2.1 into
 master

---
 src/Symfony/Component/Form/FormBuilder.php           | 1 -
 src/Symfony/Component/Form/Tests/FormBuilderTest.php | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index 9d11b5f750..0dfd8d0962 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -211,7 +211,6 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
     {
         $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
index 6836ea140d..14c8746f8b 100644
--- a/src/Symfony/Component/Form/Tests/FormBuilderTest.php
+++ b/src/Symfony/Component/Form/Tests/FormBuilderTest.php
@@ -247,17 +247,14 @@ class FormBuilderTest extends \PHPUnit_Framework_TestCase
 
         $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));