diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2013-10-27 14:29:36 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-27 14:29:36 +0100 |
| commit | a4d50d52b67ac6e3e359dd10ecf6c156ac7cc9c2 (patch) | |
| tree | f837696ad267980f54cbd484e60df2fb84282e75 /tests/passwords | |
| parent | [feature/passwords] Pass list of default types to passwords manager (diff) | |
| download | phpbb-a4d50d52b67ac6e3e359dd10ecf6c156ac7cc9c2.tar.gz phpbb-a4d50d52b67ac6e3e359dd10ecf6c156ac7cc9c2.tar.bz2 phpbb-a4d50d52b67ac6e3e359dd10ecf6c156ac7cc9c2.zip | |
[feature/passwords] Use correct default type in manager_test
PHPBB3-11610
Diffstat (limited to 'tests/passwords')
| -rw-r--r-- | tests/passwords/manager_test.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php index 4ddd8742ae..e965e3a692 100644 --- a/tests/passwords/manager_test.php +++ b/tests/passwords/manager_test.php @@ -125,7 +125,8 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase } // Check if convert_flag is correctly set - $this->assertEquals(($hash_type !== 'passwords.driver.bcrypt_2y'), $this->manager->convert_flag); + $default_type = (version_compare(PHP_VERSION, '5.3.7', '<')) ? 'passwords.driver.bcrypt' : 'passwords.driver.bcrypt_2y'; + $this->assertEquals(($hash_type !== $default_type), $this->manager->convert_flag); } |