Merge branch '5.0'
* 5.0: Fixed false-negative fabbot error on exception message
This commit is contained in:
commit
600280edf5
@ -567,7 +567,7 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
|
||||
$config['algorithm'] = 'native';
|
||||
$config['native_algorithm'] = PASSWORD_ARGON2I;
|
||||
} else {
|
||||
throw new InvalidConfigurationException(sprintf('Algorithm "argon2i" is not available. Either use %s"auto" or upgrade to PHP 7.2+ instead.', \defined('SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13') ? '"argon2id", ' : ''));
|
||||
throw new InvalidConfigurationException(sprintf('Algorithm "argon2i" is not available. Either use "%s" or upgrade to PHP 7.2+ instead.', \defined('SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13') ? 'argon2id", "auto' : 'auto'));
|
||||
}
|
||||
|
||||
return $this->createEncoder($config);
|
||||
@ -580,7 +580,7 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
|
||||
$config['algorithm'] = 'native';
|
||||
$config['native_algorithm'] = PASSWORD_ARGON2ID;
|
||||
} else {
|
||||
throw new InvalidConfigurationException(sprintf('Algorithm "argon2id" is not available. Either use %s"auto", upgrade to PHP 7.3+ or use libsodium 1.0.15+ instead.', \defined('PASSWORD_ARGON2I') || $hasSodium ? '"argon2i", ' : ''));
|
||||
throw new InvalidConfigurationException(sprintf('Algorithm "argon2id" is not available. Either use "%s", upgrade to PHP 7.3+ or use libsodium 1.0.15+ instead.', \defined('PASSWORD_ARGON2I') || $hasSodium ? 'argon2i", "auto' : 'auto'));
|
||||
}
|
||||
|
||||
return $this->createEncoder($config);
|
||||
|
Reference in New Issue
Block a user