diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-24 10:37:00 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-24 10:37:00 +0200 |
| commit | d9b548e5f2683b14519b7c1fcf00e9e8403b77be (patch) | |
| tree | 05708802672a95900c3097c4e8ea0914606dfd06 /Core/Authentication/SimplePreAuthenticatorInterface.php | |
| parent | 999b2896fe878d343d8b0de62694eea745a36665 (diff) | |
| parent | 9aa9f4801b98bccbf1ec6b93d1f36aea43829be7 (diff) | |
| download | symfony-security-d9b548e5f2683b14519b7c1fcf00e9e8403b77be.zip symfony-security-d9b548e5f2683b14519b7c1fcf00e9e8403b77be.tar.gz symfony-security-d9b548e5f2683b14519b7c1fcf00e9e8403b77be.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[Twig+FrameworkBundle] Fix forward compat with Form 2.8
[2.6] Static Code Analysis for Components
[Security/Http] Fix test relying on a private property
[Serializer] Fix bugs reported in https://github.com/symfony/symfony/commit/b5990be49149501bef7bb83a797a1aea2eb5fbe0#commitcomment-12301266
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
src/Symfony/Component/Security/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php
Diffstat (limited to 'Core/Authentication/SimplePreAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions