diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-08-13 22:18:00 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-08-13 22:18:00 +0200 |
| commit | 88389a0c8bf69f985df1ca99ef37a042f68e4a11 (patch) | |
| tree | 631105a11c8e2ae4e3830bd03fc8c9920ff43de5 /Tests/Core/Encoder/BCryptPasswordEncoderTest.php | |
| parent | f24601fc3412a43d1408ed2982372f00fc5c6188 (diff) | |
| parent | bcf632a5efec0f40041b6836bf6b4ca1f4418a5e (diff) | |
| download | symfony-security-88389a0c8bf69f985df1ca99ef37a042f68e4a11.zip symfony-security-88389a0c8bf69f985df1ca99ef37a042f68e4a11.tar.gz symfony-security-88389a0c8bf69f985df1ca99ef37a042f68e4a11.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
corrected English grammar (s/does not exists/does not exist)
[Process] Add more precision to Process::stop timeout
[Process] Avoid zombie process in case of unit tests failure
[Process] Fix #8739
[Process] Add failing test for #8739
[Process] Fix CS
Fixed documentation grammar for AuthenticationManagerInterface::authenticate()
[Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
[TwigBridge] Prevent code extension to display warning
Use strstr instead of strpos
Conflicts:
src/Symfony/Component/Finder/Shell/Command.php
src/Symfony/Component/Process/Process.php
Diffstat (limited to 'Tests/Core/Encoder/BCryptPasswordEncoderTest.php')
0 files changed, 0 insertions, 0 deletions