diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-12 09:47:54 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-02-12 09:47:54 +0100 |
| commit | 1becbbdab19283e5c19eb8072965865a60e33876 (patch) | |
| tree | fc1f02ca945567c26bb9cbd5c0572ff4df5307f2 /Core/Util | |
| parent | 2f1aeb2cdba0ee1809dab7ec0d2cafaaa7100a45 (diff) | |
| parent | 6fa94f258d7739d5b5c6063716725204c6745a87 (diff) | |
| download | symfony-security-1becbbdab19283e5c19eb8072965865a60e33876.zip symfony-security-1becbbdab19283e5c19eb8072965865a60e33876.tar.gz symfony-security-1becbbdab19283e5c19eb8072965865a60e33876.tar.bz2 | |
Merge branch '2.7'
* 2.7: (26 commits)
removed Propel bridge from Symfony Core
[2.7] Added deprecation warning for get request service in controller
[Serializer] Normalizers can serialize collections and scalars
[FrameworkBundle] Fix title and placeholder rendering in php form templates.
[Process] added a deprecation notice
[TwigBridge] Removed duplicated code from TwigRenderer
[Translator][Logging] implement TranslatorBagInterface.
RequestDataCollector - small fix
renamed composer.phar to composer to be consistent with the Symfony docs
[FrameworkBundle] bumped min version of Routing to 2.3
removed composer --dev option everywhere
fixed a test
[Console] Fixed output bug, if escaped string in a formatted string.
“console help” ignores --raw option
Fix form icon position in web profiler
[Security] Remove ContextListener's onKernelResponse listener as it is used
Revert "minor #12652 [HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value (skler)"
Revert "fixed assertion"
fixed assertion
[HttpFoundation] [Hackday] #9942 test: Request::getContent() for null value
...
Conflicts:
composer.json
src/Symfony/Bridge/Propel1/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
Diffstat (limited to 'Core/Util')
0 files changed, 0 insertions, 0 deletions