Merge branch '4.0'

chalasr · chalasr · commit efc19fc6d7df · 2017-12-11T15:33:14.000+01:00
* 4.0: minor #25421 grammar typo in docs (michaelKaefer) Extend Argon2i support check to account for sodium_compat
diff --git a/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Argon2iPasswordEncoder.php
@@ -22,9 +22,15 @@ class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingE
 {
     public static function isSupported()
     {
-        return (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I'))
-            || \function_exists('sodium_crypto_pwhash_str')
-            || \extension_loaded('libsodium');
+        if (\defined('PASSWORD_ARGON2I')) {
+            return true;
+        }
+
+        if (\class_exists('ParagonIE_Sodium_Compat') && \method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {
+            return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();
+        }
+
+        return \function_exists('sodium_crypto_pwhash_str') || \extension_loaded('libsodium');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,15 @@ class Argon2iPasswordEncoder extends BasePasswordEncoder implements SelfSaltingE`
`22`	`22`	`{`
`23`	`23`	`public static function isSupported()`
`24`	`24`	`{`
`25`		`- return (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I'))`
`26`		`- \|\| \function_exists('sodium_crypto_pwhash_str')`
`27`		`- \|\| \extension_loaded('libsodium');`
	`25`	`+ if (\defined('PASSWORD_ARGON2I')) {`
	`26`	`+ return true;`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ if (\class_exists('ParagonIE_Sodium_Compat') && \method_exists('ParagonIE_Sodium_Compat', 'crypto_pwhash_is_available')) {`
	`30`	`+ return \ParagonIE_Sodium_Compat::crypto_pwhash_is_available();`
	`31`	`+ }`
	`32`	`+`
	`33`	`+ return \function_exists('sodium_crypto_pwhash_str') \|\| \extension_loaded('libsodium');`
`28`	`34`	`}`
`29`	`35`
`30`	`36`	`/**`