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

[feature/passwords] Add prepending backslash to class namespaces

Browse source 
PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-10-02 23:45:32 +02:00
parent e7e11112b1
commit 93531e7fb0
5 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/auth/provider_apache_test.php
View file

@ -25,12 +25,12 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
$config = new \phpbb\config\config(array()); $config = new \phpbb\config\config(array());
$this->request = $this->getMock('\phpbb\request\request'); $this->request = $this->getMock('\phpbb\request\request');
$this->user = $this->getMock('\phpbb\user'); $this->user = $this->getMock('\phpbb\user');
$driver_helper = new phpbb\passwords\driver\helper($config); $driver_helper = new \phpbb\passwords\driver\helper($config);
$passwords_drivers = array( $passwords_drivers = array(
'passwords.driver.bcrypt' => new phpbb\passwords\driver\bcrypt($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.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.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb\passwords\driver\phpass($config, $driver_helper), 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper),
); );
foreach ($passwords_drivers as $key => $driver) foreach ($passwords_drivers as $key => $driver)
@ -38,9 +38,9 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
$driver->set_name($key); $driver->set_name($key);
} }
$passwords_helper = new phpbb\passwords\helper; $passwords_helper = new \phpbb\passwords\helper;
// Set up passwords manager // Set up passwords manager
$passwords_manager = new phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y'); $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y');
$this->provider = new \phpbb\auth\provider\apache($db, $config, $passwords_manager, $this->request, $this->user, $phpbb_root_path, $phpEx); $this->provider = new \phpbb\auth\provider\apache($db, $config, $passwords_manager, $this->request, $this->user, $phpbb_root_path, $phpEx);
} }

14
tests/auth/provider_db_test.php
View file

@ -28,12 +28,12 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
)); ));
$request = $this->getMock('\phpbb\request\request'); $request = $this->getMock('\phpbb\request\request');
$user = $this->getMock('\phpbb\user'); $user = $this->getMock('\phpbb\user');
$driver_helper = new phpbb\passwords\driver\helper($config); $driver_helper = new \phpbb\passwords\driver\helper($config);
$passwords_drivers = array( $passwords_drivers = array(
'passwords.driver.bcrypt' => new phpbb\passwords\driver\bcrypt($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.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.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb\passwords\driver\phpass($config, $driver_helper), 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper),
); );
foreach ($passwords_drivers as $key => $driver) foreach ($passwords_drivers as $key => $driver)
@ -41,9 +41,9 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
$driver->set_name($key); $driver->set_name($key);
} }
$passwords_helper = new phpbb\passwords\helper; $passwords_helper = new \phpbb\passwords\helper;
// Set up passwords manager // Set up passwords manager
$passwords_manager = new phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y'); $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y');
$provider = new \phpbb\auth\provider\db($db, $config, $passwords_manager, $request, $user, $phpbb_root_path, $phpEx); $provider = new \phpbb\auth\provider\db($db, $config, $passwords_manager, $request, $user, $phpbb_root_path, $phpEx);

14
tests/passwords/manager_test.php
View file

@ -26,13 +26,13 @@ class phpbb_passwords_manager_test extends PHPUnit_Framework_TestCase
// Prepare dependencies for manager and driver // Prepare dependencies for manager and driver
$config = new \phpbb\config\config(array()); $config = new \phpbb\config\config(array());
$driver_helper = new phpbb\passwords\driver\helper($config); $driver_helper = new \phpbb\passwords\driver\helper($config);
$this->passwords_drivers = array( $this->passwords_drivers = array(
'passwords.driver.bcrypt' => new phpbb\passwords\driver\bcrypt($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.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.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb\passwords\driver\phpass($config, $driver_helper), 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper),
); );
foreach ($this->passwords_drivers as $key => $driver) 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->phpbb_container->set($key, $driver);
} }
$this->helper = new phpbb\passwords\helper; $this->helper = new \phpbb\passwords\helper;
// Set up passwords manager // 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() public function hash_password_data()

16
tests/security/hash_test.php
View file

@ -15,14 +15,14 @@ class phpbb_security_hash_test extends phpbb_test_case
{ {
global $phpbb_container; global $phpbb_container;
$config = new phpbb\config\config(array()); $config = new \phpbb\config\config(array());
$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); $phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
$driver_helper = new phpbb\passwords\driver\helper($config); $driver_helper = new \phpbb\passwords\driver\helper($config);
$passwords_drivers = array( $passwords_drivers = array(
'passwords.driver.bcrypt' => new phpbb\passwords\driver\bcrypt($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.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.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb\passwords\driver\phpass($config, $driver_helper), 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper),
); );
foreach ($passwords_drivers as $key => $driver) foreach ($passwords_drivers as $key => $driver)
@ -30,9 +30,9 @@ class phpbb_security_hash_test extends phpbb_test_case
$driver->set_name($key); $driver->set_name($key);
} }
$passwords_helper = new phpbb\passwords\helper; $passwords_helper = new \phpbb\passwords\helper;
// Set up passwords manager // Set up passwords manager
$passwords_manager = new phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y'); $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, 'passwords.driver.bcrypt_2y');
$phpbb_container $phpbb_container
->expects($this->any()) ->expects($this->any())

16
tests/test_framework/phpbb_functional_test_case.php
View file

@ -1005,14 +1005,14 @@ class phpbb_functional_test_case extends phpbb_test_case
public function get_passwords_manager() public function get_passwords_manager()
{ {
// Prepare dependencies for manager and driver // Prepare dependencies for manager and driver
$config = new phpbb\config\config(array()); $config = new \phpbb\config\config(array());
$driver_helper = new phpbb\passwords\driver\helper($config); $driver_helper = new \phpbb\passwords\driver\helper($config);
$passwords_drivers = array( $passwords_drivers = array(
'passwords.driver.bcrypt' => new phpbb\passwords\driver\bcrypt($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.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.salted_md5' => new \phpbb\passwords\driver\salted_md5($config, $driver_helper),
'passwords.driver.phpass' => new phpbb\passwords\driver\phpass($config, $driver_helper), 'passwords.driver.phpass' => new \phpbb\passwords\driver\phpass($config, $driver_helper),
); );
foreach ($passwords_drivers as $key => $driver) foreach ($passwords_drivers as $key => $driver)
@ -1020,9 +1020,9 @@ class phpbb_functional_test_case extends phpbb_test_case
$driver->set_name($key); $driver->set_name($key);
} }
$passwords_helper = new phpbb\passwords\helper; $passwords_helper = new \phpbb\passwords\helper;
// Set up passwords manager // 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, 'passwords.driver.bcrypt_2y');
return $manager; return $manager;
} }