Merge pull request #398 from muskie9/refactor/encryptorConfig

REFACTOR don’t explicitly set new encryptor

Author: muskie9

_config/config.yml

@@ -28,10 +28,3 @@ SilverStripe\Core\Injector\Injector:
     properties:
       format: '%Region/%Name'
 
-SilverStripe\Security\Security:
-  password_encryption_algorithm: 'bcrypt'
-
-'SilverStripe\Security\PasswordEncryptor':
-  encryptors:
-    bcrypt:
-      'Dynamic\FoxyStripe\Security\PasswordEncryptor_BCrypt':

src/Security/PasswordEncryptor_BCrypt.php

@@ -3,6 +3,7 @@
 namespace Dynamic\FoxyStripe\Security;
 
 use SilverStripe\Security\PasswordEncryptor;
+use SilverStripe\Security\PasswordEncryptor_EncryptionFailed;
 
 /**
  * Class PasswordEncryptor_BCrypt
@@ -46,8 +47,10 @@ public static function get_cost()
 
     /**
      * @param String $password
+     * @param null $salt
      * @param null $member
-     * @return bool|string
+     * @return bool|String
+     * @throws PasswordEncryptor_EncryptionFailed
      */
     public function encrypt($password, $salt = null, $member = null)
     {
@@ -63,6 +66,8 @@ public function encrypt($password, $salt = null, $member = null)
     /**
      * @param string $hash
      * @param string $password
+     * @param null $salt
+     * @param null $member
      * @return bool
      */
     public function check($hash, $password, $salt = null, $member = null)