2 files changed, 41 insertions, 41 deletions
diff --git a/phpBB/phpbb/install/module_base.php b/phpBB/phpbb/install/module_base.php
index 93c10bd656..4464a89716 100644
--- a/phpBB/phpbb/install/module_base.php
+++ b/phpBB/phpbb/install/module_base.php
@@ -131,7 +131,7 @@ abstract class module_base implements module_interface
 					$name,
 				));
 
-				$this->install_config->increment_current_task_progress($this->task_step_count[$name]);
+				$this->install_config->increment_current_task_progress($this->task_step_count[$name] ?? false);
 			}
 			else
 			{
diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php
index ebc97c204a..0f9169ff8b 100644
--- a/tests/auth/provider_apache_test.php
+++ b/tests/auth/provider_apache_test.php
@@ -109,61 +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' => '$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i',
-			'user_passchg' => '0',
+			'user_passchg' => 0,
 			'user_email' => 'example@example.com',
 			'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' => '',
@@ -171,11 +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',
+			'reset_token_expiration' => 0,
 		);
 
 		$this->assertEquals($expected, $this->provider->autologin());