Skip to content

Commit f1e6063

Browse files
committed
[Form] removed comment now that PHPUnit 3.7 is out
1 parent 8cb1ff3 commit f1e6063

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,8 @@ public function testCreateBuilder()
104104
->method('setDefaultOptions')
105105
->will($this->returnCallback($assertIndexAndAddOption(3, 'd', 'd_default')));
106106

107-
// Can only be uncommented when the following PHPUnit "bug" is fixed:
108-
// https://github.com/sebastianbergmann/phpunit-mock-objects/issues/47
109-
// $givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
110-
// $resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
111-
112-
$givenOptions = array();
113-
$resolvedOptions = array();
107+
$givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
108+
$resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
114109

115110
// Then the form is built for the super type
116111
$parentType->expects($this->once())

0 commit comments

Comments
 (0)