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

[ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers

Browse source 
PHPBB3-12352
This commit is contained in:
Marc Alexander 2014-05-28 20:35:01 +02:00
parent 033272f968
commit dc5a5a7cdf
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/config/passwords.yml
View file

@ -62,8 +62,8 @@ services:
tags: tags:
- { name: passwords.driver } - { name: passwords.driver }
passwords.driver.phpbb2_md5: passwords.driver.md5_phpbb2:
class: phpbb\passwords\driver\phpbb2_md5 class: phpbb\passwords\driver\md5_phpbb2
arguments: arguments:
- @request - @request
- @passwords.driver.salted_md5 - @passwords.driver.salted_md5

4
phpBB/phpbb/passwords/driver/phpbb2_md5.php → phpBB/phpbb/passwords/driver/md5_phpbb2.php
View file

@ -12,9 +12,9 @@ namespace phpbb\passwords\driver;
/** /**
* @package passwords * @package passwords
*/ */
class phpbb2_md5 extends base class md5_phpbb2 extends base
{ {
const PREFIX = '$phpbb2_md5$'; const PREFIX = '$md5_phpbb2$';
/** @var \phpbb\request\request phpBB request object */ /** @var \phpbb\request\request phpBB request object */
protected $request; protected $request;

16
tests/passwords/drivers_test.php
View file

@ -31,7 +31,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
'passwords.driver.convert_password' => new \phpbb\passwords\driver\convert_password($config, $this->driver_helper), 'passwords.driver.convert_password' => new \phpbb\passwords\driver\convert_password($config, $this->driver_helper),
'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper), 'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper),
); );
$this->passwords_drivers['passwords.driver.phpbb2_md5'] = new \phpbb\passwords\driver\phpbb2_md5($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); $this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext);
} }
public function data_helper_encode64() public function data_helper_encode64()
@ -122,7 +122,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
$this->assertSame($expected, $this->passwords_drivers[$driver]->get_settings_only($hash)); $this->assertSame($expected, $this->passwords_drivers[$driver]->get_settings_only($hash));
} }
public function data_phpbb2_md5_check() public function data_md5_phpbb2_check()
{ {
return array( return array(
array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96ae'), array(false, 'foobar', 'ae2fc75e20ee25d4520766788fbc96ae'),
@ -136,9 +136,9 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
} }
/** /**
* @dataProvider data_phpbb2_md5_check * @dataProvider data_md5_phpbb2_check
*/ */
public function test_phpbb2_md5_check($expected, $password, $hash, $request_password = false) public function test_md5_phpbb2_check($expected, $password, $hash, $request_password = false)
{ {
if (!$request_password) if (!$request_password)
{ {
@ -148,14 +148,14 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
{ {
$_REQUEST['password'] = $request_password; $_REQUEST['password'] = $request_password;
} }
$this->assertSame($expected, $this->passwords_drivers['passwords.driver.phpbb2_md5']->check($password, $hash)); $this->assertSame($expected, $this->passwords_drivers['passwords.driver.md5_phpbb2']->check($password, $hash));
} }
public function test_phpbb2_md5_unneeded_functions() public function test_md5_phpbb2_unneeded_functions()
{ {
$this->assertSame(false, $this->passwords_drivers['passwords.driver.phpbb2_md5']->hash('foobar')); $this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->hash('foobar'));
$this->assertSame(false, $this->passwords_drivers['passwords.driver.phpbb2_md5']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae')); $this->assertSame(false, $this->passwords_drivers['passwords.driver.md5_phpbb2']->get_settings_only('ae2fc75e20ee25d4520766788fbc96ae'));
} }
public function test_convert_password_driver() public function test_convert_password_driver()

2
tests/passwords/manager_test.php
View file

@ -37,7 +37,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
'passwords.driver.sha1_smf' => new \phpbb\passwords\driver\sha1_smf($config, $this->driver_helper), 'passwords.driver.sha1_smf' => new \phpbb\passwords\driver\sha1_smf($config, $this->driver_helper),
'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper), 'passwords.driver.sha1' => new \phpbb\passwords\driver\sha1($config, $this->driver_helper),
); );
$this->passwords_drivers['passwords.driver.phpbb2_md5'] = new \phpbb\passwords\driver\phpbb2_md5($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext); $this->passwords_drivers['passwords.driver.md5_phpbb2'] = new \phpbb\passwords\driver\md5_phpbb2($request, $this->passwords_drivers['passwords.driver.salted_md5'], $phpbb_root_path, $php_ext);
$this->helper = new \phpbb\passwords\helper; $this->helper = new \phpbb\passwords\helper;
// Set up passwords manager // Set up passwords manager