diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:29:52 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:29:52 +0100 |
| commit | 20711216c818e8a57cdb5d3bc1b2fc8bc34757c9 (patch) | |
| tree | eda128b755c8438f9f5ae3f7c5049a08f01386e1 /Core/Encoder | |
| parent | 4fb29cc3a28770e1045e400fd740fc6028ae6df3 (diff) | |
| parent | a542abcf38b95de8e8f01f42b6127e7fffc645a8 (diff) | |
| download | symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.zip symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.tar.gz symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[2.3] CS And DocBlock Fixes
[2.3] CS Fixes
Conflicts:
src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
src/Symfony/Component/Form/FormError.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/Process/ProcessUtils.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
src/Symfony/Component/Validator/Constraints/GroupSequence.php
src/Symfony/Component/Validator/Mapping/ClassMetadata.php
src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
src/Symfony/Component/Validator/Mapping/MemberMetadata.php
src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.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 * |