Skip to content

Commit bfe4011

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: bumped Symfony version to 2.5.10 updated VERSION for 2.5.9 updated CHANGELOG for 2.5.9 bumped Symfony version to 2.3.25 updated VERSION for 2.3.24 update CONTRIBUTORS for 2.3.24 Removed unneeded version requirements updated CHANGELOG for 2.3.24 fixed tests [Security] Don't destroy the session on buggy php releases. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 98cebda + 8635a65 commit bfe4011

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

Tests/ResolvedFormTypeTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ public function testGetOptionsResolver()
100100

101101
public function testCreateBuilder()
102102
{
103-
if (version_compare(\PHPUnit_Runner_Version::id(), '3.7', '<')) {
104-
$this->markTestSkipped('This test requires PHPUnit 3.7.');
105-
}
106-
107103
$givenOptions = array('a' => 'a_custom', 'c' => 'c_custom');
108104
$resolvedOptions = array('a' => 'a_custom', 'b' => 'b_default', 'c' => 'c_custom', 'd' => 'd_default');
109105
$optionsResolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
@@ -132,10 +128,6 @@ public function testCreateBuilder()
132128

133129
public function testCreateBuilderWithDataClassOption()
134130
{
135-
if (version_compare(\PHPUnit_Runner_Version::id(), '3.7', '<')) {
136-
$this->markTestSkipped('This test requires PHPUnit 3.7.');
137-
}
138-
139131
$givenOptions = array('data_class' => 'Foo');
140132
$resolvedOptions = array('data_class' => '\stdClass');
141133
$optionsResolver = $this->getMock('Symfony\Component\OptionsResolver\OptionsResolverInterface');
@@ -164,10 +156,6 @@ public function testCreateBuilderWithDataClassOption()
164156

165157
public function testBuildForm()
166158
{
167-
if (version_compare(\PHPUnit_Runner_Version::id(), '3.7', '<')) {
168-
$this->markTestSkipped('This test requires PHPUnit 3.7.');
169-
}
170-
171159
$test = $this;
172160
$i = 0;
173161

0 commit comments

Comments
 (0)