diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-03-12 11:28:44 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-03-12 11:28:44 +0100 |
| commit | 79b93b26ebf03b69df71bdeb51ec78811dcda90a (patch) | |
| tree | d3d7b9f84d9455de3c6b159594508f36d7fffa4e /Core/Authentication/SimpleFormAuthenticatorInterface.php | |
| parent | b883dbdf074f070aaf67e7f6da5bb9af807f7cbd (diff) | |
| parent | 117752eeae89dc43f7a9d36ea8ce1f0690e97c5a (diff) | |
| download | symfony-security-79b93b26ebf03b69df71bdeb51ec78811dcda90a.zip symfony-security-79b93b26ebf03b69df71bdeb51ec78811dcda90a.tar.gz symfony-security-79b93b26ebf03b69df71bdeb51ec78811dcda90a.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
Changed visibility of setUp() and tearDown to protected
fixed XSS in the exception handler
Php Inspections (EA Extended) - static code analysis includes:
[2.3] Remove most refs uses
Test with local components instead of waiting for the subtree-splitter when possible
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Component/Config/Util/XmlUtils.php
src/Symfony/Component/Console/Helper/ProgressHelper.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/OptionsResolver/Options.php
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
src/Symfony/Component/Yaml/Inline.php
Diffstat (limited to 'Core/Authentication/SimpleFormAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions