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

Commit e9c82ad

Browse files
fabpotfabpot
committed
Merge branch '4.4' into 5.0
* 4.4: Fixed false-negative fabbot error on exception message
2 parents 910cc72 + 7b8a374 commit e9c82ad

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
@@ -553,7 +553,7 @@ private function createEncoder(array $config)
553553
$config['algorithm'] = 'native';
554554
$config['native_algorithm'] = PASSWORD_ARGON2I;
555555
} else {
556-
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", ' : ''));
556+
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'));
557557
}
558558

559559
return $this->createEncoder($config);
@@ -566,7 +566,7 @@ private function createEncoder(array $config)
566566
$config['algorithm'] = 'native';
567567
$config['native_algorithm'] = PASSWORD_ARGON2ID;
568568
} else {
569-
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", ' : ''));
569+
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'));
570570
}
571571

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

0 commit comments

Comments
 (0)
0