diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-06-04 22:11:39 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-06-04 22:11:39 +0200 |
commit | 8915e9198f12f52529c384599d735974f43f2a6f (patch) | |
tree | 2197917c4275c443fc1db09a04cc92a1c6830359 /Core/Encoder/EncoderAwareInterface.php | |
parent | c1c3818ea43fa8149223a4b55d694327d226e27b (diff) | |
parent | 86642118470f5301b4e29b8fb7d3dfe876c2e83e (diff) | |
download | symfony-security-8915e9198f12f52529c384599d735974f43f2a6f.zip symfony-security-8915e9198f12f52529c384599d735974f43f2a6f.tar.gz symfony-security-8915e9198f12f52529c384599d735974f43f2a6f.tar.bz2 |
Merge branch '2.3' into 2.6
* 2.3:
Improve the config validation in TwigBundle
[Security][Acl] enforce string identifiers
[BrowserKit] Fix bug when uri starts with http.
bumped Symfony version to 2.3.31
updated VERSION for 2.3.30
updated CHANGELOG for 2.3.30
Php Inspections (EA Extended): - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString -resolved implicit magic methods calls -resolved callable name case mismatches
Conflicts:
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Core/Encoder/EncoderAwareInterface.php')
0 files changed, 0 insertions, 0 deletions