diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-06-29 00:04:02 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-14 13:54:27 +0200 |
| commit | ddc207fae83ad260f592c6a99c83971263e7eb5a (patch) | |
| tree | d2a2fb76083340a52be1340e95b25796a3c76d50 | |
| parent | cfbd858bd734a45394b1faa05f202a906653bf03 (diff) | |
| download | forums-ddc207fae83ad260f592c6a99c83971263e7eb5a.tar forums-ddc207fae83ad260f592c6a99c83971263e7eb5a.tar.gz forums-ddc207fae83ad260f592c6a99c83971263e7eb5a.tar.bz2 forums-ddc207fae83ad260f592c6a99c83971263e7eb5a.tar.xz forums-ddc207fae83ad260f592c6a99c83971263e7eb5a.zip | |
[feature/passwords] Fix tests on PHP versions < 5.3.7
PHPBB3-11610
| -rw-r--r-- | tests/crypto/manager_test.php | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/tests/crypto/manager_test.php b/tests/crypto/manager_test.php index 9b14383f5d..f2eb9a160b 100644 --- a/tests/crypto/manager_test.php +++ b/tests/crypto/manager_test.php @@ -128,24 +128,44 @@ class phpbb_crypto_manager_test extends PHPUnit_Framework_TestCase public function test_combined_hash_data() { - return array( - array( - 'crypto.driver.salted_md5', - array('crypto.driver.bcrypt_2y'), - ), - array( - 'crypto.driver.salted_md5', - array('crypto.driver.bcrypt'), - ), - array( - 'crypto.driver.phpass', - array('crypto.driver.salted_md5'), - ), - array( - 'crypto.driver.salted_md5', - array('crypto.driver.bcrypt_2y', 'crypto.driver.bcrypt'), - ), - ); + if (version_compare(PHP_VERSION, '5.3.7', '<')) + { + return array( + array( + 'crypto.driver.salted_md5', + array('crypto.driver.bcrypt'), + ), + array( + 'crypto.driver.phpass', + array('crypto.driver.salted_md5'), + ), + array( + 'crypto.driver.salted_md5', + array('crypto.driver.phpass', 'crypto.driver.bcrypt'), + ), + ); + } + else + { + return array( + array( + 'crypto.driver.salted_md5', + array('crypto.driver.bcrypt_2y'), + ), + array( + 'crypto.driver.salted_md5', + array('crypto.driver.bcrypt'), + ), + array( + 'crypto.driver.phpass', + array('crypto.driver.salted_md5'), + ), + array( + 'crypto.driver.salted_md5', + array('crypto.driver.bcrypt_2y', 'crypto.driver.bcrypt'), + ), + ); + } } /** |