diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-28 15:20:46 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-07-28 15:20:46 +0200 |
| commit | 2b0ef47facebdfd2e8f227c16247ecad946ec204 (patch) | |
| tree | 14007184c4f721276bcacbd6ef6d2902978796d8 /Core/Encoder/BasePasswordEncoder.php | |
| parent | 531c4a7fda814e9f918673173a9aa0b2666f21ed (diff) | |
| parent | 5040c1c6890674d5298f76236942533744b1ef49 (diff) | |
| download | symfony-security-2b0ef47facebdfd2e8f227c16247ecad946ec204.zip symfony-security-2b0ef47facebdfd2e8f227c16247ecad946ec204.tar.gz symfony-security-2b0ef47facebdfd2e8f227c16247ecad946ec204.tar.bz2 | |
Merge branch '2.4' into 2.5
* 2.4:
Update validators.eu.xlf
fixed CS
remove unused imports
[Routing] simplify the XML schema file
Unify null comparisons
[EventDispatcher] don't count empty listeners
[Process] Fix unit tests in sigchild environment
[Process] fix signal handling in wait()
[BrowserKit] refactor code and fix unquoted regex
Fixed server HTTP_HOST port uri conversion
[MonologBridge] fixed Console handler priorities
Bring code into standard
[Process] Add test to verify fix for issue #11421
[Process] Fixes issue #11421
[DependencyInjection] Pass a Scope instance instead of a scope name.
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
Diffstat (limited to 'Core/Encoder/BasePasswordEncoder.php')
0 files changed, 0 insertions, 0 deletions