Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster

1 files changed, 48 insertions, 74 deletions

diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php
index 7d77d763fb..0f9169ff8b 100644
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -17,7 +17,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 	protected $user;
 	protected $request;
 
-	protected function setup()
+	protected function setup(): void
 	{
 		parent::setUp();
 
@@ -27,42 +27,15 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 		$config = new \phpbb\config\config(array());
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$lang = new \phpbb\language\language($lang_loader);
-		$this->request = $this->getMock('\phpbb\request\request');
-		$this->user = new \phpbb\user($lang, '\phpbb\datetime');
-		$driver_helper = new \phpbb\passwords\driver\helper($config);
-		$passwords_drivers = array(
-			'passwords.driver.bcrypt_2y'	=> new \phpbb\passwords\driver\bcrypt_2y($config, $driver_helper),
-			'passwords.driver.bcrypt'		=> new \phpbb\passwords\driver\bcrypt($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_helper = new \phpbb\passwords\helper;
-		// Set up passwords manager
-		$passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers));
-
-		if (version_compare(PHP_VERSION, '5.3.7', '<'))
-		{
-			$this->password_hash = '$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi';
-		}
-		else
-		{
-			$this->password_hash = '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i';
-		}
+		$this->request = $this->createMock('\phpbb\request\request');
+		$this->user = new \phpbb\user($lang, '\phpbb\datetime');;
 
-		$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($config, $db, $lang, $this->request, $this->user, $phpbb_root_path, $phpEx);
 	}
 
 	public function getDataSet()
 	{
-		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');
-		}
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
 	}
 
 	/**
@@ -109,7 +82,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'user_row'		=> array(
 				'user_id' 				=> '1',
 				'username' 				=> 'foobar',
-				'user_password'			=> $this->password_hash,
+				'user_password'			=> '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i',
 				'user_passchg' 			=> '0',
 				'user_email' 			=> 'example@example.com',
 				'user_type' 			=> '0',
@@ -136,62 +109,61 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			->will($this->returnValue('example'));
 
 		$expected = array(
-			'user_id' => '1',
-			'user_type' => '0',
-			'group_id' => '3',
+			'user_id' => 1,
+			'user_type' => 0,
+			'group_id' => 3,
 			'user_permissions' => '',
-			'user_perm_from' => '0',
+			'user_perm_from' => 0,
 			'user_ip' => '',
-			'user_regdate' => '0',
+			'user_regdate' => 0,
 			'username' => 'foobar',
 			'username_clean' => 'foobar',
-			'user_password' => $this->password_hash,
-			'user_passchg' => '0',
+			'user_password' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i',
+			'user_passchg' => 0,
 			'user_email' => 'example@example.com',
-			'user_email_hash' => '0',
 			'user_birthday' => '',
-			'user_lastvisit' => '0',
-			'user_lastmark' => '0',
-			'user_lastpost_time' => '0',
+			'user_lastvisit' => 0,
+			'user_lastmark' => 0,
+			'user_lastpost_time' => 0,
 			'user_lastpage' => '',
 			'user_last_confirm_key' => '',
-			'user_last_search' => '0',
-			'user_warnings' => '0',
-			'user_last_warning' => '0',
-			'user_login_attempts' => '0',
-			'user_inactive_reason' => '0',
-			'user_inactive_time' => '0',
-			'user_posts' => '0',
+			'user_last_search' => 0,
+			'user_warnings' => 0,
+			'user_last_warning' => 0,
+			'user_login_attempts' => 0,
+			'user_inactive_reason' => 0,
+			'user_inactive_time' => 0,
+			'user_posts' => 0,
 			'user_lang' => '',
 			'user_timezone' => '',
 			'user_dateformat' => 'd M Y H:i',
-			'user_style' => '0',
-			'user_rank' => '0',
+			'user_style' => 0,
+			'user_rank' => 0,
 			'user_colour' => '',
-			'user_new_privmsg' => '0',
-			'user_unread_privmsg' => '0',
-			'user_last_privmsg' => '0',
-			'user_message_rules' => '0',
-			'user_full_folder' => '-3',
-			'user_emailtime' => '0',
-			'user_topic_show_days' => '0',
+			'user_new_privmsg' => 0,
+			'user_unread_privmsg' => 0,
+			'user_last_privmsg' => 0,
+			'user_message_rules' => 0,
+			'user_full_folder' => -3,
+			'user_emailtime' => 0,
+			'user_topic_show_days' => 0,
 			'user_topic_sortby_type' => 't',
 			'user_topic_sortby_dir' => 'd',
-			'user_post_show_days' => '0',
+			'user_post_show_days' => 0,
 			'user_post_sortby_type' => 't',
 			'user_post_sortby_dir' => 'a',
-			'user_notify' => '0',
-			'user_notify_pm' => '1',
-			'user_notify_type' => '0',
-			'user_allow_pm' => '1',
-			'user_allow_viewonline' => '1',
-			'user_allow_viewemail' => '1',
-			'user_allow_massemail' => '1',
-			'user_options' => '230271',
+			'user_notify' => 0,
+			'user_notify_pm' => 1,
+			'user_notify_type' => 0,
+			'user_allow_pm' => 1,
+			'user_allow_viewonline' => 1,
+			'user_allow_viewemail' => 1,
+			'user_allow_massemail' => 1,
+			'user_options' => 230271,
 			'user_avatar' => '',
 			'user_avatar_type' => '',
-			'user_avatar_width' => '0',
-			'user_avatar_height' => '0',
+			'user_avatar_width' => 0,
+			'user_avatar_height' => 0,
 			'user_sig' => '',
 			'user_sig_bbcode_uid' => '',
 			'user_sig_bbcode_bitfield' => '',
@@ -199,9 +171,11 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'user_actkey' => '',
 			'user_newpasswd' => '',
 			'user_form_salt' => '',
-			'user_new' => '1',
-			'user_reminded' => '0',
-			'user_reminded_time' => '0',
+			'user_new' => 1,
+			'user_reminded' => 0,
+			'user_reminded_time' => 0,
+			'reset_token' => '',
+			'reset_token_expiration' => 0,
 		);
 
 		$this->assertEquals($expected, $this->provider->autologin());