makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/passwords] Fix tests on PHP versions < 5.3.7

Browse source 
PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-06-29 00:04:02 +02:00
parent cfbd858bd7
commit ddc207fae8
1 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
tests/crypto/manager_test.php
View file

@ -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'),
),
);
}
}
/**