diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-30 17:55:07 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-30 17:55:07 +0200 |
| commit | b071a103319fc4d8549e17e575c75b8b3417d8cd (patch) | |
| tree | 3f901a8dc01d8a8af8c32b3dfdd622e6055c121f /Core/Authentication/SimpleAuthenticatorInterface.php | |
| parent | 02b20eccaf64c7c3c138f89e91f0a83c90cebfa2 (diff) | |
| parent | 06dbcd5a5464cccf4c748071f338f34130ecad06 (diff) | |
| download | symfony-security-b071a103319fc4d8549e17e575c75b8b3417d8cd.zip symfony-security-b071a103319fc4d8549e17e575c75b8b3417d8cd.tar.gz symfony-security-b071a103319fc4d8549e17e575c75b8b3417d8cd.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[Validator] Add missing pt_BR translations
Add parsing of hexadecimal strings for PHP 7
[Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
[Validator] Added missing Hungarian translation
[Validator] Fixed grammar in Hungarian translation
CS: Unary operators should be placed adjacent to their operands
CS: Binary operators should be arounded by at least one space
remove useless tests that fail in php 7
[Translator] fix test for php 7 compatibility
Update phpdoc of ProcessBuilder#setPrefix()
Conflicts:
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
Diffstat (limited to 'Core/Authentication/SimpleAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions