Skip to content

Commit 21ec84c

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 3fc47bd + 78c56bf commit 21ec84c

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Tests/Functional/app/AppKernel.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ public function registerBundles()
7474
return include $filename;
7575
}
7676

77-
public function init()
78-
{
79-
}
80-
8177
public function getRootDir()
8278
{
8379
return __DIR__;

0 commit comments

Comments
 (0)