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] Fix tests on PHP < 5.3.3 again

Browse source 
PHPBB3-11610
This commit is contained in:
Marc Alexander 2013-10-27 13:22:53 +01:00
parent bb836b65e3
commit 760f148a2b
3 changed files with 84 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
tests/auth/fixtures/user_533.xml Normal file
View file

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_users">
<column>user_id</column>
<column>username</column>
<column>username_clean</column>
<column>user_password</column>
<column>user_passchg</column>
<column>user_pass_convert</column>
<column>user_email</column>
<column>user_type</column>
<column>user_login_attempts</column>
<column>user_permissions</column>
<column>user_sig</column>
<column>user_occ</column>
<column>user_interests</column>
<row>
<value>1</value>
<value>foobar</value>
<value>foobar</value>
<value>$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi</value>
<value>0</value>
<value>0</value>
<value>example@example.com</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
<row>
<value>2</value>
<value>foobar2</value>
<value>foobar2</value>
<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value>
<value>0</value>
<value>0</value>
<value>example@example.com</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
</table>
</dataset>

22
tests/auth/provider_apache_test.php
View file

@ -42,12 +42,28 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
// 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');
if (version_compare(PHP_VERSION, '5.3.7', '<'))
{
$this->password_hash = '$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi';
}
else
{
$this->password_hash = '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i';
}
$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);
} }
public function getDataSet() public function getDataSet()
{ {
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); if ((version_compare(PHP_VERSION, '5.3.7', '<')))
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user_533.xml');
}
else
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
}
} }
/** /**
@ -94,7 +110,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
'user_row' => array( 'user_row' => array(
'user_id' => '1', 'user_id' => '1',
'username' => 'foobar', 'username' => 'foobar',
'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i', 'user_password' => $this->password_hash,
'user_passchg' => '0', 'user_passchg' => '0',
'user_email' => 'example@example.com', 'user_email' => 'example@example.com',
'user_type' => '0', 'user_type' => '0',
@ -130,7 +146,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
'user_regdate' => '0', 'user_regdate' => '0',
'username' => 'foobar', 'username' => 'foobar',
'username_clean' => 'foobar', 'username_clean' => 'foobar',
'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i', 'user_password' => $this->password_hash,
'user_passchg' => '0', 'user_passchg' => '0',
'user_pass_convert' => '0', 'user_pass_convert' => '0',
'user_email' => 'example@example.com', 'user_email' => 'example@example.com',

19
tests/auth/provider_db_test.php
View file

@ -13,7 +13,14 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
{ {
public function getDataSet() public function getDataSet()
{ {
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml'); if ((version_compare(PHP_VERSION, '5.3.7', '<')))
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user_533.xml');
}
else
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
}
} }
public function test_login() public function test_login()
@ -46,6 +53,14 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
$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);
if (version_compare(PHP_VERSION, '5.3.7', '<'))
{
$password_hash = '$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi';
}
else
{
$password_hash = '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i';
}
$expected = array( $expected = array(
'status' => LOGIN_SUCCESS, 'status' => LOGIN_SUCCESS,
@ -53,7 +68,7 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
'user_row' => array( 'user_row' => array(
'user_id' => '1', 'user_id' => '1',
'username' => 'foobar', 'username' => 'foobar',
'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i', 'user_password' => $password_hash,
'user_passchg' => '0', 'user_passchg' => '0',
'user_pass_convert' => '0', 'user_pass_convert' => '0',
'user_email' => 'example@example.com', 'user_email' => 'example@example.com',