Skip to content

Commit e6f702e

Browse files
Merge branch '2.3' into 2.5
* 2.3: [2.3] Remove useless tests skips [2.3] Cleanup deprecations Conflicts: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/Debug/Tests/MockExceptionHandler.php src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php src/Symfony/Component/Security/Tests/Core/Validator/Constraints/UserPasswordValidatorTest.php src/Symfony/Component/Security/composer.json
2 parents 44e05e6 + d6c7a04 commit e6f702e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Controller/ExceptionControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ExceptionControllerTest extends TestCase
1919
{
2020
public function testOnlyClearOwnOutputBuffers()
2121
{
22-
$flatten = $this->getMock('Symfony\Component\HttpKernel\Exception\FlattenException');
22+
$flatten = $this->getMock('Symfony\Component\Debug\Exception\FlattenException');
2323
$flatten
2424
->expects($this->once())
2525
->method('getStatusCode')

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=5.3.3",
2020
"symfony/twig-bridge": "~2.5",
2121
"symfony/http-foundation": "~2.5",
22-
"symfony/http-kernel": "~2.1"
22+
"symfony/http-kernel": "~2.3,>=2.3.24"
2323
},
2424
"require-dev": {
2525
"symfony/stopwatch": "~2.2",

0 commit comments

Comments
 (0)