Skip to content

Commit bbc0c95

Browse files
Merge branch '2.5' into 2.6
* 2.5: [2.3] Remove useless tests skips [ClassLoader] removes deprecated classes from documentation. [ClassLoader] added missing deprecation notice. [HttpFoundation] Fix an issue caused by php's Bug #66606. [Yaml] Update README.md Don't add Accept-Range header on unsafe HTTP requests simplify hasScheme method adapted merge to 2.5 adapted previous commit for 2.3 [Security] Don't send remember cookie for sub request [Security] fixed wrong phpdoc [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri [2.3] Cleanup deprecations Conflicts: src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig src/Symfony/Component/HttpKernel/composer.json
2 parents 1e5ba4f + 21ec84c commit bbc0c95

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)