1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

[feature/passwords] Modify passwords files for namespacing changes

PHPBB3-11610
This commit is contained in:
Marc Alexander
2013-09-27 11:16:47 +02:00
parent e41c9ef6cd
commit 3f63b9b470
10 changed files with 44 additions and 26 deletions

View File

@@ -25,14 +25,14 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase
$this->phpbb_container = new phpbb_mock_container_builder;
// Prepare dependencies for manager and driver
$config = new phpbb_config(array());
$driver_helper = new phpbb_passwords_driver_helper;
$config = new \phpbb\config\config(array());
$driver_helper = new phpbb\passwords\driver\helper;
$this->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.salted_md5' => new phpbb_passwords_driver_salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb_passwords_driver_phpass($config, $driver_helper),
'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.salted_md5' => new phpbb\passwords\driver\salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb\passwords\driver\phpass($config, $driver_helper),
);
foreach ($this->passwords_drivers as $key => $driver)
@@ -41,9 +41,9 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase
$this->phpbb_container->set($key, $driver);
}
$this->helper = new phpbb_passwords_helper;
$this->helper = new phpbb\passwords\helper;
// Set up passwords manager
$this->manager = new phpbb_passwords_manager($config, $this->passwords_drivers, $this->helper, 'passwords.driver.bcrypt_2y');
$this->manager = new phpbb\passwords\manager($config, $this->passwords_drivers, $this->helper, 'passwords.driver.bcrypt_2y');
}
public function hash_password_data()