diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-30 17:54:10 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-30 17:54:10 +0200 |
| commit | 06dbcd5a5464cccf4c748071f338f34130ecad06 (patch) | |
| tree | 428d8a384142a48561d6092a5583da954649b7b6 /Core/Authentication/SimpleAuthenticatorInterface.php | |
| parent | 94465e02e58f9a17b29dd4afbcac5c02af4bf7e0 (diff) | |
| parent | 25e914f2b63d4021af1fb0e510ac0843f1bdb3ee (diff) | |
| download | symfony-security-06dbcd5a5464cccf4c748071f338f34130ecad06.zip symfony-security-06dbcd5a5464cccf4c748071f338f34130ecad06.tar.gz symfony-security-06dbcd5a5464cccf4c748071f338f34130ecad06.tar.bz2 | |
Merge branch '2.3' into 2.6v2.6.6
* 2.3:
[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/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf
src/Symfony/Component/Yaml/Parser.php
Diffstat (limited to 'Core/Authentication/SimpleAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions