diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-04-25 17:40:52 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-04-25 17:52:07 +0200 |
| commit | 7805aaad78d61a0c8821d103b58ab7c080f849be (patch) | |
| tree | 38909e99afed7514df52e8e33eca5d344b286ffc | |
| parent | f7a0e499cf233a7a66c7f2fbfbd98504171f9603 (diff) | |
| download | symfony-security-7805aaad78d61a0c8821d103b58ab7c080f849be.zip symfony-security-7805aaad78d61a0c8821d103b58ab7c080f849be.tar.gz symfony-security-7805aaad78d61a0c8821d103b58ab7c080f849be.tar.bz2 | |
[Security] tweaked previous commit
| -rw-r--r-- | Core/Encoder/BCryptPasswordEncoder.php | 4 | ||||
| -rw-r--r-- | composer.json | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index 3a9d03e..6a65fa5 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -46,9 +46,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder */ public function encodePassword($raw, $salt) { - return password_hash($raw, PASSWORD_BCRYPT, array( - 'cost' => $this->cost, - )); + return password_hash($raw, PASSWORD_BCRYPT, array('cost' => $this->cost)); } /** diff --git a/composer.json b/composer.json index c66949c..5ea71f3 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,7 @@ "php": ">=5.3.3", "symfony/event-dispatcher": "~2.1", "symfony/http-foundation": ">=2.1,<2.4-dev", - "symfony/http-kernel": ">=2.1,<=2.3-dev", - "ircmaxell/password-compat": "1.0.*" + "symfony/http-kernel": ">=2.1,<=2.3-dev" }, "require-dev": { "symfony/form": "~2.0", @@ -28,7 +27,8 @@ "symfony/validator": ">=2.2,<2.4-dev", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", - "psr/log": "~1.0" + "psr/log": "~1.0", + "ircmaxell/password-compat": "1.0.*" }, "suggest": { "symfony/class-loader": "2.2.*", @@ -36,7 +36,8 @@ "symfony/form": "2.2.*", "symfony/validator": "2.2.*", "symfony/routing": "2.2.*", - "doctrine/dbal": "to use the built-in ACL implementation" + "doctrine/dbal": "to use the built-in ACL implementation", + "ircmaxell/password-compat": "1.0.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Security\\": "" } |