Permalink
Browse files

merged branch bschussek/bugfix (PR #6630)

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: -
  • Loading branch information...
2 parents 5a312d3 + 33b245b commit 2d5bede9479166fdabfdbd0cd5de256bcdfc97bd @fabpot fabpot committed Jan 9, 2013
Showing with 0 additions and 4 deletions.
  1. +0 −1 FormBuilder.php
  2. +0 −3 Tests/FormBuilderTest.php
View
1 FormBuilder.php
@@ -211,7 +211,6 @@ public function getFormConfig()
{
$config = parent::getFormConfig();
- $config->factory = null;
$config->parent = null;
$config->children = array();
$config->unresolvedChildren = array();
View
3 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));

0 comments on commit 2d5bede

Please sign in to comment.