diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-01-01 09:14:50 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-01-01 09:14:50 +0100 |
| commit | b1021ae160f5425986dea2b62d3f14a0bbbf448a (patch) | |
| tree | 3898082add46fd814f2fa2686f58ed17d3aa0a21 /Core/Encoder | |
| parent | 07478491f681c2f6f6d2a2486c5bb7136b5dfbc9 (diff) | |
| parent | 996d89d29d482acad420803fbba96e85db23ba28 (diff) | |
| download | symfony-security-b1021ae160f5425986dea2b62d3f14a0bbbf448a.zip symfony-security-b1021ae160f5425986dea2b62d3f14a0bbbf448a.tar.gz symfony-security-b1021ae160f5425986dea2b62d3f14a0bbbf448a.tar.bz2 | |
Merge branch '2.3' into 2.4v2.4.1
* 2.3:
removed unneeded use statements
Prepend Child Bundle paths before the parent
[Routing] add unit tests for Symfony\Component\Routing\RequestContext class
Conflicts:
src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php
src/Symfony/Component/Validator/ConstraintValidatorFactory.php
Diffstat (limited to 'Core/Encoder')
| -rw-r--r-- | Core/Encoder/BCryptPasswordEncoder.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index fc79021..9a3ecdb 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Security\Core\Encoder; -use Symfony\Component\Security\Core\Encoder\BasePasswordEncoder; use Symfony\Component\Security\Core\Exception\BadCredentialsException; /** |