diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-27 14:18:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-27 14:18:02 +0100 |
| commit | 5193b3279cfcd4f7f5d656ec806b87e971c5523f (patch) | |
| tree | 45bb4f9fd78e8a34e2057593aa4b68de9135e86b /tests/test_framework | |
| parent | 760f148a2ba581df61a25d3efd0e438b5ea77e7b (diff) | |
| download | forums-5193b3279cfcd4f7f5d656ec806b87e971c5523f.tar forums-5193b3279cfcd4f7f5d656ec806b87e971c5523f.tar.gz forums-5193b3279cfcd4f7f5d656ec806b87e971c5523f.tar.bz2 forums-5193b3279cfcd4f7f5d656ec806b87e971c5523f.tar.xz forums-5193b3279cfcd4f7f5d656ec806b87e971c5523f.zip | |
[feature/passwords] Pass list of default types to passwords manager
This list is in the order of how the driver types would be used. If a driver
is not supported we will try the subsequent one.
PHPBB3-11610
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index f5e2e2c77d..76487077c2 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1003,8 +1003,8 @@ class phpbb_functional_test_case extends phpbb_test_case $driver_helper = new \phpbb\passwords\driver\helper($config); $passwords_drivers = array( - 'passwords.driver.bcrypt' => new \phpbb\passwords\driver\bcrypt($config, $driver_helper), 'passwords.driver.bcrypt_2y' => new \phpbb\passwords\driver\bcrypt_2y($config, $driver_helper), + 'passwords.driver.bcrypt' => new \phpbb\passwords\driver\bcrypt($config, $driver_helper), 'passwords.driver.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper), 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper), ); @@ -1016,7 +1016,7 @@ class phpbb_functional_test_case extends phpbb_test_case $passwords_helper = new \phpbb\passwords\helper; // Set up passwords manager - $manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y'); + $manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers)); return $manager; } |