Permalink
Browse files

Merge branch '2.1'

* 2.1:
  [Form] removed comment now that PHPUnit 3.7 is out
  Add a Sigchild compatibility mode (set to false by default)
  fix Fatal error: Cannot access private property

Conflicts:
	src/Symfony/Component/Process/Process.php
  • Loading branch information...
2 parents e09302d + 32987d0 commit 6c8fb91ffbf720e3f7d9d56c0ba6a7e2121f472d @fabpot fabpot committed Sep 19, 2012
Showing with 2 additions and 7 deletions.
  1. +2 −7 Tests/ResolvedFormTypeTest.php
@@ -104,13 +104,8 @@ public function testCreateBuilder()
->method('setDefaultOptions')
->will($this->returnCallback($assertIndexAndAddOption(3, 'd', 'd_default')));
- // Can only be uncommented when the following PHPUnit "bug" is fixed:
- // https://github.com/sebastianbergmann/phpunit-mock-objects/issues/47
- // $givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
- // $resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
-
- $givenOptions = array();
- $resolvedOptions = array();
+ $givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
+ $resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
// Then the form is built for the super type
$parentType->expects($this->once())

0 comments on commit 6c8fb91

Please sign in to comment.