8000 Merge branch '5.0' · symfony/symfony@600280e · GitHub
[go: up one dir, main page]
Skip to content

Commit 600280e

Browse files
fabpotfabpot
committed
Merge branch '5.0'
* 5.0: Fixed false-negative fabbot error on exception message
2 parents 7eecd4f + e9c82ad commit 600280e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ private function createEncoder(array $config)
567567
$config['algorithm'] = 'native';
568568
$config['native_algorithm'] = PASSWORD_ARGON2I;
569569
} else {
570-
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", ' : ''));
570+
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'));
571571
}
572572

573573
return $this->createEncoder($config);
@@ -580,7 +580,7 @@ private function createEncoder(array $config)
580580
$config['algorithm'] = 'native';
581581
$config['native_algorithm'] = PASSWORD_ARGON2ID;
582582
} else {
583-
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", ' : ''));
583+
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'));
584584
}
585585

586586
return $this->createEncoder($config);

0 commit comments

Comments
 (0)
0