diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:44:09 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:44:09 +0100 |
| commit | 080ac3294fac8b217afe620230600fb427bd2f51 (patch) | |
| tree | 094ebe0d9c29984af20b5d219219c824f6dc3486 /Core/Encoder | |
| parent | f54d46e132c02eb833419c24a9d8f4bdcd080167 (diff) | |
| parent | 20711216c818e8a57cdb5d3bc1b2fc8bc34757c9 (diff) | |
| download | symfony-security-080ac3294fac8b217afe620230600fb427bd2f51.zip symfony-security-080ac3294fac8b217afe620230600fb427bd2f51.tar.gz symfony-security-080ac3294fac8b217afe620230600fb427bd2f51.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
[2.3] CS And DocBlock Fixes
[2.3] CS Fixes
[FrameworkBundle] Fixed Translation loader and update translation command.
[Console] remove « use » statement for PHP built-in exception classes.
[SecurityBundle] adds unit tests suite for SecurityDataCollector class.
Conflicts:
src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
src/Symfony/Component/OptionsResolver/Options.php
src/Symfony/Component/OptionsResolver/OptionsResolver.php
src/Symfony/Component/Process/ProcessPipes.php
src/Symfony/Component/Stopwatch/Stopwatch.php
src/Symfony/Component/Translation/Loader/XliffFileLoader.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
Diffstat (limited to 'Core/Encoder')
| -rw-r--r-- | Core/Encoder/BCryptPasswordEncoder.php | 1 | ||||
| -rw-r--r-- | Core/Encoder/EncoderFactory.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index f62e8f5..d2b0319 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -52,6 +52,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder * It doesn't work with PHP versions lower than 5.3.7, since * the password compat library uses CRYPT_BLOWFISH hash type with * the "$2y$" salt prefix (which is not available in the early PHP versions). + * * @see https://github.com/ircmaxell/password_compat/issues/10#issuecomment-11203833 * * It is almost best to **not** pass a salt and let PHP generate one for you. diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php index 77021ec..0568d41 100644 --- a/Core/Encoder/EncoderFactory.php +++ b/Core/Encoder/EncoderFactory.php @@ -12,7 +12,7 @@ namespace Symfony\Component\Security\Core\Encoder; /** - * A generic encoder factory implementation + * A generic encoder factory implementation. * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ @@ -59,7 +59,7 @@ class EncoderFactory implements EncoderFactoryInterface } /** - * Creates the actual encoder instance + * Creates the actual encoder instance. * * @param array $config * |