Skip to content

Commit 184f5af

Browse files
Merge branch '2.6' into 2.7
* 2.6: [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/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Debug/composer.json src/Symfony/Component/Form/ButtonBuilder.php src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php src/Symfony/Component/HttpKernel/Exception/FlattenException.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
2 parents df13e64 + 6465828 commit 184f5af

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
@@ -20,7 +20,7 @@ class ExceptionControllerTest extends TestCase
2020
{
2121
public function testOnlyClearOwnOutputBuffers()
2222
{
23-
$flatten = $this->getMock('Symfony\Component\HttpKernel\Exception\FlattenException');
23+
$flatten = $this->getMock('Symfony\Component\Debug\Exception\FlattenException');
2424
$flatten
2525
->expects($this->once())
2626
->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.6|~3.0.0",
2121
"symfony/http-foundation": "~2.5|~3.0.0",
22-
"symfony/http-kernel": "~2.1|~3.0.0"
22+
"symfony/http-kernel": "~2.3,>=2.3.24|~3.0.0"
2323
},
2424
"require-dev": {
2525
"symfony/stopwatch": "~2.2|~3.0.0",

0 commit comments

Comments
 (0)