diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 16:46:01 +0100 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-01-03 16:46:01 +0100 |
commit | d2f58560d2690e98b7ead329eb33589ca6b4cb70 (patch) | |
tree | d91766a96d1846f2c46f6f7281cb83f7435a98e7 /Core/SecurityContext.php | |
parent | 372ec330bc9242dca13bc53326e00820fa868811 (diff) | |
parent | b1d5c3526ab1278959d1252c4cdda6b8f3a6452a (diff) | |
download | symfony-security-d2f58560d2690e98b7ead329eb33589ca6b4cb70.zip symfony-security-d2f58560d2690e98b7ead329eb33589ca6b4cb70.tar.gz symfony-security-d2f58560d2690e98b7ead329eb33589ca6b4cb70.tar.bz2 |
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
Diffstat (limited to 'Core/SecurityContext.php')
0 files changed, 0 insertions, 0 deletions