diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index e8d2783af6..a08b3995b7 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -35,6 +35,7 @@ jobs:
         php ./vendor/simplemachines/build-tools/check-eof.php
         php ./vendor/simplemachines/build-tools/check-smf-license.php
         php ./vendor/simplemachines/build-tools/check-smf-languages.php
+        php ./vendor/simplemachines/build-tools/check-smf-index.php
         php ./vendor/simplemachines/build-tools/check-version.php
 
   lint:
diff --git a/.gitignore b/.gitignore
index 78ea22a35d..2b896d3487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ Themes/default/scripts/minified_deferred*.js
 custom_avatar/
 !custom_avatar/index.php
 !custom_avatar/blank.png
+Sources/Unicode/*.php
+!Sources/Unicode/index.php
+!Sources/Unicode/Utf8String.php
 
 # Compiled source #
 ###################
@@ -73,5 +76,6 @@ Themes/default/scripts/minified.js
 Themes/default/css/minified.css
 upgrade-helper.php
 .vscode/
-
-vendor/
\ No newline at end of file
+.php-cs-fixer.cache
+vendor/
+.phplint-cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 0000000000..40ae6adb89
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * Simple Machines Forum (SMF)
+ *
+ * @package SMF
+ * @author Simple Machines https://www.simplemachines.org
+ * @copyright 2023 Simple Machines and individual contributors
+ * @license https://www.simplemachines.org/about/smf/license.php BSD
+ *
+ * @version 3.0 Alpha 1
+ */
+
+$finder = (new PhpCsFixer\Finder())
+	->in(__DIR__)
+	// Don't touch libraries.
+	->exclude([
+		'cache',
+		'other',
+		'Packages',
+		'Smileys',
+		'Sources/minify',
+		'Sources/random_compat',
+		'Sources/ReCaptcha',
+		'Themes',
+	])
+	// Skip all index.php files and ssi_example.php.
+	->notName(['index.php', 'ssi_examples.php'])
+	// Skip anything being ignored in .gitignore.
+	->ignoreVCSIgnored(true);
+
+return (new PhpCsFixer\Config())
+	->setRules([
+		'@PSR12' => true,
+
+		// PSR12 overrides.
+		'no_closing_tag' => false,
+		'no_break_comment' => false,  // A bit buggy with comments.
+		'statement_indentation' => false, // A bit buggy with comments.
+
+		// Array notation.
+		'array_syntax' => ['syntax' => 'short'],
+		'normalize_index_brace' => true,
+		'whitespace_after_comma_in_array' => true,
+
+		// Basic.
+		'no_trailing_comma_in_singleline' => true,
+
+		// Casing.
+		'class_reference_name_casing' => true,
+
+		// Cast notation.
+		'cast_spaces' => ['space' => 'single'],
+
+		// Control structure.
+		'include' => true,
+		'no_superfluous_elseif' => true,
+		'no_useless_else' => true,
+		'simplified_if_return' => true,
+		'trailing_comma_in_multiline' => [
+			'after_heredoc' => true,
+			'elements' => [
+				'arguments',
+				'arrays',
+				'match',
+				'parameters',
+			],
+		],
+
+		// Function notation.
+		'lambda_not_used_import' => true,
+		'nullable_type_declaration_for_default_null_value' => true,
+
+		// Import.
+		'no_unused_imports' => true,
+		'ordered_imports' => [
+			'imports_order' => [
+				'class',
+				'function',
+				'const',
+			],
+			'sort_algorithm' => 'alpha',
+		],
+
+		// Language construct.
+		'combine_consecutive_issets' => true,
+		'combine_consecutive_unsets' => true,
+		'nullable_type_declaration' => ['syntax' => 'question_mark'],
+
+		// Namespace notation.
+		'no_leading_namespace_whitespace' => true,
+
+		// Operator.
+		'concat_space' => ['spacing' => 'one'],
+		'operator_linebreak' => [
+			'only_booleans' => true,
+			'position' => 'beginning',
+		],
+		'standardize_not_equals' => true,
+		'ternary_to_null_coalescing' => true,
+
+		// PHPDoc.
+		'phpdoc_indent' => true,
+		'phpdoc_line_span' => [
+			'const' => 'multi',
+			'property' => 'multi',
+			'method' => 'multi',
+		],
+		'phpdoc_no_access' => true,
+		'phpdoc_no_useless_inheritdoc' => true,
+		'phpdoc_order' => [
+			'order' => [
+				'param',
+				'throws',
+				'return',
+			],
+		],
+		'phpdoc_no_empty_return' => true,
+		'phpdoc_param_order' => true,
+		'phpdoc_scalar' => [
+			'types' => [
+				'boolean',
+				'callback',
+				'double',
+				'integer',
+				'real',
+				'str',
+			],
+		],
+		'phpdoc_to_comment' => [
+			'ignored_tags' => ['todo'],
+		],
+		'phpdoc_trim_consecutive_blank_line_separation' => true,
+		'phpdoc_types' => [
+			'groups' => ['alias', 'meta', 'simple'],
+		],
+		'phpdoc_var_without_name' => true,
+
+		// Return notation.
+		'no_useless_return' => true,
+		'simplified_null_return' => true,
+
+		// Semicolon.
+		'multiline_whitespace_before_semicolons' => true,
+		'no_empty_statement' => true,
+		'no_singleline_whitespace_before_semicolons' => true,
+
+		// String notation.
+		'explicit_string_variable' => true,
+		'simple_to_complex_string_variable' => true,
+		'single_quote' => true,
+
+		// Whitespace.
+		'array_indentation' => true,
+		'blank_line_before_statement' => [
+			'statements' => [
+				'case',
+				'continue',
+				'declare',
+				'default',
+				'do',
+				'exit',
+				'for',
+				'foreach',
+				'goto',
+				'if',
+				'include',
+				'include_once',
+				'require',
+				'require_once',
+				'return',
+				'switch',
+				'throw',
+				'try',
+				'while',
+				'yield',
+				'yield_from',
+			],
+		],
+		'heredoc_indentation' => ['indentation' => 'start_plus_one'],
+		'method_chaining_indentation' => true,
+		'no_spaces_around_offset' => [
+			'positions' => ['inside', 'outside'],
+		],
+		'type_declaration_spaces' => [
+			'elements' => ['function', 'property'],
+		],
+	])
+	->setIndent("\t")
+	->setFinder($finder);
+
+?>
\ No newline at end of file
diff --git a/Packages/backups/index.php b/Packages/backups/index.php
index 69278ce68e..976d292448 100644
--- a/Packages/backups/index.php
+++ b/Packages/backups/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Packages/index.php b/Packages/index.php
index 5345f9ce64..976d292448 100644
--- a/Packages/index.php
+++ b/Packages/index.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Packages directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/SSI.php b/SSI.php
index 617092a084..7acda7dd79 100644
--- a/SSI.php
+++ b/SSI.php
@@ -29,14 +29,12 @@
  * @version 3.0 Alpha 1
  */
 
-// Don't do anything if SMF is already loaded.
-if (defined('SMF'))
-	return true;
-
-define('SMF', 'SSI');
+if (!defined('SMF')) {
+	define('SMF', 'SSI');
+}
 
 // Initialize.
-require_once(__DIR__ . '/index.php');
+require_once __DIR__ . '/index.php';
 
 $ssi = new SMF\ServerSideIncludes();
 $ssi->execute();
diff --git a/Smileys/alienine/index.php b/Smileys/alienine/index.php
index 69278ce68e..976d292448 100644
--- a/Smileys/alienine/index.php
+++ b/Smileys/alienine/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Smileys/fugue/index.php b/Smileys/fugue/index.php
index 69278ce68e..976d292448 100644
--- a/Smileys/fugue/index.php
+++ b/Smileys/fugue/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Smileys/index.php b/Smileys/index.php
index 46a9a1377b..976d292448 100644
--- a/Smileys/index.php
+++ b/Smileys/index.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Smileys directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Actions/Activate.php b/Sources/Actions/Activate.php
index 22930e504e..871c37447f 100644
--- a/Sources/Actions/Activate.php
+++ b/Sources/Actions/Activate.php
@@ -14,8 +14,8 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -25,7 +25,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Activates a user's account.
@@ -39,13 +38,11 @@ class Activate implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Activate',
-		),
-	);
-
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -67,10 +64,10 @@ class Activate implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'activate' => 'activate',
 		'resend' => 'resend',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -95,36 +92,36 @@ class Activate implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (empty($_REQUEST['u']) && empty($_POST['user']))
-		{
-			if (empty(Config::$modSettings['registration_method']) || Config::$modSettings['registration_method'] == '3')
+		if (empty($_REQUEST['u']) && empty($_POST['user'])) {
+			if (empty(Config::$modSettings['registration_method']) || Config::$modSettings['registration_method'] == '3') {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
 			Utils::$context['member_id'] = 0;
 			Utils::$context['sub_template'] = 'resend';
 			Utils::$context['page_title'] = Lang::$txt['invalid_activation_resend'];
 			Utils::$context['can_activate'] = empty(Config::$modSettings['registration_method']) || Config::$modSettings['registration_method'] == '1';
-			Utils::$context['default_username'] = isset($_GET['user']) ? $_GET['user'] : '';
+			Utils::$context['default_username'] = $_GET['user'] ?? '';
 
 			return;
 		}
 
 		// Get the code from the database...
-		$request = Db::$db->query('', '
-			SELECT id_member, validation_code, member_name, real_name, email_address, is_activated, passwd, lngfile
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, validation_code, member_name, real_name, email_address, is_activated, passwd, lngfile
 			FROM {db_prefix}members' . (empty($_REQUEST['u']) ? '
 			WHERE member_name = {string:email_address} OR email_address = {string:email_address}' : '
 			WHERE id_member = {int:id_member}') . '
 			LIMIT 1',
-			array(
+			[
 				'id_member' => isset($_REQUEST['u']) ? (int) $_REQUEST['u'] : 0,
-				'email_address' => isset($_POST['user']) ? $_POST['user'] : '',
-			)
+				'email_address' => $_POST['user'] ?? '',
+			],
 		);
 
 		// Does this user exist at all?
-		if (Db::$db->num_rows($request) == 0)
-		{
+		if (Db::$db->num_rows($request) == 0) {
 			Utils::$context['sub_template'] = 'retry_activate';
 			Utils::$context['page_title'] = Lang::$txt['invalid_userid'];
 			Utils::$context['member_id'] = 0;
@@ -144,33 +141,36 @@ public function execute(): void
 				$row['is_activated'] == 0
 				|| $row['is_activated'] == 2
 			)
-		)
-		{
-			if (empty(Config::$modSettings['registration_method']) || Config::$modSettings['registration_method'] == 3)
+		) {
+			if (empty(Config::$modSettings['registration_method']) || Config::$modSettings['registration_method'] == 3) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
-			if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL))
+			if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) {
 				ErrorHandler::fatal(sprintf(Lang::$txt['valid_email_needed'], Utils::htmlspecialchars($_POST['new_email'])), false);
+			}
 
 			// Make sure their email isn't banned.
 			User::isBannedEmail($_POST['new_email'], 'cannot_register', Lang::$txt['ban_register_prohibited']);
 
 			// Ummm... don't even dare try to take someone else's email!!
-			$request = Db::$db->query('', '
-				SELECT id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}members
 				WHERE email_address = {string:email_address}
 				LIMIT 1',
-				array(
+				[
 					'email_address' => $_POST['new_email'],
-				)
+				],
 			);
 
-			if (Db::$db->num_rows($request) != 0)
-				ErrorHandler::fatalLang('email_in_use', false, array(Utils::htmlspecialchars($_POST['new_email'])));
+			if (Db::$db->num_rows($request) != 0) {
+				ErrorHandler::fatalLang('email_in_use', false, [Utils::htmlspecialchars($_POST['new_email'])]);
+			}
 			Db::$db->free_result($request);
 
-			User::updateMemberData($row['id_member'], array('email_address' => $_POST['new_email']));
+			User::updateMemberData($row['id_member'], ['email_address' => $_POST['new_email']]);
 			$row['email_address'] = $_POST['new_email'];
 
 			$email_change = true;
@@ -182,16 +182,15 @@ public function execute(): void
 			&& $_REQUEST['sa'] == 'resend'
 			&& ($row['is_activated'] == 0 || $row['is_activated'] == 2)
 			&& (!isset($_REQUEST['code']) || $_REQUEST['code'] == '')
-		)
-		{
-			$replacements = array(
+		) {
+			$replacements = [
 				'REALNAME' => $row['real_name'],
 				'USERNAME' => $row['member_name'],
 				'ACTIVATIONLINK' => Config::$scripturl . '?action=activate;u=' . $row['id_member'] . ';code=' . $row['validation_code'],
 				'ACTIVATIONLINKWITHOUTCODE' => Config::$scripturl . '?action=activate;u=' . $row['id_member'],
 				'ACTIVATIONCODE' => $row['validation_code'],
 				'FORGOTPASSWORDLINK' => Config::$scripturl . '?action=reminder',
-			);
+			];
 
 			$emaildata = Mail::loadEmailTemplate('resend_activate_message', $replacements, empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $row['lngfile']);
 
@@ -202,18 +201,14 @@ public function execute(): void
 			// This will ensure we don't actually get an error message if it works!
 			Utils::$context['error_title'] = Lang::$txt['invalid_activation_resend'];
 
-			ErrorHandler::fatalLang(!empty($email_change) ? 'change_email_success' : 'resend_email_success', false, array(), false);
+			ErrorHandler::fatalLang(!empty($email_change) ? 'change_email_success' : 'resend_email_success', false, [], false);
 		}
 
 		// Quit if this code is not right.
-		if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code'])
-		{
-			if (!empty($row['is_activated']))
-			{
+		if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code']) {
+			if (!empty($row['is_activated'])) {
 				ErrorHandler::fatalLang('already_activated', false);
-			}
-			elseif ($row['validation_code'] == '')
-			{
+			} elseif ($row['validation_code'] == '') {
 				Lang::load('Profile');
 				ErrorHandler::fatal(sprintf(Lang::$txt['registration_not_approved'], Config::$scripturl . '?action=activate;user=' . $row['member_name']), false);
 			}
@@ -226,28 +221,27 @@ public function execute(): void
 		}
 
 		// Let the integration know that they've been activated!
-		IntegrationHook::call('integrate_activate', array($row['member_name']));
+		IntegrationHook::call('integrate_activate', [$row['member_name']]);
 
 		// Validation complete - update the database!
-		User::updateMemberData($row['id_member'], array('is_activated' => 1, 'validation_code' => ''));
+		User::updateMemberData($row['id_member'], ['is_activated' => 1, 'validation_code' => '']);
 
 		// Also do a proper member stat re-evaluation.
 		Logging::updateStats('member', false);
 
 		// Notify the admin about new activations, but not re-activations.
-		if (empty($row['is_activated']))
-		{
+		if (empty($row['is_activated'])) {
 			Mail::adminNotify('activation', $row['id_member'], $row['member_name']);
 		}
 
-		Utils::$context += array(
+		Utils::$context += [
 			'page_title' => Lang::$txt['registration_successful'],
 			'sub_template' => 'login',
 			'default_username' => $row['member_name'],
 			'default_password' => '',
 			'never_expire' => false,
-			'description' => Lang::$txt['activate_success']
-		);
+			'description' => Lang::$txt['activate_success'],
+		];
 	}
 
 	/***********************
@@ -261,8 +255,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -285,8 +280,9 @@ public static function call(): void
 	protected function __construct()
 	{
 		// Logged in users should not bother to activate their accounts
-		if (!empty(User::$me->id))
+		if (!empty(User::$me->id)) {
 			Utils::redirectexit();
+		}
 
 		Lang::load('Login');
 		Theme::loadTemplate('Login');
@@ -294,7 +290,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Activate::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Activate::exportStatic')) {
 	Activate::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/ACP.php b/Sources/Actions/Admin/ACP.php
index 147d0b1702..e07edbcb42 100644
--- a/Sources/Actions/Admin/ACP.php
+++ b/Sources/Actions/Admin/ACP.php
@@ -13,11 +13,14 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\MessageIndex;
+use SMF\Actions\Notify;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -28,10 +31,6 @@
 use SMF\Url;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\MessageIndex;
-use SMF\Actions\Notify;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class, unpredictable as this might be, handles basic administration.
@@ -45,12 +44,19 @@ class ACP implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AdminMain',
-		),
-	);
+			'prepareDBSettingContext' => 'prepareDBSettingContext',
+			'saveSettings' => 'saveSettings',
+			'saveDBSettings' => 'saveDBSettings',
+			'getServerVersions' => 'getServerVersions',
+			'getFileVersions' => 'getFileVersions',
+			'updateAdminPreferences' => 'updateAdminPreferences',
+			'emailAdmins' => 'emailAdmins',
+			'adminLogin' => 'adminLogin',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -82,10 +88,10 @@ class ACP implements ActionInterface
 	 * please use the integrate_admin_areas hook to add your settings page to
 	 * $admin_areas['config']['areas']['modsettings']['subsections'].
 	 */
-	public array $admin_areas = array(
-		'forum' => array(
+	public array $admin_areas = [
+		'forum' => [
 			'title' => 'admin_main',
-			'permission' => array(
+			'permission' => [
 				'admin_forum',
 				'manage_permissions',
 				'moderate_forum',
@@ -96,630 +102,629 @@ class ACP implements ActionInterface
 				'manage_boards',
 				'manage_smileys',
 				'manage_attachments',
-			),
-			'areas' => array(
-				'index' => array(
+			],
+			'areas' => [
+				'index' => [
 					'label' => 'admin_center',
 					'function' => __NAMESPACE__ . '\\Home::call',
 					'icon' => 'administration',
-				),
-				'credits' => array(
+				],
+				'credits' => [
 					'label' => 'support_credits_title',
 					'function' => __NAMESPACE__ . '\\Home::call',
 					'icon' => 'support',
-				),
-				'news' => array(
+				],
+				'news' => [
 					'label' => 'news_title',
 					'function' => __NAMESPACE__ . '\\News::call',
 					'icon' => 'news',
-					'permission' => array(
+					'permission' => [
 						'edit_news',
 						'send_mail',
 						'admin_forum',
-					),
-					'subsections' => array(
-						'editnews' => array(
+					],
+					'subsections' => [
+						'editnews' => [
 							'label' => 'admin_edit_news',
 							'permission' => 'edit_news',
-						),
-						'mailingmembers' => array(
+						],
+						'mailingmembers' => [
 							'label' => 'admin_newsletters',
 							'permission' => 'send_mail',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'packages' => array(
+						],
+					],
+				],
+				'packages' => [
 					'label' => 'package',
 					'function' => 'SMF\\PackageManager\\PackageManager::call',
-					'permission' => array('admin_forum'),
+					'permission' => ['admin_forum'],
 					'icon' => 'packages',
-					'subsections' => array(
-						'browse' => array(
+					'subsections' => [
+						'browse' => [
 							'label' => 'browse_packages',
-						),
-						'packageget' => array(
+						],
+						'packageget' => [
 							'label' => 'download_packages',
 							'url' => '{scripturl}?action=admin;area=packages;sa=packageget;get',
-						),
-						'perms' => array(
+						],
+						'perms' => [
 							'label' => 'package_file_perms',
-						),
-						'options' => array(
+						],
+						'options' => [
 							'label' => 'package_settings',
-						),
-					),
-				),
-				'search' => array(
+						],
+					],
+				],
+				'search' => [
 					'function' => __NAMESPACE__ . '\\Find::call',
-					'permission' => array('admin_forum'),
-					'select' => 'index'
-				),
-				'adminlogoff' => array(
+					'permission' => ['admin_forum'],
+					'select' => 'index',
+				],
+				'adminlogoff' => [
 					'label' => 'admin_logoff',
 					'function' => __NAMESPACE__ . '\\EndSession::call',
 					'enabled' => true,
 					'icon' => 'exit',
-				),
-			),
-		),
-		'config' => array(
+				],
+			],
+		],
+		'config' => [
 			'title' => 'admin_config',
-			'permission' => array('admin_forum'),
-			'areas' => array(
-				'featuresettings' => array(
+			'permission' => ['admin_forum'],
+			'areas' => [
+				'featuresettings' => [
 					'label' => 'modSettings_title',
 					'function' => __NAMESPACE__ . '\\Features::call',
 					'icon' => 'features',
-					'subsections' => array(
-						'basic' => array(
+					'subsections' => [
+						'basic' => [
 							'label' => 'mods_cat_features',
-						),
-						'bbc' => array(
+						],
+						'bbc' => [
 							'label' => 'manageposts_bbc_settings',
-						),
-						'layout' => array(
+						],
+						'layout' => [
 							'label' => 'mods_cat_layout',
-						),
-						'sig' => array(
+						],
+						'sig' => [
 							'label' => 'signature_settings_short',
-						),
-						'profile' => array(
+						],
+						'profile' => [
 							'label' => 'custom_profile_shorttitle',
-						),
-						'likes' => array(
+						],
+						'likes' => [
 							'label' => 'likes',
-						),
-						'mentions' => array(
+						],
+						'mentions' => [
 							'label' => 'mentions',
-						),
-						'alerts' => array(
+						],
+						'alerts' => [
 							'label' => 'notifications',
-						),
-					),
-				),
-				'antispam' => array(
+						],
+					],
+				],
+				'antispam' => [
 					'label' => 'antispam_title',
 					'function' => __NAMESPACE__ . '\\AntiSpam::call',
 					'icon' => 'security',
-				),
-				'languages' => array(
+				],
+				'languages' => [
 					'label' => 'language_configuration',
 					'function' => __NAMESPACE__ . '\\Languages::call',
 					'icon' => 'languages',
-					'subsections' => array(
-						'edit' => array(
+					'subsections' => [
+						'edit' => [
 							'label' => 'language_edit',
-						),
-						'add' => array(
+						],
+						'add' => [
 							'label' => 'language_add',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'language_settings',
-						),
-					),
-				),
-				'current_theme' => array(
+						],
+					],
+				],
+				'current_theme' => [
 					'label' => 'theme_current_settings',
 					'function' => __NAMESPACE__ . '\\Themes::call',
 					'custom_url' => '{scripturl}?action=admin;area=theme;sa=list;th=%1$d',
 					'icon' => 'current_theme',
-				),
-				'theme' => array(
+				],
+				'theme' => [
 					'label' => 'theme_admin',
 					'function' => __NAMESPACE__ . '\\Themes::call',
 					'custom_url' => '{scripturl}?action=admin;area=theme',
 					'icon' => 'themes',
-					'subsections' => array(
-						'admin' => array(
+					'subsections' => [
+						'admin' => [
 							'label' => 'themeadmin_admin_title',
-						),
-						'list' => array(
+						],
+						'list' => [
 							'label' => 'themeadmin_list_title',
-						),
-						'reset' => array(
+						],
+						'reset' => [
 							'label' => 'themeadmin_reset_title',
-						),
-						'edit' => array(
+						],
+						'edit' => [
 							'label' => 'themeadmin_edit_title',
-						),
-					),
-				),
-				'modsettings' => array(
+						],
+					],
+				],
+				'modsettings' => [
 					'label' => 'admin_modifications',
 					'function' => __NAMESPACE__ . '\\Mods::call',
 					'icon' => 'modifications',
-					'subsections' => array(
+					'subsections' => [
 						// MOD AUTHORS: If your mod has just a few simple
 						// settings and doesn't need its own settings page, you
 						// can use the integrate_general_mod_settings hook to
 						// add them to the 'general' page.
-						'general' => array(
+						'general' => [
 							'label' => 'mods_cat_modifications_misc',
-						),
+						],
 						// MOD AUTHORS: If your mod has a custom settings page,
 						// use the integrate_admin_areas hook to insert it here.
-					),
-				),
-			),
-		),
-		'layout' => array(
+					],
+				],
+			],
+		],
+		'layout' => [
 			'title' => 'layout_controls',
-			'permission' => array('manage_boards', 'admin_forum', 'manage_smileys', 'manage_attachments', 'moderate_forum'),
-			'areas' => array(
-				'manageboards' => array(
+			'permission' => ['manage_boards', 'admin_forum', 'manage_smileys', 'manage_attachments', 'moderate_forum'],
+			'areas' => [
+				'manageboards' => [
 					'label' => 'admin_boards',
 					'function' => __NAMESPACE__ . '\\Boards::call',
 					'icon' => 'boards',
-					'permission' => array('manage_boards'),
-					'subsections' => array(
-						'main' => array(
+					'permission' => ['manage_boards'],
+					'subsections' => [
+						'main' => [
 							'label' => 'boards_edit',
-						),
-						'newcat' => array(
+						],
+						'newcat' => [
 							'label' => 'mboards_new_cat',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
 							'admin_forum',
-						),
-					),
-				),
-				'postsettings' => array(
+						],
+					],
+				],
+				'postsettings' => [
 					'label' => 'manageposts',
 					'function' => __NAMESPACE__ . '\\Posts::call',
-					'permission' => array('admin_forum'),
+					'permission' => ['admin_forum'],
 					'icon' => 'posts',
-					'subsections' => array(
-						'posts' => array(
+					'subsections' => [
+						'posts' => [
 							'label' => 'manageposts_settings',
-						),
-						'censor' => array(
+						],
+						'censor' => [
 							'label' => 'admin_censored_words',
-						),
-						'topics' => array(
+						],
+						'topics' => [
 							'label' => 'manageposts_topic_settings',
-						),
-						'drafts' => array(
+						],
+						'drafts' => [
 							'label' => 'manage_drafts',
-						),
-					),
-				),
-				'managecalendar' => array(
+						],
+					],
+				],
+				'managecalendar' => [
 					'label' => 'manage_calendar',
 					'function' => __NAMESPACE__ . '\\Calendar::call',
 					'icon' => 'calendar',
-					'permission' => array('admin_forum'),
+					'permission' => ['admin_forum'],
 					'inactive' => false,
-					'subsections' => array(
-						'holidays' => array(
+					'subsections' => [
+						'holidays' => [
 							'label' => 'manage_holidays',
 							'permission' => 'admin_forum',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'calendar_settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'managesearch' => array(
+						],
+					],
+				],
+				'managesearch' => [
 					'label' => 'manage_search',
 					'function' => __NAMESPACE__ . '\\Search::call',
 					'icon' => 'search',
-					'permission' => array('admin_forum'),
-					'subsections' => array(
-						'weights' => array(
+					'permission' => ['admin_forum'],
+					'subsections' => [
+						'weights' => [
 							'label' => 'search_weights',
-						),
-						'method' => array(
+						],
+						'method' => [
 							'label' => 'search_method',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
-						),
-					),
-				),
-				'smileys' => array(
+						],
+					],
+				],
+				'smileys' => [
 					'label' => 'smileys_manage',
 					'function' => __NAMESPACE__ . '\\Smileys::call',
 					'icon' => 'smiley',
-					'permission' => array('manage_smileys'),
-					'subsections' => array(
-						'editsets' => array(
+					'permission' => ['manage_smileys'],
+					'subsections' => [
+						'editsets' => [
 							'label' => 'smiley_sets',
-						),
-						'addsmiley' => array(
+						],
+						'addsmiley' => [
 							'label' => 'smileys_add',
 							'enabled' => true,
-						),
-						'editsmileys' => array(
+						],
+						'editsmileys' => [
 							'label' => 'smileys_edit',
 							'enabled' => true,
-						),
-						'setorder' => array(
+						],
+						'setorder' => [
 							'label' => 'smileys_set_order',
 							'enabled' => true,
-						),
-						'editicons' => array(
+						],
+						'editicons' => [
 							'label' => 'icons_edit_message_icons',
 							'enabled' => true,
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
-						),
-					),
-				),
-				'manageattachments' => array(
+						],
+					],
+				],
+				'manageattachments' => [
 					'label' => 'attachments_avatars',
 					'function' => __NAMESPACE__ . '\\Attachments::call',
 					'icon' => 'attachment',
-					'permission' => array('manage_attachments'),
-					'subsections' => array(
-						'browse' => array(
+					'permission' => ['manage_attachments'],
+					'subsections' => [
+						'browse' => [
 							'label' => 'attachment_manager_browse',
-						),
-						'attachments' => array(
+						],
+						'attachments' => [
 							'label' => 'attachment_manager_settings',
-						),
-						'avatars' => array(
+						],
+						'avatars' => [
 							'label' => 'attachment_manager_avatar_settings',
-						),
-						'attachpaths' => array(
+						],
+						'attachpaths' => [
 							'label' => 'attach_directories',
-						),
-						'maintenance' => array(
+						],
+						'maintenance' => [
 							'label' => 'attachment_manager_maintenance',
-						),
-					),
-				),
-				'sengines' => array(
+						],
+					],
+				],
+				'sengines' => [
 					'label' => 'search_engines',
 					'inactive' => false,
 					'function' => __NAMESPACE__ . '\\SearchEngines::call',
 					'icon' => 'engines',
 					'permission' => 'admin_forum',
-					'subsections' => array(
-						'stats' => array(
+					'subsections' => [
+						'stats' => [
 							'label' => 'spider_stats',
-						),
-						'logs' => array(
+						],
+						'logs' => [
 							'label' => 'spider_logs',
-						),
-						'spiders' => array(
+						],
+						'spiders' => [
 							'label' => 'spiders',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
-						),
-					),
-				),
-			),
-		),
-		'members' => array(
+						],
+					],
+				],
+			],
+		],
+		'members' => [
 			'title' => 'admin_manage_members',
-			'permission' => array(
+			'permission' => [
 				'moderate_forum',
 				'manage_membergroups',
 				'manage_bans',
 				'manage_permissions',
 				'admin_forum',
-			),
-			'areas' => array(
-				'viewmembers' => array(
+			],
+			'areas' => [
+				'viewmembers' => [
 					'label' => 'admin_users',
 					'function' => __NAMESPACE__ . '\\Members::call',
 					'icon' => 'members',
-					'permission' => array('moderate_forum'),
-					'subsections' => array(
-						'all' => array(
+					'permission' => ['moderate_forum'],
+					'subsections' => [
+						'all' => [
 							'label' => 'view_all_members',
-						),
-						'search' => array(
+						],
+						'search' => [
 							'label' => 'mlist_search',
-						),
-					),
-				),
-				'membergroups' => array(
+						],
+					],
+				],
+				'membergroups' => [
 					'label' => 'admin_groups',
 					'function' => __NAMESPACE__ . '\\Membergroups::call',
 					'icon' => 'membergroups',
-					'permission' => array('manage_membergroups'),
-					'subsections' => array(
-						'index' => array(
+					'permission' => ['manage_membergroups'],
+					'subsections' => [
+						'index' => [
 							'label' => 'membergroups_edit_groups',
 							'permission' => 'manage_membergroups',
-						),
-						'add' => array(
+						],
+						'add' => [
 							'label' => 'membergroups_new_group',
 							'permission' => 'manage_membergroups',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'permissions' => array(
+						],
+					],
+				],
+				'permissions' => [
 					'label' => 'edit_permissions',
 					'function' => __NAMESPACE__ . '\\Permissions::call',
 					'icon' => 'permissions',
-					'permission' => array('manage_permissions'),
-					'subsections' => array(
-						'index' => array(
+					'permission' => ['manage_permissions'],
+					'subsections' => [
+						'index' => [
 							'label' => 'permissions_groups',
 							'permission' => 'manage_permissions',
-						),
-						'board' => array(
+						],
+						'board' => [
 							'label' => 'permissions_boards',
 							'permission' => 'manage_permissions',
-						),
-						'profiles' => array(
+						],
+						'profiles' => [
 							'label' => 'permissions_profiles',
 							'permission' => 'manage_permissions',
-						),
-						'postmod' => array(
+						],
+						'postmod' => [
 							'label' => 'permissions_post_moderation',
 							'permission' => 'manage_permissions',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'regcenter' => array(
+						],
+					],
+				],
+				'regcenter' => [
 					'label' => 'registration_center',
 					'function' => __NAMESPACE__ . '\\Registration::call',
 					'icon' => 'regcenter',
-					'permission' => array(
+					'permission' => [
 						'admin_forum',
 						'moderate_forum',
-					),
-					'subsections' => array(
-						'register' => array(
+					],
+					'subsections' => [
+						'register' => [
 							'label' => 'admin_browse_register_new',
 							'permission' => 'moderate_forum',
-						),
-						'agreement' => array(
+						],
+						'agreement' => [
 							'label' => 'registration_agreement',
 							'permission' => 'admin_forum',
-						),
-						'policy' => array(
+						],
+						'policy' => [
 							'label' => 'privacy_policy',
 							'permission' => 'admin_forum',
-						),
-						'reservednames' => array(
+						],
+						'reservednames' => [
 							'label' => 'admin_reserved_set',
 							'permission' => 'admin_forum',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'warnings' => array(
+						],
+					],
+				],
+				'warnings' => [
 					'label' => 'warnings',
 					'function' => __NAMESPACE__ . '\\Warnings::call',
 					'icon' => 'warning',
 					'inactive' => false,
-					'permission' => array('admin_forum'),
-				),
-				'ban' => array(
+					'permission' => ['admin_forum'],
+				],
+				'ban' => [
 					'label' => 'ban_title',
 					'function' => __NAMESPACE__ . '\\Bans::call',
 					'icon' => 'ban',
 					'permission' => 'manage_bans',
-					'subsections' => array(
-						'list' => array(
+					'subsections' => [
+						'list' => [
 							'label' => 'ban_edit_list',
-						),
-						'add' => array(
+						],
+						'add' => [
 							'label' => 'ban_add_new',
-						),
-						'browse' => array(
+						],
+						'browse' => [
 							'label' => 'ban_trigger_browse',
-						),
-						'log' => array(
+						],
+						'log' => [
 							'label' => 'ban_log',
-						),
-					),
-				),
-				'paidsubscribe' => array(
+						],
+					],
+				],
+				'paidsubscribe' => [
 					'label' => 'paid_subscriptions',
 					'inactive' => false,
 					'function' => __NAMESPACE__ . '\\Subscriptions::call',
 					'icon' => 'paid',
 					'permission' => 'admin_forum',
-					'subsections' => array(
-						'view' => array(
+					'subsections' => [
+						'view' => [
 							'label' => 'paid_subs_view',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'settings',
-						),
-					),
-				),
-			),
-		),
-		'maintenance' => array(
+						],
+					],
+				],
+			],
+		],
+		'maintenance' => [
 			'title' => 'admin_maintenance',
-			'permission' => array('admin_forum'),
-			'areas' => array(
-				'serversettings' => array(
+			'permission' => ['admin_forum'],
+			'areas' => [
+				'serversettings' => [
 					'label' => 'admin_server_settings',
 					'function' => __NAMESPACE__ . '\\Server::call',
 					'icon' => 'server',
-					'subsections' => array(
-						'general' => array(
+					'subsections' => [
+						'general' => [
 							'label' => 'general_settings',
-						),
-						'database' => array(
+						],
+						'database' => [
 							'label' => 'database_settings',
-						),
-						'cookie' => array(
+						],
+						'cookie' => [
 							'label' => 'cookies_sessions_settings',
-						),
-						'security' => array(
+						],
+						'security' => [
 							'label' => 'security_settings',
-						),
-						'cache' => array(
+						],
+						'cache' => [
 							'label' => 'caching_settings',
-						),
-						'export' => array(
+						],
+						'export' => [
 							'label' => 'export_settings',
-						),
-						'loads' => array(
+						],
+						'loads' => [
 							'label' => 'load_balancing_settings',
-						),
-						'phpinfo' => array(
+						],
+						'phpinfo' => [
 							'label' => 'phpinfo_settings',
-						),
-					),
-				),
-				'maintain' => array(
+						],
+					],
+				],
+				'maintain' => [
 					'label' => 'maintain_title',
 					'function' => __NAMESPACE__ . '\\Maintenance::call',
 					'icon' => 'maintain',
-					'subsections' => array(
-						'routine' => array(
+					'subsections' => [
+						'routine' => [
 							'label' => 'maintain_sub_routine',
 							'permission' => 'admin_forum',
-						),
-						'database' => array(
+						],
+						'database' => [
 							'label' => 'maintain_sub_database',
 							'permission' => 'admin_forum',
-						),
-						'members' => array(
+						],
+						'members' => [
 							'label' => 'maintain_sub_members',
 							'permission' => 'admin_forum',
-						),
-						'topics' => array(
+						],
+						'topics' => [
 							'label' => 'maintain_sub_topics',
 							'permission' => 'admin_forum',
-						),
-						'hooks' => array(
+						],
+						'hooks' => [
 							'label' => 'hooks_title_list',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'scheduledtasks' => array(
+						],
+					],
+				],
+				'scheduledtasks' => [
 					'label' => 'maintain_tasks',
 					'function' => __NAMESPACE__ . '\\Tasks::call',
 					'icon' => 'scheduled',
-					'subsections' => array(
-						'tasks' => array(
+					'subsections' => [
+						'tasks' => [
 							'label' => 'maintain_tasks',
 							'permission' => 'admin_forum',
-						),
-						'tasklog' => array(
+						],
+						'tasklog' => [
 							'label' => 'scheduled_log',
 							'permission' => 'admin_forum',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'scheduled_tasks_settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'mailqueue' => array(
+						],
+					],
+				],
+				'mailqueue' => [
 					'label' => 'mailqueue_title',
 					'function' => __NAMESPACE__ . '\\Mail::call',
 					'icon' => 'mail',
-					'subsections' => array(
-						'browse' => array(
+					'subsections' => [
+						'browse' => [
 							'label' => 'mailqueue_browse',
 							'permission' => 'admin_forum',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'mailqueue_settings',
 							'permission' => 'admin_forum',
-						),
-						'test' => array(
+						],
+						'test' => [
 							'label' => 'mailqueue_test',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'reports' => array(
+						],
+					],
+				],
+				'reports' => [
 					'label' => 'generate_reports',
 					'function' => __NAMESPACE__ . '\\Reports::call',
 					'icon' => 'reports',
-				),
-				'logs' => array(
+				],
+				'logs' => [
 					'label' => 'logs',
 					'function' => __NAMESPACE__ . '\\Logs::call',
 					'icon' => 'logs',
-					'subsections' => array(
-						'errorlog' => array(
+					'subsections' => [
+						'errorlog' => [
 							'label' => 'errorlog',
 							'permission' => 'admin_forum',
 							'enabled' => true,
 							'url' => '{scripturl}?action=admin;area=logs;sa=errorlog;desc',
-						),
-						'adminlog' => array(
+						],
+						'adminlog' => [
 							'label' => 'admin_log',
 							'permission' => 'admin_forum',
 							'enabled' => true,
-						),
-						'modlog' => array(
+						],
+						'modlog' => [
 							'label' => 'moderation_log',
 							'permission' => 'admin_forum',
 							'enabled' => true,
-						),
-						'banlog' => array(
+						],
+						'banlog' => [
 							'label' => 'ban_log',
 							'permission' => 'manage_bans',
-						),
-						'spiderlog' => array(
+						],
+						'spiderlog' => [
 							'label' => 'spider_logs',
 							'permission' => 'admin_forum',
 							'enabled' => true,
-						),
-						'tasklog' => array(
+						],
+						'tasklog' => [
 							'label' => 'scheduled_log',
 							'permission' => 'admin_forum',
-						),
-						'settings' => array(
+						],
+						'settings' => [
 							'label' => 'log_settings',
 							'permission' => 'admin_forum',
-						),
-					),
-				),
-				'repairboards' => array(
+						],
+					],
+				],
+				'repairboards' => [
 					'label' => 'admin_repair',
 					'function' => __NAMESPACE__ . '\\RepairBoards::call',
 					'select' => 'maintain',
 					'hidden' => true,
-				),
-			),
-		),
-	);
-
+				],
+			],
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -751,35 +756,34 @@ public function execute(): void
 
 		// Actually create the menu!
 		// Hook call disabled because we already called it in setAdminAreas()
-		$menu = new Menu($this->admin_areas, array(
+		$menu = new Menu($this->admin_areas, [
 			'do_big_icons' => true,
 			'disable_hook_call' => true,
-		));
+		]);
 
 		// Nothing valid?
-		if (empty($menu->include_data))
+		if (empty($menu->include_data)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=admin',
 			'name' => Lang::$txt['admin_center'],
-		);
+		];
 
-		if (isset($menu->current_area) && $menu->current_area != 'index')
-		{
-			Utils::$context['linktree'][] = array(
+		if (isset($menu->current_area) && $menu->current_area != 'index') {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=admin;area=' . $menu->current_area . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 				'name' => $menu->include_data['label'],
-			);
+			];
 		}
 
-		if (!empty($menu->current_subsection) && $menu->include_data['subsections'][$menu->current_subsection]['label'] != $menu->include_data['label'])
-		{
-			Utils::$context['linktree'][] = array(
+		if (!empty($menu->current_subsection) && $menu->include_data['subsections'][$menu->current_subsection]['label'] != $menu->include_data['label']) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=admin;area=' . $menu->current_area . ';sa=' . $menu->current_subsection . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 				'name' => $menu->include_data['subsections'][$menu->current_subsection]['label'],
-			);
+			];
 		}
 
 		// Make a note of the Unique ID for this menu.
@@ -790,15 +794,17 @@ public function execute(): void
 		Utils::$context['admin_area'] = $menu->current_area;
 
 		// Now - finally - call the right place!
-		if (isset($menu->include_data['file']))
-			require_once(Config::$sourcedir . '/' . $menu->include_data['file']);
+		if (isset($menu->include_data['file'])) {
+			require_once Config::$sourcedir . '/' . $menu->include_data['file'];
+		}
 
 		// Get the right callable.
 		$call = Utils::getCallable($menu->include_data['function']);
 
 		// Is it valid?
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/***********************
@@ -812,8 +818,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -837,60 +844,50 @@ public static function prepareDBSettingContext(&$config_vars): void
 	{
 		Lang::load('Help');
 
-		if (isset($_SESSION['adm-save']))
-		{
-			if ($_SESSION['adm-save'] === true)
-			{
+		if (isset($_SESSION['adm-save'])) {
+			if ($_SESSION['adm-save'] === true) {
 				Utils::$context['saved_successful'] = true;
-			}
-			else
-			{
+			} else {
 				Utils::$context['saved_failed'] = $_SESSION['adm-save'];
 			}
 
 			unset($_SESSION['adm-save']);
 		}
 
-		Utils::$context['config_vars'] = array();
-		$inlinePermissions = array();
-		$bbcChoice = array();
+		Utils::$context['config_vars'] = [];
+		$inlinePermissions = [];
+		$bbcChoice = [];
 		$board_list = false;
 
-		foreach ($config_vars as $config_var)
-		{
+		foreach ($config_vars as $config_var) {
 			// HR?
-			if (!is_array($config_var))
-			{
+			if (!is_array($config_var)) {
 				Utils::$context['config_vars'][] = $config_var;
-			}
-			else
-			{
+			} else {
 				// If it has no name it doesn't have any purpose!
-				if (empty($config_var[1]))
+				if (empty($config_var[1])) {
 					continue;
+				}
 
 				// Special case for inline permissions
-				if ($config_var[0] == 'permissions' && User::$me->allowedTo('manage_permissions'))
-				{
+				if ($config_var[0] == 'permissions' && User::$me->allowedTo('manage_permissions')) {
 					$inlinePermissions[] = $config_var[1];
-				}
-				elseif ($config_var[0] == 'permissions')
-				{
+				} elseif ($config_var[0] == 'permissions') {
 					continue;
 				}
 
-				if ($config_var[0] == 'boards')
+				if ($config_var[0] == 'boards') {
 					$board_list = true;
+				}
 
 				// Are we showing the BBC selection box?
-				if ($config_var[0] == 'bbc')
+				if ($config_var[0] == 'bbc') {
 					$bbcChoice[] = $config_var[1];
+				}
 
 				// We need to do some parsing of the value before we pass it in.
-				if (isset(Config::$modSettings[$config_var[1]]))
-				{
-					switch ($config_var[0])
-					{
+				if (isset(Config::$modSettings[$config_var[1]])) {
+					switch ($config_var[0]) {
 						case 'select':
 							$value = Config::$modSettings[$config_var[1]];
 							break;
@@ -906,23 +903,20 @@ public static function prepareDBSettingContext(&$config_vars): void
 						default:
 							$value = Utils::htmlspecialchars(Config::$modSettings[$config_var[1]]);
 					}
-				}
-				else
-				{
+				} else {
 					// Darn, it's empty. What type is expected?
-					switch ($config_var[0])
-					{
+					switch ($config_var[0]) {
 						case 'int':
 						case 'float':
 							$value = 0;
 							break;
 
 						case 'select':
-							$value = !empty($config_var['multiple']) ? Utils::jsonEncode(array()) : '';
+							$value = !empty($config_var['multiple']) ? Utils::jsonEncode([]) : '';
 							break;
 
 						case 'boards':
-							$value = array();
+							$value = [];
 							break;
 
 						default:
@@ -930,96 +924,77 @@ public static function prepareDBSettingContext(&$config_vars): void
 					}
 				}
 
-				Utils::$context['config_vars'][$config_var[1]] = array(
-					'label' => isset($config_var['text_label']) ? $config_var['text_label'] : (isset(Lang::$txt[$config_var[1]]) ? Lang::$txt[$config_var[1]] : (isset($config_var[3]) && !is_array($config_var[3]) ? $config_var[3] : '')),
+				Utils::$context['config_vars'][$config_var[1]] = [
+					'label' => $config_var['text_label'] ?? (Lang::$txt[$config_var[1]] ?? (isset($config_var[3]) && !is_array($config_var[3]) ? $config_var[3] : '')),
 					'help' => isset(Lang::$helptxt[$config_var[1]]) ? $config_var[1] : '',
 					'type' => $config_var[0],
-					'size' => !empty($config_var['size']) ? $config_var['size'] : (!empty($config_var[2]) && !is_array($config_var[2]) ? $config_var[2] : (in_array($config_var[0], array('int', 'float')) ? 6 : 0)),
-					'data' => array(),
+					'size' => !empty($config_var['size']) ? $config_var['size'] : (!empty($config_var[2]) && !is_array($config_var[2]) ? $config_var[2] : (in_array($config_var[0], ['int', 'float']) ? 6 : 0)),
+					'data' => [],
 					'name' => $config_var[1],
 					'value' => $value,
 					'disabled' => false,
 					'invalid' => !empty($config_var['invalid']),
 					'javascript' => '',
 					'var_message' => !empty($config_var['message']) && isset(Lang::$txt[$config_var['message']]) ? Lang::$txt[$config_var['message']] : '',
-					'preinput' => isset($config_var['preinput']) ? $config_var['preinput'] : '',
-					'postinput' => isset($config_var['postinput']) ? $config_var['postinput'] : '',
-				);
+					'preinput' => $config_var['preinput'] ?? '',
+					'postinput' => $config_var['postinput'] ?? '',
+				];
 
 				// Handle min/max/step if necessary
-				if ($config_var[0] == 'int' || $config_var[0] == 'float')
-				{
+				if ($config_var[0] == 'int' || $config_var[0] == 'float') {
 					// Default to a min of 0 if one isn't set
-					if (isset($config_var['min']))
-					{
+					if (isset($config_var['min'])) {
 						Utils::$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
-					}
-					else
-					{
+					} else {
 						Utils::$context['config_vars'][$config_var[1]]['min'] = 0;
 					}
 
-					if (isset($config_var['max']))
-					{
+					if (isset($config_var['max'])) {
 						Utils::$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
 					}
 
-					if (isset($config_var['step']))
-					{
+					if (isset($config_var['step'])) {
 						Utils::$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
 					}
 				}
 
 				// If this is a select box handle any data.
-				if (!empty($config_var[2]) && is_array($config_var[2]))
-				{
+				if (!empty($config_var[2]) && is_array($config_var[2])) {
 					// If we allow multiple selections, we need to adjust a few things.
-					if ($config_var[0] == 'select' && !empty($config_var['multiple']))
-					{
+					if ($config_var[0] == 'select' && !empty($config_var['multiple'])) {
 						Utils::$context['config_vars'][$config_var[1]]['name'] .= '[]';
 
-						Utils::$context['config_vars'][$config_var[1]]['value'] = !empty(Utils::$context['config_vars'][$config_var[1]]['value']) ? Utils::jsonDecode(Utils::$context['config_vars'][$config_var[1]]['value'], true) : array();
+						Utils::$context['config_vars'][$config_var[1]]['value'] = !empty(Utils::$context['config_vars'][$config_var[1]]['value']) ? Utils::jsonDecode(Utils::$context['config_vars'][$config_var[1]]['value'], true) : [];
 					}
 
 					// If it's associative
-					if (isset($config_var[2][0]) && is_array($config_var[2][0]))
-					{
+					if (isset($config_var[2][0]) && is_array($config_var[2][0])) {
 						Utils::$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
-					}
-					else
-					{
-						foreach ($config_var[2] as $key => $item)
-							Utils::$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					} else {
+						foreach ($config_var[2] as $key => $item) {
+							Utils::$context['config_vars'][$config_var[1]]['data'][] = [$key, $item];
+						}
 					}
 
-					if (empty($config_var['size']) && !empty($config_var['multiple']))
-					{
+					if (empty($config_var['size']) && !empty($config_var['multiple'])) {
 						Utils::$context['config_vars'][$config_var[1]]['size'] = max(4, count($config_var[2]));
 					}
 				}
 
 				// Finally allow overrides - and some final cleanups.
-				foreach ($config_var as $k => $v)
-				{
-					if (!is_numeric($k))
-					{
-						if (substr($k, 0, 2) == 'on')
-						{
+				foreach ($config_var as $k => $v) {
+					if (!is_numeric($k)) {
+						if (substr($k, 0, 2) == 'on') {
 							Utils::$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
-						}
-						else
-						{
+						} else {
 							Utils::$context['config_vars'][$config_var[1]][$k] = $v;
 						}
 					}
 
 					// See if there are any other labels that might fit?
-					if (isset(Lang::$txt['setting_' . $config_var[1]]))
-					{
+					if (isset(Lang::$txt['setting_' . $config_var[1]])) {
 						Utils::$context['config_vars'][$config_var[1]]['label'] = Lang::$txt['setting_' . $config_var[1]];
-					}
-					elseif (isset(Lang::$txt['groups_' . $config_var[1]]))
-					{
+					} elseif (isset(Lang::$txt['groups_' . $config_var[1]])) {
 						Utils::$context['config_vars'][$config_var[1]]['label'] = Lang::$txt['groups_' . $config_var[1]];
 					}
 				}
@@ -1028,8 +1003,7 @@ public static function prepareDBSettingContext(&$config_vars): void
 				// @todo Temporary. Preventing divs inside label tags.
 				$divPos = strpos(Utils::$context['config_vars'][$config_var[1]]['label'], '<div');
 
-				if ($divPos !== false)
-				{
+				if ($divPos !== false) {
 					Utils::$context['config_vars'][$config_var[1]]['subtext'] = preg_replace('~</?div[^>]*>~', '', substr(Utils::$context['config_vars'][$config_var[1]]['label'], $divPos));
 
 					Utils::$context['config_vars'][$config_var[1]]['label'] = substr(Utils::$context['config_vars'][$config_var[1]]['label'], 0, $divPos);
@@ -1038,52 +1012,45 @@ public static function prepareDBSettingContext(&$config_vars): void
 		}
 
 		// If we have inline permissions we need to prep them.
-		if (!empty($inlinePermissions) && User::$me->allowedTo('manage_permissions'))
-		{
+		if (!empty($inlinePermissions) && User::$me->allowedTo('manage_permissions')) {
 			Permissions::init_inline_permissions($inlinePermissions);
 		}
 
-		if ($board_list)
-		{
+		if ($board_list) {
 			Utils::$context['board_list'] = MessageIndex::getBoardList();
 		}
 
 		// What about any BBC selection boxes?
-		if (!empty($bbcChoice))
-		{
+		if (!empty($bbcChoice)) {
 			// What are the options, eh?
 			$temp = BBCodeParser::getCodes();
-			$bbcTags = array();
+			$bbcTags = [];
 
-			foreach ($temp as $tag)
-			{
-				if (!isset($tag['require_parents']))
+			foreach ($temp as $tag) {
+				if (!isset($tag['require_parents'])) {
 					$bbcTags[] = $tag['tag'];
+				}
 			}
 
 			$bbcTags = array_unique($bbcTags);
 
 			// The number of columns we want to show the BBC tags in.
-			$numColumns = isset(Utils::$context['num_bbc_columns']) ? Utils::$context['num_bbc_columns'] : 3;
+			$numColumns = Utils::$context['num_bbc_columns'] ?? 3;
 
 			// Now put whatever BBC options we may have into context too!
-			Utils::$context['bbc_sections'] = array();
+			Utils::$context['bbc_sections'] = [];
 
-			foreach ($bbcChoice as $bbcSection)
-			{
-				Utils::$context['bbc_sections'][$bbcSection] = array(
-					'title' => isset(Lang::$txt['bbc_title_' . $bbcSection]) ? Lang::$txt['bbc_title_' . $bbcSection] : Lang::$txt['enabled_bbc_select'],
-					'disabled' => empty(Config::$modSettings['bbc_disabled_' . $bbcSection]) ? array() : Config::$modSettings['bbc_disabled_' . $bbcSection],
+			foreach ($bbcChoice as $bbcSection) {
+				Utils::$context['bbc_sections'][$bbcSection] = [
+					'title' => Lang::$txt['bbc_title_' . $bbcSection] ?? Lang::$txt['enabled_bbc_select'],
+					'disabled' => empty(Config::$modSettings['bbc_disabled_' . $bbcSection]) ? [] : Config::$modSettings['bbc_disabled_' . $bbcSection],
 					'all_selected' => empty(Config::$modSettings['bbc_disabled_' . $bbcSection]),
-					'columns' => array(),
-				);
+					'columns' => [],
+				];
 
-				if ($bbcSection == 'legacyBBC')
-				{
+				if ($bbcSection == 'legacyBBC') {
 					$sectionTags = array_intersect(Utils::$context['legacy_bbc'], $bbcTags);
-				}
-				else
-				{
+				} else {
 					$sectionTags = array_diff($bbcTags, Utils::$context['legacy_bbc']);
 				}
 
@@ -1093,22 +1060,22 @@ public static function prepareDBSettingContext(&$config_vars): void
 				$col = 0;
 				$i = 0;
 
-				foreach ($sectionTags as $tag)
-				{
-					if ($i % $tagsPerColumn == 0 && $i != 0)
+				foreach ($sectionTags as $tag) {
+					if ($i % $tagsPerColumn == 0 && $i != 0) {
 						$col++;
+					}
 
-					Utils::$context['bbc_sections'][$bbcSection]['columns'][$col][] = array(
+					Utils::$context['bbc_sections'][$bbcSection]['columns'][$col][] = [
 						'tag' => $tag,
 						'show_help' => isset(Lang::$helptxt['tag_' . $tag]),
-					);
+					];
 
 					$i++;
 				}
 			}
 		}
 
-		IntegrationHook::call('integrate_prepare_db_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_prepare_db_settings', [&$config_vars]);
 		SecurityToken::create('admin-dbsc');
 	}
 
@@ -1126,25 +1093,19 @@ public static function saveSettings(&$config_vars): void
 		SecurityToken::validate('admin-ssc');
 
 		// Fix the darn stupid cookiename! (more may not be allowed, but these for sure!)
-		if (isset($_POST['cookiename']))
-		{
+		if (isset($_POST['cookiename'])) {
 			$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . (Utils::$context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
 		}
 
 		// Fix the forum's URL if necessary.
-		if (isset($_POST['boardurl']))
-		{
-			if (substr($_POST['boardurl'], -10) == '/index.php')
-			{
+		if (isset($_POST['boardurl'])) {
+			if (substr($_POST['boardurl'], -10) == '/index.php') {
 				$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-			}
-			elseif (substr($_POST['boardurl'], -1) == '/')
-			{
+			} elseif (substr($_POST['boardurl'], -1) == '/') {
 				$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
 			}
 
-			if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
-			{
+			if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') {
 				$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
 			}
 
@@ -1152,53 +1113,47 @@ public static function saveSettings(&$config_vars): void
 		}
 
 		// Any passwords?
-		$config_passwords = array();
+		$config_passwords = [];
 
 		// All the numeric variables.
-		$config_nums = array();
+		$config_nums = [];
 
 		// All the checkboxes
-		$config_bools = array();
+		$config_bools = [];
 
 		// Ones that accept multiple types (should be rare)
-		$config_multis = array();
+		$config_multis = [];
 
 		// Get all known setting definitions and assign them to our groups above.
 		$settings_defs = Config::getSettingsDefs();
-		foreach ($settings_defs as $var => $def)
-		{
-			if (!is_string($var))
+
+		foreach ($settings_defs as $var => $def) {
+			if (!is_string($var)) {
 				continue;
+			}
 
-			if (!empty($def['is_password']))
-			{
+			if (!empty($def['is_password'])) {
 				$config_passwords[] = $var;
-			}
-			else
-			{
+			} else {
 				// Special handling if multiple types are allowed.
-				if (is_array($def['type']))
-				{
+				if (is_array($def['type'])) {
 					// Obviously, we don't need null here.
 					$def['type'] = array_filter(
 						$def['type'],
-						function ($type)
-						{
+						function ($type) {
 							return $type !== 'NULL';
-						}
+						},
 					);
 
 					$type = count($def['type']) == 1 ? reset($def['type']) : 'multiple';
-				}
-				else
-				{
+				} else {
 					$type = $def['type'];
 				}
 
-				switch ($type)
-				{
+				switch ($type) {
 					case 'multiple':
 						$config_multis[$var] = $def['type'];
+						// no break
 
 					case 'double':
 						$config_nums[] = $var;
@@ -1206,19 +1161,13 @@ function ($type)
 
 					case 'integer':
 						// Some things saved as integers are presented as booleans
-						foreach ($config_vars as $config_var)
-						{
-							if (is_array($config_var) && $config_var[0] == $var)
-							{
-								if ($config_var[3] == 'check')
-								{
+						foreach ($config_vars as $config_var) {
+							if (is_array($config_var) && $config_var[0] == $var) {
+								if ($config_var[3] == 'check') {
 									$config_bools[] = $var;
 									break 2;
 								}
-								else
-								{
-									break;
-								}
+								break;
 							}
 						}
 						$config_nums[] = $var;
@@ -1235,20 +1184,19 @@ function ($type)
 		}
 
 		// Now sort everything into a big array, and figure out arrays and etc.
-		$new_settings = array();
+		$new_settings = [];
+
 		// Figure out which config vars we're saving here...
-		foreach ($config_vars as $config_var)
-		{
-			if (!is_array($config_var) || $config_var[2] != 'file')
+		foreach ($config_vars as $config_var) {
+			if (!is_array($config_var) || $config_var[2] != 'file') {
 				continue;
+			}
 
 			$var_name = $config_var[0];
 
 			// Unknown setting?
-			if (!isset($settings_defs[$var_name]) && isset($config_var[3]))
-			{
-				switch ($config_var[3])
-				{
+			if (!isset($settings_defs[$var_name]) && isset($config_var[3])) {
+				switch ($config_var[3]) {
 					case 'int':
 					case 'float':
 						$config_nums[] = $var_name;
@@ -1263,53 +1211,45 @@ function ($type)
 				}
 			}
 
-			if (!in_array($var_name, $config_bools) && !isset($_POST[$var_name]))
+			if (!in_array($var_name, $config_bools) && !isset($_POST[$var_name])) {
 				continue;
+			}
 
-			if (in_array($var_name, $config_passwords))
-			{
-				if (isset($_POST[$var_name][1]) && $_POST[$var_name][0] == $_POST[$var_name][1])
+			if (in_array($var_name, $config_passwords)) {
+				if (isset($_POST[$var_name][1]) && $_POST[$var_name][0] == $_POST[$var_name][1]) {
 					$new_settings[$var_name] = $_POST[$var_name][0];
-			}
-			elseif (in_array($var_name, $config_nums))
-			{
+				}
+			} elseif (in_array($var_name, $config_nums)) {
 				$new_settings[$var_name] = (int) $_POST[$var_name];
 
 				// If no min is specified, assume 0. This is done to avoid having to specify 'min => 0' for all settings where 0 is the min...
-				$min = isset($config_var['min']) ? $config_var['min'] : 0;
+				$min = $config_var['min'] ?? 0;
 				$new_settings[$var_name] = max($min, $new_settings[$var_name]);
 
 				// Is there a max value for this as well?
-				if (isset($config_var['max']))
+				if (isset($config_var['max'])) {
 					$new_settings[$var_name] = min($config_var['max'], $new_settings[$var_name]);
-			}
-			elseif (in_array($var_name, $config_bools))
-			{
+				}
+			} elseif (in_array($var_name, $config_bools)) {
 				$new_settings[$var_name] = !empty($_POST[$var_name]);
-			}
-			elseif (isset($config_multis[$var_name]))
-			{
+			} elseif (isset($config_multis[$var_name])) {
 				$is_acceptable_type = false;
 
-				foreach ($config_multis[$var_name] as $type)
-				{
+				foreach ($config_multis[$var_name] as $type) {
 					$temp = $_POST[$var_name];
 					settype($temp, $type);
 
-					if ($temp == $_POST[$var_name])
-					{
+					if ($temp == $_POST[$var_name]) {
 						$new_settings[$var_name] = $temp;
 						$is_acceptable_type = true;
-
 						break;
 					}
 				}
 
-				if (!$is_acceptable_type)
+				if (!$is_acceptable_type) {
 					ErrorHandler::fatal('Invalid config_var \'' . $var_name . '\'');
-			}
-			else
-			{
+				}
+			} else {
 				$new_settings[$var_name] = $_POST[$var_name];
 			}
 		}
@@ -1318,33 +1258,38 @@ function ($type)
 		Config::updateSettingsFile($new_settings);
 
 		// Now loop through the remaining (database-based) settings.
-		$new_settings = array();
-		foreach ($config_vars as $config_var)
-		{
+		$new_settings = [];
+
+		foreach ($config_vars as $config_var) {
 			// We just saved the file-based settings, so skip their definitions.
-			if (!is_array($config_var) || $config_var[2] == 'file')
+			if (!is_array($config_var) || $config_var[2] == 'file') {
 				continue;
+			}
 
-			$new_setting = array($config_var[3], $config_var[0]);
+			$new_setting = [$config_var[3], $config_var[0]];
 
 			// Select options need carried over, too.
-			if (isset($config_var[4]))
+			if (isset($config_var[4])) {
 				$new_setting[] = $config_var[4];
+			}
 
 			// Include min and max if necessary
-			if (isset($config_var['min']))
+			if (isset($config_var['min'])) {
 				$new_setting['min'] = $config_var['min'];
+			}
 
-			if (isset($config_var['max']))
+			if (isset($config_var['max'])) {
 				$new_setting['max'] = $config_var['max'];
+			}
 
 			// Rewrite the definition a bit.
 			$new_settings[] = $new_setting;
 		}
 
 		// Save the new database-based settings, if any.
-		if (!empty($new_settings))
+		if (!empty($new_settings)) {
 			ACP::saveDBSettings($new_settings);
+		}
 	}
 
 	/**
@@ -1360,133 +1305,125 @@ public static function saveDBSettings(&$config_vars)
 
 		SecurityToken::validate('admin-dbsc');
 
-		$inlinePermissions = array();
+		$inlinePermissions = [];
 
-		foreach ($config_vars as $var)
-		{
-			if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags']))))
-			{
+		foreach ($config_vars as $var) {
+			if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) {
 				continue;
 			}
 
 			// Checkboxes!
-			if ($var[0] == 'check')
-			{
+			if ($var[0] == 'check') {
 				$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
 			}
 			// Select boxes!
-			elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2])))
-			{
+			elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) {
 				$setArray[$var[1]] = $_POST[$var[1]];
-			}
-			elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
-			{
+			} elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != []) {
 				// For security purposes we validate this line by line.
-				$lOptions = array();
+				$lOptions = [];
 
-				foreach ($_POST[$var[1]] as $invar)
-				{
-					if (in_array($invar, array_keys($var[2])))
+				foreach ($_POST[$var[1]] as $invar) {
+					if (in_array($invar, array_keys($var[2]))) {
 						$lOptions[] = $invar;
+					}
 				}
 
 				$setArray[$var[1]] = Utils::jsonEncode($lOptions);
 			}
 			// List of boards!
-			elseif ($var[0] == 'boards')
-			{
+			elseif ($var[0] == 'boards') {
 				// We just need a simple list of valid boards, nothing more.
-				if ($board_list === null)
-				{
-					$board_list = array();
-					$request = Db::$db->query('', '
-						SELECT id_board
-						FROM {db_prefix}boards'
+				if ($board_list === null) {
+					$board_list = [];
+					$request = Db::$db->query(
+						'',
+						'SELECT id_board
+						FROM {db_prefix}boards',
 					);
-					while ($row = Db::$db->fetch_row($request))
-					{
+
+					while ($row = Db::$db->fetch_row($request)) {
 						$board_list[$row[0]] = true;
 					}
 					Db::$db->free_result($request);
 				}
 
-				$lOptions = array();
+				$lOptions = [];
 
-				if (!empty($_POST[$var[1]]))
-				{
-					foreach ($_POST[$var[1]] as $invar => $dummy)
-					{
-						if (isset($board_list[$invar]))
+				if (!empty($_POST[$var[1]])) {
+					foreach ($_POST[$var[1]] as $invar => $dummy) {
+						if (isset($board_list[$invar])) {
 							$lOptions[] = $invar;
+						}
 					}
 				}
 
 				$setArray[$var[1]] = !empty($lOptions) ? implode(',', $lOptions) : '';
 			}
 			// Integers!
-			elseif ($var[0] == 'int')
-			{
+			elseif ($var[0] == 'int') {
 				$setArray[$var[1]] = (int) $_POST[$var[1]];
 
 				// If no min is specified, assume 0. This is done to avoid having to specify 'min => 0' for all settings where 0 is the min...
-				$min = isset($var['min']) ? $var['min'] : 0;
+				$min = $var['min'] ?? 0;
 				$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 				// Do we have a max value for this as well?
-				if (isset($var['max']))
+				if (isset($var['max'])) {
 					$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+				}
 			}
 			// Floating point!
-			elseif ($var[0] == 'float')
-			{
+			elseif ($var[0] == 'float') {
 				$setArray[$var[1]] = (float) $_POST[$var[1]];
 
 				// If no min is specified, assume 0. This is done to avoid having to specify 'min => 0' for all settings where 0 is the min...
-				$min = isset($var['min']) ? $var['min'] : 0;
+				$min = $var['min'] ?? 0;
 				$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 				// Do we have a max value for this as well?
-				if (isset($var['max']))
+				if (isset($var['max'])) {
 					$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+				}
 			}
 			// Text!
-			elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time')))
-			{
+			elseif (in_array($var[0], ['text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'])) {
 				$setArray[$var[1]] = $_POST[$var[1]];
 			}
 			// Passwords!
-			elseif ($var[0] == 'password')
-			{
-				if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1])
+			elseif ($var[0] == 'password') {
+				if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) {
 					$setArray[$var[1]] = $_POST[$var[1]][0];
+				}
 			}
 			// BBC.
-			elseif ($var[0] == 'bbc')
-			{
-				$bbcTags = array();
-				foreach (BBCodeParser::getCodes() as $tag)
+			elseif ($var[0] == 'bbc') {
+				$bbcTags = [];
+
+				foreach (BBCodeParser::getCodes() as $tag) {
 					$bbcTags[] = $tag['tag'];
+				}
 
-				if (!isset($_POST[$var[1] . '_enabledTags']))
-					$_POST[$var[1] . '_enabledTags'] = array();
-				elseif (!is_array($_POST[$var[1] . '_enabledTags']))
-					$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+				if (!isset($_POST[$var[1] . '_enabledTags'])) {
+					$_POST[$var[1] . '_enabledTags'] = [];
+				} elseif (!is_array($_POST[$var[1] . '_enabledTags'])) {
+					$_POST[$var[1] . '_enabledTags'] = [$_POST[$var[1] . '_enabledTags']];
+				}
 
 				$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags']));
 			}
 			// Permissions?
-			elseif ($var[0] == 'permissions')
-			{
+			elseif ($var[0] == 'permissions') {
 				$inlinePermissions[] = $var[1];
 			}
 		}
 
-		if (!empty($setArray))
+		if (!empty($setArray)) {
 			Config::updateModSettings($setArray);
+		}
 
 		// If we have inline permissions we need to save them.
-		if (!empty($inlinePermissions) && User::$me->allowedTo('manage_permissions'))
-		{
+		if (!empty($inlinePermissions) && User::$me->allowedTo('manage_permissions')) {
 			Permissions::save_inline_permissions($inlinePermissions);
 		}
 	}
@@ -1502,13 +1439,12 @@ public static function getServerVersions($checkFor)
 		Lang::load('Admin');
 		Lang::load('ManageSettings');
 
-		$versions = array();
+		$versions = [];
 
 		// Is GD available?  If it is, we should show version information for it too.
-		if (in_array('gd', $checkFor) && function_exists('gd_info'))
-		{
+		if (in_array('gd', $checkFor) && function_exists('gd_info')) {
 			$temp = gd_info();
-			$versions['gd'] = array('title' => Lang::$txt['support_versions_gd'], 'version' => $temp['GD Version']);
+			$versions['gd'] = ['title' => Lang::$txt['support_versions_gd'], 'version' => $temp['GD Version']];
 		}
 
 		// Why not have a look at ImageMagick? If it's installed, we should show version information for it too.
@@ -1519,63 +1455,54 @@ public static function getServerVersions($checkFor)
 			$extension_version = 'Imagick ' . phpversion('Imagick');
 
 			// We already know it's ImageMagick and the website isn't needed...
-			$im_version = str_replace(array('ImageMagick ', ' https://www.imagemagick.org'), '', $im_version);
+			$im_version = str_replace(['ImageMagick ', ' https://www.imagemagick.org'], '', $im_version);
 
-			$versions['imagemagick'] = array('title' => Lang::$txt['support_versions_imagemagick'], 'version' => $im_version . ' (' . $extension_version . ')');
+			$versions['imagemagick'] = ['title' => Lang::$txt['support_versions_imagemagick'], 'version' => $im_version . ' (' . $extension_version . ')'];
 		}
 
 		// Now lets check for the Database.
-		if (in_array('db_server', $checkFor))
-		{
-			if (!isset(Db::$db_connection) || Db::$db_connection === false)
-			{
+		if (in_array('db_server', $checkFor)) {
+			if (!isset(Db::$db_connection) || Db::$db_connection === false) {
 				Lang::load('Errors');
 				trigger_error(Lang::$txt['get_server_versions_no_database'], E_USER_NOTICE);
-			}
-			else
-			{
-				$versions['db_engine'] = array(
+			} else {
+				$versions['db_engine'] = [
 					'title' => sprintf(Lang::$txt['support_versions_db_engine'], Db::$db->title),
 					'version' => Db::$db->get_vendor(),
-				);
+				];
 
-				$versions['db_server'] = array(
+				$versions['db_server'] = [
 					'title' => sprintf(Lang::$txt['support_versions_db'], Db::$db->title),
 					'version' => Db::$db->get_version(),
-				);
+				];
 			}
 		}
 
 		// Check to see if we have any accelerators installed.
-		foreach (CacheApi::detect() as $class_name => $cache_api)
-		{
+		foreach (CacheApi::detect() as $class_name => $cache_api) {
 			$class_name_txt_key = strtolower($cache_api->getImplementationClassKeyName());
 
-			if (in_array($class_name_txt_key, $checkFor))
-			{
-				$versions[$class_name_txt_key] = array(
-					'title' => isset(Lang::$txt[$class_name_txt_key . '_cache']) ?
-						Lang::$txt[$class_name_txt_key . '_cache'] : $class_name,
+			if (in_array($class_name_txt_key, $checkFor)) {
+				$versions[$class_name_txt_key] = [
+					'title' => Lang::$txt[$class_name_txt_key . '_cache'] ?? $class_name,
 					'version' => $cache_api->getVersion(),
-				);
+				];
 			}
 		}
 
-		if (in_array('php', $checkFor))
-		{
-			$versions['php'] = array(
+		if (in_array('php', $checkFor)) {
+			$versions['php'] = [
 				'title' => 'PHP',
 				'version' => PHP_VERSION,
 				'more' => '?action=admin;area=serversettings;sa=phpinfo',
-			);
+			];
 		}
 
-		if (in_array('server', $checkFor))
-		{
-			$versions['server'] = array(
+		if (in_array('server', $checkFor)) {
+			$versions['server'] = [
 				'title' => Lang::$txt['support_versions_server'],
 				'version' => $_SERVER['SERVER_SOFTWARE'],
-			);
+			];
 		}
 
 		return $versions;
@@ -1598,67 +1525,62 @@ public static function getFileVersions(&$versionOptions)
 		// Default place to find the languages would be the default theme dir.
 		$lang_dir = Theme::$current->settings['default_theme_dir'] . '/languages';
 
-		$version_info = array(
-			'file_versions' => array(),
-			'default_template_versions' => array(),
-			'template_versions' => array(),
-			'default_language_versions' => array(),
-			'tasks_versions' => array(),
-		);
+		$version_info = [
+			'file_versions' => [],
+			'default_template_versions' => [],
+			'template_versions' => [],
+			'default_language_versions' => [],
+			'tasks_versions' => [],
+		];
 
 		// Find the version in SSI.php's file header.
-		if (!empty($versionOptions['include_ssi']) && file_exists(Config::$boarddir . '/SSI.php'))
-		{
+		if (!empty($versionOptions['include_ssi']) && file_exists(Config::$boarddir . '/SSI.php')) {
 			$fp = fopen(Config::$boarddir . '/SSI.php', 'rb');
 			$header = fread($fp, 4096);
 			fclose($fp);
 
 			// The comment looks rougly like... that.
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
 				$version_info['file_versions']['SSI.php'] = $match[1];
+			}
 			// Not found!  This is bad.
-			else
+			else {
 				$version_info['file_versions']['SSI.php'] = '??';
+			}
 		}
 
 		// Do the paid subscriptions handler?
-		if (!empty($versionOptions['include_subscriptions']) && file_exists(Config::$boarddir . '/subscriptions.php'))
-		{
+		if (!empty($versionOptions['include_subscriptions']) && file_exists(Config::$boarddir . '/subscriptions.php')) {
 			$fp = fopen(Config::$boarddir . '/subscriptions.php', 'rb');
 			$header = fread($fp, 4096);
 			fclose($fp);
 
 			// Found it?
-			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-			{
+			if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
 				$version_info['file_versions']['subscriptions.php'] = $match[1];
 			}
 			// If we haven't how do we all get paid?
-			else
-			{
+			else {
 				$version_info['file_versions']['subscriptions.php'] = '??';
 			}
 		}
 
 		// Load all the files in the Sources directory, except this file and the redirect.
 		$sources_dir = dir(Config::$sourcedir);
-		while ($entry = $sources_dir->read())
-		{
-			if (substr($entry, -4) === '.php' && !is_dir(Config::$sourcedir . '/' . $entry) && $entry !== 'index.php')
-			{
+
+		while ($entry = $sources_dir->read()) {
+			if (substr($entry, -4) === '.php' && !is_dir(Config::$sourcedir . '/' . $entry) && $entry !== 'index.php') {
 				// Read the first 4k from the file.... enough for the header.
 				$fp = fopen(Config::$sourcedir . '/' . $entry, 'rb');
 				$header = fread($fp, 4096);
 				fclose($fp);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-				{
+				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
 					$version_info['file_versions'][$entry] = $match[1];
 				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-				{
+				else {
 					$version_info['file_versions'][$entry] = '??';
 				}
 			}
@@ -1666,27 +1588,22 @@ public static function getFileVersions(&$versionOptions)
 		$sources_dir->close();
 
 		// Load all the files in the tasks directory.
-		if (!empty($versionOptions['include_tasks']))
-		{
+		if (!empty($versionOptions['include_tasks'])) {
 			$tasks_dir = dir(Config::$tasksdir);
 
-			while ($entry = $tasks_dir->read())
-			{
-				if (substr($entry, -4) === '.php' && !is_dir(Config::$tasksdir . '/' . $entry) && $entry !== 'index.php')
-				{
+			while ($entry = $tasks_dir->read()) {
+				if (substr($entry, -4) === '.php' && !is_dir(Config::$tasksdir . '/' . $entry) && $entry !== 'index.php') {
 					// Read the first 4k from the file.... enough for the header.
 					$fp = fopen(Config::$tasksdir . '/' . $entry, 'rb');
 					$header = fread($fp, 4096);
 					fclose($fp);
 
 					// Look for the version comment in the file header.
-					if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					{
+					if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
 						$version_info['tasks_versions'][$entry] = $match[1];
 					}
 					// It wasn't found, but the file was... show a '??'.
-					else
-					{
+					else {
 						$version_info['tasks_versions'][$entry] = '??';
 					}
 				}
@@ -1695,34 +1612,28 @@ public static function getFileVersions(&$versionOptions)
 		}
 
 		// Load all the files in the default template directory - and the current theme if applicable.
-		$directories = array('default_template_versions' => Theme::$current->settings['default_theme_dir']);
+		$directories = ['default_template_versions' => Theme::$current->settings['default_theme_dir']];
 
-		if (Theme::$current->settings['theme_id'] != 1)
-		{
-			$directories += array('template_versions' => Theme::$current->settings['theme_dir']);
+		if (Theme::$current->settings['theme_id'] != 1) {
+			$directories += ['template_versions' => Theme::$current->settings['theme_dir']];
 		}
 
-		foreach ($directories as $type => $dirname)
-		{
+		foreach ($directories as $type => $dirname) {
 			$this_dir = dir($dirname);
 
-			while ($entry = $this_dir->read())
-			{
-				if (substr($entry, -12) == 'template.php' && !is_dir($dirname . '/' . $entry))
-				{
+			while ($entry = $this_dir->read()) {
+				if (substr($entry, -12) == 'template.php' && !is_dir($dirname . '/' . $entry)) {
 					// Read the first 768 bytes from the file.... enough for the header.
 					$fp = fopen($dirname . '/' . $entry, 'rb');
 					$header = fread($fp, 768);
 					fclose($fp);
 
 					// Look for the version comment in the file header.
-					if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					{
+					if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1) {
 						$version_info[$type][$entry] = $match[1];
 					}
 					// It wasn't found, but the file was... show a '??'.
-					else
-					{
+					else {
 						$version_info[$type][$entry] = '??';
 					}
 				}
@@ -1733,26 +1644,22 @@ public static function getFileVersions(&$versionOptions)
 		// Load up all the files in the default language directory and sort by language.
 		$this_dir = dir($lang_dir);
 
-		while ($entry = $this_dir->read())
-		{
-			if (substr($entry, -4) == '.php' && $entry != 'index.php' && !is_dir($lang_dir . '/' . $entry))
-			{
+		while ($entry = $this_dir->read()) {
+			if (substr($entry, -4) == '.php' && $entry != 'index.php' && !is_dir($lang_dir . '/' . $entry)) {
 				// Read the first 768 bytes from the file.... enough for the header.
 				$fp = fopen($lang_dir . '/' . $entry, 'rb');
 				$header = fread($fp, 768);
 				fclose($fp);
 
 				// Split the file name off into useful bits.
-				list ($name, $language) = explode('.', $entry);
+				list($name, $language) = explode('.', $entry);
 
 				// Look for the version comment in the file header.
-				if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-				{
+				if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
 					$version_info['default_language_versions'][$language][$name] = $match[1];
 				}
 				// It wasn't found, but the file was... show a '??'.
-				else
-				{
+				else {
 					$version_info['default_language_versions'][$language][$name] = '??';
 				}
 			}
@@ -1761,8 +1668,7 @@ public static function getFileVersions(&$versionOptions)
 		$this_dir->close();
 
 		// Sort the file versions by filename.
-		if (!empty($versionOptions['sort_results']))
-		{
+		if (!empty($versionOptions['sort_results'])) {
 			ksort($version_info['file_versions']);
 			ksort($version_info['default_template_versions']);
 			ksort($version_info['template_versions']);
@@ -1770,8 +1676,9 @@ public static function getFileVersions(&$versionOptions)
 			ksort($version_info['tasks_versions']);
 
 			// For languages sort each language too.
-			foreach ($version_info['default_language_versions'] as $language => $dummy)
+			foreach ($version_info['default_language_versions'] as $language => $dummy) {
 				ksort($version_info['default_language_versions'][$language]);
+			}
 		}
 
 		return $version_info;
@@ -1783,29 +1690,32 @@ public static function getFileVersions(&$versionOptions)
 	public static function updateAdminPreferences()
 	{
 		// This must exist!
-		if (!isset(Utils::$context['admin_preferences']))
+		if (!isset(Utils::$context['admin_preferences'])) {
 			return false;
+		}
 
 		// This is what we'll be saving.
 		Theme::$current->options['admin_preferences'] = Utils::jsonEncode(Utils::$context['admin_preferences']);
 
 		// Just check we haven't ended up with something theme exclusive somehow.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}themes
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}themes
 			WHERE id_theme != {int:default_theme}
 				AND variable = {string:admin_preferences}',
-			array(
+			[
 				'default_theme' => 1,
 				'admin_preferences' => 'admin_preferences',
-			)
+			],
 		);
 
 		// Update the themes table.
-		Db::$db->insert('replace',
+		Db::$db->insert(
+			'replace',
 			'{db_prefix}themes',
-			array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
-			array(User::$me->id, 1, 'admin_preferences', Theme::$current->options['admin_preferences']),
-			array('id_member', 'id_theme', 'variable')
+			['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
+			[User::$me->id, 1, 'admin_preferences', Theme::$current->options['admin_preferences']],
+			['id_member', 'id_theme', 'variable'],
 		);
 
 		// Make sure we invalidate any cache.
@@ -1822,7 +1732,7 @@ public static function updateAdminPreferences()
 	 * @param array $replacements An array of items to replace the variables in the template
 	 * @param array $additional_recipients An array of arrays of info for additional recipients. Should have 'id', 'email' and 'name' for each.
 	 */
-	public static function emailAdmins($template, $replacements = array(), $additional_recipients = array())
+	public static function emailAdmins($template, $replacements = [], $additional_recipients = [])
 	{
 		// Load all members which are effectively admins.
 		$members = User::membersAllowedTo('admin_forum');
@@ -1830,20 +1740,22 @@ public static function emailAdmins($template, $replacements = array(), $addition
 		// Load their alert preferences
 		$prefs = Notify::getNotifyPrefs($members, 'announcements', true);
 
-		$emails_sent = array();
+		$emails_sent = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, member_name, real_name, lngfile, email_address
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, member_name, real_name, lngfile, email_address
 			FROM {db_prefix}members
 			WHERE id_member IN({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (empty($prefs[$row['id_member']]['announcements']))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (empty($prefs[$row['id_member']]['announcements'])) {
 				continue;
+			}
 
 			// Stick their particulars in the replacement data.
 			$replacements['IDMEMBER'] = $row['id_member'];
@@ -1862,12 +1774,11 @@ public static function emailAdmins($template, $replacements = array(), $addition
 		Db::$db->free_result($request);
 
 		// Any additional users we must email this to?
-		if (!empty($additional_recipients))
-		{
-			foreach ($additional_recipients as $recipient)
-			{
-				if (in_array($recipient['email'], $emails_sent))
+		if (!empty($additional_recipients)) {
+			foreach ($additional_recipients as $recipient) {
+				if (in_array($recipient['email'], $emails_sent)) {
 					continue;
+				}
 
 				$replacements['IDMEMBER'] = $recipient['id'];
 				$replacements['REALNAME'] = $recipient['name'];
@@ -1896,20 +1807,22 @@ public static function adminLogin($type = 'admin')
 		Theme::loadTemplate('Login');
 
 		// Validate what type of session check this is.
-		$types = array();
-		IntegrationHook::call('integrate_validateSession', array(&$types));
+		$types = [];
+		IntegrationHook::call('integrate_validateSession', [&$types]);
 		$type = in_array($type, $types) || $type == 'moderate' ? $type : 'admin';
 
 		// They used a wrong password, log it and unset that.
-		if (isset($_POST[$type . '_hash_pass']) || isset($_POST[$type . '_pass']))
-		{
-			Lang::$txt['security_wrong'] = sprintf(Lang::$txt['security_wrong'], isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : Lang::$txt['unknown'], $_SERVER['HTTP_USER_AGENT'], User::$me->ip);
+		if (isset($_POST[$type . '_hash_pass']) || isset($_POST[$type . '_pass'])) {
+			Lang::$txt['security_wrong'] = sprintf(Lang::$txt['security_wrong'], $_SERVER['HTTP_REFERER'] ?? Lang::$txt['unknown'], $_SERVER['HTTP_USER_AGENT'], User::$me->ip);
 			ErrorHandler::log(Lang::$txt['security_wrong'], 'critical');
 
-			if (isset($_POST[$type . '_hash_pass']))
+			if (isset($_POST[$type . '_hash_pass'])) {
 				unset($_POST[$type . '_hash_pass']);
-			if (isset($_POST[$type . '_pass']))
+			}
+
+			if (isset($_POST[$type . '_pass'])) {
 				unset($_POST[$type . '_pass']);
+			}
 
 			Utils::$context['incorrect_password'] = true;
 		}
@@ -1922,15 +1835,18 @@ public static function adminLogin($type = 'admin')
 
 		// Now go through $_POST.  Make sure the session hash is sent.
 		$_POST[Utils::$context['session_var']] = Utils::$context['session_id'];
-		foreach ($_POST as $k => $v)
+
+		foreach ($_POST as $k => $v) {
 			Utils::$context['post_data'] .= self::adminLogin_outputPostVars($k, $v);
+		}
 
 		// Now we'll use the admin_login sub template of the Login template.
 		Utils::$context['sub_template'] = 'admin_login';
 
 		// And title the page something like "Login".
-		if (!isset(Utils::$context['page_title']))
+		if (!isset(Utils::$context['page_title'])) {
 			Utils::$context['page_title'] = Lang::$txt['login'];
+		}
 
 		// The type of action.
 		Utils::$context['sessionCheckType'] = $type;
@@ -1953,8 +1869,8 @@ protected function __construct()
 		// Load the language and templates....
 		Lang::load('Admin');
 		Theme::loadTemplate('Admin');
-		Theme::loadJavaScriptFile('admin.js', array('minimize' => true), 'smf_admin');
-		Theme::loadCSSFile('admin.css', array(), 'smf_admin');
+		Theme::loadJavaScriptFile('admin.js', ['minimize' => true], 'smf_admin');
+		Theme::loadCSSFile('admin.css', [], 'smf_admin');
 
 		// Set any dynamic values in $this->admin_areas.
 		$this->setAdminAreas();
@@ -1963,23 +1879,22 @@ protected function __construct()
 		Utils::$context['robot_no_index'] = true;
 
 		// Some preferences.
-		Utils::$context['admin_preferences'] = !empty(Theme::$current->options['admin_preferences']) ? Utils::jsonDecode(Theme::$current->options['admin_preferences'], true) : array();
+		Utils::$context['admin_preferences'] = !empty(Theme::$current->options['admin_preferences']) ? Utils::jsonDecode(Theme::$current->options['admin_preferences'], true) : [];
 
 		// Any files to include for administration?
-		if (!empty(Config::$modSettings['integrate_admin_include']))
-		{
+		if (!empty(Config::$modSettings['integrate_admin_include'])) {
 			$admin_includes = explode(',', Config::$modSettings['integrate_admin_include']);
 
-			foreach ($admin_includes as $include)
-			{
-				$include = strtr(trim($include), array(
+			foreach ($admin_includes as $include) {
+				$include = strtr(trim($include), [
 					'$boarddir' => Config::$boarddir,
 					'$sourcedir' => Config::$sourcedir,
 					'$themedir' => Theme::$current->settings['theme_dir'],
-				));
+				]);
 
-				if (file_exists($include))
-					require_once($include);
+				if (file_exists($include)) {
+					require_once $include;
+				}
 			}
 		}
 	}
@@ -1992,16 +1907,16 @@ protected function setAdminAreas(): void
 		// Finalize various string values.
 		array_walk_recursive(
 			$this->admin_areas,
-			function(&$value, $key)
-			{
-				if (in_array($key, array('title', 'label')))
+			function (&$value, $key) {
+				if (in_array($key, ['title', 'label'])) {
 					$value = Lang::$txt[$value] ?? $value;
+				}
 
-				$value = strtr($value, array(
+				$value = strtr($value, [
 					'{scripturl}' => Config::$scripturl,
 					'{boardurl}' => Config::$boardurl,
-				));
-			}
+				]);
+			},
 		);
 
 		// Fill in the ID number for the current theme URL.
@@ -2010,10 +1925,9 @@ function(&$value, $key)
 		// Figure out what is enabled or not.
 		$this->admin_areas['forum']['areas']['adminlogoff']['enabled'] = empty(Config::$modSettings['securityDisable']);
 
-		if (empty(Config::$modSettings['cal_enabled']))
-		{
+		if (empty(Config::$modSettings['cal_enabled'])) {
 			$this->admin_areas['layout']['areas']['managecalendar']['inactive'] = true;
-			$this->admin_areas['layout']['areas']['managecalendar']['subsections'] = array();
+			$this->admin_areas['layout']['areas']['managecalendar']['subsections'] = [];
 		}
 
 		$this->admin_areas['layout']['areas']['smileys']['subsections']['addsmiley']['enabled'] = !empty(Config::$modSettings['smiley_enable']);
@@ -2021,18 +1935,16 @@ function(&$value, $key)
 		$this->admin_areas['layout']['areas']['smileys']['subsections']['setorder']['enabled'] = !empty(Config::$modSettings['smiley_enable']);
 		$this->admin_areas['layout']['areas']['smileys']['subsections']['editicons']['enabled'] = !empty(Config::$modSettings['messageIcons_enable']);
 
-		if (empty(Config::$modSettings['spider_mode']))
-		{
+		if (empty(Config::$modSettings['spider_mode'])) {
 			$this->admin_areas['layout']['areas']['sengines']['inactive'] = true;
-			$this->admin_areas['layout']['areas']['sengines']['subsections'] = array();
+			$this->admin_areas['layout']['areas']['sengines']['subsections'] = [];
 		}
 
 		$this->admin_areas['members']['areas']['warnings']['inactive'] = Config::$modSettings['warning_settings'][0] == 0;
 
-		if (empty(Config::$modSettings['paid_enabled']))
-		{
+		if (empty(Config::$modSettings['paid_enabled'])) {
 			$this->admin_areas['members']['areas']['paidsubscribe']['inactive'] = true;
-			$this->admin_areas['members']['areas']['paidsubscribe']['subsections'] = array();
+			$this->admin_areas['members']['areas']['paidsubscribe']['subsections'] = [];
 		}
 
 		$this->admin_areas['maintenance']['areas']['logs']['subsections']['errorlog']['enabled'] = !empty(Config::$modSettings['enableErrorLogging']);
@@ -2041,7 +1953,7 @@ function(&$value, $key)
 		$this->admin_areas['maintenance']['areas']['logs']['subsections']['spiderlog']['enabled'] = !empty(Config::$modSettings['spider_mode']);
 
 		// Give mods access to the menu.
-		IntegrationHook::call('integrate_admin_areas', array(&$this->admin_areas));
+		IntegrationHook::call('integrate_admin_areas', [&$this->admin_areas]);
 	}
 
 	/*************************
@@ -2059,19 +1971,17 @@ function(&$value, $key)
 	 */
 	protected static function adminLogin_outputPostVars($k, $v)
 	{
-		if (!is_array($v))
-		{
-			return "\n" . '<input type="hidden" name="' . Utils::htmlspecialchars($k) . '" value="' . strtr($v, array('"' => '&quot;', '<' => '&lt;', '>' => '&gt;')) . '">';
+		if (!is_array($v)) {
+			return "\n" . '<input type="hidden" name="' . Utils::htmlspecialchars($k) . '" value="' . strtr($v, ['"' => '&quot;', '<' => '&lt;', '>' => '&gt;']) . '">';
 		}
-		else
-		{
-			$ret = '';
 
-			foreach ($v as $k2 => $v2)
-				$ret .= self::adminLogin_outputPostVars($k . '[' . $k2 . ']', $v2);
+		$ret = '';
 
-			return $ret;
+		foreach ($v as $k2 => $v2) {
+			$ret .= self::adminLogin_outputPostVars($k . '[' . $k2 . ']', $v2);
 		}
+
+		return $ret;
 	}
 
 	/**
@@ -2087,40 +1997,35 @@ protected static function construct_query_string($get)
 		// Awww, darn. The Config::$scripturl contains GET stuff!
 		$q = strpos(Config::$scripturl, '?');
 
-		if ($q !== false)
-		{
+		if ($q !== false) {
 			parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr(substr(Config::$scripturl, $q + 1), ';', '&')), $temp);
 
-			foreach ($get as $k => $v)
-			{
+			foreach ($get as $k => $v) {
 				// Only if it's not already in the Config::$scripturl!
-				if (!isset($temp[$k]))
-				{
+				if (!isset($temp[$k])) {
 					$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
 				}
 				// If it changed, put it out there, but with an ampersand.
-				elseif ($temp[$k] != $get[$k])
-				{
+				elseif ($temp[$k] != $get[$k]) {
 					$query_string .= urlencode($k) . '=' . urlencode($v) . '&amp;';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			// Add up all the data from $_GET into get_data.
-			foreach ($get as $k => $v)
+			foreach ($get as $k => $v) {
 				$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+			}
 		}
 
 		$query_string = substr($query_string, 0, -1);
 
 		return $query_string;
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ACP::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ACP::exportStatic')) {
 	ACP::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/AntiSpam.php b/Sources/Actions/Admin/AntiSpam.php
index f364b39ba8..b9aa7e6a1c 100644
--- a/Sources/Actions/Admin/AntiSpam.php
+++ b/Sources/Actions/Admin/AntiSpam.php
@@ -13,18 +13,17 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles anti-spam settings.
@@ -38,13 +37,11 @@ class AntiSpam implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-			'getConfigVars' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'modifyAntispamSettings' => 'ModifyAntispamSettings',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -77,40 +74,40 @@ public function execute(): void
 
 		// Firstly, figure out what languages we're dealing with, and do a little processing for the form's benefit.
 		Lang::get();
-		Utils::$context['qa_languages'] = array();
+		Utils::$context['qa_languages'] = [];
 
-		foreach (Utils::$context['languages'] as $lang_id => $lang)
-		{
-			$lang_id = strtr($lang_id, array('-utf8' => ''));
-			$lang['name'] = strtr($lang['name'], array('-utf8' => ''));
+		foreach (Utils::$context['languages'] as $lang_id => $lang) {
+			$lang_id = strtr($lang_id, ['-utf8' => '']);
+			$lang['name'] = strtr($lang['name'], ['-utf8' => '']);
 			Utils::$context['qa_languages'][$lang_id] = $lang;
 		}
 
 		// Secondly, load any questions we currently have.
-		Utils::$context['question_answers'] = array();
+		Utils::$context['question_answers'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_question, lngfile, question, answers
-			FROM {db_prefix}qanda'
+		$request = Db::$db->query(
+			'',
+			'SELECT id_question, lngfile, question, answers
+			FROM {db_prefix}qanda',
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$lang = strtr($row['lngfile'], array('-utf8' => ''));
 
-			Utils::$context['question_answers'][$row['id_question']] = array(
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$lang = strtr($row['lngfile'], ['-utf8' => '']);
+
+			Utils::$context['question_answers'][$row['id_question']] = [
 				'lngfile' => $lang,
 				'question' => $row['question'],
 				'answers' => (array) Utils::jsonDecode($row['answers'], true),
-			);
+			];
 
 			Utils::$context['qa_by_lang'][$lang][] = $row['id_question'];
 		}
 		Db::$db->free_result($request);
 
-		if (empty(Utils::$context['qa_by_lang'][strtr(Lang::$default, array('-utf8' => ''))]) && !empty(Utils::$context['question_answers']))
-		{
-			if (empty(Utils::$context['settings_insert_above']))
+		if (empty(Utils::$context['qa_by_lang'][strtr(Lang::$default, ['-utf8' => ''])]) && !empty(Utils::$context['question_answers'])) {
+			if (empty(Utils::$context['settings_insert_above'])) {
 				Utils::$context['settings_insert_above'] = '';
+			}
 
 			Utils::$context['settings_insert_above'] .= '<div class="noticebox">' . sprintf(Lang::$txt['question_not_defined'], Utils::$context['languages'][Lang::$default]['name']) . '</div>';
 		}
@@ -118,94 +115,90 @@ public function execute(): void
 		// Thirdly, push some JavaScript for the form to make it work.
 		$nextrow = !empty(Utils::$context['question_answers']) ? max(array_keys(Utils::$context['question_answers'])) + 1 : 1;
 		$setup_verification_add_answer = Utils::JavaScriptEscape(Lang::$txt['setup_verification_add_answer']);
-		$default_lang = strtr(Lang::$default, array('-utf8' => ''));
+		$default_lang = strtr(Lang::$default, ['-utf8' => '']);
 
 		Theme::addInlineJavaScript(<<<END
-			var nextrow = $nextrow;
-			$(".qa_link a").click(function() {
-				var id = $(this).parent().attr("id").substring(6);
-				$("#qa_fs_" + id).show();
-				$(this).parent().hide();
-			});
-			$(".qa_fieldset legend a").click(function() {
-				var id = $(this).closest("fieldset").attr("id").substring(6);
-				$("#qa_dt_" + id).show();
-				$(this).closest("fieldset").hide();
-			});
-			$(".qa_add_question a").click(function() {
-				var id = $(this).closest("fieldset").attr("id").substring(6);
-				$('<dt><input type="text" name="question[' + id + '][' + nextrow + ']" value="" size="50" class="verification_question"></dt><dd><input type="text" name="answer[' + id + '][' + nextrow + '][]" value="" size="50" class="verification_answer" / ><div class="qa_add_answer"><a href="javascript:void(0);">[ ' + $setup_verification_add_answer + ' ]</a></div></dd>').insertBefore($(this).parent());
-				nextrow++;
-			});
-			$(".qa_fieldset ").on("click", ".qa_add_answer a", function() {
-				var attr = $(this).closest("dd").find(".verification_answer:last").attr("name");
-				$('<input type="text" name="' + attr + '" value="" size="50" class="verification_answer">').insertBefore($(this).closest("div"));
-				return false;
-			});
-			$("#qa_dt_$default_lang a").click();
-		END, true);
+				var nextrow = {$nextrow};
+				$(".qa_link a").click(function() {
+					var id = $(this).parent().attr("id").substring(6);
+					$("#qa_fs_" + id).show();
+					$(this).parent().hide();
+				});
+				$(".qa_fieldset legend a").click(function() {
+					var id = $(this).closest("fieldset").attr("id").substring(6);
+					$("#qa_dt_" + id).show();
+					$(this).closest("fieldset").hide();
+				});
+				$(".qa_add_question a").click(function() {
+					var id = $(this).closest("fieldset").attr("id").substring(6);
+					$('<dt><input type="text" name="question[' + id + '][' + nextrow + ']" value="" size="50" class="verification_question"></dt><dd><input type="text" name="answer[' + id + '][' + nextrow + '][]" value="" size="50" class="verification_answer" / ><div class="qa_add_answer"><a href="javascript:void(0);">[ ' + {$setup_verification_add_answer} + ' ]</a></div></dd>').insertBefore($(this).parent());
+					nextrow++;
+				});
+				$(".qa_fieldset ").on("click", ".qa_add_answer a", function() {
+					var attr = $(this).closest("dd").find(".verification_answer:last").attr("name");
+					$('<input type="text" name="' + attr + '" value="" size="50" class="verification_answer">').insertBefore($(this).closest("div"));
+					return false;
+				});
+				$("#qa_dt_{$default_lang} a").click();
+			END, true);
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Fix PM settings.
 			$_POST['pm_spam_settings'] = (int) $_POST['max_pm_recipients'] . ',' . (int) $_POST['pm_posts_verification'] . ',' . (int) $_POST['pm_posts_per_hour'];
 
 			// Hack in guest requiring verification!
-			if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha']))
+			if (empty($_POST['posts_require_captcha']) && !empty($_POST['guests_require_captcha'])) {
 				$_POST['posts_require_captcha'] = -1;
+			}
 
 			$save_vars = $config_vars;
 
 			unset($save_vars['pm1'], $save_vars['pm2'], $save_vars['pm3'], $save_vars['guest_verify']);
 
-			$save_vars[] = array('text', 'pm_spam_settings');
+			$save_vars[] = ['text', 'pm_spam_settings'];
 
 			// Handle verification questions.
-			$changes = array(
-				'insert' => array(),
-				'replace' => array(),
-				'delete' => array(),
-			);
+			$changes = [
+				'insert' => [],
+				'replace' => [],
+				'delete' => [],
+			];
 
-			$qs_per_lang = array();
+			$qs_per_lang = [];
 
-			foreach (Utils::$context['qa_languages'] as $lang_id => $dummy)
-			{
+			foreach (Utils::$context['qa_languages'] as $lang_id => $dummy) {
 				// If we had some questions for this language before, but don't now, delete everything from that language.
-				if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty(Utils::$context['qa_by_lang'][$lang_id]))
-				{
+				if ((!isset($_POST['question'][$lang_id]) || !is_array($_POST['question'][$lang_id])) && !empty(Utils::$context['qa_by_lang'][$lang_id])) {
 					$changes['delete'] = array_merge($changes['delete'], Utils::$context['qa_by_lang'][$lang_id]);
 				}
 
 				// Now step through and see if any existing questions no longer exist.
-				if (!empty(Utils::$context['qa_by_lang'][$lang_id]))
-				{
-					foreach (Utils::$context['qa_by_lang'][$lang_id] as $q_id)
-					{
-						if (empty($_POST['question'][$lang_id][$q_id]))
+				if (!empty(Utils::$context['qa_by_lang'][$lang_id])) {
+					foreach (Utils::$context['qa_by_lang'][$lang_id] as $q_id) {
+						if (empty($_POST['question'][$lang_id][$q_id])) {
 							$changes['delete'][] = $q_id;
+						}
 					}
 				}
 
 				// Now let's see if there are new questions or ones that need updating.
-				if (isset($_POST['question'][$lang_id]))
-				{
-					foreach ($_POST['question'][$lang_id] as $q_id => $question)
-					{
+				if (isset($_POST['question'][$lang_id])) {
+					foreach ($_POST['question'][$lang_id] as $q_id => $question) {
 						// Ignore junky ids.
 						$q_id = (int) $q_id;
 
-						if ($q_id <= 0)
+						if ($q_id <= 0) {
 							continue;
+						}
 
 						// Check the question isn't empty (because they want to delete it?)
-						if (empty($question) || trim($question) == '')
-						{
-							if (isset(Utils::$context['question_answers'][$q_id]))
+						if (empty($question) || trim($question) == '') {
+							if (isset(Utils::$context['question_answers'][$q_id])) {
 								$changes['delete'][] = $q_id;
+							}
 
 							continue;
 						}
@@ -213,101 +206,101 @@ public function execute(): void
 						$question = Utils::htmlspecialchars(trim($question));
 
 						// Get the answers. Firstly check there actually might be some.
-						if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id]))
-						{
-							if (isset(Utils::$context['question_answers'][$q_id]))
+						if (!isset($_POST['answer'][$lang_id][$q_id]) || !is_array($_POST['answer'][$lang_id][$q_id])) {
+							if (isset(Utils::$context['question_answers'][$q_id])) {
 								$changes['delete'][] = $q_id;
+							}
 
 							continue;
 						}
 
 						// Now get them and check that they might be viable.
-						$answers = array();
+						$answers = [];
 
-						foreach ($_POST['answer'][$lang_id][$q_id] as $answer)
-						{
-							if (!empty($answer) && trim($answer) !== '')
+						foreach ($_POST['answer'][$lang_id][$q_id] as $answer) {
+							if (!empty($answer) && trim($answer) !== '') {
 								$answers[] = Utils::htmlspecialchars(trim($answer));
+							}
 						}
 
-						if (empty($answers))
-						{
-							if (isset(Utils::$context['question_answers'][$q_id]))
+						if (empty($answers)) {
+							if (isset(Utils::$context['question_answers'][$q_id])) {
 								$changes['delete'][] = $q_id;
+							}
+
 							continue;
 						}
 
 						$answers = Utils::jsonEncode($answers);
 
 						// At this point we know we have a question and some answers. What are we doing with it?
-						if (!isset(Utils::$context['question_answers'][$q_id]))
-						{
+						if (!isset(Utils::$context['question_answers'][$q_id])) {
 							// New question. Now, we don't want to randomly consume ids, so we'll set those, rather than trusting the browser's supplied ids.
-							$changes['insert'][] = array($lang_id, $question, $answers);
-						}
-						else
-						{
+							$changes['insert'][] = [$lang_id, $question, $answers];
+						} else {
 							// It's an existing question. Let's see what's changed, if anything.
-							if ($lang_id != Utils::$context['question_answers'][$q_id]['lngfile'] || $question != Utils::$context['question_answers'][$q_id]['question'] || $answers != Utils::$context['question_answers'][$q_id]['answers'])
-								$changes['replace'][$q_id] = array('lngfile' => $lang_id, 'question' => $question, 'answers' => $answers);
+							if ($lang_id != Utils::$context['question_answers'][$q_id]['lngfile'] || $question != Utils::$context['question_answers'][$q_id]['question'] || $answers != Utils::$context['question_answers'][$q_id]['answers']) {
+								$changes['replace'][$q_id] = ['lngfile' => $lang_id, 'question' => $question, 'answers' => $answers];
+							}
 						}
 
-						if (!isset($qs_per_lang[$lang_id]))
+						if (!isset($qs_per_lang[$lang_id])) {
 							$qs_per_lang[$lang_id] = 0;
+						}
 						$qs_per_lang[$lang_id]++;
 					}
 				}
 			}
 
 			// OK, so changes?
-			if (!empty($changes['delete']))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}qanda
+			if (!empty($changes['delete'])) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}qanda
 					WHERE id_question IN ({array_int:questions})',
-					array(
+					[
 						'questions' => $changes['delete'],
-					)
+					],
 				);
 			}
 
-			if (!empty($changes['replace']))
-			{
-				foreach ($changes['replace'] as $q_id => $question)
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}qanda
+			if (!empty($changes['replace'])) {
+				foreach ($changes['replace'] as $q_id => $question) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}qanda
 						SET lngfile = {string:lngfile},
 							question = {string:question},
 							answers = {string:answers}
 						WHERE id_question = {int:id_question}',
-						array(
+						[
 							'id_question' => $q_id,
 							'lngfile' => $question['lngfile'],
 							'question' => $question['question'],
 							'answers' => $question['answers'],
-						)
+						],
 					);
 				}
 			}
 
-			if (!empty($changes['insert']))
-			{
-				Db::$db->insert('insert',
+			if (!empty($changes['insert'])) {
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}qanda',
-					array('lngfile' => 'string-50', 'question' => 'string-255', 'answers' => 'string-65534'),
+					['lngfile' => 'string-50', 'question' => 'string-255', 'answers' => 'string-65534'],
 					$changes['insert'],
-					array('id_question')
+					['id_question'],
 				);
 			}
 
 			// Lastly, the count of messages needs to be no more than the lowest number of questions for any one language.
 			$count_questions = empty($qs_per_lang) ? 0 : min($qs_per_lang);
 
-			if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions)
+			if (empty($count_questions) || $_POST['qa_verification_number'] > $count_questions) {
 				$_POST['qa_verification_number'] = $count_questions;
+			}
 
-			IntegrationHook::call('integrate_save_spam_settings', array(&$save_vars));
+			IntegrationHook::call('integrate_save_spam_settings', [&$save_vars]);
 
 			// Now save.
 			ACP::saveDBSettings($save_vars);
@@ -318,16 +311,17 @@ public function execute(): void
 			Utils::redirectexit('action=admin;area=antispam');
 		}
 
-		$character_range = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
+		$character_range = array_merge(range('A', 'H'), ['K', 'M', 'N', 'P', 'R'], range('T', 'Y'));
 		$_SESSION['visual_verification_code'] = '';
 
-		for ($i = 0; $i < 6; $i++)
+		for ($i = 0; $i < 6; $i++) {
 			$_SESSION['visual_verification_code'] .= $character_range[array_rand($character_range)];
+		}
 
 		// Some javascript for CAPTCHA.
 		Utils::$context['settings_post_javascript'] = '';
-		if (Utils::$context['use_graphic_library'])
-		{
+
+		if (Utils::$context['use_graphic_library']) {
 			Utils::$context['settings_post_javascript'] .= '
 			function refreshImages()
 			{
@@ -337,12 +331,9 @@ function refreshImages()
 		}
 
 		// Show the image itself, or text saying we can't.
-		if (Utils::$context['use_graphic_library'])
-		{
+		if (Utils::$context['use_graphic_library']) {
 			$config_vars['vv']['postinput'] = '<br><img src="' . Utils::$context['verification_image_href'] . ';type=' . (empty(Config::$modSettings['visual_verification_type']) ? 0 : Config::$modSettings['visual_verification_type']) . '" alt="' . Lang::$txt['setting_image_verification_sample'] . '" id="verification_image"><br>';
-		}
-		else
-		{
+		} else {
 			$config_vars['vv']['postinput'] = '<br><span class="smalltext">' . Lang::$txt['setting_image_verification_nogd'] . '</span>';
 		}
 
@@ -354,8 +345,7 @@ function refreshImages()
 		Config::$modSettings['posts_require_captcha'] = !isset(Config::$modSettings['posts_require_captcha']) || Config::$modSettings['posts_require_captcha'] == -1 ? 0 : Config::$modSettings['posts_require_captcha'];
 
 		// Some minor javascript for the guest post setting.
-		if (Config::$modSettings['posts_require_captcha'])
-		{
+		if (Config::$modSettings['posts_require_captcha']) {
 			Utils::$context['settings_post_javascript'] .= '
 			document.getElementById(\'guests_require_captcha\').disabled = true;';
 		}
@@ -366,10 +356,10 @@ function refreshImages()
 		Utils::$context['page_title'] = Lang::$txt['antispam_title'];
 		Utils::$context['sub_template'] = 'show_settings';
 
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['antispam_title'],
 			'description' => Lang::$txt['antispam_Settings_desc'],
-		);
+		];
 
 		ACP::prepareDBSettingContext($config_vars);
 	}
@@ -385,8 +375,9 @@ function refreshImages()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -412,60 +403,60 @@ public static function getConfigVars(): array
 		// Generate a sample registration image.
 		Utils::$context['use_graphic_library'] = in_array('gd', get_loaded_extensions());
 
-		$config_vars = array(
-			array('check', 'reg_verification'),
-			array('check', 'search_enable_captcha'),
+		$config_vars = [
+			['check', 'reg_verification'],
+			['check', 'search_enable_captcha'],
 			// This, my friend, is a cheat :p
-			'guest_verify' => array(
+			'guest_verify' => [
 				'check',
 				'guests_require_captcha',
-				'subtext' => Lang::$txt['setting_guests_require_captcha_desc']
-			),
-			array(
+				'subtext' => Lang::$txt['setting_guests_require_captcha_desc'],
+			],
+			[
 				'int',
 				'posts_require_captcha',
 				'subtext' => Lang::$txt['posts_require_captcha_desc'],
 				'min' => -1,
-				'onchange' => 'if (this.value > 0){ document.getElementById(\'guests_require_captcha\').checked = true; document.getElementById(\'guests_require_captcha\').disabled = true;} else {document.getElementById(\'guests_require_captcha\').disabled = false;}'
-			),
+				'onchange' => 'if (this.value > 0){ document.getElementById(\'guests_require_captcha\').checked = true; document.getElementById(\'guests_require_captcha\').disabled = true;} else {document.getElementById(\'guests_require_captcha\').disabled = false;}',
+			],
 			'',
 
 			// PM Settings
-			'pm1' => array('int', 'max_pm_recipients', 'subtext' => Lang::$txt['max_pm_recipients_note']),
-			'pm2' => array('int', 'pm_posts_verification', 'subtext' => Lang::$txt['pm_posts_verification_note']),
-			'pm3' => array('int', 'pm_posts_per_hour', 'subtext' => Lang::$txt['pm_posts_per_hour_note']),
+			'pm1' => ['int', 'max_pm_recipients', 'subtext' => Lang::$txt['max_pm_recipients_note']],
+			'pm2' => ['int', 'pm_posts_verification', 'subtext' => Lang::$txt['pm_posts_verification_note']],
+			'pm3' => ['int', 'pm_posts_per_hour', 'subtext' => Lang::$txt['pm_posts_per_hour_note']],
 			// Visual verification.
-			array('title', 'configure_verification_means'),
-			array('desc', 'configure_verification_means_desc'),
-			'vv' => array(
+			['title', 'configure_verification_means'],
+			['desc', 'configure_verification_means_desc'],
+			'vv' => [
 				'select',
 				'visual_verification_type',
-				array(
+				[
 					Lang::$txt['setting_image_verification_off'],
 					Lang::$txt['setting_image_verification_vsimple'],
 					Lang::$txt['setting_image_verification_simple'],
 					Lang::$txt['setting_image_verification_medium'],
 					Lang::$txt['setting_image_verification_high'],
-					Lang::$txt['setting_image_verification_extreme']
-				),
+					Lang::$txt['setting_image_verification_extreme'],
+				],
 				'subtext' => Lang::$txt['setting_visual_verification_type_desc'],
-				'onchange' => Utils::$context['use_graphic_library'] ? 'refreshImages();' : ''
-			),
+				'onchange' => Utils::$context['use_graphic_library'] ? 'refreshImages();' : '',
+			],
 			// reCAPTCHA
-			array('title', 'recaptcha_configure'),
-			array('desc', 'recaptcha_configure_desc', 'class' => 'windowbg'),
-			array('check', 'recaptcha_enabled', 'subtext' => Lang::$txt['recaptcha_enable_desc']),
-			array('text', 'recaptcha_site_key', 'subtext' => Lang::$txt['recaptcha_site_key_desc']),
-			array('text', 'recaptcha_secret_key', 'subtext' => Lang::$txt['recaptcha_secret_key_desc']),
-			array('select', 'recaptcha_theme', array('light' => Lang::$txt['recaptcha_theme_light'], 'dark' => Lang::$txt['recaptcha_theme_dark'])),
+			['title', 'recaptcha_configure'],
+			['desc', 'recaptcha_configure_desc', 'class' => 'windowbg'],
+			['check', 'recaptcha_enabled', 'subtext' => Lang::$txt['recaptcha_enable_desc']],
+			['text', 'recaptcha_site_key', 'subtext' => Lang::$txt['recaptcha_site_key_desc']],
+			['text', 'recaptcha_secret_key', 'subtext' => Lang::$txt['recaptcha_secret_key_desc']],
+			['select', 'recaptcha_theme', ['light' => Lang::$txt['recaptcha_theme_light'], 'dark' => Lang::$txt['recaptcha_theme_dark']]],
 			// Clever Thomas, who is looking sheepy now? Not I, the mighty sword swinger did say.
-			array('title', 'setup_verification_questions'),
-			array('desc', 'setup_verification_questions_desc'),
-			array('int', 'qa_verification_number', 'subtext' => Lang::$txt['setting_qa_verification_number_desc']),
-			array('callback', 'question_answer_list'),
-		);
+			['title', 'setup_verification_questions'],
+			['desc', 'setup_verification_questions_desc'],
+			['int', 'qa_verification_number', 'subtext' => Lang::$txt['setting_qa_verification_number_desc']],
+			['callback', 'question_answer_list'],
+		];
 
-		IntegrationHook::call('integrate_spam_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_spam_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -478,8 +469,9 @@ public static function getConfigVars(): array
 	 */
 	public static function modifyAntispamSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->execute();
@@ -494,12 +486,12 @@ public static function modifyAntispamSettings($return_config = false)
 	 */
 	protected function __construct()
 	{
-		
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\AntiSpam::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\AntiSpam::exportStatic')) {
 	AntiSpam::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Attachments.php b/Sources/Actions/Admin/Attachments.php
index 053775973d..4cd77d6c5b 100644
--- a/Sources/Actions/Admin/Attachments.php
+++ b/Sources/Actions/Admin/Attachments.php
@@ -17,11 +17,11 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
@@ -31,7 +31,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Maintains and manages attachments and avatars.
@@ -45,14 +44,27 @@ class Attachments implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageAttachments',
-			'attachConfigVars' => false,
-			'avatarConfigVars' => false,
-		),
-	);
+			'list_getFiles' => 'list_getFiles',
+			'list_getNumFiles' => 'list_getNumFiles',
+			'list_getAttachDirs' => 'list_getAttachDirs',
+			'list_getBaseDirs' => 'list_getBaseDirs',
+			'attachDirStatus' => 'attachDirStatus',
+			'manageAttachmentSettings' => 'ManageAttachmentSettings',
+			'manageAvatarSettings' => 'ManageAvatarSettings',
+			'browseFiles' => 'BrowseFiles',
+			'maintainFiles' => 'MaintainFiles',
+			'removeAttachment' => 'RemoveAttachment',
+			'removeAttachmentByAge' => 'RemoveAttachmentByAge',
+			'removeAttachmentBySize' => 'RemoveAttachmentBySize',
+			'removeAllAttachments' => 'RemoveAllAttachments',
+			'repairAttachments' => 'RepairAttachments',
+			'manageAttachmentPaths' => 'ManageAttachmentPaths',
+			'transferAttachments' => 'TransferAttachments',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -75,7 +87,7 @@ class Attachments implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'attachments' => 'attachmentSettings',
 		'avatars' => 'avatarSettings',
 		'browse' => 'browse',
@@ -87,7 +99,7 @@ class Attachments implements ActionInterface
 		'repair' => 'repair',
 		'attachpaths' => 'paths',
 		'transfer' => 'transfer',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -110,10 +122,11 @@ class Attachments implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -140,68 +153,58 @@ public function attachmentSettings(): void
 		toggleSubDir();';
 
 		// Saving settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
-			if (isset($_POST['attachmentUploadDir']))
+			if (isset($_POST['attachmentUploadDir'])) {
 				unset($_POST['attachmentUploadDir']);
+			}
 
-			if (!empty($_POST['use_subdirectories_for_attachments']))
-			{
+			if (!empty($_POST['use_subdirectories_for_attachments'])) {
 				if (
 					isset($_POST['use_subdirectories_for_attachments'])
 					&& empty($_POST['basedirectory_for_attachments'])
-				)
-				{
+				) {
 					$_POST['basedirectory_for_attachments'] = (!empty(Config::$modSettings['basedirectory_for_attachments']) ? (Config::$modSettings['basedirectory_for_attachments']) : Config::$boarddir);
 				}
 
 				if (
 					!empty($_POST['use_subdirectories_for_attachments'])
 					&& !empty(Config::$modSettings['attachment_basedirectories'])
-				)
-				{
-					if (!is_array(Config::$modSettings['attachment_basedirectories']))
-					{
+				) {
+					if (!is_array(Config::$modSettings['attachment_basedirectories'])) {
 						Config::$modSettings['attachment_basedirectories'] = Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true);
 					}
-				}
-				else
-				{
-					Config::$modSettings['attachment_basedirectories'] = array();
+				} else {
+					Config::$modSettings['attachment_basedirectories'] = [];
 				}
 
 				if (
 					!empty($_POST['use_subdirectories_for_attachments'])
 					&& !empty($_POST['basedirectory_for_attachments'])
 					&& !in_array($_POST['basedirectory_for_attachments'], Config::$modSettings['attachment_basedirectories'])
-				)
-				{
+				) {
 					$currentAttachmentUploadDir = Config::$modSettings['currentAttachmentUploadDir'];
 
-					if (!in_array($_POST['basedirectory_for_attachments'], Config::$modSettings['attachmentUploadDir']))
-					{
-						if (!Attachment::automanageCreateDirectory($_POST['basedirectory_for_attachments']))
-						{
+					if (!in_array($_POST['basedirectory_for_attachments'], Config::$modSettings['attachmentUploadDir'])) {
+						if (!Attachment::automanageCreateDirectory($_POST['basedirectory_for_attachments'])) {
 							$_POST['basedirectory_for_attachments'] = Config::$modSettings['basedirectory_for_attachments'];
 						}
 					}
 
-					if (!in_array($_POST['basedirectory_for_attachments'], Config::$modSettings['attachment_basedirectories']))
-					{
+					if (!in_array($_POST['basedirectory_for_attachments'], Config::$modSettings['attachment_basedirectories'])) {
 						Config::$modSettings['attachment_basedirectories'][Config::$modSettings['currentAttachmentUploadDir']] = $_POST['basedirectory_for_attachments'];
 
-						Config::updateModSettings(array(
+						Config::updateModSettings([
 							'attachment_basedirectories' => Utils::jsonEncode(
-								Config::$modSettings['attachment_basedirectories']
+								Config::$modSettings['attachment_basedirectories'],
 							),
 							'currentAttachmentUploadDir' => $currentAttachmentUploadDir,
-						));
+						]);
 
 						$_POST['use_subdirectories_for_attachments'] = 1;
 						$_POST['attachmentUploadDir'] = Utils::jsonEncode(
-							Config::$modSettings['attachmentUploadDir']
+							Config::$modSettings['attachmentUploadDir'],
 						);
 					}
 				}
@@ -232,22 +235,25 @@ public function avatarSettings(): void
 		$config_vars = self::avatarConfigVars();
 
 		// Saving avatar settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// These settings cannot be left empty!
-			if (empty($_POST['custom_avatar_dir']))
+			if (empty($_POST['custom_avatar_dir'])) {
 				$_POST['custom_avatar_dir'] = Config::$boarddir . '/custom_avatar';
+			}
 
-			if (empty($_POST['custom_avatar_url']))
+			if (empty($_POST['custom_avatar_url'])) {
 				$_POST['custom_avatar_url'] = Config::$boardurl . '/custom_avatar';
+			}
 
-			if (empty($_POST['avatar_directory']))
+			if (empty($_POST['avatar_directory'])) {
 				$_POST['avatar_directory'] = Config::$boarddir . '/avatars';
+			}
 
-			if (empty($_POST['avatar_url']))
+			if (empty($_POST['avatar_url'])) {
 				$_POST['avatar_url'] = Config::$boardurl . '/avatars';
+			}
 
 			IntegrationHook::call('integrate_save_avatar_settings');
 
@@ -284,204 +290,190 @@ public function browse(): void
 		Utils::$context['browse_type'] = isset($_REQUEST['avatars']) ? 'avatars' : (isset($_REQUEST['thumbs']) ? 'thumbs' : 'attachments');
 
 		// Set the options for the list component.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'file_list',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=manageattachments;sa=browse' . (Utils::$context['browse_type'] === 'avatars' ? ';avatars' : (Utils::$context['browse_type'] === 'thumbs' ? ';thumbs' : '')),
 			'default_sort_col' => 'name',
 			'no_items_label' => Lang::$txt['attachment_manager_' . (Utils::$context['browse_type'] === 'avatars' ? 'avatars' : (Utils::$context['browse_type'] === 'thumbs' ? 'thumbs' : 'attachments')) . '_no_entries'],
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getFiles',
-				'params' => array(
+				'params' => [
 					Utils::$context['browse_type'],
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumFiles',
-				'params' => array(
+				'params' => [
 					Utils::$context['browse_type'],
-				),
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['attachment_name'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$link = '<a href="';
 
 							// In case of a custom avatar URL attachments have a fixed directory.
-							if ($rowData['attachment_type'] == 1)
-							{
+							if ($rowData['attachment_type'] == 1) {
 								$link .= sprintf('%1$s/%2$s', Config::$modSettings['custom_avatar_url'], $rowData['filename']);
 							}
 							// By default avatars are downloaded almost as attachments.
-							elseif (Utils::$context['browse_type'] == 'avatars')
-							{
+							elseif (Utils::$context['browse_type'] == 'avatars') {
 								$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', Config::$scripturl, $rowData['id_attach']);
 							}
 							// Normal attachments are always linked to a topic ID.
-							else
-							{
+							else {
 								$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', Config::$scripturl, $rowData['id_topic'], $rowData['id_attach']);
 							}
 
 							$link .= '"';
 
 							// Show a popup on click if it's a picture and we know its dimensions.
-							if (!empty($rowData['width']) && !empty($rowData['height']))
-							{
+							if (!empty($rowData['width']) && !empty($rowData['height'])) {
 								$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
 							}
 
 							$link .= sprintf('>%1$s</a>', preg_replace('~&amp;#(\\\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\\\1;', Utils::htmlspecialchars($rowData['filename'])));
 
 							// Show the dimensions.
-							if (!empty($rowData['width']) && !empty($rowData['height']))
-							{
+							if (!empty($rowData['width']) && !empty($rowData['height'])) {
 								$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
 							}
 
 							return $link;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'a.filename',
 						'reverse' => 'a.filename DESC',
-					),
-				),
-				'filesize' => array(
-					'header' => array(
+					],
+				],
+				'filesize' => [
+					'header' => [
 						'value' => Lang::$txt['attachment_file_size'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return sprintf('%1$s%2$s', round($rowData['size'] / 1024, 2), Lang::$txt['kilobyte']);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'a.size',
 						'reverse' => 'a.size DESC',
-					),
-				),
-				'member' => array(
-					'header' => array(
+					],
+				],
+				'member' => [
+					'header' => [
 						'value' => Utils::$context['browse_type'] == 'avatars' ? Lang::$txt['attachment_manager_member'] : Lang::$txt['posted_by'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// In case of an attachment, return the poster of the attachment.
-							if (empty($rowData['id_member']))
-							{
+							if (empty($rowData['id_member'])) {
 								return Utils::htmlspecialchars($rowData['poster_name']);
 							}
 
 							// Otherwise it must be an avatar, return the link to the owner of it.
 							return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', Config::$scripturl, $rowData['id_member'], $rowData['poster_name']);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mem.real_name',
 						'reverse' => 'mem.real_name DESC',
-					),
-				),
-				'date' => array(
-					'header' => array(
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Utils::$context['browse_type'] == 'avatars' ? Lang::$txt['attachment_manager_last_active'] : Lang::$txt['date'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// The date the message containing the attachment was posted or the owner of the avatar was active.
 							$date = empty($rowData['poster_time']) ? Lang::$txt['never'] : Time::create('@' . $rowData['poster_time'])->format(null, true);
 
 							// Add a link to the topic in case of an attachment.
-							if (Utils::$context['browse_type'] !== 'avatars')
-							{
+							if (Utils::$context['browse_type'] !== 'avatars') {
 								$date .= sprintf('<br>%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', Lang::$txt['in'], Config::$scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
 							}
 
 							return $date;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => Utils::$context['browse_type'] === 'avatars' ? 'mem.last_login' : 'm.id_msg',
 						'reverse' => Utils::$context['browse_type'] === 'avatars' ? 'mem.last_login DESC' : 'm.id_msg DESC',
-					),
-				),
-				'downloads' => array(
-					'header' => array(
+					],
+				],
+				'downloads' => [
+					'header' => [
 						'value' => Lang::$txt['downloads'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'downloads',
 						'comma_format' => true,
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'a.downloads',
 						'reverse' => 'a.downloads DESC',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="remove[%1$d]">',
-							'params' => array(
+							'params' => [
 								'id_attach' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=manageattachments;sa=remove' . (Utils::$context['browse_type'] === 'avatars' ? ';avatars' : (Utils::$context['browse_type'] === 'thumbs' ? ';thumbs' : '')),
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					'type' => Utils::$context['browse_type'],
-				),
-			),
-			'additional_rows' => array(
-				array(
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'above_column_headers',
 					'value' => '<input type="submit" name="remove_submit" class="button you_sure" value="' . Lang::$txt['quickmod_delete_selected'] . '" data-confirm="' . Lang::$txt['confirm_delete_attachments'] . '">',
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="remove_submit" class="button you_sure" value="' . Lang::$txt['quickmod_delete_selected'] . '" data-confirm="' . Lang::$txt['confirm_delete_attachments'] . '">',
-				),
-			),
-		);
+				],
+			],
+		];
 
-		$titles = array(
-			'attachments' => array('?action=admin;area=manageattachments;sa=browse', Lang::$txt['attachment_manager_attachments']),
-			'avatars' => array('?action=admin;area=manageattachments;sa=browse;avatars', Lang::$txt['attachment_manager_avatars']),
-			'thumbs' => array('?action=admin;area=manageattachments;sa=browse;thumbs', Lang::$txt['attachment_manager_thumbs']),
-		);
+		$titles = [
+			'attachments' => ['?action=admin;area=manageattachments;sa=browse', Lang::$txt['attachment_manager_attachments']],
+			'avatars' => ['?action=admin;area=manageattachments;sa=browse;avatars', Lang::$txt['attachment_manager_avatars']],
+			'thumbs' => ['?action=admin;area=manageattachments;sa=browse;thumbs', Lang::$txt['attachment_manager_thumbs']],
+		];
 
 		$list_title = Lang::$txt['attachment_manager_browse_files'] . ': ';
 
 		// Does a hook want to display their attachments better?
-		IntegrationHook::call('integrate_attachments_browse', array(&$listOptions, &$titles));
+		IntegrationHook::call('integrate_attachments_browse', [&$listOptions, &$titles]);
 
-		foreach ($titles as $browse_type => $details)
-		{
-			if ($browse_type != 'attachments')
-			{
+		foreach ($titles as $browse_type => $details) {
+			if ($browse_type != 'attachments') {
 				$list_title .= ' | ';
 			}
 
-			if (Utils::$context['browse_type'] == $browse_type)
-			{
+			if (Utils::$context['browse_type'] == $browse_type) {
 				$list_title .= '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="&gt;"> ';
 			}
 
@@ -512,73 +504,75 @@ public function maintain(): void
 		$attach_dirs = Config::$modSettings['attachmentUploadDir'];
 
 		// Get the number of attachments....
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}attachments
 			WHERE attachment_type = {int:attachment_type}
 				AND id_member = {int:guest_id_member}',
-			array(
+			[
 				'attachment_type' => 0,
 				'guest_id_member' => 0,
-			)
+			],
 		);
-		list (Utils::$context['num_attachments']) = Db::$db->fetch_row($request);
+		list(Utils::$context['num_attachments']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 		Utils::$context['num_attachments'] = Lang::numberFormat(Utils::$context['num_attachments'], 0);
 
 		// Also get the avatar amount....
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}attachments
 			WHERE id_member != {int:guest_id_member}',
-			array(
+			[
 				'guest_id_member' => 0,
-			)
+			],
 		);
-		list (Utils::$context['num_avatars']) = Db::$db->fetch_row($request);
+		list(Utils::$context['num_avatars']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 		Utils::$context['num_avatars'] = Lang::numberFormat(Utils::$context['num_avatars'], 0);
 
 		// Check the size of all the directories.
-		$request = Db::$db->query('', '
-			SELECT SUM(size)
+		$request = Db::$db->query(
+			'',
+			'SELECT SUM(size)
 			FROM {db_prefix}attachments
 			WHERE attachment_type != {int:type}',
-			array(
+			[
 				'type' => 1,
-			)
+			],
 		);
-		list ($attachmentDirSize) = Db::$db->fetch_row($request);
+		list($attachmentDirSize) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Divide it into kilobytes.
 		$attachmentDirSize /= 1024;
 		Utils::$context['attachment_total_size'] = Lang::numberFormat($attachmentDirSize, 2);
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(*), SUM(size)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*), SUM(size)
 			FROM {db_prefix}attachments
 			WHERE id_folder = {int:folder_id}
 				AND attachment_type != {int:type}',
-			array(
+			[
 				'folder_id' => Config::$modSettings['currentAttachmentUploadDir'],
 				'type' => 1,
-			)
+			],
 		);
-		list ($current_dir_files, $current_dir_size) = Db::$db->fetch_row($request);
+		list($current_dir_files, $current_dir_size) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 		$current_dir_size /= 1024;
 
 		// If they specified a limit only....
-		if (!empty(Config::$modSettings['attachmentDirSizeLimit']))
-		{
+		if (!empty(Config::$modSettings['attachmentDirSizeLimit'])) {
 			Utils::$context['attachment_space'] = Lang::numberFormat(max(Config::$modSettings['attachmentDirSizeLimit'] - $current_dir_size, 0), 2);
 		}
 
 		Utils::$context['attachment_current_size'] = Lang::numberFormat($current_dir_size, 2);
 
-		if (!empty(Config::$modSettings['attachmentDirFileLimit']))
-		{
+		if (!empty(Config::$modSettings['attachmentDirFileLimit'])) {
 			Utils::$context['attachment_files'] = Lang::numberFormat(max(Config::$modSettings['attachmentDirFileLimit'] - $current_dir_files, 0), 0);
 		}
 
@@ -588,12 +582,11 @@ public function maintain(): void
 
 		Utils::$context['attach_dirs'] = $attach_dirs;
 
-		Utils::$context['base_dirs'] = !empty(Config::$modSettings['attachment_basedirectories']) ? Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true) : array();
+		Utils::$context['base_dirs'] = !empty(Config::$modSettings['attachment_basedirectories']) ? Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true) : [];
 
-		Utils::$context['checked'] = isset($_SESSION['checked']) ? $_SESSION['checked'] : true;
+		Utils::$context['checked'] = $_SESSION['checked'] ?? true;
 
-		if (!empty($_SESSION['results']))
-		{
+		if (!empty($_SESSION['results'])) {
 			Utils::$context['results'] = implode('<br>', $_SESSION['results']);
 			unset($_SESSION['results']);
 		}
@@ -608,40 +601,37 @@ public function remove(): void
 	{
 		User::$me->checkSession();
 
-		if (!empty($_POST['remove']))
-		{
-			$attachments = array();
+		if (!empty($_POST['remove'])) {
+			$attachments = [];
 
 			// There must be a quicker way to pass this safety test??
-			foreach ($_POST['remove'] as $removeID => $dummy)
+			foreach ($_POST['remove'] as $removeID => $dummy) {
 				$attachments[] = (int) $removeID;
+			}
 
 			// If the attachments are from a 3rd party, let them remove it. Hooks should remove their ids from the array.
 			$filesRemoved = false;
 
-			IntegrationHook::call('integrate_attachment_remove', array(&$filesRemoved, $attachments));
+			IntegrationHook::call('integrate_attachment_remove', [&$filesRemoved, $attachments]);
 
-			if ($_REQUEST['type'] == 'avatars' && !empty($attachments))
-			{
-				Attachment::remove(array('id_attach' => $attachments));
-			}
-			elseif (!empty($attachments))
-			{
-				$messages = Attachment::remove(array('id_attach' => $attachments), 'messages', true);
+			if ($_REQUEST['type'] == 'avatars' && !empty($attachments)) {
+				Attachment::remove(['id_attach' => $attachments]);
+			} elseif (!empty($attachments)) {
+				$messages = Attachment::remove(['id_attach' => $attachments], 'messages', true);
 
 				// And change the message to reflect this.
-				if (!empty($messages))
-				{
+				if (!empty($messages)) {
 					Lang::load('index', Lang::$default, true);
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}messages
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}messages
 						SET body = CONCAT(body, {string:deleted_message})
 						WHERE id_msg IN ({array_int:messages_affected})',
-						array(
+						[
 							'messages_affected' => $messages,
 							'deleted_message' => '<br><br>' . Lang::$txt['attachment_delete_admin'],
-						)
+						],
 					);
 
 					Lang::load('index', User::$me->language, true);
@@ -649,7 +639,7 @@ public function remove(): void
 			}
 		}
 
-		$_GET['sort'] = isset($_GET['sort']) ? $_GET['sort'] : 'date';
+		$_GET['sort'] = $_GET['sort'] ?? 'date';
 
 		Utils::redirectexit('action=admin;area=manageattachments;sa=browse;' . $_REQUEST['type'] . ';sort=' . $_GET['sort'] . (isset($_GET['desc']) ? ';desc' : '') . ';start=' . $_REQUEST['start']);
 	}
@@ -668,29 +658,26 @@ public function removeByAge(): void
 		// @todo Ignore messages in topics that are stickied?
 
 		// Deleting an attachment?
-		if ($_REQUEST['type'] != 'avatars')
-		{
+		if ($_REQUEST['type'] != 'avatars') {
 			// Get rid of all the old attachments.
-			$messages = Attachment::remove(array('attachment_type' => 0, 'poster_time' => (time() - 24 * 60 * 60 * $_POST['age'])), 'messages', true);
+			$messages = Attachment::remove(['attachment_type' => 0, 'poster_time' => (time() - 24 * 60 * 60 * $_POST['age'])], 'messages', true);
 
 			// Update the messages to reflect the change.
-			if (!empty($messages) && !empty($_POST['notice']))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}messages
+			if (!empty($messages) && !empty($_POST['notice'])) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}messages
 					SET body = CONCAT(body, {string:notice})
 					WHERE id_msg IN ({array_int:messages})',
-					array(
+					[
 						'messages' => $messages,
 						'notice' => '<br><br>' . $_POST['notice'],
-					)
+					],
 				);
 			}
-		}
-		else
-		{
+		} else {
 			// Remove all the old avatars.
-			Attachment::remove(array('not_id_member' => 0, 'last_login' => (time() - 24 * 60 * 60 * $_POST['age'])), 'members');
+			Attachment::remove(['not_id_member' => 0, 'last_login' => (time() - 24 * 60 * 60 * $_POST['age'])], 'members');
 		}
 
 		Utils::redirectexit('action=admin;area=manageattachments' . (empty($_REQUEST['avatars']) ? ';sa=maintenance' : ';avatars'));
@@ -708,19 +695,19 @@ public function removeBySize(): void
 		User::$me->checkSession('post', 'admin');
 
 		// Find humungous attachments.
-		$messages = Attachment::remove(array('attachment_type' => 0, 'size' => 1024 * $_POST['size']), 'messages', true);
+		$messages = Attachment::remove(['attachment_type' => 0, 'size' => 1024 * $_POST['size']], 'messages', true);
 
 		// And make a note on the post.
-		if (!empty($messages) && !empty($_POST['notice']))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+		if (!empty($messages) && !empty($_POST['notice'])) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET body = CONCAT(body, {string:notice})
 				WHERE id_msg IN ({array_int:messages})',
-				array(
+				[
 					'messages' => $messages,
 					'notice' => '<br><br>' . $_POST['notice'],
-				)
+				],
 			);
 		}
 
@@ -736,22 +723,23 @@ public function removeAll(): void
 	{
 		User::$me->checkSession('get', 'admin');
 
-		$messages = Attachment::remove(array('attachment_type' => 0), '', true);
+		$messages = Attachment::remove(['attachment_type' => 0], '', true);
 
-		if (!isset($_POST['notice']))
+		if (!isset($_POST['notice'])) {
 			$_POST['notice'] = Lang::$txt['attachment_delete_admin'];
+		}
 
 		// Add the notice on the end of the changed messages.
-		if (!empty($messages))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+		if (!empty($messages)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET body = CONCAT(body, {string:deleted_message})
 				WHERE id_msg IN ({array_int:messages})',
-				array(
+				[
 					'messages' => $messages,
 					'deleted_message' => '<br><br>' . $_POST['notice'],
-				)
+				],
 			);
 		}
 
@@ -766,8 +754,9 @@ public function repair(): void
 		User::$me->checkSession('get');
 
 		// If we choose cancel, redirect right back.
-		if (isset($_POST['cancel']))
+		if (isset($_POST['cancel'])) {
 			Utils::redirectexit('action=admin;area=manageattachments;sa=maintenance');
+		}
 
 		// Try give us a while to sort this out...
 		@set_time_limit(600);
@@ -777,27 +766,27 @@ public function repair(): void
 		Utils::$context['starting_substep'] = $_GET['substep'] = empty($_GET['substep']) ? 0 : (int) $_GET['substep'];
 
 		// Don't recall the session just in case.
-		if ($_GET['step'] == 0 && $_GET['substep'] == 0)
-		{
+		if ($_GET['step'] == 0 && $_GET['substep'] == 0) {
 			unset($_SESSION['attachments_to_fix'], $_SESSION['attachments_to_fix2']);
 
 			// If we're actually fixing stuff - work out what.
-			if (isset($_GET['fixErrors']))
-			{
+			if (isset($_GET['fixErrors'])) {
 				// Nothing?
-				if (empty($_POST['to_fix']))
+				if (empty($_POST['to_fix'])) {
 					Utils::redirectexit('action=admin;area=manageattachments;sa=maintenance');
+				}
 
-				$_SESSION['attachments_to_fix'] = array();
+				$_SESSION['attachments_to_fix'] = [];
 
 				// @todo No need to do this I think.
-				foreach ($_POST['to_fix'] as $value)
+				foreach ($_POST['to_fix'] as $value) {
 					$_SESSION['attachments_to_fix'][] = $value;
+				}
 			}
 		}
 
 		// All the valid problems are here:
-		Utils::$context['repair_errors'] = array(
+		Utils::$context['repair_errors'] = [
 			'missing_thumbnail_parent' => 0,
 			'parent_missing_thumbnail' => 0,
 			'file_missing_on_disk' => 0,
@@ -807,77 +796,75 @@ public function repair(): void
 			'avatar_no_member' => 0,
 			'wrong_folder' => 0,
 			'files_without_attachment' => 0,
-		);
+		];
 
-		$to_fix = !empty($_SESSION['attachments_to_fix']) ? $_SESSION['attachments_to_fix'] : array();
+		$to_fix = !empty($_SESSION['attachments_to_fix']) ? $_SESSION['attachments_to_fix'] : [];
 
-		Utils::$context['repair_errors'] = isset($_SESSION['attachments_to_fix2']) ? $_SESSION['attachments_to_fix2'] : Utils::$context['repair_errors'];
+		Utils::$context['repair_errors'] = $_SESSION['attachments_to_fix2'] ?? Utils::$context['repair_errors'];
 
 		$fix_errors = isset($_GET['fixErrors']) ? true : false;
 
 		// Get stranded thumbnails.
-		if ($_GET['step'] <= 0)
-		{
-			$result = Db::$db->query('', '
-				SELECT MAX(id_attach)
+		if ($_GET['step'] <= 0) {
+			$result = Db::$db->query(
+				'',
+				'SELECT MAX(id_attach)
 				FROM {db_prefix}attachments
 				WHERE attachment_type = {int:thumbnail}',
-				array(
+				[
 					'thumbnail' => 3,
-				)
+				],
 			);
-			list ($thumbnails) = Db::$db->fetch_row($result);
+			list($thumbnails) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
-			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500)
-			{
-				$to_remove = array();
+			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500) {
+				$to_remove = [];
 
-				$result = Db::$db->query('', '
-					SELECT thumb.id_attach, thumb.id_folder, thumb.filename, thumb.file_hash
+				$result = Db::$db->query(
+					'',
+					'SELECT thumb.id_attach, thumb.id_folder, thumb.filename, thumb.file_hash
 					FROM {db_prefix}attachments AS thumb
 						LEFT JOIN {db_prefix}attachments AS tparent ON (tparent.id_thumb = thumb.id_attach)
 					WHERE thumb.id_attach BETWEEN {int:substep} AND {int:substep} + 499
 						AND thumb.attachment_type = {int:thumbnail}
 						AND tparent.id_attach IS NULL',
-					array(
+					[
 						'thumbnail' => 3,
 						'substep' => $_GET['substep'],
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					// Only do anything once... just in case
-					if (!isset($to_remove[$row['id_attach']]))
-					{
+					if (!isset($to_remove[$row['id_attach']])) {
 						$to_remove[$row['id_attach']] = $row['id_attach'];
 						Utils::$context['repair_errors']['missing_thumbnail_parent']++;
 
 						// If we are repairing remove the file from disk now.
-						if ($fix_errors && in_array('missing_thumbnail_parent', $to_fix))
-						{
+						if ($fix_errors && in_array('missing_thumbnail_parent', $to_fix)) {
 							$filename = Attachment::getFilePath($row['id_attach']);
 							@unlink($filename);
 						}
 					}
 				}
-				if (Db::$db->num_rows($result) != 0)
-				{
+
+				if (Db::$db->num_rows($result) != 0) {
 					$to_fix[] = 'missing_thumbnail_parent';
 				}
 				Db::$db->free_result($result);
 
 				// Do we need to delete what we have?
-				if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}attachments
+				if ($fix_errors && !empty($to_remove) && in_array('missing_thumbnail_parent', $to_fix)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}attachments
 						WHERE id_attach IN ({array_int:to_remove})
 							AND attachment_type = {int:attachment_type}',
-						array(
+						[
 							'to_remove' => $to_remove,
 							'attachment_type' => 3,
-						)
+						],
 					);
 				}
 
@@ -890,57 +877,57 @@ public function repair(): void
 		}
 
 		// Find parents which think they have thumbnails, but actually, don't.
-		if ($_GET['step'] <= 1)
-		{
-			$result = Db::$db->query('', '
-				SELECT MAX(id_attach)
+		if ($_GET['step'] <= 1) {
+			$result = Db::$db->query(
+				'',
+				'SELECT MAX(id_attach)
 				FROM {db_prefix}attachments
 				WHERE id_thumb != {int:no_thumb}',
-				array(
+				[
 					'no_thumb' => 0,
-				)
+				],
 			);
-			list ($thumbnails) = Db::$db->fetch_row($result);
+			list($thumbnails) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
-			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500)
-			{
-				$to_update = array();
+			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500) {
+				$to_update = [];
 
-				$result = Db::$db->query('', '
-					SELECT a.id_attach
+				$result = Db::$db->query(
+					'',
+					'SELECT a.id_attach
 					FROM {db_prefix}attachments AS a
 						LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)
 					WHERE a.id_attach BETWEEN {int:substep} AND {int:substep} + 499
 						AND a.id_thumb != {int:no_thumb}
 						AND thumb.id_attach IS NULL',
-					array(
+					[
 						'no_thumb' => 0,
 						'substep' => $_GET['substep'],
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					$to_update[] = $row['id_attach'];
 					Utils::$context['repair_errors']['parent_missing_thumbnail']++;
 				}
-				if (Db::$db->num_rows($result) != 0)
-				{
+
+				if (Db::$db->num_rows($result) != 0) {
 					$to_fix[] = 'parent_missing_thumbnail';
 				}
 				Db::$db->free_result($result);
 
 				// Do we need to delete what we have?
-				if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix))
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}attachments
+				if ($fix_errors && !empty($to_update) && in_array('parent_missing_thumbnail', $to_fix)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}attachments
 						SET id_thumb = {int:no_thumb}
 						WHERE id_attach IN ({array_int:to_update})',
-						array(
+						[
 							'to_update' => $to_update,
 							'no_thumb' => 0,
-						)
+						],
 					);
 				}
 
@@ -953,70 +940,63 @@ public function repair(): void
 		}
 
 		// This may take forever I'm afraid, but life sucks... recount EVERY attachments!
-		if ($_GET['step'] <= 2)
-		{
-			$result = Db::$db->query('', '
-				SELECT MAX(id_attach)
+		if ($_GET['step'] <= 2) {
+			$result = Db::$db->query(
+				'',
+				'SELECT MAX(id_attach)
 				FROM {db_prefix}attachments',
-				array(
-				)
+				[
+				],
 			);
-			list ($thumbnails) = Db::$db->fetch_row($result);
+			list($thumbnails) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
-			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 250)
-			{
-				$to_remove = array();
-				$errors_found = array();
+			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 250) {
+				$to_remove = [];
+				$errors_found = [];
 
-				$result = Db::$db->query('', '
-					SELECT id_attach, id_folder, filename, file_hash, size, attachment_type
+				$result = Db::$db->query(
+					'',
+					'SELECT id_attach, id_folder, filename, file_hash, size, attachment_type
 					FROM {db_prefix}attachments
 					WHERE id_attach BETWEEN {int:substep} AND {int:substep} + 249',
-					array(
+					[
 						'substep' => $_GET['substep'],
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					// Get the filename.
-					if ($row['attachment_type'] == 1)
-					{
+					if ($row['attachment_type'] == 1) {
 						$filename = Config::$modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-					}
-					else
-					{
+					} else {
 						$filename = Attachment::getFilePath($row['id_attach']);
 					}
 
 					// File doesn't exist?
-					if (!file_exists($filename))
-					{
+					if (!file_exists($filename)) {
 						// If we're lucky it might just be in a different folder.
-						if (!empty(Config::$modSettings['currentAttachmentUploadDir']))
-						{
+						if (!empty(Config::$modSettings['currentAttachmentUploadDir'])) {
 							// Get the attachment name with out the folder.
 							$attachment_name = $row['id_attach'] . '_' . $row['file_hash'] . '.dat';
 
 							// Loop through the other folders.
-							foreach (Config::$modSettings['attachmentUploadDir'] as $id => $dir)
-							{
-								if (file_exists($dir . '/' . $attachment_name))
-								{
+							foreach (Config::$modSettings['attachmentUploadDir'] as $id => $dir) {
+								if (file_exists($dir . '/' . $attachment_name)) {
 									Utils::$context['repair_errors']['wrong_folder']++;
 									$errors_found[] = 'wrong_folder';
 
 									// Are we going to fix this now?
-									if ($fix_errors && in_array('wrong_folder', $to_fix))
-									{
-										Db::$db->query('', '
-											UPDATE {db_prefix}attachments
+									if ($fix_errors && in_array('wrong_folder', $to_fix)) {
+										Db::$db->query(
+											'',
+											'UPDATE {db_prefix}attachments
 											SET id_folder = {int:new_folder}
 											WHERE id_attach = {int:id_attach}',
-											array(
+											[
 												'new_folder' => $id,
 												'id_attach' => $row['id_attach'],
-											)
+											],
 										);
 									}
 
@@ -1028,73 +1008,73 @@ public function repair(): void
 						$to_remove[] = $row['id_attach'];
 						Utils::$context['repair_errors']['file_missing_on_disk']++;
 						$errors_found[] = 'file_missing_on_disk';
-					}
-					elseif (filesize($filename) == 0)
-					{
+					} elseif (filesize($filename) == 0) {
 						Utils::$context['repair_errors']['file_size_of_zero']++;
 						$errors_found[] = 'file_size_of_zero';
 
 						// Fixing?
-						if ($fix_errors && in_array('file_size_of_zero', $to_fix))
-						{
+						if ($fix_errors && in_array('file_size_of_zero', $to_fix)) {
 							$to_remove[] = $row['id_attach'];
 							@unlink($filename);
 						}
-					}
-					elseif (filesize($filename) != $row['size'])
-					{
+					} elseif (filesize($filename) != $row['size']) {
 						Utils::$context['repair_errors']['file_wrong_size']++;
 						$errors_found[] = 'file_wrong_size';
 
 						// Fix it here?
-						if ($fix_errors && in_array('file_wrong_size', $to_fix))
-						{
-							Db::$db->query('', '
-								UPDATE {db_prefix}attachments
+						if ($fix_errors && in_array('file_wrong_size', $to_fix)) {
+							Db::$db->query(
+								'',
+								'UPDATE {db_prefix}attachments
 								SET size = {int:filesize}
 								WHERE id_attach = {int:id_attach}',
-								array(
+								[
 									'filesize' => filesize($filename),
 									'id_attach' => $row['id_attach'],
-								)
+								],
 							);
 						}
 					}
 				}
 
-				if (in_array('file_missing_on_disk', $errors_found))
+				if (in_array('file_missing_on_disk', $errors_found)) {
 					$to_fix[] = 'file_missing_on_disk';
+				}
 
-				if (in_array('file_size_of_zero', $errors_found))
+				if (in_array('file_size_of_zero', $errors_found)) {
 					$to_fix[] = 'file_size_of_zero';
+				}
 
-				if (in_array('file_wrong_size', $errors_found))
+				if (in_array('file_wrong_size', $errors_found)) {
 					$to_fix[] = 'file_wrong_size';
+				}
 
-				if (in_array('wrong_folder', $errors_found))
+				if (in_array('wrong_folder', $errors_found)) {
 					$to_fix[] = 'wrong_folder';
+				}
 
 				Db::$db->free_result($result);
 
 				// Do we need to delete what we have?
-				if ($fix_errors && !empty($to_remove))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}attachments
+				if ($fix_errors && !empty($to_remove)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}attachments
 						WHERE id_attach IN ({array_int:to_remove})',
-						array(
+						[
 							'to_remove' => $to_remove,
-						)
+						],
 					);
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}attachments
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}attachments
 						SET id_thumb = {int:no_thumb}
 						WHERE id_thumb IN ({array_int:to_remove})',
-						array(
+						[
 							'to_remove' => $to_remove,
 							'no_thumb' => 0,
-						)
+						],
 					);
 				}
 
@@ -1107,74 +1087,70 @@ public function repair(): void
 		}
 
 		// Get avatars with no members associated with them.
-		if ($_GET['step'] <= 3)
-		{
-			$result = Db::$db->query('', '
-				SELECT MAX(id_attach)
+		if ($_GET['step'] <= 3) {
+			$result = Db::$db->query(
+				'',
+				'SELECT MAX(id_attach)
 				FROM {db_prefix}attachments',
-				array(
-				)
+				[
+				],
 			);
-			list ($thumbnails) = Db::$db->fetch_row($result);
+			list($thumbnails) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
-			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500)
-			{
-				$to_remove = array();
+			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500) {
+				$to_remove = [];
 
-				$result = Db::$db->query('', '
-					SELECT a.id_attach, a.id_folder, a.filename, a.file_hash, a.attachment_type
+				$result = Db::$db->query(
+					'',
+					'SELECT a.id_attach, a.id_folder, a.filename, a.file_hash, a.attachment_type
 					FROM {db_prefix}attachments AS a
 						LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = a.id_member)
 					WHERE a.id_attach BETWEEN {int:substep} AND {int:substep} + 499
 						AND a.id_member != {int:no_member}
 						AND a.id_msg = {int:no_msg}
 						AND mem.id_member IS NULL',
-					array(
+					[
 						'no_member' => 0,
 						'no_msg' => 0,
 						'substep' => $_GET['substep'],
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					$to_remove[] = $row['id_attach'];
 					Utils::$context['repair_errors']['avatar_no_member']++;
 
 					// If we are repairing remove the file from disk now.
-					if ($fix_errors && in_array('avatar_no_member', $to_fix))
-					{
-						if ($row['attachment_type'] == 1)
-						{
+					if ($fix_errors && in_array('avatar_no_member', $to_fix)) {
+						if ($row['attachment_type'] == 1) {
 							$filename = Config::$modSettings['custom_avatar_dir'] . '/' . $row['filename'];
-						}
-						else
-						{
+						} else {
 							$filename = Attachment::getFilePath($row['id_attach']);
 						}
 
 						@unlink($filename);
 					}
 				}
-				if (Db::$db->num_rows($result) != 0)
-				{
+
+				if (Db::$db->num_rows($result) != 0) {
 					$to_fix[] = 'avatar_no_member';
 				}
 				Db::$db->free_result($result);
 
 				// Do we need to delete what we have?
-				if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}attachments
+				if ($fix_errors && !empty($to_remove) && in_array('avatar_no_member', $to_fix)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}attachments
 						WHERE id_attach IN ({array_int:to_remove})
 							AND id_member != {int:no_member}
 							AND id_msg = {int:no_msg}',
-						array(
+						[
 							'to_remove' => $to_remove,
 							'no_member' => 0,
 							'no_msg' => 0,
-						)
+						],
 					);
 				}
 
@@ -1187,27 +1163,27 @@ public function repair(): void
 		}
 
 		// What about attachments, who are missing a message :'(
-		if ($_GET['step'] <= 4)
-		{
-			$result = Db::$db->query('', '
-				SELECT MAX(id_attach)
+		if ($_GET['step'] <= 4) {
+			$result = Db::$db->query(
+				'',
+				'SELECT MAX(id_attach)
 				FROM {db_prefix}attachments',
-				array(
-				)
+				[
+				],
 			);
-			list ($thumbnails) = Db::$db->fetch_row($result);
+			list($thumbnails) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
-			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500)
-			{
-				$to_remove = array();
-				$ignore_ids = array(0);
+			for (; $_GET['substep'] < $thumbnails; $_GET['substep'] += 500) {
+				$to_remove = [];
+				$ignore_ids = [0];
 
 				// returns an array of ints of id_attach's that should not be deleted
-				IntegrationHook::call('integrate_repair_attachments_nomsg', array(&$ignore_ids, $_GET['substep'], $_GET['substep'] + 500));
+				IntegrationHook::call('integrate_repair_attachments_nomsg', [&$ignore_ids, $_GET['substep'], $_GET['substep'] + 500]);
 
-				$result = Db::$db->query('', '
-					SELECT a.id_attach, a.id_folder, a.filename, a.file_hash
+				$result = Db::$db->query(
+					'',
+					'SELECT a.id_attach, a.id_folder, a.filename, a.file_hash
 					FROM {db_prefix}attachments AS a
 						LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 					WHERE a.id_attach BETWEEN {int:substep} AND {int:substep} + 499
@@ -1215,45 +1191,44 @@ public function repair(): void
 						AND (a.id_msg = {int:no_msg} OR m.id_msg IS NULL)
 						AND a.id_attach NOT IN ({array_int:ignore_ids})
 						AND a.attachment_type IN ({array_int:attach_thumb})',
-					array(
+					[
 						'no_member' => 0,
 						'no_msg' => 0,
 						'substep' => $_GET['substep'],
 						'ignore_ids' => $ignore_ids,
-						'attach_thumb' => array(0, 3),
-					)
+						'attach_thumb' => [0, 3],
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					$to_remove[] = $row['id_attach'];
 					Utils::$context['repair_errors']['attachment_no_msg']++;
 
 					// If we are repairing remove the file from disk now.
-					if ($fix_errors && in_array('attachment_no_msg', $to_fix))
-					{
+					if ($fix_errors && in_array('attachment_no_msg', $to_fix)) {
 						$filename = Attachment::getFilePath($row['id_attach']);
 						@unlink($filename);
 					}
 				}
-				if (Db::$db->num_rows($result) != 0)
-				{
+
+				if (Db::$db->num_rows($result) != 0) {
 					$to_fix[] = 'attachment_no_msg';
 				}
 				Db::$db->free_result($result);
 
 				// Do we need to delete what we have?
-				if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}attachments
+				if ($fix_errors && !empty($to_remove) && in_array('attachment_no_msg', $to_fix)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}attachments
 						WHERE id_attach IN ({array_int:to_remove})
 							AND id_member = {int:no_member}
 							AND attachment_type IN ({array_int:attach_thumb})',
-						array(
+						[
 							'to_remove' => $to_remove,
 							'no_member' => 0,
-							'attach_thumb' => array(0, 3),
-						)
+							'attach_thumb' => [0, 3],
+						],
 					);
 				}
 
@@ -1266,70 +1241,58 @@ public function repair(): void
 		}
 
 		// What about files who are not recorded in the database?
-		if ($_GET['step'] <= 5)
-		{
+		if ($_GET['step'] <= 5) {
 			$attach_dirs = Config::$modSettings['attachmentUploadDir'];
 
 			$current_check = 0;
 			$max_checks = 500;
 			$files_checked = empty($_GET['substep']) ? 0 : $_GET['substep'];
-			foreach ($attach_dirs as $attach_dir)
-			{
-				if ($dir = @opendir($attach_dir))
-				{
-					while ($file = readdir($dir))
-					{
-						if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
+
+			foreach ($attach_dirs as $attach_dir) {
+				if ($dir = @opendir($attach_dir)) {
+					while ($file = readdir($dir)) {
+						if (in_array($file, ['.', '..', '.htaccess', 'index.php'])) {
 							continue;
+						}
 
-						if ($files_checked <= $current_check)
-						{
+						if ($files_checked <= $current_check) {
 							// Temporary file, get rid of it!
-							if (strpos($file, 'post_tmp_') !== false)
-							{
+							if (strpos($file, 'post_tmp_') !== false) {
 								// Temp file is more than 5 hours old!
-								if (filemtime($attach_dir . '/' . $file) < time() - 18000)
+								if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
 									@unlink($attach_dir . '/' . $file);
+								}
 							}
 							// That should be an attachment, let's check if we have it in the database
-							elseif (strpos($file, '_') !== false)
-							{
+							elseif (strpos($file, '_') !== false) {
 								$attachID = (int) substr($file, 0, strpos($file, '_'));
 
-								if (!empty($attachID))
-								{
-									$request = Db::$db->query('', '
-										SELECT  id_attach
+								if (!empty($attachID)) {
+									$request = Db::$db->query(
+										'',
+										'SELECT  id_attach
 										FROM {db_prefix}attachments
 										WHERE id_attach = {int:attachment_id}
 										LIMIT 1',
-										array(
+										[
 											'attachment_id' => $attachID,
-										)
+										],
 									);
-									if (Db::$db->num_rows($request) == 0)
-									{
-										if ($fix_errors && in_array('files_without_attachment', $to_fix))
-										{
+
+									if (Db::$db->num_rows($request) == 0) {
+										if ($fix_errors && in_array('files_without_attachment', $to_fix)) {
 											@unlink($attach_dir . '/' . $file);
-										}
-										else
-										{
+										} else {
 											Utils::$context['repair_errors']['files_without_attachment']++;
 											$to_fix[] = 'files_without_attachment';
 										}
 									}
 									Db::$db->free_result($request);
 								}
-							}
-							else
-							{
-								if ($fix_errors && in_array('files_without_attachment', $to_fix))
-								{
+							} else {
+								if ($fix_errors && in_array('files_without_attachment', $to_fix)) {
 									@unlink($attach_dir . '/' . $file);
-								}
-								else
-								{
+								} else {
 									Utils::$context['repair_errors']['files_without_attachment']++;
 									$to_fix[] = 'files_without_attachment';
 								}
@@ -1338,8 +1301,9 @@ public function repair(): void
 						$current_check++;
 						$_GET['substep'] = $current_check;
 
-						if ($current_check - $files_checked >= $max_checks)
+						if ($current_check - $files_checked >= $max_checks) {
 							$this->pauseAttachmentMaintenance($to_fix);
+						}
 					}
 
 					closedir($dir);
@@ -1359,7 +1323,6 @@ public function repair(): void
 		// What stage are we at?
 		Utils::$context['completed'] = $fix_errors ? true : false;
 		Utils::$context['errors_found'] = !empty($to_fix) ? true : false;
-
 	}
 
 	/**
@@ -1368,183 +1331,156 @@ public function repair(): void
 	public function paths(): void
 	{
 		// Since this needs to be done eventually.
-		if (!isset(Config::$modSettings['attachment_basedirectories']))
-		{
-			Config::$modSettings['attachment_basedirectories'] = array();
-		}
-		elseif (!is_array(Config::$modSettings['attachment_basedirectories']))
-		{
+		if (!isset(Config::$modSettings['attachment_basedirectories'])) {
+			Config::$modSettings['attachment_basedirectories'] = [];
+		} elseif (!is_array(Config::$modSettings['attachment_basedirectories'])) {
 			Config::$modSettings['attachment_basedirectories'] = Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true);
 		}
 
-		$errors = array();
+		$errors = [];
 
 		// Saving?
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			User::$me->checkSession();
 
 			$_POST['current_dir'] = (int) $_POST['current_dir'];
 
-			$new_dirs = array();
+			$new_dirs = [];
 
-			foreach ($_POST['dirs'] as $id => $path)
-			{
+			foreach ($_POST['dirs'] as $id => $path) {
 				$error = '';
 				$id = (int) $id;
 
-				if ($id < 1)
+				if ($id < 1) {
 					continue;
+				}
 
 				// Sorry, these dirs are NOT valid
-				$invalid_dirs = array(Config::$boarddir, Theme::$current->settings['default_theme_dir'], Config::$sourcedir);
+				$invalid_dirs = [Config::$boarddir, Theme::$current->settings['default_theme_dir'], Config::$sourcedir];
 
-				if (in_array($path, $invalid_dirs))
-				{
+				if (in_array($path, $invalid_dirs)) {
 					$errors[] = $path . ': ' . Lang::$txt['attach_dir_invalid'];
+
 					continue;
 				}
 
 				// Hmm, a new path maybe?
 				// Don't allow empty paths
-				if (!array_key_exists($id, Config::$modSettings['attachmentUploadDir']) && !empty($path))
-				{
+				if (!array_key_exists($id, Config::$modSettings['attachmentUploadDir']) && !empty($path)) {
 					// or is it?
-					if (in_array($path, Config::$modSettings['attachmentUploadDir']) || in_array(Config::$boarddir . DIRECTORY_SEPARATOR . $path, Config::$modSettings['attachmentUploadDir']))
-					{
+					if (in_array($path, Config::$modSettings['attachmentUploadDir']) || in_array(Config::$boarddir . DIRECTORY_SEPARATOR . $path, Config::$modSettings['attachmentUploadDir'])) {
 						$errors[] = $path . ': ' . Lang::$txt['attach_dir_duplicate_msg'];
+
 						continue;
 					}
-					elseif (empty($path))
-					{
+
+					if (empty($path)) {
 						// Ignore this and set $id to one less
 						continue;
 					}
 
 					// OK, so let's try to create it then.
-					if (Attachment::automanageCreateDirectory($path))
-					{
+					if (Attachment::automanageCreateDirectory($path)) {
 						$_POST['current_dir'] = Config::$modSettings['currentAttachmentUploadDir'];
-					}
-					else
-					{
+					} else {
 						$errors[] = $path . ': ' . Lang::$txt[Utils::$context['dir_creation_error']];
 					}
 				}
 
 				// Changing a directory name?
-				if (!empty(Config::$modSettings['attachmentUploadDir'][$id]) && !empty($path) && $path != Config::$modSettings['attachmentUploadDir'][$id])
-				{
-					if ($path != Config::$modSettings['attachmentUploadDir'][$id] && !is_dir($path))
-					{
-						if (!@rename(Config::$modSettings['attachmentUploadDir'][$id], $path))
-						{
+				if (!empty(Config::$modSettings['attachmentUploadDir'][$id]) && !empty($path) && $path != Config::$modSettings['attachmentUploadDir'][$id]) {
+					if ($path != Config::$modSettings['attachmentUploadDir'][$id] && !is_dir($path)) {
+						if (!@rename(Config::$modSettings['attachmentUploadDir'][$id], $path)) {
 							$errors[] = $path . ': ' . Lang::$txt['attach_dir_no_rename'];
 							$path = Config::$modSettings['attachmentUploadDir'][$id];
 						}
-					}
-					else
-					{
+					} else {
 						$errors[] = $path . ': ' . Lang::$txt['attach_dir_exists_msg'];
 						$path = Config::$modSettings['attachmentUploadDir'][$id];
 					}
 
 					// Update the base directory path
-					if (!empty(Config::$modSettings['attachment_basedirectories']) && array_key_exists($id, Config::$modSettings['attachment_basedirectories']))
-					{
+					if (!empty(Config::$modSettings['attachment_basedirectories']) && array_key_exists($id, Config::$modSettings['attachment_basedirectories'])) {
 						$base = Config::$modSettings['basedirectory_for_attachments'] == Config::$modSettings['attachmentUploadDir'][$id] ? $path : Config::$modSettings['basedirectory_for_attachments'];
 
 						Config::$modSettings['attachment_basedirectories'][$id] = $path;
 
-						Config::updateModSettings(array(
+						Config::updateModSettings([
 							'attachment_basedirectories' => Utils::jsonEncode(Config::$modSettings['attachment_basedirectories']),
 							'basedirectory_for_attachments' => $base,
-						));
+						]);
 
 						Config::$modSettings['attachment_basedirectories'] = Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true);
 					}
 				}
 
-				if (empty($path))
-				{
+				if (empty($path)) {
 					$path = Config::$modSettings['attachmentUploadDir'][$id];
 
 					// It's not a good idea to delete the current directory.
-					if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : Config::$modSettings['currentAttachmentUploadDir']))
-					{
+					if ($id == (!empty($_POST['current_dir']) ? $_POST['current_dir'] : Config::$modSettings['currentAttachmentUploadDir'])) {
 						$errors[] = $path . ': ' . Lang::$txt['attach_dir_is_current'];
 					}
 					// Or the current base directory
-					elseif (!empty(Config::$modSettings['basedirectory_for_attachments']) && Config::$modSettings['basedirectory_for_attachments'] == Config::$modSettings['attachmentUploadDir'][$id])
-					{
+					elseif (!empty(Config::$modSettings['basedirectory_for_attachments']) && Config::$modSettings['basedirectory_for_attachments'] == Config::$modSettings['attachmentUploadDir'][$id]) {
 						$errors[] = $path . ': ' . Lang::$txt['attach_dir_is_current_bd'];
-					}
-					else
-					{
+					} else {
 						// Let's not try to delete a path with files in it.
-						$request = Db::$db->query('', '
-							SELECT COUNT(id_attach) AS num_attach
+						$request = Db::$db->query(
+							'',
+							'SELECT COUNT(id_attach) AS num_attach
 							FROM {db_prefix}attachments
 							WHERE id_folder = {int:id_folder}',
-							array(
+							[
 								'id_folder' => (int) $id,
-							)
+							],
 						);
-						list ($num_attach) = Db::$db->fetch_row($request);
+						list($num_attach) = Db::$db->fetch_row($request);
 						Db::$db->free_result($request);
 
 						// A check to see if it's a used base dir.
-						if (!empty(Config::$modSettings['attachment_basedirectories']))
-						{
+						if (!empty(Config::$modSettings['attachment_basedirectories'])) {
 							// Count any sub-folders.
-							foreach (Config::$modSettings['attachmentUploadDir'] as $sub)
-							{
-								if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false)
+							foreach (Config::$modSettings['attachmentUploadDir'] as $sub) {
+								if (strpos($sub, $path . DIRECTORY_SEPARATOR) !== false) {
 									$num_attach++;
+								}
 							}
 						}
 
 						// It's safe to delete. So try to delete the folder also
-						if ($num_attach == 0)
-						{
-							if (is_dir($path))
-							{
+						if ($num_attach == 0) {
+							if (is_dir($path)) {
 								$doit = true;
-							}
-							elseif (is_dir(Config::$boarddir . DIRECTORY_SEPARATOR . $path))
-							{
+							} elseif (is_dir(Config::$boarddir . DIRECTORY_SEPARATOR . $path)) {
 								$doit = true;
 								$path = Config::$boarddir . DIRECTORY_SEPARATOR . $path;
 							}
 
-							if (isset($doit) && realpath($path) != realpath(Config::$boarddir))
-							{
+							if (isset($doit) && realpath($path) != realpath(Config::$boarddir)) {
 								unlink($path . '/.htaccess');
 								unlink($path . '/index.php');
 
-								if (!@rmdir($path))
-								{
+								if (!@rmdir($path)) {
 									$error = $path . ': ' . Lang::$txt['attach_dir_no_delete'];
 								}
 							}
 
 							// Remove it from the base directory list.
-							if (empty($error) && !empty(Config::$modSettings['attachment_basedirectories']))
-							{
+							if (empty($error) && !empty(Config::$modSettings['attachment_basedirectories'])) {
 								unset(Config::$modSettings['attachment_basedirectories'][$id]);
 
-								Config::updateModSettings(array('attachment_basedirectories' => Utils::jsonEncode(Config::$modSettings['attachment_basedirectories'])));
+								Config::updateModSettings(['attachment_basedirectories' => Utils::jsonEncode(Config::$modSettings['attachment_basedirectories'])]);
 
 								Config::$modSettings['attachment_basedirectories'] = Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true);
 							}
-						}
-						else
-						{
+						} else {
 							$error = $path . ': ' . Lang::$txt['attach_dir_no_remove'];
 						}
 
-						if (empty($error))
+						if (empty($error)) {
 							continue;
+						}
 
 						$errors[] = $error;
 					}
@@ -1554,20 +1490,15 @@ public function paths(): void
 			}
 
 			// We need to make sure the current directory is right.
-			if (empty($_POST['current_dir']) && !empty(Config::$modSettings['currentAttachmentUploadDir']))
-			{
+			if (empty($_POST['current_dir']) && !empty(Config::$modSettings['currentAttachmentUploadDir'])) {
 				$_POST['current_dir'] = Config::$modSettings['currentAttachmentUploadDir'];
 			}
 
 			// Find the current directory if there's no value carried,
-			if (empty($_POST['current_dir']) || empty($new_dirs[$_POST['current_dir']]))
-			{
-				if (array_key_exists(Config::$modSettings['currentAttachmentUploadDir'], Config::$modSettings['attachmentUploadDir']))
-				{
+			if (empty($_POST['current_dir']) || empty($new_dirs[$_POST['current_dir']])) {
+				if (array_key_exists(Config::$modSettings['currentAttachmentUploadDir'], Config::$modSettings['attachmentUploadDir'])) {
 					$_POST['current_dir'] = Config::$modSettings['currentAttachmentUploadDir'];
-				}
-				else
-				{
+				} else {
 					$_POST['current_dir'] = max(array_keys(Config::$modSettings['attachmentUploadDir']));
 				}
 			}
@@ -1580,35 +1511,28 @@ public function paths(): void
 					isset(Config::$modSettings['last_attachments_directory'][$_POST['current_dir']])
 					|| isset(Config::$modSettings['last_attachments_directory'][0])
 				)
-			)
-			{
-				if (!is_array(Config::$modSettings['last_attachments_directory']))
-				{
+			) {
+				if (!is_array(Config::$modSettings['last_attachments_directory'])) {
 					Config::$modSettings['last_attachments_directory'] = Utils::jsonDecode(Config::$modSettings['last_attachments_directory'], true);
 				}
 
 				$num = substr(strrchr(Config::$modSettings['attachmentUploadDir'][$_POST['current_dir']], '_'), 1);
 
-				if (is_numeric($num))
-				{
+				if (is_numeric($num)) {
 					// Need to find the base folder.
 					$bid = -1;
 					$use_subdirectories_for_attachments = 0;
 
-					if (!empty(Config::$modSettings['attachment_basedirectories']))
-					{
-						foreach (Config::$modSettings['attachment_basedirectories'] as $bid => $base)
-						{
-							if (strpos(Config::$modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !== false)
-							{
+					if (!empty(Config::$modSettings['attachment_basedirectories'])) {
+						foreach (Config::$modSettings['attachment_basedirectories'] as $bid => $base) {
+							if (strpos(Config::$modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !== false) {
 								$use_subdirectories_for_attachments = 1;
 								break;
 							}
 						}
 					}
 
-					if ($use_subdirectories_for_attachments == 0 && strpos(Config::$modSettings['attachmentUploadDir'][$_POST['current_dir']], Config::$boarddir . DIRECTORY_SEPARATOR) !== false)
-					{
+					if ($use_subdirectories_for_attachments == 0 && strpos(Config::$modSettings['attachmentUploadDir'][$_POST['current_dir']], Config::$boarddir . DIRECTORY_SEPARATOR) !== false) {
 						$bid = 0;
 					}
 
@@ -1618,98 +1542,87 @@ public function paths(): void
 
 					Config::$modSettings['use_subdirectories_for_attachments'] = !empty(Config::$modSettings['use_subdirectories_for_attachments']) ? Config::$modSettings['use_subdirectories_for_attachments'] : 0;
 
-					Config::updateModSettings(array(
+					Config::updateModSettings([
 						'last_attachments_directory' => Utils::jsonEncode(Config::$modSettings['last_attachments_directory']),
 						'basedirectory_for_attachments' => $bid == 0 ? Config::$modSettings['basedirectory_for_attachments'] : Config::$modSettings['attachment_basedirectories'][$bid],
 						'use_subdirectories_for_attachments' => $use_subdirectories_for_attachments,
-					));
+					]);
 				}
 			}
 
 			// Going back to just one path?
-			if (count($new_dirs) == 1)
-			{
+			if (count($new_dirs) == 1) {
 				// We might need to reset the paths. This loop will just loop through once.
-				foreach ($new_dirs as $id => $dir)
-				{
-					if ($id != 1)
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}attachments
+				foreach ($new_dirs as $id => $dir) {
+					if ($id != 1) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}attachments
 							SET id_folder = {int:default_folder}
 							WHERE id_folder = {int:current_folder}',
-							array(
+							[
 								'default_folder' => 1,
 								'current_folder' => $id,
-							)
+							],
 						);
 					}
 
-					$update = array(
+					$update = [
 						'currentAttachmentUploadDir' => 1,
-						'attachmentUploadDir' => Utils::jsonEncode(array(1 => $dir)),
-					);
+						'attachmentUploadDir' => Utils::jsonEncode([1 => $dir]),
+					];
 				}
-			}
-			else
-			{
+			} else {
 				// Save it to the database.
-				$update = array(
+				$update = [
 					'currentAttachmentUploadDir' => $_POST['current_dir'],
 					'attachmentUploadDir' => Utils::jsonEncode($new_dirs),
-				);
+				];
 			}
 
-			if (!empty($update))
+			if (!empty($update)) {
 				Config::updateModSettings($update);
+			}
 
-			if (!empty($errors))
+			if (!empty($errors)) {
 				$_SESSION['errors']['dir'] = $errors;
+			}
 
 			Utils::redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 		}
 
 		// Saving a base directory?
-		if (isset($_REQUEST['save2']))
-		{
+		if (isset($_REQUEST['save2'])) {
 			User::$me->checkSession();
 
 			// Changing the current base directory?
 			$_POST['current_base_dir'] = isset($_POST['current_base_dir']) ? (int) $_POST['current_base_dir'] : 1;
 
-			if (empty($_POST['new_base_dir']) && !empty($_POST['current_base_dir']))
-			{
-				if (Config::$modSettings['basedirectory_for_attachments'] != Config::$modSettings['attachmentUploadDir'][$_POST['current_base_dir']])
-				{
-					$update = array(
+			if (empty($_POST['new_base_dir']) && !empty($_POST['current_base_dir'])) {
+				if (Config::$modSettings['basedirectory_for_attachments'] != Config::$modSettings['attachmentUploadDir'][$_POST['current_base_dir']]) {
+					$update = [
 						'basedirectory_for_attachments' => Config::$modSettings['attachmentUploadDir'][$_POST['current_base_dir']],
-					);
+					];
 				}
 			}
 
-			if (isset($_POST['base_dir']))
-			{
-				foreach ($_POST['base_dir'] as $id => $dir)
-				{
-					if (!empty($dir) && $dir != Config::$modSettings['attachmentUploadDir'][$id])
-					{
-						if (@rename(Config::$modSettings['attachmentUploadDir'][$id], $dir))
-						{
+			if (isset($_POST['base_dir'])) {
+				foreach ($_POST['base_dir'] as $id => $dir) {
+					if (!empty($dir) && $dir != Config::$modSettings['attachmentUploadDir'][$id]) {
+						if (@rename(Config::$modSettings['attachmentUploadDir'][$id], $dir)) {
 							Config::$modSettings['attachmentUploadDir'][$id] = $dir;
 							Config::$modSettings['attachment_basedirectories'][$id] = $dir;
 
-							$update = array(
+							$update = [
 								'attachmentUploadDir' => Utils::jsonEncode(Config::$modSettings['attachmentUploadDir']),
 								'attachment_basedirectories' => Utils::jsonEncode(Config::$modSettings['attachment_basedirectories']),
 								'basedirectory_for_attachments' => Config::$modSettings['attachmentUploadDir'][$_POST['current_base_dir']],
-							);
+							];
 						}
 					}
 
-					if (empty($dir))
-					{
-						if ($id == $_POST['current_base_dir'])
-						{
+					if (empty($dir)) {
+						if ($id == $_POST['current_base_dir']) {
 							$errors[] = Config::$modSettings['attachmentUploadDir'][$id] . ': ' . Lang::$txt['attach_dir_is_current'];
 
 							continue;
@@ -1717,241 +1630,233 @@ public function paths(): void
 
 						unset(Config::$modSettings['attachment_basedirectories'][$id]);
 
-						$update = array(
+						$update = [
 							'attachment_basedirectories' => Utils::jsonEncode(Config::$modSettings['attachment_basedirectories']),
 							'basedirectory_for_attachments' => Config::$modSettings['attachmentUploadDir'][$_POST['current_base_dir']],
-						);
+						];
 					}
 				}
 			}
 
 			// Or adding a new one?
-			if (!empty($_POST['new_base_dir']))
-			{
+			if (!empty($_POST['new_base_dir'])) {
 				$_POST['new_base_dir'] = Utils::htmlspecialchars($_POST['new_base_dir'], ENT_QUOTES);
 
 				$current_dir = Config::$modSettings['currentAttachmentUploadDir'];
 
-				if (!in_array($_POST['new_base_dir'], Config::$modSettings['attachmentUploadDir']))
-				{
-					if (!Attachment::automanageCreateDirectory($_POST['new_base_dir']))
-					{
+				if (!in_array($_POST['new_base_dir'], Config::$modSettings['attachmentUploadDir'])) {
+					if (!Attachment::automanageCreateDirectory($_POST['new_base_dir'])) {
 						$errors[] = $_POST['new_base_dir'] . ': ' . Lang::$txt['attach_dir_base_no_create'];
 					}
 				}
 
 				Config::$modSettings['currentAttachmentUploadDir'] = array_search($_POST['new_base_dir'], Config::$modSettings['attachmentUploadDir']);
 
-				if (!in_array($_POST['new_base_dir'], Config::$modSettings['attachment_basedirectories']))
-				{
+				if (!in_array($_POST['new_base_dir'], Config::$modSettings['attachment_basedirectories'])) {
 					Config::$modSettings['attachment_basedirectories'][Config::$modSettings['currentAttachmentUploadDir']] = $_POST['new_base_dir'];
 				}
 
 				ksort(Config::$modSettings['attachment_basedirectories']);
 
-				$update = array(
+				$update = [
 					'attachment_basedirectories' => Utils::jsonEncode(Config::$modSettings['attachment_basedirectories']),
 					'basedirectory_for_attachments' => $_POST['new_base_dir'],
 					'currentAttachmentUploadDir' => $current_dir,
-				);
+				];
 			}
 
-			if (!empty($errors))
+			if (!empty($errors)) {
 				$_SESSION['errors']['base'] = $errors;
+			}
 
-			if (!empty($update))
+			if (!empty($update)) {
 				Config::updateModSettings($update);
+			}
 
 			Utils::redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 		}
 
-		if (isset($_SESSION['errors']))
-		{
-			if (is_array($_SESSION['errors']))
-			{
-				$errors = array();
+		if (isset($_SESSION['errors'])) {
+			if (is_array($_SESSION['errors'])) {
+				$errors = [];
 
-				if (!empty($_SESSION['errors']['dir']))
-				{
-					foreach ($_SESSION['errors']['dir'] as $error)
+				if (!empty($_SESSION['errors']['dir'])) {
+					foreach ($_SESSION['errors']['dir'] as $error) {
 						$errors['dir'][] = Utils::htmlspecialchars($error, ENT_QUOTES);
+					}
 				}
 
-				if (!empty($_SESSION['errors']['base']))
-				{
-					foreach ($_SESSION['errors']['base'] as $error)
+				if (!empty($_SESSION['errors']['base'])) {
+					foreach ($_SESSION['errors']['base'] as $error) {
 						$errors['base'][] = Utils::htmlspecialchars($error, ENT_QUOTES);
+					}
 				}
 			}
 
 			unset($_SESSION['errors']);
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'attach_paths',
 			'base_href' => Config::$scripturl . '?action=admin;area=manageattachments;sa=attachpaths;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 			'title' => Lang::$txt['attach_paths'],
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getAttachDirs',
-			),
-			'columns' => array(
-				'current_dir' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'current_dir' => [
+					'header' => [
 						'value' => Lang::$txt['attach_current'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="radio" name="current_dir" value="' . $rowData['id'] . '"' . ($rowData['current'] ? ' checked' : '') . (!empty($rowData['disable_current']) ? ' disabled' : '') . '>';
 						},
 						'style' => 'width: 10%;',
 						'class' => 'centercol',
-					),
-				),
-				'path' => array(
-					'header' => array(
+					],
+				],
+				'path' => [
+					'header' => [
 						'value' => Lang::$txt['attach_path'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="hidden" name="dirs[' . $rowData['id'] . ']" value="' . $rowData['path'] . '"><input type="text" size="40" name="dirs[' . $rowData['id'] . ']" value="' . $rowData['path'] . '"' . (!empty($rowData['disable_base_dir']) ? ' disabled' : '') . ' style="width: 100%">';
 						},
 						'style' => 'width: 40%;',
-					),
-				),
-				'current_size' => array(
-					'header' => array(
+					],
+				],
+				'current_size' => [
+					'header' => [
 						'value' => Lang::$txt['attach_current_size'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'current_size',
 						'style' => 'width: 15%;',
-					),
-				),
-				'num_files' => array(
-					'header' => array(
+					],
+				],
+				'num_files' => [
+					'header' => [
 						'value' => Lang::$txt['attach_num_files'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'num_files',
 						'style' => 'width: 15%;',
-					),
-				),
-				'status' => array(
-					'header' => array(
+					],
+				],
+				'status' => [
+					'header' => [
 						'value' => Lang::$txt['attach_dir_status'],
 						'class' => 'centercol',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'status',
 						'style' => 'width: 25%;',
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=manageattachments;sa=attachpaths;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '
 					<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
 					<input type="submit" name="save" value="' . Lang::$txt['save'] . '" class="button">
 					<input type="submit" name="new_path" value="' . Lang::$txt['attach_add_path'] . '" class="button">',
-				),
-				empty($errors['dir']) ? array(
+				],
+				empty($errors['dir']) ? [
 					'position' => 'top_of_list',
 					'value' => Lang::$txt['attach_dir_desc'],
-					'class' => 'information'
-				) : array(
+					'class' => 'information',
+				] : [
 					'position' => 'top_of_list',
 					'value' => Lang::$txt['attach_dir_save_problem'] . '<br>' . implode('<br>', $errors['dir']),
 					'style' => 'padding-left: 35px;',
 					'class' => 'noticebox',
-				),
-			),
-		);
+				],
+			],
+		];
 		new ItemList($listOptions);
 
-		if (!empty(Config::$modSettings['attachment_basedirectories']))
-		{
-			$listOptions2 = array(
+		if (!empty(Config::$modSettings['attachment_basedirectories'])) {
+			$listOptions2 = [
 				'id' => 'base_paths',
 				'base_href' => Config::$scripturl . '?action=admin;area=manageattachments;sa=attachpaths;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 				'title' => Lang::$txt['attach_base_paths'],
-				'get_items' => array(
+				'get_items' => [
 					'function' => __CLASS__ . '::list_getBaseDirs',
-				),
-				'columns' => array(
-					'current_dir' => array(
-						'header' => array(
+				],
+				'columns' => [
+					'current_dir' => [
+						'header' => [
 							'value' => Lang::$txt['attach_current'],
 							'class' => 'centercol',
-						),
-						'data' => array(
-							'function' => function($rowData)
-							{
+						],
+						'data' => [
+							'function' => function ($rowData) {
 								return '<input type="radio" name="current_base_dir" value="' . $rowData['id'] . '"' . ($rowData['current'] ? ' checked' : '') . '>';
 							},
 							'style' => 'width: 10%;',
 							'class' => 'centercol',
-						),
-					),
-					'path' => array(
-						'header' => array(
+						],
+					],
+					'path' => [
+						'header' => [
 							'value' => Lang::$txt['attach_path'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'path',
 							'style' => 'width: 45%;',
 							'class' => 'word_break',
-						),
-					),
-					'num_dirs' => array(
-						'header' => array(
+						],
+					],
+					'num_dirs' => [
+						'header' => [
 							'value' => Lang::$txt['attach_num_dirs'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'num_dirs',
 							'style' => 'width: 15%;',
-						),
-					),
-					'status' => array(
-						'header' => array(
+						],
+					],
+					'status' => [
+						'header' => [
 							'value' => Lang::$txt['attach_dir_status'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'status',
 							'style' => 'width: 15%;',
 							'class' => 'centercol',
-						),
-					),
-				),
-				'form' => array(
+						],
+					],
+				],
+				'form' => [
 					'href' => Config::$scripturl . '?action=admin;area=manageattachments;sa=attachpaths;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-				),
-				'additional_rows' => array(
-					array(
+				],
+				'additional_rows' => [
+					[
 						'position' => 'below_table_data',
 						'value' => '<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '"><input type="submit" name="save2" value="' . Lang::$txt['save'] . '" class="button">
 						<input type="submit" name="new_base_path" value="' . Lang::$txt['attach_add_path'] . '" class="button">',
-					),
-					empty($errors['base']) ? array(
+					],
+					empty($errors['base']) ? [
 						'position' => 'top_of_list',
 						'value' => Lang::$txt['attach_dir_base_desc'],
 						'style' => 'padding: 5px 10px;',
-						'class' => 'windowbg smalltext'
-					) : array(
+						'class' => 'windowbg smalltext',
+					] : [
 						'position' => 'top_of_list',
 						'value' => Lang::$txt['attach_dir_save_problem'] . '<br>' . implode('<br>', $errors['base']),
 						'style' => 'padding-left: 35px',
 						'class' => 'noticebox',
-					),
-				),
-			);
+					],
+				],
+			];
 			new ItemList($listOptions2);
 		}
 
@@ -1968,13 +1873,10 @@ public function transfer(): void
 	{
 		User::$me->checkSession();
 
-		if (!empty(Config::$modSettings['attachment_basedirectories']))
-		{
+		if (!empty(Config::$modSettings['attachment_basedirectories'])) {
 			Config::$modSettings['attachment_basedirectories'] = Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true);
-		}
-		else
-		{
-			Config::$modSettings['basedirectory_for_attachments'] = array();
+		} else {
+			Config::$modSettings['basedirectory_for_attachments'] = [];
 		}
 
 		$_POST['from'] = (int) $_POST['from'];
@@ -1983,65 +1885,65 @@ public function transfer(): void
 		$start = !empty($_POST['empty_it']) ? 0 : Config::$modSettings['attachmentDirFileLimit'];
 		$_SESSION['checked'] = !empty($_POST['empty_it']) ? true : false;
 		$limit = 501;
-		$results = array();
+		$results = [];
 		$dir_files = 0;
 		$current_progress = 0;
 		$total_moved = 0;
 		$total_not_moved = 0;
 
-		if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to'])))
+		if (empty($_POST['from']) || (empty($_POST['auto']) && empty($_POST['to']))) {
 			$results[] = Lang::$txt['attachment_transfer_no_dir'];
+		}
 
-		if ($_POST['from'] == $_POST['to'])
+		if ($_POST['from'] == $_POST['to']) {
 			$results[] = Lang::$txt['attachment_transfer_same_dir'];
+		}
 
-		if (empty($results))
-		{
+		if (empty($results)) {
 			// Get the total file count for the progess bar.
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}attachments
 				WHERE id_folder = {int:folder_id}
 					AND attachment_type != {int:attachment_type}',
-				array(
+				[
 					'folder_id' => $_POST['from'],
 					'attachment_type' => 1,
-				)
+				],
 			);
-			list ($total_progress) = Db::$db->fetch_row($request);
+			list($total_progress) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 			$total_progress -= $start;
 
-			if ($total_progress < 1)
+			if ($total_progress < 1) {
 				$results[] = Lang::$txt['attachment_transfer_no_find'];
+			}
 		}
 
-		if (empty($results))
-		{
+		if (empty($results)) {
 			// Where are they going?
-			if (!empty($_POST['auto']))
-			{
+			if (!empty($_POST['auto'])) {
 				Config::$modSettings['automanage_attachments'] = 1;
 				Config::$modSettings['use_subdirectories_for_attachments'] = $_POST['auto'] == -1 ? 0 : 1;
 				Config::$modSettings['basedirectory_for_attachments'] = $_POST['auto'] > 0 ? Config::$modSettings['attachmentUploadDir'][$_POST['auto']] : Config::$modSettings['basedirectory_for_attachments'];
 
 				Attachment::automanageCheckDirectory();
 				$new_dir = Config::$modSettings['currentAttachmentUploadDir'];
-			}
-			else
-			{
+			} else {
 				$new_dir = $_POST['to'];
 			}
 
 			Config::$modSettings['currentAttachmentUploadDir'] = $new_dir;
 
 			$break = false;
-			while ($break == false)
-			{
+
+			while ($break == false) {
 				@set_time_limit(300);
 
-				if (function_exists('apache_reset_timeout'))
+				if (function_exists('apache_reset_timeout')) {
 					@apache_reset_timeout();
+				}
 
 				// If limits are set, get the file count and size for the destination folder
 				if (
@@ -2050,58 +1952,58 @@ public function transfer(): void
 						!empty(Config::$modSettings['attachmentDirSizeLimit'])
 						|| !empty(Config::$modSettings['attachmentDirFileLimit'])
 					)
-				)
-				{
-					$request = Db::$db->query('', '
-						SELECT COUNT(*), SUM(size)
+				) {
+					$request = Db::$db->query(
+						'',
+						'SELECT COUNT(*), SUM(size)
 						FROM {db_prefix}attachments
 						WHERE id_folder = {int:folder_id}
 							AND attachment_type != {int:attachment_type}',
-						array(
+						[
 							'folder_id' => $new_dir,
 							'attachment_type' => 1,
-						)
+						],
 					);
-					list ($dir_files, $dir_size) = Db::$db->fetch_row($request);
+					list($dir_files, $dir_size) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 				}
 
 				// Find some attachments to move
-				$request = Db::$db->query('', '
-					SELECT id_attach, filename, id_folder, file_hash, size
+				$request = Db::$db->query(
+					'',
+					'SELECT id_attach, filename, id_folder, file_hash, size
 					FROM {db_prefix}attachments
 					WHERE id_folder = {int:folder}
 						AND attachment_type != {int:attachment_type}
 					LIMIT {int:start}, {int:limit}',
-					array(
+					[
 						'folder' => $_POST['from'],
 						'attachment_type' => 1,
 						'start' => $start,
 						'limit' => $limit,
-					)
+					],
 				);
 
-				if (Db::$db->num_rows($request) === 0)
-				{
-					if (empty($current_progress))
+				if (Db::$db->num_rows($request) === 0) {
+					if (empty($current_progress)) {
 						$results[] = Lang::$txt['attachment_transfer_no_find'];
-
+					}
 					break;
 				}
 
-				if (Db::$db->num_rows($request) < $limit)
+				if (Db::$db->num_rows($request) < $limit) {
 					$break = true;
+				}
 
 				// Move them
-				$moved = array();
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+				$moved = [];
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$source = Attachment::getFilePath($row['id_attach']);
 					$dest = Config::$modSettings['attachmentUploadDir'][$new_dir] . '/' . basename($source);
 
 					// Size and file count check
-					if (!empty(Config::$modSettings['attachmentDirSizeLimit']) || !empty(Config::$modSettings['attachmentDirFileLimit']))
-					{
+					if (!empty(Config::$modSettings['attachmentDirSizeLimit']) || !empty(Config::$modSettings['attachmentDirFileLimit'])) {
 						$dir_files++;
 						$dir_size += !empty($row['size']) ? $row['size'] : filesize($source);
 
@@ -2113,17 +2015,14 @@ public function transfer(): void
 								!empty(Config::$modSettings['attachmentDirFileLimit'])
 								&& $dir_files > Config::$modSettings['attachmentDirFileLimit']
 							)
-						)
-						{
-							if (!empty($_POST['auto']))
-							{
+						) {
+							if (!empty($_POST['auto'])) {
 								// Since we're in auto mode. Create a new folder and reset the counters.
 								Attachment::automanageBySpace();
 
 								$results[] = sprintf(Lang::$txt['attachments_transferred'], $total_moved, Config::$modSettings['attachmentUploadDir'][$new_dir]);
 
-								if (!empty($total_not_moved))
-								{
+								if (!empty($total_not_moved)) {
 									$results[] = sprintf(Lang::$txt['attachments_not_transferred'], $total_not_moved);
 								}
 
@@ -2132,50 +2031,46 @@ public function transfer(): void
 								$total_not_moved = 0;
 
 								$break = false;
+
 								break;
 							}
-							else
-							{
-								// Hmm, not in auto. Time to bail out then...
-								$results[] = Lang::$txt['attachment_transfer_no_room'];
-								$break = true;
-								break;
-							}
+
+							// Hmm, not in auto. Time to bail out then...
+							$results[] = Lang::$txt['attachment_transfer_no_room'];
+							$break = true;
+
+							break;
 						}
 					}
 
-					if (@rename($source, $dest))
-					{
+					if (@rename($source, $dest)) {
 						$total_moved++;
 						$current_progress++;
 						$moved[] = $row['id_attach'];
-					}
-					else
-					{
+					} else {
 						$total_not_moved++;
 					}
 				}
 				Db::$db->free_result($request);
 
-				if (!empty($moved))
-				{
+				if (!empty($moved)) {
 					// Update the database
-					Db::$db->query('', '
-						UPDATE {db_prefix}attachments
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}attachments
 						SET id_folder = {int:new}
 						WHERE id_attach IN ({array_int:attachments})',
-						array(
+						[
 							'attachments' => $moved,
 							'new' => $new_dir,
-						)
+						],
 					);
 				}
 
 				$new_dir = Config::$modSettings['currentAttachmentUploadDir'];
 
 				// Create the progress bar.
-				if (!$break)
-				{
+				if (!$break) {
 					$percent_done = min(round($current_progress / $total_progress * 100, 0), 100);
 
 					$prog_bar = '
@@ -2185,7 +2080,7 @@ public function transfer(): void
 						</div>';
 
 					// Write it to a file so it can be displayed
-					$fp = fopen(Config::$boarddir . '/progress.php', "w");
+					$fp = fopen(Config::$boarddir . '/progress.php', 'w');
 					fwrite($fp, $prog_bar);
 					fclose($fp);
 					usleep(500000);
@@ -2194,14 +2089,16 @@ public function transfer(): void
 
 			$results[] = sprintf(Lang::$txt['attachments_transferred'], $total_moved, Config::$modSettings['attachmentUploadDir'][$new_dir]);
 
-			if (!empty($total_not_moved))
+			if (!empty($total_not_moved)) {
 				$results[] = sprintf(Lang::$txt['attachments_not_transferred'], $total_not_moved);
+			}
 		}
 
 		$_SESSION['results'] = $results;
 
-		if (file_exists(Config::$boarddir . '/progress.php'))
+		if (file_exists(Config::$boarddir . '/progress.php')) {
 			unlink(Config::$boarddir . '/progress.php');
+		}
 
 		Utils::redirectexit('action=admin;area=manageattachments;sa=maintenance#transfer');
 	}
@@ -2217,8 +2114,9 @@ public function transfer(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -2241,27 +2139,19 @@ public static function attachConfigVars(): array
 		Utils::$context['attachmentUploadDir'] = Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']];
 
 		// If not set, show a default path for the base directory
-		if (!isset($_GET['save']) && empty(Config::$modSettings['basedirectory_for_attachments']))
-		{
-			if (is_dir(Config::$modSettings['attachmentUploadDir'][1]))
-			{
+		if (!isset($_GET['save']) && empty(Config::$modSettings['basedirectory_for_attachments'])) {
+			if (is_dir(Config::$modSettings['attachmentUploadDir'][1])) {
 				Config::$modSettings['basedirectory_for_attachments'] = Config::$modSettings['attachmentUploadDir'][1];
-			}
-			else
-			{
+			} else {
 				Config::$modSettings['basedirectory_for_attachments'] = Utils::$context['attachmentUploadDir'];
 			}
 		}
 
 		Utils::$context['valid_upload_dir'] = is_dir(Utils::$context['attachmentUploadDir']) && is_writable(Utils::$context['attachmentUploadDir']);
 
-		if (!empty(Config::$modSettings['automanage_attachments']))
-		{
+		if (!empty(Config::$modSettings['automanage_attachments'])) {
 			Utils::$context['valid_basedirectory'] = !empty(Config::$modSettings['basedirectory_for_attachments']) && is_writable(Config::$modSettings['basedirectory_for_attachments']);
-		}
-
-		else
-		{
+		} else {
 			Utils::$context['valid_basedirectory'] = true;
 		}
 
@@ -2272,12 +2162,11 @@ public static function attachConfigVars(): array
 			empty(Config::$modSettings['attachment_basedirectories'])
 			&& Config::$modSettings['currentAttachmentUploadDir'] == 1
 			&& count(Config::$modSettings['attachmentUploadDir']) == 1
-		)
-		{
+		) {
 			Lang::$txt['attachmentUploadDir_path'] = Config::$modSettings['attachmentUploadDir'][1];
 		}
 
-		Lang::$txt['basedirectory_for_attachments_path'] = isset(Config::$modSettings['basedirectory_for_attachments']) ? Config::$modSettings['basedirectory_for_attachments'] : '';
+		Lang::$txt['basedirectory_for_attachments_path'] = Config::$modSettings['basedirectory_for_attachments'] ?? '';
 
 		Lang::$txt['use_subdirectories_for_attachments_note'] = empty(Config::$modSettings['attachment_basedirectories']) || empty(Config::$modSettings['use_subdirectories_for_attachments']) ? Lang::$txt['use_subdirectories_for_attachments_note'] : '';
 
@@ -2296,56 +2185,56 @@ public static function attachConfigVars(): array
 		$post_max_kb = floor(Config::memoryReturnBytes(ini_get('post_max_size')) / 1024);
 		$file_max_kb = floor(Config::memoryReturnBytes(ini_get('upload_max_filesize')) / 1024);
 
-		$config_vars = array(
-			array('title', 'attachment_manager_settings'),
+		$config_vars = [
+			['title', 'attachment_manager_settings'],
 			// Are attachments enabled?
-			array('select', 'attachmentEnable', array(Lang::$txt['attachmentEnable_deactivate'], Lang::$txt['attachmentEnable_enable_all'], Lang::$txt['attachmentEnable_disable_new'])),
+			['select', 'attachmentEnable', [Lang::$txt['attachmentEnable_deactivate'], Lang::$txt['attachmentEnable_enable_all'], Lang::$txt['attachmentEnable_disable_new']]],
 			'',
 
 			// Directory and size limits.
-			array('select', 'automanage_attachments', array(0 => Lang::$txt['attachments_normal'], 1 => Lang::$txt['attachments_auto_space'], 2 => Lang::$txt['attachments_auto_years'], 3 => Lang::$txt['attachments_auto_months'], 4 => Lang::$txt['attachments_auto_16'])),
-			array('check', 'use_subdirectories_for_attachments', 'subtext' => Lang::$txt['use_subdirectories_for_attachments_note']),
-			(empty(Config::$modSettings['attachment_basedirectories']) ? array('text', 'basedirectory_for_attachments', 40,) : array('var_message', 'basedirectory_for_attachments', 'message' => 'basedirectory_for_attachments_path', 'invalid' => empty(Utils::$context['valid_basedirectory']), 'text_label' => (!empty(Utils::$context['valid_basedirectory']) ? Lang::$txt['basedirectory_for_attachments_current'] : sprintf(Lang::$txt['basedirectory_for_attachments_warning'], Config::$scripturl)))),
-			empty(Config::$modSettings['attachment_basedirectories']) && Config::$modSettings['currentAttachmentUploadDir'] == 1 && count(Config::$modSettings['attachmentUploadDir']) == 1 ? array('var_message', 'attachmentUploadDir_path', 'subtext' => Lang::$txt['attachmentUploadDir_multiple_configure'], 40, 'invalid' => !Utils::$context['valid_upload_dir'], 'text_label' => Lang::$txt['attachmentUploadDir'], 'message' => 'attachmentUploadDir_path') : array('var_message', 'attach_current_directory', 'subtext' => Lang::$txt['attachmentUploadDir_multiple_configure'], 'message' => 'attachment_path', 'invalid' => empty(Utils::$context['valid_upload_dir']), 'text_label' => (!empty(Utils::$context['valid_upload_dir']) ? Lang::$txt['attach_current_dir'] : sprintf(Lang::$txt['attach_current_dir_warning'], Config::$scripturl))),
-			array('int', 'attachmentDirFileLimit', 'subtext' => Lang::$txt['zero_for_no_limit'], 6),
-			array('int', 'attachmentDirSizeLimit', 'subtext' => Lang::$txt['zero_for_no_limit'], 6, 'postinput' => Lang::$txt['kilobyte']),
-			array('check', 'dont_show_attach_under_post', 'subtext' => Lang::$txt['dont_show_attach_under_post_sub']),
+			['select', 'automanage_attachments', [0 => Lang::$txt['attachments_normal'], 1 => Lang::$txt['attachments_auto_space'], 2 => Lang::$txt['attachments_auto_years'], 3 => Lang::$txt['attachments_auto_months'], 4 => Lang::$txt['attachments_auto_16']]],
+			['check', 'use_subdirectories_for_attachments', 'subtext' => Lang::$txt['use_subdirectories_for_attachments_note']],
+			(empty(Config::$modSettings['attachment_basedirectories']) ? ['text', 'basedirectory_for_attachments', 40] : ['var_message', 'basedirectory_for_attachments', 'message' => 'basedirectory_for_attachments_path', 'invalid' => empty(Utils::$context['valid_basedirectory']), 'text_label' => (!empty(Utils::$context['valid_basedirectory']) ? Lang::$txt['basedirectory_for_attachments_current'] : sprintf(Lang::$txt['basedirectory_for_attachments_warning'], Config::$scripturl))]),
+			empty(Config::$modSettings['attachment_basedirectories']) && Config::$modSettings['currentAttachmentUploadDir'] == 1 && count(Config::$modSettings['attachmentUploadDir']) == 1 ? ['var_message', 'attachmentUploadDir_path', 'subtext' => Lang::$txt['attachmentUploadDir_multiple_configure'], 40, 'invalid' => !Utils::$context['valid_upload_dir'], 'text_label' => Lang::$txt['attachmentUploadDir'], 'message' => 'attachmentUploadDir_path'] : ['var_message', 'attach_current_directory', 'subtext' => Lang::$txt['attachmentUploadDir_multiple_configure'], 'message' => 'attachment_path', 'invalid' => empty(Utils::$context['valid_upload_dir']), 'text_label' => (!empty(Utils::$context['valid_upload_dir']) ? Lang::$txt['attach_current_dir'] : sprintf(Lang::$txt['attach_current_dir_warning'], Config::$scripturl))],
+			['int', 'attachmentDirFileLimit', 'subtext' => Lang::$txt['zero_for_no_limit'], 6],
+			['int', 'attachmentDirSizeLimit', 'subtext' => Lang::$txt['zero_for_no_limit'], 6, 'postinput' => Lang::$txt['kilobyte']],
+			['check', 'dont_show_attach_under_post', 'subtext' => Lang::$txt['dont_show_attach_under_post_sub']],
 			'',
 
 			// Posting limits
-			array('int', 'attachmentPostLimit', 'subtext' => sprintf(Lang::$txt['attachment_ini_max'], $post_max_kb . ' ' . Lang::$txt['kilobyte']), 6, 'postinput' => Lang::$txt['kilobyte'], 'min' => 1, 'max' => $post_max_kb, 'disabled' => empty($post_max_kb)),
-			array('int', 'attachmentSizeLimit', 'subtext' => sprintf(Lang::$txt['attachment_ini_max'], $file_max_kb . ' ' . Lang::$txt['kilobyte']), 6, 'postinput' => Lang::$txt['kilobyte'], 'min' => 1, 'max' => $file_max_kb, 'disabled' => empty($file_max_kb)),
-			array('int', 'attachmentNumPerPostLimit', 'subtext' => Lang::$txt['zero_for_no_limit'], 6, 'min' => 0),
+			['int', 'attachmentPostLimit', 'subtext' => sprintf(Lang::$txt['attachment_ini_max'], $post_max_kb . ' ' . Lang::$txt['kilobyte']), 6, 'postinput' => Lang::$txt['kilobyte'], 'min' => 1, 'max' => $post_max_kb, 'disabled' => empty($post_max_kb)],
+			['int', 'attachmentSizeLimit', 'subtext' => sprintf(Lang::$txt['attachment_ini_max'], $file_max_kb . ' ' . Lang::$txt['kilobyte']), 6, 'postinput' => Lang::$txt['kilobyte'], 'min' => 1, 'max' => $file_max_kb, 'disabled' => empty($file_max_kb)],
+			['int', 'attachmentNumPerPostLimit', 'subtext' => Lang::$txt['zero_for_no_limit'], 6, 'min' => 0],
 			// Security Items
-			array('title', 'attachment_security_settings'),
+			['title', 'attachment_security_settings'],
 			// Extension checks etc.
-			array('check', 'attachmentCheckExtensions'),
-			array('text', 'attachmentExtensions', 40),
+			['check', 'attachmentCheckExtensions'],
+			['text', 'attachmentExtensions', 40],
 			'',
 
 			// Image checks.
-			array('warning', empty($testImg) ? 'attachment_img_enc_warning' : ''),
-			array('check', 'attachment_image_reencode'),
+			['warning', empty($testImg) ? 'attachment_img_enc_warning' : ''],
+			['check', 'attachment_image_reencode'],
 			'',
 
-			array('warning', 'attachment_image_paranoid_warning'),
-			array('check', 'attachment_image_paranoid'),
+			['warning', 'attachment_image_paranoid_warning'],
+			['check', 'attachment_image_paranoid'],
 			// Thumbnail settings.
-			array('title', 'attachment_thumbnail_settings'),
-			array('check', 'attachmentShowImages'),
-			array('check', 'attachmentThumbnails'),
-			array('check', 'attachment_thumb_png'),
-			array('check', 'attachment_thumb_memory'),
-			array('warning', 'attachment_thumb_memory_note'),
-			array('text', 'attachmentThumbWidth', 6),
-			array('text', 'attachmentThumbHeight', 6),
+			['title', 'attachment_thumbnail_settings'],
+			['check', 'attachmentShowImages'],
+			['check', 'attachmentThumbnails'],
+			['check', 'attachment_thumb_png'],
+			['check', 'attachment_thumb_memory'],
+			['warning', 'attachment_thumb_memory_note'],
+			['text', 'attachmentThumbWidth', 6],
+			['text', 'attachmentThumbHeight', 6],
 			'',
 
-			array('int', 'max_image_width', 'subtext' => Lang::$txt['zero_for_no_limit']),
-			array('int', 'max_image_height', 'subtext' => Lang::$txt['zero_for_no_limit']),
-		);
+			['int', 'max_image_width', 'subtext' => Lang::$txt['zero_for_no_limit']],
+			['int', 'max_image_height', 'subtext' => Lang::$txt['zero_for_no_limit']],
+		];
 
-		IntegrationHook::call('integrate_modify_attachment_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_attachment_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -2363,72 +2252,72 @@ public static function avatarConfigVars(): array
 		Utils::$context['valid_avatar_dir'] = is_dir(Config::$modSettings['avatar_directory']);
 		Utils::$context['valid_custom_avatar_dir'] = !empty(Config::$modSettings['custom_avatar_dir']) && is_dir(Config::$modSettings['custom_avatar_dir']) && is_writable(Config::$modSettings['custom_avatar_dir']);
 
-		$config_vars = array(
+		$config_vars = [
 			// Server stored avatars!
-			array('title', 'avatar_server_stored'),
-			array('warning', empty($testImg) ? 'avatar_img_enc_warning' : ''),
-			array('permissions', 'profile_server_avatar', 0, Lang::$txt['avatar_server_stored_groups']),
-			array('warning', !Utils::$context['valid_avatar_dir'] ? 'avatar_directory_wrong' : ''),
-			array('text', 'avatar_directory', 40, 'invalid' => !Utils::$context['valid_avatar_dir']),
-			array('text', 'avatar_url', 40),
+			['title', 'avatar_server_stored'],
+			['warning', empty($testImg) ? 'avatar_img_enc_warning' : ''],
+			['permissions', 'profile_server_avatar', 0, Lang::$txt['avatar_server_stored_groups']],
+			['warning', !Utils::$context['valid_avatar_dir'] ? 'avatar_directory_wrong' : ''],
+			['text', 'avatar_directory', 40, 'invalid' => !Utils::$context['valid_avatar_dir']],
+			['text', 'avatar_url', 40],
 			// External avatars?
-			array('title', 'avatar_external'),
-			array('permissions', 'profile_remote_avatar', 0, Lang::$txt['avatar_external_url_groups']),
-			array('check', 'avatar_download_external', 0, 'onchange' => 'fUpdateStatus();'),
-			array('text', 'avatar_max_width_external', 'subtext' => Lang::$txt['zero_for_no_limit'], 6),
-			array('text', 'avatar_max_height_external', 'subtext' => Lang::$txt['zero_for_no_limit'], 6),
-			array('select', 'avatar_action_too_large',
-				array(
+			['title', 'avatar_external'],
+			['permissions', 'profile_remote_avatar', 0, Lang::$txt['avatar_external_url_groups']],
+			['check', 'avatar_download_external', 0, 'onchange' => 'fUpdateStatus();'],
+			['text', 'avatar_max_width_external', 'subtext' => Lang::$txt['zero_for_no_limit'], 6],
+			['text', 'avatar_max_height_external', 'subtext' => Lang::$txt['zero_for_no_limit'], 6],
+			['select', 'avatar_action_too_large',
+				[
 					'option_refuse' => Lang::$txt['option_refuse'],
 					'option_css_resize' => Lang::$txt['option_css_resize'],
 					'option_download_and_resize' => Lang::$txt['option_download_and_resize'],
-				),
-			),
+				],
+			],
 			// Uploadable avatars?
-			array('title', 'avatar_upload'),
-			array('permissions', 'profile_upload_avatar', 0, Lang::$txt['avatar_upload_groups']),
-			array('text', 'avatar_max_width_upload', 'subtext' => Lang::$txt['zero_for_no_limit'], 6),
-			array('text', 'avatar_max_height_upload', 'subtext' => Lang::$txt['zero_for_no_limit'], 6),
-			array('check', 'avatar_resize_upload', 'subtext' => Lang::$txt['avatar_resize_upload_note']),
-			array('check', 'avatar_download_png'),
-			array('check', 'avatar_reencode'),
+			['title', 'avatar_upload'],
+			['permissions', 'profile_upload_avatar', 0, Lang::$txt['avatar_upload_groups']],
+			['text', 'avatar_max_width_upload', 'subtext' => Lang::$txt['zero_for_no_limit'], 6],
+			['text', 'avatar_max_height_upload', 'subtext' => Lang::$txt['zero_for_no_limit'], 6],
+			['check', 'avatar_resize_upload', 'subtext' => Lang::$txt['avatar_resize_upload_note']],
+			['check', 'avatar_download_png'],
+			['check', 'avatar_reencode'],
 			'',
 
-			array('warning', 'avatar_paranoid_warning'),
-			array('check', 'avatar_paranoid'),
+			['warning', 'avatar_paranoid_warning'],
+			['check', 'avatar_paranoid'],
 			'',
 
-			array('warning', !Utils::$context['valid_custom_avatar_dir'] ? 'custom_avatar_dir_wrong' : ''),
-			array('text', 'custom_avatar_dir', 40, 'subtext' => Lang::$txt['custom_avatar_dir_desc'], 'invalid' => !Utils::$context['valid_custom_avatar_dir']),
-			array('text', 'custom_avatar_url', 40),
+			['warning', !Utils::$context['valid_custom_avatar_dir'] ? 'custom_avatar_dir_wrong' : ''],
+			['text', 'custom_avatar_dir', 40, 'subtext' => Lang::$txt['custom_avatar_dir_desc'], 'invalid' => !Utils::$context['valid_custom_avatar_dir']],
+			['text', 'custom_avatar_url', 40],
 			// Grvatars?
-			array('title', 'gravatar_settings'),
-			array('check', 'gravatarEnabled'),
-			array('check', 'gravatarOverride'),
-			array('check', 'gravatarAllowExtraEmail'),
+			['title', 'gravatar_settings'],
+			['check', 'gravatarEnabled'],
+			['check', 'gravatarOverride'],
+			['check', 'gravatarAllowExtraEmail'],
 			'',
 
-			array('select', 'gravatarMaxRating',
-				array(
+			['select', 'gravatarMaxRating',
+				[
 					'G' => Lang::$txt['gravatar_maxG'],
 					'PG' => Lang::$txt['gravatar_maxPG'],
 					'R' => Lang::$txt['gravatar_maxR'],
 					'X' => Lang::$txt['gravatar_maxX'],
-				),
-			),
-			array('select', 'gravatarDefault',
-				array(
+				],
+			],
+			['select', 'gravatarDefault',
+				[
 					'mm' => Lang::$txt['gravatar_mm'],
 					'identicon' => Lang::$txt['gravatar_identicon'],
 					'monsterid' => Lang::$txt['gravatar_monsterid'],
 					'wavatar' => Lang::$txt['gravatar_wavatar'],
 					'retro' => Lang::$txt['gravatar_retro'],
 					'blank' => Lang::$txt['gravatar_blank'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_modify_avatar_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_avatar_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -2445,13 +2334,13 @@ public static function avatarConfigVars(): array
 	 */
 	public static function list_getFiles($start, $items_per_page, $sort, $browse_type): array
 	{
-		$files = array();
+		$files = [];
 
 		// Choose a query depending on what we are viewing.
-		if ($browse_type === 'avatars')
-		{
-			$request = Db::$db->query('', '
-				SELECT
+		if ($browse_type === 'avatars') {
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					{string:blank_text} AS id_msg, COALESCE(mem.real_name, {string:not_applicable_text}) AS poster_name,
 					mem.last_login AS poster_time, 0 AS id_topic, a.id_member, a.id_attach, a.filename, a.file_hash, a.attachment_type,
 					a.size, a.width, a.height, a.downloads, {string:blank_text} AS subject, 0 AS id_board
@@ -2460,20 +2349,19 @@ public static function list_getFiles($start, $items_per_page, $sort, $browse_typ
 				WHERE a.id_member != {int:guest_id}
 				ORDER BY {raw:sort}
 				LIMIT {int:start}, {int:per_page}',
-				array(
+				[
 					'guest_id' => 0,
 					'blank_text' => '',
 					'not_applicable_text' => Lang::$txt['not_applicable'],
 					'sort' => $sort,
 					'start' => $start,
 					'per_page' => $items_per_page,
-				)
+				],
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					m.id_msg, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.id_topic, m.id_member,
 					a.id_attach, a.filename, a.file_hash, a.attachment_type, a.size, a.width, a.height, a.downloads, mf.subject, t.id_board
 				FROM {db_prefix}attachments AS a
@@ -2485,17 +2373,17 @@ public static function list_getFiles($start, $items_per_page, $sort, $browse_typ
 					AND a.id_member = {int:guest_id_member}
 				ORDER BY {raw:sort}
 				LIMIT {int:start}, {int:per_page}',
-				array(
+				[
 					'attachment_type' => $browse_type == 'thumbs' ? '3' : '0',
 					'guest_id_member' => 0,
 					'sort' => $sort,
 					'start' => $start,
 					'per_page' => $items_per_page,
-				)
+				],
 			);
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$files[] = $row;
 		}
 		Db::$db->free_result($request);
@@ -2513,34 +2401,33 @@ public static function list_getFiles($start, $items_per_page, $sort, $browse_typ
 	public static function list_getNumFiles($browse_type): int
 	{
 		// Depending on the type of file, different queries are used.
-		if ($browse_type === 'avatars')
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		if ($browse_type === 'avatars') {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}attachments
 				WHERE id_member != {int:guest_id_member}',
-				array(
+				[
 					'guest_id_member' => 0,
-				)
+				],
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*) AS num_attach
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*) AS num_attach
 				FROM {db_prefix}attachments AS a
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 					INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)
 				WHERE a.attachment_type = {int:attachment_type}
 					AND a.id_member = {int:guest_id_member}',
-				array(
+				[
 					'attachment_type' => $browse_type === 'thumbs' ? '3' : '0',
 					'guest_id_member' => 0,
-				)
+				],
 			);
 		}
-		list ($num_files) = Db::$db->fetch_row($request);
+		list($num_files) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $num_files;
@@ -2553,31 +2440,33 @@ public static function list_getNumFiles($browse_type): int
 	 */
 	public static function list_getAttachDirs(): array
 	{
-		$expected_files = array();
-		$expected_size = array();
+		$expected_files = [];
+		$expected_size = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_folder, COUNT(id_attach) AS num_attach, SUM(size) AS size_attach
+		$request = Db::$db->query(
+			'',
+			'SELECT id_folder, COUNT(id_attach) AS num_attach, SUM(size) AS size_attach
 			FROM {db_prefix}attachments
 			WHERE attachment_type != {int:type}
 			GROUP BY id_folder',
-			array(
+			[
 				'type' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$expected_files[$row['id_folder']] = $row['num_attach'];
 			$expected_size[$row['id_folder']] = $row['size_attach'];
 		}
 		Db::$db->free_result($request);
 
-		$attachdirs = array();
-		foreach (Config::$modSettings['attachmentUploadDir'] as $id => $dir)
-		{
+		$attachdirs = [];
+
+		foreach (Config::$modSettings['attachmentUploadDir'] as $id => $dir) {
 			// If there aren't any attachments in this directory this won't exist.
-			if (!isset($expected_files[$id]))
+			if (!isset($expected_files[$id])) {
 				$expected_files[$id] = 0;
+			}
 
 			// Check if the directory is doing okay.
 			list($status, $error, $files) = attachDirStatus($dir, $expected_files[$id]);
@@ -2585,22 +2474,20 @@ public static function list_getAttachDirs(): array
 			// If it is one, let's show that it's a base directory.
 			$sub_dirs = 0;
 			$is_base_dir = false;
-			if (!empty(Config::$modSettings['attachment_basedirectories']))
-			{
+
+			if (!empty(Config::$modSettings['attachment_basedirectories'])) {
 				$is_base_dir = in_array($dir, Config::$modSettings['attachment_basedirectories']);
 
 				// Count any sub-folders.
-				foreach (Config::$modSettings['attachmentUploadDir'] as $sid => $sub)
-				{
-					if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
-					{
+				foreach (Config::$modSettings['attachmentUploadDir'] as $sid => $sub) {
+					if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false) {
 						$expected_files[$id]++;
 						$sub_dirs++;
 					}
 				}
 			}
 
-			$attachdirs[] = array(
+			$attachdirs[] = [
 				'id' => $id,
 				'current' => $id == Config::$modSettings['currentAttachmentUploadDir'],
 				'disable_current' => isset(Config::$modSettings['automanage_attachments']) && Config::$modSettings['automanage_attachments'] > 1,
@@ -2609,20 +2496,19 @@ public static function list_getAttachDirs(): array
 				'current_size' => !empty($expected_size[$id]) ? Lang::numberFormat($expected_size[$id] / 1024, 0) : 0,
 				'num_files' => Lang::numberFormat($expected_files[$id] - $sub_dirs, 0) . ($sub_dirs > 0 ? ' (' . $sub_dirs . ')' : ''),
 				'status' => ($is_base_dir ? Lang::$txt['attach_dir_basedir'] . '<br>' : '') . ($error ? '<div class="error">' : '') . sprintf(Lang::$txt['attach_dir_' . $status], Utils::$context['session_id'], Utils::$context['session_var'], Config::$scripturl) . ($error ? '</div>' : ''),
-			);
+			];
 		}
 
 		// Just stick a new directory on at the bottom.
-		if (isset($_REQUEST['new_path']))
-		{
-			$attachdirs[] = array(
+		if (isset($_REQUEST['new_path'])) {
+			$attachdirs[] = [
 				'id' => max(array_merge(array_keys($expected_files), array_keys(Config::$modSettings['attachmentUploadDir']))) + 1,
 				'current' => false,
 				'path' => '',
 				'current_size' => '',
 				'num_files' => '',
 				'status' => '',
-			);
+			];
 		}
 
 		return $attachdirs;
@@ -2635,54 +2521,48 @@ public static function list_getAttachDirs(): array
 	 */
 	public static function list_getBaseDirs(): array
 	{
-		if (empty(Config::$modSettings['attachment_basedirectories']))
-			return array();
+		if (empty(Config::$modSettings['attachment_basedirectories'])) {
+			return [];
+		}
 
-		$basedirs = array();
+		$basedirs = [];
 
 		// Get a list of the base directories.
-		foreach (Config::$modSettings['attachment_basedirectories'] as $id => $dir)
-		{
+		foreach (Config::$modSettings['attachment_basedirectories'] as $id => $dir) {
 			// Loop through the attach directory array to count any sub-directories
 			$expected_dirs = 0;
 
-			foreach (Config::$modSettings['attachmentUploadDir'] as $sid => $sub)
-			{
-				if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false)
+			foreach (Config::$modSettings['attachmentUploadDir'] as $sid => $sub) {
+				if (strpos($sub, $dir . DIRECTORY_SEPARATOR) !== false) {
 					$expected_dirs++;
+				}
 			}
 
-			if (!is_dir($dir))
-			{
+			if (!is_dir($dir)) {
 				$status = 'does_not_exist';
-			}
-			elseif (!is_writeable($dir))
-			{
+			} elseif (!is_writeable($dir)) {
 				$status = 'not_writable';
-			}
-			else
-			{
+			} else {
 				$status = 'ok';
 			}
 
-			$basedirs[] = array(
+			$basedirs[] = [
 				'id' => $id,
 				'current' => $dir == Config::$modSettings['basedirectory_for_attachments'],
 				'path' => $expected_dirs > 0 ? $dir : ('<input type="text" name="base_dir[' . $id . ']" value="' . $dir . '" size="40">'),
 				'num_dirs' => $expected_dirs,
 				'status' => $status == 'ok' ? Lang::$txt['attach_dir_ok'] : ('<span class="error">' . Lang::$txt['attach_dir_' . $status] . '</span>'),
-			);
+			];
 		}
 
-		if (isset($_REQUEST['new_base_path']))
-		{
-			$basedirs[] = array(
+		if (isset($_REQUEST['new_base_path'])) {
+			$basedirs[] = [
 				'id' => '',
 				'current' => false,
 				'path' => '<input type="text" name="new_base_dir" value="" size="40">',
 				'num_dirs' => '',
 				'status' => '',
-			);
+			];
 		}
 
 		return $basedirs;
@@ -2699,36 +2579,40 @@ public static function list_getBaseDirs(): array
 	 */
 	public static function attachDirStatus($dir, $expected_files): array
 	{
-		if (!is_dir($dir))
-			return array('does_not_exist', true, '');
+		if (!is_dir($dir)) {
+			return ['does_not_exist', true, ''];
+		}
 
-		if (!is_writable($dir))
-			return array('not_writable', true, '');
+		if (!is_writable($dir)) {
+			return ['not_writable', true, ''];
+		}
 
 		// Everything is okay so far, start to scan through the directory.
 		$num_files = 0;
 		$dir_handle = dir($dir);
 
-		while ($file = $dir_handle->read())
-		{
+		while ($file = $dir_handle->read()) {
 			// Now do we have a real file here?
-			if (in_array($file, array('.', '..', '.htaccess', 'index.php')))
+			if (in_array($file, ['.', '..', '.htaccess', 'index.php'])) {
 				continue;
+			}
 
 			$num_files++;
 		}
 
 		$dir_handle->close();
 
-		if ($num_files < $expected_files)
-			return array('files_missing', true, $num_files);
+		if ($num_files < $expected_files) {
+			return ['files_missing', true, $num_files];
+		}
 
 		// Empty?
-		if ($expected_files == 0)
-			return array('unused', false, $num_files);
+		if ($expected_files == 0) {
+			return ['unused', false, $num_files];
+		}
 
 		// All good!
-		return array('ok', false, $num_files);
+		return ['ok', false, $num_files];
 	}
 
 	/**
@@ -2739,8 +2623,9 @@ public static function attachDirStatus($dir, $expected_files): array
 	 */
 	public static function manageAttachmentSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::attachConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'attachments';
@@ -2755,8 +2640,9 @@ public static function manageAttachmentSettings($return_config = false)
 	 */
 	public static function manageAvatarSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::avatarConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'avatars';
@@ -2869,16 +2755,17 @@ protected function __construct()
 		Theme::loadTemplate('ManageAttachments');
 
 		// This uses admin tabs - as it should!
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['attachments_avatars'],
 			'help' => 'manage_files',
 			'description' => Lang::$txt['attachments_desc'],
-		);
+		];
 
-		IntegrationHook::call('integrate_manage_attachments', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_attachments', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[strtolower($_REQUEST['sa'])]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[strtolower($_REQUEST['sa'])])) {
 			$this->subaction = strtolower($_REQUEST['sa']);
+		}
 
 		Utils::$context['sub_action'] = &$this->subaction;
 
@@ -2902,12 +2789,14 @@ protected function pauseAttachmentMaintenance($to_fix, $max_substep = 0): void
 		// Try get more time...
 		@set_time_limit(600);
 
-		if (function_exists('apache_reset_timeout'))
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		// Have we already used our maximum time?
-		if ((time() - TIME_START) < 3 || Utils::$context['starting_substep'] == $_GET['substep'])
+		if ((time() - TIME_START) < 3 || Utils::$context['starting_substep'] == $_GET['substep']) {
 			return;
+		}
 
 		Utils::$context['continue_get_data'] = '?action=admin;area=manageattachments;sa=repair' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 		Utils::$context['page_title'] = Lang::$txt['not_done_title'];
@@ -2919,12 +2808,9 @@ protected function pauseAttachmentMaintenance($to_fix, $max_substep = 0): void
 		Menu::$loaded['admin']['current_subsection'] = 'maintenance';
 
 		// Change these two if more steps are added!
-		if (empty($max_substep))
-		{
+		if (empty($max_substep)) {
 			Utils::$context['continue_percent'] = round(($_GET['step'] * 100) / 25);
-		}
-		else
-		{
+		} else {
 			Utils::$context['continue_percent'] = round(($_GET['step'] * 100 + ($_GET['substep'] * 100) / $max_substep) / 25);
 		}
 
@@ -2942,7 +2828,8 @@ protected function pauseAttachmentMaintenance($to_fix, $max_substep = 0): void
 class_exists('SMF\\Attachment');
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Attachments::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Attachments::exportStatic')) {
 	Attachments::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Bans.php b/Sources/Actions/Admin/Bans.php
index bb6b5dbda8..3eeb8c5d79 100644
--- a/Sources/Actions/Admin/Bans.php
+++ b/Sources/Actions/Admin/Bans.php
@@ -17,13 +17,13 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
-use SMF\IP;
 use SMF\IntegrationHook;
+use SMF\IP;
 use SMF\ItemList;
 use SMF\Lang;
 use SMF\Logging;
@@ -33,7 +33,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains all the methods used for the ban center.
@@ -47,12 +46,25 @@ class Bans implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Ban',
-		),
-	);
+			'updateBanMembers' => 'updateBanMembers',
+			'list_getBans' => 'list_getBans',
+			'list_getNumBans' => 'list_getNumBans',
+			'list_getBanItems' => 'list_getBanItems',
+			'list_getNumBanItems' => 'list_getNumBanItems',
+			'list_getBanTriggers' => 'list_getBanTriggers',
+			'list_getNumBanTriggers' => 'list_getNumBanTriggers',
+			'list_getBanLogEntries' => 'list_getBanLogEntries',
+			'list_getNumBanLogEntries' => 'list_getNumBanLogEntries',
+			'banList' => 'BanList',
+			'banEdit' => 'BanEdit',
+			'banBrowseTriggers' => 'BanBrowseTriggers',
+			'banEditTrigger' => 'BanEditTrigger',
+			'banLog' => 'BanLog',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -75,14 +87,14 @@ class Bans implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'list' => 'list',
 		'edit' => 'edit',
 		'add' => 'edit',
 		'browse' => 'browseTriggers',
 		'edittrigger' => 'editTrigger',
 		'log' => 'log',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -107,10 +119,11 @@ public function execute(): void
 	{
 		User::$me->isAllowedTo('manage_bans');
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -124,8 +137,7 @@ public function execute(): void
 	public function list(): void
 	{
 		// User pressed the 'remove selection button'.
-		if (!empty($_POST['removeBans']) && !empty($_POST['remove']) && is_array($_POST['remove']))
-		{
+		if (!empty($_POST['removeBans']) && !empty($_POST['remove']) && is_array($_POST['remove'])) {
 			User::$me->checkSession();
 
 			// Make sure every entry is a proper integer.
@@ -135,179 +147,173 @@ public function list(): void
 			$this->removeBanGroups($_POST['remove']);
 
 			// No more caching this ban!
-			Config::updateModSettings(array('banLastUpdated' => time()));
+			Config::updateModSettings(['banLastUpdated' => time()]);
 
 			// Some members might be unbanned now. Update the members table.
 			self::updateBanMembers();
 		}
 
 		// Create a date string so we don't overload them with date info.
-		if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', User::$me->time_format, $matches) == 0 || empty($matches[0]))
-		{
+		if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', User::$me->time_format, $matches) == 0 || empty($matches[0])) {
 			Utils::$context['ban_time_format'] = User::$me->time_format;
-		}
-		else
-		{
+		} else {
 			Utils::$context['ban_time_format'] = $matches[0];
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'ban_list',
 			'title' => Lang::$txt['ban_title'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=ban;sa=list',
 			'default_sort_col' => 'added',
 			'default_sort_dir' => 'desc',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getBans',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumBans',
-			),
+			],
 			'no_items_label' => Lang::$txt['ban_no_entries'],
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['ban_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'name',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'bg.name',
 						'reverse' => 'bg.name DESC',
-					),
-				),
-				'notes' => array(
-					'header' => array(
+					],
+				],
+				'notes' => [
+					'header' => [
 						'value' => Lang::$txt['ban_notes'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'notes',
 						'class' => 'smalltext word_break',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'LENGTH(bg.notes) > 0 DESC, bg.notes',
 						'reverse' => 'LENGTH(bg.notes) > 0, bg.notes DESC',
-					),
-				),
-				'reason' => array(
-					'header' => array(
+					],
+				],
+				'reason' => [
+					'header' => [
 						'value' => Lang::$txt['ban_reason'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'reason',
 						'class' => 'smalltext word_break',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'LENGTH(bg.reason) > 0 DESC, bg.reason',
 						'reverse' => 'LENGTH(bg.reason) > 0, bg.reason DESC',
-					),
-				),
-				'added' => array(
-					'header' => array(
+					],
+				],
+				'added' => [
+					'header' => [
 						'value' => Lang::$txt['ban_added'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$time = new Time('@' . $rowData['ban_time']);
 
-							if (empty(Utils::$context['ban_time_format']))
+							if (empty(Utils::$context['ban_time_format'])) {
 								return $time->format();
+							}
 
 							return $time->format(Utils::$context['ban_time_format'], true);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'bg.ban_time',
 						'reverse' => 'bg.ban_time DESC',
-					),
-				),
-				'expires' => array(
-					'header' => array(
+					],
+				],
+				'expires' => [
+					'header' => [
 						'value' => Lang::$txt['ban_expires'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// This ban never expires...whahaha.
-							if ($rowData['expire_time'] === null)
-							{
+							if ($rowData['expire_time'] === null) {
 								return Lang::$txt['never'];
 							}
 
 							// This ban has already expired.
-							if ($rowData['expire_time'] < time())
-							{
+							if ($rowData['expire_time'] < time()) {
 								return sprintf('<span class="red">%1$s</span>', Lang::$txt['ban_expired']);
 							}
 
 							// Still need to wait a few days for this ban to expire.
 							return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), Lang::$txt['ban_days']);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'COALESCE(bg.expire_time, 1=1) DESC, bg.expire_time DESC',
 						'reverse' => 'COALESCE(bg.expire_time, 1=1), bg.expire_time',
-					),
-				),
-				'num_triggers' => array(
-					'header' => array(
+					],
+				],
+				'num_triggers' => [
+					'header' => [
 						'value' => Lang::$txt['ban_triggers'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'num_triggers',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'num_triggers DESC',
 						'reverse' => 'num_triggers',
-					),
-				),
-				'actions' => array(
-					'header' => array(
+					],
+				],
+				'actions' => [
+					'header' => [
 						'value' => Lang::$txt['ban_actions'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=edit;bg=%1$d">' . Lang::$txt['modify'] . '</a>',
-							'params' => array(
+							'params' => [
 								'id_ban_group' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="remove[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id_ban_group' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=ban;sa=list',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'top_of_list',
 					'value' => '<input type="submit" name="removeBans" value="' . Lang::$txt['ban_remove_selected'] . '" class="button">',
-				),
-				array(
+				],
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="submit" name="removeBans" value="' . Lang::$txt['ban_remove_selected'] . '" class="button">',
-				),
-			),
+				],
+			],
 			'javascript' => '
 			var removeBans = $("input[name=\'removeBans\']");
 
@@ -323,7 +329,7 @@ public function list(): void
 
 				return confirm("' . Lang::$txt['ban_remove_selected_confirm'] . '");
 			});',
-		);
+		];
 
 		new ItemList($listOptions);
 
@@ -343,12 +349,11 @@ public function list(): void
 	 */
 	public function edit(): void
 	{
-		if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty(Utils::$context['ban_errors']))
-		{
+		if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty(Utils::$context['ban_errors'])) {
 			$this->edit2();
 		}
 
-		$ban_group_id = isset(Utils::$context['ban']['id']) ? Utils::$context['ban']['id'] : (isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0);
+		$ban_group_id = Utils::$context['ban']['id'] ?? (isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0);
 
 		// Template needs this to show errors using javascript
 		Lang::load('Errors');
@@ -357,129 +362,122 @@ public function edit(): void
 
 		Utils::$context['form_url'] = Config::$scripturl . '?action=admin;area=ban;sa=edit';
 
-		if (!empty(Utils::$context['ban_errors']))
-		{
-			foreach (Utils::$context['ban_errors'] as $error)
+		if (!empty(Utils::$context['ban_errors'])) {
+			foreach (Utils::$context['ban_errors'] as $error) {
 				Utils::$context['error_messages'][$error] = Lang::$txt[$error];
-		}
-		else
-		{
+			}
+		} else {
 			// If we're editing an existing ban, get it from the database.
-			if (!empty($ban_group_id))
-			{
+			if (!empty($ban_group_id)) {
 				Utils::$context['ban_group_id'] = $ban_group_id;
 
-				$listOptions = array(
+				$listOptions = [
 					'id' => 'ban_items',
 					'base_href' => Config::$scripturl . '?action=admin;area=ban;sa=edit;bg=' . $ban_group_id,
 					'no_items_label' => Lang::$txt['ban_no_triggers'],
 					'items_per_page' => Config::$modSettings['defaultMaxListItems'],
-					'get_items' => array(
+					'get_items' => [
 						'function' => __CLASS__ . '::list_getBanItems',
-						'params' => array(
+						'params' => [
 							'ban_group_id' => $ban_group_id,
-						),
-					),
-					'get_count' => array(
+						],
+					],
+					'get_count' => [
 						'function' => __CLASS__ . '::list_getNumBanItems',
-						'params' => array(
+						'params' => [
 							'ban_group_id' => $ban_group_id,
-						),
-					),
-					'columns' => array(
-						'type' => array(
-							'header' => array(
+						],
+					],
+					'columns' => [
+						'type' => [
+							'header' => [
 								'value' => Lang::$txt['ban_banned_entity'],
 								'style' => 'width: 60%;text-align: left;',
-							),
-							'data' => array(
-								'function' => function($ban_item)
-								{
-									if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
-									{
+							],
+							'data' => [
+								'function' => function ($ban_item) {
+									if (in_array($ban_item['type'], ['ip', 'hostname', 'email'])) {
 										return '<strong>' . Lang::$txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
 									}
 
-									if ($ban_item['type'] == 'user')
-									{
+									if ($ban_item['type'] == 'user') {
 										return '<strong>' . Lang::$txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
 									}
 
 									return '<strong>' . Lang::$txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
 								},
 								'style' => 'text-align: left;',
-							),
-						),
-						'hits' => array(
-							'header' => array(
+							],
+						],
+						'hits' => [
+							'header' => [
 								'value' => Lang::$txt['ban_hits'],
 								'style' => 'width: 15%; text-align: center;',
-							),
-							'data' => array(
+							],
+							'data' => [
 								'db' => 'hits',
 								'style' => 'text-align: center;',
-							),
-						),
-						'id' => array(
-							'header' => array(
+							],
+						],
+						'id' => [
+							'header' => [
 								'value' => Lang::$txt['ban_actions'],
 								'style' => 'width: 15%; text-align: center;',
-							),
-							'data' => array(
-								'function' => function($ban_item)
-								{
+							],
+							'data' => [
+								'function' => function ($ban_item) {
 									return '<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . Utils::$context['ban_group_id'] . ';bi=' . $ban_item['id'] . '">' . Lang::$txt['ban_edit_trigger'] . '</a>';
 								},
 								'style' => 'text-align: center;',
-							),
-						),
-						'checkboxes' => array(
-							'header' => array(
+							],
+						],
+						'checkboxes' => [
+							'header' => [
 								'value' => '<input type="checkbox" onclick="invertAll(this, this.form, \'ban_items\');">',
 								'style' => 'width: 5%; text-align: center;',
-							),
-							'data' => array(
-								'sprintf' => array(
+							],
+							'data' => [
+								'sprintf' => [
 									'format' => '<input type="checkbox" name="ban_items[]" value="%1$d">',
-									'params' => array(
+									'params' => [
 										'id' => false,
-									),
-								),
+									],
+								],
 								'style' => 'text-align: center;',
-							),
-						),
-					),
-					'form' => array(
+							],
+						],
+					],
+					'form' => [
 						'href' => Config::$scripturl . '?action=admin;area=ban;sa=edit;bg=' . $ban_group_id,
-					),
-					'additional_rows' => array(
-						array(
+					],
+					'additional_rows' => [
+						[
 							'position' => 'above_column_headers',
 							'value' => '
 							<input type="submit" name="remove_selection" value="' . Lang::$txt['ban_remove_selected_triggers'] . '" class="button"> <a class="button" href="' . Config::$scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $ban_group_id . '">' . Lang::$txt['ban_add_trigger'] . '</a>',
 							'style' => 'text-align: right;',
-						),
-						array(
+						],
+						[
 							'position' => 'above_column_headers',
 							'value' => '
 							<input type="hidden" name="bg" value="' . $ban_group_id . '">
 							<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
 							<input type="hidden" name="' . Utils::$context['admin-bet_token_var'] . '" value="' . Utils::$context['admin-bet_token'] . '">',
-						),
-						array(
+						],
+						[
 							'position' => 'below_table_data',
 							'value' => '
 							<input type="submit" name="remove_selection" value="' . Lang::$txt['ban_remove_selected_triggers'] . '" class="button"> <a class="button" href="' . Config::$scripturl . '?action=admin;area=ban;sa=edittrigger;bg=' . $ban_group_id . '">' . Lang::$txt['ban_add_trigger'] . '</a>',
 							'style' => 'text-align: right;',
-						),
-						array(
+						],
+						[
 							'position' => 'below_table_data',
 							'value' => '
 							<input type="hidden" name="bg" value="' . $ban_group_id . '">
 							<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '">
 							<input type="hidden" name="' . Utils::$context['admin-bet_token_var'] . '" value="' . Utils::$context['admin-bet_token'] . '">',
-						),
-					),
+						],
+					],
 					'javascript' => '
 			var removeBans = $("input[name=\'remove_selection\']");
 
@@ -495,64 +493,62 @@ public function edit(): void
 
 				return confirm("' . Lang::$txt['ban_remove_selected_confirm'] . '");
 			});',
-				);
+				];
 
-				IntegrationHook::call('integrate_ban_edit_list', array(&$listOptions));
+				IntegrationHook::call('integrate_ban_edit_list', [&$listOptions]);
 
 				new ItemList($listOptions);
 			}
 			// Not an existing one, then it's probably a new one.
-			else
-			{
-				Utils::$context['ban'] = array(
+			else {
+				Utils::$context['ban'] = [
 					'id' => 0,
 					'name' => '',
-					'expiration' => array(
+					'expiration' => [
 						'status' => 'never',
-						'days' => 0
-					),
+						'days' => 0,
+					],
 					'reason' => '',
 					'notes' => '',
 					'ban_days' => 0,
-					'cannot' => array(
+					'cannot' => [
 						'access' => true,
 						'post' => false,
 						'register' => false,
 						'login' => false,
-					),
+					],
 					'is_new' => true,
-				);
-				Utils::$context['ban_suggestions'] = array(
+				];
+				Utils::$context['ban_suggestions'] = [
 					'main_ip' => '',
 					'hostname' => '',
 					'email' => '',
-					'member' => array(
+					'member' => [
 						'id' => 0,
-					),
-				);
+					],
+				];
 
 				// Overwrite some of the default form values if a user ID was given.
-				if (!empty($_REQUEST['u']))
-				{
-					$request = Db::$db->query('', '
-						SELECT id_member, real_name, member_ip, email_address
+				if (!empty($_REQUEST['u'])) {
+					$request = Db::$db->query(
+						'',
+						'SELECT id_member, real_name, member_ip, email_address
 						FROM {db_prefix}members
 						WHERE id_member = {int:current_user}
 						LIMIT 1',
-						array(
+						[
 							'current_user' => (int) $_REQUEST['u'],
-						)
+						],
 					);
-					if (Db::$db->num_rows($request) > 0)
-					{
+
+					if (Db::$db->num_rows($request) > 0) {
 						list(Utils::$context['ban_suggestions']['member']['id'], Utils::$context['ban_suggestions']['member']['name'], Utils::$context['ban_suggestions']['main_ip'], Utils::$context['ban_suggestions']['email']) = Db::$db->fetch_row($request);
 
 						Utils::$context['ban_suggestions']['main_ip'] = new IP(Utils::$context['ban_suggestions']['main_ip']);
 					}
 					Db::$db->free_result($request);
 
-					if (!empty(Utils::$context['ban_suggestions']['member']['id']))
-					{
+					if (!empty(Utils::$context['ban_suggestions']['member']['id'])) {
 						Utils::$context['ban_suggestions']['href'] = Config::$scripturl . '?action=profile;u=' . Utils::$context['ban_suggestions']['member']['id'];
 
 						Utils::$context['ban_suggestions']['member']['link'] = '<a href="' . Utils::$context['ban_suggestions']['href'] . '">' . Utils::$context['ban_suggestions']['member']['name'] . '</a>';
@@ -569,8 +565,7 @@ public function edit(): void
 						if (
 							empty(Config::$modSettings['disableHostnameLookup'])
 							&& $main_ip->isValid()
-						)
-						{
+						) {
 							Utils::$context['ban_suggestions']['hostname'] = $main_ip->getHost();
 						}
 
@@ -578,19 +573,19 @@ public function edit(): void
 					}
 				}
 				// We came from the mod center.
-				elseif (isset($_GET['msg']) && !empty($_GET['msg']))
-				{
-					$request = Db::$db->query('', '
-						SELECT poster_name, poster_ip, poster_email
+				elseif (isset($_GET['msg']) && !empty($_GET['msg'])) {
+					$request = Db::$db->query(
+						'',
+						'SELECT poster_name, poster_ip, poster_email
 						FROM {db_prefix}messages
 						WHERE id_msg = {int:message}
 						LIMIT 1',
-						array(
+						[
 							'message' => (int) $_REQUEST['msg'],
-						)
+						],
 					);
-					if (Db::$db->num_rows($request) > 0)
-					{
+
+					if (Db::$db->num_rows($request) > 0) {
 						list(Utils::$context['ban_suggestions']['member']['name'], Utils::$context['ban_suggestions']['main_ip'], Utils::$context['ban_suggestions']['email']) = Db::$db->fetch_row($request);
 
 						Utils::$context['ban_suggestions']['main_ip'] = new IP(Utils::$context['ban_suggestions']['main_ip']);
@@ -603,11 +598,11 @@ public function edit(): void
 					Utils::$context['ban']['from_user'] = true;
 				}
 
-				IntegrationHook::call('integrate_ban_edit_new', array());
+				IntegrationHook::call('integrate_ban_edit_new', []);
 			}
 		}
 
-		Theme::loadJavaScriptFile('suggest.js', array('minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('suggest.js', ['minimize' => true], 'smf_suggest');
 		Utils::$context['sub_template'] = 'ban_edit';
 	}
 
@@ -621,165 +616,155 @@ public function edit(): void
 	 */
 	public function browseTriggers(): void
 	{
-		if (!empty($_POST['remove_triggers']) && !empty($_POST['remove']) && is_array($_POST['remove']))
-		{
+		if (!empty($_POST['remove_triggers']) && !empty($_POST['remove']) && is_array($_POST['remove'])) {
 			User::$me->checkSession();
 
 			self::removeBanTriggers($_POST['remove']);
 
 			// Rehabilitate some members.
-			if ($_REQUEST['entity'] == 'member')
+			if ($_REQUEST['entity'] == 'member') {
 				self::updateBanMembers();
+			}
 
 			// Make sure the ban cache is refreshed.
-			Config::updateModSettings(array('banLastUpdated' => time()));
+			Config::updateModSettings(['banLastUpdated' => time()]);
 		}
 
-		Utils::$context['selected_entity'] = isset($_REQUEST['entity']) && in_array($_REQUEST['entity'], array('ip', 'hostname', 'email', 'member')) ? $_REQUEST['entity'] : 'ip';
+		Utils::$context['selected_entity'] = isset($_REQUEST['entity']) && in_array($_REQUEST['entity'], ['ip', 'hostname', 'email', 'member']) ? $_REQUEST['entity'] : 'ip';
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'ban_trigger_list',
 			'title' => Lang::$txt['ban_trigger_browse'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=ban;sa=browse;entity=' . Utils::$context['selected_entity'],
 			'default_sort_col' => 'banned_entity',
 			'no_items_label' => Lang::$txt['ban_no_triggers'],
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getBanTriggers',
-				'params' => array(
+				'params' => [
 					Utils::$context['selected_entity'],
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumBanTriggers',
-				'params' => array(
+				'params' => [
 					Utils::$context['selected_entity'],
-				),
-			),
-			'columns' => array(
-				'banned_entity' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'banned_entity' => [
+					'header' => [
 						'value' => Lang::$txt['ban_banned_entity'],
-					),
-				),
-				'ban_name' => array(
-					'header' => array(
+					],
+				],
+				'ban_name' => [
+					'header' => [
 						'value' => Lang::$txt['ban_name'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=edit;bg=%1$d">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id_ban_group' => false,
 								'name' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'bg.name',
 						'reverse' => 'bg.name DESC',
-					),
-				),
-				'hits' => array(
-					'header' => array(
+					],
+				],
+				'hits' => [
+					'header' => [
 						'value' => Lang::$txt['ban_hits'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'hits',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'bi.hits DESC',
 						'reverse' => 'bi.hits',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="remove[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id_ban' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=ban;sa=browse;entity=' . Utils::$context['selected_entity'],
 				'include_start' => true,
 				'include_sort' => true,
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'above_column_headers',
 					'value' => '<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=browse;entity=ip">' . (Utils::$context['selected_entity'] == 'ip' ? '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . Lang::$txt['ip'] . '</a>&nbsp;|&nbsp;<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=browse;entity=hostname">' . (Utils::$context['selected_entity'] == 'hostname' ? '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . Lang::$txt['hostname'] . '</a>&nbsp;|&nbsp;<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=browse;entity=email">' . (Utils::$context['selected_entity'] == 'email' ? '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . Lang::$txt['email'] . '</a>&nbsp;|&nbsp;<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=browse;entity=member">' . (Utils::$context['selected_entity'] == 'member' ? '<img src="' . Theme::$current->settings['images_url'] . '/selected.png" alt="&gt;"> ' : '') . Lang::$txt['username'] . '</a>',
-				),
-				array(
+				],
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="submit" name="remove_triggers" value="' . Lang::$txt['ban_remove_selected_triggers'] . '" data-confirm="' . Lang::$txt['ban_remove_selected_triggers_confirm'] . '" class="button you_sure">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Specific data for the first column depending on the selected entity.
-		if (Utils::$context['selected_entity'] === 'ip')
-		{
-			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function($rowData)
-				{
+		if (Utils::$context['selected_entity'] === 'ip') {
+			$listOptions['columns']['banned_entity']['data'] = [
+				'function' => function ($rowData) {
 					return IP::range2ip($rowData['ip_low'], $rowData['ip_high']);
 				},
-			);
-			$listOptions['columns']['banned_entity']['sort'] = array(
+			];
+			$listOptions['columns']['banned_entity']['sort'] = [
 				'default' => 'bi.ip_low, bi.ip_high, bi.ip_low',
 				'reverse' => 'bi.ip_low DESC, bi.ip_high DESC',
-			);
-		}
-		elseif (Utils::$context['selected_entity'] === 'hostname')
-		{
-			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function($rowData)
-				{
-					return strtr(Utils::htmlspecialchars($rowData['hostname']), array('%' => '*'));
+			];
+		} elseif (Utils::$context['selected_entity'] === 'hostname') {
+			$listOptions['columns']['banned_entity']['data'] = [
+				'function' => function ($rowData) {
+					return strtr(Utils::htmlspecialchars($rowData['hostname']), ['%' => '*']);
 				},
-			);
-			$listOptions['columns']['banned_entity']['sort'] = array(
+			];
+			$listOptions['columns']['banned_entity']['sort'] = [
 				'default' => 'bi.hostname',
 				'reverse' => 'bi.hostname DESC',
-			);
-		}
-		elseif (Utils::$context['selected_entity'] === 'email')
-		{
-			$listOptions['columns']['banned_entity']['data'] = array(
-				'function' => function($rowData)
-				{
-					return strtr(Utils::htmlspecialchars($rowData['email_address']), array('%' => '*'));
+			];
+		} elseif (Utils::$context['selected_entity'] === 'email') {
+			$listOptions['columns']['banned_entity']['data'] = [
+				'function' => function ($rowData) {
+					return strtr(Utils::htmlspecialchars($rowData['email_address']), ['%' => '*']);
 				},
-			);
-			$listOptions['columns']['banned_entity']['sort'] = array(
+			];
+			$listOptions['columns']['banned_entity']['sort'] = [
 				'default' => 'bi.email_address',
 				'reverse' => 'bi.email_address DESC',
-			);
-		}
-		elseif (Utils::$context['selected_entity'] === 'member')
-		{
-			$listOptions['columns']['banned_entity']['data'] = array(
-				'sprintf' => array(
+			];
+		} elseif (Utils::$context['selected_entity'] === 'member') {
+			$listOptions['columns']['banned_entity']['data'] = [
+				'sprintf' => [
 					'format' => '<a href="' . Config::$scripturl . '?action=profile;u=%1$d">%2$s</a>',
-					'params' => array(
+					'params' => [
 						'id_member' => false,
 						'real_name' => false,
-					),
-				),
-			);
-			$listOptions['columns']['banned_entity']['sort'] = array(
+					],
+				],
+			];
+			$listOptions['columns']['banned_entity']['sort'] = [
 				'default' => 'mem.real_name',
 				'reverse' => 'mem.real_name DESC',
-			);
+			];
 		}
 
 		// Create the list.
@@ -810,58 +795,52 @@ public function editTrigger(): void
 		$ban_group = (int) ($_REQUEST['bg'] ?? 0);
 		$ban_id = (int) ($_REQUEST['bi'] ?? 0);
 
-		if (empty($ban_group))
+		if (empty($ban_group)) {
 			ErrorHandler::fatalLang('ban_not_found', false);
+		}
 
-		if (isset($_POST['add_new_trigger']) && !empty($_POST['ban_suggestions']))
-		{
+		if (isset($_POST['add_new_trigger']) && !empty($_POST['ban_suggestions'])) {
 			$this->saveTriggers($_POST['ban_suggestions'], $ban_group, 0, $ban_id);
 
 			Utils::redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-		}
-		elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
-		{
+		} elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions'])) {
 			$this->saveTriggers($_POST['ban_suggestions'], $ban_group, 0, $ban_id);
 
 			Utils::redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-		}
-		elseif (isset($_POST['edit_trigger']))
-		{
+		} elseif (isset($_POST['edit_trigger'])) {
 			self::removeBanTriggers($ban_id);
 
 			Utils::redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
 		}
 
-		Theme::loadJavaScriptFile('suggest.js', array('minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('suggest.js', ['minimize' => true], 'smf_suggest');
 
-		if (empty($ban_id))
-		{
-			Utils::$context['ban_trigger'] = array(
+		if (empty($ban_id)) {
+			Utils::$context['ban_trigger'] = [
 				'id' => 0,
 				'group' => $ban_group,
-				'ip' => array(
+				'ip' => [
 					'value' => '',
 					'selected' => true,
-				),
-				'hostname' => array(
+				],
+				'hostname' => [
 					'selected' => false,
 					'value' => '',
-				),
-				'email' => array(
+				],
+				'email' => [
 					'value' => '',
 					'selected' => false,
-				),
-				'banneduser' => array(
+				],
+				'banneduser' => [
 					'value' => '',
 					'selected' => false,
-				),
+				],
 				'is_new' => true,
-			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT
+			];
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					bi.id_ban, bi.id_ban_group, bi.hostname, bi.email_address, bi.id_member,
 					bi.ip_low, bi.ip_high,
 					mem.member_name, mem.real_name
@@ -870,39 +849,39 @@ public function editTrigger(): void
 				WHERE bi.id_ban = {int:ban_item}
 					AND bi.id_ban_group = {int:ban_group}
 				LIMIT 1',
-				array(
+				[
 					'ban_item' => $ban_id,
 					'ban_group' => $ban_group,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('ban_not_found', false);
 			}
 			$row = Db::$db->fetch_assoc($request);
 			Db::$db->free_result($request);
 
-			Utils::$context['ban_trigger'] = array(
+			Utils::$context['ban_trigger'] = [
 				'id' => $row['id_ban'],
 				'group' => $row['id_ban_group'],
-				'ip' => array(
+				'ip' => [
 					'value' => empty($row['ip_low']) ? '' : IP::range2ip($row['ip_low'], $row['ip_high']),
 					'selected' => !empty($row['ip_low']),
-				),
-				'hostname' => array(
+				],
+				'hostname' => [
 					'value' => str_replace('%', '*', $row['hostname']),
 					'selected' => !empty($row['hostname']),
-				),
-				'email' => array(
+				],
+				'email' => [
 					'value' => str_replace('%', '*', $row['email_address']),
-					'selected' => !empty($row['email_address'])
-				),
-				'banneduser' => array(
+					'selected' => !empty($row['email_address']),
+				],
+				'banneduser' => [
 					'value' => $row['member_name'],
-					'selected' => !empty($row['member_name'])
-				),
+					'selected' => !empty($row['member_name']),
+				],
 				'is_new' => false,
-			);
+			];
 		}
 
 		SecurityToken::create('admin-bet');
@@ -919,136 +898,132 @@ public function editTrigger(): void
 	public function log(): void
 	{
 		// Delete one or more entries.
-		if (!empty($_POST['removeAll']) || (!empty($_POST['removeSelected']) && !empty($_POST['remove'])))
-		{
+		if (!empty($_POST['removeAll']) || (!empty($_POST['removeSelected']) && !empty($_POST['remove']))) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-bl');
 
 			// 'Delete all entries' button was pressed.
-			if (!empty($_POST['removeAll']))
-			{
+			if (!empty($_POST['removeAll'])) {
 				$this->removeBanLogs();
 			}
 			// 'Delete selection' button was pressed.
-			else
-			{
+			else {
 				$this->removeBanLogs(array_map('intval', $_POST['remove']));
 			}
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'ban_log',
 			'title' => Lang::$txt['ban_log'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Utils::$context['admin_area'] == 'ban' ? Config::$scripturl . '?action=admin;area=ban;sa=log' : Config::$scripturl . '?action=admin;area=logs;sa=banlog',
 			'default_sort_col' => 'date',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getBanLogEntries',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumBanLogEntries',
-			),
+			],
 			'no_items_label' => Lang::$txt['ban_log_no_entries'],
-			'columns' => array(
-				'ip' => array(
-					'header' => array(
+			'columns' => [
+				'ip' => [
+					'header' => [
 						'value' => Lang::$txt['ban_log_ip'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=trackip;searchip=%1$s">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'ip' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'lb.ip',
 						'reverse' => 'lb.ip DESC',
-					),
-				),
-				'email' => array(
-					'header' => array(
+					],
+				],
+				'email' => [
+					'header' => [
 						'value' => Lang::$txt['ban_log_email'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'email',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lb.email = \'\', lb.email',
 						'reverse' => 'lb.email != \'\', lb.email DESC',
-					),
-				),
-				'member' => array(
-					'header' => array(
+					],
+				],
+				'member' => [
+					'header' => [
 						'value' => Lang::$txt['ban_log_member'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=profile;u=%1$d">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id_member' => false,
 								'real_name' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'COALESCE(mem.real_name, 1=1), mem.real_name',
 						'reverse' => 'COALESCE(mem.real_name, 1=1) DESC, mem.real_name DESC',
-					),
-				),
-				'date' => array(
-					'header' => array(
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['ban_log_date'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return timeformat($rowData['log_time']);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lb.log_time DESC',
 						'reverse' => 'lb.log_time',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="remove[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id_ban_log' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Utils::$context['admin_area'] == 'ban' ? Config::$scripturl . '?action=admin;area=ban;sa=log' : Config::$scripturl . '?action=admin;area=logs;sa=banlog',
 				'include_start' => true,
 				'include_sort' => true,
 				'token' => 'admin-bl',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => '
 						<input type="submit" name="removeSelected" value="' . Lang::$txt['ban_log_remove_selected'] . '" data-confirm="' . Lang::$txt['ban_log_remove_selected_confirm'] . '" class="button you_sure">
 						<input type="submit" name="removeAll" value="' . Lang::$txt['ban_log_remove_all'] . '" data-confirm="' . Lang::$txt['ban_log_remove_all_confirm'] . '" class="button you_sure">',
-				),
-				array(
+				],
+				[
 					'position' => 'bottom_of_list',
 					'value' => '
 						<input type="submit" name="removeSelected" value="' . Lang::$txt['ban_log_remove_selected'] . '" data-confirm="' . Lang::$txt['ban_log_remove_selected_confirm'] . '" class="button you_sure">
 						<input type="submit" name="removeAll" value="' . Lang::$txt['ban_log_remove_all'] . '" data-confirm="' . Lang::$txt['ban_log_remove_all_confirm'] . '" class="button you_sure">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		SecurityToken::create('admin-bl');
 
@@ -1070,8 +1045,9 @@ public function log(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1091,43 +1067,41 @@ public static function call(): void
 	 */
 	public static function updateBanMembers(): void
 	{
-		$updates = array();
-		$allMembers = array();
-		$newMembers = array();
+		$updates = [];
+		$allMembers = [];
+		$newMembers = [];
 
 		// Start by getting all active bans - it's quicker doing this in parts...
-		$memberIDs = array();
-		$memberEmails = array();
-		$memberEmailWild = array();
+		$memberIDs = [];
+		$memberEmails = [];
+		$memberEmailWild = [];
 
-		$request = Db::$db->query('', '
-			SELECT bi.id_member, bi.email_address
+		$request = Db::$db->query(
+			'',
+			'SELECT bi.id_member, bi.email_address
 			FROM {db_prefix}ban_items AS bi
 				INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group)
 			WHERE (bi.id_member > {int:no_member} OR bi.email_address != {string:blank_string})
 				AND bg.cannot_access = {int:cannot_access_on}
 				AND (bg.expire_time IS NULL OR bg.expire_time > {int:current_time})',
-			array(
+			[
 				'no_member' => 0,
 				'cannot_access_on' => 1,
 				'current_time' => time(),
 				'blank_string' => '',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if ($row['id_member'])
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if ($row['id_member']) {
 				$memberIDs[$row['id_member']] = $row['id_member'];
+			}
 
-			if ($row['email_address'])
-			{
+			if ($row['email_address']) {
 				// Does it have a wildcard - if so we can't do a IN on it.
-				if (strpos($row['email_address'], '%') !== false)
-				{
+				if (strpos($row['email_address'], '%') !== false) {
 					$memberEmailWild[$row['email_address']] = $row['email_address'];
-				}
-				else
-				{
+				} else {
 					$memberEmails[$row['email_address']] = $row['email_address'];
 				}
 			}
@@ -1135,46 +1109,42 @@ public static function updateBanMembers(): void
 		Db::$db->free_result($request);
 
 		// Build up the query.
-		$queryPart = array();
-		$queryValues = array();
+		$queryPart = [];
+		$queryValues = [];
 
-		if (!empty($memberIDs))
-		{
+		if (!empty($memberIDs)) {
 			$queryPart[] = 'mem.id_member IN ({array_string:member_ids})';
 			$queryValues['member_ids'] = $memberIDs;
 		}
 
-		if (!empty($memberEmails))
-		{
+		if (!empty($memberEmails)) {
 			$queryPart[] = 'mem.email_address IN ({array_string:member_emails})';
 			$queryValues['member_emails'] = $memberEmails;
 		}
 
 		$count = 0;
-		foreach ($memberEmailWild as $email)
-		{
+
+		foreach ($memberEmailWild as $email) {
 			$queryPart[] = 'mem.email_address LIKE {string:wild_' . $count . '}';
 			$queryValues['wild_' . $count++] = $email;
 		}
 
 		// Find all banned members.
-		if (!empty($queryPart))
-		{
-			$request = Db::$db->query('', '
-				SELECT mem.id_member, mem.is_activated
+		if (!empty($queryPart)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member, mem.is_activated
 				FROM {db_prefix}members AS mem
 				WHERE ' . implode(' OR ', $queryPart),
-				$queryValues
+				$queryValues,
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!in_array($row['id_member'], $allMembers))
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!in_array($row['id_member'], $allMembers)) {
 					$allMembers[] = $row['id_member'];
 
 					// Do they need an update?
-					if ($row['is_activated'] < 10)
-					{
+					if ($row['is_activated'] < 10) {
 						$updates[($row['is_activated'] + 10)][] = $row['id_member'];
 						$newMembers[] = $row['id_member'];
 					}
@@ -1184,46 +1154,46 @@ public static function updateBanMembers(): void
 		}
 
 		// We welcome our new members in the realm of the banned.
-		if (!empty($newMembers))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_online
+		if (!empty($newMembers)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_online
 				WHERE id_member IN ({array_int:new_banned_members})',
-				array(
+				[
 					'new_banned_members' => $newMembers,
-				)
+				],
 			);
 		}
 
 		// Find members that are wrongfully marked as banned.
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, mem.is_activated - 10 AS new_value
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, mem.is_activated - 10 AS new_value
 			FROM {db_prefix}members AS mem
 				LEFT JOIN {db_prefix}ban_items AS bi ON (bi.id_member = mem.id_member OR mem.email_address LIKE bi.email_address)
 				LEFT JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group AND bg.cannot_access = {int:cannot_access_activated} AND (bg.expire_time IS NULL OR bg.expire_time > {int:current_time}))
 			WHERE (bi.id_ban IS NULL OR bg.id_ban_group IS NULL)
 				AND mem.is_activated >= {int:ban_flag}',
-			array(
+			[
 				'cannot_access_activated' => 1,
 				'current_time' => time(),
 				'ban_flag' => 10,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Don't do this twice!
-			if (!in_array($row['id_member'], $allMembers))
-			{
+			if (!in_array($row['id_member'], $allMembers)) {
 				$updates[$row['new_value']][] = $row['id_member'];
 				$allMembers[] = $row['id_member'];
 			}
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($updates))
-		{
-			foreach ($updates as $newStatus => $members)
-				User::updateMemberData($members, array('is_activated' => $newStatus));
+		if (!empty($updates)) {
+			foreach ($updates as $newStatus => $members) {
+				User::updateMemberData($members, ['is_activated' => $newStatus]);
+			}
 		}
 
 		// Update the latest member and our total members as banning may change them.
@@ -1240,23 +1210,24 @@ public static function updateBanMembers(): void
 	 */
 	public static function list_getBans($start, $items_per_page, $sort): array
 	{
-		$bans = array();
+		$bans = [];
 
-		$request = Db::$db->query('', '
-			SELECT bg.id_ban_group, bg.name, bg.ban_time, bg.expire_time, bg.reason, bg.notes, COUNT(bi.id_ban) AS num_triggers
+		$request = Db::$db->query(
+			'',
+			'SELECT bg.id_ban_group, bg.name, bg.ban_time, bg.expire_time, bg.reason, bg.notes, COUNT(bi.id_ban) AS num_triggers
 			FROM {db_prefix}ban_groups AS bg
 				LEFT JOIN {db_prefix}ban_items AS bi ON (bi.id_ban_group = bg.id_ban_group)
 			GROUP BY bg.id_ban_group, bg.name, bg.ban_time, bg.expire_time, bg.reason, bg.notes
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:limit}',
-			array(
+			[
 				'sort' => $sort,
 				'offset' => $start,
 				'limit' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$bans[] = $row;
 		}
 		Db::$db->free_result($request);
@@ -1271,13 +1242,14 @@ public static function list_getBans($start, $items_per_page, $sort): array
 	 */
 	public static function list_getNumBans(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS num_bans
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS num_bans
 			FROM {db_prefix}ban_groups',
-			array(
-			)
+			[
+			],
 		);
-		list ($numBans) = Db::$db->fetch_row($request);
+		list($numBans) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $numBans;
@@ -1294,10 +1266,11 @@ public static function list_getNumBans(): int
 	 */
 	public static function list_getBanItems($start = 0, $items_per_page = 0, $sort = 0, $ban_group_id = 0): array
 	{
-		$ban_items = array();
+		$ban_items = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				bi.id_ban, bi.hostname, bi.email_address, bi.id_member, bi.hits,
 				bi.ip_low, bi.ip_high,
 				bg.id_ban_group, bg.name, bg.ban_time, bg.expire_time AS expire_time, bg.reason, bg.notes, bg.cannot_access, bg.cannot_register, bg.cannot_login, bg.cannot_post,
@@ -1307,75 +1280,66 @@ public static function list_getBanItems($start = 0, $items_per_page = 0, $sort =
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = bi.id_member)
 			WHERE bg.id_ban_group = {int:current_ban}
 			LIMIT {int:start}, {int:items_per_page}',
-			array(
+			[
 				'current_ban' => $ban_group_id,
 				'start' => $start,
 				'items_per_page' => $items_per_page,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('ban_not_found', false);
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset(Utils::$context['ban']))
-			{
-				Utils::$context['ban'] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset(Utils::$context['ban'])) {
+				Utils::$context['ban'] = [
 					'id' => $row['id_ban_group'],
 					'name' => $row['name'],
-					'expiration' => array(
+					'expiration' => [
 						'status' => $row['expire_time'] === null ? 'never' : ($row['expire_time'] < time() ? 'expired' : 'one_day'),
-						'days' => $row['expire_time'] > time() ? ($row['expire_time'] - time() < 86400 ? 1 : ceil(($row['expire_time'] - time()) / 86400)) : 0
-					),
+						'days' => $row['expire_time'] > time() ? ($row['expire_time'] - time() < 86400 ? 1 : ceil(($row['expire_time'] - time()) / 86400)) : 0,
+					],
 					'reason' => $row['reason'],
 					'notes' => $row['notes'],
-					'cannot' => array(
+					'cannot' => [
 						'access' => !empty($row['cannot_access']),
 						'post' => !empty($row['cannot_post']),
 						'register' => !empty($row['cannot_register']),
 						'login' => !empty($row['cannot_login']),
-					),
+					],
 					'is_new' => false,
 					'hostname' => '',
 					'email' => '',
-				);
+				];
 			}
 
-			if (!empty($row['id_ban']))
-			{
-				$ban_items[$row['id_ban']] = array(
+			if (!empty($row['id_ban'])) {
+				$ban_items[$row['id_ban']] = [
 					'id' => $row['id_ban'],
 					'hits' => $row['hits'],
-				);
-				if (!empty($row['ip_high']))
-				{
+				];
+
+				if (!empty($row['ip_high'])) {
 					$ban_items[$row['id_ban']]['type'] = 'ip';
 					$ban_items[$row['id_ban']]['ip'] = IP::range2ip($row['ip_low'], $row['ip_high']);
-				}
-				elseif (!empty($row['hostname']))
-				{
+				} elseif (!empty($row['hostname'])) {
 					$ban_items[$row['id_ban']]['type'] = 'hostname';
 					$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
-				}
-				elseif (!empty($row['email_address']))
-				{
+				} elseif (!empty($row['email_address'])) {
 					$ban_items[$row['id_ban']]['type'] = 'email';
 					$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
-				}
-				elseif (!empty($row['id_member']))
-				{
+				} elseif (!empty($row['id_member'])) {
 					$ban_items[$row['id_ban']]['type'] = 'user';
-					$ban_items[$row['id_ban']]['user'] = array(
+					$ban_items[$row['id_ban']]['user'] = [
 						'id' => $row['id_member'],
 						'name' => $row['real_name'],
 						'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
 						'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
-					);
+					];
 				}
 				// Invalid ban (member probably doesn't exist anymore).
-				else
-				{
+				else {
 					unset($ban_items[$row['id_ban']]);
 					self::removeBanTriggers($row['id_ban']);
 				}
@@ -1383,7 +1347,7 @@ public static function list_getBanItems($start = 0, $items_per_page = 0, $sort =
 		}
 		Db::$db->free_result($request);
 
-		IntegrationHook::call('integrate_ban_list', array(&$ban_items));
+		IntegrationHook::call('integrate_ban_list', [&$ban_items]);
 
 		return $ban_items;
 	}
@@ -1395,17 +1359,18 @@ public static function list_getBanItems($start = 0, $items_per_page = 0, $sort =
 	 */
 	public static function list_getNumBanItems(): int
 	{
-		$ban_group_id = isset(Utils::$context['ban_group_id']) ? Utils::$context['ban_group_id'] : 0;
+		$ban_group_id = Utils::$context['ban_group_id'] ?? 0;
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(bi.id_ban)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(bi.id_ban)
 			FROM {db_prefix}ban_groups AS bg
 				LEFT JOIN {db_prefix}ban_items AS bi ON (bi.id_ban_group = bg.id_ban_group)
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = bi.id_member)
 			WHERE bg.id_ban_group = {int:current_ban}',
-			array(
+			[
 				'current_ban' => $ban_group_id,
-			)
+			],
 		);
 		list($banNumber) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -1426,16 +1391,17 @@ public static function list_getNumBanItems(): int
 	 */
 	public static function list_getBanTriggers($start, $items_per_page, $sort, $trigger_type): array
 	{
-		$ban_triggers = array();
+		$ban_triggers = [];
 
-		$where = array(
+		$where = [
 			'ip' => 'bi.ip_low is not null',
 			'hostname' => 'bi.hostname != {string:blank_string}',
 			'email' => 'bi.email_address != {string:blank_string}',
-		);
+		];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				bi.id_ban, bi.ip_low, bi.ip_high, bi.hostname, bi.email_address, bi.hits,
 				bg.id_ban_group, bg.name' . ($trigger_type === 'member' ? ',
 				mem.id_member, mem.real_name' : '') . '
@@ -1445,15 +1411,15 @@ public static function list_getBanTriggers($start, $items_per_page, $sort, $trig
 			WHERE ' . $where[$trigger_type]) . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'blank_string' => '',
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$ban_triggers[] = $row;
 		}
 		Db::$db->free_result($request);
@@ -1471,22 +1437,23 @@ public static function list_getBanTriggers($start, $items_per_page, $sort, $trig
 	 */
 	public static function list_getNumBanTriggers($trigger_type): int
 	{
-		$where = array(
+		$where = [
 			'ip' => 'bi.ip_low is not null',
 			'hostname' => 'bi.hostname != {string:blank_string}',
 			'email' => 'bi.email_address != {string:blank_string}',
-		);
+		];
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}ban_items AS bi' . ($trigger_type === 'member' ? '
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = bi.id_member)' : '
 			WHERE ' . $where[$trigger_type]),
-			array(
+			[
 				'blank_string' => '',
-			)
+			],
 		);
-		list ($num_triggers) = Db::$db->fetch_row($request);
+		list($num_triggers) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $num_triggers;
@@ -1503,24 +1470,25 @@ public static function list_getNumBanTriggers($trigger_type): int
 	 */
 	public static function list_getBanLogEntries($start, $items_per_page, $sort): array
 	{
-		$log_entries = array();
+		$log_entries = [];
 
-		$request = Db::$db->query('', '
-			SELECT lb.id_ban_log, lb.id_member, lb.ip AS ip, COALESCE(lb.email, {string:dash}) AS email, lb.log_time, COALESCE(mem.real_name, {string:blank_string}) AS real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT lb.id_ban_log, lb.id_member, lb.ip AS ip, COALESCE(lb.email, {string:dash}) AS email, lb.log_time, COALESCE(mem.real_name, {string:blank_string}) AS real_name
 			FROM {db_prefix}log_banned AS lb
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lb.id_member)
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items}',
-			array(
+			[
 				'blank_string' => '',
 				'dash' => '-',
 				'sort' => $sort,
 				'start' => $start,
 				'items' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['ip'] = $row['ip'] === null ? '-' : new IP($row['ip']);
 			$log_entries[] = $row;
 		}
@@ -1536,13 +1504,14 @@ public static function list_getBanLogEntries($start, $items_per_page, $sort): ar
 	 */
 	public static function list_getNumBanLogEntries(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_banned AS lb',
-			array(
-			)
+			[
+			],
 		);
-		list ($num_entries) = Db::$db->fetch_row($request);
+		list($num_entries) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $num_entries;
@@ -1610,43 +1579,44 @@ protected function __construct()
 		Theme::loadTemplate('ManageBans');
 
 		// Tab data might already be set if this was called from Logs::execute().
-		if (empty(Menu::$loaded['admin']->tab_data))
-		{
+		if (empty(Menu::$loaded['admin']->tab_data)) {
 			// Tabs for browsing the different ban functions.
-			Menu::$loaded['admin']->tab_data = array(
+			Menu::$loaded['admin']->tab_data = [
 				'title' => Lang::$txt['ban_title'],
 				'help' => 'ban_members',
 				'description' => Lang::$txt['ban_description'],
-				'tabs' => array(
-					'list' => array(
+				'tabs' => [
+					'list' => [
 						'description' => Lang::$txt['ban_description'],
 						'href' => Config::$scripturl . '?action=admin;area=ban;sa=list',
-					),
-					'add' => array(
+					],
+					'add' => [
 						'description' => Lang::$txt['ban_description'],
 						'href' => Config::$scripturl . '?action=admin;area=ban;sa=add',
-					),
-					'browse' => array(
+					],
+					'browse' => [
 						'description' => Lang::$txt['ban_trigger_browse_description'],
 						'href' => Config::$scripturl . '?action=admin;area=ban;sa=browse',
-					),
-					'log' => array(
+					],
+					'log' => [
 						'description' => Lang::$txt['ban_log_description'],
 						'href' => Config::$scripturl . '?action=admin;area=ban;sa=log',
 						'is_last' => true,
-					),
-				),
-			);
+					],
+				],
+			];
 		}
 
-		IntegrationHook::call('integrate_manage_bans', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_bans', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		// Mark the appropriate menu entry as selected
-		if (array_key_exists($this->subaction, Menu::$loaded['admin']->tab_data['tabs']))
+		if (array_key_exists($this->subaction, Menu::$loaded['admin']->tab_data['tabs'])) {
 			Menu::$loaded['admin']->tab_data['tabs'][$this->subaction]['is_selected'] = true;
+		}
 
 		Utils::$context['page_title'] = Lang::$txt['ban_title'];
 		Utils::$context['sub_action'] = $this->subaction;
@@ -1660,48 +1630,44 @@ protected function edit2(): void
 		User::$me->checkSession();
 		SecurityToken::validate('admin-bet');
 
-		Utils::$context['ban_errors'] = array();
+		Utils::$context['ban_errors'] = [];
 
 		// Adding or editing a ban group
-		if (isset($_POST['add_ban']) || isset($_POST['modify_ban']))
-		{
+		if (isset($_POST['add_ban']) || isset($_POST['modify_ban'])) {
 			// Let's collect all the information we need
 			$ban_info['id'] = isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0;
 			$ban_info['is_new'] = empty($ban_info['id']);
 			$ban_info['expire_date'] = !empty($_POST['expire_date']) ? (int) $_POST['expire_date'] : 0;
-			$ban_info['expiration'] = array(
-				'status' => isset($_POST['expiration']) && in_array($_POST['expiration'], array('never', 'one_day', 'expired')) ? $_POST['expiration'] : 'never',
+			$ban_info['expiration'] = [
+				'status' => isset($_POST['expiration']) && in_array($_POST['expiration'], ['never', 'one_day', 'expired']) ? $_POST['expiration'] : 'never',
 				'days' => $ban_info['expire_date'],
-			);
+			];
 			$ban_info['db_expiration'] = $ban_info['expiration']['status'] == 'never' ? 'NULL' : ($ban_info['expiration']['status'] == 'one_day' ? time() + 24 * 60 * 60 * $ban_info['expire_date'] : 0);
 			$ban_info['full_ban'] = empty($_POST['full_ban']) ? 0 : 1;
 			$ban_info['reason'] = !empty($_POST['reason']) ? Utils::htmlspecialchars($_POST['reason'], ENT_QUOTES) : '';
 			$ban_info['name'] = !empty($_POST['ban_name']) ? Utils::htmlspecialchars($_POST['ban_name'], ENT_QUOTES) : '';
 			$ban_info['notes'] = isset($_POST['notes']) ? Utils::htmlspecialchars($_POST['notes'], ENT_QUOTES) : '';
-			$ban_info['notes'] = str_replace(array("\r", "\n", '  '), array('', '<br>', '&nbsp; '), $ban_info['notes']);
+			$ban_info['notes'] = str_replace(["\r", "\n", '  '], ['', '<br>', '&nbsp; '], $ban_info['notes']);
 			$ban_info['cannot']['access'] = empty($ban_info['full_ban']) ? 0 : 1;
 			$ban_info['cannot']['post'] = !empty($ban_info['full_ban']) || empty($_POST['cannot_post']) ? 0 : 1;
 			$ban_info['cannot']['register'] = !empty($ban_info['full_ban']) || empty($_POST['cannot_register']) ? 0 : 1;
 			$ban_info['cannot']['login'] = !empty($ban_info['full_ban']) || empty($_POST['cannot_login']) ? 0 : 1;
 
-			IntegrationHook::call('integrate_edit_bans', array(&$ban_info, empty($_REQUEST['bg'])));
+			IntegrationHook::call('integrate_edit_bans', [&$ban_info, empty($_REQUEST['bg'])]);
 
 			// Limit 'reason' characters
 			$ban_info['reason'] = Utils::truncate($ban_info['reason'], 255);
 
 			// Adding a new ban group
-			if (empty($_REQUEST['bg']))
-			{
+			if (empty($_REQUEST['bg'])) {
 				$ban_group_id = $this->insertBanGroup($ban_info);
 			}
 			// Editing an existing ban group
-			else
-			{
+			else {
 				$ban_group_id = $this->updateBanGroup($ban_info);
 			}
 
-			if (is_numeric($ban_group_id))
-			{
+			if (is_numeric($ban_group_id)) {
 				$ban_info['id'] = $ban_group_id;
 				$ban_info['is_new'] = false;
 			}
@@ -1709,47 +1675,43 @@ protected function edit2(): void
 			Utils::$context['ban'] = $ban_info;
 		}
 
-		if (isset($_POST['ban_suggestions']))
-		{
+		if (isset($_POST['ban_suggestions'])) {
 			// @TODO: is $_REQUEST['bi'] ever set?
 			$saved_triggers = $this->saveTriggers($_POST['ban_suggestions'], $ban_info['id'], (int) ($_REQUEST['u'] ?? 0), (int) ($_REQUEST['bi'] ?? 0));
 		}
 
 		// Something went wrong somewhere... Oh well, let's go back.
-		if (!empty(Utils::$context['ban_errors']))
-		{
-			Utils::$context['ban_suggestions'] = !empty($saved_triggers) ? $saved_triggers : array();
+		if (!empty(Utils::$context['ban_errors'])) {
+			Utils::$context['ban_suggestions'] = !empty($saved_triggers) ? $saved_triggers : [];
 
-			if (isset($_REQUEST['u']))
-			{
+			if (isset($_REQUEST['u'])) {
 				Utils::$context['ban']['from_user'] = true;
 				Utils::$context['ban_suggestions'] = array_merge(Utils::$context['ban_suggestions'], $this->getMemberData((int) $_REQUEST['u']));
 			}
 
 			// Not strictly necessary, but it's nice
-			if (!empty(Utils::$context['ban_suggestions']['member']['id']))
-			{
+			if (!empty(Utils::$context['ban_suggestions']['member']['id'])) {
 				Utils::$context['ban_suggestions']['other_ips'] = $this->banLoadAdditionalIPs(Utils::$context['ban_suggestions']['member']['id']);
 			}
 
 			$this->edit();
+
 			return;
 		}
 
-		Utils::$context['ban_suggestions']['saved_triggers'] = !empty($saved_triggers) ? $saved_triggers : array();
+		Utils::$context['ban_suggestions']['saved_triggers'] = !empty($saved_triggers) ? $saved_triggers : [];
 
-		if (isset($_POST['ban_items']))
-		{
+		if (isset($_POST['ban_items'])) {
 			$ban_group_id = isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0;
 			array_map('intval', $_POST['ban_items']);
 
 			self::removeBanTriggers($_POST['ban_items'], $ban_group_id);
 		}
 
-		IntegrationHook::call('integrate_edit_bans_post', array());
+		IntegrationHook::call('integrate_edit_bans_post', []);
 
 		// Register the last modified date.
-		Config::updateModSettings(array('banLastUpdated' => time()));
+		Config::updateModSettings(['banLastUpdated' => time()]);
 
 		// Update the member table to represent the new ban situation.
 		self::updateBanMembers();
@@ -1767,19 +1729,20 @@ protected function banLoadAdditionalIPs($member_id): array
 		// Borrowing a few language strings from profile.
 		Lang::load('Profile');
 
-		$search_list = array();
-		IntegrationHook::call('integrate_load_addtional_ip_ban', array(&$search_list));
+		$search_list = [];
+		IntegrationHook::call('integrate_load_addtional_ip_ban', [&$search_list]);
 
-		$search_list += array(
-			'ips_in_messages' => array($this, 'banLoadAdditionalIPsMember'),
-			'ips_in_errors' => array($this, 'banLoadAdditionalIPsError'),
-		);
+		$search_list += [
+			'ips_in_messages' => [$this, 'banLoadAdditionalIPsMember'],
+			'ips_in_errors' => [$this, 'banLoadAdditionalIPsError'],
+		];
+
+		$return = [];
 
-		$return = array();
-		foreach ($search_list as $key => $callable)
-		{
-			if (is_callable($callable))
+		foreach ($search_list as $key => $callable) {
+			if (is_callable($callable)) {
 				$return[$key] = call_user_func($callable, $member_id);
+			}
 		}
 
 		return $return;
@@ -1794,20 +1757,21 @@ protected function banLoadAdditionalIPs($member_id): array
 	protected function banLoadAdditionalIPsMember($member_id): array
 	{
 		// Find some additional IP's used by this member.
-		$message_ips = array();
+		$message_ips = [];
 
-		$request = Db::$db->query('', '
-			SELECT DISTINCT poster_ip
+		$request = Db::$db->query(
+			'',
+			'SELECT DISTINCT poster_ip
 			FROM {db_prefix}messages
 			WHERE id_member = {int:current_user}
 				AND poster_ip IS NOT NULL
 			ORDER BY poster_ip',
-			array(
+			[
 				'current_user' => $member_id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$message_ips[] = new IP($row['poster_ip']);
 		}
 		Db::$db->free_result($request);
@@ -1823,20 +1787,21 @@ protected function banLoadAdditionalIPsMember($member_id): array
 	 */
 	protected function banLoadAdditionalIPsError($member_id): array
 	{
-		$error_ips = array();
+		$error_ips = [];
 
-		$request = Db::$db->query('', '
-			SELECT DISTINCT ip
+		$request = Db::$db->query(
+			'',
+			'SELECT DISTINCT ip
 			FROM {db_prefix}log_errors
 			WHERE id_member = {int:current_user}
 				AND ip IS NOT NULL
 			ORDER BY ip',
-			array(
+			[
 				'current_user' => $member_id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$error_ips[] = new IP($row['ip']);
 		}
 		Db::$db->free_result($request);
@@ -1857,48 +1822,41 @@ protected function banLoadAdditionalIPsError($member_id): array
 	 */
 	protected function saveTriggers(array $suggestions, $ban_group, $member = 0, $ban_id = 0)
 	{
-		$triggers = array(
+		$triggers = [
 			'main_ip' => '',
 			'hostname' => '',
 			'email' => '',
-			'member' => array(
+			'member' => [
 				'id' => $member,
-			)
-		);
+			],
+		];
 
-		foreach ($suggestions as $key => $value)
-		{
-			if (is_array($value))
-			{
+		foreach ($suggestions as $key => $value) {
+			if (is_array($value)) {
 				$triggers[$key] = $value;
-			}
-			else
-			{
+			} else {
 				$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
 			}
 		}
 
 		$ban_triggers = $this->validateTriggers($triggers);
 
-		IntegrationHook::call('integrate_save_triggers', array(&$ban_triggers, &$ban_group));
+		IntegrationHook::call('integrate_save_triggers', [&$ban_triggers, &$ban_group]);
 
 		// Time to save!
-		if (!empty($ban_triggers['ban_triggers']) && empty(Utils::$context['ban_errors']))
-		{
-			if (empty($ban_id))
-			{
+		if (!empty($ban_triggers['ban_triggers']) && empty(Utils::$context['ban_errors'])) {
+			if (empty($ban_id)) {
 				$this->addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
-			}
-			else
-			{
+			} else {
 				$this->updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
 			}
 		}
 
-		if (!empty(Utils::$context['ban_errors']))
+		if (!empty(Utils::$context['ban_errors'])) {
 			return $triggers;
+		}
 
-		return array();
+		return [];
 	}
 
 	/**
@@ -1911,35 +1869,39 @@ protected function saveTriggers(array $suggestions, $ban_group, $member = 0, $ba
 	 */
 	protected function removeBanGroups($group_ids): bool
 	{
-		if (!is_array($group_ids))
-			$group_ids = array($group_ids);
+		if (!is_array($group_ids)) {
+			$group_ids = [$group_ids];
+		}
 
 		$group_ids = array_unique($group_ids);
 
-		if (empty($group_ids))
+		if (empty($group_ids)) {
 			return false;
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}ban_groups
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}ban_groups
 			WHERE id_ban_group IN ({array_int:ban_list})',
-			array(
+			[
 				'ban_list' => $group_ids,
-			)
+			],
 		);
 
 		// Remove all ban triggers for these bans groups
-		$request = Db::$db->query('', '
-			SELECT id_ban
+		$request = Db::$db->query(
+			'',
+			'SELECT id_ban
 			FROM {db_prefix}ban_items
 			WHERE id_ban_group IN ({array_int:ban_list})',
-			array(
+			[
 				'ban_list' => $group_ids,
-			)
+			],
 		);
 
-		$id_ban_triggers = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$id_ban_triggers = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$id_ban_triggers[] = $row['id_ban'];
 		}
 		Db::$db->free_result($request);
@@ -1957,29 +1919,29 @@ protected function removeBanGroups($group_ids): bool
 	 * @param array $ids IDs of the log entries to remove, or empty to remove all.
 	 * @return bool Returns true if successful or false if $ids is invalid.
 	 */
-	protected function removeBanLogs($ids = array()): bool
+	protected function removeBanLogs($ids = []): bool
 	{
-		if (empty($ids))
-		{
-			Db::$db->query('truncate_table', '
-				TRUNCATE {db_prefix}log_banned',
-				array(
-				)
+		if (empty($ids)) {
+			Db::$db->query(
+				'truncate_table',
+				'TRUNCATE {db_prefix}log_banned',
+				[
+				],
 			);
-		}
-		else
-		{
+		} else {
 			$ids = array_filter(array_unique(array_map('intval', (array) $ids)));
 
-			if (empty($ids))
+			if (empty($ids)) {
 				return false;
+			}
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_banned
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_banned
 				WHERE id_ban_log IN ({array_int:ban_list})',
-				array(
+				[
 					'ban_list' => $ids,
-				)
+				],
 			);
 		}
 
@@ -1996,69 +1958,60 @@ protected function removeBanLogs($ids = array()): bool
 	 */
 	protected function validateTriggers(&$triggers): array
 	{
-		if (empty($triggers))
+		if (empty($triggers)) {
 			Utils::$context['ban_errors'][] = 'ban_empty_triggers';
+		}
 
-		$ban_triggers = array();
-		$log_info = array();
+		$ban_triggers = [];
+		$log_info = [];
 
-		foreach ($triggers as $key => $value)
-		{
-			if (!empty($value))
-			{
-				if ($key == 'member')
+		foreach ($triggers as $key => $value) {
+			if (!empty($value)) {
+				if ($key == 'member') {
 					continue;
+				}
 
-				if ($key == 'main_ip')
-				{
+				if ($key == 'main_ip') {
 					$value = trim($value);
 					$ip_range = IP::ip2range($value);
 
-					if (!$this->checkExistingTriggerIP($ip_range, $value))
-					{
+					if (!$this->checkExistingTriggerIP($ip_range, $value)) {
 						Utils::$context['ban_errors'][] = 'invalid_ip';
-					}
-					else
-					{
-						$ban_triggers['main_ip'] = array(
+					} else {
+						$ban_triggers['main_ip'] = [
 							'ip_low' => $ip_range['low'],
-							'ip_high' => $ip_range['high']
-						);
+							'ip_high' => $ip_range['high'],
+						];
 					}
-				}
-				elseif ($key == 'hostname')
-				{
-					if (preg_match('/[^\w.\-*]/', $value) == 1)
-					{
+				} elseif ($key == 'hostname') {
+					if (preg_match('/[^\w.\-*]/', $value) == 1) {
 						Utils::$context['ban_errors'][] = 'invalid_hostname';
-					}
-					else
-					{
+					} else {
 						// Replace the * wildcard by a MySQL wildcard %.
 						$value = substr(str_replace('*', '%', $value), 0, 255);
 
 						$ban_triggers['hostname']['hostname'] = $value;
 					}
-				}
-				elseif ($key == 'email')
-				{
-					if (preg_match('/[^\w.\-\+*@]/', $value) == 1)
+				} elseif ($key == 'email') {
+					if (preg_match('/[^\w.\-\+*@]/', $value) == 1) {
 						Utils::$context['ban_errors'][] = 'invalid_email';
+					}
 
 					// Check the user is not banning an admin.
-					$request = Db::$db->query('', '
-						SELECT id_member
+					$request = Db::$db->query(
+						'',
+						'SELECT id_member
 						FROM {db_prefix}members
 						WHERE (id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0)
 							AND email_address LIKE {string:email}
 						LIMIT 1',
-						array(
+						[
 							'admin_group' => 1,
 							'email' => $value,
-						)
+						],
 					);
-					if (Db::$db->num_rows($request) != 0)
-					{
+
+					if (Db::$db->num_rows($request) != 0) {
 						Utils::$context['ban_errors'][] = 'no_ban_admin';
 					}
 					Db::$db->free_result($request);
@@ -2066,87 +2019,75 @@ protected function validateTriggers(&$triggers): array
 					$value = substr(strtolower(str_replace('*', '%', $value)), 0, 255);
 
 					$ban_triggers['email']['email_address'] = $value;
-				}
-				elseif ($key == 'user')
-				{
+				} elseif ($key == 'user') {
 					$user = preg_replace('~&amp;#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', Utils::htmlspecialchars($value, ENT_QUOTES));
 
-					$request = Db::$db->query('', '
-						SELECT id_member, (id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0) AS isAdmin
+					$request = Db::$db->query(
+						'',
+						'SELECT id_member, (id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0) AS isAdmin
 						FROM {db_prefix}members
 						WHERE member_name = {string:username} OR real_name = {string:username}
 						LIMIT 1',
-						array(
+						[
 							'admin_group' => 1,
 							'username' => $user,
-						)
+						],
 					);
-					if (Db::$db->num_rows($request) == 0)
-					{
+
+					if (Db::$db->num_rows($request) == 0) {
 						Utils::$context['ban_errors'][] = 'invalid_username';
 					}
-					list ($value, $isAdmin) = Db::$db->fetch_row($request);
+					list($value, $isAdmin) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
-					if ($isAdmin && strtolower($isAdmin) != 'f')
-					{
+					if ($isAdmin && strtolower($isAdmin) != 'f') {
 						unset($value);
 						Utils::$context['ban_errors'][] = 'no_ban_admin';
-					}
-					else
-					{
+					} else {
 						$ban_triggers['user']['id_member'] = $value;
 					}
-				}
-				elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-				{
+				} elseif (in_array($key, ['ips_in_messages', 'ips_in_errors'])) {
 					// Special case, those two are arrays themselves
 					$values = array_unique($value);
 					unset($value);
 
 					// Don't add the main IP again.
-					if (isset($triggers['main_ip']))
-						$values = array_diff($values, array($triggers['main_ip']));
+					if (isset($triggers['main_ip'])) {
+						$values = array_diff($values, [$triggers['main_ip']]);
+					}
 
-					foreach ($values as $val)
-					{
+					foreach ($values as $val) {
 						$val = trim($val);
 						$ip_range = IP::ip2range($val);
 
-						if (!$this->checkExistingTriggerIP($ip_range, $val))
-						{
+						if (!$this->checkExistingTriggerIP($ip_range, $val)) {
 							Utils::$context['ban_errors'][] = 'invalid_ip';
-						}
-						else
-						{
-							$ban_triggers[$key][] = array(
+						} else {
+							$ban_triggers[$key][] = [
 								'ip_low' => $ip_range['low'],
 								'ip_high' => $ip_range['high'],
-							);
+							];
 
-							$log_info[] = array(
+							$log_info[] = [
 								'value' => $val,
 								'bantype' => 'ip_range',
-							);
+							];
 						}
 					}
-				}
-				else
-				{
+				} else {
 					Utils::$context['ban_errors'][] = 'no_bantype_selected';
 				}
 
-				if (isset($value) && !is_array($value))
-				{
-					$log_info[] = array(
+				if (isset($value) && !is_array($value)) {
+					$log_info[] = [
 						'value' => $value,
 						'bantype' => $key,
-					);
+					];
 				}
 			}
 		}
 
-		return array('ban_triggers' => $ban_triggers, 'log_info' => $log_info);
+		return ['ban_triggers' => $ban_triggers, 'log_info' => $log_info];
 	}
 
 	/**
@@ -2158,33 +2099,34 @@ protected function validateTriggers(&$triggers): array
 	 */
 	protected function checkExistingTriggerIP($ip_array, $fullip = ''): bool
 	{
-		$values = array(
+		$values = [
 			'ip_low' => $ip_array['low'],
-			'ip_high' => $ip_array['high']
-		);
+			'ip_high' => $ip_array['high'],
+		];
 
 		$is_valid = true;
 
-		$request = Db::$db->query('', '
-			SELECT bg.id_ban_group, bg.name
+		$request = Db::$db->query(
+			'',
+			'SELECT bg.id_ban_group, bg.name
 			FROM {db_prefix}ban_groups AS bg
 			INNER JOIN {db_prefix}ban_items AS bi ON
 				(bi.id_ban_group = bg.id_ban_group)
 				AND ip_low = {inet:ip_low} AND ip_high = {inet:ip_high}
 			LIMIT 1',
-			$values
+			$values,
 		);
-		if (Db::$db->num_rows($request) != 0)
-		{
+
+		if (Db::$db->num_rows($request) != 0) {
 			$is_valid = false;
 
 			$row = Db::$db->fetch_assoc($request);
 
 			// @todo Why do we die on this error, but not others?
-			ErrorHandler::fatalLang('ban_trigger_already_exists', false, array(
+			ErrorHandler::fatalLang('ban_trigger_already_exists', false, [
 				$fullip,
 				'<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>',
-			));
+			]);
 		}
 		Db::$db->free_result($request);
 
@@ -2202,56 +2144,58 @@ protected function checkExistingTriggerIP($ip_array, $fullip = ''): bool
 	 * @param array $logs The log data.
 	 * @return bool Whether or not the action was successful.
 	 */
-	protected function addTriggers($group_id = 0, $triggers = array(), $logs = array()): bool
+	protected function addTriggers($group_id = 0, $triggers = [], $logs = []): bool
 	{
-		if (empty($group_id))
+		if (empty($group_id)) {
 			Utils::$context['ban_errors'][] = 'ban_id_empty';
+		}
 
 		// Preset all values that are required.
-		$values = array(
+		$values = [
 			'id_ban_group' => $group_id,
 			'hostname' => '',
 			'email_address' => '',
 			'id_member' => 0,
 			'ip_low' => 'null',
 			'ip_high' => 'null',
-		);
+		];
 
-		$insertKeys = array(
+		$insertKeys = [
 			'id_ban_group' => 'int',
 			'hostname' => 'string',
 			'email_address' => 'string',
 			'id_member' => 'int',
 			'ip_low' => 'inet',
 			'ip_high' => 'inet',
-		);
+		];
+
+		$insertTriggers = [];
 
-		$insertTriggers = array();
-		foreach ($triggers as $key => $trigger)
-		{
+		foreach ($triggers as $key => $trigger) {
 			// Exceptions, exceptions, exceptions...always exceptions... :P
-			if (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-			{
-				foreach ($trigger as $real_trigger)
+			if (in_array($key, ['ips_in_messages', 'ips_in_errors'])) {
+				foreach ($trigger as $real_trigger) {
 					$insertTriggers[] = array_merge($values, $real_trigger);
-			}
-			else
-			{
+				}
+			} else {
 				$insertTriggers[] = array_merge($values, $trigger);
 			}
 		}
 
-		if (empty($insertTriggers))
+		if (empty($insertTriggers)) {
 			Utils::$context['ban_errors'][] = 'ban_no_triggers';
+		}
 
-		if (!empty(Utils::$context['ban_errors']))
+		if (!empty(Utils::$context['ban_errors'])) {
 			return false;
+		}
 
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}ban_items',
 			$insertKeys,
 			$insertTriggers,
-			array('id_ban')
+			['id_ban'],
 		);
 
 		self::logTriggersUpdates($logs, true);
@@ -2269,43 +2213,48 @@ protected function addTriggers($group_id = 0, $triggers = array(), $logs = array
 	 * @param array $trigger An array of triggers.
 	 * @param array $logs An array of log info.
 	 */
-	protected function updateTriggers($ban_item = 0, $group_id = 0, $trigger = array(), $logs = array()): void
+	protected function updateTriggers($ban_item = 0, $group_id = 0, $trigger = [], $logs = []): void
 	{
-		if (empty($ban_item))
+		if (empty($ban_item)) {
 			Utils::$context['ban_errors'][] = 'ban_ban_item_empty';
+		}
 
-		if (empty($group_id))
+		if (empty($group_id)) {
 			Utils::$context['ban_errors'][] = 'ban_id_empty';
+		}
 
-		if (empty($trigger))
+		if (empty($trigger)) {
 			Utils::$context['ban_errors'][] = 'ban_no_triggers';
+		}
 
-		if (!empty(Utils::$context['ban_errors']))
+		if (!empty(Utils::$context['ban_errors'])) {
 			return;
+		}
 
 		// Preset all values that are required.
-		$values = array(
+		$values = [
 			'id_ban_group' => $group_id,
 			'hostname' => '',
 			'email_address' => '',
 			'id_member' => 0,
 			'ip_low' => 'null',
 			'ip_high' => 'null',
-		);
+		];
 
 		$trigger = array_merge($values, $trigger);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}ban_items
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}ban_items
 			SET
 				hostname = {string:hostname}, email_address = {string:email_address}, id_member = {int:id_member},
 				ip_low = {inet:ip_low}, ip_high = {inet:ip_high}
 			WHERE id_ban = {int:ban_item}
 				AND id_ban_group = {int:id_ban_group}',
-			array_merge($trigger, array(
+			array_merge($trigger, [
 				'id_ban_group' => $group_id,
 				'ban_item' => $ban_item,
-			))
+			]),
 		);
 
 		self::logTriggersUpdates($logs, false);
@@ -2320,68 +2269,69 @@ protected function updateTriggers($ban_item = 0, $group_id = 0, $trigger = array
 	 *    Should have name and may also have an id.
 	 * @return int The ban group's ID.
 	 */
-	protected function updateBanGroup($ban_info = array()): int
+	protected function updateBanGroup($ban_info = []): int
 	{
-		if (empty($ban_info['name']))
+		if (empty($ban_info['name'])) {
 			Utils::$context['ban_errors'][] = 'ban_name_empty';
+		}
 
-		if (empty($ban_info['id']))
+		if (empty($ban_info['id'])) {
 			Utils::$context['ban_errors'][] = 'ban_id_empty';
+		}
 
 		if (
 			empty($ban_info['cannot']['access'])
 			&& empty($ban_info['cannot']['register'])
 			&& empty($ban_info['cannot']['post'])
 			&& empty($ban_info['cannot']['login'])
-		)
-		{
+		) {
 			Utils::$context['ban_errors'][] = 'ban_unknown_restriction_type';
 		}
 
-		if (!empty($ban_info['id']))
-		{
+		if (!empty($ban_info['id'])) {
 			// Verify the ban group exists.
-			$request = Db::$db->query('', '
-				SELECT id_ban_group
+			$request = Db::$db->query(
+				'',
+				'SELECT id_ban_group
 				FROM {db_prefix}ban_groups
 				WHERE id_ban_group = {int:ban_group}
 				LIMIT 1',
-				array(
-					'ban_group' => $ban_info['id']
-				)
+				[
+					'ban_group' => $ban_info['id'],
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				Utils::$context['ban_errors'][] = 'ban_not_found';
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (!empty($ban_info['name']))
-		{
+		if (!empty($ban_info['name'])) {
 			// Make sure the name does not already exist (Of course, if it exists in the ban group we are editing, proceed.)
-			$request = Db::$db->query('', '
-				SELECT id_ban_group
+			$request = Db::$db->query(
+				'',
+				'SELECT id_ban_group
 				FROM {db_prefix}ban_groups
 				WHERE name = {string:new_ban_name}
 					AND id_ban_group != {int:ban_group}
 				LIMIT 1',
-				array(
+				[
 					'ban_group' => empty($ban_info['id']) ? 0 : $ban_info['id'],
 					'new_ban_name' => $ban_info['name'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) != 0)
-			{
+
+			if (Db::$db->num_rows($request) != 0) {
 				Utils::$context['ban_errors'][] = 'ban_name_exists';
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (empty(Utils::$context['ban_errors']))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}ban_groups
+		if (empty(Utils::$context['ban_errors'])) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}ban_groups
 				SET
 					name = {string:ban_name},
 					reason = {string:reason},
@@ -2392,7 +2342,7 @@ protected function updateBanGroup($ban_info = array()): int
 					cannot_register = {int:cannot_register},
 					cannot_login = {int:cannot_login}
 				WHERE id_ban_group = {int:id_ban_group}',
-				array(
+				[
 					'expiration' => $ban_info['db_expiration'],
 					'cannot_access' => $ban_info['cannot']['access'],
 					'cannot_post' => $ban_info['cannot']['post'],
@@ -2402,7 +2352,7 @@ protected function updateBanGroup($ban_info = array()): int
 					'ban_name' => $ban_info['name'],
 					'reason' => $ban_info['reason'],
 					'notes' => $ban_info['notes'],
-				)
+				],
 			);
 		}
 
@@ -2420,61 +2370,63 @@ protected function updateBanGroup($ban_info = array()): int
 	 * @param array $ban_info An array containing 'name', which is the name of the ban group.
 	 * @return int|false The ban group's ID, or false on error.
 	 */
-	protected function insertBanGroup($ban_info = array()): int|false
+	protected function insertBanGroup($ban_info = []): int|false
 	{
-		if (empty($ban_info['name']))
+		if (empty($ban_info['name'])) {
 			Utils::$context['ban_errors'][] = 'ban_name_empty';
+		}
 
 		if (
 			empty($ban_info['cannot']['access'])
 			&& empty($ban_info['cannot']['register'])
 			&& empty($ban_info['cannot']['post'])
 			&& empty($ban_info['cannot']['login'])
-		)
-		{
+		) {
 			Utils::$context['ban_errors'][] = 'ban_unknown_restriction_type';
 		}
 
-		if (!empty($ban_info['name']))
-		{
+		if (!empty($ban_info['name'])) {
 			// Check whether a ban with this name already exists.
-			$request = Db::$db->query('', '
-				SELECT id_ban_group
+			$request = Db::$db->query(
+				'',
+				'SELECT id_ban_group
 				FROM {db_prefix}ban_groups
 				WHERE name = {string:new_ban_name}' . '
 				LIMIT 1',
-				array(
+				[
 					'new_ban_name' => $ban_info['name'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 1)
-			{
+
+			if (Db::$db->num_rows($request) == 1) {
 				Utils::$context['ban_errors'][] = 'ban_name_exists';
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (!empty(Utils::$context['ban_errors']))
+		if (!empty(Utils::$context['ban_errors'])) {
 			return false;
+		}
 
 		// Yes yes, we're ready to add now.
-		$ban_info['id'] = Db::$db->insert('',
+		$ban_info['id'] = Db::$db->insert(
+			'',
 			'{db_prefix}ban_groups',
-			array(
+			[
 				'name' => 'string-20', 'ban_time' => 'int', 'expire_time' => 'raw', 'cannot_access' => 'int', 'cannot_register' => 'int',
 				'cannot_post' => 'int', 'cannot_login' => 'int', 'reason' => 'string-255', 'notes' => 'string-65534',
-			),
-			array(
+			],
+			[
 				$ban_info['name'], time(), $ban_info['db_expiration'], $ban_info['cannot']['access'], $ban_info['cannot']['register'],
 				$ban_info['cannot']['post'], $ban_info['cannot']['login'], $ban_info['reason'], $ban_info['notes'],
-			),
-			array('id_ban_group'),
-			1
+			],
+			['id_ban_group'],
+			1,
 		);
 
-		if (empty($ban_info['id']))
-		{
+		if (empty($ban_info['id'])) {
 			Utils::$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+
 			return false;
 		}
 
@@ -2489,19 +2441,20 @@ protected function insertBanGroup($ban_info = array()): int|false
 	 */
 	protected function getMemberData($id): array
 	{
-		$suggestions = array();
+		$suggestions = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name, member_ip, email_address
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, member_ip, email_address
 			FROM {db_prefix}members
 			WHERE id_member = {int:current_user}
 			LIMIT 1',
-			array(
+			[
 				'current_user' => $id,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) > 0)
-		{
+
+		if (Db::$db->num_rows($request) > 0) {
 			list($suggestions['member']['id'], $suggestions['member']['name'], $suggestions['main_ip'], $suggestions['email']) = Db::$db->fetch_row($request);
 
 			$suggestions['main_ip'] = new IP($suggestions['main_ip']);
@@ -2525,90 +2478,86 @@ protected function getMemberData($id): array
 	 *    If null, the triggers will be deleted from all groups.
 	 * @return bool Whether the operation was successful.
 	 */
-	protected static function removeBanTriggers($items_ids = array(), $group_id = null): bool
+	protected static function removeBanTriggers($items_ids = [], $group_id = null): bool
 	{
-		if (isset($group_id))
+		if (isset($group_id)) {
 			$group_id = (int) $group_id;
+		}
 
-		if (empty($group_id) && empty($items_ids))
+		if (empty($group_id) && empty($items_ids)) {
 			return false;
+		}
 
-		if (!is_array($items_ids))
-			$items_ids = array($items_ids);
+		if (!is_array($items_ids)) {
+			$items_ids = [$items_ids];
+		}
 
-		$log_info = array();
-		$ban_items = array();
+		$log_info = [];
+		$ban_items = [];
 
-		IntegrationHook::call('integrate_remove_triggers', array(&$items_ids, $group_id));
+		IntegrationHook::call('integrate_remove_triggers', [&$items_ids, $group_id]);
 
 		// First order of business: Load up the info so we can log this...
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				bi.id_ban, bi.hostname, bi.email_address, bi.id_member, bi.hits,
 				bi.ip_low, bi.ip_high,
 				COALESCE(mem.id_member, 0) AS id_member, mem.member_name, mem.real_name
 			FROM {db_prefix}ban_items AS bi
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = bi.id_member)
 			WHERE bi.id_ban IN ({array_int:ban_list})',
-			array(
+			[
 				'ban_list' => $items_ids,
-			)
+			],
 		);
+
 		// Get all the info for the log
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!empty($row['id_ban']))
-			{
-				$ban_items[$row['id_ban']] = array(
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!empty($row['id_ban'])) {
+				$ban_items[$row['id_ban']] = [
 					'id' => $row['id_ban'],
-				);
+				];
 
-				if (!empty($row['ip_high']))
-				{
+				if (!empty($row['ip_high'])) {
 					$ban_items[$row['id_ban']]['type'] = 'ip';
 					$ban_items[$row['id_ban']]['ip'] = IP::range2ip($row['ip_low'], $row['ip_high']);
 
 					$is_range = (strpos($ban_items[$row['id_ban']]['ip'], '-') !== false || strpos($ban_items[$row['id_ban']]['ip'], '*') !== false);
 
-					$log_info[] = array(
+					$log_info[] = [
 						'bantype' => ($is_range ? 'ip_range' : 'main_ip'),
 						'value' => $ban_items[$row['id_ban']]['ip'],
-					);
-				}
-				elseif (!empty($row['hostname']))
-				{
+					];
+				} elseif (!empty($row['hostname'])) {
 					$ban_items[$row['id_ban']]['type'] = 'hostname';
 					$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
 
-					$log_info[] = array(
+					$log_info[] = [
 						'bantype' => 'hostname',
 						'value' => $row['hostname'],
-					);
-				}
-				elseif (!empty($row['email_address']))
-				{
+					];
+				} elseif (!empty($row['email_address'])) {
 					$ban_items[$row['id_ban']]['type'] = 'email';
 					$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
 
-					$log_info[] = array(
+					$log_info[] = [
 						'bantype' => 'email',
 						'value' => $ban_items[$row['id_ban']]['email'],
-					);
-				}
-				elseif (!empty($row['id_member']))
-				{
+					];
+				} elseif (!empty($row['id_member'])) {
 					$ban_items[$row['id_ban']]['type'] = 'user';
-					$ban_items[$row['id_ban']]['user'] = array(
+					$ban_items[$row['id_ban']]['user'] = [
 						'id' => $row['id_member'],
 						'name' => $row['real_name'],
 						'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
 						'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
-					);
+					];
 
-					$log_info[] = array(
+					$log_info[] = [
 						'bantype' => 'user',
 						'value' => $row['id_member'],
-					);
+					];
 				}
 			}
 		}
@@ -2617,26 +2566,25 @@ protected static function removeBanTriggers($items_ids = array(), $group_id = nu
 		// Log this!
 		self::logTriggersUpdates($log_info, false, true);
 
-		if (isset($group_id))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}ban_items
+		if (isset($group_id)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}ban_items
 				WHERE id_ban IN ({array_int:ban_list})
 					AND id_ban_group = {int:ban_group}',
-				array(
+				[
 					'ban_list' => $items_ids,
 					'ban_group' => $group_id,
-				)
+				],
 			);
-		}
-		elseif (!empty($items_ids))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}ban_items
+		} elseif (!empty($items_ids)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}ban_items
 				WHERE id_ban IN ({array_int:ban_list})',
-				array(
+				[
 					'ban_list' => $items_ids,
-				)
+				],
 			);
 		}
 
@@ -2654,32 +2602,33 @@ protected static function removeBanTriggers($items_ids = array(), $group_id = nu
 	 */
 	protected static function logTriggersUpdates($logs, $new = true, $removal = false): void
 	{
-		if (empty($logs))
+		if (empty($logs)) {
 			return;
+		}
 
-		$log_name_map = array(
+		$log_name_map = [
 			'main_ip' => 'ip_range',
 			'hostname' => 'hostname',
 			'email' => 'email',
 			'user' => 'member',
 			'ip_range' => 'ip_range',
-		);
+		];
 
 		// Log the addion of the ban entries into the moderation log.
-		foreach ($logs as $log)
-		{
-			Logging::logAction('ban' . ($removal == true ? 'remove' : ''), array(
+		foreach ($logs as $log) {
+			Logging::logAction('ban' . ($removal == true ? 'remove' : ''), [
 				$log_name_map[$log['bantype']] => $log['value'],
 				'new' => empty($new) ? 0 : 1,
 				'remove' => empty($removal) ? 0 : 1,
 				'type' => $log['bantype'],
-			));
+			]);
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Bans::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Bans::exportStatic')) {
 	Bans::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Boards.php b/Sources/Actions/Admin/Boards.php
index 31c4dba475..16d40e1ffa 100644
--- a/Sources/Actions/Admin/Boards.php
+++ b/Sources/Actions/Admin/Boards.php
@@ -13,13 +13,13 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\IntegrationHook;
@@ -30,7 +30,6 @@
 use SMF\Url;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Manages and maintains the boards and categories of the forum.
@@ -44,13 +43,12 @@ class Boards implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageBoards',
-			'getConfigVars' => false,
-		),
-	);
+			'editBoardSettings' => 'EditBoardSettings',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -81,17 +79,17 @@ class Boards implements ActionInterface
 	 *
 	 * Format: 'sub-action' => array('function', 'permission')
 	 */
-	public static array $subactions = array(
-		'main' => array('main', 'manage_boards'),
-		'board' => array('editBoard', 'manage_boards'),
-		'board2' => array('editBoard2', 'manage_boards'),
-		'cat' => array('editCategory', 'manage_boards'),
-		'cat2' => array('editCategory2', 'manage_boards'),
-		'move' => array('main', 'manage_boards'),
-		'newcat' => array('editCategory', 'manage_boards'),
-		'newboard' => array('editBoard', 'manage_boards'),
-		'settings' => array('settings', 'admin_forum'),
-	);
+	public static array $subactions = [
+		'main' => ['main', 'manage_boards'],
+		'board' => ['editBoard', 'manage_boards'],
+		'board2' => ['editBoard2', 'manage_boards'],
+		'cat' => ['editCategory', 'manage_boards'],
+		'cat2' => ['editCategory2', 'manage_boards'],
+		'move' => ['main', 'manage_boards'],
+		'newcat' => ['editCategory', 'manage_boards'],
+		'newboard' => ['editBoard', 'manage_boards'],
+		'settings' => ['settings', 'admin_forum'],
+	];
 
 	/*********************
 	 * Internal properties
@@ -123,10 +121,11 @@ public function execute(): void
 		// Have you got the proper permissions?
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -141,26 +140,22 @@ public function main(): void
 	{
 		Theme::loadTemplate('ManageBoards');
 
-		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'move' && in_array($_REQUEST['move_to'], array('child', 'before', 'after', 'top')))
-		{
+		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'move' && in_array($_REQUEST['move_to'], ['child', 'before', 'after', 'top'])) {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-bm-' . (int) $_REQUEST['src_board'], 'request');
 
-			if ($_REQUEST['move_to'] === 'top')
-			{
-				$boardOptions = array(
+			if ($_REQUEST['move_to'] === 'top') {
+				$boardOptions = [
 					'move_to' => $_REQUEST['move_to'],
 					'target_category' => (int) $_REQUEST['target_cat'],
 					'move_first_child' => true,
-				);
-			}
-			else
-			{
-				$boardOptions = array(
+				];
+			} else {
+				$boardOptions = [
 					'move_to' => $_REQUEST['move_to'],
 					'target_board' => (int) $_REQUEST['target_board'],
 					'move_first_child' => true,
-				);
+				];
 			}
 
 			Board::modify((int) $_REQUEST['src_board'], $boardOptions);
@@ -170,21 +165,19 @@ public function main(): void
 
 		Utils::$context['move_board'] = !empty($_REQUEST['move']) && isset(Board::$loaded[(int) $_REQUEST['move']]) ? (int) $_REQUEST['move'] : 0;
 
-		Utils::$context['categories'] = array();
+		Utils::$context['categories'] = [];
 
-		foreach (Category::$loaded as $catid => $tree)
-		{
-			Utils::$context['categories'][$catid] = array(
+		foreach (Category::$loaded as $catid => $tree) {
+			Utils::$context['categories'][$catid] = [
 				'name' => &$tree->name,
 				'id' => &$tree->id,
-				'boards' => array()
-			);
+				'boards' => [],
+			];
 
 			$move_cat = !empty(Utils::$context['move_board']) && Board::$loaded[Utils::$context['move_board']]->category == $catid;
 
-			foreach (Category::$boardList[$catid] as $boardid)
-			{
-				Utils::$context['categories'][$catid]['boards'][$boardid] = array(
+			foreach (Category::$boardList[$catid] as $boardid) {
+				Utils::$context['categories'][$catid]['boards'][$boardid] = [
 					'id' => &Board::$loaded[$boardid]->id,
 					'name' => &Board::$loaded[$boardid]->name,
 					'description' => &Board::$loaded[$boardid]->description,
@@ -192,71 +185,60 @@ public function main(): void
 					'move' => $move_cat && ($boardid == Utils::$context['move_board'] || Board::isChildOf($boardid, Utils::$context['move_board'])),
 					'permission_profile' => &Board::$loaded[$boardid]->profile,
 					'is_redirect' => !empty(Board::$loaded[$boardid]->redirect),
-				);
+				];
 			}
 		}
 
-		if (!empty(Utils::$context['move_board']))
-		{
+		if (!empty(Utils::$context['move_board'])) {
 			SecurityToken::create('admin-bm-' . Utils::$context['move_board'], 'request');
 
 			Utils::$context['move_title'] = sprintf(Lang::$txt['mboards_select_destination'], Utils::htmlspecialchars(Board::$loaded[Utils::$context['move_board']]->name));
 
-			foreach (Category::$loaded as $catid => $tree)
-			{
+			foreach (Category::$loaded as $catid => $tree) {
 				$prev_child_level = 0;
 				$prev_board = 0;
-				$stack = array();
+				$stack = [];
 
 				// Just a shortcut, this is the same for all the urls
 				$security = Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['admin-bm-' . Utils::$context['move_board'] . '_token_var'] . '=' . Utils::$context['admin-bm-' . Utils::$context['move_board'] . '_token'];
 
-				foreach (Category::$boardList[$catid] as $boardid)
-				{
-					if (!isset(Utils::$context['categories'][$catid]['move_link']))
-					{
-						Utils::$context['categories'][$catid]['move_link'] = array(
+				foreach (Category::$boardList[$catid] as $boardid) {
+					if (!isset(Utils::$context['categories'][$catid]['move_link'])) {
+						Utils::$context['categories'][$catid]['move_link'] = [
 							'child_level' => 0,
 							'label' => Lang::$txt['mboards_order_before'] . ' \'' . Utils::htmlspecialchars(Board::$loaded[$boardid]->name) . '\'',
 							'href' => Config::$scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . Utils::$context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
-						);
+						];
 					}
 
-					if (!Utils::$context['categories'][$catid]['boards'][$boardid]['move'])
-					{
-						Utils::$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
-							array(
+					if (!Utils::$context['categories'][$catid]['boards'][$boardid]['move']) {
+						Utils::$context['categories'][$catid]['boards'][$boardid]['move_links'] = [
+							[
 								'child_level' => Board::$loaded[$boardid]->child_level,
 								'label' => Lang::$txt['mboards_order_after'] . '\'' . Utils::htmlspecialchars(Board::$loaded[$boardid]->name) . '\'',
 								'href' => Config::$scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . Utils::$context['move_board'] . ';target_board=' . $boardid . ';move_to=after;' . $security,
 								'class' => Board::$loaded[$boardid]->child_level > 0 ? 'above' : 'below',
-							),
-							array(
+							],
+							[
 								'child_level' => Board::$loaded[$boardid]->child_level + 1,
 								'label' => Lang::$txt['mboards_order_child_of'] . ' \'' . Utils::htmlspecialchars(Board::$loaded[$boardid]->name) . '\'',
 								'href' => Config::$scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . Utils::$context['move_board'] . ';target_board=' . $boardid . ';move_to=child;' . $security,
 								'class' => 'here',
-							),
-						);
+							],
+						];
 					}
 
 					$difference = Board::$loaded[$boardid]->child_level - $prev_child_level;
 
-					if ($difference == 1)
-					{
+					if ($difference == 1) {
 						array_push($stack, !empty(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
-					}
-					elseif ($difference < 0)
-					{
-						if (empty(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links']))
-						{
-							Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+					} elseif ($difference < 0) {
+						if (empty(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+							Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'] = [];
 						}
 
-						for ($i = 0; $i < -$difference; $i++)
-						{
-							if (($temp = array_pop($stack)) != null)
-							{
+						for ($i = 0; $i < -$difference; $i++) {
+							if (($temp = array_pop($stack)) != null) {
 								array_unshift(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
 							}
 						}
@@ -266,22 +248,18 @@ public function main(): void
 					$prev_child_level = Board::$loaded[$boardid]->child_level;
 				}
 
-				if (!empty($stack) && !empty(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links']))
-				{
+				if (!empty($stack) && !empty(Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
 					Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links']);
-				}
-				elseif (!empty($stack))
-				{
+				} elseif (!empty($stack)) {
 					Utils::$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
 				}
 
-				if (empty(Category::$boardList[$catid]))
-				{
-					Utils::$context['categories'][$catid]['move_link'] = array(
+				if (empty(Category::$boardList[$catid])) {
+					Utils::$context['categories'][$catid]['move_link'] = [
 						'child_level' => 0,
 						'label' => Lang::$txt['mboards_order_before'] . ' \'' . Utils::htmlspecialchars($tree->name) . '\'',
 						'href' => Config::$scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . Utils::$context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
-					);
+					];
 				}
 			}
 		}
@@ -314,78 +292,67 @@ public function editCategory(): void
 		$_REQUEST['cat'] = isset($_REQUEST['cat']) ? (int) $_REQUEST['cat'] : 0;
 
 		// Start with one - "In first place".
-		Utils::$context['category_order'] = array(
-			array(
+		Utils::$context['category_order'] = [
+			[
 				'id' => 0,
 				'name' => Lang::$txt['mboards_order_first'],
 				'selected' => !empty($_REQUEST['cat']) ? Category::$loaded[$_REQUEST['cat']]->is_first : false,
-				'true_name' => ''
-			)
-		);
+				'true_name' => '',
+			],
+		];
 
 		// If this is a new category set up some defaults.
-		if ($_REQUEST['sa'] == 'newcat')
-		{
-			Utils::$context['category'] = array(
+		if ($_REQUEST['sa'] == 'newcat') {
+			Utils::$context['category'] = [
 				'id' => 0,
 				'name' => Lang::$txt['mboards_new_cat_name'],
 				'editable_name' => Utils::htmlspecialchars(Lang::$txt['mboards_new_cat_name']),
 				'description' => '',
 				'can_collapse' => true,
 				'is_new' => true,
-				'is_empty' => true
-			);
+				'is_empty' => true,
+			];
 		}
 		// Category doesn't exist, man... sorry.
-		elseif (!isset(Category::$loaded[$_REQUEST['cat']]))
-		{
+		elseif (!isset(Category::$loaded[$_REQUEST['cat']])) {
 			Utils::redirectexit('action=admin;area=manageboards');
-		}
-		else
-		{
-			Utils::$context['category'] = array(
+		} else {
+			Utils::$context['category'] = [
 				'id' => $_REQUEST['cat'],
 				'name' => Category::$loaded[$_REQUEST['cat']]->name,
 				'editable_name' => Category::$loaded[$_REQUEST['cat']]->name,
 				'description' => Category::$loaded[$_REQUEST['cat']]->description,
 				'can_collapse' => !empty(Category::$loaded[$_REQUEST['cat']]->can_collapse),
-				'children' => array(),
-				'is_empty' => empty(Category::$loaded[$_REQUEST['cat']]->children)
-			);
+				'children' => [],
+				'is_empty' => empty(Category::$loaded[$_REQUEST['cat']]->children),
+			];
 
-			foreach (Category::$boardList[$_REQUEST['cat']] as $child_board)
-			{
+			foreach (Category::$boardList[$_REQUEST['cat']] as $child_board) {
 				Utils::$context['category']['children'][] = str_repeat('-', Board::$loaded[$child_board]->child_level) . ' ' . Board::$loaded[$child_board]->name;
 			}
 		}
 
 		$prevCat = 0;
-		foreach (Category::$loaded as $catid => $tree)
-		{
-			if ($catid == $_REQUEST['cat'] && $prevCat > 0)
-			{
+
+		foreach (Category::$loaded as $catid => $tree) {
+			if ($catid == $_REQUEST['cat'] && $prevCat > 0) {
 				Utils::$context['category_order'][$prevCat]['selected'] = true;
-			}
-			elseif ($catid != $_REQUEST['cat'])
-			{
-				Utils::$context['category_order'][$catid] = array(
+			} elseif ($catid != $_REQUEST['cat']) {
+				Utils::$context['category_order'][$catid] = [
 					'id' => $catid,
 					'name' => Lang::$txt['mboards_order_after'] . $tree->name,
 					'selected' => false,
-					'true_name' => $tree->name
-				);
+					'true_name' => $tree->name,
+				];
 			}
 
 			$prevCat = $catid;
 		}
 
-		if (!isset($_REQUEST['delete']))
-		{
+		if (!isset($_REQUEST['delete'])) {
 			Utils::$context['sub_template'] = 'modify_category';
 			Utils::$context['page_title'] = $_REQUEST['sa'] == 'newcat' ? Lang::$txt['mboards_new_cat_name'] : Lang::$txt['cat_edit'];
-		}
-		else
-		{
+		} else {
 			Utils::$context['sub_template'] = 'confirm_category_delete';
 			Utils::$context['page_title'] = Lang::$txt['mboards_delete_cat'];
 		}
@@ -415,47 +382,41 @@ public function editCategory2(): void
 		$_POST['cat'] = (int) $_POST['cat'];
 
 		// Add a new category or modify an existing one..
-		if (isset($_POST['edit']) || isset($_POST['add']))
-		{
-			$catOptions = array();
+		if (isset($_POST['edit']) || isset($_POST['add'])) {
+			$catOptions = [];
 
-			if (isset($_POST['cat_order']))
+			if (isset($_POST['cat_order'])) {
 				$catOptions['move_after'] = (int) $_POST['cat_order'];
+			}
 
 			// Try and get any valid HTML to BBC first, add a naive attempt to strip it off, htmlspecialchars for the rest
 			$catOptions['cat_name'] = Utils::htmlspecialchars(strip_tags($_POST['cat_name']));
 			$catOptions['cat_desc'] = Utils::htmlspecialchars(strip_tags(BBCodeParser::load()->unparse($_POST['cat_desc'])));
 			$catOptions['is_collapsible'] = isset($_POST['collapse']);
 
-			if (isset($_POST['add']))
-			{
+			if (isset($_POST['add'])) {
 				Category::create($catOptions);
-			}
-			else
-			{
+			} else {
 				Category::modify($_POST['cat'], $catOptions);
 			}
 		}
 		// If they want to delete - first give them confirmation.
-		elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty']))
-		{
+		elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty'])) {
 			$this->editCategory();
+
 			return;
 		}
 		// Delete the category!
-		elseif (isset($_POST['delete']))
-		{
+		elseif (isset($_POST['delete'])) {
 			// First off - check if we are moving all the current boards first - before we start deleting!
-			if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
-			{
-				if (empty($_POST['cat_to']))
+			if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1) {
+				if (empty($_POST['cat_to'])) {
 					ErrorHandler::fatalLang('mboards_delete_error');
+				}
 
-				Category::delete(array($_POST['cat']), (int) $_POST['cat_to']);
-			}
-			else
-			{
-				Category::delete(array($_POST['cat']));
+				Category::delete([$_POST['cat']], (int) $_POST['cat_to']);
+			} else {
+				Category::delete([$_POST['cat']]);
 			}
 		}
 
@@ -487,28 +448,27 @@ public function editBoard(): void
 		// id_board must be a number....
 		$_REQUEST['boardid'] = isset($_REQUEST['boardid']) ? (int) $_REQUEST['boardid'] : 0;
 
-		if (!isset(Board::$loaded[$_REQUEST['boardid']]))
-		{
+		if (!isset(Board::$loaded[$_REQUEST['boardid']])) {
 			$_REQUEST['boardid'] = 0;
 			$_REQUEST['sa'] = 'newboard';
 		}
 
-		if ('newboard' === $_REQUEST['sa'])
-		{
+		if ('newboard' === $_REQUEST['sa']) {
 			// Category doesn't exist, man... sorry.
-			if (empty($_REQUEST['cat']))
+			if (empty($_REQUEST['cat'])) {
 				Utils::redirectexit('action=admin;area=manageboards');
+			}
 
 			// Some things that need to be setup for a new board.
-			$curBoard = array(
-				'member_groups' => array(0, -1),
-				'deny_groups' => array(),
-				'category' => (int) $_REQUEST['cat']
-			);
+			$curBoard = [
+				'member_groups' => [0, -1],
+				'deny_groups' => [],
+				'category' => (int) $_REQUEST['cat'],
+			];
 
-			Utils::$context['board_order'] = array();
+			Utils::$context['board_order'] = [];
 
-			Utils::$context['board'] = Board::init(0, array(
+			Utils::$context['board'] = Board::init(0, [
 				'is_new' => true,
 				'name' => Lang::$txt['mboards_new_board_name'],
 				'description' => '',
@@ -521,10 +481,8 @@ public function editBoard(): void
 				'redirect' => '',
 				'category' => (int) $_REQUEST['cat'],
 				'no_children' => true,
-			));
-		}
-		else
-		{
+			]);
+		} else {
 			// Just some easy shortcuts.
 			$curBoard = &Board::$loaded[$_REQUEST['boardid']];
 
@@ -545,8 +503,7 @@ public function editBoard(): void
 		Utils::$context['can_manage_permissions'] = User::$me->allowedTo('manage_permissions');
 
 		// Load all membergroups except admin and moderator.
-		foreach (Group::loadSimple(Group::LOAD_BOTH, array(Group::ADMIN, Group::MOD)) as $group)
-		{
+		foreach (Group::loadSimple(Group::LOAD_BOTH, [Group::ADMIN, Group::MOD]) as $group) {
 			$group->allow = in_array($group->id, $curBoard['member_groups']);
 			$group->deny = in_array($group->id, $curBoard['deny_groups']);
 
@@ -556,133 +513,126 @@ public function editBoard(): void
 		}
 
 		// Category doesn't exist, man... sorry.
-		if (!isset(Category::$boardList[$curBoard['category']]))
+		if (!isset(Category::$boardList[$curBoard['category']])) {
 			Utils::redirectexit('action=admin;area=manageboards');
+		}
 
-		foreach (Category::$boardList[$curBoard['category']] as $boardid)
-		{
-			if ($boardid == $_REQUEST['boardid'])
-			{
-				Utils::$context['board_order'][] = array(
+		foreach (Category::$boardList[$curBoard['category']] as $boardid) {
+			if ($boardid == $_REQUEST['boardid']) {
+				Utils::$context['board_order'][] = [
 					'id' => $boardid,
 					'name' => str_repeat('-', Board::$loaded[$boardid]->child_level) . ' (' . Lang::$txt['mboards_current_position'] . ')',
 					'children' => Board::$loaded[$boardid]->children,
 					'no_children' => empty(Board::$loaded[$boardid]->children),
 					'is_child' => false,
-					'selected' => true
-				);
-			}
-			else
-			{
-				Utils::$context['board_order'][] = array(
+					'selected' => true,
+				];
+			} else {
+				Utils::$context['board_order'][] = [
 					'id' => $boardid,
 					'name' => str_repeat('-', Board::$loaded[$boardid]->child_level) . ' ' . Board::$loaded[$boardid]->name,
 					'is_child' => empty($_REQUEST['boardid']) ? false : Board::isChildOf($boardid, $_REQUEST['boardid']),
-					'selected' => false
-				);
+					'selected' => false,
+				];
 			}
 		}
 
 		// Are there any places to move child boards to in the case where we are confirming a delete?
-		if (!empty($_REQUEST['boardid']))
-		{
+		if (!empty($_REQUEST['boardid'])) {
 			Utils::$context['can_move_children'] = false;
 			Utils::$context['children'] = Board::$loaded[$_REQUEST['boardid']]->children;
 
-			foreach (Utils::$context['board_order'] as $lBoard)
-			{
-				if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
+			foreach (Utils::$context['board_order'] as $lBoard) {
+				if ($lBoard['is_child'] == false && $lBoard['selected'] == false) {
 					Utils::$context['can_move_children'] = true;
+				}
 			}
 		}
 
 		// Get other available categories.
-		Utils::$context['categories'] = array();
+		Utils::$context['categories'] = [];
 
-		foreach (Category::$loaded as $catID => $tree)
-		{
-			Utils::$context['categories'][] = array(
+		foreach (Category::$loaded as $catID => $tree) {
+			Utils::$context['categories'][] = [
 				'id' => $catID == $curBoard['category'] ? 0 : $catID,
 				'name' => $tree->name,
-				'selected' => $catID == $curBoard['category']
-			);
+				'selected' => $catID == $curBoard['category'],
+			];
 		}
 
 		// Get all the moderators.
-		Utils::$context['board']->moderators = array();
+		Utils::$context['board']->moderators = [];
 
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, mem.real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, mem.real_name
 			FROM {db_prefix}moderators AS mods
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = mods.id_member)
 			WHERE mods.id_board = {int:current_board}',
-			array(
+			[
 				'current_board' => $_REQUEST['boardid'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['board']->moderators[$row['id_member']] = $row['real_name'];
 		}
 		Db::$db->free_result($request);
 
 		Utils::$context['board']->moderator_list = empty(Utils::$context['board']->moderators) ? '' : '&quot;' . implode('&quot;, &quot;', Utils::$context['board']->moderators) . '&quot;';
 
-		if (!empty(Utils::$context['board']->moderators))
-		{
-			list (Utils::$context['board']->last_moderator_id) = array_slice(array_keys(Utils::$context['board']->moderators), -1);
+		if (!empty(Utils::$context['board']->moderators)) {
+			list(Utils::$context['board']->last_moderator_id) = array_slice(array_keys(Utils::$context['board']->moderators), -1);
 		}
 
 		// Get all the groups assigned as moderators.
-		Utils::$context['board']->moderator_groups = array();
+		Utils::$context['board']->moderator_groups = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group
 			FROM {db_prefix}moderator_groups
 			WHERE id_board = {int:current_board}',
-			array(
+			[
 				'current_board' => $_REQUEST['boardid'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['board']->moderator_groups[$row['id_group']] = Utils::$context['groups'][$row['id_group']]['name'];
 		}
 		Db::$db->free_result($request);
 
 		Utils::$context['board']->moderator_groups_list = empty(Utils::$context['board']->moderator_groups) ? '' : '&quot;' . implode('&quot;, &qout;', Utils::$context['board']->moderator_groups) . '&quot;';
 
-		if (!empty(Utils::$context['board']->moderator_groups))
-		{
-			list (Utils::$context['board']->last_moderator_group_id) = array_slice(array_keys(Utils::$context['board']->moderator_groups), -1);
+		if (!empty(Utils::$context['board']->moderator_groups)) {
+			list(Utils::$context['board']->last_moderator_group_id) = array_slice(array_keys(Utils::$context['board']->moderator_groups), -1);
 		}
 
 		// Get all the themes...
-		Utils::$context['themes'] = array();
+		Utils::$context['themes'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_theme AS id, value AS name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme AS id, value AS name
 			FROM {db_prefix}themes
 			WHERE variable = {literal:name}
 				AND id_theme IN ({array_int:enable_themes})',
-			array(
+			[
 				'enable_themes' => explode(',', Config::$modSettings['enableThemes']),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['themes'][] = $row;
 		}
 		Db::$db->free_result($request);
 
-		if (!isset($_REQUEST['delete']))
-		{
+		if (!isset($_REQUEST['delete'])) {
 			Utils::$context['sub_template'] = 'modify_board';
 			Utils::$context['page_title'] = Lang::$txt['boards_edit'];
-			Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-		}
-		else
-		{
+			Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
+		} else {
 			Utils::$context['sub_template'] = 'confirm_board_delete';
 			Utils::$context['page_title'] = Lang::$txt['mboards_delete_board'];
 		}
@@ -711,21 +661,19 @@ public function editBoard2(): void
 		SecurityToken::validate('admin-be-' . $_REQUEST['boardid']);
 
 		// Mode: modify aka. don't delete.
-		if (isset($_POST['edit']) || isset($_POST['add']))
-		{
-			$boardOptions = array();
+		if (isset($_POST['edit']) || isset($_POST['add'])) {
+			$boardOptions = [];
 
 			// Move this board to a new category?
-			if (!empty($_POST['new_cat']))
-			{
+			if (!empty($_POST['new_cat'])) {
 				$boardOptions['move_to'] = 'bottom';
 				$boardOptions['target_category'] = (int) $_POST['new_cat'];
 			}
 			// Change the boardorder of this board?
-			elseif (!empty($_POST['placement']) && !empty($_POST['board_order']))
-			{
-				if (!in_array($_POST['placement'], array('before', 'after', 'child')))
+			elseif (!empty($_POST['placement']) && !empty($_POST['board_order'])) {
+				if (!in_array($_POST['placement'], ['before', 'after', 'child'])) {
 					ErrorHandler::fatalLang('mangled_post', false);
+				}
 
 				$boardOptions['move_to'] = $_POST['placement'];
 				$boardOptions['target_board'] = (int) $_POST['board_order'];
@@ -735,26 +683,20 @@ public function editBoard2(): void
 			$boardOptions['posts_count'] = isset($_POST['count']);
 			$boardOptions['override_theme'] = isset($_POST['override_theme']);
 			$boardOptions['board_theme'] = (int) $_POST['boardtheme'];
-			$boardOptions['access_groups'] = array();
-			$boardOptions['deny_groups'] = array();
-
-			if (!empty($_POST['groups']))
-			{
-				foreach ($_POST['groups'] as $group => $action)
-				{
-					if ($action == 'allow')
-					{
+			$boardOptions['access_groups'] = [];
+			$boardOptions['deny_groups'] = [];
+
+			if (!empty($_POST['groups'])) {
+				foreach ($_POST['groups'] as $group => $action) {
+					if ($action == 'allow') {
 						$boardOptions['access_groups'][] = (int) $group;
-					}
-					elseif ($action == 'deny')
-					{
+					} elseif ($action == 'deny') {
 						$boardOptions['deny_groups'][] = (int) $group;
 					}
 				}
 			}
 
-			if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-			{
+			if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) {
 				ErrorHandler::fatalLang('too_many_groups', false);
 			}
 
@@ -764,24 +706,24 @@ public function editBoard2(): void
 
 			$boardOptions['moderator_string'] = $_POST['moderators'];
 
-			if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list']))
-			{
-				$moderators = array();
+			if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list'])) {
+				$moderators = [];
 
-				foreach ($_POST['moderator_list'] as $moderator)
+				foreach ($_POST['moderator_list'] as $moderator) {
 					$moderators[(int) $moderator] = (int) $moderator;
+				}
 
 				$boardOptions['moderators'] = $moderators;
 			}
 
 			$boardOptions['moderator_group_string'] = $_POST['moderator_groups'];
 
-			if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list']))
-			{
-				$moderator_groups = array();
+			if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list'])) {
+				$moderator_groups = [];
 
-				foreach ($_POST['moderator_group_list'] as $moderator_group)
+				foreach ($_POST['moderator_group_list'] as $moderator_group) {
 					$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+				}
 
 				$boardOptions['moderator_groups'] = $moderator_groups;
 			}
@@ -794,32 +736,29 @@ public function editBoard2(): void
 			$boardOptions['inherit_permissions'] = $_POST['profile'] == -1;
 
 			// We need to know what used to be case in terms of redirection.
-			if (!empty($_POST['boardid']))
-			{
-				$request = Db::$db->query('', '
-					SELECT redirect, num_posts, id_cat
+			if (!empty($_POST['boardid'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT redirect, num_posts, id_cat
 					FROM {db_prefix}boards
 					WHERE id_board = {int:current_board}',
-					array(
+					[
 						'current_board' => $_POST['boardid'],
-					)
+					],
 				);
-				list ($oldRedirect, $numPosts, $old_id_cat) = Db::$db->fetch_row($request);
+				list($oldRedirect, $numPosts, $old_id_cat) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
 				// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
-				if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts)
-				{
+				if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) {
 					unset($boardOptions['redirect']);
 				}
 				// Reset the redirection count when switching on/off.
-				elseif (empty($boardOptions['redirect']) != empty($oldRedirect))
-				{
+				elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) {
 					$boardOptions['num_posts'] = 0;
 				}
 				// Resetting the count?
-				elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect']))
-				{
+				elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) {
 					$boardOptions['num_posts'] = 0;
 				}
 
@@ -827,50 +766,42 @@ public function editBoard2(): void
 			}
 
 			// Create a new board...
-			if (isset($_POST['add']))
-			{
+			if (isset($_POST['add'])) {
 				// New boards by default go to the bottom of the category.
-				if (empty($_POST['new_cat']))
+				if (empty($_POST['new_cat'])) {
 					$boardOptions['target_category'] = (int) $_POST['cur_cat'];
+				}
 
-				if (!isset($boardOptions['move_to']))
+				if (!isset($boardOptions['move_to'])) {
 					$boardOptions['move_to'] = 'bottom';
+				}
 
 				Board::create($boardOptions);
 			}
 			// ...or update an existing board.
-			else
-			{
+			else {
 				Board::modify($_POST['boardid'], $boardOptions);
 			}
-		}
-		elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
-		{
+		} elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children'])) {
 			$this->editBoard();
+
 			return;
-		}
-		elseif (isset($_POST['delete']))
-		{
+		} elseif (isset($_POST['delete'])) {
 			// First off - check if we are moving all the current child boards first - before we start deleting!
-			if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
-			{
-				if (empty($_POST['board_to']))
+			if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1) {
+				if (empty($_POST['board_to'])) {
 					ErrorHandler::fatalLang('mboards_delete_board_error');
+				}
 
-				Board::delete(array($_POST['boardid']), (int) $_POST['board_to']);
-			}
-			else
-			{
-				Board::delete(array($_POST['boardid']), 0);
+				Board::delete([$_POST['boardid']], (int) $_POST['board_to']);
+			} else {
+				Board::delete([$_POST['boardid']], 0);
 			}
 		}
 
-		if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions')
-		{
+		if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') {
 			Utils::redirectexit('action=admin;area=permissions;sa=board;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
-		}
-		else
-		{
+		} else {
 			Utils::redirectexit('action=admin;area=manageboards');
 		}
 	}
@@ -884,31 +815,33 @@ public function modifyCat(): void
 		Category::getTree();
 
 		// Allowed sub-actions...
-		$allowed_sa = array('add', 'modify', 'cut');
+		$allowed_sa = ['add', 'modify', 'cut'];
 
 		// Check our input.
 		$_POST['id'] = empty($_POST['id']) ? array_keys((array) Board::$info) : (int) $_POST['id'];
 		$_POST['id'] = substr($_POST['id'][1], 0, 3);
 
 		// Select the stuff we need from the DB.
-		$request = Db::$db->query('', '
-			SELECT CONCAT({string:post_id}, {string:feline_clause}, {string:subact})
+		$request = Db::$db->query(
+			'',
+			'SELECT CONCAT({string:post_id}, {string:feline_clause}, {string:subact})
 			FROM {db_prefix}categories
 			LIMIT 1',
-			array(
+			[
 				'post_id' => $_POST['id'] . 's ar',
 				'feline_clause' => 'e,o ',
 				'subact' => $allowed_sa[2] . 'e, ',
-			)
+			],
 		);
-		list ($cat) = Db::$db->fetch_row($request);
+		list($cat) = Db::$db->fetch_row($request);
 
 		// Free resources.
 		Db::$db->free_result($request);
 
 		// This would probably never happen, but just to be sure.
-		if ($cat .= $allowed_sa[1])
+		if ($cat .= $allowed_sa[1]) {
 			die(str_replace(',', ' to', $cat));
+		}
 
 		Utils::redirectexit();
 	}
@@ -935,8 +868,7 @@ public function settings(): void
 		Utils::$context['force_form_onsubmit'] = 'if(document.getElementById(\'recycle_enable\').checked && document.getElementById(\'recycle_board\').value == 0) { return confirm(\'' . Lang::$txt['recycle_board_unselected_notice'] . '\');} return true;';
 
 		// Doing a save?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_board_settings');
@@ -964,8 +896,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -986,48 +919,51 @@ public static function call(): void
 	public static function getConfigVars(): array
 	{
 		// Load the boards list - for the recycle bin!
-		$request = Db::$db->query('order_by_board_order', '
-			SELECT b.id_board, b.name AS board_name, c.name AS cat_name
+		$request = Db::$db->query(
+			'order_by_board_order',
+			'SELECT b.id_board, b.name AS board_name, c.name AS cat_name
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 			WHERE redirect = {string:empty_string}',
-			array(
+			[
 				'empty_string' => '',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($recycle_boards))
+		if (!empty($recycle_boards)) {
 			Board::sort($recycle_boards);
+		}
 
-		$recycle_boards = array('') + ($recycle_boards ?? array());
+		$recycle_boards = [''] + ($recycle_boards ?? []);
 
 		// If this setting is missing, set it to 1
-		if (empty(Config::$modSettings['boardindex_max_depth']))
+		if (empty(Config::$modSettings['boardindex_max_depth'])) {
 			Config::$modSettings['boardindex_max_depth'] = 1;
+		}
 
 		// Here are the board settings...
-		$config_vars = array(
-			array('title', 'settings'),
+		$config_vars = [
+			['title', 'settings'],
 
 			// Inline permissions.
-			array('permissions', 'manage_boards'),
+			['permissions', 'manage_boards'],
 			'',
 
 			// Other board settings.
-			array('int', 'boardindex_max_depth', 'step' => 1, 'min' => 1, 'max' => 100),
-			array('check', 'countChildPosts'),
-			array('check', 'recycle_enable', 'onclick' => 'document.getElementById(\'recycle_board\').disabled = !this.checked;'),
-			array('select', 'recycle_board', $recycle_boards),
-			array('check', 'allow_ignore_boards'),
-			array('check', 'deny_boards_access'),
-		);
+			['int', 'boardindex_max_depth', 'step' => 1, 'min' => 1, 'max' => 100],
+			['check', 'countChildPosts'],
+			['check', 'recycle_enable', 'onclick' => 'document.getElementById(\'recycle_board\').disabled = !this.checked;'],
+			['select', 'recycle_board', $recycle_boards],
+			['check', 'allow_ignore_boards'],
+			['check', 'deny_boards_access'],
+		];
 
-		IntegrationHook::call('integrate_modify_board_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_board_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1040,8 +976,9 @@ public static function getConfigVars(): array
 	 */
 	public static function editBoardSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -1061,22 +998,22 @@ protected function __construct()
 		Lang::load('ManageBoards');
 
 		// Create the tabs for the template.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['boards_and_cats'],
 			'help' => 'manage_boards',
 			'description' => Lang::$txt['boards_and_cats_desc'],
-			'tabs' => array(
-				'main' => array(
-				),
-				'newcat' => array(
-				),
-				'settings' => array(
+			'tabs' => [
+				'main' => [
+				],
+				'newcat' => [
+				],
+				'settings' => [
 					'description' => Lang::$txt['mboards_settings_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_boards', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_boards', [&self::$subactions]);
 
 		// Default to sub action 'main' or 'settings' depending on permissions.
 		$this->subaction = isset($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (User::$me->allowedTo('manage_boards') ? 'main' : 'settings');
@@ -1087,11 +1024,11 @@ protected function __construct()
 	 *************************/
 
 	// code...
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Boards::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Boards::exportStatic')) {
 	Boards::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Calendar.php b/Sources/Actions/Admin/Calendar.php
index 45978e98d7..ba9be533b1 100644
--- a/Sources/Actions/Admin/Calendar.php
+++ b/Sources/Actions/Admin/Calendar.php
@@ -15,11 +15,12 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Calendar as Cal;
+use SMF\BackwardCompatibility;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
@@ -29,8 +30,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Calendar as Cal;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class allows you to manage the calendar.
@@ -44,13 +43,13 @@ class Calendar implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageCalendar',
-			'getConfigVars' => false,
-		),
-	);
+			'modifyHolidays' => 'ModifyHolidays',
+			'editHoliday' => 'EditHoliday',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -73,11 +72,11 @@ class Calendar implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'holidays' => 'holidays',
 		'editholiday' => 'edit',
-		'settings' => 'settings'
-	);
+		'settings' => 'settings',
+	];
 
 	/****************************
 	 * Internal static properties
@@ -102,10 +101,11 @@ public function execute(): void
 	{
 		User::$me->isAllowedTo('admin_forum');
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -114,108 +114,107 @@ public function execute(): void
 	public function holidays(): void
 	{
 		// Submitting something...
-		if (isset($_REQUEST['delete']) && !empty($_REQUEST['holiday']))
-		{
+		if (isset($_REQUEST['delete']) && !empty($_REQUEST['holiday'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-mc');
 
-			foreach ($_REQUEST['holiday'] as $id => $value)
+			foreach ($_REQUEST['holiday'] as $id => $value) {
 				$_REQUEST['holiday'][$id] = (int) $id;
+			}
 
 			Cal::removeHolidays($_REQUEST['holiday']);
 		}
 
 		SecurityToken::create('admin-mc');
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'holiday_list',
 			'title' => Lang::$txt['current_holidays'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=managecalendar;sa=holidays',
 			'default_sort_col' => 'name',
-			'get_items' => array(
+			'get_items' => [
 				'file' => Config::$sourcedir . '/Actions/Calendar.php',
 				'function' => 'SMF\\Actions\\Calendar::list_getHolidays',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'file' => Config::$sourcedir . '/Actions/Calendar.php',
 				'function' => 'SMF\\Actions\\Calendar::list_getNumHolidays',
-			),
+			],
 			'no_items_label' => Lang::$txt['holidays_no_entries'],
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['holidays_title'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=managecalendar;sa=editholiday;holiday=%1$d">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id_holiday' => false,
 								'title' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'title ASC, event_date ASC',
 						'reverse' => 'title DESC, event_date ASC',
-					)
-				),
-				'date' => array(
-					'header' => array(
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// Recurring every year or just a single year?
 							$year = $rowData['year'] == '1004' ? sprintf('(%1$s)', Lang::$txt['every_year']) : $rowData['year'];
 
 							// Construct the date.
 							return sprintf('%1$d %2$s %3$s', $rowData['day'], Lang::$txt['months'][(int) $rowData['month']], $year);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'event_date',
 						'reverse' => 'event_date DESC',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="holiday[%1$d]">',
-							'params' => array(
+							'params' => [
 								'id_holiday' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=managecalendar;sa=holidays',
 				'token' => 'admin-mc',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'above_column_headers',
 					'value' => '<input type="submit" name="delete" value="' . Lang::$txt['quickmod_delete_selected'] . '" class="button">
 						<a class="button" href="' . Config::$scripturl . '?action=admin;area=managecalendar;sa=editholiday">' . Lang::$txt['holidays_add'] . '</a>',
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="delete" value="' . Lang::$txt['quickmod_delete_selected'] . '" class="button">
 						<a class="button" href="' . Config::$scripturl . '?action=admin;area=managecalendar;sa=editholiday">' . Lang::$txt['holidays_add'] . '</a>',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
-		//loadTemplate('ManageCalendar');
+		// loadTemplate('ManageCalendar');
 		Utils::$context['page_title'] = Lang::$txt['manage_holidays'];
 
 		// Since the list is the only thing to show, use the default list template.
@@ -235,12 +234,12 @@ public function edit(): void
 		Utils::$context['sub_template'] = 'edit_holiday';
 
 		// Cast this for safety...
-		if (isset($_REQUEST['holiday']))
+		if (isset($_REQUEST['holiday'])) {
 			$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+		}
 
 		// Submitting?
-		if (isset($_POST[Utils::$context['session_var']]) && (isset($_REQUEST['delete']) || $_REQUEST['title'] != ''))
-		{
+		if (isset($_POST[Utils::$context['session_var']]) && (isset($_REQUEST['delete']) || $_REQUEST['title'] != '')) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-eh');
 
@@ -248,52 +247,49 @@ public function edit(): void
 			$_REQUEST['title'] = Utils::entitySubstr(Utils::normalize($_REQUEST['title']), 0, 60);
 			$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
-			if (isset($_REQUEST['delete']))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}calendar_holidays
+			if (isset($_REQUEST['delete'])) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}calendar_holidays
 					WHERE id_holiday = {int:selected_holiday}',
-					array(
+					[
 						'selected_holiday' => $_REQUEST['holiday'],
-					)
+					],
 				);
-			}
-			else
-			{
+			} else {
 				$date = Time::strftime($_REQUEST['year'] <= 1004 ? '1004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $_REQUEST['month'], $_REQUEST['day'], $_REQUEST['year']));
 
-				if (isset($_REQUEST['edit']))
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}calendar_holidays
+				if (isset($_REQUEST['edit'])) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}calendar_holidays
 						SET event_date = {date:holiday_date}, title = {string:holiday_title}
 						WHERE id_holiday = {int:selected_holiday}',
-						array(
+						[
 							'holiday_date' => $date,
 							'selected_holiday' => $_REQUEST['holiday'],
 							'holiday_title' => $_REQUEST['title'],
-						)
+						],
 					);
-				}
-				else
-				{
-					Db::$db->insert('',
+				} else {
+					Db::$db->insert(
+						'',
 						'{db_prefix}calendar_holidays',
-						array(
+						[
 							'event_date' => 'date', 'title' => 'string-60',
-						),
-						array(
+						],
+						[
 							$date, $_REQUEST['title'],
-						),
-						array('id_holiday')
+						],
+						['id_holiday'],
 					);
 				}
 			}
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'calendar_updated' => time(),
 				'settings_updated' => time(),
-			));
+			]);
 
 			Utils::redirectexit('action=admin;area=managecalendar;sa=holidays');
 		}
@@ -301,37 +297,36 @@ public function edit(): void
 		SecurityToken::create('admin-eh');
 
 		// Default states...
-		if (Utils::$context['is_new'])
-		{
-			Utils::$context['holiday'] = array(
+		if (Utils::$context['is_new']) {
+			Utils::$context['holiday'] = [
 				'id' => 0,
 				'day' => date('d'),
 				'month' => date('m'),
 				'year' => '0000',
-				'title' => ''
-			);
+				'title' => '',
+			];
 		}
 		// If it's not new load the data.
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT id_holiday, YEAR(event_date) AS year, MONTH(event_date) AS month, DAYOFMONTH(event_date) AS day, title
+		else {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_holiday, YEAR(event_date) AS year, MONTH(event_date) AS month, DAYOFMONTH(event_date) AS day, title
 				FROM {db_prefix}calendar_holidays
 				WHERE id_holiday = {int:selected_holiday}
 				LIMIT 1',
-				array(
+				[
 					'selected_holiday' => $_REQUEST['holiday'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				Utils::$context['holiday'] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				Utils::$context['holiday'] = [
 					'id' => $row['id_holiday'],
 					'day' => $row['day'],
 					'month' => $row['month'],
 					'year' => $row['year'] <= 4 ? 0 : $row['year'],
-					'title' => $row['title']
-				);
+					'title' => $row['title'],
+				];
 			}
 			Db::$db->free_result($request);
 		}
@@ -356,16 +351,15 @@ public function settings(): void
 		Utils::$context['settings_title'] = Lang::$txt['calendar_settings'];
 
 		// Saving the settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 			IntegrationHook::call('integrate_save_calendar_settings');
 			ACP::saveDBSettings($config_vars);
 
 			// Update the stats in case.
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'calendar_updated' => time(),
-			));
+			]);
 
 			$_SESSION['adm-save'] = true;
 			Utils::redirectexit('action=admin;area=managecalendar;sa=settings');
@@ -389,8 +383,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -410,77 +405,75 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		if (!empty(Config::$modSettings['cal_enabled']))
-		{
+		if (!empty(Config::$modSettings['cal_enabled'])) {
 			// Load the boards list.
-			$boards = array('');
+			$boards = [''];
 
-			$request = Db::$db->query('order_by_board_order', '
-				SELECT b.id_board, b.name AS board_name, c.name AS cat_name
+			$request = Db::$db->query(
+				'order_by_board_order',
+				'SELECT b.id_board, b.name AS board_name, c.name AS cat_name
 				FROM {db_prefix}boards AS b
 					LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)',
-				array(
-				)
+				[
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
 			}
 			Db::$db->free_result($request);
 
 			Board::sort($boards);
 
-			$config_vars = array(
-				array('check', 'cal_enabled'),
+			$config_vars = [
+				['check', 'cal_enabled'],
 				'',
 
 				// All the permissions:
-				array('permissions', 'calendar_view'),
-				array('permissions', 'calendar_post'),
-				array('permissions', 'calendar_edit_own'),
-				array('permissions', 'calendar_edit_any'),
+				['permissions', 'calendar_view'],
+				['permissions', 'calendar_post'],
+				['permissions', 'calendar_edit_own'],
+				['permissions', 'calendar_edit_any'],
 				'',
 
 				// How many days to show on board index, and where to display events etc?
-				array('int', 'cal_days_for_index', 'help' => 'cal_maxdays_advance', 6, 'postinput' => Lang::$txt['days_word']),
-				array('select', 'cal_showholidays', array(0 => Lang::$txt['setting_cal_show_never'], 1 => Lang::$txt['setting_cal_show_cal'], 3 => Lang::$txt['setting_cal_show_index'], 2 => Lang::$txt['setting_cal_show_all'])),
-				array('select', 'cal_showbdays', array(0 => Lang::$txt['setting_cal_show_never'], 1 => Lang::$txt['setting_cal_show_cal'], 3 => Lang::$txt['setting_cal_show_index'], 2 => Lang::$txt['setting_cal_show_all'])),
-				array('select', 'cal_showevents', array(0 => Lang::$txt['setting_cal_show_never'], 1 => Lang::$txt['setting_cal_show_cal'], 3 => Lang::$txt['setting_cal_show_index'], 2 => Lang::$txt['setting_cal_show_all'])),
-				array('check', 'cal_export'),
+				['int', 'cal_days_for_index', 'help' => 'cal_maxdays_advance', 6, 'postinput' => Lang::$txt['days_word']],
+				['select', 'cal_showholidays', [0 => Lang::$txt['setting_cal_show_never'], 1 => Lang::$txt['setting_cal_show_cal'], 3 => Lang::$txt['setting_cal_show_index'], 2 => Lang::$txt['setting_cal_show_all']]],
+				['select', 'cal_showbdays', [0 => Lang::$txt['setting_cal_show_never'], 1 => Lang::$txt['setting_cal_show_cal'], 3 => Lang::$txt['setting_cal_show_index'], 2 => Lang::$txt['setting_cal_show_all']]],
+				['select', 'cal_showevents', [0 => Lang::$txt['setting_cal_show_never'], 1 => Lang::$txt['setting_cal_show_cal'], 3 => Lang::$txt['setting_cal_show_index'], 2 => Lang::$txt['setting_cal_show_all']]],
+				['check', 'cal_export'],
 				'',
 
 				// Linking events etc...
-				array('select', 'cal_defaultboard', $boards),
-				array('check', 'cal_daysaslink', 'help' => 'cal_link_postevent'),
-				array('check', 'cal_allow_unlinked', 'help' => 'cal_allow_unlinkedevents'),
-				array('check', 'cal_showInTopic'),
+				['select', 'cal_defaultboard', $boards],
+				['check', 'cal_daysaslink', 'help' => 'cal_link_postevent'],
+				['check', 'cal_allow_unlinked', 'help' => 'cal_allow_unlinkedevents'],
+				['check', 'cal_showInTopic'],
 				'',
 
 				// Dates of calendar...
-				array('int', 'cal_minyear', 'help' => 'cal_min_year'),
-				array('int', 'cal_maxyear', 'help' => 'cal_max_year'),
+				['int', 'cal_minyear', 'help' => 'cal_min_year'],
+				['int', 'cal_maxyear', 'help' => 'cal_max_year'],
 				'',
 
 				// Calendar spanning...
-				array('int', 'cal_maxspan', 6, 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_for_no_limit'], 'help' => 'cal_maxevent_span'),
+				['int', 'cal_maxspan', 6, 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_for_no_limit'], 'help' => 'cal_maxevent_span'],
 				'',
 
 				// Miscellaneous layout settings...
-				array('check', 'cal_disable_prev_next'),
-				array('select', 'cal_week_links', array(0 => Lang::$txt['setting_cal_week_links_none'], 1 => Lang::$txt['setting_cal_week_links_mini'], 2 => Lang::$txt['setting_cal_week_links_main'], 3 => Lang::$txt['setting_cal_week_links_both'])),
-				array('check', 'cal_prev_next_links'),
-				array('check', 'cal_short_days'),
-				array('check', 'cal_short_months'),
-			);
-		}
-		else
-		{
-			$config_vars = array(
-				array('check', 'cal_enabled'),
-			);
+				['check', 'cal_disable_prev_next'],
+				['select', 'cal_week_links', [0 => Lang::$txt['setting_cal_week_links_none'], 1 => Lang::$txt['setting_cal_week_links_mini'], 2 => Lang::$txt['setting_cal_week_links_main'], 3 => Lang::$txt['setting_cal_week_links_both']]],
+				['check', 'cal_prev_next_links'],
+				['check', 'cal_short_days'],
+				['check', 'cal_short_months'],
+			];
+		} else {
+			$config_vars = [
+				['check', 'cal_enabled'],
+			];
 		}
 
-		IntegrationHook::call('integrate_modify_calendar_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_calendar_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -507,11 +500,11 @@ public static function editHoliday(): void
 
 	/**
 	 * Backward compatibility wrapper for the settings sub-action.
-	  *
-	  * @param bool $return_config Whether to return the $config_vars array (used for admin search)
-	  * @return void|array Returns nothing or returns $config_vars if $return_config is true
-	  */
-	 public function modifyCalendarSettings($return_config = false)
+	 *
+	 * @param bool $return_config Whether to return the $config_vars array (used for admin search)
+	 * @return void|array Returns nothing or returns $config_vars if $return_config is true
+	 */
+	public function modifyCalendarSettings($return_config = false)
 	{
 		self::load();
 		self::$obj->subaction = '';
@@ -530,40 +523,40 @@ protected function __construct()
 		// Everything's gonna need this.
 		Lang::load('ManageCalendar');
 
-		if (empty(Config::$modSettings['cal_enabled']))
-		{
+		if (empty(Config::$modSettings['cal_enabled'])) {
 			unset(self::$subactions['holidays'], self::$subactions['editholiday']);
 			$this->subaction = 'settings';
 		}
 
 		// Set up the two tabs here...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['manage_calendar'],
 			'help' => 'calendar',
 			'description' => Lang::$txt['calendar_settings_desc'],
-		);
+		];
 
-		if (!empty(Config::$modSettings['cal_enabled']))
-		{
-			Menu::$loaded['admin']->tab_data['tabs'] = array(
-				'holidays' => array(
+		if (!empty(Config::$modSettings['cal_enabled'])) {
+			Menu::$loaded['admin']->tab_data['tabs'] = [
+				'holidays' => [
 					'description' => Lang::$txt['manage_holidays_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['calendar_settings_desc'],
-				),
-			);
+				],
+			];
 		}
 
-		IntegrationHook::call('integrate_manage_calendar', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_calendar', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Calendar::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Calendar::exportStatic')) {
 	Calendar::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/EndSession.php b/Sources/Actions/Admin/EndSession.php
index ec2887dd08..168f4476c6 100644
--- a/Sources/Actions/Admin/EndSession.php
+++ b/Sources/Actions/Admin/EndSession.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Utils;
 
 /**
@@ -30,12 +29,11 @@ class EndSession implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AdminEndSession',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -62,10 +60,10 @@ public function execute(): void
 		unset($_SESSION['admin_time']);
 
 		// Clean any admin tokens as well.
-		foreach ($_SESSION['token'] as $key => $token)
-		{
-			if (strpos($key, '-admin') !== false)
+		foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false) {
 				unset($_SESSION['token'][$key]);
+			}
 		}
 
 		Utils::redirectexit();
@@ -82,8 +80,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -109,7 +108,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\EndSession::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\EndSession::exportStatic')) {
 	EndSession::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/ErrorLog.php b/Sources/Actions/Admin/ErrorLog.php
index 36107abce4..fd9e76a144 100644
--- a/Sources/Actions/Admin/ErrorLog.php
+++ b/Sources/Actions/Admin/ErrorLog.php
@@ -13,13 +13,13 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
-use SMF\IP;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
+use SMF\IP;
 use SMF\Lang;
 use SMF\PageIndex;
 use SMF\SecurityToken;
@@ -27,7 +27,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Shows a list of all errors that were logged on the forum,
@@ -42,12 +41,11 @@ class ErrorLog implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ViewErrorLog',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -65,48 +63,48 @@ class ErrorLog implements ActionInterface
 	 *
 	 * Basic info about the available filters.
 	 */
-	public array $filters = array(
-		'id_member' => array(
+	public array $filters = [
+		'id_member' => [
 			'txt' => 'username',
 			'operator' => '=',
 			'datatype' => 'int',
-		),
-		'ip' => array(
+		],
+		'ip' => [
 			'txt' => 'ip_address',
 			'operator' => '=',
 			'datatype' => 'inet',
-		),
-		'session' => array(
+		],
+		'session' => [
 			'txt' => 'session',
 			'operator' => 'LIKE',
 			'datatype' => 'string',
-		),
-		'url' => array(
+		],
+		'url' => [
 			'txt' => 'error_url',
 			'operator' => 'LIKE',
 			'datatype' => 'string',
-		),
-		'message' => array(
+		],
+		'message' => [
 			'txt' => 'error_message',
 			'operator' => 'LIKE',
 			'datatype' => 'string',
-		),
-		'error_type' => array(
+		],
+		'error_type' => [
 			'txt' => 'error_type',
 			'operator' => 'LIKE',
 			'datatype' => 'string',
-		),
-		'file' => array(
+		],
+		'file' => [
 			'txt' => 'file',
 			'operator' => 'LIKE',
 			'datatype' => 'string',
-		),
-		'line' => array(
+		],
+		'line' => [
 			'txt' => 'line',
 			'operator' => '=',
 			'datatype' => 'int',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -133,18 +131,15 @@ public function execute(): void
 		User::$me->isAllowedTo('admin_forum');
 
 		// Viewing contents of a file?
-		if (isset($_GET['file']))
-		{
+		if (isset($_GET['file'])) {
 			$this->viewFile();
 		}
 		// Viewing contents of a backtrace?
-		elseif (isset($_GET['backtrace']))
-		{
+		elseif (isset($_GET['backtrace'])) {
 			$this->viewBacktrace();
 		}
 		// Viewing the log.
-		else
-		{
+		else {
 			$this->view();
 		}
 	}
@@ -159,43 +154,44 @@ public function execute(): void
 	public function view(): void
 	{
 		// Set up the filtering...
-		if (isset($_GET['value'], $_GET['filter']) && isset($this->filters[$_GET['filter']]))
-		{
-			$this->filter = array(
+		if (isset($_GET['value'], $_GET['filter'], $this->filters[$_GET['filter']])) {
+			$this->filter = [
 				'variable' => $_GET['filter'],
-				'value' => array(
-					'sql' => in_array($_GET['filter'], array('message', 'url', 'file')) ? base64_decode(strtr($_GET['value'], array(' ' => '+'))) : Db::$db->escape_wildcard_string($_GET['value']),
-				),
+				'value' => [
+					'sql' => in_array($_GET['filter'], ['message', 'url', 'file']) ? base64_decode(strtr($_GET['value'], [' ' => '+'])) : Db::$db->escape_wildcard_string($_GET['value']),
+				],
 				'href' => ';filter=' . $_GET['filter'] . ';value=' . $_GET['value'],
-				'entity' => $this->filters[$_GET['filter']]['txt']
-			);
+				'entity' => $this->filters[$_GET['filter']]['txt'],
+			];
 		}
 
 		// Deleting, are we?
-		if (isset($_POST['delall']) || isset($_POST['delete']))
+		if (isset($_POST['delall']) || isset($_POST['delete'])) {
 			$this->deleteErrors();
+		}
 
 		// Just how many errors are there?
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_errors' . (isset($this->filter) ? '
 			WHERE ' . $this->filter['variable'] . ' ' . $this->filters[$_GET['filter']]['operator'] . ' {' . $this->filters[$_GET['filter']]['datatype'] . ':filter}' : ''),
-			array(
+			[
 				'filter' => isset($this->filter) ? $this->filter['value']['sql'] : '',
-			)
+			],
 		);
 		list($num_errors) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// If this filter is empty...
-		if ($num_errors == 0 && isset($this->filter))
-		{
+		if ($num_errors == 0 && isset($this->filter)) {
 			Utils::redirectexit('action=admin;area=logs;sa=errorlog' . (isset($_REQUEST['desc']) ? ';desc' : ''));
 		}
 
 		// Clean up start.
-		if (!isset($_GET['start']) || $_GET['start'] < 0)
+		if (!isset($_GET['start']) || $_GET['start'] < 0) {
 			$_GET['start'] = 0;
+		}
 
 		// Do we want to reverse error listing?
 		Utils::$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
@@ -206,84 +202,83 @@ public function view(): void
 		Utils::$context['start'] = $_GET['start'];
 
 		// Update the error count
-		if (!isset($this->filter))
-		{
+		if (!isset($this->filter)) {
 			Utils::$context['num_errors'] = $num_errors;
-		}
-		else
-		{
+		} else {
 			// We want all errors, not just the number of filtered messages...
-			$query = Db::$db->query('', '
-				SELECT COUNT(*)
+			$query = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}log_errors',
-				array()
+				[],
 			);
 			list(Utils::$context['num_errors']) = Db::$db->fetch_row($query);
 			Db::$db->free_result($query);
 		}
 
 		// Find and sort out the errors.
-		Utils::$context['errors'] = array();
-		$members = array();
+		Utils::$context['errors'] = [];
+		$members = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_error, id_member, ip, url, log_time, message, session, error_type, file, line
+		$request = Db::$db->query(
+			'',
+			'SELECT id_error, id_member, ip, url, log_time, message, session, error_type, file, line
 			FROM {db_prefix}log_errors' . (isset($this->filter) ? '
 			WHERE ' . $this->filter['variable'] . ' ' . $this->filters[$_GET['filter']]['operator'] . ' {' . $this->filters[$_GET['filter']]['datatype'] . ':filter}' : '') . '
 			ORDER BY id_error ' . (Utils::$context['sort_direction'] == 'down' ? 'DESC' : '') . '
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'filter' => isset($this->filter) ? $this->filter['value']['sql'] : '',
 				'start' => $_GET['start'],
 				'max' => Config::$modSettings['defaultMaxListItems'],
-			)
+			],
 		);
-		for ($i = 0; $row = Db::$db->fetch_assoc($request); $i++)
-		{
+
+		for ($i = 0; $row = Db::$db->fetch_assoc($request); $i++) {
 			$search_message = preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '%', Db::$db->escape_wildcard_string($row['message']));
 
-			if (isset($this->filter) && $search_message == $this->filter['value']['sql'])
+			if (isset($this->filter) && $search_message == $this->filter['value']['sql']) {
 				$search_message = Db::$db->escape_wildcard_string($row['message']);
+			}
 
-			$show_message = strtr(strtr(preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '$1', $row['message']), array("\r" => '', '<br>' => "\n", '<' => '&lt;', '>' => '&gt;', '"' => '&quot;')), array("\n" => '<br>'));
+			$show_message = strtr(strtr(preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '$1', $row['message']), ["\r" => '', '<br>' => "\n", '<' => '&lt;', '>' => '&gt;', '"' => '&quot;']), ["\n" => '<br>']);
 
-			Utils::$context['errors'][$row['id_error']] = array(
-				'member' => array(
+			Utils::$context['errors'][$row['id_error']] = [
+				'member' => [
 					'id' => $row['id_member'],
 					'ip' => isset($row['ip']) ? new IP($row['ip']) : null,
-					'session' => $row['session']
-				),
+					'session' => $row['session'],
+				],
 				'time' => Time::create('@' . $row['log_time'])->format(),
 				'timestamp' => $row['log_time'],
-				'url' => array(
+				'url' => [
 					'html' => Utils::htmlspecialchars(strpos($row['url'], 'cron.php') === false ? (substr($row['url'], 0, 1) == '?' ? Config::$scripturl : '') . $row['url'] : $row['url']),
-					'href' => base64_encode(Db::$db->escape_wildcard_string($row['url']))
-				),
-				'message' => array(
+					'href' => base64_encode(Db::$db->escape_wildcard_string($row['url'])),
+				],
+				'message' => [
 					'html' => $show_message,
-					'href' => base64_encode($search_message)
-				),
+					'href' => base64_encode($search_message),
+				],
 				'id' => $row['id_error'],
-				'error_type' => array(
+				'error_type' => [
 					'type' => $row['error_type'],
-					'name' => isset(Lang::$txt['errortype_' . $row['error_type']]) ? Lang::$txt['errortype_' . $row['error_type']] : $row['error_type'],
-				),
-				'file' => array(),
-			);
+					'name' => Lang::$txt['errortype_' . $row['error_type']] ?? $row['error_type'],
+				],
+				'file' => [],
+			];
 
-			if (!empty($row['file']) && !empty($row['line']))
-			{
+			if (!empty($row['file']) && !empty($row['line'])) {
 				// Eval'd files rarely point to the right location and cause
 				// havoc for linking, so don't link them.
 				$linkfile = strpos($row['file'], 'eval') !== false && strpos($row['file'], '?') !== false;
 
-				Utils::$context['errors'][$row['id_error']]['file'] = array(
+				Utils::$context['errors'][$row['id_error']]['file'] = [
 					'file' => $row['file'],
 					'line' => $row['line'],
 					'href' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog;file=' . base64_encode($row['file']) . ';line=' . $row['line'],
 					'link' => $linkfile ? '<a href="' . Config::$scripturl . '?action=admin;area=logs;sa=errorlog;file=' . base64_encode($row['file']) . ';line=' . $row['line'] . '" onclick="return reqWin(this.href, 600, 480, false);">' . $row['file'] . '</a>' : $row['file'],
 					'search' => base64_encode($row['file']),
-				);
+				];
 			}
 
 			// Make a list of members to load later.
@@ -292,35 +287,34 @@ public function view(): void
 		Db::$db->free_result($request);
 
 		// Load the member data.
-		if (!empty($members))
-		{
+		if (!empty($members)) {
 			// Get some additional member info...
-			$request = Db::$db->query('', '
-				SELECT id_member, member_name, real_name
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, member_name, real_name
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:member_list})
 				LIMIT {int:members}',
-				array(
+				[
 					'member_list' => $members,
 					'members' => count($members),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$members[$row['id_member']] = $row;
 			}
 			Db::$db->free_result($request);
 
 			// This is a guest...
-			$members[0] = array(
+			$members[0] = [
 				'id_member' => 0,
 				'member_name' => '',
-				'real_name' => Lang::$txt['guest_title']
-			);
+				'real_name' => Lang::$txt['guest_title'],
+			];
 
 			// Go through each error and tack the data on.
-			foreach (Utils::$context['errors'] as $id => &$error)
-			{
+			foreach (Utils::$context['errors'] as $id => &$error) {
 				$memID = $error['member']['id'];
 
 				$error['member']['username'] = $members[$memID]['member_name'];
@@ -331,73 +325,64 @@ public function view(): void
 		}
 
 		// Filtering anything?
-		if (isset($this->filter))
-		{
+		if (isset($this->filter)) {
 			Utils::$context['filter'] = &$this->filter;
 
 			// Set the filtering context.
-			if ($this->filter['variable'] == 'id_member')
-			{
+			if ($this->filter['variable'] == 'id_member') {
 				$id = $this->filter['value']['sql'];
 
 				User::load($id, self::LOAD_BY_ID, 'minimal');
 
 				Utils::$context['filter']['value']['html'] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $id . '">' . (isset(User::$loaded[$id]) ? User::$loaded[$id]->name : Lang::$txt['guest']) . '</a>';
-			}
-			elseif ($this->filter['variable'] == 'url')
-			{
-				Utils::$context['filter']['value']['html'] = '\'' . strtr(Utils::htmlspecialchars((substr($this->filter['value']['sql'], 0, 1) == '?' ? Config::$scripturl : '') . $this->filter['value']['sql']), array('\_' => '_')) . '\'';
-			}
-			elseif ($this->filter['variable'] == 'message')
-			{
-				Utils::$context['filter']['value']['html'] = '\'' . strtr(Utils::htmlspecialchars($this->filter['value']['sql']), array("\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\_' => '_', '\\%' => '%', '\\\\' => '\\')) . '\'';
+			} elseif ($this->filter['variable'] == 'url') {
+				Utils::$context['filter']['value']['html'] = '\'' . strtr(Utils::htmlspecialchars((substr($this->filter['value']['sql'], 0, 1) == '?' ? Config::$scripturl : '') . $this->filter['value']['sql']), ['\\_' => '_']) . '\'';
+			} elseif ($this->filter['variable'] == 'message') {
+				Utils::$context['filter']['value']['html'] = '\'' . strtr(Utils::htmlspecialchars($this->filter['value']['sql']), ["\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\\_' => '_', '\\%' => '%', '\\\\' => '\\']) . '\'';
 
 				Utils::$context['filter']['value']['html'] = preg_replace('~&amp;lt;span class=&amp;quot;remove&amp;quot;&amp;gt;(.+?)&amp;lt;/span&amp;gt;~', '$1', Utils::$context['filter']['value']['html']);
-			}
-			elseif ($this->filter['variable'] == 'error_type')
-			{
-				Utils::$context['filter']['value']['html'] = '\'' . strtr(Utils::htmlspecialchars($this->filter['value']['sql']), array("\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\_' => '_', '\\%' => '%', '\\\\' => '\\')) . '\'';
-			}
-			else
-			{
+			} elseif ($this->filter['variable'] == 'error_type') {
+				Utils::$context['filter']['value']['html'] = '\'' . strtr(Utils::htmlspecialchars($this->filter['value']['sql']), ["\n" => '<br>', '&lt;br /&gt;' => '<br>', "\t" => '&nbsp;&nbsp;&nbsp;', '\\_' => '_', '\\%' => '%', '\\\\' => '\\']) . '\'';
+			} else {
 				Utils::$context['filter']['value']['html'] = &$this->filter['value']['sql'];
 			}
 		}
 
-		Utils::$context['error_types'] = array();
+		Utils::$context['error_types'] = [];
 
-		Utils::$context['error_types']['all'] = array(
+		Utils::$context['error_types']['all'] = [
 			'label' => Lang::$txt['errortype_all'],
 			'error_type' => 'all',
-			'description' => isset(Lang::$txt['errortype_all_desc']) ? Lang::$txt['errortype_all_desc'] : '',
+			'description' => Lang::$txt['errortype_all_desc'] ?? '',
 			'url' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog' . (Utils::$context['sort_direction'] == 'down' ? ';desc' : ''),
 			'is_selected' => empty($this->filter),
-		);
+		];
 
 		// What type of errors do we have and how many do we have?
 		$sum = 0;
 
-		$request = Db::$db->query('', '
-			SELECT error_type, COUNT(*) AS num_errors
+		$request = Db::$db->query(
+			'',
+			'SELECT error_type, COUNT(*) AS num_errors
 			FROM {db_prefix}log_errors
 			GROUP BY error_type
 			ORDER BY error_type = {string:critical_type} DESC, error_type ASC',
-			array(
+			[
 				'critical_type' => 'critical',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Total errors so far?
 			$sum += $row['num_errors'];
 
-			Utils::$context['error_types'][$sum] = array(
-				'label' => (isset(Lang::$txt['errortype_' . $row['error_type']]) ? Lang::$txt['errortype_' . $row['error_type']] : $row['error_type']) . ' (' . $row['num_errors'] . ')',
+			Utils::$context['error_types'][$sum] = [
+				'label' => (Lang::$txt['errortype_' . $row['error_type']] ?? $row['error_type']) . ' (' . $row['num_errors'] . ')',
 				'error_type' => $row['error_type'],
-				'description' => isset(Lang::$txt['errortype_' . $row['error_type'] . '_desc']) ? Lang::$txt['errortype_' . $row['error_type'] . '_desc'] : '',
+				'description' => Lang::$txt['errortype_' . $row['error_type'] . '_desc'] ?? '',
 				'url' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog' . (Utils::$context['sort_direction'] == 'down' ? ';desc' : '') . ';filter=error_type;value=' . $row['error_type'],
 				'is_selected' => isset($this->filter) && $this->filter['value']['sql'] == Db::$db->escape_wildcard_string($row['error_type']),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -405,12 +390,9 @@ public function view(): void
 		Utils::$context['error_types']['all']['label'] .= ' (' . $sum . ')';
 
 		// Finally, work out what is the last tab!
-		if (isset(Utils::$context['error_types'][$sum]))
-		{
+		if (isset(Utils::$context['error_types'][$sum])) {
 			Utils::$context['error_types'][$sum]['is_last'] = true;
-		}
-		else
-		{
+		} else {
 			Utils::$context['error_types']['all']['is_last'] = true;
 		}
 
@@ -455,9 +437,8 @@ public function viewFile(): void
 			|| $basename == strtolower(basename(SMF_SETTINGS_BACKUP_FILE))
 			|| strpos($file, $real_cache) !== false
 			|| !is_readable($file)
-		)
-		{
-			ErrorHandler::fatalLang('error_bad_file', true, array(Utils::htmlspecialchars($file)));
+		) {
+			ErrorHandler::fatalLang('error_bad_file', true, [Utils::htmlspecialchars($file)]);
 		}
 
 		// Get the min and max lines.
@@ -465,8 +446,9 @@ public function viewFile(): void
 		$min = max($line - 20, 1);
 		$max = $line + 21;
 
-		if ($max <= 0 || $min >= $max)
+		if ($max <= 0 || $min >= $max) {
 			ErrorHandler::fatalLang('error_bad_line');
+		}
 
 		$file_data = explode('<br />', BBCodeParser::highlightPhpCode(Utils::htmlspecialchars(file_get_contents($file))));
 
@@ -475,15 +457,15 @@ public function viewFile(): void
 
 		$file_data = array_slice($file_data, $min - 1, $max - $min);
 
-		Utils::$context['file_data'] = array(
+		Utils::$context['file_data'] = [
 			'contents' => $file_data,
 			'min' => $min,
 			'target' => $line,
-			'file' => strtr($file, array('"' => '\\"')),
-		);
+			'file' => strtr($file, ['"' => '\\"']),
+		];
 
 		Theme::loadTemplate('Errors');
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'show_file';
 	}
 
@@ -497,26 +479,27 @@ public function viewBacktrace(): void
 	{
 		$id_error = (int) $_REQUEST['backtrace'];
 
-		$request = Db::$db->query('', '
-			SELECT backtrace, error_type, message, file, line, url
+		$request = Db::$db->query(
+			'',
+			'SELECT backtrace, error_type, message, file, line, url
 			FROM {db_prefix}log_errors
 			WHERE id_error = {int:id_error}',
-			array(
+			[
 				'id_error' => $id_error,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['error_info'] = $row;
 			Utils::$context['error_info']['url'] = Config::$scripturl . $row['url'];
 			Utils::$context['error_info']['backtrace'] = Utils::jsonDecode($row['backtrace']);
 		}
 		Db::$db->free_result($request);
 
-		Theme::loadCSSFile('admin.css', array(), 'smf_admin');
+		Theme::loadCSSFile('admin.css', [], 'smf_admin');
 		Theme::loadTemplate('Errors');
 		Lang::load('ManageMaintenance');
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'show_backtrace';
 	}
 
@@ -531,8 +514,9 @@ public function viewBacktrace(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -558,8 +542,9 @@ protected function __construct()
 		Lang::load('ManageMaintenance');
 		Theme::loadTemplate('Errors');
 
-		foreach ($this->filters as &$filter)
+		foreach ($this->filters as &$filter) {
 			$filter['txt'] = Lang::$txt[$filter['txt']];
+		}
 	}
 
 	/**
@@ -576,38 +561,38 @@ protected function deleteErrors()
 		SecurityToken::validate('admin-el');
 
 		// Delete all or just some?
-		if (isset($_POST['delall']) && !isset($this->filter))
-		{
-			Db::$db->query('truncate_table', '
-				TRUNCATE {db_prefix}log_errors',
-				array(
-				)
+		if (isset($_POST['delall']) && !isset($this->filter)) {
+			Db::$db->query(
+				'truncate_table',
+				'TRUNCATE {db_prefix}log_errors',
+				[
+				],
 			);
 		}
 		// Deleting all with a filter?
-		elseif (isset($_POST['delall']) && isset($this->filter))
-		{
+		elseif (isset($_POST['delall'], $this->filter)) {
 			// IP addresses need a different placeholder type.
 			$filter_type = $this->filter['variable'] == 'ip' ? 'inet' : 'string';
 			$filter_op = $this->filter['variable'] == 'ip' ? '=' : 'LIKE';
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_errors
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_errors
 				WHERE ' . $this->filter['variable'] . ' ' . $filter_op . ' {' . $filter_type . ':filter}',
-				array(
+				[
 					'filter' => $this->filter['value']['sql'],
-				)
+				],
 			);
 		}
 		// Just specific errors?
-		elseif (!empty($_POST['delete']))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_errors
+		elseif (!empty($_POST['delete'])) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_errors
 				WHERE id_error IN ({array_int:error_list})',
-				array(
+				[
 					'error_list' => array_unique($_POST['delete']),
-				)
+				],
 			);
 
 			// Go back to where we were.
@@ -620,7 +605,8 @@ protected function deleteErrors()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ErrorLog::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ErrorLog::exportStatic')) {
 	ErrorLog::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Features.php b/Sources/Actions/Admin/Features.php
index 352d181252..f490990e72 100644
--- a/Sources/Actions/Admin/Features.php
+++ b/Sources/Actions/Admin/Features.php
@@ -13,12 +13,14 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Profile\Notification;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
+use SMF\Graphics\Image;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
@@ -29,9 +31,6 @@
 use SMF\TimeZone;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Profile\Notification;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Graphics\Image;
 
 /**
  * Class to manage various core features.
@@ -45,18 +44,22 @@ class Features implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ModifyFeatureSettings',
-			'basicConfigVars' => false,
-			'bbcConfigVars' => false,
-			'layoutConfigVars' => false,
-			'sigConfigVars' => false,
-			'likesConfigVars' => false,
-			'mentionsConfigVars' => false,
-		),
-	);
+			'list_getProfileFields' => 'list_getProfileFields',
+			'list_getProfileFieldSize' => 'list_getProfileFieldSize',
+			'modifyBasicSettings' => 'ModifyBasicSettings',
+			'modifyBBCSettings' => 'ModifyBBCSettings',
+			'modifyLayoutSettings' => 'ModifyLayoutSettings',
+			'modifySignatureSettings' => 'ModifySignatureSettings',
+			'showCustomProfiles' => 'ShowCustomProfiles',
+			'editCustomProfiles' => 'EditCustomProfiles',
+			'modifyLikesSettings' => 'ModifyLikesSettings',
+			'modifyMentionsSettings' => 'ModifyMentionsSettings',
+			'modifyAlertsSettings' => 'ModifyAlertsSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -79,7 +82,7 @@ class Features implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'basic' => 'basic',
 		'bbc' => 'bbc',
 		'layout' => 'layout',
@@ -89,7 +92,7 @@ class Features implements ActionInterface
 		'likes' => 'likes',
 		'mentions' => 'mentions',
 		'alerts' => 'alerts',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -118,10 +121,11 @@ public function execute(): void
 		Utils::$context['sub_template'] = 'show_settings';
 		Utils::$context['sub_action'] = $this->subaction;
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -134,19 +138,18 @@ public function basic(): void
 		$config_vars = self::basicConfigVars();
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Make sure the country codes are valid.
-			if (!empty($_POST['timezone_priority_countries']))
-			{
+			if (!empty($_POST['timezone_priority_countries'])) {
 				$_POST['timezone_priority_countries'] = TimeZone::validateIsoCountryCodes($_POST['timezone_priority_countries'], true);
 			}
 
 			// Prevent absurd boundaries here - make it a day tops.
-			if (isset($_POST['lastActive']))
+			if (isset($_POST['lastActive'])) {
 				$_POST['lastActive'] = min((int) $_POST['lastActive'], 1440);
+			}
 
 			IntegrationHook::call('integrate_save_basic_settings');
 
@@ -154,8 +157,9 @@ public function basic(): void
 			$_SESSION['adm-save'] = true;
 
 			// Do a bit of housekeeping
-			if (empty($_POST['minimize_files']) || $_POST['minimize_files'] != Config::$modSettings['minimize_files'])
+			if (empty($_POST['minimize_files']) || $_POST['minimize_files'] != Config::$modSettings['minimize_files']) {
 				Theme::deleteAllMinified();
+			}
 
 			User::$me->logOnline();
 			Utils::redirectexit('action=admin;area=featuresettings;sa=basic');
@@ -184,82 +188,69 @@ public function bbc(): void
 		Utils::$context['page_title'] = Lang::$txt['manageposts_bbc_settings_title'];
 
 		// Make sure we check the right tags!
-		Config::$modSettings['bbc_disabled_disabledBBC'] = empty(Config::$modSettings['disabledBBC']) ? array() : explode(',', Config::$modSettings['disabledBBC']);
+		Config::$modSettings['bbc_disabled_disabledBBC'] = empty(Config::$modSettings['disabledBBC']) ? [] : explode(',', Config::$modSettings['disabledBBC']);
 
 		// Legacy BBC are listed separately, but we use the same info in both cases
 		Config::$modSettings['bbc_disabled_legacyBBC'] = Config::$modSettings['bbc_disabled_disabledBBC'];
 
 		$extra = '';
-		if (isset($_REQUEST['cowsay']))
-		{
-			$config_vars[] = array('permissions', 'bbc_cowsay', 'text_label' => sprintf(Lang::$txt['groups_can_use'], '[cowsay]'));
+
+		if (isset($_REQUEST['cowsay'])) {
+			$config_vars[] = ['permissions', 'bbc_cowsay', 'text_label' => sprintf(Lang::$txt['groups_can_use'], '[cowsay]')];
 			$extra = ';cowsay';
 		}
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Clean up the tags.
-			$bbcTags = array();
-			$bbcTagsChildren = array();
-			foreach (BBCodeParser::getCodes() as $tag)
-			{
+			$bbcTags = [];
+			$bbcTagsChildren = [];
+
+			foreach (BBCodeParser::getCodes() as $tag) {
 				$bbcTags[] = $tag['tag'];
 
-				if (isset($tag['require_children']))
-				{
+				if (isset($tag['require_children'])) {
 					$bbcTagsChildren[$tag['tag']] = !isset($bbcTagsChildren[$tag['tag']]) ? $tag['require_children'] : array_unique(array_merge($bbcTagsChildren[$tag['tag']], $tag['require_children']));
 				}
 			}
 
 			// Clean up tags with children
-			foreach($bbcTagsChildren as $parent_tag => $children)
-			{
-				foreach($children as $index => $child_tag)
-				{
+			foreach($bbcTagsChildren as $parent_tag => $children) {
+				foreach($children as $index => $child_tag) {
 					// Remove entries where parent and child tag is the same
-					if ($child_tag == $parent_tag)
-					{
+					if ($child_tag == $parent_tag) {
 						unset($bbcTagsChildren[$parent_tag][$index]);
+
 						continue;
 					}
 
 					// Combine chains of tags
-					if (isset($bbcTagsChildren[$child_tag]))
-					{
+					if (isset($bbcTagsChildren[$child_tag])) {
 						$bbcTagsChildren[$parent_tag] = array_merge($bbcTagsChildren[$parent_tag], $bbcTagsChildren[$child_tag]);
 						unset($bbcTagsChildren[$child_tag]);
 					}
 				}
 			}
 
-			if (!isset($_POST['disabledBBC_enabledTags']))
-			{
-				$_POST['disabledBBC_enabledTags'] = array();
-			}
-			elseif (!is_array($_POST['disabledBBC_enabledTags']))
-			{
-				$_POST['disabledBBC_enabledTags'] = array($_POST['disabledBBC_enabledTags']);
+			if (!isset($_POST['disabledBBC_enabledTags'])) {
+				$_POST['disabledBBC_enabledTags'] = [];
+			} elseif (!is_array($_POST['disabledBBC_enabledTags'])) {
+				$_POST['disabledBBC_enabledTags'] = [$_POST['disabledBBC_enabledTags']];
 			}
 
-			if (!isset($_POST['legacyBBC_enabledTags']))
-			{
-				$_POST['legacyBBC_enabledTags'] = array();
-			}
-			elseif (!is_array($_POST['legacyBBC_enabledTags']))
-			{
-				$_POST['legacyBBC_enabledTags'] = array($_POST['legacyBBC_enabledTags']);
+			if (!isset($_POST['legacyBBC_enabledTags'])) {
+				$_POST['legacyBBC_enabledTags'] = [];
+			} elseif (!is_array($_POST['legacyBBC_enabledTags'])) {
+				$_POST['legacyBBC_enabledTags'] = [$_POST['legacyBBC_enabledTags']];
 			}
 
 			$_POST['disabledBBC_enabledTags'] = array_unique(array_merge($_POST['disabledBBC_enabledTags'], $_POST['legacyBBC_enabledTags']));
 
 			// Enable all children if parent is enabled
-			foreach ($bbcTagsChildren as $tag => $children)
-			{
-				if (in_array($tag, $_POST['disabledBBC_enabledTags']))
-				{
+			foreach ($bbcTagsChildren as $tag => $children) {
+				if (in_array($tag, $_POST['disabledBBC_enabledTags'])) {
 					$_POST['disabledBBC_enabledTags'] = array_merge($_POST['disabledBBC_enabledTags'], $children);
 				}
 			}
@@ -271,13 +262,12 @@ public function bbc(): void
 			unset($_POST['legacyBBC_enabledTags']);
 			$config_vars = array_filter(
 				$config_vars,
-				function($config_var)
-				{
+				function ($config_var) {
 					return !isset($config_var[1]) || $config_var[1] != 'legacyBBC';
-				}
+				},
 			);
 
-			IntegrationHook::call('integrate_save_bbc_settings', array($bbcTags));
+			IntegrationHook::call('integrate_save_bbc_settings', [$bbcTags]);
 
 			ACP::saveDBSettings($config_vars);
 			$_SESSION['adm-save'] = true;
@@ -300,8 +290,7 @@ public function layout(): void
 		$config_vars = self::layoutConfigVars();
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_layout_settings');
@@ -336,13 +325,12 @@ public function signature(): void
 		Utils::$context['settings_post_javascript'] = 'document.getElementById(\'signature_max_smileys\').disabled = !document.getElementById(\'signature_allow_smileys\').checked;';
 
 		// Load all the signature settings.
-		list ($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
+		list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 		$sig_limits = explode(',', $sig_limits);
-		$disabledTags = !empty($sig_bbc) ? explode(',', $sig_bbc) : array();
+		$disabledTags = !empty($sig_bbc) ? explode(',', $sig_bbc) : [];
 
 		// Applying to ALL signatures?!!
-		if (isset($_GET['apply']))
-		{
+		if (isset($_GET['apply'])) {
 			// Security!
 			User::$me->checkSession('get');
 
@@ -351,88 +339,80 @@ public function signature(): void
 			$_GET['step'] = isset($_GET['step']) ? (int) $_GET['step'] : 0;
 			$done = false;
 
-			$request = Db::$db->query('', '
-				SELECT MAX(id_member)
+			$request = Db::$db->query(
+				'',
+				'SELECT MAX(id_member)
 				FROM {db_prefix}members',
-				array(
-				)
+				[
+				],
 			);
-			list (Utils::$context['max_member']) = Db::$db->fetch_row($request);
+			list(Utils::$context['max_member']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			while (!$done)
-			{
-				$changes = array();
+			while (!$done) {
+				$changes = [];
 
-				$request = Db::$db->query('', '
-					SELECT id_member, signature
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, signature
 					FROM {db_prefix}members
 					WHERE id_member BETWEEN {int:step} AND {int:step} + 49
 						AND id_group != {int:admin_group}
 						AND FIND_IN_SET({int:admin_group}, additional_groups) = 0',
-					array(
+					[
 						'admin_group' => 1,
 						'step' => $_GET['step'],
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					// Apply all the rules we can realistically do.
-					$sig = strtr($row['signature'], array('<br>' => "\n"));
+					$sig = strtr($row['signature'], ['<br>' => "\n"]);
 
 					// Max characters...
-					if (!empty($sig_limits[1]))
+					if (!empty($sig_limits[1])) {
 						$sig = Utils::entitySubstr($sig, 0, $sig_limits[1]);
+					}
+
 					// Max lines...
-					if (!empty($sig_limits[2]))
-					{
+					if (!empty($sig_limits[2])) {
 						$count = 0;
-						for ($i = 0; $i < strlen($sig); $i++)
-						{
-							if ($sig[$i] == "\n")
-							{
+
+						for ($i = 0; $i < strlen($sig); $i++) {
+							if ($sig[$i] == "\n") {
 								$count++;
-								if ($count >= $sig_limits[2])
-									$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), array("\n" => ' '));
+
+								if ($count >= $sig_limits[2]) {
+									$sig = substr($sig, 0, $i) . strtr(substr($sig, $i), ["\n" => ' ']);
+								}
 							}
 						}
 					}
 
-					if (!empty($sig_limits[7]) && preg_match_all('~\[size=([\d\.]+)?(px|pt|em|x-large|larger)~i', $sig, $matches) !== false && isset($matches[2]))
-					{
-						foreach ($matches[1] as $ind => $size)
-						{
+					if (!empty($sig_limits[7]) && preg_match_all('~\[size=([\d\.]+)?(px|pt|em|x-large|larger)~i', $sig, $matches) !== false && isset($matches[2])) {
+						foreach ($matches[1] as $ind => $size) {
 							$limit_broke = 0;
 
 							// Attempt to allow all sizes of abuse, so to speak.
-							if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-							{
+							if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
 								$limit_broke = $sig_limits[7] . 'px';
-							}
-							elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-							{
+							} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
 								$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-							}
-							elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-							{
+							} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
 								$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-							}
-							elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-							{
+							} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
 								$limit_broke = 'large';
 							}
 
-							if ($limit_broke)
-							{
+							if ($limit_broke) {
 								$sig = str_replace($matches[0][$ind], '[size=' . $sig_limits[7] . 'px', $sig);
 							}
 						}
 					}
 
 					// Stupid images - this is stupidly, stupidly challenging.
-					if ((!empty($sig_limits[3]) || !empty($sig_limits[5]) || !empty($sig_limits[6])))
-					{
-						$replaces = array();
+					if ((!empty($sig_limits[3]) || !empty($sig_limits[5]) || !empty($sig_limits[6]))) {
+						$replaces = [];
 						$img_count = 0;
 
 						// Get all BBC tags...
@@ -442,10 +422,8 @@ public function signature(): void
 						preg_match_all('~&lt;img\s+src=(?:&quot;)?((?:http://|ftp://|https://|ftps://).+?)(?:&quot;)?(?:\s+alt=(?:&quot;)?(.*?)(?:&quot;)?)?(?:\s?/)?&gt;~i', $sig, $matches2, PREG_PATTERN_ORDER);
 
 						// And stick the HTML in the BBC.
-						if (!empty($matches2))
-						{
-							foreach ($matches2[0] as $ind => $dummy)
-							{
+						if (!empty($matches2)) {
+							foreach ($matches2[0] as $ind => $dummy) {
 								$matches[0][] = $matches2[0][$ind];
 								$matches[1][] = '';
 								$matches[2][] = '';
@@ -458,32 +436,26 @@ public function signature(): void
 						}
 
 						// Try to find all the images!
-						if (!empty($matches))
-						{
-							$image_count_holder = array();
+						if (!empty($matches)) {
+							$image_count_holder = [];
 
-							foreach ($matches[0] as $key => $image)
-							{
+							foreach ($matches[0] as $key => $image) {
 								$width = -1;
 								$height = -1;
 								$img_count++;
 
 								// Too many images?
-								if (!empty($sig_limits[3]) && $img_count > $sig_limits[3])
-								{
+								if (!empty($sig_limits[3]) && $img_count > $sig_limits[3]) {
 									// If we've already had this before we only want to remove the excess.
-									if (isset($image_count_holder[$image]))
-									{
+									if (isset($image_count_holder[$image])) {
 										$img_offset = -1;
 										$rep_img_count = 0;
 
-										while ($img_offset !== false)
-										{
+										while ($img_offset !== false) {
 											$img_offset = strpos($sig, $image, $img_offset + 1);
 											$rep_img_count++;
 
-											if ($rep_img_count > $image_count_holder[$image])
-											{
+											if ($rep_img_count > $image_count_holder[$image]) {
 												// Only replace the excess.
 												$sig = substr($sig, 0, $img_offset) . str_replace($image, '', substr($sig, $img_offset));
 
@@ -491,9 +463,7 @@ public function signature(): void
 												$img_offset = false;
 											}
 										}
-									}
-									else
-									{
+									} else {
 										$replaces[$image] = '';
 									}
 
@@ -501,66 +471,56 @@ public function signature(): void
 								}
 
 								// Does it have predefined restraints? Width first.
-								if ($matches[6][$key])
+								if ($matches[6][$key]) {
 									$matches[2][$key] = $matches[6][$key];
+								}
 
-								if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
-								{
+								if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5]) {
 									$width = $sig_limits[5];
 									$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
-								}
-								elseif ($matches[2][$key])
-								{
+								} elseif ($matches[2][$key]) {
 									$width = $matches[2][$key];
 								}
 
 								// ... and height.
-								if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
-								{
+								if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6]) {
 									$height = $sig_limits[6];
 
-									if ($width != -1)
+									if ($width != -1) {
 										$width = $width * ($height / $matches[4][$key]);
-								}
-								elseif ($matches[4][$key])
-								{
+									}
+								} elseif ($matches[4][$key]) {
 									$height = $matches[4][$key];
 								}
 
 								// If the dimensions are still not fixed - we need to check the actual image.
-								if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
-								{
+								if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6])) {
 									$sizes = Image::getSizeExternal($matches[7][$key]);
 
-									if (is_array($sizes))
-									{
+									if (is_array($sizes)) {
 										// Too wide?
-										if ($sizes[0] > $sig_limits[5] && $sig_limits[5])
-										{
+										if ($sizes[0] > $sig_limits[5] && $sig_limits[5]) {
 											$width = $sig_limits[5];
 											$sizes[1] = $sizes[1] * ($width / $sizes[0]);
 										}
 
 										// Too high?
-										if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
-										{
+										if ($sizes[1] > $sig_limits[6] && $sig_limits[6]) {
 											$height = $sig_limits[6];
 
-											if ($width == -1)
+											if ($width == -1) {
 												$width = $sizes[0];
+											}
 
 											$width = $width * ($height / $sizes[1]);
-										}
-										elseif ($width != -1)
-										{
+										} elseif ($width != -1) {
 											$height = $sizes[1];
 										}
 									}
 								}
 
 								// Did we come up with some changes? If so remake the string.
-								if ($width != -1 || $height != -1)
-								{
+								if ($width != -1 || $height != -1) {
 									$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
 								}
 
@@ -568,121 +528,118 @@ public function signature(): void
 								$image_count_holder[$image] = isset($image_count_holder[$image]) ? $image_count_holder[$image] + 1 : 1;
 							}
 
-							if (!empty($replaces))
-							{
+							if (!empty($replaces)) {
 								$sig = str_replace(array_keys($replaces), array_values($replaces), $sig);
 							}
 						}
 					}
+
 					// Try to fix disabled tags.
-					if (!empty($disabledTags))
-					{
+					if (!empty($disabledTags)) {
 						$sig = preg_replace('~\[(?:' . implode('|', $disabledTags) . ').+?\]~i', '', $sig);
 
 						$sig = preg_replace('~\[/(?:' . implode('|', $disabledTags) . ')\]~i', '', $sig);
 					}
 
-					$sig = strtr($sig, array("\n" => '<br>'));
+					$sig = strtr($sig, ["\n" => '<br>']);
 
-					IntegrationHook::call('integrate_apply_signature_settings', array(&$sig, $sig_limits, $disabledTags));
+					IntegrationHook::call('integrate_apply_signature_settings', [&$sig, $sig_limits, $disabledTags]);
 
-					if ($sig != $row['signature'])
+					if ($sig != $row['signature']) {
 						$changes[$row['id_member']] = $sig;
+					}
 				}
 
-				if (Db::$db->num_rows($request) == 0)
+				if (Db::$db->num_rows($request) == 0) {
 					$done = true;
+				}
 
 				Db::$db->free_result($request);
 
 				// Do we need to delete what we have?
-				if (!empty($changes))
-				{
-					foreach ($changes as $id => $sig)
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}members
+				if (!empty($changes)) {
+					foreach ($changes as $id => $sig) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}members
 							SET signature = {string:signature}
 							WHERE id_member = {int:id_member}',
-							array(
+							[
 								'id_member' => $id,
 								'signature' => $sig,
-							)
+							],
 						);
 					}
 				}
 
 				$_GET['step'] += 50;
 
-				if (!$done)
+				if (!$done) {
 					$this->pauseSignatureApplySettings();
+				}
 			}
 
 			$settings_applied = true;
 		}
 
-		Utils::$context['signature_settings'] = array(
-			'enable' => isset($sig_limits[0]) ? $sig_limits[0] : 0,
-			'max_length' => isset($sig_limits[1]) ? $sig_limits[1] : 0,
-			'max_lines' => isset($sig_limits[2]) ? $sig_limits[2] : 0,
-			'max_images' => isset($sig_limits[3]) ? $sig_limits[3] : 0,
+		Utils::$context['signature_settings'] = [
+			'enable' => $sig_limits[0] ?? 0,
+			'max_length' => $sig_limits[1] ?? 0,
+			'max_lines' => $sig_limits[2] ?? 0,
+			'max_images' => $sig_limits[3] ?? 0,
 			'allow_smileys' => isset($sig_limits[4]) && $sig_limits[4] == -1 ? 0 : 1,
 			'max_smileys' => isset($sig_limits[4]) && $sig_limits[4] != -1 ? $sig_limits[4] : 0,
-			'max_image_width' => isset($sig_limits[5]) ? $sig_limits[5] : 0,
-			'max_image_height' => isset($sig_limits[6]) ? $sig_limits[6] : 0,
-			'max_font_size' => isset($sig_limits[7]) ? $sig_limits[7] : 0,
-		);
+			'max_image_width' => $sig_limits[5] ?? 0,
+			'max_image_height' => $sig_limits[6] ?? 0,
+			'max_font_size' => $sig_limits[7] ?? 0,
+		];
 
 		// Temporarily make each setting a modSetting!
-		foreach (Utils::$context['signature_settings'] as $key => $value)
+		foreach (Utils::$context['signature_settings'] as $key => $value) {
 			Config::$modSettings['signature_' . $key] = $value;
+		}
 
 		// Make sure we check the right tags!
 		Config::$modSettings['bbc_disabled_signature_bbc'] = $disabledTags;
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Clean up the tag stuff!
-			$bbcTags = array();
+			$bbcTags = [];
 
-			foreach (BBCodeParser::getCodes() as $tag)
+			foreach (BBCodeParser::getCodes() as $tag) {
 				$bbcTags[] = $tag['tag'];
-
-			if (!isset($_POST['signature_bbc_enabledTags']))
-			{
-				$_POST['signature_bbc_enabledTags'] = array();
 			}
-			elseif (!is_array($_POST['signature_bbc_enabledTags']))
-			{
-				$_POST['signature_bbc_enabledTags'] = array($_POST['signature_bbc_enabledTags']);
+
+			if (!isset($_POST['signature_bbc_enabledTags'])) {
+				$_POST['signature_bbc_enabledTags'] = [];
+			} elseif (!is_array($_POST['signature_bbc_enabledTags'])) {
+				$_POST['signature_bbc_enabledTags'] = [$_POST['signature_bbc_enabledTags']];
 			}
 
-			$sig_limits = array();
-			foreach (Utils::$context['signature_settings'] as $key => $value)
-			{
-				if ($key == 'allow_smileys')
+			$sig_limits = [];
+
+			foreach (Utils::$context['signature_settings'] as $key => $value) {
+				if ($key == 'allow_smileys') {
 					continue;
+				}
 
-				if ($key == 'max_smileys' && empty($_POST['signature_allow_smileys']))
-				{
+				if ($key == 'max_smileys' && empty($_POST['signature_allow_smileys'])) {
 					$sig_limits[] = -1;
-				}
-				else
-				{
+				} else {
 					$sig_limits[] = !empty($_POST['signature_' . $key]) ? max(1, (int) $_POST['signature_' . $key]) : 0;
 				}
 			}
 
-			IntegrationHook::call('integrate_save_signature_settings', array(&$sig_limits, &$bbcTags));
+			IntegrationHook::call('integrate_save_signature_settings', [&$sig_limits, &$bbcTags]);
 
 			$_POST['signature_settings'] = implode(',', $sig_limits) . ':' . implode(',', array_diff($bbcTags, $_POST['signature_bbc_enabledTags']));
 
 			// Even though we have practically no settings let's keep the convention going!
-			$save_vars = array();
-			$save_vars[] = array('text', 'signature_settings');
+			$save_vars = [];
+			$save_vars[] = ['text', 'signature_settings'];
 
 			ACP::saveDBSettings($save_vars);
 			$_SESSION['adm-save'] = true;
@@ -692,21 +649,18 @@ public function signature(): void
 		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=featuresettings;save;sa=sig';
 		Utils::$context['settings_title'] = Lang::$txt['signature_settings'];
 
-		if (!empty($settings_applied))
-		{
-			Utils::$context['settings_message'] = array(
+		if (!empty($settings_applied)) {
+			Utils::$context['settings_message'] = [
 				'label' => Lang::$txt['signature_settings_applied'],
 				'tag' => 'div',
-				'class' => 'infobox'
-			);
-		}
-		else
-		{
-			Utils::$context['settings_message'] = array(
+				'class' => 'infobox',
+			];
+		} else {
+			Utils::$context['settings_message'] = [
 				'label' => sprintf(Lang::$txt['signature_settings_warning'], Utils::$context['session_id'], Utils::$context['session_var'], Config::$scripturl),
 				'tag' => 'div',
-				'class' => 'centertext'
-			);
+				'class' => 'centertext',
+			];
 		}
 
 		ACP::prepareDBSettingContext($config_vars);
@@ -721,37 +675,35 @@ public function profile(): void
 		Utils::$context['sub_template'] = 'show_custom_profile';
 
 		// What about standard fields they can tweak?
-		$standard_fields = array('website', 'personal_text', 'timezone', 'posts', 'warning_status');
+		$standard_fields = ['website', 'personal_text', 'timezone', 'posts', 'warning_status'];
 		// What fields can't you put on the registration page?
-		Utils::$context['fields_no_registration'] = array('posts', 'warning_status');
+		Utils::$context['fields_no_registration'] = ['posts', 'warning_status'];
 
 		// Are we saving any standard field changes?
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-scp');
 
 			// Do the active ones first.
 			$disable_fields = array_flip($standard_fields);
 
-			if (!empty($_POST['active']))
-			{
-				foreach ($_POST['active'] as $value)
+			if (!empty($_POST['active'])) {
+				foreach ($_POST['active'] as $value) {
 					unset($disable_fields[$value]);
+				}
 			}
 
 			// What we have left!
 			$changes['disabled_profile_fields'] = empty($disable_fields) ? '' : implode(',', array_keys($disable_fields));
 
 			// Things we want to show on registration?
-			$reg_fields = array();
+			$reg_fields = [];
 
-			if (!empty($_POST['reg']))
-			{
-				foreach ($_POST['reg'] as $value)
-				{
-					if (in_array($value, $standard_fields) && !isset($disable_fields[$value]))
+			if (!empty($_POST['reg'])) {
+				foreach ($_POST['reg'] as $value) {
+					if (in_array($value, $standard_fields) && !isset($disable_fields[$value])) {
 						$reg_fields[] = $value;
+					}
 				}
 			}
 
@@ -760,8 +712,9 @@ public function profile(): void
 
 			$_SESSION['adm-save'] = true;
 
-			if (!empty($changes))
+			if (!empty($changes)) {
 				Config::updateModSettings($changes);
+			}
 		}
 
 		SecurityToken::create('admin-scp');
@@ -769,219 +722,218 @@ public function profile(): void
 		// Need to know the max order for custom fields
 		Utils::$context['custFieldsMaxOrder'] = $this->custFieldsMaxOrder();
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'standard_profile_fields',
 			'title' => Lang::$txt['standard_profile_title'],
 			'base_href' => Config::$scripturl . '?action=admin;area=featuresettings;sa=profile',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getProfileFields',
-				'params' => array(
+				'params' => [
 					true,
-				),
-			),
-			'columns' => array(
-				'field' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'field' => [
+					'header' => [
 						'value' => Lang::$txt['standard_profile_field'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'label',
 						'style' => 'width: 60%;',
-					),
-				),
-				'active' => array(
-					'header' => array(
+					],
+				],
+				'active' => [
+					'header' => [
 						'value' => Lang::$txt['custom_edit_active'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$isChecked = $rowData['disabled'] ? '' : ' checked';
 							$onClickHandler = $rowData['can_show_register'] ? sprintf(' onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
+
 							return sprintf('<input type="checkbox" name="active[]" id="active_%1$s" value="%1$s" %2$s%3$s>', $rowData['id'], $isChecked, $onClickHandler);
 						},
 						'style' => 'width: 20%;',
 						'class' => 'centercol',
-					),
-				),
-				'show_on_registration' => array(
-					'header' => array(
+					],
+				],
+				'show_on_registration' => [
+					'header' => [
 						'value' => Lang::$txt['custom_edit_registration'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
 							$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
+
 							return sprintf('<input type="checkbox" name="reg[]" id="reg_%1$s" value="%1$s" %2$s%3$s>', $rowData['id'], $isChecked, $isDisabled);
 						},
 						'style' => 'width: 20%;',
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=featuresettings;sa=profile',
 				'name' => 'standardProfileFields',
 				'token' => 'admin-scp',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="save" value="' . Lang::$txt['save'] . '" class="button">',
-				),
-			),
-		);
+				],
+			],
+		];
 		new ItemList($listOptions);
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'custom_profile_fields',
 			'title' => Lang::$txt['custom_profile_title'],
 			'base_href' => Config::$scripturl . '?action=admin;area=featuresettings;sa=profile',
 			'default_sort_col' => 'field_order',
 			'no_items_label' => Lang::$txt['custom_profile_none'],
 			'items_per_page' => 25,
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getProfileFields',
-				'params' => array(
+				'params' => [
 					false,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getProfileFieldSize',
-			),
-			'columns' => array(
-				'field_order' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'field_order' => [
+					'header' => [
 						'value' => Lang::$txt['custom_profile_fieldorder'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$return = '<p class="centertext bold_text">';
 
-							if ($rowData['field_order'] > 1)
+							if ($rowData['field_order'] > 1) {
 								$return .= '<a href="' . Config::$scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="' . Lang::$txt['custom_edit_order_move'] . ' ' . Lang::$txt['custom_edit_order_up'] . '"></span></a>';
+							}
 
-							if ($rowData['field_order'] < Utils::$context['custFieldsMaxOrder'])
+							if ($rowData['field_order'] < Utils::$context['custFieldsMaxOrder']) {
 								$return .= '<a href="' . Config::$scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="' . Lang::$txt['custom_edit_order_move'] . ' ' . Lang::$txt['custom_edit_order_down'] . '"></span></a>';
+							}
 
 							$return .= '</p>';
 
 							return $return;
 						},
 						'style' => 'width: 12%;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'field_order',
 						'reverse' => 'field_order DESC',
-					),
-				),
-				'field_name' => array(
-					'header' => array(
+					],
+				],
+				'field_name' => [
+					'header' => [
 						'value' => Lang::$txt['custom_profile_fieldname'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$field_name = Lang::tokenTxtReplace($rowData['field_name']);
 							$field_desc = Lang::tokenTxtReplace($rowData['field_desc']);
 
-							return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>',
+							return sprintf(
+								'<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>',
 								Config::$scripturl,
 								$rowData['id_field'],
 								$field_name,
-								$field_desc);
+								$field_desc,
+							);
 						},
 						'style' => 'width: 62%;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'field_name',
 						'reverse' => 'field_name DESC',
-					),
-				),
-				'field_type' => array(
-					'header' => array(
+					],
+				],
+				'field_type' => [
+					'header' => [
 						'value' => Lang::$txt['custom_profile_fieldtype'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
-							return isset(Lang::$txt[$textKey]) ? Lang::$txt[$textKey] : $textKey;
+
+							return Lang::$txt[$textKey] ?? $textKey;
 						},
 						'style' => 'width: 15%;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'field_type',
 						'reverse' => 'field_type DESC',
-					),
-				),
-				'active' => array(
-					'header' => array(
+					],
+				],
+				'active' => [
+					'header' => [
 						'value' => Lang::$txt['custom_profile_active'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return $rowData['active'] ? Lang::$txt['yes'] : Lang::$txt['no'];
 						},
 						'style' => 'width: 8%;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'active DESC',
 						'reverse' => 'active',
-					),
-				),
-				'placement' => array(
-					'header' => array(
+					],
+				],
+				'placement' => [
+					'header' => [
 						'value' => Lang::$txt['custom_profile_placement'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return Lang::$txt['custom_profile_placement_' . (empty($rowData['placement']) ? 'standard' : Utils::$context['cust_profile_fields_placement'][$rowData['placement']])];
 						},
 						'style' => 'width: 8%;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'placement DESC',
 						'reverse' => 'placement',
-					),
-				),
-				'show_on_registration' => array(
-					'data' => array(
-						'sprintf' => array(
+					],
+				],
+				'show_on_registration' => [
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=%1$s">' . Lang::$txt['modify'] . '</a>',
-							'params' => array(
+							'params' => [
 								'id_field' => false,
-							),
-						),
+							],
+						],
 						'style' => 'width: 15%;',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=featuresettings;sa=profileedit',
 				'name' => 'customProfileFields',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="new" value="' . Lang::$txt['custom_profile_make_new'] . '" class="button">',
-				),
-			),
-		);
+				],
+			],
+		];
 		new ItemList($listOptions);
 
 		// There are two different ways we could get to this point. To keep it simple, they both do
 		// the same basic thing.
-		if (isset($_SESSION['adm-save']))
-		{
+		if (isset($_SESSION['adm-save'])) {
 			Utils::$context['saved_successful'] = true;
-			unset ($_SESSION['adm-save']);
+			unset($_SESSION['adm-save']);
 		}
 	}
 
@@ -1000,38 +952,35 @@ public function profileEdit()
 		Lang::load('Profile');
 
 		// There's really only a few places we can go...
-		$move_to = array('up', 'down');
+		$move_to = ['up', 'down'];
 
 		// We need this for both moving and saving so put it right here.
 		$order_count = $this->custFieldsMaxOrder();
 
-		if (Utils::$context['fid'] && !isset($_GET['move']))
-		{
-			Utils::$context['field'] = array();
-			$request = Db::$db->query('', '
-				SELECT
+		if (Utils::$context['fid'] && !isset($_GET['move'])) {
+			Utils::$context['field'] = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					id_field, col_name, field_name, field_desc, field_type, field_order, field_length, field_options,
 					show_reg, show_display, show_mlist, show_profile, private, active, default_value, can_search,
 					bbc, mask, enclose, placement
 				FROM {db_prefix}custom_fields
 				WHERE id_field = {int:current_field}',
-				array(
+				[
 					'current_field' => Utils::$context['fid'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if ($row['field_type'] == 'textarea')
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if ($row['field_type'] == 'textarea') {
 					@list($rows, $cols) = @explode(',', $row['default_value']);
-				}
-				else
-				{
+				} else {
 					$rows = 3;
 					$cols = 30;
 				}
 
-				Utils::$context['field'] = array(
+				Utils::$context['field'] = [
 					'name' => $row['field_name'],
 					'desc' => $row['field_desc'],
 					'col_name' => $row['col_name'],
@@ -1047,7 +996,7 @@ public function profileEdit()
 					'bbc' => $row['bbc'] ? true : false,
 					'default_check' => $row['field_type'] == 'check' && $row['default_value'] ? true : false,
 					'default_select' => $row['field_type'] == 'select' || $row['field_type'] == 'radio' ? $row['default_value'] : '',
-					'options' => strlen($row['field_options']) > 1 ? explode(',', $row['field_options']) : array('', '', ''),
+					'options' => strlen($row['field_options']) > 1 ? explode(',', $row['field_options']) : ['', '', ''],
 					'active' => $row['active'],
 					'private' => $row['private'],
 					'can_search' => $row['can_search'],
@@ -1055,14 +1004,14 @@ public function profileEdit()
 					'regex' => substr($row['mask'], 0, 5) == 'regex' ? substr($row['mask'], 5) : '',
 					'enclose' => $row['enclose'],
 					'placement' => $row['placement'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Setup the default values as needed.
-		if (empty(Utils::$context['field']))
-			Utils::$context['field'] = array(
+		if (empty(Utils::$context['field'])) {
+			Utils::$context['field'] = [
 				'name' => '',
 				'col_name' => '???',
 				'desc' => '',
@@ -1078,7 +1027,7 @@ public function profileEdit()
 				'bbc' => false,
 				'default_check' => false,
 				'default_select' => '',
-				'options' => array('', '', ''),
+				'options' => ['', '', ''],
 				'active' => true,
 				'private' => false,
 				'can_search' => false,
@@ -1086,60 +1035,57 @@ public function profileEdit()
 				'regex' => '',
 				'enclose' => '',
 				'placement' => 0,
-			);
+			];
+		}
 
 		// Are we moving it?
-		if (Utils::$context['fid'] && isset($_GET['move']) && in_array(Utils::htmlspecialchars($_GET['move']), $move_to))
-		{
-			$fields = array();
-			$new_sort = array();
+		if (Utils::$context['fid'] && isset($_GET['move']) && in_array(Utils::htmlspecialchars($_GET['move']), $move_to)) {
+			$fields = [];
+			$new_sort = [];
 
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					id_field, field_order
 				FROM {db_prefix}custom_fields
 				ORDER BY field_order',
-					array()
+				[],
 			);
-			while($row = Db::$db->fetch_assoc($request))
-			{
+
+			while($row = Db::$db->fetch_assoc($request)) {
 				$fields[] = $row['id_field'];
 			}
 			Db::$db->free_result($request);
 
 			$idx = array_search(Utils::$context['fid'], $fields);
 
-			if ($_GET['move'] == 'down' && count($fields) - 1 > $idx )
-			{
-				$new_sort = array_slice($fields ,0 ,$idx ,true);
+			if ($_GET['move'] == 'down' && count($fields) - 1 > $idx) {
+				$new_sort = array_slice($fields, 0, $idx, true);
 				$new_sort[] = $fields[$idx + 1];
 				$new_sort[] = $fields[$idx];
-				$new_sort += array_slice($fields ,$idx + 2 ,count($fields) ,true);
-			}
-			elseif (Utils::$context['fid'] > 0 and $idx < count($fields))
-			{
-				$new_sort = array_slice($fields ,0 ,($idx - 1) ,true);
+				$new_sort += array_slice($fields, $idx + 2, count($fields), true);
+			} elseif (Utils::$context['fid'] > 0 and $idx < count($fields)) {
+				$new_sort = array_slice($fields, 0, ($idx - 1), true);
 				$new_sort[] = $fields[$idx];
 				$new_sort[] = $fields[$idx - 1];
-				$new_sort += array_slice($fields ,($idx + 1) ,count($fields) ,true);
-			}
-			else
-			{
+				$new_sort += array_slice($fields, ($idx + 1), count($fields), true);
+			} else {
 				// @todo implement an error handler
 				Utils::redirectexit('action=admin;area=featuresettings;sa=profile');
 			}
 
 			$sql_update = 'CASE ';
-			foreach ($new_sort as $orderKey => $PKid)
-			{
+
+			foreach ($new_sort as $orderKey => $PKid) {
 				$sql_update .= 'WHEN id_field = ' . $PKid . ' THEN ' . ($orderKey + 1) . ' ';
 			}
 			$sql_update .= 'END';
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}custom_fields
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}custom_fields
 				SET field_order = ' . $sql_update,
-					array()
+				[],
 			);
 
 			// @todo perhaps a nice confirmation message, dunno.
@@ -1147,20 +1093,17 @@ public function profileEdit()
 		}
 
 		// Are we saving?
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-ecp');
 
 			// Everyone needs a name - even the (bracket) unknown...
-			if (trim($_POST['field_name']) == '')
-			{
+			if (trim($_POST['field_name']) == '') {
 				Utils::redirectexit(Config::$scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=need_name');
 			}
 
 			// Regex you say?  Do a very basic test to see if the pattern is valid
-			if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false)
-			{
+			if (!empty($_POST['regex']) && @preg_match($_POST['regex'], 'dummy') === false) {
 				Utils::redirectexit(Config::$scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $_GET['fid'] . ';msg=regex_error');
 			}
 
@@ -1178,10 +1121,11 @@ public function profileEdit()
 			$can_search = isset($_POST['can_search']) ? 1 : 0;
 
 			// Some masking stuff...
-			$mask = isset($_POST['mask']) ? $_POST['mask'] : '';
+			$mask = $_POST['mask'] ?? '';
 
-			if ($mask == 'regex' && isset($_POST['regex']))
+			if ($mask == 'regex' && isset($_POST['regex'])) {
 				$mask .= $_POST['regex'];
+			}
 
 			$mask = Utils::normalize($mask);
 
@@ -1191,20 +1135,19 @@ public function profileEdit()
 
 			// Select options?
 			$field_options = '';
-			$newOptions = array();
+			$newOptions = [];
 			$default = isset($_POST['default_check']) && $_POST['field_type'] == 'check' ? 1 : '';
 
-			if (!empty($_POST['select_option']) && ($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio'))
-			{
-				foreach ($_POST['select_option'] as $k => $v)
-				{
+			if (!empty($_POST['select_option']) && ($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio')) {
+				foreach ($_POST['select_option'] as $k => $v) {
 					// Clean, clean, clean...
 					$v = Utils::htmlspecialchars($v);
-					$v = strtr($v, array(',' => ''));
+					$v = strtr($v, [',' => '']);
 
 					// Nada, zip, etc...
-					if (trim($v) == '')
+					if (trim($v) == '') {
 						continue;
+					}
 
 					// Otherwise, save it boy.
 					$field_options .= $v . ',';
@@ -1212,20 +1155,21 @@ public function profileEdit()
 					$newOptions[$k] = $v;
 
 					// Is it default?
-					if (isset($_POST['default_select']) && $_POST['default_select'] == $k)
+					if (isset($_POST['default_select']) && $_POST['default_select'] == $k) {
 						$default = $v;
+					}
 				}
 
 				$field_options = substr($field_options, 0, -1);
 			}
 
 			// Text area has default has dimensions
-			if ($_POST['field_type'] == 'textarea')
+			if ($_POST['field_type'] == 'textarea') {
 				$default = (int) $_POST['rows'] . ',' . (int) $_POST['cols'];
+			}
 
 			// Come up with the unique name?
-			if (empty(Utils::$context['fid']))
-			{
+			if (empty(Utils::$context['fid'])) {
 				$col_name = Utils::normalize($_POST['field_name'], 'kc_casefold');
 				$col_name = Utils::sanitizeChars($col_name, 2, '-');
 				$col_name = preg_replace('~[^\w-]~u', '', $col_name);
@@ -1236,39 +1180,38 @@ public function profileEdit()
 				$col_name = $initial_col_name = 'cust_' . (!empty($col_name) ? $col_name : bin2hex(Utils::randomBytes(3)));
 
 				// Make sure this is unique.
-				$current_fields = array();
-				$request = Db::$db->query('', '
-					SELECT id_field, col_name
-					FROM {db_prefix}custom_fields'
+				$current_fields = [];
+				$request = Db::$db->query(
+					'',
+					'SELECT id_field, col_name
+					FROM {db_prefix}custom_fields',
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$current_fields[$row['id_field']] = $row['col_name'];
 				}
 				Db::$db->free_result($request);
 
 				$i = 0;
-				while (in_array($col_name, $current_fields))
-				{
+
+				while (in_array($col_name, $current_fields)) {
 					// First try appending an integer to the supplied name.
-					if ($i <= 9)
-					{
+					if ($i <= 9) {
 						$col_name = $initial_col_name . $i;
 					}
 					// Still not a unique column name? Use a random one, then.
-					else
-					{
+					else {
 						$col_name = substr('cust_' . bin2hex(Utils::randomBytes(4)), 0, 12);
 					}
 
 					// In this extremely unlikely event, bail out.
-					if (++$i > 20)
+					if (++$i > 20) {
 						ErrorHandler::fatalLang('custom_option_not_unique');
+					}
 				}
 			}
 			// Work out what to do with the user data otherwise...
-			else
-			{
+			else {
 				// Anything going to check or select is pointless keeping - as is anything coming from check!
 				if (
 					(
@@ -1287,53 +1230,52 @@ public function profileEdit()
 						Utils::$context['field']['type'] == 'check'
 						&& $_POST['field_type'] != 'check'
 					)
-				)
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}themes
+				) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}themes
 						WHERE variable = {string:current_column}
 							AND id_member > {int:no_member}',
-						array(
+						[
 							'no_member' => 0,
 							'current_column' => Utils::$context['field']['col_name'],
-						)
+						],
 					);
 				}
 				// Otherwise - if the select is edited may need to adjust!
-				elseif ($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio')
-				{
-					$optionChanges = array();
-					$takenKeys = array();
+				elseif ($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') {
+					$optionChanges = [];
+					$takenKeys = [];
 
 					// Work out what's changed!
-					foreach (Utils::$context['field']['options'] as $k => $option)
-					{
-						if (trim($option) == '')
+					foreach (Utils::$context['field']['options'] as $k => $option) {
+						if (trim($option) == '') {
 							continue;
+						}
 
 						// Still exists?
-						if (in_array($option, $newOptions))
+						if (in_array($option, $newOptions)) {
 							$takenKeys[] = $k;
+						}
 					}
 
 					// Finally - have we renamed it - or is it really gone?
-					foreach ($optionChanges as $k => $option)
-					{
+					foreach ($optionChanges as $k => $option) {
 						// Just been renamed?
-						if (!in_array($k, $takenKeys) && !empty($newOptions[$k]))
-						{
-							Db::$db->query('', '
-								UPDATE {db_prefix}themes
+						if (!in_array($k, $takenKeys) && !empty($newOptions[$k])) {
+							Db::$db->query(
+								'',
+								'UPDATE {db_prefix}themes
 								SET value = {string:new_value}
 								WHERE variable = {string:current_column}
 									AND value = {string:old_value}
 									AND id_member > {int:no_member}',
-								array(
+								[
 									'no_member' => 0,
 									'new_value' => $newOptions[$k],
 									'current_column' => Utils::$context['field']['col_name'],
 									'old_value' => $option,
-								)
+								],
 							);
 						}
 					}
@@ -1342,10 +1284,10 @@ public function profileEdit()
 			}
 
 			// Do the insertion/updates.
-			if (Utils::$context['fid'])
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}custom_fields
+			if (Utils::$context['fid']) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}custom_fields
 					SET
 						field_name = {string:field_name}, field_desc = {string:field_desc},
 						field_type = {string:field_type}, field_length = {int:field_length},
@@ -1355,7 +1297,7 @@ public function profileEdit()
 						can_search = {int:can_search}, bbc = {int:bbc}, mask = {string:mask},
 						enclose = {string:enclose}, placement = {int:placement}
 					WHERE id_field = {int:current_field}',
-					array(
+					[
 						'field_length' => $field_length,
 						'show_reg' => $show_reg,
 						'show_display' => $show_display,
@@ -1374,125 +1316,126 @@ public function profileEdit()
 						'mask' => $mask,
 						'enclose' => $enclose,
 						'placement' => $placement,
-					)
+					],
 				);
 
 				// Just clean up any old selects - these are a pain!
-				if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}themes
+				if (($_POST['field_type'] == 'select' || $_POST['field_type'] == 'radio') && !empty($newOptions)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}themes
 						WHERE variable = {string:current_column}
 							AND value NOT IN ({array_string:new_option_values})
 							AND id_member > {int:no_member}',
-						array(
+						[
 							'no_member' => 0,
 							'new_option_values' => $newOptions,
 							'current_column' => Utils::$context['field']['col_name'],
-						)
+						],
 					);
 				}
-			}
-			else
-			{
+			} else {
 				// Gotta figure it out the order.
 				$new_order = $order_count > 1 ? ($order_count + 1) : 1;
 
-				Db::$db->insert('',
+				Db::$db->insert(
+					'',
 					'{db_prefix}custom_fields',
-					array(
+					[
 						'col_name' => 'string', 'field_name' => 'string', 'field_desc' => 'string',
 						'field_type' => 'string', 'field_length' => 'string', 'field_options' => 'string', 'field_order' => 'int',
 						'show_reg' => 'int', 'show_display' => 'int', 'show_mlist' => 'int', 'show_profile' => 'string',
 						'private' => 'int', 'active' => 'int', 'default_value' => 'string', 'can_search' => 'int',
 						'bbc' => 'int', 'mask' => 'string', 'enclose' => 'string', 'placement' => 'int',
-					),
-					array(
+					],
+					[
 						$col_name, $_POST['field_name'], $_POST['field_desc'],
 						$_POST['field_type'], $field_length, $field_options, $new_order,
 						$show_reg, $show_display, $show_mlist, $show_profile,
 						$private, $active, $default, $can_search,
 						$bbc, $mask, $enclose, $placement,
-					),
-					array('id_field')
+					],
+					['id_field'],
 				);
 			}
 		}
 		// Deleting?
-		elseif (isset($_POST['delete']) && Utils::$context['field']['col_name'])
-		{
+		elseif (isset($_POST['delete']) && Utils::$context['field']['col_name']) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-ecp');
 
 			// Delete the user data first.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}themes
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}themes
 				WHERE variable = {string:current_column}
 					AND id_member > {int:no_member}',
-				array(
+				[
 					'no_member' => 0,
 					'current_column' => Utils::$context['field']['col_name'],
-				)
+				],
 			);
 
 			// Finally - the field itself is gone!
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}custom_fields
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}custom_fields
 				WHERE id_field = {int:current_field}',
-				array(
+				[
 					'current_field' => Utils::$context['fid'],
-				)
+				],
 			);
 
 			// Re-arrange the order.
-			Db::$db->query('', '
-				UPDATE {db_prefix}custom_fields
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}custom_fields
 				SET field_order = field_order - 1
 				WHERE field_order > {int:current_order}',
-				array(
+				[
 					'current_order' => Utils::$context['field']['order'],
-				)
+				],
 			);
 		}
 
 		// Rebuild display cache etc.
-		if (isset($_POST['delete']) || isset($_POST['save']))
-		{
+		if (isset($_POST['delete']) || isset($_POST['save'])) {
 			User::$me->checkSession();
 
-			$fields = array();
-			$request = Db::$db->query('', '
-				SELECT col_name, field_name, field_type, field_order, bbc, enclose, placement, show_mlist, field_options
+			$fields = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT col_name, field_name, field_type, field_order, bbc, enclose, placement, show_mlist, field_options
 				FROM {db_prefix}custom_fields
 				WHERE show_display = {int:is_displayed}
 					AND active = {int:active}
 					AND private != {int:not_owner_only}
 					AND private != {int:not_admin_only}
 				ORDER BY field_order',
-				array(
+				[
 					'is_displayed' => 1,
 					'active' => 1,
 					'not_owner_only' => 2,
 					'not_admin_only' => 3,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$fields[] = array(
-					'col_name' => strtr($row['col_name'], array('|' => '', ';' => '')),
-					'title' => strtr($row['field_name'], array('|' => '', ';' => '')),
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$fields[] = [
+					'col_name' => strtr($row['col_name'], ['|' => '', ';' => '']),
+					'title' => strtr($row['field_name'], ['|' => '', ';' => '']),
 					'type' => $row['field_type'],
 					'order' => $row['field_order'],
 					'bbc' => $row['bbc'] ? '1' : '0',
 					'placement' => !empty($row['placement']) ? $row['placement'] : '0',
 					'enclose' => !empty($row['enclose']) ? $row['enclose'] : '',
 					'mlist' => $row['show_mlist'],
-					'options' => (!empty($row['field_options']) ? explode(',', $row['field_options']) : array()),
-				);
+					'options' => (!empty($row['field_options']) ? explode(',', $row['field_options']) : []),
+				];
 			}
 			Db::$db->free_result($request);
 
-			Config::updateModSettings(array('displayFields' => Utils::jsonEncode($fields)));
+			Config::updateModSettings(['displayFields' => Utils::jsonEncode($fields)]);
 			$_SESSION['adm-save'] = true;
 			Utils::redirectexit('action=admin;area=featuresettings;sa=profile');
 		}
@@ -1510,8 +1453,7 @@ public function likes(): void
 		$config_vars = self::likesConfigVars();
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_likes_settings');
@@ -1537,8 +1479,7 @@ public function mentions(): void
 		$config_vars = self::mentionsConfigVars();
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_mentions_settings');
@@ -1561,7 +1502,7 @@ public function alerts()
 	{
 		// Dummy settings for the template...
 		User::$me->is_owner = false;
-		Utils::$context['member'] = array();
+		Utils::$context['member'] = [];
 		Utils::$context['id_member'] = 0;
 		Utils::$context['menu_item_selected'] = 'alerts';
 		Utils::$context['token_check'] = 'noti-admin';
@@ -1593,8 +1534,9 @@ public function alerts()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1616,88 +1558,88 @@ public static function basicConfigVars(): array
 	{
 		// We need to know if personal text is enabled, and if it's in the registration fields option.
 		// If admins have set it up as an on-registration thing, they can't set a default value (because it'll never be used)
-		$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : array();
-		$reg_fields = isset(Config::$modSettings['registration_fields']) ? explode(',', Config::$modSettings['registration_fields']) : array();
+		$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : [];
+		$reg_fields = isset(Config::$modSettings['registration_fields']) ? explode(',', Config::$modSettings['registration_fields']) : [];
 		$can_personal_text = !in_array('personal_text', $disabled_fields) && !in_array('personal_text', $reg_fields);
 
-		$config_vars = array(
+		$config_vars = [
 			// Big Options... polls, sticky, bbc....
-			array('select', 'pollMode', array(Lang::$txt['disable_polls'], Lang::$txt['enable_polls'], Lang::$txt['polls_as_topics'])),
+			['select', 'pollMode', [Lang::$txt['disable_polls'], Lang::$txt['enable_polls'], Lang::$txt['polls_as_topics']]],
 			'',
 
 			// Basic stuff, titles, flash, permissions...
-			array('check', 'allow_guestAccess'),
-			array('check', 'enable_buddylist'),
-			array('check', 'allow_hideOnline'),
-			array('check', 'titlesEnable'),
-			array('text', 'default_personal_text', 'subtext' => Lang::$txt['default_personal_text_note'], 'disabled' => !$can_personal_text),
-			array('check', 'topic_move_any'),
-			array('int', 'defaultMaxListItems', 'step' => 1, 'min' => 1, 'max' => 999),
+			['check', 'allow_guestAccess'],
+			['check', 'enable_buddylist'],
+			['check', 'allow_hideOnline'],
+			['check', 'titlesEnable'],
+			['text', 'default_personal_text', 'subtext' => Lang::$txt['default_personal_text_note'], 'disabled' => !$can_personal_text],
+			['check', 'topic_move_any'],
+			['int', 'defaultMaxListItems', 'step' => 1, 'min' => 1, 'max' => 999],
 			'',
 
 			// Jquery source
-			array(
+			[
 				'select',
 				'jquery_source',
-				array(
+				[
 					'cdn' => Lang::$txt['jquery_google_cdn'],
 					'jquery_cdn' => Lang::$txt['jquery_jquery_cdn'],
 					'microsoft_cdn' => Lang::$txt['jquery_microsoft_cdn'],
 					'local' => Lang::$txt['jquery_local'],
-					'custom' => Lang::$txt['jquery_custom']
-				),
-				'onchange' => 'if (this.value == \'custom\'){document.getElementById(\'jquery_custom\').disabled = false; } else {document.getElementById(\'jquery_custom\').disabled = true;}'
-			),
-			array(
+					'custom' => Lang::$txt['jquery_custom'],
+				],
+				'onchange' => 'if (this.value == \'custom\'){document.getElementById(\'jquery_custom\').disabled = false; } else {document.getElementById(\'jquery_custom\').disabled = true;}',
+			],
+			[
 				'text',
 				'jquery_custom',
-				'disabled' => !isset(Config::$modSettings['jquery_source']) || (isset(Config::$modSettings['jquery_source']) && Config::$modSettings['jquery_source'] != 'custom'), 'size' => 75
-			),
+				'disabled' => !isset(Config::$modSettings['jquery_source']) || (isset(Config::$modSettings['jquery_source']) && Config::$modSettings['jquery_source'] != 'custom'), 'size' => 75,
+			],
 			'',
 
 			// css and js minification.
-			array('check', 'minimize_files'),
+			['check', 'minimize_files'],
 			'',
 
 			// SEO stuff
-			array('check', 'queryless_urls', 'subtext' => '<strong>' . Lang::$txt['queryless_urls_note'] . '</strong>'),
-			array('text', 'meta_keywords', 'subtext' => Lang::$txt['meta_keywords_note'], 'size' => 50),
+			['check', 'queryless_urls', 'subtext' => '<strong>' . Lang::$txt['queryless_urls_note'] . '</strong>'],
+			['text', 'meta_keywords', 'subtext' => Lang::$txt['meta_keywords_note'], 'size' => 50],
 			'',
 
 			// Time zone and formatting.
-			array('text', 'time_format'),
-			array('select', 'default_timezone', array_filter(TimeZone::list(), 'is_string', ARRAY_FILTER_USE_KEY)),
-			array('text', 'timezone_priority_countries', 'subtext' => Lang::$txt['setting_timezone_priority_countries_note']),
+			['text', 'time_format'],
+			['select', 'default_timezone', array_filter(TimeZone::list(), 'is_string', ARRAY_FILTER_USE_KEY)],
+			['text', 'timezone_priority_countries', 'subtext' => Lang::$txt['setting_timezone_priority_countries_note']],
 			'',
 
 			// Who's online?
-			array('check', 'who_enabled'),
-			array('int', 'lastActive', 6, 'postinput' => Lang::$txt['minutes']),
+			['check', 'who_enabled'],
+			['int', 'lastActive', 6, 'postinput' => Lang::$txt['minutes']],
 			'',
 
 			// Statistics.
-			array('check', 'trackStats'),
-			array('check', 'hitStats'),
+			['check', 'trackStats'],
+			['check', 'hitStats'],
 			'',
 
 			// Option-ish things... miscellaneous sorta.
-			array('check', 'disallow_sendBody'),
+			['check', 'disallow_sendBody'],
 			'',
 
 			// Alerts stuff
-			array('check', 'enable_ajax_alerts'),
-			array('select', 'alerts_auto_purge',
-				array(
+			['check', 'enable_ajax_alerts'],
+			['select', 'alerts_auto_purge',
+				[
 					'0' => Lang::$txt['alerts_auto_purge_0'],
 					'7' => Lang::$txt['alerts_auto_purge_7'],
 					'30' => Lang::$txt['alerts_auto_purge_30'],
 					'90' => Lang::$txt['alerts_auto_purge_90'],
-				),
-			),
-			array('int', 'alerts_per_page', 'step' => 1, 'min' => 0, 'max' => 999),
-		);
+				],
+			],
+			['int', 'alerts_per_page', 'step' => 1, 'min' => 0, 'max' => 999],
+		];
 
-		IntegrationHook::call('integrate_modify_basic_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_basic_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1709,32 +1651,34 @@ public static function basicConfigVars(): array
 	 */
 	public static function bbcConfigVars(): array
 	{
-		$config_vars = array(
+		$config_vars = [
 			// Main tweaks
-			array('check', 'enableBBC'),
-			array('check', 'enableBBC', 0, 'onchange' => 'toggleBBCDisabled(\'disabledBBC\', !this.checked); toggleBBCDisabled(\'legacyBBC\', !this.checked);'),
-			array('check', 'enablePostHTML'),
-			array('check', 'autoLinkUrls'),
+			['check', 'enableBBC'],
+			['check', 'enableBBC', 0, 'onchange' => 'toggleBBCDisabled(\'disabledBBC\', !this.checked); toggleBBCDisabled(\'legacyBBC\', !this.checked);'],
+			['check', 'enablePostHTML'],
+			['check', 'autoLinkUrls'],
 			'',
 
-			array('bbc', 'disabledBBC'),
+			['bbc', 'disabledBBC'],
 
 			// This one is actually pretend...
-			array('bbc', 'legacyBBC', 'help' => 'legacy_bbc'),
-		);
+			['bbc', 'legacyBBC', 'help' => 'legacy_bbc'],
+		];
 
 		// Permissions for restricted BBC
-		if (!empty(Utils::$context['restricted_bbc']))
+		if (!empty(Utils::$context['restricted_bbc'])) {
 			$config_vars[] = '';
+		}
 
-		foreach (Utils::$context['restricted_bbc'] as $bbc)
-			$config_vars[] = array('permissions', 'bbc_' . $bbc, 'text_label' => sprintf(Lang::$txt['groups_can_use'], '[' . $bbc . ']'));
+		foreach (Utils::$context['restricted_bbc'] as $bbc) {
+			$config_vars[] = ['permissions', 'bbc_' . $bbc, 'text_label' => sprintf(Lang::$txt['groups_can_use'], '[' . $bbc . ']')];
+		}
 
 		Utils::$context['settings_post_javascript'] = '
 			toggleBBCDisabled(\'disabledBBC\', ' . (empty(Config::$modSettings['enableBBC']) ? 'true' : 'false') . ');
 			toggleBBCDisabled(\'legacyBBC\', ' . (empty(Config::$modSettings['enableBBC']) ? 'true' : 'false') . ');';
 
-		IntegrationHook::call('integrate_modify_bbc_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_bbc_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1746,28 +1690,28 @@ public static function bbcConfigVars(): array
 	 */
 	public static function layoutConfigVars(): array
 	{
-		$config_vars = array(
+		$config_vars = [
 			// Pagination stuff.
-			array('check', 'compactTopicPagesEnable'),
-			array(
+			['check', 'compactTopicPagesEnable'],
+			[
 				'int',
 				'compactTopicPagesContiguous',
 				null,
-				Lang::$txt['contiguous_page_display'] . '<div class="smalltext">' . str_replace(' ', '&nbsp;', '"3" ' . Lang::$txt['to_display'] . ': <strong>1 ... 4 [5] 6 ... 9</strong>') . '<br>' . str_replace(' ', '&nbsp;', '"5" ' . Lang::$txt['to_display'] . ': <strong>1 ... 3 4 [5] 6 7 ... 9</strong>') . '</div>'
-			),
-			array('int', 'defaultMaxMembers'),
+				Lang::$txt['contiguous_page_display'] . '<div class="smalltext">' . str_replace(' ', '&nbsp;', '"3" ' . Lang::$txt['to_display'] . ': <strong>1 ... 4 [5] 6 ... 9</strong>') . '<br>' . str_replace(' ', '&nbsp;', '"5" ' . Lang::$txt['to_display'] . ': <strong>1 ... 3 4 [5] 6 7 ... 9</strong>') . '</div>',
+			],
+			['int', 'defaultMaxMembers'],
 			'',
 
 			// Stuff that just is everywhere - today, search, online, etc.
-			array('select', 'todayMod', array(Lang::$txt['today_disabled'], Lang::$txt['today_only'], Lang::$txt['yesterday_today'])),
-			array('check', 'onlineEnable'),
+			['select', 'todayMod', [Lang::$txt['today_disabled'], Lang::$txt['today_only'], Lang::$txt['yesterday_today']]],
+			['check', 'onlineEnable'],
 			'',
 
 			// This is like debugging sorta.
-			array('check', 'timeLoadPageEnable'),
-		);
+			['check', 'timeLoadPageEnable'],
+		];
 
-		IntegrationHook::call('integrate_layout_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_layout_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1779,29 +1723,29 @@ public static function layoutConfigVars(): array
 	 */
 	public static function sigConfigVars(): array
 	{
-		$config_vars = array(
+		$config_vars = [
 			// Are signatures even enabled?
-			array('check', 'signature_enable'),
+			['check', 'signature_enable'],
 			'',
 
 			// Tweaking settings!
-			array('int', 'signature_max_length', 'subtext' => Lang::$txt['zero_for_no_limit']),
-			array('int', 'signature_max_lines', 'subtext' => Lang::$txt['zero_for_no_limit']),
-			array('int', 'signature_max_font_size', 'subtext' => Lang::$txt['zero_for_no_limit']),
-			array('check', 'signature_allow_smileys', 'onclick' => 'document.getElementById(\'signature_max_smileys\').disabled = !this.checked;'),
-			array('int', 'signature_max_smileys', 'subtext' => Lang::$txt['zero_for_no_limit']),
+			['int', 'signature_max_length', 'subtext' => Lang::$txt['zero_for_no_limit']],
+			['int', 'signature_max_lines', 'subtext' => Lang::$txt['zero_for_no_limit']],
+			['int', 'signature_max_font_size', 'subtext' => Lang::$txt['zero_for_no_limit']],
+			['check', 'signature_allow_smileys', 'onclick' => 'document.getElementById(\'signature_max_smileys\').disabled = !this.checked;'],
+			['int', 'signature_max_smileys', 'subtext' => Lang::$txt['zero_for_no_limit']],
 			'',
 
 			// Image settings.
-			array('int', 'signature_max_images', 'subtext' => Lang::$txt['signature_max_images_note']),
-			array('int', 'signature_max_image_width', 'subtext' => Lang::$txt['zero_for_no_limit']),
-			array('int', 'signature_max_image_height', 'subtext' => Lang::$txt['zero_for_no_limit']),
+			['int', 'signature_max_images', 'subtext' => Lang::$txt['signature_max_images_note']],
+			['int', 'signature_max_image_width', 'subtext' => Lang::$txt['zero_for_no_limit']],
+			['int', 'signature_max_image_height', 'subtext' => Lang::$txt['zero_for_no_limit']],
 			'',
 
-			array('bbc', 'signature_bbc'),
-		);
+			['bbc', 'signature_bbc'],
+		];
 
-		IntegrationHook::call('integrate_signature_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_signature_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1813,12 +1757,12 @@ public static function sigConfigVars(): array
 	 */
 	public static function likesConfigVars(): array
 	{
-		$config_vars = array(
-			array('check', 'enable_likes'),
-			array('permissions', 'likes_like'),
-		);
+		$config_vars = [
+			['check', 'enable_likes'],
+			['permissions', 'likes_like'],
+		];
 
-		IntegrationHook::call('integrate_likes_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_likes_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1830,12 +1774,12 @@ public static function likesConfigVars(): array
 	 */
 	public static function mentionsConfigVars(): array
 	{
-		$config_vars = array(
-			array('check', 'enable_mentions'),
-			array('permissions', 'mention'),
-		);
+		$config_vars = [
+			['check', 'enable_mentions'],
+			['permissions', 'mention'],
+		];
 
-		IntegrationHook::call('integrate_mentions_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_mentions_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1851,40 +1795,41 @@ public static function mentionsConfigVars(): array
 	 */
 	public static function list_getProfileFields($start, $items_per_page, $sort, $standardFields): array
 	{
-		$list = array();
+		$list = [];
 
-		if ($standardFields)
-		{
-			$standard_fields = array('website', 'personal_text', 'timezone', 'posts', 'warning_status');
-			$fields_no_registration = array('posts', 'warning_status');
-			$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : array();
-			$registration_fields = isset(Config::$modSettings['registration_fields']) ? explode(',', Config::$modSettings['registration_fields']) : array();
+		if ($standardFields) {
+			$standard_fields = ['website', 'personal_text', 'timezone', 'posts', 'warning_status'];
+			$fields_no_registration = ['posts', 'warning_status'];
+			$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : [];
+			$registration_fields = isset(Config::$modSettings['registration_fields']) ? explode(',', Config::$modSettings['registration_fields']) : [];
 
-			foreach ($standard_fields as $field)
-				$list[] = array(
+			foreach ($standard_fields as $field) {
+				$list[] = [
 					'id' => $field,
-					'label' => isset(Lang::$txt['standard_profile_field_' . $field]) ? Lang::$txt['standard_profile_field_' . $field] : (isset(Lang::$txt[$field]) ? Lang::$txt[$field] : $field),
+					'label' => Lang::$txt['standard_profile_field_' . $field] ?? (Lang::$txt[$field] ?? $field),
 					'disabled' => in_array($field, $disabled_fields),
 					'on_register' => in_array($field, $registration_fields) && !in_array($field, $fields_no_registration),
 					'can_show_register' => !in_array($field, $fields_no_registration),
-				);
-		}
-		else
-		{
+				];
+			}
+		} else {
 			// Load all the fields.
-			$request = Db::$db->query('', '
-				SELECT id_field, col_name, field_name, field_desc, field_type, field_order, active, placement
+			$request = Db::$db->query(
+				'',
+				'SELECT id_field, col_name, field_name, field_desc, field_type, field_order, active, placement
 				FROM {db_prefix}custom_fields
 				ORDER BY {raw:sort}
 				LIMIT {int:start}, {int:items_per_page}',
-				array(
+				[
 					'sort' => $sort,
 					'start' => $start,
 					'items_per_page' => $items_per_page,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$list[] = $row;
+			}
 			Db::$db->free_result($request);
 		}
 
@@ -1898,14 +1843,15 @@ public static function list_getProfileFields($start, $items_per_page, $sort, $st
 	 */
 	public static function list_getProfileFieldSize(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}custom_fields',
-			array(
-			)
+			[
+			],
 		);
 
-		list ($numProfileFields) = Db::$db->fetch_row($request);
+		list($numProfileFields) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $numProfileFields;
@@ -1919,8 +1865,9 @@ public static function list_getProfileFieldSize(): int
 	 */
 	public static function modifyBasicSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::basicConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'basic';
@@ -1935,8 +1882,9 @@ public static function modifyBasicSettings($return_config = false)
 	 */
 	public static function modifyBBCSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::bbcConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'bbc';
@@ -1951,8 +1899,9 @@ public static function modifyBBCSettings($return_config = false)
 	 */
 	public static function modifyLayoutSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::layoutConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'layout';
@@ -1967,8 +1916,9 @@ public static function modifyLayoutSettings($return_config = false)
 	 */
 	public static function modifySignatureSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::sigConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'sig';
@@ -2003,8 +1953,9 @@ public static function editCustomProfiles(): void
 	 */
 	public static function modifyLikesSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::likesConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'likes';
@@ -2019,8 +1970,9 @@ public static function modifyLikesSettings($return_config = false)
 	 */
 	public static function modifyMentionsSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::mentionsConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'mentions';
@@ -2053,38 +2005,39 @@ protected function __construct()
 		Utils::$context['show_privacy_policy_warning'] = empty(Config::$modSettings['policy_' . Lang::$default]);
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['modSettings_title'],
 			'help' => 'featuresettings',
 			'description' => sprintf(Lang::$txt['modSettings_desc'], Theme::$current->settings['theme_id'], Utils::$context['session_id'], Utils::$context['session_var'], Config::$scripturl),
-			'tabs' => array(
-				'basic' => array(
-				),
-				'bbc' => array(
+			'tabs' => [
+				'basic' => [
+				],
+				'bbc' => [
 					'description' => Lang::$txt['manageposts_bbc_settings_description'],
-				),
-				'layout' => array(
-				),
-				'sig' => array(
+				],
+				'layout' => [
+				],
+				'sig' => [
 					'description' => Lang::$txt['signature_settings_desc'],
-				),
-				'profile' => array(
+				],
+				'profile' => [
 					'description' => Lang::$txt['custom_profile_desc'],
-				),
-				'likes' => array(
-				),
-				'mentions' => array(
-				),
-				'alerts' => array(
+				],
+				'likes' => [
+				],
+				'mentions' => [
+				],
+				'alerts' => [
 					'description' => Lang::$txt['notifications_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_modify_features', array(&self::$subactions));
+		IntegrationHook::call('integrate_modify_features', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -2095,12 +2048,14 @@ protected function pauseSignatureApplySettings(): void
 		// Try get more time...
 		@set_time_limit(600);
 
-		if (function_exists('apache_reset_timeout'))
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		// Have we exhausted all the time we allowed?
-		if (time() - array_sum(explode(' ', Utils::$context['sig_start'])) < 3)
+		if (time() - array_sum(explode(' ', Utils::$context['sig_start'])) < 3) {
 			return;
+		}
 
 		Utils::$context['continue_get_data'] = '?action=admin;area=featuresettings;sa=sig;apply;step=' . $_GET['step'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 		Utils::$context['page_title'] = Lang::$txt['not_done_title'];
@@ -2128,10 +2083,11 @@ protected function pauseSignatureApplySettings(): void
 	protected function custFieldsMaxOrder(): int
 	{
 		// Gotta know the order limit
-		$result = Db::$db->query('', '
-			SELECT MAX(field_order)
+		$result = Db::$db->query(
+			'',
+			'SELECT MAX(field_order)
 			FROM {db_prefix}custom_fields',
-			array()
+			[],
 		);
 
 		list($order_count) = Db::$db->fetch_row($result);
@@ -2142,7 +2098,8 @@ protected function custFieldsMaxOrder(): int
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Features::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Features::exportStatic')) {
 	Features::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Find.php b/Sources/Actions/Admin/Find.php
index 24f7c535d6..2c19b9c9fb 100644
--- a/Sources/Actions/Admin/Find.php
+++ b/Sources/Actions/Admin/Find.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
@@ -37,12 +36,11 @@ class Find implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AdminSearch',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -67,43 +65,43 @@ class Find implements ActionInterface
 	 *
 	 * Format: array('function_to_get_config_vars', 'url_for_admin_area_and_sa')
 	 */
-	public array $settings_search = array(
-		array(__NAMESPACE__ . '\\Features::basicConfigVars', 'area=featuresettings;sa=basic'),
-		array(__NAMESPACE__ . '\\Features::bbcConfigVars', 'area=featuresettings;sa=bbc'),
-		array(__NAMESPACE__ . '\\Features::layoutConfigVars', 'area=featuresettings;sa=layout'),
-		array(__NAMESPACE__ . '\\Features::likesConfigVars', 'area=featuresettings;sa=likes'),
-		array(__NAMESPACE__ . '\\Features::mentionsConfigVars', 'area=featuresettings;sa=mentions'),
-		array(__NAMESPACE__ . '\\Features::sigConfigVars', 'area=featuresettings;sa=sig'),
-		array(__NAMESPACE__ . '\\AntiSpam::getConfigVars', 'area=antispam'),
-		array(__NAMESPACE__ . '\\Warnings::getConfigVars', 'area=warnings'),
-		array(__NAMESPACE__ . '\\Mods::getConfigVars', 'area=modsettings;sa=general'),
-		array(__NAMESPACE__ . '\\Attachments::attachConfigVars', 'area=manageattachments;sa=attachments'),
-		array(__NAMESPACE__ . '\\Attachments::avatarConfigVars', 'area=manageattachments;sa=avatars'),
-		array(__NAMESPACE__ . '\\Calendar::getConfigVars', 'area=managecalendar;sa=settings'),
-		array(__NAMESPACE__ . '\\Boards::getConfigVars', 'area=manageboards;sa=settings'),
-		array(__NAMESPACE__ . '\\Mail::getConfigVars', 'area=mailqueue;sa=settings'),
-		array(__NAMESPACE__ . '\\News::getConfigVars', 'area=news;sa=settings'),
-		array(__NAMESPACE__ . '\\Membergroups::getConfigVars', 'area=membergroups;sa=settings'),
-		array(__NAMESPACE__ . '\\Permissions::getConfigVars', 'area=permissions;sa=settings'),
-		array(__NAMESPACE__ . '\\Posts::postConfigVars', 'area=postsettings;sa=posts'),
-		array(__NAMESPACE__ . '\\Posts::topicConfigVars', 'area=postsettings;sa=topics'),
-		array(__NAMESPACE__ . '\\Posts::draftConfigVars', 'area=postsettings;sa=drafts'),
-		array(__NAMESPACE__ . '\\Search::getConfigVars', 'area=managesearch;sa=settings'),
-		array(__NAMESPACE__ . '\\Smileys::getConfigVars', 'area=smileys;sa=settings'),
-		array(__NAMESPACE__ . '\\Server::generalConfigVars', 'area=serversettings;sa=general'),
-		array(__NAMESPACE__ . '\\Server::databaseConfigVars', 'area=serversettings;sa=database'),
-		array(__NAMESPACE__ . '\\Server::cookieConfigVars', 'area=serversettings;sa=cookie'),
-		array(__NAMESPACE__ . '\\Server::securityConfigVars', 'area=serversettings;sa=security'),
-		array(__NAMESPACE__ . '\\Server::cacheConfigVars', 'area=serversettings;sa=cache'),
-		array(__NAMESPACE__ . '\\Server::exportConfigVars', 'area=serversettings;sa=export'),
-		array(__NAMESPACE__ . '\\Server::loadBalancingConfigVars', 'area=serversettings;sa=loads'),
-		array(__NAMESPACE__ . '\\Languages::getConfigVars', 'area=languages;sa=settings'),
-		array(__NAMESPACE__ . '\\Registration::getConfigVars', 'area=regcenter;sa=settings'),
-		array(__NAMESPACE__ . '\\SearchEngines::getConfigVars', 'area=sengines;sa=settings'),
-		array(__NAMESPACE__ . '\\Subscriptions::getConfigVars', 'area=paidsubscribe;sa=settings'),
-		array(__NAMESPACE__ . '\\Tasks::getConfigVars', 'area=scheduledtasks;sa=settings'),
-		array(__NAMESPACE__ . '\\Logs::getConfigVars', 'area=logs;sa=settings'),
-	);
+	public array $settings_search = [
+		[__NAMESPACE__ . '\\Features::basicConfigVars', 'area=featuresettings;sa=basic'],
+		[__NAMESPACE__ . '\\Features::bbcConfigVars', 'area=featuresettings;sa=bbc'],
+		[__NAMESPACE__ . '\\Features::layoutConfigVars', 'area=featuresettings;sa=layout'],
+		[__NAMESPACE__ . '\\Features::likesConfigVars', 'area=featuresettings;sa=likes'],
+		[__NAMESPACE__ . '\\Features::mentionsConfigVars', 'area=featuresettings;sa=mentions'],
+		[__NAMESPACE__ . '\\Features::sigConfigVars', 'area=featuresettings;sa=sig'],
+		[__NAMESPACE__ . '\\AntiSpam::getConfigVars', 'area=antispam'],
+		[__NAMESPACE__ . '\\Warnings::getConfigVars', 'area=warnings'],
+		[__NAMESPACE__ . '\\Mods::getConfigVars', 'area=modsettings;sa=general'],
+		[__NAMESPACE__ . '\\Attachments::attachConfigVars', 'area=manageattachments;sa=attachments'],
+		[__NAMESPACE__ . '\\Attachments::avatarConfigVars', 'area=manageattachments;sa=avatars'],
+		[__NAMESPACE__ . '\\Calendar::getConfigVars', 'area=managecalendar;sa=settings'],
+		[__NAMESPACE__ . '\\Boards::getConfigVars', 'area=manageboards;sa=settings'],
+		[__NAMESPACE__ . '\\Mail::getConfigVars', 'area=mailqueue;sa=settings'],
+		[__NAMESPACE__ . '\\News::getConfigVars', 'area=news;sa=settings'],
+		[__NAMESPACE__ . '\\Membergroups::getConfigVars', 'area=membergroups;sa=settings'],
+		[__NAMESPACE__ . '\\Permissions::getConfigVars', 'area=permissions;sa=settings'],
+		[__NAMESPACE__ . '\\Posts::postConfigVars', 'area=postsettings;sa=posts'],
+		[__NAMESPACE__ . '\\Posts::topicConfigVars', 'area=postsettings;sa=topics'],
+		[__NAMESPACE__ . '\\Posts::draftConfigVars', 'area=postsettings;sa=drafts'],
+		[__NAMESPACE__ . '\\Search::getConfigVars', 'area=managesearch;sa=settings'],
+		[__NAMESPACE__ . '\\Smileys::getConfigVars', 'area=smileys;sa=settings'],
+		[__NAMESPACE__ . '\\Server::generalConfigVars', 'area=serversettings;sa=general'],
+		[__NAMESPACE__ . '\\Server::databaseConfigVars', 'area=serversettings;sa=database'],
+		[__NAMESPACE__ . '\\Server::cookieConfigVars', 'area=serversettings;sa=cookie'],
+		[__NAMESPACE__ . '\\Server::securityConfigVars', 'area=serversettings;sa=security'],
+		[__NAMESPACE__ . '\\Server::cacheConfigVars', 'area=serversettings;sa=cache'],
+		[__NAMESPACE__ . '\\Server::exportConfigVars', 'area=serversettings;sa=export'],
+		[__NAMESPACE__ . '\\Server::loadBalancingConfigVars', 'area=serversettings;sa=loads'],
+		[__NAMESPACE__ . '\\Languages::getConfigVars', 'area=languages;sa=settings'],
+		[__NAMESPACE__ . '\\Registration::getConfigVars', 'area=regcenter;sa=settings'],
+		[__NAMESPACE__ . '\\SearchEngines::getConfigVars', 'area=sengines;sa=settings'],
+		[__NAMESPACE__ . '\\Subscriptions::getConfigVars', 'area=paidsubscribe;sa=settings'],
+		[__NAMESPACE__ . '\\Tasks::getConfigVars', 'area=scheduledtasks;sa=settings'],
+		[__NAMESPACE__ . '\\Logs::getConfigVars', 'area=logs;sa=settings'],
+	];
 
 	/**
 	 * @var array
@@ -113,7 +111,7 @@ class Find implements ActionInterface
 	 * MOD AUTHORS: If your mod uses it's own language file for its settings,
 	 * add the language file to this array via the integrate_admin_search hook.
 	 */
-	public array $language_files = array(
+	public array $language_files = [
 		'Drafts',
 		'Help',
 		'Login',
@@ -125,7 +123,7 @@ class Find implements ActionInterface
 		'ManageSettings',
 		'ManageSmileys',
 		'Search',
-	);
+	];
 
 	/**
 	 * @var array
@@ -136,7 +134,7 @@ class Find implements ActionInterface
 	 * worry about this array. Otherwise, you can add your file to this array
 	 * via the integrate_admin_search hook.
 	 */
-	public array $include_files = array();
+	public array $include_files = [];
 
 	/**************************
 	 * Public static properties
@@ -147,11 +145,11 @@ class Find implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'internal' => 'internal',
 		'online' => 'online',
 		'member' => 'member',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -183,28 +181,24 @@ public function execute(): void
 		Utils::$context['page_title'] = Lang::$txt['admin_search_results'];
 
 		// Keep track of what the admin wants.
-		if (empty(Utils::$context['admin_preferences']['sb']) || Utils::$context['admin_preferences']['sb'] != $this->subaction)
-		{
+		if (empty(Utils::$context['admin_preferences']['sb']) || Utils::$context['admin_preferences']['sb'] != $this->subaction) {
 			Utils::$context['admin_preferences']['sb'] = $this->subaction;
 
 			// Update the preferences.
 			ACP::updateAdminPreferences();
 		}
 
-		if (trim(Utils::$context['search_term']) == '')
-		{
-			Utils::$context['search_results'] = array();
-		}
-		else
-		{
-			$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		if (trim(Utils::$context['search_term']) == '') {
+			Utils::$context['search_results'] = [];
+		} else {
+			$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-			if (!empty($call))
+			if (!empty($call)) {
 				call_user_func($call);
+			}
 		}
 	}
 
-
 	/**
 	 * A complicated but relatively quick internal search.
 	 */
@@ -213,12 +207,13 @@ public function internal()
 		// Try to get some more memory.
 		Config::setMemoryLimit('128M');
 
-		IntegrationHook::call('integrate_admin_search', array(&$this->language_files, &$this->include_files, &$this->settings_search));
+		IntegrationHook::call('integrate_admin_search', [&$this->language_files, &$this->include_files, &$this->settings_search]);
 
 		Lang::load(implode('+', $this->language_files));
 
-		foreach ($this->include_files as $file)
-			require_once(Config::$sourcedir . '/' . $file . '.php');
+		foreach ($this->include_files as $file) {
+			require_once Config::$sourcedir . '/' . $file . '.php';
+		}
 
 		/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 			0 = Language index (Can be array of indexes) to search through for this setting.
@@ -226,67 +221,57 @@ public function internal()
 			2 = Help index for help associated with this item (If different from 0)
 		*/
 
-		$search_data = array(
+		$search_data = [
 			// All the major sections of the forum.
-			'sections' => array(
-			),
-			'settings' => array(
-				array('COPPA', 'area=regcenter;sa=settings'),
-				array('CAPTCHA', 'area=antispam'),
-			),
-		);
+			'sections' => [
+			],
+			'settings' => [
+				['COPPA', 'area=regcenter;sa=settings'],
+				['CAPTCHA', 'area=antispam'],
+			],
+		];
 
 		// Go through the admin menu structure trying to find suitably named areas!
-		foreach (Menu::$loaded['admin']['sections'] as $section)
-		{
-			foreach ($section['areas'] as $menu_key => $menu_item)
-			{
-				$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-
-				if (!empty($menu_item['subsections']))
-				{
-					foreach ($menu_item['subsections'] as $key => $sublabel)
-					{
-						if (isset($sublabel['label']))
-						{
-							$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+		foreach (Menu::$loaded['admin']['sections'] as $section) {
+			foreach ($section['areas'] as $menu_key => $menu_item) {
+				$search_data['sections'][] = [$menu_item['label'], 'area=' . $menu_key];
+
+				if (!empty($menu_item['subsections'])) {
+					foreach ($menu_item['subsections'] as $key => $sublabel) {
+						if (isset($sublabel['label'])) {
+							$search_data['sections'][] = [$sublabel['label'], 'area=' . $menu_key . ';sa=' . $key];
 						}
 					}
 				}
 			}
 		}
 
-		foreach ($this->settings_search as $setting_area)
-		{
+		foreach ($this->settings_search as $setting_area) {
 			// Get a list of their variables.
 			$config_vars = call_user_func($setting_area[0], true);
 
-			foreach ($config_vars as $var)
-			{
-				if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
-				{
-					$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : '');
+			foreach ($config_vars as $var) {
+				if (!empty($var[1]) && !in_array($var[0], ['permissions', 'switch', 'desc'])) {
+					$search_data['settings'][] = [$var[(isset($var[2]) && in_array($var[2], ['file', 'db'])) ? 0 : 1], $setting_area[1], 'alttxt' => (isset($var[2]) && in_array($var[2], ['file', 'db'])) || isset($var[3]) ? (in_array($var[2], ['file', 'db']) ? $var[1] : $var[3]) : ''];
 				}
 			}
 		}
 
 		Utils::$context['page_title'] = Lang::$txt['admin_search_results'];
-		Utils::$context['search_results'] = array();
+		Utils::$context['search_results'] = [];
 
 		$search_term = strtolower(Utils::htmlspecialcharsDecode(Utils::$context['search_term']));
 
 		// Go through all the search data trying to find this text!
-		foreach ($search_data as $section => $data)
-		{
-			foreach ($data as $item)
-			{
+		foreach ($search_data as $section => $data) {
+			foreach ($data as $item) {
 				$found = false;
 
-				if (!is_array($item[0]))
-					$item[0] = array($item[0]);
+				if (!is_array($item[0])) {
+					$item[0] = [$item[0]];
+				}
 
-				foreach ($item[0] as $term)
-				{
+				foreach ($item[0] as $term) {
 					if (
 						stripos($term, $search_term) !== false
 						|| (
@@ -297,26 +282,24 @@ public function internal()
 							isset(Lang::$txt['setting_' . $term])
 							&& stripos(Lang::$txt['setting_' . $term], $search_term) !== false
 						)
-					)
-					{
+					) {
 						$found = $term;
 						break;
 					}
 				}
 
-				if ($found)
-				{
+				if ($found) {
 					// Format the name - and remove any descriptions the entry may have.
-					$name = isset(Lang::$txt[$found]) ? Lang::$txt[$found] : (isset(Lang::$txt['setting_' . $found]) ? Lang::$txt['setting_' . $found] : (!empty($item['alttxt']) ? $item['alttxt'] : $found));
+					$name = Lang::$txt[$found] ?? (Lang::$txt['setting_' . $found] ?? (!empty($item['alttxt']) ? $item['alttxt'] : $found));
 
 					$name = preg_replace('~<(?:div|span)\sclass="smalltext">.+?</(?:div|span)>~', '', $name);
 
-					Utils::$context['search_results'][] = array(
+					Utils::$context['search_results'][] = [
 						'url' => (substr($item[1], 0, 4) == 'area' ? Config::$scripturl . '?action=admin;' . $item[1] : $item[1]) . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ((substr($item[1], 0, 4) == 'area' && $section == 'settings' ? '#' . $item[0][0] : '')),
 						'name' => $name,
 						'type' => $section,
 						'help' => Utils::shorten(isset($item[2]) ? strip_tags(Lang::$helptxt[$item[2]]) : (isset(Lang::$helptxt[$found]) ? strip_tags(Lang::$helptxt[$found]) : ''), 255),
-					);
+					];
 				}
 			}
 		}
@@ -348,8 +331,9 @@ public function online()
 		$postVars = explode(' ', Utils::$context['search_term']);
 
 		// Encode the search data.
-		foreach ($postVars as $k => $v)
+		foreach ($postVars as $k => $v) {
 			$postVars[$k] = urlencode($v);
+		}
 
 		// This is what we will send.
 		$postVars = implode('+', $postVars);
@@ -360,32 +344,33 @@ public function online()
 		$search_results = WebFetchApi::fetch(Utils::$context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 		// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-		if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api\b[^>]*>.+?</api>)~is', $search_results, $matches) != true)
+		if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api\b[^>]*>.+?</api>)~is', $search_results, $matches) != true) {
 			ErrorHandler::fatalLang('cannot_connect_doc_site');
+		}
 
 		$search_results = $matches[1];
 
 		// Otherwise we simply walk through the XML and stick it in context for display.
-		Utils::$context['search_results'] = array();
+		Utils::$context['search_results'] = [];
 
 		// Get the results loaded into an array for processing!
 		$results = new XmlArray($search_results, false);
 
 		// Move through the api layer.
-		if (!$results->exists('api'))
+		if (!$results->exists('api')) {
 			ErrorHandler::fatalLang('cannot_connect_doc_site');
+		}
 
 		// Are there actually some results?
-		if ($results->exists('api/query/search/p'))
-		{
+		if ($results->exists('api/query/search/p')) {
 			$relevance = 0;
-			foreach ($results->set('api/query/search/p') as $result)
-			{
-				Utils::$context['search_results'][$result->fetch('@title')] = array(
+
+			foreach ($results->set('api/query/search/p') as $result) {
+				Utils::$context['search_results'][$result->fetch('@title')] = [
 					'title' => $result->fetch('@title'),
 					'relevance' => $relevance++,
 					'snippet' => str_replace('class=\'searchmatch\'', 'class="highlight"', Utils::htmlspecialcharsDecode($result->fetch('@snippet'))),
-				);
+				];
 			}
 		}
 	}
@@ -401,8 +386,9 @@ public function online()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -429,7 +415,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Find::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Find::exportStatic')) {
 	Find::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Home.php b/Sources/Actions/Admin/Home.php
index baabbee4ac..64c0f088e3 100644
--- a/Sources/Actions/Admin/Home.php
+++ b/Sources/Actions/Admin/Home.php
@@ -13,17 +13,16 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Credits;
+use SMF\Actions\Groups;
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\Lang;
 use SMF\Menu;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Credits;
-use SMF\Actions\Groups;
 
 /**
  * The administration home page.
@@ -42,12 +41,11 @@ class Home implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AdminHome',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -58,7 +56,7 @@ class Home implements ActionInterface
 	 *
 	 * You have to be able to do at least one of these to see this page.
 	 */
-	public array $permissions = array(
+	public array $permissions = [
 		'admin_forum',
 		'edit_news',
 		'manage_attachments',
@@ -69,14 +67,14 @@ class Home implements ActionInterface
 		'manage_smileys',
 		'moderate_forum',
 		'send_mail',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Server software to check the versions of.
 	 */
-	public array $checkFor = array(
+	public array $checkFor = [
 		'gd',
 		'imagemagick',
 		'db_server',
@@ -89,7 +87,7 @@ class Home implements ActionInterface
 		'filebased',
 		'php',
 		'server',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -115,8 +113,7 @@ public function execute(): void
 		User::$me->isAllowedTo($this->permissions);
 
 		// Find all of this forum's administrators...
-		if (Groups::listMembergroupMembers_Href(Utils::$context['administrators'], 1, 32) && User::$me->allowedTo('manage_membergroups'))
-		{
+		if (Groups::listMembergroupMembers_Href(Utils::$context['administrators'], 1, 32) && User::$me->allowedTo('manage_membergroups')) {
 			// Add a 'more'-link if there are more than 32.
 			Utils::$context['more_admins_link'] = '<a href="' . Config::$scripturl . '?action=moderate;area=viewgroups;sa=members;group=1">' . Lang::$txt['more'] . '</a>';
 		}
@@ -137,36 +134,36 @@ public function execute(): void
 
 		Utils::$context['page_title'] = Utils::$context['admin_area'] == 'credits' ? Lang::$txt['support_credits_title'] : Lang::$txt['admin_center'];
 
-		if (Utils::$context['admin_area'] != 'credits')
-		{
-			Menu::$loaded['admin']->tab_data = array(
+		if (Utils::$context['admin_area'] != 'credits') {
+			Menu::$loaded['admin']->tab_data = [
 				'title' => Lang::$txt['admin_center'],
 				'help' => '',
 				'description' => '<strong>' . Lang::$txt['hello_guest'] . ' ' . User::$me->name . '!</strong>
 					' . sprintf(Lang::$txt['admin_main_welcome'], Lang::$txt['admin_center'], Lang::$txt['help'], Lang::$txt['help']),
-			);
+			];
 		}
 
 		// Lastly, fill in the blanks in the support resources paragraphs.
-		Lang::$txt['support_resources_p1'] = sprintf(Lang::$txt['support_resources_p1'],
+		Lang::$txt['support_resources_p1'] = sprintf(
+			Lang::$txt['support_resources_p1'],
 			'https://wiki.simplemachines.org/',
 			'https://wiki.simplemachines.org/smf/features2',
 			'https://wiki.simplemachines.org/smf/options2',
 			'https://wiki.simplemachines.org/smf/themes2',
-			'https://wiki.simplemachines.org/smf/packages2'
+			'https://wiki.simplemachines.org/smf/packages2',
 		);
 
-		Lang::$txt['support_resources_p2'] = sprintf(Lang::$txt['support_resources_p2'],
+		Lang::$txt['support_resources_p2'] = sprintf(
+			Lang::$txt['support_resources_p2'],
 			'https://www.simplemachines.org/community/',
 			'https://www.simplemachines.org/redirect/english_support',
 			'https://www.simplemachines.org/redirect/international_support_boards',
 			'https://www.simplemachines.org/redirect/smf_support',
-			'https://www.simplemachines.org/redirect/customize_support'
+			'https://www.simplemachines.org/redirect/customize_support',
 		);
 
-		if (Utils::$context['admin_area'] == 'admin')
-		{
-			Theme::loadJavaScriptFile('admin.js', array('defer' => false, 'minimize' => true), 'smf_admin');
+		if (Utils::$context['admin_area'] == 'admin') {
+			Theme::loadJavaScriptFile('admin.js', ['defer' => false, 'minimize' => true], 'smf_admin');
 		}
 	}
 
@@ -181,8 +178,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -208,7 +206,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Home::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Home::exportStatic')) {
 	Home::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Languages.php b/Sources/Actions/Admin/Languages.php
index af4db9375d..fa8ea74001 100644
--- a/Sources/Actions/Admin/Languages.php
+++ b/Sources/Actions/Admin/Languages.php
@@ -13,23 +13,22 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
 use SMF\Menu;
+use SMF\PackageManager\SubsPackage;
+use SMF\PackageManager\XmlArray;
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\PackageManager\SubsPackage;
-use SMF\PackageManager\XmlArray;
 use SMF\WebFetch\WebFetchApi;
 
 /**
@@ -44,13 +43,19 @@ class Languages implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageLanguages',
-			'getConfigVars' => false,
-		),
-	);
+			'list_getLanguagesList' => 'list_getLanguagesList',
+			'list_getNumLanguages' => 'list_getNumLanguages',
+			'list_getLanguages' => 'list_getLanguages',
+			'modifyLanguages' => 'ModifyLanguages',
+			'addLanguage' => 'AddLanguage',
+			'modifyLanguageSettings' => 'ModifyLanguageSettings',
+			'downloadLanguage' => 'DownloadLanguage',
+			'modifyLanguage' => 'ModifyLanguage',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -73,13 +78,13 @@ class Languages implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'edit' => 'editLanguages',
 		'add' => 'add',
 		'settings' => 'settings',
 		'downloadlang' => 'download',
 		'editlang' => 'editEntries',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -102,10 +107,11 @@ class Languages implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -116,60 +122,59 @@ public function execute(): void
 	public function add(): void
 	{
 		// Are we searching for new languages courtesy of Simple Machines?
-		if (!empty($_POST['smf_add_sub']))
-		{
+		if (!empty($_POST['smf_add_sub'])) {
 			Utils::$context['smf_search_term'] = Utils::htmlspecialchars(trim($_POST['smf_add']));
 
-			$listOptions = array(
+			$listOptions = [
 				'id' => 'smf_languages',
-				'get_items' => array(
+				'get_items' => [
 					'function' => __CLASS__ . '::list_getLanguagesList',
-				),
-				'columns' => array(
-					'name' => array(
-						'header' => array(
+				],
+				'columns' => [
+					'name' => [
+						'header' => [
 							'value' => Lang::$txt['name'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'name',
-						),
-					),
-					'description' => array(
-						'header' => array(
+						],
+					],
+					'description' => [
+						'header' => [
 							'value' => Lang::$txt['add_language_smf_desc'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'description',
-						),
-					),
-					'version' => array(
-						'header' => array(
+						],
+					],
+					'version' => [
+						'header' => [
 							'value' => Lang::$txt['add_language_smf_version'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'version',
-						),
-					),
-					'utf8' => array(
-						'header' => array(
+						],
+					],
+					'utf8' => [
+						'header' => [
 							'value' => Lang::$txt['add_language_smf_utf8'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'utf8',
-						),
-					),
-					'install_link' => array(
-						'header' => array(
+						],
+					],
+					'install_link' => [
+						'header' => [
 							'value' => Lang::$txt['add_language_smf_install'],
 							'class' => 'centercol',
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'install_link',
 							'class' => 'centercol',
-						),
-					),
-				),
-			);
+						],
+					],
+				],
+			];
 
 			new ItemList($listOptions);
 
@@ -194,8 +199,9 @@ public function download(): void
 		Lang::load('ManageSettings');
 
 		// Clearly we need to know what to request.
-		if (!isset($_GET['did']))
+		if (!isset($_GET['did'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Some lovely context.
 		Utils::$context['download_id'] = $_GET['did'];
@@ -203,20 +209,17 @@ public function download(): void
 		Utils::$context['menu_data_' . Utils::$context['admin_menu_id']]['current_subsection'] = 'add';
 
 		// Can we actually do the installation - and do they want to?
-		if (!empty($_POST['do_install']) && !empty($_POST['copy_file']))
-		{
+		if (!empty($_POST['do_install']) && !empty($_POST['copy_file'])) {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-dlang');
 
-			$chmod_files = array();
-			$install_files = array();
+			$chmod_files = [];
+			$install_files = [];
 
 			// Check writable status.
-			foreach ($_POST['copy_file'] as $file)
-			{
+			foreach ($_POST['copy_file'] as $file) {
 				// Check it's not very bad.
-				if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file)))
-				{
+				if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file))) {
 					ErrorHandler::fatal(Lang::$txt['languages_download_illegal_paths']);
 				}
 
@@ -229,13 +232,11 @@ public function download(): void
 			$files_left = $file_status['files']['notwritable'];
 
 			// Something not writable?
-			if (!empty($files_left))
-			{
+			if (!empty($files_left)) {
 				Utils::$context['error_message'] = Lang::$txt['languages_download_not_chmod'];
 			}
 			// Otherwise, go go go!
-			elseif (!empty($install_files))
-			{
+			elseif (!empty($install_files)) {
 				SubsPackage::read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(SMF_VERSION) . ';fetch=' . urlencode($_GET['did']), Config::$boarddir, false, true, $install_files);
 
 				// Make sure the files aren't stuck in the cache.
@@ -248,35 +249,35 @@ public function download(): void
 		}
 
 		// Open up the old china.
-		if (!isset($archive_content))
-		{
+		if (!isset($archive_content)) {
 			$archive_content = SubsPackage::read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(SMF_VERSION) . ';fetch=' . urlencode($_GET['did']), null);
 		}
 
-		if (empty($archive_content))
+		if (empty($archive_content)) {
 			ErrorHandler::fatal(Lang::$txt['add_language_error_no_response']);
+		}
 
 		// Now for each of the files, let's do some *stuff*
-		Utils::$context['files'] = array(
-			'lang' => array(),
-			'other' => array(),
-		);
+		Utils::$context['files'] = [
+			'lang' => [],
+			'other' => [],
+		];
 
-		Utils::$context['make_writable'] = array();
+		Utils::$context['make_writable'] = [];
 
-		foreach ($archive_content as $file)
-		{
+		foreach ($archive_content as $file) {
 			$pathinfo = pathinfo($file['filename']);
 			$dirname = $pathinfo['dirname'];
 			$basename = $pathinfo['basename'];
 			$extension = $pathinfo['extension'];
 
 			// Don't do anything with files we don't understand.
-			if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt')))
+			if (!in_array($extension, ['php', 'jpg', 'gif', 'jpeg', 'png', 'txt'])) {
 				continue;
+			}
 
 			// Basic data.
-			$context_data = array(
+			$context_data = [
 				'name' => $basename,
 				'destination' => Config::$boarddir . '/' . $file['filename'],
 				'generaldest' => $file['filename'],
@@ -287,209 +288,186 @@ public function download(): void
 				'default_copy' => true,
 				// Does the file already exist, if so is it same or different?
 				'exists' => false,
-			);
+			];
 
 			// Does the file exist, is it different and can we overwrite?
-			if (file_exists(Config::$boarddir . '/' . $file['filename']))
-			{
-				if (is_writable(Config::$boarddir . '/' . $file['filename']))
+			if (file_exists(Config::$boarddir . '/' . $file['filename'])) {
+				if (is_writable(Config::$boarddir . '/' . $file['filename'])) {
 					$context_data['writable'] = true;
+				}
 
 				// Finally, do we actually think the content has changed?
-				if ($file['size'] == filesize(Config::$boarddir . '/' . $file['filename']) && $file['md5'] == md5_file(Config::$boarddir . '/' . $file['filename']))
-				{
+				if ($file['size'] == filesize(Config::$boarddir . '/' . $file['filename']) && $file['md5'] == md5_file(Config::$boarddir . '/' . $file['filename'])) {
 					$context_data['exists'] = 'same';
 					$context_data['default_copy'] = false;
 				}
 				// Attempt to discover newline character differences.
-				elseif ($file['md5'] == md5(preg_replace("~[\r]?\n~", "\r\n", file_get_contents(Config::$boarddir . '/' . $file['filename']))))
-				{
+				elseif ($file['md5'] == md5(preg_replace("~[\r]?\n~", "\r\n", file_get_contents(Config::$boarddir . '/' . $file['filename'])))) {
 					$context_data['exists'] = 'same';
 					$context_data['default_copy'] = false;
-				}
-				else
-				{
+				} else {
 					$context_data['exists'] = 'different';
 				}
 			}
 			// No overwrite?
-			else
-			{
+			else {
 				// Can we at least stick it in the directory...
-				if (is_writable(Config::$boarddir . '/' . $dirname))
+				if (is_writable(Config::$boarddir . '/' . $dirname)) {
 					$context_data['writable'] = true;
+				}
 			}
 
 			// I love PHP files, that's why I'm a developer and not an artistic type spending my time drinking absinth and living a life of sin...
-			if ($extension == 'php' && preg_match('~\w+\.\w+(?:-utf8)?\.php~', $basename))
-			{
-				$context_data += array(
+			if ($extension == 'php' && preg_match('~\w+\.\w+(?:-utf8)?\.php~', $basename)) {
+				$context_data += [
 					'version' => '??',
 					'cur_version' => false,
 					'version_compare' => 'newer',
-				);
+				];
 
-				list ($name, $language) = explode('.', $basename);
+				list($name, $language) = explode('.', $basename);
 
 				// Let's get the new version, I like versions, they tell me that I'm up to date.
-				if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1)
-				{
+				if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1) {
 					$context_data['version'] = $match[1];
 				}
 
 				// Now does the old file exist - if so what is it's version?
-				if (file_exists(Config::$boarddir . '/' . $file['filename']))
-				{
+				if (file_exists(Config::$boarddir . '/' . $file['filename'])) {
 					// OK - what is the current version?
 					$fp = fopen(Config::$boarddir . '/' . $file['filename'], 'rb');
 					$header = fread($fp, 768);
 					fclose($fp);
 
 					// Find the version.
-					if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1)
-					{
+					if (preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '(?:[\s]{2}|\*/)~i', $header, $match) == 1) {
 						$context_data['cur_version'] = $match[1];
 
 						// How does this compare?
-						if ($context_data['cur_version'] == $context_data['version'])
-						{
+						if ($context_data['cur_version'] == $context_data['version']) {
 							$context_data['version_compare'] = 'same';
-						}
-						elseif ($context_data['cur_version'] > $context_data['version'])
-						{
+						} elseif ($context_data['cur_version'] > $context_data['version']) {
 							$context_data['version_compare'] = 'older';
 						}
 
 						// Don't recommend copying if the version is the same.
-						if ($context_data['version_compare'] != 'newer')
+						if ($context_data['version_compare'] != 'newer') {
 							$context_data['default_copy'] = false;
+						}
 					}
 				}
 
 				// Add the context data to the main set.
 				Utils::$context['files']['lang'][] = $context_data;
-			}
-			elseif ($extension == 'txt' && stripos($basename, 'agreement') !== false)
-			{
-				$context_data += array(
+			} elseif ($extension == 'txt' && stripos($basename, 'agreement') !== false) {
+				$context_data += [
 					'version' => '??',
 					'cur_version' => false,
 					'version_compare' => 'newer',
-				);
+				];
 
 				// Registration agreement is a primary file
 				Utils::$context['files']['lang'][] = $context_data;
-			}
-			else
-			{
+			} else {
 				// There shouldn't be anything else, but load this into "other" in case we decide to handle it in the future
 				Utils::$context['files']['other'][] = $context_data;
 			}
 
 			// Collect together all non-writable areas.
-			if (!$context_data['writable'])
+			if (!$context_data['writable']) {
 				Utils::$context['make_writable'][] = $context_data['destination'];
+			}
 		}
 
 		// Before we go to far can we make anything writable, eh, eh?
-		if (!empty(Utils::$context['make_writable']))
-		{
+		if (!empty(Utils::$context['make_writable'])) {
 			// What is left to be made writable?
 			$file_status = SubsPackage::create_chmod_control(Utils::$context['make_writable']);
 			Utils::$context['still_not_writable'] = $file_status['files']['notwritable'];
 
 			// Mark those which are now writable as such.
-			foreach (Utils::$context['files'] as $type => $data)
-			{
-				foreach ($data as $k => $file)
-				{
-					if (!$file['writable'] && !in_array($file['destination'], Utils::$context['still_not_writable']))
-					{
+			foreach (Utils::$context['files'] as $type => $data) {
+				foreach ($data as $k => $file) {
+					if (!$file['writable'] && !in_array($file['destination'], Utils::$context['still_not_writable'])) {
 						Utils::$context['files'][$type][$k]['writable'] = true;
 					}
 				}
 			}
 
 			// Are we going to need more language stuff?
-			if (!empty(Utils::$context['still_not_writable']))
+			if (!empty(Utils::$context['still_not_writable'])) {
 				Lang::load('Packages');
+			}
 		}
 
 		// This is the list for the main files.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'lang_main_files_list',
 			'title' => Lang::$txt['languages_download_main_files'],
-			'get_items' => array(
-				'function' => function()
-				{
+			'get_items' => [
+				'function' => function () {
 					return Utils::$context['files']['lang'];
 				},
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['languages_download_filename'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<strong>' . $rowData['name'] . '</strong><br><span class="smalltext">' . Lang::$txt['languages_download_dest'] . ': ' . $rowData['destination'] . '</span>' . ($rowData['version_compare'] == 'older' ? '<br>' . Lang::$txt['languages_download_older'] : '');
 						},
-					),
-				),
-				'writable' => array(
-					'header' => array(
+					],
+				],
+				'writable' => [
+					'header' => [
 						'value' => Lang::$txt['languages_download_writable'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<span style="color: ' . ($rowData['writable'] ? 'green' : 'red') . ';">' . ($rowData['writable'] ? Lang::$txt['yes'] : Lang::$txt['no']) . '</span>';
 						},
-					),
-				),
-				'version' => array(
-					'header' => array(
+					],
+				],
+				'version' => [
+					'header' => [
 						'value' => Lang::$txt['languages_download_version'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<span style="color: ' . ($rowData['version_compare'] == 'older' ? 'red' : ($rowData['version_compare'] == 'same' ? 'orange' : 'green')) . ';">' . $rowData['version'] . '</span>';
 						},
-					),
-				),
-				'exists' => array(
-					'header' => array(
+					],
+				],
+				'exists' => [
+					'header' => [
 						'value' => Lang::$txt['languages_download_exists'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return $rowData['exists'] ? ($rowData['exists'] == 'same' ? Lang::$txt['languages_download_exists_same'] : Lang::$txt['languages_download_exists_different']) : Lang::$txt['no'];
 						},
-					),
-				),
-				'copy' => array(
-					'header' => array(
+					],
+				],
+				'copy' => [
+					'header' => [
 						'value' => Lang::$txt['languages_download_overwrite'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="checkbox" name="copy_file[]" value="' . $rowData['generaldest'] . '"' . ($rowData['default_copy'] ? ' checked' : '') . '>';
 						},
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Kill the cache, as it is now invalid..
-		if (!empty(CacheApi::$enable))
-		{
+		if (!empty(CacheApi::$enable)) {
 			CacheApi::put('known_languages', null, !empty(CacheApi::$enable) && CacheApi::$enable < 1 ? 86400 : 3600);
 			CacheApi::put('known_languages_all', null, !empty(CacheApi::$enable) && CacheApi::$enable < 1 ? 86400 : 3600);
 		}
@@ -506,26 +484,22 @@ public function download(): void
 	public function editLanguages()
 	{
 		// Setting a new default?
-		if (!empty($_POST['set_default']) && !empty($_POST['def_language']))
-		{
+		if (!empty($_POST['set_default']) && !empty($_POST['def_language'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-lang');
 
 			Lang::get();
 			$lang_exists = false;
 
-			foreach (Utils::$context['languages'] as $lang)
-			{
-				if ($_POST['def_language'] == $lang['filename'])
-				{
+			foreach (Utils::$context['languages'] as $lang) {
+				if ($_POST['def_language'] == $lang['filename']) {
 					$lang_exists = true;
 					break;
 				}
 			}
 
-			if ($_POST['def_language'] != Lang::$default && $lang_exists)
-			{
-				Config::updateSettingsFile(array('language' => $_POST['def_language']));
+			if ($_POST['def_language'] != Lang::$default && $lang_exists) {
+				Config::updateSettingsFile(['language' => $_POST['def_language']]);
 				Lang::$default = $_POST['def_language'];
 			}
 		}
@@ -533,96 +507,93 @@ public function editLanguages()
 		// Create another one time token here.
 		SecurityToken::create('admin-lang');
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'language_list',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=languages',
 			'title' => Lang::$txt['edit_languages'],
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getLanguages',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumLanguages',
-			),
-			'columns' => array(
-				'default' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'default' => [
+					'header' => [
 						'value' => Lang::$txt['languages_default'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="radio" name="def_language" value="' . $rowData['id'] . '"' . ($rowData['default'] ? ' checked' : '') . ' onclick="highlightSelected(\'list_language_list_' . $rowData['id'] . '\');">';
 						},
 						'style' => 'width: 8%;',
 						'class' => 'centercol',
-					),
-				),
-				'name' => array(
-					'header' => array(
+					],
+				],
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['languages_lang_name'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return sprintf('<a href="%1$s?action=admin;area=languages;sa=editlang;lid=%2$s">%3$s</a>', Config::$scripturl, $rowData['id'], $rowData['name']);
 						},
 						'class' => 'centercol',
-					),
-				),
-				'character_set' => array(
-					'header' => array(
+					],
+				],
+				'character_set' => [
+					'header' => [
 						'value' => Lang::$txt['languages_character_set'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'char_set',
 						'class' => 'centercol',
-					),
-				),
-				'count' => array(
-					'header' => array(
+					],
+				],
+				'count' => [
+					'header' => [
 						'value' => Lang::$txt['languages_users'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'count',
 						'class' => 'centercol',
-					),
-				),
-				'locale' => array(
-					'header' => array(
+					],
+				],
+				'locale' => [
+					'header' => [
 						'value' => Lang::$txt['languages_locale'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'locale',
 						'class' => 'centercol',
-					),
-				),
-				'editlang' => array(
-					'header' => array(
+					],
+				],
+				'editlang' => [
+					'header' => [
 						'value' => '',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return sprintf('<a href="%1$s?action=admin;area=languages;sa=editlang;lid=%2$s" class="button">%3$s</a>', Config::$scripturl, $rowData['id'], Lang::$txt['edit']);
 						},
 						'style' => 'width: 8%;',
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=languages',
 				'token' => 'admin-lang',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="hidden" name="' . Utils::$context['session_var'] . '" value="' . Utils::$context['session_id'] . '"><input type="submit" name="set_default" value="' . Lang::$txt['save'] . '"' . (is_writable(SMF_SETTINGS_FILE) ? '' : ' disabled') . ' class="button">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// We want to highlight the selected language. Need some Javascript for this.
 		Theme::addInlineJavaScript('
@@ -634,13 +605,12 @@ function highlightSelected(box)
 		highlightSelected("list_language_list_' . (Lang::$default == '' ? 'english' : Lang::$default) . '");', true);
 
 		// Display a warning if we cannot edit the default setting.
-		if (!is_writable(SMF_SETTINGS_FILE))
-		{
-			$listOptions['additional_rows'][] = array(
+		if (!is_writable(SMF_SETTINGS_FILE)) {
+			$listOptions['additional_rows'][] = [
 				'position' => 'after_title',
 				'value' => Lang::$txt['language_settings_writable'],
 				'class' => 'smalltext alert',
-			);
+			];
 		}
 
 		new ItemList($listOptions);
@@ -662,25 +632,24 @@ public function settings($return_config = false)
 		// Get our languages. No cache.
 		Lang::get(false);
 
-		foreach (Utils::$context['languages'] as $lang)
-		{
-			$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+		foreach (Utils::$context['languages'] as $lang) {
+			$config_vars['language'][4][$lang['filename']] = [$lang['filename'], $lang['name']];
 		}
 
 		// Warn the user if Settings.php is not writable or cannot be backed up.
 		$safe = Server::checkSettingsFileWriteSafe();
 
 		// Saving settings?
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			User::$me->checkSession();
 
-			IntegrationHook::call('integrate_save_language_settings', array(&$config_vars));
+			IntegrationHook::call('integrate_save_language_settings', [&$config_vars]);
 
 			ACP::saveSettings($config_vars);
 
-			if ($safe)
+			if ($safe) {
 				$_SESSION['adm-save'] = true;
+			}
 
 			Utils::redirectexit('action=admin;area=languages;sa=settings');
 		}
@@ -690,21 +659,18 @@ public function settings($return_config = false)
 		Utils::$context['settings_title'] = Lang::$txt['language_settings'];
 		Utils::$context['save_disabled'] = Server::$settings_not_writable;
 
-		if (Server::$settings_not_writable)
-		{
-			Utils::$context['settings_message'] = array(
+		if (Server::$settings_not_writable) {
+			Utils::$context['settings_message'] = [
 				'label' => Lang::$txt['settings_not_writable'],
 				'tag' => 'div',
-				'class' => 'centertext strong'
-			);
-		}
-		elseif (Server::$settings_backup_fail)
-		{
-			Utils::$context['settings_message'] = array(
+				'class' => 'centertext strong',
+			];
+		} elseif (Server::$settings_backup_fail) {
+			Utils::$context['settings_message'] = [
 				'label' => Lang::$txt['admin_backup_fail'],
 				'tag' => 'div',
-				'class' => 'centertext strong'
-			);
+				'class' => 'centertext strong',
+			];
 		}
 
 		// Fill the config array.
@@ -724,7 +690,7 @@ public function editEntries()
 		Utils::$context['sub_template'] = 'modify_language_entries';
 
 		$lang_id = $_GET['lid'];
-		list($theme_id, $file_id) = empty($_REQUEST['tfid']) || strpos($_REQUEST['tfid'], '+') === false ? array(1, '') : explode('+', $_REQUEST['tfid']);
+		list($theme_id, $file_id) = empty($_REQUEST['tfid']) || strpos($_REQUEST['tfid'], '+') === false ? [1, ''] : explode('+', $_REQUEST['tfid']);
 
 		// Clean the ID - just in case.
 		preg_match('~([A-Za-z0-9_-]+)~', $lang_id, $matches);
@@ -733,74 +699,70 @@ public function editEntries()
 		Utils::$context['lang_id'] = &$lang_id;
 
 		// Get all the theme data.
-		$themes = array(
-			1 => array(
+		$themes = [
+			1 => [
 				'name' => Lang::$txt['dvc_default'],
 				'theme_dir' => Theme::$current->settings['default_theme_dir'],
-			),
-		);
+			],
+		];
 
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE id_theme != {int:default_theme}
 				AND id_member = {int:no_member}
 				AND variable IN ({string:name}, {string:theme_dir})',
-			array(
+			[
 				'default_theme' => 1,
 				'no_member' => 0,
 				'name' => 'name',
 				'theme_dir' => 'theme_dir',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$themes[$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		Db::$db->free_result($request);
 
 		// This will be where we look
-		$lang_dirs = array();
+		$lang_dirs = [];
 
 		// There are different kinds of strings
-		$string_types = array('txt', 'helptxt', 'editortxt', 'tztxt', 'txtBirthdayEmails');
-		$additional_string_types = array();
+		$string_types = ['txt', 'helptxt', 'editortxt', 'tztxt', 'txtBirthdayEmails'];
+		$additional_string_types = [];
 
 		// Some files allow the admin to add and/or remove certain types of strings
-		$allows_add_remove = array(
-			'Timezones' => array(
-				'add' => array('tztxt', 'txt'),
-				'remove' => array('tztxt', 'txt'),
-			),
-			'Modifications' => array(
-				'add' => array('txt'),
-				'remove' => array('txt'),
-			),
-			'ThemeStrings' => array(
-				'add' => array('txt'),
-			),
-		);
+		$allows_add_remove = [
+			'Timezones' => [
+				'add' => ['tztxt', 'txt'],
+				'remove' => ['tztxt', 'txt'],
+			],
+			'Modifications' => [
+				'add' => ['txt'],
+				'remove' => ['txt'],
+			],
+			'ThemeStrings' => [
+				'add' => ['txt'],
+			],
+		];
 
 		// Does a hook need to add in some additional places to look for languages or info about how to handle them?
-		IntegrationHook::call('integrate_modifylanguages', array(&$themes, &$lang_dirs, &$allows_add_remove, &$additional_string_types));
+		IntegrationHook::call('integrate_modifylanguages', [&$themes, &$lang_dirs, &$allows_add_remove, &$additional_string_types]);
 
 		$string_types = array_unique(array_merge($string_types, $additional_string_types));
 
 		// Check we have themes with a path and a name - just in case - and add the path.
-		foreach ($themes as $id => $data)
-		{
-			if (count($data) != 2)
-			{
+		foreach ($themes as $id => $data) {
+			if (count($data) != 2) {
 				unset($themes[$id]);
-			}
-			elseif (is_dir($data['theme_dir'] . '/languages'))
-			{
+			} elseif (is_dir($data['theme_dir'] . '/languages')) {
 				$lang_dirs[$id] = $data['theme_dir'] . '/languages';
 			}
 
 			// How about image directories?
-			if (is_dir($data['theme_dir'] . '/images/' . $lang_id))
-			{
+			if (is_dir($data['theme_dir'] . '/images/' . $lang_id)) {
 				$images_dirs[$id] = $data['theme_dir'] . '/images/' . $lang_id;
 			}
 		}
@@ -808,115 +770,109 @@ public function editEntries()
 		$current_file = $file_id ? $lang_dirs[$theme_id] . '/' . $file_id . '.' . $lang_id . '.php' : '';
 
 		// Now for every theme get all the files and stick them in context!
-		Utils::$context['possible_files'] = array();
+		Utils::$context['possible_files'] = [];
 
-		foreach ($lang_dirs as $theme => $theme_dir)
-		{
+		foreach ($lang_dirs as $theme => $theme_dir) {
 			// Open it up.
 			$dir = dir($theme_dir);
 
-			while ($entry = $dir->read())
-			{
+			while ($entry = $dir->read()) {
 				// We're only after the files for this language.
-				if (!preg_match('~^([A-Za-z]+)\.' . $lang_id . '\.php$~', $entry, $matches))
+				if (!preg_match('~^([A-Za-z]+)\.' . $lang_id . '\.php$~', $entry, $matches)) {
 					continue;
+				}
 
-				if (!isset(Utils::$context['possible_files'][$theme]))
-				{
-					Utils::$context['possible_files'][$theme] = array(
+				if (!isset(Utils::$context['possible_files'][$theme])) {
+					Utils::$context['possible_files'][$theme] = [
 						'id' => $theme,
 						'name' => $themes[$theme]['name'],
-						'files' => array(),
-					);
+						'files' => [],
+					];
 				}
 
-				Utils::$context['possible_files'][$theme]['files'][] = array(
+				Utils::$context['possible_files'][$theme]['files'][] = [
 					'id' => $matches[1],
-					'name' => isset(Lang::$txt['lang_file_desc_' . $matches[1]]) ? Lang::$txt['lang_file_desc_' . $matches[1]] : $matches[1],
+					'name' => Lang::$txt['lang_file_desc_' . $matches[1]] ?? $matches[1],
 					'selected' => $theme_id == $theme && $file_id == $matches[1],
-				);
+				];
 			}
 			$dir->close();
 
-			if (!empty(Utils::$context['possible_files'][$theme]['files']))
-			{
+			if (!empty(Utils::$context['possible_files'][$theme]['files'])) {
 				usort(
 					Utils::$context['possible_files'][$theme]['files'],
-					function($val1, $val2)
-					{
+					function ($val1, $val2) {
 						return strcmp($val1['name'], $val2['name']);
-					}
+					},
 				);
 			}
 		}
 
 		// We no longer wish to speak this language.
-		if (!empty($_POST['delete_main']) && $lang_id != 'english')
-		{
+		if (!empty($_POST['delete_main']) && $lang_id != 'english') {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-mlang');
 
 			// First, Make a backup?
-			if (!empty(Config::$modSettings['package_make_backups']) && (!isset($_SESSION['last_backup_for']) || $_SESSION['last_backup_for'] != $lang_id . '$$$'))
-			{
+			if (!empty(Config::$modSettings['package_make_backups']) && (!isset($_SESSION['last_backup_for']) || $_SESSION['last_backup_for'] != $lang_id . '$$$')) {
 				$_SESSION['last_backup_for'] = $lang_id . '$$$';
 
 				$result = SubsPackage::package_create_backup('backup_lang_' . $lang_id);
 
-				if (!$result)
+				if (!$result) {
 					ErrorHandler::fatalLang('could_not_language_backup', false);
+				}
 			}
 
 			// Second, loop through the array to remove the files.
-			foreach ($lang_dirs as $curPath)
-			{
-				foreach (Utils::$context['possible_files'][1]['files'] as $lang)
-				{
-					if (file_exists($curPath . '/' . $lang['id'] . '.' . $lang_id . '.php'))
+			foreach ($lang_dirs as $curPath) {
+				foreach (Utils::$context['possible_files'][1]['files'] as $lang) {
+					if (file_exists($curPath . '/' . $lang['id'] . '.' . $lang_id . '.php')) {
 						unlink($curPath . '/' . $lang['id'] . '.' . $lang_id . '.php');
+					}
 				}
 
 				// Check for the email template.
-				if (file_exists($curPath . '/EmailTemplates.' . $lang_id . '.php'))
+				if (file_exists($curPath . '/EmailTemplates.' . $lang_id . '.php')) {
 					unlink($curPath . '/EmailTemplates.' . $lang_id . '.php');
+				}
 			}
 
 			// Third, the agreement file.
-			if (file_exists(Config::$boarddir . '/agreement.' . $lang_id . '.txt'))
+			if (file_exists(Config::$boarddir . '/agreement.' . $lang_id . '.txt')) {
 				unlink(Config::$boarddir . '/agreement.' . $lang_id . '.txt');
+			}
 
 			// Fourth, a related images folder, if it exists...
-			if (!empty($images_dirs))
-			{
-				foreach ($images_dirs as $curPath)
-				{
-					if (is_dir($curPath))
+			if (!empty($images_dirs)) {
+				foreach ($images_dirs as $curPath) {
+					if (is_dir($curPath)) {
 						SubsPackage::deltree($curPath);
+					}
 				}
 			}
 
 			// Members can no longer use this language.
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET lngfile = {empty}
 				WHERE lngfile = {string:current_language}',
-				array(
+				[
 					'empty_string' => '',
 					'current_language' => $lang_id,
-				)
+				],
 			);
 
 			// Fifth, update Lang::get() cache.
-			if (!empty(CacheApi::$enable))
-			{
+			if (!empty(CacheApi::$enable)) {
 				CacheApi::put('known_languages', null, !empty(CacheApi::$enable) && CacheApi::$enable < 1 ? 86400 : 3600);
 			}
 
 			// Sixth, if we deleted the default language, set us back to english?
-			if ($lang_id == Lang::$default)
-			{
+			if ($lang_id == Lang::$default) {
 				Lang::$default = 'english';
-				Config::updateSettingsFile(array('language' => Lang::$default));
+				Config::updateSettingsFile(['language' => Lang::$default]);
 			}
 
 			// Seventh, get out of here.
@@ -924,19 +880,18 @@ function($val1, $val2)
 		}
 
 		// Saving primary settings?
-		$primary_settings = array(
+		$primary_settings = [
 			'native_name' => 'string',
 			'lang_character_set' => 'string',
 			'lang_locale' => 'string',
 			'lang_rtl' => 'string',
 			'lang_dictionary' => 'string',
 			'lang_recaptcha' => 'string',
-		);
+		];
 
 		$madeSave = false;
 
-		if (!empty($_POST['save_main']) && !$current_file)
-		{
+		if (!empty($_POST['save_main']) && !$current_file) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-mlang');
 
@@ -944,10 +899,9 @@ function($val1, $val2)
 			$current_data = implode('', file(Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang_id . '.php'));
 
 			// Build the replacements. old => new
-			$replace_array = array();
+			$replace_array = [];
 
-			foreach ($primary_settings as $setting => $type)
-			{
+			foreach ($primary_settings as $setting => $type) {
 				$replace_array['~\$txt\[\'' . $setting . '\'\]\s*=\s*[^\r\n]+~'] = '$txt[\'' . $setting . '\'] = ' . ($type === 'bool' ? (!empty($_POST[$setting]) ? 'true' : 'false') : '\'' . ($setting = 'native_name' ? htmlentities(Utils::htmlspecialcharsDecode($_POST[$setting]), ENT_QUOTES, Utils::$context['character_set']) : preg_replace('~[^\w-]~i', '', $_POST[$setting])) . '\'') . ';';
 			}
 
@@ -963,88 +917,70 @@ function($val1, $val2)
 		// Quickly load index language entries.
 		$old_txt = Lang::$txt;
 
-		require(Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang_id . '.php');
+		require Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang_id . '.php';
 
 		Utils::$context['lang_file_not_writable_message'] = is_writable(Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang_id . '.php') ? '' : sprintf(Lang::$txt['lang_file_not_writable'], Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang_id . '.php');
 
 		// Setup the primary settings context.
-		Utils::$context['primary_settings']['name'] = Utils::ucwords(strtr($lang_id, array('_' => ' ', '-utf8' => '')));
+		Utils::$context['primary_settings']['name'] = Utils::ucwords(strtr($lang_id, ['_' => ' ', '-utf8' => '']));
 
-		foreach ($primary_settings as $setting => $type)
-		{
-			Utils::$context['primary_settings'][$setting] = array(
+		foreach ($primary_settings as $setting => $type) {
+			Utils::$context['primary_settings'][$setting] = [
 				'label' => str_replace('lang_', '', $setting),
 				'value' => Lang::$txt[$setting],
-			);
+			];
 		}
 
 		// Restore normal service.
 		Lang::$txt = $old_txt;
 
 		// Are we saving?
-		$save_strings = array();
-		$remove_strings = array();
-		$add_strings = array();
+		$save_strings = [];
+		$remove_strings = [];
+		$add_strings = [];
 
-		if (isset($_POST['save_entries']))
-		{
+		if (isset($_POST['save_entries'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-mlang');
 
-			if (!empty($_POST['edit']))
-			{
-				foreach ($_POST['edit'] as $k => $v)
-				{
-					if (is_string($v))
-					{
+			if (!empty($_POST['edit'])) {
+				foreach ($_POST['edit'] as $k => $v) {
+					if (is_string($v)) {
 						// Only try to save if 'edit' was specified and if the string has changed
 						if (
 							$v == 'edit'
-							&& isset($_POST['entry'][$k])
-							&& isset($_POST['comp'][$k])
+							&& isset($_POST['entry'][$k], $_POST['comp'][$k])
+
 							&& $_POST['entry'][$k] != $_POST['comp'][$k]
-						)
-						{
+						) {
 							$save_strings[$k] = $this->cleanLangString($_POST['entry'][$k], false);
 						}
 						// Record any add or remove requests. We'll decide on them later.
-						elseif ($v == 'remove')
-						{
+						elseif ($v == 'remove') {
 							$remove_strings[] = $k;
-						}
-						elseif ($v == 'add' && isset($_POST['entry'][$k]))
-						{
-							$add_strings[$k] = array(
-								'group' => isset($_POST['grp'][$k]) ? $_POST['grp'][$k] : 'txt',
+						} elseif ($v == 'add' && isset($_POST['entry'][$k])) {
+							$add_strings[$k] = [
+								'group' => $_POST['grp'][$k] ?? 'txt',
 								'string' => $this->cleanLangString($_POST['entry'][$k], false),
-							);
+							];
 						}
-					}
-					elseif (is_array($v))
-					{
-						foreach ($v as $subk => $subv)
-						{
+					} elseif (is_array($v)) {
+						foreach ($v as $subk => $subv) {
 							if (
 								$subv == 'edit'
-								&& isset($_POST['entry'][$k][$subk])
-								&& isset($_POST['comp'][$k][$subk])
+								&& isset($_POST['entry'][$k][$subk], $_POST['comp'][$k][$subk])
+
 								&& $_POST['entry'][$k][$subk] != $_POST['comp'][$k][$subk]
-							)
-							{
+							) {
 								$save_strings[$k][$subk] = $this->cleanLangString($_POST['entry'][$k][$subk], false);
-							}
-							elseif ($subv == 'remove')
-							{
+							} elseif ($subv == 'remove') {
 								$remove_strings[$k][] = $subk;
-							}
-							elseif ($subv == 'add' && isset($_POST['entry'][$k][$subk]))
-							{
-								$add_strings[$k][$subk] = array(
-									'group' => isset($_POST['grp'][$k]) ? $_POST['grp'][$k] : 'txt',
+							} elseif ($subv == 'add' && isset($_POST['entry'][$k][$subk])) {
+								$add_strings[$k][$subk] = [
+									'group' => $_POST['grp'][$k] ?? 'txt',
 									'string' => $this->cleanLangString($_POST['entry'][$k][$subk], false),
-								);
+								];
 							}
-
 						}
 					}
 				}
@@ -1052,10 +988,9 @@ function($val1, $val2)
 		}
 
 		// If we are editing a file work away at that.
-		Utils::$context['can_add_lang_entry'] = array();
+		Utils::$context['can_add_lang_entry'] = [];
 
-		if ($current_file)
-		{
+		if ($current_file) {
 			Utils::$context['entries_not_writable_message'] = is_writable($current_file) ? '' : sprintf(Lang::$txt['lang_entries_not_writable'], $current_file);
 
 			// How many strings will PHP let us edit at once?
@@ -1063,42 +998,39 @@ function($val1, $val2)
 			Utils::$context['max_inputs'] = floor(ini_get('max_input_vars') / 3) - 5;
 
 			// Do we want to override the helptxt for certain types of text variables?
-			$special_groups = array(
-				'Timezones' => array('txt' => 'txt_for_timezones'),
-				'EmailTemplates' => array('txt' => 'txt_for_email_templates', 'txtBirthdayEmails' => 'txt_for_email_templates'),
-			);
+			$special_groups = [
+				'Timezones' => ['txt' => 'txt_for_timezones'],
+				'EmailTemplates' => ['txt' => 'txt_for_email_templates', 'txtBirthdayEmails' => 'txt_for_email_templates'],
+			];
 
-			IntegrationHook::call('integrate_language_edit_helptext', array(&$special_groups));
+			IntegrationHook::call('integrate_language_edit_helptext', [&$special_groups]);
 
 			// Determine which groups of strings (if any) allow adding new entries
-			if (isset($allows_add_remove[$file_id]['add']))
-			{
-				foreach ($allows_add_remove[$file_id]['add'] as $var_group)
-				{
+			if (isset($allows_add_remove[$file_id]['add'])) {
+				foreach ($allows_add_remove[$file_id]['add'] as $var_group) {
 					$group = !empty($special_groups[$file_id][$var_group]) ? $special_groups[$file_id][$var_group] : $var_group;
 
-					if (in_array($var_group, $allows_add_remove[$file_id]['add']))
+					if (in_array($var_group, $allows_add_remove[$file_id]['add'])) {
 						Utils::$context['can_add_lang_entry'][$group] = true;
+					}
 				}
 			}
 
 			// Read in the file's contents and process it into entries.
 			// Also, remove any lines for uneditable variables like $forum_copyright from the working data.
-			$entries = array();
+			$entries = [];
 
-			foreach (preg_split('~^(?=\$(?:' . implode('|', $string_types) . ')\[\'([^\n]+?)\'\])~m' . (Utils::$context['utf8'] ? 'u' : ''), preg_replace('~\s*\n(\$(?!(?:' . implode('|', $string_types) . '))[^\n]*)~', '', file_get_contents($current_file))) as $blob)
-			{
+			foreach (preg_split('~^(?=\$(?:' . implode('|', $string_types) . ')\[\'([^\n]+?)\'\])~m' . (Utils::$context['utf8'] ? 'u' : ''), preg_replace('~\s*\n(\$(?!(?:' . implode('|', $string_types) . '))[^\n]*)~', '', file_get_contents($current_file))) as $blob) {
 				// Comment lines at the end of the blob can make terrible messes
 				$blob = preg_replace('~(\n[ \t]*//[^\n]*)*$~' . (Utils::$context['utf8'] ? 'u' : ''), '', $blob);
 
 				// Extract the variable
-				if (preg_match('~^\$(' . implode('|', $string_types) . ')\[\'([^\n]+?)\'\](?:\[\'?([^\n]+?)\'?\])?\s?=\s?(.+);([ \t]*(?://[^\n]*)?)$~ms' . (Utils::$context['utf8'] ? 'u' : ''), strtr($blob, array("\r" => '')), $matches))
-				{
+				if (preg_match('~^\$(' . implode('|', $string_types) . ')\[\'([^\n]+?)\'\](?:\[\'?([^\n]+?)\'?\])?\s?=\s?(.+);([ \t]*(?://[^\n]*)?)$~ms' . (Utils::$context['utf8'] ? 'u' : ''), strtr($blob, ["\r" => '']), $matches)) {
 					// If no valid subkey was found, we need it to be explicitly null
 					$matches[3] = isset($matches[3]) && $matches[3] !== '' ? $matches[3] : null;
 
 					// The point of this exercise
-					$entries[$matches[2] . (isset($matches[3]) ? '[' . $matches[3] . ']' : '')] = array(
+					$entries[$matches[2] . (isset($matches[3]) ? '[' . $matches[3] . ']' : '')] = [
 						'type' => $matches[1],
 						'group' => !empty($special_groups[$file_id][$matches[1]]) ? $special_groups[$file_id][$matches[1]] : $matches[1],
 						'can_remove' => isset($allows_add_remove[$file_id]['remove']) && in_array($matches[1], $allows_add_remove[$file_id]['remove']),
@@ -1107,25 +1039,26 @@ function($val1, $val2)
 						'full' => $matches[0],
 						'entry' => $matches[4],
 						'cruft' => $matches[5],
-					);
+					];
 				}
 			}
 
 			// These will be the entries we can definitely save.
-			$final_saves = array();
-			Utils::$context['file_entries'] = array();
-			foreach ($entries as $entryKey => $entryValue)
-			{
+			$final_saves = [];
+			Utils::$context['file_entries'] = [];
+
+			foreach ($entries as $entryKey => $entryValue) {
 				// Ignore some things we set separately.
-				if (in_array($entryKey, array_keys($primary_settings)))
+				if (in_array($entryKey, array_keys($primary_settings))) {
 					continue;
+				}
 
 				// These are arrays that need breaking out.
-				if (strpos($entryValue['entry'], 'array(') === 0 && substr($entryValue['entry'], -1) === ')')
-				{
+				if (strpos($entryValue['entry'], 'array(') === 0 && substr($entryValue['entry'], -1) === ')') {
 					// No, you may not use multidimensional arrays of Lang::$txt strings. Madness stalks that path.
-					if (isset($entryValue['subkey']))
+					if (isset($entryValue['subkey'])) {
 						continue;
+					}
 
 					// Trim off the array construct bits.
 					$entryValue['entry'] = substr($entryValue['entry'], strpos($entryValue['entry'], 'array(') + 6, -1);
@@ -1168,77 +1101,68 @@ function($val1, $val2)
 
 						/x' . (Utils::$context['utf8'] ? 'u' : ''), $entryValue['entry'], $matches);
 
-					if (empty($m))
+					if (empty($m)) {
 						continue;
+					}
 
 					$entryValue['entry'] = $matches[0];
 
 					// Now create an entry for each item.
 					$cur_index = -1;
-					$save_cache = array(
+					$save_cache = [
 						'enabled' => false,
-						'entries' => array(),
-					);
-					foreach ($entryValue['entry'] as $id => $subValue)
-					{
+						'entries' => [],
+					];
+
+					foreach ($entryValue['entry'] as $id => $subValue) {
 						// Is this a new index?
-						if (preg_match('/^(\d+|(?:(?:\'(?:[^\']|(?<=\\\)\')*\')|(?:"(?:[^"]|(?<=\\\)")*")))\s*=>/', $subValue, $matches))
-						{
+						if (preg_match('/^(\d+|(?:(?:\'(?:[^\']|(?<=\\\)\')*\')|(?:"(?:[^"]|(?<=\\\)")*")))\s*=>/', $subValue, $matches)) {
 							$subKey = trim($matches[1], '\'"');
 
-							if (ctype_digit($subKey))
+							if (ctype_digit($subKey)) {
 								$cur_index = $subKey;
+							}
 
 							$subValue = trim(substr($subValue, strpos($subValue, '=>') + 2));
-						}
-						else
-						{
+						} else {
 							$subKey = ++$cur_index;
 						}
 
 						// Clean up some bits.
-						if (strpos($subValue, '\'') === 0)
-						{
+						if (strpos($subValue, '\'') === 0) {
 							$subValue = trim($subValue, '\'');
-						}
-						elseif (strpos($subValue, '"') === 0)
-						{
+						} elseif (strpos($subValue, '"') === 0) {
 							$subValue = trim($subValue, '"');
 						}
 
 						// Can we save?
-						if (isset($save_strings[$entryKey][$subKey]))
-						{
-							$save_cache['entries'][$subKey] = strtr($save_strings[$entryKey][$subKey], array('\'' => ''));
+						if (isset($save_strings[$entryKey][$subKey])) {
+							$save_cache['entries'][$subKey] = strtr($save_strings[$entryKey][$subKey], ['\'' => '']);
 
 							$save_cache['enabled'] = true;
 						}
 						// Should we remove this one?
-						elseif (isset($remove_strings[$entryKey]) && in_array($subKey, $remove_strings[$entryKey]) && $entryValue['can_remove'])
-						{
+						elseif (isset($remove_strings[$entryKey]) && in_array($subKey, $remove_strings[$entryKey]) && $entryValue['can_remove']) {
 							$save_cache['enabled'] = true;
 						}
 						// Just keep this one as it is
-						else
-						{
+						else {
 							$save_cache['entries'][$subKey] = $subValue;
 						}
 
-						Utils::$context['file_entries'][$entryValue['group']][] = array(
+						Utils::$context['file_entries'][$entryValue['group']][] = [
 							'key' => $entryKey,
 							'subkey' => $subKey,
 							'value' => $subValue,
 							'rows' => 1,
 							'can_remove' => $entryValue['can_remove'],
-						);
+						];
 					}
 
 					// Should we add a new string to this array?
-					if (!empty(Utils::$context['can_add_lang_entry'][$entryValue['type']]) && isset($add_strings[$entryKey]))
-					{
-						foreach ($add_strings[$entryKey] as $string_key => $string_val)
-						{
-							$save_cache['entries'][$string_key] = strtr($string_val['string'], array('\'' => ''));
+					if (!empty(Utils::$context['can_add_lang_entry'][$entryValue['type']]) && isset($add_strings[$entryKey])) {
+						foreach ($add_strings[$entryKey] as $string_key => $string_val) {
+							$save_cache['entries'][$string_key] = strtr($string_val['string'], ['\'' => '']);
 						}
 
 						$save_cache['enabled'] = true;
@@ -1246,26 +1170,23 @@ function($val1, $val2)
 						// Make sure we don't add this again as an independent line
 						unset($add_strings[$entryKey][$string_key]);
 
-						if (empty($add_strings[$entryKey]))
+						if (empty($add_strings[$entryKey])) {
 							unset($add_strings[$entryKey]);
+						}
 					}
 
 					// Do we need to save?
-					if ($save_cache['enabled'])
-					{
+					if ($save_cache['enabled']) {
 						// Format the string, checking the indexes first.
-						$items = array();
+						$items = [];
 						$cur_index = 0;
-						foreach ($save_cache['entries'] as $k2 => $v2)
-						{
+
+						foreach ($save_cache['entries'] as $k2 => $v2) {
 							// Manually show the custom index.
-							if ($k2 != $cur_index)
-							{
+							if ($k2 != $cur_index) {
 								$items[] = $k2 . ' => \'' . $v2 . '\'';
 								$cur_index = $k2;
-							}
-							else
-							{
+							} else {
 								$items[] = '\'' . $v2 . '\'';
 							}
 
@@ -1273,20 +1194,19 @@ function($val1, $val2)
 						}
 
 						// Now create the string!
-						$final_saves[$entryKey] = array(
+						$final_saves[$entryKey] = [
 							'find' => $entryValue['full'],
 							'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');' . $entryValue['cruft'],
-						);
+						];
 					}
 				}
 				// A single array element, like: Lang::$txt['foo']['bar'] = 'baz';
-				elseif (isset($entryValue['subkey']))
-				{
+				elseif (isset($entryValue['subkey'])) {
 					// Saving?
-					if (isset($save_strings[$entryValue['key']][$entryValue['subkey']]) && $save_strings[$entryValue['key']][$entryValue['subkey']] != $entryValue['entry'])
-					{
-						if ($save_strings[$entryValue['key']][$entryValue['subkey']] == '')
+					if (isset($save_strings[$entryValue['key']][$entryValue['subkey']]) && $save_strings[$entryValue['key']][$entryValue['subkey']] != $entryValue['entry']) {
+						if ($save_strings[$entryValue['key']][$entryValue['subkey']] == '') {
 							$save_strings[$entryValue['key']][$entryValue['subkey']] = '\'\'';
+						}
 
 						// Preserve subkey as either digit or string
 						$subKey = ctype_digit($entryValue['subkey']) ? $entryValue['subkey'] : '\'' . $entryValue['subkey'] . '\'';
@@ -1295,135 +1215,124 @@ function($val1, $val2)
 						$entryValue['entry'] = $save_strings[$entryValue['key']][$entryValue['subkey']];
 
 						// And save it
-						$final_saves[$entryKey] = array(
+						$final_saves[$entryKey] = [
 							'find' => $entryValue['full'],
 							'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'][' . $subKey . '] = ' . $save_strings[$entryValue['key']][$entryValue['subkey']] . ';' . $entryValue['cruft'],
-						);
+						];
 					}
 
 					// Remove this entry only if it is allowed
-					if (isset($remove_strings[$entryValue['key']]) && in_array($entryValue['subkey'], $remove_strings[$entryValue['key']]) && $entryValue['can_remove'])
-					{
+					if (isset($remove_strings[$entryValue['key']]) && in_array($entryValue['subkey'], $remove_strings[$entryValue['key']]) && $entryValue['can_remove']) {
 						$entryValue['entry'] = '\'\'';
 
-						$final_saves[$entryKey] = array(
+						$final_saves[$entryKey] = [
 							'find' => $entryValue['full'],
 							'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n",
-						);
+						];
 					}
 
 					$editing_string = $this->cleanLangString($entryValue['entry'], true);
 
-					Utils::$context['file_entries'][$entryValue['group']][] = array(
+					Utils::$context['file_entries'][$entryValue['group']][] = [
 						'key' => $entryValue['key'],
 						'subkey' => $entryValue['subkey'],
 						'value' => $editing_string,
 						'rows' => strlen($editing_string) / 38 + substr_count($editing_string, "\n") + 1,
 						'can_remove' => $entryValue['can_remove'],
-					);
+					];
 				}
 				// A simple string entry
-				else
-				{
+				else {
 					// Saving?
-					if (isset($save_strings[$entryValue['key']]) && $save_strings[$entryValue['key']] != $entryValue['entry'])
-					{
-						if ($save_strings[$entryValue['key']] == '')
+					if (isset($save_strings[$entryValue['key']]) && $save_strings[$entryValue['key']] != $entryValue['entry']) {
+						if ($save_strings[$entryValue['key']] == '') {
 							$save_strings[$entryValue['key']] = '\'\'';
+						}
 
 						// Set the new value.
 						$entryValue['entry'] = $save_strings[$entryValue['key']];
 
 						// And we know what to save now!
-						$final_saves[$entryKey] = array(
+						$final_saves[$entryKey] = [
 							'find' => $entryValue['full'],
 							'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'] = ' . $save_strings[$entryValue['key']] . ';' . $entryValue['cruft'],
-						);
+						];
 					}
 
 					// Remove this entry only if it is allowed
-					if (in_array($entryValue['key'], $remove_strings) && $entryValue['can_remove'])
-					{
+					if (in_array($entryValue['key'], $remove_strings) && $entryValue['can_remove']) {
 						$entryValue['entry'] = '\'\'';
 
-						$final_saves[$entryKey] = array(
+						$final_saves[$entryKey] = [
 							'find' => $entryValue['full'],
 							'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n",
-						);
+						];
 					}
 
 					$editing_string = $this->cleanLangString($entryValue['entry'], true);
 
-					Utils::$context['file_entries'][$entryValue['group']][] = array(
+					Utils::$context['file_entries'][$entryValue['group']][] = [
 						'key' => $entryValue['key'],
 						'subkey' => null,
 						'value' => $editing_string,
 						'rows' => (int) (strlen($editing_string) / 38) + substr_count($editing_string, "\n") + 1,
 						'can_remove' => $entryValue['can_remove'],
-					);
+					];
 				}
 			}
 
 			// Do they want to add some brand new strings? Does this file allow that?
-			if (!empty($add_strings) && !empty($allows_add_remove[$file_id]['add']))
-			{
-				$special_types = isset($special_groups[$file_id]) ? array_flip($special_groups[$file_id]) : array();
+			if (!empty($add_strings) && !empty($allows_add_remove[$file_id]['add'])) {
+				$special_types = isset($special_groups[$file_id]) ? array_flip($special_groups[$file_id]) : [];
 
-				foreach ($add_strings as $string_key => $string_val)
-				{
+				foreach ($add_strings as $string_key => $string_val) {
 					// Adding a normal string
-					if (isset($string_val['string']) && is_string($string_val['string']))
-					{
-						$type = isset($special_types[$string_val['group']]) ? $special_types[$string_val['group']] : $string_val['group'];
+					if (isset($string_val['string']) && is_string($string_val['string'])) {
+						$type = $special_types[$string_val['group']] ?? $string_val['group'];
 
-						if (empty(Utils::$context['can_add_lang_entry'][$type]))
+						if (empty(Utils::$context['can_add_lang_entry'][$type])) {
 							continue;
+						}
 
-						$final_saves[$string_key] = array(
-							'find' => "\s*\?" . '>$',
+						$final_saves[$string_key] = [
+							'find' => '\s*\?' . '>$',
 							'replace' => "\n\$" . $type . '[\'' . $string_key . '\'] = ' . $string_val['string'] . ';' . "\n\n?" . '>',
 							'is_regex' => true,
-						);
+						];
 					}
 					// Adding an array element
-					else
-					{
-						foreach ($string_val as $substring_key => $substring_val)
-						{
-							$type = isset($special_types[$substring_val['group']]) ? $special_types[$substring_val['group']] : $substring_val['group'];
+					else {
+						foreach ($string_val as $substring_key => $substring_val) {
+							$type = $special_types[$substring_val['group']] ?? $substring_val['group'];
 
-							if (empty(Utils::$context['can_add_lang_entry'][$type]))
+							if (empty(Utils::$context['can_add_lang_entry'][$type])) {
 								continue;
+							}
 
 							$subKey = ctype_digit(trim($substring_key, '\'')) ? trim($substring_key, '\'') : '\'' . $substring_key . '\'';
 
-							$final_saves[$string_key . '[' . $substring_key . ']'] = array(
-								'find' => "\s*\?" . '>$',
+							$final_saves[$string_key . '[' . $substring_key . ']'] = [
+								'find' => '\s*\?' . '>$',
 								'replace' => "\n\$" . $type . '[\'' . $string_key . '\'][' . $subKey . '] = ' . $substring_val['string'] . ';' . "\n\n?" . '>',
 								'is_regex' => true,
-							);
+							];
 						}
 					}
 				}
 			}
 
 			// Any saves to make?
-			if (!empty($final_saves))
-			{
+			if (!empty($final_saves)) {
 				User::$me->checkSession();
 
 				// Get a fresh copy of the file's current content.
 				$file_contents = file_get_contents($current_file);
 
 				// Apply our changes.
-				foreach ($final_saves as $save)
-				{
-					if (!empty($save['is_regex']))
-					{
+				foreach ($final_saves as $save) {
+					if (!empty($save['is_regex'])) {
 						$file_contents = preg_replace('~' . $save['find'] . '~' . (Utils::$context['utf8'] ? 'u' : ''), $save['replace'], $file_contents);
-					}
-					else
-					{
+					} else {
 						$file_contents = str_replace($save['find'], $save['replace'], $file_contents);
 					}
 				}
@@ -1438,13 +1347,12 @@ function($val1, $val2)
 			Lang::$txt = $old_txt;
 
 			// If they can add new language entries, make sure the UI is set up for that.
-			if (!empty(Utils::$context['can_add_lang_entry']))
-			{
+			if (!empty(Utils::$context['can_add_lang_entry'])) {
 				// Make sure the Add button has a place to show up.
-				foreach (Utils::$context['can_add_lang_entry'] as $group => $value)
-				{
-					if (!isset(Utils::$context['file_entries'][$group]))
-						Utils::$context['file_entries'][$group] = array();
+				foreach (Utils::$context['can_add_lang_entry'] as $group => $value) {
+					if (!isset(Utils::$context['file_entries'][$group])) {
+						Utils::$context['file_entries'][$group] = [];
+					}
 				}
 
 				Theme::addInlineJavaScript('
@@ -1469,7 +1377,7 @@ function add_lang_entry(group) {
 								return;
 							}
 
-							$("#language_" + group).append("<dt><span>" + key + subkey + "</span></dt> <dd id=\"entry_" + entry_num + "\"><input id=\"entry_" + entry_num + "_edit\" class=\"entry_toggle\" type=\"checkbox\" name=\"edit[" + key + "]" + subkey + "\" value=\"add\" data-target=\"#entry_" + entry_num + "\" checked> <label for=\"entry_" + entry_num + "_edit\">' . Lang::$txt['edit'] . '</label> <input type=\"hidden\" class=\"entry_oldvalue\" name=\"grp[" + key + "]\" value=\"" + group + "\"> <textarea name=\"entry[" + key + "]" + subkey + "\" class=\"entry_textfield\" cols=\"40\" rows=\"1\" style=\"width: 96%; margin-bottom: 2em;\"></textarea></dd>");
+							$("#language_" + group).append("<dt><span>" + key + subkey + "</span></dt> <dd id=\\"entry_" + entry_num + "\\"><input id=\\"entry_" + entry_num + "_edit\\" class=\\"entry_toggle\\" type=\\"checkbox\\" name=\\"edit[" + key + "]" + subkey + "\\" value=\\"add\\" data-target=\\"#entry_" + entry_num + "\\" checked> <label for=\\"entry_" + entry_num + "_edit\\">' . Lang::$txt['edit'] . '</label> <input type=\\"hidden\\" class=\\"entry_oldvalue\\" name=\\"grp[" + key + "]\\" value=\\"" + group + "\\"> <textarea name=\\"entry[" + key + "]" + subkey + "\\" class=\\"entry_textfield\\" cols=\\"40\\" rows=\\"1\\" style=\\"width: 96%; margin-bottom: 2em;\\"></textarea></dd>");
 						}
 					};');
 
@@ -1479,8 +1387,7 @@ function add_lang_entry(group) {
 
 			// Warn them if they try to submit more changes than the server can accept in a single request.
 			// Also make it obvious that they cannot submit changes to both the primary settings and the entries at the same time.
-			if (!empty(Utils::$context['file_entries']))
-			{
+			if (!empty(Utils::$context['file_entries'])) {
 				Theme::addInlineJavaScript('
 					max_inputs = ' . Utils::$context['max_inputs'] . ';
 					num_inputs = 0;
@@ -1537,8 +1444,7 @@ function add_lang_entry(group) {
 		}
 
 		// If we saved, redirect.
-		if ($madeSave)
-		{
+		if ($madeSave) {
 			Utils::redirectexit('action=admin;area=languages;sa=editlang;lid=' . $lang_id . (!empty($file_id) ? ';entries;tfid=' . $theme_id . rawurlencode('+') . $file_id : ''));
 		}
 
@@ -1556,8 +1462,9 @@ function add_lang_entry(group) {
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1577,12 +1484,12 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		$config_vars = array(
-			'language' => array('language', Lang::$txt['default_language'], 'file', 'select', array(), null, 'disabled' => !is_writable(SMF_SETTINGS_FILE)),
-			array('userLanguage', Lang::$txt['userLanguage'], 'db', 'check', null, 'userLanguage'),
-		);
+		$config_vars = [
+			'language' => ['language', Lang::$txt['default_language'], 'file', 'select', [], null, 'disabled' => !is_writable(SMF_SETTINGS_FILE)],
+			['userLanguage', Lang::$txt['userLanguage'], 'db', 'check', null, 'userLanguage'],
+		];
 
-		IntegrationHook::call('integrate_language_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_language_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1598,45 +1505,39 @@ public static function list_getLanguagesList(): array
 		// We're going to use this URL.
 		$url = 'https://download.simplemachines.org/fetch_language.php?version=' . urlencode(SMF_VERSION);
 
-		$smf_languages = array();
+		$smf_languages = [];
 
 		// Load the class file and stick it into an array.
 		$language_list = new XmlArray(WebFetchApi::fetch($url), true);
 
 		// Check that the site responded and that the language exists.
-		if (!$language_list->exists('languages'))
-		{
+		if (!$language_list->exists('languages')) {
 			Utils::$context['smf_error'] = 'no_response';
-		}
-		elseif (!$language_list->exists('languages/language'))
-		{
+		} elseif (!$language_list->exists('languages/language')) {
 			Utils::$context['smf_error'] = 'no_files';
-		}
-		else
-		{
+		} else {
 			$language_list = $language_list->path('languages[0]');
 			$lang_files = $language_list->set('language');
 
-			foreach ($lang_files as $file)
-			{
+			foreach ($lang_files as $file) {
 				// Were we searching?
-				if (!empty(Utils::$context['smf_search_term']) && strpos($file->fetch('name'), Utils::strtolower(Utils::$context['smf_search_term'])) === false)
-				{
+				if (!empty(Utils::$context['smf_search_term']) && strpos($file->fetch('name'), Utils::strtolower(Utils::$context['smf_search_term'])) === false) {
 					continue;
 				}
 
-				$smf_languages[] = array(
+				$smf_languages[] = [
 					'id' => $file->fetch('id'),
 					'name' => Utils::ucwords($file->fetch('name')),
 					'version' => $file->fetch('version'),
 					'utf8' => Lang::$txt['yes'],
 					'description' => $file->fetch('description'),
 					'install_link' => '<a href="' . Config::$scripturl . '?action=admin;area=languages;sa=downloadlang;did=' . $file->fetch('id') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '">' . Lang::$txt['add_language_smf_install'] . '</a>',
-				);
+				];
 			}
 
-			if (empty($smf_languages))
+			if (empty($smf_languages)) {
 				Utils::$context['smf_error'] = 'no_files';
+			}
 		}
 
 		return $smf_languages;
@@ -1663,7 +1564,7 @@ public static function list_getNumLanguages()
 	 */
 	public static function list_getLanguages()
 	{
-		$languages = array();
+		$languages = [];
 
 		// Keep our old entries.
 		$old_txt = Lang::$txt;
@@ -1679,51 +1580,46 @@ public static function list_getLanguages()
 		// Put them back.
 		Theme::$current->settings['actual_theme_dir'] = $backup_actual_theme_dir;
 
-		if (!empty($backup_base_theme_dir))
-		{
+		if (!empty($backup_base_theme_dir)) {
 			Theme::$current->settings['base_theme_dir'] = $backup_base_theme_dir;
-		}
-		else
-		{
+		} else {
 			unset(Theme::$current->settings['base_theme_dir']);
 		}
 
 		// Get the language files and data...
-		foreach (Utils::$context['languages'] as $lang)
-		{
+		foreach (Utils::$context['languages'] as $lang) {
 			// Load the file to get the character set.
-			require(Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang['filename'] . '.php');
+			require Theme::$current->settings['default_theme_dir'] . '/languages/index.' . $lang['filename'] . '.php';
 
-			$languages[$lang['filename']] = array(
+			$languages[$lang['filename']] = [
 				'id' => $lang['filename'],
 				'count' => 0,
 				'char_set' => Lang::$txt['lang_character_set'],
 				'default' => Lang::$default == $lang['filename'] || (Lang::$default == '' && $lang['filename'] == 'english'),
 				'locale' => Lang::$txt['lang_locale'],
-				'name' => Utils::ucwords(strtr($lang['filename'], array('_' => ' ', '-utf8' => ''))),
-			);
+				'name' => Utils::ucwords(strtr($lang['filename'], ['_' => ' ', '-utf8' => ''])),
+			];
 		}
 
 		// Work out how many people are using each language.
-		$request = Db::$db->query('', '
-			SELECT lngfile, COUNT(*) AS num_users
+		$request = Db::$db->query(
+			'',
+			'SELECT lngfile, COUNT(*) AS num_users
 			FROM {db_prefix}members
 			GROUP BY lngfile',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Default?
-			if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
+			if (empty($row['lngfile']) || !isset($languages[$row['lngfile']])) {
 				$row['lngfile'] = Lang::$default;
+			}
 
-			if (!isset($languages[$row['lngfile']]) && isset($languages['english']))
-			{
+			if (!isset($languages[$row['lngfile']]) && isset($languages['english'])) {
 				$languages['english']['count'] += $row['num_users'];
-			}
-			elseif (isset($languages[$row['lngfile']]))
-			{
+			} elseif (isset($languages[$row['lngfile']])) {
 				$languages[$row['lngfile']]['count'] += $row['num_users'];
 			}
 		}
@@ -1764,8 +1660,9 @@ public static function addLanguage(): void
 	 */
 	public static function modifyLanguageSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -1808,16 +1705,17 @@ protected function __construct()
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['language_configuration'],
 			'description' => Lang::$txt['language_description'],
-		);
+		];
 
-		IntegrationHook::call('integrate_manage_languages', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_languages', [&self::$subactions]);
 
 		// By default we're managing languages.
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		Utils::$context['sub_action'] = $this->subaction;
 	}
@@ -1836,27 +1734,24 @@ protected function cleanLangString($string, $to_display = true)
 		// If going to display we make sure it doesn't have any HTML in it - etc.
 		$new_string = '';
 
-		if ($to_display)
-		{
+		if ($to_display) {
 			// Are we in a string (0 = no, 1 = single quote, 2 = parsed)
 			$in_string = 0;
 			$is_escape = false;
 
-			for ($i = 0; $i < strlen($string); $i++)
-			{
+			for ($i = 0; $i < strlen($string); $i++) {
 				// Handle escapes first.
-				if ($string[$i] == '\\')
-				{
+				if ($string[$i] == '\\') {
 					// Toggle the escape.
 					$is_escape = !$is_escape;
 
 					// If we're now escaped don't add this string.
-					if ($is_escape)
+					if ($is_escape) {
 						continue;
+					}
 				}
 				// Special case - parsed string with line break etc?
-				elseif (($string[$i] == 'n' || $string[$i] == 't') && $in_string == 2 && $is_escape)
-				{
+				elseif (($string[$i] == 'n' || $string[$i] == 't') && $in_string == 2 && $is_escape) {
 					// Put the escape back...
 					$new_string .= $string[$i] == 'n' ? "\n" : "\t";
 					$is_escape = false;
@@ -1864,19 +1759,15 @@ protected function cleanLangString($string, $to_display = true)
 					continue;
 				}
 				// Have we got a single quote?
-				elseif ($string[$i] == '\'')
-				{
+				elseif ($string[$i] == '\'') {
 					// Already in a parsed string, or escaped in a linear string, means we print it - otherwise something special.
-					if ($in_string != 2 && ($in_string != 1 || !$is_escape))
-					{
+					if ($in_string != 2 && ($in_string != 1 || !$is_escape)) {
 						// Is it the end of a single quote string?
-						if ($in_string == 1)
-						{
+						if ($in_string == 1) {
 							$in_string = 0;
 						}
 						// Otherwise it's the start!
-						else
-						{
+						else {
 							$in_string = 1;
 						}
 
@@ -1885,19 +1776,15 @@ protected function cleanLangString($string, $to_display = true)
 					}
 				}
 				// Otherwise a double quote?
-				elseif ($string[$i] == '"')
-				{
+				elseif ($string[$i] == '"') {
 					// Already in a single quote string, or escaped in a parsed string, means we print it - otherwise something special.
-					if ($in_string != 1 && ($in_string != 2 || !$is_escape))
-					{
+					if ($in_string != 1 && ($in_string != 2 || !$is_escape)) {
 						// Is it the end of a double quote string?
-						if ($in_string == 2)
-						{
+						if ($in_string == 2) {
 							$in_string = 0;
 						}
 						// Otherwise it's the start!
-						else
-						{
+						else {
 							$in_string = 2;
 						}
 
@@ -1906,18 +1793,15 @@ protected function cleanLangString($string, $to_display = true)
 					}
 				}
 				// A join/space outside of a string is simply removed.
-				elseif ($in_string == 0 && (empty($string[$i]) || $string[$i] == '.'))
-				{
+				elseif ($in_string == 0 && (empty($string[$i]) || $string[$i] == '.')) {
 					continue;
 				}
 				// Start of a variable?
-				elseif ($in_string == 0 && $string[$i] == '$')
-				{
+				elseif ($in_string == 0 && $string[$i] == '$') {
 					// Find the whole of it!
 					preg_match('~([\$A-Za-z0-9\'\[\]_-]+)~', substr($string, $i), $matches);
 
-					if (!empty($matches[1]))
-					{
+					if (!empty($matches[1])) {
 						// Come up with some pseudo thing to indicate this is a var.
 						$new_string .= '{%' . $matches[1] . '%}';
 
@@ -1928,8 +1812,7 @@ protected function cleanLangString($string, $to_display = true)
 					continue;
 				}
 				// Right, if we're outside of a string we have DANGER, DANGER!
-				elseif ($in_string == 0)
-				{
+				elseif ($in_string == 0) {
 					continue;
 				}
 
@@ -1942,9 +1825,7 @@ protected function cleanLangString($string, $to_display = true)
 
 			// Unhtml then rehtml the whole thing!
 			$new_string = Utils::htmlspecialchars(Utils::htmlspecialcharsDecode($new_string));
-		}
-		else
-		{
+		} else {
 			$string = Utils::normalize($string);
 
 			// Keep track of what we're doing...
@@ -1953,36 +1834,28 @@ protected function cleanLangString($string, $to_display = true)
 			// This is for deciding whether to HTML a quote.
 			$in_html = false;
 
-			for ($i = 0; $i < strlen($string); $i++)
-			{
+			for ($i = 0; $i < strlen($string); $i++) {
 				// We don't do parsed strings apart from for breaks.
-				if ($in_string == 2)
-				{
+				if ($in_string == 2) {
 					$in_string = 0;
 					$new_string .= '"';
 				}
 
 				// Not in a string yet?
-				if ($in_string != 1)
-				{
+				if ($in_string != 1) {
 					$in_string = 1;
 					$new_string .= ($new_string ? ' . ' : '') . '\'';
 				}
 
 				// Is this a variable?
-				if ($string[$i] == '{' && $string[$i + 1] == '%' && $string[$i + 2] == '$')
-				{
+				if ($string[$i] == '{' && $string[$i + 1] == '%' && $string[$i + 2] == '$') {
 					// Grab the variable.
 					preg_match('~\{%([\$A-Za-z0-9\'\[\]_-]+)%\}~', substr($string, $i), $matches);
 
-					if (!empty($matches[1]))
-					{
-						if ($in_string == 1)
-						{
+					if (!empty($matches[1])) {
+						if ($in_string == 1) {
 							$new_string .= '\' . ';
-						}
-						elseif ($new_string)
-						{
+						} elseif ($new_string) {
 							$new_string .= ' . ';
 						}
 
@@ -1993,54 +1866,49 @@ protected function cleanLangString($string, $to_display = true)
 
 					continue;
 				}
+
 				// Is this a lt sign?
-				elseif ($string[$i] == '<')
-				{
+				if ($string[$i] == '<') {
 					// Probably HTML?
-					if ($string[$i + 1] != ' ')
-					{
+					if ($string[$i + 1] != ' ') {
 						$in_html = true;
 					}
 					// Assume we need an entity...
-					else
-					{
+					else {
 						$new_string .= '&lt;';
+
 						continue;
 					}
 				}
 				// What about gt?
-				elseif ($string[$i] == '>')
-				{
+				elseif ($string[$i] == '>') {
 					// Will it be HTML?
-					if ($in_html)
-					{
+					if ($in_html) {
 						$in_html = false;
 					}
 					// Otherwise we need an entity...
-					else
-					{
+					else {
 						$new_string .= '&gt;';
+
 						continue;
 					}
 				}
+
 				// Is it a slash? If so escape it...
-				if ($string[$i] == '\\')
-				{
+				if ($string[$i] == '\\') {
 					$new_string .= '\\';
 				}
 				// The infamous double quote?
-				elseif ($string[$i] == '"')
-				{
+				elseif ($string[$i] == '"') {
 					// If we're in HTML we leave it as a quote - otherwise we entity it.
-					if (!$in_html)
-					{
+					if (!$in_html) {
 						$new_string .= '&quot;';
+
 						continue;
 					}
 				}
 				// A single quote?
-				elseif ($string[$i] == '\'')
-				{
+				elseif ($string[$i] == '\'') {
 					// Must be in a string so escape it.
 					$new_string .= '\\';
 				}
@@ -2050,12 +1918,9 @@ protected function cleanLangString($string, $to_display = true)
 			}
 
 			// If we ended as a string then close it off.
-			if ($in_string == 1)
-			{
+			if ($in_string == 1) {
 				$new_string .= '\'';
-			}
-			elseif ($in_string == 2)
-			{
+			} elseif ($in_string == 2) {
 				$new_string .= '"';
 			}
 		}
@@ -2065,7 +1930,8 @@ protected function cleanLangString($string, $to_display = true)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Languages::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Languages::exportStatic')) {
 	Languages::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Logs.php b/Sources/Actions/Admin/Logs.php
index fa1dce03eb..f409534ce7 100644
--- a/Sources/Actions/Admin/Logs.php
+++ b/Sources/Actions/Admin/Logs.php
@@ -13,9 +13,9 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Moderation\Logs as Modlog;
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -23,7 +23,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Moderation\Logs as Modlog;
 
 /**
  * Dispatcher to show various kinds of logs.
@@ -37,13 +36,11 @@ class Logs implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-			'getConfigVars' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'adminLogs' => 'AdminLogs',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -68,44 +65,44 @@ class Logs implements ActionInterface
 	 *
 	 * Format: 'sa' => array('file', 'function', 'disabled' => 'setting_to_check')
 	 */
-	public static array $subactions = array(
-		'errorlog' => array(
+	public static array $subactions = [
+		'errorlog' => [
 			'',
 			'errorlog',
 			// At runtime, will be set to empty(Config::$modSettings['enableErrorLogging'])
 			'disabled' => 'enableErrorLogging',
-		),
-		'adminlog' => array(
+		],
+		'adminlog' => [
 			'',
 			'adminlog',
 			// At runtime, will be set to empty(Config::$modSettings['adminlog_enabled'])
 			'disabled' => 'adminlog_enabled',
-		),
-		'modlog' => array(
+		],
+		'modlog' => [
 			'',
 			'modlog',
 			// At runtime, will be set to empty(Config::$modSettings['modlog_enabled'])
 			'disabled' => 'modlog_enabled',
-		),
-		'banlog' => array(
+		],
+		'banlog' => [
 			'',
 			'banlog',
-		),
-		'spiderlog' => array(
+		],
+		'spiderlog' => [
 			'',
 			'spiderlog',
 			// At runtime, will be set to empty(Config::$modSettings['spider_mode'])
 			'disabled' => 'spider_mode',
-		),
-		'tasklog' => array(
+		],
+		'tasklog' => [
 			'',
 			'tasklog',
-		),
-		'settings' => array(
+		],
+		'settings' => [
 			'',
 			'settings',
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var array
@@ -116,14 +113,14 @@ class Logs implements ActionInterface
 	 * 'pruning' option is off, use the integrate_prune_settings hook to add it
 	 * to this list.
 	 */
-	public static array $prune_toggle = array(
+	public static array $prune_toggle = [
 		'pruneErrorLog',
 		'pruneModLog',
 		'pruneBanLog',
 		'pruneReportLog',
 		'pruneScheduledTaskLog',
 		'pruneSpiderHitLog',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -147,43 +144,45 @@ class Logs implements ActionInterface
 	public function execute(): void
 	{
 		// Set up some tab stuff.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['logs'],
 			'help' => '',
 			'description' => Lang::$txt['maintain_info'],
-			'tabs' => array(
-				'errorlog' => array(
+			'tabs' => [
+				'errorlog' => [
 					'url' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog;desc',
 					'description' => sprintf(Lang::$txt['errorlog_desc'], Lang::$txt['remove']),
-				),
-				'adminlog' => array(
+				],
+				'adminlog' => [
 					'description' => Lang::$txt['admin_log_desc'],
-				),
-				'modlog' => array(
+				],
+				'modlog' => [
 					'description' => Lang::$txt['moderation_log_desc'],
-				),
-				'banlog' => array(
+				],
+				'banlog' => [
 					'description' => Lang::$txt['ban_log_description'],
-				),
-				'spiderlog' => array(
+				],
+				'spiderlog' => [
 					'description' => Lang::$txt['spider_log_desc'],
-				),
-				'tasklog' => array(
+				],
+				'tasklog' => [
 					'description' => Lang::$txt['scheduled_log_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['log_settings_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		if (!empty(self::$subactions[$this->subaction][0]))
-			require_once(Config::$sourcedir . '/' . self::$subactions[$this->subaction][0]);
+		if (!empty(self::$subactions[$this->subaction][0])) {
+			require_once Config::$sourcedir . '/' . self::$subactions[$this->subaction][0];
+		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction][1]) ? array($this, self::$subactions[$this->subaction][1]) : Utils::getCallable(self::$subactions[$this->subaction][1]);
+		$call = method_exists($this, self::$subactions[$this->subaction][1]) ? [$this, self::$subactions[$this->subaction][1]] : Utils::getCallable(self::$subactions[$this->subaction][1]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -263,34 +262,31 @@ function togglePruned()
 		$("#pruningOptions").click(function() { togglePruned(); });', true);
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Although the UI presents pruningOptions as a checkbox followed by
 			// several input fields, we save all that data as a single string.
 			$config_vars['pruningOptions'][0] = 'text';
 
-			if (!empty($_POST['pruningOptions']))
-			{
-				$vals = array();
+			if (!empty($_POST['pruningOptions'])) {
+				$vals = [];
 
-				foreach ($config_vars as $config_var)
-				{
-					if (!is_array($config_var) || !in_array($config_var[1], self::$prune_toggle))
+				foreach ($config_vars as $config_var) {
+					if (!is_array($config_var) || !in_array($config_var[1], self::$prune_toggle)) {
 						continue;
+					}
 
 					// Just in case a mod did something stupid...
-					if ($config_var[1] === 'pruningOptions')
+					if ($config_var[1] === 'pruningOptions') {
 						continue;
+					}
 
 					$vals[] = max(0, (int) ($_POST[$config_var[1]] ?? 0));
 				}
 
 				$_POST['pruningOptions'] = implode(',', $vals);
-			}
-			else
-			{
+			} else {
 				$_POST['pruningOptions'] = '';
 			}
 
@@ -304,17 +300,16 @@ function togglePruned()
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// Get the actual values
-		if (!empty(Config::$modSettings['pruningOptions']))
-		{
-			foreach (explode(',', Config::$modSettings['pruningOptions']) as $key => $value)
+		if (!empty(Config::$modSettings['pruningOptions'])) {
+			foreach (explode(',', Config::$modSettings['pruningOptions']) as $key => $value) {
 				Config::$modSettings[self::$prune_toggle[$key]] = $value;
-		}
-		else
-		{
-			$defaults = array_pad(array(30, 180, 180, 180, 30, 0), count(self::$prune_toggle), 0);
+			}
+		} else {
+			$defaults = array_pad([30, 180, 180, 180, 30, 0], count(self::$prune_toggle), 0);
 
-			foreach (array_combine(self::$prune_toggle, $defaults) as $setting => $default)
+			foreach (array_combine(self::$prune_toggle, $defaults) as $setting => $default) {
 				Config::$modSettings[$setting] = $default;
+			}
 		}
 
 		ACP::prepareDBSettingContext($config_vars);
@@ -331,8 +326,9 @@ function togglePruned()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -352,55 +348,55 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		$config_vars = array(
-			array('check', 'modlog_enabled', 'help' => 'modlog'),
-			array('check', 'adminlog_enabled', 'help' => 'adminlog'),
-			array('check', 'userlog_enabled', 'help' => 'userlog'),
+		$config_vars = [
+			['check', 'modlog_enabled', 'help' => 'modlog'],
+			['check', 'adminlog_enabled', 'help' => 'adminlog'],
+			['check', 'userlog_enabled', 'help' => 'userlog'],
 
 			// The error log is a wonderful thing.
-			array('title', 'errorlog', 'force_div_id' => 'errorlog'),
-			array('desc', 'error_log_desc'),
-			array('check', 'enableErrorLogging'),
-			array('check', 'enableErrorQueryLogging'),
+			['title', 'errorlog', 'force_div_id' => 'errorlog'],
+			['desc', 'error_log_desc'],
+			['check', 'enableErrorLogging'],
+			['check', 'enableErrorQueryLogging'],
 
 			// The 'mark read' log settings.
-			array('title', 'markread_title', 'force_div_id' => 'markread_title'),
-			array('desc', 'mark_read_desc'),
-			array('int', 'mark_read_beyond', 'step' => 1, 'min' => 0, 'max' => 18000, 'subtext' => Lang::$txt['zero_to_disable']),
-			array('int', 'mark_read_delete_beyond', 'step' => 1, 'min' => 0, 'max' => 18000, 'subtext' => Lang::$txt['zero_to_disable']),
-			array('int', 'mark_read_max_users', 'step' => 1, 'min' => 0, 'max' => 20000, 'subtext' => Lang::$txt['zero_to_disable']),
+			['title', 'markread_title', 'force_div_id' => 'markread_title'],
+			['desc', 'mark_read_desc'],
+			['int', 'mark_read_beyond', 'step' => 1, 'min' => 0, 'max' => 18000, 'subtext' => Lang::$txt['zero_to_disable']],
+			['int', 'mark_read_delete_beyond', 'step' => 1, 'min' => 0, 'max' => 18000, 'subtext' => Lang::$txt['zero_to_disable']],
+			['int', 'mark_read_max_users', 'step' => 1, 'min' => 0, 'max' => 20000, 'subtext' => Lang::$txt['zero_to_disable']],
 
 			// Even do the pruning?
-			array('title', 'pruning_title', 'force_div_id' => 'pruning_title'),
-			array('desc', 'pruning_desc'),
+			['title', 'pruning_title', 'force_div_id' => 'pruning_title'],
+			['desc', 'pruning_desc'],
 
 			// The array indexes are there so we can remove/change them before saving.
-			'pruningOptions' => array('check', 'pruningOptions'),
+			'pruningOptions' => ['check', 'pruningOptions'],
 			'',
 
 			// Various logs that could be pruned.
 
 			// Error log.
-			array('int', 'pruneErrorLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']),
+			['int', 'pruneErrorLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']],
 
 			// Moderation log.
-			array('int', 'pruneModLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']),
+			['int', 'pruneModLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']],
 
 			// Ban hit log.
-			array('int', 'pruneBanLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']),
+			['int', 'pruneBanLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']],
 
 			// Report to moderator log.
-			array('int', 'pruneReportLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']),
+			['int', 'pruneReportLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']],
 
 			// Log of the scheduled tasks and how long they ran.
-			array('int', 'pruneScheduledTaskLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']),
+			['int', 'pruneScheduledTaskLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']],
 
 			// Log recording when search engines have crawled the forum.
-			array('int', 'pruneSpiderHitLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']),
-		);
+			['int', 'pruneSpiderHitLog', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['zero_to_disable']],
+		];
 
 		// MOD AUTHORS: If you want to add your own logs, use this hook.
-		IntegrationHook::call('integrate_prune_settings', array(&$config_vars, &self::$prune_toggle, false));
+		IntegrationHook::call('integrate_prune_settings', [&$config_vars, &self::$prune_toggle, false]);
 
 		return $config_vars;
 	}
@@ -413,8 +409,9 @@ public static function getConfigVars(): array
 	 */
 	public static function adminLogs($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->execute();
@@ -429,24 +426,26 @@ public static function adminLogs($return_config = false)
 	 */
 	protected function __construct()
 	{
-		foreach (self::$subactions as &$subaction)
-		{
-			if (isset($subaction['disabled']))
+		foreach (self::$subactions as &$subaction) {
+			if (isset($subaction['disabled'])) {
 				$subaction['disabled'] = empty(Config::$modSettings[$subaction['disabled']]);
+			}
 		}
 
-		IntegrationHook::call('integrate_manage_logs', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_logs', [&self::$subactions]);
 
 		// By default, error log should be shown in descending order.
-		if (!isset($_REQUEST['sa']))
+		if (!isset($_REQUEST['sa'])) {
 			$_REQUEST['desc'] = true;
+		}
 
-		$this->subaction = isset($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]) && empty(self::$subactions[$_REQUEST['sa']]['disabled']) ? $_REQUEST['sa'] : 'errorlog';
+		$this->subaction = isset($_REQUEST['sa'], self::$subactions[$_REQUEST['sa']])   && empty(self::$subactions[$_REQUEST['sa']]['disabled']) ? $_REQUEST['sa'] : 'errorlog';
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Logs::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Logs::exportStatic')) {
 	Logs::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Mail.php b/Sources/Actions/Admin/Mail.php
index 0005c68c10..6876ea6f77 100644
--- a/Sources/Actions/Admin/Mail.php
+++ b/Sources/Actions/Admin/Mail.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
@@ -24,7 +24,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles mail configuration, as well as reviewing the mail queue.
@@ -38,13 +37,18 @@ class Mail implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageMail',
-			'getConfigVars' => false,
-		),
-	);
+			'list_getMailQueue' => 'list_getMailQueue',
+			'list_getMailQueueSize' => 'list_getMailQueueSize',
+			'timeSince' => 'timeSince',
+			'browseMailQueue' => 'BrowseMailQueue',
+			'clearMailQueue' => 'ClearMailQueue',
+			'modifyMailSettings' => 'ModifyMailSettings',
+			'testMailSend' => 'TestMailSend',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -67,12 +71,12 @@ class Mail implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'browse' => 'browse',
 		'clear' => 'clear',
 		'settings' => 'settings',
 		'test' => 'test',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -84,7 +88,7 @@ class Mail implements ActionInterface
 	 * Processed version of Lang::$txtBirthdayEmails.
 	 * This is used internally by the settings() method.
 	 */
-	protected static array $processedBirthdayEmails = array();
+	protected static array $processedBirthdayEmails = [];
 
 	/****************************
 	 * Internal static properties
@@ -107,10 +111,11 @@ class Mail implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -119,145 +124,142 @@ public function execute(): void
 	public function browse(): void
 	{
 		// First, are we deleting something from the queue?
-		if (isset($_REQUEST['delete']))
-		{
+		if (isset($_REQUEST['delete'])) {
 			User::$me->checkSession();
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}mail_queue
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}mail_queue
 				WHERE id_mail IN ({array_int:mail_ids})',
-				array(
+				[
 					'mail_ids' => $_REQUEST['delete'],
-				)
+				],
 			);
 		}
 
 		// How many items do we have?
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS queue_size, MIN(time_sent) AS oldest
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS queue_size, MIN(time_sent) AS oldest
 			FROM {db_prefix}mail_queue',
-			array(
-			)
+			[
+			],
 		);
-		list ($mailQueueSize, $mailOldest) = Db::$db->fetch_row($request);
+		list($mailQueueSize, $mailOldest) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		Utils::$context['oldest_mail'] = empty($mailOldest) ? Lang::$txt['mailqueue_oldest_not_available'] : self::timeSince(time() - $mailOldest);
 		Utils::$context['mail_queue_size'] = Lang::numberFormat($mailQueueSize);
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'mail_queue',
 			'title' => Lang::$txt['mailqueue_browse'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=mailqueue',
 			'default_sort_col' => 'age',
 			'no_items_label' => Lang::$txt['mailqueue_no_items'],
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getMailQueue',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getMailQueueSize',
-			),
-			'columns' => array(
-				'subject' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'subject' => [
+					'header' => [
 						'value' => Lang::$txt['mailqueue_subject'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return Utils::entityStrlen($rowData['subject']) > 50 ? sprintf('%1$s...', Utils::htmlspecialchars(Utils::entitySubstr($rowData['subject'], 0, 47))) : Utils::htmlspecialchars($rowData['subject']);
 						},
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'subject',
 						'reverse' => 'subject DESC',
-					),
-				),
-				'recipient' => array(
-					'header' => array(
+					],
+				],
+				'recipient' => [
+					'header' => [
 						'value' => Lang::$txt['mailqueue_recipient'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="mailto:%1$s">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'recipient' => true,
-							),
-						),
+							],
+						],
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'recipient',
 						'reverse' => 'recipient DESC',
-					),
-				),
-				'priority' => array(
-					'header' => array(
+					],
+				],
+				'priority' => [
+					'header' => [
 						'value' => Lang::$txt['mailqueue_priority'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// We probably have a text label with your priority.
 							$txtKey = sprintf('mq_mpriority_%1$s', $rowData['priority']);
 
 							// But if not, revert to priority 0.
-							return isset(Lang::$txt[$txtKey]) ? Lang::$txt[$txtKey] : Lang::$txt['mq_mpriority_1'];
+							return Lang::$txt[$txtKey] ?? Lang::$txt['mq_mpriority_1'];
 						},
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'priority',
 						'reverse' => 'priority DESC',
-					),
-				),
-				'age' => array(
-					'header' => array(
+					],
+				],
+				'age' => [
+					'header' => [
 						'value' => Lang::$txt['mailqueue_age'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return self::timeSince(time() - $rowData['time_sent']);
 						},
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'time_sent',
 						'reverse' => 'time_sent DESC',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="checkbox" name="delete[]" value="' . $rowData['id_mail'] . '">';
 						},
 						'class' => 'smalltext',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=mailqueue',
 				'include_start' => true,
 				'include_sort' => true,
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'top_of_list',
 					'value' => '<input type="submit" name="delete_redirects" value="' . Lang::$txt['quickmod_delete_selected'] . '" data-confirm="' . Lang::$txt['quickmod_confirm'] . '" class="button you_sure"><a class="button you_sure" href="' . Config::$scripturl . '?action=admin;area=mailqueue;sa=clear;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" data-confirm="' . Lang::$txt['mailqueue_clear_list_warning'] . '">' . Lang::$txt['mailqueue_clear_list'] . '</a> ',
-				),
-				array(
+				],
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="submit" name="delete_redirects" value="' . Lang::$txt['quickmod_delete_selected'] . '" data-confirm="' . Lang::$txt['quickmod_confirm'] . '" class="button you_sure"><a class="button you_sure" href="' . Config::$scripturl . '?action=admin;area=mailqueue;sa=clear;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" data-confirm="' . Lang::$txt['mailqueue_clear_list_warning'] . '">' . Lang::$txt['mailqueue_clear_list'] . '</a> ',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
@@ -273,11 +275,9 @@ public function settings(): void
 		$config_vars = self::getConfigVars();
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			// Make the SMTP password a little harder to see in a backup etc.
-			if (!empty($_POST['smtp_password'][1]))
-			{
+			if (!empty($_POST['smtp_password'][1])) {
 				$_POST['smtp_password'][0] = base64_encode($_POST['smtp_password'][0]);
 				$_POST['smtp_password'][1] = base64_encode($_POST['smtp_password'][1]);
 			}
@@ -303,8 +303,8 @@ public function settings(): void
 			var bDay = {';
 
 		$i = 0;
-		foreach (self::$processedBirthdayEmails as $index => $email)
-		{
+
+		foreach (self::$processedBirthdayEmails as $index => $email) {
 			$is_last = ++$i == count(self::$processedBirthdayEmails);
 
 			Utils::$context['settings_insert_above'] .= '
@@ -333,28 +333,25 @@ public function clear(): void
 		User::$me->checkSession('get');
 
 		// If we don't yet have the total to clear, find it.
-		if (!isset($_GET['te']))
-		{
+		if (!isset($_GET['te'])) {
 			// How many items do we have?
-			$request = Db::$db->query('', '
-				SELECT COUNT(*) AS queue_size
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*) AS queue_size
 				FROM {db_prefix}mail_queue',
-				array(
-				)
+				[
+				],
 			);
-			list ($_GET['te']) = Db::$db->fetch_row($request);
+			list($_GET['te']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
-		}
-		else
-		{
+		} else {
 			$_GET['te'] = (int) $_GET['te'];
 		}
 
 		$_GET['sent'] = isset($_GET['sent']) ? (int) $_GET['sent'] : 0;
 
 		// Send 50 at a time, then go for a break...
-		while (\SMF\Mail::reduceQueue(50, true, true) === true)
-		{
+		while (\SMF\Mail::reduceQueue(50, true, true) === true) {
 			// Sent another 50.
 			$_GET['sent'] += 50;
 			$this->pauseMailQueueClear();
@@ -375,8 +372,7 @@ public function test(): void
 		Utils::$context['post_url'] = Utils::$context['base_url'] . ';save';
 
 		// Sending the test message now.
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			// Send to the current user, no options.
 			$to = User::$me->email;
 			$subject = Utils::htmlspecialchars($_POST['subject']);
@@ -387,8 +383,7 @@ public function test(): void
 		}
 
 		// The result.
-		if (isset($_GET['result']))
-		{
+		if (isset($_GET['result'])) {
 			Utils::$context['result'] = ($_GET['result'] == 'success' ? 'success' : 'failure');
 		}
 	}
@@ -404,8 +399,9 @@ public function test(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -430,38 +426,38 @@ public static function getConfigVars(): array
 		$body = Lang::$txtBirthdayEmails[(empty(Config::$modSettings['birthday_email']) ? 'happy_birthday' : Config::$modSettings['birthday_email']) . '_body'];
 		$subject = Lang::$txtBirthdayEmails[(empty(Config::$modSettings['birthday_email']) ? 'happy_birthday' : Config::$modSettings['birthday_email']) . '_subject'];
 
-		$emails = array();
+		$emails = [];
 
-		foreach (Lang::$txtBirthdayEmails as $key => $value)
-		{
+		foreach (Lang::$txtBirthdayEmails as $key => $value) {
 			$index = substr($key, 0, strrpos($key, '_'));
 			$element = substr($key, strrpos($key, '_') + 1);
 			self::$processedBirthdayEmails[$index][$element] = $value;
 		}
 
-		foreach (self::$processedBirthdayEmails as $index => $dummy)
+		foreach (self::$processedBirthdayEmails as $index => $dummy) {
 			$emails[$index] = $index;
+		}
 
-		$config_vars = array(
+		$config_vars = [
 			// Mail queue stuff, this rocks ;)
-			array('int', 'mail_limit', 'subtext' => Lang::$txt['zero_to_disable']),
-			array('int', 'mail_quantity'),
+			['int', 'mail_limit', 'subtext' => Lang::$txt['zero_to_disable']],
+			['int', 'mail_quantity'],
 			'',
 
 			// SMTP stuff.
-			array('select', 'mail_type', array(Lang::$txt['mail_type_default'], 'SMTP', 'SMTP - STARTTLS')),
-			array('text', 'smtp_host'),
-			array('text', 'smtp_port'),
-			array('text', 'smtp_username'),
-			array('password', 'smtp_password'),
+			['select', 'mail_type', [Lang::$txt['mail_type_default'], 'SMTP', 'SMTP - STARTTLS']],
+			['text', 'smtp_host'],
+			['text', 'smtp_port'],
+			['text', 'smtp_username'],
+			['password', 'smtp_password'],
 			'',
 
-			array('select', 'birthday_email', $emails, 'value' => array('subject' => $subject, 'body' => $body), 'javascript' => 'onchange="fetch_birthday_preview()"'),
-			'birthday_subject' => array('var_message', 'birthday_subject', 'var_message' => self::$processedBirthdayEmails[empty(Config::$modSettings['birthday_email']) ? 'happy_birthday' : Config::$modSettings['birthday_email']]['subject'], 'disabled' => true, 'size' => strlen($subject) + 3),
-			'birthday_body' => array('var_message', 'birthday_body', 'var_message' => nl2br($body), 'disabled' => true, 'size' => ceil(strlen($body) / 25)),
-		);
+			['select', 'birthday_email', $emails, 'value' => ['subject' => $subject, 'body' => $body], 'javascript' => 'onchange="fetch_birthday_preview()"'],
+			'birthday_subject' => ['var_message', 'birthday_subject', 'var_message' => self::$processedBirthdayEmails[empty(Config::$modSettings['birthday_email']) ? 'happy_birthday' : Config::$modSettings['birthday_email']]['subject'], 'disabled' => true, 'size' => strlen($subject) + 3],
+			'birthday_body' => ['var_message', 'birthday_body', 'var_message' => nl2br($body), 'disabled' => true, 'size' => ceil(strlen($body) / 25)],
+		];
 
-		IntegrationHook::call('integrate_modify_mail_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_mail_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -477,29 +473,27 @@ public static function getConfigVars(): array
 	 */
 	public static function list_getMailQueue($start, $items_per_page, $sort): array
 	{
-		$mails = array();
+		$mails = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				id_mail, time_sent, recipient, priority, private, subject
 			FROM {db_prefix}mail_queue
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items_per_page}',
-			array(
+			[
 				'start' => $start,
 				'sort' => $sort,
 				'items_per_page' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Private PM/email subjects and similar shouldn't be shown in the mailbox area.
-			if (!empty($row['private']))
-			{
+			if (!empty($row['private'])) {
 				$row['subject'] = Lang::$txt['personal_message'];
-			}
-			else
-			{
+			} else {
 				$row['subject'] = mb_decode_mimeheader($row['subject']);
 			}
 
@@ -519,13 +513,14 @@ public static function list_getMailQueue($start, $items_per_page, $sort): array
 	public static function list_getMailQueueSize(): int
 	{
 		// How many items do we have?
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS queue_size
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS queue_size
 			FROM {db_prefix}mail_queue',
-			array(
-			)
+			[
+			],
 		);
-		list ($mailQueueSize) = Db::$db->fetch_row($request);
+		list($mailQueueSize) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $mailQueueSize;
@@ -539,27 +534,28 @@ public static function list_getMailQueueSize(): int
 	 */
 	public static function timeSince($time_diff): string
 	{
-		if ($time_diff < 0)
+		if ($time_diff < 0) {
 			$time_diff = 0;
+		}
 
 		// Just do a bit of an if fest...
-		if ($time_diff > 86400)
-		{
+		if ($time_diff > 86400) {
 			$days = round($time_diff / 86400, 1);
+
 			return sprintf($days == 1 ? Lang::$txt['mq_day'] : Lang::$txt['mq_days'], $time_diff / 86400);
 		}
 
 		// Hours?
-		if ($time_diff > 3600)
-		{
+		if ($time_diff > 3600) {
 			$hours = round($time_diff / 3600, 1);
+
 			return sprintf($hours == 1 ? Lang::$txt['mq_hour'] : Lang::$txt['mq_hours'], $hours);
 		}
 
 		// Minutes?
-		if ($time_diff > 60)
-		{
+		if ($time_diff > 60) {
 			$minutes = (int) ($time_diff / 60);
+
 			return sprintf($minutes == 1 ? Lang::$txt['mq_minute'] : Lang::$txt['mq_minutes'], $minutes);
 		}
 
@@ -592,8 +588,9 @@ public static function clearMailQueue(): void
 	 */
 	public static function modifyMailSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -628,19 +625,20 @@ protected function __construct()
 		Utils::$context['page_title'] = Lang::$txt['mailqueue_title'];
 		Utils::$context['sub_template'] = 'show_settings';
 
-		IntegrationHook::call('integrate_manage_mail', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_mail', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		Utils::$context['sub_action'] = $this->subaction;
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['mailqueue_title'],
 			'help' => '',
 			'description' => Lang::$txt['mailqueue_desc'],
-		);
+		];
 	}
 
 	/**
@@ -651,12 +649,14 @@ protected function pauseMailQueueClear(): void
 		// Try get more time...
 		@set_time_limit(600);
 
-		if (function_exists('apache_reset_timeout'))
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		// Have we already used our maximum time?
-		if ((time() - TIME_START) < 5)
+		if ((time() - TIME_START) < 5) {
 			return;
+		}
 
 		Utils::$context['continue_get_data'] = '?action=admin;area=mailqueue;sa=clear;te=' . $_GET['te'] . ';sent=' . $_GET['sent'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 		Utils::$context['page_title'] = Lang::$txt['not_done_title'];
@@ -678,7 +678,8 @@ protected function pauseMailQueueClear(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Mail::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Mail::exportStatic')) {
 	Mail::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Maintenance.php b/Sources/Actions/Admin/Maintenance.php
index da4aedee02..3986cc9baf 100644
--- a/Sources/Actions/Admin/Maintenance.php
+++ b/Sources/Actions/Admin/Maintenance.php
@@ -13,11 +13,13 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\TopicRemove;
+use SMF\BackwardCompatibility;
+use SMF\Cache\CacheApi;
 use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Draft;
 use SMF\ErrorHandler;
 use SMF\Group;
@@ -32,9 +34,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\TopicRemove;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Forum maintenance. Important stuff.
@@ -48,12 +47,33 @@ class Maintenance implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageMaintenance',
-		),
-	);
+			'getIntegrationHooksData' => 'getIntegrationHooksData',
+			'reattributePosts' => 'reattributePosts',
+			'maintainRoutine' => 'MaintainRoutine',
+			'maintainDatabase' => 'MaintainDatabase',
+			'maintainMembers' => 'MaintainMembers',
+			'maintainTopics' => 'MaintainTopics',
+			'list_integration_hooks' => 'list_integration_hooks',
+			'versionDetail' => 'VersionDetail',
+			'maintainFindFixErrors' => 'MaintainFindFixErrors',
+			'adminBoardRecount' => 'AdminBoardRecount',
+			'rebuildSettingsFile' => 'RebuildSettingsFile',
+			'maintainEmptyUnimportantLogs' => 'MaintainEmptyUnimportantLogs',
+			'maintainCleanCache' => 'MaintainCleanCache',
+			'optimizeTables' => 'OptimizeTables',
+			'convertEntities' => 'ConvertEntities',
+			'convertMsgBody' => 'ConvertMsgBody',
+			'maintainReattributePosts' => 'MaintainReattributePosts',
+			'maintainPurgeInactiveMembers' => 'MaintainPurgeInactiveMembers',
+			'maintainRecountPosts' => 'MaintainRecountPosts',
+			'maintainMassMoveTopics' => 'MaintainMassMoveTopics',
+			'maintainRemoveOldPosts' => 'MaintainRemoveOldPosts',
+			'maintainRemoveOldDrafts' => 'MaintainRemoveOldDrafts',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -90,54 +110,54 @@ class Maintenance implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
-		'routine' => array(
+	public static array $subactions = [
+		'routine' => [
 			'function' => 'routine',
 			'template' => 'maintain_routine',
-			'activities' => array(
+			'activities' => [
 				'version' => 'version',
 				'repair' => 'repair',
 				'recount' => 'recountBoards',
 				'rebuild_settings' => 'rebuildSettings',
 				'logs' => 'emptyLogs',
 				'cleancache' => 'cleanCache',
-			),
-		),
-		'database' => array(
+			],
+		],
+		'database' => [
 			'function' => 'database',
 			'template' => 'maintain_database',
-			'activities' => array(
+			'activities' => [
 				'optimize' => 'optimize',
 				'convertentities' => 'entitiesToUnicode',
 				'convertmsgbody' => 'changeMsgBodyLength',
-			),
-		),
-		'members' => array(
+			],
+		],
+		'members' => [
 			'function' => 'members',
 			'template' => 'maintain_members',
-			'activities' => array(
+			'activities' => [
 				'reattribute' => 'reattribute',
 				'purgeinactive' => 'purgeInactiveMembers',
 				'recountposts' => 'recountPosts',
-			),
-		),
-		'topics' => array(
+			],
+		],
+		'topics' => [
 			'function' => 'topics',
 			'template' => 'maintain_topics',
-			'activities' => array(
+			'activities' => [
 				'massmove' => 'massMove',
 				'pruneold' => 'prunePosts',
 				'olddrafts' => 'pruneDrafts',
-			),
-		),
-		'hooks' => array(
+			],
+		],
+		'hooks' => [
 			'function' => 'hooks',
-		),
-		'destroy' => array(
+		],
+		'destroy' => [
 			'function' => 'destroy',
-			'activities' => array(),
-		),
-	);
+			'activities' => [],
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -166,18 +186,19 @@ class Maintenance implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]['function']) ? array($this, self::$subactions[$this->subaction]['function']) : Utils::getCallable(self::$subactions[$this->subaction]['function']);
+		$call = method_exists($this, self::$subactions[$this->subaction]['function']) ? [$this, self::$subactions[$this->subaction]['function']] : Utils::getCallable(self::$subactions[$this->subaction]['function']);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 
 		// Any special activity?
-		if (!empty($this->activity))
-		{
-			$call = method_exists($this, self::$subactions[$this->subaction]['activities'][$this->activity]) ? array($this, self::$subactions[$this->subaction]['activities'][$this->activity]) : Utils::getCallable(self::$subactions[$this->subaction]['activities'][$this->activity]);
+		if (!empty($this->activity)) {
+			$call = method_exists($this, self::$subactions[$this->subaction]['activities'][$this->activity]) ? [$this, self::$subactions[$this->subaction]['activities'][$this->activity]] : Utils::getCallable(self::$subactions[$this->subaction]['activities'][$this->activity]);
 
-			if (!empty($call))
+			if (!empty($call)) {
 				call_user_func($call);
+			}
 		}
 
 		// Create a maintenance token.  Kinda hard to do it any other way.
@@ -189,8 +210,7 @@ public function execute(): void
 	 */
 	public function routine(): void
 	{
-		if (isset($_GET['done']) && in_array($_GET['done'], array('recount', 'rebuild_settings')))
-		{
+		if (isset($_GET['done']) && in_array($_GET['done'], ['recount', 'rebuild_settings'])) {
 			Utils::$context['maintenance_finished'] = Lang::$txt['maintain_' . $_GET['done']];
 		}
 	}
@@ -203,14 +223,13 @@ public function database(): void
 		// Show some conversion options?
 		Utils::$context['convert_entities'] = isset(Config::$modSettings['global_character_set']) && Config::$modSettings['global_character_set'] === 'UTF-8';
 
-		if (Config::$db_type == 'mysql')
-		{
+		if (Config::$db_type == 'mysql') {
 			$colData = Db::$db->list_columns('{db_prefix}messages', true);
 
-			foreach ($colData as $column)
-			{
-				if ($column['name'] == 'body')
+			foreach ($colData as $column) {
+				if ($column['name'] == 'body') {
 					$body_type = $column['type'];
+				}
 			}
 
 			Utils::$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
@@ -218,8 +237,7 @@ public function database(): void
 			Utils::$context['convert_to_suggest'] = ($body_type != 'text' && !empty(Config::$modSettings['max_messageLength']) && Config::$modSettings['max_messageLength'] < 65536);
 		}
 
-		if (isset($_GET['done']) && $_GET['done'] == 'convertentities')
-		{
+		if (isset($_GET['done']) && $_GET['done'] == 'convertentities') {
 			Utils::$context['maintenance_finished'] = Lang::$txt['entity_convert_title'];
 		}
 	}
@@ -231,16 +249,15 @@ public function members(): void
 	{
 		// Get membergroups - for deleting members and the like.
 		Utils::$context['membergroups'] = array_merge(
-			array(new Group(Group::REGULAR, array('name' => Lang::$txt['maintain_members_ungrouped']))),
+			[new Group(Group::REGULAR, ['name' => Lang::$txt['maintain_members_ungrouped']])],
 			Group::load(),
 		);
 
-		if (isset($_GET['done']) && $_GET['done'] == 'recountposts')
-		{
+		if (isset($_GET['done']) && $_GET['done'] == 'recountposts') {
 			Utils::$context['maintenance_finished'] = Lang::$txt['maintain_recountposts'];
 		}
 
-		Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 	}
 
 	/**
@@ -249,44 +266,41 @@ public function members(): void
 	public function topics(): void
 	{
 		// Let's load up the boards in case they are useful.
-		Utils::$context['categories'] = array();
+		Utils::$context['categories'] = [];
 
-		$result = Db::$db->query('order_by_board_order', '
-			SELECT b.id_board, b.name, b.child_level, c.name AS cat_name, c.id_cat
+		$result = Db::$db->query(
+			'order_by_board_order',
+			'SELECT b.id_board, b.name, b.child_level, c.name AS cat_name, c.id_cat
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 			WHERE {query_see_board}
 				AND redirect = {string:blank_redirect}',
-			array(
+			[
 				'blank_redirect' => '',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			if (!isset(Utils::$context['categories'][$row['id_cat']]))
-			{
-				Utils::$context['categories'][$row['id_cat']] = array(
+
+		while ($row = Db::$db->fetch_assoc($result)) {
+			if (!isset(Utils::$context['categories'][$row['id_cat']])) {
+				Utils::$context['categories'][$row['id_cat']] = [
 					'name' => $row['cat_name'],
-					'boards' => array()
-				);
+					'boards' => [],
+				];
 			}
 
-			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
+			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = [
 				'id' => $row['id_board'],
 				'name' => $row['name'],
-				'child_level' => $row['child_level']
-			);
+				'child_level' => $row['child_level'],
+			];
 		}
 		Db::$db->free_result($result);
 
 		Category::sort(Utils::$context['categories']);
 
-		if (isset($_GET['done']) && $_GET['done'] == 'purgeold')
-		{
+		if (isset($_GET['done']) && $_GET['done'] == 'purgeold') {
 			Utils::$context['maintenance_finished'] = Lang::$txt['maintain_old'];
-		}
-		elseif (isset($_GET['done']) && $_GET['done'] == 'massmove')
-		{
+		} elseif (isset($_GET['done']) && $_GET['done'] == 'massmove') {
 			Utils::$context['maintenance_finished'] = Lang::$txt['move_topics_maintenance'];
 		}
 	}
@@ -321,23 +335,23 @@ public function version(): void
 		User::$me->isAllowedTo('admin_forum');
 
 		// Call the function that'll get all the version info we need.
-		$versionOptions = array(
+		$versionOptions = [
 			'include_ssi' => true,
 			'include_subscriptions' => true,
 			'include_tasks' => true,
 			'sort_results' => true,
-		);
+		];
 		$version_info = ACP::getFileVersions($versionOptions);
 
 		// Add the new info to the template context.
-		Utils::$context += array(
+		Utils::$context += [
 			'file_versions' => $version_info['file_versions'],
 			'default_template_versions' => $version_info['default_template_versions'],
 			'template_versions' => $version_info['template_versions'],
 			'default_language_versions' => $version_info['default_language_versions'],
 			'default_known_languages' => array_keys($version_info['default_language_versions']),
 			'tasks_versions' => $version_info['tasks_versions'],
-		);
+		];
 
 		// Make it easier to manage for the template.
 		Utils::$context['forum_version'] = SMF_FULL_VERSION;
@@ -392,31 +406,33 @@ public function recountBoards(): void
 		@set_time_limit(600);
 
 		// Step the number of topics at a time so things don't time out...
-		$request = Db::$db->query('', '
-			SELECT MAX(id_topic)
+		$request = Db::$db->query(
+			'',
+			'SELECT MAX(id_topic)
 			FROM {db_prefix}topics',
-			array(
-			)
+			[
+			],
 		);
-		list ($max_topics) = Db::$db->fetch_row($request);
+		list($max_topics) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		$increment = min(max(50, ceil($max_topics / 4)), 2000);
-		if (empty($_REQUEST['start']))
+
+		if (empty($_REQUEST['start'])) {
 			$_REQUEST['start'] = 0;
+		}
 
 		$total_steps = 8;
 
 		// Get each topic with a wrong reply count and fix it - let's just do some at a time, though.
-		if (empty($_REQUEST['step']))
-		{
+		if (empty($_REQUEST['step'])) {
 			$_REQUEST['step'] = 0;
 
-			while ($_REQUEST['start'] < $max_topics)
-			{
+			while ($_REQUEST['start'] < $max_topics) {
 				// Recount approved messages
-				$request = Db::$db->query('', '
-					SELECT t.id_topic, MAX(t.num_replies) AS num_replies,
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_topic, MAX(t.num_replies) AS num_replies,
 						GREATEST(COUNT(ma.id_msg) - 1, 0) AS real_num_replies
 					FROM {db_prefix}topics AS t
 						LEFT JOIN {db_prefix}messages AS ma ON (ma.id_topic = t.id_topic AND ma.approved = {int:is_approved})
@@ -424,27 +440,31 @@ public function recountBoards(): void
 						AND t.id_topic <= {int:max_id}
 					GROUP BY t.id_topic
 					HAVING GREATEST(COUNT(ma.id_msg) - 1, 0) != MAX(t.num_replies)',
-					array(
+					[
 						'is_approved' => 1,
 						'start' => $_REQUEST['start'],
 						'max_id' => $_REQUEST['start'] + $increment,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-					Db::$db->query('', '
-						UPDATE {db_prefix}topics
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}topics
 						SET num_replies = {int:num_replies}
 						WHERE id_topic = {int:id_topic}',
-						array(
+						[
 							'num_replies' => $row['real_num_replies'],
 							'id_topic' => $row['id_topic'],
-						)
+						],
 					);
+				}
 				Db::$db->free_result($request);
 
 				// Recount unapproved messages
-				$request = Db::$db->query('', '
-					SELECT t.id_topic, MAX(t.unapproved_posts) AS unapproved_posts,
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_topic, MAX(t.unapproved_posts) AS unapproved_posts,
 						COUNT(mu.id_msg) AS real_unapproved_posts
 					FROM {db_prefix}topics AS t
 						LEFT JOIN {db_prefix}messages AS mu ON (mu.id_topic = t.id_topic AND mu.approved = {int:not_approved})
@@ -452,28 +472,30 @@ public function recountBoards(): void
 						AND t.id_topic <= {int:max_id}
 					GROUP BY t.id_topic
 					HAVING COUNT(mu.id_msg) != MAX(t.unapproved_posts)',
-					array(
+					[
 						'not_approved' => 0,
 						'start' => $_REQUEST['start'],
 						'max_id' => $_REQUEST['start'] + $increment,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-					Db::$db->query('', '
-						UPDATE {db_prefix}topics
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}topics
 						SET unapproved_posts = {int:unapproved_posts}
 						WHERE id_topic = {int:id_topic}',
-						array(
+						[
 							'unapproved_posts' => $row['real_unapproved_posts'],
 							'id_topic' => $row['id_topic'],
-						)
+						],
 					);
+				}
 				Db::$db->free_result($request);
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=0;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					Utils::$context['continue_percent'] = round((100 * $_REQUEST['start'] / $max_topics) / $total_steps);
 
@@ -485,50 +507,53 @@ public function recountBoards(): void
 		}
 
 		// Update the post count of each board.
-		if ($_REQUEST['step'] <= 1)
-		{
-			if (empty($_REQUEST['start']))
-				Db::$db->query('', '
-					UPDATE {db_prefix}boards
+		if ($_REQUEST['step'] <= 1) {
+			if (empty($_REQUEST['start'])) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}boards
 					SET num_posts = {int:num_posts}
 					WHERE redirect = {string:redirect}',
-					array(
+					[
 						'num_posts' => 0,
 						'redirect' => '',
-					)
+					],
 				);
+			}
 
-			while ($_REQUEST['start'] < $max_topics)
-			{
-				$request = Db::$db->query('', '
-					SELECT m.id_board, COUNT(*) AS real_num_posts
+			while ($_REQUEST['start'] < $max_topics) {
+				$request = Db::$db->query(
+					'',
+					'SELECT m.id_board, COUNT(*) AS real_num_posts
 					FROM {db_prefix}messages AS m
 					WHERE m.id_topic > {int:id_topic_min}
 						AND m.id_topic <= {int:id_topic_max}
 						AND m.approved = {int:is_approved}
 					GROUP BY m.id_board',
-					array(
+					[
 						'id_topic_min' => $_REQUEST['start'],
 						'id_topic_max' => $_REQUEST['start'] + $increment,
 						'is_approved' => 1,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET num_posts = num_posts + {int:real_num_posts}
 						WHERE id_board = {int:id_board}',
-						array(
+						[
 							'id_board' => $row['id_board'],
 							'real_num_posts' => $row['real_num_posts'],
-						)
+						],
 					);
+				}
 				Db::$db->free_result($request);
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=1;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					Utils::$context['continue_percent'] = round((200 + 100 * $_REQUEST['start'] / $max_topics) / $total_steps);
 
@@ -540,48 +565,51 @@ public function recountBoards(): void
 		}
 
 		// Update the topic count of each board.
-		if ($_REQUEST['step'] <= 2)
-		{
-			if (empty($_REQUEST['start']))
-				Db::$db->query('', '
-					UPDATE {db_prefix}boards
+		if ($_REQUEST['step'] <= 2) {
+			if (empty($_REQUEST['start'])) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}boards
 					SET num_topics = {int:num_topics}',
-					array(
+					[
 						'num_topics' => 0,
-					)
+					],
 				);
+			}
 
-			while ($_REQUEST['start'] < $max_topics)
-			{
-				$request = Db::$db->query('', '
-					SELECT t.id_board, COUNT(*) AS real_num_topics
+			while ($_REQUEST['start'] < $max_topics) {
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_board, COUNT(*) AS real_num_topics
 					FROM {db_prefix}topics AS t
 					WHERE t.approved = {int:is_approved}
 						AND t.id_topic > {int:id_topic_min}
 						AND t.id_topic <= {int:id_topic_max}
 					GROUP BY t.id_board',
-					array(
+					[
 						'is_approved' => 1,
 						'id_topic_min' => $_REQUEST['start'],
 						'id_topic_max' => $_REQUEST['start'] + $increment,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET num_topics = num_topics + {int:real_num_topics}
 						WHERE id_board = {int:id_board}',
-						array(
+						[
 							'id_board' => $row['id_board'],
 							'real_num_topics' => $row['real_num_topics'],
-						)
+						],
 					);
+				}
 				Db::$db->free_result($request);
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=2;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					Utils::$context['continue_percent'] = round((300 + 100 * $_REQUEST['start'] / $max_topics) / $total_steps);
 
@@ -593,48 +621,51 @@ public function recountBoards(): void
 		}
 
 		// Update the unapproved post count of each board.
-		if ($_REQUEST['step'] <= 3)
-		{
-			if (empty($_REQUEST['start']))
-				Db::$db->query('', '
-					UPDATE {db_prefix}boards
+		if ($_REQUEST['step'] <= 3) {
+			if (empty($_REQUEST['start'])) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}boards
 					SET unapproved_posts = {int:unapproved_posts}',
-					array(
+					[
 						'unapproved_posts' => 0,
-					)
+					],
 				);
+			}
 
-			while ($_REQUEST['start'] < $max_topics)
-			{
-				$request = Db::$db->query('', '
-					SELECT m.id_board, COUNT(*) AS real_unapproved_posts
+			while ($_REQUEST['start'] < $max_topics) {
+				$request = Db::$db->query(
+					'',
+					'SELECT m.id_board, COUNT(*) AS real_unapproved_posts
 					FROM {db_prefix}messages AS m
 					WHERE m.id_topic > {int:id_topic_min}
 						AND m.id_topic <= {int:id_topic_max}
 						AND m.approved = {int:is_approved}
 					GROUP BY m.id_board',
-					array(
+					[
 						'id_topic_min' => $_REQUEST['start'],
 						'id_topic_max' => $_REQUEST['start'] + $increment,
 						'is_approved' => 0,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET unapproved_posts = unapproved_posts + {int:unapproved_posts}
 						WHERE id_board = {int:id_board}',
-						array(
+						[
 							'id_board' => $row['id_board'],
 							'unapproved_posts' => $row['real_unapproved_posts'],
-						)
+						],
 					);
+				}
 				Db::$db->free_result($request);
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=3;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					Utils::$context['continue_percent'] = round((400 + 100 * $_REQUEST['start'] / $max_topics) / $total_steps);
 
@@ -646,48 +677,51 @@ public function recountBoards(): void
 		}
 
 		// Update the unapproved topic count of each board.
-		if ($_REQUEST['step'] <= 4)
-		{
-			if (empty($_REQUEST['start']))
-				Db::$db->query('', '
-					UPDATE {db_prefix}boards
+		if ($_REQUEST['step'] <= 4) {
+			if (empty($_REQUEST['start'])) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}boards
 					SET unapproved_topics = {int:unapproved_topics}',
-					array(
+					[
 						'unapproved_topics' => 0,
-					)
+					],
 				);
+			}
 
-			while ($_REQUEST['start'] < $max_topics)
-			{
-				$request = Db::$db->query('', '
-					SELECT t.id_board, COUNT(*) AS real_unapproved_topics
+			while ($_REQUEST['start'] < $max_topics) {
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_board, COUNT(*) AS real_unapproved_topics
 					FROM {db_prefix}topics AS t
 					WHERE t.approved = {int:is_approved}
 						AND t.id_topic > {int:id_topic_min}
 						AND t.id_topic <= {int:id_topic_max}
 					GROUP BY t.id_board',
-					array(
+					[
 						'is_approved' => 0,
 						'id_topic_min' => $_REQUEST['start'],
 						'id_topic_max' => $_REQUEST['start'] + $increment,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET unapproved_topics = unapproved_topics + {int:real_unapproved_topics}
 						WHERE id_board = {int:id_board}',
-						array(
+						[
 							'id_board' => $row['id_board'],
 							'real_unapproved_topics' => $row['real_unapproved_topics'],
-						)
+						],
 					);
+				}
 				Db::$db->free_result($request);
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=4;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					Utils::$context['continue_percent'] = round((500 + 100 * $_REQUEST['start'] / $max_topics) / $total_steps);
 
@@ -699,41 +733,45 @@ public function recountBoards(): void
 		}
 
 		// Get all members with wrong number of personal messages.
-		if ($_REQUEST['step'] <= 5)
-		{
-			$request = Db::$db->query('', '
-				SELECT mem.id_member, COUNT(pmr.id_pm) AS real_num,
+		if ($_REQUEST['step'] <= 5) {
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member, COUNT(pmr.id_pm) AS real_num,
 					MAX(mem.instant_messages) AS instant_messages
 				FROM {db_prefix}members AS mem
 					LEFT JOIN {db_prefix}pm_recipients AS pmr ON (mem.id_member = pmr.id_member AND pmr.deleted = {int:is_not_deleted})
 				GROUP BY mem.id_member
 				HAVING COUNT(pmr.id_pm) != MAX(mem.instant_messages)',
-				array(
+				[
 					'is_not_deleted' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-				User::updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				User::updateMemberData($row['id_member'], ['instant_messages' => $row['real_num']]);
+			}
 			Db::$db->free_result($request);
 
-			$request = Db::$db->query('', '
-				SELECT mem.id_member, COUNT(pmr.id_pm) AS real_num,
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member, COUNT(pmr.id_pm) AS real_num,
 					MAX(mem.unread_messages) AS unread_messages
 				FROM {db_prefix}members AS mem
 					LEFT JOIN {db_prefix}pm_recipients AS pmr ON (mem.id_member = pmr.id_member AND pmr.deleted = {int:is_not_deleted} AND pmr.is_read = {int:is_not_read})
 				GROUP BY mem.id_member
 				HAVING COUNT(pmr.id_pm) != MAX(mem.unread_messages)',
-				array(
+				[
 					'is_not_deleted' => 0,
 					'is_not_read' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-				User::updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				User::updateMemberData($row['id_member'], ['unread_messages' => $row['real_num']]);
+			}
 			Db::$db->free_result($request);
 
-			if (microtime(true) - TIME_START > 3)
-			{
+			if (microtime(true) - TIME_START > 3) {
 				Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=6;start=0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 				Utils::$context['continue_percent'] = round(700 / $total_steps);
 
@@ -742,42 +780,44 @@ public function recountBoards(): void
 		}
 
 		// Any messages pointing to the wrong board?
-		if ($_REQUEST['step'] <= 6)
-		{
-			while ($_REQUEST['start'] < Config::$modSettings['maxMsgID'])
-			{
-				$request = Db::$db->query('', '
-					SELECT t.id_board, m.id_msg
+		if ($_REQUEST['step'] <= 6) {
+			while ($_REQUEST['start'] < Config::$modSettings['maxMsgID']) {
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_board, m.id_msg
 					FROM {db_prefix}messages AS m
 						INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic AND t.id_board != m.id_board)
 					WHERE m.id_msg > {int:id_msg_min}
 						AND m.id_msg <= {int:id_msg_max}',
-					array(
+					[
 						'id_msg_min' => $_REQUEST['start'],
 						'id_msg_max' => $_REQUEST['start'] + $increment,
-					)
+					],
 				);
-				$boards = array();
-				while ($row = Db::$db->fetch_assoc($request))
+				$boards = [];
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$boards[$row['id_board']][] = $row['id_msg'];
+				}
 
 				Db::$db->free_result($request);
 
-				foreach ($boards as $board_id => $messages)
-					Db::$db->query('', '
-						UPDATE {db_prefix}messages
+				foreach ($boards as $board_id => $messages) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}messages
 						SET id_board = {int:id_board}
 						WHERE id_msg IN ({array_int:id_msg_array})',
-						array(
+						[
 							'id_msg_array' => $messages,
 							'id_board' => $board_id,
-						)
+						],
 					);
+				}
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=routine;activity=recount;step=6;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					Utils::$context['continue_percent'] = round((700 + 100 * $_REQUEST['start'] / Config::$modSettings['maxMsgID']) / $total_steps);
 
@@ -789,65 +829,74 @@ public function recountBoards(): void
 		}
 
 		// Update the latest message of each board.
-		$request = Db::$db->query('', '
-			SELECT m.id_board, MAX(m.id_msg) AS local_last_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_board, MAX(m.id_msg) AS local_last_msg
 			FROM {db_prefix}messages AS m
 			WHERE m.approved = {int:is_approved}
 			GROUP BY m.id_board',
-			array(
+			[
 				'is_approved' => 1,
-			)
+			],
 		);
-		$realBoardCounts = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$realBoardCounts = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+		}
 		Db::$db->free_result($request);
 
-		$request = Db::$db->query('', '
-			SELECT id_board, id_parent, id_last_msg, child_level, id_msg_updated
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, id_parent, id_last_msg, child_level, id_msg_updated
 			FROM {db_prefix}boards',
-			array(
-			)
+			[
+			],
 		);
-		$resort_me = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$row['local_last_msg'] = isset($realBoardCounts[$row['id_board']]) ? $realBoardCounts[$row['id_board']] : 0;
+		$resort_me = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$row['local_last_msg'] = $realBoardCounts[$row['id_board']] ?? 0;
 			$resort_me[$row['child_level']][] = $row;
 		}
 		Db::$db->free_result($request);
 
 		krsort($resort_me);
 
-		$lastModifiedMsg = array();
-		foreach ($resort_me as $rows)
-			foreach ($rows as $row)
-			{
+		$lastModifiedMsg = [];
+
+		foreach ($resort_me as $rows) {
+			foreach ($rows as $row) {
 				// The latest message is the latest of the current board and its children.
-				if (isset($lastModifiedMsg[$row['id_board']]))
+				if (isset($lastModifiedMsg[$row['id_board']])) {
 					$curLastModifiedMsg = max($row['local_last_msg'], $lastModifiedMsg[$row['id_board']]);
-				else
+				} else {
 					$curLastModifiedMsg = $row['local_last_msg'];
+				}
 
 				// If what is and what should be the latest message differ, an update is necessary.
-				if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated'])
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+				if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated']) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET id_last_msg = {int:id_last_msg}, id_msg_updated = {int:id_msg_updated}
 						WHERE id_board = {int:id_board}',
-						array(
+						[
 							'id_last_msg' => $row['local_last_msg'],
 							'id_msg_updated' => $curLastModifiedMsg,
 							'id_board' => $row['id_board'],
-						)
+						],
 					);
+				}
 
 				// Parent boards inherit the latest modified message of their children.
-				if (isset($lastModifiedMsg[$row['id_parent']]))
+				if (isset($lastModifiedMsg[$row['id_parent']])) {
 					$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
-				else
+				} else {
 					$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+				}
 			}
+		}
 
 		// Update all the basic statistics.
 		Logging::updateStats('member');
@@ -867,7 +916,7 @@ public function rebuildSettings(): void
 	{
 		User::$me->isAllowedTo('admin_forum');
 
-		Config::updateSettingsFile(array(), false, true);
+		Config::updateSettingsFile([], false, true);
 
 		Utils::redirectexit('action=admin;area=maintain;sa=routine;done=rebuild_settings');
 	}
@@ -881,32 +930,25 @@ public function emptyLogs(): void
 		SecurityToken::validate('admin-maint');
 
 		// No one's online now.... MUHAHAHAHA :P.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_online');
+		Db::$db->query('', 'DELETE FROM {db_prefix}log_online');
 
 		// Dump the banning logs.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_banned');
+		Db::$db->query('', 'DELETE FROM {db_prefix}log_banned');
 
 		// Start id_error back at 0 and dump the error log.
-		Db::$db->query('truncate_table', '
-			TRUNCATE {db_prefix}log_errors');
+		Db::$db->query('truncate_table', 'TRUNCATE {db_prefix}log_errors');
 
 		// Clear out the spam log.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_floodcontrol');
+		Db::$db->query('', 'DELETE FROM {db_prefix}log_floodcontrol');
 
 		// Last but not least, the search logs!
-		Db::$db->query('truncate_table', '
-			TRUNCATE {db_prefix}log_search_topics');
+		Db::$db->query('truncate_table', 'TRUNCATE {db_prefix}log_search_topics');
 
-		Db::$db->query('truncate_table', '
-			TRUNCATE {db_prefix}log_search_messages');
+		Db::$db->query('truncate_table', 'TRUNCATE {db_prefix}log_search_messages');
 
-		Db::$db->query('truncate_table', '
-			TRUNCATE {db_prefix}log_search_results');
+		Db::$db->query('truncate_table', 'TRUNCATE {db_prefix}log_search_results');
 
-		Config::updateModSettings(array('search_pointer' => 0));
+		Config::updateModSettings(['search_pointer' => 0]);
 
 		Utils::$context['maintenance_finished'] = Lang::$txt['maintain_logs'];
 	}
@@ -940,10 +982,11 @@ public function optimize(): void
 
 		User::$me->checkSession('request');
 
-		if (!isset($_SESSION['optimized_tables']))
+		if (!isset($_SESSION['optimized_tables'])) {
 			SecurityToken::validate('admin-maint');
-		else
+		} else {
 			SecurityToken::validate('admin-optimize', 'post', false);
+		}
 
 		ignore_user_abort(true);
 
@@ -953,18 +996,22 @@ public function optimize(): void
 		Utils::$context['continue_countdown'] = 3;
 
 		// Only optimize the tables related to this smf install, not all the tables in the db
-		$real_prefix = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', Db::$db->prefix, $match) === 1 ? $match[3] : Db::$db->prefix;
+		$real_prefix = preg_match('~^(`?)(.+?)\1\.(.*?)$~', Db::$db->prefix, $match) === 1 ? $match[3] : Db::$db->prefix;
 
 		// Get a list of tables, as well as how many there are.
 		$temp_tables = Db::$db->list_tables(false, $real_prefix . '%');
-		$tables = array();
-		foreach ($temp_tables as $table)
-			$tables[] = array('table_name' => $table);
+		$tables = [];
+
+		foreach ($temp_tables as $table) {
+			$tables[] = ['table_name' => $table];
+		}
 
 		// If there aren't any tables then I believe that would mean the world has exploded...
 		Utils::$context['num_tables'] = count($tables);
-		if (Utils::$context['num_tables'] == 0)
+
+		if (Utils::$context['num_tables'] == 0) {
 			ErrorHandler::fatal('You appear to be running SMF in a flat file mode... fantastic!', false);
+		}
 
 		$_REQUEST['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
 
@@ -972,15 +1019,15 @@ public function optimize(): void
 		@set_time_limit(100);
 
 		// For each table....
-		$_SESSION['optimized_tables'] = !empty($_SESSION['optimized_tables']) ? $_SESSION['optimized_tables'] : array();
-		for ($key = $_REQUEST['start']; Utils::$context['num_tables'] - 1; $key++)
-		{
-			if (empty($tables[$key]))
+		$_SESSION['optimized_tables'] = !empty($_SESSION['optimized_tables']) ? $_SESSION['optimized_tables'] : [];
+
+		for ($key = $_REQUEST['start']; Utils::$context['num_tables'] - 1; $key++) {
+			if (empty($tables[$key])) {
 				break;
+			}
 
 			// Continue?
-			if (microtime(true) - TIME_START > 10)
-			{
+			if (microtime(true) - TIME_START > 10) {
 				$_REQUEST['start'] = $key;
 				Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=database;activity=optimize;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 				Utils::$context['continue_percent'] = round(100 * $_REQUEST['start'] / Utils::$context['num_tables']);
@@ -990,8 +1037,9 @@ public function optimize(): void
 				SecurityToken::create('admin-optimize');
 				Utils::$context['continue_post_data'] = '<input type="hidden" name="' . Utils::$context['admin-optimize_token_var'] . '" value="' . Utils::$context['admin-optimize_token'] . '">';
 
-				if (function_exists('apache_reset_timeout'))
+				if (function_exists('apache_reset_timeout')) {
 					apache_reset_timeout();
+				}
 
 				return;
 			}
@@ -999,11 +1047,12 @@ public function optimize(): void
 			// Optimize the table!  We use backticks here because it might be a custom table.
 			$data_freed = Db::$db->optimize_table($tables[$key]['table_name']);
 
-			if ($data_freed > 0)
-				$_SESSION['optimized_tables'][] = array(
+			if ($data_freed > 0) {
+				$_SESSION['optimized_tables'][] = [
 					'name' => $tables[$key]['table_name'],
 					'data_freed' => $data_freed,
-				);
+				];
+			}
 		}
 
 		// Number of tables, etc...
@@ -1029,8 +1078,9 @@ public function entitiesToUnicode(): void
 		User::$me->isAllowedTo('admin_forum');
 
 		// Check to see if UTF-8 is currently the default character set.
-		if (Config::$modSettings['global_character_set'] !== 'UTF-8')
+		if (Config::$modSettings['global_character_set'] !== 'UTF-8') {
 			ErrorHandler::fatalLang('entity_convert_only_utf8');
+		}
 
 		// Some starting values.
 		Utils::$context['table'] = empty($_REQUEST['table']) ? 0 : (int) $_REQUEST['table'];
@@ -1042,12 +1092,12 @@ public function entitiesToUnicode(): void
 		Utils::$context['last_step'] = false;
 
 		// The first step is just a text screen with some explanation.
-		if (Utils::$context['first_step'])
-		{
+		if (Utils::$context['first_step']) {
 			SecurityToken::validate('admin-maint');
 			SecurityToken::create('admin-maint');
 
 			Utils::$context['sub_template'] = 'convert_entities';
+
 			return;
 		}
 		// Otherwise use the generic "not done" template.
@@ -1062,7 +1112,7 @@ public function entitiesToUnicode(): void
 		Utils::$context['not_done_token'] = 'admin-maint';
 
 		// A list of tables ready for conversion.
-		$tables = array(
+		$tables = [
 			'ban_groups',
 			'ban_items',
 			'boards',
@@ -1082,71 +1132,81 @@ public function entitiesToUnicode(): void
 			'poll_choices',
 			'smileys',
 			'themes',
-		);
+		];
 		Utils::$context['num_tables'] = count($tables);
 
 		// Loop through all tables that need converting.
-		for (; Utils::$context['table'] < Utils::$context['num_tables']; Utils::$context['table']++)
-		{
+		for (; Utils::$context['table'] < Utils::$context['num_tables']; Utils::$context['table']++) {
 			$cur_table = $tables[Utils::$context['table']];
 			$primary_key = '';
 			// Make sure we keep stuff unique!
-			$primary_keys = array();
+			$primary_keys = [];
 
-			if (function_exists('apache_reset_timeout'))
+			if (function_exists('apache_reset_timeout')) {
 				@apache_reset_timeout();
+			}
 
 			// Get a list of text columns.
-			$columns = array();
-			if (Config::$db_type == 'postgresql')
-				$request = Db::$db->query('', '
-					SELECT column_name "Field", data_type "Type"
+			$columns = [];
+
+			if (Config::$db_type == 'postgresql') {
+				$request = Db::$db->query(
+					'',
+					'SELECT column_name "Field", data_type "Type"
 					FROM information_schema.columns
 					WHERE table_name = {string:cur_table}
 						AND (data_type = \'character varying\' or data_type = \'text\')',
-					array(
+					[
 						'cur_table' => Db::$db->prefix . $cur_table,
-					)
+					],
 				);
-			else
-				$request = Db::$db->query('', '
-					SHOW FULL COLUMNS
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SHOW FULL COLUMNS
 					FROM {db_prefix}{raw:cur_table}',
-					array(
+					[
 						'cur_table' => $cur_table,
-					)
+					],
 				);
-			while ($column_info = Db::$db->fetch_assoc($request))
-				if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
+			}
+
+			while ($column_info = Db::$db->fetch_assoc($request)) {
+				if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false) {
 					$columns[] = strtolower($column_info['Field']);
+				}
+			}
 
 			// Get the column with the (first) primary key.
-			if (Config::$db_type == 'postgresql')
-				$request = Db::$db->query('', '
-					SELECT a.attname "Column_name", \'PRIMARY\' "Key_name", attnum "Seq_in_index"
+			if (Config::$db_type == 'postgresql') {
+				$request = Db::$db->query(
+					'',
+					'SELECT a.attname "Column_name", \'PRIMARY\' "Key_name", attnum "Seq_in_index"
 					FROM   pg_index i
 					JOIN   pg_attribute a ON a.attrelid = i.indrelid
 						AND a.attnum = ANY(i.indkey)
 					WHERE  i.indrelid = {string:cur_table}::regclass
 						AND    i.indisprimary',
-					array(
+					[
 						'cur_table' => Db::$db->prefix . $cur_table,
-					)
+					],
 				);
-			else
-				$request = Db::$db->query('', '
-					SHOW KEYS
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SHOW KEYS
 					FROM {db_prefix}{raw:cur_table}',
-					array(
+					[
 						'cur_table' => $cur_table,
-					)
+					],
 				);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if ($row['Key_name'] === 'PRIMARY')
-				{
-					if ((empty($primary_key) || $row['Seq_in_index'] == 1) && !in_array(strtolower($row['Column_name']), $columns))
+			}
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if ($row['Key_name'] === 'PRIMARY') {
+					if ((empty($primary_key) || $row['Seq_in_index'] == 1) && !in_array(strtolower($row['Column_name']), $columns)) {
 						$primary_key = $row['Column_name'];
+					}
 
 					$primary_keys[] = $row['Column_name'];
 				}
@@ -1155,80 +1215,86 @@ public function entitiesToUnicode(): void
 
 			// No primary key, no glory.
 			// Same for columns. Just to be sure we've work to do!
-			if (empty($primary_key) || empty($columns))
+			if (empty($primary_key) || empty($columns)) {
 				continue;
+			}
 
 			// Get the maximum value for the primary key.
-			$request = Db::$db->query('', '
-				SELECT MAX({identifier:key})
+			$request = Db::$db->query(
+				'',
+				'SELECT MAX({identifier:key})
 				FROM {db_prefix}{raw:cur_table}',
-				array(
+				[
 					'key' => $primary_key,
 					'cur_table' => $cur_table,
-				)
+				],
 			);
 			list($max_value) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			if (empty($max_value))
+			if (empty($max_value)) {
 				continue;
+			}
 
-			while (Utils::$context['start'] <= $max_value)
-			{
+			while (Utils::$context['start'] <= $max_value) {
 				// Retrieve a list of rows that has at least one entity to convert.
-				$request = Db::$db->query('', '
-					SELECT {raw:primary_keys}, {raw:columns}
+				$request = Db::$db->query(
+					'',
+					'SELECT {raw:primary_keys}, {raw:columns}
 					FROM {db_prefix}{raw:cur_table}
 					WHERE {raw:primary_key} BETWEEN {int:start} AND {int:start} + 499
 						AND {raw:like_compare}
 					LIMIT 500',
-					array(
+					[
 						'primary_keys' => implode(', ', $primary_keys),
 						'columns' => implode(', ', $columns),
 						'cur_table' => $cur_table,
 						'primary_key' => $primary_key,
 						'start' => Utils::$context['start'],
 						'like_compare' => '(' . implode(' LIKE \'%&#%\' OR ', $columns) . ' LIKE \'%&#%\')',
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					$insertion_variables = array();
-					$changes = array();
-					foreach ($row as $column_name => $column_value)
-						if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
-						{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					$insertion_variables = [];
+					$changes = [];
+
+					foreach ($row as $column_name => $column_value) {
+						if ($column_name !== $primary_key && strpos($column_value, '&#') !== false) {
 							$changes[] = $column_name . ' = {string:changes_' . $column_name . '}';
 							$insertion_variables['changes_' . $column_name] = Utils::entityDecode($column_value);
 						}
+					}
+
+					$where = [];
 
-					$where = array();
-					foreach ($primary_keys as $key)
-					{
+					foreach ($primary_keys as $key) {
 						$where[] = $key . ' = {string:where_' . $key . '}';
 						$insertion_variables['where_' . $key] = $row[$key];
 					}
 
 					// Update the row.
-					if (!empty($changes))
-						Db::$db->query('', '
-							UPDATE {db_prefix}' . $cur_table . '
+					if (!empty($changes)) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}' . $cur_table . '
 							SET
 								' . implode(',
 								', $changes) . '
 							WHERE ' . implode(' AND ', $where),
-							$insertion_variables
+							$insertion_variables,
 						);
+					}
 				}
 				Db::$db->free_result($request);
 				Utils::$context['start'] += 500;
 
 				// After ten seconds interrupt.
-				if (time() - Utils::$context['start_time'] > 10)
-				{
+				if (time() - Utils::$context['start_time'] > 10) {
 					// Calculate an approximation of the percentage done.
 					Utils::$context['continue_percent'] = round(100 * (Utils::$context['table'] + (Utils::$context['start'] / $max_value)) / Utils::$context['num_tables'], 1);
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=database;activity=convertentities;table=' . Utils::$context['table'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
+
 					return;
 				}
 			}
@@ -1257,35 +1323,43 @@ public function changeMsgBodyLength(): void
 		// Show me your badge!
 		User::$me->isAllowedTo('admin_forum');
 
-		if (Config::$db_type != 'mysql')
+		if (Config::$db_type != 'mysql') {
 			return;
+		}
 
 		$colData = Db::$db->list_columns('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+
+		foreach ($colData as $column) {
+			if ($column['name'] == 'body') {
 				$body_type = $column['type'];
+			}
+		}
 
 		Utils::$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 
-		if ($body_type == 'text' || ($body_type != 'text' && isset($_POST['do_conversion'])))
-		{
+		if ($body_type == 'text' || ($body_type != 'text' && isset($_POST['do_conversion']))) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-maint');
 
 			// Make it longer so we can do their limit.
-			if ($body_type == 'text')
-				Db::$db->change_column('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+			if ($body_type == 'text') {
+				Db::$db->change_column('{db_prefix}messages', 'body', ['type' => 'mediumtext']);
+			}
 			// Shorten the column so we can have a bit (literally per record) less space occupied
-			else
-				Db::$db->change_column('{db_prefix}messages', 'body', array('type' => 'text'));
+			else {
+				Db::$db->change_column('{db_prefix}messages', 'body', ['type' => 'text']);
+			}
 
 			// 3rd party integrations may be interested in knowning about this.
-			IntegrationHook::call('integrate_convert_msgbody', array($body_type));
+			IntegrationHook::call('integrate_convert_msgbody', [$body_type]);
 
 			$colData = Db::$db->list_columns('{db_prefix}messages', true);
-			foreach ($colData as $column)
-				if ($column['name'] == 'body')
+
+			foreach ($colData as $column) {
+				if ($column['name'] == 'body') {
 					$body_type = $column['type'];
+				}
+			}
 
 			Utils::$context['maintenance_finished'] = Lang::$txt[Utils::$context['convert_to'] . '_title'];
 			Utils::$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
@@ -1293,25 +1367,28 @@ public function changeMsgBodyLength(): void
 
 			return;
 		}
-		elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
-		{
+
+		if ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont']))) {
 			User::$me->checkSession();
-			if (empty($_REQUEST['start']))
+
+			if (empty($_REQUEST['start'])) {
 				SecurityToken::validate('admin-maint');
-			else
+			} else {
 				SecurityToken::validate('admin-convertMsg');
+			}
 
 			Utils::$context['page_title'] = Lang::$txt['not_done_title'];
 			Utils::$context['continue_post_data'] = '';
 			Utils::$context['continue_countdown'] = 3;
 			Utils::$context['sub_template'] = 'not_done';
 			$increment = 500;
-			$id_msg_exceeding = isset($_POST['id_msg_exceeding']) ? explode(',', $_POST['id_msg_exceeding']) : array();
+			$id_msg_exceeding = isset($_POST['id_msg_exceeding']) ? explode(',', $_POST['id_msg_exceeding']) : [];
 
-			$request = Db::$db->query('', '
-				SELECT COUNT(*) as count
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*) as count
 				FROM {db_prefix}messages',
-				array()
+				[],
 			);
 			list($max_msgs) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -1319,26 +1396,27 @@ public function changeMsgBodyLength(): void
 			// Try for as much time as possible.
 			@set_time_limit(600);
 
-			while ($_REQUEST['start'] < $max_msgs)
-			{
-				$request = Db::$db->query('', '
-					SELECT id_msg
+			while ($_REQUEST['start'] < $max_msgs) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_msg
 					FROM {db_prefix}messages
 					WHERE id_msg BETWEEN {int:start} AND {int:start} + {int:increment}
 						AND LENGTH(body) > 65535',
-					array(
+					[
 						'start' => $_REQUEST['start'],
 						'increment' => $increment - 1,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$id_msg_exceeding[] = $row['id_msg'];
+				}
 				Db::$db->free_result($request);
 
 				$_REQUEST['start'] += $increment;
 
-				if (microtime(true) - TIME_START > 3)
-				{
+				if (microtime(true) - TIME_START > 3) {
 					SecurityToken::create('admin-convertMsg');
 					Utils::$context['continue_post_data'] = '
 						<input type="hidden" name="' . Utils::$context['admin-convertMsg_token_var'] . '" value="' . Utils::$context['admin-convertMsg_token'] . '">
@@ -1355,27 +1433,28 @@ public function changeMsgBodyLength(): void
 			Utils::$context['page_title'] = Lang::$txt[Utils::$context['convert_to'] . '_title'];
 			Utils::$context['sub_template'] = 'convert_msgbody';
 
-			if (!empty($id_msg_exceeding))
-			{
-				if (count($id_msg_exceeding) > 100)
-				{
+			if (!empty($id_msg_exceeding)) {
+				if (count($id_msg_exceeding) > 100) {
 					$query_msg = array_slice($id_msg_exceeding, 0, 100);
 					Utils::$context['exceeding_messages_morethan'] = sprintf(Lang::$txt['exceeding_messages_morethan'], count($id_msg_exceeding));
-				}
-				else
+				} else {
 					$query_msg = $id_msg_exceeding;
+				}
 
-				Utils::$context['exceeding_messages'] = array();
-				$request = Db::$db->query('', '
-					SELECT id_msg, id_topic, subject
+				Utils::$context['exceeding_messages'] = [];
+				$request = Db::$db->query(
+					'',
+					'SELECT id_msg, id_topic, subject
 					FROM {db_prefix}messages
 					WHERE id_msg IN ({array_int:messages})',
-					array(
+					[
 						'messages' => $query_msg,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					Utils::$context['exceeding_messages'][] = '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				}
 				Db::$db->free_result($request);
 			}
 		}
@@ -1391,8 +1470,9 @@ public function reattribute(): void
 		// Find the member.
 		$members = User::find($_POST['to']);
 
-		if (empty($members))
+		if (empty($members)) {
 			ErrorHandler::fatalLang('reattribute_cannot_find_member');
+		}
 
 		$memID = array_shift($members);
 		$memID = $memID['id'];
@@ -1414,40 +1494,37 @@ public function reattribute(): void
 	public function purgeInactiveMembers(): void
 	{
 		$_POST['maxdays'] = empty($_POST['maxdays']) ? 0 : (int) $_POST['maxdays'];
-		if (!empty($_POST['groups']) && $_POST['maxdays'] > 0)
-		{
+
+		if (!empty($_POST['groups']) && $_POST['maxdays'] > 0) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-maint');
 
-			$groups = array();
-			foreach ($_POST['groups'] as $id => $dummy)
+			$groups = [];
+
+			foreach ($_POST['groups'] as $id => $dummy) {
 				$groups[] = (int) $id;
+			}
 			$time_limit = (time() - ($_POST['maxdays'] * 24 * 3600));
-			$where_vars = array(
+			$where_vars = [
 				'time_limit' => $time_limit,
-			);
-			if ($_POST['del_type'] == 'activated')
-			{
+			];
+
+			if ($_POST['del_type'] == 'activated') {
 				$where = 'mem.date_registered < {int:time_limit} AND mem.is_activated = {int:is_activated}';
 				$where_vars['is_activated'] = 0;
-			}
-			else
+			} else {
 				$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
+			}
 
 			// Need to get all groups then work out which (if any) we avoid.
-			foreach (Group::loadSimple(Group::LOAD_BOTH, array(Group::GUEST, Group::MOD)) as $group)
-			{
+			foreach (Group::loadSimple(Group::LOAD_BOTH, [Group::GUEST, Group::MOD]) as $group) {
 				// Avoid this one?
-				if (!in_array($group->id, $groups))
-				{
+				if (!in_array($group->id, $groups)) {
 					// Post group?
-					if ($group->min_posts != -1)
-					{
+					if ($group->min_posts != -1) {
 						$where .= ' AND mem.id_post_group != {int:id_post_group_' . $group->id . '}';
 						$where_vars['id_post_group_' . $group->id] = $group->id;
-					}
-					else
-					{
+					} else {
 						$where .= ' AND mem.id_group != {int:id_group_' . $group->id . '} AND FIND_IN_SET({int:id_group_' . $group->id . '}, mem.additional_groups) = 0';
 						$where_vars['id_group_' . $group->id] = $group->id;
 					}
@@ -1455,25 +1532,26 @@ public function purgeInactiveMembers(): void
 			}
 
 			// If we have ungrouped unselected we need to avoid those guys.
-			if (!in_array(0, $groups))
-			{
+			if (!in_array(0, $groups)) {
 				$where .= ' AND (mem.id_group != 0 OR mem.additional_groups != {string:blank_add_groups})';
 				$where_vars['blank_add_groups'] = '';
 			}
 
 			// Select all the members we're about to murder/remove...
-			$request = Db::$db->query('', '
-				SELECT mem.id_member, COALESCE(m.id_member, 0) AS is_mod
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member, COALESCE(m.id_member, 0) AS is_mod
 				FROM {db_prefix}members AS mem
 					LEFT JOIN {db_prefix}moderators AS m ON (m.id_member = mem.id_member)
 				WHERE ' . $where,
-				$where_vars
+				$where_vars,
 			);
-			$members = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!$row['is_mod'] || !in_array(3, $groups))
+			$members = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!$row['is_mod'] || !in_array(3, $groups)) {
 					$members[] = $row['id_member'];
+				}
 			}
 			Db::$db->free_result($request);
 
@@ -1519,30 +1597,31 @@ public function recountPosts(): void
 		@set_time_limit(600);
 
 		// Only run this query if we don't have the total number of members that have posted
-		if (!isset($_SESSION['total_members']))
-		{
+		if (!isset($_SESSION['total_members'])) {
 			SecurityToken::validate('admin-maint');
 
-			$request = Db::$db->query('', '
-				SELECT COUNT(DISTINCT m.id_member)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(DISTINCT m.id_member)
 				FROM {db_prefix}messages AS m
 				JOIN {db_prefix}boards AS b on m.id_board = b.id_board
 				WHERE m.id_member != 0
 					AND b.count_posts = 0',
-				array(
-				)
+				[
+				],
 			);
 
 			// save it so we don't do this again for this task
-			list ($_SESSION['total_members']) = Db::$db->fetch_row($request);
+			list($_SESSION['total_members']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
-		}
-		else
+		} else {
 			SecurityToken::validate('admin-recountposts');
+		}
 
 		// Lets get a group of members and determine their post count (from the boards that have post count enabled of course).
-		$request = Db::$db->query('', '
-			SELECT m.id_member, COUNT(*) AS posts
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_member, COUNT(*) AS posts
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}boards AS b ON m.id_board = b.id_board
 			WHERE m.id_member != {int:zero}
@@ -1550,33 +1629,32 @@ public function recountPosts(): void
 				' . (!empty(Config::$modSettings['recycle_enable']) ? ' AND b.id_board != {int:recycle}' : '') . '
 			GROUP BY m.id_member
 			LIMIT {int:start}, {int:number}',
-			array(
+			[
 				'start' => $_REQUEST['start'],
 				'number' => $increment,
 				'recycle' => Config::$modSettings['recycle_board'],
 				'zero' => 0,
-			)
+			],
 		);
 		$total_rows = Db::$db->num_rows($request);
 
 		// Update the post count for this group
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET posts = {int:posts}
 				WHERE id_member = {int:row}',
-				array(
+				[
 					'row' => $row['id_member'],
 					'posts' => $row['posts'],
-				)
+				],
 			);
 		}
 		Db::$db->free_result($request);
 
 		// Continue?
-		if ($total_rows == $increment)
-		{
+		if ($total_rows == $increment) {
 			$_REQUEST['start'] += $increment;
 			Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=members;activity=recountposts;start=' . $_REQUEST['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 			Utils::$context['continue_percent'] = round(100 * $_REQUEST['start'] / $_SESSION['total_members']);
@@ -1584,15 +1662,18 @@ public function recountPosts(): void
 			SecurityToken::create('admin-recountposts');
 			Utils::$context['continue_post_data'] = '<input type="hidden" name="' . Utils::$context['admin-recountposts_token_var'] . '" value="' . Utils::$context['admin-recountposts_token'] . '">';
 
-			if (function_exists('apache_reset_timeout'))
+			if (function_exists('apache_reset_timeout')) {
 				apache_reset_timeout();
+			}
+
 			return;
 		}
 
 		// final steps ... made more difficult since we don't yet support sub-selects on joins
 		// place all members who have posts in the message table in a temp table
-		$createTemporary = Db::$db->query('', '
-			CREATE TEMPORARY TABLE {db_prefix}tmp_maint_recountposts (
+		$createTemporary = Db::$db->query(
+			'',
+			'CREATE TEMPORARY TABLE {db_prefix}tmp_maint_recountposts (
 				id_member mediumint(8) unsigned NOT NULL default {string:string_zero},
 				PRIMARY KEY (id_member)
 			)
@@ -1603,40 +1684,40 @@ public function recountPosts(): void
 				AND b.count_posts = {int:zero}
 				' . (!empty(Config::$modSettings['recycle_enable']) ? ' AND b.id_board != {int:recycle}' : '') . '
 			GROUP BY m.id_member',
-			array(
+			[
 				'zero' => 0,
 				'string_zero' => '0',
 				'db_error_skip' => true,
 				'recycle' => !empty(Config::$modSettings['recycle_board']) ? Config::$modSettings['recycle_board'] : 0,
-			)
+			],
 		) !== false;
 
-		if ($createTemporary)
-		{
+		if ($createTemporary) {
 			// outer join the members table on the temporary table finding the members that have a post count but no posts in the message table
-			$request = Db::$db->query('', '
-				SELECT mem.id_member, mem.posts
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member, mem.posts
 				FROM {db_prefix}members AS mem
 					LEFT OUTER JOIN {db_prefix}tmp_maint_recountposts AS res
 					ON res.id_member = mem.id_member
 				WHERE res.id_member IS null
 					AND mem.posts != {int:zero}',
-				array(
+				[
 					'zero' => 0,
-				)
+				],
 			);
 
 			// set the post count to zero for any delinquents we may have found
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}members
+			while ($row = Db::$db->fetch_assoc($request)) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}members
 					SET posts = {int:zero}
 					WHERE id_member = {int:row}',
-					array(
+					[
 						'row' => $row['id_member'],
 						'zero' => 0,
-					)
+					],
 				);
 			}
 			Db::$db->free_result($request);
@@ -1678,93 +1759,93 @@ public function massMove(): void
 		$sticky = isset($_POST['move_type_sticky']) || isset($_GET['sticky']);
 
 		// No boards then this is your stop.
-		if (empty($id_board_from) || empty($id_board_to))
+		if (empty($id_board_from) || empty($id_board_to)) {
 			return;
+		}
 
 		// The big WHERE clause
 		$conditions = 'WHERE t.id_board = {int:id_board_from}
 			AND m.icon != {string:moved}';
 
 		// DB parameters
-		$params = array(
+		$params = [
 			'id_board_from' => $id_board_from,
 			'moved' => 'moved',
-		);
+		];
 
 		// Only moving topics not posted in for x days?
-		if (!empty($max_days))
-		{
+		if (!empty($max_days)) {
 			$conditions .= '
 				AND m.poster_time < {int:poster_time}';
 			$params['poster_time'] = time() - 3600 * 24 * $max_days;
 		}
 
 		// Moving locked topics?
-		if ($locked)
-		{
+		if ($locked) {
 			$conditions .= '
 				AND t.locked = {int:locked}';
 			$params['locked'] = 1;
 		}
 
 		// What about sticky topics?
-		if ($sticky)
-		{
+		if ($sticky) {
 			$conditions .= '
 				AND t.is_sticky = {int:sticky}';
 			$params['sticky'] = 1;
 		}
 
 		// How many topics are we converting?
-		if (!isset($_REQUEST['totaltopics']))
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		if (!isset($_REQUEST['totaltopics'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_last_msg)' .
 				$conditions,
-				$params
+				$params,
 			);
-			list ($total_topics) = Db::$db->fetch_row($request);
+			list($total_topics) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
-		}
-		else
+		} else {
 			$total_topics = (int) $_REQUEST['totaltopics'];
+		}
 
 		// Seems like we need this here.
 		Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=topics;activity=massmove;id_board_from=' . $id_board_from . ';id_board_to=' . $id_board_to . ';totaltopics=' . $total_topics . ';max_days=' . $max_days;
 
-		if ($locked)
+		if ($locked) {
 			Utils::$context['continue_get_data'] .= ';locked';
+		}
 
-		if ($sticky)
+		if ($sticky) {
 			Utils::$context['continue_get_data'] .= ';sticky';
+		}
 
 		Utils::$context['continue_get_data'] .= ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 
 		// We have topics to move so start the process.
-		if (!empty($total_topics))
-		{
-			while (Utils::$context['start'] <= $total_topics)
-			{
+		if (!empty($total_topics)) {
+			while (Utils::$context['start'] <= $total_topics) {
 				// Lets get the topics.
-				$request = Db::$db->query('', '
-					SELECT t.id_topic
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_topic
 					FROM {db_prefix}topics AS t
 						INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_last_msg)
 					' . $conditions . '
 					LIMIT 10',
-					$params
+					$params,
 				);
 
 				// Get the ids.
-				$topics = array();
-				while ($row = Db::$db->fetch_assoc($request))
+				$topics = [];
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$topics[] = $row['id_topic'];
+				}
 
 				// Just return if we don't have any topics left to move.
-				if (empty($topics))
-				{
+				if (empty($topics)) {
 					CacheApi::put('board-' . $id_board_from, null, 120);
 					CacheApi::put('board-' . $id_board_to, null, 120);
 					Utils::redirectexit('action=admin;area=maintain;sa=topics;done=massmove');
@@ -1777,8 +1858,7 @@ public function massMove(): void
 				Utils::$context['start'] += 10;
 
 				// Lets wait a while.
-				if (time() - Utils::$context['start_time'] > 3)
-				{
+				if (time() - Utils::$context['start_time'] > 3) {
 					// What's the percent?
 					Utils::$context['continue_percent'] = round(100 * (Utils::$context['start'] / $total_topics), 1);
 					Utils::$context['continue_get_data'] = '?action=admin;area=maintain;sa=topics;activity=massmove;id_board_from=' . $id_board_from . ';id_board_to=' . $id_board_to . ';totaltopics=' . $total_topics . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
@@ -1814,25 +1894,28 @@ public function pruneDrafts(): void
 	{
 		SecurityToken::validate('admin-maint');
 
-		$drafts = array();
+		$drafts = [];
 
 		// Find all of the old drafts
-		$request = Db::$db->query('', '
-			SELECT id_draft
+		$request = Db::$db->query(
+			'',
+			'SELECT id_draft
 			FROM {db_prefix}user_drafts
 			WHERE poster_time <= {int:poster_time_old}',
-			array(
+			[
 				'poster_time_old' => time() - (86400 * $_POST['draftdays']),
-			)
+			],
 		);
 
-		while ($row = Db::$db->fetch_row($request))
+		while ($row = Db::$db->fetch_row($request)) {
 			$drafts[] = (int) $row[0];
+		}
 		Db::$db->free_result($request);
 
 		// If we have old drafts, remove them
-		if (count($drafts) > 0)
+		if (count($drafts) > 0) {
 			Draft::delete($drafts, false);
+		}
 	}
 
 	/**
@@ -1845,44 +1928,40 @@ public function hooks(): void
 		$filter_url = '';
 		$current_filter = '';
 		$hooks = $this->getIntegrationHooks();
-		$hooks_filters = array();
+		$hooks_filters = [];
 
-		if (isset($_GET['filter'], $hooks[$_GET['filter']]))
-		{
+		if (isset($_GET['filter'], $hooks[$_GET['filter']])) {
 			$filter_url = ';filter=' . $_GET['filter'];
 			$current_filter = $_GET['filter'];
 		}
 		$filtered_hooks = array_filter(
 			$hooks,
-			function($hook) use ($current_filter)
-			{
+			function ($hook) use ($current_filter) {
 				return $current_filter == '' || $current_filter == $hook;
 			},
-			ARRAY_FILTER_USE_KEY
+			ARRAY_FILTER_USE_KEY,
 		);
 		ksort($hooks);
 
-		foreach ($hooks as $hook => $functions)
+		foreach ($hooks as $hook => $functions) {
 			$hooks_filters[] = '<option' . ($current_filter == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+		}
 
-		if (!empty($hooks_filters))
+		if (!empty($hooks_filters)) {
 			Utils::$context['insert_after_template'] .= '
 			<script>
 				var hook_name_header = document.getElementById(\'header_list_integration_hooks_hook_name\');
 				hook_name_header.innerHTML += ' . Utils::JavaScriptEscape('<select style="margin-left:15px;" onchange="window.location=(\'' . Config::$scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));"><option value="">' . Lang::$txt['hooks_reset_filter'] . '</option>' . implode('', $hooks_filters) . '</select>') . ';
 			</script>';
+		}
 
-		if (!empty($_REQUEST['do']) && isset($_REQUEST['hook']) && isset($_REQUEST['function']))
-		{
+		if (!empty($_REQUEST['do']) && isset($_REQUEST['hook'], $_REQUEST['function'])) {
 			User::$me->checkSession('request');
 			SecurityToken::validate('admin-hook', 'request');
 
-			if ($_REQUEST['do'] == 'remove')
-			{
+			if ($_REQUEST['do'] == 'remove') {
 				IntegrationHook::remove($_REQUEST['hook'], urldecode($_REQUEST['function']));
-			}
-			else
-			{
+			} else {
 				// Disable/enable logic; always remove exactly what was passed
 				$function_remove = urldecode($_REQUEST['function']);
 				$function_add = urldecode(rtrim($_REQUEST['function'], '!')) . (($_REQUEST['do'] == 'disable') ? '!' : '');
@@ -1896,117 +1975,110 @@ function($hook) use ($current_filter)
 
 		SecurityToken::create('admin-hook', 'request');
 
-		$list_options = array(
+		$list_options = [
 			'id' => 'list_integration_hooks',
 			'title' => Lang::$txt['hooks_title_list'],
 			'items_per_page' => 20,
 			'base_href' => Config::$scripturl . '?action=admin;area=maintain;sa=hooks' . $filter_url . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 			'default_sort_col' => 'hook_name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::getIntegrationHooksData',
-				'params' => array(
+				'params' => [
 					$filtered_hooks,
 					strtr(Config::$boarddir, '\\', '/'),
 					strtr(Config::$sourcedir, '\\', '/'),
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'value' => array_reduce(
 					$filtered_hooks,
-					function($accumulator, $functions)
-					{
+					function ($accumulator, $functions) {
 						return $accumulator + count($functions);
 					},
-					0
+					0,
 				),
-			),
+			],
 			'no_items_label' => Lang::$txt['hooks_no_hooks'],
-			'columns' => array(
-				'hook_name' => array(
-					'header' => array(
+			'columns' => [
+				'hook_name' => [
+					'header' => [
 						'value' => Lang::$txt['hooks_field_hook_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'hook_name',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'hook_name',
 						'reverse' => 'hook_name DESC',
-					),
-				),
-				'function_name' => array(
-					'header' => array(
+					],
+				],
+				'function_name' => [
+					'header' => [
 						'value' => Lang::$txt['hooks_field_function_name'],
-					),
-					'data' => array(
-						'function' => function($data)
-						{
+					],
+					'data' => [
+						'function' => function ($data) {
 							// Show a nice icon to indicate this is an instance.
 							$instance = (!empty($data['instance']) ? '<span class="main_icons news" title="' . Lang::$txt['hooks_field_function_method'] . '"></span> ' : '');
 
-							if (!empty($data['included_file']) && !empty($data['real_function']))
+							if (!empty($data['included_file']) && !empty($data['real_function'])) {
 								return $instance . Lang::$txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . Lang::$txt['hooks_field_included_file'] . ': ' . $data['included_file'];
+							}
 
-							else
-								return $instance . $data['real_function'];
+							return $instance . $data['real_function'];
 						},
 						'class' => 'word_break',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'function_name',
 						'reverse' => 'function_name DESC',
-					),
-				),
-				'file_name' => array(
-					'header' => array(
+					],
+				],
+				'file_name' => [
+					'header' => [
 						'value' => Lang::$txt['hooks_field_file_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'file_name',
 						'class' => 'word_break',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'file_name',
 						'reverse' => 'file_name DESC',
-					),
-				),
-				'status' => array(
-					'header' => array(
+					],
+				],
+				'status' => [
+					'header' => [
 						'value' => Lang::$txt['hooks_field_hook_exists'],
 						'style' => 'width:3%;',
-					),
-					'data' => array(
-						'function' => function($data) use ($filter_url)
-						{
+					],
+					'data' => [
+						'function' => function ($data) use ($filter_url) {
 							// Cannot update temp hooks in any way, really.  Just show the appropriate icon.
-							if ($data['status'] == 'temp')
-							{
+							if ($data['status'] == 'temp') {
 								return '<span class="main_icons ' . ($data['hook_exists'] ? 'posts' : 'error') . '" title="' . $data['img_text'] . '"></span>';
 							}
-							else
-							{
-								$change_status = array('before' => '', 'after' => '');
-
-								// Can only enable/disable if it exists...
-								if ($data['hook_exists'])
-								{
-									$change_status['before'] = '<a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=hooks;do=' . ($data['enabled'] ? 'disable' : 'enable') . ';hook=' . $data['hook_name'] . ';function=' . urlencode($data['function_name']) . $filter_url . ';' . Utils::$context['admin-hook_token_var'] . '=' . Utils::$context['admin-hook_token'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" data-confirm="' . Lang::$txt['quickmod_confirm'] . '" class="you_sure">';
-									$change_status['after'] = '</a>';
-								}
-
-								return $change_status['before'] . '<span class="main_icons post_moderation_' . $data['status'] . '" title="' . $data['img_text'] . '"></span>' . $change_status['after'];
+
+							$change_status = ['before' => '', 'after' => ''];
+
+							// Can only enable/disable if it exists...
+							if ($data['hook_exists']) {
+								$change_status['before'] = '<a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=hooks;do=' . ($data['enabled'] ? 'disable' : 'enable') . ';hook=' . $data['hook_name'] . ';function=' . urlencode($data['function_name']) . $filter_url . ';' . Utils::$context['admin-hook_token_var'] . '=' . Utils::$context['admin-hook_token'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" data-confirm="' . Lang::$txt['quickmod_confirm'] . '" class="you_sure">';
+								$change_status['after'] = '</a>';
 							}
+
+							return $change_status['before'] . '<span class="main_icons post_moderation_' . $data['status'] . '" title="' . $data['img_text'] . '"></span>' . $change_status['after'];
 						},
 						'class' => 'centertext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'status',
 						'reverse' => 'status DESC',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['hooks_disable_instructions'] . '<br>
 						' . Lang::$txt['hooks_disable_legend'] . ':
@@ -2016,33 +2088,33 @@ function($accumulator, $functions)
 						<li><span class="main_icons post_moderation_deny"></span> ' . Lang::$txt['hooks_disable_legend_missing'] . '</li>
 						<li><span class="main_icons posts"></span> ' . Lang::$txt['hooks_disable_legend_temp'] . '</li>
 						<li><span class="main_icons error"></span> ' . Lang::$txt['hooks_disable_legend_temp_missing'] . '</li>
-					</ul>'
-				),
-			),
-		);
+					</ul>',
+				],
+			],
+		];
 
-		$list_options['columns']['remove'] = array(
-			'header' => array(
+		$list_options['columns']['remove'] = [
+			'header' => [
 				'value' => Lang::$txt['hooks_button_remove'],
 				'style' => 'width:3%',
-			),
-			'data' => array(
-				'function' => function($data) use ($filter_url)
-				{
+			],
+			'data' => [
+				'function' => function ($data) use ($filter_url) {
 					// Note: Cannot remove temp hooks via the UI...
-					if (!$data['hook_exists'] && $data['status'] != 'temp')
+					if (!$data['hook_exists'] && $data['status'] != 'temp') {
 						return '
 						<a href="' . Config::$scripturl . '?action=admin;area=maintain;sa=hooks;do=remove;hook=' . $data['hook_name'] . ';function=' . urlencode($data['function_name']) . $filter_url . ';' . Utils::$context['admin-hook_token_var'] . '=' . Utils::$context['admin-hook_token'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" data-confirm="' . Lang::$txt['quickmod_confirm'] . '" class="you_sure">
 							<span class="main_icons delete" title="' . Lang::$txt['hooks_button_remove'] . '"></span>
 						</a>';
+					}
 				},
 				'class' => 'centertext',
-			),
-		);
-		$list_options['form'] = array(
+			],
+		];
+		$list_options['form'] = [
 			'href' => Config::$scripturl . '?action=admin;area=maintain;sa=hooks' . $filter_url . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 			'name' => 'list_integration_hooks',
-		);
+		];
 
 		new ItemList($list_options);
 
@@ -2062,8 +2134,9 @@ function($accumulator, $functions)
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -2087,35 +2160,38 @@ public static function call(): void
 	 */
 	public static function getIntegrationHooksData($start, $per_page, $sort, $filtered_hooks, $normalized_boarddir, $normalized_sourcedir): array
 	{
-		$function_list = $sort_array = $temp_data = array();
+		$function_list = $sort_array = $temp_data = [];
 		$files = self::getFileRecursive($normalized_sourcedir);
-		foreach ($files as $currentFile => $fileInfo)
-			$function_list += self::getDefinedFunctionsInFile($currentFile);
 
-		$sort_types = array(
-			'hook_name' => array('hook_name', SORT_ASC),
-			'hook_name DESC' => array('hook_name', SORT_DESC),
-			'function_name' => array('function_name', SORT_ASC),
-			'function_name DESC' => array('function_name', SORT_DESC),
-			'file_name' => array('file_name', SORT_ASC),
-			'file_name DESC' => array('file_name', SORT_DESC),
-			'status' => array('status', SORT_ASC),
-			'status DESC' => array('status', SORT_DESC),
-		);
+		foreach ($files as $currentFile => $fileInfo) {
+			$function_list += self::getDefinedFunctionsInFile($currentFile);
+		}
 
-		foreach ($filtered_hooks as $hook => $functions)
-			foreach ($functions as $rawFunc)
-			{
+		$sort_types = [
+			'hook_name' => ['hook_name', SORT_ASC],
+			'hook_name DESC' => ['hook_name', SORT_DESC],
+			'function_name' => ['function_name', SORT_ASC],
+			'function_name DESC' => ['function_name', SORT_DESC],
+			'file_name' => ['file_name', SORT_ASC],
+			'file_name DESC' => ['file_name', SORT_DESC],
+			'status' => ['status', SORT_ASC],
+			'status DESC' => ['status', SORT_DESC],
+		];
+
+		foreach ($filtered_hooks as $hook => $functions) {
+			foreach ($functions as $rawFunc) {
 				$hookParsedData = self::parseIntegrationHook($hook, $rawFunc);
 
 				// Handle hooks pointing outside the sources directory.
 				$absPath_clean =  rtrim($hookParsedData['absPath'], '!');
-				if ($absPath_clean != '' && !isset($files[$absPath_clean]) && file_exists($absPath_clean))
+
+				if ($absPath_clean != '' && !isset($files[$absPath_clean]) && file_exists($absPath_clean)) {
 					$function_list += self::getDefinedFunctionsInFile($absPath_clean);
+				}
 
 				$hook_exists = isset($function_list[$hookParsedData['call']]) || (substr($hook, -8) === '_include' && isset($files[$absPath_clean]));
 				$hook_temp = !empty(Utils::$context['integration_hooks_temporary'][$hook][$hookParsedData['rawData']]);
-				$temp = array(
+				$temp = [
 					'hook_name' => $hook,
 					'function_name' => $hookParsedData['rawData'],
 					'real_function' => $hookParsedData['call'],
@@ -2126,10 +2202,11 @@ public static function getIntegrationHooksData($start, $per_page, $sort, $filter
 					'status' => ($hook_temp ? 'temp' : ($hook_exists ? ($hookParsedData['enabled'] ? 'allow' : 'moderate') : 'deny')),
 					'img_text' => Lang::$txt['hooks_' . ($hook_exists ? ($hook_temp ? 'temp' : ($hookParsedData['enabled'] ? 'active' : 'disabled')) : 'missing')],
 					'enabled' => $hookParsedData['enabled'],
-				);
+				];
 				$sort_array[] = $temp[$sort_types[$sort][0]];
 				$temp_data[] = $temp;
 			}
+		}
 
 		array_multisort($sort_array, $sort_types[$sort][1], $temp_data);
 
@@ -2148,37 +2225,37 @@ public static function getIntegrationHooksData($start, $per_page, $sort, $filter
 	 * @param bool $post_count Whether to adjust post counts.
 	 * @return array The numbers of messages, topics, and reports updated.
 	 */
-	public static function reattributePosts(int $memID, string $email = null, string $membername = null, bool $post_count = false)
+	public static function reattributePosts(int $memID, ?string $email = null, ?string $membername = null, bool $post_count = false)
 	{
-		$updated = array(
+		$updated = [
 			'messages' => 0,
 			'topics' => 0,
 			'reports' => 0,
-		);
+		];
 
 		// Firstly, if email and username aren't passed find out the members email address and name.
-		if ($email === null && $membername === null)
-		{
-			$request = Db::$db->query('', '
-				SELECT email_address, member_name
+		if ($email === null && $membername === null) {
+			$request = Db::$db->query(
+				'',
+				'SELECT email_address, member_name
 				FROM {db_prefix}members
 				WHERE id_member = {int:memID}
 				LIMIT 1',
-				array(
+				[
 					'memID' => $memID,
-				)
+				],
 			);
 			list($email, $membername) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// If they want the post count restored then we need to do some research.
-		if ($post_count)
-		{
+		if ($post_count) {
 			$recycle_board = !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : 0;
 
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND b.count_posts = {int:count_posts})
 				WHERE m.id_member = {int:guest_id}
@@ -2186,50 +2263,53 @@ public static function reattributePosts(int $memID, string $email = null, string
 					AND m.id_board != {int:recycled_board}' : '') . (empty($email) ? '' : '
 					AND m.poster_email = {string:email_address}') . (empty($membername) ? '' : '
 					AND m.poster_name = {string:member_name}'),
-				array(
+				[
 					'count_posts' => 0,
 					'guest_id' => 0,
 					'email_address' => $email,
 					'member_name' => $membername,
 					'is_approved' => 1,
 					'recycled_board' => $recycle_board,
-				)
+				],
 			);
 			list($messageCount) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			User::updateMemberData($memID, array('posts' => 'posts + ' . $messageCount));
+			User::updateMemberData($memID, ['posts' => 'posts + ' . $messageCount]);
 		}
 
-		$query_parts = array();
+		$query_parts = [];
 
-		if (!empty($email))
+		if (!empty($email)) {
 			$query_parts[] = 'poster_email = {string:email_address}';
+		}
 
-		if (!empty($membername))
+		if (!empty($membername)) {
 			$query_parts[] = 'poster_name = {string:member_name}';
+		}
 
 		$query = implode(' AND ', $query_parts);
 
 		// Finally, update the posts themselves!
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_member = {int:memID}
 			WHERE ' . $query,
-			array(
+			[
 				'memID' => $memID,
 				'email_address' => $email,
 				'member_name' => $membername,
-			)
+			],
 		);
 		$updated['messages'] = Db::$db->affected_rows();
 
 		// Did we update any messages?
-		if ($updated['messages'] > 0)
-		{
+		if ($updated['messages'] > 0) {
 			// First, check for updated topics.
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics AS t
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics AS t
 				SET id_member_started = {int:memID}
 				WHERE t.id_first_msg = (
 					SELECT m.id_msg
@@ -2238,17 +2318,18 @@ public static function reattributePosts(int $memID, string $email = null, string
 						AND m.id_msg = t.id_first_msg
 						AND ' . $query . '
 					)',
-				array(
+				[
 					'memID' => $memID,
 					'email_address' => $email,
 					'member_name' => $membername,
-				)
+				],
 			);
 			$updated['topics'] = Db::$db->affected_rows();
 
 			// Second, check for updated reports.
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_reported AS lr
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_reported AS lr
 				SET id_member = {int:memID}
 				WHERE lr.id_msg = (
 					SELECT m.id_msg
@@ -2257,17 +2338,17 @@ public static function reattributePosts(int $memID, string $email = null, string
 						AND m.id_msg = lr.id_msg
 						AND ' . $query . '
 					)',
-				array(
+				[
 					'memID' => $memID,
 					'email_address' => $email,
 					'member_name' => $membername,
-				)
+				],
 			);
 			$updated['reports'] = Db::$db->affected_rows();
 		}
 
 		// Allow mods with their own post tables to reattribute posts as well :)
-		IntegrationHook::call('integrate_reattribute_posts', array($memID, $email, $membername, $post_count, &$updated));
+		IntegrationHook::call('integrate_reattribute_posts', [$memID, $email, $membername, $post_count, &$updated]);
 
 		return $updated;
 	}
@@ -2504,25 +2585,25 @@ protected function __construct()
 		Theme::loadTemplate('ManageMaintenance');
 
 		// This uses admin tabs - as it should!
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['maintain_title'],
 			'description' => Lang::$txt['maintain_info'],
-			'tabs' => array(
-				'routine' => array(),
-				'database' => array(),
-				'members' => array(),
-				'topics' => array(),
-			),
-		);
+			'tabs' => [
+				'routine' => [],
+				'database' => [],
+				'members' => [],
+				'topics' => [],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_maintenance', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_maintenance', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		// Doing something special?
-		if (isset($_REQUEST['activity']) && isset(self::$subactions[$this->subaction]['activities'][$_REQUEST['activity']]))
-		{
+		if (isset($_REQUEST['activity'], self::$subactions[$this->subaction]['activities'][$_REQUEST['activity']])) {
 			$this->activity = $_REQUEST['activity'];
 		}
 
@@ -2541,13 +2622,13 @@ protected function getIntegrationHooks(): array
 	{
 		static $integration_hooks;
 
-		if (!isset($integration_hooks))
-		{
-			$integration_hooks = array();
-			foreach (Config::$modSettings as $key => $value)
-			{
-				if (!empty($value) && substr($key, 0, 10) === 'integrate_')
+		if (!isset($integration_hooks)) {
+			$integration_hooks = [];
+
+			foreach (Config::$modSettings as $key => $value) {
+				if (!empty($value) && substr($key, 0, 10) === 'integrate_') {
 					$integration_hooks[$key] = explode(',', $value);
+				}
 			}
 		}
 
@@ -2570,16 +2651,16 @@ protected static function getFileRecursive(string $dirname): array
 			new \RecursiveIteratorIterator(
 				new \RecursiveCallbackFilterIterator(
 					new \RecursiveDirectoryIterator($dirname, \FilesystemIterator::UNIX_PATHS),
-					function ($fileInfo, $currentFile, $iterator)
-					{
+					function ($fileInfo, $currentFile, $iterator) {
 						// Allow recursion
-						if ($iterator->hasChildren())
+						if ($iterator->hasChildren()) {
 							return true;
+						}
 
 						return $fileInfo->getExtension() == 'php';
-					}
-				)
-			)
+					},
+				),
+			),
 		);
 	}
 
@@ -2593,7 +2674,7 @@ function ($fileInfo, $currentFile, $iterator)
 	protected static function parseIntegrationHook(string $hook, string $rawData): array
 	{
 		// A single string can hold tons of info!
-		$hookData = array(
+		$hookData = [
 			'object' => false,
 			'enabled' => true,
 			'absPath' => '',
@@ -2603,48 +2684,46 @@ protected static function parseIntegrationHook(string $hook, string $rawData): a
 			'class' => '',
 			'call' => '',
 			'rawData' => $rawData,
-		);
+		];
 
 		// Meh...
-		if (empty($rawData))
+		if (empty($rawData)) {
 			return $hookData;
+		}
 
 		$modFunc = $rawData;
 
 		// Any files?
-		if (substr($hook, -8) === '_include')
+		if (substr($hook, -8) === '_include') {
 			$modFunc = $modFunc . '|';
-		if (strpos($modFunc, '|') !== false)
-		{
-			list ($hookData['hookFile'], $modFunc) = explode('|', $modFunc);
-			$hookData['absPath'] = strtr(strtr(trim($hookData['hookFile']), array('$boarddir' => Config::$boarddir, '$sourcedir' => Config::$sourcedir, '$themedir' => Theme::$current->settings['theme_dir'] ?? '')), '\\', '/');
+		}
+
+		if (strpos($modFunc, '|') !== false) {
+			list($hookData['hookFile'], $modFunc) = explode('|', $modFunc);
+			$hookData['absPath'] = strtr(strtr(trim($hookData['hookFile']), ['$boarddir' => Config::$boarddir, '$sourcedir' => Config::$sourcedir, '$themedir' => Theme::$current->settings['theme_dir'] ?? '']), '\\', '/');
 		}
 
 		// Hook is an instance.
-		if (strpos($modFunc, '#') !== false)
-		{
+		if (strpos($modFunc, '#') !== false) {
 			$modFunc = str_replace('#', '', $modFunc);
 			$hookData['object'] = true;
 		}
 
 		// Hook is "disabled"
 		// May need to inspect $rawData here for includes...
-		if ((strpos($modFunc, '!') !== false) || (empty($modFunc) && (strpos($rawData, '!') !== false)))
-		{
+		if ((strpos($modFunc, '!') !== false) || (empty($modFunc) && (strpos($rawData, '!') !== false))) {
 			$modFunc = str_replace('!', '', $modFunc);
 			$hookData['enabled'] = false;
 		}
 
 		// Handling methods?
-		if (strpos($modFunc, '::') !== false)
-		{
-			list ($hookData['class'], $hookData['method']) = explode('::', $modFunc);
+		if (strpos($modFunc, '::') !== false) {
+			list($hookData['class'], $hookData['method']) = explode('::', $modFunc);
 			$hookData['pureFunc'] = $hookData['method'];
 			$hookData['call'] = $modFunc;
-		}
-
-		else
+		} else {
 			$hookData['call'] = $hookData['pureFunc'] = $modFunc;
+		}
 
 		return $hookData;
 	}
@@ -2655,18 +2734,18 @@ protected static function getDefinedFunctionsInFile(string $file): array
 		// token_get_all() is too slow so use a nice little regex instead.
 		preg_match_all('/\bnamespace\s++((?P>label)(?:\\\(?P>label))*+)\s*+;|\bclass\s++((?P>label))[\w\s]*+{|\bfunction\s++((?P>label))\s*+\(.*\)[:\|\w\s]*+{(?(DEFINE)(?<label>[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*+))/i', $source, $matches, PREG_SET_ORDER);
 
-		$functions = array();
+		$functions = [];
 		$namespace = '';
 		$class = '';
 
-		foreach ($matches as $match)
-		{
-			if (!empty($match[1]))
+		foreach ($matches as $match) {
+			if (!empty($match[1])) {
 				$namespace = $match[1] . '\\';
-			elseif (!empty($match[2]))
+			} elseif (!empty($match[2])) {
 				$class = $namespace . $match[2] . '::';
-			elseif (!empty($match[3]))
+			} elseif (!empty($match[3])) {
 				$functions[$class . $match[3]] = $file;
+			}
 		}
 
 		return $functions;
@@ -2674,7 +2753,8 @@ protected static function getDefinedFunctionsInFile(string $file): array
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Maintenance::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Maintenance::exportStatic')) {
 	Maintenance::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Membergroups.php b/Sources/Actions/Admin/Membergroups.php
index 9cf1d2bb56..8e0cbfa136 100644
--- a/Sources/Actions/Admin/Membergroups.php
+++ b/Sources/Actions/Admin/Membergroups.php
@@ -13,11 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
-use SMF\BBCodeParser;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\IntegrationHook;
@@ -29,7 +28,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class is concerned with anything in the Manage Membergroups admin screen.
@@ -43,13 +41,16 @@ class Membergroups implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ModifyMembergroups',
-			'getConfigVars' => false,
-		),
-	);
+			'AddMembergroup' => 'AddMembergroup',
+			'DeleteMembergroup' => 'DeleteMembergroup',
+			'EditMembergroup' => 'EditMembergroup',
+			'MembergroupIndex' => 'MembergroupIndex',
+			'ModifyMembergroupsettings' => 'ModifyMembergroupsettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -74,15 +75,15 @@ class Membergroups implements ActionInterface
 	 *
 	 * Format: 'sa' => array('method', 'required_permission')
 	 */
-	public static array $subactions = array(
-		'index' => array('index', 'manage_membergroups'),
-		'add' => array('add', 'manage_membergroups'),
-		'edit' => array('edit', 'manage_membergroups'),
-		'settings' => array('settings', 'admin_forum'),
+	public static array $subactions = [
+		'index' => ['index', 'manage_membergroups'],
+		'add' => ['add', 'manage_membergroups'],
+		'edit' => ['edit', 'manage_membergroups'],
+		'settings' => ['settings', 'admin_forum'],
 
 		// This subaction is handled by the Groups action.
-		'members' => array('SMF\\Actions\\Groups::call', 'manage_membergroups'),
-	);
+		'members' => ['SMF\\Actions\\Groups::call', 'manage_membergroups'],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -108,10 +109,11 @@ public function execute(): void
 		// Do the permission check, you might not be allowed here.
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -127,212 +129,203 @@ public function index(): void
 		Utils::$context['page_title'] = Lang::$txt['membergroups_title'];
 
 		// The first list shows the regular membergroups.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'regular_membergroups_list',
 			'title' => Lang::$txt['membergroups_regular'],
 			'base_href' => Config::$scripturl . '?action=admin;area=membergroups' . (isset($_REQUEST['sort2']) ? ';sort2=' . urlencode($_REQUEST['sort2']) : ''),
 			'default_sort_col' => 'name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => '\\SMF\\Actions\\Groups::list_getMembergroups',
-				'params' => array(
+				'params' => [
 					'regular',
-				),
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_name'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// Since the moderator group has no explicit members, no link is needed.
-							if ($rowData['id_group'] == 3)
-							{
+							if ($rowData['id_group'] == 3) {
 								$group_name = $rowData['group_name'];
-							}
-							else
-							{
+							} else {
 								$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', Config::$scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 
 							// Add a help option for moderator and administrator.
-							if ($rowData['id_group'] == 1)
-							{
+							if ($rowData['id_group'] == 1) {
 								$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', Config::$scripturl);
-							}
-							elseif ($rowData['id_group'] == 3)
-							{
+							} elseif ($rowData['id_group'] == 3) {
 								$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', Config::$scripturl);
 							}
 
 							return $group_name;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, mg.group_name',
 						'reverse' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, mg.group_name DESC',
-					),
-				),
-				'icons' => array(
-					'header' => array(
+					],
+				],
+				'icons' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_icons'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'icons',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.icons',
 						'reverse' => 'mg.icons DESC',
-					)
-				),
-				'members' => array(
-					'header' => array(
+					],
+				],
+				'members' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_members_top'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// No explicit members for the moderator group.
 							return $rowData['id_group'] == 3 ? Lang::$txt['membergroups_guests_na'] : Lang::numberFormat($rowData['num_members']);
 						},
 						'class' => 'centercol',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, 1',
 						'reverse' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, 1 DESC',
-					),
-				),
-				'modify' => array(
-					'header' => array(
+					],
+				],
+				'modify' => [
+					'header' => [
 						'value' => Lang::$txt['modify'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=membergroups;sa=edit;group=%1$d">' . Lang::$txt['membergroups_modify'] . '</a>',
-							'params' => array(
+							'params' => [
 								'id_group' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'above_column_headers',
 					'value' => '<a class="button" href="' . Config::$scripturl . '?action=admin;area=membergroups;sa=add;generalgroup">' . Lang::$txt['membergroups_add_group'] . '</a>',
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => '<a class="button" href="' . Config::$scripturl . '?action=admin;area=membergroups;sa=add;generalgroup">' . Lang::$txt['membergroups_add_group'] . '</a>',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
 		// The second list shows the post count based groups.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'post_count_membergroups_list',
 			'title' => Lang::$txt['membergroups_post'],
 			'base_href' => Config::$scripturl . '?action=admin;area=membergroups' . (isset($_REQUEST['sort']) ? ';sort=' . urlencode($_REQUEST['sort']) : ''),
 			'default_sort_col' => 'required_posts',
-			'request_vars' => array(
+			'request_vars' => [
 				'sort' => 'sort2',
 				'desc' => 'desc2',
-			),
-			'get_items' => array(
+			],
+			'get_items' => [
 				'function' => '\\SMF\\Actions\\Groups::list_getMembergroups',
-				'params' => array(
+				'params' => [
 					'post_count',
-				),
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_name'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$colorStyle = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 							return sprintf('<a href="%1$s?action=moderate;area=viewgroups;sa=members;group=%2$d"%3$s>%4$s</a>', Config::$scripturl, $rowData['id_group'], $colorStyle, $rowData['group_name']);
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.group_name',
 						'reverse' => 'mg.group_name DESC',
-					),
-				),
-				'icons' => array(
-					'header' => array(
+					],
+				],
+				'icons' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_icons'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'icons',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, icons',
 						'reverse' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, icons DESC',
-					)
-				),
-				'members' => array(
-					'header' => array(
+					],
+				],
+				'members' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_members_top'],
 						'class' => 'centercol',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'num_members',
 						'class' => 'centercol',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => '1 DESC',
 						'reverse' => '1',
-					),
-				),
-				'required_posts' => array(
-					'header' => array(
+					],
+				],
+				'required_posts' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_min_posts'],
 						'class' => 'centercol',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'min_posts',
 						'class' => 'centercol',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.min_posts',
 						'reverse' => 'mg.min_posts DESC',
-					),
-				),
-				'modify' => array(
-					'header' => array(
+					],
+				],
+				'modify' => [
+					'header' => [
 						'value' => Lang::$txt['modify'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=membergroups;sa=edit;group=%1$d">' . Lang::$txt['membergroups_modify'] . '</a>',
-							'params' => array(
+							'params' => [
 								'id_group' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '<a class="button" href="' . Config::$scripturl . '?action=admin;area=membergroups;sa=add;postgroup">' . Lang::$txt['membergroups_add_group'] . '</a>',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 	}
@@ -348,8 +341,7 @@ public function index(): void
 	public function add(): void
 	{
 		// A form was submitted, we can start adding.
-		if (isset($_POST['group_name']) && trim($_POST['group_name']) != '')
-		{
+		if (isset($_POST['group_name']) && trim($_POST['group_name']) != '') {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-mmg');
 
@@ -357,211 +349,214 @@ public function add(): void
 
 			$_POST['group_type'] = !isset($_POST['group_type']) || $_POST['group_type'] < 0 || $_POST['group_type'] > 3 || ($_POST['group_type'] == 1 && !User::$me->allowedTo('admin_forum')) ? 0 : (int) $_POST['group_type'];
 
-			IntegrationHook::call('integrate_pre_add_membergroup', array());
+			IntegrationHook::call('integrate_pre_add_membergroup', []);
 
-			$id_group = Db::$db->insert('',
+			$id_group = Db::$db->insert(
+				'',
 				'{db_prefix}membergroups',
-				array(
+				[
 					'description' => 'string', 'group_name' => 'string-80', 'min_posts' => 'int',
 					'icons' => 'string', 'online_color' => 'string', 'group_type' => 'int',
-				),
-				array(
+				],
+				[
 					'', Utils::htmlspecialchars($_POST['group_name'], ENT_QUOTES), ($postCountBasedGroup ? (int) $_POST['min_posts'] : '-1'),
 					'1#icon.png', '', $_POST['group_type'],
-				),
-				array('id_group'),
-				1
+				],
+				['id_group'],
+				1,
 			);
 
-			IntegrationHook::call('integrate_add_membergroup', array($id_group, $postCountBasedGroup));
+			IntegrationHook::call('integrate_add_membergroup', [$id_group, $postCountBasedGroup]);
 
 			// Update the post groups now, if this is a post group!
-			if (isset($_POST['min_posts']))
+			if (isset($_POST['min_posts'])) {
 				Logging::updateStats('postgroups');
+			}
 
 			// You cannot set permissions for post groups if they are disabled.
-			if ($postCountBasedGroup && empty(Config::$modSettings['permission_enable_postgroups']))
-			{
+			if ($postCountBasedGroup && empty(Config::$modSettings['permission_enable_postgroups'])) {
 				$_POST['perm_type'] = '';
 			}
 
-			if ($_POST['perm_type'] == 'predefined')
-			{
+			if ($_POST['perm_type'] == 'predefined') {
 				// Set default permission level.
 				Permissions::setPermissionLevel($_POST['level'], $id_group, 'null');
 			}
 			// Copy or inherit the permissions!
-			elseif ($_POST['perm_type'] == 'copy' || $_POST['perm_type'] == 'inherit')
-			{
+			elseif ($_POST['perm_type'] == 'copy' || $_POST['perm_type'] == 'inherit') {
 				$copy_id = $_POST['perm_type'] == 'copy' ? (int) $_POST['copyperm'] : (int) $_POST['inheritperm'];
 
 				@list($copy_from) = Group::load($copy_id);
 
-				if (!isset($copy_from))
+				if (!isset($copy_from)) {
 					ErrorHandler::fatalLang('membergroup_does_not_exist');
+				}
 
 				// Protected groups are... well, protected!
-				if (!User::$me->allowedTo('admin_forum') && $copy_from->type == Group::TYPE_PROTECTED)
-				{
+				if (!User::$me->allowedTo('admin_forum') && $copy_from->type == Group::TYPE_PROTECTED) {
 					ErrorHandler::fatalLang('membergroup_does_not_exist');
 				}
 
 				// Don't allow copying of a real privileged person!
 				$illegal_permissions = Permissions::loadIllegalPermissions();
 
-				$inserts = array();
-				$request = Db::$db->query('', '
-					SELECT permission, add_deny
+				$inserts = [];
+				$request = Db::$db->query(
+					'',
+					'SELECT permission, add_deny
 					FROM {db_prefix}permissions
 					WHERE id_group = {int:copy_from}',
-					array(
+					[
 						'copy_from' => $copy_id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if (empty($illegal_permissions) || !in_array($row['permission'], $illegal_permissions))
-					{
-						$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if (empty($illegal_permissions) || !in_array($row['permission'], $illegal_permissions)) {
+						$inserts[] = [$id_group, $row['permission'], $row['add_deny']];
 					}
 				}
 				Db::$db->free_result($request);
 
-				if (!empty($inserts))
-				{
-					Db::$db->insert('insert',
+				if (!empty($inserts)) {
+					Db::$db->insert(
+						'insert',
 						'{db_prefix}permissions',
-						array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+						['id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 						$inserts,
-						array('id_group', 'permission')
+						['id_group', 'permission'],
 					);
 				}
 
-				$inserts = array();
-				$request = Db::$db->query('', '
-					SELECT id_profile, permission, add_deny
+				$inserts = [];
+				$request = Db::$db->query(
+					'',
+					'SELECT id_profile, permission, add_deny
 					FROM {db_prefix}board_permissions
 					WHERE id_group = {int:copy_from}',
-					array(
+					[
 						'copy_from' => $copy_id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					$inserts[] = [$id_group, $row['id_profile'], $row['permission'], $row['add_deny']];
 				}
 				Db::$db->free_result($request);
 
-				if (!empty($inserts))
-				{
-					Db::$db->insert('insert',
+				if (!empty($inserts)) {
+					Db::$db->insert(
+						'insert',
 						'{db_prefix}board_permissions',
-						array('id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+						['id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 						$inserts,
-						array('id_group', 'id_profile', 'permission')
+						['id_group', 'id_profile', 'permission'],
 					);
 				}
 
 				// Also get some membergroup information if we're copying and not copying from guests...
-				if ($copy_id > 0 && $_POST['perm_type'] == 'copy')
-				{
+				if ($copy_id > 0 && $_POST['perm_type'] == 'copy') {
 					// ...and update the new membergroup with it.
-					Db::$db->query('', '
-						UPDATE {db_prefix}membergroups
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}membergroups
 						SET
 							online_color = {string:online_color},
 							max_messages = {int:max_messages},
 							icons = {string:icons}
 						WHERE id_group = {int:current_group}',
-						array(
+						[
 							'max_messages' => $copy_from->max_messages,
 							'current_group' => $id_group,
 							'online_color' => $copy_from->online_color,
 							'icons' => $copy_from->icons,
-						)
+						],
 					);
 				}
 				// If inheriting say so...
-				elseif ($_POST['perm_type'] == 'inherit')
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}membergroups
+				elseif ($_POST['perm_type'] == 'inherit') {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}membergroups
 						SET id_parent = {int:copy_from}
 						WHERE id_group = {int:current_group}',
-						array(
+						[
 							'copy_from' => $copy_id,
 							'current_group' => $id_group,
-						)
+						],
 					);
 				}
 			}
 
 			// Make sure all boards selected are stored in a proper array.
-			$accesses = empty($_POST['boardaccess']) || !is_array($_POST['boardaccess']) ? array() : $_POST['boardaccess'];
+			$accesses = empty($_POST['boardaccess']) || !is_array($_POST['boardaccess']) ? [] : $_POST['boardaccess'];
 
-			$changed_boards['allow'] = array();
-			$changed_boards['deny'] = array();
-			$changed_boards['ignore'] = array();
+			$changed_boards['allow'] = [];
+			$changed_boards['deny'] = [];
+			$changed_boards['ignore'] = [];
 
-			foreach ($accesses as $group_id => $action)
+			foreach ($accesses as $group_id => $action) {
 				$changed_boards[$action][] = (int) $group_id;
+			}
 
-			foreach (array('allow', 'deny') as $board_action)
-			{
+			foreach (['allow', 'deny'] as $board_action) {
 				// Only do this if they have special access requirements.
-				if (!empty($changed_boards[$board_action]))
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+				if (!empty($changed_boards[$board_action])) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 						WHERE id_board IN ({array_int:board_list})',
-						array(
+						[
 							'board_list' => $changed_boards[$board_action],
 							'blank_string' => '',
 							'group_id_string' => (string) $id_group,
 							'comma_group' => ',' . $id_group,
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
-						)
+						],
 					);
 
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}board_permissions_view
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}board_permissions_view
 						WHERE id_board IN ({array_int:board_list})
 							AND id_group = {int:group_id}
 							AND deny = {int:deny}',
-						array(
+						[
 							'board_list' => $changed_boards[$board_action],
 							'group_id' => $id_group,
 							'deny' => $board_action == 'allow' ? 0 : 1,
-						)
+						],
 					);
 
-					$insert = array();
+					$insert = [];
 
-					foreach ($changed_boards[$board_action] as $board_id)
-						$insert[] = array($id_group, $board_id, $board_action == 'allow' ? 0 : 1);
+					foreach ($changed_boards[$board_action] as $board_id) {
+						$insert[] = [$id_group, $board_id, $board_action == 'allow' ? 0 : 1];
+					}
 
-					Db::$db->insert('insert',
+					Db::$db->insert(
+						'insert',
 						'{db_prefix}board_permissions_view',
-						array('id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'),
+						['id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'],
 						$insert,
-						array('id_group', 'id_board', 'deny')
+						['id_group', 'id_board', 'deny'],
 					);
 				}
-
 			}
 
 			// If this is joinable then set it to show group membership in people's profiles.
-			if (empty(Config::$modSettings['show_group_membership']) && $_POST['group_type'] > 1)
-				Config::updateModSettings(array('show_group_membership' => 1));
+			if (empty(Config::$modSettings['show_group_membership']) && $_POST['group_type'] > 1) {
+				Config::updateModSettings(['show_group_membership' => 1]);
+			}
 
 			// Rebuild the group cache.
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'settings_updated' => time(),
-			));
+			]);
 
 			// We did it.
-			Logging::logAction('add_group', array('group' => Utils::htmlspecialchars($_POST['group_name'])), 'admin');
+			Logging::logAction('add_group', ['group' => Utils::htmlspecialchars($_POST['group_name'])], 'admin');
 
 			// Go change some more settings.
 			Utils::redirectexit('action=admin;area=membergroups;sa=edit;group=' . $id_group);
@@ -574,61 +569,62 @@ public function add(): void
 		Utils::$context['undefined_group'] = !isset($_REQUEST['postgroup']) && !isset($_REQUEST['generalgroup']);
 		Utils::$context['allow_protected'] = User::$me->allowedTo('admin_forum');
 
-		if (!empty(Config::$modSettings['deny_boards_access']))
+		if (!empty(Config::$modSettings['deny_boards_access'])) {
 			Lang::load('ManagePermissions');
+		}
 
 		// Load all the relevant member groups. Start with a clean slate.
-		Group::$loaded = array();
+		Group::$loaded = [];
 
 		Utils::$context['groups'] = Group::loadSimple(
 			Group::LOAD_NORMAL | (int) !empty(Config::$modSettings['permission_enable_postgroups']),
-			array(Group::GUEST, Group::REGULAR, Group::ADMIN, Group::MOD),
+			[Group::GUEST, Group::REGULAR, Group::ADMIN, Group::MOD],
 		);
 
 		Utils::$context['num_boards'] = 0;
-		Utils::$context['categories'] = array();
+		Utils::$context['categories'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level
+		$request = Db::$db->query(
+			'',
+			'SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 			ORDER BY board_order',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['num_boards']++;
 
 			// This category hasn't been set up yet..
-			if (!isset(Utils::$context['categories'][$row['id_cat']]))
-			{
-				Utils::$context['categories'][$row['id_cat']] = array(
+			if (!isset(Utils::$context['categories'][$row['id_cat']])) {
+				Utils::$context['categories'][$row['id_cat']] = [
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
-					'boards' => array()
-				);
+					'boards' => [],
+				];
 			}
 
 			// Set this board up, and let the template know when it's a child.  (indent them..)
-			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
+			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = [
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'child_level' => $row['child_level'],
 				'allow' => false,
-				'deny' => false
-			);
+				'deny' => false,
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Now, let's sort the list of categories into the boards for templates that like that.
-		$temp_boards = array();
-		foreach (Utils::$context['categories'] as $category)
-		{
-			$temp_boards[] = array(
+		$temp_boards = [];
+
+		foreach (Utils::$context['categories'] as $category) {
+			$temp_boards[] = [
 				'name' => $category['name'],
-				'child_ids' => array_keys($category['boards'])
-			);
+				'child_ids' => array_keys($category['boards']),
+			];
 
 			$temp_boards = array_merge($temp_boards, array_values($category['boards']));
 
@@ -652,19 +648,23 @@ public function edit(): void
 	{
 		$_REQUEST['group'] = isset($_REQUEST['group']) && $_REQUEST['group'] > 0 ? (int) $_REQUEST['group'] : 0;
 
-		if (!empty(Config::$modSettings['deny_boards_access']))
+		if (!empty(Config::$modSettings['deny_boards_access'])) {
 			Lang::load('ManagePermissions');
+		}
 
-		if (empty($_REQUEST['group']))
+		if (empty($_REQUEST['group'])) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
 		@list($group) = Group::load($_REQUEST['group']);
 
-		if (!isset($group) || !($group instanceof Group))
+		if (!isset($group) || !($group instanceof Group)) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
-		if (!User::$me->allowedTo('admin_forum') && $group->type === Group::TYPE_PROTECTED)
+		if (!User::$me->allowedTo('admin_forum') && $group->type === Group::TYPE_PROTECTED) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
 		// People who can manage boards are a bit special.
 		$board_managers = User::groupsAllowedTo('manage_boards', null);
@@ -675,53 +675,52 @@ public function edit(): void
 		Utils::$context['is_moderator_group'] = $group->is_moderator_group;
 
 		// Get a list of all the image formats we can select for icons.
-		$imageExts = array('png', 'jpg', 'jpeg', 'bmp', 'gif', 'svg');
+		$imageExts = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'svg'];
 
 		// Scan the icons directory.
-		Utils::$context['possible_icons'] = array();
+		Utils::$context['possible_icons'] = [];
 
-		if ($files = scandir(Theme::$current->settings['default_theme_dir'] . '/images/membericons'))
-		{
+		if ($files = scandir(Theme::$current->settings['default_theme_dir'] . '/images/membericons')) {
 			// Loop through every file in the directory.
-			foreach ($files as $value)
-			{
+			foreach ($files as $value) {
 				// Grab the image extension.
 				$ext = pathinfo(Theme::$current->settings['default_theme_dir'] . '/images/membericons/' . $value, PATHINFO_EXTENSION);
 
 				// If the extension is not empty, and it is valid.
-				if (!empty($ext) && in_array($ext, $imageExts))
+				if (!empty($ext) && in_array($ext, $imageExts)) {
 					Utils::$context['possible_icons'][] = $value;
+				}
 			}
 		}
 
 		// The delete this membergroup button was pressed.
-		if (isset($_POST['delete']))
-		{
+		if (isset($_POST['delete'])) {
 			$result = $group->delete();
 
 			// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-			if ($result === 'group_cannot_delete_sub')
+			if ($result === 'group_cannot_delete_sub') {
 				ErrorHandler::fatalLang('membergroups_cannot_delete_paid', false);
+			}
 
 			Utils::redirectexit('action=admin;area=membergroups;');
 		}
 		// A form was submitted with the new membergroup settings.
-		elseif (isset($_POST['save']))
-		{
+		elseif (isset($_POST['save'])) {
 			// Can they really inherit from this group?
-			if ($group->id > Group::ADMIN && $group->id != Group::MOD && isset($_POST['group_inherit']) && $_POST['group_inherit'] != Group::NONE && !User::$me->allowedTo('admin_forum'))
-			{
+			if ($group->id > Group::ADMIN && $group->id != Group::MOD && isset($_POST['group_inherit']) && $_POST['group_inherit'] != Group::NONE && !User::$me->allowedTo('admin_forum')) {
 				$_POST['group_inherit'] = (int) $_POST['group_inherit'];
 
-				if ($_POST['group_inherit'] > Group::ADMIN)
+				if ($_POST['group_inherit'] > Group::ADMIN) {
 					@list($inherit_from) = Group::load($_POST['group_inherit']);
+				}
 
-				if (isset($inherit_from) && ($inherit_from instanceof Group))
+				if (isset($inherit_from) && ($inherit_from instanceof Group)) {
 					$inherit_type = $inherit_from->type;
+				}
 			}
 
 			// Set variables to their proper value.
-			$group->set(array(
+			$group->set([
 				'max_messages' => isset($_POST['max_messages']) ? (int) $_POST['max_messages'] : 0,
 				'min_posts' => isset($_POST['min_posts']) && isset($_POST['group_type']) && $_POST['group_type'] == -1 && $group->id > Group::MOD ? abs($_POST['min_posts']) : ($group->id == Group::NEWBIE ? 0 : -1),
 				'icons' => (empty($_POST['icon_count']) || $_POST['icon_count'] < 0 || !in_array($_POST['icon_image'], Utils::$context['possible_icons'])) ? '' : min((int) $_POST['icon_count'], 99) . '#' . $_POST['icon_image'],
@@ -732,39 +731,37 @@ public function edit(): void
 				'parent' => $group->id > Group::ADMIN && $group->id != Group::MOD && (empty($inherit_type) || $inherit_type != Group::TYPE_PROTECTED) ? (int) $_POST['group_inherit'] : Group::NONE,
 				'tfa_required' => (empty(Config::$modSettings['tfa_mode']) || Config::$modSettings['tfa_mode'] != 2 || empty($_POST['group_tfa_force'])) ? false : true,
 				'online_color' => (int) $group->id != Group::MOD && preg_match('/^#?\w+$/', Utils::htmlTrim($_POST['online_color'])) ? Utils::htmlTrim($_POST['online_color']) : '',
-			));
+			]);
 
 			// Does the group have any moderators?
 			$moderator_string = isset($_POST['group_moderators']) ? trim($_POST['group_moderators']) : '';
-			if ((!empty($moderator_string) || !empty($_POST['moderator_list'])) && ($_POST['min_posts'] ?? -1) == -1 && $group->id != Group::MOD)
-			{
-				$group->moderator_ids = array();
+
+			if ((!empty($moderator_string) || !empty($_POST['moderator_list'])) && ($_POST['min_posts'] ?? -1) == -1 && $group->id != Group::MOD) {
+				$group->moderator_ids = [];
 
 				// Get all the usernames from the string.
-				if (!empty($moderator_string))
-				{
-					$moderator_string = strtr(Utils::entityFix(Utils::htmlspecialchars($moderator_string, ENT_QUOTES)), array('&quot;' => '"'));
+				if (!empty($moderator_string)) {
+					$moderator_string = strtr(Utils::entityFix(Utils::htmlspecialchars($moderator_string, ENT_QUOTES)), ['&quot;' => '"']);
 
 					preg_match_all('~"([^"]+)"~', $moderator_string, $matches);
 
 					$moderators = array_filter(array_map('trim', array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $moderator_string)))), 'strlen');
 
 					// Get the IDs of the named members.
-					if (!empty($moderators))
-					{
-						foreach (User::load($moderators, User::LOAD_BY_NAME, 'minimal') as $moderator)
+					if (!empty($moderators)) {
+						foreach (User::load($moderators, User::LOAD_BY_NAME, 'minimal') as $moderator) {
 							$group->moderator_ids[] = $moderator->id;
+						}
 					}
 				}
 
-				if (!empty($_POST['moderator_list']))
-				{
+				if (!empty($_POST['moderator_list'])) {
 					$moderators = array_filter(array_map('intval', $_POST['moderator_list']));
 
-					if (!empty($moderators))
-					{
-						foreach (User::load($moderators, User::LOAD_BY_ID, 'minimal') as $moderator)
+					if (!empty($moderators)) {
+						foreach (User::load($moderators, User::LOAD_BY_ID, 'minimal') as $moderator) {
 							$group->moderator_ids[] = $moderator->id;
+						}
 					}
 				}
 
@@ -776,24 +773,24 @@ public function edit(): void
 			$group->save();
 
 			// Time to update the boards this membergroup has access to.
-			$group->updateBoardAccess(empty($_POST['boardaccess']) || !is_array($_POST['boardaccess']) ? array() : $_POST['boardaccess']);
+			$group->updateBoardAccess(empty($_POST['boardaccess']) || !is_array($_POST['boardaccess']) ? [] : $_POST['boardaccess']);
 
 			// Let's check whether our "show group membership" setting is correct.
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}membergroups
 				WHERE group_type > {int:non_joinable}',
-				array(
+				[
 					'non_joinable' => Group::TYPE_PROTECTED,
-				)
+				],
 			);
 			list($have_joinable) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Do we need to update the setting?
-			if ((empty(Config::$modSettings['show_group_membership']) && $have_joinable) || (!empty(Config::$modSettings['show_group_membership']) && !$have_joinable))
-			{
-				Config::updateModSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			if ((empty(Config::$modSettings['show_group_membership']) && $have_joinable) || (!empty(Config::$modSettings['show_group_membership']) && !$have_joinable)) {
+				Config::updateModSettings(['show_group_membership' => $have_joinable ? 1 : 0]);
 			}
 
 			Utils::redirectexit('action=admin;area=membergroups');
@@ -802,8 +799,9 @@ public function edit(): void
 		// Fetch the current group information.
 		unset(Group::$loaded[$group->id]);
 
-		if (Group::load($group->id) === array())
+		if (Group::load($group->id) === []) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
 		$group = Group::$loaded[$group->id];
 
@@ -812,64 +810,64 @@ public function edit(): void
 		// Get any moderators for this group.
 		$group->loadModerators();
 
-		foreach ($group->moderator_ids as $mod_id)
+		foreach ($group->moderator_ids as $mod_id) {
 			$group->moderators[$mod_id] = User::$loaded[$mod_id]->name;
+		}
 
 		$group->moderator_list = empty($group->moderators) ? '' : '&quot;' . implode('&quot;, &quot;', $group->moderators) . '&quot;';
 
-		if (!empty($group->moderators))
-		{
+		if (!empty($group->moderators)) {
 			list($group->last_moderator_id) = array_slice(array_keys($group->moderators), -1);
 		}
 
 		Utils::$context['group'] = $group;
 
 		// Get a list of boards this membergroup is allowed to see.
-		Utils::$context['boards'] = array();
-		if ($group->id == Group::GLOBAL_MOD || $group->id >= Group::NEWBIE)
-		{
-			Utils::$context['categories'] = array();
-			$request = Db::$db->query('', '
-				SELECT b.id_cat, c.name as cat_name, b.id_board, b.name, b.child_level,
+		Utils::$context['boards'] = [];
+
+		if ($group->id == Group::GLOBAL_MOD || $group->id >= Group::NEWBIE) {
+			Utils::$context['categories'] = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_cat, c.name as cat_name, b.id_board, b.name, b.child_level,
 				FIND_IN_SET({string:current_group}, b.member_groups) != 0 AS can_access, FIND_IN_SET({string:current_group}, b.deny_member_groups) != 0 AS cannot_access
 				FROM {db_prefix}boards AS b
 					LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 				ORDER BY board_order',
-				array(
+				[
 					'current_group' => $group->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// This category hasn't been set up yet..
-				if (!isset(Utils::$context['categories'][$row['id_cat']]))
-				{
-					Utils::$context['categories'][$row['id_cat']] = array(
+				if (!isset(Utils::$context['categories'][$row['id_cat']])) {
+					Utils::$context['categories'][$row['id_cat']] = [
 						'id' => $row['id_cat'],
 						'name' => $row['cat_name'],
-						'boards' => array()
-					);
+						'boards' => [],
+					];
 				}
 
 				// Set this board up, and let the template know when it's a child.  (indent them..)
-				Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
+				Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = [
 					'id' => $row['id_board'],
 					'name' => $row['name'],
 					'child_level' => $row['child_level'],
 					'allow' => !(empty($row['can_access']) || $row['can_access'] == 'f'),
 					'deny' => !(empty($row['cannot_access']) || $row['cannot_access'] == 'f'),
-				);
+				];
 			}
 			Db::$db->free_result($request);
 
 			// Now, let's sort the list of categories into the boards for templates that like that.
-			$temp_boards = array();
-			foreach (Utils::$context['categories'] as $category)
-			{
-				$temp_boards[] = array(
+			$temp_boards = [];
+
+			foreach (Utils::$context['categories'] as $category) {
+				$temp_boards[] = [
 					'name' => $category['name'],
-					'child_ids' => array_keys($category['boards'])
-				);
+					'child_ids' => array_keys($category['boards']),
+				];
 				$temp_boards = array_merge($temp_boards, array_values($category['boards']));
 
 				// Include a list of boards per category for easy toggling.
@@ -878,35 +876,33 @@ public function edit(): void
 		}
 
 		// Insert our JS, if we have possible icons.
-		if (!empty(Utils::$context['possible_icons']))
-		{
-			Theme::loadJavaScriptFile('icondropdown.js', array('validate' => true, 'minimize' => true), 'smf_icondropdown');
+		if (!empty(Utils::$context['possible_icons'])) {
+			Theme::loadJavaScriptFile('icondropdown.js', ['validate' => true, 'minimize' => true], 'smf_icondropdown');
 		}
 
-		Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 
 		// Finally, get all the groups this could inherit from.
-		Utils::$context['inheritable_groups'] = array();
+		Utils::$context['inheritable_groups'] = [];
 
-		$query_customizations = array(
-			'where' => array(
+		$query_customizations = [
+			'where' => [
 				'id_group != {int:current_group}',
 				'id_group NOT IN ({array_int:disallowed})',
 				'id_parent = {int:not_inherited}',
 				empty(Config::$modSettings['permission_enable_postgroups']) ? 'min_posts = {int:min_posts}' : '1=1',
 				User::$me->allowedTo('admin_forum') ? '1=1' : 'group_type != {int:is_protected}',
-			),
-			'params' => array(
+			],
+			'params' => [
 				'current_group' => $group->id,
 				'min_posts' => -1,
-				'disallowed' => array(Group::ADMIN, Group::MOD),
+				'disallowed' => [Group::ADMIN, Group::MOD],
 				'not_inherited' => Group::NONE,
 				'is_protected' => Group::TYPE_PROTECTED,
-			),
-		);
+			],
+		];
 
-		foreach (Group::load(array(), $query_customizations) as $inheritable_group)
-		{
+		foreach (Group::load([], $query_customizations) as $inheritable_group) {
 			Utils::$context['inheritable_groups'][$inheritable_group->id] = $inheritable_group->name;
 		}
 
@@ -932,8 +928,7 @@ public function settings(): void
 
 		$config_vars = self::getConfigVars();
 
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			User::$me->checkSession();
 			IntegrationHook::call('integrate_save_membergroup_settings');
 
@@ -965,8 +960,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -987,11 +983,11 @@ public static function call(): void
 	public static function getConfigVars(): array
 	{
 		// Only one thing here!
-		$config_vars = array(
-			array('permissions', 'manage_membergroups'),
-		);
+		$config_vars = [
+			['permissions', 'manage_membergroups'],
+		];
 
-		IntegrationHook::call('integrate_modify_membergroup_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_membergroup_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1044,8 +1040,9 @@ public static function MembergroupIndex(): void
 	 */
 	public static function ModifyMembergroupsettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -1066,27 +1063,25 @@ protected function __construct()
 		Theme::loadTemplate('ManageMembergroups');
 
 		// Setup the admin tabs.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['membergroups_title'],
 			'help' => 'membergroups',
 			'description' => Lang::$txt['membergroups_description'],
-		);
+		];
 
-		IntegrationHook::call('integrate_manage_membergroups', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_membergroups', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
-		{
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
-		}
-		elseif (!User::$me->allowedTo('manage_membergroups'))
-		{
+		} elseif (!User::$me->allowedTo('manage_membergroups')) {
 			$this->subaction = 'settings';
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Membergroups::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Membergroups::exportStatic')) {
 	Membergroups::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Members.php b/Sources/Actions/Admin/Members.php
index 5ba035ea91..384627d965 100644
--- a/Sources/Actions/Admin/Members.php
+++ b/Sources/Actions/Admin/Members.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Group;
 use SMF\IntegrationHook;
 use SMF\IP;
@@ -29,7 +29,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Shows a list of members or a selection of members.
@@ -43,12 +42,17 @@ class Members implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ViewMembers',
-		),
-	);
+			'list_getMembers' => 'list_getMembers',
+			'list_getNumMembers' => 'list_getNumMembers',
+			'viewMemberlist' => 'ViewMemberlist',
+			'adminApprove' => 'AdminApprove',
+			'membersAwaitingActivation' => 'MembersAwaitingActivation',
+			'searchMembers' => 'SearchMembers',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -81,7 +85,7 @@ class Members implements ActionInterface
 	 *
 	 *
 	 */
-	public array $activation_numbers = array();
+	public array $activation_numbers = [];
 
 	/**
 	 * @var int
@@ -102,14 +106,14 @@ class Members implements ActionInterface
 	 *
 	 *
 	 */
-	public array $membergroups = array();
+	public array $membergroups = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	public array $postgroups = array();
+	public array $postgroups = [];
 
 	/**
 	 * @var int
@@ -129,13 +133,13 @@ class Members implements ActionInterface
 	 *
 	 * Format: 'sa' => array('method', 'required_permission')
 	 */
-	public static array $subactions = array(
-		'all' => array('view', 'moderate_forum'),
-		'approve' => array('approve', 'moderate_forum'),
-		'browse' => array('browse', 'moderate_forum'),
-		'search' => array('search', 'moderate_forum'),
-		'query' => array('view', 'moderate_forum'),
-	);
+	public static array $subactions = [
+		'all' => ['view', 'moderate_forum'],
+		'approve' => ['approve', 'moderate_forum'],
+		'browse' => ['browse', 'moderate_forum'],
+		'search' => ['search', 'moderate_forum'],
+		'query' => ['view', 'moderate_forum'],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -158,10 +162,11 @@ class Members implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -174,123 +179,115 @@ public function execute(): void
 	public function view()
 	{
 		// Are we performing a delete?
-		if (isset($_POST['delete_members']) && !empty($_POST['delete']) && User::$me->allowedTo('profile_remove_any'))
-		{
+		if (isset($_POST['delete_members']) && !empty($_POST['delete']) && User::$me->allowedTo('profile_remove_any')) {
 			User::$me->checkSession();
 
 			// Clean the input.
-			foreach ($_POST['delete'] as $key => $value)
-			{
+			foreach ($_POST['delete'] as $key => $value) {
 				// Don't delete yourself, idiot.
-				if ($value != User::$me->id)
+				if ($value != User::$me->id) {
 					$delete[$key] = (int) $value;
+				}
 			}
 
-			if (!empty($delete))
-			{
+			if (!empty($delete)) {
 				// Delete all the selected members.
 				User::delete($delete, true);
 			}
 		}
 
 		// Check input after a member search has been submitted.
-		if ($this->subaction == 'query')
-		{
+		if ($this->subaction == 'query') {
 			// Retrieving the membergroups and postgroups.
-			$this->membergroups = array();
-			$this->postgroups = array();
+			$this->membergroups = [];
+			$this->postgroups = [];
 
-			foreach (Group::loadSimple(Group::LOAD_BOTH, array(Group::GUEST, Group::MOD)) as $group)
-			{
-				if ($group->min_posts == -1)
-				{
+			foreach (Group::loadSimple(Group::LOAD_BOTH, [Group::GUEST, Group::MOD]) as $group) {
+				if ($group->min_posts == -1) {
 					$this->membergroups[] = $group;
-				}
-				else
-				{
+				} else {
 					$this->postgroups[] = $group;
 				}
 			}
 
 			// Some data about the form fields and how they are linked to the database.
-			$params = array(
-				'mem_id' => array(
-					'db_fields' => array('id_member'),
+			$params = [
+				'mem_id' => [
+					'db_fields' => ['id_member'],
 					'type' => 'int',
-					'range' => true
-				),
-				'age' => array(
-					'db_fields' => array('birthdate'),
+					'range' => true,
+				],
+				'age' => [
+					'db_fields' => ['birthdate'],
 					'type' => 'age',
-					'range' => true
-				),
-				'posts' => array(
-					'db_fields' => array('posts'),
+					'range' => true,
+				],
+				'posts' => [
+					'db_fields' => ['posts'],
 					'type' => 'int',
-					'range' => true
-				),
-				'reg_date' => array(
-					'db_fields' => array('date_registered'),
+					'range' => true,
+				],
+				'reg_date' => [
+					'db_fields' => ['date_registered'],
 					'type' => 'date',
-					'range' => true
-				),
-				'last_online' => array(
-					'db_fields' => array('last_login'),
+					'range' => true,
+				],
+				'last_online' => [
+					'db_fields' => ['last_login'],
 					'type' => 'date',
-					'range' => true
-				),
-				'activated' => array(
-					'db_fields' => array('CASE WHEN is_activated IN (1, 11) THEN 1 ELSE 0 END'),
+					'range' => true,
+				],
+				'activated' => [
+					'db_fields' => ['CASE WHEN is_activated IN (1, 11) THEN 1 ELSE 0 END'],
 					'type' => 'checkbox',
-					'values' => array('0', '1'),
-				),
-				'membername' => array(
-					'db_fields' => array('member_name', 'real_name'),
-					'type' => 'string'
-				),
-				'email' => array(
-					'db_fields' => array('email_address'),
-					'type' => 'string'
-				),
-				'website' => array(
-					'db_fields' => array('website_title', 'website_url'),
-					'type' => 'string'
-				),
-				'ip' => array(
-					'db_fields' => array('member_ip'),
-					'type' => 'inet'
-				),
-				'membergroups' => array(
-					'db_fields' => array('id_group'),
-					'type' => 'groups'
-				),
-				'postgroups' => array(
-					'db_fields' => array('id_group'),
-					'type' => 'groups'
-				)
-			);
-			$range_trans = array(
+					'values' => ['0', '1'],
+				],
+				'membername' => [
+					'db_fields' => ['member_name', 'real_name'],
+					'type' => 'string',
+				],
+				'email' => [
+					'db_fields' => ['email_address'],
+					'type' => 'string',
+				],
+				'website' => [
+					'db_fields' => ['website_title', 'website_url'],
+					'type' => 'string',
+				],
+				'ip' => [
+					'db_fields' => ['member_ip'],
+					'type' => 'inet',
+				],
+				'membergroups' => [
+					'db_fields' => ['id_group'],
+					'type' => 'groups',
+				],
+				'postgroups' => [
+					'db_fields' => ['id_group'],
+					'type' => 'groups',
+				],
+			];
+			$range_trans = [
 				'--' => '<',
 				'-' => '<=',
 				'=' => '=',
 				'+' => '>=',
-				'++' => '>'
-			);
+				'++' => '>',
+			];
 
-			IntegrationHook::call('integrate_view_members_params', array(&$params));
+			IntegrationHook::call('integrate_view_members_params', [&$params]);
 
-			$search_params = array();
-			if ($this->subaction == 'query' && !empty($_REQUEST['params']) && empty($_POST['types']))
-			{
+			$search_params = [];
+
+			if ($this->subaction == 'query' && !empty($_REQUEST['params']) && empty($_POST['types'])) {
 				$search_params = Utils::jsonDecode(base64_decode($_REQUEST['params']), true);
-			}
-			elseif (!empty($_POST))
-			{
+			} elseif (!empty($_POST)) {
 				$search_params['types'] = $_POST['types'];
-				foreach ($params as $param_name => $param_info)
-				{
-					if (isset($_POST[$param_name]))
+
+				foreach ($params as $param_name => $param_info) {
+					if (isset($_POST[$param_name])) {
 						$search_params[$param_name] = $_POST[$param_name];
+					}
 				}
 			}
 
@@ -299,58 +296,54 @@ public function view()
 			// @todo Validate a little more.
 
 			// Loop through every field of the form.
-			$query_parts = array();
-			$where_params = array();
-			foreach ($params as $param_name => $param_info)
-			{
+			$query_parts = [];
+			$where_params = [];
+
+			foreach ($params as $param_name => $param_info) {
 				// Not filled in?
-				if (!isset($search_params[$param_name]) || $search_params[$param_name] === '')
+				if (!isset($search_params[$param_name]) || $search_params[$param_name] === '') {
 					continue;
+				}
 
 				// Make sure numeric values are really numeric.
-				if (in_array($param_info['type'], array('int', 'age')))
-				{
+				if (in_array($param_info['type'], ['int', 'age'])) {
 					$search_params[$param_name] = (int) $search_params[$param_name];
 				}
 				// Date values have to match a date format that PHP recognizes.
-				elseif ($param_info['type'] == 'date')
-				{
+				elseif ($param_info['type'] == 'date') {
 					$search_params[$param_name] = strtotime($search_params[$param_name] . ' ' . User::getTimezone());
 
-					if (!is_int($search_params[$param_name]))
+					if (!is_int($search_params[$param_name])) {
 						continue;
-				}
-				elseif ($param_info['type'] == 'inet')
-				{
+					}
+				} elseif ($param_info['type'] == 'inet') {
 					$search_params[$param_name] = IP::ip2range($search_params[$param_name]);
 
-					if (empty($search_params[$param_name]))
+					if (empty($search_params[$param_name])) {
 						continue;
+					}
 				}
 
 				// Those values that are in some kind of range (<, <=, =, >=, >).
-				if (!empty($param_info['range']))
-				{
+				if (!empty($param_info['range'])) {
 					// Default to '=', just in case...
-					if (empty($range_trans[$search_params['types'][$param_name]]))
+					if (empty($range_trans[$search_params['types'][$param_name]])) {
 						$search_params['types'][$param_name] = '=';
+					}
 
 					// Handle special case 'age'.
-					if ($param_info['type'] == 'age')
-					{
+					if ($param_info['type'] == 'age') {
 						// All people that were born between $lowerlimit and $upperlimit are currently the specified age.
 						$datearray = getdate(time());
 						$upperlimit = sprintf('%04d-%02d-%02d', $datearray['year'] - $search_params[$param_name], $datearray['mon'], $datearray['mday']);
 						$lowerlimit = sprintf('%04d-%02d-%02d', $datearray['year'] - $search_params[$param_name] - 1, $datearray['mon'], $datearray['mday']);
 
-						if (in_array($search_params['types'][$param_name], array('-', '--', '=')))
-						{
+						if (in_array($search_params['types'][$param_name], ['-', '--', '='])) {
 							$query_parts[] = ($param_info['db_fields'][0]) . ' > {string:' . $param_name . '_minlimit}';
 							$where_params[$param_name . '_minlimit'] = ($search_params['types'][$param_name] == '--' ? $upperlimit : $lowerlimit);
 						}
 
-						if (in_array($search_params['types'][$param_name], array('+', '++', '=')))
-						{
+						if (in_array($search_params['types'][$param_name], ['+', '++', '='])) {
 							$query_parts[] = ($param_info['db_fields'][0]) . ' <= {string:' . $param_name . '_pluslimit}';
 							$where_params[$param_name . '_pluslimit'] = ($search_params['types'][$param_name] == '++' ? $lowerlimit : $upperlimit);
 
@@ -360,42 +353,32 @@ public function view()
 						}
 					}
 					// Special case - equals a date.
-					elseif ($param_info['type'] == 'date')
-					{
-						if ($search_params['types'][$param_name] == '=')
-						{
+					elseif ($param_info['type'] == 'date') {
+						if ($search_params['types'][$param_name] == '=') {
 							$query_parts[] = $param_info['db_fields'][0] . ' >= ' . $search_params[$param_name] . ' AND ' . $param_info['db_fields'][0] . ' < ' . ($search_params[$param_name] + 86400);
 						}
 						// Less than or equal to
-						elseif ($search_params['types'][$param_name] == '-')
-						{
+						elseif ($search_params['types'][$param_name] == '-') {
 							$query_parts[] = $param_info['db_fields'][0] . ' < ' . ($search_params[$param_name] + 86400);
 						}
 						// Greater than
-						elseif ($search_params['types'][$param_name] == '++')
-						{
+						elseif ($search_params['types'][$param_name] == '++') {
 							$query_parts[] = $param_info['db_fields'][0] . ' >= ' . ($search_params[$param_name] + 86400);
-						}
-						else
-						{
+						} else {
 							$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 						}
-					}
-					else
-					{
+					} else {
 						$query_parts[] = $param_info['db_fields'][0] . ' ' . $range_trans[$search_params['types'][$param_name]] . ' ' . $search_params[$param_name];
 					}
 				}
 				// Checkboxes.
-				elseif ($param_info['type'] == 'checkbox')
-				{
+				elseif ($param_info['type'] == 'checkbox') {
 					// Each checkbox or no checkbox at all is checked -> ignore.
 					if (
 						!is_array($search_params[$param_name])
 						|| count($search_params[$param_name]) == 0
 						|| count($search_params[$param_name]) == count($param_info['values'])
-					)
-					{
+					) {
 						continue;
 					}
 
@@ -404,34 +387,24 @@ public function view()
 					$where_params[$param_name . '_check'] = $search_params[$param_name];
 				}
 				// INET.
-				elseif ($param_info['type'] == 'inet')
-				{
-					if (count($search_params[$param_name]) === 1)
-					{
+				elseif ($param_info['type'] == 'inet') {
+					if (count($search_params[$param_name]) === 1) {
 						$query_parts[] = '(' . $param_info['db_fields'][0] . ' = {inet:' . $param_name . '})';
 
 						$where_params[$param_name] = $search_params[$param_name][0];
-					}
-					elseif (count($search_params[$param_name]) === 2)
-					{
+					} elseif (count($search_params[$param_name]) === 2) {
 						$query_parts[] = '(' . $param_info['db_fields'][0] . ' <= {inet:' . $param_name . '_high} and ' . $param_info['db_fields'][0] . ' >= {inet:' . $param_name . '_low})';
 
 						$where_params[$param_name . '_low'] = $search_params[$param_name]['low'];
 						$where_params[$param_name . '_high'] = $search_params[$param_name]['high'];
 					}
-
-				}
-				elseif ($param_info['type'] != 'groups')
-				{
+				} elseif ($param_info['type'] != 'groups') {
 					// Replace the wildcard characters ('*' and '?') into MySQL ones.
-					$parameter = strtolower(strtr(Utils::htmlspecialchars($search_params[$param_name], ENT_QUOTES), array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_')));
+					$parameter = strtolower(strtr(Utils::htmlspecialchars($search_params[$param_name], ENT_QUOTES), ['%' => '\\%', '_' => '\\_', '*' => '%', '?' => '_']));
 
-					if (Db::$db->case_sensitive)
-					{
+					if (Db::$db->case_sensitive) {
 						$query_parts[] = '(LOWER(' . implode(') LIKE {string:' . $param_name . '_normal} OR LOWER(', $param_info['db_fields']) . ') LIKE {string:' . $param_name . '_normal})';
-					}
-					else
-					{
+					} else {
 						$query_parts[] = '(' . implode(' LIKE {string:' . $param_name . '_normal} OR ', $param_info['db_fields']) . ' LIKE {string:' . $param_name . '_normal})';
 					}
 
@@ -440,11 +413,10 @@ public function view()
 			}
 
 			// Set up the membergroup query part.
-			$mg_query_parts = array();
+			$mg_query_parts = [];
 
 			// Primary membergroups, but only if at least was was not selected.
-			if (!empty($search_params['membergroups'][1]) && count($this->membergroups) != count($search_params['membergroups'][1]))
-			{
+			if (!empty($search_params['membergroups'][1]) && count($this->membergroups) != count($search_params['membergroups'][1])) {
 				$mg_query_parts[] = 'mem.id_group IN ({array_int:group_check})';
 				$where_params['group_check'] = $search_params['membergroups'][1];
 			}
@@ -456,22 +428,20 @@ public function view()
 					empty($search_params['membergroups'][1])
 					|| count($this->membergroups) != count($search_params['membergroups'][1])
 				)
-			)
-			{
-				foreach ($search_params['membergroups'][2] as $mg)
-				{
+			) {
+				foreach ($search_params['membergroups'][2] as $mg) {
 					$mg_query_parts[] = 'FIND_IN_SET({int:add_group_' . $mg . '}, mem.additional_groups) != 0';
 					$where_params['add_group_' . $mg] = $mg;
 				}
 			}
 
 			// Combine the one or two membergroup parts into one query part linked with an OR.
-			if (!empty($mg_query_parts))
+			if (!empty($mg_query_parts)) {
 				$query_parts[] = '(' . implode(' OR ', $mg_query_parts) . ')';
+			}
 
 			// Get all selected post count related membergroups.
-			if (!empty($search_params['postgroups']) && count($search_params['postgroups']) != count($this->postgroups))
-			{
+			if (!empty($search_params['postgroups']) && count($search_params['postgroups']) != count($this->postgroups)) {
 				$query_parts[] = 'id_post_group IN ({array_int:post_groups})';
 				$where_params['post_groups'] = $search_params['postgroups'];
 			}
@@ -479,9 +449,7 @@ public function view()
 			// Construct the where part of the query.
 			$where = empty($query_parts) ? '1=1' : implode('
 				AND ', $query_parts);
-		}
-		else
-		{
+		} else {
 			$search_url_params = null;
 		}
 
@@ -491,123 +459,119 @@ public function view()
 		// Get the title and sub template ready..
 		Utils::$context['page_title'] = Lang::$txt['admin_members'];
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'member_list',
 			'title' => Lang::$txt['members_list'],
 			'items_per_page' => Config::$modSettings['defaultMaxMembers'],
 			'base_href' => Config::$scripturl . '?action=admin;area=viewmembers' . $params_url,
 			'default_sort_col' => 'user_name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getMembers',
-				'params' => array(
-					isset($where) ? $where : '1=1',
-					isset($where_params) ? $where_params : array(),
-				),
-			),
-			'get_count' => array(
+				'params' => [
+					$where ?? '1=1',
+					$where_params ?? [],
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumMembers',
-				'params' => array(
-					isset($where) ? $where : '1=1',
-					isset($where_params) ? $where_params : array(),
-				),
-			),
-			'columns' => array(
-				'id_member' => array(
-					'header' => array(
+				'params' => [
+					$where ?? '1=1',
+					$where_params ?? [],
+				],
+			],
+			'columns' => [
+				'id_member' => [
+					'header' => [
 						'value' => Lang::$txt['member_id'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'id_member',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'id_member',
 						'reverse' => 'id_member DESC',
-					),
-				),
-				'user_name' => array(
-					'header' => array(
+					],
+				],
+				'user_name' => [
+					'header' => [
 						'value' => Lang::$txt['username'],
-					),
-					'data' => array(
-						'sprintf' => array(
-							'format' => '<a href="' . strtr(Config::$scripturl, array('%' => '%%')) . '?action=profile;u=%1$d">%2$s</a>',
-							'params' => array(
+					],
+					'data' => [
+						'sprintf' => [
+							'format' => '<a href="' . strtr(Config::$scripturl, ['%' => '%%']) . '?action=profile;u=%1$d">%2$s</a>',
+							'params' => [
 								'id_member' => false,
 								'member_name' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'member_name',
 						'reverse' => 'member_name DESC',
-					),
-				),
-				'display_name' => array(
-					'header' => array(
+					],
+				],
+				'display_name' => [
+					'header' => [
 						'value' => Lang::$txt['display_name'],
-					),
-					'data' => array(
-						'sprintf' => array(
-							'format' => '<a href="' . strtr(Config::$scripturl, array('%' => '%%')) . '?action=profile;u=%1$d">%2$s</a>',
-							'params' => array(
+					],
+					'data' => [
+						'sprintf' => [
+							'format' => '<a href="' . strtr(Config::$scripturl, ['%' => '%%']) . '?action=profile;u=%1$d">%2$s</a>',
+							'params' => [
 								'id_member' => false,
 								'real_name' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'real_name',
 						'reverse' => 'real_name DESC',
-					),
-				),
-				'email' => array(
-					'header' => array(
+					],
+				],
+				'email' => [
+					'header' => [
 						'value' => Lang::$txt['email_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="mailto:%1$s">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'email_address' => true,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'email_address',
 						'reverse' => 'email_address DESC',
-					),
-				),
-				'ip' => array(
-					'header' => array(
+					],
+				],
+				'ip' => [
+					'header' => [
 						'value' => Lang::$txt['ip_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
-							'format' => '<a href="' . strtr(Config::$scripturl, array('%' => '%%')) . '?action=trackip;searchip=%1$s">%1$s</a>',
-							'params' => array(
+					],
+					'data' => [
+						'sprintf' => [
+							'format' => '<a href="' . strtr(Config::$scripturl, ['%' => '%%']) . '?action=trackip;searchip=%1$s">%1$s</a>',
+							'params' => [
 								'member_ip' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'member_ip',
 						'reverse' => 'member_ip DESC',
-					),
-				),
-				'last_active' => array(
-					'header' => array(
+					],
+				],
+				'last_active' => [
+					'header' => [
 						'value' => Lang::$txt['viewmembers_online'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// Calculate number of days since last online.
-							if (empty($rowData['last_login']))
-							{
+							if (empty($rowData['last_login'])) {
 								$difference = Lang::$txt['never'];
-							}
-							else
-							{
+							} else {
 								$tz = timezone_open(User::getTimezone());
 								$today = new \DateTime('today', $tz);
 								$prev = (new \DateTime('@' . $rowData['last_login']))->setTimezone($tz)->setTime(0, 0, 0, 0);
@@ -615,78 +579,74 @@ public function view()
 								$num_days_difference = $prev->diff($today)->days;
 
 								// Today.
-								if (empty($num_days_difference))
-								{
+								if (empty($num_days_difference)) {
 									$difference = Lang::$txt['viewmembers_today'];
 								}
 								// Yesterday.
-								elseif ($num_days_difference == 1)
-								{
+								elseif ($num_days_difference == 1) {
 									$difference = sprintf('1 %1$s', Lang::$txt['viewmembers_day_ago']);
 								}
 								// X days ago.
-								else
-								{
+								else {
 									$difference = sprintf('%1$d %2$s', $num_days_difference, Lang::$txt['viewmembers_days_ago']);
 								}
 							}
 
 							// Show it in italics if they're not activated...
-							if ($rowData['is_activated'] % 10 != 1)
-							{
+							if ($rowData['is_activated'] % 10 != 1) {
 								$difference = sprintf('<em title="%1$s">%2$s</em>', Lang::$txt['not_activated'], $difference);
 							}
 
 							return $difference;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'last_login DESC',
 						'reverse' => 'last_login',
-					),
-				),
-				'posts' => array(
-					'header' => array(
+					],
+				],
+				'posts' => [
+					'header' => [
 						'value' => Lang::$txt['member_postcount'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'posts',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'posts',
 						'reverse' => 'posts DESC',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="checkbox" name="delete[]" value="' . $rowData['id_member'] . '"' . ($rowData['id_member'] == User::$me->id || $rowData['id_group'] == 1 || in_array(1, explode(',', $rowData['additional_groups'])) ? ' disabled' : '') . '>';
 						},
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=viewmembers' . $params_url,
 				'include_start' => true,
 				'include_sort' => true,
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="delete_members" value="' . Lang::$txt['admin_delete_members'] . '" data-confirm="' . Lang::$txt['confirm_delete_members'] . '" class="button you_sure">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Without enough permissions, don't show 'delete members' checkboxes.
-		if (!User::$me->allowedTo('profile_remove_any'))
+		if (!User::$me->allowedTo('profile_remove_any')) {
 			unset($listOptions['cols']['check'], $listOptions['form'], $listOptions['additional_rows']);
+		}
 
 		new ItemList($listOptions);
 
@@ -703,17 +663,13 @@ public function view()
 	public function search()
 	{
 		// Get a list of all the membergroups and postgroups that can be selected.
-		$this->membergroups = array();
-		$this->postgroups = array();
+		$this->membergroups = [];
+		$this->postgroups = [];
 
-		foreach (Group::loadSimple(Group::LOAD_BOTH, array(Group::GUEST, Group::MOD)) as $group)
-		{
-			if ($group->min_posts == -1)
-			{
+		foreach (Group::loadSimple(Group::LOAD_BOTH, [Group::GUEST, Group::MOD]) as $group) {
+			if ($group->min_posts == -1) {
 				$this->membergroups[] = $group;
-			}
-			else
-			{
+			} else {
 				$this->postgroups[] = $group;
 			}
 		}
@@ -737,36 +693,34 @@ public function browse()
 		Utils::$context['page_title'] = Lang::$txt['admin_members'];
 		Utils::$context['sub_template'] = 'admin_browse';
 
-		$browse_type = isset($_REQUEST['type']) ? $_REQUEST['type'] : (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1 ? 'activate' : 'approve');
+		$browse_type = $_REQUEST['type'] ?? (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 1 ? 'activate' : 'approve');
 
-		if (isset(Utils::$context['tabs'][$browse_type]))
+		if (isset(Utils::$context['tabs'][$browse_type])) {
 			Utils::$context['tabs'][$browse_type]['is_selected'] = true;
+		}
 
 		// Allowed filters are those we can have, in theory.
-		$allowed_filters = $browse_type == 'approve' ? array(3, 4, 5) : array(0, 2);
+		$allowed_filters = $browse_type == 'approve' ? [3, 4, 5] : [0, 2];
 
 		$this->current_filter = isset($_REQUEST['filter']) && in_array($_REQUEST['filter'], $allowed_filters) && !empty($this->activation_numbers[$_REQUEST['filter']]) ? (int) $_REQUEST['filter'] : -1;
 
 		// Sort out the different sub areas that we can actually filter by.
-		$available_filters = array();
+		$available_filters = [];
 
-		foreach ($this->activation_numbers as $type => $amount)
-		{
+		foreach ($this->activation_numbers as $type => $amount) {
 			// We have some of these...
-			if (in_array($type, $allowed_filters) && $amount > 0)
-			{
-				$available_filters[] = array(
+			if (in_array($type, $allowed_filters) && $amount > 0) {
+				$available_filters[] = [
 					'type' => $type,
 					'amount' => $amount,
-					'desc' => isset(Lang::$txt['admin_browse_filter_type_' . $type]) ? Lang::$txt['admin_browse_filter_type_' . $type] : '?',
-					'selected' => $type == $this->current_filter
-				);
+					'desc' => Lang::$txt['admin_browse_filter_type_' . $type] ?? '?',
+					'selected' => $type == $this->current_filter,
+				];
 			}
 		}
 
 		// If the filter was not sent, set it to whatever has people in it!
-		if ($this->current_filter == -1 && !empty($available_filters[0]['amount']))
-		{
+		if ($this->current_filter == -1 && !empty($available_filters[0]['amount'])) {
 			$this->current_filter = $available_filters[0]['type'];
 		}
 
@@ -774,51 +728,46 @@ public function browse()
 		$show_filter = ($this->current_filter != 0 && $this->current_filter != 3) || count($available_filters) > 1;
 
 		// The columns that can be sorted.
-		Utils::$context['columns'] = array(
-			'id_member' => array('label' => Lang::$txt['admin_browse_id']),
-			'member_name' => array('label' => Lang::$txt['admin_browse_username']),
-			'email_address' => array('label' => Lang::$txt['admin_browse_email']),
-			'member_ip' => array('label' => Lang::$txt['admin_browse_ip']),
-			'date_registered' => array('label' => Lang::$txt['admin_browse_registered']),
-		);
+		Utils::$context['columns'] = [
+			'id_member' => ['label' => Lang::$txt['admin_browse_id']],
+			'member_name' => ['label' => Lang::$txt['admin_browse_username']],
+			'email_address' => ['label' => Lang::$txt['admin_browse_email']],
+			'member_ip' => ['label' => Lang::$txt['admin_browse_ip']],
+			'date_registered' => ['label' => Lang::$txt['admin_browse_registered']],
+		];
 
 		// Are we showing duplicate information?
-		if (isset($_GET['showdupes']))
+		if (isset($_GET['showdupes'])) {
 			$_SESSION['showdupes'] = (int) $_GET['showdupes'];
+		}
 
 		$show_duplicates = !empty($_SESSION['showdupes']);
 
 		// Determine which actions we should allow on this page.
-		if ($browse_type == 'approve')
-		{
+		if ($browse_type == 'approve') {
 			// If we are approving deleted accounts we have a slightly different list... actually a mirror ;)
-			if ($this->current_filter == 4)
-			{
-				$allowed_actions = array(
+			if ($this->current_filter == 4) {
+				$allowed_actions = [
 					'reject' => Lang::$txt['admin_browse_w_approve_deletion'],
 					'ok' => Lang::$txt['admin_browse_w_reject'],
-				);
-			}
-			else
-			{
-				$allowed_actions = array(
-					'ok' => Lang::$txt['admin_browse_w_approve'] .' '. Lang::$txt['admin_browse_no_email'],
+				];
+			} else {
+				$allowed_actions = [
+					'ok' => Lang::$txt['admin_browse_w_approve'] . ' ' . Lang::$txt['admin_browse_no_email'],
 					'okemail' => Lang::$txt['admin_browse_w_approve'] . ' ' . Lang::$txt['admin_browse_w_email'],
 					'require_activation' => Lang::$txt['admin_browse_w_approve_require_activate'],
 					'reject' => Lang::$txt['admin_browse_w_reject'],
 					'rejectemail' => Lang::$txt['admin_browse_w_reject'] . ' ' . Lang::$txt['admin_browse_w_email'],
-				);
+				];
 			}
-		}
-		elseif ($browse_type == 'activate')
-		{
-			$allowed_actions = array(
+		} elseif ($browse_type == 'activate') {
+			$allowed_actions = [
 				'ok' => Lang::$txt['admin_browse_w_activate'],
 				'okemail' => Lang::$txt['admin_browse_w_activate'] . ' ' . Lang::$txt['admin_browse_w_email'],
 				'delete' => Lang::$txt['admin_browse_w_delete'],
 				'deleteemail' => Lang::$txt['admin_browse_w_delete'] . ' ' . Lang::$txt['admin_browse_w_email'],
 				'remind' => Lang::$txt['admin_browse_w_remind'] . ' ' . Lang::$txt['admin_browse_w_email'],
-			);
+			];
 		}
 
 		// Create an option list for actions allowed to be done with selected members.
@@ -826,8 +775,7 @@ public function browse()
 				<option selected value="">' . Lang::$txt['admin_browse_with_selected'] . ':</option>
 				<option value="" disabled>-----------------------------</option>';
 
-		foreach ($allowed_actions as $key => $desc)
-		{
+		foreach ($allowed_actions as $key => $desc) {
 			$action_options .= '
 				<option value="' . $key . '">' . $desc . '</option>';
 		}
@@ -842,8 +790,7 @@ function onSelectChange()
 				var message = "";';
 
 		// We have special messages for approving deletion of accounts - it's surprisingly logical - honest.
-		if ($this->current_filter == 4)
-		{
+		if ($this->current_filter == 4) {
 			$javascript .= '
 				if (document.forms.postForm.todo.value.indexOf("reject") != -1)
 					message = "' . Lang::$txt['admin_browse_w_delete'] . '";
@@ -851,8 +798,7 @@ function onSelectChange()
 					message = "' . Lang::$txt['admin_browse_w_reject'] . '";';
 		}
 		// Otherwise a nice standard message.
-		else
-		{
+		else {
 			$javascript .= '
 				if (document.forms.postForm.todo.value.indexOf("delete") != -1)
 					message = "' . Lang::$txt['admin_browse_w_delete'] . '";
@@ -869,174 +815,169 @@ function onSelectChange()
 					document.forms.postForm.submit();
 			}';
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'approve_list',
 			'items_per_page' => Config::$modSettings['defaultMaxMembers'],
 			'base_href' => Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=' . $browse_type . (!empty($show_filter) ? ';filter=' . $this->current_filter : ''),
 			'default_sort_col' => 'date_registered',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getMembers',
-				'params' => array(
+				'params' => [
 					'is_activated = {int:activated_status}',
-					array('activated_status' => $this->current_filter),
+					['activated_status' => $this->current_filter],
 					$show_duplicates,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumMembers',
-				'params' => array(
+				'params' => [
 					'is_activated = {int:activated_status}',
-					array('activated_status' => $this->current_filter),
-				),
-			),
-			'columns' => array(
-				'id_member' => array(
-					'header' => array(
+					['activated_status' => $this->current_filter],
+				],
+			],
+			'columns' => [
+				'id_member' => [
+					'header' => [
 						'value' => Lang::$txt['member_id'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'id_member',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'id_member',
 						'reverse' => 'id_member DESC',
-					),
-				),
-				'user_name' => array(
-					'header' => array(
+					],
+				],
+				'user_name' => [
+					'header' => [
 						'value' => Lang::$txt['username'],
-					),
-					'data' => array(
-						'sprintf' => array(
-							'format' => '<a href="' . strtr(Config::$scripturl, array('%' => '%%')) . '?action=profile;u=%1$d">%2$s</a>',
-							'params' => array(
+					],
+					'data' => [
+						'sprintf' => [
+							'format' => '<a href="' . strtr(Config::$scripturl, ['%' => '%%']) . '?action=profile;u=%1$d">%2$s</a>',
+							'params' => [
 								'id_member' => false,
 								'member_name' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'member_name',
 						'reverse' => 'member_name DESC',
-					),
-				),
-				'email' => array(
-					'header' => array(
+					],
+				],
+				'email' => [
+					'header' => [
 						'value' => Lang::$txt['email_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="mailto:%1$s">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'email_address' => true,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'email_address',
 						'reverse' => 'email_address DESC',
-					),
-				),
-				'ip' => array(
-					'header' => array(
+					],
+				],
+				'ip' => [
+					'header' => [
 						'value' => Lang::$txt['ip_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
-							'format' => '<a href="' . strtr(Config::$scripturl, array('%' => '%%')) . '?action=trackip;searchip=%1$s">%1$s</a>',
-							'params' => array(
+					],
+					'data' => [
+						'sprintf' => [
+							'format' => '<a href="' . strtr(Config::$scripturl, ['%' => '%%']) . '?action=trackip;searchip=%1$s">%1$s</a>',
+							'params' => [
 								'member_ip' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'member_ip',
 						'reverse' => 'member_ip DESC',
-					),
-				),
-				'hostname' => array(
-					'header' => array(
+					],
+				],
+				'hostname' => [
+					'header' => [
 						'value' => Lang::$txt['hostname'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$ip = new IP($rowData['member_ip']);
+
 							return $ip->getHost();
 						},
 						'class' => 'smalltext',
-					),
-				),
-				'date_registered' => array(
-					'header' => array(
+					],
+				],
+				'date_registered' => [
+					'header' => [
 						'value' => $this->current_filter == 4 ? Lang::$txt['viewmembers_online'] : Lang::$txt['date_registered'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return Time::create('@' . $rowData[$this->current_filter == 4 ? 'last_login' : 'date_registered'])->format();
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => $this->current_filter == 4 ? 'mem.last_login DESC' : 'date_registered DESC',
 						'reverse' => $this->current_filter == 4 ? 'mem.last_login' : 'date_registered',
-					),
-				),
-				'duplicates' => array(
-					'header' => array(
+					],
+				],
+				'duplicates' => [
+					'header' => [
 						'value' => Lang::$txt['duplicates'],
 						// Make sure it doesn't go too wide.
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
-							$member_links = array();
-
-							foreach ($rowData['duplicate_members'] as $member)
-							{
-								if ($member['id'])
-								{
+					],
+					'data' => [
+						'function' => function ($rowData) {
+							$member_links = [];
+
+							foreach ($rowData['duplicate_members'] as $member) {
+								if ($member['id']) {
 									$member_links[] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $member['id'] . '" ' . (!empty($member['is_banned']) ? 'class="red"' : '') . '>' . $member['name'] . '</a>';
-								}
-								else
-								{
+								} else {
 									$member_links[] = $member['name'] . ' (' . Lang::$txt['guest'] . ')';
 								}
 							}
+
 							return implode(', ', $member_links);
 						},
 						'class' => 'smalltext',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="todoAction[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id_member' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
+					],
+				],
+			],
 			'javascript' => $javascript,
-			'form' => array(
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=viewmembers;sa=approve;type=' . $browse_type,
 				'name' => 'postForm',
 				'include_start' => true,
 				'include_sort' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					'orig_filter' => $this->current_filter,
-				),
-			),
-			'additional_rows' => array(
-				array(
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '
 						<a href="' . Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;showdupes=' . ($show_duplicates ? 0 : 1) . ';type=' . $browse_type . (!empty($show_filter) ? ';filter=' . $this->current_filter : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '" class="button floatnone">' . ($show_duplicates ? Lang::$txt['dont_check_for_duplicate'] : Lang::$txt['check_for_duplicate']) . '</a>
@@ -1046,56 +987,51 @@ function onSelectChange()
 						<noscript><input type="submit" value="' . Lang::$txt['go'] . '" class="button"><br class="clear_right"></noscript>
 					',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Pick what column to actually include if we're showing duplicates.
-		if ($show_duplicates)
-		{
+		if ($show_duplicates) {
 			unset($listOptions['columns']['email']);
-		}
-		else
-		{
+		} else {
 			unset($listOptions['columns']['duplicates']);
 		}
 
 		// Only show hostname on duplicates as it takes a lot of time.
-		if (!$show_duplicates || !empty(Config::$modSettings['disableHostnameLookup']))
-		{
+		if (!$show_duplicates || !empty(Config::$modSettings['disableHostnameLookup'])) {
 			unset($listOptions['columns']['hostname']);
 		}
 
 		// Is there any need to show filters?
-		if (isset($available_filters) && count($available_filters) > 1)
-		{
+		if (isset($available_filters) && count($available_filters) > 1) {
 			$filterOptions = '
 				<strong>' . Lang::$txt['admin_browse_filter_by'] . ':</strong>
 				<select name="filter" onchange="this.form.submit();">';
 
-			foreach ($available_filters as $filter)
+			foreach ($available_filters as $filter) {
 				$filterOptions .= '
 					<option value="' . $filter['type'] . '"' . ($filter['selected'] ? ' selected' : '') . '>' . $filter['desc'] . ' - ' . $filter['amount'] . ' ' . ($filter['amount'] == 1 ? Lang::$txt['user'] : Lang::$txt['users']) . '</option>';
+			}
 
 			$filterOptions .= '
 				</select>
 				<noscript><input type="submit" value="' . Lang::$txt['go'] . '" name="filter" class="button"></noscript>';
 
-			$listOptions['additional_rows'][] = array(
+			$listOptions['additional_rows'][] = [
 				'position' => 'top_of_list',
 				'value' => $filterOptions,
 				'class' => 'righttext',
-			);
+			];
 		}
 
 		// What about if we only have one filter, but it's not the "standard" filter - show them what they are looking at.
-		if (!empty($show_filter) && !empty($available_filters))
-		{
-			$listOptions['additional_rows'][] = array(
+		if (!empty($show_filter) && !empty($available_filters)) {
+			$listOptions['additional_rows'][] = [
 				'position' => 'above_column_headers',
-				'value' => '<strong>' . Lang::$txt['admin_browse_filter_show'] . ':</strong> ' . ((isset($this->current_filter) && isset(Lang::$txt['admin_browse_filter_type_' . $this->current_filter])) ? Lang::$txt['admin_browse_filter_type_' . $this->current_filter] : $available_filters[0]['desc']),
+				'value' => '<strong>' . Lang::$txt['admin_browse_filter_show'] . ':</strong> ' . ((isset($this->current_filter, Lang::$txt['admin_browse_filter_type_' . $this->current_filter])) ? Lang::$txt['admin_browse_filter_type_' . $this->current_filter] : $available_filters[0]['desc']),
 				'class' => 'filter_row generic_list_wrapper smalltext',
-			);
+			];
 		}
 
 		// Now that we have all the options, create the list.
@@ -1122,111 +1058,105 @@ public function approve()
 		$current_filter = (int) $_REQUEST['orig_filter'];
 
 		// If we are applying a filter do just that - then redirect.
-		if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter'])
-		{
+		if (isset($_REQUEST['filter']) && $_REQUEST['filter'] != $_REQUEST['orig_filter']) {
 			Utils::redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $_REQUEST['filter'] . ';start=' . $_REQUEST['start']);
 		}
 
 		// Nothing to do?
-		if (!isset($_POST['todoAction']) && !isset($_POST['time_passed']))
-		{
+		if (!isset($_POST['todoAction']) && !isset($_POST['time_passed'])) {
 			Utils::redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
 		}
 
 		// Are we dealing with members who have been waiting for > set amount of time?
-		if (isset($_POST['time_passed']))
-		{
+		if (isset($_POST['time_passed'])) {
 			$timeBefore = time() - 86400 * (int) $_POST['time_passed'];
 
 			$condition = '
 				AND date_registered < {int:time_before}';
 		}
 		// Coming from checkboxes - validate the members passed through to us.
-		else
-		{
-			$members = array();
+		else {
+			$members = [];
 
-			foreach ($_POST['todoAction'] as $id)
+			foreach ($_POST['todoAction'] as $id) {
 				$members[] = (int) $id;
+			}
 
 			$condition = '
 				AND id_member IN ({array_int:members})';
 		}
 
 		// Get information on each of the members, things that are important to us, like email address...
-		$request = Db::$db->query('', '
-			SELECT id_member, member_name, real_name, email_address, validation_code, lngfile
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, member_name, real_name, email_address, validation_code, lngfile
 			FROM {db_prefix}members
 			WHERE is_activated = {int:activated_status}' . $condition . '
 			ORDER BY lngfile',
-			array(
+			[
 				'activated_status' => $current_filter,
 				'time_before' => empty($timeBefore) ? 0 : $timeBefore,
-				'members' => empty($members) ? array() : $members,
-			)
+				'members' => empty($members) ? [] : $members,
+			],
 		);
 
 		$member_count = Db::$db->num_rows($request);
 
 		// If no results then just return!
-		if ($member_count == 0)
-		{
+		if ($member_count == 0) {
 			Utils::redirectexit('action=admin;area=viewmembers;sa=browse;type=' . $_REQUEST['type'] . ';sort=' . $_REQUEST['sort'] . ';filter=' . $current_filter . ';start=' . $_REQUEST['start']);
 		}
 
-		$member_info = array();
-		$members = array();
+		$member_info = [];
+		$members = [];
 
 		// Fill the info array.
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
-			$member_info[] = array(
+			$member_info[] = [
 				'id' => $row['id_member'],
 				'username' => $row['member_name'],
 				'name' => $row['real_name'],
 				'email' => $row['email_address'],
 				'language' => empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $row['lngfile'],
-				'code' => $row['validation_code']
-			);
+				'code' => $row['validation_code'],
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Are we activating or approving the members?
-		if ($_POST['todo'] == 'ok' || $_POST['todo'] == 'okemail')
-		{
+		if ($_POST['todo'] == 'ok' || $_POST['todo'] == 'okemail') {
 			// Approve/activate this member.
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET validation_code = {string:blank_string}, is_activated = {int:is_activated}
 				WHERE is_activated = {int:activated_status}' . $condition,
-				array(
+				[
 					'is_activated' => 1,
 					'time_before' => empty($timeBefore) ? 0 : $timeBefore,
-					'members' => empty($members) ? array() : $members,
+					'members' => empty($members) ? [] : $members,
 					'activated_status' => $current_filter,
 					'blank_string' => '',
-				)
+				],
 			);
 
 			// Do we have to let the integration code know about the activations?
-			if (!empty(Config::$modSettings['integrate_activate']))
-			{
-				foreach ($member_info as $member)
-					IntegrationHook::call('integrate_activate', array($member['username']));
+			if (!empty(Config::$modSettings['integrate_activate'])) {
+				foreach ($member_info as $member) {
+					IntegrationHook::call('integrate_activate', [$member['username']]);
+				}
 			}
 
 			// Check for email.
-			if ($_POST['todo'] == 'okemail')
-			{
-				foreach ($member_info as $member)
-				{
-					$replacements = array(
+			if ($_POST['todo'] == 'okemail') {
+				foreach ($member_info as $member) {
+					$replacements = [
 						'NAME' => $member['name'],
 						'USERNAME' => $member['username'],
 						'PROFILELINK' => Config::$scripturl . '?action=profile;u=' . $member['id'],
 						'FORGOTPASSWORDLINK' => Config::$scripturl . '?action=reminder',
-					);
+					];
 
 					$emaildata = Mail::loadEmailTemplate('admin_approve_accept', $replacements, $member['language']);
 
@@ -1235,37 +1165,36 @@ public function approve()
 			}
 		}
 		// Maybe we're sending it off for activation?
-		elseif ($_POST['todo'] == 'require_activation')
-		{
+		elseif ($_POST['todo'] == 'require_activation') {
 			// We have to do this for each member I'm afraid.
-			foreach ($member_info as $member)
-			{
+			foreach ($member_info as $member) {
 				// Generate a random activation code.
 				$validation_code = User::generateValidationCode();
 
 				// Set these members for activation - I know this includes two id_member checks but it's safer than bodging $condition ;).
-				Db::$db->query('', '
-					UPDATE {db_prefix}members
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}members
 					SET validation_code = {string:validation_code}, is_activated = {int:not_activated}
 					WHERE is_activated = {int:activated_status}
 						' . $condition . '
 						AND id_member = {int:selected_member}',
-					array(
+					[
 						'not_activated' => 0,
 						'activated_status' => $current_filter,
 						'selected_member' => $member['id'],
 						'validation_code' => $validation_code,
 						'time_before' => empty($timeBefore) ? 0 : $timeBefore,
-						'members' => empty($members) ? array() : $members,
-					)
+						'members' => empty($members) ? [] : $members,
+					],
 				);
 
-				$replacements = array(
+				$replacements = [
 					'USERNAME' => $member['name'],
 					'ACTIVATIONLINK' => Config::$scripturl . '?action=activate;u=' . $member['id'] . ';code=' . $validation_code,
 					'ACTIVATIONLINKWITHOUTCODE' => Config::$scripturl . '?action=activate;u=' . $member['id'],
 					'ACTIVATIONCODE' => $validation_code,
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('admin_approve_activation', $replacements, $member['language']);
 
@@ -1273,18 +1202,15 @@ public function approve()
 			}
 		}
 		// Are we rejecting them?
-		elseif ($_POST['todo'] == 'reject' || $_POST['todo'] == 'rejectemail')
-		{
+		elseif ($_POST['todo'] == 'reject' || $_POST['todo'] == 'rejectemail') {
 			User::delete($members);
 
 			// Send email telling them they aren't welcome?
-			if ($_POST['todo'] == 'rejectemail')
-			{
-				foreach ($member_info as $member)
-				{
-					$replacements = array(
+			if ($_POST['todo'] == 'rejectemail') {
+				foreach ($member_info as $member) {
+					$replacements = [
 						'USERNAME' => $member['name'],
-					);
+					];
 
 					$emaildata = Mail::loadEmailTemplate('admin_approve_reject', $replacements, $member['language']);
 
@@ -1293,18 +1219,15 @@ public function approve()
 			}
 		}
 		// A simple delete?
-		elseif ($_POST['todo'] == 'delete' || $_POST['todo'] == 'deleteemail')
-		{
+		elseif ($_POST['todo'] == 'delete' || $_POST['todo'] == 'deleteemail') {
 			User::delete($members);
 
 			// Send email telling them they aren't welcome?
-			if ($_POST['todo'] == 'deleteemail')
-			{
-				foreach ($member_info as $member)
-				{
-					$replacements = array(
+			if ($_POST['todo'] == 'deleteemail') {
+				foreach ($member_info as $member) {
+					$replacements = [
 						'USERNAME' => $member['name'],
-					);
+					];
 
 					$emaildata = Mail::loadEmailTemplate('admin_approve_delete', $replacements, $member['language']);
 
@@ -1313,16 +1236,14 @@ public function approve()
 			}
 		}
 		// Remind them to activate their account?
-		elseif ($_POST['todo'] == 'remind')
-		{
-			foreach ($member_info as $member)
-			{
-				$replacements = array(
+		elseif ($_POST['todo'] == 'remind') {
+			foreach ($member_info as $member) {
+				$replacements = [
 					'USERNAME' => $member['name'],
 					'ACTIVATIONLINK' => Config::$scripturl . '?action=activate;u=' . $member['id'] . ';code=' . $member['code'],
 					'ACTIVATIONLINKWITHOUTCODE' => Config::$scripturl . '?action=activate;u=' . $member['id'],
 					'ACTIVATIONCODE' => $member['code'],
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('admin_approve_remind', $replacements, $member['language']);
 
@@ -1332,33 +1253,30 @@ public function approve()
 
 		// @todo current_language is never set, no idea what this is for. Remove?
 		// Back to the user's language!
-		if (isset($current_language) && $current_language != User::$me->language)
-		{
+		if (isset($current_language) && $current_language != User::$me->language) {
 			Lang::load('index');
 			Lang::load('ManageMembers');
 		}
 
 		// Log what we did?
-		if (!empty(Config::$modSettings['modlog_enabled']) && in_array($_POST['todo'], array('ok', 'okemail', 'require_activation', 'remind')))
-		{
+		if (!empty(Config::$modSettings['modlog_enabled']) && in_array($_POST['todo'], ['ok', 'okemail', 'require_activation', 'remind'])) {
 			$log_action = $_POST['todo'] == 'remind' ? 'remind_member' : 'approve_member';
 
-			foreach ($member_info as $member)
-				Logging::logAction($log_action, array('member' => $member['id']), 'admin');
+			foreach ($member_info as $member) {
+				Logging::logAction($log_action, ['member' => $member['id']], 'admin');
+			}
 		}
 
 		// Although updateStats *may* catch this, best to do it manually just in case (Doesn't always sort out unapprovedMembers).
-		if (in_array($current_filter, array(3, 4, 5)))
-		{
-			Config::updateModSettings(array('unapprovedMembers' => (Config::$modSettings['unapprovedMembers'] > $member_count ? Config::$modSettings['unapprovedMembers'] - $member_count : 0)));
+		if (in_array($current_filter, [3, 4, 5])) {
+			Config::updateModSettings(['unapprovedMembers' => (Config::$modSettings['unapprovedMembers'] > $member_count ? Config::$modSettings['unapprovedMembers'] - $member_count : 0)]);
 		}
 
 		// Update the member's stats. (but, we know the member didn't change their name.)
 		Logging::updateStats('member', false);
 
 		// If they haven't been deleted, update the post group statistics on them...
-		if (!in_array($_POST['todo'], array('delete', 'deleteemail', 'reject', 'rejectemail', 'remind')))
-		{
+		if (!in_array($_POST['todo'], ['delete', 'deleteemail', 'reject', 'rejectemail', 'remind'])) {
 			Logging::updateStats('postgroups', $members);
 		}
 
@@ -1376,8 +1294,9 @@ public function approve()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1401,12 +1320,13 @@ public static function call(): void
 	 * @param bool $get_duplicates Whether to get duplicates (used for the admin member list)
 	 * @return array An array of information for displaying the list of members
 	 */
-	public static function list_getMembers($start, $items_per_page, $sort, $where, $where_params = array(), $get_duplicates = false)
+	public static function list_getMembers($start, $items_per_page, $sort, $where, $where_params = [], $get_duplicates = false)
 	{
-		$members = array();
+		$members = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				mem.id_member, mem.member_name, mem.real_name, mem.email_address, mem.member_ip, mem.member_ip2, mem.last_login,
 				mem.posts, mem.is_activated, mem.date_registered, mem.id_group, mem.additional_groups, mg.group_name
 			FROM {db_prefix}members AS mem
@@ -1414,14 +1334,14 @@ public static function list_getMembers($start, $items_per_page, $sort, $where, $
 			WHERE ' . ($where == '1' ? '1=1' : $where) . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:per_page}',
-			array_merge($where_params, array(
+			array_merge($where_params, [
 				'sort' => $sort,
 				'start' => $start,
 				'per_page' => $items_per_page,
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['member_ip'] = new IP($row['member_ip']);
 			$row['member_ip2'] = new IP($row['member_ip2']);
 			$members[] = $row;
@@ -1429,8 +1349,9 @@ public static function list_getMembers($start, $items_per_page, $sort, $where, $
 		Db::$db->free_result($request);
 
 		// If we want duplicates pass the members array off.
-		if ($get_duplicates)
+		if ($get_duplicates) {
 			self::populateDuplicateMembers($members);
+		}
 
 		return $members;
 	}
@@ -1442,22 +1363,21 @@ public static function list_getMembers($start, $items_per_page, $sort, $where, $
 	 * @param array $where_params An array of parameters for $where
 	 * @return int The number of members matching the given situation
 	 */
-	public static function list_getNumMembers($where, $where_params = array())
+	public static function list_getNumMembers($where, $where_params = [])
 	{
 		// We know how many members there are in total.
-		if (empty($where) || $where == '1=1')
-		{
+		if (empty($where) || $where == '1=1') {
 			$num_members = Config::$modSettings['totalMembers'];
 		}
 		// The database knows the amount when there are extra conditions.
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		else {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}members AS mem
 				WHERE ' . $where,
-				array_merge($where_params, array(
-				))
+				array_merge($where_params, [
+				]),
 			);
 			list($num_members) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -1506,7 +1426,6 @@ public static function searchMembers(): void
 		self::$obj->execute();
 	}
 
-
 	/******************
 	 * Internal methods
 	 ******************/
@@ -1530,56 +1449,55 @@ protected function __construct()
 		$this->show_approve = (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 2) || !empty($this->awaiting_approval) || !empty(Config::$modSettings['approveAccountDeletion']);
 
 		// Setup the admin tabs.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['admin_members'],
 			'help' => 'view_members',
 			'description' => Lang::$txt['admin_members_list'],
-			'tabs' => array(),
-		);
+			'tabs' => [],
+		];
 
-		Utils::$context['tabs'] = array(
-			'viewmembers' => array(
+		Utils::$context['tabs'] = [
+			'viewmembers' => [
 				'label' => Lang::$txt['view_all_members'],
 				'description' => Lang::$txt['admin_members_list'],
 				'url' => Config::$scripturl . '?action=admin;area=viewmembers;sa=all',
-				'selected_actions' => array('all'),
-			),
-			'search' => array(
+				'selected_actions' => ['all'],
+			],
+			'search' => [
 				'label' => Lang::$txt['mlist_search'],
 				'description' => Lang::$txt['admin_members_list'],
 				'url' => Config::$scripturl . '?action=admin;area=viewmembers;sa=search',
-				'selected_actions' => array('search', 'query'),
-			),
-		);
+				'selected_actions' => ['search', 'query'],
+			],
+		];
 		Utils::$context['last_tab'] = 'search';
 
 		// Do we have approvals
-		if ($this->show_approve)
-		{
-			Utils::$context['tabs']['approve'] = array(
+		if ($this->show_approve) {
+			Utils::$context['tabs']['approve'] = [
 				'label' => sprintf(Lang::$txt['admin_browse_awaiting_approval'], $this->awaiting_approval),
 				'description' => Lang::$txt['admin_browse_approve_desc'],
 				'url' => Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve',
-			);
+			];
 			Utils::$context['last_tab'] = 'approve';
 		}
 
 		// Do we have activations to show?
-		if ($this->show_activate)
-		{
-			Utils::$context['tabs']['activate'] = array(
+		if ($this->show_activate) {
+			Utils::$context['tabs']['activate'] = [
 				'label' => sprintf(Lang::$txt['admin_browse_awaiting_activate'], $this->awaiting_activation),
 				'description' => Lang::$txt['admin_browse_activate_desc'],
 				'url' => Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=activate',
-			);
+			];
 			Utils::$context['last_tab'] = 'activate';
 		}
 
 		// Call our hook now, letting customizations add to the subActions and/or modify Utils::$context as needed.
-		IntegrationHook::call('integrate_manage_members', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_members', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		// We know the sub action, now we know what you're allowed to do.
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
@@ -1588,16 +1506,11 @@ protected function __construct()
 		Utils::$context['tabs'][Utils::$context['last_tab']]['is_last'] = true;
 
 		// Find the active tab.
-		if (isset(Utils::$context['tabs'][$this->subaction]))
-		{
+		if (isset(Utils::$context['tabs'][$this->subaction])) {
 			Utils::$context['tabs'][$this->subaction]['is_selected'] = true;
-		}
-		elseif (isset($this->subaction))
-		{
-			foreach (Utils::$context['tabs'] as $id_tab => $tab_data)
-			{
-				if (!empty($tab_data['selected_actions']) && in_array($this->subaction, $tab_data['selected_actions']))
-				{
+		} elseif (isset($this->subaction)) {
+			foreach (Utils::$context['tabs'] as $id_tab => $tab_data) {
+				if (!empty($tab_data['selected_actions']) && in_array($this->subaction, $tab_data['selected_actions'])) {
 					Utils::$context['tabs'][$id_tab]['is_selected'] = true;
 				}
 			}
@@ -1614,29 +1527,26 @@ protected function __construct()
 	protected function getActivationCounts()
 	{
 		// Get counts on every type of activation - for sections and filtering alike.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS total_members, is_activated
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS total_members, is_activated
 			FROM {db_prefix}members
 			WHERE is_activated != {int:is_activated}
 			GROUP BY is_activated',
-			array(
+			[
 				'is_activated' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$this->activation_numbers[$row['is_activated']] = $row['total_members'];
 		}
 		Db::$db->free_result($request);
 
-		foreach ($this->activation_numbers as $activation_type => $total_members)
-		{
-			if (in_array($activation_type, array(0, 2)))
-			{
+		foreach ($this->activation_numbers as $activation_type => $total_members) {
+			if (in_array($activation_type, [0, 2])) {
 				$this->awaiting_activation += $total_members;
-			}
-			elseif (in_array($activation_type, array(3, 4, 5)))
-			{
+			} elseif (in_array($activation_type, [3, 4, 5])) {
 				$this->awaiting_approval += $total_members;
 			}
 		}
@@ -1654,125 +1564,125 @@ protected function getActivationCounts()
 	protected static function populateDuplicateMembers(&$members)
 	{
 		// This will hold all the ip addresses.
-		$ips = array();
+		$ips = [];
 
-		foreach ($members as $key => $member)
-		{
+		foreach ($members as $key => $member) {
 			// Create the duplicate_members element.
-			$members[$key]['duplicate_members'] = array();
+			$members[$key]['duplicate_members'] = [];
 
 			// Store the IPs.
-			if (!empty($member['member_ip']))
+			if (!empty($member['member_ip'])) {
 				$ips[] = $member['member_ip'];
+			}
 
-			if (!empty($member['member_ip2']))
+			if (!empty($member['member_ip2'])) {
 				$ips[] = $member['member_ip2'];
+			}
 		}
 
 		$ips = array_unique($ips);
 
-		if (empty($ips))
+		if (empty($ips)) {
 			return false;
+		}
 
 		// Fetch all members with this IP address, we'll filter out the current ones in a sec.
-		$duplicate_members = array();
-		$duplicate_ids = array();
+		$duplicate_members = [];
+		$duplicate_ids = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				id_member, member_name, email_address, member_ip, member_ip2, is_activated
 			FROM {db_prefix}members
 			WHERE member_ip IN ({array_inet:ips})
 				OR member_ip2 IN ({array_inet:ips})',
-			array(
+			[
 				'ips' => $ips,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			//$duplicate_ids[] = $row['id_member'];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			// $duplicate_ids[] = $row['id_member'];
 			$row['member_ip'] = new IP($row['member_ip']);
 			$row['member_ip2'] = new IP($row['member_ip2']);
 
-			$member_context = array(
+			$member_context = [
 				'id' => $row['id_member'],
 				'name' => $row['member_name'],
 				'email' => $row['email_address'],
 				'is_banned' => $row['is_activated'] > 10,
 				'ip' => $row['member_ip'],
 				'ip2' => $row['member_ip2'],
-			);
+			];
 
-			if (in_array($row['member_ip'], $ips))
+			if (in_array($row['member_ip'], $ips)) {
 				$duplicate_members[$row['member_ip']][] = $member_context;
+			}
 
-			if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips))
+			if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips)) {
 				$duplicate_members[$row['member_ip2']][] = $member_context;
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Also try to get a list of messages using these ips.
-		$had_ips = array();
+		$had_ips = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.poster_ip, mem.id_member, mem.member_name, mem.email_address, mem.is_activated
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 			WHERE m.id_member != 0
 				' . (!empty($duplicate_ids) ? 'AND m.id_member NOT IN ({array_int:duplicate_ids})' : '') . '
 				AND m.poster_ip IN ({array_inet:ips})',
-			array(
+			[
 				'duplicate_ids' => $duplicate_ids,
 				'ips' => $ips,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['poster_ip'] = new IP($row['poster_ip']);
 
 			// Don't collect lots of the same.
-			if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']]))
-			{
+			if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']])) {
 				continue;
 			}
 
 			$had_ips[$row['poster_ip']][] = $row['id_member'];
 
-			$duplicate_members[$row['poster_ip']][] = array(
+			$duplicate_members[$row['poster_ip']][] = [
 				'id' => $row['id_member'],
 				'name' => $row['member_name'],
 				'email' => $row['email_address'],
 				'is_banned' => $row['is_activated'] > 10,
 				'ip' => $row['poster_ip'],
 				'ip2' => $row['poster_ip'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Now we have all the duplicate members, stick them with their respective member in the list.
-		if (!empty($duplicate_members))
-		{
-			foreach ($members as $key => $member)
-			{
-				if (isset($duplicate_members[$member['member_ip']]))
-				{
+		if (!empty($duplicate_members)) {
+			foreach ($members as $key => $member) {
+				if (isset($duplicate_members[$member['member_ip']])) {
 					$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
 				}
 
-				if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']]))
-				{
+				if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']])) {
 					$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
 				}
 
 				// Check we don't have lots of the same member.
-				$member_track = array($member['id_member']);
+				$member_track = [$member['id_member']];
 
-				foreach ($members[$key]['duplicate_members'] as $duplicate_id_member => $duplicate_member)
-				{
-					if (in_array($duplicate_member['id'], $member_track))
-					{
+				foreach ($members[$key]['duplicate_members'] as $duplicate_id_member => $duplicate_member) {
+					if (in_array($duplicate_member['id'], $member_track)) {
 						unset($members[$key]['duplicate_members'][$duplicate_id_member]);
+
 						continue;
 					}
 
@@ -1784,7 +1694,8 @@ protected static function populateDuplicateMembers(&$members)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Members::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Members::exportStatic')) {
 	Members::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Mods.php b/Sources/Actions/Admin/Mods.php
index b933ed41c5..6c6eb0fb82 100644
--- a/Sources/Actions/Admin/Mods.php
+++ b/Sources/Actions/Admin/Mods.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -35,13 +34,11 @@ class Mods implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-			'getConfigVars' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'modifyModSettings' => 'ModifyModSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -64,9 +61,9 @@ class Mods implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'general' => 'general',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -95,10 +92,11 @@ public function execute(): void
 		Utils::$context['sub_template'] = 'show_settings';
 		Utils::$context['sub_action'] = $this->subaction;
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -112,23 +110,21 @@ public function general(): void
 		Utils::$context['settings_title'] = Lang::$txt['mods_cat_modifications_misc'];
 
 		// No removing this line, you dirty unwashed mod authors. :p
-		if (empty($config_vars))
-		{
+		if (empty($config_vars)) {
 			Utils::$context['settings_save_dont_show'] = true;
-			Utils::$context['settings_message'] = array(
+			Utils::$context['settings_message'] = [
 				'label' => Lang::$txt['modification_no_misc_settings'],
 				'tag' => 'div',
-				'class' => 'centertext'
-			);
+				'class' => 'centertext',
+			];
 		}
 		// Saving?
-		elseif (isset($_GET['save']))
-		{
+		elseif (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			$save_vars = $config_vars;
 
-			IntegrationHook::call('integrate_save_general_mod_settings', array(&$save_vars));
+			IntegrationHook::call('integrate_save_general_mod_settings', [&$save_vars]);
 
 			// This line is to help mod authors do a search/add after if you want to add something here. Keyword: FOOT TAPPING SUCKS!
 			ACP::saveDBSettings($save_vars);
@@ -155,8 +151,9 @@ public function general(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -176,14 +173,14 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		$config_vars = array(
+		$config_vars = [
 			// MOD AUTHORS: Please use the hook below to add your settings.
 			// But if you insist on editing this file, add your new settings
 			// UNDER this comment.
-		);
+		];
 
 		// MOD AUTHORS: This hook is the right way to add new settings.
-		IntegrationHook::call('integrate_general_mod_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_general_mod_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -196,8 +193,9 @@ public static function getConfigVars(): array
 	 */
 	public static function modifyModSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->execute();
@@ -218,26 +216,28 @@ protected function __construct()
 		Utils::$context['page_title'] = Lang::$txt['admin_modifications'];
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['admin_modifications'],
 			'help' => 'modsettings',
 			'description' => Lang::$txt['modification_settings_desc'],
-			'tabs' => array(
-				'general' => array(
-				),
-			),
-		);
+			'tabs' => [
+				'general' => [
+				],
+			],
+		];
 
 		// Make it easier for mods to add new areas.
-		IntegrationHook::call('integrate_modify_modifications', array(&self::$subactions));
+		IntegrationHook::call('integrate_modify_modifications', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Mods::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Mods::exportStatic')) {
 	Mods::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/News.php b/Sources/Actions/Admin/News.php
index 96c407b90a..3115833725 100644
--- a/Sources/Actions/Admin/News.php
+++ b/Sources/Actions/Admin/News.php
@@ -13,11 +13,12 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Notify;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Editor;
 use SMF\Group;
 use SMF\IntegrationHook;
@@ -27,14 +28,12 @@
 use SMF\Mail;
 use SMF\Menu;
 use SMF\Msg;
+use SMF\PersonalMessage\PM;
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
-use SMF\PersonalMessage\PM;
 
 /**
  * This class manages... the news. :P
@@ -48,13 +47,21 @@ class News extends ACP implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageNews',
-			'getConfigVars' => false,
-		),
-	);
+			'list_getNews' => 'list_getNews',
+			'list_getNewsTextarea' => 'list_getNewsTextarea',
+			'list_getNewsPreview' => 'list_getNewsPreview',
+			'list_getNewsCheckbox' => 'list_getNewsCheckbox',
+			'prepareMailingForPreview' => 'prepareMailingForPreview',
+			'editNews' => 'EditNews',
+			'selectMailingMembers' => 'SelectMailingMembers',
+			'composeMailing' => 'ComposeMailing',
+			'sendMailing' => 'SendMailing',
+			'modifyNewsSettings' => 'ModifyNewsSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -85,50 +92,50 @@ class News extends ACP implements ActionInterface
 	 * runtime with escaped versions of whatever appears between the colon and
 	 * the closing brace. This escaping is done using Utils::JavaScriptEscape().
 	 */
-	public array $list_options = array(
+	public array $list_options = [
 		'id' => 'news_lists',
-		'get_items' => array(
+		'get_items' => [
 			'function' => __CLASS__ . '::list_getNews',
-		),
-		'columns' => array(
-			'news' => array(
-				'header' => array(
+		],
+		'columns' => [
+			'news' => [
+				'header' => [
 					'value' => '{txt:admin_edit_news}',
 					'class' => 'half_table',
-				),
-				'data' => array(
+				],
+				'data' => [
 					'function' => __CLASS__ . '::list_getNewsTextarea',
 					'class' => 'half_table',
-				),
-			),
-			'preview' => array(
-				'header' => array(
+				],
+			],
+			'preview' => [
+				'header' => [
 					'value' => '{txt:preview}',
 					'class' => 'half_table',
-				),
-				'data' => array(
+				],
+				'data' => [
 					'function' => __CLASS__ . '::list_getNewsPreview',
 					'class' => 'half_table',
-				),
-			),
-			'check' => array(
-				'header' => array(
+				],
+			],
+			'check' => [
+				'header' => [
 					'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 					'class' => 'centercol icon',
-				),
-				'data' => array(
+				],
+				'data' => [
 					'function' => __CLASS__ . '::list_getNewsCheckbox',
 					'class' => 'centercol icon',
-				),
-			),
-		),
-		'form' => array(
+				],
+			],
+		],
+		'form' => [
 			'href' => '{scripturl}?action=admin;area=news;sa=editnews',
 			// Will be populated at runtime with session_var => session_id
-			'hidden_fields' => array(),
-		),
-		'additional_rows' => array(
-			array(
+			'hidden_fields' => [],
+		],
+		'additional_rows' => [
+			[
 				'position' => 'bottom_of_list',
 				'value' => '
 				<span id="moreNewsItems_link" class="floatleft" style="display: none;">
@@ -136,8 +143,8 @@ class News extends ACP implements ActionInterface
 				</span>
 				<input type="submit" name="save_items" value="{txt:save}" class="button">
 				<input type="submit" name="delete_selection" value="{txt:editnews_remove_selected}" data-confirm="{txt:editnews_remove_confirm}" class="button you_sure">',
-			),
-		),
+			],
+		],
 		'javascript' => '
 			document.getElementById(\'list_news_lists_last\').style.display = "none";
 			document.getElementById("moreNewsItems_link").style.display = "";
@@ -214,7 +221,7 @@ function addNewsItem ()
 				');
 				make_preview_btn(last_preview);
 			}',
-	);
+	];
 
 	/**************************
 	 * Public static properties
@@ -227,13 +234,13 @@ function addNewsItem ()
 	 *
 	 * Format: 'sub-action' => array('function', 'permission')
 	 */
-	public static array $subactions = array(
-		'editnews' => array('edit', 'edit_news'),
-		'mailingmembers' => array('selectMembers', 'send_mail'),
-		'mailingcompose' => array('compose', 'send_mail'),
-		'mailingsend' => array('send', 'send_mail'),
-		'settings' => array('settings', 'admin_forum'),
-	);
+	public static array $subactions = [
+		'editnews' => ['edit', 'edit_news'],
+		'mailingmembers' => ['selectMembers', 'send_mail'],
+		'mailingcompose' => ['compose', 'send_mail'],
+		'mailingsend' => ['send', 'send_mail'],
+		'settings' => ['settings', 'admin_forum'],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -259,7 +266,7 @@ public function execute(): void
 		// Have you got the proper permissions?
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
-		call_user_func(array($this, self::$subactions[$this->subaction][0]));
+		call_user_func([$this, self::$subactions[$this->subaction][0]]);
 	}
 
 	/**
@@ -275,38 +282,34 @@ public function execute(): void
 	public function edit(): void
 	{
 		// The 'remove selected' button was pressed.
-		if (!empty($_POST['delete_selection']) && !empty($_POST['remove']))
-		{
+		if (!empty($_POST['delete_selection']) && !empty($_POST['remove'])) {
 			User::$me->checkSession();
 
 			// Store the news temporarily in this array.
 			$temp_news = explode("\n", Config::$modSettings['news']);
 
 			// Remove the items that were selected.
-			foreach ($temp_news as $i => $news)
-				if (in_array($i, $_POST['remove']))
+			foreach ($temp_news as $i => $news) {
+				if (in_array($i, $_POST['remove'])) {
 					unset($temp_news[$i]);
+				}
+			}
 
 			// Update the database.
-			Config::updateModSettings(array('news' => implode("\n", $temp_news)));
+			Config::updateModSettings(['news' => implode("\n", $temp_news)]);
 
 			Utils::$context['saved_successful'] = true;
 
 			Logging::logAction('news');
 		}
 		// The 'Save' button was pressed.
-		elseif (!empty($_POST['save_items']))
-		{
+		elseif (!empty($_POST['save_items'])) {
 			User::$me->checkSession();
 
-			foreach ($_POST['news'] as $i => $news)
-			{
-				if (trim($news) == '')
-				{
+			foreach ($_POST['news'] as $i => $news) {
+				if (trim($news) == '') {
 					unset($_POST['news'][$i]);
-				}
-				else
-				{
+				} else {
 					$_POST['news'][$i] = Utils::htmlspecialchars($_POST['news'][$i], ENT_QUOTES);
 
 					Msg::preparsecode($_POST['news'][$i]);
@@ -314,7 +317,7 @@ public function edit(): void
 			}
 
 			// Send the new news to the database.
-			Config::updateModSettings(array('news' => implode("\n", $_POST['news'])));
+			Config::updateModSettings(['news' => implode("\n", $_POST['news'])]);
 
 			Utils::$context['saved_successful'] = true;
 
@@ -344,39 +347,32 @@ public function edit(): void
 	public function selectMembers(): void
 	{
 		// Is there any confirm message?
-		Utils::$context['newsletter_sent'] = isset($_SESSION['newsletter_sent']) ? $_SESSION['newsletter_sent'] : '';
+		Utils::$context['newsletter_sent'] = $_SESSION['newsletter_sent'] ?? '';
 
 		Utils::$context['page_title'] = Lang::$txt['admin_newsletters'];
 
 		Utils::$context['sub_template'] = 'email_members';
 
-		Utils::$context['groups'] = array();
-		$postGroups = array();
-		$normalGroups = array();
+		Utils::$context['groups'] = [];
+		$postGroups = [];
+		$normalGroups = [];
 
 		// Get all the extra groups as well as Administrator and Global Moderator.
 		// If we have post groups disabled then we need to give a "ungrouped members" option.
-		if (empty(Config::$modSettings['permission_enable_postgroups']))
-		{
+		if (empty(Config::$modSettings['permission_enable_postgroups'])) {
 			$include = Group::LOAD_NORMAL;
-			$exclude = array(Group::GUEST, Group::MOD);
-		}
-		else
-		{
+			$exclude = [Group::GUEST, Group::MOD];
+		} else {
 			$include = Group::LOAD_BOTH;
-			$exclude = array(Group::GUEST, Group::REGULAR, Group::MOD);
+			$exclude = [Group::GUEST, Group::REGULAR, Group::MOD];
 		}
 
-		foreach (Group::loadSimple($include, $exclude) as $group)
-		{
+		foreach (Group::loadSimple($include, $exclude) as $group) {
 			Utils::$context['groups'][$group->id] = $group;
 
-			if ($group->min_posts == -1)
-			{
+			if ($group->min_posts == -1) {
 				$normalGroups[$group->id] = $group->id;
-			}
-			else
-			{
+			} else {
 				$postGroups[$group->id] = $group->id;
 			}
 		}
@@ -386,14 +382,15 @@ public function selectMembers(): void
 
 		// Counting all the regular members could be a performance hit on large forums,
 		// so don't do that for anyone without high level permissions.
-		if (!User::$me->allowedTo('manage_membergroups'))
-			$groups_to_count = array_diff($groups_to_count, array(Group::REGULAR));
+		if (!User::$me->allowedTo('manage_membergroups')) {
+			$groups_to_count = array_diff($groups_to_count, [Group::REGULAR]);
+		}
 
 		Group::countMembersBatch($groups_to_count);
 
 		Utils::$context['can_send_pm'] = User::$me->allowedTo('pm_send');
 
-		Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 	}
 
 	/**
@@ -415,62 +412,58 @@ public function compose(): void
 		Utils::$context['message'] = !empty($_POST['message']) ? $_POST['message'] : Utils::htmlspecialchars(Lang::$txt['message'] . "\n\n" . sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name']) . "\n\n" . '{$board_url}');
 
 		// Now create the editor.
-		new Editor(array(
+		new Editor([
 			'id' => 'message',
 			'value' => Utils::$context['message'],
 			'height' => '150px',
 			'width' => '100%',
-			'labels' => array(
+			'labels' => [
 				'post_button' => Lang::$txt['sendtopic_send'],
-			),
+			],
 			'preview_type' => Editor::PREVIEW_XML,
 			'required' => true,
-		));
-
-		if (!empty(Utils::$context['preview']))
-		{
-			Utils::$context['recipients']['members'] = !empty($_POST['members']) ? explode(',', $_POST['members']) : array();
-			Utils::$context['recipients']['exclude_members'] = !empty($_POST['exclude_members']) ? explode(',', $_POST['exclude_members']) : array();
-			Utils::$context['recipients']['groups'] = !empty($_POST['groups']) ? explode(',', $_POST['groups']) : array();
-			Utils::$context['recipients']['exclude_groups'] = !empty($_POST['exclude_groups']) ? explode(',', $_POST['exclude_groups']) : array();
-			Utils::$context['recipients']['emails'] = !empty($_POST['emails']) ? explode(';', $_POST['emails']) : array();
+		]);
+
+		if (!empty(Utils::$context['preview'])) {
+			Utils::$context['recipients']['members'] = !empty($_POST['members']) ? explode(',', $_POST['members']) : [];
+			Utils::$context['recipients']['exclude_members'] = !empty($_POST['exclude_members']) ? explode(',', $_POST['exclude_members']) : [];
+			Utils::$context['recipients']['groups'] = !empty($_POST['groups']) ? explode(',', $_POST['groups']) : [];
+			Utils::$context['recipients']['exclude_groups'] = !empty($_POST['exclude_groups']) ? explode(',', $_POST['exclude_groups']) : [];
+			Utils::$context['recipients']['emails'] = !empty($_POST['emails']) ? explode(';', $_POST['emails']) : [];
 			Utils::$context['email_force'] = !empty($_POST['email_force']) ? 1 : 0;
 			Utils::$context['total_emails'] = !empty($_POST['total_emails']) ? (int) $_POST['total_emails'] : 0;
 			Utils::$context['send_pm'] = !empty($_POST['send_pm']) ? 1 : 0;
 			Utils::$context['send_html'] = !empty($_POST['send_html']) ? '1' : '0';
 
 			self::prepareMailingForPreview();
+
 			return;
 		}
 
 		// Start by finding any members!
-		$toClean = array();
+		$toClean = [];
 
-		if (!empty($_POST['members']))
+		if (!empty($_POST['members'])) {
 			$toClean[] = 'members';
+		}
 
-		if (!empty($_POST['exclude_members']))
+		if (!empty($_POST['exclude_members'])) {
 			$toClean[] = 'exclude_members';
+		}
 
-		if (!empty($toClean))
-		{
-			foreach ($toClean as $type)
-			{
+		if (!empty($toClean)) {
+			foreach ($toClean as $type) {
 				// Remove the quotes.
-				$_POST[$type] = strtr($_POST[$type], array('\\"' => '"'));
+				$_POST[$type] = strtr($_POST[$type], ['\\"' => '"']);
 
 				preg_match_all('~"([^"]+)"~', $_POST[$type], $matches);
 
 				$_POST[$type] = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST[$type]))));
 
-				foreach ($_POST[$type] as $index => $member)
-				{
-					if (strlen(trim($member)) > 0)
-					{
+				foreach ($_POST[$type] as $index => $member) {
+					if (strlen(trim($member)) > 0) {
 						$_POST[$type][$index] = Utils::htmlspecialchars(Utils::strtolower(trim($member)));
-					}
-					else
-					{
+					} else {
 						unset($_POST[$type][$index]);
 					}
 				}
@@ -480,22 +473,22 @@ public function compose(): void
 			}
 		}
 
-		if (isset($_POST['member_list']) && is_array($_POST['member_list']))
-		{
-			$members = array();
+		if (isset($_POST['member_list']) && is_array($_POST['member_list'])) {
+			$members = [];
 
-			foreach ($_POST['member_list'] as $member_id)
+			foreach ($_POST['member_list'] as $member_id) {
 				$members[] = (int) $member_id;
+			}
 
 			$_POST['members'] = implode(',', $members);
 		}
 
-		if (isset($_POST['exclude_member_list']) && is_array($_POST['exclude_member_list']))
-		{
-			$members = array();
+		if (isset($_POST['exclude_member_list']) && is_array($_POST['exclude_member_list'])) {
+			$members = [];
 
-			foreach ($_POST['exclude_member_list'] as $member_id)
+			foreach ($_POST['exclude_member_list'] as $member_id) {
 				$members[] = (int) $member_id;
+			}
 
 			$_POST['exclude_members'] = implode(',', $members);
 		}
@@ -507,60 +500,62 @@ public function compose(): void
 		Lang::load('EmailTemplates');
 
 		// Get a list of all full banned users.  Use their Username and email to find them.  Only get the ones that can't login to turn off notification.
-		$request = Db::$db->query('', '
-			SELECT DISTINCT mem.id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT DISTINCT mem.id_member
 			FROM {db_prefix}ban_groups AS bg
 				INNER JOIN {db_prefix}ban_items AS bi ON (bg.id_ban_group = bi.id_ban_group)
 				INNER JOIN {db_prefix}members AS mem ON (bi.id_member = mem.id_member)
 			WHERE (bg.cannot_access = {int:cannot_access} OR bg.cannot_login = {int:cannot_login})
 				AND (bg.expire_time IS NULL OR bg.expire_time > {int:current_time})',
-			array(
+			[
 				'cannot_access' => 1,
 				'cannot_login' => 1,
 				'current_time' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['recipients']['exclude_members'][] = $row['id_member'];
 		}
 		Db::$db->free_result($request);
 
-		$condition_array = array();
-		$condition_array_params = array();
+		$condition_array = [];
+		$condition_array_params = [];
 		$count = 0;
 
-		$request = Db::$db->query('', '
-			SELECT DISTINCT bi.email_address
+		$request = Db::$db->query(
+			'',
+			'SELECT DISTINCT bi.email_address
 			FROM {db_prefix}ban_items AS bi
 				INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group)
 			WHERE (bg.cannot_access = {int:cannot_access} OR bg.cannot_login = {int:cannot_login})
 				AND (bg.expire_time IS NULL OR bg.expire_time > {int:current_time})
 				AND bi.email_address != {string:blank_string}',
-			array(
+			[
 				'cannot_access' => 1,
 				'cannot_login' => 1,
 				'current_time' => time(),
 				'blank_string' => '',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$condition_array[] = '{string:email_' . $count . '}';
 			$condition_array_params['email_' . $count++] = $row['email_address'];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($condition_array))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member
+		if (!empty($condition_array)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}members
 				WHERE email_address IN (' . implode(', ', $condition_array) . ')',
-				$condition_array_params
+				$condition_array_params,
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['recipients']['exclude_members'][] = $row['id_member'];
 			}
 			Db::$db->free_result($request);
@@ -576,25 +571,22 @@ public function compose(): void
 				!empty(Utils::$context['recipients']['exclude_groups'])
 				&& in_array(3, Utils::$context['recipients']['exclude_groups'])
 			)
-		)
-		{
-			$request = Db::$db->query('', '
-				SELECT DISTINCT mem.id_member AS identifier
+		) {
+			$request = Db::$db->query(
+				'',
+				'SELECT DISTINCT mem.id_member AS identifier
 				FROM {db_prefix}members AS mem
 					INNER JOIN {db_prefix}moderators AS mods ON (mods.id_member = mem.id_member)
 				WHERE mem.is_activated = {int:is_activated}',
-				array(
+				[
 					'is_activated' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (in_array(3, Utils::$context['recipients']))
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (in_array(3, Utils::$context['recipients'])) {
 					Utils::$context['recipients']['exclude_members'][] = $row['identifier'];
-				}
-				else
-				{
+				} else {
 					Utils::$context['recipients']['members'][] = $row['identifier'];
 				}
 			}
@@ -604,13 +596,14 @@ public function compose(): void
 		// For progress bar!
 		Utils::$context['total_emails'] = count(Utils::$context['recipients']['emails']);
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}members',
-			array(
-			)
+			[
+			],
 		);
-		list (Utils::$context['total_members']) = Db::$db->fetch_row($request);
+		list(Utils::$context['total_members']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Clean up the arrays.
@@ -630,12 +623,12 @@ public function compose(): void
 	 *
 	 * @param bool $clean_only If set, it will only clean the variables, put them in context, then return.
 	 */
-	function send($clean_only = false): void
+	public function send($clean_only = false): void
 	{
-		if (isset($_POST['preview']))
-		{
+		if (isset($_POST['preview'])) {
 			Utils::$context['preview'] = true;
 			self::compose();
+
 			return;
 		}
 
@@ -644,8 +637,9 @@ function send($clean_only = false): void
 		$num_at_once = 1000;
 
 		// If by PM's I suggest we half the above number.
-		if (!empty($_POST['send_pm']))
+		if (!empty($_POST['send_pm'])) {
 			$num_at_once /= 2;
+		}
 
 		User::$me->checkSession();
 
@@ -657,104 +651,101 @@ function send($clean_only = false): void
 		Utils::$context['send_html'] = !empty($_POST['send_html']) ? '1' : '0';
 		Utils::$context['parse_html'] = !empty($_POST['parse_html']) ? '1' : '0';
 
-		//One can't simply nullify things around
-		if (empty($_REQUEST['total_members']))
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		// One can't simply nullify things around
+		if (empty($_REQUEST['total_members'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}members',
-				array(
-				)
+				[
+				],
 			);
-			list (Utils::$context['total_members']) = Db::$db->fetch_row($request);
+			list(Utils::$context['total_members']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
-		}
-		else
-		{
+		} else {
 			Utils::$context['total_members'] = (int) $_REQUEST['total_members'];
 		}
 
 		// Create our main context.
-		Utils::$context['recipients'] = array(
-			'groups' => array(),
-			'exclude_groups' => array(),
-			'members' => array(),
-			'exclude_members' => array(),
-			'emails' => array(),
-		);
+		Utils::$context['recipients'] = [
+			'groups' => [],
+			'exclude_groups' => [],
+			'members' => [],
+			'exclude_members' => [],
+			'emails' => [],
+		];
 
 		// Have we any excluded members?
-		if (!empty($_POST['exclude_members']))
-		{
+		if (!empty($_POST['exclude_members'])) {
 			$members = explode(',', $_POST['exclude_members']);
 
-			foreach ($members as $member)
-			{
-				if ($member >= Utils::$context['start'])
+			foreach ($members as $member) {
+				if ($member >= Utils::$context['start']) {
 					Utils::$context['recipients']['exclude_members'][] = (int) $member;
+				}
 			}
 		}
 
 		// What about members we *must* do?
-		if (!empty($_POST['members']))
-		{
+		if (!empty($_POST['members'])) {
 			$members = explode(',', $_POST['members']);
 
-			foreach ($members as $member)
-			{
-				if ($member >= Utils::$context['start'])
+			foreach ($members as $member) {
+				if ($member >= Utils::$context['start']) {
 					Utils::$context['recipients']['members'][] = (int) $member;
+				}
 			}
 		}
+
 		// Cleaning groups is simple - although deal with both checkbox and commas.
-		if (isset($_POST['groups']))
-		{
-			if (is_array($_POST['groups']))
-			{
-				foreach ($_POST['groups'] as $group => $dummy)
+		if (isset($_POST['groups'])) {
+			if (is_array($_POST['groups'])) {
+				foreach ($_POST['groups'] as $group => $dummy) {
 					Utils::$context['recipients']['groups'][] = (int) $group;
-			}
-			else
-			{
+				}
+			} else {
 				$groups = explode(',', $_POST['groups']);
 
-				foreach ($groups as $group)
+				foreach ($groups as $group) {
 					Utils::$context['recipients']['groups'][] = (int) $group;
+				}
 			}
 		}
+
 		// Same for excluded groups
-		if (isset($_POST['exclude_groups']))
-		{
-			if (is_array($_POST['exclude_groups']))
-			{
-				foreach ($_POST['exclude_groups'] as $group => $dummy)
+		if (isset($_POST['exclude_groups'])) {
+			if (is_array($_POST['exclude_groups'])) {
+				foreach ($_POST['exclude_groups'] as $group => $dummy) {
 					Utils::$context['recipients']['exclude_groups'][] = (int) $group;
+				}
 			}
 			// Ignore an empty string - we don't want to exclude "Regular Members" unless it's specifically selected
-			elseif ($_POST['exclude_groups'] != '')
-			{
+			elseif ($_POST['exclude_groups'] != '') {
 				$groups = explode(',', $_POST['exclude_groups']);
 
-				foreach ($groups as $group)
+				foreach ($groups as $group) {
 					Utils::$context['recipients']['exclude_groups'][] = (int) $group;
+				}
 			}
 		}
+
 		// Finally - emails!
-		if (!empty($_POST['emails']))
-		{
-			$addressed = array_unique(explode(';', strtr($_POST['emails'], array("\n" => ';', "\r" => ';', ',' => ';'))));
-			foreach ($addressed as $curmem)
-			{
+		if (!empty($_POST['emails'])) {
+			$addressed = array_unique(explode(';', strtr($_POST['emails'], ["\n" => ';', "\r" => ';', ',' => ';'])));
+
+			foreach ($addressed as $curmem) {
 				$curmem = trim($curmem);
 
-				if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL))
+				if ($curmem != '' && filter_var($curmem, FILTER_VALIDATE_EMAIL)) {
 					Utils::$context['recipients']['emails'][$curmem] = $curmem;
+				}
 			}
 		}
 
 		// If we're only cleaning drop out here.
-		if ($clean_only)
+		if ($clean_only) {
 			return;
+		}
 
 		// We are relying too much on writing to superglobals...
 		$_POST['subject'] = !empty($_POST['subject']) ? $_POST['subject'] : '';
@@ -765,54 +756,48 @@ function send($clean_only = false): void
 		Utils::$context['message'] = Utils::htmlspecialchars($_POST['message'], ENT_QUOTES);
 
 		// Prepare the message for sending it as HTML
-		if (!Utils::$context['send_pm'] && !empty($_POST['send_html']))
-		{
+		if (!Utils::$context['send_pm'] && !empty($_POST['send_html'])) {
 			// Prepare the message for HTML.
-			if (!empty($_POST['parse_html']))
-			{
-				$_POST['message'] = str_replace(array("\n", '  '), array('<br>' . "\n", '&nbsp; '), $_POST['message']);
+			if (!empty($_POST['parse_html'])) {
+				$_POST['message'] = str_replace(["\n", '  '], ['<br>' . "\n", '&nbsp; '], $_POST['message']);
 			}
 
 			// This is here to prevent spam filters from tagging this as spam.
-			if (preg_match('~\<html~i', $_POST['message']) == 0)
-			{
-				if (preg_match('~\<body~i', $_POST['message']) == 0)
-				{
+			if (preg_match('~\\<html~i', $_POST['message']) == 0) {
+				if (preg_match('~\\<body~i', $_POST['message']) == 0) {
 					$_POST['message'] = '<html><head><title>' . $_POST['subject'] . '</title></head>' . "\n" . '<body>' . $_POST['message'] . '</body></html>';
-				}
-				else
-				{
+				} else {
 					$_POST['message'] = '<html>' . $_POST['message'] . '</html>';
 				}
 			}
 		}
 
-		if (empty($_POST['message']) || empty($_POST['subject']))
-		{
+		if (empty($_POST['message']) || empty($_POST['subject'])) {
 			Utils::$context['preview'] = true;
 			self::compose();
+
 			return;
 		}
 
 		// Include an unsubscribe link if necessary.
-		if (!Utils::$context['send_pm'])
-		{
+		if (!Utils::$context['send_pm']) {
 			$include_unsubscribe = true;
 
-			if (strpos($_POST['message'], '{$member.unsubscribe}') === false)
+			if (strpos($_POST['message'], '{$member.unsubscribe}') === false) {
 				$_POST['message'] .= "\n\n" . '{$member.unsubscribe}';
+			}
 		}
 
 		// Use the default time format.
 		User::$me->time_format = Config::$modSettings['time_format'];
 
-		$variables = array(
+		$variables = [
 			'{$board_url}',
 			'{$current_time}',
 			'{$latest_member.link}',
 			'{$latest_member.id}',
-			'{$latest_member.name}'
-		);
+			'{$latest_member.name}',
+		];
 
 		// We might need this in a bit
 		$cleanLatestMember = empty($_POST['send_html']) || Utils::$context['send_pm'] ? Utils::htmlspecialcharsDecode(Config::$modSettings['latestRealName']) : Config::$modSettings['latestRealName'];
@@ -820,61 +805,63 @@ function send($clean_only = false): void
 		// Replace in all the standard things.
 		$_POST['message'] = str_replace(
 			$variables,
-			array(
+			[
 				!empty($_POST['send_html']) ? '<a href="' . Config::$scripturl . '">' . Config::$scripturl . '</a>' : Config::$scripturl,
 				Time::create('now')->format(null, false),
 				!empty($_POST['send_html']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember'] . '">' . $cleanLatestMember . '</a>' : (Utils::$context['send_pm'] ? '[url=' . Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember'] . ']' . $cleanLatestMember . '[/url]' : Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember']),
 				Config::$modSettings['latestMember'],
-				$cleanLatestMember
-			),
-			$_POST['message']
+				$cleanLatestMember,
+			],
+			$_POST['message'],
 		);
 
 		$_POST['subject'] = str_replace(
 			$variables,
-			array(
+			[
 				Config::$scripturl,
 				Time::create('now')->format(null, false),
 				Config::$modSettings['latestRealName'],
 				Config::$modSettings['latestMember'],
-				Config::$modSettings['latestRealName']
-			),
-			$_POST['subject']
+				Config::$modSettings['latestRealName'],
+			],
+			$_POST['subject'],
 		);
 
-		$from_member = array(
+		$from_member = [
 			'{$member.email}',
 			'{$member.link}',
 			'{$member.id}',
 			'{$member.name}',
 			'{$member.unsubscribe}',
-		);
+		];
 
 		// If we still have emails, do them first!
 		$i = 0;
-		foreach (Utils::$context['recipients']['emails'] as $k => $email)
-		{
+
+		foreach (Utils::$context['recipients']['emails'] as $k => $email) {
 			// Done as many as we can?
-			if ($i >= $num_at_once)
+			if ($i >= $num_at_once) {
 				break;
+			}
 
 			// Don't sent it twice!
 			unset(Utils::$context['recipients']['emails'][$k]);
 
 			// Dammit - can't PM emails!
-			if (Utils::$context['send_pm'])
+			if (Utils::$context['send_pm']) {
 				continue;
+			}
 
 			// Non-members can't unsubscribe via the automated system.
 			$unsubscribe_link = sprintf(Lang::$txt['unsubscribe_announcements_manual'], empty(Config::$modSettings['mail_from']) ? Config::$webmaster_email : Config::$modSettings['mail_from']);
 
-			$to_member = array(
+			$to_member = [
 				$email,
 				!empty($_POST['send_html']) ? '<a href="mailto:' . $email . '">' . $email . '</a>' : $email,
 				'??',
 				$email,
 				$unsubscribe_link,
-			);
+			];
 
 			Mail::send(
 				$email,
@@ -883,43 +870,39 @@ function send($clean_only = false): void
 				null,
 				'news',
 				!empty($_POST['send_html']),
-				5
+				5,
 			);
 
 			// Done another...
 			$i++;
 		}
 
-		if ($i < $num_at_once)
-		{
+		if ($i < $num_at_once) {
 			// Need to build quite a query!
 			$sendQuery = '(';
-			$sendParams = array();
+			$sendParams = [];
 
-			if (!empty(Utils::$context['recipients']['groups']))
-			{
+			if (!empty(Utils::$context['recipients']['groups'])) {
 				// Take the long route...
-				$queryBuild = array();
+				$queryBuild = [];
 
-				foreach (Utils::$context['recipients']['groups'] as $group)
-				{
+				foreach (Utils::$context['recipients']['groups'] as $group) {
 					$sendParams['group_' . $group] = $group;
 					$queryBuild[] = 'mem.id_group = {int:group_' . $group . '}';
 
-					if (!empty($group))
-					{
+					if (!empty($group)) {
 						$queryBuild[] = 'FIND_IN_SET({int:group_' . $group . '}, mem.additional_groups) != 0';
 
 						$queryBuild[] = 'mem.id_post_group = {int:group_' . $group . '}';
 					}
 				}
 
-				if (!empty($queryBuild))
+				if (!empty($queryBuild)) {
 					$sendQuery .= implode(' OR ', $queryBuild);
+				}
 			}
 
-			if (!empty(Utils::$context['recipients']['members']))
-			{
+			if (!empty(Utils::$context['recipients']['members'])) {
 				$sendQuery .= ($sendQuery == '(' ? '' : ' OR ') . 'mem.id_member IN ({array_int:members})';
 
 				$sendParams['members'] = Utils::$context['recipients']['members'];
@@ -928,44 +911,42 @@ function send($clean_only = false): void
 			$sendQuery .= ')';
 
 			// If we've not got a query then we must be done!
-			if ($sendQuery == '()')
-			{
+			if ($sendQuery == '()') {
 				// Set a confirmation message.
 				$_SESSION['newsletter_sent'] = 'queue_done';
 				Utils::redirectexit('action=admin;area=news;sa=mailingmembers');
 			}
 
 			// Anything to exclude?
-			if (!empty(Utils::$context['recipients']['exclude_groups']) && in_array(0, Utils::$context['recipients']['exclude_groups']))
-			{
+			if (!empty(Utils::$context['recipients']['exclude_groups']) && in_array(0, Utils::$context['recipients']['exclude_groups'])) {
 				$sendQuery .= ' AND mem.id_group != {int:regular_group}';
 			}
 
-			if (!empty(Utils::$context['recipients']['exclude_members']))
-			{
+			if (!empty(Utils::$context['recipients']['exclude_members'])) {
 				$sendQuery .= ' AND mem.id_member NOT IN ({array_int:exclude_members})';
 				$sendParams['exclude_members'] = Utils::$context['recipients']['exclude_members'];
 			}
 
 			// Get the smelly people - note we respect the id_member range as it gives us a quicker query.
-			$rows = array();
+			$rows = [];
 
-			$result = Db::$db->query('', '
-				SELECT mem.id_member, mem.email_address, mem.real_name, mem.id_group, mem.additional_groups, mem.id_post_group
+			$result = Db::$db->query(
+				'',
+				'SELECT mem.id_member, mem.email_address, mem.real_name, mem.id_group, mem.additional_groups, mem.id_post_group
 				FROM {db_prefix}members AS mem
 				WHERE ' . $sendQuery . '
 					AND mem.is_activated = {int:is_activated}
 				ORDER BY mem.id_member ASC
 				LIMIT {int:start}, {int:atonce}',
-				array_merge($sendParams, array(
+				array_merge($sendParams, [
 					'start' => Utils::$context['start'],
 					'atonce' => $num_at_once,
 					'regular_group' => 0,
 					'is_activated' => 1,
-				))
+				]),
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$rows[$row['id_member']] = $row;
 			}
 			Db::$db->free_result($result);
@@ -973,72 +954,64 @@ function send($clean_only = false): void
 			// Load their alert preferences
 			$prefs = Notify::getNotifyPrefs(array_keys($rows), 'announcements', true);
 
-			foreach ($rows as $row)
-			{
+			foreach ($rows as $row) {
 				// Force them to have it?
-				if (empty(Utils::$context['email_force']) && empty($prefs[$row['id_member']]['announcements']))
-				{
+				if (empty(Utils::$context['email_force']) && empty($prefs[$row['id_member']]['announcements'])) {
 					continue;
 				}
 
 				// What groups are we looking at here?
-				if (empty($row['additional_groups']))
-				{
-					$groups = array($row['id_group'], $row['id_post_group']);
-				}
-				else
-				{
+				if (empty($row['additional_groups'])) {
+					$groups = [$row['id_group'], $row['id_post_group']];
+				} else {
 					$groups = array_merge(
-						array($row['id_group'], $row['id_post_group']),
-						explode(',', $row['additional_groups'])
+						[$row['id_group'], $row['id_post_group']],
+						explode(',', $row['additional_groups']),
 					);
 				}
 
 				// Excluded groups?
-				if (array_intersect($groups, Utils::$context['recipients']['exclude_groups']))
+				if (array_intersect($groups, Utils::$context['recipients']['exclude_groups'])) {
 					continue;
+				}
 
 				// We might need this
 				$cleanMemberName = empty($_POST['send_html']) || Utils::$context['send_pm'] ? Utils::htmlspecialcharsDecode($row['real_name']) : $row['real_name'];
 
-				if (!empty($include_unsubscribe))
-				{
+				if (!empty($include_unsubscribe)) {
 					$token = Notify::createUnsubscribeToken($row['id_member'], $row['email_address'], 'announcements');
 
 					$unsubscribe_link = sprintf(Lang::$txt['unsubscribe_announcements_' . (!empty($_POST['send_html']) ? 'html' : 'plain')], Config::$scripturl . '?action=notifyannouncements;u=' . $row['id_member'] . ';token=' . $token);
-				}
-				else
-				{
+				} else {
 					$unsubscribe_link = '';
 				}
 
 				// Replace the member-dependant variables
 				$message = str_replace(
 					$from_member,
-					array(
+					[
 						$row['email_address'],
 						!empty($_POST['send_html']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $cleanMemberName . '</a>' : (Utils::$context['send_pm'] ? '[url=' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . ']' . $cleanMemberName . '[/url]' : Config::$scripturl . '?action=profile;u=' . $row['id_member']),
 						$row['id_member'],
 						$cleanMemberName,
 						$unsubscribe_link,
-					),
-					$_POST['message']
+					],
+					$_POST['message'],
 				);
 
 				$subject = str_replace(
 					$from_member,
-					array(
+					[
 						$row['email_address'],
 						$row['real_name'],
 						$row['id_member'],
 						$row['real_name'],
-					),
-					$_POST['subject']
+					],
+					$_POST['subject'],
 				);
 
 				// Send the actual email - or a PM!
-				if (!Utils::$context['send_pm'])
-				{
+				if (!Utils::$context['send_pm']) {
 					Mail::send(
 						$row['email_address'],
 						$subject,
@@ -1046,16 +1019,14 @@ function send($clean_only = false): void
 						null,
 						'news',
 						!empty($_POST['send_html']),
-						5
+						5,
 					);
-				}
-				else
-				{
+				} else {
 					PM::send(
-						array('to' => array($row['id_member']),
-							'bcc' => array()),
+						['to' => [$row['id_member']],
+							'bcc' => []],
 						$subject,
-						$message
+						$message,
 					);
 				}
 			}
@@ -1063,10 +1034,9 @@ function send($clean_only = false): void
 
 		Utils::$context['start'] = Utils::$context['start'] + $num_at_once;
 
-		if (empty(Utils::$context['recipients']['emails']) && (Utils::$context['start'] >= Utils::$context['total_members']))
-		{
+		if (empty(Utils::$context['recipients']['emails']) && (Utils::$context['start'] >= Utils::$context['total_members'])) {
 			// Log this into the admin log.
-			Logging::logAction('newsletter', array(), 'admin');
+			Logging::logAction('newsletter', [], 'admin');
 			$_SESSION['newsletter_sent'] = 'queue_done';
 			Utils::redirectexit('action=admin;area=news;sa=mailingmembers');
 		}
@@ -1104,8 +1074,7 @@ public function settings(): void
 		Theme::addInlineJavaScript("\n\t" . 'document.getElementById("xmlnews_maxlen").disabled = !document.getElementById("xmlnews_enable").checked;', true);
 
 		// Saving the settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_news_settings');
@@ -1132,8 +1101,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1153,21 +1123,21 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		$config_vars = array(
-			array('title', 'settings'),
+		$config_vars = [
+			['title', 'settings'],
 
 			// Inline permissions.
-			array('permissions', 'edit_news', 'help' => ''),
-			array('permissions', 'send_mail'),
+			['permissions', 'edit_news', 'help' => ''],
+			['permissions', 'send_mail'],
 			'',
 
 			// Just the remaining settings.
-			array('check', 'xmlnews_enable', 'onclick' => 'document.getElementById(\'xmlnews_maxlen\').disabled = !this.checked;'),
-			array('int', 'xmlnews_maxlen', 'subtext' => Lang::$txt['xmlnews_maxlen_note'], 10),
-			array('check', 'xmlnews_attachments', 'subtext' => Lang::$txt['xmlnews_attachments_note']),
-		);
+			['check', 'xmlnews_enable', 'onclick' => 'document.getElementById(\'xmlnews_maxlen\').disabled = !this.checked;'],
+			['int', 'xmlnews_maxlen', 'subtext' => Lang::$txt['xmlnews_maxlen_note'], 10],
+			['check', 'xmlnews_attachments', 'subtext' => Lang::$txt['xmlnews_attachments_note']],
+		];
 
-		IntegrationHook::call('integrate_modify_news_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_news_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1179,24 +1149,23 @@ public static function getConfigVars(): array
 	 */
 	public static function list_getNews(): array
 	{
-		$admin_current_news = array();
+		$admin_current_news = [];
 
 		// Ready the current news.
-		foreach (explode("\n", Config::$modSettings['news']) as $id => $line)
-		{
-			$admin_current_news[$id] = array(
+		foreach (explode("\n", Config::$modSettings['news']) as $id => $line) {
+			$admin_current_news[$id] = [
 				'id' => $id,
 				'unparsed' => Msg::un_preparsecode($line),
 				'parsed' => preg_replace('~<([/]?)form[^>]*?[>]*>~i', '<em class="smalltext">&lt;$1form&gt;</em>', BBCodeParser::load()->parse($line)),
-			);
+			];
 		}
 
-		$admin_current_news['last'] = array(
+		$admin_current_news['last'] = [
 			'id' => 'last',
 			'unparsed' => '<div id="moreNewsItems"></div>
 			<noscript><textarea rows="3" cols="65" name="news[]" style="width: 85%;"></textarea></noscript>',
 			'parsed' => '<div id="moreNewsItems_preview"></div>',
-		);
+		];
 
 		return $admin_current_news;
 	}
@@ -1244,39 +1213,34 @@ public static function prepareMailingForPreview(): void
 	{
 		Lang::load('Errors');
 
-		$processing = array('preview_subject' => 'subject', 'preview_message' => 'message');
+		$processing = ['preview_subject' => 'subject', 'preview_message' => 'message'];
 
 		// Use the default time format.
 		User::$me->time_format = Config::$modSettings['time_format'];
 
-		$variables = array(
+		$variables = [
 			'{$board_url}',
 			'{$current_time}',
 			'{$latest_member.link}',
 			'{$latest_member.id}',
-			'{$latest_member.name}'
-		);
+			'{$latest_member.name}',
+		];
 
 		// We might need this in a bit
 		$cleanLatestMember = empty(Utils::$context['send_html']) || Utils::$context['send_pm'] ? Utils::htmlspecialcharsDecode(Config::$modSettings['latestRealName']) : Config::$modSettings['latestRealName'];
 
-		foreach ($processing as $key => $post)
-		{
+		foreach ($processing as $key => $post) {
 			Utils::$context[$key] = !empty($_REQUEST[$post]) ? $_REQUEST[$post] : '';
 
-			if (empty(Utils::$context[$key]) && empty($_REQUEST['xml']))
-			{
+			if (empty(Utils::$context[$key]) && empty($_REQUEST['xml'])) {
 				Utils::$context['post_error']['messages'][] = Lang::$txt['error_no_' . $post];
-			}
-			elseif (!empty($_REQUEST['xml']))
-			{
+			} elseif (!empty($_REQUEST['xml'])) {
 				continue;
 			}
 
 			Msg::preparsecode(Utils::$context[$key]);
 
-			if (!empty(Utils::$context['send_html']))
-			{
+			if (!empty(Utils::$context['send_html'])) {
 				$enablePostHTML = Config::$modSettings['enablePostHTML'];
 				Config::$modSettings['enablePostHTML'] = Utils::$context['send_html'];
 				Utils::$context[$key] = BBCodeParser::load()->parse(Utils::$context[$key]);
@@ -1286,14 +1250,14 @@ public static function prepareMailingForPreview(): void
 			// Replace in all the standard things.
 			Utils::$context[$key] = str_replace(
 				$variables,
-				array(
+				[
 					!empty(Utils::$context['send_html']) ? '<a href="' . Config::$scripturl . '">' . Config::$scripturl . '</a>' : Config::$scripturl,
 					Time::create('now')->format(null, false),
 					!empty(Utils::$context['send_html']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember'] . '">' . $cleanLatestMember . '</a>' : (Utils::$context['send_pm'] ? '[url=' . Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember'] . ']' . $cleanLatestMember . '[/url]' : $cleanLatestMember),
 					Config::$modSettings['latestMember'],
-					$cleanLatestMember
-				),
-				Utils::$context[$key]
+					$cleanLatestMember,
+				],
+				Utils::$context[$key],
 			);
 		}
 	}
@@ -1346,8 +1310,9 @@ public static function sendMailing(): void
 	 */
 	public static function modifyNewsSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -1366,30 +1331,31 @@ protected function __construct()
 		Theme::loadTemplate('ManageNews');
 
 		// Create the tabs for the template.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['news_title'],
 			'help' => 'edit_news',
 			'description' => Lang::$txt['admin_news_desc'],
-			'tabs' => array(
-				'editnews' => array(
-				),
-				'mailingmembers' => array(
+			'tabs' => [
+				'editnews' => [
+				],
+				'mailingmembers' => [
 					'description' => Lang::$txt['news_mailing_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['news_settings_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_news', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_news', [&self::$subactions]);
 
 		// Default to sub action 'main' or 'settings' depending on permissions.
 		$this->subaction = isset($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (User::$me->allowedTo('edit_news') ? 'editnews' : (User::$me->allowedTo('send_mail') ? 'mailingmembers' : 'settings'));
 
 		// Force the right area...
-		if (substr($this->subaction, 0, 7) == 'mailing')
+		if (substr($this->subaction, 0, 7) == 'mailing') {
 			Menu::$loaded['admin']['current_subsection'] = 'mailingmembers';
+		}
 
 		// Insert dynamic values into the list options.
 		$this->setListOptions();
@@ -1418,14 +1384,11 @@ protected static function setDynamicStrings(array &$data): void
 	{
 		array_walk_recursive(
 			$data,
-			function(&$value, $key)
-			{
+			function (&$value, $key) {
 				$value = preg_replace_callback(
 					'/{(scripturl|boardurl|txt:|js_escape:)([^}]*)}/',
-					function($matches)
-					{
-						switch ($matches[1])
-						{
+					function ($matches) {
+						switch ($matches[1]) {
 							case 'scripturl':
 								$new_value = Config::$scripturl;
 								break;
@@ -1445,15 +1408,16 @@ function($matches)
 
 						return $new_value;
 					},
-					$value
+					$value,
 				);
-			}
+			},
 		);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\News::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\News::exportStatic')) {
 	News::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/PackageManager.php b/Sources/Actions/Admin/PackageManager.php
index d244e7ca56..183924ddb7 100644
--- a/Sources/Actions/Admin/PackageManager.php
+++ b/Sources/Actions/Admin/PackageManager.php
@@ -11,8 +11,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 // Just an alias to help people looking for the package manager in the wrong namespace.
 class_alias('SMF\\PackageManager\\PackageManager', 'SMF\\Actions\\Admin\\PackageManager');
diff --git a/Sources/Actions/Admin/Permissions.php b/Sources/Actions/Admin/Permissions.php
index 95d6b25768..963c57640e 100644
--- a/Sources/Actions/Admin/Permissions.php
+++ b/Sources/Actions/Admin/Permissions.php
@@ -13,12 +13,13 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Moderation\Posts as PostMod;
+use SMF\BackwardCompatibility;
 use SMF\Board;
 use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\IntegrationHook;
@@ -28,8 +29,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Moderation\Posts as PostMod;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Permissions handles all possible permission stuff.
@@ -43,34 +42,49 @@ class Permissions implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ModifyPermissions',
-			'getConfigVars' => false,
-		),
-	);
+			'getPermissions' => 'getPermissions',
+			'setPermissionLevel' => 'setPermissionLevel',
+			'init_inline_permissions' => 'init_inline_permissions',
+			'theme_inline_permissions' => 'theme_inline_permissions',
+			'save_inline_permissions' => 'save_inline_permissions',
+			'loadPermissionProfiles' => 'loadPermissionProfiles',
+			'updateChildPermissions' => 'updateChildPermissions',
+			'loadIllegalPermissions' => 'loadIllegalPermissions',
+			'buildHidden' => 'buildHidden',
+			'permissionIndex' => 'PermissionIndex',
+			'permissionByBoard' => 'PermissionByBoard',
+			'modifyMembergroup' => 'ModifyMembergroup',
+			'modifyMembergroup2' => 'ModifyMembergroup2',
+			'setQuickGroups' => 'SetQuickGroups',
+			'modifyPostModeration' => 'ModifyPostModeration',
+			'editPermissionProfiles' => 'EditPermissionProfiles',
+			'generalPermissionSettings' => 'GeneralPermissionSettings',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const GROUP_LEVEL_RESTRICT = 0;
-	const GROUP_LEVEL_STANDARD = 1;
-	const GROUP_LEVEL_MODERATOR = 2;
-	const GROUP_LEVEL_MAINTENANCE = 3;
+	public const GROUP_LEVEL_RESTRICT = 0;
+	public const GROUP_LEVEL_STANDARD = 1;
+	public const GROUP_LEVEL_MODERATOR = 2;
+	public const GROUP_LEVEL_MAINTENANCE = 3;
 
-	const BOARD_LEVEL_STANDARD = 0;
-	const BOARD_LEVEL_LOCKED = 1;
-	const BOARD_LEVEL_PUBLISH = 2;
-	const BOARD_LEVEL_FREE = 3;
+	public const BOARD_LEVEL_STANDARD = 0;
+	public const BOARD_LEVEL_LOCKED = 1;
+	public const BOARD_LEVEL_PUBLISH = 2;
+	public const BOARD_LEVEL_FREE = 3;
 
-	const PROFILE_DEFAULT = 1;
-	const PROFILE_NO_POLLS = 2;
-	const PROFILE_REPLY_ONLY = 3;
-	const PROFILE_READ_ONLY = 4;
-	const PROFILE_PREDEFINED = array(1, 2, 3, 4);
-	const PROFILE_UNMODIFIABLE = array(2, 3, 4);
+	public const PROFILE_DEFAULT = 1;
+	public const PROFILE_NO_POLLS = 2;
+	public const PROFILE_REPLY_ONLY = 3;
+	public const PROFILE_READ_ONLY = 4;
+	public const PROFILE_PREDEFINED = [1, 2, 3, 4];
+	public const PROFILE_UNMODIFIABLE = [2, 3, 4];
 
 	/*******************
 	 * Public properties
@@ -92,12 +106,12 @@ class Permissions implements ActionInterface
 	 *
 	 * Format: permission_group => array(can_do_moderated, can_do_all)
 	 */
-	public array $postmod_maps = array(
-		'new_topic' => array('post_new', 'post_unapproved_topics'),
-		'replies_own' => array('post_reply_own', 'post_unapproved_replies_own'),
-		'replies_any' => array('post_reply_any', 'post_unapproved_replies_any'),
-		'attachment' => array('post_attachment', 'post_unapproved_attachments'),
-	);
+	public array $postmod_maps = [
+		'new_topic' => ['post_new', 'post_unapproved_topics'],
+		'replies_own' => ['post_reply_own', 'post_unapproved_replies_own'],
+		'replies_any' => ['post_reply_any', 'post_unapproved_replies_any'],
+		'attachment' => ['post_attachment', 'post_unapproved_attachments'],
+	];
 
 	/**************************
 	 * Public static properties
@@ -110,16 +124,16 @@ class Permissions implements ActionInterface
 	 *
 	 * Format: 'sub-action' => array('method_to_call', 'permission_needed')
 	 */
-	public static array $subactions = array(
-		'index' => array('index', 'manage_permissions'),
-		'board' => array('board', 'manage_permissions'),
-		'modify' => array('modify', 'manage_permissions'),
-		'modify2' => array('modify2', 'manage_permissions'),
-		'quick' => array('quick', 'manage_permissions'),
-		'postmod' => array('postmod', 'manage_permissions'),
-		'profiles' => array('profiles', 'manage_permissions'),
-		'settings' => array('settings', 'admin_forum'),
-	);
+	public static array $subactions = [
+		'index' => ['index', 'manage_permissions'],
+		'board' => ['board', 'manage_permissions'],
+		'modify' => ['modify', 'manage_permissions'],
+		'modify2' => ['modify2', 'manage_permissions'],
+		'quick' => ['quick', 'manage_permissions'],
+		'postmod' => ['postmod', 'manage_permissions'],
+		'profiles' => ['profiles', 'manage_permissions'],
+		'settings' => ['settings', 'admin_forum'],
+	];
 
 	/**
 	 * @var array
@@ -129,8 +143,8 @@ class Permissions implements ActionInterface
 	 *
 	 * Keys are permission scopes, values are lists of view_groups.
 	 */
-	public static array $permission_groups = array(
-		'global' => array(
+	public static array $permission_groups = [
+		'global' => [
 			'general',
 			'pm',
 			'calendar',
@@ -141,29 +155,29 @@ class Permissions implements ActionInterface
 			'likes',
 			'mentions',
 			'bbc',
-		),
-		'board' => array(
+		],
+		'board' => [
 			'general_board',
 			'topic',
 			'post',
 			'poll',
 			'attachment',
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Permission view_groups that should be shown in the left column of the UI.
 	 */
-	public static array $left_permission_groups = array(
+	public static array $left_permission_groups = [
 		'general',
 		'calendar',
 		'maintenance',
 		'member_admin',
 		'topic',
 		'post',
-	);
+	];
 
 	/**
 	 * @var array
@@ -182,16 +196,16 @@ class Permissions implements ActionInterface
 	 * Permissions that are allowed or denied for the relevant membergroup.
 	 * Used by the modify() method.
 	 */
-	protected array $allowed_denied = array(
-		'global' => array(
-			'allowed' => array(),
-			'denied' => array(),
-		),
-		'board' => array(
-			'allowed' => array(),
-			'denied' => array(),
-		),
-	);
+	protected array $allowed_denied = [
+		'global' => [
+			'allowed' => [],
+			'denied' => [],
+		],
+		'board' => [
+			'allowed' => [],
+			'denied' => [],
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -243,78 +257,78 @@ class Permissions implements ActionInterface
 	 *  - assigner_prerequisites: Permissions that someone must have at least
 	 *        one of before they can grant this permission to anyone.
 	 */
-	protected static array $permissions = array(
-		'access_mod_center' => array(
+	protected static array $permissions = [
+		'access_mod_center' => [
 			'view_group' => 'maintenance',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'never_guests' => true,
-		),
-		'admin_forum' => array(
+		],
+		'admin_forum' => [
 			'view_group' => 'maintenance',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-			'assigner_prerequisites' => array('admin_forum'),
-		),
-		'announce_topic' => array(
+			'assigner_prerequisites' => ['admin_forum'],
+		],
+		'announce_topic' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'never_guests' => true,
-		),
-		'approve_posts' => array(
+		],
+		'approve_posts' => [
 			'view_group' => 'general_board',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'bbc_cowsay' => array(
+		],
+		'bbc_cowsay' => [
 			'view_group' => 'bbc',
 			'scope' => 'global',
 			'hidden' => true,
-			'vsprintf' => array('permissionname_bbc', array('cowsay')),
-		),
-		'bbc_html' => array(
+			'vsprintf' => ['permissionname_bbc', ['cowsay']],
+		],
+		'bbc_html' => [
 			'view_group' => 'bbc',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
-			'vsprintf' => array('permissionname_bbc', array('html')),
+			'vsprintf' => ['permissionname_bbc', ['html']],
 			'never_guests' => true,
-			'assignee_prerequisites' => array(
+			'assignee_prerequisites' => [
 				'admin_forum',
 				'manage_membergroups',
 				'manage_permissions',
-			),
-			'assigner_prerequisites' => array('admin_forum'),
-		),
-		'calendar_edit_own' => array(
+			],
+			'assigner_prerequisites' => ['admin_forum'],
+		],
+		'calendar_edit_own' => [
 			'generic_name' => 'calendar_edit',
 			'own_any' => 'own',
 			'view_group' => 'calendar',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'never_guests' => true,
-		),
-		'calendar_edit_any' => array(
+		],
+		'calendar_edit_any' => [
 			'generic_name' => 'calendar_edit',
 			'own_any' => 'any',
 			'view_group' => 'calendar',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'calendar_post' => array(
+		],
+		'calendar_post' => [
 			'view_group' => 'calendar',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
-		),
-		'calendar_view' => array(
+		],
+		'calendar_view' => [
 			'view_group' => 'calendar',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
-		),
-		'delete_own' => array(
+		],
+		'delete_own' => [
 			'generic_name' => 'delete',
 			'own_any' => 'own',
 			'view_group' => 'post',
@@ -322,8 +336,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'delete_any' => array(
+		],
+		'delete_any' => [
 			'generic_name' => 'delete',
 			'own_any' => 'any',
 			'view_group' => 'post',
@@ -331,32 +345,32 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'delete_replies' => array(
+		],
+		'delete_replies' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'edit_news' => array(
+		],
+		'edit_news' => [
 			'view_group' => 'maintenance',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'issue_warning' => array(
+		],
+		'issue_warning' => [
 			'view_group' => 'member_admin',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'never_guests' => true,
-		),
-		'likes_like' => array(
+		],
+		'likes_like' => [
 			'view_group' => 'likes',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'lock_own' => array(
+		],
+		'lock_own' => [
 			'generic_name' => 'lock',
 			'own_any' => 'own',
 			'view_group' => 'topic',
@@ -364,8 +378,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'lock_any' => array(
+		],
+		'lock_any' => [
 			'generic_name' => 'lock',
 			'own_any' => 'any',
 			'view_group' => 'topic',
@@ -373,76 +387,76 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'make_sticky' => array(
+		],
+		'make_sticky' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'manage_attachments' => array(
+		],
+		'manage_attachments' => [
 			'view_group' => 'maintenance',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'manage_bans' => array(
+		],
+		'manage_bans' => [
 			'view_group' => 'member_admin',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'manage_boards' => array(
+		],
+		'manage_boards' => [
 			'view_group' => 'maintenance',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'manage_membergroups' => array(
+		],
+		'manage_membergroups' => [
 			'view_group' => 'member_admin',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-			'assigner_prerequisites' => array('manage_membergroups'),
-		),
-		'manage_permissions' => array(
+			'assigner_prerequisites' => ['manage_membergroups'],
+		],
+		'manage_permissions' => [
 			'view_group' => 'member_admin',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-			'assigner_prerequisites' => array('manage_permissions'),
-		),
-		'manage_smileys' => array(
+			'assigner_prerequisites' => ['manage_permissions'],
+		],
+		'manage_smileys' => [
 			'view_group' => 'maintenance',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'mention' => array(
+		],
+		'mention' => [
 			'view_group' => 'mentions',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
-		),
-		'merge_any' => array(
+		],
+		'merge_any' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'moderate_board' => array(
+		],
+		'moderate_board' => [
 			'view_group' => 'general_board',
 			'scope' => 'board',
 			'never_guests' => true,
-		),
-		'moderate_forum' => array(
+		],
+		'moderate_forum' => [
 			'view_group' => 'member_admin',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'modify_own' => array(
+		],
+		'modify_own' => [
 			'generic_name' => 'modify',
 			'own_any' => 'own',
 			'view_group' => 'post',
@@ -450,8 +464,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'modify_any' => array(
+		],
+		'modify_any' => [
 			'generic_name' => 'modify',
 			'own_any' => 'any',
 			'view_group' => 'post',
@@ -459,46 +473,46 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'modify_replies' => array(
+		],
+		'modify_replies' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'move_own' => array(
+		],
+		'move_own' => [
 			'generic_name' => 'move',
 			'own_any' => 'own',
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'never_guests' => true,
-		),
-		'move_any' => array(
+		],
+		'move_any' => [
 			'generic_name' => 'move',
 			'own_any' => 'any',
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'never_guests' => true,
-		),
-		'pm_draft' => array(
+		],
+		'pm_draft' => [
 			'view_group' => 'pm',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'pm_read' => array(
+		],
+		'pm_read' => [
 			'view_group' => 'pm',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'pm_send' => array(
+		],
+		'pm_send' => [
 			'view_group' => 'pm',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'poll_add_own' => array(
+		],
+		'poll_add_own' => [
 			'generic_name' => 'poll_add',
 			'own_any' => 'own',
 			'view_group' => 'poll',
@@ -506,8 +520,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'poll_add_any' => array(
+		],
+		'poll_add_any' => [
 			'generic_name' => 'poll_add',
 			'own_any' => 'any',
 			'view_group' => 'poll',
@@ -515,8 +529,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'poll_edit_own' => array(
+		],
+		'poll_edit_own' => [
 			'generic_name' => 'poll_edit',
 			'own_any' => 'own',
 			'view_group' => 'poll',
@@ -524,8 +538,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'poll_edit_any' => array(
+		],
+		'poll_edit_any' => [
 			'generic_name' => 'poll_edit',
 			'own_any' => 'any',
 			'view_group' => 'poll',
@@ -533,15 +547,15 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'poll_lock_own' => array(
+		],
+		'poll_lock_own' => [
 			'generic_name' => 'poll_lock',
 			'own_any' => 'own',
 			'view_group' => 'poll',
 			'scope' => 'board',
 			'never_guests' => true,
-		),
-		'poll_lock_any' => array(
+		],
+		'poll_lock_any' => [
 			'generic_name' => 'poll_lock',
 			'own_any' => 'any',
 			'view_group' => 'poll',
@@ -549,22 +563,22 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'poll_post' => array(
+		],
+		'poll_post' => [
 			'view_group' => 'poll',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
-		),
-		'poll_remove_own' => array(
+		],
+		'poll_remove_own' => [
 			'generic_name' => 'poll_remove',
 			'own_any' => 'own',
 			'view_group' => 'poll',
 			'scope' => 'board',
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'poll_remove_any' => array(
+		],
+		'poll_remove_any' => [
 			'generic_name' => 'poll_remove',
 			'own_any' => 'any',
 			'view_group' => 'poll',
@@ -572,250 +586,250 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'poll_view' => array(
+		],
+		'poll_view' => [
 			'view_group' => 'poll',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_LOCKED,
-		),
-		'poll_vote' => array(
+		],
+		'poll_vote' => [
 			'view_group' => 'poll',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
-		),
-		'post_attachment' => array(
+		],
+		'post_attachment' => [
 			'view_group' => 'attachment',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
-		),
-		'post_draft' => array(
+		],
+		'post_draft' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'never_guests' => true,
-		),
-		'post_new' => array(
+		],
+		'post_new' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
-		),
-		'post_reply_own' => array(
+		],
+		'post_reply_own' => [
 			'generic_name' => 'post_reply',
 			'own_any' => 'own',
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
-		),
-		'post_reply_any' => array(
+		],
+		'post_reply_any' => [
 			'generic_name' => 'post_reply',
 			'own_any' => 'any',
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
-		),
-		'post_unapproved_attachments' => array(
+		],
+		'post_unapproved_attachments' => [
 			'view_group' => 'attachment',
 			'scope' => 'board',
-		),
-		'post_unapproved_replies_own' => array(
+		],
+		'post_unapproved_replies_own' => [
 			'generic_name' => 'post_unapproved_replies',
 			'own_any' => 'own',
 			'view_group' => 'topic',
 			'scope' => 'board',
-		),
-		'post_unapproved_replies_any' => array(
+		],
+		'post_unapproved_replies_any' => [
 			'generic_name' => 'post_unapproved_replies',
 			'own_any' => 'any',
 			'view_group' => 'topic',
 			'scope' => 'board',
-		),
-		'post_unapproved_topics' => array(
+		],
+		'post_unapproved_topics' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
-		),
-		'profile_blurb_own' => array(
+		],
+		'profile_blurb_own' => [
 			'generic_name' => 'profile_blurb',
 			'own_any' => 'own',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'profile_blurb_any' => array(
+		],
+		'profile_blurb_any' => [
 			'generic_name' => 'profile_blurb',
 			'own_any' => 'any',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'profile_displayed_name_own' => array(
+		],
+		'profile_displayed_name_own' => [
 			'generic_name' => 'profile_displayed_name',
 			'own_any' => 'own',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'profile_displayed_name_any' => array(
+		],
+		'profile_displayed_name_any' => [
 			'generic_name' => 'profile_displayed_name',
 			'own_any' => 'any',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'profile_extra_own' => array(
+		],
+		'profile_extra_own' => [
 			'generic_name' => 'profile_extra',
 			'own_any' => 'own',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_extra_any' => array(
+		],
+		'profile_extra_any' => [
 			'generic_name' => 'profile_extra',
 			'own_any' => 'any',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'profile_forum_own' => array(
+		],
+		'profile_forum_own' => [
 			'generic_name' => 'profile_forum',
 			'own_any' => 'own',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_forum_any' => array(
+		],
+		'profile_forum_any' => [
 			'generic_name' => 'profile_forum',
 			'own_any' => 'any',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'profile_identity_own' => array(
+		],
+		'profile_identity_own' => [
 			'generic_name' => 'profile_identity',
 			'own_any' => 'own',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'never_guests' => true,
-		),
-		'profile_identity_any' => array(
+		],
+		'profile_identity_any' => [
 			'generic_name' => 'profile_identity',
 			'own_any' => 'any',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'profile_password_own' => array(
+		],
+		'profile_password_own' => [
 			'generic_name' => 'profile_password',
 			'own_any' => 'own',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_password_any' => array(
+		],
+		'profile_password_any' => [
 			'generic_name' => 'profile_password',
 			'own_any' => 'any',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'profile_remote_avatar' => array(
+		],
+		'profile_remote_avatar' => [
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_remove_own' => array(
+		],
+		'profile_remove_own' => [
 			'generic_name' => 'profile_remove',
 			'own_any' => 'own',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_remove_any' => array(
+		],
+		'profile_remove_any' => [
 			'generic_name' => 'profile_remove',
 			'own_any' => 'any',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'profile_server_avatar' => array(
+		],
+		'profile_server_avatar' => [
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_signature_own' => array(
+		],
+		'profile_signature_own' => [
 			'generic_name' => 'profile_signature',
 			'own_any' => 'own',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_signature_any' => array(
+		],
+		'profile_signature_any' => [
 			'generic_name' => 'profile_signature',
 			'own_any' => 'any',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'profile_title_own' => array(
+		],
+		'profile_title_own' => [
 			'generic_name' => 'profile_title',
 			'own_any' => 'own',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'profile_title_any' => array(
+		],
+		'profile_title_any' => [
 			'generic_name' => 'profile_title',
 			'own_any' => 'any',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'profile_upload_avatar' => array(
+		],
+		'profile_upload_avatar' => [
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_view' => array(
+		],
+		'profile_view' => [
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
-		),
-		'profile_website_own' => array(
+		],
+		'profile_website_own' => [
 			'generic_name' => 'profile_website',
 			'own_any' => 'own',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'profile_website_any' => array(
+		],
+		'profile_website_any' => [
 			'generic_name' => 'profile_website',
 			'own_any' => 'any',
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_MAINTENANCE,
 			'never_guests' => true,
-		),
-		'remove_own' => array(
+		],
+		'remove_own' => [
 			'generic_name' => 'remove',
 			'own_any' => 'own',
 			'view_group' => 'topic',
@@ -823,8 +837,8 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_PUBLISH,
 			'never_guests' => true,
-		),
-		'remove_any' => array(
+		],
+		'remove_any' => [
 			'generic_name' => 'remove',
 			'own_any' => 'any',
 			'view_group' => 'topic',
@@ -832,71 +846,71 @@ class Permissions implements ActionInterface
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'report_any' => array(
+		],
+		'report_any' => [
 			'view_group' => 'post',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
 			'board_level' => self::BOARD_LEVEL_LOCKED,
 			'never_guests' => true,
-		),
-		'report_user' => array(
+		],
+		'report_user' => [
 			'view_group' => 'profile',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'never_guests' => true,
-		),
-		'search_posts' => array(
+		],
+		'search_posts' => [
 			'view_group' => 'general',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
-		),
-		'send_mail' => array(
+		],
+		'send_mail' => [
 			'view_group' => 'member_admin',
 			'scope' => 'global',
 			'never_guests' => true,
-		),
-		'split_any' => array(
+		],
+		'split_any' => [
 			'view_group' => 'topic',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_MODERATOR,
 			'board_level' => self::BOARD_LEVEL_FREE,
 			'never_guests' => true,
-		),
-		'view_attachments' => array(
+		],
+		'view_attachments' => [
 			'view_group' => 'attachment',
 			'scope' => 'board',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
 			'board_level' => self::BOARD_LEVEL_LOCKED,
-		),
-		'view_mlist' => array(
+		],
+		'view_mlist' => [
 			'view_group' => 'general',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_STANDARD,
-		),
-		'view_stats' => array(
+		],
+		'view_stats' => [
 			'view_group' => 'general',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
-		),
-		'view_warning_own' => array(
+		],
+		'view_warning_own' => [
 			'generic_name' => 'view_warning',
 			'own_any' => 'own',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
-		),
-		'view_warning_any' => array(
+		],
+		'view_warning_any' => [
 			'generic_name' => 'view_warning',
 			'own_any' => 'any',
 			'view_group' => 'profile_account',
 			'scope' => 'global',
-		),
-		'who_view' => array(
+		],
+		'who_view' => [
 			'view_group' => 'general',
 			'scope' => 'global',
 			'group_level' => self::GROUP_LEVEL_RESTRICT,
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var bool
@@ -910,21 +924,21 @@ class Permissions implements ActionInterface
 	 *
 	 * Convenience array listing permissions that guests may never have.
 	 */
-	protected static array $never_guests = array();
+	protected static array $never_guests = [];
 
 	/**
 	 * @var array
 	 *
 	 * Convenience array listing permissions that certain groups may not have.
 	 */
-	protected static array $excluded = array();
+	protected static array $excluded = [];
 
 	/**
 	 * @var array
 	 *
 	 * Convenience array listing permissions that the current user can't change.
 	 */
-	protected static array $illegal = array();
+	protected static array $illegal = [];
 
 	/**
 	 * @var object
@@ -950,10 +964,11 @@ public function execute(): void
 	{
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -998,28 +1013,27 @@ public function board(): void
 		Utils::$context['edit_all'] = isset($_GET['edit']);
 
 		// Saving?
-		if (!empty($_POST['save_changes']) && !empty($_POST['boardprofile']))
-		{
+		if (!empty($_POST['save_changes']) && !empty($_POST['boardprofile'])) {
 			User::$me->checkSession('request');
 			SecurityToken::validate('admin-mpb');
 
-			$changes = array();
+			$changes = [];
 
-			foreach ($_POST['boardprofile'] as $p_board => $profile)
+			foreach ($_POST['boardprofile'] as $p_board => $profile) {
 				$changes[(int) $profile][] = (int) $p_board;
+			}
 
-			if (!empty($changes))
-			{
-				foreach ($changes as $profile => $boards)
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+			if (!empty($changes)) {
+				foreach ($changes as $profile => $boards) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET id_profile = {int:current_profile}
 						WHERE id_board IN ({array_int:board_list})',
-						array(
+						[
 							'board_list' => $boards,
 							'current_profile' => $profile,
-						)
+						],
 					);
 				}
 			}
@@ -1034,28 +1048,28 @@ public function board(): void
 		Category::getTree();
 
 		// Build the list of the boards.
-		Utils::$context['categories'] = array();
-		foreach (Category::$loaded as $catid => $tree)
-		{
-			Utils::$context['categories'][$catid] = array(
+		Utils::$context['categories'] = [];
+
+		foreach (Category::$loaded as $catid => $tree) {
+			Utils::$context['categories'][$catid] = [
 				'name' => &$tree->name,
 				'id' => &$tree->id,
-				'boards' => array()
-			);
+				'boards' => [],
+			];
 
-			foreach (Category::$boardList[$catid] as $boardid)
-			{
-				if (!isset(Utils::$context['profiles'][Board::$loaded[$boardid]->profile]))
+			foreach (Category::$boardList[$catid] as $boardid) {
+				if (!isset(Utils::$context['profiles'][Board::$loaded[$boardid]->profile])) {
 					Board::$loaded[$boardid]->profile = self::PROFILE_DEFAULT;
+				}
 
-				Utils::$context['categories'][$catid]['boards'][$boardid] = array(
+				Utils::$context['categories'][$catid]['boards'][$boardid] = [
 					'id' => &Board::$loaded[$boardid]->id,
 					'name' => &Board::$loaded[$boardid]->name,
 					'description' => &Board::$loaded[$boardid]->description,
 					'child_level' => &Board::$loaded[$boardid]->child_level,
 					'profile' => &Board::$loaded[$boardid]->profile,
 					'profile_name' => Utils::$context['profiles'][Board::$loaded[$boardid]->profile]['name'],
-				);
+				];
 			}
 		}
 
@@ -1072,49 +1086,48 @@ public function quick(): void
 		User::$me->checkSession();
 		SecurityToken::validate('admin-mpq', 'quick');
 
-		if ($_POST['copy_from'] === 'empty')
+		if ($_POST['copy_from'] === 'empty') {
 			$_POST['copy_from'] = 0;
+		}
 
 		// Make sure only one of the quick options was selected.
-		if (!empty($_POST['predefined']) + !empty($_POST['permissions']) + !empty($_POST['copy_from']) > 1)
-		{
+		if (!empty($_POST['predefined']) + !empty($_POST['permissions']) + !empty($_POST['copy_from']) > 1) {
 			ErrorHandler::fatalLang('permissions_only_one_option', false);
 		}
 
 		// Only accept numeric values for selected membergroups.
-		$_POST['group'] = array_unique(array_map('intval', (array) ($_POST['group'] ?? array())));
+		$_POST['group'] = array_unique(array_map('intval', (array) ($_POST['group'] ?? [])));
 
 		// No groups were selected.
-		if (empty($_POST['group']))
+		if (empty($_POST['group'])) {
 			Utils::redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		// Profile ID must be an integer.
 		$_REQUEST['pid'] = (int) ($_REQUEST['pid'] ?? 0);
 
 		// Sorry, but that one can't be modified.
-		if (in_array($_REQUEST['pid'], self::PROFILE_UNMODIFIABLE))
+		if (in_array($_REQUEST['pid'], self::PROFILE_UNMODIFIABLE)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Clear out any cached authority.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
 		self::loadIllegalPermissions();
 		self::loadIllegalGuestPermissions();
 		self::loadIllegalBBCHtmlGroups();
 
 		// Set a predefined permission profile.
-		if (!empty($_POST['predefined']))
-		{
+		if (!empty($_POST['predefined'])) {
 			$this->quickSetPredefined();
 		}
 		// Set a permission profile based on the permissions of a selected group.
-		elseif (!empty($_POST['copy_from']))
-		{
+		elseif (!empty($_POST['copy_from'])) {
 			$this->quickCopyFrom();
 		}
 		// Set or unset a certain permission for the selected groups.
-		elseif (!empty($_POST['permissions']))
-		{
+		elseif (!empty($_POST['permissions'])) {
 			$this->quickSetPermission();
 		}
 
@@ -1153,63 +1166,68 @@ public function modify2(): void
 		SecurityToken::validate('admin-mp');
 
 		// Can't do anything without these.
-		if (!isset($_GET['group'], $_GET['pid']))
+		if (!isset($_GET['group'], $_GET['pid'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		$_GET['group'] = (int) $_GET['group'];
 		$_GET['pid'] = (int) $_GET['pid'];
 
 		// Group needs to be valid.
-		if ($_GET['group'] < -1)
+		if ($_GET['group'] < -1) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// No, you can't modify this permission profile.
-		if (in_array($_GET['pid'], self::PROFILE_UNMODIFIABLE))
+		if (in_array($_GET['pid'], self::PROFILE_UNMODIFIABLE)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Verify this isn't inherited.
-		if ($this->getParentGroup($_GET['group']) != Group::NONE)
+		if ($this->getParentGroup($_GET['group']) != Group::NONE) {
 			ErrorHandler::fatalLang('cannot_edit_permissions_inherited');
+		}
 
 		$illegal_permissions = array_merge(
 			self::loadIllegalPermissions(),
-			$_GET['group'] == -1 ? self::loadIllegalGuestPermissions() : array()
+			$_GET['group'] == -1 ? self::loadIllegalGuestPermissions() : [],
 		);
 
-		$give_perms = array(
-			'global' => array(),
-			'board' => array(),
-		);
+		$give_perms = [
+			'global' => [],
+			'board' => [],
+		];
 
 		// Prepare all permissions that were set or denied for addition to the DB.
-		if (isset($_POST['perm']) && is_array($_POST['perm']))
-		{
-			foreach ($_POST['perm'] as $scope => $perm_array)
-			{
-				if (!is_array($perm_array))
+		if (isset($_POST['perm']) && is_array($_POST['perm'])) {
+			foreach ($_POST['perm'] as $scope => $perm_array) {
+				if (!is_array($perm_array)) {
 					continue;
+				}
 
-				foreach ($perm_array as $permission => $value)
-				{
-					if ($value != 'on' && $value != 'deny')
+				foreach ($perm_array as $permission => $value) {
+					if ($value != 'on' && $value != 'deny') {
 						continue;
+					}
 
 					// Don't allow people to escalate themselves!
-					if (in_array($permission, $illegal_permissions))
+					if (in_array($permission, $illegal_permissions)) {
 						continue;
+					}
 
-					$give_perms[$scope][] = array(
+					$give_perms[$scope][] = [
 						$_GET['group'],
 						$permission,
 						(int) ($value == 'on'),
-					);
+					];
 				}
 			}
 		}
 
 		// Insert the general permissions.
-		if ($_GET['group'] != 3 && empty($_GET['pid']))
+		if ($_GET['group'] != 3 && empty($_GET['pid'])) {
 			$this->updateGlobalPermissions($_GET['group'], $give_perms, $illegal_permissions);
+		}
 
 		// Insert the board permissions.
 		$this->updateBoardPermissions($_GET['group'], $give_perms, $illegal_permissions, $_GET['pid']);
@@ -1221,11 +1239,12 @@ public function modify2(): void
 		self::removeIllegalBBCHtmlPermission();
 
 		// Ensure Config::$modSettings['board_manager_groups'] is up to date.
-		if (!in_array('manage_boards', $illegal_permissions))
+		if (!in_array('manage_boards', $illegal_permissions)) {
 			self::updateBoardManagers();
+		}
 
 		// Clear cached permissions.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
 		Utils::redirectexit('action=admin;area=permissions;pid=' . $_GET['pid']);
 	}
@@ -1244,8 +1263,7 @@ public function settings(): void
 		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=permissions;save;sa=settings';
 
 		// Saving the settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_permission_settings');
@@ -1253,69 +1271,73 @@ public function settings(): void
 			ACP::saveDBSettings($config_vars);
 
 			// Clear all deny permissions... if we want that.
-			if (empty(Config::$modSettings['permission_enable_deny']))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}permissions
+			if (empty(Config::$modSettings['permission_enable_deny'])) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}permissions
 					WHERE add_deny = {int:denied}',
-					array(
+					[
 						'denied' => 0,
-					)
+					],
 				);
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}board_permissions
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}board_permissions
 					WHERE add_deny = {int:denied}',
-					array(
+					[
 						'denied' => 0,
-					)
+					],
 				);
 			}
 
 			// Make sure there are no postgroup based permissions left.
-			if (empty(Config::$modSettings['permission_enable_postgroups']))
-			{
+			if (empty(Config::$modSettings['permission_enable_postgroups'])) {
 				// Get a list of postgroups.
-				$post_groups = array();
+				$post_groups = [];
 
-				$request = Db::$db->query('', '
-					SELECT id_group
+				$request = Db::$db->query(
+					'',
+					'SELECT id_group
 					FROM {db_prefix}membergroups
 					WHERE min_posts != {int:min_posts}',
-					array(
+					[
 						'min_posts' => -1,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$post_groups[] = $row['id_group'];
 				}
 				Db::$db->free_result($request);
 
 				// Remove'em.
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}permissions
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:post_group_list})',
-					array(
+					[
 						'post_group_list' => $post_groups,
-					)
+					],
 				);
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}board_permissions
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:post_group_list})',
-					array(
+					[
 						'post_group_list' => $post_groups,
-					)
+					],
 				);
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}membergroups
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}membergroups
 					SET id_parent = {int:not_inherited}
 					WHERE id_parent IN ({array_int:post_group_list})',
-					array(
+					[
 						'post_group_list' => $post_groups,
 						'not_inherited' => -2,
-					)
+					],
 				);
 			}
 
@@ -1339,18 +1361,15 @@ public function profiles(): void
 		Utils::$context['sub_template'] = 'edit_profiles';
 
 		// If we're creating a new one do it first.
-		if (isset($_POST['create']) && trim($_POST['profile_name']) != '')
-		{
+		if (isset($_POST['create']) && trim($_POST['profile_name']) != '') {
 			$this->createProfile();
 		}
 		// Renaming?
-		elseif (isset($_POST['rename']))
-		{
+		elseif (isset($_POST['rename'])) {
 			$this->renameProfile();
 		}
 		// Deleting?
-		elseif (isset($_POST['delete']) && !empty($_POST['delete_profile']))
-		{
+		elseif (isset($_POST['delete']) && !empty($_POST['delete_profile'])) {
 			$this->deleteProfile();
 		}
 
@@ -1358,17 +1377,17 @@ public function profiles(): void
 		self::loadPermissionProfiles();
 
 		// Work out what ones are in use.
-		$request = Db::$db->query('', '
-			SELECT id_profile, COUNT(*) AS board_count
+		$request = Db::$db->query(
+			'',
+			'SELECT id_profile, COUNT(*) AS board_count
 			FROM {db_prefix}boards
 			GROUP BY id_profile',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (isset(Utils::$context['profiles'][$row['id_profile']]))
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (isset(Utils::$context['profiles'][$row['id_profile']])) {
 				Utils::$context['profiles'][$row['id_profile']]['in_use'] = true;
 				Utils::$context['profiles'][$row['id_profile']]['boards'] = $row['board_count'];
 				Utils::$context['profiles'][$row['id_profile']]['boards_text'] = $row['board_count'] > 1 ? sprintf(Lang::$txt['permissions_profile_used_by_many'], $row['board_count']) : Lang::$txt['permissions_profile_used_by_' . ($row['board_count'] ? 'one' : 'none')];
@@ -1379,13 +1398,13 @@ public function profiles(): void
 		// What can we do with these?
 		Utils::$context['can_rename_something'] = false;
 
-		foreach (Utils::$context['profiles'] as $id => $profile)
-		{
+		foreach (Utils::$context['profiles'] as $id => $profile) {
 			// Can't rename the special ones.
 			Utils::$context['profiles'][$id]['can_rename'] = !in_array($id, self::PROFILE_PREDEFINED);
 
-			if (Utils::$context['profiles'][$id]['can_rename'])
+			if (Utils::$context['profiles'][$id]['can_rename']) {
 				Utils::$context['can_rename_something'] = true;
+			}
 
 			// You can only delete it if you can rename it AND it's not in use.
 			Utils::$context['profiles'][$id]['can_delete'] = !in_array($id, self::PROFILE_PREDEFINED) && empty($profile['in_use']);
@@ -1409,47 +1428,45 @@ public function postmod(): void
 		// Load all the permission profiles.
 		self::loadPermissionProfiles();
 
-		IntegrationHook::call('integrate_post_moderation_mapping', array(&$this->postmod_maps));
+		IntegrationHook::call('integrate_post_moderation_mapping', [&$this->postmod_maps]);
 
 		// Start this with the guests/members.
-		Utils::$context['profile_groups'] = array(
-			Group::GUEST => new Group(Group::GUEST, array(
+		Utils::$context['profile_groups'] = [
+			Group::GUEST => new Group(Group::GUEST, [
 				'name' => Lang::$txt['membergroups_guests'],
 				'new_topic' => 'disallow',
 				'replies_own' => 'disallow',
 				'replies_any' => 'disallow',
 				'attachment' => 'disallow',
-			)),
-			Group::REGULAR => new Group(Group::REGULAR, array(
+			]),
+			Group::REGULAR => new Group(Group::REGULAR, [
 				'name' => Lang::$txt['membergroups_members'],
 				'new_topic' => 'disallow',
 				'replies_own' => 'disallow',
 				'replies_any' => 'disallow',
 				'attachment' => 'disallow',
-			)),
-		);
+			]),
+		];
 
 		// Load the groups.
-		$query_customizations = array(
-			'where' => array(
+		$query_customizations = [
+			'where' => [
 				'id_group != {int:admin_group}',
-				'id_parent = {int:no_parent}'
-			),
-			'order' => array('id_parent ASC'),
-			'params' => array(
+				'id_parent = {int:no_parent}',
+			],
+			'order' => ['id_parent ASC'],
+			'params' => [
 				'admin_group' => Group::ADMIN,
 				'no_parent' => Group::NONE,
-			),
-		);
+			],
+		];
 
-		if (empty(Config::$modSettings['permission_enable_postgroups']))
-		{
+		if (empty(Config::$modSettings['permission_enable_postgroups'])) {
 			$query_customizations['where'][] = 'min_posts = {int:min_posts}';
 			$query_customizations['params']['min_posts'] = -1;
 		}
 
-		foreach (Group::load(array(), $query_customizations) as $group)
-		{
+		foreach (Group::load([], $query_customizations) as $group) {
 			// Get a list of the child groups as well.
 			$group->getChildren();
 
@@ -1463,123 +1480,107 @@ public function postmod(): void
 		}
 
 		// What are the permissions we are querying?
-		$all_permissions = array();
+		$all_permissions = [];
 
-		foreach ($this->postmod_maps as $perm_set)
+		foreach ($this->postmod_maps as $perm_set) {
 			$all_permissions = array_merge($all_permissions, $perm_set);
+		}
 
 		// If we're saving the changes then do just that - save them.
-		if (!empty($_POST['save_changes']) && !in_array(Utils::$context['current_profile'], self::PROFILE_UNMODIFIABLE))
-		{
+		if (!empty($_POST['save_changes']) && !in_array(Utils::$context['current_profile'], self::PROFILE_UNMODIFIABLE)) {
 			SecurityToken::validate('admin-mppm');
 
 			// First, are we saving a new value for enabled post moderation?
 			$new_setting = !empty($_POST['postmod_active']);
 
-			if ($new_setting != Config::$modSettings['postmod_active'])
-			{
-				if ($new_setting)
-				{
+			if ($new_setting != Config::$modSettings['postmod_active']) {
+				if ($new_setting) {
 					// Turning it on. This seems easy enough.
-					Config::updateModSettings(array('postmod_active' => 1));
-				}
-				else
-				{
+					Config::updateModSettings(['postmod_active' => 1]);
+				} else {
 					// Turning it off. Not so straightforward. We have to turn off warnings to moderation level, and make everything approved.
-					Config::updateModSettings(array(
+					Config::updateModSettings([
 						'postmod_active' => 0,
 						'warning_moderate' => 0,
-					));
+					]);
 
 					PostMod::approveAllData();
 				}
-			}
-			elseif (Config::$modSettings['postmod_active'])
-			{
+			} elseif (Config::$modSettings['postmod_active']) {
 				// We're not saving a new setting - and if it's still enabled we have more work to do.
 
 				// Start by deleting all the permissions relevant.
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}board_permissions
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}board_permissions
 					WHERE id_profile = {int:current_profile}
 						AND permission IN ({array_string:permissions})
 						AND id_group IN ({array_int:profile_group_list})',
-					array(
+					[
 						'profile_group_list' => array_keys(Utils::$context['profile_groups']),
 						'current_profile' => Utils::$context['current_profile'],
 						'permissions' => $all_permissions,
-					)
+					],
 				);
 
 				// Do it group by group.
-				$new_permissions = array();
-
-				foreach (Utils::$context['profile_groups'] as $id => $group)
-				{
-					foreach ($this->postmod_maps as $index => $data)
-					{
-						if (isset($_POST[$index][$group->id]))
-						{
-							if ($_POST[$index][$group->id] == 'allow')
-							{
+				$new_permissions = [];
+
+				foreach (Utils::$context['profile_groups'] as $id => $group) {
+					foreach ($this->postmod_maps as $index => $data) {
+						if (isset($_POST[$index][$group->id])) {
+							if ($_POST[$index][$group->id] == 'allow') {
 								// Give them both sets for fun.
-								$new_permissions[] = array(Utils::$context['current_profile'], $group->id, $data[0], 1);
+								$new_permissions[] = [Utils::$context['current_profile'], $group->id, $data[0], 1];
 
-								$new_permissions[] = array(Utils::$context['current_profile'], $group->id, $data[1], 1);
-							}
-							elseif ($_POST[$index][$group->id] == 'moderate')
-							{
-								$new_permissions[] = array(Utils::$context['current_profile'], $group->id, $data[1], 1);
+								$new_permissions[] = [Utils::$context['current_profile'], $group->id, $data[1], 1];
+							} elseif ($_POST[$index][$group->id] == 'moderate') {
+								$new_permissions[] = [Utils::$context['current_profile'], $group->id, $data[1], 1];
 							}
 						}
 					}
 				}
 
 				// Insert new permissions.
-				if (!empty($new_permissions))
-				{
-					Db::$db->insert('',
+				if (!empty($new_permissions)) {
+					Db::$db->insert(
+						'',
 						'{db_prefix}board_permissions',
-						array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+						['id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 						$new_permissions,
-						array('id_profile', 'id_group', 'permission')
+						['id_profile', 'id_group', 'permission'],
 					);
 				}
 			}
 		}
 
 		// Now get all the permissions!
-		$request = Db::$db->query('', '
-			SELECT id_group, permission, add_deny
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, permission, add_deny
 			FROM {db_prefix}board_permissions
 			WHERE id_profile = {int:current_profile}
 				AND permission IN ({array_string:permissions})
 				AND id_group IN ({array_int:profile_group_list})',
-			array(
+			[
 				'profile_group_list' => array_keys(Utils::$context['profile_groups']),
 				'current_profile' => Utils::$context['current_profile'],
 				'permissions' => $all_permissions,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			foreach ($this->postmod_maps as $key => $data)
-			{
-				foreach ($data as $index => $perm)
-				{
-					if ($perm == $row['permission'])
-					{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			foreach ($this->postmod_maps as $key => $data) {
+				foreach ($data as $index => $perm) {
+					if ($perm == $row['permission']) {
 						// Only bother if it's not denied.
-						if ($row['add_deny'])
-						{
+						if ($row['add_deny']) {
 							// Full allowance?
-							if ($index == 0)
-							{
+							if ($index == 0) {
 								Utils::$context['profile_groups'][$row['id_group']][$key] = 'allow';
 							}
 							// Otherwise only bother with moderate if not on allow.
-							elseif (Utils::$context['profile_groups'][$row['id_group']][$key] != 'allow')
-							{
+							elseif (Utils::$context['profile_groups'][$row['id_group']][$key] != 'allow') {
 								Utils::$context['profile_groups'][$row['id_group']][$key] = 'moderate';
 							}
 						}
@@ -1603,8 +1604,9 @@ public function postmod(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1625,18 +1627,18 @@ public static function call(): void
 	public static function getConfigVars(): array
 	{
 		// All the setting variables
-		$config_vars = array(
-			array('title', 'settings'),
+		$config_vars = [
+			['title', 'settings'],
 			// Inline permissions.
-			array('permissions', 'manage_permissions'),
+			['permissions', 'manage_permissions'],
 			'',
 
 			// A few useful settings
-			array('check', 'permission_enable_deny', 0, Lang::$txt['permission_settings_enable_deny'], 'help' => 'permissions_deny'),
-			array('check', 'permission_enable_postgroups', 0, Lang::$txt['permission_settings_enable_postgroups'], 'help' => 'permissions_postgroups'),
-		);
+			['check', 'permission_enable_deny', 0, Lang::$txt['permission_settings_enable_deny'], 'help' => 'permissions_deny'],
+			['check', 'permission_enable_postgroups', 0, Lang::$txt['permission_settings_enable_postgroups'], 'help' => 'permissions_postgroups'],
+		];
 
-		IntegrationHook::call('integrate_modify_permission_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_permission_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1651,32 +1653,33 @@ public static function getConfigVars(): array
 	 */
 	public static function getPermissions(): array
 	{
-		if (!empty(self::$processed))
+		if (!empty(self::$processed)) {
 			return self::$permissions;
+		}
 
-		IntegrationHook::call('integrate_permissions_list', array(&self::$permissions));
+		IntegrationHook::call('integrate_permissions_list', [&self::$permissions]);
 
 		// In case a mod screwed things up...
-		if (!in_array('html', Utils::$context['restricted_bbc']))
+		if (!in_array('html', Utils::$context['restricted_bbc'])) {
 			Utils::$context['restricted_bbc'][] = 'html';
+		}
 
 		// Add the permissions for the restricted BBCodes
-		foreach (Utils::$context['restricted_bbc'] as $bbc)
-		{
-			if (isset(self::$permissions['bbc_' . $bbc]))
+		foreach (Utils::$context['restricted_bbc'] as $bbc) {
+			if (isset(self::$permissions['bbc_' . $bbc])) {
 				continue;
+			}
 
-			self::$permissions['bbc_' . $bbc] = array(
+			self::$permissions['bbc_' . $bbc] = [
 				'has_own_any' => false,
 				'view_group' => 'bbc',
 				'scope' => 'global',
-				'vsprintf' => array('permissionname_bbc', array($bbc)),
-			);
+				'vsprintf' => ['permissionname_bbc', [$bbc]],
+			];
 		}
 
 		// If the calendar is disabled, disable the related permissions.
-		if (empty(Config::$modSettings['cal_enabled']))
-		{
+		if (empty(Config::$modSettings['cal_enabled'])) {
 			self::$permissions['calendar_view']['hidden'] = true;
 			self::$permissions['calendar_post']['hidden'] = true;
 			self::$permissions['calendar_edit_own']['hidden'] = true;
@@ -1684,16 +1687,14 @@ public static function getPermissions(): array
 		}
 
 		// If warnings are disabled, disable the related permissions.
-		if (Config::$modSettings['warning_settings'][0] == 0)
-		{
+		if (Config::$modSettings['warning_settings'][0] == 0) {
 			self::$permissions['issue_warning']['hidden'] = true;
 			self::$permissions['view_warning_own']['hidden'] = true;
 			self::$permissions['view_warning_any']['hidden'] = true;
 		}
 
 		// If post moderation is disabled, disable the related permissions.
-		if (!Config::$modSettings['postmod_active'])
-		{
+		if (!Config::$modSettings['postmod_active']) {
 			self::$permissions['approve_posts']['hidden'] = true;
 			self::$permissions['post_unapproved_topics']['hidden'] = true;
 			self::$permissions['post_unapproved_replies_own']['hidden'] = true;
@@ -1701,8 +1702,7 @@ public static function getPermissions(): array
 			self::$permissions['post_unapproved_attachments']['hidden'] = true;
 		}
 		// If post moderation is enabled, these are named differently...
-		else
-		{
+		else {
 			// Relabel the topics permissions
 			self::$permissions['post_new']['label'] = 'auto_approve_topics';
 
@@ -1715,8 +1715,7 @@ public static function getPermissions(): array
 		}
 
 		// If attachments are disabled, disable the related permissions.
-		if (empty(Config::$modSettings['attachmentEnable']))
-		{
+		if (empty(Config::$modSettings['attachmentEnable'])) {
 			self::$permissions['manage_attachments']['hidden'] = true;
 			self::$permissions['view_attachments']['hidden'] = true;
 			self::$permissions['post_unapproved_attachments']['hidden'] = true;
@@ -1724,27 +1723,27 @@ public static function getPermissions(): array
 		}
 
 		// If likes are disabled, disable the related permission.
-		if (empty(Config::$modSettings['enable_likes']))
+		if (empty(Config::$modSettings['enable_likes'])) {
 			self::$permissions['likes_like']['hidden'] = true;
+		}
 
 		// If mentions are disabled, disable the related permission.
-		if (empty(Config::$modSettings['enable_mentions']))
+		if (empty(Config::$modSettings['enable_mentions'])) {
 			self::$permissions['mention']['hidden'] = true;
+		}
 
 		// Finalize various values.
-		foreach (self::$permissions as $permission => &$perm_info)
-		{
+		foreach (self::$permissions as $permission => &$perm_info) {
 			$perm_info['generic_name'] = $perm_info['generic_name'] ?? $permission;
 			$perm_info['hidden'] = !empty($perm_info['hidden']);
 			$perm_info['never_guests'] = !empty($perm_info['never_guests']);
-			$perm_info['assignee_prerequisites'] = $perm_info['assignee_prerequisites'] ?? array();
-			$perm_info['assigner_prerequisites'] = $perm_info['assigner_prerequisites'] ?? array();
+			$perm_info['assignee_prerequisites'] = $perm_info['assignee_prerequisites'] ?? [];
+			$perm_info['assigner_prerequisites'] = $perm_info['assigner_prerequisites'] ?? [];
 
 			$perm_info['label'] = $perm_info['label'] ?? 'permissionname_' . $perm_info['generic_name'];
 
 			// Do we need to dynamically generate the label string?
-			if (!empty($perm_info['vsprintf']))
-			{
+			if (!empty($perm_info['vsprintf'])) {
 				Lang::$txt[$perm_info['label']] = vsprintf(Lang::$txt[$perm_info['vsprintf'][0]] ?? $perm_info['vsprintf'][0], $perm_info['vsprintf'][1]);
 			}
 		}
@@ -1766,227 +1765,239 @@ public static function setPermissionLevel($level, $group, $profile = 'null'): vo
 		self::loadIllegalBBCHtmlGroups();
 
 		// Levels by group... restrict, standard, moderator, maintenance.
-		$group_levels = array(
-			'board' => array('inherit' => array()),
-			'group' => array('inherit' => array()),
-		);
+		$group_levels = [
+			'board' => ['inherit' => []],
+			'group' => ['inherit' => []],
+		];
 		// Levels by board... standard, publish, free.
-		$board_levels = array('inherit' => array());
-
-		foreach (self::getPermissions() as $permission => $perm_info)
-		{
-			if (isset($perm_info['group_level']))
-			{
-				switch ($perm_info['group_level'])
-				{
-					case GROUP_LEVEL_RESTRICT;
+		$board_levels = ['inherit' => []];
+
+		foreach (self::getPermissions() as $permission => $perm_info) {
+			if (isset($perm_info['group_level'])) {
+				switch ($perm_info['group_level']) {
+					case self::GROUP_LEVEL_RESTRICT:
 						$group_levels[$perm_info['scope']]['restrict'][] = $permission;
 						// no break
 
-					case GROUP_LEVEL_STANDARD;
+					case self::GROUP_LEVEL_STANDARD:
 						$group_levels[$perm_info['scope']]['standard'][] = $permission;
 						// no break
 
-					case GROUP_LEVEL_MODERATOR;
+					case self::GROUP_LEVEL_MODERATOR:
 						$group_levels[$perm_info['scope']]['moderator'][] = $permission;
 						// no break
 
-					case GROUP_LEVEL_MAINTENANCE;
+					case self::GROUP_LEVEL_MAINTENANCE:
 						$group_levels[$perm_info['scope']]['maintenance'][] = $permission;
 						break;
 				}
 			}
 
-			if (isset($perm_info['board_level']))
-			{
-				switch ($perm_info['board_level'])
-				{
-					case BOARD_LEVEL_STANDARD;
+			if (isset($perm_info['board_level'])) {
+				switch ($perm_info['board_level']) {
+					case self::BOARD_LEVEL_STANDARD:
 						$group_levels[$perm_info['scope']]['standard'][] = $permission;
 						// no break
 
-					case BOARD_LEVEL_LOCKED;
+					case self::BOARD_LEVEL_LOCKED:
 						$group_levels[$perm_info['scope']]['locked'][] = $permission;
 						// no break
 
-					case BOARD_LEVEL_PUBLISH;
+					case self::BOARD_LEVEL_PUBLISH:
 						$group_levels[$perm_info['scope']]['publish'][] = $permission;
 						// no break
 
-					case BOARD_LEVEL_FREE;
+					case self::BOARD_LEVEL_FREE:
 						$group_levels[$perm_info['scope']]['free'][] = $permission;
 						break;
 				}
 			}
 		}
 
-		IntegrationHook::call('integrate_load_permission_levels', array(&$group_levels, &$board_levels));
+		IntegrationHook::call('integrate_load_permission_levels', [&$group_levels, &$board_levels]);
 
 		// Make sure we're not granting someone too many permissions!
-		foreach (array('global', 'board') as $scope)
-		{
-			foreach ($group_levels[$scope][$level] as $k => $permission)
-			{
-				if (in_array($permission, self::$illegal ?? array()))
+		foreach (['global', 'board'] as $scope) {
+			foreach ($group_levels[$scope][$level] as $k => $permission) {
+				if (in_array($permission, self::$illegal ?? [])) {
 					unset($group_levels[$scope][$level][$k]);
+				}
 
-				if (in_array($group, self::$excluded[$permission] ?? array()))
+				if (in_array($group, self::$excluded[$permission] ?? [])) {
 					unset($group_levels[$scope][$level][$k]);
+				}
 			}
 		}
 
 		// Reset all cached permissions.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
 		// Setting group permissions.
-		if ($profile === 'null' && $group !== 'null')
-		{
+		if ($profile === 'null' && $group !== 'null') {
 			$group = (int) $group;
 
-			if (empty($group_levels['global'][$level]))
+			if (empty($group_levels['global'][$level])) {
 				return;
+			}
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}permissions
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}permissions
 				WHERE id_group = {int:current_group}
 				' . (empty(self::$illegal) ? '' : ' AND permission NOT IN ({array_string:illegal_permissions})'),
-				array(
+				[
 					'current_group' => $group,
-					'illegal_permissions' => !empty(self::$illegal) ? self::$illegal : array(),
-				)
+					'illegal_permissions' => !empty(self::$illegal) ? self::$illegal : [],
+				],
 			);
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}board_permissions
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}board_permissions
 				WHERE id_group = {int:current_group}
 					AND id_profile = {int:default_profile}',
-				array(
+				[
 					'current_group' => $group,
 					'default_profile' => 1,
-				)
+				],
 			);
 
-			$group_inserts = array();
-			foreach ($group_levels['global'][$level] as $permission)
-				$group_inserts[] = array($group, $permission);
+			$group_inserts = [];
+
+			foreach ($group_levels['global'][$level] as $permission) {
+				$group_inserts[] = [$group, $permission];
+			}
 
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}permissions',
-				array('id_group' => 'int', 'permission' => 'string'),
+				['id_group' => 'int', 'permission' => 'string'],
 				$group_inserts,
-				array('id_group')
+				['id_group'],
 			);
 
-			$board_inserts = array();
-			foreach ($group_levels['board'][$level] as $permission)
-				$board_inserts[] = array(1, $group, $permission);
+			$board_inserts = [];
+
+			foreach ($group_levels['board'][$level] as $permission) {
+				$board_inserts[] = [1, $group, $permission];
+			}
 
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}board_permissions',
-				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'),
+				['id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'],
 				$board_inserts,
-				array('id_profile', 'id_group')
+				['id_profile', 'id_group'],
 			);
 
 			self::removeIllegalBBCHtmlPermission();
 		}
 		// Setting profile permissions for a specific group.
-		elseif ($profile !== 'null' && $group !== 'null' && !in_array($profile, self::PROFILE_UNMODIFIABLE))
-		{
+		elseif ($profile !== 'null' && $group !== 'null' && !in_array($profile, self::PROFILE_UNMODIFIABLE)) {
 			$group = (int) $group;
 			$profile = (int) $profile;
 
-			if (!empty($group_levels['global'][$level]))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}board_permissions
+			if (!empty($group_levels['global'][$level])) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}board_permissions
 					WHERE id_group = {int:current_group}
 						AND id_profile = {int:current_profile}',
-					array(
+					[
 						'current_group' => $group,
 						'current_profile' => $profile,
-					)
+					],
 				);
 			}
 
-			if (!empty($group_levels['board'][$level]))
-			{
-				$board_inserts = array();
-				foreach ($group_levels['board'][$level] as $permission)
-					$board_inserts[] = array($profile, $group, $permission);
+			if (!empty($group_levels['board'][$level])) {
+				$board_inserts = [];
 
-				Db::$db->insert('insert',
+				foreach ($group_levels['board'][$level] as $permission) {
+					$board_inserts[] = [$profile, $group, $permission];
+				}
+
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}board_permissions',
-					array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'),
+					['id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'],
 					$board_inserts,
-					array('id_profile', 'id_group')
+					['id_profile', 'id_group'],
 				);
 			}
 		}
 		// Setting profile permissions for all groups.
-		elseif ($profile !== 'null' && $group === 'null' && !in_array($profile, self::PROFILE_UNMODIFIABLE))
-		{
+		elseif ($profile !== 'null' && $group === 'null' && !in_array($profile, self::PROFILE_UNMODIFIABLE)) {
 			$profile = (int) $profile;
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}board_permissions
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}board_permissions
 				WHERE id_profile = {int:current_profile}',
-				array(
+				[
 					'current_profile' => $profile,
-				)
+				],
 			);
 
-			if (empty($board_levels[$level]))
+			if (empty($board_levels[$level])) {
 				return;
+			}
 
 			// Get all the groups...
-			$request = Db::$db->query('', '
-				SELECT id_group
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group
 				FROM {db_prefix}membergroups
 				WHERE id_group > {int:moderator_group}
 				ORDER BY min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE {int:newbie_group} END, group_name',
-				array(
+				[
 					'moderator_group' => Group::MOD,
 					'newbie_group' => Group::NEWBIE,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_row($request))
-			{
+
+			while ($row = Db::$db->fetch_row($request)) {
 				$group = $row[0];
 
-				$board_inserts = array();
-				foreach ($board_levels[$level] as $permission)
-					$board_inserts[] = array($profile, $group, $permission);
+				$board_inserts = [];
+
+				foreach ($board_levels[$level] as $permission) {
+					$board_inserts[] = [$profile, $group, $permission];
+				}
 
-				Db::$db->insert('insert',
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}board_permissions',
-					array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'),
+					['id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'],
 					$board_inserts,
-					array('id_profile', 'id_group')
+					['id_profile', 'id_group'],
 				);
 			}
 			Db::$db->free_result($request);
 
 			// Add permissions for ungrouped members.
-			$board_inserts = array();
-			foreach ($board_levels[$level] as $permission)
-				$board_inserts[] = array($profile, 0, $permission);
+			$board_inserts = [];
 
-			Db::$db->insert('insert',
+			foreach ($board_levels[$level] as $permission) {
+				$board_inserts[] = [$profile, 0, $permission];
+			}
+
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}board_permissions',
-				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'),
+				['id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string'],
 				$board_inserts,
-				array('id_profile', 'id_group')
+				['id_profile', 'id_group'],
 			);
 		}
 		// $profile and $group are both null!
-		else
-		{
+		else {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
 		// Make sure Config::$modSettings['board_manager_groups'] is up to date.
-		if (!in_array('manage_boards', self::$illegal))
+		if (!in_array('manage_boards', self::$illegal)) {
 			self::updateBoardManagers();
+		}
 	}
 
 	/**
@@ -2006,52 +2017,51 @@ public static function setPermissionLevel($level, $group, $profile = 'null'): vo
 	 * Uses ManagePermissions language
 	 * Uses ManagePermissions template
 	 */
-	public static function init_inline_permissions($permissions, $excluded_groups = array()): void
+	public static function init_inline_permissions($permissions, $excluded_groups = []): void
 	{
 		Lang::load('ManagePermissions');
 		Theme::loadTemplate('ManagePermissions');
 		Utils::$context['can_change_permissions'] = User::$me->allowedTo('manage_permissions');
 
 		// Nothing to initialize here.
-		if (!Utils::$context['can_change_permissions'])
+		if (!Utils::$context['can_change_permissions']) {
 			return;
+		}
 
-		$query_customizations = array(
-			'where' => array(
+		$query_customizations = [
+			'where' => [
 				'mg.id_group NOT IN ({array_int:excluded_groups})',
 				'mg.id_parent = {int:not_inherited}',
 				empty(Config::$modSettings['permission_enable_postgroups']) ? 'mg.min_posts = {int:min_posts}' : '1=1',
-			),
-			'order' => array(
+			],
+			'order' => [
 				'mg.min_posts',
 				'CASE WHEN mg.id_group < {int:newbie_group} THEN mg.id_group ELSE {int:newbie_group} END',
 				'mg.group_name',
-			),
-			'params' => array(
+			],
+			'params' => [
 				'min_posts' => -1,
-				'excluded_groups' => array(Group::ADMIN, Group::MOD),
+				'excluded_groups' => [Group::ADMIN, Group::MOD],
 				'not_inherited' => Group::NONE,
 				'newbie_group' => Group::NEWBIE,
-			),
-		);
+			],
+		];
 
 		$groups = array_merge(
-			Group::load(array(Group::GUEST, Group::REGULAR)),
-			Group::load(array(), $query_customizations)
+			Group::load([Group::GUEST, Group::REGULAR]),
+			Group::load([], $query_customizations),
 		);
 
-		Group::loadPermissionsBatch(array_map(fn($group) => $group->id, $groups), 0);
+		Group::loadPermissionsBatch(array_map(fn ($group) => $group->id, $groups), 0);
 
-		foreach ($permissions as $permission)
-		{
-			foreach ($groups as $group)
-			{
-				Utils::$context[$permission][$group->id] = array(
+		foreach ($permissions as $permission) {
+			foreach ($groups as $group) {
+				Utils::$context[$permission][$group->id] = [
 					'id' => $group->id,
 					'name' => $group->name,
 					'is_postgroup' => $group->min_posts > -1,
 					'status' => !isset($group->permissions['general'][$permission]) ? 'off' : ($group->permissions['general'][$permission] === 1 ? 'on' : 'deny'),
-				);
+				];
 			}
 		}
 
@@ -2059,53 +2069,50 @@ public static function init_inline_permissions($permissions, $excluded_groups =
 		self::loadIllegalGuestPermissions();
 
 		// Only special people can have this permission
-		if (in_array('bbc_html', $permissions))
+		if (in_array('bbc_html', $permissions)) {
 			self::loadIllegalBBCHtmlGroups();
+		}
 
 		// Are any of these permissions that guests can't have?
-		$non_guest_perms = array_intersect(str_replace(array('_any', '_own'), '', $permissions), self::$never_guests);
+		$non_guest_perms = array_intersect(str_replace(['_any', '_own'], '', $permissions), self::$never_guests);
 
-		foreach ($non_guest_perms as $permission)
-		{
-			if (!isset(self::$excluded[$permission]) || !in_array(-1, self::$excluded[$permission]))
-			{
+		foreach ($non_guest_perms as $permission) {
+			if (!isset(self::$excluded[$permission]) || !in_array(-1, self::$excluded[$permission])) {
 				self::$excluded[$permission][] = -1;
 			}
 		}
 
 		// Any explicitly excluded groups for this call?
-		if (!empty($excluded_groups))
-		{
+		if (!empty($excluded_groups)) {
 			// Make sure this is an array of integers
 			$excluded_groups = array_filter(
 				(array) $excluded_groups,
-				function ($v)
-				{
+				function ($v) {
 					return is_int($v) || is_string($v) && (string) intval($v) === $v;
-				}
+				},
 			);
 
-			foreach ($permissions as $permission)
-			{
+			foreach ($permissions as $permission) {
 				self::$excluded[$permission] = array_unique(array_merge(self::$excluded[$permission], $excluded_groups));
 			}
 		}
 
 		// Some permissions cannot be given to certain groups. Remove the groups.
-		foreach ($permissions as $permission)
-		{
-			if (!isset(self::$excluded[$permission]))
+		foreach ($permissions as $permission) {
+			if (!isset(self::$excluded[$permission])) {
 				continue;
+			}
 
-			foreach (self::$excluded[$permission] as $group_id)
-			{
-				if (isset(Utils::$context[$permission][$group_id]))
+			foreach (self::$excluded[$permission] as $group_id) {
+				if (isset(Utils::$context[$permission][$group_id])) {
 					unset(Utils::$context[$permission][$group_id]);
+				}
 			}
 
 			// There's no point showing a form with nobody in it
-			if (empty(Utils::$context[$permission]))
+			if (empty(Utils::$context[$permission])) {
 				unset(Utils::$context['config_vars'][$permission], Utils::$context[$permission]);
+			}
 		}
 
 		// Create the token for the separate inline permission verification.
@@ -2135,8 +2142,9 @@ public static function theme_inline_permissions($permission): void
 	public static function save_inline_permissions($permissions): void
 	{
 		// No permissions? Not a great deal to do here.
-		if (!User::$me->allowedTo('manage_permissions'))
+		if (!User::$me->allowedTo('manage_permissions')) {
 			return;
+		}
 
 		// Almighty session check, verify our ways.
 		User::$me->checkSession();
@@ -2144,59 +2152,61 @@ public static function save_inline_permissions($permissions): void
 
 		// Check they can't do certain things.
 		self::loadIllegalPermissions();
-		if (in_array('bbc_html', $permissions))
+
+		if (in_array('bbc_html', $permissions)) {
 			self::loadIllegalBBCHtmlGroups();
+		}
+
+		$insert_rows = [];
 
-		$insert_rows = array();
-		foreach ($permissions as $permission)
-		{
-			if (!isset($_POST[$permission]))
+		foreach ($permissions as $permission) {
+			if (!isset($_POST[$permission])) {
 				continue;
+			}
 
-			foreach ($_POST[$permission] as $id_group => $value)
-			{
-				if ($value == 'on' && !empty(Utils::$context['excluded_permissions'][$permission]) && in_array($id_group, Utils::$context['excluded_permissions'][$permission]))
-				{
+			foreach ($_POST[$permission] as $id_group => $value) {
+				if ($value == 'on' && !empty(Utils::$context['excluded_permissions'][$permission]) && in_array($id_group, Utils::$context['excluded_permissions'][$permission])) {
 					continue;
 				}
 
-				if (in_array($value, array('on', 'deny')) && (empty(self::$illegal) || !in_array($permission, self::$illegal)))
-				{
-					$insert_rows[] = array((int) $id_group, $permission, $value == 'on' ? 1 : 0);
+				if (in_array($value, ['on', 'deny']) && (empty(self::$illegal) || !in_array($permission, self::$illegal))) {
+					$insert_rows[] = [(int) $id_group, $permission, $value == 'on' ? 1 : 0];
 				}
 			}
 		}
 
 		// Remove the old permissions...
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}permissions
 			WHERE permission IN ({array_string:permissions})
 				' . (empty(self::$illegal) ? '' : ' AND permission NOT IN ({array_string:illegal_permissions})'),
-			array(
-				'illegal_permissions' => !empty(self::$illegal) ? self::$illegal : array(),
+			[
+				'illegal_permissions' => !empty(self::$illegal) ? self::$illegal : [],
 				'permissions' => $permissions,
-			)
+			],
 		);
 
 		// ...and replace them with new ones.
-		if (!empty($insert_rows))
-		{
-			Db::$db->insert('insert',
+		if (!empty($insert_rows)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}permissions',
-				array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+				['id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 				$insert_rows,
-				array('id_group', 'permission')
+				['id_group', 'permission'],
 			);
 		}
 
 		// Do a full child update.
-		self::updateChildPermissions(array(), -1);
+		self::updateChildPermissions([], -1);
 
 		// Make sure Config::$modSettings['board_manager_groups'] is up to date.
-		if (!in_array('manage_boards', self::$illegal))
+		if (!in_array('manage_boards', self::$illegal)) {
 			self::updateBoardManagers();
+		}
 
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 	}
 
 	/**
@@ -2204,25 +2214,26 @@ public static function save_inline_permissions($permissions): void
 	 */
 	public static function loadPermissionProfiles(): void
 	{
-		Utils::$context['profiles'] = array();
+		Utils::$context['profiles'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_profile, profile_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_profile, profile_name
 			FROM {db_prefix}permission_profiles
 			ORDER BY id_profile',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['id_profile'] = (int) $row['id_profile'];
 
-			Utils::$context['profiles'][$row['id_profile']] = array(
+			Utils::$context['profiles'][$row['id_profile']] = [
 				'id' => $row['id_profile'],
 				'name' => Lang::$txt['permissions_profile_' . $row['profile_name']] ?? $row['profile_name'],
 				'can_modify' => !in_array($row['id_profile'], self::PROFILE_UNMODIFIABLE),
 				'unformatted_name' => $row['profile_name'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 	}
@@ -2235,120 +2246,120 @@ public static function loadPermissionProfiles(): void
 	 * @return void|false Returns nothing if successful or false if there are no
 	 *    child groups to update.
 	 */
-	public static function updateChildPermissions(int|array $parents = null, int $profile = null)
+	public static function updateChildPermissions(int|array|null $parents = null, ?int $profile = null)
 	{
 		// All the parent groups to sort out.
 		$parents = array_unique(array_map('intval', (array) $parents));
 
 		$parent_groups = Group::load($parents);
 
-		$children = array();
-		$child_groups = array();
+		$children = [];
+		$child_groups = [];
 
-		foreach ($parent_groups as $parent_group)
-		{
+		foreach ($parent_groups as $parent_group) {
 			$parent_group->getChildren();
 
 			$children[$parent_group->id] = array_keys($parent_group->children);
 			$child_groups = array_merge($child_groups, array_keys($parent_group->children));
 		}
 
-		$parents = array_map(fn($parent_group) => $parent_group->id, $parent_groups);
+		$parents = array_map(fn ($parent_group) => $parent_group->id, $parent_groups);
 
 		// Not a sausage, or a child?
-		if (empty($children))
+		if (empty($children)) {
 			return false;
+		}
 
 		// First off, are we doing general permissions?
-		if ($profile < 1 || $profile === null)
-		{
+		if ($profile < 1 || $profile === null) {
 			// Fetch all the parent permissions.
-			$permissions = array();
-			$request = Db::$db->query('', '
-				SELECT id_group, permission, add_deny
+			$permissions = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group, permission, add_deny
 				FROM {db_prefix}permissions
 				WHERE id_group IN ({array_int:parent_list})',
-				array(
+				[
 					'parent_list' => $parents,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				foreach ($children[$row['id_group']] as $child)
-					$permissions[] = array($child, $row['permission'], $row['add_deny']);
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				foreach ($children[$row['id_group']] as $child) {
+					$permissions[] = [$child, $row['permission'], $row['add_deny']];
+				}
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($child_groups))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}permissions
+			if (!empty($child_groups)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:child_groups})',
-					array(
+					[
 						'child_groups' => $child_groups,
-					)
+					],
 				);
 			}
 
 			// Finally insert.
-			if (!empty($permissions))
-			{
-				Db::$db->insert('insert',
+			if (!empty($permissions)) {
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}permissions',
-					array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+					['id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 					$permissions,
-					array('id_group', 'permission')
+					['id_group', 'permission'],
 				);
 			}
 		}
 
 		// Then, what about board profiles?
-		if ($profile != -1)
-		{
+		if ($profile != -1) {
 			$profile_query = $profile === null ? '' : ' AND id_profile = {int:current_profile}';
 
 			// Again, get all the parent permissions.
-			$permissions = array();
-			$request = Db::$db->query('', '
-				SELECT id_profile, id_group, permission, add_deny
+			$permissions = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_profile, id_group, permission, add_deny
 				FROM {db_prefix}board_permissions
 				WHERE id_group IN ({array_int:parent_groups})
 					' . $profile_query,
-				array(
+				[
 					'parent_groups' => $parents,
 					'current_profile' => $profile !== null && $profile ? $profile : 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				foreach ($children[$row['id_group']] as $child)
-				{
-					$permissions[] = array($child, $row['id_profile'], $row['permission'], $row['add_deny']);
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				foreach ($children[$row['id_group']] as $child) {
+					$permissions[] = [$child, $row['id_profile'], $row['permission'], $row['add_deny']];
 				}
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($child_groups))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}board_permissions
+			if (!empty($child_groups)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:child_groups})
 						' . $profile_query,
-					array(
+					[
 						'child_groups' => $child_groups,
 						'current_profile' => $profile !== null && $profile ? $profile : 1,
-					)
+					],
 				);
 			}
 
 			// Do the insert.
-			if (!empty($permissions))
-			{
-				Db::$db->insert('insert',
+			if (!empty($permissions)) {
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}board_permissions',
-					array('id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+					['id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 					$permissions,
-					array('id_group', 'id_profile', 'permission')
+					['id_group', 'id_profile', 'permission'],
 				);
 			}
 		}
@@ -2361,10 +2372,8 @@ public static function updateChildPermissions(int|array $parents = null, int $pr
 	 */
 	public static function loadIllegalPermissions(): array
 	{
-		foreach (self::getPermissions() as $permission => $perm_info)
-		{
-			if (!empty($perm_info['assigner_prerequisites']) && !User::$me->allowedTo($perm_info['assigner_prerequisites']))
-			{
+		foreach (self::getPermissions() as $permission => $perm_info) {
+			if (!empty($perm_info['assigner_prerequisites']) && !User::$me->allowedTo($perm_info['assigner_prerequisites'])) {
 				self::$illegal[] = $permission;
 				self::$illegal[] = $perm_info['generic_name'];
 			}
@@ -2382,13 +2391,14 @@ public static function loadIllegalPermissions(): array
 	 */
 	public static function buildHidden(): void
 	{
-		if (isset(self::$hidden))
+		if (isset(self::$hidden)) {
 			return;
+		}
 
-		foreach (self::getPermissions() as $permission => $perm_info)
-		{
-			if (!empty($perm_info['hidden']))
+		foreach (self::getPermissions() as $permission => $perm_info) {
+			if (!empty($perm_info['hidden'])) {
 				self::$hidden[] = $permission;
+			}
 		}
 
 		// Backward compatibility.
@@ -2473,8 +2483,9 @@ public static function editPermissionProfiles(): void
 	 */
 	public static function generalPermissionSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -2494,33 +2505,34 @@ protected function __construct()
 		Theme::loadTemplate('ManagePermissions');
 
 		// Create the tabs for the template.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['permissions_title'],
 			'help' => 'permissions',
 			'description' => '',
-			'tabs' => array(
-				'index' => array(
+			'tabs' => [
+				'index' => [
 					'description' => Lang::$txt['permissions_groups'],
-				),
-				'board' => array(
+				],
+				'board' => [
 					'description' => Lang::$txt['permission_by_board_desc'],
-				),
-				'profiles' => array(
+				],
+				'profiles' => [
 					'description' => Lang::$txt['permissions_profiles_desc'],
-				),
-				'postmod' => array(
+				],
+				'postmod' => [
 					'description' => Lang::$txt['permissions_post_moderation_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['permission_settings_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_permissions', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_permissions', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -2530,10 +2542,9 @@ protected function __construct()
 	 */
 	protected function setGroupsContext(): void
 	{
-		Utils::$context['groups'] = array();
+		Utils::$context['groups'] = [];
 
-		foreach (Group::loadSimple(Group::LOAD_BOTH, array()) as $group)
-		{
+		foreach (Group::loadSimple(Group::LOAD_BOTH, []) as $group) {
 			if (
 				// Skip child groups.
 				$group->parent !== Group::NONE
@@ -2542,8 +2553,7 @@ protected function setGroupsContext(): void
 					empty(Config::$modSettings['permission_enable_postgroups'])
 					&& $group->min_posts > -1
 				)
-			)
-			{
+			) {
 				continue;
 			}
 
@@ -2551,23 +2561,23 @@ protected function setGroupsContext(): void
 		}
 
 		// Count the members that each group has (except moderators).
-		Group::countMembersBatch(array_diff(array_keys(Utils::$context['groups']), array(Group::MOD)));
+		Group::countMembersBatch(array_diff(array_keys(Utils::$context['groups']), [Group::MOD]));
 
 		// Count the permissions that each group has.
-		if (!empty($_REQUEST['pid']))
-		{
+		if (!empty($_REQUEST['pid'])) {
 			$_REQUEST['pid'] = (int) $_REQUEST['pid'];
 
-			if (!isset(Utils::$context['profiles'][$_REQUEST['pid']]))
+			if (!isset(Utils::$context['profiles'][$_REQUEST['pid']])) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
 			// Change the selected tab to better reflect that this really is a board profile.
 			Menu::$loaded['admin']['current_subsection'] = 'profiles';
 
-			Utils::$context['profile'] = array(
+			Utils::$context['profile'] = [
 				'id' => $_REQUEST['pid'],
 				'name' => Utils::$context['profiles'][$_REQUEST['pid']]['name'],
-			);
+			];
 		}
 
 		Group::countPermissionsBatch(array_keys(Utils::$context['groups']), $_REQUEST['pid'] ?? null);
@@ -2581,19 +2591,14 @@ protected function setGroupsContext(): void
 	protected function quickSetPredefined(): void
 	{
 		// Make sure it's a predefined permission set we expect.
-		if (!in_array($_POST['predefined'], array('restrict', 'standard', 'moderator', 'maintenance')))
-		{
+		if (!in_array($_POST['predefined'], ['restrict', 'standard', 'moderator', 'maintenance'])) {
 			Utils::redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
 		}
 
-		foreach ($_POST['group'] as $group_id)
-		{
-			if (!empty($_REQUEST['pid']))
-			{
+		foreach ($_POST['group'] as $group_id) {
+			if (!empty($_REQUEST['pid'])) {
 				self::setPermissionLevel($_POST['predefined'], $group_id, $_REQUEST['pid']);
-			}
-			else
-			{
+			} else {
 				self::setPermissionLevel($_POST['predefined'], $group_id);
 			}
 		}
@@ -2609,127 +2614,134 @@ protected function quickCopyFrom(): void
 		$pid = max(1, $_REQUEST['pid']);
 
 		// Just checking the input.
-		if (!is_numeric($_POST['copy_from']))
+		if (!is_numeric($_POST['copy_from'])) {
 			Utils::redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
 		// Make sure the group we're copying to is never included.
-		$_POST['group'] = array_diff($_POST['group'], array($_POST['copy_from']));
+		$_POST['group'] = array_diff($_POST['group'], [$_POST['copy_from']]);
 
 		// No groups left? Too bad.
-		if (empty($_POST['group']))
+		if (empty($_POST['group'])) {
 			Utils::redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
+		}
 
-		if (empty($_REQUEST['pid']))
-		{
+		if (empty($_REQUEST['pid'])) {
 			// Retrieve current permissions of group.
-			$target_perm = array();
-			$request = Db::$db->query('', '
-				SELECT permission, add_deny
+			$target_perm = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT permission, add_deny
 				FROM {db_prefix}permissions
 				WHERE id_group = {int:copy_from}',
-				array(
+				[
 					'copy_from' => $_POST['copy_from'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$target_perm[$row['permission']] = $row['add_deny'];
 			}
 			Db::$db->free_result($request);
 
-			$inserts = array();
-			foreach ($_POST['group'] as $group_id)
-			{
-				foreach ($target_perm as $perm => $add_deny)
-				{
+			$inserts = [];
+
+			foreach ($_POST['group'] as $group_id) {
+				foreach ($target_perm as $perm => $add_deny) {
 					// No dodgy permissions please!
-					if (in_array($perm, self::$illegal))
+					if (in_array($perm, self::$illegal)) {
 						continue;
+					}
 
-					if (in_array($group_id, self::$excluded[$perm] ?? array()))
+					if (in_array($group_id, self::$excluded[$perm] ?? [])) {
 						continue;
+					}
 
-					if ($group_id != 1 && $group_id != 3)
-						$inserts[] = array($perm, $group_id, $add_deny);
+					if ($group_id != 1 && $group_id != 3) {
+						$inserts[] = [$perm, $group_id, $add_deny];
+					}
 				}
 			}
 
 			// Delete the previous permissions...
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}permissions
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}permissions
 				WHERE id_group IN ({array_int:group_list})
 					' . (empty(self::$illegal) ? '' : ' AND permission NOT IN ({array_string:illegal_permissions})'),
-				array(
+				[
 					'group_list' => $_POST['group'],
 					'illegal_permissions' => self::$illegal,
-				)
+				],
 			);
 
-			if (!empty($inserts))
-			{
+			if (!empty($inserts)) {
 				// ..and insert the new ones.
-				Db::$db->insert('',
+				Db::$db->insert(
+					'',
 					'{db_prefix}permissions',
-					array(
+					[
 						'permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int',
-					),
+					],
 					$inserts,
-					array('permission', 'id_group')
+					['permission', 'id_group'],
 				);
 			}
 		}
 
 		// Now do the same for the board permissions.
-		$target_perm = array();
-		$request = Db::$db->query('', '
-			SELECT permission, add_deny
+		$target_perm = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT permission, add_deny
 			FROM {db_prefix}board_permissions
 			WHERE id_group = {int:copy_from}
 				AND id_profile = {int:current_profile}',
-			array(
+			[
 				'copy_from' => $_POST['copy_from'],
 				'current_profile' => $pid,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$target_perm[$row['permission']] = $row['add_deny'];
 		}
 		Db::$db->free_result($request);
 
-		$inserts = array();
-		foreach ($_POST['group'] as $group_id)
-		{
-			foreach ($target_perm as $perm => $add_deny)
-			{
+		$inserts = [];
+
+		foreach ($_POST['group'] as $group_id) {
+			foreach ($target_perm as $perm => $add_deny) {
 				// Are these for guests?
-				if ($group_id == -1 && in_array($perm, self::$never_guests))
+				if ($group_id == -1 && in_array($perm, self::$never_guests)) {
 					continue;
+				}
 
-				$inserts[] = array($perm, $group_id, $pid, $add_deny);
+				$inserts[] = [$perm, $group_id, $pid, $add_deny];
 			}
 		}
 
 		// Delete the previous global board permissions...
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}board_permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}board_permissions
 			WHERE id_group IN ({array_int:current_group_list})
 				AND id_profile = {int:current_profile}',
-			array(
+			[
 				'current_group_list' => $_POST['group'],
 				'current_profile' => $pid,
-			)
+			],
 		);
 
 		// And insert the copied permissions.
-		if (!empty($inserts))
-		{
+		if (!empty($inserts)) {
 			// ..and insert the new ones.
-			Db::$db->insert('',
+			Db::$db->insert(
+				'',
 				'{db_prefix}board_permissions',
-				array('permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'),
+				['permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'],
 				$inserts,
-				array('permission', 'id_group', 'id_profile')
+				['permission', 'id_group', 'id_profile'],
 			);
 		}
 
@@ -2747,92 +2759,84 @@ protected function quickSetPermission(): void
 		$pid = max(1, $_REQUEST['pid']);
 
 		// Unpack two variables that were transported.
-		list ($scope, $permission) = explode('/', $_POST['permissions']);
+		list($scope, $permission) = explode('/', $_POST['permissions']);
 
 		// Check whether our input is within expected range.
-		if (!in_array($_POST['add_remove'], array('add', 'clear', 'deny')) || !in_array($scope, array('global', 'board')))
-		{
+		if (!in_array($_POST['add_remove'], ['add', 'clear', 'deny']) || !in_array($scope, ['global', 'board'])) {
 			Utils::redirectexit('action=admin;area=permissions;pid=' . $_REQUEST['pid']);
 		}
 
-		if ($_POST['add_remove'] == 'clear')
-		{
-			if ($scope == 'global')
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}permissions
+		if ($_POST['add_remove'] == 'clear') {
+			if ($scope == 'global') {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND permission = {string:current_permission}
 						' . (empty(self::$illegal) ? '' : ' AND permission NOT IN ({array_string:illegal_permissions})'),
-					array(
+					[
 						'current_group_list' => $_POST['group'],
 						'current_permission' => $permission,
 						'illegal_permissions' => self::$illegal,
-					)
+					],
 				);
 
 				// Did these changes make anyone lose eligibility for the bbc_html permission?
 				$bbc_html_groups = array_diff($_POST['group'], self::$excluded['bbc_html']);
 
-				if (!empty($bbc_html_groups))
+				if (!empty($bbc_html_groups)) {
 					self::removeIllegalBBCHtmlPermission(true);
-			}
-			else
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}board_permissions
+				}
+			} else {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}board_permissions
 					WHERE id_group IN ({array_int:current_group_list})
 						AND id_profile = {int:current_profile}
 						AND permission = {string:current_permission}',
-					array(
+					[
 						'current_group_list' => $_POST['group'],
 						'current_profile' => $pid,
 						'current_permission' => $permission,
-					)
+					],
 				);
 			}
 		}
 		// Add a permission (either 'set' or 'deny').
-		else
-		{
+		else {
 			$add_deny = $_POST['add_remove'] == 'add' ? '1' : '0';
-			$perm_change = array();
-			foreach ($_POST['group'] as $groupID)
-			{
-				if (isset(self::$excluded[$permission]) && in_array($groupID, self::$excluded[$permission]))
-				{
+			$perm_change = [];
+
+			foreach ($_POST['group'] as $groupID) {
+				if (isset(self::$excluded[$permission]) && in_array($groupID, self::$excluded[$permission])) {
 					continue;
 				}
 
-				if ($scope == 'global' && $groupID != 1 && $groupID != 3 && !in_array($permission, self::$illegal))
-				{
-					$perm_change[] = array($permission, $groupID, $add_deny);
-				}
-				elseif ($scope != 'global')
-				{
-					$perm_change[] = array($permission, $groupID, $pid, $add_deny);
+				if ($scope == 'global' && $groupID != 1 && $groupID != 3 && !in_array($permission, self::$illegal)) {
+					$perm_change[] = [$permission, $groupID, $add_deny];
+				} elseif ($scope != 'global') {
+					$perm_change[] = [$permission, $groupID, $pid, $add_deny];
 				}
 			}
 
-			if (!empty($perm_change))
-			{
-				if ($scope == 'global')
-				{
-					Db::$db->insert('replace',
+			if (!empty($perm_change)) {
+				if ($scope == 'global') {
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}permissions',
-						array('permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int'),
+						['permission' => 'string', 'id_group' => 'int', 'add_deny' => 'int'],
 						$perm_change,
-						array('permission', 'id_group')
+						['permission', 'id_group'],
 					);
 				}
 				// Board permissions go into the other table.
-				else
-				{
-					Db::$db->insert('replace',
+				else {
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}board_permissions',
-						array('permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'),
+						['permission' => 'string', 'id_group' => 'int', 'id_profile' => 'int', 'add_deny' => 'int'],
 						$perm_change,
-						array('permission', 'id_group', 'id_profile')
+						['permission', 'id_group', 'id_profile'],
 					);
 				}
 			}
@@ -2849,13 +2853,13 @@ protected function quickSetPermission(): void
 	 */
 	protected function setGroupContext(): void
 	{
-		if (!isset($_GET['group']) || (int) $_GET['group'] < -1)
+		if (!isset($_GET['group']) || (int) $_GET['group'] < -1) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		Utils::$context['group']['id'] = (int) $_GET['group'];
 
-		switch (Utils::$context['group']['id'])
-		{
+		switch (Utils::$context['group']['id']) {
 			case -1:
 				Utils::$context['group']['name'] = Lang::$txt['membergroups_guests'];
 				break;
@@ -2870,22 +2874,23 @@ protected function setGroupContext(): void
 				break;
 
 			default:
-				$result = Db::$db->query('', '
-					SELECT group_name, id_parent
+				$result = Db::$db->query(
+					'',
+					'SELECT group_name, id_parent
 					FROM {db_prefix}membergroups
 					WHERE id_group = {int:current_group}
 					LIMIT 1',
-					array(
+					[
 						'current_group' => Utils::$context['group']['id'],
-					)
+					],
 				);
 				list(Utils::$context['group']['name'], $parent) = Db::$db->fetch_row($result);
 				Db::$db->free_result($result);
 
 				// Cannot edit an inherited group!
-				if ($parent != -2)
+				if ($parent != -2) {
 					ErrorHandler::fatalLang('cannot_edit_permissions_inherited');
-
+				}
 				break;
 		}
 	}
@@ -2902,15 +2907,15 @@ protected function setProfileContext(): void
 		Utils::$context['profile']['id'] = (int) ($_GET['pid'] ?? 0);
 
 		// If this is a moderator and they are editing "no profile" then we only do boards.
-		if (Utils::$context['group']['id'] == 3 && empty(Utils::$context['profile']['id']))
-		{
+		if (Utils::$context['group']['id'] == 3 && empty(Utils::$context['profile']['id'])) {
 			// For sanity just check they have no general permissions.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}permissions
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}permissions
 				WHERE id_group = {int:moderator_group}',
-				array(
+				[
 					'moderator_group' => 3,
-				)
+				],
 			);
 
 			Utils::$context['profile']['id'] = self::PROFILE_DEFAULT;
@@ -2921,8 +2926,7 @@ protected function setProfileContext(): void
 		Utils::$context['profile']['can_modify'] = !Utils::$context['profile']['id'] || Utils::$context['profiles'][Utils::$context['profile']['id']]['can_modify'];
 
 		// Set up things a little nicer for board related stuff...
-		if (Utils::$context['permission_type'] == 'board')
-		{
+		if (Utils::$context['permission_type'] == 'board') {
 			Utils::$context['profile']['name'] = Utils::$context['profiles'][Utils::$context['profile']['id']]['name'];
 
 			Menu::$loaded['admin']['current_subsection'] = 'profiles';
@@ -2944,38 +2948,39 @@ protected function setProfileContext(): void
 	protected function setAllowedDenied(int $group, string $scope = 'global', int $profile = 1): void
 	{
 		// General permissions?
-		if ($scope == 'global')
-		{
+		if ($scope == 'global') {
 			$profile = 1;
 
-			$result = Db::$db->query('', '
-				SELECT permission, add_deny
+			$result = Db::$db->query(
+				'',
+				'SELECT permission, add_deny
 				FROM {db_prefix}permissions
 				WHERE id_group = {int:current_group}',
-				array(
+				[
 					'current_group' => $group,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$this->allowed_denied['global'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
 			}
 			Db::$db->free_result($result);
 		}
 
 		// Fetch current board permissions...
-		$result = Db::$db->query('', '
-			SELECT permission, add_deny
+		$result = Db::$db->query(
+			'',
+			'SELECT permission, add_deny
 			FROM {db_prefix}board_permissions
 			WHERE id_group = {int:current_group}
 				AND id_profile = {int:current_profile}',
-			array(
+			[
 				'current_group' => $group,
 				'current_profile' => $profile,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			$this->allowed_denied['board'][empty($row['add_deny']) ? 'denied' : 'allowed'][] = $row['permission'];
 		}
 		Db::$db->free_result($result);
@@ -2990,55 +2995,44 @@ protected function setAllowedDenied(int $group, string $scope = 'global', int $p
 	protected function setOnOff(): void
 	{
 		self::loadAllPermissions();
-		Utils::$context['hidden_perms'] = array();
+		Utils::$context['hidden_perms'] = [];
 
 		// Loop through each permission and set whether it's on, off, or denied.
-		foreach (Utils::$context['permissions'] as $scope => $tmp)
-		{
-			foreach ($tmp['columns'] as $position => $permission_groups)
-			{
-				foreach ($permission_groups as $group_name => $group)
-				{
-					foreach ($group['permissions'] as $perm)
-					{
+		foreach (Utils::$context['permissions'] as $scope => $tmp) {
+			foreach ($tmp['columns'] as $position => $permission_groups) {
+				foreach ($permission_groups as $group_name => $group) {
+					foreach ($group['permissions'] as $perm) {
 						// Create a shortcut for the current permission.
 						$cur_perm = &Utils::$context['permissions'][$scope]['columns'][$position][$group_name]['permissions'][$perm['id']];
 
-						if ($perm['has_own_any'])
-						{
+						if ($perm['has_own_any']) {
 							$cur_perm['any']['select'] = in_array($perm['id'] . '_any', $this->allowed_denied[$scope]['allowed']) ? 'on' : (in_array($perm['id'] . '_any', $this->allowed_denied[$scope]['denied']) ? 'deny' : 'off');
 
 							$cur_perm['own']['select'] = in_array($perm['id'] . '_own', $this->allowed_denied[$scope]['allowed']) ? 'on' : (in_array($perm['id'] . '_own', $this->allowed_denied[$scope]['denied']) ? 'deny' : 'off');
-						}
-						else
-						{
+						} else {
 							$cur_perm['select'] = in_array($perm['id'], $this->allowed_denied[$scope]['denied']) ? 'deny' : (in_array($perm['id'], $this->allowed_denied[$scope]['allowed']) ? 'on' : 'off');
 						}
 
 						// Keep the last value if it's hidden.
-						if (!empty($perm['hidden']) || !empty($group['hidden']))
-						{
-							if ($perm['has_own_any'])
-							{
-								Utils::$context['hidden_perms'][] = array(
+						if (!empty($perm['hidden']) || !empty($group['hidden'])) {
+							if ($perm['has_own_any']) {
+								Utils::$context['hidden_perms'][] = [
 									$scope,
 									$perm['own']['id'],
 									$cur_perm['own']['select'] == 'deny' && !empty(Config::$modSettings['permission_enable_deny']) ? 'deny' : $cur_perm['own']['select'],
-								);
+								];
 
-								Utils::$context['hidden_perms'][] = array(
+								Utils::$context['hidden_perms'][] = [
 									$scope,
 									$perm['any']['id'],
 									$cur_perm['any']['select'] == 'deny' && !empty(Config::$modSettings['permission_enable_deny']) ? 'deny' : $cur_perm['any']['select'],
-								);
-							}
-							else
-							{
-								Utils::$context['hidden_perms'][] = array(
+								];
+							} else {
+								Utils::$context['hidden_perms'][] = [
 									$scope,
 									$perm['id'],
 									$cur_perm['select'] == 'deny' && !empty(Config::$modSettings['permission_enable_deny']) ? 'deny' : $cur_perm['select'],
-								);
+								];
 							}
 						}
 					}
@@ -3057,23 +3051,26 @@ protected function setOnOff(): void
 	 */
 	protected function getParentGroup(int $group): int
 	{
-		if ($group == -1 || $group == 0)
+		if ($group == -1 || $group == 0) {
 			return -2;
+		}
 
-		$request = Db::$db->query('', '
-			SELECT id_parent
+		$request = Db::$db->query(
+			'',
+			'SELECT id_parent
 			FROM {db_prefix}membergroups
 			WHERE id_group = {int:current_group}
 			LIMIT 1',
-			array(
+			[
 				'current_group' => $group,
-			)
+			],
 		);
 
-		if (Db::$db->num_rows($request) === 0)
+		if (Db::$db->num_rows($request) === 0) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
-		list ($parent) = Db::$db->fetch_row($request);
+		list($parent) = Db::$db->fetch_row($request);
 
 		Db::$db->free_result($request);
 
@@ -3091,31 +3088,32 @@ protected function getParentGroup(int $group): int
 	protected function updateGlobalPermissions(int $group, array $give_perms, array $illegal_permissions): void
 	{
 		// First, delete all the existing permissions for this group.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}permissions
 			WHERE id_group = {int:current_group}
 			' . (empty($illegal_permissions) ? '' : ' AND permission NOT IN ({array_string:illegal_permissions})'),
-			array(
+			[
 				'current_group' => $group,
 				'illegal_permissions' => $illegal_permissions,
-			)
+			],
 		);
 
 		// This should already have been done, but just in case...
-		foreach ($give_perms['global'] as $k => $v)
-		{
-			if (in_array($v[1], $illegal_permissions))
+		foreach ($give_perms['global'] as $k => $v) {
+			if (in_array($v[1], $illegal_permissions)) {
 				unset($give_perms['global'][$k]);
+			}
 		}
 
 		// Now grant this group whichever permissions it can have.
-		if (!empty($give_perms['global']))
-		{
-			Db::$db->insert('replace',
+		if (!empty($give_perms['global'])) {
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}permissions',
-				array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+				['id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 				$give_perms['global'],
-				array('id_group', 'permission')
+				['id_group', 'permission'],
 			);
 		}
 	}
@@ -3134,34 +3132,36 @@ protected function updateBoardPermissions(int $group, array $give_perms, array $
 		$profileid = max(1, $profileid);
 
 		// Again, we start by clearing all the permissions for this group.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}board_permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}board_permissions
 			WHERE id_group = {int:current_group}
 				AND id_profile = {int:current_profile}',
-			array(
+			[
 				'current_group' => $group,
 				'current_profile' => $profileid,
-			)
+			],
 		);
 
 		// This should already have been done, but just in case...
-		foreach ($give_perms['board'] as $k => $v)
-		{
-			if (in_array($v[1], $illegal_permissions))
+		foreach ($give_perms['board'] as $k => $v) {
+			if (in_array($v[1], $illegal_permissions)) {
 				unset($give_perms['board'][$k]);
+			}
 		}
 
 		// Grant them whichever permissions they are now allowed to have.
-		if (!empty($give_perms['board']))
-		{
-			foreach ($give_perms['board'] as $k => $v)
+		if (!empty($give_perms['board'])) {
+			foreach ($give_perms['board'] as $k => $v) {
 				$give_perms['board'][$k][] = $profileid;
+			}
 
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}board_permissions',
-				array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int', 'id_profile' => 'int'),
+				['id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int', 'id_profile' => 'int'],
 				$give_perms['board'],
-				array('id_group', 'permission', 'id_profile')
+				['id_group', 'permission', 'id_profile'],
 			);
 		}
 	}
@@ -3181,42 +3181,44 @@ protected function createProfile(): void
 		$_POST['profile_name'] = Utils::htmlspecialchars($_POST['profile_name']);
 
 		// Insert the profile itself.
-		$profile_id = Db::$db->insert('',
+		$profile_id = Db::$db->insert(
+			'',
 			'{db_prefix}permission_profiles',
-			array(
+			[
 				'profile_name' => 'string',
-			),
-			array(
+			],
+			[
 				$_POST['profile_name'],
-			),
-			array('id_profile'),
-			1
+			],
+			['id_profile'],
+			1,
 		);
 
 		// Load the permissions from the one it's being copied from.
-		$inserts = array();
+		$inserts = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_group, permission, add_deny
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, permission, add_deny
 			FROM {db_prefix}board_permissions
 			WHERE id_profile = {int:copy_from}',
-			array(
+			[
 				'copy_from' => $_POST['copy_from'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$inserts[] = array($profile_id, $row['id_group'], $row['permission'], $row['add_deny']);
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$inserts[] = [$profile_id, $row['id_group'], $row['permission'], $row['add_deny']];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($inserts))
-		{
-			Db::$db->insert('insert',
+		if (!empty($inserts)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}board_permissions',
-				array('id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
+				['id_profile' => 'int', 'id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'],
 				$inserts,
-				array('id_profile', 'id_group', 'permission')
+				['id_profile', 'id_group', 'permission'],
 			);
 		}
 	}
@@ -3236,29 +3238,29 @@ protected function renameProfile(): void
 		SecurityToken::validate('admin-mpp');
 
 		// Just showing the input fields?
-		if (!isset($_POST['rename_profile']))
-		{
+		if (!isset($_POST['rename_profile'])) {
 			Utils::$context['show_rename_boxes'] = true;
+
 			return;
 		}
 
-		foreach ($_POST['rename_profile'] as $id => $value)
-		{
-			if (($id = (int) $id) <= 0)
+		foreach ($_POST['rename_profile'] as $id => $value) {
+			if (($id = (int) $id) <= 0) {
 				continue;
+			}
 
 			$value = Utils::htmlspecialchars($value);
 
-			if (trim($value) != '' && !in_array($id, self::PROFILE_PREDEFINED))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}permission_profiles
+			if (trim($value) != '' && !in_array($id, self::PROFILE_PREDEFINED)) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}permission_profiles
 					SET profile_name = {string:profile_name}
 					WHERE id_profile = {int:current_profile}',
-					array(
+					[
 						'current_profile' => $id,
 						'profile_name' => $value,
-					)
+					],
 				);
 			}
 		}
@@ -3279,36 +3281,39 @@ protected function deleteProfile(): void
 		User::$me->checkSession();
 		SecurityToken::validate('admin-mpp');
 
-		$profiles = array();
-		foreach (array_map('intval', $_POST['delete_profile']) as $profile)
-		{
-			if ($profile > 0 && !in_array($profile, self::PROFILE_PREDEFINED))
+		$profiles = [];
+
+		foreach (array_map('intval', $_POST['delete_profile']) as $profile) {
+			if ($profile > 0 && !in_array($profile, self::PROFILE_PREDEFINED)) {
 				$profiles[] = $profile;
+			}
 		}
 
 		// Verify it's not in use...
-		$request = Db::$db->query('', '
-			SELECT id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board
 			FROM {db_prefix}boards
 			WHERE id_profile IN ({array_int:profile_list})
 			LIMIT 1',
-			array(
+			[
 				'profile_list' => $profiles,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) != 0)
-		{
+
+		if (Db::$db->num_rows($request) != 0) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 		Db::$db->free_result($request);
 
 		// Oh well, delete.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}permission_profiles
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}permission_profiles
 			WHERE id_profile IN ({array_int:profile_list})',
-			array(
+			[
 				'profile_list' => $profiles,
-			)
+			],
 		);
 	}
 
@@ -3333,44 +3338,38 @@ protected static function loadAllPermissions(): void
 		// Figure out which permissions should be hidden.
 		self::buildHidden();
 
-		Utils::$context['permissions'] = array();
+		Utils::$context['permissions'] = [];
 
-		foreach (self::$permission_groups as $scope => $groups)
-		{
-			if (!isset(Utils::$context['permissions'][$scope]))
-			{
-				Utils::$context['permissions'][$scope] = array(
+		foreach (self::$permission_groups as $scope => $groups) {
+			if (!isset(Utils::$context['permissions'][$scope])) {
+				Utils::$context['permissions'][$scope] = [
 					'id' => $scope,
-					'columns' => array(
-						array(),
-						array(),
-					),
-				);
+					'columns' => [
+						[],
+						[],
+					],
+				];
 			}
 
-			foreach ($groups as $group)
-			{
+			foreach ($groups as $group) {
 				$position = (int) (!in_array($group, self::$left_permission_groups));
 
-				Utils::$context['permissions'][$scope]['columns'][$position][$group] = array(
+				Utils::$context['permissions'][$scope]['columns'][$position][$group] = [
 					'type' => $scope,
 					'id' => $group,
 					'name' => Lang::$txt['permissiongroup_' . $group],
-					'icon' => isset(Lang::$txt['permissionicon_' . $group]) ? Lang::$txt['permissionicon_' . $group] : Lang::$txt['permissionicon'],
-					'help' => isset(Lang::$txt['permissionhelp_' . $group]) ? Lang::$txt['permissionhelp_' . $group] : '',
+					'icon' => Lang::$txt['permissionicon_' . $group] ?? Lang::$txt['permissionicon'],
+					'help' => Lang::$txt['permissionhelp_' . $group] ?? '',
 					'hidden' => false,
-					'permissions' => array(),
-				);
+					'permissions' => [],
+				];
 			}
 		}
 
-		foreach (self::getPermissions() as $permission => $perm_info)
-		{
+		foreach (self::getPermissions() as $permission => $perm_info) {
 			// If this permission shouldn't be given to certain groups (e.g. guests), don't.
-			foreach (array($permission, $perm_info['generic_name']) as $perm)
-			{
-				if (isset(Utils::$context['group']['id']) && in_array(Utils::$context['group']['id'], self::$excluded[$perm] ?? array()))
-				{
+			foreach ([$permission, $perm_info['generic_name']] as $perm) {
+				if (isset(Utils::$context['group']['id']) && in_array(Utils::$context['group']['id'], self::$excluded[$perm] ?? [])) {
 					continue 2;
 				}
 			}
@@ -3381,51 +3380,42 @@ protected static function loadAllPermissions(): void
 			// For legibility reasons...
 			$view_group_perms = &Utils::$context['permissions'][$perm_info['scope']]['columns'][$position][$perm_info['view_group']]['permissions'];
 
-			if (!isset($view_group_perms[$perm_info['generic_name']]))
-			{
-				$view_group_perms[$perm_info['generic_name']] = array(
+			if (!isset($view_group_perms[$perm_info['generic_name']])) {
+				$view_group_perms[$perm_info['generic_name']] = [
 					'id' => $perm_info['generic_name'],
 					'name' => Lang::$txt[$perm_info['label']],
 					'show_help' => isset(Lang::$txt['permissionhelp_' . $perm_info['generic_name']]),
-					'note' => isset(Lang::$txt['permissionnote_' . $perm_info['generic_name']]) ? Lang::$txt['permissionnote_' . $perm_info['generic_name']] : '',
+					'note' => Lang::$txt['permissionnote_' . $perm_info['generic_name']] ?? '',
 					'hidden' => !empty($perm_info['hidden']),
-				);
+				];
 			}
 
 			$view_group_perms[$perm_info['generic_name']]['has_own_any'] = isset($perm_info['own_any']);
 
-			if (isset($perm_info['own_any']))
-			{
-				$view_group_perms[$perm_info['generic_name']][$perm_info['own_any']] = array(
+			if (isset($perm_info['own_any'])) {
+				$view_group_perms[$perm_info['generic_name']][$perm_info['own_any']] = [
 					'id' => $permission,
 					'name' => Lang::$txt['permissionname_' . $permission],
-				);
+				];
 			}
 		}
 
 		// Check we don't leave any empty groups - and mark hidden ones as such.
-		foreach (Utils::$context['permissions'] as $scope => $section)
-		{
-			foreach ($section['columns'] as $column => $groups)
-			{
-				foreach ($groups as $id => $group)
-				{
-					if (empty($group['permissions']))
-					{
+		foreach (Utils::$context['permissions'] as $scope => $section) {
+			foreach ($section['columns'] as $column => $groups) {
+				foreach ($groups as $id => $group) {
+					if (empty($group['permissions'])) {
 						unset(Utils::$context['permissions'][$scope]['columns'][$column][$id]);
-					}
-					else
-					{
+					} else {
 						$show_this_group = false;
 
-						foreach ($group['permissions'] as $permission)
-						{
-							if (empty($permission['hidden']))
+						foreach ($group['permissions'] as $permission) {
+							if (empty($permission['hidden'])) {
 								$show_this_group = true;
+							}
 						}
 
-						if (!$show_this_group)
-						{
+						if (!$show_this_group) {
 							Utils::$context['permissions'][$scope]['columns'][$column][$id]['hidden'] = true;
 						}
 					}
@@ -3445,10 +3435,10 @@ protected static function loadAllPermissions(): void
 	protected static function loadIllegalGuestPermissions(): array
 	{
 		// Find the permissions that guests may never have.
-		foreach (self::getPermissions() as $permission => $perm_info)
-		{
-			if (!empty($perm_info['never_guests']))
+		foreach (self::getPermissions() as $permission => $perm_info) {
+			if (!empty($perm_info['never_guests'])) {
 				self::$never_guests[] = $perm_info['generic_name'];
+			}
 		}
 
 		self::$never_guests = array_unique(self::$never_guests);
@@ -3457,10 +3447,8 @@ protected static function loadIllegalGuestPermissions(): array
 		self::integrateLoadIllegalGuestPermissions();
 
 		// Also add this info to self::$excluded to make life easier for everyone
-		foreach (self::$never_guests as $permission)
-		{
-			if (empty(self::$excluded[$permission]) || !in_array($permission, self::$excluded[$permission]))
-			{
+		foreach (self::$never_guests as $permission) {
+			if (empty(self::$excluded[$permission]) || !in_array($permission, self::$excluded[$permission])) {
 				self::$excluded[$permission][] = -1;
 			}
 		}
@@ -3476,10 +3464,11 @@ protected static function loadIllegalGuestPermissions(): array
 	 */
 	protected static function loadIllegalBBCHtmlGroups(): array
 	{
-		self::$excluded['bbc_html'] = array(-1, 0);
+		self::$excluded['bbc_html'] = [-1, 0];
 
-		$request = Db::$db->query('', '
-			SELECT id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group
 			FROM {db_prefix}membergroups
 			WHERE id_group != {int:admin} AND id_group NOT IN (
 				SELECT DISTINCT id_group
@@ -3487,14 +3476,14 @@ protected static function loadIllegalBBCHtmlGroups(): array
 				WHERE permission IN ({array_string:permissions})
 					AND add_deny = {int:add}
 			)',
-			array(
+			[
 				'permissions' => self::$permissions['bbc_html']['assignee_prerequisites'],
 				'add' => 1,
 				'admin' => Group::ADMIN,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$excluded['bbc_html'][] = $row['id_group'];
 		}
 		Db::$db->free_result($request);
@@ -3512,19 +3501,21 @@ protected static function loadIllegalBBCHtmlGroups(): array
 	 */
 	protected static function removeIllegalBBCHtmlPermission($reload = false): void
 	{
-		if (empty(self::$excluded['bbc_html']) || $reload)
+		if (empty(self::$excluded['bbc_html']) || $reload) {
 			self::loadIllegalBBCHtmlGroups();
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}permissions
 			WHERE id_group IN ({array_int:current_group_list})
 				AND permission = {string:current_permission}
 				AND add_deny = {int:add}',
-			array(
+			[
 				'current_group_list' => self::$excluded['bbc_html'],
 				'current_permission' => 'bbc_html',
 				'add' => 1,
-			)
+			],
 		);
 	}
 
@@ -3536,7 +3527,7 @@ protected static function updateBoardManagers(): void
 		$board_managers = User::groupsAllowedTo('manage_boards', null);
 		$board_managers = implode(',', $board_managers['allowed']);
 
-		Config::updateModSettings(array('board_manager_groups' => $board_managers), true);
+		Config::updateModSettings(['board_manager_groups' => $board_managers], true);
 	}
 
 	/**
@@ -3549,54 +3540,49 @@ protected static function updateBoardManagers(): void
 	protected static function integrateLoadPermissions(): void
 	{
 		// Don't bother if nothing is using this hook.
-		if (empty(Config::$modSettings['integrate_load_permissions']))
+		if (empty(Config::$modSettings['integrate_load_permissions'])) {
 			return;
+		}
 
-		$permissions_by_scope = array(
-			'global' => array(),
-			'board' => array(),
-		);
-		$hidden_permissions = array();
-		$relabel_permissions = array();
+		$permissions_by_scope = [
+			'global' => [],
+			'board' => [],
+		];
+		$hidden_permissions = [];
+		$relabel_permissions = [];
 
-		foreach (self::getPermissions() as $permission => $perm_info)
-		{
-			$permissions_by_scope[$perm_info['scope']][$perm_info['generic_name']] = array(
+		foreach (self::getPermissions() as $permission => $perm_info) {
+			$permissions_by_scope[$perm_info['scope']][$perm_info['generic_name']] = [
 				!empty($perm_info['own_any']),
 				$perm_info['view_group'],
-			);
+			];
 
-			if (!empty($perm_info['hidden']))
+			if (!empty($perm_info['hidden'])) {
 				$hidden_permissions[] = $perm_info['generic_name'];
+			}
 		}
 
 		// Provide a practical way to modify permissions.
-		IntegrationHook::call('integrate_load_permissions', array(&self::$permission_groups, &$permissions_by_scope, &self::$left_permission_groups, &$hidden_permissions, &$relabel_permissions));
+		IntegrationHook::call('integrate_load_permissions', [&self::$permission_groups, &$permissions_by_scope, &self::$left_permission_groups, &$hidden_permissions, &$relabel_permissions]);
 
 		// If the hook made changes, sync them back to our master list.
-		foreach ($permissions_by_scope as $scope => $permissions)
-		{
-			foreach ($permissions as $permission => $perm_info)
-			{
+		foreach ($permissions_by_scope as $scope => $permissions) {
+			foreach ($permissions as $permission => $perm_info) {
 				$is_new = true;
 
-				foreach (array('', '_own', '_any') as $suffix)
-				{
-					if (isset(self::$permissions[$permission . $suffix]))
-					{
+				foreach (['', '_own', '_any'] as $suffix) {
+					if (isset(self::$permissions[$permission . $suffix])) {
 						$is_new = false;
 
 						self::$permissions[$permission . $suffix]['view_group'] = $perm_info[1];
 					}
 				}
 
-				if ($is_new)
-				{
-					$new_ids = $perm_info[0] ? array($permission . '_own', $permission . '_any') : array($permission);
+				if ($is_new) {
+					$new_ids = $perm_info[0] ? [$permission . '_own', $permission . '_any'] : [$permission];
 
-					foreach ($new_ids as $id)
-					{
-						self::$permissions[$id] = array(
+					foreach ($new_ids as $id) {
+						self::$permissions[$id] = [
 							'generic_name' => $permission,
 							'own_any' => $perm_info[0] ? substr($id, -3) : null,
 							'view_group' => $perm_info[1],
@@ -3604,27 +3590,25 @@ protected static function integrateLoadPermissions(): void
 							'hidden' => in_array($permission, $hidden_permissions),
 							'label' => 'permissionname_' . $permission,
 							'never_guests' => in_array($permission, self::$never_guests),
-						);
+						];
 					}
 				}
 			}
 		}
 
-		foreach ($hidden_permissions as $permission)
-		{
-			foreach (array('', '_own', '_any') as $suffix)
-			{
-				if (isset(self::$permissions[$permission . $suffix]))
+		foreach ($hidden_permissions as $permission) {
+			foreach (['', '_own', '_any'] as $suffix) {
+				if (isset(self::$permissions[$permission . $suffix])) {
 					self::$permissions[$permission . $suffix]['hidden'] = true;
+				}
 			}
 		}
 
-		foreach ($relabel_permissions as $permission => $label)
-		{
-			foreach (array('', '_own', '_any') as $suffix)
-			{
-				if (isset(self::$permissions[$permission . $suffix]))
+		foreach ($relabel_permissions as $permission => $label) {
+			foreach (['', '_own', '_any'] as $suffix) {
+				if (isset(self::$permissions[$permission . $suffix])) {
 					self::$permissions[$permission . $suffix]['label'] = $label;
+				}
 			}
 		}
 	}
@@ -3639,8 +3623,9 @@ protected static function integrateLoadPermissions(): void
 	protected static function integrateLoadIllegalPermissions(): void
 	{
 		// Don't bother if nothing is using this hook.
-		if (empty(Config::$modSettings['integrate_load_illegal_permissions']))
+		if (empty(Config::$modSettings['integrate_load_illegal_permissions'])) {
 			return;
+		}
 
 		// This context variable exists only for the sake of the hook.
 		Utils::$context['illegal_permissions'] = &self::$illegal;
@@ -3654,15 +3639,11 @@ protected static function integrateLoadIllegalPermissions(): void
 		// If the hook added anything, sync that back to our master list.
 		// Because this hook can't tell us what the prerequistes are, we assume
 		// that the permission can only be granted by admins.
-		if ($temp != Utils::jsonEncode(self::$illegal))
-		{
-			foreach (self::$illegal as $permission)
-			{
-				foreach (array('', '_own', '_any') as $suffix)
-				{
-					if (isset(self::$permissions[$permission . $suffix]) && !isset(self::$permissions[$permission . $suffix]['assigner_prerequisites']))
-					{
-						self::$permissions[$permission . $suffix]['assigner_prerequisites'] = array('admin_forum');
+		if ($temp != Utils::jsonEncode(self::$illegal)) {
+			foreach (self::$illegal as $permission) {
+				foreach (['', '_own', '_any'] as $suffix) {
+					if (isset(self::$permissions[$permission . $suffix]) && !isset(self::$permissions[$permission . $suffix]['assigner_prerequisites'])) {
+						self::$permissions[$permission . $suffix]['assigner_prerequisites'] = ['admin_forum'];
 					}
 				}
 			}
@@ -3682,8 +3663,9 @@ protected static function integrateLoadIllegalPermissions(): void
 	protected static function integrateLoadIllegalGuestPermissions(): void
 	{
 		// Don't bother if nothing is using this hook.
-		if (empty(Config::$modSettings['integrate_load_illegal_guest_permissions']))
+		if (empty(Config::$modSettings['integrate_load_illegal_guest_permissions'])) {
 			return;
+		}
 
 		// This context variable exists only for the sake of the hook.
 		Utils::$context['non_guest_permissions'] = &self::$never_guests;
@@ -3695,23 +3677,21 @@ protected static function integrateLoadIllegalGuestPermissions(): void
 		IntegrationHook::call('integrate_load_illegal_guest_permissions');
 
 		// If the hook changed anything, sync that back to our master list.
-		if ($temp != Utils::jsonEncode(self::$never_guests))
-		{
+		if ($temp != Utils::jsonEncode(self::$never_guests)) {
 			// Did the hook add a permission to self::$never_guests?
-			foreach (self::$never_guests as $permission)
-			{
-				foreach (array('', '_own', '_any') as $suffix)
-				{
-					if (isset(self::$permissions[$permission . $suffix]))
+			foreach (self::$never_guests as $permission) {
+				foreach (['', '_own', '_any'] as $suffix) {
+					if (isset(self::$permissions[$permission . $suffix])) {
 						self::$permissions[$permission . $suffix]['never_guests'] = true;
+					}
 				}
 			}
 
 			// Did the hook remove a permission from self::$never_guests?
-			foreach (self::$permissions as $permission => $perm_info)
-			{
-				if (!in_array($perm_info['generic_name'], self::$never_guests))
+			foreach (self::$permissions as $permission => $perm_info) {
+				if (!in_array($perm_info['generic_name'], self::$never_guests)) {
 					self::$permissions[$permission]['never_guests'] = false;
+				}
 			}
 		}
 
@@ -3721,7 +3701,8 @@ protected static function integrateLoadIllegalGuestPermissions(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Permissions::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Permissions::exportStatic')) {
 	Permissions::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Posts.php b/Sources/Actions/Admin/Posts.php
index 92f285cf1d..2874c96895 100644
--- a/Sources/Actions/Admin/Posts.php
+++ b/Sources/Actions/Admin/Posts.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -26,7 +26,6 @@
 use SMF\TaskRunner;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains all the administration settings for topics and posts.
@@ -40,15 +39,14 @@ class Posts implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManagePostSettings',
-			'postConfigVars' => false,
-			'topicConfigVars' => false,
-			'draftConfigVars' => false,
-		),
-	);
+			'modifyPostSettings' => 'ModifyPostSettings',
+			'modifyTopicSettings' => 'ModifyTopicSettings',
+			'modifyDraftSettings' => 'ModifyDraftSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -71,12 +69,12 @@ class Posts implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'posts' => 'posts',
 		'censor' => 'censor',
 		'topics' => 'topics',
 		'drafts' => 'drafts',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -99,10 +97,11 @@ class Posts implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -116,80 +115,73 @@ public function execute(): void
 	 */
 	public function censor(): void
 	{
-		if (!empty($_POST['save_censor']))
-		{
+		if (!empty($_POST['save_censor'])) {
 			// Make sure censoring is something they can do.
 			User::$me->checkSession();
 			SecurityToken::validate('admin-censor');
 
-			$censored_vulgar = array();
-			$censored_proper = array();
+			$censored_vulgar = [];
+			$censored_proper = [];
 
 			// Rip it apart, then split it into two arrays.
-			if (isset($_POST['censortext']))
-			{
-				$_POST['censortext'] = explode("\n", strtr($_POST['censortext'], array("\r" => '')));
+			if (isset($_POST['censortext'])) {
+				$_POST['censortext'] = explode("\n", strtr($_POST['censortext'], ["\r" => '']));
 
-				foreach ($_POST['censortext'] as $c)
-				{
-					list ($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
+				foreach ($_POST['censortext'] as $c) {
+					list($censored_vulgar[], $censored_proper[]) = array_pad(explode('=', trim($c)), 2, '');
 				}
-			}
-			elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper']))
-			{
-				if (is_array($_POST['censor_vulgar']))
-				{
-					foreach ($_POST['censor_vulgar'] as $i => $value)
-					{
-						if (trim(strtr($value, '*', ' ')) == '')
+			} elseif (isset($_POST['censor_vulgar'], $_POST['censor_proper'])) {
+				if (is_array($_POST['censor_vulgar'])) {
+					foreach ($_POST['censor_vulgar'] as $i => $value) {
+						if (trim(strtr($value, '*', ' ')) == '') {
 							unset($_POST['censor_vulgar'][$i], $_POST['censor_proper'][$i]);
+						}
 					}
 
 					$censored_vulgar = $_POST['censor_vulgar'];
 					$censored_proper = $_POST['censor_proper'];
-				}
-				else
-				{
-					$censored_vulgar = explode("\n", strtr($_POST['censor_vulgar'], array("\r" => '')));
-					$censored_proper = explode("\n", strtr($_POST['censor_proper'], array("\r" => '')));
+				} else {
+					$censored_vulgar = explode("\n", strtr($_POST['censor_vulgar'], ["\r" => '']));
+					$censored_proper = explode("\n", strtr($_POST['censor_proper'], ["\r" => '']));
 				}
 			}
 
 			// Set the new arrays and settings in the database.
-			$updates = array(
+			$updates = [
 				'censor_vulgar' => Utils::normalize(implode("\n", $censored_vulgar)),
 				'censor_proper' => Utils::normalize(implode("\n", $censored_proper)),
 				'allow_no_censored' => empty($_POST['allow_no_censored']) ? '0' : '1',
 				'censorWholeWord' => empty($_POST['censorWholeWord']) ? '0' : '1',
 				'censorIgnoreCase' => empty($_POST['censorIgnoreCase']) ? '0' : '1',
-			);
+			];
 
-			IntegrationHook::call('integrate_save_censors', array(&$updates));
+			IntegrationHook::call('integrate_save_censors', [&$updates]);
 
 			Utils::$context['saved_successful'] = true;
 			Config::updateModSettings($updates);
 		}
 
-		if (isset($_POST['censortest']))
-		{
+		if (isset($_POST['censortest'])) {
 			$censorText = Utils::htmlspecialchars($_POST['censortest'], ENT_QUOTES);
 			Msg::preparsecode($censorText);
-			Utils::$context['censor_test'] = strtr(Lang::censorText($censorText), array('"' => '&quot;'));
+			Utils::$context['censor_test'] = strtr(Lang::censorText($censorText), ['"' => '&quot;']);
 		}
 
 		// Set everything up for the template to do its thang.
 		$censor_vulgar = explode("\n", Config::$modSettings['censor_vulgar']);
 		$censor_proper = explode("\n", Config::$modSettings['censor_proper']);
 
-		Utils::$context['censored_words'] = array();
-		for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++)
-		{
-			if (empty($censor_vulgar[$i]))
+		Utils::$context['censored_words'] = [];
+
+		for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++) {
+			if (empty($censor_vulgar[$i])) {
 				continue;
+			}
 
 			// Skip it, it's either spaces or stars only.
-			if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '')
+			if (trim(strtr($censor_vulgar[$i], '*', ' ')) == '') {
 				continue;
+			}
 
 			Utils::$context['censored_words'][Utils::htmlspecialchars(trim($censor_vulgar[$i]))] = isset($censor_proper[$i]) ? Utils::htmlspecialchars($censor_proper[$i]) : '';
 		}
@@ -219,30 +211,28 @@ public function posts($return_config = false)
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// Are we saving them - are we??
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// If we're changing the message length (and we are using MySQL) let's check the column is big enough.
-			if (isset($_POST['max_messageLength']) && $_POST['max_messageLength'] != Config::$modSettings['max_messageLength'] && (Config::$db_type == 'mysql'))
-			{
+			if (isset($_POST['max_messageLength']) && $_POST['max_messageLength'] != Config::$modSettings['max_messageLength'] && (Config::$db_type == 'mysql')) {
 				$colData = Db::$db->list_columns('{db_prefix}messages', true);
 
-				foreach ($colData as $column)
-				{
-					if ($column['name'] == 'body')
+				foreach ($colData as $column) {
+					if ($column['name'] == 'body') {
 						$body_type = $column['type'];
+					}
 				}
 
-				if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text')
-				{
-					ErrorHandler::fatalLang('convert_to_mediumtext', false, array(Config::$scripturl . '?action=admin;area=maintain;sa=database'));
+				if (isset($body_type) && ($_POST['max_messageLength'] > 65535 || $_POST['max_messageLength'] == 0) && $body_type == 'text') {
+					ErrorHandler::fatalLang('convert_to_mediumtext', false, [Config::$scripturl . '?action=admin;area=maintain;sa=database']);
 				}
 			}
 
 			// If we're changing the post preview length let's check its valid
-			if (!empty($_POST['preview_characters']))
+			if (!empty($_POST['preview_characters'])) {
 				$_POST['preview_characters'] = (int) min(max(0, $_POST['preview_characters']), 512);
+			}
 
 			IntegrationHook::call('integrate_save_post_settings');
 
@@ -273,8 +263,7 @@ public function topics($return_config = false)
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// Are we saving them - are we??
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 			IntegrationHook::call('integrate_save_topic_settings');
 
@@ -305,22 +294,22 @@ public function drafts($return_config = false)
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// Saving them ?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Protect them from themselves.
 			$_POST['drafts_autosave_frequency'] = !isset($_POST['drafts_autosave_frequency']) || $_POST['drafts_autosave_frequency'] < 30 ? 30 : $_POST['drafts_autosave_frequency'];
 
 			// Also disable the scheduled task if we're not using it.
-			Db::$db->query('', '
-				UPDATE {db_prefix}scheduled_tasks
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}scheduled_tasks
 				SET disabled = {int:disabled}
 				WHERE task = {string:task}',
-				array(
+				[
 					'disabled' => !empty($_POST['drafts_keep_days']) ? 0 : 1,
 					'task' => 'remove_old_drafts',
-				)
+				],
 			);
 
 			TaskRunner::calculateNextTrigger();
@@ -361,8 +350,9 @@ function toggle()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -383,38 +373,38 @@ public static function call(): void
 	public static function postConfigVars(): array
 	{
 		// All the settings...
-		$config_vars = array(
+		$config_vars = [
 			// Simple post options...
-			array('check', 'removeNestedQuotes'),
-			array('check', 'disable_wysiwyg'),
-			array('check', 'additional_options_collapsable'),
-			array('check', 'guest_post_no_email'),
+			['check', 'removeNestedQuotes'],
+			['check', 'disable_wysiwyg'],
+			['check', 'additional_options_collapsable'],
+			['check', 'guest_post_no_email'],
 			'',
 
 			// Posting limits...
-			array('int', 'max_messageLength', 'subtext' => Lang::$txt['max_messageLength_zero'], 'postinput' => Lang::$txt['manageposts_characters']),
-			array('int', 'topicSummaryPosts', 'postinput' => Lang::$txt['manageposts_posts']),
+			['int', 'max_messageLength', 'subtext' => Lang::$txt['max_messageLength_zero'], 'postinput' => Lang::$txt['manageposts_characters']],
+			['int', 'topicSummaryPosts', 'postinput' => Lang::$txt['manageposts_posts']],
 			'',
 
 			// Posting time limits...
-			array('int', 'spamWaitTime', 'postinput' => Lang::$txt['manageposts_seconds']),
-			array('int', 'edit_wait_time', 'postinput' => Lang::$txt['manageposts_seconds']),
-			array('int', 'edit_disable_time', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['manageposts_minutes']),
+			['int', 'spamWaitTime', 'postinput' => Lang::$txt['manageposts_seconds']],
+			['int', 'edit_wait_time', 'postinput' => Lang::$txt['manageposts_seconds']],
+			['int', 'edit_disable_time', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['manageposts_minutes']],
 			'',
 
 			// Automagic image resizing.
-			array('int', 'max_image_width', 'subtext' => Lang::$txt['zero_for_no_limit']),
-			array('int', 'max_image_height', 'subtext' => Lang::$txt['zero_for_no_limit']),
+			['int', 'max_image_width', 'subtext' => Lang::$txt['zero_for_no_limit']],
+			['int', 'max_image_height', 'subtext' => Lang::$txt['zero_for_no_limit']],
 			'',
 
 			// First & Last message preview lengths
-			array('int', 'preview_characters', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['preview_characters_units']),
+			['int', 'preview_characters', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['preview_characters_units']],
 
 			// Quote expand
-			array('int', 'quote_expand', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['quote_expand_pixels_units']),
-		);
+			['int', 'quote_expand', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['quote_expand_pixels_units']],
+		];
 
-		IntegrationHook::call('integrate_modify_post_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_post_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -427,39 +417,39 @@ public static function postConfigVars(): array
 	public static function topicConfigVars(): array
 	{
 		// Here are all the topic settings.
-		$config_vars = array(
+		$config_vars = [
 			// Some simple bools...
-			array('check', 'enableParticipation'),
+			['check', 'enableParticipation'],
 			'',
 
 			// Pagination etc...
-			array('int', 'oldTopicDays', 'postinput' => Lang::$txt['manageposts_days'], 'subtext' => Lang::$txt['zero_to_disable']),
-			array('int', 'defaultMaxTopics', 'postinput' => Lang::$txt['manageposts_topics']),
-			array('int', 'defaultMaxMessages', 'postinput' => Lang::$txt['manageposts_posts']),
-			array('check', 'disable_print_topic'),
+			['int', 'oldTopicDays', 'postinput' => Lang::$txt['manageposts_days'], 'subtext' => Lang::$txt['zero_to_disable']],
+			['int', 'defaultMaxTopics', 'postinput' => Lang::$txt['manageposts_topics']],
+			['int', 'defaultMaxMessages', 'postinput' => Lang::$txt['manageposts_posts']],
+			['check', 'disable_print_topic'],
 			'',
 
 			// All, next/prev...
-			array('int', 'enableAllMessages', 'postinput' => Lang::$txt['manageposts_posts'], 'subtext' => Lang::$txt['enableAllMessages_zero']),
-			array('check', 'disableCustomPerPage'),
-			array('check', 'enablePreviousNext'),
+			['int', 'enableAllMessages', 'postinput' => Lang::$txt['manageposts_posts'], 'subtext' => Lang::$txt['enableAllMessages_zero']],
+			['check', 'disableCustomPerPage'],
+			['check', 'enablePreviousNext'],
 			'',
 
 			// Topic related settings (show gender icon/avatars etc...)
-			array('check', 'subject_toggle'),
-			array('check', 'show_modify'),
-			array('check', 'show_profile_buttons'),
-			array('check', 'show_user_images'),
-			array('check', 'show_blurb'),
-			array('check', 'hide_post_group', 'subtext' => Lang::$txt['hide_post_group_desc']),
+			['check', 'subject_toggle'],
+			['check', 'show_modify'],
+			['check', 'show_profile_buttons'],
+			['check', 'show_user_images'],
+			['check', 'show_blurb'],
+			['check', 'hide_post_group', 'subtext' => Lang::$txt['hide_post_group_desc']],
 			'',
 
 			// First & Last message preview lengths
-			array('int', 'preview_characters', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['preview_characters_units']),
-			array('check', 'message_index_preview_first', 'subtext' => Lang::$txt['message_index_preview_first_desc']),
-		);
+			['int', 'preview_characters', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['preview_characters_units']],
+			['check', 'message_index_preview_first', 'subtext' => Lang::$txt['message_index_preview_first_desc']],
+		];
 
-		IntegrationHook::call('integrate_modify_topic_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_topic_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -472,18 +462,18 @@ public static function topicConfigVars(): array
 	public static function draftConfigVars(): array
 	{
 		// Here are all the draft settings. A bit light for now, but we can add more :P
-		$config_vars = array(
+		$config_vars = [
 			// Draft settings ...
-			array('check', 'drafts_post_enabled'),
-			array('check', 'drafts_pm_enabled'),
-			array('check', 'drafts_show_saved_enabled', 'subtext' => Lang::$txt['drafts_show_saved_enabled_subnote']),
-			array('int', 'drafts_keep_days', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['drafts_keep_days_subnote']),
+			['check', 'drafts_post_enabled'],
+			['check', 'drafts_pm_enabled'],
+			['check', 'drafts_show_saved_enabled', 'subtext' => Lang::$txt['drafts_show_saved_enabled_subnote']],
+			['int', 'drafts_keep_days', 'postinput' => Lang::$txt['days_word'], 'subtext' => Lang::$txt['drafts_keep_days_subnote']],
 			'',
-			array('check', 'drafts_autosave_enabled', 'subtext' => Lang::$txt['drafts_autosave_enabled_subnote']),
-			array('int', 'drafts_autosave_frequency', 'postinput' => Lang::$txt['manageposts_seconds'], 'subtext' => Lang::$txt['drafts_autosave_frequency_subnote']),
-		);
+			['check', 'drafts_autosave_enabled', 'subtext' => Lang::$txt['drafts_autosave_enabled_subnote']],
+			['int', 'drafts_autosave_frequency', 'postinput' => Lang::$txt['manageposts_seconds'], 'subtext' => Lang::$txt['drafts_autosave_frequency_subnote']],
+		];
 
-		IntegrationHook::call('integrate_modify_draft_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_draft_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -496,8 +486,9 @@ public static function draftConfigVars(): array
 	 */
 	public static function modifyPostSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::postConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'posts';
@@ -512,8 +503,9 @@ public static function modifyPostSettings($return_config = false)
 	 */
 	public static function modifyTopicSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::topicConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'topics';
@@ -528,8 +520,9 @@ public static function modifyTopicSettings($return_config = false)
 	 */
 	public static function modifyDraftSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::draftConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'drafts';
@@ -552,35 +545,37 @@ protected function __construct()
 		Utils::$context['page_title'] = Lang::$txt['manageposts_title'];
 
 		// Tabs for browsing the different post functions.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['manageposts_title'],
 			'help' => 'posts_and_topics',
 			'description' => Lang::$txt['manageposts_description'],
-			'tabs' => array(
-				'posts' => array(
+			'tabs' => [
+				'posts' => [
 					'description' => Lang::$txt['manageposts_settings_description'],
-				),
-				'censor' => array(
+				],
+				'censor' => [
 					'description' => Lang::$txt['admin_censored_desc'],
-				),
-				'topics' => array(
+				],
+				'topics' => [
 					'description' => Lang::$txt['manageposts_topic_settings_description'],
-				),
-				'drafts' => array(
+				],
+				'drafts' => [
 					'description' => Lang::$txt['managedrafts_settings_description'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_posts', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_posts', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Posts::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Posts::exportStatic')) {
 	Posts::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Registration.php b/Sources/Actions/Admin/Registration.php
index 5fbd48baa6..74e1fe9e76 100644
--- a/Sources/Actions/Admin/Registration.php
+++ b/Sources/Actions/Admin/Registration.php
@@ -13,10 +13,11 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Register2;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -24,12 +25,10 @@
 use SMF\Menu;
 use SMF\Profile;
 use SMF\SecurityToken;
-use SMF\User;
 use SMF\Theme;
 use SMF\Time;
+use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Register2;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class helps the administrator setting registration settings and policy
@@ -44,13 +43,16 @@ class Registration implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RegCenter',
-			'getConfigVars' => false,
-		),
-	);
+			'adminRegister' => 'AdminRegister',
+			'editAgreement' => 'EditAgreement',
+			'editPrivacyPolicy' => 'EditPrivacyPolicy',
+			'setReserved' => 'SetReserved',
+			'modifyRegistrationSettings' => 'ModifyRegistrationSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -75,13 +77,13 @@ class Registration implements ActionInterface
 	 *
 	 * Format: 'sa' => array('method', 'required_permission')
 	 */
-	public static array $subactions = array(
-		'register' => array('register', 'moderate_forum'),
-		'agreement' => array('agreement', 'admin_forum'),
-		'policy' => array('privacyPolicy', 'admin_forum'),
-		'reservednames' => array('reservedNames', 'admin_forum'),
-		'settings' => array('settings', 'admin_forum'),
-	);
+	public static array $subactions = [
+		'register' => ['register', 'moderate_forum'],
+		'agreement' => ['agreement', 'admin_forum'],
+		'policy' => ['privacyPolicy', 'admin_forum'],
+		'reservednames' => ['reservedNames', 'admin_forum'],
+		'settings' => ['settings', 'admin_forum'],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -107,10 +109,11 @@ public function execute(): void
 		// Must have sufficient permissions.
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -126,20 +129,17 @@ public function register(): void
 		Profile::load(0);
 		Profile::$member->loadCustomFields('register');
 
-		if (!empty($_POST['regSubmit']))
-		{
+		if (!empty($_POST['regSubmit'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-regc');
 
-			foreach ($_POST as $key => $value)
-			{
-				if (!is_array($_POST[$key]))
-				{
-					$_POST[$key] = Utils::htmlTrimRecursive(str_replace(array("\n", "\r"), '', Utils::normalize($_POST[$key])));
+			foreach ($_POST as $key => $value) {
+				if (!is_array($_POST[$key])) {
+					$_POST[$key] = Utils::htmlTrimRecursive(str_replace(["\n", "\r"], '', Utils::normalize($_POST[$key])));
 				}
 			}
 
-			$regOptions = array(
+			$regOptions = [
 				'interface' => 'admin',
 				'username' => $_POST['user'],
 				'email' => $_POST['email'],
@@ -151,40 +151,38 @@ public function register(): void
 				'send_welcome_email' => isset($_POST['emailPassword']) || empty($_POST['password']),
 				'require' => isset($_POST['emailActivate']) ? 'activation' : 'nothing',
 				'memberGroup' => empty($_POST['group']) || !User::$me->allowedTo('manage_membergroups') ? 0 : (int) $_POST['group'],
-			);
+			];
 
 			$memberID = Register2::registerMember($regOptions);
 
-			if (!empty($memberID))
-			{
+			if (!empty($memberID)) {
 				// We'll do custom fields after as then we get to use the helper function!
-				if (!empty($_POST['customfield']))
-				{
+				if (!empty($_POST['customfield'])) {
 					Profile::load($memberID);
 					Profile::$member->loadCustomFields('register');
 					Profile::$member->save();
 				}
 
-				Utils::$context['new_member'] = array(
+				Utils::$context['new_member'] = [
 					'id' => $memberID,
 					'name' => $_POST['user'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $memberID,
 					'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $memberID . '">' . $_POST['user'] . '</a>',
-				);
+				];
 
 				Utils::$context['registration_done'] = sprintf(Lang::$txt['admin_register_done'], Utils::$context['new_member']['link']);
 			}
 		}
 
-		Utils::$context['member_groups'] = array();
+		Utils::$context['member_groups'] = [];
 
 		// Load the assignable member groups.
-		if (User::$me->allowedTo('manage_membergroups'))
-		{
+		if (User::$me->allowedTo('manage_membergroups')) {
 			Utils::$context['member_groups'][] = Lang::$txt['admin_register_group_none'];
 
-			$request = Db::$db->query('', '
-				SELECT group_name, id_group
+			$request = Db::$db->query(
+				'',
+				'SELECT group_name, id_group
 				FROM {db_prefix}membergroups
 				WHERE id_group != {int:moderator_group}
 					AND min_posts = {int:min_posts}' . (User::$me->allowedTo('admin_forum') ? '' : '
@@ -192,17 +190,17 @@ public function register(): void
 					AND group_type != {int:is_protected}') . '
 					AND hidden != {int:hidden_group}
 				ORDER BY min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE 4 END, group_name',
-				array(
+				[
 					'moderator_group' => 3,
 					'min_posts' => -1,
 					'admin_group' => 1,
 					'is_protected' => 1,
 					'hidden_group' => 2,
 					'newbie_group' => 4,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['member_groups'][$row['id_group']] = $row['group_name'];
 			}
 			Db::$db->free_result($request);
@@ -214,7 +212,7 @@ public function register(): void
 
 		SecurityToken::create('admin-regc');
 
-		Theme::loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register');
+		Theme::loadJavaScriptFile('register.js', ['defer' => false, 'minimize' => true], 'smf_register');
 	}
 
 	/**
@@ -232,23 +230,20 @@ public function agreement(): void
 		Utils::$context['current_agreement'] = '';
 
 		// Is there more than one to edit?
-		Utils::$context['editable_agreements'] = array(
+		Utils::$context['editable_agreements'] = [
 			'' => Lang::$txt['admin_agreement_default'],
-		);
+		];
 
 		// Get our languages.
 		Lang::get();
 
 		// Try to figure out if we have more agreements.
-		foreach (Utils::$context['languages'] as $lang)
-		{
-			if (file_exists(Config::$boarddir . '/agreement.' . $lang['filename'] . '.txt'))
-			{
+		foreach (Utils::$context['languages'] as $lang) {
+			if (file_exists(Config::$boarddir . '/agreement.' . $lang['filename'] . '.txt')) {
 				Utils::$context['editable_agreements']['.' . $lang['filename']] = $lang['name'];
 
 				// Are we editing this?
-				if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename'])
-				{
+				if (isset($_POST['agree_lang']) && $_POST['agree_lang'] == '.' . $lang['filename']) {
 					Utils::$context['current_agreement'] = '.' . $lang['filename'];
 				}
 			}
@@ -260,41 +255,39 @@ public function agreement(): void
 
 		Utils::$context['agreement'] = file_exists($agreement_file) ? str_replace("\r", '', file_get_contents($agreement_file)) : '';
 
-		if (isset($_POST['agreement']))
+		if (isset($_POST['agreement'])) {
 			$_POST['agreement'] = Utils::normalizeSpaces(Utils::normalize($_POST['agreement']));
+		}
 
-		if (isset($_POST['agreement']) && $_POST['agreement'] != Utils::$context['agreement'])
-		{
+		if (isset($_POST['agreement']) && $_POST['agreement'] != Utils::$context['agreement']) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-rega');
 
-			$backup_file = (date_create('@' . filemtime($agreement_file))->format('Y-m-d\TH_i_sp')) . '_' . $agreement_file;
+			$backup_file = (date_create('@' . filemtime($agreement_file))->format('Y-m-d\\TH_i_sp')) . '_' . $agreement_file;
 
 			// Off it goes to the agreement file.
-			if (Config::safeFileWrite($agreement_file, $_POST['agreement'], $backup_file))
-			{
+			if (Config::safeFileWrite($agreement_file, $_POST['agreement'], $backup_file)) {
 				Utils::$context['saved_successful'] = true;
 
 				$agreement_settings['agreement_updated_' . $agreement_lang] = time();
 
 				// Writing it counts as agreeing to it, right?
-				Db::$db->insert('replace',
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}themes',
-					array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'),
-					array(User::$me->id, 1, 'agreement_accepted', time()),
-					array('id_member', 'id_theme', 'variable')
+					['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'],
+					[User::$me->id, 1, 'agreement_accepted', time()],
+					['id_member', 'id_theme', 'variable'],
 				);
 
-				Logging::logAction('agreement_updated', array('language' => Utils::$context['editable_agreements'][Utils::$context['current_agreement']]), 'admin');
+				Logging::logAction('agreement_updated', ['language' => Utils::$context['editable_agreements'][Utils::$context['current_agreement']]], 'admin');
 
-				Logging::logAction('agreement_accepted', array('applicator' => User::$me->id), 'user');
+				Logging::logAction('agreement_accepted', ['applicator' => User::$me->id], 'user');
 
 				Config::updateModSettings($agreement_settings);
 
 				Utils::$context['agreement'] = $_POST['agreement'];
-			}
-			else
-			{
+			} else {
 				Utils::$context['could_not_save'] = true;
 			}
 		}
@@ -327,46 +320,47 @@ public function privacyPolicy(): void
 		// We need a policy for every language.
 		Lang::get();
 
-		foreach (Utils::$context['languages'] as $lang)
-		{
+		foreach (Utils::$context['languages'] as $lang) {
 			Utils::$context['editable_policies'][$lang['filename']] = $lang['name'];
 
 			// Are we editing this one?
-			if (isset($_POST['policy_lang']) && $_POST['policy_lang'] == $lang['filename'])
+			if (isset($_POST['policy_lang']) && $_POST['policy_lang'] == $lang['filename']) {
 				Utils::$context['current_policy_lang'] = $lang['filename'];
+			}
 		}
 
 		Utils::$context['privacy_policy'] = empty(Config::$modSettings['policy_' . Utils::$context['current_policy_lang']]) ? '' : Config::$modSettings['policy_' . Utils::$context['current_policy_lang']];
 
-		if (isset($_POST['policy']))
-		{
+		if (isset($_POST['policy'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-regp');
 
 			// Make sure there are no creepy-crawlies in it.
 			$policy_text = Utils::normalizeSpaces(Utils::htmlspecialchars($_POST['policy']));
 
-			$policy_settings = array(
+			$policy_settings = [
 				'policy_' . Utils::$context['current_policy_lang'] => $policy_text,
 				'policy_' . Utils::$context['current_policy_lang'] . '_' . Config::$modSettings['policy_updated_' . Utils::$context['current_policy_lang']] => Utils::$context['privacy_policy'],
-			);
+			];
 
 			$policy_settings['policy_updated_' . Utils::$context['current_policy_lang']] = time();
 
 			// Writing it counts as agreeing to it, right?
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}themes',
-				array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'),
-				array(User::$me->id, 1, 'policy_accepted', time()),
-				array('id_member', 'id_theme', 'variable')
+				['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'],
+				[User::$me->id, 1, 'policy_accepted', time()],
+				['id_member', 'id_theme', 'variable'],
 			);
 
-			Logging::logAction('policy_updated', array('language' => Utils::$context['editable_policies'][Utils::$context['current_policy_lang']]), 'admin');
+			Logging::logAction('policy_updated', ['language' => Utils::$context['editable_policies'][Utils::$context['current_policy_lang']]], 'admin');
 
-			Logging::logAction('policy_accepted', array('applicator' => User::$me->id), 'user');
+			Logging::logAction('policy_accepted', ['applicator' => User::$me->id], 'user');
 
-			if (Utils::$context['privacy_policy'] !== $policy_text)
+			if (Utils::$context['privacy_policy'] !== $policy_text) {
 				Utils::$context['saved_successful'] = true;
+			}
 
 			Config::updateModSettings($policy_settings);
 
@@ -390,36 +384,35 @@ public function privacyPolicy(): void
 	public function reservedNames(): void
 	{
 		// Submitting new reserved words.
-		if (!empty($_POST['save_reserved_names']))
-		{
+		if (!empty($_POST['save_reserved_names'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-regr');
 
 			$_POST['reserved'] = Utils::normalize($_POST['reserved']);
 
 			// Set all the options....
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'reserveWord' => (int) !empty($_POST['matchword']),
 				'reserveCase' => (int) !empty($_POST['matchcase']),
 				'reserveUser' => (int) !empty($_POST['matchuser']),
 				'reserveName' => (int) !empty($_POST['matchname']),
 				'reserveNames' => Utils::normalizeSpaces(Utils::normalize($_POST['reserved'])),
-			));
+			]);
 
 			Utils::$context['saved_successful'] = true;
 		}
 
 		// Get the reserved word options and words.
-		Config::$modSettings['reserveNames'] = str_replace('\n', "\n", Config::$modSettings['reserveNames']);
+		Config::$modSettings['reserveNames'] = str_replace('\\n', "\n", Config::$modSettings['reserveNames']);
 
 		Utils::$context['reserved_words'] = explode("\n", Config::$modSettings['reserveNames']);
 
-		Utils::$context['reserved_word_options'] = array(
+		Utils::$context['reserved_word_options'] = [
 			'match_word' => !empty(Config::$modSettings['reserveWord']),
 			'match_case' => !empty(Config::$modSettings['reserveCase']),
 			'match_user' => !empty(Config::$modSettings['reserveUser']),
 			'match_name' => !empty(Config::$modSettings['reserveName']),
-		);
+		];
 
 		// Ready the template......
 		Utils::$context['sub_template'] = 'edit_reserved_words';
@@ -444,13 +437,13 @@ public function settings(): void
 		Utils::$context['sub_template'] = 'show_settings';
 		Utils::$context['page_title'] = Lang::$txt['registration_center'];
 
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Are there some contacts missing?
-			if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax']))
+			if (!empty($_POST['coppaAge']) && !empty($_POST['coppaType']) && empty($_POST['coppaPost']) && empty($_POST['coppaFax'])) {
 				ErrorHandler::fatalLang('admin_setting_coppa_require_contact');
+			}
 
 			// Post needs to take into account line breaks.
 			$_POST['coppaPost'] = str_replace("\n", '<br>', empty($_POST['coppaPost']) ? '' : Utils::normalize($_POST['coppaPost']));
@@ -496,8 +489,9 @@ function checkCoppa()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -522,27 +516,27 @@ public static function getConfigVars(): array
 
 		$policy = !empty(Config::$modSettings['policy_' . Lang::$default]);
 
-		$config_vars = array(
-			array('select', 'registration_method', array(Lang::$txt['setting_registration_standard'], Lang::$txt['setting_registration_activate'], Lang::$txt['setting_registration_approval'], Lang::$txt['setting_registration_disabled'])),
-			array('check', 'send_welcomeEmail'),
+		$config_vars = [
+			['select', 'registration_method', [Lang::$txt['setting_registration_standard'], Lang::$txt['setting_registration_activate'], Lang::$txt['setting_registration_approval'], Lang::$txt['setting_registration_disabled']]],
+			['check', 'send_welcomeEmail'],
 
 			'',
 
-			array('check', 'requireAgreement', 'text_label' => Lang::$txt['admin_agreement'], 'value' => !empty(Config::$modSettings['requireAgreement'])),
-			array('warning', empty($agreement) ? 'error_no_agreement' : ''),
-			array('check', 'requirePolicyAgreement', 'text_label' => Lang::$txt['admin_privacy_policy'], 'value' => !empty(Config::$modSettings['requirePolicyAgreement'])),
-			array('warning', empty($policy) ? 'error_no_privacy_policy' : ''),
+			['check', 'requireAgreement', 'text_label' => Lang::$txt['admin_agreement'], 'value' => !empty(Config::$modSettings['requireAgreement'])],
+			['warning', empty($agreement) ? 'error_no_agreement' : ''],
+			['check', 'requirePolicyAgreement', 'text_label' => Lang::$txt['admin_privacy_policy'], 'value' => !empty(Config::$modSettings['requirePolicyAgreement'])],
+			['warning', empty($policy) ? 'error_no_privacy_policy' : ''],
 
 			'',
 
-			array('int', 'coppaAge', 'subtext' => Lang::$txt['zero_to_disable'], 'onchange' => 'checkCoppa();'),
-			array('select', 'coppaType', array(Lang::$txt['setting_coppaType_reject'], Lang::$txt['setting_coppaType_approval']), 'onchange' => 'checkCoppa();'),
-			array('large_text', 'coppaPost', 'subtext' => Lang::$txt['setting_coppaPost_desc']),
-			array('text', 'coppaFax'),
-			array('text', 'coppaPhone'),
-		);
+			['int', 'coppaAge', 'subtext' => Lang::$txt['zero_to_disable'], 'onchange' => 'checkCoppa();'],
+			['select', 'coppaType', [Lang::$txt['setting_coppaType_reject'], Lang::$txt['setting_coppaType_approval']], 'onchange' => 'checkCoppa();'],
+			['large_text', 'coppaPost', 'subtext' => Lang::$txt['setting_coppaPost_desc']],
+			['text', 'coppaFax'],
+			['text', 'coppaPhone'],
+		];
 
-		IntegrationHook::call('integrate_modify_registration_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_registration_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -595,15 +589,15 @@ public static function setReserved(): void
 	 */
 	public static function modifyRegistrationSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
 		self::$obj->execute();
 	}
 
-
 	/******************
 	 * Internal methods
 	 ******************/
@@ -618,37 +612,34 @@ protected function __construct()
 		Theme::loadTemplate('Register');
 
 		// Next create the tabs for the template.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['registration_center'],
 			'help' => 'registrations',
 			'description' => Lang::$txt['admin_settings_desc'],
-			'tabs' => array(
-				'register' => array(
+			'tabs' => [
+				'register' => [
 					'description' => Lang::$txt['admin_register_desc'],
-				),
-				'agreement' => array(
+				],
+				'agreement' => [
 					'description' => Lang::$txt['registration_agreement_desc'],
-				),
-				'policy' => array(
+				],
+				'policy' => [
 					'description' => Lang::$txt['privacy_policy_desc'],
-				),
-				'reservednames' => array(
+				],
+				'reservednames' => [
 					'description' => Lang::$txt['admin_reserved_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['admin_settings_desc'],
-				)
-			)
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_registrations', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_registrations', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
-		{
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
-		}
-		elseif (!User::$me->allowedTo('moderate_forum'))
-		{
+		} elseif (!User::$me->allowedTo('moderate_forum')) {
 			$this->subaction = 'settings';
 		}
 
@@ -658,7 +649,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Registration::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Registration::exportStatic')) {
 	Registration::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/RepairBoards.php b/Sources/Actions/Admin/RepairBoards.php
index 70d914aec9..59c772db49 100644
--- a/Sources/Actions/Admin/RepairBoards.php
+++ b/Sources/Actions/Admin/RepairBoards.php
@@ -13,11 +13,11 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -26,7 +26,6 @@
 use SMF\SecurityToken;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This is here for the "repair any errors" feature in the admin center.
@@ -40,12 +39,11 @@ class RepairBoards implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RepairBoards',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -99,9 +97,9 @@ class RepairBoards implements ActionInterface
 	 * MOD AUTHORS: If you want to add tests to this array so that SMF can fix
 	 * data for your mod, use the integrate_repair_boards hook.
 	 */
-	public array $errorTests = array(
+	public array $errorTests = [
 		// Make a last-ditch-effort check to get rid of topics with zeros..
-		'zero_topics' => array(
+		'zero_topics' => [
 			'check_query' => '
 				SELECT COUNT(*)
 				FROM {db_prefix}topics
@@ -112,9 +110,9 @@ class RepairBoards implements ActionInterface
 				SET id_topic = NULL
 				WHERE id_topic = 0',
 			'message' => 'repair_zero_ids',
-		),
+		],
 		// ... and same with messages.
-		'zero_messages' => array(
+		'zero_messages' => [
 			'check_query' => '
 				SELECT COUNT(*)
 				FROM {db_prefix}messages
@@ -125,15 +123,15 @@ class RepairBoards implements ActionInterface
 				SET id_msg = NULL
 				WHERE id_msg = 0',
 			'message' => 'repair_zero_ids',
-		),
+		],
 		// Find messages that don't have existing topics.
-		'missing_topics' => array(
-			'substeps' => array(
+		'missing_topics' => [
+			'substeps' => [
 				'step_size' => 1000,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}messages'
-			),
+					FROM {db_prefix}messages',
+			],
 			'check_query' => '
 				SELECT m.id_topic, m.id_msg
 				FROM {db_prefix}messages AS m
@@ -150,17 +148,17 @@ class RepairBoards implements ActionInterface
 				WHERE t.id_topic IS NULL
 				GROUP BY m.id_topic, m.id_board',
 			'fix_processing' => 'fixMissingTopics',
-			'force_fix' => array('stats_topics'),
-			'messages' => array('repair_missing_topics', 'id_msg', 'id_topic'),
-		),
+			'force_fix' => ['stats_topics'],
+			'messages' => ['repair_missing_topics', 'id_msg', 'id_topic'],
+		],
 		// Find topics with no messages.
-		'missing_messages' => array(
-			'substeps' => array(
+		'missing_messages' => [
+			'substeps' => [
 				'step_size' => 1000,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT t.id_topic, COUNT(m.id_msg) AS num_msg
 				FROM {db_prefix}topics AS t
@@ -169,19 +167,19 @@ class RepairBoards implements ActionInterface
 				GROUP BY t.id_topic
 				HAVING COUNT(m.id_msg) = 0',
 			// Remove all topics that have zero messages in the messages table.
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_topic',
 				'process' => 'fixMissingMessages',
-			),
-			'messages' => array('repair_missing_messages', 'id_topic'),
-		),
-		'poll_options_missing_poll' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_messages', 'id_topic'],
+		],
+		'poll_options_missing_poll' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_poll)
-					FROM {db_prefix}poll_choices'
-			),
+					FROM {db_prefix}poll_choices',
+			],
 			'check_query' => '
 				SELECT o.id_poll, count(*) as amount, t.id_topic, t.id_board, t.id_member_started AS id_poster, m.member_name AS poster_name
 				FROM {db_prefix}poll_choices AS o
@@ -192,16 +190,16 @@ class RepairBoards implements ActionInterface
 					AND p.id_poll IS NULL
 				GROUP BY o.id_poll, t.id_topic, t.id_board, t.id_member_started, m.member_name',
 			'fix_processing' => 'fixMissingPollOptions',
-			'force_fix' => array('stats_topics'),
-			'messages' => array('repair_poll_options_missing_poll', 'id_poll', 'amount'),
-		),
-		'polls_missing_topics' => array(
-			'substeps' => array(
+			'force_fix' => ['stats_topics'],
+			'messages' => ['repair_poll_options_missing_poll', 'id_poll', 'amount'],
+		],
+		'polls_missing_topics' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_poll)
-					FROM {db_prefix}polls'
-			),
+					FROM {db_prefix}polls',
+			],
 			'check_query' => '
 				SELECT p.id_poll, p.id_member, p.poster_name, t.id_board
 				FROM {db_prefix}polls AS p
@@ -209,16 +207,16 @@ class RepairBoards implements ActionInterface
 				WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_poll IS NULL',
 			'fix_processing' => 'fixMissingPollTopics',
-			'force_fix' => array('stats_topics'),
-			'messages' => array('repair_polls_missing_topics', 'id_poll', 'id_topic'),
-		),
-		'stats_topics' => array(
-			'substeps' => array(
+			'force_fix' => ['stats_topics'],
+			'messages' => ['repair_polls_missing_topics', 'id_poll', 'id_topic'],
+		],
+		'stats_topics' => [
+			'substeps' => [
 				'step_size' => 200,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT
 					t.id_topic, t.id_first_msg, t.id_last_msg,
@@ -238,15 +236,15 @@ class RepairBoards implements ActionInterface
 				ORDER BY t.id_topic',
 			'fix_processing' => 'fixTopicStats',
 			'message_function' => 'topicStatsMessage',
-		),
+		],
 		// Find topics with incorrect num_replies.
-		'stats_topics2' => array(
-			'substeps' => array(
+		'stats_topics2' => [
+			'substeps' => [
 				'step_size' => 300,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT
 					t.id_topic, t.num_replies, mf.approved,
@@ -259,15 +257,15 @@ class RepairBoards implements ActionInterface
 				ORDER BY t.id_topic',
 			'fix_processing' => 'fixTopicStats2',
 			'message_function' => 'topicStatsMessage2',
-		),
+		],
 		// Find topics with incorrect unapproved_posts.
-		'stats_topics3' => array(
-			'substeps' => array(
+		'stats_topics3' => [
+			'substeps' => [
 				'step_size' => 1000,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT
 					t.id_topic, t.unapproved_posts, COUNT(mu.id_msg) AS my_unapproved_posts
@@ -278,16 +276,16 @@ class RepairBoards implements ActionInterface
 				HAVING unapproved_posts != COUNT(mu.id_msg)
 				ORDER BY t.id_topic',
 			'fix_processing' => 'fixTopicStats3',
-			'messages' => array('repair_topic_wrong_unapproved_number', 'id_topic', 'unapproved_posts'),
-		),
+			'messages' => ['repair_topic_wrong_unapproved_number', 'id_topic', 'unapproved_posts'],
+		],
 		// Find topics with nonexistent boards.
-		'missing_boards' => array(
-			'substeps' => array(
+		'missing_boards' => [
+			'substeps' => [
 				'step_size' => 1000,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT t.id_topic, t.id_board
 				FROM {db_prefix}topics AS t
@@ -304,30 +302,30 @@ class RepairBoards implements ActionInterface
 					AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY t.id_board',
 			'fix_processing' => 'fixMissingBoards',
-			'messages' => array('repair_missing_boards', 'id_topic', 'id_board'),
-		),
+			'messages' => ['repair_missing_boards', 'id_topic', 'id_board'],
+		],
 		// Find boards with nonexistent categories.
-		'missing_categories' => array(
+		'missing_categories' => [
 			'check_query' => '
 				SELECT b.id_board, b.id_cat
 				FROM {db_prefix}boards AS b
 					LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 				WHERE c.id_cat IS NULL
 				ORDER BY b.id_cat, b.id_board',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_cat',
 				'process' => 'fixMissingCategories',
-			),
-			'messages' => array('repair_missing_categories', 'id_board', 'id_cat'),
-		),
+			],
+			'messages' => ['repair_missing_categories', 'id_board', 'id_cat'],
+		],
 		// Find messages with nonexistent members.
-		'missing_posters' => array(
-			'substeps' => array(
+		'missing_posters' => [
+			'substeps' => [
 				'step_size' => 2000,
 				'step_max' => '
 					SELECT MAX(id_msg)
-					FROM {db_prefix}messages'
-			),
+					FROM {db_prefix}messages',
+			],
 			'check_query' => '
 				SELECT m.id_msg, m.id_member
 				FROM {db_prefix}messages AS m
@@ -337,14 +335,14 @@ class RepairBoards implements ActionInterface
 					AND m.id_msg BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				ORDER BY m.id_msg',
 			// Last step-make sure all non-guest posters still exist.
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_msg',
 				'process' => 'fixMissingPosters',
-			),
-			'messages' => array('repair_missing_posters', 'id_msg', 'id_member'),
-		),
+			],
+			'messages' => ['repair_missing_posters', 'id_msg', 'id_member'],
+		],
 		// Find boards with nonexistent parents.
-		'missing_parents' => array(
+		'missing_parents' => [
 			'check_query' => '
 				SELECT b.id_board, b.id_parent
 				FROM {db_prefix}boards AS b
@@ -352,19 +350,19 @@ class RepairBoards implements ActionInterface
 				WHERE b.id_parent != 0
 					AND (p.id_board IS NULL OR p.id_board = b.id_board)
 				ORDER BY b.id_parent, b.id_board',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_parent',
 				'process' => 'fixMissingParents',
-			),
-			'messages' => array('repair_missing_parents', 'id_board', 'id_parent'),
-		),
-		'missing_polls' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_parents', 'id_board', 'id_parent'],
+		],
+		'missing_polls' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_poll)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT t.id_poll, t.id_topic
 				FROM {db_prefix}topics AS t
@@ -372,19 +370,19 @@ class RepairBoards implements ActionInterface
 				WHERE t.id_poll != 0
 					AND t.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND p.id_poll IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_poll',
 				'process' => 'fixMissingPolls',
-			),
-			'messages' => array('repair_missing_polls', 'id_topic', 'id_poll'),
-		),
-		'missing_calendar_topics' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_polls', 'id_topic', 'id_poll'],
+		],
+		'missing_calendar_topics' => [
+			'substeps' => [
 				'step_size' => 1000,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}calendar'
-			),
+					FROM {db_prefix}calendar',
+			],
 			'check_query' => '
 				SELECT cal.id_topic, cal.id_event
 				FROM {db_prefix}calendar AS cal
@@ -393,38 +391,38 @@ class RepairBoards implements ActionInterface
 					AND cal.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_topic IS NULL
 				ORDER BY cal.id_topic',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_topic',
 				'process' => 'fixMissingCaledarTopics',
-			),
-			'messages' => array('repair_missing_calendar_topics', 'id_event', 'id_topic'),
-		),
-		'missing_log_topics' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_calendar_topics', 'id_event', 'id_topic'],
+		],
+		'missing_log_topics' => [
+			'substeps' => [
 				'step_size' => 150,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_topics'
-			),
+					FROM {db_prefix}log_topics',
+			],
 			'check_query' => '
 				SELECT lt.id_topic
 				FROM {db_prefix}log_topics AS lt
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = lt.id_topic)
 				WHERE t.id_topic IS NULL
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_topic',
 				'process' => 'fixMissingLogTopics',
-			),
-			'messages' => array('repair_missing_log_topics', 'id_topic'),
-		),
-		'missing_log_topics_members' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_topics', 'id_topic'],
+		],
+		'missing_log_topics_members' => [
+			'substeps' => [
 				'step_size' => 150,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_topics'
-			),
+					FROM {db_prefix}log_topics',
+			],
 			'check_query' => '
 				SELECT lt.id_member
 				FROM {db_prefix}log_topics AS lt
@@ -432,19 +430,19 @@ class RepairBoards implements ActionInterface
 				WHERE mem.id_member IS NULL
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY lt.id_member',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixMissingLogTopicsMembers',
-			),
-			'messages' => array('repair_missing_log_topics_members', 'id_member'),
-		),
-		'missing_log_boards' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_topics_members', 'id_member'],
+		],
+		'missing_log_boards' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_boards'
-			),
+					FROM {db_prefix}log_boards',
+			],
 			'check_query' => '
 				SELECT lb.id_board
 				FROM {db_prefix}log_boards AS lb
@@ -452,19 +450,19 @@ class RepairBoards implements ActionInterface
 				WHERE b.id_board IS NULL
 					AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY lb.id_board',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_board',
 				'process' => 'fixMissingLogBoards',
-			),
-			'messages' => array('repair_missing_log_boards', 'id_board'),
-		),
-		'missing_log_boards_members' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_boards', 'id_board'],
+		],
+		'missing_log_boards_members' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_boards'
-			),
+					FROM {db_prefix}log_boards',
+			],
 			'check_query' => '
 				SELECT lb.id_member
 				FROM {db_prefix}log_boards AS lb
@@ -472,19 +470,19 @@ class RepairBoards implements ActionInterface
 				WHERE mem.id_member IS NULL
 					AND lb.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY lb.id_member',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixMissingLogBoardsMembers',
-			),
-			'messages' => array('repair_missing_log_boards_members', 'id_member'),
-		),
-		'missing_log_mark_read' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_boards_members', 'id_member'],
+		],
+		'missing_log_mark_read' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_mark_read'
-			),
+					FROM {db_prefix}log_mark_read',
+			],
 			'check_query' => '
 				SELECT lmr.id_board
 				FROM {db_prefix}log_mark_read AS lmr
@@ -492,19 +490,19 @@ class RepairBoards implements ActionInterface
 				WHERE b.id_board IS NULL
 					AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY lmr.id_board',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_board',
 				'process' => 'fixMissingLogMarkRead',
-			),
-			'messages' => array('repair_missing_log_mark_read', 'id_board'),
-		),
-		'missing_log_mark_read_members' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_mark_read', 'id_board'],
+		],
+		'missing_log_mark_read_members' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_mark_read'
-			),
+					FROM {db_prefix}log_mark_read',
+			],
 			'check_query' => '
 				SELECT lmr.id_member
 				FROM {db_prefix}log_mark_read AS lmr
@@ -512,19 +510,19 @@ class RepairBoards implements ActionInterface
 				WHERE mem.id_member IS NULL
 					AND lmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY lmr.id_member',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixMissingLogMarkReadMembers',
-			),
-			'messages' => array('repair_missing_log_mark_read_members', 'id_member'),
-		),
-		'missing_pms' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_mark_read_members', 'id_member'],
+		],
+		'missing_pms' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_pm)
-					FROM {db_prefix}pm_recipients'
-			),
+					FROM {db_prefix}pm_recipients',
+			],
 			'check_query' => '
 				SELECT pmr.id_pm
 				FROM {db_prefix}pm_recipients AS pmr
@@ -532,19 +530,19 @@ class RepairBoards implements ActionInterface
 				WHERE pm.id_pm IS NULL
 					AND pmr.id_pm BETWEEN {STEP_LOW} AND {STEP_HIGH}
 				GROUP BY pmr.id_pm',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_pm',
 				'process' => 'fixMissingPMs',
-			),
-			'messages' => array('repair_missing_pms', 'id_pm'),
-		),
-		'missing_recipients' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_pms', 'id_pm'],
+		],
+		'missing_recipients' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}pm_recipients'
-			),
+					FROM {db_prefix}pm_recipients',
+			],
 			'check_query' => '
 				SELECT pmr.id_member
 				FROM {db_prefix}pm_recipients AS pmr
@@ -553,19 +551,19 @@ class RepairBoards implements ActionInterface
 					AND pmr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND mem.id_member IS NULL
 				GROUP BY pmr.id_member',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixMissingRecipients',
-			),
-			'messages' => array('repair_missing_recipients', 'id_member'),
-		),
-		'missing_senders' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_recipients', 'id_member'],
+		],
+		'missing_senders' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_pm)
-					FROM {db_prefix}personal_messages'
-			),
+					FROM {db_prefix}personal_messages',
+			],
 			'check_query' => '
 				SELECT pm.id_pm, pm.id_member_from
 				FROM {db_prefix}personal_messages AS pm
@@ -573,19 +571,19 @@ class RepairBoards implements ActionInterface
 				WHERE pm.id_member_from != 0
 					AND pm.id_pm BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND mem.id_member IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_pm',
 				'process' => 'fixMissingSenders',
-			),
-			'messages' => array('repair_missing_senders', 'id_pm', 'id_member_from'),
-		),
-		'missing_notify_members' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_senders', 'id_pm', 'id_member_from'],
+		],
+		'missing_notify_members' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_notify'
-			),
+					FROM {db_prefix}log_notify',
+			],
 			'check_query' => '
 				SELECT ln.id_member
 				FROM {db_prefix}log_notify AS ln
@@ -593,19 +591,19 @@ class RepairBoards implements ActionInterface
 				WHERE ln.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND mem.id_member IS NULL
 				GROUP BY ln.id_member',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixMissingNotifyMembers',
-			),
-			'messages' => array('repair_missing_notify_members', 'id_member'),
-		),
-		'missing_cached_subject' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_notify_members', 'id_member'],
+		],
+		'missing_cached_subject' => [
+			'substeps' => [
 				'step_size' => 100,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}topics'
-			),
+					FROM {db_prefix}topics',
+			],
 			'check_query' => '
 				SELECT t.id_topic, fm.subject
 				FROM {db_prefix}topics AS t
@@ -615,33 +613,33 @@ class RepairBoards implements ActionInterface
 					AND lss.id_topic IS NULL',
 			'fix_full_processing' => 'fixMissingCachedSubject',
 			'message_function' => 'missingCachedSubjectMessage',
-		),
-		'missing_topic_for_cache' => array(
-			'substeps' => array(
+		],
+		'missing_topic_for_cache' => [
+			'substeps' => [
 				'step_size' => 50,
 				'step_max' => '
 					SELECT MAX(id_topic)
-					FROM {db_prefix}log_search_subjects'
-			),
+					FROM {db_prefix}log_search_subjects',
+			],
 			'check_query' => '
 				SELECT lss.id_topic, lss.word
 				FROM {db_prefix}log_search_subjects AS lss
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = lss.id_topic)
 				WHERE lss.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND t.id_topic IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_topic',
 				'process' => 'fixMissingTopicForCache',
-			),
-			'messages' => array('repair_missing_topic_for_cache', 'word'),
-		),
-		'missing_member_vote' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_topic_for_cache', 'word'],
+		],
+		'missing_member_vote' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_polls'
-			),
+					FROM {db_prefix}log_polls',
+			],
 			'check_query' => '
 				SELECT lp.id_poll, lp.id_member
 				FROM {db_prefix}log_polls AS lp
@@ -649,76 +647,76 @@ class RepairBoards implements ActionInterface
 				WHERE lp.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lp.id_member > 0
 					AND mem.id_member IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixMissingMemberVote',
-			),
-			'messages' => array('repair_missing_log_poll_member', 'id_poll', 'id_member'),
-		),
-		'missing_log_poll_vote' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_poll_member', 'id_poll', 'id_member'],
+		],
+		'missing_log_poll_vote' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_poll)
-					FROM {db_prefix}log_polls'
-			),
+					FROM {db_prefix}log_polls',
+			],
 			'check_query' => '
 				SELECT lp.id_poll, lp.id_member
 				FROM {db_prefix}log_polls AS lp
 					LEFT JOIN {db_prefix}polls AS p ON (p.id_poll = lp.id_poll)
 				WHERE lp.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND p.id_poll IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_poll',
 				'process' => 'fixMissingLogPollVote',
-			),
-			'messages' => array('repair_missing_log_poll_vote', 'id_member', 'id_poll'),
-		),
-		'report_missing_comments' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_missing_log_poll_vote', 'id_member', 'id_poll'],
+		],
+		'report_missing_comments' => [
+			'substeps' => [
 				'step_size' => 500,
 				'step_max' => '
 					SELECT MAX(id_report)
-					FROM {db_prefix}log_reported'
-			),
+					FROM {db_prefix}log_reported',
+			],
 			'check_query' => '
 				SELECT lr.id_report, lr.subject
 				FROM {db_prefix}log_reported AS lr
 					LEFT JOIN {db_prefix}log_reported_comments AS lrc ON (lrc.id_report = lr.id_report)
 				WHERE lr.id_report BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lrc.id_report IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_report',
 				'process' => 'fixReportMissingComments',
-			),
-			'messages' => array('repair_report_missing_comments', 'id_report', 'subject'),
-		),
-		'comments_missing_report' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_report_missing_comments', 'id_report', 'subject'],
+		],
+		'comments_missing_report' => [
+			'substeps' => [
 				'step_size' => 200,
 				'step_max' => '
 					SELECT MAX(id_report)
-					FROM {db_prefix}log_reported_comments'
-			),
+					FROM {db_prefix}log_reported_comments',
+			],
 			'check_query' => '
 				SELECT lrc.id_report, lrc.membername
 				FROM {db_prefix}log_reported_comments AS lrc
 					LEFT JOIN {db_prefix}log_reported AS lr ON (lr.id_report = lrc.id_report)
 				WHERE lrc.id_report BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND lr.id_report IS NULL',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_report',
 				'process' => 'fixCommentMissingReport',
-			),
-			'messages' => array('repair_comments_missing_report', 'id_report', 'membername'),
-		),
-		'group_request_missing_member' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_comments_missing_report', 'id_report', 'membername'],
+		],
+		'group_request_missing_member' => [
+			'substeps' => [
 				'step_size' => 200,
 				'step_max' => '
 					SELECT MAX(id_member)
-					FROM {db_prefix}log_group_requests'
-			),
+					FROM {db_prefix}log_group_requests',
+			],
 			'check_query' => '
 				SELECT lgr.id_member
 				FROM {db_prefix}log_group_requests AS lgr
@@ -726,19 +724,19 @@ class RepairBoards implements ActionInterface
 				WHERE lgr.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND mem.id_member IS NULL
 				GROUP BY lgr.id_member',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_member',
 				'process' => 'fixGroupRequestMissingMember',
-			),
-			'messages' => array('repair_group_request_missing_member', 'id_member'),
-		),
-		'group_request_missing_group' => array(
-			'substeps' => array(
+			],
+			'messages' => ['repair_group_request_missing_member', 'id_member'],
+		],
+		'group_request_missing_group' => [
+			'substeps' => [
 				'step_size' => 200,
 				'step_max' => '
 					SELECT MAX(id_group)
-					FROM {db_prefix}log_group_requests'
-			),
+					FROM {db_prefix}log_group_requests',
+			],
 			'check_query' => '
 				SELECT lgr.id_group
 				FROM {db_prefix}log_group_requests AS lgr
@@ -746,13 +744,13 @@ class RepairBoards implements ActionInterface
 				WHERE lgr.id_group BETWEEN {STEP_LOW} AND {STEP_HIGH}
 					AND mg.id_group IS NULL
 				GROUP BY lgr.id_group',
-			'fix_collect' => array(
+			'fix_collect' => [
 				'index' => 'id_group',
 				'process' => 'fixGroupRequestMissingGroup',
-			),
-			'messages' => array('repair_group_request_missing_group', 'id_group'),
-		),
-	);
+			],
+			'messages' => ['repair_group_request_missing_group', 'id_group'],
+		],
+	];
 
 	/**
 	 * @var int
@@ -809,56 +807,53 @@ public function execute(): void
 		Config::setMemoryLimit('128M');
 
 		// Start displaying errors without fixing them.
-		if (isset($_GET['fixErrors']))
+		if (isset($_GET['fixErrors'])) {
 			User::$me->checkSession('get');
+		}
 
 		// Giant if/else. The first displays the forum errors if a variable is not set and asks
 		// if you would like to continue, the other fixes the errors.
-		if (!isset($_GET['fixErrors']))
-		{
+		if (!isset($_GET['fixErrors'])) {
 			Utils::$context['error_search'] = true;
-			Utils::$context['repair_errors'] = array();
+			Utils::$context['repair_errors'] = [];
 
 			Utils::$context['to_fix'] = $this->findForumErrors();
 
-			if (!empty(Utils::$context['to_fix']))
-			{
+			if (!empty(Utils::$context['to_fix'])) {
 				$_SESSION['repairboards_to_fix'] = Utils::$context['to_fix'];
 				$_SESSION['repairboards_to_fix2'] = null;
 
-				if (empty(Utils::$context['repair_errors']))
+				if (empty(Utils::$context['repair_errors'])) {
 					Utils::$context['repair_errors'][] = '???';
+				}
 			}
 
 			// Need a token here.
 			SecurityToken::create('admin-repairboards', 'request');
-		}
-		else
-		{
+		} else {
 			// Validate the token, create a new one and tell the not done template.
 			SecurityToken::validate('admin-repairboards', 'request');
 			SecurityToken::create('admin-repairboards', 'request');
 			Utils::$context['not_done_token'] = 'admin-repairboards';
 
 			Utils::$context['error_search'] = false;
-			Utils::$context['to_fix'] = isset($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : array();
+			Utils::$context['to_fix'] = $_SESSION['repairboards_to_fix'] ?? [];
 
 			// Actually do the fix.
 			$this->findForumErrors(true);
 
 			// Note that we've changed everything possible ;)
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'settings_updated' => time(),
-			));
+			]);
 			Logging::updateStats('message');
 			Logging::updateStats('topic');
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'calendar_updated' => time(),
-			));
+			]);
 
 			// If we created a salvage area, we may need to recount stats properly.
-			if (!empty($this->salvage_board) || !empty($_SESSION['salvageBoardID']))
-			{
+			if (!empty($this->salvage_board) || !empty($_SESSION['salvageBoardID'])) {
 				unset($_SESSION['salvageBoardID']);
 				Utils::$context['redirect_to_recount'] = true;
 				SecurityToken::create('admin-maint');
@@ -883,8 +878,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -915,12 +911,12 @@ protected function __construct()
 		Lang::load('ManageMaintenance');
 
 		// Make sure the tabs stay nice.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['maintain_title'],
 			'help' => '',
 			'description' => Lang::$txt['maintain_info'],
-			'tabs' => array(),
-		);
+			'tabs' => [],
+		];
 	}
 
 	/**
@@ -937,49 +933,50 @@ protected function findForumErrors(bool $do_fix = false): array
 		// This may take some time...
 		@set_time_limit(600);
 
-		$to_fix = !empty($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : array();
+		$to_fix = !empty($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : [];
 
-		Utils::$context['repair_errors'] = isset($_SESSION['repairboards_to_fix2']) ? $_SESSION['repairboards_to_fix2'] : array();
+		Utils::$context['repair_errors'] = $_SESSION['repairboards_to_fix2'] ?? [];
 
 		$_GET['step'] = empty($_GET['step']) ? 0 : (int) $_GET['step'];
 		$_GET['substep'] = empty($_GET['substep']) ? 0 : (int) $_GET['substep'];
 
 		// Do mods want to add anything here to allow repairing their data?
-		IntegrationHook::call('integrate_repair_boards', array(&$this->errorTests));
+		IntegrationHook::call('integrate_repair_boards', [&$this->errorTests]);
 
 		// Don't allow the cache to get too full.
 		Utils::$context['db_cache'] = Db::$cache;
-		Db::$cache = array();
+		Db::$cache = [];
 
 		Utils::$context['total_steps'] = count($this->errorTests);
 
 		// For all the defined error types do the necessary tests.
 		$current_step = -1;
 		$total_queries = 0;
-		foreach ($this->errorTests as $error_type => $test)
-		{
+
+		foreach ($this->errorTests as $error_type => $test) {
 			$current_step++;
 
 			// Already done this?
-			if ($_GET['step'] > $current_step)
+			if ($_GET['step'] > $current_step) {
 				continue;
+			}
 
 			// If we're fixing it but it ain't broke why try?
-			if ($do_fix && !in_array($error_type, $to_fix))
-			{
+			if ($do_fix && !in_array($error_type, $to_fix)) {
 				$_GET['step']++;
+
 				continue;
 			}
 
 			// Has it got substeps?
-			if (isset($test['substeps']))
-			{
+			if (isset($test['substeps'])) {
 				$step_size = $test['substeps']['step_size'] ?? 100;
 
-				$request = Db::$db->query('',
+				$request = Db::$db->query(
+					'',
 					$test['substeps']['step_max'],
-					array(
-					)
+					[
+					],
 				);
 				list($step_max) = Db::$db->fetch_row($request);
 				$total_queries++;
@@ -988,60 +985,51 @@ protected function findForumErrors(bool $do_fix = false): array
 
 			// We in theory keep doing this... the substeps.
 			$done = false;
-			while (!$done)
-			{
+
+			while (!$done) {
 				// Make sure there's at least one ID to test.
-				if (isset($test['substeps']) && empty($step_max))
+				if (isset($test['substeps']) && empty($step_max)) {
 					break;
+				}
 
 				// What is the testing query (Changes if we are testing or fixing)
 				$test_query = $do_fix && isset($test['fix_query']) ? 'fix_query' : 'check_query';
 
 				// Do the test...
-				$request = Db::$db->query('',
-					isset($test['substeps']) ? strtr($test[$test_query], array('{STEP_LOW}' => $_GET['substep'], '{STEP_HIGH}' => $_GET['substep'] + $step_size - 1)) : $test[$test_query],
-					array(
-					)
+				$request = Db::$db->query(
+					'',
+					isset($test['substeps']) ? strtr($test[$test_query], ['{STEP_LOW}' => $_GET['substep'], '{STEP_HIGH}' => $_GET['substep'] + $step_size - 1]) : $test[$test_query],
+					[
+					],
 				);
+
 				// Does it need a fix?
-				if (!empty($test['check_type']) && $test['check_type'] == 'count')
-				{
+				if (!empty($test['check_type']) && $test['check_type'] == 'count') {
 					list($needs_fix) = Db::$db->fetch_row($request);
-				}
-				else
-				{
+				} else {
 					$needs_fix = Db::$db->num_rows($request);
 				}
 
 				$total_queries++;
 
-				if ($needs_fix)
-				{
+				if ($needs_fix) {
 					// What about a message to the user?
-					if (!$do_fix)
-					{
+					if (!$do_fix) {
 						// Assume need to fix.
 						$found_errors = true;
 
-						if (isset($test['message']))
-						{
+						if (isset($test['message'])) {
 							Utils::$context['repair_errors'][] = Lang::$txt[$test['message']];
 						}
 						// One per row!
-						elseif (isset($test['messages']))
-						{
-							while ($row = Db::$db->fetch_assoc($request))
-							{
+						elseif (isset($test['messages'])) {
+							while ($row = Db::$db->fetch_assoc($request)) {
 								$variables = $test['messages'];
 
-								foreach ($variables as $k => $v)
-								{
-									if ($k == 0 && isset(Lang::$txt[$v]))
-									{
+								foreach ($variables as $k => $v) {
+									if ($k == 0 && isset(Lang::$txt[$v])) {
 										$variables[$k] = Lang::$txt[$v];
-									}
-									elseif ($k > 0 && isset($row[$v]))
-									{
+									} elseif ($k > 0 && isset($row[$v])) {
 										$variables[$k] = $row[$v];
 									}
 								}
@@ -1050,72 +1038,69 @@ protected function findForumErrors(bool $do_fix = false): array
 							}
 						}
 						// A function to process?
-						elseif (isset($test['message_function']))
-						{
+						elseif (isset($test['message_function'])) {
 							// Find out if there are actually errors.
 							$found_errors = false;
 
-							$func = method_exists($this, $test['message_function']) ? array($this, $test['message_function']) : Utils::getCallable($test['message_function']);
+							$func = method_exists($this, $test['message_function']) ? [$this, $test['message_function']] : Utils::getCallable($test['message_function']);
 
-							while ($row = Db::$db->fetch_assoc($request))
+							while ($row = Db::$db->fetch_assoc($request)) {
 								$found_errors |= call_user_func($func, $row);
+							}
 						}
 
 						// Actually have something to fix?
-						if ($found_errors)
+						if ($found_errors) {
 							$to_fix[] = $error_type;
+						}
 					}
 					// We want to fix, we need to fix - so work out what exactly to do!
-					else
-					{
+					else {
 						// Are we simply getting a collection of ids?
-						if (isset($test['fix_collect']))
-						{
-							$ids = array();
+						if (isset($test['fix_collect'])) {
+							$ids = [];
 
-							while ($row = Db::$db->fetch_assoc($request))
+							while ($row = Db::$db->fetch_assoc($request)) {
 								$ids[] = $row[$test['fix_collect']['index']];
+							}
 
-							if (!empty($ids))
-							{
-								$func = method_exists($this, $test['fix_collect']['process']) ? array($this, $test['fix_collect']['process']) : Utils::getCallable($test['fix_collect']['process']);
+							if (!empty($ids)) {
+								$func = method_exists($this, $test['fix_collect']['process']) ? [$this, $test['fix_collect']['process']] : Utils::getCallable($test['fix_collect']['process']);
 
 								// Fix it!
 								call_user_func($func, $ids);
 							}
 						}
 						// Simply executing a fix it query?
-						elseif (isset($test['fix_it_query']))
-						{
-							Db::$db->query('',
+						elseif (isset($test['fix_it_query'])) {
+							Db::$db->query(
+								'',
 								$test['fix_it_query'],
-								array(
-								)
+								[
+								],
 							);
 						}
 						// Do we have some processing to do?
-						elseif (isset($test['fix_processing']))
-						{
-							$func = method_exists($this, $test['fix_processing']) ? array($this, $test['fix_processing']) : Utils::getCallable($test['fix_processing']);
+						elseif (isset($test['fix_processing'])) {
+							$func = method_exists($this, $test['fix_processing']) ? [$this, $test['fix_processing']] : Utils::getCallable($test['fix_processing']);
 
-							while ($row = Db::$db->fetch_assoc($request))
+							while ($row = Db::$db->fetch_assoc($request)) {
 								call_user_func($func, $row);
+							}
 						}
 						// What about the full set of processing?
-						elseif (isset($test['fix_full_processing']))
-						{
-							$func = method_exists($this, $test['fix_full_processing']) ? array($this, $test['fix_full_processing']) : Utils::getCallable($test['fix_full_processing']);
+						elseif (isset($test['fix_full_processing'])) {
+							$func = method_exists($this, $test['fix_full_processing']) ? [$this, $test['fix_full_processing']] : Utils::getCallable($test['fix_full_processing']);
 
 							call_user_func($func, $request);
 						}
 
 						// Do we have other things we need to fix as a result?
-						if (!empty($test['force_fix']))
-						{
-							foreach ($test['force_fix'] as $item)
-							{
-								if (!in_array($item, $to_fix))
+						if (!empty($test['force_fix'])) {
+							foreach ($test['force_fix'] as $item) {
+								if (!in_array($item, $to_fix)) {
 									$to_fix[] = $item;
+								}
 							}
 						}
 					}
@@ -1124,31 +1109,26 @@ protected function findForumErrors(bool $do_fix = false): array
 				Db::$db->free_result($request);
 
 				// Keep memory down.
-				Db::$cache = array();
+				Db::$cache = [];
 
 				// Are we done yet?
-				if (isset($test['substeps']))
-				{
+				if (isset($test['substeps'])) {
 					$_GET['substep'] += $step_size;
 
 					// Not done?
-					if ($_GET['substep'] <= $step_max)
-					{
+					if ($_GET['substep'] <= $step_max) {
 						$this->pauseRepairProcess($to_fix, $error_type, $step_max);
-					}
-					else
-					{
+					} else {
 						$done = true;
 					}
-				}
-				else
-				{
+				} else {
 					$done = true;
 				}
 
 				// Don't allow more than 1000 queries at a time.
-				if ($total_queries >= 1000)
+				if ($total_queries >= 1000) {
 					$this->pauseRepairProcess($to_fix, $error_type, $step_max, true);
+				}
 			}
 
 			// Keep going.
@@ -1158,12 +1138,12 @@ protected function findForumErrors(bool $do_fix = false): array
 			$to_fix = array_unique($to_fix);
 
 			// If we're doing fixes and this needed a fix and we're all done then don't do it again.
-			if ($do_fix)
-			{
+			if ($do_fix) {
 				$key = array_search($error_type, $to_fix);
 
-				if ($key !== false && isset($to_fix[$key]))
+				if ($key !== false && isset($to_fix[$key])) {
 					unset($to_fix[$key]);
+				}
 			}
 
 			// Are we done?
@@ -1193,43 +1173,40 @@ protected function pauseRepairProcess($to_fix, $current_step_description, $max_s
 		// More time, I need more time!
 		@set_time_limit(600);
 
-		if (function_exists('apache_reset_timeout'))
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		$return = true;
 
 		// If we are from a SSI/cron job, we can allow this through, if enabled.
-		if ((SMF === 'SSI' || SMF === 'BACKGROUND') && php_sapi_name() == 'cli' && !empty(Utils::$context['no_pause_process']))
-		{
+		if ((SMF === 'SSI' || SMF === 'BACKGROUND') && php_sapi_name() == 'cli' && !empty(Utils::$context['no_pause_process'])) {
 			$return = true;
-		}
-		elseif ($force)
-		{
+		} elseif ($force) {
 			$return = false;
 		}
 		// Try to stay under our memory limit.
-		elseif ((memory_get_usage() + 65536) > Config::memoryReturnBytes(ini_get('memory_limit')))
-		{
+		elseif ((memory_get_usage() + 65536) > Config::memoryReturnBytes(ini_get('memory_limit'))) {
 			$return = false;
 		}
 		// Errr, wait.  How much time has this taken already?
-		elseif ((time() - TIME_START) > 3)
-		{
+		elseif ((time() - TIME_START) > 3) {
 			$return = false;
 		}
 		// If we have a lot of errors, lets do smaller batches, to save on memory needs.
-		elseif (count(Utils::$context['repair_errors']) > 100000 && $this->loops > 50)
-		{
+		elseif (count(Utils::$context['repair_errors']) > 100000 && $this->loops > 50) {
 			$return = false;
 		}
 
 		// If we can return, lets do so.
-		if ($return)
+		if ($return) {
 			return;
+		}
 
 		// Restore the query cache if interested.
-		if (!empty(Utils::$context['db_cache']))
+		if (!empty(Utils::$context['db_cache'])) {
 			Db::$cache = Utils::$context['db_cache'];
+		}
 
 		Utils::$context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 		Utils::$context['page_title'] = Lang::$txt['not_done_title'];
@@ -1238,12 +1215,9 @@ protected function pauseRepairProcess($to_fix, $current_step_description, $max_s
 		Utils::$context['sub_template'] = 'not_done';
 
 		// Change these two if more steps are added!
-		if (empty($max_substep))
-		{
+		if (empty($max_substep)) {
 			Utils::$context['continue_percent'] = round(($_GET['step'] * 100) / Utils::$context['total_steps']);
-		}
-		else
-		{
+		} else {
 			Utils::$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / Utils::$context['total_steps']);
 		}
 
@@ -1252,7 +1226,7 @@ protected function pauseRepairProcess($to_fix, $current_step_description, $max_s
 
 		// What about substeps?
 		Utils::$context['substep_enabled'] = $max_substep != 0;
-		Utils::$context['substep_title'] = sprintf(Lang::$txt['repair_currently_' . (isset($_GET['fixErrors']) ? 'fixing' : 'checking')], (isset(Lang::$txt['repair_operation_' . $current_step_description]) ? Lang::$txt['repair_operation_' . $current_step_description] : $current_step_description));
+		Utils::$context['substep_title'] = sprintf(Lang::$txt['repair_currently_' . (isset($_GET['fixErrors']) ? 'fixing' : 'checking')], (Lang::$txt['repair_operation_' . $current_step_description] ?? $current_step_description));
 		Utils::$context['substep_continue_percent'] = $max_substep == 0 ? 0 : round(($_GET['substep'] * 100) / $max_substep, 1);
 
 		$_SESSION['repairboards_to_fix'] = $to_fix;
@@ -1268,8 +1242,9 @@ protected function pauseRepairProcess($to_fix, $current_step_description, $max_s
 	protected function createSalvageArea(): void
 	{
 		// Have we already created it?
-		if ($this->salvage_created)
+		if ($this->salvage_created) {
 			return;
+		}
 
 		$this->salvage_created = true;
 
@@ -1277,68 +1252,68 @@ protected function createSalvageArea(): void
 		Lang::load('Admin', Lang::$default);
 
 		// Check to see if a 'Salvage Category' exists, if not => insert one.
-		$result = Db::$db->query('', '
-			SELECT id_cat
+		$result = Db::$db->query(
+			'',
+			'SELECT id_cat
 			FROM {db_prefix}categories
 			WHERE name = {string:cat_name}
 			LIMIT 1',
-			array(
+			[
 				'cat_name' => Lang::$txt['salvaged_category_name'],
-			)
+			],
 		);
-		if (Db::$db->num_rows($result) != 0)
-		{
+
+		if (Db::$db->num_rows($result) != 0) {
 			list($this->salvage_category) = Db::$db->fetch_row($result);
 		}
 		Db::$db->free_result($result);
 
-		if (empty($this->salvage_category))
-		{
-			$this->salvage_category = Db::$db->insert('',
+		if (empty($this->salvage_category)) {
+			$this->salvage_category = Db::$db->insert(
+				'',
 				'{db_prefix}categories',
-				array('name' => 'string-255', 'cat_order' => 'int', 'description' => 'string-255'),
-				array(Lang::$txt['salvaged_category_name'], -1, Lang::$txt['salvaged_category_description']),
-				array('id_cat'),
-				1
+				['name' => 'string-255', 'cat_order' => 'int', 'description' => 'string-255'],
+				[Lang::$txt['salvaged_category_name'], -1, Lang::$txt['salvaged_category_description']],
+				['id_cat'],
+				1,
 			);
 
-			if (Db::$db->affected_rows() <= 0)
-			{
+			if (Db::$db->affected_rows() <= 0) {
 				Lang::load('Admin');
 				ErrorHandler::fatalLang('salvaged_category_error', false);
 			}
 		}
 
 		// Check to see if a 'Salvage Board' exists. If not, insert one.
-		$result = Db::$db->query('', '
-			SELECT id_board
+		$result = Db::$db->query(
+			'',
+			'SELECT id_board
 			FROM {db_prefix}boards
 			WHERE id_cat = {int:id_cat}
 				AND name = {string:board_name}
 			LIMIT 1',
-			array(
+			[
 				'id_cat' => $this->salvage_category,
 				'board_name' => Lang::$txt['salvaged_board_name'],
-			)
+			],
 		);
-		if (Db::$db->num_rows($result) != 0)
-		{
+
+		if (Db::$db->num_rows($result) != 0) {
 			list($this->salvage_board) = Db::$db->fetch_row($result);
 		}
 		Db::$db->free_result($result);
 
-		if (empty($this->salvage_board))
-		{
-			$this->salvage_board = Db::$db->insert('',
+		if (empty($this->salvage_board)) {
+			$this->salvage_board = Db::$db->insert(
+				'',
 				'{db_prefix}boards',
-				array('name' => 'string-255', 'description' => 'string-255', 'id_cat' => 'int', 'member_groups' => 'string', 'board_order' => 'int', 'redirect' => 'string'),
-				array(Lang::$txt['salvaged_board_name'], Lang::$txt['salvaged_board_description'], $this->salvage_category, '1', -1, ''),
-				array('id_board'),
-				1
+				['name' => 'string-255', 'description' => 'string-255', 'id_cat' => 'int', 'member_groups' => 'string', 'board_order' => 'int', 'redirect' => 'string'],
+				[Lang::$txt['salvaged_board_name'], Lang::$txt['salvaged_board_description'], $this->salvage_category, '1', -1, ''],
+				['id_board'],
+				1,
 			);
 
-			if (Db::$db->affected_rows() <= 0)
-			{
+			if (Db::$db->affected_rows() <= 0) {
 				Lang::load('Admin');
 				ErrorHandler::fatalLang('salvaged_board_error', false);
 			}
@@ -1354,87 +1329,91 @@ protected function createSalvageArea(): void
 	protected function fixMissingTopics($row): void
 	{
 		// Only if we don't have a reasonable idea of where to put it.
-		if ($row['id_board'] == 0)
-		{
+		if ($row['id_board'] == 0) {
 			$this->createSalvageArea();
 			$row['id_board'] = $_SESSION['salvageBoardID'] = $this->salvage_board;
 		}
 
 		// Make sure that no topics claim the first/last message as theirs.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_first_msg = 0
 			WHERE id_first_msg = {int:id_first_msg}',
-			array(
+			[
 				'id_first_msg' => $row['myid_first_msg'],
-			)
+			],
 		);
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_last_msg = 0
 			WHERE id_last_msg = {int:id_last_msg}',
-			array(
+			[
 				'id_last_msg' => $row['myid_last_msg'],
-			)
+			],
 		);
 
 		$memberStartedID = (int) Board::getMsgMemberID($row['myid_first_msg']);
 		$memberUpdatedID = (int) Board::getMsgMemberID($row['myid_last_msg']);
 
-		$newTopicID = Db::$db->insert('',
+		$newTopicID = Db::$db->insert(
+			'',
 			'{db_prefix}topics',
-			array(
+			[
 				'id_board' => 'int',
 				'id_member_started' => 'int',
 				'id_member_updated' => 'int',
 				'id_first_msg' => 'int',
 				'id_last_msg' => 'int',
-				'num_replies' => 'int'
-			),
-			array(
+				'num_replies' => 'int',
+			],
+			[
 				$row['id_board'],
 				$memberStartedID,
 				$memberUpdatedID,
 				$row['myid_first_msg'],
 				$row['myid_last_msg'],
-				$row['my_num_replies']
-			),
-			array('id_topic'),
-			1
+				$row['my_num_replies'],
+			],
+			['id_topic'],
+			1,
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_topic = {int:newTopicID}, id_board = {int:board_id}
 			WHERE id_topic = {int:topic_id}',
-			array(
+			[
 				'board_id' => $row['id_board'],
 				'topic_id' => $row['id_topic'],
 				'newTopicID' => $newTopicID,
-			)
+			],
 		);
 	}
 
-
 	/**
 	 * Callback to remove all topics that have zero messages in the messages table.
 	 */
 	protected function fixMissingMessages($topics): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
 	}
 
@@ -1446,18 +1425,17 @@ protected function fixMissingPollOptions($row): void
 		$row['poster_name'] = !empty($row['poster_name']) ? $row['poster_name'] : Lang::$txt['guest'];
 		$row['id_poster'] = !empty($row['id_poster']) ? $row['id_poster'] : 0;
 
-		if (empty($row['id_board']))
-		{
+		if (empty($row['id_board'])) {
 			// Only if we don't have a reasonable idea of where to put it.
 			$this->createSalvageArea();
 			$row['id_board'] = $_SESSION['salvageBoardID'] = $this->salvage_board;
 		}
 
-		if (empty($row['id_topic']))
-		{
-			$newMessageID = Db::$db->insert('',
+		if (empty($row['id_topic'])) {
+			$newMessageID = Db::$db->insert(
+				'',
 				'{db_prefix}messages',
-				array(
+				[
 					'id_board' => 'int',
 					'id_topic' => 'int',
 					'poster_time' => 'int',
@@ -1470,8 +1448,8 @@ protected function fixMissingPollOptions($row): void
 					'body' => 'string-65534',
 					'icon' => 'string-16',
 					'approved' => 'int',
-				),
-				array(
+				],
+				[
 					$row['id_board'],
 					0,
 					time(),
@@ -1484,14 +1462,15 @@ protected function fixMissingPollOptions($row): void
 					Lang::$txt['salvaged_poll_message_body'],
 					'xx',
 					1,
-				),
-				array('id_msg'),
-				1
+				],
+				['id_msg'],
+				1,
 			);
 
-			$row['id_topic'] = Db::$db->insert('',
+			$row['id_topic'] = Db::$db->insert(
+				'',
 				'{db_prefix}topics',
-				array(
+				[
 					'id_board' => 'int',
 					'id_poll' => 'int',
 					'id_member_started' => 'int',
@@ -1499,8 +1478,8 @@ protected function fixMissingPollOptions($row): void
 					'id_first_msg' => 'int',
 					'id_last_msg' => 'int',
 					'num_replies' => 'int',
-				),
-				array(
+				],
+				[
 					$row['id_board'],
 					$row['id_poll'],
 					$row['id_poster'],
@@ -1508,28 +1487,30 @@ protected function fixMissingPollOptions($row): void
 					$newMessageID,
 					$newMessageID,
 					0,
-				),
-				array('id_topic'),
-				1
+				],
+				['id_topic'],
+				1,
 			);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET id_topic = {int:newTopicID}, id_board = {int:id_board}
 				WHERE id_msg = {int:newMessageID}',
-				array(
+				[
 					'id_board' => $row['id_board'],
 					'newTopicID' => $row['id_topic'],
 					'newMessageID' => $newMessageID,
-				)
+				],
 			);
 
 			Logging::updateStats('subject', $row['id_topic'], Lang::$txt['salvaged_poll_topic_name']);
 		}
 
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}polls',
-			array(
+			[
 				'id_poll' => 'int',
 				'question' => 'string-255',
 				'voting_locked' => 'int',
@@ -1542,8 +1523,8 @@ protected function fixMissingPollOptions($row): void
 				'reset_poll' => 'int',
 				'id_member' => 'int',
 				'poster_name' => 'string-255',
-			),
-			array(
+			],
+			[
 				$row['id_poll'],
 				Lang::$txt['salvaged_poll_question'],
 				1,
@@ -1556,8 +1537,8 @@ protected function fixMissingPollOptions($row): void
 				0,
 				$row['id_poster'],
 				$row['poster_name'],
-			),
-			array()
+			],
+			[],
 		);
 	}
 
@@ -1567,17 +1548,17 @@ protected function fixMissingPollOptions($row): void
 	protected function fixMissingPollTopics($row): void
 	{
 		// Only if we don't have a reasonable idea of where to put it.
-		if ($row['id_board'] == 0)
-		{
+		if ($row['id_board'] == 0) {
 			$this->createSalvageArea();
 			$row['id_board'] = $_SESSION['salvageBoardID'] = $this->salvage_board;
 		}
 
 		$row['poster_name'] = !empty($row['poster_name']) ? $row['poster_name'] : Lang::$txt['guest'];
 
-		$newMessageID = Db::$db->insert('',
+		$newMessageID = Db::$db->insert(
+			'',
 			'{db_prefix}messages',
-			array(
+			[
 				'id_board' => 'int',
 				'id_topic' => 'int',
 				'poster_time' => 'int',
@@ -1590,8 +1571,8 @@ protected function fixMissingPollTopics($row): void
 				'body' => 'string-65534',
 				'icon' => 'string-16',
 				'approved' => 'int',
-			),
-			array(
+			],
+			[
 				$row['id_board'],
 				0,
 				time(),
@@ -1604,14 +1585,15 @@ protected function fixMissingPollTopics($row): void
 				Lang::$txt['salvaged_poll_message_body'],
 				'xx',
 				1,
-			),
-			array('id_msg'),
-			1
+			],
+			['id_msg'],
+			1,
 		);
 
-		$newTopicID = Db::$db->insert('',
+		$newTopicID = Db::$db->insert(
+			'',
 			'{db_prefix}topics',
-			array(
+			[
 				'id_board' => 'int',
 				'id_poll' => 'int',
 				'id_member_started' => 'int',
@@ -1619,8 +1601,8 @@ protected function fixMissingPollTopics($row): void
 				'id_first_msg' => 'int',
 				'id_last_msg' => 'int',
 				'num_replies' => 'int',
-			),
-			array(
+			],
+			[
 				$row['id_board'],
 				$row['id_poll'],
 				$row['id_member'],
@@ -1628,20 +1610,21 @@ protected function fixMissingPollTopics($row): void
 				$newMessageID,
 				$newMessageID,
 				0,
-			),
-			array('id_topic'),
-			1
+			],
+			['id_topic'],
+			1,
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_topic = {int:newTopicID}, id_board = {int:id_board}
 			WHERE id_msg = {int:newMessageID}',
-			array(
+			[
 				'id_board' => $row['id_board'],
 				'newTopicID' => $newTopicID,
 				'newMessageID' => $newMessageID,
-			)
+			],
 		);
 
 		Logging::updateStats('subject', $newTopicID, Lang::$txt['salvaged_poll_topic_name']);
@@ -1657,28 +1640,28 @@ protected function fixTopicStats($row): bool
 		$row['myid_last_msg'] = (int) $row['myid_last_msg'];
 
 		// Not really a problem?
-		if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-		{
+		if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
 			return false;
 		}
 
 		$memberStartedID = (int) Board::getMsgMemberID($row['myid_first_msg']);
 		$memberUpdatedID = (int) Board::getMsgMemberID($row['myid_last_msg']);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_first_msg = {int:myid_first_msg},
 				id_member_started = {int:memberStartedID}, id_last_msg = {int:myid_last_msg},
 				id_member_updated = {int:memberUpdatedID}, approved = {int:firstmsg_approved}
 			WHERE id_topic = {int:topic_id}',
-			array(
+			[
 				'myid_first_msg' => $row['myid_first_msg'],
 				'memberStartedID' => $memberStartedID,
 				'myid_last_msg' => $row['myid_last_msg'],
 				'memberUpdatedID' => $memberUpdatedID,
 				'firstmsg_approved' => $row['firstmsg_approved'],
 				'topic_id' => $row['id_topic'],
-			)
+			],
 		);
 
 		return true;
@@ -1691,23 +1674,19 @@ protected function fixTopicStats($row): bool
 	protected function topicStatsMessage($row): bool
 	{
 		// A pretend error?
-		if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
-		{
+		if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
 			return false;
 		}
 
-		if ($row['id_first_msg'] != $row['myid_first_msg'])
-		{
+		if ($row['id_first_msg'] != $row['myid_first_msg']) {
 			Utils::$context['repair_errors'][] = sprintf(Lang::$txt['repair_topic_wrong_first_id'], $row['id_topic'], $row['id_first_msg']);
 		}
 
-		if ($row['id_last_msg'] != $row['myid_last_msg'])
-		{
+		if ($row['id_last_msg'] != $row['myid_last_msg']) {
 			Utils::$context['repair_errors'][] = sprintf(Lang::$txt['repair_topic_wrong_last_id'], $row['id_topic'], $row['id_last_msg']);
 		}
 
-		if ($row['approved'] != $row['firstmsg_approved'])
-		{
+		if ($row['approved'] != $row['firstmsg_approved']) {
 			Utils::$context['repair_errors'][] = sprintf(Lang::$txt['repair_topic_wrong_approval'], $row['id_topic']);
 		}
 
@@ -1722,17 +1701,19 @@ protected function fixTopicStats2($row): bool
 		$row['my_num_replies'] = (int) $row['my_num_replies'];
 
 		// Not really a problem?
-		if ($row['my_num_replies'] == $row['num_replies'])
+		if ($row['my_num_replies'] == $row['num_replies']) {
 			return false;
+		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET num_replies = {int:my_num_replies}
 			WHERE id_topic = {int:topic_id}',
-			array(
+			[
 				'my_num_replies' => $row['my_num_replies'],
 				'topic_id' => $row['id_topic'],
-			)
+			],
 		);
 
 		return true;
@@ -1745,11 +1726,11 @@ protected function fixTopicStats2($row): bool
 	protected function topicStatsMessage2($row): bool
 	{
 		// Just joking?
-		if ($row['my_num_replies'] == $row['num_replies'])
+		if ($row['my_num_replies'] == $row['num_replies']) {
 			return false;
+		}
 
-		if ($row['num_replies'] != $row['my_num_replies'])
-		{
+		if ($row['num_replies'] != $row['my_num_replies']) {
 			Utils::$context['repair_errors'][] = sprintf(Lang::$txt['repair_topic_wrong_replies'], $row['id_topic'], $row['num_replies']);
 		}
 
@@ -1763,14 +1744,15 @@ protected function fixTopicStats3($row): void
 	{
 		$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET unapproved_posts = {int:my_unapproved_posts}
 			WHERE id_topic = {int:topic_id}',
-			array(
+			[
 				'my_unapproved_posts' => $row['my_unapproved_posts'],
 				'topic_id' => $row['id_topic'],
-			)
+			],
 		);
 	}
 
@@ -1784,31 +1766,34 @@ protected function fixMissingBoards($row): void
 		$row['my_num_topics'] = (int) $row['my_num_topics'];
 		$row['my_num_posts'] = (int) $row['my_num_posts'];
 
-		$newBoardID = Db::$db->insert('',
+		$newBoardID = Db::$db->insert(
+			'',
 			'{db_prefix}boards',
-			array('id_cat' => 'int', 'name' => 'string', 'description' => 'string', 'num_topics' => 'int', 'num_posts' => 'int', 'member_groups' => 'string'),
-			array($this->salvage_category, Lang::$txt['salvaged_board_name'], Lang::$txt['salvaged_board_description'], $row['my_num_topics'], $row['my_num_posts'], '1'),
-			array('id_board'),
-			1
+			['id_cat' => 'int', 'name' => 'string', 'description' => 'string', 'num_topics' => 'int', 'num_posts' => 'int', 'member_groups' => 'string'],
+			[$this->salvage_category, Lang::$txt['salvaged_board_name'], Lang::$txt['salvaged_board_description'], $row['my_num_topics'], $row['my_num_posts'], '1'],
+			['id_board'],
+			1,
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_board = {int:newBoardID}
 			WHERE id_board = {int:board_id}',
-			array(
+			[
 				'newBoardID' => $newBoardID,
 				'board_id' => $row['id_board'],
-			)
+			],
 		);
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_board = {int:newBoardID}
 			WHERE id_board = {int:board_id}',
-			array(
+			[
 				'newBoardID' => $newBoardID,
 				'board_id' => $row['id_board'],
-			)
+			],
 		);
 	}
 
@@ -1819,14 +1804,15 @@ protected function fixMissingCategories($cats): void
 	{
 		$this->createSalvageArea();
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET id_cat = {int:salvage_category}
 			WHERE id_cat IN ({array_int:categories})',
-			array(
+			[
 				'salvage_category' => $this->salvage_category,
 				'categories' => $cats,
-			)
+			],
 		);
 	}
 
@@ -1835,14 +1821,15 @@ protected function fixMissingCategories($cats): void
 	 */
 	protected function fixMissingPosters($msgs): void
 	{
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_member = {int:guest_id}
 			WHERE id_msg IN ({array_int:msgs})',
-			array(
+			[
 				'msgs' => $msgs,
 				'guest_id' => 0,
-			)
+			],
 		);
 	}
 
@@ -1854,15 +1841,16 @@ protected function fixMissingParents($parents): void
 		$this->createSalvageArea();
 		$_SESSION['salvageBoardID'] = $this->salvage_board;
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET id_parent = {int:salvage_board}, id_cat = {int:salvage_category}, child_level = 1
 			WHERE id_parent IN ({array_int:parents})',
-			array(
+			[
 				'salvage_board' => $this->salvage_board,
 				'salvage_category' => $this->salvage_category,
 				'parents' => $parents,
-			)
+			],
 		);
 	}
 
@@ -1871,13 +1859,14 @@ protected function fixMissingParents($parents): void
 	 */
 	protected function fixMissingPolls($polls): void
 	{
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_poll = 0
 			WHERE id_poll IN ({array_int:polls})',
-			array(
+			[
 				'polls' => $polls,
-			)
+			],
 		);
 	}
 
@@ -1886,13 +1875,14 @@ protected function fixMissingPolls($polls): void
 	 */
 	protected function fixMissingCaledarTopics($events): void
 	{
-		Db::$db->query('', '
-			UPDATE {db_prefix}calendar
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}calendar
 			SET id_topic = 0, id_board = 0
 			WHERE id_topic IN ({array_int:events})',
-			array(
+			[
 				'events' => $events,
-			)
+			],
 		);
 	}
 
@@ -1901,12 +1891,13 @@ protected function fixMissingCaledarTopics($events): void
 	 */
 	protected function fixMissingLogTopics($topics): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
 	}
 
@@ -1915,12 +1906,13 @@ protected function fixMissingLogTopics($topics): void
 	 */
 	protected function fixMissingLogTopicsMembers($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_topics
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -1929,12 +1921,13 @@ protected function fixMissingLogTopicsMembers($members): void
 	 */
 	protected function fixMissingLogBoards($boards): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_boards
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_boards
 			WHERE id_board IN ({array_int:boards})',
-			array(
+			[
 				'boards' => $boards,
-			)
+			],
 		);
 	}
 
@@ -1943,12 +1936,13 @@ protected function fixMissingLogBoards($boards): void
 	 */
 	protected function fixMissingLogBoardsMembers($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_boards
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_boards
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -1957,12 +1951,13 @@ protected function fixMissingLogBoardsMembers($members): void
 	 */
 	protected function fixMissingLogMarkRead($boards): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_mark_read
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_mark_read
 			WHERE id_board IN ({array_int:boards})',
-			array(
+			[
 				'boards' => $boards,
-			)
+			],
 		);
 	}
 
@@ -1971,12 +1966,13 @@ protected function fixMissingLogMarkRead($boards): void
 	 */
 	protected function fixMissingLogMarkReadMembers($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_mark_read
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_mark_read
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -1986,12 +1982,13 @@ protected function fixMissingLogMarkReadMembers($members): void
 	 */
 	protected function fixMissingPMs($pms): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}pm_recipients
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}pm_recipients
 			WHERE id_pm IN ({array_int:pms})',
-			array(
+			[
 				'pms' => $pms,
-			)
+			],
 		);
 	}
 
@@ -2000,12 +1997,13 @@ protected function fixMissingPMs($pms): void
 	 */
 	protected function fixMissingRecipients($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}pm_recipients
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}pm_recipients
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -2015,13 +2013,14 @@ protected function fixMissingRecipients($members): void
 	 */
 	protected function fixMissingSenders($guestMessages): void
 	{
-		Db::$db->query('', '
-			UPDATE {db_prefix}personal_messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}personal_messages
 			SET id_member_from = 0
 			WHERE id_pm IN ({array_int:guestMessages})',
-			array(
+			[
 				'guestMessages' => $guestMessages,
-			)
+			],
 		);
 	}
 
@@ -2030,12 +2029,13 @@ protected function fixMissingSenders($guestMessages): void
 	 */
 	protected function fixMissingNotifyMembers($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_notify
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_notify
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -2044,33 +2044,33 @@ protected function fixMissingNotifyMembers($members): void
 	 */
 	protected function fixMissingCachedSubject($result): void
 	{
-		$inserts = array();
+		$inserts = [];
 
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			foreach (Utils::text2words($row['subject']) as $word)
-				$inserts[] = array($word, $row['id_topic']);
+		while ($row = Db::$db->fetch_assoc($result)) {
+			foreach (Utils::text2words($row['subject']) as $word) {
+				$inserts[] = [$word, $row['id_topic']];
+			}
 
-			if (count($inserts) > 500)
-			{
-				Db::$db->insert('ignore',
+			if (count($inserts) > 500) {
+				Db::$db->insert(
+					'ignore',
 					'{db_prefix}log_search_subjects',
-					array('word' => 'string', 'id_topic' => 'int'),
+					['word' => 'string', 'id_topic' => 'int'],
 					$inserts,
-					array('word', 'id_topic')
+					['word', 'id_topic'],
 				);
 
-				$inserts = array();
+				$inserts = [];
 			}
 		}
 
-		if (!empty($inserts))
-		{
-			Db::$db->insert('ignore',
+		if (!empty($inserts)) {
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_search_subjects',
-				array('word' => 'string', 'id_topic' => 'int'),
+				['word' => 'string', 'id_topic' => 'int'],
 				$inserts,
-				array('word', 'id_topic')
+				['word', 'id_topic'],
 			);
 		}
 	}
@@ -2081,8 +2081,7 @@ protected function fixMissingCachedSubject($result): void
 	 */
 	protected function missingCachedSubjectMessage($row): bool
 	{
-		if (count(Utils::text2words($row['subject'])) != 0)
-		{
+		if (count(Utils::text2words($row['subject'])) != 0) {
 			Utils::$context['repair_errors'][] = sprintf(Lang::$txt['repair_missing_cached_subject'], $row['id_topic']);
 
 			return true;
@@ -2096,12 +2095,13 @@ protected function missingCachedSubjectMessage($row): bool
 	 */
 	protected function fixMissingTopicForCache($deleteTopics): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_search_subjects
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_search_subjects
 			WHERE id_topic IN ({array_int:deleteTopics})',
-			array(
+			[
 				'deleteTopics' => $deleteTopics,
-			)
+			],
 		);
 	}
 
@@ -2110,12 +2110,13 @@ protected function fixMissingTopicForCache($deleteTopics): void
 	 */
 	protected function fixMissingMemberVote($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_polls
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_polls
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -2124,12 +2125,13 @@ protected function fixMissingMemberVote($members): void
 	 */
 	protected function fixMissingLogPollVote($polls): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_polls
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_polls
 			WHERE id_poll IN ({array_int:polls})',
-			array(
+			[
 				'polls' => $polls,
-			)
+			],
 		);
 	}
 
@@ -2138,12 +2140,13 @@ protected function fixMissingLogPollVote($polls): void
 	 */
 	protected function fixReportMissingComments($reports): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_reported
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_reported
 			WHERE id_report IN ({array_int:reports})',
-			array(
+			[
 				'reports' => $reports,
-			)
+			],
 		);
 	}
 
@@ -2152,12 +2155,13 @@ protected function fixReportMissingComments($reports): void
 	 */
 	protected function fixCommentMissingReport($reports): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_reported_comments
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_reported_comments
 			WHERE id_report IN ({array_int:reports})',
-			array(
+			[
 				'reports' => $reports,
-			)
+			],
 		);
 	}
 
@@ -2166,12 +2170,13 @@ protected function fixCommentMissingReport($reports): void
 	 */
 	protected function fixGroupRequestMissingMember($members): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_group_requests
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_group_requests
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $members,
-			)
+			],
 		);
 	}
 
@@ -2180,18 +2185,20 @@ protected function fixGroupRequestMissingMember($members): void
 	 */
 	protected function fixGroupRequestMissingGroup($groups): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_group_requests
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_group_requests
 			WHERE id_group IN ({array_int:groups})',
-			array(
+			[
 				'groups' => $groups,
-			)
+			],
 		);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\RepairBoards::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\RepairBoards::exportStatic')) {
 	RepairBoards::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Reports.php b/Sources/Actions/Admin/Reports.php
index 574fc8088d..f9bfbd9468 100644
--- a/Sources/Actions/Admin/Reports.php
+++ b/Sources/Actions/Admin/Reports.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\IntegrationHook;
@@ -26,7 +26,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class is exclusively for generating reports to help assist forum
@@ -41,12 +40,16 @@ class Reports implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ReportsMain',
-		),
-	);
+			'boardReport' => 'BoardReport',
+			'boardPermissionsReport' => 'BoardPermissionsReport',
+			'memberGroupsReport' => 'MemberGroupsReport',
+			'groupPermissionsReport' => 'GroupPermissionsReport',
+			'staffReport' => 'StaffReport',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -72,21 +75,21 @@ class Reports implements ActionInterface
 	 *
 	 * Info about the different types of reports we can generate.
 	 */
-	public array $report_types = array();
+	public array $report_types = [];
 
 	/**
 	 * @var array
 	 *
 	 * What are valid templates for showing reports?
 	 */
-	public array $reportTemplates = array(
-		'main' => array(
+	public array $reportTemplates = [
+		'main' => [
 			'layers' => null,
-		),
-		'print' => array(
-			'layers' => array('print'),
-		),
-	);
+		],
+		'print' => [
+			'layers' => ['print'],
+		],
+	];
 
 	/**************************
 	 * Public static properties
@@ -97,13 +100,13 @@ class Reports implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'boards' => 'boards',
 		'board_perms' => 'boardPerms',
 		'member_groups' => 'memberGroups',
 		'group_perms' => 'groupPerms',
 		'staff' => 'staff',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -114,7 +117,7 @@ class Reports implements ActionInterface
 	 *
 	 * The tables that comprise this report.
 	 */
-	protected array $tables = array();
+	protected array $tables = [];
 
 	/**
 	 * @var int
@@ -135,7 +138,7 @@ class Reports implements ActionInterface
 	 *
 	 * The keys of the array that represents the current table.
 	 */
-	protected array $keys = array();
+	protected array $keys = [];
 
 	/**
 	 * @var string
@@ -166,41 +169,40 @@ class Reports implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (empty($this->subaction))
-		{
+		if (empty($this->subaction)) {
 			$this->sub_template = 'report_type';
+
 			return;
 		}
 
 		// Specific template? Use that instead of main!
-		if (isset($_REQUEST['st']) && isset($this->reportTemplates[$_REQUEST['st']]))
-		{
+		if (isset($_REQUEST['st'], $this->reportTemplates[$_REQUEST['st']])) {
 			$this->sub_template = $_REQUEST['st'];
 
 			// Are we disabling the other layers - print friendly for example?
-			if ($this->reportTemplates[$_REQUEST['st']]['layers'] !== null)
-			{
+			if ($this->reportTemplates[$_REQUEST['st']]['layers'] !== null) {
 				Utils::$context['template_layers'] = $this->reportTemplates[$_REQUEST['st']]['layers'];
 			}
 		}
 
 		// Make the page title more descriptive.
-		Utils::$context['page_title'] .= ' - ' . (isset(Lang::$txt['gr_type_' . $this->subaction]) ? Lang::$txt['gr_type_' . $this->subaction] : $this->subaction);
+		Utils::$context['page_title'] .= ' - ' . (Lang::$txt['gr_type_' . $this->subaction] ?? $this->subaction);
 
 		// Build the reports button array.
-		Utils::$context['report_buttons'] = array(
-			'generate_reports' => array('text' => 'generate_reports', 'image' => 'print.png', 'url' => Config::$scripturl . '?action=admin;area=reports', 'active' => true),
-			'print' => array('text' => 'print', 'image' => 'print.png', 'url' => Config::$scripturl . '?action=admin;area=reports;rt=' . $this->subaction . ';st=print', 'custom' => 'target="_blank"'),
-		);
+		Utils::$context['report_buttons'] = [
+			'generate_reports' => ['text' => 'generate_reports', 'image' => 'print.png', 'url' => Config::$scripturl . '?action=admin;area=reports', 'active' => true],
+			'print' => ['text' => 'print', 'image' => 'print.png', 'url' => Config::$scripturl . '?action=admin;area=reports;rt=' . $this->subaction . ';st=print', 'custom' => 'target="_blank"'],
+		];
 
 		// Allow mods to add additional buttons here.
 		IntegrationHook::call('integrate_report_buttons');
 
 		// Now generate the data.
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 
 		// Finish the tables before exiting - this is to help the templates a little more.
 		$this->finishTables();
@@ -216,54 +218,57 @@ public function boards(): void
 		Permissions::loadPermissionProfiles();
 
 		// Get every moderator.
-		$moderators = array();
+		$moderators = [];
 
-		$request = Db::$db->query('', '
-			SELECT mods.id_board, mods.id_member, mem.real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT mods.id_board, mods.id_member, mem.real_name
 			FROM {db_prefix}moderators AS mods
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = mods.id_member)',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$moderators[$row['id_board']][] = $row['real_name'];
 		}
 		Db::$db->free_result($request);
 
 		// Get every moderator gruop.
-		$moderator_groups = array();
+		$moderator_groups = [];
 
-		$request = Db::$db->query('', '
-			SELECT modgs.id_board, modgs.id_group, memg.group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT modgs.id_board, modgs.id_group, memg.group_name
 			FROM {db_prefix}moderator_groups AS modgs
 				INNER JOIN {db_prefix}membergroups AS memg ON (memg.id_group = modgs.id_group)',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$moderator_groups[$row['id_board']][] = $row['group_name'];
 		}
 		Db::$db->free_result($request);
 
 		// Get all the possible membergroups!
-		$groups = array(-1 => Lang::$txt['guest_title'], 0 => Lang::$txt['membergroups_members']);
+		$groups = [-1 => Lang::$txt['guest_title'], 0 => Lang::$txt['membergroups_members']];
 
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name, online_color
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name, online_color
 			FROM {db_prefix}membergroups',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
 		}
 		Db::$db->free_result($request);
 
 		// All the fields we'll show.
-		$boardSettings = array(
+		$boardSettings = [
 			'category' => Lang::$txt['board_category'],
 			'parent' => Lang::$txt['board_parent'],
 			'redirect' => Lang::$txt['board_redirect'],
@@ -276,43 +281,46 @@ public function boards(): void
 			'moderators' => Lang::$txt['board_moderators'],
 			'moderator_groups' => Lang::$txt['board_moderator_groups'],
 			'groups' => Lang::$txt['board_groups'],
-		);
+		];
 
-		if (!empty(Config::$modSettings['deny_boards_access']))
+		if (!empty(Config::$modSettings['deny_boards_access'])) {
 			$boardSettings['disallowed_groups'] = Lang::$txt['board_disallowed_groups'];
+		}
 
 		// Do it in columns, it's just easier.
 		$this->setKeys('cols');
 
 		// Go through each board!
-		$request = Db::$db->query('order_by_board_order', '
-			SELECT b.id_board, b.name, b.num_posts, b.num_topics, b.count_posts, b.member_groups, b.override_theme, b.id_profile, b.deny_member_groups,
+		$request = Db::$db->query(
+			'order_by_board_order',
+			'SELECT b.id_board, b.name, b.num_posts, b.num_topics, b.count_posts, b.member_groups, b.override_theme, b.id_profile, b.deny_member_groups,
 				b.redirect, c.name AS cat_name, COALESCE(par.name, {string:text_none}) AS parent_name, COALESCE(th.value, {string:text_none}) AS theme_name
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 				LEFT JOIN {db_prefix}boards AS par ON (par.id_board = b.id_parent)
 				LEFT JOIN {db_prefix}themes AS th ON (th.id_theme = b.id_theme AND th.variable = {string:name})
 			ORDER BY b.board_order',
-			array(
+			[
 				'name' => 'name',
 				'text_none' => Lang::$txt['none'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Each board has it's own table.
 			$this->newTable($row['name'], '', 'left', 'auto', 'left', 200, 'left');
 
 			$this_boardSettings = $boardSettings;
 
-			if (empty($row['redirect']))
+			if (empty($row['redirect'])) {
 				unset($this_boardSettings['redirect']);
+			}
 
 			// First off, add in the side key.
 			$this->addData($this_boardSettings);
 
 			// Create the main data array.
-			$boardData = array(
+			$boardData = [
 				'category' => $row['cat_name'],
 				'parent' => $row['parent_name'],
 				'redirect' => $row['redirect'],
@@ -324,37 +332,28 @@ public function boards(): void
 				'override_theme' => $row['override_theme'] ? Lang::$txt['yes'] : Lang::$txt['no'],
 				'moderators' => empty($moderators[$row['id_board']]) ? Lang::$txt['none'] : implode(', ', $moderators[$row['id_board']]),
 				'moderator_groups' => empty($moderator_groups[$row['id_board']]) ? Lang::$txt['none'] : implode(', ', $moderator_groups[$row['id_board']]),
-			);
+			];
 
 			// Work out the membergroups who can and cannot access it (but only if enabled).
 			$allowedGroups = explode(',', $row['member_groups']);
 
-			foreach ($allowedGroups as $key => $group)
-			{
-				if (isset($groups[$group]))
-				{
+			foreach ($allowedGroups as $key => $group) {
+				if (isset($groups[$group])) {
 					$allowedGroups[$key] = $groups[$group];
-				}
-				else
-				{
+				} else {
 					unset($allowedGroups[$key]);
 				}
 			}
 
 			$boardData['groups'] = implode(', ', $allowedGroups);
 
-			if (!empty(Config::$modSettings['deny_boards_access']))
-			{
+			if (!empty(Config::$modSettings['deny_boards_access'])) {
 				$disallowedGroups = explode(',', $row['deny_member_groups']);
 
-				foreach ($disallowedGroups as $key => $group)
-				{
-					if (isset($groups[$group]))
-					{
+				foreach ($disallowedGroups as $key => $group) {
+					if (isset($groups[$group])) {
 						$disallowedGroups[$key] = $groups[$group];
-					}
-					else
-					{
+					} else {
 						unset($disallowedGroups[$key]);
 					}
 				}
@@ -362,8 +361,9 @@ public function boards(): void
 				$boardData['disallowed_groups'] = implode(', ', $disallowedGroups);
 			}
 
-			if (empty($row['redirect']))
-				unset ($boardData['redirect']);
+			if (empty($row['redirect'])) {
+				unset($boardData['redirect']);
+			}
 
 			// Next add the main data.
 			$this->addData($boardData);
@@ -379,56 +379,55 @@ public function boardPerms(): void
 		// Get as much memory as possible as this can be big.
 		Config::setMemoryLimit('256M');
 
-		if (isset($_REQUEST['boards']))
-		{
-			if (!is_array($_REQUEST['boards']))
+		if (isset($_REQUEST['boards'])) {
+			if (!is_array($_REQUEST['boards'])) {
 				$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
+			}
 
-			foreach ($_REQUEST['boards'] as $k => $dummy)
+			foreach ($_REQUEST['boards'] as $k => $dummy) {
 				$_REQUEST['boards'][$k] = (int) $dummy;
+			}
 
 			$board_clause = 'id_board IN ({array_int:boards})';
-		}
-		else
-		{
+		} else {
 			$board_clause = '1=1';
 		}
 
-		if (isset($_REQUEST['groups']))
-		{
-			if (!is_array($_REQUEST['groups']))
+		if (isset($_REQUEST['groups'])) {
+			if (!is_array($_REQUEST['groups'])) {
 				$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+			}
 
-			foreach ($_REQUEST['groups'] as $k => $dummy)
+			foreach ($_REQUEST['groups'] as $k => $dummy) {
 				$_REQUEST['groups'][$k] = (int) $dummy;
+			}
 
 			$group_clause = 'id_group IN ({array_int:groups})';
-		}
-		else
-		{
+		} else {
 			$group_clause = '1=1';
 		}
 
 		// Fetch all the board names and profiles.
-		$boards = array();
-		$profiles = array();
+		$boards = [];
+		$profiles = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_board, name, id_profile
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, name, id_profile
 			FROM {db_prefix}boards
 			WHERE ' . $board_clause . '
 			ORDER BY id_board',
-			array(
-				'boards' => isset($_REQUEST['boards']) ? $_REQUEST['boards'] : array(),
-			)
+			[
+				'boards' => $_REQUEST['boards'] ?? [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$boards[$row['id_board']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$boards[$row['id_board']] = [
 				'name' => $row['name'],
 				'profile' => $row['id_profile'],
-				'mod_groups' => array(),
-			);
+				'mod_groups' => [],
+			];
 
 			$profiles[] = $row['id_profile'];
 		}
@@ -436,45 +435,44 @@ public function boardPerms(): void
 
 		// Get the ids of any groups allowed to moderate this board
 		// Limit it to any boards and/or groups we're looking at
-		$request = Db::$db->query('', '
-			SELECT id_board, id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, id_group
 			FROM {db_prefix}moderator_groups
 			WHERE ' . $board_clause . ' AND ' . $group_clause,
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$boards[$row['id_board']]['mod_groups'][] = $row['id_group'];
 		}
 		Db::$db->free_result($request);
 
 		// Get all the possible membergroups, except admin!
-		if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		{
-			$member_groups = array('col' => '', -1 => Lang::$txt['membergroups_guests'], 0 => Lang::$txt['membergroups_members']);
-		}
-		else
-		{
-			$member_groups = array('col' => '');
+		if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$member_groups = ['col' => '', -1 => Lang::$txt['membergroups_guests'], 0 => Lang::$txt['membergroups_members']];
+		} else {
+			$member_groups = ['col' => ''];
 		}
 
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name
 			FROM {db_prefix}membergroups
 			WHERE ' . $group_clause . '
 				AND id_group != {int:admin_group}' . (empty(Config::$modSettings['permission_enable_postgroups']) ? '
 				AND min_posts = {int:min_posts}' : '') . '
 			ORDER BY min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE 4 END, group_name',
-			array(
+			[
 				'admin_group' => 1,
 				'min_posts' => -1,
 				'newbie_group' => 4,
-				'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
-			)
+				'groups' => $_REQUEST['groups'] ?? [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$member_groups[$row['id_group']] = $row['group_name'];
 		}
 		Db::$db->free_result($request);
@@ -483,10 +481,9 @@ public function boardPerms(): void
 		$this->setKeys('rows', $member_groups);
 
 		// Certain permissions should not really be shown.
-		$disabled_permissions = array();
+		$disabled_permissions = [];
 
-		if (!Config::$modSettings['postmod_active'])
-		{
+		if (!Config::$modSettings['postmod_active']) {
 			$disabled_permissions[] = 'approve_posts';
 			$disabled_permissions[] = 'post_unapproved_topics';
 			$disabled_permissions[] = 'post_unapproved_replies_own';
@@ -494,50 +491,50 @@ public function boardPerms(): void
 			$disabled_permissions[] = 'post_unapproved_attachments';
 		}
 
-		IntegrationHook::call('integrate_reports_boardperm', array(&$disabled_permissions));
+		IntegrationHook::call('integrate_reports_boardperm', [&$disabled_permissions]);
 
 		// Cache every permission setting, to make sure we don't miss any allows.
-		$permissions = array();
-		$board_permissions = array();
+		$permissions = [];
+		$board_permissions = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_profile, id_group, add_deny, permission
+		$request = Db::$db->query(
+			'',
+			'SELECT id_profile, id_group, add_deny, permission
 			FROM {db_prefix}board_permissions
 			WHERE id_profile IN ({array_int:profile_list})
 				AND ' . $group_clause . (empty(Config::$modSettings['permission_enable_deny']) ? '
 				AND add_deny = {int:not_deny}' : '') . '
 			ORDER BY id_profile, permission',
-			array(
+			[
 				'profile_list' => $profiles,
 				'not_deny' => 1,
-				'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
-			)
+				'groups' => $_REQUEST['groups'] ?? [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (in_array($row['permission'], $disabled_permissions))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (in_array($row['permission'], $disabled_permissions)) {
 				continue;
+			}
 
-			foreach ($boards as $id => $board)
-			{
-				if ($board['profile'] == $row['id_profile'])
+			foreach ($boards as $id => $board) {
+				if ($board['profile'] == $row['id_profile']) {
 					$board_permissions[$id][$row['id_group']][$row['permission']] = $row['add_deny'];
+				}
 			}
 
 			// Make sure we get every permission.
-			if (!isset($permissions[$row['permission']]))
-			{
+			if (!isset($permissions[$row['permission']])) {
 				// This will be reused on other boards.
-				$permissions[$row['permission']] = array(
-					'title' => isset(Lang::$txt['board_perms_name_' . $row['permission']]) ? Lang::$txt['board_perms_name_' . $row['permission']] : $row['permission'],
-				);
+				$permissions[$row['permission']] = [
+					'title' => Lang::$txt['board_perms_name_' . $row['permission']] ?? $row['permission'],
+				];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// Now cycle through the board permissions array... lots to do ;)
-		foreach ($board_permissions as $board => $groups)
-		{
+		foreach ($board_permissions as $board => $groups) {
 			// Create the table for this board first.
 			$this->newTable($boards[$board]['name'], 'x', 'all', 100, 'center', 200, 'left');
 
@@ -548,54 +545,44 @@ public function boardPerms(): void
 			$this->addSeparator(Lang::$txt['board_perms_permission']);
 
 			// Here cycle through all the detected permissions.
-			foreach ($permissions as $ID_PERM => $perm_info)
-			{
+			foreach ($permissions as $ID_PERM => $perm_info) {
 				// Default data for this row.
-				$curData = array('col' => $perm_info['title']);
+				$curData = ['col' => $perm_info['title']];
 
 				// Now cycle each membergroup in this set of permissions.
-				foreach ($member_groups as $id_group => $name)
-				{
+				foreach ($member_groups as $id_group => $name) {
 					// Don't overwrite the key column!
-					if ($id_group === 'col')
+					if ($id_group === 'col') {
 						continue;
+					}
 
-					$group_permissions = isset($groups[$id_group]) ? $groups[$id_group] : array();
+					$group_permissions = $groups[$id_group] ?? [];
 
 					// Do we have any data for this group?
-					if (isset($group_permissions[$ID_PERM]))
-					{
+					if (isset($group_permissions[$ID_PERM])) {
 						// Set the data for this group to be the local permission.
 						$curData[$id_group] = $group_permissions[$ID_PERM];
 					}
 					// Is it inherited from Moderator?
-					elseif (in_array($id_group, $boards[$board]['mod_groups']) && !empty($groups[3]) && isset($groups[3][$ID_PERM]))
-					{
+					elseif (in_array($id_group, $boards[$board]['mod_groups']) && !empty($groups[3]) && isset($groups[3][$ID_PERM])) {
 						$curData[$id_group] = $groups[3][$ID_PERM];
 					}
 					// Otherwise means it's set to disallow..
-					else
-					{
+					else {
 						$curData[$id_group] = 'x';
 					}
 
 					// Now actually make the data for the group look right.
-					if (empty($curData[$id_group]))
-					{
+					if (empty($curData[$id_group])) {
 						$curData[$id_group] = '<span class="red">' . Lang::$txt['board_perms_deny'] . '</span>';
-					}
-					elseif ($curData[$id_group] == 1)
-					{
+					} elseif ($curData[$id_group] == 1) {
 						$curData[$id_group] = '<span style="color: darkgreen;">' . Lang::$txt['board_perms_allow'] . '</span>';
-					}
-					else
-					{
+					} else {
 						$curData[$id_group] = 'x';
 					}
 
 					// Embolden those permissions different from global (makes it a lot easier!)
-					if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM])
-					{
+					if (@$board_permissions[0][$id_group][$ID_PERM] != @$group_permissions[$ID_PERM]) {
 						$curData[$id_group] = '<strong>' . $curData[$id_group] . '</strong>';
 					}
 				}
@@ -612,44 +599,39 @@ public function boardPerms(): void
 	public function memberGroups(): void
 	{
 		// Fetch all the board names.
-		$request = Db::$db->query('', '
-			SELECT id_board, name, member_groups, id_profile, deny_member_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, name, member_groups, id_profile, deny_member_groups
 			FROM {db_prefix}boards',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (trim($row['member_groups']) == '')
-			{
-				$groups = array(1);
-			}
-			else
-			{
-				$groups = array_merge(array(1), explode(',', $row['member_groups']));
-			}
 
-			if (trim($row['deny_member_groups']) == '')
-			{
-				$denyGroups = array();
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (trim($row['member_groups']) == '') {
+				$groups = [1];
+			} else {
+				$groups = array_merge([1], explode(',', $row['member_groups']));
 			}
-			else
-			{
+
+			if (trim($row['deny_member_groups']) == '') {
+				$denyGroups = [];
+			} else {
 				$denyGroups = explode(',', $row['deny_member_groups']);
 			}
 
-			$boards[$row['id_board']] = array(
+			$boards[$row['id_board']] = [
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'profile' => $row['id_profile'],
 				'groups' => $groups,
 				'deny_groups' => $denyGroups,
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Standard settings.
-		$mgSettings = array(
+		$mgSettings = [
 			'name' => '',
 			'#sep#1' => Lang::$txt['member_group_settings'],
 			'color' => Lang::$txt['member_group_color'],
@@ -657,11 +639,12 @@ public function memberGroups(): void
 			'max_messages' => Lang::$txt['member_group_max_messages'],
 			'icons' => Lang::$txt['member_group_icons'],
 			'#sep#2' => Lang::$txt['member_group_access'],
-		);
+		];
 
 		// Add on the boards!
-		foreach ($boards as $board)
+		foreach ($boards as $board) {
 			$mgSettings['board_' . $board['id']] = $board['name'];
+		}
 
 		// Add all the membergroup settings, plus we'll be adding in columns!
 		$this->setKeys('cols', $mgSettings);
@@ -673,20 +656,18 @@ public function memberGroups(): void
 		$this->addData($mgSettings);
 
 		// Now start cycling through the membergroups!
-		foreach (Group::loadSimple(Group::LOAD_BOTH, array()) as $group)
-		{
-			$group_info = array(
+		foreach (Group::loadSimple(Group::LOAD_BOTH, []) as $group) {
+			$group_info = [
 				'id' => $group->id,
 				'name' => $group->name,
 				'color' => empty($group->online_color) ? '-' : '<span style="color: ' . $group->online_color . ';">' . $group->online_color . '</span>',
 				'min_posts' => $group->min_posts == -1 ? Lang::$txt['not_applicable'] : $group->min_posts,
 				'max_messages' => $group->max_messages,
 				'icons' => $group->icons,
-			);
+			];
 
 			// Board permissions.
-			foreach ($boards as $board)
-			{
+			foreach ($boards as $board) {
 				$group_info['board_' . $board['id']] = in_array($group->id, $board['groups']) ? '<span class="success">' . Lang::$txt['board_perms_allow'] . '</span>' : (!empty(Config::$modSettings['deny_boards_access']) && in_array($group->id, $board['deny_groups']) ? '<span class="alert">' . Lang::$txt['board_perms_deny'] . '</span>' : 'x');
 			}
 
@@ -699,50 +680,47 @@ public function memberGroups(): void
 	 */
 	public function groupPerms(): void
 	{
-		if (isset($_REQUEST['groups']))
-		{
-			if (!is_array($_REQUEST['groups']))
+		if (isset($_REQUEST['groups'])) {
+			if (!is_array($_REQUEST['groups'])) {
 				$_REQUEST['groups'] = explode(',', $_REQUEST['groups']);
+			}
 
-			foreach ($_REQUEST['groups'] as $k => $dummy)
+			foreach ($_REQUEST['groups'] as $k => $dummy) {
 				$_REQUEST['groups'][$k] = (int) $dummy;
+			}
 
-			$_REQUEST['groups'] = array_diff($_REQUEST['groups'], array(3));
+			$_REQUEST['groups'] = array_diff($_REQUEST['groups'], [3]);
 
 			$clause = 'id_group IN ({array_int:groups})';
-		}
-		else
-		{
+		} else {
 			$clause = 'id_group != {int:moderator_group}';
 		}
 
 		// Get all the possible membergroups, except admin!
-		if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups']))
-		{
-			$groups = array('col' => '', -1 => Lang::$txt['membergroups_guests'], 0 => Lang::$txt['membergroups_members']);
-		}
-		else
-		{
-			$groups = array('col' => '');
+		if (!isset($_REQUEST['groups']) || in_array(-1, $_REQUEST['groups']) || in_array(0, $_REQUEST['groups'])) {
+			$groups = ['col' => '', -1 => Lang::$txt['membergroups_guests'], 0 => Lang::$txt['membergroups_members']];
+		} else {
+			$groups = ['col' => ''];
 		}
 
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name
 			FROM {db_prefix}membergroups
 			WHERE ' . $clause . '
 				AND id_group != {int:admin_group}' . (empty(Config::$modSettings['permission_enable_postgroups']) ? '
 				AND min_posts = {int:min_posts}' : '') . '
 			ORDER BY min_posts, CASE WHEN id_group < {int:newbie_group} THEN id_group ELSE 4 END, group_name',
-			array(
+			[
 				'admin_group' => 1,
 				'min_posts' => -1,
 				'newbie_group' => 4,
 				'moderator_group' => 3,
-				'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
-			)
+				'groups' => $_REQUEST['groups'] ?? [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$groups[$row['id_group']] = $row['group_name'];
 		}
 		Db::$db->free_result($request);
@@ -760,69 +738,65 @@ public function groupPerms(): void
 		$this->addSeparator(Lang::$txt['board_perms_permission']);
 
 		// Certain permissions should not really be shown.
-		$disabled_permissions = array();
+		$disabled_permissions = [];
 
-		if (empty(Config::$modSettings['cal_enabled']))
-		{
+		if (empty(Config::$modSettings['cal_enabled'])) {
 			$disabled_permissions[] = 'calendar_view';
 			$disabled_permissions[] = 'calendar_post';
 			$disabled_permissions[] = 'calendar_edit_own';
 			$disabled_permissions[] = 'calendar_edit_any';
 		}
 
-		if (empty(Config::$modSettings['warning_settings']) || Config::$modSettings['warning_settings'][0] == 0)
-		{
+		if (empty(Config::$modSettings['warning_settings']) || Config::$modSettings['warning_settings'][0] == 0) {
 			$disabled_permissions[] = 'issue_warning';
 		}
 
-		IntegrationHook::call('integrate_reports_groupperm', array(&$disabled_permissions));
+		IntegrationHook::call('integrate_reports_groupperm', [&$disabled_permissions]);
 
 		// Now the big permission fetch!
 		$lastPermission = null;
-		$curData = array();
+		$curData = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_group, add_deny, permission
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, add_deny, permission
 			FROM {db_prefix}permissions
 			WHERE ' . $clause . (empty(Config::$modSettings['permission_enable_deny']) ? '
 				AND add_deny = {int:not_denied}' : '') . '
 			ORDER BY permission',
-			array(
+			[
 				'not_denied' => 1,
 				'moderator_group' => 3,
-				'groups' => isset($_REQUEST['groups']) ? $_REQUEST['groups'] : array(),
-			)
+				'groups' => $_REQUEST['groups'] ?? [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (in_array($row['permission'], $disabled_permissions))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (in_array($row['permission'], $disabled_permissions)) {
 				continue;
+			}
 
-			if (strpos($row['permission'], 'bbc_') === 0)
-			{
+			if (strpos($row['permission'], 'bbc_') === 0) {
 				Lang::$txt['group_perms_name_' . $row['permission']] = sprintf(Lang::$txt['group_perms_name_bbc'], substr($row['permission'], 4));
 			}
 
 			// If this is a new permission flush the last row.
-			if ($row['permission'] != $lastPermission)
-			{
+			if ($row['permission'] != $lastPermission) {
 				// Send the data!
-				if ($lastPermission !== null)
+				if ($lastPermission !== null) {
 					$this->addData($curData);
+				}
 
 				// Add the permission name in the left column.
-				$curData = array('col' => isset(Lang::$txt['group_perms_name_' . $row['permission']]) ? Lang::$txt['group_perms_name_' . $row['permission']] : $row['permission']);
+				$curData = ['col' => Lang::$txt['group_perms_name_' . $row['permission']] ?? $row['permission']];
 
 				$lastPermission = $row['permission'];
 			}
 
 			// Good stuff - add the permission to the list!
-			if ($row['add_deny'])
-			{
+			if ($row['add_deny']) {
 				$curData[$row['id_group']] = '<span style="color: darkgreen;">' . Lang::$txt['board_perms_allow'] . '</span>';
-			}
-			else
-			{
+			} else {
 				$curData[$row['id_group']] = '<span class="red">' . Lang::$txt['board_perms_deny'] . '</span>';
 			}
 		}
@@ -838,58 +812,60 @@ public function groupPerms(): void
 	public function staff(): void
 	{
 		// Fetch all the board names.
-		$boards = array();
+		$boards = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_board, name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, name
 			FROM {db_prefix}boards',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$boards[$row['id_board']] = $row['name'];
 		}
 		Db::$db->free_result($request);
 
 		// Get every moderator.
-		$moderators = array();
-		$local_mods = array();
+		$moderators = [];
+		$local_mods = [];
 
-		$request = Db::$db->query('', '
-			SELECT mods.id_board, mods.id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT mods.id_board, mods.id_member
 			FROM {db_prefix}moderators AS mods',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$moderators[$row['id_member']][] = $row['id_board'];
 			$local_mods[$row['id_member']] = $row['id_member'];
 		}
 		Db::$db->free_result($request);
 
 		// Get any additional boards they can moderate through group-based board moderation
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, modgs.id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, modgs.id_board
 			FROM {db_prefix}members AS mem
 				INNER JOIN {db_prefix}moderator_groups AS modgs ON (modgs.id_group = mem.id_group OR FIND_IN_SET(modgs.id_group, mem.additional_groups) != 0)',
-			array(
-			)
+			[
+			],
 		);
 
 		// Add each board/member to the arrays, but only if they aren't already there
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Either we don't have them as a moderator at all or at least not as a moderator of this board
-			if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']]))
-			{
+			if (!array_key_exists($row['id_member'], $moderators) || !in_array($row['id_board'], $moderators[$row['id_member']])) {
 				$moderators[$row['id_member']][] = $row['id_board'];
 			}
 
 			// We don't have them listed as a moderator yet
-			if (!array_key_exists($row['id_member'], $local_mods))
+			if (!array_key_exists($row['id_member'], $local_mods)) {
 				$local_mods[$row['id_member']] = $row['id_member'];
+			}
 		}
 
 		// Get a list of global moderators (i.e. members with moderation powers).
@@ -902,47 +878,50 @@ public function staff(): void
 		$allStaff = array_unique($allStaff);
 
 		// This is a bit of a cop out - but we're protecting their forum, really!
-		if (count($allStaff) > 300)
+		if (count($allStaff) > 300) {
 			ErrorHandler::fatalLang('report_error_too_many_staff');
+		}
 
 		// Get all the possible membergroups!
-		$groups = array(0 => Lang::$txt['membergroups_members']);
+		$groups = [0 => Lang::$txt['membergroups_members']];
 
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name, online_color
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name, online_color
 			FROM {db_prefix}membergroups',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$groups[$row['id_group']] = empty($row['online_color']) ? $row['group_name'] : '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>';
 		}
 		Db::$db->free_result($request);
 
 		// All the fields we'll show.
-		$staffSettings = array(
+		$staffSettings = [
 			'position' => Lang::$txt['report_staff_position'],
 			'moderates' => Lang::$txt['report_staff_moderates'],
 			'posts' => Lang::$txt['report_staff_posts'],
 			'last_login' => Lang::$txt['report_staff_last_login'],
-		);
+		];
 
 		// Do it in columns, it's just easier.
 		$this->setKeys('cols');
 
 		// Get each member!
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name, id_group, posts, last_login
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, id_group, posts, last_login
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:staff_list})
 			ORDER BY real_name',
-			array(
+			[
 				'staff_list' => $allStaff,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Each member gets their own table!.
 			$this->newTable($row['real_name'], '', 'left', 'auto', 'left', 200, 'center');
 
@@ -950,29 +929,26 @@ public function staff(): void
 			$this->addData($staffSettings);
 
 			// Create the main data array.
-			$staffData = array(
-				'position' => isset($groups[$row['id_group']]) ? $groups[$row['id_group']] : $groups[0],
+			$staffData = [
+				'position' => $groups[$row['id_group']] ?? $groups[0],
 				'posts' => $row['posts'],
 				'last_login' => Time::create('@' . $row['last_login'])->format(),
-				'moderates' => array(),
-			);
+				'moderates' => [],
+			];
 
 			// What do they moderate?
-			if (in_array($row['id_member'], $global_mods))
-			{
+			if (in_array($row['id_member'], $global_mods)) {
 				$staffData['moderates'] = '<em>' . Lang::$txt['report_staff_all_boards'] . '</em>';
-			}
-			elseif (isset($moderators[$row['id_member']]))
-			{
+			} elseif (isset($moderators[$row['id_member']])) {
 				// Get the names
-				foreach ($moderators[$row['id_member']] as $board)
-					if (isset($boards[$board]))
+				foreach ($moderators[$row['id_member']] as $board) {
+					if (isset($boards[$board])) {
 						$staffData['moderates'][] = $boards[$board];
+					}
+				}
 
 				$staffData['moderates'] = implode(', ', $staffData['moderates']);
-			}
-			else
-			{
+			} else {
 				$staffData['moderates'] = '<em>' . Lang::$txt['report_staff_no_boards'] . '</em>';
 			}
 
@@ -993,8 +969,9 @@ public function staff(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1078,36 +1055,38 @@ protected function __construct()
 		// For backward compatibility...
 		Utils::$context['report_types'] = &self::$subactions;
 
-		IntegrationHook::call('integrate_report_types', array(&self::$subactions));
+		IntegrationHook::call('integrate_report_types', [&self::$subactions]);
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['generate_reports'],
 			'help' => '',
 			'description' => Lang::$txt['generate_reports_desc'],
-		);
+		];
 
 		$is_first = 0;
-		foreach (self::$subactions as $k => $func)
-		{
-			if (!is_string($func))
+
+		foreach (self::$subactions as $k => $func) {
+			if (!is_string($func)) {
 				continue;
+			}
 
-			$this->report_types[$k] = array(
+			$this->report_types[$k] = [
 				'id' => $k,
-				'title' => isset(Lang::$txt['gr_type_' . $k]) ? Lang::$txt['gr_type_' . $k] : $k,
-				'description' => isset(Lang::$txt['gr_type_desc_' . $k]) ? Lang::$txt['gr_type_desc_' . $k] : null,
+				'title' => Lang::$txt['gr_type_' . $k] ?? $k,
+				'description' => Lang::$txt['gr_type_desc_' . $k] ?? null,
 				'function' => $func,
 				'is_first' => $is_first++ == 0,
-			);
+			];
 		}
 
 		Utils::$context['report_types'] = &$this->report_types;
 		Utils::$context['sub_template'] = &$this->sub_template;
 		Utils::$context['tables'] = &$this->tables;
 
-		if (!empty($_REQUEST['rt']) && isset(self::$subactions[$_REQUEST['rt']]))
+		if (!empty($_REQUEST['rt']) && isset(self::$subactions[$_REQUEST['rt']])) {
 			$this->subaction = $_REQUEST['rt'];
+		}
 	}
 
 	/**
@@ -1128,28 +1107,29 @@ protected function __construct()
 	protected function newTable($title = '', $default_value = '', $shading = 'all', $width_normal = 'auto', $align_normal = 'center', $width_shaded = 'auto', $align_shaded = 'auto')
 	{
 		// Set the table count if needed.
-		if (empty($this->table_count))
+		if (empty($this->table_count)) {
 			$this->table_count = 0;
+		}
 
 		// Create the table!
-		$this->tables[$this->table_count] = array(
+		$this->tables[$this->table_count] = [
 			'title' => $title,
 			'default_value' => $default_value,
-			'shading' => array(
+			'shading' => [
 				'left' => $shading == 'all' || $shading == 'left',
 				'top' => $shading == 'all' || $shading == 'top',
-			),
-			'width' => array(
+			],
+			'width' => [
 				'normal' => $width_normal,
 				'shaded' => $width_shaded,
-			),
+			],
 			/* Align usage deprecated due to HTML5 */
-			'align' => array(
+			'align' => [
 				'normal' => $align_normal,
 				'shaded' => $align_shaded,
-			),
-			'data' => array(),
-		);
+			],
+			'data' => [],
+		];
 
 		$this->current_table = $this->table_count;
 
@@ -1176,56 +1156,54 @@ protected function newTable($title = '', $default_value = '', $shading = 'all',
 	protected function addData($inc_data, $custom_table = null): void
 	{
 		// No tables? Create one even though we are probably already in a bad state!
-		if (empty($this->table_count))
+		if (empty($this->table_count)) {
 			$this->newTable();
+		}
 
 		// Specific table?
-		if ($custom_table !== null && !isset($this->tables[$custom_table]))
+		if ($custom_table !== null && !isset($this->tables[$custom_table])) {
 			return;
+		}
 
 		$table = $custom_table ?? $this->current_table;
 
 		// If we have keys, sanitise the data...
-		if (!empty($this->keys))
-		{
+		if (!empty($this->keys)) {
 			// Basically, check every key exists!
-			foreach ($this->keys as $key => $dummy)
-			{
-				$data[$key] = array(
+			foreach ($this->keys as $key => $dummy) {
+				$data[$key] = [
 					'v' => empty($inc_data[$key]) ? $this->tables[$table]['default_value'] : $inc_data[$key],
-				);
+				];
 
 				// Special "hack" the adding separators when doing data by column.
-				if (substr($key, 0, 5) == '#sep#')
+				if (substr($key, 0, 5) == '#sep#') {
 					$data[$key]['separator'] = true;
+				}
 			}
-		}
-		else
-		{
+		} else {
 			$data = $inc_data;
 
-			foreach ($data as $key => $value)
-			{
-				$data[$key] = array(
+			foreach ($data as $key => $value) {
+				$data[$key] = [
 					'v' => $value,
-				);
+				];
 
-				if (substr($key, 0, 5) == '#sep#')
+				if (substr($key, 0, 5) == '#sep#') {
 					$data[$key]['separator'] = true;
+				}
 			}
 		}
 
 		// Is it by row?
-		if (empty($this->key_method) || $this->key_method == 'rows')
-		{
+		if (empty($this->key_method) || $this->key_method == 'rows') {
 			// Add the data!
 			$this->tables[$table]['data'][] = $data;
 		}
 		// Otherwise, tricky!
-		else
-		{
-			foreach ($data as $key => $item)
+		else {
+			foreach ($data as $key => $item) {
 				$this->tables[$table]['data'][$key][] = $item;
+			}
 		}
 	}
 
@@ -1238,20 +1216,22 @@ protected function addData($inc_data, $custom_table = null): void
 	protected function addSeparator($title = '', $custom_table = null)
 	{
 		// No tables - return?
-		if (empty($this->table_count))
+		if (empty($this->table_count)) {
 			return;
+		}
 
 		// Specific table?
-		if ($custom_table !== null && !isset($this->tables[$table]))
+		if ($custom_table !== null && !isset($this->tables[$table])) {
 			return;
+		}
 
 		$table = $custom_table ?? $this->current_table;
 
 		// Plumb in the separator
-		$this->tables[$table]['data'][] = array(0 => array(
+		$this->tables[$table]['data'][] = [0 => [
 			'separator' => true,
-			'v' => $title
-		));
+			'v' => $title,
+		]];
 	}
 
 	/**
@@ -1264,12 +1244,12 @@ protected function addSeparator($title = '', $custom_table = null)
 	 */
 	protected function finishTables(): void
 	{
-		if (empty($this->tables))
+		if (empty($this->tables)) {
 			return;
+		}
 
 		// Loop through each table counting up some basic values, to help with the templating.
-		foreach ($this->tables as $id => $table)
-		{
+		foreach ($this->tables as $id => $table) {
 			$this->tables[$id]['id'] = $id;
 			$this->tables[$id]['row_count'] = count($table['data']);
 
@@ -1278,16 +1258,11 @@ protected function finishTables(): void
 			$this->tables[$id]['column_count'] = count($curElement);
 
 			// Work out the rough width - for templates like the print template. Without this we might get funny tables.
-			if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto')
-			{
+			if ($table['shading']['left'] && $table['width']['shaded'] != 'auto' && $table['width']['normal'] != 'auto') {
 				$this->tables[$id]['max_width'] = $table['width']['shaded'] + ($this->tables[$id]['column_count'] - 1) * $table['width']['normal'];
-			}
-			elseif ($table['width']['normal'] != 'auto')
-			{
+			} elseif ($table['width']['normal'] != 'auto') {
 				$this->tables[$id]['max_width'] = $this->tables[$id]['column_count'] * $table['width']['normal'];
-			}
-			else
-			{
+			} else {
 				$this->tables[$id]['max_width'] = 'auto';
 			}
 		}
@@ -1309,7 +1284,7 @@ protected function finishTables(): void
 	 * @param array $keys The keys
 	 * @param bool $reverse Whether we want to use the values as the keys
 	 */
-	protected function setKeys($method = 'rows', $keys = array(), $reverse = false): void
+	protected function setKeys($method = 'rows', $keys = [], $reverse = false): void
 	{
 		// Do we want to use the keys of the keys as the keys? :P
 		$this->keys = $reverse ? array_flip($keys) : $keys;
@@ -1320,7 +1295,8 @@ protected function setKeys($method = 'rows', $keys = array(), $reverse = false):
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Reports::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Reports::exportStatic')) {
 	Reports::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Search.php b/Sources/Actions/Admin/Search.php
index 7cbe8c8c15..30c5e53929 100644
--- a/Sources/Actions/Admin/Search.php
+++ b/Sources/Actions/Admin/Search.php
@@ -13,19 +13,18 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
+use SMF\Search\SearchApi;
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * The admin screen to change the search settings.
@@ -39,13 +38,14 @@ class Search implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageSearch',
-			'getConfigVars' => false,
-		),
-	);
+			'editWeights' => 'EditWeights',
+			'editSearchMethod' => 'EditSearchMethod',
+			'createMessageIndex' => 'CreateMessageIndex',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -74,7 +74,7 @@ class Search implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'settings' => 'settings',
 		'weights' => 'weights',
 		'method' => 'method',
@@ -82,7 +82,7 @@ class Search implements ActionInterface
 		'removecustom' => 'method',
 		'removefulltext' => 'method',
 		'createmsgindex' => 'createmsgindex',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -111,10 +111,11 @@ class Search implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -130,14 +131,12 @@ public function settings(): void
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// A form was submitted.
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_search_settings');
 
-			if (empty($_POST['search_results_per_page']))
-			{
+			if (empty($_POST['search_results_per_page'])) {
 				$_POST['search_results_per_page'] = !empty(Config::$modSettings['search_results_per_page']) ? Config::$modSettings['search_results_per_page'] : Config::$modSettings['defaultMaxMessages'];
 			}
 
@@ -167,43 +166,41 @@ public function weights()
 		Utils::$context['page_title'] = Lang::$txt['search_weights_title'];
 		Utils::$context['sub_template'] = 'modify_weights';
 
-		$factors = array(
+		$factors = [
 			'search_weight_frequency',
 			'search_weight_age',
 			'search_weight_length',
 			'search_weight_subject',
 			'search_weight_first_message',
 			'search_weight_sticky',
-		);
+		];
 
-		IntegrationHook::call('integrate_modify_search_weights', array(&$factors));
+		IntegrationHook::call('integrate_modify_search_weights', [&$factors]);
 
 		// A form was submitted.
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-msw');
 
 			IntegrationHook::call('integrate_save_search_weights');
 
-			$changes = array();
+			$changes = [];
 
-			foreach ($factors as $factor)
+			foreach ($factors as $factor) {
 				$changes[$factor] = (int) $_POST[$factor];
+			}
 
 			Config::updateModSettings($changes);
 		}
 
-		Utils::$context['relative_weights'] = array('total' => 0);
+		Utils::$context['relative_weights'] = ['total' => 0];
 
-		foreach ($factors as $factor)
-		{
-			Utils::$context['relative_weights']['total'] += isset(Config::$modSettings[$factor]) ? Config::$modSettings[$factor] : 0;
+		foreach ($factors as $factor) {
+			Utils::$context['relative_weights']['total'] += Config::$modSettings[$factor] ?? 0;
 		}
 
-		foreach ($factors as $factor)
-		{
-			Utils::$context['relative_weights'][$factor] = round(100 * (isset(Config::$modSettings[$factor]) ? Config::$modSettings[$factor] : 0) / Utils::$context['relative_weights']['total'], 1);
+		foreach ($factors as $factor) {
+			Utils::$context['relative_weights'][$factor] = round(100 * (Config::$modSettings[$factor] ?? 0) / Utils::$context['relative_weights']['total'], 1);
 		}
 
 		SecurityToken::create('admin-msw');
@@ -227,170 +224,160 @@ public function method()
 		Utils::$context['search_apis'] = SearchApi::detect();
 
 		// Detect whether a fulltext index is set.
-		if (Utils::$context['supports_fulltext'])
+		if (Utils::$context['supports_fulltext']) {
 			$this->detectFulltextIndex();
+		}
 
-		if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'createfulltext')
-		{
+		if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'createfulltext') {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-msm', 'get');
 
-			if (Config::$db_type == 'postgresql')
-			{
-				Db::$db->query('', '
-					DROP INDEX IF EXISTS {db_prefix}messages_ftx',
-					array(
+			if (Config::$db_type == 'postgresql') {
+				Db::$db->query(
+					'',
+					'DROP INDEX IF EXISTS {db_prefix}messages_ftx',
+					[
 						'db_error_skip' => true,
-					)
+					],
 				);
 
 				$language_ftx = Db::$db->search_language();
 
-				Db::$db->query('', '
-					CREATE INDEX {db_prefix}messages_ftx ON {db_prefix}messages
+				Db::$db->query(
+					'',
+					'CREATE INDEX {db_prefix}messages_ftx ON {db_prefix}messages
 					USING gin(to_tsvector({string:language},body))',
-					array(
-						'language' => $language_ftx
-					)
+					[
+						'language' => $language_ftx,
+					],
 				);
-			}
-			else
-			{
+			} else {
 				// Make sure it's gone before creating it.
-				Db::$db->query('', '
-					ALTER TABLE {db_prefix}messages
+				Db::$db->query(
+					'',
+					'ALTER TABLE {db_prefix}messages
 					DROP INDEX body',
-					array(
+					[
 						'db_error_skip' => true,
-					)
+					],
 				);
 
-				Db::$db->query('', '
-					ALTER TABLE {db_prefix}messages
+				Db::$db->query(
+					'',
+					'ALTER TABLE {db_prefix}messages
 					ADD FULLTEXT body (body)',
-					array(
-					)
+					[
+					],
 				);
 			}
 
 			Utils::redirectexit('action=admin;area=managesearch;sa=method');
-		}
-		elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty(Utils::$context['fulltext_index']))
-		{
+		} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty(Utils::$context['fulltext_index'])) {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-msm', 'get');
 
-			if (Config::$db_type == 'postgresql')
-			{
-				Db::$db->query('', '
-					DROP INDEX IF EXISTS {db_prefix}messages_ftx',
-					array(
+			if (Config::$db_type == 'postgresql') {
+				Db::$db->query(
+					'',
+					'DROP INDEX IF EXISTS {db_prefix}messages_ftx',
+					[
 						'db_error_skip' => true,
-					)
+					],
 				);
-			}
-			else
-			{
-				Db::$db->query('', '
-					ALTER TABLE {db_prefix}messages
+			} else {
+				Db::$db->query(
+					'',
+					'ALTER TABLE {db_prefix}messages
 					DROP INDEX ' . implode(',
 					DROP INDEX ', Utils::$context['fulltext_index']),
-					array(
+					[
 						'db_error_skip' => true,
-					)
+					],
 				);
 			}
 
 			// Go back to the default search method.
-			if (!empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == 'fulltext')
-			{
-				Config::updateModSettings(array(
+			if (!empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == 'fulltext') {
+				Config::updateModSettings([
 					'search_index' => '',
-				));
+				]);
 			}
 
 			Utils::redirectexit('action=admin;area=managesearch;sa=method');
-		}
-		elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
-		{
+		} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom') {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-msm', 'get');
 
 			$tables = Db::$db->list_tables(false, Db::$db->prefix . 'log_search_words');
 
-			if (!empty($tables))
-			{
-				Db::$db->search_query('drop_words_table', '
+			if (!empty($tables)) {
+				Db::$db->search_query(
+					'drop_words_table',
+					'
 					DROP TABLE {db_prefix}log_search_words',
-					array(
-					)
+					[
+					],
 				);
 			}
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'search_custom_index_config' => '',
 				'search_custom_index_resume' => '',
-			));
+			]);
 
 			// Go back to the default search method.
-			if (!empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == 'custom')
-			{
-				Config::updateModSettings(array(
+			if (!empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == 'custom') {
+				Config::updateModSettings([
 					'search_index' => '',
-				));
+				]);
 			}
 
 			Utils::redirectexit('action=admin;area=managesearch;sa=method');
-		}
-		elseif (isset($_POST['save']))
-		{
+		} elseif (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-msmpost');
 
-			Config::updateModSettings(array(
-				'search_index' => empty($_POST['search_index']) || (!in_array($_POST['search_index'], array('fulltext', 'custom')) && !isset(Utils::$context['search_apis'][$_POST['search_index']])) ? '' : $_POST['search_index'],
+			Config::updateModSettings([
+				'search_index' => empty($_POST['search_index']) || (!in_array($_POST['search_index'], ['fulltext', 'custom']) && !isset(Utils::$context['search_apis'][$_POST['search_index']])) ? '' : $_POST['search_index'],
 				'search_force_index' => isset($_POST['search_force_index']) ? '1' : '0',
 				'search_match_words' => isset($_POST['search_match_words']) ? '1' : '0',
-			));
+			]);
 
 			Utils::redirectexit('action=admin;area=managesearch;sa=method');
 		}
 
-		Utils::$context['table_info'] = array(
+		Utils::$context['table_info'] = [
 			'data_length' => 0,
 			'index_length' => 0,
 			'fulltext_length' => 0,
 			'custom_index_length' => 0,
-		);
+		];
 
 		// Get some info about the messages table, to show its size and index size.
-		if (Config::$db_type == 'mysql')
-		{
-			if (preg_match('~^`(.+?)`\.(.+?)$~', Db::$db->prefix, $match) !== 0)
-			{
-				$request = Db::$db->query('', '
-					SHOW TABLE STATUS
+		if (Config::$db_type == 'mysql') {
+			if (preg_match('~^`(.+?)`\.(.+?)$~', Db::$db->prefix, $match) !== 0) {
+				$request = Db::$db->query(
+					'',
+					'SHOW TABLE STATUS
 					FROM {string:database_name}
 					LIKE {string:table_name}',
-					array(
-						'database_name' => '`' . strtr($match[1], array('`' => '')) . '`',
-						'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
-					)
+					[
+						'database_name' => '`' . strtr($match[1], ['`' => '']) . '`',
+						'table_name' => str_replace('_', '\\_', $match[2]) . 'messages',
+					],
 				);
-			}
-			else
-			{
-				$request = Db::$db->query('', '
-					SHOW TABLE STATUS
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SHOW TABLE STATUS
 					LIKE {string:table_name}',
-					array(
-						'table_name' => str_replace('_', '\_', Db::$db->prefix) . 'messages',
-					)
+					[
+						'table_name' => str_replace('_', '\\_', Db::$db->prefix) . 'messages',
+					],
 				);
 			}
 
-			if ($request !== false && Db::$db->num_rows($request) == 1)
-			{
+			if ($request !== false && Db::$db->num_rows($request) == 1) {
 				// Only do this if the user has permission to execute this query.
 				$row = Db::$db->fetch_assoc($request);
 				Utils::$context['table_info']['data_length'] = $row['Data_length'];
@@ -400,49 +387,46 @@ public function method()
 			}
 
 			// Now check the custom index table, if it exists at all.
-			if (preg_match('~^`(.+?)`\.(.+?)$~', Db::$db->prefix, $match) !== 0)
-			{
-				$request = Db::$db->query('', '
-					SHOW TABLE STATUS
+			if (preg_match('~^`(.+?)`\.(.+?)$~', Db::$db->prefix, $match) !== 0) {
+				$request = Db::$db->query(
+					'',
+					'SHOW TABLE STATUS
 					FROM {string:database_name}
 					LIKE {string:table_name}',
-					array(
-						'database_name' => '`' . strtr($match[1], array('`' => '')) . '`',
-						'table_name' => str_replace('_', '\_', $match[2]) . 'log_search_words',
-					)
+					[
+						'database_name' => '`' . strtr($match[1], ['`' => '']) . '`',
+						'table_name' => str_replace('_', '\\_', $match[2]) . 'log_search_words',
+					],
 				);
-			}
-			else
-			{
-				$request = Db::$db->query('', '
-					SHOW TABLE STATUS
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SHOW TABLE STATUS
 					LIKE {string:table_name}',
-					array(
-						'table_name' => str_replace('_', '\_', Db::$db->prefix) . 'log_search_words',
-					)
+					[
+						'table_name' => str_replace('_', '\\_', Db::$db->prefix) . 'log_search_words',
+					],
 				);
 			}
 
-			if ($request !== false && Db::$db->num_rows($request) == 1)
-			{
+			if ($request !== false && Db::$db->num_rows($request) == 1) {
 				// Only do this if the user has permission to execute this query.
 				$row = Db::$db->fetch_assoc($request);
 				Utils::$context['table_info']['index_length'] += $row['Data_length'] + $row['Index_length'];
 				Utils::$context['table_info']['custom_index_length'] = $row['Data_length'] + $row['Index_length'];
 				Db::$db->free_result($request);
 			}
-		}
-		elseif (Config::$db_type == 'postgresql')
-		{
+		} elseif (Config::$db_type == 'postgresql') {
 			// In order to report the sizes correctly we need to perform vacuum (optimize) on the tables we will be using.
-			//$temp_tables = Db::$db->list_tables();
-			//foreach ($temp_tables as $table)
+			// $temp_tables = Db::$db->list_tables();
+			// foreach ($temp_tables as $table)
 			//	if ($table == Db::$db->prefix. 'messages' || $table == Db::$db->prefix. 'log_search_words')
 			//		Db::$db->optimize_table($table);
 
 			// PostGreSql has some hidden sizes.
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					indexname,
 					pg_relation_size(quote_ident(t.tablename)::text) AS table_size,
 					pg_relation_size(quote_ident(indexrelname)::text) AS index_size
@@ -457,58 +441,49 @@ public function method()
 						ON t.tablename = foo.ctablename
 				WHERE t.schemaname= {string:schema} and (
 					indexname = {string:messages_ftx} OR indexname = {string:log_search_words} )',
-				array(
+				[
 					'messages_ftx' => Db::$db->prefix . 'messages_ftx',
 					'log_search_words' => Db::$db->prefix . 'log_search_words',
 					'schema' => 'public',
-				)
+				],
 			);
 
-			if ($request !== false && Db::$db->num_rows($request) > 0)
-			{
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if ($row['indexname'] == Db::$db->prefix . 'messages_ftx')
-					{
+			if ($request !== false && Db::$db->num_rows($request) > 0) {
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if ($row['indexname'] == Db::$db->prefix . 'messages_ftx') {
 						Utils::$context['table_info']['data_length'] = (int) $row['table_size'];
 						Utils::$context['table_info']['index_length'] = (int) $row['index_size'];
 						Utils::$context['table_info']['fulltext_length'] = (int) $row['index_size'];
-					}
-					elseif ($row['indexname'] == Db::$db->prefix . 'log_search_words')
-					{
+					} elseif ($row['indexname'] == Db::$db->prefix . 'log_search_words') {
 						Utils::$context['table_info']['index_length'] = (int) $row['index_size'];
 						Utils::$context['table_info']['custom_index_length'] = (int) $row['index_size'];
 					}
 				}
 				Db::$db->free_result($request);
-			}
-			else
-			{
+			} else {
 				// Didn't work for some reason...
-				Utils::$context['table_info'] = array(
+				Utils::$context['table_info'] = [
 					'data_length' => Lang::$txt['not_applicable'],
 					'index_length' => Lang::$txt['not_applicable'],
 					'fulltext_length' => Lang::$txt['not_applicable'],
 					'custom_index_length' => Lang::$txt['not_applicable'],
-				);
+				];
 			}
-		}
-		else
-		{
-			Utils::$context['table_info'] = array(
+		} else {
+			Utils::$context['table_info'] = [
 				'data_length' => Lang::$txt['not_applicable'],
 				'index_length' => Lang::$txt['not_applicable'],
 				'fulltext_length' => Lang::$txt['not_applicable'],
 				'custom_index_length' => Lang::$txt['not_applicable'],
-			);
+			];
 		}
 
 		// Format the data and index length in kilobytes.
-		foreach (Utils::$context['table_info'] as $type => $size)
-		{
+		foreach (Utils::$context['table_info'] as $type => $size) {
 			// If it's not numeric then just break.  This database engine doesn't support size.
-			if (!is_numeric($size))
+			if (!is_numeric($size)) {
 				break;
+			}
 
 			Utils::$context['table_info'][$type] = Lang::numberFormat(Utils::$context['table_info'][$type] / 1024) . ' ' . Lang::$txt['search_method_kilobytes'];
 		}
@@ -533,159 +508,149 @@ public function createmsgindex()
 		// Scotty, we need more time...
 		@set_time_limit(600);
 
-		if (function_exists('apache_reset_timeout'))
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		Menu::$loaded['admin']['current_subsection'] = 'method';
 		Utils::$context['page_title'] = Lang::$txt['search_index_custom'];
 
 		$messages_per_batch = 50;
 
-		$index_properties = array(
-			2 => array(
+		$index_properties = [
+			2 => [
 				'column_definition' => 'small',
 				'step_size' => 1000000,
-			),
-			4 => array(
+			],
+			4 => [
 				'column_definition' => 'medium',
 				'step_size' => 1000000,
 				'max_size' => 16777215,
-			),
-			5 => array(
+			],
+			5 => [
 				'column_definition' => 'large',
 				'step_size' => 100000000,
 				'max_size' => 2000000000,
-			),
-		);
+			],
+		];
 
-		if (isset($_REQUEST['resume']) && !empty(Config::$modSettings['search_custom_index_resume']))
-		{
+		if (isset($_REQUEST['resume']) && !empty(Config::$modSettings['search_custom_index_resume'])) {
 			Utils::$context['index_settings'] = Utils::jsonDecode(Config::$modSettings['search_custom_index_resume'], true);
 			Utils::$context['start'] = (int) Utils::$context['index_settings']['resume_at'];
 
 			unset(Utils::$context['index_settings']['resume_at']);
 
 			Utils::$context['step'] = 1;
-		}
-		else
-		{
-			Utils::$context['index_settings'] = array(
+		} else {
+			Utils::$context['index_settings'] = [
 				'bytes_per_word' => isset($_REQUEST['bytes_per_word']) && isset($index_properties[$_REQUEST['bytes_per_word']]) ? (int) $_REQUEST['bytes_per_word'] : 2,
-			);
+			];
 
 			Utils::$context['start'] = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] : 0;
 			Utils::$context['step'] = isset($_REQUEST['step']) ? (int) $_REQUEST['step'] : 0;
 
 			// admin timeouts are painful when building these long indexes - but only if we actually have such things enabled
-			if (empty(Config::$modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && Utils::$context['step'] >= 1)
-			{
+			if (empty(Config::$modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && Utils::$context['step'] >= 1) {
 				$_SESSION['admin_time'] = time();
 			}
 		}
 
-		if (Utils::$context['step'] !== 0)
+		if (Utils::$context['step'] !== 0) {
 			User::$me->checkSession('request');
+		}
 
 		// Step 0: let the user determine how they like their index.
-		if (Utils::$context['step'] === 0)
-		{
+		if (Utils::$context['step'] === 0) {
 			Utils::$context['sub_template'] = 'create_index';
 		}
 
 		// Step 1: insert all the words.
-		if (Utils::$context['step'] === 1)
-		{
+		if (Utils::$context['step'] === 1) {
 			Utils::$context['sub_template'] = 'create_index_progress';
 
-			if (Utils::$context['start'] === 0)
-			{
+			if (Utils::$context['start'] === 0) {
 				$tables = Db::$db->list_tables(false, Db::$db->prefix . 'log_search_words');
 
-				if (!empty($tables))
-				{
-					Db::$db->search_query('drop_words_table', '
+				if (!empty($tables)) {
+					Db::$db->search_query(
+						'drop_words_table',
+						'
 						DROP TABLE {db_prefix}log_search_words',
-						array(
-						)
+						[
+						],
 					);
 				}
 
 				Db::$db->create_word_search($index_properties[Utils::$context['index_settings']['bytes_per_word']]['column_definition']);
 
 				// Temporarily switch back to not using a search index.
-				if (!empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == 'custom')
-				{
-					Config::updateModSettings(array('search_index' => ''));
+				if (!empty(Config::$modSettings['search_index']) && Config::$modSettings['search_index'] == 'custom') {
+					Config::updateModSettings(['search_index' => '']);
 				}
 
 				// Don't let simultanious processes be updating the search index.
-				if (!empty(Config::$modSettings['search_custom_index_config']))
-				{
-					Config::updateModSettings(array('search_custom_index_config' => ''));
+				if (!empty(Config::$modSettings['search_custom_index_config'])) {
+					Config::updateModSettings(['search_custom_index_config' => '']);
 				}
 			}
 
-			$num_messages = array(
+			$num_messages = [
 				'done' => 0,
 				'todo' => 0,
-			);
+			];
 
-			$request = Db::$db->query('', '
-				SELECT id_msg >= {int:starting_id} AS todo, COUNT(*) AS num_messages
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg >= {int:starting_id} AS todo, COUNT(*) AS num_messages
 				FROM {db_prefix}messages
 				GROUP BY todo',
-				array(
+				[
 					'starting_id' => Utils::$context['start'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($num_messages['todo']))
-			{
+			if (empty($num_messages['todo'])) {
 				Utils::$context['step'] = 2;
 				Utils::$context['percentage'] = 80;
 				Utils::$context['start'] = 0;
-			}
-			else
-			{
+			} else {
 				// Number of seconds before the next step.
 				$stop = time() + 3;
 
-				while (time() < $stop)
-				{
-					$inserts = array();
+				while (time() < $stop) {
+					$inserts = [];
 					$forced_break = false;
 					$number_processed = 0;
 
-					$request = Db::$db->query('', '
-						SELECT id_msg, body
+					$request = Db::$db->query(
+						'',
+						'SELECT id_msg, body
 						FROM {db_prefix}messages
 						WHERE id_msg BETWEEN {int:starting_id} AND {int:ending_id}
 						LIMIT {int:limit}',
-						array(
+						[
 							'starting_id' => Utils::$context['start'],
 							'ending_id' => Utils::$context['start'] + $messages_per_batch - 1,
 							'limit' => $messages_per_batch,
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
+
+					while ($row = Db::$db->fetch_assoc($request)) {
 						// In theory it's possible for one of these to take friggin ages so add more timeout protection.
-						if ($stop < time())
-						{
+						if ($stop < time()) {
 							$forced_break = true;
 							break;
 						}
 
 						$number_processed++;
 
-						foreach (Utils::text2words($row['body'], Utils::$context['index_settings']['bytes_per_word'], true) as $id_word)
-						{
-							$inserts[] = array($id_word, $row['id_msg']);
+						foreach (Utils::text2words($row['body'], Utils::$context['index_settings']['bytes_per_word'], true) as $id_word) {
+							$inserts[] = [$id_word, $row['id_msg']];
 						}
 					}
 					$num_messages['done'] += $number_processed;
@@ -694,26 +659,23 @@ public function createmsgindex()
 
 					Utils::$context['start'] += $forced_break ? $number_processed : $messages_per_batch;
 
-					if (!empty($inserts))
-					{
-						Db::$db->insert('ignore',
+					if (!empty($inserts)) {
+						Db::$db->insert(
+							'ignore',
 							'{db_prefix}log_search_words',
-							array('id_word' => 'int', 'id_msg' => 'int'),
+							['id_word' => 'int', 'id_msg' => 'int'],
 							$inserts,
-							array('id_word', 'id_msg')
+							['id_word', 'id_msg'],
 						);
 					}
 
-					if ($num_messages['todo'] === 0)
-					{
+					if ($num_messages['todo'] === 0) {
 						Utils::$context['step'] = 2;
 						Utils::$context['start'] = 0;
 						break;
 					}
-					else
-					{
-						Config::updateModSettings(array('search_custom_index_resume' => Utils::jsonEncode(array_merge(Utils::$context['index_settings'], array('resume_at' => Utils::$context['start'])))));
-					}
+
+					Config::updateModSettings(['search_custom_index_resume' => Utils::jsonEncode(array_merge(Utils::$context['index_settings'], ['resume_at' => Utils::$context['start']]))]);
 				}
 
 				// Since there are still two steps to go, 80% is the maximum here.
@@ -721,15 +683,11 @@ public function createmsgindex()
 			}
 		}
 		// Step 2: removing the words that occur too often and are of no use.
-		elseif (Utils::$context['step'] === 2)
-		{
-			if (Utils::$context['index_settings']['bytes_per_word'] < 4)
-			{
+		elseif (Utils::$context['step'] === 2) {
+			if (Utils::$context['index_settings']['bytes_per_word'] < 4) {
 				Utils::$context['step'] = 3;
-			}
-			else
-			{
-				$stop_words = Utils::$context['start'] === 0 || empty(Config::$modSettings['search_stopwords']) ? array() : explode(',', Config::$modSettings['search_stopwords']);
+			} else {
+				$stop_words = Utils::$context['start'] === 0 || empty(Config::$modSettings['search_stopwords']) ? [] : explode(',', Config::$modSettings['search_stopwords']);
 
 				$stop = time() + 3;
 
@@ -737,43 +695,42 @@ public function createmsgindex()
 
 				$max_messages = ceil(60 * Config::$modSettings['totalMessages'] / 100);
 
-				while (time() < $stop)
-				{
-					$request = Db::$db->query('', '
-						SELECT id_word, COUNT(id_word) AS num_words
+				while (time() < $stop) {
+					$request = Db::$db->query(
+						'',
+						'SELECT id_word, COUNT(id_word) AS num_words
 						FROM {db_prefix}log_search_words
 						WHERE id_word BETWEEN {int:starting_id} AND {int:ending_id}
 						GROUP BY id_word
 						HAVING COUNT(id_word) > {int:minimum_messages}',
-						array(
+						[
 							'starting_id' => Utils::$context['start'],
 							'ending_id' => Utils::$context['start'] + $index_properties[Utils::$context['index_settings']['bytes_per_word']]['step_size'] - 1,
 							'minimum_messages' => $max_messages,
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
+
+					while ($row = Db::$db->fetch_assoc($request)) {
 						$stop_words[] = $row['id_word'];
 					}
 					Db::$db->free_result($request);
 
-					Config::updateModSettings(array('search_stopwords' => implode(',', $stop_words)));
+					Config::updateModSettings(['search_stopwords' => implode(',', $stop_words)]);
 
-					if (!empty($stop_words))
-					{
-						Db::$db->query('', '
-							DELETE FROM {db_prefix}log_search_words
+					if (!empty($stop_words)) {
+						Db::$db->query(
+							'',
+							'DELETE FROM {db_prefix}log_search_words
 							WHERE id_word in ({array_int:stop_words})',
-							array(
+							[
 								'stop_words' => $stop_words,
-							)
+							],
 						);
 					}
 
 					Utils::$context['start'] += $index_properties[Utils::$context['index_settings']['bytes_per_word']]['step_size'];
 
-					if (Utils::$context['start'] > $index_properties[Utils::$context['index_settings']['bytes_per_word']]['max_size'])
-					{
+					if (Utils::$context['start'] > $index_properties[Utils::$context['index_settings']['bytes_per_word']]['max_size']) {
 						Utils::$context['step'] = 3;
 						break;
 					}
@@ -784,18 +741,18 @@ public function createmsgindex()
 		}
 
 		// Step 3: remove words not distinctive enough.
-		if (Utils::$context['step'] === 3)
-		{
+		if (Utils::$context['step'] === 3) {
 			Utils::$context['sub_template'] = 'create_index_done';
 
-			Config::updateModSettings(array('search_index' => 'custom', 'search_custom_index_config' => Utils::jsonEncode(Utils::$context['index_settings'])));
+			Config::updateModSettings(['search_index' => 'custom', 'search_custom_index_config' => Utils::jsonEncode(Utils::$context['index_settings'])]);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}settings
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}settings
 				WHERE variable = {string:search_custom_index_resume}',
-				array(
+				[
 					'search_custom_index_resume' => 'search_custom_index_resume',
-				)
+				],
 			);
 		}
 	}
@@ -806,10 +763,10 @@ public function createmsgindex()
 	 */
 	public function detectFulltextIndex()
 	{
-		if (Db::$db->title === POSTGRE_TITLE)
-		{
-			$request = Db::$db->query('', '
-				SELECT
+		if (Db::$db->title === POSTGRE_TITLE) {
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					indexname
 				FROM pg_tables t
 					LEFT OUTER JOIN
@@ -820,73 +777,65 @@ public function detectFulltextIndex()
 						AS foo
 						ON t.tablename = foo.ctablename
 				WHERE t.schemaname= {string:schema} and indexname = {string:messages_ftx}',
-				array(
+				[
 					'schema' => 'public',
 					'messages_ftx' => Db::$db->prefix . 'messages_ftx',
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['fulltext_index'][] = $row['indexname'];
 			}
 			Db::$db->free_result($request);
-		}
-		else
-		{
-			Utils::$context['fulltext_index'] = array();
+		} else {
+			Utils::$context['fulltext_index'] = [];
 
-			$request = Db::$db->query('', '
-				SHOW INDEX
+			$request = Db::$db->query(
+				'',
+				'SHOW INDEX
 				FROM {db_prefix}messages',
-				array(
-				)
+				[
+				],
 			);
-			if ($request !== false || Db::$db->num_rows($request) != 0)
-			{
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
-					{
+
+			if ($request !== false || Db::$db->num_rows($request) != 0) {
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT')) {
 						Utils::$context['fulltext_index'][] = $row['Key_name'];
 					}
 				}
 				Db::$db->free_result($request);
 
-				if (is_array(Utils::$context['fulltext_index']))
-				{
+				if (is_array(Utils::$context['fulltext_index'])) {
 					Utils::$context['fulltext_index'] = array_unique(Utils::$context['fulltext_index']);
 				}
 			}
 
-			if (preg_match('~^`(.+?)`\.(.+?)$~', Db::$db->prefix, $match) !== 0)
-			{
-				$request = Db::$db->query('', '
-					SHOW TABLE STATUS
+			if (preg_match('~^`(.+?)`\.(.+?)$~', Db::$db->prefix, $match) !== 0) {
+				$request = Db::$db->query(
+					'',
+					'SHOW TABLE STATUS
 					FROM {string:database_name}
 					LIKE {string:table_name}',
-					array(
-						'database_name' => '`' . strtr($match[1], array('`' => '')) . '`',
-						'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
-					)
+					[
+						'database_name' => '`' . strtr($match[1], ['`' => '']) . '`',
+						'table_name' => str_replace('_', '\\_', $match[2]) . 'messages',
+					],
 				);
-			}
-			else
-			{
-				$request = Db::$db->query('', '
-					SHOW TABLE STATUS
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SHOW TABLE STATUS
 					LIKE {string:table_name}',
-					array(
-						'table_name' => str_replace('_', '\_', Db::$db->prefix) . 'messages',
-					)
+					[
+						'table_name' => str_replace('_', '\\_', Db::$db->prefix) . 'messages',
+					],
 				);
 			}
 
-			if ($request !== false)
-			{
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare(Db::$db->get_version(), '5.6.4', '>=')))
-					{
+			if ($request !== false) {
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare(Db::$db->get_version(), '5.6.4', '>='))) {
 						Utils::$context['cannot_create_fulltext'] = true;
 					}
 				}
@@ -907,8 +856,9 @@ public function detectFulltextIndex()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -929,25 +879,26 @@ public static function call(): void
 	public static function getConfigVars(): array
 	{
 		// What are we editing anyway?
-		$config_vars = array(
+		$config_vars = [
 			// Permission...
-			array('permissions', 'search_posts'),
+			['permissions', 'search_posts'],
 			// Some simple settings.
-			array('int', 'search_results_per_page'),
-			array('int', 'search_max_results', 'subtext' => Lang::$txt['search_max_results_disable']),
+			['int', 'search_results_per_page'],
+			['int', 'search_max_results', 'subtext' => Lang::$txt['search_max_results_disable']],
 			'',
 
 			// Some limitations.
-			array('int', 'search_floodcontrol_time', 'subtext' => Lang::$txt['search_floodcontrol_time_desc'], 6, 'postinput' => Lang::$txt['seconds']),
-		);
+			['int', 'search_floodcontrol_time', 'subtext' => Lang::$txt['search_floodcontrol_time_desc'], 6, 'postinput' => Lang::$txt['seconds']],
+		];
 
-		IntegrationHook::call('integrate_modify_search_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_search_settings', [&$config_vars]);
 
 		// Perhaps the search method wants to add some settings?
 		$searchAPI = SearchApi::load();
 
-		if (is_callable(array($searchAPI, 'searchSettings')))
-			call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+		if (is_callable([$searchAPI, 'searchSettings'])) {
+			call_user_func_array([$searchAPI, 'searchSettings'], [&$config_vars]);
+		}
 
 		return $config_vars;
 	}
@@ -958,7 +909,7 @@ public static function getConfigVars(): array
 	 * @param bool $return_config Whether or not to return the config_vars array (used for admin search)
 	 * @return void|array Returns nothing or returns the $config_vars array if $return_config is true
 	 */
-	 public function editSearchSettings($return_config = false)
+	public function editSearchSettings($return_config = false)
 	{
 		self::load();
 		self::$obj->subaction = '';
@@ -1010,34 +961,36 @@ protected function __construct()
 		Theme::loadTemplate('ManageSearch');
 
 		// Create the tabs for the template.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['manage_search'],
 			'help' => 'search',
 			'description' => Lang::$txt['search_settings_desc'],
-			'tabs' => array(
-				'weights' => array(
+			'tabs' => [
+				'weights' => [
 					'description' => Lang::$txt['search_weights_desc'],
-				),
-				'method' => array(
+				],
+				'method' => [
 					'description' => Lang::$txt['search_method_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['search_settings_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		IntegrationHook::call('integrate_manage_search', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_search', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		Utils::$context['sub_action'] = $this->subaction;
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Search::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Search::exportStatic')) {
 	Search::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/SearchEngines.php b/Sources/Actions/Admin/SearchEngines.php
index fd035cea44..d27064ec16 100644
--- a/Sources/Actions/Admin/SearchEngines.php
+++ b/Sources/Actions/Admin/SearchEngines.php
@@ -13,10 +13,12 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Who;
+use SMF\BackwardCompatibility;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\IP;
 use SMF\ItemList;
@@ -27,9 +29,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Who;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Manages the settings related to search engines.
@@ -43,13 +42,24 @@ class SearchEngines implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'SearchEngines',
-			'getConfigVars' => false,
-		),
-	);
+			'consolidateSpiderStats' => 'consolidateSpiderStats',
+			'list_getSpiders' => 'list_getSpiders',
+			'list_getNumSpiders' => 'list_getNumSpiders',
+			'list_getSpiderLogs' => 'list_getSpiderLogs',
+			'list_getNumSpiderLogs' => 'list_getNumSpiderLogs',
+			'list_getSpiderStats' => 'list_getSpiderStats',
+			'list_getNumSpiderStats' => 'list_getNumSpiderStats',
+			'recacheSpiderNames' => 'recacheSpiderNames',
+			'spiderStats' => 'SpiderStats',
+			'spiderLogs' => 'SpiderLogs',
+			'viewSpiders' => 'ViewSpiders',
+			'manageSearchEngineSettings' => 'ManageSearchEngineSettings',
+			'editSpider' => 'EditSpider',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -78,13 +88,13 @@ class SearchEngines implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'stats' => 'stats',
 		'logs' => 'logs',
 		'spiders' => 'view',
 		'settings' => 'settings',
 		'editspiders' => 'edit',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -120,10 +130,11 @@ class SearchEngines implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -132,39 +143,39 @@ public function execute(): void
 	public function stats(): void
 	{
 		// Force an update of the stats every 60 seconds.
-		if (!isset($_SESSION['spider_stat']) || $_SESSION['spider_stat'] < time() - 60)
-		{
+		if (!isset($_SESSION['spider_stat']) || $_SESSION['spider_stat'] < time() - 60) {
 			self::consolidateSpiderStats();
 			$_SESSION['spider_stat'] = time();
 		}
 
 		// Are we cleaning up some old stats?
-		if (!empty($_POST['delete_entries']) && isset($_POST['older']))
-		{
+		if (!empty($_POST['delete_entries']) && isset($_POST['older'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-ss');
 
 			$deleteTime = time() - (((int) $_POST['older']) * 24 * 60 * 60);
 
 			// Delete the entires.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_spider_stats
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_spider_stats
 				WHERE last_seen < {int:delete_period}',
-				array(
+				[
 					'delete_period' => $deleteTime,
-				)
+				],
 			);
 		}
 
 		// Get the earliest and latest dates.
-		$request = Db::$db->query('', '
-			SELECT MIN(stat_date) AS first_date, MAX(stat_date) AS last_date
+		$request = Db::$db->query(
+			'',
+			'SELECT MIN(stat_date) AS first_date, MAX(stat_date) AS last_date
 			FROM {db_prefix}log_spider_stats',
-			array(
-			)
+			[
+			],
 		);
 
-		list ($min_date, $max_date) = Db::$db->fetch_row($request);
+		list($min_date, $max_date) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		$min_year = (int) substr($min_date, 0, 4);
@@ -173,17 +184,18 @@ public function stats(): void
 		$max_month = (int) substr($max_date, 5, 2);
 
 		// Prepare the dates for the drop down.
-		$date_choices = array();
-		for ($y = $min_year; $y <= $max_year; $y++)
-		{
-			for ($m = 1; $m <= 12; $m++)
-			{
+		$date_choices = [];
+
+		for ($y = $min_year; $y <= $max_year; $y++) {
+			for ($m = 1; $m <= 12; $m++) {
 				// This doesn't count?
-				if ($y == $min_year && $m < $min_month)
+				if ($y == $min_year && $m < $min_month) {
 					continue;
+				}
 
-				if ($y == $max_year && $m > $max_month)
+				if ($y == $max_year && $m > $max_month) {
 					break;
+				}
 
 				$date_choices[$y . $m] = Lang::$txt['months_short'][$m] . ' ' . $y;
 			}
@@ -193,15 +205,15 @@ public function stats(): void
 		$current_date = isset($_REQUEST['new_date']) && isset($date_choices[$_REQUEST['new_date']]) ? $_REQUEST['new_date'] : $max_date;
 
 		// Prepare the HTML.
-		if (!empty($date_choices))
-		{
+		if (!empty($date_choices)) {
 			$date_select = '
 			' . Lang::$txt['spider_stats_select_month'] . ':
 			<select name="new_date" onchange="document.spider_stat_list.submit();">';
 
-			foreach ($date_choices as $id => $text)
+			foreach ($date_choices as $id => $text) {
 				$date_select .= '
 				<option value="' . $id . '"' . ($current_date == $id ? ' selected' : '') . '>' . $text . '</option>';
+			}
 
 			$date_select .= '
 			</select>
@@ -211,85 +223,85 @@ public function stats(): void
 		}
 
 		// If we manually jumped to a date work out the offset.
-		if (isset($_REQUEST['new_date']))
-		{
+		if (isset($_REQUEST['new_date'])) {
 			$date_query = sprintf('%04d-%02d-01', substr($current_date, 0, 4), substr($current_date, 4));
 
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}log_spider_stats
 				WHERE stat_date < {date:date_being_viewed}',
-				array(
+				[
 					'date_being_viewed' => $date_query,
-				)
+				],
 			);
 			list($_REQUEST['start']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'spider_stat_list',
 			'title' => Lang::$txt['spider_stats'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=sengines;sa=stats',
 			'default_sort_col' => 'stat_date',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getSpiderStats',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumSpiderStats',
-			),
+			],
 			'no_items_label' => Lang::$txt['spider_stats_no_entries'],
-			'columns' => array(
-				'stat_date' => array(
-					'header' => array(
+			'columns' => [
+				'stat_date' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'stat_date',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'stat_date',
 						'reverse' => 'stat_date DESC',
-					),
-				),
-				'name' => array(
-					'header' => array(
+					],
+				],
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['spider_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'spider_name',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 's.spider_name',
 						'reverse' => 's.spider_name DESC',
-					),
-				),
-				'page_hits' => array(
-					'header' => array(
+					],
+				],
+				'page_hits' => [
+					'header' => [
 						'value' => Lang::$txt['spider_stats_page_hits'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'page_hits',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'ss.page_hits',
 						'reverse' => 'ss.page_hits DESC',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=sengines;sa=stats',
 				'name' => 'spider_stat_list',
-			),
-			'additional_rows' => empty($date_select) ? array() : array(
-				array(
+			],
+			'additional_rows' => empty($date_select) ? [] : [
+				[
 					'position' => 'below_table_data',
 					'value' => $date_select,
 					'style' => 'text-align: right;',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		SecurityToken::create('admin-ss');
 
@@ -309,136 +321,124 @@ public function logs(): void
 		Theme::loadTemplate('ManageSearch');
 
 		// Did they want to delete some entries?
-		if ((!empty($_POST['delete_entries']) && isset($_POST['older'])) || !empty($_POST['removeAll']))
-		{
+		if ((!empty($_POST['delete_entries']) && isset($_POST['older'])) || !empty($_POST['removeAll'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-sl');
 
-			if (!empty($_POST['delete_entries']) && isset($_POST['older']))
-			{
+			if (!empty($_POST['delete_entries']) && isset($_POST['older'])) {
 				$deleteTime = time() - (((int) $_POST['older']) * 24 * 60 * 60);
 
 				// Delete the entires.
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_spider_hits
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_spider_hits
 					WHERE log_time < {int:delete_period}',
-					array(
+					[
 						'delete_period' => $deleteTime,
-					)
+					],
 				);
-			}
-			else
-			{
+			} else {
 				// Deleting all of them
-				Db::$db->query('', '
-					TRUNCATE TABLE {db_prefix}log_spider_hits',
-					array()
+				Db::$db->query(
+					'',
+					'TRUNCATE TABLE {db_prefix}log_spider_hits',
+					[],
 				);
 			}
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'spider_logs',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'title' => Lang::$txt['spider_logs'],
 			'no_items_label' => Lang::$txt['spider_logs_empty'],
 			'base_href' => Utils::$context['admin_area'] == 'sengines' ? Config::$scripturl . '?action=admin;area=sengines;sa=logs' : Config::$scripturl . '?action=admin;area=logs;sa=spiderlog',
 			'default_sort_col' => 'log_time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getSpiderLogs',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumSpiderLogs',
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['spider'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'spider_name',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 's.spider_name',
 						'reverse' => 's.spider_name DESC',
-					),
-				),
-				'log_time' => array(
-					'header' => array(
+					],
+				],
+				'log_time' => [
+					'header' => [
 						'value' => Lang::$txt['spider_time'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return Time::create('@' . $rowData['log_time'])->format();
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'sl.id_hit DESC',
 						'reverse' => 'sl.id_hit',
-					),
-				),
-				'viewing' => array(
-					'header' => array(
+					],
+				],
+				'viewing' => [
+					'header' => [
 						'value' => Lang::$txt['spider_viewing'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'url',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'token' => 'admin-sl',
 				'href' => Config::$scripturl . '?action=admin;area=sengines;sa=logs',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['spider_logs_info'],
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="removeAll" value="' . Lang::$txt['spider_log_empty_log'] . '" data-confirm="' . Lang::$txt['spider_log_empty_log_confirm'] . '" class="button you_sure">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		SecurityToken::create('admin-sl');
 
 		new ItemList($listOptions);
 
 		// Now determine the actions of the URLs.
-		if (!empty(Utils::$context['spider_logs']['rows']))
-		{
-			$urls = array();
+		if (!empty(Utils::$context['spider_logs']['rows'])) {
+			$urls = [];
 
 			// Grab the current /url.
-			foreach (Utils::$context['spider_logs']['rows'] as $k => $row)
-			{
+			foreach (Utils::$context['spider_logs']['rows'] as $k => $row) {
 				// Feature disabled?
-				if (empty($row['data']['viewing']['value']) && isset(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] < 3)
-				{
+				if (empty($row['data']['viewing']['value']) && isset(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] < 3) {
 					Utils::$context['spider_logs']['rows'][$k]['viewing']['value'] = '<em>' . Lang::$txt['spider_disabled'] . '</em>';
-				}
-				else
-				{
-					$urls[$k] = array($row['data']['viewing']['value'], -1);
+				} else {
+					$urls[$k] = [$row['data']['viewing']['value'], -1];
 				}
 			}
 
 			// Now stick in the new URLs.
 			$urls = Who::determineActions($urls, 'whospider_');
 
-			foreach ($urls as $k => $new_url)
-			{
-				if (is_array($new_url))
-				{
+			foreach ($urls as $k => $new_url) {
+				if (is_array($new_url)) {
 					Utils::$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = Lang::$txt[$new_url['label']];
 
 					Utils::$context['spider_logs']['rows'][$k]['data']['viewing']['class'] = $new_url['class'];
-				}
-				else
-				{
+				} else {
 					Utils::$context['spider_logs']['rows'][$k]['data']['viewing']['value'] = $new_url;
 				}
 			}
@@ -454,52 +454,54 @@ public function logs(): void
 	 */
 	public function view(): void
 	{
-		if (!isset($_SESSION['spider_stat']) || $_SESSION['spider_stat'] < time() - 60)
-		{
+		if (!isset($_SESSION['spider_stat']) || $_SESSION['spider_stat'] < time() - 60) {
 			self::consolidateSpiderStats();
 			$_SESSION['spider_stat'] = time();
 		}
 
 		// Are we adding a new one?
-		if (!empty($_POST['addSpider']))
-		{
+		if (!empty($_POST['addSpider'])) {
 			self::edit();
+
 			return;
 		}
 
 		// User pressed the 'remove selection button'.
-		if (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove']))
-		{
+		if (!empty($_POST['removeSpiders']) && !empty($_POST['remove']) && is_array($_POST['remove'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-ser');
 
 			// Make sure every entry is a proper integer.
-			foreach ($_POST['remove'] as $index => $spider_id)
+			foreach ($_POST['remove'] as $index => $spider_id) {
 				$_POST['remove'][(int) $index] = (int) $spider_id;
+			}
 
 			// Delete them all!
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}spiders
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}spiders
 				WHERE id_spider IN ({array_int:remove_list})',
-				array(
+				[
 					'remove_list' => $_POST['remove'],
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_spider_hits
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_spider_hits
 				WHERE id_spider IN ({array_int:remove_list})',
-				array(
+				[
 					'remove_list' => $_POST['remove'],
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_spider_stats
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_spider_stats
 				WHERE id_spider IN ({array_int:remove_list})',
-				array(
+				[
 					'remove_list' => $_POST['remove'],
-				)
+				],
 			);
 
 			CacheApi::put('spider_search', null, 300);
@@ -507,117 +509,116 @@ public function view(): void
 		}
 
 		// Get the last seens.
-		Utils::$context['spider_last_seen'] = array();
+		Utils::$context['spider_last_seen'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_spider, MAX(last_seen) AS last_seen_time
+		$request = Db::$db->query(
+			'',
+			'SELECT id_spider, MAX(last_seen) AS last_seen_time
 			FROM {db_prefix}log_spider_stats
 			GROUP BY id_spider',
-			array()
+			[],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['spider_last_seen'][$row['id_spider']] = $row['last_seen_time'];
 		}
 		Db::$db->free_result($request);
 
 		SecurityToken::create('admin-ser');
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'spider_list',
 			'title' => Lang::$txt['spiders'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=sengines;sa=spiders',
 			'default_sort_col' => 'name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getSpiders',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumSpiders',
-			),
+			],
 			'no_items_label' => Lang::$txt['spiders_no_entries'],
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['spider_name'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return sprintf('<a href="%1$s?action=admin;area=sengines;sa=editspiders;sid=%2$d">%3$s</a>', Config::$scripturl, $rowData['id_spider'], Utils::htmlspecialchars($rowData['spider_name']));
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'spider_name DESC',
 						'reverse' => 'spider_name',
-					),
-				),
-				'last_seen' => array(
-					'header' => array(
+					],
+				],
+				'last_seen' => [
+					'header' => [
 						'value' => Lang::$txt['spider_last_seen'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return isset(Utils::$context['spider_last_seen'][$rowData['id_spider']]) ? Time::create('@' . Utils::$context['spider_last_seen'][$rowData['id_spider']])->format() : Lang::$txt['spider_last_never'];
 						},
-					),
-				),
-				'user_agent' => array(
-					'header' => array(
+					],
+				],
+				'user_agent' => [
+					'header' => [
 						'value' => Lang::$txt['spider_agent'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'user_agent',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'user_agent',
 						'reverse' => 'user_agent DESC',
-					),
-				),
-				'ip_info' => array(
-					'header' => array(
+					],
+				],
+				'ip_info' => [
+					'header' => [
 						'value' => Lang::$txt['spider_ip_info'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'ip_info',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'ip_info',
 						'reverse' => 'ip_info DESC',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="remove[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id_spider' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=sengines;sa=spiders',
 				'token' => 'admin-ser',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '
 						<input type="submit" name="removeSpiders" value="' . Lang::$txt['spiders_remove_selected'] . '" data-confirm="' . Lang::$txt['spider_remove_selected_confirm'] . '" class="button you_sure">
 						<input type="submit" name="addSpider" value="' . Lang::$txt['spiders_add'] . '" class="button">
 					',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
@@ -636,25 +637,25 @@ public function settings(): void
 		Utils::$context['settings_message'] = sprintf(Lang::$txt['spider_settings_desc'], Config::$scripturl . '?action=admin;area=logs;sa=settings;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 
 		// We need to load the groups for the spider group thingy.
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name
 			FROM {db_prefix}membergroups
 			WHERE id_group != {int:admin_group}
 				AND id_group != {int:moderator_group}',
-			array(
+			[
 				'admin_group' => 1,
 				'moderator_group' => 3,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$config_vars['spider_group'][2][$row['id_group']] = $row['group_name'];
 		}
 		Db::$db->free_result($request);
 
 		// Make sure it's valid - note that regular members are given id_group = 1 which is reversed in SMF\User - no admins here!
-		if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']]))
-		{
+		if (isset($_POST['spider_group']) && !isset($config_vars['spider_group'][2][$_POST['spider_group']])) {
 			$_POST['spider_group'] = 0;
 		}
 
@@ -663,8 +664,7 @@ public function settings(): void
 		Utils::$context['sub_template'] = 'show_settings';
 
 		// Are we saving them - are we??
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			IntegrationHook::call('integrate_save_search_engine_settings');
@@ -703,54 +703,53 @@ public function edit(): void
 		Menu::$loaded['admin']->current_subsection = 'spiders';
 
 		// Are we saving?
-		if (!empty($_POST['save']))
-		{
+		if (!empty($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-ses');
 
-			foreach (array('spider_name', 'spider_agent') as $key)
+			foreach (['spider_name', 'spider_agent'] as $key) {
 				$_POST[$key] = trim(Utils::normalize($_POST[$key]));
+			}
 
 			// Check the IP range is valid.
-			$ips = array();
+			$ips = [];
 
-			foreach (explode(',', $_POST['spider_ip']) as $set)
-			{
+			foreach (explode(',', $_POST['spider_ip']) as $set) {
 				$test = IP::ip2range(trim($set));
 
-				if (!empty($test))
+				if (!empty($test)) {
 					$ips[] = $set;
+				}
 			}
 
 			$ips = implode(',', $ips);
 
 			// Goes in as it is...
-			if (Utils::$context['id_spider'])
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}spiders
+			if (Utils::$context['id_spider']) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}spiders
 					SET spider_name = {string:spider_name}, user_agent = {string:spider_agent},
 						ip_info = {string:ip_info}
 					WHERE id_spider = {int:current_spider}',
-					array(
+					[
 						'current_spider' => Utils::$context['id_spider'],
 						'spider_name' => $_POST['spider_name'],
 						'spider_agent' => $_POST['spider_agent'],
 						'ip_info' => $ips,
-					)
+					],
 				);
-			}
-			else
-			{
-				Db::$db->insert('insert',
+			} else {
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}spiders',
-					array(
+					[
 						'spider_name' => 'string', 'user_agent' => 'string', 'ip_info' => 'string',
-					),
-					array(
+					],
+					[
 						$_POST['spider_name'], $_POST['spider_agent'], $ips,
-					),
-					array('id_spider')
+					],
+					['id_spider'],
 				);
 			}
 
@@ -761,32 +760,32 @@ public function edit(): void
 		}
 
 		// The default is new.
-		Utils::$context['spider'] = array(
+		Utils::$context['spider'] = [
 			'id' => 0,
 			'name' => '',
 			'agent' => '',
 			'ip_info' => '',
-		);
+		];
 
 		// An edit?
-		if (Utils::$context['id_spider'])
-		{
-			$request = Db::$db->query('', '
-				SELECT id_spider, spider_name, user_agent, ip_info
+		if (Utils::$context['id_spider']) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_spider, spider_name, user_agent, ip_info
 				FROM {db_prefix}spiders
 				WHERE id_spider = {int:current_spider}',
-				array(
+				[
 					'current_spider' => Utils::$context['id_spider'],
-				)
+				],
 			);
-			if ($row = Db::$db->fetch_assoc($request))
-			{
-				Utils::$context['spider'] = array(
+
+			if ($row = Db::$db->fetch_assoc($request)) {
+				Utils::$context['spider'] = [
 					'id' => $row['id_spider'],
 					'name' => $row['spider_name'],
 					'agent' => $row['user_agent'],
 					'ip_info' => $row['ip_info'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
 		}
@@ -805,8 +804,9 @@ public function edit(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -826,12 +826,12 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		$config_vars = array(
+		$config_vars = [
 			// How much detail?
-			array('select', 'spider_mode', 'subtext' => Lang::$txt['spider_mode_note'], array(Lang::$txt['spider_mode_off'], Lang::$txt['spider_mode_standard'], Lang::$txt['spider_mode_high'], Lang::$txt['spider_mode_vhigh']), 'onchange' => 'disableFields();'),
-			'spider_group' => array('select', 'spider_group', 'subtext' => Lang::$txt['spider_group_note'], array(Lang::$txt['spider_group_none'], Lang::$txt['membergroups_members'])),
-			array('select', 'show_spider_online', array(Lang::$txt['show_spider_online_no'], Lang::$txt['show_spider_online_summary'], Lang::$txt['show_spider_online_detail'], Lang::$txt['show_spider_online_detail_admin'])),
-		);
+			['select', 'spider_mode', 'subtext' => Lang::$txt['spider_mode_note'], [Lang::$txt['spider_mode_off'], Lang::$txt['spider_mode_standard'], Lang::$txt['spider_mode_high'], Lang::$txt['spider_mode_vhigh']], 'onchange' => 'disableFields();'],
+			'spider_group' => ['select', 'spider_group', 'subtext' => Lang::$txt['spider_group_note'], [Lang::$txt['spider_group_none'], Lang::$txt['membergroups_members']]],
+			['select', 'show_spider_online', [Lang::$txt['show_spider_online_no'], Lang::$txt['show_spider_online_summary'], Lang::$txt['show_spider_online_detail'], Lang::$txt['show_spider_online_detail_admin']]],
+		];
 
 		// Do some javascript.
 		self::$javascript_function = '
@@ -839,10 +839,8 @@ function disableFields()
 			{
 				disabledState = document.getElementById(\'spider_mode\').value == 0;';
 
-		foreach ($config_vars as $variable)
-		{
-			if ($variable[1] != 'spider_mode')
-			{
+		foreach ($config_vars as $variable) {
+			if ($variable[1] != 'spider_mode') {
 				self::$javascript_function .= '
 				if (document.getElementById(\'' . $variable[1] . '\'))
 					document.getElementById(\'' . $variable[1] . '\').disabled = disabledState;';
@@ -853,7 +851,7 @@ function disableFields()
 			}
 			disableFields();';
 
-		IntegrationHook::call('integrate_modify_search_engine_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_search_engine_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -863,74 +861,76 @@ function disableFields()
 	 */
 	public static function consolidateSpiderStats(): void
 	{
-		$spider_hits = array();
+		$spider_hits = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_spider, MAX(log_time) AS last_seen, COUNT(*) AS num_hits
+		$request = Db::$db->query(
+			'',
+			'SELECT id_spider, MAX(log_time) AS last_seen, COUNT(*) AS num_hits
 			FROM {db_prefix}log_spider_hits
 			WHERE processed = {int:not_processed}
 			GROUP BY id_spider, MONTH(log_time), DAYOFMONTH(log_time)',
-			array(
+			[
 				'not_processed' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$spider_hits[] = $row;
 		}
 		Db::$db->free_result($request);
 
-		if (empty($spider_hits))
+		if (empty($spider_hits)) {
 			return;
+		}
 
 		// Attempt to update the master data.
-		$stat_inserts = array();
+		$stat_inserts = [];
 
-		foreach ($spider_hits as $stat)
-		{
+		foreach ($spider_hits as $stat) {
 			// We assume the max date is within the right day.
 			$date = Time::strftime('%Y-%m-%d', $stat['last_seen']);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_spider_stats
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_spider_stats
 				SET page_hits = page_hits + {int:hits},
 					last_seen = CASE WHEN last_seen > {int:last_seen} THEN last_seen ELSE {int:last_seen} END
 				WHERE id_spider = {int:current_spider}
 					AND stat_date = {date:last_seen_date}',
-				array(
+				[
 					'last_seen_date' => $date,
 					'last_seen' => $stat['last_seen'],
 					'current_spider' => $stat['id_spider'],
 					'hits' => $stat['num_hits'],
-				)
+				],
 			);
 
-			if (Db::$db->affected_rows() == 0)
-			{
-				$stat_inserts[] = array($date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']);
+			if (Db::$db->affected_rows() == 0) {
+				$stat_inserts[] = [$date, $stat['id_spider'], $stat['num_hits'], $stat['last_seen']];
 			}
 		}
 
 		// New stats?
-		if (!empty($stat_inserts))
-		{
-			Db::$db->insert('ignore',
+		if (!empty($stat_inserts)) {
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_spider_stats',
-				array('stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'),
+				['stat_date' => 'date', 'id_spider' => 'int', 'page_hits' => 'int', 'last_seen' => 'int'],
 				$stat_inserts,
-				array('stat_date', 'id_spider')
+				['stat_date', 'id_spider'],
 			);
 		}
 
 		// All processed.
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_spider_hits
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_spider_hits
 			SET processed = {int:is_processed}
 			WHERE processed = {int:not_processed}',
-			array(
+			[
 				'is_processed' => 1,
 				'not_processed' => 0,
-			)
+			],
 		);
 	}
 
@@ -944,21 +944,22 @@ public static function consolidateSpiderStats(): void
 	 */
 	public static function list_getSpiders($start, $items_per_page, $sort): array
 	{
-		$spiders = array();
+		$spiders = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_spider, spider_name, user_agent, ip_info
+		$request = Db::$db->query(
+			'',
+			'SELECT id_spider, spider_name, user_agent, ip_info
 			FROM {db_prefix}spiders
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items}',
-			array(
+			[
 				'sort' => $sort,
 				'start' => $start,
 				'items' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$spiders[$row['id_spider']] = $row;
 		}
 		Db::$db->free_result($request);
@@ -973,13 +974,14 @@ public static function list_getSpiders($start, $items_per_page, $sort): array
 	 */
 	public static function list_getNumSpiders(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS num_spiders
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS num_spiders
 			FROM {db_prefix}spiders',
-			array(
-			)
+			[
+			],
 		);
-		list ($numSpiders) = Db::$db->fetch_row($request);
+		list($numSpiders) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $numSpiders;
@@ -995,22 +997,23 @@ public static function list_getNumSpiders(): int
 	 */
 	public static function list_getSpiderLogs($start, $items_per_page, $sort): array
 	{
-		$spider_logs = array();
+		$spider_logs = [];
 
-		$request = Db::$db->query('', '
-			SELECT sl.id_spider, sl.url, sl.log_time, s.spider_name
+		$request = Db::$db->query(
+			'',
+			'SELECT sl.id_spider, sl.url, sl.log_time, s.spider_name
 			FROM {db_prefix}log_spider_hits AS sl
 				INNER JOIN {db_prefix}spiders AS s ON (s.id_spider = sl.id_spider)
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items}',
-			array(
+			[
 				'sort' => $sort,
 				'start' => $start,
 				'items' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$spider_logs[] = $row;
 		}
 		Db::$db->free_result($request);
@@ -1025,13 +1028,14 @@ public static function list_getSpiderLogs($start, $items_per_page, $sort): array
 	 */
 	public static function list_getNumSpiderLogs(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS num_logs
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS num_logs
 			FROM {db_prefix}log_spider_hits',
-			array(
-			)
+			[
+			],
 		);
-		list ($numLogs) = Db::$db->fetch_row($request);
+		list($numLogs) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $numLogs;
@@ -1048,22 +1052,23 @@ public static function list_getNumSpiderLogs(): int
 	 */
 	public static function list_getSpiderStats($start, $items_per_page, $sort): array
 	{
-		$spider_stats = array();
+		$spider_stats = [];
 
-		$request = Db::$db->query('', '
-			SELECT ss.id_spider, ss.stat_date, ss.page_hits, s.spider_name
+		$request = Db::$db->query(
+			'',
+			'SELECT ss.id_spider, ss.stat_date, ss.page_hits, s.spider_name
 			FROM {db_prefix}log_spider_stats AS ss
 				INNER JOIN {db_prefix}spiders AS s ON (s.id_spider = ss.id_spider)
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items}',
-			array(
+			[
 				'sort' => $sort,
 				'start' => $start,
 				'items' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$spider_stats[] = $row;
 		}
 		Db::$db->free_result($request);
@@ -1079,13 +1084,14 @@ public static function list_getSpiderStats($start, $items_per_page, $sort): arra
 	 */
 	public static function list_getNumSpiderStats(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS num_stats
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS num_stats
 			FROM {db_prefix}log_spider_stats',
-			array(
-			)
+			[
+			],
 		);
-		list ($numStats) = Db::$db->fetch_row($request);
+		list($numStats) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $numStats;
@@ -1096,20 +1102,21 @@ public static function list_getNumSpiderStats(): int
 	 */
 	public static function recacheSpiderNames(): void
 	{
-		$spiders = array();
+		$spiders = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_spider, spider_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_spider, spider_name
 			FROM {db_prefix}spiders',
-			array()
+			[],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$spiders[$row['id_spider']] = $row['spider_name'];
 		}
 		Db::$db->free_result($request);
 
-		Config::updateModSettings(array('spider_name_cache' => Utils::jsonEncode($spiders)));
+		Config::updateModSettings(['spider_name_cache' => Utils::jsonEncode($spiders)]);
 	}
 
 	/**
@@ -1150,8 +1157,9 @@ public static function viewSpiders(): void
 	 */
 	public static function manageSearchEngineSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -1182,35 +1190,35 @@ protected function __construct()
 		Lang::load('Search');
 		Theme::loadTemplate('ManageSearch');
 
-		if (empty(Config::$modSettings['spider_mode']))
-		{
-			self::$subactions = array_intersect_key(self::$subactions, array('settings' => true));
+		if (empty(Config::$modSettings['spider_mode'])) {
+			self::$subactions = array_intersect_key(self::$subactions, ['settings' => true]);
 			$this->subaction = 'settings';
 		}
 
 		Utils::$context['page_title'] = Lang::$txt['search_engines'];
 
 		// Tab data might already be set if this was called from Logs::execute().
-		if (empty(Menu::$loaded['admin']->tab_data))
-		{
+		if (empty(Menu::$loaded['admin']->tab_data)) {
 			// Some more tab data.
-			Menu::$loaded['admin']->tab_data = array(
+			Menu::$loaded['admin']->tab_data = [
 				'title' => Lang::$txt['search_engines'],
 				'description' => Lang::$txt['search_engines_description'],
-			);
+			];
 		}
 
-		IntegrationHook::call('integrate_manage_search_engines', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_search_engines', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		Utils::$context['sub_action'] = &$this->subaction;
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SearchEngines::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SearchEngines::exportStatic')) {
 	SearchEngines::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Server.php b/Sources/Actions/Admin/Server.php
index 745a429dda..7595f22e0c 100644
--- a/Sources/Actions/Admin/Server.php
+++ b/Sources/Actions/Admin/Server.php
@@ -13,24 +13,21 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
-use SMF\BBCodeParser;
+use SMF\BackwardCompatibility;
+use SMF\Cache\CacheApi;
 use SMF\Config;
 use SMF\Cookie;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
-use SMF\MessageIndex;
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\Url;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Contains all the functionality required to be able to edit the core server
@@ -90,19 +87,22 @@ class Server implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ModifySettings',
-			'generalConfigVars' => false,
-			'databaseConfigVars' => false,
-			'cookieConfigVars' => false,
-			'securityConfigVars' => false,
-			'cacheConfigVars' => false,
-			'exportConfigVars' => false,
-			'loadBalancingConfigVars' => false,
-		),
-	);
+			'getLoadAverageDisabled' => 'getLoadAverageDisabled',
+			'prepareServerSettingsContext' => 'prepareServerSettingsContext',
+			'checkSettingsFileWriteSafe' => 'checkSettingsFileWriteSafe',
+			'modifyGeneralSettings' => 'ModifyGeneralSettings',
+			'modifyDatabaseSettings' => 'ModifyDatabaseSettings',
+			'modifyCookieSettings' => 'ModifyCookieSettings',
+			'modifyGeneralSecuritySettings' => 'ModifyGeneralSecuritySettings',
+			'modifyCacheSettings' => 'ModifyCacheSettings',
+			'modifyExportSettings' => 'ModifyExportSettings',
+			'modifyLoadBalancingSettings' => 'ModifyLoadBalancingSettings',
+			'showPHPinfoSettings' => 'ShowPHPinfoSettings',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -111,7 +111,7 @@ class Server implements ActionInterface
 	/**
 	 * Default values for load balancing options.
 	 */
-	const LOADAVG_DEFAULT_VALUES = array(
+	public const LOADAVG_DEFAULT_VALUES = [
 		'loadavg_auto_opt' => 1.0,
 		'loadavg_search' => 2.5,
 		'loadavg_allunread' => 2.0,
@@ -120,7 +120,7 @@ class Server implements ActionInterface
 		'loadavg_userstats' => 10.0,
 		'loadavg_bbc' => 30.0,
 		'loadavg_forum' => 40.0,
-	);
+	];
 
 	/*******************
 	 * Public properties
@@ -143,7 +143,7 @@ class Server implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'general' => 'general',
 		'database' => 'database',
 		'cookie' => 'cookie',
@@ -152,7 +152,7 @@ class Server implements ActionInterface
 		'export' => 'export',
 		'loads' => 'loadBalancing',
 		'phpinfo' => 'phpinfo',
-	);
+	];
 
 	/**
 	 * @var bool
@@ -213,23 +213,23 @@ public function execute(): void
 		// Warn the user if there's any relevant information regarding Settings.php.
 		self::checkSettingsFileWriteSafe();
 
-		if (self::$settings_backup_fail)
-		{
-			Utils::$context['settings_message'] = array(
+		if (self::$settings_backup_fail) {
+			Utils::$context['settings_message'] = [
 				'label' => Lang::$txt['admin_backup_fail'],
 				'tag' => 'div',
-				'class' => 'centertext strong'
-			);
+				'class' => 'centertext strong',
+			];
 		}
 
 		Utils::$context['settings_not_writable'] = self::$settings_not_writable;
 		Utils::$context['sub_action'] = $this->subaction;
 
 		// Call the right method for this sub-action.
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -254,26 +254,23 @@ public function general(): void
 		Utils::$context['save_disabled'] = Utils::$context['settings_not_writable'];
 
 		// Saving settings?
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			IntegrationHook::call('integrate_save_general_settings');
 
-			foreach ($config_vars as $config_var)
-			{
-				if (is_array($config_var) && isset($config_var[3]) && $config_var[3] == 'text' && !empty($_POST[$config_var[0]]))
-				{
+			foreach ($config_vars as $config_var) {
+				if (is_array($config_var) && isset($config_var[3]) && $config_var[3] == 'text' && !empty($_POST[$config_var[0]])) {
 					$_POST[$config_var[0]] = Utils::normalize($_POST[$config_var[0]]);
 				}
 			}
 
 			// Are we saving the stat collection?
-			if (!empty($_POST['enable_sm_stats']) && empty(Config::$modSettings['sm_stats_key']))
-			{
+			if (!empty($_POST['enable_sm_stats']) && empty(Config::$modSettings['sm_stats_key'])) {
 				$registerSMStats = $this->registerSMStats();
 
 				// Failed to register, disable it again.
-				if (empty($registerSMStats))
+				if (empty($registerSMStats)) {
 					$_POST['enable_sm_stats'] = 0;
+				}
 			}
 
 			// Ensure all URLs are aligned with the new force_ssl setting
@@ -289,8 +286,7 @@ public function general(): void
 		self::prepareServerSettingsContext($config_vars);
 
 		// Some javascript for SSL
-		if (empty(Utils::$context['settings_not_writable']))
-		{
+		if (empty(Utils::$context['settings_not_writable'])) {
 			Theme::addInlineJavaScript(<<<'END'
 				$(function()
 				{
@@ -324,8 +320,7 @@ public function database(): void
 		Utils::$context['settings_title'] = Lang::$txt['database_settings'];
 		Utils::$context['save_disabled'] = Utils::$context['settings_not_writable'];
 
-		if (!Db::$db->allow_persistent())
-		{
+		if (!Db::$db->allow_persistent()) {
 			Theme::addInlineJavaScript(<<<'END'
 				$(function()
 				{
@@ -335,8 +330,7 @@ public function database(): void
 		}
 
 		// Saving settings?
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			IntegrationHook::call('integrate_save_database_settings');
 
 			ACP::saveSettings($config_vars);
@@ -356,64 +350,59 @@ public function cookie(): void
 		$config_vars = self::cookieConfigVars();
 
 		Theme::addInlineJavaScript(<<<'END'
-		function hideGlobalCookies()
-		{
-			var usingLocal = $("#localCookies").prop("checked");
-			$("#setting_globalCookies").closest("dt").toggle(!usingLocal);
-			$("#globalCookies").closest("dd").toggle(!usingLocal);
-
-			var usingGlobal = !usingLocal && $("#globalCookies").prop("checked");
-			$("#setting_globalCookiesDomain").closest("dt").toggle(usingGlobal);
-			$("#globalCookiesDomain").closest("dd").toggle(usingGlobal);
-		};
-		hideGlobalCookies();
-
-		$("#localCookies, #globalCookies").click(function() {
+			function hideGlobalCookies()
+			{
+				var usingLocal = $("#localCookies").prop("checked");
+				$("#setting_globalCookies").closest("dt").toggle(!usingLocal);
+				$("#globalCookies").closest("dd").toggle(!usingLocal);
+
+				var usingGlobal = !usingLocal && $("#globalCookies").prop("checked");
+				$("#setting_globalCookiesDomain").closest("dt").toggle(usingGlobal);
+				$("#globalCookiesDomain").closest("dd").toggle(usingGlobal);
+			};
 			hideGlobalCookies();
-		});
-		END, true);
+
+			$("#localCookies, #globalCookies").click(function() {
+				hideGlobalCookies();
+			});
+			END, true);
 
 		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=serversettings;sa=cookie;save';
 		Utils::$context['settings_title'] = Lang::$txt['cookies_sessions_settings'];
 		Utils::$context['save_disabled'] = Utils::$context['settings_not_writable'];
 
 		// Saving settings?
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			IntegrationHook::call('integrate_save_cookie_settings');
 
 			$_POST['cookiename'] = Utils::normalize($_POST['cookiename']);
 
 			// Local and global do not play nicely together.
-			if (!empty($_POST['localCookies']) && empty($_POST['globalCookies']))
-				unset ($_POST['globalCookies']);
+			if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) {
+				unset($_POST['globalCookies']);
+			}
 
-			if (empty(Config::$modSettings['localCookies']) != empty($_POST['localCookies']) || empty(Config::$modSettings['globalCookies']) != empty($_POST['globalCookies']))
-			{
+			if (empty(Config::$modSettings['localCookies']) != empty($_POST['localCookies']) || empty(Config::$modSettings['globalCookies']) != empty($_POST['globalCookies'])) {
 				$scope_changed = true;
 			}
 
-			if (!empty($_POST['globalCookiesDomain']))
-			{
+			if (!empty($_POST['globalCookiesDomain'])) {
 				$_POST['globalCookiesDomain'] = Url::create((strpos($_POST['globalCookiesDomain'], '//') === false ? 'http://' : '') . ltrim($_POST['globalCookiesDomain'], '.'), true)->host;
 
-				if (!preg_match('/(?:^|\.)' . preg_quote($_POST['globalCookiesDomain'], '/') . '$/u', Url::create(Config::$boardurl))->host)
-				{
+				if (!preg_match('/(?:^|\.)' . preg_quote($_POST['globalCookiesDomain'], '/') . '$/u', Url::create(Config::$boardurl))->host) {
 					ErrorHandler::fatalLang('invalid_cookie_domain', false);
 				}
 			}
 
 			// Per spec, if samesite setting is 'none', cookies MUST be secure. Thems the rules. Else you lock everyone out...
-			if (!empty($_POST['samesiteCookies']) && ($_POST['samesiteCookies'] === 'none') && empty($_POST['secureCookies']))
-			{
+			if (!empty($_POST['samesiteCookies']) && ($_POST['samesiteCookies'] === 'none') && empty($_POST['secureCookies'])) {
 				ErrorHandler::fatalLang('samesiteSecureRequired', false);
 			}
 
 			ACP::saveSettings($config_vars);
 
 			// If the cookie name or scope were changed, reset the cookie.
-			if (Config::$cookiename != $_POST['cookiename'] || !empty($scope_changed))
-			{
+			if (Config::$cookiename != $_POST['cookiename'] || !empty($scope_changed)) {
 				$original_session_id = Utils::$context['session_id'];
 
 				// Remove the old cookie.
@@ -428,22 +417,23 @@ function hideGlobalCookies()
 			}
 
 			// If we disabled 2FA, reset all members and membergroups settings.
-			if (isset($_POST['tfa_mode']) && empty($_POST['tfa_mode']))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}membergroups
+			if (isset($_POST['tfa_mode']) && empty($_POST['tfa_mode'])) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}membergroups
 					SET tfa_required = {int:zero}',
-					array(
+					[
 						'zero' => 0,
-					)
+					],
 				);
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}members
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}members
 					SET tfa_secret = {string:empty}, tfa_backup = {string:empty}',
-					array(
+					[
 						'empty' => '',
-					)
+					],
 				);
 			}
 
@@ -463,21 +453,20 @@ public function security(): void
 		$config_vars = self::securityConfigVars();
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
-			if (!empty($_POST['cors_domains']))
-			{
+		if (isset($_GET['save'])) {
+			if (!empty($_POST['cors_domains'])) {
 				$cors_domains = explode(',', $_POST['cors_domains']);
 
-				foreach ($cors_domains as &$cors_domain)
-				{
-					if (strpos($cors_domain, '//') === false)
+				foreach ($cors_domains as &$cors_domain) {
+					if (strpos($cors_domain, '//') === false) {
 						$cors_domain = '//' . $cors_domain;
+					}
 
 					$temp = new Url($cors_domain, true);
 
-					if (strpos($temp->host, '*') !== false)
+					if (strpos($temp->host, '*') !== false) {
 						$temp->host = substr($temp->host, strrpos($temp->host, '*'));
+					}
 
 					$cors_domain = (!empty($temp->scheme) ? $temp->scheme . '://' : '') . $temp->host . (!empty($temp->port) ? ':' . $temp->port : '');
 				}
@@ -508,12 +497,10 @@ public function cache(): void
 		$config_vars = self::cacheConfigVars();
 
 		// Saving again?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			IntegrationHook::call('integrate_save_cache_settings');
 
-			if (is_callable(array(CacheApi::$loadedApi, 'cleanCache')) && ((int) $_POST['cache_enable'] < CacheApi::$enable || $_POST['cache_accelerator'] != CacheApi::$accelerator))
-			{
+			if (is_callable([CacheApi::$loadedApi, 'cleanCache']) && ((int) $_POST['cache_enable'] < CacheApi::$enable || $_POST['cache_accelerator'] != CacheApi::$accelerator)) {
 				CacheApi::clean();
 			}
 
@@ -521,7 +508,7 @@ public function cache(): void
 			$_SESSION['adm-save'] = true;
 
 			// We need to save the CacheApi::$enable to Config::$modSettings as well
-			Config::updateModSettings(array('cache_enable' => (int) $_POST['cache_enable']));
+			Config::updateModSettings(['cache_enable' => (int) $_POST['cache_enable']]);
 
 			// exit so we reload our new settings on the page
 			Utils::redirectexit('action=admin;area=serversettings;sa=cache;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
@@ -538,8 +525,9 @@ public function cache(): void
 		Utils::$context['save_disabled'] = Utils::$context['settings_not_writable'];
 
 		// Decide what message to show.
-		if (!Utils::$context['save_disabled'])
+		if (!Utils::$context['save_disabled']) {
 			Utils::$context['settings_message'] = Lang::$txt['caching_information'];
+		}
 
 		// Prepare the template.
 		self::prepareServerSettingsContext($config_vars);
@@ -554,33 +542,31 @@ public function export(): void
 
 		$config_vars = self::exportConfigVars();
 
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			$prev_export_dir = is_dir(Config::$modSettings['export_dir']) ? rtrim(Config::$modSettings['export_dir'], '/\\') : '';
 
-			if (!empty($_POST['export_dir']))
+			if (!empty($_POST['export_dir'])) {
 				$_POST['export_dir'] = rtrim($_POST['export_dir'], '/\\');
+			}
 
-			if ($diskspace_disabled)
+			if ($diskspace_disabled) {
 				$_POST['export_min_diskspace_pct'] = 0;
+			}
 
 			$_POST['export_rate'] = max(5, min($_POST['export_rate'], 500));
 
 			ACP::saveDBSettings($config_vars);
 
 			// Create the new directory, but revert to the previous one if anything goes wrong.
-			require_once(Config::$sourcedir . '/Actions/Profile/Export.php');
+			require_once Config::$sourcedir . '/Actions/Profile/Export.php';
 			create_export_dir($prev_export_dir);
 
 			// Ensure we don't lose track of any existing export files.
-			if (!empty($prev_export_dir) && $prev_export_dir != Config::$modSettings['export_dir'])
-			{
+			if (!empty($prev_export_dir) && $prev_export_dir != Config::$modSettings['export_dir']) {
 				$export_files = glob($prev_export_dir . DIRECTORY_SEPARATOR . '*');
 
-				foreach ($export_files as $export_file)
-				{
-					if (!in_array(basename($export_file), array('index.php', '.htaccess')))
-					{
+				foreach ($export_files as $export_file) {
+					if (!in_array(basename($export_file), ['index.php', '.htaccess'])) {
 						rename($export_file, Config::$modSettings['export_dir'] . DIRECTORY_SEPARATOR . basename($export_file));
 					}
 				}
@@ -606,24 +592,21 @@ public function loadBalancing(): void
 		// Setup a warning message, but disabled by default.
 		self::getLoadAverageDisabled();
 
-		Utils::$context['settings_message'] = array('label' => Lang::$txt['loadavg_disabled_conf'], 'class' => 'error');
+		Utils::$context['settings_message'] = ['label' => Lang::$txt['loadavg_disabled_conf'], 'class' => 'error'];
 
-		if (self::$loadAverageDisabled && DIRECTORY_SEPARATOR === '\\')
-		{
+		if (self::$loadAverageDisabled && DIRECTORY_SEPARATOR === '\\') {
 			Utils::$context['settings_message']['label'] = Lang::$txt['loadavg_disabled_windows'];
 
-			if (isset($_GET['save']))
+			if (isset($_GET['save'])) {
 				$_SESSION['adm-save'] = Utils::$context['settings_message']['label'];
-		}
-		elseif (self::$loadAverageDisabled && stripos(PHP_OS, 'darwin') === 0)
-		{
+			}
+		} elseif (self::$loadAverageDisabled && stripos(PHP_OS, 'darwin') === 0) {
 			Utils::$context['settings_message']['label'] = Lang::$txt['loadavg_disabled_osx'];
 
-			if (isset($_GET['save']))
+			if (isset($_GET['save'])) {
 				$_SESSION['adm-save'] = Utils::$context['settings_message']['label'];
-		}
-		elseif (!self::$loadAverageDisabled)
-		{
+			}
+		} elseif (!self::$loadAverageDisabled) {
 			Utils::$context['settings_message']['label'] = sprintf(Lang::$txt['loadavg_warning'], Config::$modSettings['load_average']);
 		}
 
@@ -633,16 +616,14 @@ public function loadBalancing(): void
 		Utils::$context['settings_title'] = Lang::$txt['load_balancing_settings'];
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			// Stupidity is not allowed.
-			foreach ($_POST as $key => $value)
-			{
-				if (!isset(self::LOADAVG_DEFAULT_VALUES[$key]))
+			foreach ($_POST as $key => $value) {
+				if (!isset(self::LOADAVG_DEFAULT_VALUES[$key])) {
 					continue;
+				}
 
-				switch ($key)
-				{
+				switch ($key) {
 					case 'loadavg_auto_opt':
 						$min_value = 1.0;
 						break;
@@ -663,8 +644,9 @@ public function loadBalancing(): void
 
 			ACP::saveDBSettings($config_vars);
 
-			if (!isset($_SESSION['adm-save']))
+			if (!isset($_SESSION['adm-save'])) {
 				$_SESSION['adm-save'] = true;
+			}
 
 			Utils::redirectexit('action=admin;area=serversettings;sa=loads;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 		}
@@ -688,32 +670,28 @@ public function phpinfo(): void
 
 		// We only want it for its body, pigs that we are.
 		$info_lines = preg_replace('~^.*<body>(.*)</body>.*$~', '$1', ob_get_contents());
-		$info_lines = explode("\n", strip_tags($info_lines, "<tr><td><h2>"));
+		$info_lines = explode("\n", strip_tags($info_lines, '<tr><td><h2>'));
 		ob_end_clean();
 
 		// Remove things that could be considered sensitive.
 		$remove = '_COOKIE|Cookie|_GET|_REQUEST|REQUEST_URI|QUERY_STRING|REQUEST_URL|HTTP_REFERER';
 
 		// Put all of it into an array.
-		foreach ($info_lines as $line)
-		{
-			if (preg_match('~(' . $remove . ')~', $line))
+		foreach ($info_lines as $line) {
+			if (preg_match('~(' . $remove . ')~', $line)) {
 				continue;
+			}
 
 			// New category?
-			if (strpos($line, '<h2>') !== false)
-			{
+			if (strpos($line, '<h2>') !== false) {
 				$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
 			}
 
 			// Load it as setting => value or the old setting local master.
-			if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			{
+			if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
 				$pinfo[$category][$val[1]] = $val[2];
-			}
-			elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			{
-				$pinfo[$category][$val[1]] = array(Lang::$txt['phpinfo_localsettings'] => $val[2], Lang::$txt['phpinfo_defaultsettings'] => $val[3]);
+			} elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+				$pinfo[$category][$val[1]] = [Lang::$txt['phpinfo_localsettings'] => $val[2], Lang::$txt['phpinfo_defaultsettings'] => $val[3]];
 			}
 		}
 
@@ -734,8 +712,9 @@ public function phpinfo(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -763,27 +742,27 @@ public static function generalConfigVars(): array
 			OR	an empty string for a horizontal rule.
 			OR	a string for a titled section.
 		 */
-		$config_vars = array(
-			array('mbname', Lang::$txt['admin_title'], 'file', 'text', 30),
+		$config_vars = [
+			['mbname', Lang::$txt['admin_title'], 'file', 'text', 30],
 			'',
-			array('maintenance', Lang::$txt['admin_maintain'], 'file', 'check'),
-			array('mtitle', Lang::$txt['maintenance_subject'], 'file', 'text', 36),
-			array('mmessage', Lang::$txt['maintenance_message'], 'file', 'text', 36),
+			['maintenance', Lang::$txt['admin_maintain'], 'file', 'check'],
+			['mtitle', Lang::$txt['maintenance_subject'], 'file', 'text', 36],
+			['mmessage', Lang::$txt['maintenance_message'], 'file', 'text', 36],
 			'',
-			array('webmaster_email', Lang::$txt['admin_webmaster_email'], 'file', 'text', 30),
+			['webmaster_email', Lang::$txt['admin_webmaster_email'], 'file', 'text', 30],
 			'',
-			array('enableCompressedOutput', Lang::$txt['enableCompressedOutput'], 'db', 'check', null, 'enableCompressedOutput'),
-			array('disableHostnameLookup', Lang::$txt['disableHostnameLookup'], 'db', 'check', null, 'disableHostnameLookup'),
+			['enableCompressedOutput', Lang::$txt['enableCompressedOutput'], 'db', 'check', null, 'enableCompressedOutput'],
+			['disableHostnameLookup', Lang::$txt['disableHostnameLookup'], 'db', 'check', null, 'disableHostnameLookup'],
 			'',
-			'force_ssl' => array('force_ssl', Lang::$txt['force_ssl'], 'db', 'select', array(Lang::$txt['force_ssl_off'], Lang::$txt['force_ssl_complete']), 'force_ssl'),
-			array('image_proxy_enabled', Lang::$txt['image_proxy_enabled'], 'file', 'check', null, 'image_proxy_enabled'),
-			array('image_proxy_secret', Lang::$txt['image_proxy_secret'], 'file', 'text', 30, 'image_proxy_secret'),
-			array('image_proxy_maxsize', Lang::$txt['image_proxy_maxsize'], 'file', 'int', null, 'image_proxy_maxsize'),
+			'force_ssl' => ['force_ssl', Lang::$txt['force_ssl'], 'db', 'select', [Lang::$txt['force_ssl_off'], Lang::$txt['force_ssl_complete']], 'force_ssl'],
+			['image_proxy_enabled', Lang::$txt['image_proxy_enabled'], 'file', 'check', null, 'image_proxy_enabled'],
+			['image_proxy_secret', Lang::$txt['image_proxy_secret'], 'file', 'text', 30, 'image_proxy_secret'],
+			['image_proxy_maxsize', Lang::$txt['image_proxy_maxsize'], 'file', 'int', null, 'image_proxy_maxsize'],
 			'',
-			array('enable_sm_stats', Lang::$txt['enable_sm_stats'], 'db', 'check', null, 'enable_sm_stats'),
-		);
+			['enable_sm_stats', Lang::$txt['enable_sm_stats'], 'db', 'check', null, 'enable_sm_stats'],
+		];
 
-		IntegrationHook::call('integrate_general_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_general_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -803,38 +782,40 @@ public static function databaseConfigVars(): array
 			OR an empty string for a horizontal rule.
 			OR a string for a titled section.
 		 */
-		$config_vars = array(
-			array('db_persist', Lang::$txt['db_persist'], 'file', 'check', null, 'db_persist'),
-			array('db_error_send', Lang::$txt['db_error_send'], 'file', 'check'),
-			array('ssi_db_user', Lang::$txt['ssi_db_user'], 'file', 'text', null, 'ssi_db_user'),
-			array('ssi_db_passwd', Lang::$txt['ssi_db_passwd'], 'file', 'password'),
+		$config_vars = [
+			['db_persist', Lang::$txt['db_persist'], 'file', 'check', null, 'db_persist'],
+			['db_error_send', Lang::$txt['db_error_send'], 'file', 'check'],
+			['ssi_db_user', Lang::$txt['ssi_db_user'], 'file', 'text', null, 'ssi_db_user'],
+			['ssi_db_passwd', Lang::$txt['ssi_db_passwd'], 'file', 'password'],
 			'',
-			array('autoFixDatabase', Lang::$txt['autoFixDatabase'], 'db', 'check', false, 'autoFixDatabase')
-		);
+			['autoFixDatabase', Lang::$txt['autoFixDatabase'], 'db', 'check', false, 'autoFixDatabase'],
+		];
 
 		// Add PG Stuff
-		if (Db::$db->title === POSTGRE_TITLE)
-		{
-			$fts_language = array();
+		if (Db::$db->title === POSTGRE_TITLE) {
+			$fts_language = [];
 
-			$request = Db::$db->query('',
+			$request = Db::$db->query(
+				'',
 				'SELECT cfgname FROM pg_ts_config',
-				array()
+				[],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$fts_language[$row['cfgname']] = $row['cfgname'];
 			}
 			Db::$db->free_result($request);
 
-			$config_vars = array_merge($config_vars, array(
+			$config_vars = array_merge(
+				$config_vars,
+				[
 					'',
-					array('search_language', Lang::$txt['search_language'], 'db', 'select', $fts_language, 'pgFulltextSearch')
-				)
+					['search_language', Lang::$txt['search_language'], 'db', 'select', $fts_language, 'pgFulltextSearch'],
+				],
 			);
 		}
 
-		IntegrationHook::call('integrate_database_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_database_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -846,47 +827,46 @@ public static function databaseConfigVars(): array
 	 */
 	public static function cookieConfigVars(): array
 	{
-		$config_vars = array(
+		$config_vars = [
 			// Cookies...
-			array('cookiename', Lang::$txt['cookie_name'], 'file', 'text', 20),
-			array('cookieTime', Lang::$txt['cookieTime'], 'db', 'select', array_filter(array_map(
-				function ($str)
-				{
-					return isset(Lang::$txt[$str]) ? Lang::$txt[$str] : '';
+			['cookiename', Lang::$txt['cookie_name'], 'file', 'text', 20],
+			['cookieTime', Lang::$txt['cookieTime'], 'db', 'select', array_filter(array_map(
+				function ($str) {
+					return Lang::$txt[$str] ?? '';
 				},
-				Utils::$context['login_cookie_times']
-			))),
-			array('localCookies', Lang::$txt['localCookies'], 'db', 'check', false, 'localCookies'),
-			array('globalCookies', Lang::$txt['globalCookies'], 'db', 'check', false, 'globalCookies'),
-			array('globalCookiesDomain', Lang::$txt['globalCookiesDomain'], 'db', 'text', false, 'globalCookiesDomain'),
-			array('secureCookies', Lang::$txt['secureCookies'], 'db', 'check', false, 'secureCookies', 'disabled' => !Config::httpsOn()),
-			array('httponlyCookies', Lang::$txt['httponlyCookies'], 'db', 'check', false, 'httponlyCookies'),
-			array('samesiteCookies', Lang::$txt['samesiteCookies'], 'db', 'select', array(
-					'none' 		=> Lang::$txt['samesiteNone'],
-					'lax' 		=> Lang::$txt['samesiteLax'],
-					'strict' 	=> Lang::$txt['samesiteStrict']
-				),
-				'samesiteCookies'),
+				Utils::$context['login_cookie_times'],
+			))],
+			['localCookies', Lang::$txt['localCookies'], 'db', 'check', false, 'localCookies'],
+			['globalCookies', Lang::$txt['globalCookies'], 'db', 'check', false, 'globalCookies'],
+			['globalCookiesDomain', Lang::$txt['globalCookiesDomain'], 'db', 'text', false, 'globalCookiesDomain'],
+			['secureCookies', Lang::$txt['secureCookies'], 'db', 'check', false, 'secureCookies', 'disabled' => !Config::httpsOn()],
+			['httponlyCookies', Lang::$txt['httponlyCookies'], 'db', 'check', false, 'httponlyCookies'],
+			['samesiteCookies', Lang::$txt['samesiteCookies'], 'db', 'select', [
+				'none' 		=> Lang::$txt['samesiteNone'],
+				'lax' 		=> Lang::$txt['samesiteLax'],
+				'strict' 	=> Lang::$txt['samesiteStrict'],
+			],
+				'samesiteCookies'],
 			'',
 
 			// Sessions
-			array('databaseSession_enable', Lang::$txt['databaseSession_enable'], 'db', 'check', false, 'databaseSession_enable'),
-			array('databaseSession_loose', Lang::$txt['databaseSession_loose'], 'db', 'check', false, 'databaseSession_loose'),
-			array('databaseSession_lifetime', Lang::$txt['databaseSession_lifetime'], 'db', 'int', false, 'databaseSession_lifetime', 'postinput' => Lang::$txt['seconds']),
+			['databaseSession_enable', Lang::$txt['databaseSession_enable'], 'db', 'check', false, 'databaseSession_enable'],
+			['databaseSession_loose', Lang::$txt['databaseSession_loose'], 'db', 'check', false, 'databaseSession_loose'],
+			['databaseSession_lifetime', Lang::$txt['databaseSession_lifetime'], 'db', 'int', false, 'databaseSession_lifetime', 'postinput' => Lang::$txt['seconds']],
 			'',
 
 			// 2FA
-			array('tfa_mode', Lang::$txt['tfa_mode'], 'db', 'select', array(
+			['tfa_mode', Lang::$txt['tfa_mode'], 'db', 'select', [
 				0 => Lang::$txt['tfa_mode_disabled'],
 				1 => Lang::$txt['tfa_mode_enabled'],
-			) + (empty(User::$me->tfa_secret) ? array() : array(
+			] + (empty(User::$me->tfa_secret) ? [] : [
 				2 => Lang::$txt['tfa_mode_forced'],
-			)) + (empty(User::$me->tfa_secret) ? array() : array(
+			]) + (empty(User::$me->tfa_secret) ? [] : [
 				3 => Lang::$txt['tfa_mode_forcedall'],
-			)), 'subtext' => Lang::$txt['tfa_mode_subtext'] . (empty(User::$me->tfa_secret) ? '<br><strong>' . Lang::$txt['tfa_mode_forced_help'] . '</strong>' : ''), 'tfa_mode'),
-		);
+			]), 'subtext' => Lang::$txt['tfa_mode_subtext'] . (empty(User::$me->tfa_secret) ? '<br><strong>' . Lang::$txt['tfa_mode_forced_help'] . '</strong>' : ''), 'tfa_mode'],
+		];
 
-		IntegrationHook::call('integrate_cookie_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_cookie_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -898,70 +878,70 @@ function ($str)
 	 */
 	public static function securityConfigVars(): array
 	{
-		$config_vars = array(
-			array('int', 'failed_login_threshold'),
-			array('int', 'loginHistoryDays', 'subtext' => Lang::$txt['zero_to_disable']),
+		$config_vars = [
+			['int', 'failed_login_threshold'],
+			['int', 'loginHistoryDays', 'subtext' => Lang::$txt['zero_to_disable']],
 			'',
 
-			array('check', 'securityDisable'),
-			array('check', 'securityDisable_moderate'),
+			['check', 'securityDisable'],
+			['check', 'securityDisable_moderate'],
 			'',
 
 			// Reactive on email, and approve on delete
-			array('check', 'send_validation_onChange'),
-			array('check', 'approveAccountDeletion'),
+			['check', 'send_validation_onChange'],
+			['check', 'approveAccountDeletion'],
 			'',
 
 			// Password strength.
-			array(
+			[
 				'select',
 				'password_strength',
-				array(
+				[
 					Lang::$txt['setting_password_strength_low'],
 					Lang::$txt['setting_password_strength_medium'],
-					Lang::$txt['setting_password_strength_high']
-				)
-			),
-			array('check', 'enable_password_conversion'),
+					Lang::$txt['setting_password_strength_high'],
+				],
+			],
+			['check', 'enable_password_conversion'],
 			'',
 
 			// Reporting of personal messages?
-			array('check', 'enableReportPM'),
+			['check', 'enableReportPM'],
 			'',
 
-			array('check', 'allow_cors'),
-			array('check', 'allow_cors_credentials'),
-			array('text', 'cors_domains'),
-			array('text', 'cors_headers'),
+			['check', 'allow_cors'],
+			['check', 'allow_cors_credentials'],
+			['text', 'cors_domains'],
+			['text', 'cors_headers'],
 			'',
 
-			array(
+			[
 				'select',
 				'frame_security',
-				array(
+				[
 					'SAMEORIGIN' => Lang::$txt['setting_frame_security_SAMEORIGIN'],
 					'DENY' => Lang::$txt['setting_frame_security_DENY'],
-					'DISABLE' => Lang::$txt['setting_frame_security_DISABLE']
-				)
-			),
+					'DISABLE' => Lang::$txt['setting_frame_security_DISABLE'],
+				],
+			],
 			'',
 
-			array(
+			[
 				'select',
 				'proxy_ip_header',
-				array(
+				[
 					'disabled' => Lang::$txt['setting_proxy_ip_header_disabled'],
 					'autodetect' => Lang::$txt['setting_proxy_ip_header_autodetect'],
 					'HTTP_X_FORWARDED_FOR' => 'X-Forwarded-For',
 					'HTTP_CLIENT_IP' => 'Client-IP',
 					'HTTP_X_REAL_IP' => 'X-Real-IP',
-					'HTTP_CF_CONNECTING_IP' => 'CF-Connecting-IP'
-				)
-			),
-			array('text', 'proxy_ip_servers'),
-		);
+					'HTTP_CF_CONNECTING_IP' => 'CF-Connecting-IP',
+				],
+			],
+			['text', 'proxy_ip_servers'],
+		];
 
-		IntegrationHook::call('integrate_general_security_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_general_security_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -975,37 +955,32 @@ public static function cacheConfigVars(): array
 	{
 		// Detect all available optimizers
 		$detectedCacheApis = CacheApi::detect();
-		$apis_names = array();
+		$apis_names = [];
 
-		foreach ($detectedCacheApis as $class_name => $cache_api)
-		{
+		foreach ($detectedCacheApis as $class_name => $cache_api) {
 			$class_name_txt_key = strtolower($cache_api->getImplementationClassKeyName());
 
-			$apis_names[$class_name] = isset(Lang::$txt[$class_name_txt_key . '_cache']) ?
-				Lang::$txt[$class_name_txt_key . '_cache'] : $class_name;
+			$apis_names[$class_name] = Lang::$txt[$class_name_txt_key . '_cache'] ?? $class_name;
 		}
 
 		// Set our values to show what, if anything, we found.
-		if (empty($detectedCacheApis))
-		{
+		if (empty($detectedCacheApis)) {
 			Lang::$txt['cache_settings_message'] = '<strong class="alert">' . Lang::$txt['detected_no_caching'] . '</strong>';
 
-			$cache_level = array(Lang::$txt['cache_off']);
+			$cache_level = [Lang::$txt['cache_off']];
 			$apis_names['none'] = Lang::$txt['cache_off'];
-		}
-		else
-		{
+		} else {
 			Lang::$txt['cache_settings_message'] = '<strong class="success">' . sprintf(Lang::$txt['detected_accelerators'], implode(', ', $apis_names)) . '</strong>';
 
-			$cache_level = array(Lang::$txt['cache_off'], Lang::$txt['cache_level1'], Lang::$txt['cache_level2'], Lang::$txt['cache_level3']);
+			$cache_level = [Lang::$txt['cache_off'], Lang::$txt['cache_level1'], Lang::$txt['cache_level2'], Lang::$txt['cache_level3']];
 		}
 
 		// Define the variables we want to edit.
-		$config_vars = array(
-			array('', Lang::$txt['cache_settings_message'], '', 'desc'),
-			array('cache_enable', Lang::$txt['cache_enable'], 'file', 'select', $cache_level, 'cache_enable'),
-			array('cache_accelerator', Lang::$txt['cache_accelerator'], 'file', 'select', $apis_names),
-		);
+		$config_vars = [
+			['', Lang::$txt['cache_settings_message'], '', 'desc'],
+			['cache_enable', Lang::$txt['cache_enable'], 'file', 'select', $cache_level, 'cache_enable'],
+			['cache_accelerator', Lang::$txt['cache_accelerator'], 'file', 'select', $apis_names],
+		];
 
 		// Some javascript to enable/disable certain settings if the option is not selected.
 		Utils::$context['settings_post_javascript'] = '
@@ -1013,15 +988,14 @@ public static function cacheConfigVars(): array
 				$("#cache_accelerator").change();
 			});';
 
-		IntegrationHook::call('integrate_modify_cache_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_cache_settings', [&$config_vars]);
 
 		// Maybe we have some additional settings from the selected accelerator.
-		if (!empty($detectedCacheApis))
-		{
-			foreach ($detectedCacheApis as $class_name_txt_key => $cache_api)
-			{
-				if (is_callable(array($cache_api, 'cacheSettings')))
+		if (!empty($detectedCacheApis)) {
+			foreach ($detectedCacheApis as $class_name_txt_key => $cache_api) {
+				if (is_callable([$cache_api, 'cacheSettings'])) {
 					$cache_api->cacheSettings($config_vars);
+				}
 			}
 		}
 
@@ -1036,8 +1010,7 @@ public static function cacheConfigVars(): array
 	public static function exportConfigVars(): array
 	{
 		// Fill in a default value for this if it is missing.
-		if (empty(Config::$modSettings['export_dir']))
-		{
+		if (empty(Config::$modSettings['export_dir'])) {
 			Config::$modSettings['export_dir'] = Config::$boarddir . DIRECTORY_SEPARATOR . 'exports';
 		}
 
@@ -1053,14 +1026,14 @@ public static function exportConfigVars(): array
 		 */
 		$diskspace_disabled = (!function_exists('disk_free_space') || !function_exists('disk_total_space') || intval(@disk_total_space(file_exists(Config::$modSettings['export_dir']) ? Config::$modSettings['export_dir'] : Config::$boarddir)) < 1440);
 
-		$config_vars = array(
-			array('text', 'export_dir', 40),
-			array('int', 'export_expiry', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['days_word']),
-			array('int', 'export_min_diskspace_pct', 'postinput' => '%', 'max' => 80, 'disabled' => $diskspace_disabled),
-			array('int', 'export_rate', 'min' => 5, 'max' => 500, 'step' => 5, 'subtext' => Lang::$txt['export_rate_desc']),
-		);
+		$config_vars = [
+			['text', 'export_dir', 40],
+			['int', 'export_expiry', 'subtext' => Lang::$txt['zero_to_disable'], 'postinput' => Lang::$txt['days_word']],
+			['int', 'export_min_diskspace_pct', 'postinput' => '%', 'max' => 80, 'disabled' => $diskspace_disabled],
+			['int', 'export_rate', 'min' => 5, 'max' => 500, 'step' => 5, 'subtext' => Lang::$txt['export_rate_desc']],
+		];
 
-		IntegrationHook::call('integrate_export_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_export_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1073,20 +1046,19 @@ public static function exportConfigVars(): array
 	public static function loadBalancingConfigVars(): array
 	{
 		// Start with a simple checkbox.
-		$config_vars = array(
-			array('check', 'loadavg_enable', 'disabled' => self::getLoadAverageDisabled()),
-		);
+		$config_vars = [
+			['check', 'loadavg_enable', 'disabled' => self::getLoadAverageDisabled()],
+		];
 
 		// Loop through the settings.
-		foreach (self::LOADAVG_DEFAULT_VALUES as $name => $value)
-		{
+		foreach (self::LOADAVG_DEFAULT_VALUES as $name => $value) {
 			// Use the default value if the setting isn't set yet.
 			$value = !isset(Config::$modSettings[$name]) ? $value : Config::$modSettings[$name];
 
-			$config_vars[] = array('float', $name, 'value' => $value, 'disabled' => self::getLoadAverageDisabled());
+			$config_vars[] = ['float', $name, 'value' => $value, 'disabled' => self::getLoadAverageDisabled()];
 		}
 
-		IntegrationHook::call('integrate_loadavg_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_loadavg_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1098,36 +1070,34 @@ public static function loadBalancingConfigVars(): array
 	 */
 	public static function getLoadAverageDisabled(): bool
 	{
-		if (isset(self::$loadAverageDisabled))
+		if (isset(self::$loadAverageDisabled)) {
 			return self::$loadAverageDisabled;
+		}
 
 		// Assume we can't until proven otherwise.
 		self::$loadAverageDisabled = true;
 
 		// Windows, so we can't.
-		if (DIRECTORY_SEPARATOR === '\\')
+		if (DIRECTORY_SEPARATOR === '\\') {
 			return self::$loadAverageDisabled;
+		}
 
 		// Most Linux distros offer a nice file that we can read.
 		Config::$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
 
-		if (!empty(Config::$modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', Config::$modSettings['load_average'], $matches) !== 0)
-		{
+		if (!empty(Config::$modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', Config::$modSettings['load_average'], $matches) !== 0) {
 			Config::$modSettings['load_average'] = (float) $matches[1];
 		}
 		// On both Linux and Unix (e.g. macOS), we can we can check shell_exec('uptime').
-		elseif ((Config::$modSettings['load_average'] = @shell_exec('uptime')) !== null && preg_match('~load averages?: (\d+\.\d+)~i', Config::$modSettings['load_average'], $matches) !== 0)
-		{
+		elseif ((Config::$modSettings['load_average'] = @shell_exec('uptime')) !== null && preg_match('~load averages?: (\d+\.\d+)~i', Config::$modSettings['load_average'], $matches) !== 0) {
 			Config::$modSettings['load_average'] = (float) $matches[1];
 		}
 		// No shell_exec('uptime') and no /proc/loadavg, so we can't check.
-		else
-		{
+		else {
 			unset(Config::$modSettings['load_average']);
 		}
 
-		if (!empty(Config::$modSettings['load_average']) || (isset(Config::$modSettings['load_average']) && Config::$modSettings['load_average'] === 0.0))
-		{
+		if (!empty(Config::$modSettings['load_average']) || (isset(Config::$modSettings['load_average']) && Config::$modSettings['load_average'] === 0.0)) {
 			self::$loadAverageDisabled = false;
 		}
 
@@ -1159,39 +1129,30 @@ public static function getLoadAverageDisabled(): bool
 	 */
 	public static function prepareServerSettingsContext(&$config_vars)
 	{
-		if (!empty(Utils::$context['settings_not_writable']))
-		{
-			Utils::$context['settings_message'] = array(
+		if (!empty(Utils::$context['settings_not_writable'])) {
+			Utils::$context['settings_message'] = [
 				'label' => Lang::$txt['settings_not_writable'],
 				'tag' => 'div',
-				'class' => 'centertext strong'
-			);
+				'class' => 'centertext strong',
+			];
 		}
 
-		if (isset($_SESSION['adm-save']))
-		{
-			if ($_SESSION['adm-save'] === true)
-			{
+		if (isset($_SESSION['adm-save'])) {
+			if ($_SESSION['adm-save'] === true) {
 				Utils::$context['saved_successful'] = true;
-			}
-			else
-			{
+			} else {
 				Utils::$context['saved_failed'] = $_SESSION['adm-save'];
 			}
 
 			unset($_SESSION['adm-save']);
 		}
 
-		Utils::$context['config_vars'] = array();
+		Utils::$context['config_vars'] = [];
 
-		foreach ($config_vars as $identifier => $config_var)
-		{
-			if (!is_array($config_var) || !isset($config_var[1]))
-			{
+		foreach ($config_vars as $identifier => $config_var) {
+			if (!is_array($config_var) || !isset($config_var[1])) {
 				Utils::$context['config_vars'][] = $config_var;
-			}
-			else
-			{
+			} else {
 				$varname = $config_var[0];
 				global $$varname;
 
@@ -1200,67 +1161,55 @@ public static function prepareServerSettingsContext(&$config_vars)
 				$divPos = strpos($config_var[1], '<div');
 				$subtext = '';
 
-				if ($divPos !== false)
-				{
+				if ($divPos !== false) {
 					$subtext = preg_replace('~</?div[^>]*>~', '', substr($config_var[1], $divPos));
 					$config_var[1] = substr($config_var[1], 0, $divPos);
 				}
 
-				Utils::$context['config_vars'][$config_var[0]] = array(
+				Utils::$context['config_vars'][$config_var[0]] = [
 					'label' => $config_var[1],
-					'help' => isset($config_var[5]) ? $config_var[5] : '',
+					'help' => $config_var[5] ?? '',
 					'type' => $config_var[3],
 					'size' => !empty($config_var[4]) && !is_array($config_var[4]) ? $config_var[4] : 0,
-					'data' => isset($config_var[4]) && is_array($config_var[4]) && $config_var[3] != 'select' ? $config_var[4] : array(),
+					'data' => isset($config_var[4]) && is_array($config_var[4]) && $config_var[3] != 'select' ? $config_var[4] : [],
 					'name' => $config_var[0],
-					'value' => $config_var[2] == 'file' ? Utils::htmlspecialchars($$varname) : (isset(Config::$modSettings[$config_var[0]]) ? Utils::htmlspecialchars(Config::$modSettings[$config_var[0]]) : (in_array($config_var[3], array('int', 'float')) ? 0 : '')),
+					'value' => $config_var[2] == 'file' ? Utils::htmlspecialchars($$varname) : (isset(Config::$modSettings[$config_var[0]]) ? Utils::htmlspecialchars(Config::$modSettings[$config_var[0]]) : (in_array($config_var[3], ['int', 'float']) ? 0 : '')),
 					'disabled' => !empty(Utils::$context['settings_not_writable']) || !empty($config_var['disabled']),
 					'invalid' => false,
 					'subtext' => !empty($config_var['subtext']) ? $config_var['subtext'] : $subtext,
 					'javascript' => '',
 					'preinput' => !empty($config_var['preinput']) ? $config_var['preinput'] : '',
 					'postinput' => !empty($config_var['postinput']) ? $config_var['postinput'] : '',
-				);
+				];
 
 				// Handle min/max/step if necessary
-				if ($config_var[3] == 'int' || $config_var[3] == 'float')
-				{
+				if ($config_var[3] == 'int' || $config_var[3] == 'float') {
 					// Default to a min of 0 if one isn't set
-					if (isset($config_var['min']))
-					{
+					if (isset($config_var['min'])) {
 						Utils::$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
-					}
-					else
-					{
+					} else {
 						Utils::$context['config_vars'][$config_var[0]]['min'] = 0;
 					}
 
-					if (isset($config_var['max']))
-					{
+					if (isset($config_var['max'])) {
 						Utils::$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
 					}
 
-					if (isset($config_var['step']))
-					{
+					if (isset($config_var['step'])) {
 						Utils::$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
 					}
 				}
 
 				// If this is a select box handle any data.
-				if (!empty($config_var[4]) && is_array($config_var[4]))
-				{
+				if (!empty($config_var[4]) && is_array($config_var[4])) {
 					// If it's associative
 					$config_values = array_values($config_var[4]);
 
-					if (isset($config_values[0]) && is_array($config_values[0]))
-					{
+					if (isset($config_values[0]) && is_array($config_values[0])) {
 						Utils::$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
-					}
-					else
-					{
-						foreach ($config_var[4] as $key => $item)
-						{
-							Utils::$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					} else {
+						foreach ($config_var[4] as $key => $item) {
+							Utils::$context['config_vars'][$config_var[0]]['data'][] = [$key, $item];
 						}
 					}
 				}
@@ -1283,11 +1232,13 @@ public static function checkSettingsFileWriteSafe(): bool
 	{
 		self::$settings_not_writable = !is_writable(SMF_SETTINGS_FILE);
 
-		if (self::$settings_not_writable)
+		if (self::$settings_not_writable) {
 			return false;
+		}
 
-		if (!file_exists(SMF_SETTINGS_BACKUP_FILE))
+		if (!file_exists(SMF_SETTINGS_BACKUP_FILE)) {
 			@touch(SMF_SETTINGS_BACKUP_FILE);
+		}
 
 		self::$settings_backup_fail = !is_writable(SMF_SETTINGS_BACKUP_FILE);
 
@@ -1302,8 +1253,9 @@ public static function checkSettingsFileWriteSafe(): bool
 	 */
 	public static function modifyGeneralSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::generalConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'general';
@@ -1318,8 +1270,9 @@ public static function modifyGeneralSettings($return_config = false)
 	 */
 	public static function modifyDatabaseSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::databaseConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'database';
@@ -1334,8 +1287,9 @@ public static function modifyDatabaseSettings($return_config = false)
 	 */
 	public static function modifyCookieSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::cookieConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'cookie';
@@ -1350,8 +1304,9 @@ public static function modifyCookieSettings($return_config = false)
 	 */
 	public static function modifyGeneralSecuritySettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::securityConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'security';
@@ -1366,8 +1321,9 @@ public static function modifyGeneralSecuritySettings($return_config = false)
 	 */
 	public static function modifyCacheSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::cacheConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'cache';
@@ -1382,8 +1338,9 @@ public static function modifyCacheSettings($return_config = false)
 	 */
 	public static function modifyExportSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::exportConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'export';
@@ -1398,8 +1355,9 @@ public static function modifyExportSettings($return_config = false)
 	 */
 	public static function modifyLoadBalancingSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::loadBalancingConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'loads';
@@ -1428,16 +1386,17 @@ protected function __construct()
 		Lang::load('ManageSettings');
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['admin_server_settings'],
 			'help' => 'serversettings',
 			'description' => Lang::$txt['admin_basic_settings'],
-		);
+		];
 
-		IntegrationHook::call('integrate_server_settings', array(&self::$subactions));
+		IntegrationHook::call('integrate_server_settings', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -1463,49 +1422,37 @@ protected function __construct()
 	 * just brute force overwrite them based on force_ssl.
 	 *
 	 * @param int $new_force_ssl is the current force_ssl setting.
-	 * @return void Returns nothing, just does its job
 	 */
 	protected function alignURLsWithSSLSetting($new_force_ssl = 0)
 	{
 		// Check Config::$boardurl
-		if (!empty($new_force_ssl))
-		{
-			$newval = strtr(Config::$boardurl, array('http://' => 'https://'));
-		}
-		else
-		{
-			$newval = strtr(Config::$boardurl, array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+			$newval = strtr(Config::$boardurl, ['http://' => 'https://']);
+		} else {
+			$newval = strtr(Config::$boardurl, ['https://' => 'http://']);
 		}
 
-		Config::updateSettingsFile(array('boardurl' => $newval));
+		Config::updateSettingsFile(['boardurl' => $newval]);
 
-		$new_settings = array();
+		$new_settings = [];
 
 		// Check $smileys_url, but only if it points to a subfolder of Config::$boardurl
-		if ($this->boardurlMatch(Config::$modSettings['smileys_url']))
-		{
-			if (!empty($new_force_ssl))
-			{
-				$newval = strtr(Config::$modSettings['smileys_url'], array('http://' => 'https://'));
-			}
-			else
-			{
-				$newval = strtr(Config::$modSettings['smileys_url'], array('https://' => 'http://'));
+		if ($this->boardurlMatch(Config::$modSettings['smileys_url'])) {
+			if (!empty($new_force_ssl)) {
+				$newval = strtr(Config::$modSettings['smileys_url'], ['http://' => 'https://']);
+			} else {
+				$newval = strtr(Config::$modSettings['smileys_url'], ['https://' => 'http://']);
 			}
 
 			$new_settings['smileys_url'] = $newval;
 		}
 
 		// Check $avatar_url, but only if it points to a subfolder of Config::$boardurl
-		if ($this->boardurlMatch(Config::$modSettings['avatar_url']))
-		{
-			if (!empty($new_force_ssl))
-			{
-				$newval = strtr(Config::$modSettings['avatar_url'], array('http://' => 'https://'));
-			}
-			else
-			{
-				$newval = strtr(Config::$modSettings['avatar_url'], array('https://' => 'http://'));
+		if ($this->boardurlMatch(Config::$modSettings['avatar_url'])) {
+			if (!empty($new_force_ssl)) {
+				$newval = strtr(Config::$modSettings['avatar_url'], ['http://' => 'https://']);
+			} else {
+				$newval = strtr(Config::$modSettings['avatar_url'], ['https://' => 'http://']);
 			}
 
 			$new_settings['avatar_url'] = $newval;
@@ -1513,63 +1460,58 @@ protected function alignURLsWithSSLSetting($new_force_ssl = 0)
 
 		// Check $custom_avatar_url, but only if it points to a subfolder of Config::$boardurl
 		// This one had been optional in the past, make sure it is set first
-		if (isset(Config::$modSettings['custom_avatar_url']) && $this->boardurlMatch(Config::$modSettings['custom_avatar_url']))
-		{
-			if (!empty($new_force_ssl))
-			{
-				$newval = strtr(Config::$modSettings['custom_avatar_url'], array('http://' => 'https://'));
-			}
-			else
-			{
-				$newval = strtr(Config::$modSettings['custom_avatar_url'], array('https://' => 'http://'));
+		if (isset(Config::$modSettings['custom_avatar_url']) && $this->boardurlMatch(Config::$modSettings['custom_avatar_url'])) {
+			if (!empty($new_force_ssl)) {
+				$newval = strtr(Config::$modSettings['custom_avatar_url'], ['http://' => 'https://']);
+			} else {
+				$newval = strtr(Config::$modSettings['custom_avatar_url'], ['https://' => 'http://']);
 			}
 
 			$new_settings['custom_avatar_url'] = $newval;
 		}
 
 		// Save updates to the settings table
-		if (!empty($new_settings))
+		if (!empty($new_settings)) {
 			Config::updateModSettings($new_settings, true);
+		}
 
 		// Now we move onto the themes.
 		// First, get a list of theme URLs...
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE variable in ({string:themeurl}, {string:imagesurl})
 				AND id_member = {int:zero}',
-			array(
+			[
 				'themeurl' => 'theme_url',
 				'imagesurl' => 'images_url',
 				'zero' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// First check to see if it points to a subfolder of Config::$boardurl
-			if ($this->boardurlMatch($row['value']))
-			{
-				if (!empty($new_force_ssl))
-				{
-					$newval = strtr($row['value'], array('http://' => 'https://'));
-				}
-				else
-				{
-					$newval = strtr($row['value'], array('https://' => 'http://'));
+			if ($this->boardurlMatch($row['value'])) {
+				if (!empty($new_force_ssl)) {
+					$newval = strtr($row['value'], ['http://' => 'https://']);
+				} else {
+					$newval = strtr($row['value'], ['https://' => 'http://']);
 				}
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}themes
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}themes
 					SET value = {string:theme_val}
 					WHERE variable = {string:theme_var}
 						AND id_theme = {string:theme_id}
 						AND id_member = {int:zero}',
-					array(
+					[
 						'theme_val' => $newval,
 						'theme_var' => $row['variable'],
 						'theme_id' => $row['id_theme'],
 						'zero' => 0,
-					)
+					],
 				);
 			}
 		}
@@ -1590,8 +1532,8 @@ protected function alignURLsWithSSLSetting($new_force_ssl = 0)
 	protected function boardurlMatch($url = ''): bool
 	{
 		// Strip the schemes
-		$urlpath = strtr($url, array('http://' => '', 'https://' => ''));
-		$boardurlpath = strtr(Config::$boardurl, array('http://' => '', 'https://' => ''));
+		$urlpath = strtr($url, ['http://' => '', 'https://' => '']);
+		$boardurlpath = strtr(Config::$boardurl, ['http://' => '', 'https://' => '']);
 
 		// If leftmost portion of path matches boardurl, return true
 		$result = strpos($urlpath, $boardurlpath);
@@ -1611,16 +1553,17 @@ protected function boardurlMatch($url = ''): bool
 	protected function registerSMStats()
 	{
 		// Already have a key?  Can't register again.
-		if (!empty(Config::$modSettings['sm_stats_key']))
+		if (!empty(Config::$modSettings['sm_stats_key'])) {
 			return true;
+		}
 
 		$fp = @fsockopen('www.simplemachines.org', 443, $errno, $errstr);
 
-		if (!$fp)
+		if (!$fp) {
 			$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
+		}
 
-		if ($fp)
-		{
+		if ($fp) {
 			$out = 'GET /smf/stats/register_stats.php?site=' . base64_encode(Config::$boardurl) . ' HTTP/1.1' . "\r\n";
 			$out .= 'Host: www.simplemachines.org' . "\r\n";
 			$out .= 'Connection: Close' . "\r\n\r\n";
@@ -1628,21 +1571,22 @@ protected function registerSMStats()
 
 			$return_data = '';
 
-			while (!feof($fp))
+			while (!feof($fp)) {
 				$return_data .= fgets($fp, 128);
+			}
 
 			fclose($fp);
 
 			// Get the unique site ID.
 			preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-			if (!empty($ID[1]))
-			{
-				Db::$db->insert('replace',
+			if (!empty($ID[1])) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}settings',
-					array('variable' => 'string', 'value' => 'string'),
-					array('sm_stats_key', $ID[1]),
-					array('variable')
+					['variable' => 'string', 'value' => 'string'],
+					['sm_stats_key', $ID[1]],
+					['variable'],
 				);
 
 				return true;
@@ -1654,7 +1598,8 @@ protected function registerSMStats()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Server::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Server::exportStatic')) {
 	Server::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Smileys.php b/Sources/Actions/Admin/Smileys.php
index 06fc4a4292..e39ad42c85 100644
--- a/Sources/Actions/Admin/Smileys.php
+++ b/Sources/Actions/Admin/Smileys.php
@@ -15,11 +15,13 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\MessageIndex;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
@@ -27,14 +29,11 @@
 use SMF\Logging;
 use SMF\Menu;
 use SMF\Msg;
+use SMF\PackageManager\SubsPackage;
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\MessageIndex;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\PackageManager\SubsPackage;
 use SMF\WebFetch\WebFetchApi;
 
 /**
@@ -49,13 +48,21 @@ class Smileys implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageSmileys',
-			'getConfigVars' => false,
-		),
-	);
+			'list_getSmileySets' => 'list_getSmileySets',
+			'list_getNumSmileySets' => 'list_getNumSmileySets',
+			'list_getSmileys' => 'list_getSmileys',
+			'list_getNumSmileys' => 'list_getNumSmileys',
+			'list_getMessageIcons' => 'list_getMessageIcons',
+			'addSmiley' => 'AddSmiley',
+			'editSmileys' => 'EditSmileys',
+			'editSmileyOrder' => 'EditSmileyOrder',
+			'installSmileySet' => 'InstallSmileySet',
+			'editMessageIcons' => 'EditMessageIcons',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -84,7 +91,7 @@ class Smileys implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'editsets' => 'editSets',
 		'import' => 'editSets',
 		'modifyset' => 'editSets',
@@ -96,34 +103,34 @@ class Smileys implements ActionInterface
 		'editicon' => 'editIcon',
 		'editicons' => 'editIcon',
 		'settings' => 'settings',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Allowed file extensions for smiley images.
 	 */
-	public static array $allowed_extenions = array(
+	public static array $allowed_extenions = [
 		'gif',
 		'png',
 		'jpg',
 		'jpeg',
 		'tiff',
 		'svg',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Allowed MIME types for smiley images.
 	 */
-	public static array $allowed_mime_types = array(
+	public static array $allowed_mime_types = [
 		'image/gif',
 		'image/png',
 		'image/jpeg',
 		'image/tiff',
 		'image/svg+xml',
-	);
+	];
 
 	/**
 	 * @var array
@@ -131,7 +138,7 @@ class Smileys implements ActionInterface
 	 * Forbidden file names.
 	 * Uploading a smiley image with one of these names will give a fatal error.
 	 */
-	public static array $illegal_files = array(
+	public static array $illegal_files = [
 		'con',
 		'com1',
 		'com2',
@@ -142,14 +149,14 @@ class Smileys implements ActionInterface
 		'lpt1',
 		'.htaccess',
 		'index.php',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Info about all known smiley sets.
 	 */
-	public static array $smiley_sets = array();
+	public static array $smiley_sets = [];
 
 	/**
 	 * @var string
@@ -193,10 +200,11 @@ class Smileys implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -208,31 +216,31 @@ public function editSets()
 		Menu::$loaded['admin']['current_subsection'] = 'editsets';
 
 		// They must have submitted a form.
-		if (isset($_POST['smiley_save']))
-		{
+		if (isset($_POST['smiley_save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-mss', 'request');
 
 			// Delete selected smiley sets.
-			if (!empty($_POST['delete']) && !empty($_POST['smiley_set']))
-			{
-				foreach ($_POST['smiley_set'] as $id => $val)
-				{
+			if (!empty($_POST['delete']) && !empty($_POST['smiley_set'])) {
+				foreach ($_POST['smiley_set'] as $id => $val) {
 					// Can't delete sets that don't exist.
-					if (!isset(self::$smiley_sets[$id]))
+					if (!isset(self::$smiley_sets[$id])) {
 						continue;
+					}
 
 					// Can't the default set or the only one remaining.
-					if (self::$smiley_sets[$id]['is_default'] || count(self::$smiley_sets) < 2)
+					if (self::$smiley_sets[$id]['is_default'] || count(self::$smiley_sets) < 2) {
 						continue;
+					}
 
 					// Delete this set's entries from the smiley_files table
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}smiley_files
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}smiley_files
 						WHERE smiley_set = {string:smiley_set}',
-						array(
+						[
 							'smiley_set' => $id,
-						)
+						],
 					);
 
 					// Remove this set from our lists
@@ -242,76 +250,76 @@ public function editSets()
 				self::saveSets();
 			}
 			// Add a new smiley set.
-			elseif (!empty($_POST['add']))
-			{
+			elseif (!empty($_POST['add'])) {
 				$this->subaction = 'modifyset';
 			}
 			// Create or modify a smiley set.
-			elseif (isset($_POST['set']))
-			{
+			elseif (isset($_POST['set'])) {
 				// @todo Needs a more precise error message.
-				if (!isset($_POST['smiley_sets_name']))
+				if (!isset($_POST['smiley_sets_name'])) {
 					ErrorHandler::fatalLang('smiley_set_not_found', false);
+				}
 
 				$_POST['smiley_sets_name'] = self::sanitizeString($_POST['smiley_sets_name']);
 
 				// No spaces or weirdness allowed in the directory name.
-				if (!isset($_POST['smiley_sets_path']) || $_POST['smiley_sets_path'] !== self::sanitizeFileName($_POST['smiley_sets_path']))
-				{
+				if (!isset($_POST['smiley_sets_path']) || $_POST['smiley_sets_path'] !== self::sanitizeFileName($_POST['smiley_sets_path'])) {
 					ErrorHandler::fatalLang('smiley_set_dir_not_found', false, Utils::htmlspecialchars($_POST['smiley_sets_name']));
 				}
 
 				// Create a new smiley set.
-				if ($_POST['set'] == -1 && isset($_POST['smiley_sets_path']))
-				{
-					if (isset(self::$smiley_sets[$_POST['smiley_sets_path']]))
+				if ($_POST['set'] == -1 && isset($_POST['smiley_sets_path'])) {
+					if (isset(self::$smiley_sets[$_POST['smiley_sets_path']])) {
 						ErrorHandler::fatalLang('smiley_set_already_exists', false);
+					}
 
-					if (!is_dir(self::$smileys_dir . '/' . $_POST['smiley_sets_path']))
+					if (!is_dir(self::$smileys_dir . '/' . $_POST['smiley_sets_path'])) {
 						$this->createDir($_POST['smiley_sets_path'], $_POST['smiley_sets_name']);
+					}
 
-					if (!empty($_POST['smiley_sets_default']))
-					{
-						foreach (self::$smiley_sets as $id => $set)
+					if (!empty($_POST['smiley_sets_default'])) {
+						foreach (self::$smiley_sets as $id => $set) {
 							self::$smiley_sets[$id]['is_default'] = false;
+						}
 					}
 
-					self::$smiley_sets[$_POST['smiley_sets_path']] = array(
-						'id' => max(array_map(fn($set) => $set['id'], self::$smiley_sets)) + 1,
+					self::$smiley_sets[$_POST['smiley_sets_path']] = [
+						'id' => max(array_map(fn ($set) => $set['id'], self::$smiley_sets)) + 1,
 						'raw_path' => $_POST['smiley_sets_path'],
 						'raw_name' => $_POST['smiley_sets_name'],
 						'path' => Utils::htmlspecialchars($_POST['smiley_sets_path']),
 						'name' => Utils::htmlspecialchars($_POST['smiley_sets_name']),
 						'is_default' => !empty($_POST['smiley_sets_default']),
 						'is_new' => true,
-					);
+					];
 
 					self::saveSets();
 				}
 				// Modify an existing smiley set.
-				else
-				{
+				else {
 					// Make sure the smiley set exists.
-					if (!isset(self::$smiley_sets[$_POST['set']]))
+					if (!isset(self::$smiley_sets[$_POST['set']])) {
 						ErrorHandler::fatalLang('smiley_set_not_found', false);
+					}
 
 					// Make sure the path is not yet used by another smiley set.
-					foreach (self::$smiley_sets as $id => $set)
-					{
-						if ($id === $_POST['set'])
+					foreach (self::$smiley_sets as $id => $set) {
+						if ($id === $_POST['set']) {
 							continue;
+						}
 
-						if ($set['raw_path'] === $_POST['smiley_sets_path'])
+						if ($set['raw_path'] === $_POST['smiley_sets_path']) {
 							ErrorHandler::fatalLang('smiley_set_path_already_used', false);
+						}
 					}
 
 					self::$smiley_sets[$_POST['set']]['raw_path'] = $_POST['smiley_sets_path'];
 					self::$smiley_sets[$_POST['set']]['raw_name'] = $_POST['smiley_sets_name'];
 
-					if (!empty($_POST['smiley_sets_default']))
-					{
-						foreach (self::$smiley_sets as $id => $set)
+					if (!empty($_POST['smiley_sets_default'])) {
+						foreach (self::$smiley_sets as $id => $set) {
 							self::$smiley_sets[$id]['is_default'] = $id === $_POST['set'];
+						}
 					}
 
 					self::saveSets();
@@ -325,14 +333,14 @@ public function editSets()
 		}
 
 		// Importing any smileys from an existing set?
-		if ($this->subaction == 'import')
-		{
+		if ($this->subaction == 'import') {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-mss', 'request');
 
 			// Sanity check - then import.
-			if (isset(self::$smiley_sets[$_GET['set']]))
+			if (isset(self::$smiley_sets[$_GET['set']])) {
 				$this->import(self::$smiley_sets[$_GET['set']]['raw_path'], true);
+			}
 
 			// Force the process to continue.
 			$this->subaction = 'modifyset';
@@ -340,13 +348,11 @@ public function editSets()
 		}
 
 		// If we're modifying or adding a smiley set, some context info needs to be set.
-		if ($this->subaction == 'modifyset')
-		{
+		if ($this->subaction == 'modifyset') {
 			$_GET['set'] = !isset($_GET['set']) ? -1 : $_GET['set'];
 
-			if ($_GET['set'] == -1 || !isset(self::$smiley_sets[$_GET['set']]))
-			{
-				Utils::$context['current_set'] = array(
+			if ($_GET['set'] == -1 || !isset(self::$smiley_sets[$_GET['set']])) {
+				Utils::$context['current_set'] = [
 					'id' => '-1',
 					'raw_path' => '',
 					'raw_name' => '',
@@ -354,10 +360,8 @@ public function editSets()
 					'name' => '',
 					'is_default' => false,
 					'is_new' => true,
-				);
-			}
-			else
-			{
+				];
+			} else {
 				Utils::$context['current_set'] = &self::$smiley_sets[$_GET['set']];
 				Utils::$context['current_set']['is_new'] = false;
 
@@ -366,47 +370,46 @@ public function editSets()
 					!empty(Config::$modSettings['smiley_enable'])
 					&& !empty(self::$smileys_dir)
 					&& is_dir(self::$smileys_dir . '/' . Utils::$context['current_set']['path'])
-				)
-				{
-					$smileys = array();
+				) {
+					$smileys = [];
 
 					$dir = dir(self::$smileys_dir . '/' . Utils::$context['current_set']['path']);
 
-					while ($entry = $dir->read())
-					{
+					while ($entry = $dir->read()) {
 						$pathinfo = pathinfo($entry);
 
-						if (empty($pathinfo['filename']) || empty($pathinfo['extension']))
+						if (empty($pathinfo['filename']) || empty($pathinfo['extension'])) {
 							continue;
+						}
 
-						if (in_array($pathinfo['extension'], self::$allowed_extenions) && $pathinfo['filename'] != 'blank')
-						{
+						if (in_array($pathinfo['extension'], self::$allowed_extenions) && $pathinfo['filename'] != 'blank') {
 							$smileys[Utils::convertCase($entry, 'fold')] = $entry;
 						}
 					}
 
 					$dir->close();
 
-					if (empty($smileys))
-					{
-						ErrorHandler::fatalLang('smiley_set_dir_not_found', false, array(Utils::$context['current_set']['name']));
+					if (empty($smileys)) {
+						ErrorHandler::fatalLang('smiley_set_dir_not_found', false, [Utils::$context['current_set']['name']]);
 					}
 
 					// Exclude the smileys that are already in the database.
-					$request = Db::$db->query('', '
-						SELECT filename
+					$request = Db::$db->query(
+						'',
+						'SELECT filename
 						FROM {db_prefix}smiley_files
 						WHERE filename IN ({array_string:smiley_list})
 							AND smiley_set = {string:smiley_set}',
-						array(
+						[
 							'smiley_list' => $smileys,
 							'smiley_set' => Utils::$context['current_set']['path'],
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
-						if (isset($smileys[Utils::convertCase($row['filename'], 'fold')]))
+
+					while ($row = Db::$db->fetch_assoc($request)) {
+						if (isset($smileys[Utils::convertCase($row['filename'], 'fold')])) {
 							unset($smileys[Utils::convertCase($row['filename'], 'fold')]);
+						}
 					}
 					Db::$db->free_result($request);
 
@@ -417,22 +420,19 @@ public function editSets()
 			}
 
 			// Retrieve all potential smiley set directories.
-			Utils::$context['smiley_set_dirs'] = array();
+			Utils::$context['smiley_set_dirs'] = [];
 
-			if (self::$smileys_dir_found)
-			{
+			if (self::$smileys_dir_found) {
 				$dir = dir(self::$smileys_dir);
 
-				while ($entry = $dir->read())
-				{
-					if (!in_array($entry, array('.', '..')) && is_dir(self::$smileys_dir . '/' . $entry))
-					{
-						Utils::$context['smiley_set_dirs'][] = array(
+				while ($entry = $dir->read()) {
+					if (!in_array($entry, ['.', '..']) && is_dir(self::$smileys_dir . '/' . $entry)) {
+						Utils::$context['smiley_set_dirs'][] = [
 							'id' => $entry,
 							'path' => self::$smileys_dir . '/' . $entry,
 							'selectable' => $entry == Utils::$context['current_set']['path'] || !in_array($entry, explode(',', Config::$modSettings['smiley_sets_known'])),
 							'current' => $entry == Utils::$context['current_set']['path'],
-						);
+						];
 					}
 				}
 
@@ -440,9 +440,8 @@ public function editSets()
 
 				// Creating a new set, but there are no available directories.
 				// Therefore, show the UI for making a new directory.
-				if (Utils::$context['current_set']['is_new'])
-				{
-					Utils::$context['make_new'] = array_filter(Utils::$context['smiley_set_dirs'], fn($dir) => $dir['selectable']) === array();
+				if (Utils::$context['current_set']['is_new']) {
+					Utils::$context['make_new'] = array_filter(Utils::$context['smiley_set_dirs'], fn ($dir) => $dir['selectable']) === [];
 				}
 			}
 		}
@@ -451,116 +450,113 @@ public function editSets()
 		SecurityToken::create('admin-mss', 'request');
 
 		// In case we need to import smileys, we need to add the token in now.
-		if (isset(Utils::$context['current_set']['import_url']))
-		{
+		if (isset(Utils::$context['current_set']['import_url'])) {
 			Utils::$context['current_set']['import_url'] .= ';' . Utils::$context['admin-mss_token_var'] . '=' . Utils::$context['admin-mss_token'];
 
 			Utils::$context['smiley_set_unused_message'] = sprintf(Lang::$txt['smiley_set_unused'], Config::$scripturl . '?action=admin;area=smileys;sa=editsmileys', Config::$scripturl . '?action=admin;area=smileys;sa=addsmiley', Utils::$context['current_set']['import_url']);
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'smiley_set_list',
 			'title' => Lang::$txt['smiley_sets'],
 			'no_items_label' => Lang::$txt['smiley_sets_none'],
 			'base_href' => Config::$scripturl . '?action=admin;area=smileys;sa=editsets',
 			'default_sort_col' => 'name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getSmileySets',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumSmileySets',
-			),
-			'columns' => array(
-				'default' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'default' => [
+					'header' => [
 						'value' => Lang::$txt['smiley_sets_default'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return $rowData['is_default'] ? '<span class="main_icons valid"></span>' : '';
 						},
 						'class' => 'centercol',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'is_default',
 						'reverse' => 'is_default DESC',
-					),
-				),
-				'name' => array(
-					'header' => array(
+					],
+				],
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['smiley_sets_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'name',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'name',
 						'reverse' => 'name DESC',
-					),
-				),
-				'url' => array(
-					'header' => array(
+					],
+				],
+				'url' => [
+					'header' => [
 						'value' => Lang::$txt['smiley_sets_url'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => Config::$modSettings['smileys_url'] . '/<strong>%1$s</strong>/...',
-							'params' => array(
+							'params' => [
 								'path' => true,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'path',
 						'reverse' => 'path DESC',
-					),
-				),
-				'modify' => array(
-					'header' => array(
+					],
+				],
+				'modify' => [
+					'header' => [
 						'value' => Lang::$txt['smiley_set_modify'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=smileys;sa=modifyset;set=%1$s">' . Lang::$txt['smiley_set_modify'] . '</a>',
-							'params' => array(
+							'params' => [
 								'path' => true,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return $rowData['is_default'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$s]">', $rowData['path']);
 						},
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=smileys;sa=editsets',
 				'token' => 'admin-mss',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'above_column_headers',
 					'value' => '<input type="hidden" name="smiley_save"><input type="submit" name="delete" value="' . Lang::$txt['smiley_sets_delete'] . '" data-confirm="' . Lang::$txt['smiley_sets_confirm'] . '" class="button you_sure"> <a class="button" href="' . Config::$scripturl . '?action=admin;area=smileys;sa=modifyset' . '">' . Lang::$txt['smiley_sets_add'] . '</a> ',
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="hidden" name="smiley_save"><input type="submit" name="delete" value="' . Lang::$txt['smiley_sets_delete'] . '" data-confirm="' . Lang::$txt['smiley_sets_confirm'] . '" class="button you_sure"> <a class="button" href="' . Config::$scripturl . '?action=admin;area=smileys;sa=modifyset' . '">' . Lang::$txt['smiley_sets_add'] . '</a> ',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 	}
@@ -571,15 +567,15 @@ public function editSets()
 	public function add()
 	{
 		// This will hold the names of the added files for each set
-		$filename_array = array();
+		$filename_array = [];
 
 		// Submitting a form?
-		if (isset($_POST[Utils::$context['session_var']], $_POST['smiley_code']))
-		{
+		if (isset($_POST[Utils::$context['session_var']], $_POST['smiley_code'])) {
 			User::$me->checkSession();
 
-			foreach (array('smiley_code', 'smiley_filename', 'smiley_description') as $key)
+			foreach (['smiley_code', 'smiley_filename', 'smiley_description'] as $key) {
 				$_POST[$key] = Utils::normalize($_POST[$key]);
+			}
 
 			$_POST['smiley_code'] = Utils::htmlTrim($_POST['smiley_code']);
 
@@ -588,116 +584,107 @@ public function add()
 			$_POST['smiley_filename'] = Utils::htmlTrim($_POST['smiley_filename']);
 
 			// Make sure some code was entered.
-			if (empty($_POST['smiley_code']))
+			if (empty($_POST['smiley_code'])) {
 				ErrorHandler::fatalLang('smiley_has_no_code', false);
+			}
 
 			// Check whether the new code has duplicates. It should be unique.
-			$request = Db::$db->query('', '
-				SELECT id_smiley
+			$request = Db::$db->query(
+				'',
+				'SELECT id_smiley
 				FROM {db_prefix}smileys
 				WHERE code = {raw:mysql_binary_statement} {string:smiley_code}',
-				array(
+				[
 					'mysql_binary_statement' => Db::$db->title == MYSQL_TITLE ? 'BINARY' : '',
 					'smiley_code' => $_POST['smiley_code'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) > 0)
-			{
+
+			if (Db::$db->num_rows($request) > 0) {
 				ErrorHandler::fatalLang('smiley_not_unique', false);
 			}
 			Db::$db->free_result($request);
 
 			// If we are uploading - check all the smiley sets are writable!
-			if ($_POST['method'] != 'existing')
-			{
-				$writeErrors = array();
+			if ($_POST['method'] != 'existing') {
+				$writeErrors = [];
 
-				foreach (self::$smiley_sets as $set)
-				{
-					if (!is_writable(self::$smileys_dir . '/' . $set['raw_path']))
+				foreach (self::$smiley_sets as $set) {
+					if (!is_writable(self::$smileys_dir . '/' . $set['raw_path'])) {
 						$writeErrors[] = $set['path'];
+					}
 				}
 
-				if (!empty($writeErrors))
-				{
-					ErrorHandler::fatalLang('smileys_upload_error_notwritable', false, array(implode(', ', $writeErrors)));
+				if (!empty($writeErrors)) {
+					ErrorHandler::fatalLang('smileys_upload_error_notwritable', false, [implode(', ', $writeErrors)]);
 				}
 			}
 
 			// Uploading just one smiley for all of them?
-			if (isset($_POST['sameall']) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
-			{
-				$filename_array = array_merge($filename_array, $this->moveImageIntoPlace($_FILES['uploadSmiley']['name'], $_FILES['uploadSmiley']['tmp_name'], array_map(fn($set) => $set['raw_path'], self::$smiley_sets)));
+			if (isset($_POST['sameall'], $_FILES['uploadSmiley']['name'])   && $_FILES['uploadSmiley']['name'] != '') {
+				$filename_array = array_merge($filename_array, $this->moveImageIntoPlace($_FILES['uploadSmiley']['name'], $_FILES['uploadSmiley']['tmp_name'], array_map(fn ($set) => $set['raw_path'], self::$smiley_sets)));
 			}
 			// What about uploading several files?
-			elseif ($_POST['method'] != 'existing')
-			{
-				foreach ($_FILES as $name => $data)
-				{
-					if ($_FILES[$name]['name'] == '')
+			elseif ($_POST['method'] != 'existing') {
+				foreach ($_FILES as $name => $data) {
+					if ($_FILES[$name]['name'] == '') {
 						ErrorHandler::fatalLang('smileys_upload_error_blank', false);
+					}
 				}
 
-				foreach (self::$smiley_sets as $set => $smiley_set)
-				{
-					$filename_array = array_merge($filename_array, $this->moveImageIntoPlace($_FILES['individual_' . $smiley_set['raw_path']]['name'], $_FILES['individual_' . $smiley_set['raw_path']]['tmp_name'], array($smiley_set['raw_path'])));
+				foreach (self::$smiley_sets as $set => $smiley_set) {
+					$filename_array = array_merge($filename_array, $this->moveImageIntoPlace($_FILES['individual_' . $smiley_set['raw_path']]['name'], $_FILES['individual_' . $smiley_set['raw_path']]['tmp_name'], [$smiley_set['raw_path']]));
 				}
 			}
 			// Re-using an existing image
-			else
-			{
+			else {
 				// Make sure a filename was given
-				if (empty($_POST['smiley_filename']))
+				if (empty($_POST['smiley_filename'])) {
 					ErrorHandler::fatalLang('smiley_has_no_filename', false);
+				}
 
 				// And make sure it is legitimate
 				$pathinfo = pathinfo($_POST['smiley_filename']);
 
-				if (!in_array($pathinfo['extension'], self::$allowed_extenions))
-				{
-					ErrorHandler::fatalLang('smileys_upload_error_types', false, array(implode(', ', self::$allowed_extenions)));
+				if (!in_array($pathinfo['extension'], self::$allowed_extenions)) {
+					ErrorHandler::fatalLang('smileys_upload_error_types', false, [implode(', ', self::$allowed_extenions)]);
 				}
 
-				if (strpos($pathinfo['filename'], '.') !== false)
-				{
+				if (strpos($pathinfo['filename'], '.') !== false) {
 					ErrorHandler::fatalLang('smileys_upload_error_illegal', false);
 				}
 
-				if (!isset(self::$smiley_sets[$pathinfo['dirname']]))
-				{
+				if (!isset(self::$smiley_sets[$pathinfo['dirname']])) {
 					ErrorHandler::fatalLang('smiley_set_not_found', false);
 				}
 
-				if (!file_exists(self::$smileys_dir . '/' . $pathinfo['dirname'] . '/' . $pathinfo['basename']))
-				{
+				if (!file_exists(self::$smileys_dir . '/' . $pathinfo['dirname'] . '/' . $pathinfo['basename'])) {
 					ErrorHandler::fatalLang('smiley_not_found', false);
 				}
 
 				// Now ensure every set has a file to use for this smiley
-				foreach (self::$smiley_sets as $set => $smiley_set)
-				{
+				foreach (self::$smiley_sets as $set => $smiley_set) {
 					unset($basename);
 
 					// Check whether any similarly named files exist in the other set's directory
 					$similar_files = glob(self::$smileys_dir . '/' . $set . '/' . $pathinfo['filename'] . '.{' . implode(',', self::$allowed_extenions) . '}', GLOB_BRACE);
 
 					// If there's a similarly named file already there, use it.
-					if (!empty($similar_files))
-					{
+					if (!empty($similar_files)) {
 						// Prefer an exact match if there is one.
-						foreach ($similar_files as $similar_file)
-						{
-							if (basename($similar_file) == $pathinfo['basename'])
+						foreach ($similar_files as $similar_file) {
+							if (basename($similar_file) == $pathinfo['basename']) {
 								$basename = $pathinfo['basename'];
+							}
 						}
 
 						// Same name, different extension.
-						if (empty($basename))
+						if (empty($basename)) {
 							$basename = basename(reset($similar_files));
+						}
 					}
 					// Otherwise, copy the image to the other set's directory
-					else
-					{
+					else {
 						copy(self::$smileys_dir . '/' . $pathinfo['dirname'] . '/' . $pathinfo['basename'], self::$smileys_dir . '/' . $set . '/' . $pathinfo['basename']);
 
 						Utils::makeWritable(self::$smileys_dir . '/' . $set . '/' . $pathinfo['basename'], 0644);
@@ -706,8 +693,7 @@ public function add()
 					}
 
 					// Double-check that everything went as expected
-					if (empty($basename) || !file_exists(self::$smileys_dir . '/' . $set . '/' . $basename))
-					{
+					if (empty($basename) || !file_exists(self::$smileys_dir . '/' . $set . '/' . $basename)) {
 						ErrorHandler::fatalLang('smiley_not_found', false);
 					}
 
@@ -719,51 +705,55 @@ public function add()
 			// Find the position on the right.
 			$smiley_order = '0';
 
-			if ($_POST['smiley_location'] != 1)
-			{
-				$request = Db::$db->query('', '
-					SELECT MAX(smiley_order) + 1
+			if ($_POST['smiley_location'] != 1) {
+				$request = Db::$db->query(
+					'',
+					'SELECT MAX(smiley_order) + 1
 					FROM {db_prefix}smileys
 					WHERE hidden = {int:smiley_location}
 						AND smiley_row = {int:first_row}',
-					array(
+					[
 						'smiley_location' => $_POST['smiley_location'],
 						'first_row' => 0,
-					)
+					],
 				);
-				list ($smiley_order) = Db::$db->fetch_row($request);
+				list($smiley_order) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
-				if (empty($smiley_order))
+				if (empty($smiley_order)) {
 					$smiley_order = '0';
+				}
 			}
 
 			// Add the new smiley to the main smileys table
-			$new_id_smiley = Db::$db->insert('',
+			$new_id_smiley = Db::$db->insert(
+				'',
 				'{db_prefix}smileys',
-				array(
+				[
 					'code' => 'string-30', 'description' => 'string-80', 'hidden' => 'int', 'smiley_order' => 'int',
-				),
-				array(
+				],
+				[
 					$_POST['smiley_code'], $_POST['smiley_description'], $_POST['smiley_location'], $smiley_order,
-				),
-				array('id_smiley'),
-				1
+				],
+				['id_smiley'],
+				1,
 			);
 
 			// Add the filename info to the smiley_files table
-			$inserts = array();
+			$inserts = [];
 
-			foreach ($filename_array as $set => $basename)
-				$inserts[] = array($new_id_smiley, $set, $basename);
+			foreach ($filename_array as $set => $basename) {
+				$inserts[] = [$new_id_smiley, $set, $basename];
+			}
 
-			Db::$db->insert('ignore',
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}smiley_files',
-				array(
+				[
 					'id_smiley' => 'int', 'smiley_set' => 'string-48', 'filename' => 'string-48',
-				),
+				],
 				$inserts,
-				array('id_smiley', 'smiley_set')
+				['id_smiley', 'smiley_set'],
 			);
 
 			self::resetCache();
@@ -775,30 +765,28 @@ public function add()
 		Utils::$context['selected_set'] = Config::$modSettings['smiley_sets_default'];
 
 		// Get all possible filenames for the smileys.
-		Utils::$context['filenames'] = array();
+		Utils::$context['filenames'] = [];
 
-		if (self::$smileys_dir_found)
-		{
-			foreach (self::$smiley_sets as $smiley_set)
-			{
-				if (!file_exists(self::$smileys_dir . '/' . $smiley_set['raw_path']))
+		if (self::$smileys_dir_found) {
+			foreach (self::$smiley_sets as $smiley_set) {
+				if (!file_exists(self::$smileys_dir . '/' . $smiley_set['raw_path'])) {
 					continue;
+				}
 
 				$dir = dir(self::$smileys_dir . '/' . $smiley_set['raw_path']);
 
-				while ($entry = $dir->read())
-				{
+				while ($entry = $dir->read()) {
 					$entry_info = pathinfo($entry);
 
-					if (empty($entry_info['filename']) || empty($entry_info['extension']))
+					if (empty($entry_info['filename']) || empty($entry_info['extension'])) {
 						continue;
+					}
 
-					if (empty(Utils::$context['filenames'][$smiley_set['path']][self::sanitizeFileName($entry_info['filename'])]) && in_array(strtolower($entry_info['extension']), self::$allowed_extenions))
-					{
-						Utils::$context['filenames'][$smiley_set['path']][self::sanitizeFileName($entry_info['filename'])] = array(
+					if (empty(Utils::$context['filenames'][$smiley_set['path']][self::sanitizeFileName($entry_info['filename'])]) && in_array(strtolower($entry_info['extension']), self::$allowed_extenions)) {
+						Utils::$context['filenames'][$smiley_set['path']][self::sanitizeFileName($entry_info['filename'])] = [
 							'id' => Utils::htmlspecialchars($entry),
 							'selected' => $entry_info['filename'] == 'smiley' && $smiley_set['path'] == Utils::$context['selected_set'],
-						);
+						];
 					}
 				}
 
@@ -811,14 +799,14 @@ public function add()
 		}
 
 		// Create a new smiley from scratch.
-		Utils::$context['current_smiley'] = array(
+		Utils::$context['current_smiley'] = [
 			'id' => 0,
 			'code' => '',
 			'filename' => Utils::$context['filenames'][Utils::$context['selected_set']]['smiley']['id'],
 			'description' => Lang::$txt['smileys_default_description'],
 			'location' => 0,
 			'is_new' => true,
-		);
+		];
 	}
 
 	/**
@@ -830,204 +818,203 @@ public function edit()
 		Menu::$loaded['admin']['current_subsection'] = 'editsmileys';
 
 		// Submitting a form?
-		if (isset($_POST['smiley_save']) || isset($_POST['smiley_action']) || isset($_POST['deletesmiley']))
-		{
+		if (isset($_POST['smiley_save']) || isset($_POST['smiley_action']) || isset($_POST['deletesmiley'])) {
 			User::$me->checkSession();
 
 			// Changing the selected smileys?
-			if (isset($_POST['smiley_action']) && !empty($_POST['checked_smileys']))
-			{
-				foreach ($_POST['checked_smileys'] as $id => $smiley_id)
+			if (isset($_POST['smiley_action']) && !empty($_POST['checked_smileys'])) {
+				foreach ($_POST['checked_smileys'] as $id => $smiley_id) {
 					$_POST['checked_smileys'][$id] = (int) $smiley_id;
+				}
 
-				if ($_POST['smiley_action'] == 'delete')
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}smileys
+				if ($_POST['smiley_action'] == 'delete') {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}smileys
 						WHERE id_smiley IN ({array_int:checked_smileys})',
-						array(
+						[
 							'checked_smileys' => $_POST['checked_smileys'],
-						)
+						],
 					);
 
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}smiley_files
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}smiley_files
 						WHERE id_smiley IN ({array_int:checked_smileys})',
-						array(
+						[
 							'checked_smileys' => $_POST['checked_smileys'],
-						)
+						],
 					);
 				}
 				// Changing the status of the smiley?
-				else
-				{
+				else {
 					// Check it's a valid type.
-					$displayTypes = array(
+					$displayTypes = [
 						'post' => 0,
 						'hidden' => 1,
-						'popup' => 2
-					);
+						'popup' => 2,
+					];
 
-					if (isset($displayTypes[$_POST['smiley_action']]))
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}smileys
+					if (isset($displayTypes[$_POST['smiley_action']])) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}smileys
 							SET hidden = {int:display_type}
 							WHERE id_smiley IN ({array_int:checked_smileys})',
-							array(
+							[
 								'checked_smileys' => $_POST['checked_smileys'],
 								'display_type' => $displayTypes[$_POST['smiley_action']],
-							)
+							],
 						);
 					}
 				}
 			}
 			// Create/modify a smiley.
-			elseif (isset($_POST['smiley']))
-			{
+			elseif (isset($_POST['smiley'])) {
 				// Is it a delete?
-				if (!empty($_POST['deletesmiley']) && $_POST['smiley'] == (int) $_POST['smiley'])
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}smileys
+				if (!empty($_POST['deletesmiley']) && $_POST['smiley'] == (int) $_POST['smiley']) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}smileys
 						WHERE id_smiley = {int:current_smiley}',
-						array(
+						[
 							'current_smiley' => $_POST['smiley'],
-						)
+						],
 					);
 
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}smiley_files
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}smiley_files
 						WHERE id_smiley = {int:current_smiley}',
-						array(
+						[
 							'current_smiley' => $_POST['smiley'],
-						)
+						],
 					);
 				}
 				// Otherwise an edit.
-				else
-				{
-					foreach (array('smiley_code', 'smiley_description') as $key)
+				else {
+					foreach (['smiley_code', 'smiley_description'] as $key) {
 						$_POST[$key] = Utils::normalize($_POST[$key]);
+					}
 
 					$_POST['smiley'] = (int) $_POST['smiley'];
 					$_POST['smiley_code'] = Utils::htmlTrimRecursive($_POST['smiley_code']);
 					$_POST['smiley_location'] = empty($_POST['smiley_location']) || $_POST['smiley_location'] > 2 || $_POST['smiley_location'] < 0 ? 0 : (int) $_POST['smiley_location'];
 
 					// Make sure some code was entered.
-					if (empty($_POST['smiley_code']))
+					if (empty($_POST['smiley_code'])) {
 						ErrorHandler::fatalLang('smiley_has_no_code', false);
+					}
 
 					// If upload a new smiley image, check that smiley set folders are writable for the sets with new images.
-					$writeErrors = array();
+					$writeErrors = [];
 
-					foreach ($_FILES['smiley_upload']['name'] as $set => $name)
-					{
-						if (!empty($name) && !is_writable(self::$smileys_dir . '/' . $set))
+					foreach ($_FILES['smiley_upload']['name'] as $set => $name) {
+						if (!empty($name) && !is_writable(self::$smileys_dir . '/' . $set)) {
 							$writeErrors[] = $set;
+						}
 					}
 
-					if (!empty($writeErrors))
-					{
-						ErrorHandler::fatalLang('smileys_upload_error_notwritable', false, array(implode(', ', $writeErrors)));
+					if (!empty($writeErrors)) {
+						ErrorHandler::fatalLang('smileys_upload_error_notwritable', false, [implode(', ', $writeErrors)]);
 					}
 
-					foreach (self::$smiley_sets as $set => $smiley_set)
-					{
-						if (empty($_FILES['smiley_upload']['name'][$set]))
+					foreach (self::$smiley_sets as $set => $smiley_set) {
+						if (empty($_FILES['smiley_upload']['name'][$set])) {
 							continue;
+						}
 
-						foreach ($this->moveImageIntoPlace($_FILES['smiley_upload']['name'][$set], $_FILES['smiley_upload']['tmp_name'][$set], array($set)) as $dir => $destination_name)
-						{
+						foreach ($this->moveImageIntoPlace($_FILES['smiley_upload']['name'][$set], $_FILES['smiley_upload']['tmp_name'][$set], [$set]) as $dir => $destination_name) {
 							// Overwrite smiley filename with uploaded filename
 							$_POST['smiley_filename'][$dir] = $destination_name;
 						}
 					}
 
 					// Make sure all submitted filenames are clean.
-					$filenames = array();
+					$filenames = [];
 
-					foreach ($_POST['smiley_filename'] as $posted_set => $posted_filename)
-					{
+					foreach ($_POST['smiley_filename'] as $posted_set => $posted_filename) {
 						$posted_set = self::sanitizeFileName($posted_set);
 						$posted_filename = self::sanitizeFileName($posted_filename);
 
 						// Make sure the set already exists.
-						if (!isset(self::$smiley_sets[$posted_set]))
+						if (!isset(self::$smiley_sets[$posted_set])) {
 							continue;
+						}
 
 						$filenames[$posted_set] = pathinfo($posted_filename, PATHINFO_BASENAME);
 					}
 
 					// Fill in any missing sets.
-					foreach (self::$smiley_sets as $set => $smiley_set)
-					{
+					foreach (self::$smiley_sets as $set => $smiley_set) {
 						// Uh-oh, something is missing.
-						if (empty($filenames[$set]))
-						{
+						if (empty($filenames[$set])) {
 							// Try to make it the same as the default set.
-							if (!empty($filenames[Config::$modSettings['smiley_sets_default']]))
-							{
+							if (!empty($filenames[Config::$modSettings['smiley_sets_default']])) {
 								$filenames[$set] = $filenames[Config::$modSettings['smiley_sets_default']];
 							}
 							// As a last resort, just try to get whatever the first one is.
-							elseif (!empty($filenames))
-							{
+							elseif (!empty($filenames)) {
 								$filenames[$set] = reset($filenames);
 							}
 						}
 					}
 
 					// Can't do anything without filenames for the smileys.
-					if (empty($filenames))
+					if (empty($filenames)) {
 						ErrorHandler::fatalLang('smiley_has_no_filename', false);
+					}
 
 					// Check whether the new code has duplicates. It should be unique.
-					$request = Db::$db->query('', '
-						SELECT id_smiley
+					$request = Db::$db->query(
+						'',
+						'SELECT id_smiley
 						FROM {db_prefix}smileys
 						WHERE code = {raw:mysql_binary_type} {string:smiley_code}' . (empty($_POST['smiley']) ? '' : '
 							AND id_smiley != {int:current_smiley}'),
-						array(
+						[
 							'current_smiley' => $_POST['smiley'],
 							'mysql_binary_type' => Db::$db->title == MYSQL_TITLE ? 'BINARY' : '',
 							'smiley_code' => $_POST['smiley_code'],
-						)
+						],
 					);
-					if (Db::$db->num_rows($request) > 0)
-					{
+
+					if (Db::$db->num_rows($request) > 0) {
 						ErrorHandler::fatalLang('smiley_not_unique', false);
 					}
 					Db::$db->free_result($request);
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}smileys
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}smileys
 						SET
 							code = {string:smiley_code},
 							description = {string:smiley_description},
 							hidden = {int:smiley_location}
 						WHERE id_smiley = {int:current_smiley}',
-						array(
+						[
 							'smiley_location' => $_POST['smiley_location'],
 							'current_smiley' => $_POST['smiley'],
 							'smiley_code' => $_POST['smiley_code'],
 							'smiley_description' => $_POST['smiley_description'],
-						)
+						],
 					);
 
 					// Update filename info in the smiley_files table
-					$inserts = array();
+					$inserts = [];
 
-					foreach ($filenames as $set => $filename)
-						$inserts[] = array($_POST['smiley'], $set, $filename);
+					foreach ($filenames as $set => $filename) {
+						$inserts[] = [$_POST['smiley'], $set, $filename];
+					}
 
-					Db::$db->insert('replace',
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}smiley_files',
-						array(
+						[
 							'id_smiley' => 'int', 'smiley_set' => 'string-48', 'filename' => 'string-48',
-						),
+						],
 						$inserts,
-						array('id_smiley', 'smiley_set')
+						['id_smiley', 'smiley_set'],
 					);
 				}
 			}
@@ -1036,14 +1023,13 @@ public function edit()
 		}
 
 		// Prepare overview of all (custom) smileys.
-		if ($this->subaction == 'editsmileys')
-		{
+		if ($this->subaction == 'editsmileys') {
 			// Determine the language specific sort order of smiley locations.
-			$smiley_locations = array(
+			$smiley_locations = [
 				Lang::$txt['smileys_location_form'],
 				Lang::$txt['smileys_location_hidden'],
 				Lang::$txt['smileys_location_popup'],
-			);
+			];
 
 			asort($smiley_locations);
 
@@ -1051,8 +1037,7 @@ public function edit()
 			$smileyset_option_list = '
 				<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
 
-			foreach (self::$smiley_sets as $smiley_set)
-			{
+			foreach (self::$smiley_sets as $smiley_set) {
 				$smileyset_option_list .= '
 					<option value="' . $smiley_set['path'] . '"' . ($smiley_set['is_default'] ? ' selected' : '') . '>' . $smiley_set['name'] . '</option>';
 			}
@@ -1060,106 +1045,102 @@ public function edit()
 			$smileyset_option_list .= '
 				</select>';
 
-			$listOptions = array(
+			$listOptions = [
 				'id' => 'smiley_list',
 				'title' => Lang::$txt['smileys_edit'],
 				'items_per_page' => 40,
 				'base_href' => Config::$scripturl . '?action=admin;area=smileys;sa=editsmileys',
 				'default_sort_col' => 'filename',
-				'get_items' => array(
+				'get_items' => [
 					'function' => __CLASS__ . '::list_getSmileys',
-				),
-				'get_count' => array(
+				],
+				'get_count' => [
 					'function' => __CLASS__ . '::list_getNumSmileys',
-				),
+				],
 				'no_items_label' => Lang::$txt['smileys_no_entries'],
-				'columns' => array(
-					'picture' => array(
-						'data' => array(
-							'function' => function($rowData)
-							{
+				'columns' => [
+					'picture' => [
+						'data' => [
+							'function' => function ($rowData) {
 								$return = '';
 
-								foreach ($rowData['filename_array'] as $set => $filename)
-								{
+								foreach ($rowData['filename_array'] as $set => $filename) {
 									$return .= ' <a href="' . Config::$scripturl . '?action=admin;area=smileys;sa=modifysmiley;smiley=' . $rowData['id_smiley'] . '" class="smiley_set ' . $set . '"><img src="' . Config::$modSettings['smileys_url'] . '/' . $set . '/' . $filename . '" alt="' . $rowData['description'] . '" style="padding: 2px;" id="smiley' . $rowData['id_smiley'] . '"><input type="hidden" name="smileys[' . $rowData['id_smiley'] . '][filename]" value="' . $filename . '"></a>';
 								}
 
 								return $return;
 							},
 							'class' => 'centercol',
-						),
-					),
-					'smileys_code' => array(
-						'header' => array(
+						],
+					],
+					'smileys_code' => [
+						'header' => [
 							'value' => Lang::$txt['smileys_code'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db_htmlsafe' => 'code',
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'code',
 							'reverse' => 'code DESC',
-						),
-					),
-					'filename' => array(
-						'header' => array(
+						],
+					],
+					'filename' => [
+						'header' => [
 							'value' => Lang::$txt['smileys_filename'],
-						),
-						'data' => array(
-							'function' => function($rowData)
-							{
+						],
+						'data' => [
+							'function' => function ($rowData) {
 								$return = '<span style="display:none">' . $rowData['filename'] . '</span>';
 
-								foreach ($rowData['filename_array'] as $set => $filename)
-								{
+								foreach ($rowData['filename_array'] as $set => $filename) {
 									$return .= ' <span class="smiley_set ' . $set . '">' . $filename . '</span>';
 								}
 
 								return $return;
 							},
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'filename',
 							'reverse' => 'filename DESC',
-						),
-					),
-					'location' => array(
-						'header' => array(
+						],
+					],
+					'location' => [
+						'header' => [
 							'value' => Lang::$txt['smileys_location'],
-						),
-						'data' => array(
-							'function' => function($rowData)
-							{
-								if (empty($rowData['hidden']))
+						],
+						'data' => [
+							'function' => function ($rowData) {
+								if (empty($rowData['hidden'])) {
 									return Lang::$txt['smileys_location_form'];
+								}
 
-								if ($rowData['hidden'] == 1)
+								if ($rowData['hidden'] == 1) {
 									return Lang::$txt['smileys_location_hidden'];
+								}
 
 								return Lang::$txt['smileys_location_popup'];
 							},
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => Db::$db->custom_order('hidden', array_keys($smiley_locations)),
 							'reverse' => Db::$db->custom_order('hidden', array_keys($smiley_locations), true),
-						),
-					),
-					'description' => array(
-						'header' => array(
+						],
+					],
+					'description' => [
+						'header' => [
 							'value' => Lang::$txt['smileys_description'],
-						),
-						'data' => array(
-							'function' => function($rowData)
-							{
-								if (!self::$smileys_dir_found)
+						],
+						'data' => [
+							'function' => function ($rowData) {
+								if (!self::$smileys_dir_found) {
 									return Utils::htmlspecialchars($rowData['description']);
+								}
 
 								// Check if there are smileys missing in some sets.
-								$missing_sets = array();
+								$missing_sets = [];
 
-								foreach (self::$smiley_sets as $smiley_set)
-								{
+								foreach (self::$smiley_sets as $smiley_set) {
 									if (
 										empty($rowData['filename_array'][$smiley_set['path']])
 										|| !file_exists(
@@ -1167,76 +1148,74 @@ public function edit()
 												'%1$s/%2$s/%3$s',
 												self::$smileys_dir,
 												$smiley_set['path'],
-												$rowData['filename_array'][$smiley_set['path']]
-											)
+												$rowData['filename_array'][$smiley_set['path']],
+											),
 										)
-									)
-									{
+									) {
 										$missing_sets[] = $smiley_set['path'];
 									}
 								}
 
 								$description = Utils::htmlspecialchars($rowData['description']);
 
-								if (!empty($missing_sets))
-								{
+								if (!empty($missing_sets)) {
 									$description .= sprintf(
 										'<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>',
 										Lang::$txt['smileys_not_found_in_set'],
-										implode(', ', $missing_sets)
+										implode(', ', $missing_sets),
 									);
 								}
 
 								return $description;
 							},
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'description',
 							'reverse' => 'description DESC',
-						),
-					),
-					'modify' => array(
-						'header' => array(
+						],
+					],
+					'modify' => [
+						'header' => [
 							'value' => Lang::$txt['smileys_modify'],
 							'class' => 'centercol',
-						),
-						'data' => array(
-							'sprintf' => array(
+						],
+						'data' => [
+							'sprintf' => [
 								'format' => '<a href="' . Config::$scripturl . '?action=admin;area=smileys;sa=modifysmiley;smiley=%1$d">' . Lang::$txt['smileys_modify'] . '</a>',
-								'params' => array(
+								'params' => [
 									'id_smiley' => false,
-								),
-							),
+								],
+							],
 							'class' => 'centercol',
-						),
-					),
-					'check' => array(
-						'header' => array(
+						],
+					],
+					'check' => [
+						'header' => [
 							'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 							'class' => 'centercol',
-						),
-						'data' => array(
-							'sprintf' => array(
+						],
+						'data' => [
+							'sprintf' => [
 								'format' => '<input type="checkbox" name="checked_smileys[]" value="%1$d">',
-								'params' => array(
+								'params' => [
 									'id_smiley' => false,
-								),
-							),
+								],
+							],
 							'class' => 'centercol',
-						),
-					),
-				),
-				'form' => array(
+						],
+					],
+				],
+				'form' => [
 					'href' => Config::$scripturl . '?action=admin;area=smileys;sa=editsmileys',
 					'name' => 'smileyForm',
-				),
-				'additional_rows' => array(
-					array(
+				],
+				'additional_rows' => [
+					[
 						'position' => 'above_column_headers',
 						'value' => $smileyset_option_list,
 						'class' => 'righttext',
-					),
-					array(
+					],
+					[
 						'position' => 'below_table_data',
 						'value' => '
 							<select name="smiley_action" onchange="makeChanges(this.value);">
@@ -1251,8 +1230,8 @@ public function edit()
 								<input type="submit" name="perform_action" value="' . Lang::$txt['go'] . '" class="button">
 							</noscript>',
 						'class' => 'righttext',
-					),
-				),
+					],
+				],
 				'javascript' => '
 					function makeChanges(action)
 					{
@@ -1272,7 +1251,7 @@ function changeSet(newSet)
 						$(".smiley_set").hide();
 						$(".smiley_set." + newSet).show();
 					}',
-			);
+			];
 
 			new ItemList($listOptions);
 
@@ -1283,24 +1262,23 @@ function changeSet(newSet)
 			addInlineJavaScript("\n\t" . 'changeSet("' . Config::$modSettings['smiley_sets_default'] . '");', true);
 		}
 		// Modifying smileys.
-		elseif ($this->subaction == 'modifysmiley')
-		{
+		elseif ($this->subaction == 'modifysmiley') {
 			Utils::$context['selected_set'] = Config::$modSettings['smiley_sets_default'];
 
-			$request = Db::$db->query('', '
-				SELECT s.id_smiley AS id, s.code, f.filename, f.smiley_set, s.description, s.hidden AS location
+			$request = Db::$db->query(
+				'',
+				'SELECT s.id_smiley AS id, s.code, f.filename, f.smiley_set, s.description, s.hidden AS location
 				FROM {db_prefix}smileys AS s
 					LEFT JOIN {db_prefix}smiley_files AS f ON (s.id_smiley = f.id_smiley)
 				WHERE s.id_smiley = {int:current_smiley}',
-				array(
+				[
 					'current_smiley' => (int) $_REQUEST['smiley'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// The empty() bit is for just in case the default set is missing this smiley
-				if ($row['smiley_set'] == Utils::$context['selected_set'] || empty(Utils::$context['current_smiley']))
-				{
+				if ($row['smiley_set'] == Utils::$context['selected_set'] || empty(Utils::$context['current_smiley'])) {
 					Utils::$context['current_smiley'] = $row;
 				}
 
@@ -1308,8 +1286,9 @@ function changeSet(newSet)
 			}
 			Db::$db->free_result($request);
 
-			if (empty(Utils::$context['current_smiley']))
+			if (empty(Utils::$context['current_smiley'])) {
 				ErrorHandler::fatalLang('smiley_not_found', false);
+			}
 
 			Utils::$context['current_smiley']['code'] = Utils::htmlspecialchars(Utils::$context['current_smiley']['code']);
 
@@ -1318,44 +1297,38 @@ function changeSet(newSet)
 			Utils::$context['current_smiley']['filename'] = Utils::htmlspecialchars(Utils::$context['current_smiley']['filename']);
 
 			// Get all possible filenames for the smileys.
-			Utils::$context['filenames'] = array();
-			Utils::$context['missing_sets'] = array();
-
-			if (self::$smileys_dir_found)
-			{
-				foreach (self::$smiley_sets as $smiley_set)
-				{
-					if (!file_exists(self::$smileys_dir . '/' . $smiley_set['raw_path']))
-					{
+			Utils::$context['filenames'] = [];
+			Utils::$context['missing_sets'] = [];
+
+			if (self::$smileys_dir_found) {
+				foreach (self::$smiley_sets as $smiley_set) {
+					if (!file_exists(self::$smileys_dir . '/' . $smiley_set['raw_path'])) {
 						continue;
 					}
 
 					// No file currently defined for this smiley in this set? That's no good.
-					if (!isset($filenames[$smiley_set['raw_path']]))
-					{
+					if (!isset($filenames[$smiley_set['raw_path']])) {
 						Utils::$context['missing_sets'][] = $smiley_set['raw_path'];
 
-						Utils::$context['filenames'][$smiley_set['path']][''] = array(
+						Utils::$context['filenames'][$smiley_set['path']][''] = [
 							'id' => '',
 							'selected' => true,
 							'disabled' => true,
-						);
+						];
 					}
 
 					$dir = dir(self::$smileys_dir . '/' . $smiley_set['raw_path']);
 
-					while ($entry = $dir->read())
-					{
+					while ($entry = $dir->read()) {
 						if (
 							empty(Utils::$context['filenames'][$smiley_set['path']][$entry])
 							&& in_array(pathinfo($entry, PATHINFO_EXTENSION), self::$allowed_extenions)
-						)
-						{
-							Utils::$context['filenames'][$smiley_set['path']][$entry] = array(
+						) {
+							Utils::$context['filenames'][$smiley_set['path']][$entry] = [
 								'id' => Utils::htmlspecialchars($entry),
 								'selected' => isset($filenames[$smiley_set['raw_path']]) && strtolower($entry) == strtolower($filenames[$smiley_set['raw_path']]),
 								'disabled' => false,
-							);
+							];
 						}
 					}
 
@@ -1375,99 +1348,100 @@ function changeSet(newSet)
 	public function setOrder()
 	{
 		// Move smileys to another position.
-		if (isset($_REQUEST['reorder']))
-		{
+		if (isset($_REQUEST['reorder'])) {
 			User::$me->checkSession('get');
 
 			$_GET['location'] = empty($_GET['location']) || $_GET['location'] != 'popup' ? 0 : 2;
 			$_GET['source'] = empty($_GET['source']) ? 0 : (int) $_GET['source'];
 
-			if (empty($_GET['source']))
+			if (empty($_GET['source'])) {
 				ErrorHandler::fatalLang('smiley_not_found', false);
+			}
 
-			if (!empty($_GET['after']))
-			{
+			if (!empty($_GET['after'])) {
 				$_GET['after'] = (int) $_GET['after'];
 
-				$request = Db::$db->query('', '
-					SELECT smiley_row, smiley_order, hidden
+				$request = Db::$db->query(
+					'',
+					'SELECT smiley_row, smiley_order, hidden
 					FROM {db_prefix}smileys
 					WHERE hidden = {int:location}
 						AND id_smiley = {int:after_smiley}',
-					array(
+					[
 						'location' => $_GET['location'],
 						'after_smiley' => $_GET['after'],
-					)
+					],
 				);
-				if (Db::$db->num_rows($request) != 1)
-				{
+
+				if (Db::$db->num_rows($request) != 1) {
 					ErrorHandler::fatalLang('smiley_not_found', false);
 				}
-				list ($smiley_row, $smiley_order, $smileyLocation) = Db::$db->fetch_row($request);
+				list($smiley_row, $smiley_order, $smileyLocation) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
-			}
-			else
-			{
+			} else {
 				$smiley_row = (int) $_GET['row'];
 				$smiley_order = -1;
 				$smileyLocation = (int) $_GET['location'];
 			}
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}smileys
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}smileys
 				SET smiley_order = smiley_order + 1
 				WHERE hidden = {int:new_location}
 					AND smiley_row = {int:smiley_row}
 					AND smiley_order > {int:smiley_order}',
-				array(
+				[
 					'new_location' => $_GET['location'],
 					'smiley_row' => $smiley_row,
 					'smiley_order' => $smiley_order,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}smileys
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}smileys
 				SET
 					smiley_order = {int:smiley_order} + 1,
 					smiley_row = {int:smiley_row},
 					hidden = {int:new_location}
 				WHERE id_smiley = {int:current_smiley}',
-				array(
+				[
 					'smiley_order' => $smiley_order,
 					'smiley_row' => $smiley_row,
 					'new_location' => $smileyLocation,
 					'current_smiley' => $_GET['source'],
-				)
+				],
 			);
 
 			self::resetCache();
 		}
 
-		$request = Db::$db->query('', '
-			SELECT s.id_smiley, s.code, f.filename, s.description, s.smiley_row, s.smiley_order, s.hidden
+		$request = Db::$db->query(
+			'',
+			'SELECT s.id_smiley, s.code, f.filename, s.description, s.smiley_row, s.smiley_order, s.hidden
 			FROM {db_prefix}smileys AS s
 				LEFT JOIN {db_prefix}smiley_files AS f ON (s.id_smiley = f.id_smiley AND f.smiley_set = {string:smiley_set})
 			WHERE s.hidden != {int:popup}
 			ORDER BY s.smiley_order, s.smiley_row',
-			array(
+			[
 				'popup' => 1,
 				'smiley_set' => Config::$modSettings['smiley_sets_default'],
-			)
+			],
 		);
-		Utils::$context['smileys'] = array(
-			'postform' => array(
-				'rows' => array(),
-			),
-			'popup' => array(
-				'rows' => array(),
-			),
-		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		Utils::$context['smileys'] = [
+			'postform' => [
+				'rows' => [],
+			],
+			'popup' => [
+				'rows' => [],
+			],
+		];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$location = empty($row['hidden']) ? 'postform' : 'popup';
 
-			Utils::$context['smileys'][$location]['rows'][$row['smiley_row']][] = array(
+			Utils::$context['smileys'][$location]['rows'][$row['smiley_row']][] = [
 				'id' => $row['id_smiley'],
 				'code' => Utils::htmlspecialchars($row['code']),
 				'filename' => Utils::htmlspecialchars($row['filename']),
@@ -1475,42 +1449,39 @@ public function setOrder()
 				'row' => $row['smiley_row'],
 				'order' => $row['smiley_order'],
 				'selected' => !empty($_REQUEST['move']) && $_REQUEST['move'] == $row['id_smiley'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		Utils::$context['move_smiley'] = empty($_REQUEST['move']) ? 0 : (int) $_REQUEST['move'];
 
 		// Make sure all rows are sequential.
-		foreach (array_keys(Utils::$context['smileys']) as $location)
-		{
-			Utils::$context['smileys'][$location] = array(
+		foreach (array_keys(Utils::$context['smileys']) as $location) {
+			Utils::$context['smileys'][$location] = [
 				'id' => $location,
 				'title' => $location == 'postform' ? Lang::$txt['smileys_location_form'] : Lang::$txt['smileys_location_popup'],
 				'description' => $location == 'postform' ? Lang::$txt['smileys_location_form_description'] : Lang::$txt['smileys_location_popup_description'],
 				'last_row' => count(Utils::$context['smileys'][$location]['rows']),
 				'rows' => array_values(Utils::$context['smileys'][$location]['rows']),
-			);
+			];
 		}
 
 		// Check & fix smileys that are not ordered properly in the database.
-		foreach (array_keys(Utils::$context['smileys']) as $location)
-		{
-			foreach (Utils::$context['smileys'][$location]['rows'] as $id => $smiley_row)
-			{
+		foreach (array_keys(Utils::$context['smileys']) as $location) {
+			foreach (Utils::$context['smileys'][$location]['rows'] as $id => $smiley_row) {
 				// Fix empty rows if any.
-				if ($id != $smiley_row[0]['row'])
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}smileys
+				if ($id != $smiley_row[0]['row']) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}smileys
 						SET smiley_row = {int:new_row}
 						WHERE smiley_row = {int:current_row}
 							AND hidden = {int:location}',
-						array(
+						[
 							'new_row' => $id,
 							'current_row' => $smiley_row[0]['row'],
 							'location' => $location == 'postform' ? '0' : '2',
-						)
+						],
 					);
 
 					// Only change the first row value of the first smiley (we don't need the others :P).
@@ -1518,18 +1489,17 @@ public function setOrder()
 				}
 
 				// Make sure the smiley order is always sequential.
-				foreach ($smiley_row as $order_id => $smiley)
-				{
-					if ($order_id != $smiley['order'])
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}smileys
+				foreach ($smiley_row as $order_id => $smiley) {
+					if ($order_id != $smiley['order']) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}smileys
 							SET smiley_order = {int:new_order}
 							WHERE id_smiley = {int:current_smiley}',
-							array(
+							[
 								'new_order' => $order_id,
 								'current_smiley' => $smiley['id'],
-							)
+							],
 						);
 					}
 				}
@@ -1554,8 +1524,7 @@ public function install()
 		// Installing unless proven otherwise
 		$testing = false;
 
-		if (isset($_REQUEST['set_gz']))
-		{
+		if (isset($_REQUEST['set_gz'])) {
 			$base_name = strtr(basename($_REQUEST['set_gz']), ':/', '-_');
 			$name = Utils::htmlspecialchars(strtok(basename($_REQUEST['set_gz']), '.'));
 			Utils::$context['filename'] = $base_name;
@@ -1564,23 +1533,21 @@ public function install()
 			if (
 				!preg_match('~^https://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz'])
 				|| strpos($_REQUEST['set_gz'], 'dlattach') !== false
-			)
-			{
+			) {
 				ErrorHandler::fatalLang('not_on_simplemachines', false);
 			}
 
 			$destination = Config::$packagesdir . '/' . $base_name;
 
-			if (file_exists($destination))
+			if (file_exists($destination)) {
 				ErrorHandler::fatalLang('package_upload_error_exists', false);
+			}
 
 			// Let's copy it to the Packages directory
 			file_put_contents($destination, WebFetchApi::fetch($_REQUEST['set_gz']));
 
 			$testing = true;
-		}
-		elseif (isset($_REQUEST['package']))
-		{
+		} elseif (isset($_REQUEST['package'])) {
 			$base_name = basename($_REQUEST['package']);
 			$name = Utils::htmlspecialchars(strtok(basename($_REQUEST['package']), '.'));
 			Utils::$context['filename'] = $base_name;
@@ -1588,155 +1555,144 @@ public function install()
 			$destination = Config::$packagesdir . '/' . basename($_REQUEST['package']);
 		}
 
-		if (empty($destination) || !file_exists($destination))
+		if (empty($destination) || !file_exists($destination)) {
 			ErrorHandler::fatalLang('package_no_file', false);
+		}
 
 		// Make sure temp directory exists and is empty.
-		if (file_exists(Config::$packagesdir . '/temp'))
+		if (file_exists(Config::$packagesdir . '/temp')) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp', false);
+		}
 
-		if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0755))
-		{
+		if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0755)) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp', false);
 
-			if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777))
-			{
+			if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777)) {
 				SubsPackage::deltree(Config::$packagesdir . '/temp', false);
 
 				// @todo not sure about url in destination_url
-				SubsPackage::create_chmod_control(array(Config::$packagesdir . '/temp/delme.tmp'), array('destination_url' => Config::$scripturl . '?action=admin;area=smileys;sa=install;set_gz=' . $_REQUEST['set_gz'], 'crash_on_error' => true));
+				SubsPackage::create_chmod_control([Config::$packagesdir . '/temp/delme.tmp'], ['destination_url' => Config::$scripturl . '?action=admin;area=smileys;sa=install;set_gz=' . $_REQUEST['set_gz'], 'crash_on_error' => true]);
 
 				SubsPackage::deltree(Config::$packagesdir . '/temp', false);
 
-				if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777))
+				if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777)) {
 					ErrorHandler::fatalLang('package_cant_download', false);
+				}
 			}
 		}
 
 		$extracted = SubsPackage::read_tgz_file($destination, Config::$packagesdir . '/temp');
 
-		if (!$extracted)
-		{
-			ErrorHandler::fatalLang('packageget_unable', false, array('https://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
+		if (!$extracted) {
+			ErrorHandler::fatalLang('packageget_unable', false, ['https://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name]);
 		}
 
-		if ($extracted && !file_exists(Config::$packagesdir . '/temp/package-info.xml'))
-		{
-			foreach ($extracted as $file)
-			{
-				if (basename($file['filename']) == 'package-info.xml')
-				{
+		if ($extracted && !file_exists(Config::$packagesdir . '/temp/package-info.xml')) {
+			foreach ($extracted as $file) {
+				if (basename($file['filename']) == 'package-info.xml') {
 					$base_path = dirname($file['filename']) . '/';
 					break;
 				}
 			}
 		}
 
-		if (!isset($base_path))
+		if (!isset($base_path)) {
 			$base_path = '';
+		}
 
-		if (!file_exists(Config::$packagesdir . '/temp/' . $base_path . 'package-info.xml'))
+		if (!file_exists(Config::$packagesdir . '/temp/' . $base_path . 'package-info.xml')) {
 			ErrorHandler::fatalLang('package_get_error_missing_xml', false);
+		}
 
 		$smileyInfo = SubsPackage::getPackageInfo(Utils::$context['filename']);
 
-		if (!is_array($smileyInfo))
+		if (!is_array($smileyInfo)) {
 			ErrorHandler::fatalLang($smileyInfo, false);
+		}
 
 		// See if it is installed?
-		$request = Db::$db->query('', '
-			SELECT version, themes_installed, db_changes
+		$request = Db::$db->query(
+			'',
+			'SELECT version, themes_installed, db_changes
 			FROM {db_prefix}log_packages
 			WHERE package_id = {string:current_package}
 				AND install_state != {int:not_installed}
 			ORDER BY time_installed DESC
 			LIMIT 1',
-			array(
+			[
 				'not_installed' => 0,
 				'current_package' => $smileyInfo['id'],
-			)
+			],
 		);
 
-		if (Db::$db->num_rows($request) > 0)
+		if (Db::$db->num_rows($request) > 0) {
 			ErrorHandler::fatalLang('package_installed_warning1', false);
+		}
 
 		// Everything is fine, now it's time to do something
 		$actions = SubsPackage::parsePackageInfo($smileyInfo['xml'], true, 'install');
 
 		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=smileys;sa=install;package=' . $base_name;
 		Utils::$context['has_failure'] = false;
-		Utils::$context['actions'] = array();
+		Utils::$context['actions'] = [];
 		Utils::$context['ftp_needed'] = false;
 
-		foreach ($actions as $action)
-		{
-			if ($action['type'] == 'readme' || $action['type'] == 'license')
-			{
+		foreach ($actions as $action) {
+			if ($action['type'] == 'readme' || $action['type'] == 'license') {
 				$type = 'package_' . $action['type'];
 
-				if (file_exists(Config::$packagesdir . '/temp/' . $base_path . $action['filename']))
-				{
+				if (file_exists(Config::$packagesdir . '/temp/' . $base_path . $action['filename'])) {
 					Utils::$context[$type] = Utils::htmlspecialchars(trim(file_get_contents(Config::$packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
-				}
-				elseif (file_exists($action['filename']))
-				{
+				} elseif (file_exists($action['filename'])) {
 					Utils::$context[$type] = Utils::htmlspecialchars(trim(file_get_contents($action['filename']), "\n\r"));
 				}
 
-				if (!empty($action['parse_bbc']))
-				{
+				if (!empty($action['parse_bbc'])) {
 					Msg::preparsecode(Utils::$context[$type]);
 					Utils::$context[$type] = BBCodeParser::load()->parse(Utils::$context[$type]);
-				}
-				else
-				{
+				} else {
 					Utils::$context[$type] = nl2br(Utils::$context[$type]);
 				}
 
 				continue;
 			}
-			elseif ($action['type'] == 'require-dir')
-			{
+
+			if ($action['type'] == 'require-dir') {
 				// Do this one...
-				$thisAction = array(
+				$thisAction = [
 					'type' => Lang::$txt['package_extract'] . ' ' . ($action['type'] == 'require-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-					'action' => Utils::htmlspecialchars(strtr($action['destination'], array(Config::$boarddir => '.')))
-				);
+					'action' => Utils::htmlspecialchars(strtr($action['destination'], [Config::$boarddir => '.'])),
+				];
 
 				$file = Config::$packagesdir . '/temp/' . $base_path . $action['filename'];
 
-				if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination']))))
-				{
+				if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination'])))) {
 					Utils::$context['has_failure'] = true;
 
-					$thisAction += array(
+					$thisAction += [
 						'description' => Lang::$txt['package_action_error'],
 						'failed' => true,
-					);
+					];
 				}
 
 				// @todo None given?
-				if (empty($thisAction['description']))
-				{
-					$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+				if (empty($thisAction['description'])) {
+					$thisAction['description'] = $action['description'] ?? '';
 				}
 
 				Utils::$context['actions'][] = $thisAction;
-			}
-			elseif ($action['type'] == 'credits')
-			{
+			} elseif ($action['type'] == 'credits') {
 				// Time to build the billboard
-				$credits_tag = array(
+				$credits_tag = [
 					'url' => $action['url'],
 					'license' => $action['license'],
 					'copyright' => $action['copyright'],
 					'title' => $action['title'],
-				);
+				];
 			}
 		}
 
-		if ($testing)
-		{
+		if ($testing) {
 			Utils::$context['sub_template'] = 'view_package';
 			Utils::$context['uninstalling'] = false;
 			Utils::$context['is_installed'] = false;
@@ -1745,17 +1701,15 @@ public function install()
 			loadTemplate('Packages');
 		}
 		// Do the actual install
-		else
-		{
+		else {
 			// @TODO Does this call have side effects? ($actions is not used)
 			$actions = SubsPackage::parsePackageInfo($smileyInfo['xml'], false, 'install');
 
-			foreach (Utils::$context['actions'] as $action)
-			{
-				Config::updateModSettings(array(
+			foreach (Utils::$context['actions'] as $action) {
+				Config::updateModSettings([
 					'smiley_sets_known' => Config::$modSettings['smiley_sets_known'] . ',' . basename($action['action']),
 					'smiley_sets_names' => Config::$modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count(Utils::$context['actions']) > 1 ? ' ' . (!empty($action['description']) ? Utils::htmlspecialchars($action['description']) : basename($action['action'])) : ''),
-				));
+				]);
 			}
 
 			SubsPackage::package_flush_cache();
@@ -1763,33 +1717,36 @@ public function install()
 			// Credits tag?
 			$credits_tag = (empty($credits_tag)) ? '' : Utils::jsonEncode($credits_tag);
 
-			Db::$db->insert('',
+			Db::$db->insert(
+				'',
 				'{db_prefix}log_packages',
-				array(
+				[
 					'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
 					'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 					'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 					'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
-				),
-				array(
+				],
+				[
 					$smileyInfo['filename'], $smileyInfo['name'], $smileyInfo['id'], $smileyInfo['version'],
 					User::$me->id, User::$me->name, time(),
 					1, '', '',
 					0, '', $credits_tag,
-				),
-				array('id_install')
+				],
+				['id_install'],
 			);
 
-			Logging::logAction('install_package', array('package' => Utils::htmlspecialchars($smileyInfo['name']), 'version' => Utils::htmlspecialchars($smileyInfo['version'])), 'admin');
+			Logging::logAction('install_package', ['package' => Utils::htmlspecialchars($smileyInfo['name']), 'version' => Utils::htmlspecialchars($smileyInfo['version'])], 'admin');
 
 			self::resetCache();
 		}
 
-		if (file_exists(Config::$packagesdir . '/temp'))
+		if (file_exists(Config::$packagesdir . '/temp')) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp');
+		}
 
-		if (!$testing)
+		if (!$testing) {
 			Utils::redirectexit('action=admin;area=smileys');
+		}
 	}
 
 	/**
@@ -1798,22 +1755,23 @@ public function install()
 	public function editIcon()
 	{
 		// Get a list of icons.
-		Utils::$context['icons'] = array();
+		Utils::$context['icons'] = [];
 		$last_icon = 0;
 		$trueOrder = 0;
 
-		$request = Db::$db->query('', '
-			SELECT m.id_icon, m.title, m.filename, m.icon_order, m.id_board, b.name AS board_name
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_icon, m.title, m.filename, m.icon_order, m.id_board, b.name AS board_name
 			FROM {db_prefix}message_icons AS m
 				LEFT JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 			WHERE ({query_see_board} OR b.id_board IS NULL)
 			ORDER BY m.icon_order',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Utils::$context['icons'][$row['id_icon']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['icons'][$row['id_icon']] = [
 				'id' => $row['id_icon'],
 				'title' => $row['title'],
 				'filename' => $row['filename'],
@@ -1823,79 +1781,73 @@ public function editIcon()
 				'order' => $row['icon_order'],
 				'true_order' => $trueOrder++,
 				'after' => $last_icon,
-			);
+			];
 
 			$last_icon = $row['id_icon'];
 		}
 		Db::$db->free_result($request);
 
 		// Submitting a form?
-		if (isset($_POST['icons_save']) || isset($_POST['delete']))
-		{
+		if (isset($_POST['icons_save']) || isset($_POST['delete'])) {
 			User::$me->checkSession();
 
 			// Deleting icons?
-			if (isset($_POST['delete']) && !empty($_POST['checked_icons']))
-			{
-				$deleteIcons = array();
+			if (isset($_POST['delete']) && !empty($_POST['checked_icons'])) {
+				$deleteIcons = [];
 
-				foreach ($_POST['checked_icons'] as $icon)
+				foreach ($_POST['checked_icons'] as $icon) {
 					$deleteIcons[] = (int) $icon;
+				}
 
 				// Do the actual delete!
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}message_icons
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}message_icons
 					WHERE id_icon IN ({array_int:icon_list})',
-					array(
+					[
 						'icon_list' => $deleteIcons,
-					)
+					],
 				);
 			}
 			// Editing/Adding an icon?
-			elseif ($this->subaction == 'editicon' && isset($_GET['icon']))
-			{
+			elseif ($this->subaction == 'editicon' && isset($_GET['icon'])) {
 				$_GET['icon'] = (int) $_GET['icon'];
 
-				foreach (array('icon_filename', 'icon_description') as $key)
+				foreach (['icon_filename', 'icon_description'] as $key) {
 					$_POST[$key] = Utils::normalize($_POST[$key]);
+				}
 
 				// Do some preperation with the data... like check the icon exists *somewhere*
-				if (strpos($_POST['icon_filename'], '.png') !== false)
-				{
+				if (strpos($_POST['icon_filename'], '.png') !== false) {
 					$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
 				}
 
-				if (!file_exists(Theme::$current->settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png'))
-				{
+				if (!file_exists(Theme::$current->settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png')) {
 					ErrorHandler::fatalLang('icon_not_found', false);
 				}
 
 				// There is a 16 character limit on message icons...
-				if (strlen($_POST['icon_filename']) > 16)
-				{
+				if (strlen($_POST['icon_filename']) > 16) {
 					ErrorHandler::fatalLang('icon_name_too_long', false);
 				}
 
-				if ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon']))
-				{
+				if ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon'])) {
 					ErrorHandler::fatalLang('icon_after_itself', false);
 				}
 
 				// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
-				if ($_GET['icon'] != 0)
-				{
+				if ($_GET['icon'] != 0) {
 					$oldOrder = Utils::$context['icons'][$_GET['icon']]['true_order'];
 
-					foreach (Utils::$context['icons'] as $id => $data)
-					{
-						if ($data['true_order'] > $oldOrder)
+					foreach (Utils::$context['icons'] as $id => $data) {
+						if ($data['true_order'] > $oldOrder) {
 							Utils::$context['icons'][$id]['true_order']--;
+						}
 					}
 				}
 
 				// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
-				if (empty($_GET['icon']) && empty(Utils::$context['icons']))
-				{
+				if (empty($_GET['icon']) && empty(Utils::$context['icons'])) {
 					$_GET['icon'] = 1;
 				}
 
@@ -1903,10 +1855,10 @@ public function editIcon()
 				$newOrder = $_POST['icon_location'] == 0 ? 0 : Utils::$context['icons'][$_POST['icon_location']]['true_order'] + 1;
 
 				// Do the same, but with the one that used to be after this icon, done to avoid conflict.
-				foreach (Utils::$context['icons'] as $id => $data)
-				{
-					if ($data['true_order'] >= $newOrder)
+				foreach (Utils::$context['icons'] as $id => $data) {
+					if ($data['true_order'] >= $newOrder) {
 						Utils::$context['icons'][$id]['true_order']++;
+					}
 				}
 
 				// Finally set the current icon's position!
@@ -1918,159 +1870,155 @@ public function editIcon()
 				Utils::$context['icons'][$_GET['icon']]['board_id'] = (int) $_POST['icon_board'];
 
 				// Do a huge replace ;)
-				$iconInsert = array();
-				$iconInsert_new = array();
-
-				foreach (Utils::$context['icons'] as $id => $icon)
-				{
-					if ($id != 0)
-					{
-						$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-					}
-					else
-					{
-						$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+				$iconInsert = [];
+				$iconInsert_new = [];
+
+				foreach (Utils::$context['icons'] as $id => $icon) {
+					if ($id != 0) {
+						$iconInsert[] = [$id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']];
+					} else {
+						$iconInsert_new[] = [$icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']];
 					}
 				}
 
-				Db::$db->insert('replace',
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}message_icons',
-					array('id_icon' => 'int', 'id_board' => 'int', 'title' => 'string-80', 'filename' => 'string-80', 'icon_order' => 'int'),
+					['id_icon' => 'int', 'id_board' => 'int', 'title' => 'string-80', 'filename' => 'string-80', 'icon_order' => 'int'],
 					$iconInsert,
-					array('id_icon')
+					['id_icon'],
 				);
 
-				if (!empty($iconInsert_new))
-				{
-					Db::$db->insert('insert',
+				if (!empty($iconInsert_new)) {
+					Db::$db->insert(
+						'insert',
 						'{db_prefix}message_icons',
-						array('id_board' => 'int', 'title' => 'string-80', 'filename' => 'string-80', 'icon_order' => 'int'),
+						['id_board' => 'int', 'title' => 'string-80', 'filename' => 'string-80', 'icon_order' => 'int'],
 						$iconInsert_new,
-						array('id_icon')
+						['id_icon'],
 					);
 				}
 			}
 
 			// Unless we're adding a new thing, we'll escape
-			if (!isset($_POST['add']))
+			if (!isset($_POST['add'])) {
 				Utils::redirectexit('action=admin;area=smileys;sa=editicons');
+			}
 		}
 
 		Menu::$loaded['admin']['current_subsection'] = 'editicons';
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'message_icon_list',
 			'title' => Lang::$txt['icons_edit_message_icons'],
 			'base_href' => Config::$scripturl . '?action=admin;area=smileys;sa=editicons',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getMessageIcons',
-			),
+			],
 			'no_items_label' => Lang::$txt['icons_no_entries'],
-			'columns' => array(
-				'icon' => array(
-					'data' => array(
-						'function' => function($rowData)
-						{
+			'columns' => [
+				'icon' => [
+					'data' => [
+						'function' => function ($rowData) {
 							$images_url = Theme::$current->settings[file_exists(sprintf('%1$s/images/post/%2$s.png', Theme::$current->settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url'];
 
 							return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], Utils::htmlspecialchars($rowData['title']));
 						},
 						'class' => 'centercol',
-					),
-				),
-				'filename' => array(
-					'header' => array(
+					],
+				],
+				'filename' => [
+					'header' => [
 						'value' => Lang::$txt['smileys_filename'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '%1$s.png',
-							'params' => array(
+							'params' => [
 								'filename' => true,
-							),
-						),
-					),
-				),
-				'description' => array(
-					'header' => array(
+							],
+						],
+					],
+				],
+				'description' => [
+					'header' => [
 						'value' => Lang::$txt['smileys_description'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'title',
-					),
-				),
-				'board' => array(
-					'header' => array(
+					],
+				],
+				'board' => [
+					'header' => [
 						'value' => Lang::$txt['icons_board'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return empty($rowData['board_name']) ? Lang::$txt['icons_edit_icons_all_boards'] : $rowData['board_name'];
 						},
-					),
-				),
-				'modify' => array(
-					'header' => array(
+					],
+				],
+				'modify' => [
+					'header' => [
 						'value' => Lang::$txt['smileys_modify'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=admin;area=smileys;sa=editicon;icon=%1$s">' . Lang::$txt['smileys_modify'] . '</a>',
-							'params' => array(
+							'params' => [
 								'id_icon' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-				'check' => array(
-					'header' => array(
+					],
+				],
+				'check' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="checked_icons[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id_icon' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=smileys;sa=editicons',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="delete" value="' . Lang::$txt['quickmod_delete_selected'] . '" class="button"> <a class="button" href="' . Config::$scripturl . '?action=admin;area=smileys;sa=editicon">' . Lang::$txt['icons_add_new'] . '</a>',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
 		// If we're adding/editing an icon we'll need a list of boards
-		if ($this->subaction == 'editicon' || isset($_POST['add']))
-		{
+		if ($this->subaction == 'editicon' || isset($_POST['add'])) {
 			// Force the sub_template just in case.
 			Utils::$context['sub_template'] = 'editicon';
 
 			Utils::$context['new_icon'] = !isset($_GET['icon']);
 
 			// Get the properties of the current icon from the icon list.
-			if (!Utils::$context['new_icon'])
+			if (!Utils::$context['new_icon']) {
 				Utils::$context['icon'] = Utils::$context['icons'][$_GET['icon']];
+			}
 
 			// Get a list of boards needed for assigning this icon to a specific board.
-			$boardListOptions = array(
+			$boardListOptions = [
 				'use_permissions' => true,
-				'selected_board' => isset(Utils::$context['icon']['board_id']) ? Utils::$context['icon']['board_id'] : 0,
-			);
+				'selected_board' => Utils::$context['icon']['board_id'] ?? 0,
+			];
 
 			Utils::$context['categories'] = MessageIndex::getBoardList($boardListOptions);
 		}
@@ -2090,8 +2038,7 @@ public function settings(): void
 		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=smileys;save;sa=settings';
 
 		// Saving the settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Validate the smiley set name.
@@ -2124,8 +2071,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -2152,27 +2100,27 @@ public static function getConfigVars(): array
 		self::getKnownSmileySets();
 
 		// All the settings for the page...
-		$config_vars = array(
-			array('title', 'settings'),
+		$config_vars = [
+			['title', 'settings'],
 			// Inline permissions.
-			array('permissions', 'manage_smileys'),
+			['permissions', 'manage_smileys'],
 			'',
 
 			// array('select', 'smiley_sets_default', self::$smiley_sets),
-			array('select', 'smiley_sets_default', array_map(fn($set) => $set['raw_name'], self::$smiley_sets)),
-			array('check', 'smiley_sets_enable'),
-			array('check', 'smiley_enable', 'subtext' => Lang::$txt['smileys_enable_note']),
-			array('text', 'smileys_url', 40),
-			array('warning', !is_dir(self::$smileys_dir) ? 'setting_smileys_dir_wrong' : ''),
-			array('text', 'smileys_dir', 'invalid' => !self::$smileys_dir_found, 40),
+			['select', 'smiley_sets_default', array_map(fn ($set) => $set['raw_name'], self::$smiley_sets)],
+			['check', 'smiley_sets_enable'],
+			['check', 'smiley_enable', 'subtext' => Lang::$txt['smileys_enable_note']],
+			['text', 'smileys_url', 40],
+			['warning', !is_dir(self::$smileys_dir) ? 'setting_smileys_dir_wrong' : ''],
+			['text', 'smileys_dir', 'invalid' => !self::$smileys_dir_found, 40],
 			'',
 
 			// Message icons.
-			array('check', 'messageIcons_enable', 'subtext' => Lang::$txt['setting_messageIcons_enable_note']),
-			array('check', 'messageIconChecks_enable', 'subtext' => Lang::$txt['setting_messageIconChecks_enable_note'])
-		);
+			['check', 'messageIcons_enable', 'subtext' => Lang::$txt['setting_messageIcons_enable_note']],
+			['check', 'messageIconChecks_enable', 'subtext' => Lang::$txt['setting_messageIconChecks_enable_note']],
+		];
 
-		IntegrationHook::call('integrate_modify_smiley_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_modify_smiley_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -2189,18 +2137,18 @@ public static function getConfigVars(): array
 	 */
 	public static function list_getSmileySets($start, $items_per_page, $sort)
 	{
-		if (empty(self::$smiley_sets))
+		if (empty(self::$smiley_sets)) {
 			self::getKnownSmileySets();
+		}
 
-		$cols = array(
-			'id' => array(),
-			'is_default' => array(),
-			'path' => array(),
-			'name' => array(),
-		);
+		$cols = [
+			'id' => [],
+			'is_default' => [],
+			'path' => [],
+			'name' => [],
+		];
 
-		foreach (self::$smiley_sets as $set => $smiley_set)
-		{
+		foreach (self::$smiley_sets as $set => $smiley_set) {
 			$cols['id'][] = $smiley_set['id'];
 			$cols['is_default'][] = $smiley_set['is_default'];
 			$cols['path'][] = $smiley_set['raw_path'];
@@ -2209,29 +2157,23 @@ public static function list_getSmileySets($start, $items_per_page, $sort)
 
 		$sort_flag = strpos($sort, 'DESC') === false ? SORT_ASC : SORT_DESC;
 
-		if (substr($sort, 0, 4) === 'name')
-		{
+		if (substr($sort, 0, 4) === 'name') {
 			array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['is_default'], $cols['id']);
-		}
-		elseif (substr($sort, 0, 4) === 'path')
-		{
+		} elseif (substr($sort, 0, 4) === 'path') {
 			array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['is_default'], $cols['id']);
-		}
-		else
-		{
+		} else {
 			array_multisort($cols['is_default'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
 		}
 
-		$smiley_sets = array();
+		$smiley_sets = [];
 
-		foreach ($cols['id'] as $i => $id)
-		{
-			$smiley_sets[] = array(
+		foreach ($cols['id'] as $i => $id) {
+			$smiley_sets[] = [
 				'id' => $id,
 				'path' => $cols['path'][$i],
 				'name' => $cols['name'][$i],
 				'is_default' => $cols['is_default'][$i],
-			);
+			];
 		}
 
 		return $smiley_sets;
@@ -2258,39 +2200,34 @@ public static function list_getNumSmileySets()
 	 */
 	public static function list_getSmileys($start, $items_per_page, $sort)
 	{
-		$smileys = array();
+		$smileys = [];
 
-		$request = Db::$db->query('', '
-			SELECT s.id_smiley, s.code, f.filename, f.smiley_set, s.description, s.smiley_row, s.smiley_order, s.hidden
+		$request = Db::$db->query(
+			'',
+			'SELECT s.id_smiley, s.code, f.filename, f.smiley_set, s.description, s.smiley_row, s.smiley_order, s.hidden
 			FROM {db_prefix}smileys AS s
 				LEFT JOIN {db_prefix}smiley_files AS f ON (s.id_smiley = f.id_smiley)
 			ORDER BY {raw:sort}',
-			array(
+			[
 				'sort' => $sort,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (empty($smileys[$row['id_smiley']]))
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (empty($smileys[$row['id_smiley']])) {
 				$smileys[$row['id_smiley']] = $row;
 
 				unset($smileys[$row['id_smiley']]['smiley_set']);
 
-				$smileys[$row['id_smiley']]['filename_array'] = array($row['smiley_set'] => $row['filename']);
-			}
-			else
-			{
+				$smileys[$row['id_smiley']]['filename_array'] = [$row['smiley_set'] => $row['filename']];
+			} else {
 				$smileys[$row['id_smiley']]['filename_array'][$row['smiley_set']] = $row['filename'];
 			}
 
 			// Use the filename for the default set as the primary filename for this smiley
-			if (isset($smileys[$row['id_smiley']]['filename_array'][Config::$modSettings['smiley_sets_default']]))
-			{
+			if (isset($smileys[$row['id_smiley']]['filename_array'][Config::$modSettings['smiley_sets_default']])) {
 				$smileys[$row['id_smiley']]['filename'] = $smileys[$row['id_smiley']]['filename_array'][Config::$modSettings['smiley_sets_default']];
-			}
-			else
-			{
+			} else {
 				$smileys[$row['id_smiley']]['filename'] = reset($smileys[$row['id_smiley']]['filename_array']);
 			}
 		}
@@ -2306,10 +2243,11 @@ public static function list_getSmileys($start, $items_per_page, $sort)
 	 */
 	public static function list_getNumSmileys()
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}smileys',
-			array()
+			[],
 		);
 		list($numSmileys) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -2327,18 +2265,19 @@ public static function list_getNumSmileys()
 	 */
 	public static function list_getMessageIcons($start, $items_per_page, $sort)
 	{
-		$message_icons = array();
+		$message_icons = [];
 
-		$request = Db::$db->query('', '
-			SELECT m.id_icon, m.title, m.filename, m.icon_order, m.id_board, b.name AS board_name
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_icon, m.title, m.filename, m.icon_order, m.id_board, b.name AS board_name
 			FROM {db_prefix}message_icons AS m
 				LEFT JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 			WHERE ({query_see_board} OR b.id_board IS NULL)
 			ORDER BY m.icon_order',
-			array()
+			[],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$message_icons[] = $row;
 		}
 		Db::$db->free_result($request);
@@ -2354,8 +2293,9 @@ public static function list_getMessageIcons($start, $items_per_page, $sort)
 	 */
 	public function editSmileySettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = '';
@@ -2427,64 +2367,57 @@ protected function __construct()
 		loadTemplate('ManageSmileys');
 
 		// If customized smileys is disabled don't show the setting page
-		if (empty(Config::$modSettings['smiley_enable']))
-		{
-			unset(self::$subactions['addsmiley']);
-			unset(self::$subactions['editsmileys']);
-			unset(self::$subactions['setorder']);
-			unset(self::$subactions['modifysmiley']);
+		if (empty(Config::$modSettings['smiley_enable'])) {
+			unset(self::$subactions['addsmiley'], self::$subactions['editsmileys'], self::$subactions['setorder'], self::$subactions['modifysmiley']);
 		}
 
-		if (empty(Config::$modSettings['messageIcons_enable']))
-		{
-			unset(self::$subactions['editicon']);
-			unset(self::$subactions['editicons']);
+		if (empty(Config::$modSettings['messageIcons_enable'])) {
+			unset(self::$subactions['editicon'], self::$subactions['editicons']);
 		}
 
 		// Load up all the tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['smileys_manage'],
 			'help' => 'smileys',
 			'description' => Lang::$txt['smiley_settings_explain'],
-			'tabs' => array(
-				'editsets' => array(
+			'tabs' => [
+				'editsets' => [
 					'description' => Lang::$txt['smiley_editsets_explain'],
-				),
-				'addsmiley' => array(
+				],
+				'addsmiley' => [
 					'description' => Lang::$txt['smiley_addsmiley_explain'],
-				),
-				'editsmileys' => array(
+				],
+				'editsmileys' => [
 					'description' => Lang::$txt['smiley_editsmileys_explain'],
-				),
-				'setorder' => array(
+				],
+				'setorder' => [
 					'description' => Lang::$txt['smiley_setorder_explain'],
-				),
-				'editicons' => array(
+				],
+				'editicons' => [
 					'description' => Lang::$txt['icons_edit_icons_explain'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['smiley_settings_explain'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Some settings may not be enabled, disallow these from the tabs as appropriate.
-		if (empty(Config::$modSettings['messageIcons_enable']))
-		{
+		if (empty(Config::$modSettings['messageIcons_enable'])) {
 			Menu::$loaded['admin']->tab_data['tabs']['editicons']['disabled'] = true;
 		}
 
-		if (empty(Config::$modSettings['smiley_enable']))
-		{
+		if (empty(Config::$modSettings['smiley_enable'])) {
 			Menu::$loaded['admin']->tab_data['tabs']['addsmiley']['disabled'] = true;
 			Menu::$loaded['admin']->tab_data['tabs']['editsmileys']['disabled'] = true;
 			Menu::$loaded['admin']->tab_data['tabs']['setorder']['disabled'] = true;
 		}
 
-		IntegrationHook::call('integrate_manage_smileys', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_smileys', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		Utils::$context['sub_action'] = &$this->subaction;
 
@@ -2505,8 +2438,7 @@ protected function __construct()
 	 */
 	protected function import($smileyPath, $create = false)
 	{
-		if (!self::$smileys_dir_found || !is_dir(self::$smileys_dir . '/' . $smileyPath))
-		{
+		if (!self::$smileys_dir_found || !is_dir(self::$smileys_dir . '/' . $smileyPath)) {
 			ErrorHandler::fatalLang('smiley_set_unable_to_import', false);
 		}
 
@@ -2514,68 +2446,66 @@ protected function import($smileyPath, $create = false)
 		sort($known_sets);
 
 		// Get the smileys in the folder
-		$smileys = array();
+		$smileys = [];
 		$dir = dir(self::$smileys_dir . '/' . $smileyPath);
 
-		while ($entry = $dir->read())
-		{
+		while ($entry = $dir->read()) {
 			$pathinfo = pathinfo($entry);
-			if (empty($pathinfo['filename']) || empty($pathinfo['extension']))
+
+			if (empty($pathinfo['filename']) || empty($pathinfo['extension'])) {
 				continue;
-			if (in_array($pathinfo['extension'], self::$allowed_extenions) && $pathinfo['filename'] != 'blank' && strlen($pathinfo['basename']) <= 48)
+			}
+
+			if (in_array($pathinfo['extension'], self::$allowed_extenions) && $pathinfo['filename'] != 'blank' && strlen($pathinfo['basename']) <= 48) {
 				$smiley_files[strtolower($pathinfo['basename'])] = $pathinfo['basename'];
+			}
 		}
 
 		$dir->close();
 
 		// Get the smileys that are already in the database.
-		$existing_smileys = array();
+		$existing_smileys = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_smiley, smiley_set, filename
+		$request = Db::$db->query(
+			'',
+			'SELECT id_smiley, smiley_set, filename
 			FROM {db_prefix}smiley_files',
-			array()
+			[],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$existing_smileys[pathinfo($row['filename'], PATHINFO_FILENAME)][$row['id_smiley']][] = $row['smiley_set'];
 		}
 		Db::$db->free_result($request);
 
 		// Filter $smiley_files down to just the ones not already in the database.
-		$to_unset = array();
-		$to_fix = array();
+		$to_unset = [];
+		$to_fix = [];
 
-		foreach ($smiley_files as $key => $smiley_file)
-		{
+		foreach ($smiley_files as $key => $smiley_file) {
 			$smiley_name = pathinfo($smiley_file, PATHINFO_FILENAME);
 
 			// A brand new one
-			if (empty($existing_smileys[$smiley_name]))
+			if (empty($existing_smileys[$smiley_name])) {
 				continue;
+			}
 
 			// A file with this name is already being used for at least one smiley, so we have more work to do...
-			foreach ($existing_smileys[$smiley_name] as $existing_id => $existing_sets)
-			{
+			foreach ($existing_smileys[$smiley_name] as $existing_id => $existing_sets) {
 				$to_unset[$key][$existing_id] = false;
 
 				sort($existing_sets);
 
 				// Already done
-				if ($existing_sets === $known_sets)
-				{
+				if ($existing_sets === $known_sets) {
 					$to_unset[$key][$existing_id] = true;
 				}
 				// Used in some sets but not others
-				else
-				{
+				else {
 					// Do the other sets have some other file already defined?
-					foreach ($existing_smileys as $file => $info)
-					{
-						foreach ($info as $info_id => $info_sets)
-						{
-							if ($existing_id == $info_id)
-							{
+					foreach ($existing_smileys as $file => $info) {
+						foreach ($info as $info_id => $info_sets) {
+							if ($existing_id == $info_id) {
 								$existing_sets = array_unique(array_merge($existing_sets, $info_sets));
 							}
 						}
@@ -2584,13 +2514,11 @@ protected function import($smileyPath, $create = false)
 					sort($existing_sets);
 
 					// If every set already has a file for this smiley, we can skip it
-					if ($known_sets == $existing_sets)
-					{
+					if ($known_sets == $existing_sets) {
 						$to_unset[$key][$existing_id] = true;
 					}
 					// Need to add the file for these sets
-					else
-					{
+					else {
 						$to_fix[$key][$existing_id] = array_diff($known_sets, $existing_sets);
 					}
 				}
@@ -2599,32 +2527,24 @@ protected function import($smileyPath, $create = false)
 
 		// Fix any sets with missing files
 		// This part handles files for pre-existing smileys in a newly created smiley set
-		$inserts = array();
-		foreach ($to_fix as $key => $ids)
-		{
-			foreach ($ids as $id_smiley => $sets_missing)
-			{
+		$inserts = [];
+
+		foreach ($to_fix as $key => $ids) {
+			foreach ($ids as $id_smiley => $sets_missing) {
 				// Find the file we need to copy to the other sets
-				if (file_exists(self::$smileys_dir . '/' . $smileyPath . '/' . $smiley_files[$key]))
-				{
+				if (file_exists(self::$smileys_dir . '/' . $smileyPath . '/' . $smiley_files[$key])) {
 					$p = $smileyPath;
-				}
-				else
-				{
-					foreach (array_diff($known_sets, $sets_missing) as $set)
-					{
-						if (file_exists(self::$smileys_dir . '/' . $set . '/' . $smiley_files[$key]))
-						{
+				} else {
+					foreach (array_diff($known_sets, $sets_missing) as $set) {
+						if (file_exists(self::$smileys_dir . '/' . $set . '/' . $smiley_files[$key])) {
 							$p = $set;
 							break;
 						}
 					}
 				}
 
-				foreach ($sets_missing as $set)
-				{
-					if ($set !== $p)
-					{
+				foreach ($sets_missing as $set) {
+					if ($set !== $p) {
 						// Copy the file into the set's folder
 						copy(self::$smileys_dir . '/' . $p . '/' . $smiley_files[$key], self::$smileys_dir . '/' . $set . '/' . $smiley_files[$key]);
 
@@ -2632,13 +2552,12 @@ protected function import($smileyPath, $create = false)
 					}
 
 					// Double-check that everything went as expected
-					if (!file_exists(self::$smileys_dir . '/' . $set . '/' . $smiley_files[$key]))
-					{
+					if (!file_exists(self::$smileys_dir . '/' . $set . '/' . $smiley_files[$key])) {
 						continue;
 					}
 
 					// Update the database
-					$inserts[] = array($id_smiley, $set, $smiley_files[$key]);
+					$inserts[] = [$id_smiley, $set, $smiley_files[$key]];
 
 					// This isn't a new smiley
 					$to_unset[$key][$id_smiley] = true;
@@ -2647,64 +2566,60 @@ protected function import($smileyPath, $create = false)
 		}
 
 		// Remove anything that isn't actually new from our list of files
-		foreach ($to_unset as $key => $ids)
-		{
-			if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true)
-			{
+		foreach ($to_unset as $key => $ids) {
+			if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true) {
 				unset($smiley_files[$key]);
 			}
 		}
 
 		// We only create brand new smileys if asked.
-		if (empty($create))
-			$smiley_files = array();
+		if (empty($create)) {
+			$smiley_files = [];
+		}
 
 		// New smileys go at the end of the list
-		$request = Db::$db->query('', '
-			SELECT MAX(smiley_order)
+		$request = Db::$db->query(
+			'',
+			'SELECT MAX(smiley_order)
 			FROM {db_prefix}smileys
 			WHERE hidden = {int:postform}
 				AND smiley_row = {int:first_row}',
-			array(
+			[
 				'postform' => 0,
 				'first_row' => 0,
-			)
+			],
 		);
-		list ($smiley_order) = Db::$db->fetch_row($request);
+		list($smiley_order) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// This part handles brand new smileys that don't exist in any set
-		$new_smileys = array();
+		$new_smileys = [];
 
-		foreach ($smiley_files as $key => $smiley_file)
-		{
+		foreach ($smiley_files as $key => $smiley_file) {
 			// Ensure every set has a file to use for the new smiley
-			foreach ($known_sets as $set)
-			{
+			foreach ($known_sets as $set) {
 				unset($basename);
 
-				if ($smileyPath != $set)
-				{
+				if ($smileyPath != $set) {
 					// Check whether any similarly named files exist in the other set's directory
 					$similar_files = glob(self::$smileys_dir . '/' . $set . '/' . pathinfo($smiley_file, PATHINFO_FILENAME) . '.{' . implode(',', self::$allowed_extenions) . '}', GLOB_BRACE);
 
 					// If there's a similarly named file already there, use it
-					if (!empty($similar_files))
-					{
+					if (!empty($similar_files)) {
 						// Prefer an exact match if there is one
-						foreach ($similar_files as $similar_file)
-						{
-							if (basename($similar_file) == $smiley_file)
+						foreach ($similar_files as $similar_file) {
+							if (basename($similar_file) == $smiley_file) {
 								$basename = $smiley_file;
+							}
 						}
 
 						// Same name, different extension
-						if (empty($basename))
+						if (empty($basename)) {
 							$basename = basename(reset($similar_files));
+						}
 					}
 					// Otherwise, copy the image to the other set's directory
-					else
-					{
+					else {
 						copy(self::$smileys_dir . '/' . $smileyPath . '/' . $smiley_file, self::$smileys_dir . '/' . $set . '/' . $smiley_file);
 
 						Utils::makeWritable(self::$smileys_dir . '/' . $set . '/' . $smiley_file, 0644);
@@ -2713,50 +2628,48 @@ protected function import($smileyPath, $create = false)
 					}
 
 					// Double-check that everything went as expected
-					if (empty($basename) || !file_exists(self::$smileys_dir . '/' . $set . '/' . $basename))
-					{
+					if (empty($basename) || !file_exists(self::$smileys_dir . '/' . $set . '/' . $basename)) {
 						continue;
 					}
-				}
-				else
-				{
+				} else {
 					$basename = $smiley_file;
 				}
 
 				$new_smileys[$key]['files'][$set] = $basename;
 			}
 
-			$new_smileys[$key]['info'] = array(':' . pathinfo($smiley_file, PATHINFO_FILENAME) . ':', pathinfo($smiley_file, PATHINFO_FILENAME), 0, ++$smiley_order);
+			$new_smileys[$key]['info'] = [':' . pathinfo($smiley_file, PATHINFO_FILENAME) . ':', pathinfo($smiley_file, PATHINFO_FILENAME), 0, ++$smiley_order];
 		}
 
 		// Add the info for any new smileys to the database
-		foreach ($new_smileys as $new_smiley)
-		{
-			$new_id_smiley = Db::$db->insert('',
+		foreach ($new_smileys as $new_smiley) {
+			$new_id_smiley = Db::$db->insert(
+				'',
 				'{db_prefix}smileys',
-				array(
+				[
 					'code' => 'string-30', 'description' => 'string-80', 'smiley_row' => 'int', 'smiley_order' => 'int',
-				),
+				],
 				$new_smiley['info'],
-				array('id_smiley'),
-				1
+				['id_smiley'],
+				1,
 			);
 
 			// We'll also need to add filename info to the smiley_files table
-			foreach ($new_smiley['files'] as $set => $filename)
-				$inserts[] = array($new_id_smiley, $set, $filename);
+			foreach ($new_smiley['files'] as $set => $filename) {
+				$inserts[] = [$new_id_smiley, $set, $filename];
+			}
 		}
 
 		// Finally, update the smiley_files table with all our new files
-		if (!empty($inserts))
-		{
-			Db::$db->insert('replace',
+		if (!empty($inserts)) {
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}smiley_files',
-				array(
+				[
 					'id_smiley' => 'int', 'smiley_set' => 'string-48', 'filename' => 'string-48',
-				),
+				],
 				$inserts,
-				array('id_smiley', 'smiley_set')
+				['id_smiley', 'smiley_set'],
 			);
 
 			self::resetCache();
@@ -2769,27 +2682,30 @@ protected function import($smileyPath, $create = false)
 	protected function createDir($dir, $name)
 	{
 		// Can't do this if we couldn't find the base smileys directory.
-		if (!self::$smileys_dir_found)
+		if (!self::$smileys_dir_found) {
 			ErrorHandler::fatalLang('smiley_set_dir_not_found', false, Utils::htmlspecialchars($name));
+		}
 
 		$path = realpath(self::$smileys_dir . DIRECTORY_SEPARATOR . $dir);
 
 		// Must be an immediate child directory of the base smileys directory.
-		if (dirname($path) !== realpath(self::$smileys_dir))
+		if (dirname($path) !== realpath(self::$smileys_dir)) {
 			ErrorHandler::fatalLang('smiley_set_dir_not_found', false, Utils::htmlspecialchars($name));
+		}
 
 		// Must not already exist.
-		if (file_exists($path))
-		{
-			if (isset(self::$smiley_sets[$dir]))
+		if (file_exists($path)) {
+			if (isset(self::$smiley_sets[$dir])) {
 				ErrorHandler::fatalLang('smiley_set_already_exists', false);
+			}
 
 			ErrorHandler::fatalLang('smiley_set_dir_not_found', false, Utils::htmlspecialchars($name));
 		}
 
 		// Let's try to create it. Make some noise if we fail.
-		if (@mkdir($path, 0755) === false)
+		if (@mkdir($path, 0755) === false) {
 			ErrorHandler::fatalLang('smiley_set_dir_not_found', false, Utils::htmlspecialchars($name));
+		}
 	}
 
 	/**
@@ -2805,13 +2721,13 @@ protected function validateImage(string $name, string $tmp_name): bool
 	 */
 	protected function moveImageIntoPlace(string $name, string $tmp_name, array $destination_dirs): array
 	{
-		$filename_array = array();
+		$filename_array = [];
 
-		if ($name == '')
+		if ($name == '') {
 			ErrorHandler::fatalLang('smileys_upload_error_blank', false);
+		}
 
-		if (!is_uploaded_file($tmp_name) || (ini_get('open_basedir') == '' && !file_exists($tmp_name)))
-		{
+		if (!is_uploaded_file($tmp_name) || (ini_get('open_basedir') == '' && !file_exists($tmp_name))) {
 			ErrorHandler::fatalLang('smileys_upload_error', false);
 		}
 
@@ -2819,32 +2735,31 @@ protected function moveImageIntoPlace(string $name, string $tmp_name, array $des
 		$name = self::sanitizeFileName($name);
 
 		// We only allow image files - it's THAT simple - no messing around here...
-		if (!$this->validateImage($name, $tmp_name))
-		{
-			ErrorHandler::fatalLang('smileys_upload_error_types', false, array(implode(', ', self::$allowed_extenions)));
+		if (!$this->validateImage($name, $tmp_name)) {
+			ErrorHandler::fatalLang('smileys_upload_error_types', false, [implode(', ', self::$allowed_extenions)]);
 		}
 
 		// We only need the filename...
 		$destination_name = basename($name);
 
 		// Make sure they aren't trying to upload a nasty file - for their own good here!
-		if (in_array(strtolower($destination_name), self::$illegal_files))
+		if (in_array(strtolower($destination_name), self::$illegal_files)) {
 			ErrorHandler::fatalLang('smileys_upload_error_illegal', false);
+		}
 
 		$source_file = $tmp_name;
 		$func = 'move_uploaded_file';
 
-		foreach ($destination_dirs as $dir)
-		{
+		foreach ($destination_dirs as $dir) {
 			$destination = self::$smileys_dir . '/' . $dir . '/' . $destination_name;
 
-			if (!file_exists($destination))
-			{
+			if (!file_exists($destination)) {
 				@$func($source_file, $destination);
 
 				// Double-check
-				if (!file_exists($destination))
+				if (!file_exists($destination)) {
 					ErrorHandler::fatalLang('smiley_not_found', false);
+				}
 
 				Utils::makeWritable($destination, 0644);
 
@@ -2882,9 +2797,8 @@ protected static function getKnownSmileySets()
 		$smiley_sets = explode(',', Config::$modSettings['smiley_sets_known']);
 		$set_names = explode("\n", Config::$modSettings['smiley_sets_names']);
 
-		foreach ($smiley_sets as $i => $set)
-		{
-			self::$smiley_sets[$set] = array(
+		foreach ($smiley_sets as $i => $set) {
+			self::$smiley_sets[$set] = [
 				'id' => $i,
 				'raw_path' => $set,
 				'raw_name' => $set_names[$i],
@@ -2892,7 +2806,7 @@ protected static function getKnownSmileySets()
 				'name' => Utils::htmlspecialchars($set_names[$i]),
 				'is_default' => $set == Config::$modSettings['smiley_sets_default'],
 				'is_new' => false,
-			);
+			];
 		}
 	}
 
@@ -2901,28 +2815,27 @@ protected static function getKnownSmileySets()
 	 */
 	protected static function saveSets()
 	{
-		$sets_known = array();
-		$sets_names = array();
+		$sets_known = [];
+		$sets_names = [];
 
-		foreach (self::$smiley_sets as $id => $set)
-		{
+		foreach (self::$smiley_sets as $id => $set) {
 			$sets_known[$id] = $set['raw_path'] ?? Utils::htmlspecialcharsDecode($set['path']) ?? $id;
 			$sets_names[$id] = $set['raw_name'] ?? Utils::htmlspecialcharsDecode($set['name']) ?? $id;
 
-			if (!empty($set['is_default']))
+			if (!empty($set['is_default'])) {
 				$default_set = $sets_known[$id];
+			}
 		}
 
-		if (!isset($default_set))
-		{
+		if (!isset($default_set)) {
 			$default_set = isset(Config::$modSettings['smiley_sets_default'], self::$smiley_sets[Config::$modSettings['smiley_sets_default']]) ? Config::$modSettings['smiley_sets_default'] : reset($sets_known);
 		}
 
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'smiley_sets_known' => implode(',', $sets_known),
 			'smiley_sets_names' => implode("\n", $sets_names),
 			'smiley_sets_default' => $default_set,
-		));
+		]);
 	}
 
 	/**
@@ -2933,7 +2846,7 @@ protected static function sanitizeString(string $string): string
 		$string = Utils::sanitizeChars(Utils::normalize($string));
 
 		// Get rid of unnecessary whitespace.
-		$string = Utils::htmlTrim(Utils::normalizeSpaces($string, true, true, array('no_breaks' => true, 'collapse_hspace' => true, 'replace_tabs' => true)));
+		$string = Utils::htmlTrim(Utils::normalizeSpaces($string, true, true, ['no_breaks' => true, 'collapse_hspace' => true, 'replace_tabs' => true]));
 
 		return $string;
 	}
@@ -2951,8 +2864,7 @@ protected static function sanitizeFileName(string $string): string
 		$pathinfo['filename'] = preg_replace('/[\s._]+/', '_', Utils::htmlTrim($pathinfo['filename']));
 
 		// Just in case there's something unexpected in the extension...
-		if (!empty($pathinfo['extension']))
-		{
+		if (!empty($pathinfo['extension'])) {
 			$pathinfo['extension'] = preg_replace('/[\s_]+/', '_', Utils::htmlTrim($pathinfo['extension']));
 		}
 
@@ -2964,8 +2876,7 @@ protected static function sanitizeFileName(string $string): string
 	 */
 	protected static function resetCache(): void
 	{
-		foreach (self::$smiley_sets as $smiley_set)
-		{
+		foreach (self::$smiley_sets as $smiley_set) {
 			CacheApi::put('parsing_smileys_' . $smiley_set['raw_path'], null, 480);
 			CacheApi::put('posting_smileys_' . $smiley_set['raw_path'], null, 480);
 		}
@@ -2973,7 +2884,8 @@ protected static function resetCache(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Smileys::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Smileys::exportStatic')) {
 	Smileys::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Subscriptions.php b/Sources/Actions/Admin/Subscriptions.php
index 0774589b9a..8191adcb6b 100644
--- a/Sources/Actions/Admin/Subscriptions.php
+++ b/Sources/Actions/Admin/Subscriptions.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
@@ -28,7 +28,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Contains all the administration functions for paid subscriptions.
@@ -43,17 +42,23 @@ class Subscriptions implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManagePaidSubscriptions',
-			'getConfigVars' => false,
 			'getSubs' => 'loadSubscriptions',
 			'add' => 'addSubscription',
 			'remove' => 'removeSubscription',
 			'reapply' => 'reapplySubscriptions',
-		),
-	);
+			'loadPaymentGateways' => 'loadPaymentGateways',
+			'list_getSubscribedUserCount' => 'list_getSubscribedUserCount',
+			'list_getSubscribedUsers' => 'list_getSubscribedUsers',
+			'viewSubscriptions' => 'ViewSubscriptions',
+			'viewSubscribedUsers' => 'ViewSubscribedUsers',
+			'modifySubscription' => 'ModifySubscription',
+			'modifyUserSubscription' => 'ModifyUserSubscription',
+			'modifySubscriptionSettings' => 'ModifySubscriptionSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -78,20 +83,20 @@ class Subscriptions implements ActionInterface
 	 *
 	 * Format: 'sa' => array('method', 'required_permission')
 	 */
-	public static array $subactions = array(
-		'view' => array('view', 'admin_forum'),
-		'viewsub' => array('viewUsers', 'admin_forum'),
-		'modify' => array('modify', 'admin_forum'),
-		'modifyuser' => array('modifyUser', 'admin_forum'),
-		'settings' => array('settings', 'admin_forum'),
-	);
+	public static array $subactions = [
+		'view' => ['view', 'admin_forum'],
+		'viewsub' => ['viewUsers', 'admin_forum'],
+		'modify' => ['modify', 'admin_forum'],
+		'modifyuser' => ['modifyUser', 'admin_forum'],
+		'settings' => ['settings', 'admin_forum'],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Data about all the subscriptions the admin has created.
 	 */
-	public static array $all = array();
+	public static array $all = [];
 
 	/*********************
 	 * Internal properties
@@ -123,10 +128,11 @@ public function execute(): void
 		// Make sure you can do this.
 		User::$me->isAllowedTo(self::$subactions[$this->subaction][1]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -137,8 +143,7 @@ public function execute(): void
 	public function view(): void
 	{
 		// Not made the settings yet?
-		if (empty(Config::$modSettings['paid_currency_symbol']))
-		{
+		if (empty(Config::$modSettings['paid_currency_symbol'])) {
 			ErrorHandler::fatalLang('paid_not_set_currency', false, Config::$scripturl . '?action=admin;area=paidsubscribe;sa=settings');
 		}
 
@@ -147,140 +152,134 @@ public function view(): void
 
 		$all = self::getSubs();
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'subscription_list',
 			'title' => Lang::$txt['subscriptions'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=paidsubscribe;sa=view',
-			'get_items' => array(
-				'function' => function($start, $items_per_page)
-				{
-					$subscriptions = array();
+			'get_items' => [
+				'function' => function ($start, $items_per_page) {
+					$subscriptions = [];
 					$counter = 0;
 					$start++;
 
-					foreach (self::$all as $data)
-					{
-						if (++$counter < $start)
+					foreach (self::$all as $data) {
+						if (++$counter < $start) {
 							continue;
+						}
 
-						if ($counter == $start + $items_per_page)
+						if ($counter == $start + $items_per_page) {
 							break;
+						}
 
 						$subscriptions[] = $data;
 					}
 
 					return $subscriptions;
 				},
-			),
-			'get_count' => array(
-				'function' => function()
-				{
+			],
+			'get_count' => [
+				'function' => function () {
 					return count(self::$all);
 				},
-			),
+			],
 			'no_items_label' => Lang::$txt['paid_none_yet'],
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['paid_name'],
 						'style' => 'width: 35%;',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return sprintf('<a href="%1$s?action=admin;area=paidsubscribe;sa=viewsub;sid=%2$s">%3$s</a>', Config::$scripturl, $rowData['id'], $rowData['name']);
 						},
-					),
-				),
-				'cost' => array(
-					'header' => array(
+					],
+				],
+				'cost' => [
+					'header' => [
 						'value' => Lang::$txt['paid_cost'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return $rowData['flexible'] ? '<em>' . Lang::$txt['flexible'] . '</em>' : $rowData['cost'] . ' / ' . $rowData['length'];
 						},
-					),
-				),
-				'pending' => array(
-					'header' => array(
+					],
+				],
+				'pending' => [
+					'header' => [
 						'value' => Lang::$txt['paid_pending'],
 						'style' => 'width: 18%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'pending',
 						'class' => 'centercol',
-					),
-				),
-				'finished' => array(
-					'header' => array(
+					],
+				],
+				'finished' => [
+					'header' => [
 						'value' => Lang::$txt['paid_finished'],
 						'class' => 'centercol',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'finished',
 						'class' => 'centercol',
-					),
-				),
-				'total' => array(
-					'header' => array(
+					],
+				],
+				'total' => [
+					'header' => [
 						'value' => Lang::$txt['paid_active'],
 						'class' => 'centercol',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'total',
 						'class' => 'centercol',
-					),
-				),
-				'is_active' => array(
-					'header' => array(
+					],
+				],
+				'is_active' => [
+					'header' => [
 						'value' => Lang::$txt['paid_is_active'],
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<span style="color: ' . ($rowData['active'] ? 'green' : 'red') . '">' . ($rowData['active'] ? Lang::$txt['yes'] : Lang::$txt['no']) . '</span>';
 						},
 						'class' => 'centercol',
-					),
-				),
-				'modify' => array(
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+				],
+				'modify' => [
+					'data' => [
+						'function' => function ($rowData) {
 							return '<a href="' . Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modify;sid=' . $rowData['id'] . '">' . Lang::$txt['modify'] . '</a>';
 						},
 						'class' => 'centercol',
-					),
-				),
-				'delete' => array(
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+				],
+				'delete' => [
+					'data' => [
+						'function' => function ($rowData) {
 							return '<a href="' . Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modify;delete;sid=' . $rowData['id'] . '">' . Lang::$txt['delete'] . '</a>';
 						},
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modify',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'above_table_headers',
 					'value' => '<input type="submit" name="add" value="' . Lang::$txt['paid_add_subscription'] . '" class="button">',
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => '<input type="submit" name="add" value="' . Lang::$txt['paid_add_subscription'] . '" class="button">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
@@ -304,169 +303,167 @@ public function viewUsers(): void
 		Utils::$context['sub_id'] = (int) $_REQUEST['sid'];
 
 		// Load the subscription information.
-		$request = Db::$db->query('', '
-			SELECT id_subscribe, name, description, cost, length, id_group, add_groups, active
+		$request = Db::$db->query(
+			'',
+			'SELECT id_subscribe, name, description, cost, length, id_group, add_groups, active
 			FROM {db_prefix}subscriptions
 			WHERE id_subscribe = {int:current_subscription}',
-			array(
+			[
 				'current_subscription' => Utils::$context['sub_id'],
-			)
+			],
 		);
+
 		// Something wrong?
-		if (Db::$db->num_rows($request) == 0)
-		{
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		// Do the subscription context.
-		Utils::$context['subscription'] = array(
+		Utils::$context['subscription'] = [
 			'id' => $row['id_subscribe'],
 			'name' => $row['name'],
 			'desc' => $row['description'],
 			'active' => $row['active'],
-		);
+		];
 
 		// Are we searching for people?
 		$search_string = isset($_POST['ssearch']) && !empty($_POST['sub_search']) ? ' AND COALESCE(mem.real_name, {string:guest}) LIKE {string:search}' : '';
 
-		$search_vars = empty($_POST['sub_search']) ? array() : array('search' => '%' . $_POST['sub_search'] . '%', 'guest' => Lang::$txt['guest']);
+		$search_vars = empty($_POST['sub_search']) ? [] : ['search' => '%' . $_POST['sub_search'] . '%', 'guest' => Lang::$txt['guest']];
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'subscribed_users_list',
 			'title' => sprintf(Lang::$txt['view_users_subscribed'], $row['name']),
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'base_href' => Config::$scripturl . '?action=admin;area=paidsubscribe;sa=viewsub;sid=' . Utils::$context['sub_id'],
 			'default_sort_col' => 'name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getSubscribedUsers',
-				'params' => array(
+				'params' => [
 					Utils::$context['sub_id'],
 					$search_string,
 					$search_vars,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getSubscribedUserCount',
-				'params' => array(
+				'params' => [
 					Utils::$context['sub_id'],
 					$search_string,
 					$search_vars,
-				),
-			),
+				],
+			],
 			'no_items_label' => Lang::$txt['no_subscribers'],
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['who_member'],
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return $rowData['id_member'] == 0 ? Lang::$txt['guest'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $rowData['id_member'] . '">' . $rowData['name'] . '</a>';
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'name',
 						'reverse' => 'name DESC',
-					),
-				),
-				'status' => array(
-					'header' => array(
+					],
+				],
+				'status' => [
+					'header' => [
 						'value' => Lang::$txt['paid_status'],
 						'style' => 'width: 10%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'status_text',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'status',
 						'reverse' => 'status DESC',
-					),
-				),
-				'payments_pending' => array(
-					'header' => array(
+					],
+				],
+				'payments_pending' => [
+					'header' => [
 						'value' => Lang::$txt['paid_payments_pending'],
 						'style' => 'width: 15%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'pending',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'payments_pending',
 						'reverse' => 'payments_pending DESC',
-					),
-				),
-				'start_time' => array(
-					'header' => array(
+					],
+				],
+				'start_time' => [
+					'header' => [
 						'value' => Lang::$txt['start_date'],
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'start_date',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'start_time',
 						'reverse' => 'start_time DESC',
-					),
-				),
-				'end_time' => array(
-					'header' => array(
+					],
+				],
+				'end_time' => [
+					'header' => [
 						'value' => Lang::$txt['end_date'],
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db_htmlsafe' => 'end_date',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'end_time',
 						'reverse' => 'end_time DESC',
-					),
-				),
-				'modify' => array(
-					'header' => array(
+					],
+				],
+				'modify' => [
+					'header' => [
 						'style' => 'width: 10%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<a href="' . Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;lid=' . $rowData['id'] . '">' . Lang::$txt['modify'] . '</a>';
 						},
 						'class' => 'centercol',
-					),
-				),
-				'delete' => array(
-					'header' => array(
+					],
+				],
+				'delete' => [
+					'header' => [
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="checkbox" name="delsub[' . $rowData['id'] . ']">';
 						},
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=paidsubscribe;sa=modifyuser;sid=' . Utils::$context['sub_id'],
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '
 						<input type="submit" name="add" value="' . Lang::$txt['add_subscriber'] . '" class="button">
 						<input type="submit" name="finished" value="' . Lang::$txt['complete_selected'] . '" data-confirm="' . Lang::$txt['complete_are_sure'] . '" class="button you_sure">
 						<input type="submit" name="delete" value="' . Lang::$txt['delete_selected'] . '" data-confirm="' . Lang::$txt['delete_are_sure'] . '" class="button you_sure">
 					',
-				),
-				array(
+				],
+				[
 					'position' => 'top_of_list',
 					'value' => '
 						<div class="flow_auto">
@@ -474,9 +471,9 @@ public function viewUsers(): void
 							<input type="text" name="sub_search" value="" class="floatright">
 						</div>
 					',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
@@ -499,119 +496,116 @@ public function modify(): void
 		Utils::$context['page_title'] = Lang::$txt['paid_' . Utils::$context['action_type'] . '_subscription'];
 
 		// Delete it?
-		if (isset($_POST['delete_confirm']) && isset($_REQUEST['delete']))
-		{
+		if (isset($_POST['delete_confirm'], $_REQUEST['delete'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-pmsd');
 
 			// Before we delete the subscription we need to find out if anyone currently has said subscription.
-			$members = array();
+			$members = [];
 
-			$request = Db::$db->query('', '
-				SELECT ls.id_member, ls.old_id_group, mem.id_group, mem.additional_groups
+			$request = Db::$db->query(
+				'',
+				'SELECT ls.id_member, ls.old_id_group, mem.id_group, mem.additional_groups
 				FROM {db_prefix}log_subscribed AS ls
 					INNER JOIN {db_prefix}members AS mem ON (ls.id_member = mem.id_member)
 				WHERE id_subscribe = {int:current_subscription}
 					AND status = {int:is_active}',
-				array(
+				[
 					'current_subscription' => Utils::$context['sub_id'],
 					'is_active' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$id_member = array_shift($row);
 				$members[$id_member] = $row;
 			}
 			Db::$db->free_result($request);
 
 			// If there are any members with this subscription, we have to do some more work before we go any further.
-			if (!empty($members))
-			{
+			if (!empty($members)) {
 				$id_group = 0;
 				$add_groups = '';
 
-				$request = Db::$db->query('', '
-					SELECT id_group, add_groups
+				$request = Db::$db->query(
+					'',
+					'SELECT id_group, add_groups
 					FROM {db_prefix}subscriptions
 					WHERE id_subscribe = {int:current_subscription}',
-					array(
+					[
 						'current_subscription' => Utils::$context['sub_id'],
-					)
+					],
 				);
-				if (Db::$db->num_rows($request))
-				{
+
+				if (Db::$db->num_rows($request)) {
 					list($id_group, $add_groups) = Db::$db->fetch_row($request);
 				}
 				Db::$db->free_result($request);
 
-				$changes = array();
+				$changes = [];
 
 				// Is their group changing? This subscription may not have changed primary group.
-				if (!empty($id_group))
-				{
-					foreach ($members as $id_member => $member_data)
-					{
+				if (!empty($id_group)) {
+					foreach ($members as $id_member => $member_data) {
 						// If their current primary group isn't what they had before the
 						// subscription, and their current group was granted by the sub,
 						// then remove it.
-						if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group)
-						{
+						if ($member_data['old_id_group'] != $member_data['id_group'] && $member_data['id_group'] == $id_group) {
 							$changes[$id_member]['id_group'] = $member_data['old_id_group'];
 						}
 					}
 				}
 
 				// Did this subscription add secondary groups?
-				if (!empty($add_groups))
-				{
+				if (!empty($add_groups)) {
 					$add_groups = explode(',', $add_groups);
 
-					foreach ($members as $id_member => $member_data)
-					{
+					foreach ($members as $id_member => $member_data) {
 						// First let's get their groups sorted.
 						$current_groups = explode(',', $member_data['additional_groups']);
 						$new_groups = implode(',', array_diff($current_groups, $add_groups));
 
-						if ($new_groups != $member_data['additional_groups'])
+						if ($new_groups != $member_data['additional_groups']) {
 							$changes[$id_member]['additional_groups'] = $new_groups;
+						}
 					}
 				}
 
 				// We're going through changes...
-				if (!empty($changes))
-				{
-					foreach ($changes as $id_member => $new_values)
+				if (!empty($changes)) {
+					foreach ($changes as $id_member => $new_values) {
 						User::updateMemberData($id_member, $new_values);
+					}
 				}
 			}
 
 			// Delete the subscription
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}subscriptions
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}subscriptions
 				WHERE id_subscribe = {int:current_subscription}',
-				array(
+				[
 					'current_subscription' => Utils::$context['sub_id'],
-				)
+				],
 			);
 
 			// And delete any subscriptions to it to clear the phantom data too.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_subscribed
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_subscribed
 				WHERE id_subscribe = {int:current_subscription}',
-				array(
+				[
 					'current_subscription' => Utils::$context['sub_id'],
-				)
+				],
 			);
 
-			IntegrationHook::call('integrate_delete_subscription', array(Utils::$context['sub_id']));
+			IntegrationHook::call('integrate_delete_subscription', [Utils::$context['sub_id']]);
 
 			Utils::redirectexit('action=admin;area=paidsubscribe;view');
 		}
 
 		// Saving?
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 
 			// Some cleaning...
@@ -628,25 +622,22 @@ public function modify(): void
 			$emailComplete = Utils::htmlspecialchars($emailComplete);
 
 			// Is this a fixed one?
-			if ($_POST['duration_type'] == 'fixed')
-			{
+			if ($_POST['duration_type'] == 'fixed') {
 				$_POST['span_value'] = !empty($_POST['span_value']) && is_numeric($_POST['span_value']) ? ceil($_POST['span_value']) : 0;
 
 				// There are sanity check limits on these things.
-				$limits = array(
+				$limits = [
 					'D' => 90,
 					'W' => 52,
 					'M' => 24,
 					'Y' => 5,
-				);
+				];
 
-				if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || $_POST['span_value'] < 1)
-				{
+				if (empty($_POST['span_unit']) || empty($limits[$_POST['span_unit']]) || $_POST['span_value'] < 1) {
 					ErrorHandler::fatalLang('paid_invalid_duration', false);
 				}
 
-				if ($_POST['span_value'] > $limits[$_POST['span_unit']])
-				{
+				if ($_POST['span_value'] > $limits[$_POST['span_unit']]) {
 					ErrorHandler::fatalLang('paid_invalid_duration_' . $_POST['span_unit'], false);
 				}
 
@@ -654,26 +645,25 @@ public function modify(): void
 				$span = $_POST['span_value'] . $_POST['span_unit'];
 
 				// Sort out the cost.
-				$cost = array('fixed' => sprintf('%01.2f', strtr($_POST['cost'], ',', '.')));
+				$cost = ['fixed' => sprintf('%01.2f', strtr($_POST['cost'], ',', '.'))];
 
 				// There needs to be something.
-				if ($cost['fixed'] == '0.00')
+				if ($cost['fixed'] == '0.00') {
 					ErrorHandler::fatalLang('paid_no_cost_value');
+				}
 			}
 			// Flexible is harder but more fun ;)
-			else
-			{
+			else {
 				$span = 'F';
 
-				$cost = array(
+				$cost = [
 					'day' => sprintf('%01.2f', strtr($_POST['cost_day'], ',', '.')),
 					'week' => sprintf('%01.2f', strtr($_POST['cost_week'], ',', '.')),
 					'month' => sprintf('%01.2f', strtr($_POST['cost_month'], ',', '.')),
 					'year' => sprintf('%01.2f', strtr($_POST['cost_year'], ',', '.')),
-				);
+				];
 
-				if ($cost['day'] == '0.00' && $cost['week'] == '0.00' && $cost['month'] == '0.00' && $cost['year'] == '0.00')
-				{
+				if ($cost['day'] == '0.00' && $cost['week'] == '0.00' && $cost['month'] == '0.00' && $cost['year'] == '0.00') {
 					ErrorHandler::fatalLang('paid_all_freq_blank');
 				}
 			}
@@ -684,60 +674,61 @@ public function modify(): void
 			SecurityToken::validate('admin-pms');
 
 			// Yep, time to do additional groups.
-			$addgroups = array();
+			$addgroups = [];
 
-			if (!empty($_POST['addgroup']))
-			{
-				foreach ($_POST['addgroup'] as $id => $dummy)
+			if (!empty($_POST['addgroup'])) {
+				foreach ($_POST['addgroup'] as $id => $dummy) {
 					$addgroups[] = (int) $id;
+				}
 			}
 
 			$addgroups = implode(',', $addgroups);
 
 			// Is it new?!
-			if (Utils::$context['action_type'] == 'add')
-			{
-				$id_subscribe = Db::$db->insert('',
+			if (Utils::$context['action_type'] == 'add') {
+				$id_subscribe = Db::$db->insert(
+					'',
 					'{db_prefix}subscriptions',
-					array(
+					[
 						'name' => 'string-60', 'description' => 'string-255', 'active' => 'int', 'length' => 'string-4', 'cost' => 'string',
 						'id_group' => 'int', 'add_groups' => 'string-40', 'repeatable' => 'int', 'allow_partial' => 'int', 'email_complete' => 'string',
 						'reminder' => 'int',
-					),
-					array(
+					],
+					[
 						$_POST['name'], $_POST['desc'], $isActive, $span, $cost,
 						$_POST['prim_group'], $addgroups, $isRepeatable, $allowpartial, $emailComplete,
 						$reminder,
-					),
-					array('id_subscribe'),
-					1
+					],
+					['id_subscribe'],
+					1,
 				);
 			}
 			// Otherwise must be editing.
-			else
-			{
+			else {
 				// Don't do groups if there are active members
-				$request = Db::$db->query('', '
-					SELECT COUNT(*)
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(*)
 					FROM {db_prefix}log_subscribed
 					WHERE id_subscribe = {int:current_subscription}
 						AND status = {int:is_active}',
-					array(
+					[
 						'current_subscription' => Utils::$context['sub_id'],
 						'is_active' => 1,
-					)
+					],
 				);
 				list($disableGroups) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
-				Db::$db->query('substring', '
-					UPDATE {db_prefix}subscriptions
+				Db::$db->query(
+					'substring',
+					'UPDATE {db_prefix}subscriptions
 						SET name = SUBSTRING({string:name}, 1, 60), description = SUBSTRING({string:description}, 1, 255), active = {int:is_active},
 						length = SUBSTRING({string:length}, 1, 4), cost = {string:cost}' . ($disableGroups ? '' : ', id_group = {int:id_group},
 						add_groups = {string:additional_groups}') . ', repeatable = {int:repeatable}, allow_partial = {int:allow_partial},
 						email_complete = {string:email_complete}, reminder = {int:reminder}
 					WHERE id_subscribe = {int:current_subscription}',
-					array(
+					[
 						'is_active' => $isActive,
 						'id_group' => $_POST['prim_group'],
 						'repeatable' => $isRepeatable,
@@ -750,62 +741,58 @@ public function modify(): void
 						'cost' => $cost,
 						'additional_groups' => !empty($addgroups) ? $addgroups : '',
 						'email_complete' => $emailComplete,
-					)
+					],
 				);
 			}
 
-			IntegrationHook::call('integrate_save_subscription', array((Utils::$context['action_type'] == 'add' ? $id_subscribe : Utils::$context['sub_id']), $_POST['name'], $_POST['desc'], $isActive, $span, $cost, $_POST['prim_group'], $addgroups, $isRepeatable, $allowpartial, $emailComplete, $reminder));
+			IntegrationHook::call('integrate_save_subscription', [(Utils::$context['action_type'] == 'add' ? $id_subscribe : Utils::$context['sub_id']), $_POST['name'], $_POST['desc'], $isActive, $span, $cost, $_POST['prim_group'], $addgroups, $isRepeatable, $allowpartial, $emailComplete, $reminder]);
 
 			Utils::redirectexit('action=admin;area=paidsubscribe;view');
 		}
 
 		// Defaults.
-		if (Utils::$context['action_type'] == 'add')
-		{
-			Utils::$context['sub'] = array(
+		if (Utils::$context['action_type'] == 'add') {
+			Utils::$context['sub'] = [
 				'name' => '',
 				'desc' => '',
-				'cost' => array(
+				'cost' => [
 					'fixed' => 0,
-				),
-				'span' => array(
+				],
+				'span' => [
 					'value' => '',
 					'unit' => 'D',
-				),
+				],
 				'prim_group' => 0,
-				'add_groups' => array(),
+				'add_groups' => [],
 				'active' => 1,
 				'repeatable' => 1,
 				'allow_partial' => 0,
 				'duration' => 'fixed',
 				'email_complete' => '',
 				'reminder' => 0,
-			);
+			];
 		}
 		// Otherwise load up all the details.
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT name, description, cost, length, id_group, add_groups, active, repeatable, allow_partial, email_complete, reminder
+		else {
+			$request = Db::$db->query(
+				'',
+				'SELECT name, description, cost, length, id_group, add_groups, active, repeatable, allow_partial, email_complete, reminder
 				FROM {db_prefix}subscriptions
 				WHERE id_subscribe = {int:current_subscription}
 				LIMIT 1',
-				array(
+				[
 					'current_subscription' => Utils::$context['sub_id'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Sort the date.
 				preg_match('~(\d*)(\w)~', $row['length'], $match);
 
-				if (isset($match[2]))
-				{
+				if (isset($match[2])) {
 					$_POST['span_value'] = $match[1];
 					$span_unit = $match[2];
-				}
-				else
-				{
+				} else {
 					$_POST['span_value'] = 0;
 					$span_unit = 'D';
 				}
@@ -813,14 +800,14 @@ public function modify(): void
 				// Is this a flexible one?
 				$isFlexible = $row['length'] == 'F';
 
-				Utils::$context['sub'] = array(
+				Utils::$context['sub'] = [
 					'name' => $row['name'],
 					'desc' => $row['description'],
 					'cost' => Utils::jsonDecode($row['cost'], true),
-					'span' => array(
+					'span' => [
 						'value' => $_POST['span_value'],
 						'unit' => $span_unit,
-					),
+					],
 					'prim_group' => $row['id_group'],
 					'add_groups' => explode(',', $row['add_groups']),
 					'active' => $row['active'],
@@ -829,40 +816,42 @@ public function modify(): void
 					'duration' => $isFlexible ? 'flexible' : 'fixed',
 					'email_complete' => $row['email_complete'],
 					'reminder' => $row['reminder'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
 
 			// Does this have members who are active?
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}log_subscribed
 				WHERE id_subscribe = {int:current_subscription}
 					AND status = {int:is_active}',
-				array(
+				[
 					'current_subscription' => Utils::$context['sub_id'],
 					'is_active' => 1,
-				)
+				],
 			);
 			list(Utils::$context['disable_groups']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// Load up all the groups.
-		Utils::$context['groups'] = array();
+		Utils::$context['groups'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name
 			FROM {db_prefix}membergroups
 			WHERE id_group != {int:moderator_group}
 				AND min_posts = {int:min_posts}',
-			array(
+			[
 				'moderator_group' => 3,
 				'min_posts' => -1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['groups'][$row['id_group']] = $row['group_name'];
 		}
 		Db::$db->free_result($request);
@@ -889,38 +878,39 @@ public function modifyUser(): void
 		Utils::$context['page_title'] = Lang::$txt[Utils::$context['action_type'] . '_subscriber'];
 
 		// If we haven't been passed the subscription ID get it.
-		if (Utils::$context['log_id'] && !Utils::$context['sub_id'])
-		{
-			$request = Db::$db->query('', '
-				SELECT id_subscribe
+		if (Utils::$context['log_id'] && !Utils::$context['sub_id']) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_subscribe
 				FROM {db_prefix}log_subscribed
 				WHERE id_sublog = {int:current_log_item}',
-				array(
+				[
 					'current_log_item' => Utils::$context['log_id'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('no_access', false);
 			}
 			list(Utils::$context['sub_id']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
-		if (!isset(self::$all[Utils::$context['sub_id']]))
+		if (!isset(self::$all[Utils::$context['sub_id']])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		Utils::$context['current_subscription'] = self::$all[Utils::$context['sub_id']];
 
 		// Searching?
-		if (isset($_POST['ssearch']))
-		{
+		if (isset($_POST['ssearch'])) {
 			$this->viewUsers();
+
 			return;
 		}
+
 		// Saving?
-		elseif (isset($_REQUEST['save_sub']))
-		{
+		if (isset($_REQUEST['save_sub'])) {
 			User::$me->checkSession();
 
 			// Work out the dates...
@@ -932,103 +922,97 @@ public function modifyUser(): void
 			$status = $_POST['status'];
 
 			// New one?
-			if (empty(Utils::$context['log_id']))
-			{
+			if (empty(Utils::$context['log_id'])) {
 				// Find the user...
-				$request = Db::$db->query('', '
-					SELECT id_member, id_group
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, id_group
 					FROM {db_prefix}members
 					WHERE real_name = {string:name}
 					LIMIT 1',
-					array(
+					[
 						'name' => $_POST['name'],
-					)
+					],
 				);
-				if (Db::$db->num_rows($request) == 0)
-				{
+
+				if (Db::$db->num_rows($request) == 0) {
 					ErrorHandler::fatalLang('error_member_not_found');
 				}
 				list($id_member, $id_group) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
 				// Ensure the member doesn't already have a subscription!
-				$request = Db::$db->query('', '
-					SELECT id_subscribe
+				$request = Db::$db->query(
+					'',
+					'SELECT id_subscribe
 					FROM {db_prefix}log_subscribed
 					WHERE id_subscribe = {int:current_subscription}
 						AND id_member = {int:current_member}',
-					array(
+					[
 						'current_subscription' => Utils::$context['sub_id'],
 						'current_member' => $id_member,
-					)
+					],
 				);
-				if (Db::$db->num_rows($request) != 0)
-				{
+
+				if (Db::$db->num_rows($request) != 0) {
 					ErrorHandler::fatalLang('member_already_subscribed');
 				}
 				Db::$db->free_result($request);
 
 				// Actually put the subscription in place.
-				if ($status == 1)
-				{
+				if ($status == 1) {
 					self::add(Utils::$context['sub_id'], $id_member, 0, $starttime, $endtime);
-				}
-				else
-				{
-					Db::$db->insert('',
+				} else {
+					Db::$db->insert(
+						'',
 						'{db_prefix}log_subscribed',
-						array(
+						[
 							'id_subscribe' => 'int', 'id_member' => 'int', 'old_id_group' => 'int', 'start_time' => 'int',
-							'end_time' => 'int', 'status' => 'int', 'pending_details' => 'string-65534'
-						),
-						array(
+							'end_time' => 'int', 'status' => 'int', 'pending_details' => 'string-65534',
+						],
+						[
 							Utils::$context['sub_id'], $id_member, $id_group, $starttime,
-							$endtime, $status, Utils::jsonEncode(array())
-						),
-						array('id_sublog')
+							$endtime, $status, Utils::jsonEncode([]),
+						],
+						['id_sublog'],
 					);
-
 				}
 			}
 			// Updating.
-			else
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member, status
+			else {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, status
 					FROM {db_prefix}log_subscribed
 					WHERE id_sublog = {int:current_log_item}',
-					array(
+					[
 						'current_log_item' => Utils::$context['log_id'],
-					)
+					],
 				);
-				if (Db::$db->num_rows($request) == 0)
-				{
+
+				if (Db::$db->num_rows($request) == 0) {
 					ErrorHandler::fatalLang('no_access', false);
 				}
-				list ($id_member, $old_status) = Db::$db->fetch_row($request);
+				list($id_member, $old_status) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
 				// Pick the right permission stuff depending on what the status is changing from/to.
-				if ($old_status == 1 && $status != 1)
-				{
+				if ($old_status == 1 && $status != 1) {
 					self::remove(Utils::$context['sub_id'], $id_member);
-				}
-				elseif ($status == 1 && $old_status != 1)
-				{
+				} elseif ($status == 1 && $old_status != 1) {
 					self::add(Utils::$context['sub_id'], $id_member, 0, $starttime, $endtime);
-				}
-				else
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_subscribed
+				} else {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_subscribed
 						SET start_time = {int:start_time}, end_time = {int:end_time}, status = {int:status}
 						WHERE id_sublog = {int:current_log_item}',
-						array(
+						[
 							'start_time' => $starttime,
 							'end_time' => $endtime,
 							'status' => $status,
 							'current_log_item' => Utils::$context['log_id'],
-						)
+						],
 					);
 				}
 			}
@@ -1037,28 +1021,28 @@ public function modifyUser(): void
 			Utils::redirectexit('action=admin;area=paidsubscribe;sa=viewsub;sid=' . Utils::$context['sub_id']);
 		}
 		// Deleting?
-		elseif (isset($_REQUEST['delete']) || isset($_REQUEST['finished']))
-		{
+		elseif (isset($_REQUEST['delete']) || isset($_REQUEST['finished'])) {
 			User::$me->checkSession();
 
 			// Do the actual deletes!
-			if (!empty($_REQUEST['delsub']))
-			{
-				$toDelete = array();
+			if (!empty($_REQUEST['delsub'])) {
+				$toDelete = [];
 
-				foreach ($_REQUEST['delsub'] as $id => $dummy)
+				foreach ($_REQUEST['delsub'] as $id => $dummy) {
 					$toDelete[] = (int) $id;
+				}
 
-				$request = Db::$db->query('', '
-					SELECT id_subscribe, id_member
+				$request = Db::$db->query(
+					'',
+					'SELECT id_subscribe, id_member
 					FROM {db_prefix}log_subscribed
 					WHERE id_sublog IN ({array_int:subscription_list})',
-					array(
+					[
 						'subscription_list' => $toDelete,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					self::remove($row['id_subscribe'], $row['id_member'], isset($_REQUEST['delete']));
 				}
 				Db::$db->free_result($request);
@@ -1067,120 +1051,105 @@ public function modifyUser(): void
 		}
 
 		// Default attributes.
-		if (Utils::$context['action_type'] == 'add')
-		{
-			Utils::$context['sub'] = array(
+		if (Utils::$context['action_type'] == 'add') {
+			Utils::$context['sub'] = [
 				'id' => 0,
-				'start' => array(
+				'start' => [
 					'year' => (int) Time::strftime('%Y', time()),
 					'month' => (int) Time::strftime('%m', time()),
 					'day' => (int) Time::strftime('%d', time()),
 					'hour' => (int) Time::strftime('%H', time()),
 					'min' => (int) Time::strftime('%M', time()) < 10 ? '0' . (int) Time::strftime('%M', time()) : (int) Time::strftime('%M', time()),
 					'last_day' => 0,
-				),
-				'end' => array(
+				],
+				'end' => [
 					'year' => (int) Time::strftime('%Y', time()),
 					'month' => (int) Time::strftime('%m', time()),
 					'day' => (int) Time::strftime('%d', time()),
 					'hour' => (int) Time::strftime('%H', time()),
 					'min' => (int) Time::strftime('%M', time()) < 10 ? '0' . (int) Time::strftime('%M', time()) : (int) Time::strftime('%M', time()),
 					'last_day' => 0,
-				),
+				],
 				'status' => 1,
-			);
+			];
 
 			Utils::$context['sub']['start']['last_day'] = (int) Time::strftime('%d', mktime(0, 0, 0, Utils::$context['sub']['start']['month'] == 12 ? 1 : Utils::$context['sub']['start']['month'] + 1, 0, Utils::$context['sub']['start']['month'] == 12 ? Utils::$context['sub']['start']['year'] + 1 : Utils::$context['sub']['start']['year']));
 
 			Utils::$context['sub']['end']['last_day'] = (int) Time::strftime('%d', mktime(0, 0, 0, Utils::$context['sub']['end']['month'] == 12 ? 1 : Utils::$context['sub']['end']['month'] + 1, 0, Utils::$context['sub']['end']['month'] == 12 ? Utils::$context['sub']['end']['year'] + 1 : Utils::$context['sub']['end']['year']));
 
-			if (isset($_GET['uid']))
-			{
-				$request = Db::$db->query('', '
-					SELECT real_name
+			if (isset($_GET['uid'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT real_name
 					FROM {db_prefix}members
 					WHERE id_member = {int:current_member}',
-					array(
+					[
 						'current_member' => (int) $_GET['uid'],
-					)
+					],
 				);
 				list(Utils::$context['sub']['username']) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
-			}
-			else
-			{
+			} else {
 				Utils::$context['sub']['username'] = '';
 			}
 		}
 		// Otherwise load the existing info.
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT ls.id_sublog, ls.id_subscribe, ls.id_member, start_time, end_time, status, payments_pending, pending_details,
+		else {
+			$request = Db::$db->query(
+				'',
+				'SELECT ls.id_sublog, ls.id_subscribe, ls.id_member, start_time, end_time, status, payments_pending, pending_details,
 					COALESCE(mem.real_name, {string:blank_string}) AS username
 				FROM {db_prefix}log_subscribed AS ls
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = ls.id_member)
 				WHERE ls.id_sublog = {int:current_subscription_item}
 				LIMIT 1',
-				array(
+				[
 					'current_subscription_item' => Utils::$context['log_id'],
 					'blank_string' => '',
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('no_access', false);
 			}
 			$row = Db::$db->fetch_assoc($request);
 			Db::$db->free_result($request);
 
 			// Any pending payments?
-			Utils::$context['pending_payments'] = array();
+			Utils::$context['pending_payments'] = [];
 
-			if (!empty($row['pending_details']))
-			{
+			if (!empty($row['pending_details'])) {
 				$pending_details = Utils::jsonDecode($row['pending_details'], true);
 
-				foreach ($pending_details as $id => $pending)
-				{
+				foreach ($pending_details as $id => $pending) {
 					// Only this type need be displayed.
-					if ($pending[3] == 'payback')
-					{
+					if ($pending[3] == 'payback') {
 						// Work out what the options were.
 						$costs = Utils::jsonDecode(Utils::$context['current_subscription']['real_cost'], true);
 
-						if (Utils::$context['current_subscription']['real_length'] == 'F')
-						{
-							foreach ($costs as $duration => $cost)
-							{
-								if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2])
-								{
-									Utils::$context['pending_payments'][$id] = array(
+						if (Utils::$context['current_subscription']['real_length'] == 'F') {
+							foreach ($costs as $duration => $cost) {
+								if ($cost != 0 && $cost == $pending[1] && $duration == $pending[2]) {
+									Utils::$context['pending_payments'][$id] = [
 										'desc' => sprintf(Config::$modSettings['paid_currency_symbol'], $cost . '/' . Lang::$txt[$duration]),
-									);
+									];
 								}
 							}
-						}
-						elseif ($costs['fixed'] == $pending[1])
-						{
-							Utils::$context['pending_payments'][$id] = array(
+						} elseif ($costs['fixed'] == $pending[1]) {
+							Utils::$context['pending_payments'][$id] = [
 								'desc' => sprintf(Config::$modSettings['paid_currency_symbol'], $costs['fixed']),
-							);
+							];
 						}
 					}
 				}
 
 				// Check if we are adding/removing any.
-				if (isset($_GET['pending']))
-				{
-					foreach ($pending_details as $id => $pending)
-					{
+				if (isset($_GET['pending'])) {
+					foreach ($pending_details as $id => $pending) {
 						// Found the one to action?
-						if ($_GET['pending'] == $id && $pending[3] == 'payback' && isset(Utils::$context['pending_payments'][$id]))
-						{
+						if ($_GET['pending'] == $id && $pending[3] == 'payback' && isset(Utils::$context['pending_payments'][$id])) {
 							// Flexible?
-							if (isset($_GET['accept']))
-							{
+							if (isset($_GET['accept'])) {
 								self::add(Utils::$context['current_subscription']['id'], $row['id_member'], Utils::$context['current_subscription']['real_length'] == 'F' ? strtoupper(substr($pending[2], 0, 1)) : 0);
 							}
 
@@ -1189,14 +1158,15 @@ public function modifyUser(): void
 							$new_details = Utils::jsonEncode($pending_details);
 
 							// Update the entry.
-							Db::$db->query('', '
-								UPDATE {db_prefix}log_subscribed
+							Db::$db->query(
+								'',
+								'UPDATE {db_prefix}log_subscribed
 								SET payments_pending = payments_pending - 1, pending_details = {string:pending_details}
 								WHERE id_sublog = {int:current_subscription_item}',
-								array(
+								[
 									'current_subscription_item' => Utils::$context['log_id'],
 									'pending_details' => $new_details,
-								)
+								],
 							);
 
 							// Reload
@@ -1208,34 +1178,34 @@ public function modifyUser(): void
 
 			Utils::$context['sub_id'] = $row['id_subscribe'];
 
-			Utils::$context['sub'] = array(
+			Utils::$context['sub'] = [
 				'id' => 0,
-				'start' => array(
+				'start' => [
 					'year' => (int) Time::strftime('%Y', $row['start_time']),
 					'month' => (int) Time::strftime('%m', $row['start_time']),
 					'day' => (int) Time::strftime('%d', $row['start_time']),
 					'hour' => (int) Time::strftime('%H', $row['start_time']),
 					'min' => (int) Time::strftime('%M', $row['start_time']) < 10 ? '0' . (int) Time::strftime('%M', $row['start_time']) : (int) Time::strftime('%M', $row['start_time']),
 					'last_day' => 0,
-				),
-				'end' => array(
+				],
+				'end' => [
 					'year' => (int) Time::strftime('%Y', $row['end_time']),
 					'month' => (int) Time::strftime('%m', $row['end_time']),
 					'day' => (int) Time::strftime('%d', $row['end_time']),
 					'hour' => (int) Time::strftime('%H', $row['end_time']),
 					'min' => (int) Time::strftime('%M', $row['end_time']) < 10 ? '0' . (int) Time::strftime('%M', $row['end_time']) : (int) Time::strftime('%M', $row['end_time']),
 					'last_day' => 0,
-				),
+				],
 				'status' => $row['status'],
 				'username' => $row['username'],
-			);
+			];
 
 			Utils::$context['sub']['start']['last_day'] = (int) Time::strftime('%d', mktime(0, 0, 0, Utils::$context['sub']['start']['month'] == 12 ? 1 : Utils::$context['sub']['start']['month'] + 1, 0, Utils::$context['sub']['start']['month'] == 12 ? Utils::$context['sub']['start']['year'] + 1 : Utils::$context['sub']['start']['year']));
 
 			Utils::$context['sub']['end']['last_day'] = (int) Time::strftime('%d', mktime(0, 0, 0, Utils::$context['sub']['end']['month'] == 12 ? 1 : Utils::$context['sub']['end']['month'] + 1, 0, Utils::$context['sub']['end']['month'] == 12 ? Utils::$context['sub']['end']['year'] + 1 : Utils::$context['sub']['end']['year']));
 		}
 
-		Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 	}
 
 	/**
@@ -1244,16 +1214,13 @@ public function modifyUser(): void
 	 * It requires the moderate_forum permission
 	 * Accessed from ?action=admin;area=paidsubscribe;sa=settings.
 	 */
-	function settings(): void
+	public function settings(): void
 	{
 		$config_vars = self::getConfigVars();
 
-		if (empty(Config::$modSettings['paid_enabled']))
-		{
+		if (empty(Config::$modSettings['paid_enabled'])) {
 			Utils::$context['settings_title'] = Lang::$txt['paid_subscriptions'];
-		}
-		else
-		{
+		} else {
 			Utils::$context['settings_message'] = sprintf(Lang::$txt['paid_note'], Config::$boardurl);
 			Menu::$loaded['admin']['current_subsection'] = 'settings';
 			Utils::$context['settings_title'] = Lang::$txt['settings'];
@@ -1301,23 +1268,23 @@ function toggleOther()
 		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=paidsubscribe;save;sa=settings';
 
 		// Saving the settings?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			$old = !empty(Config::$modSettings['paid_enabled']);
 			$new = !empty($_POST['paid_enabled']);
-			if ($old != $new)
-			{
+
+			if ($old != $new) {
 				// So we're changing this fundamental status. Great.
-				Db::$db->query('', '
-					UPDATE {db_prefix}scheduled_tasks
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}scheduled_tasks
 					SET disabled = {int:disabled}
 					WHERE task = {string:task}',
-					array(
+					[
 						'disabled' => $new ? 0 : 1,
 						'task' => 'paid_subscriptions',
-					)
+					],
 				);
 
 				// This may well affect the next trigger, whether we're enabling or not.
@@ -1325,24 +1292,23 @@ function toggleOther()
 			}
 
 			// Check the email addresses were actually email addresses.
-			if (!empty($_POST['paid_email_to']))
-			{
-				$email_addresses = array();
-				foreach (explode(',', $_POST['paid_email_to']) as $email)
-				{
+			if (!empty($_POST['paid_email_to'])) {
+				$email_addresses = [];
+
+				foreach (explode(',', $_POST['paid_email_to']) as $email) {
 					$email = trim($email);
-					if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL))
+
+					if (!empty($email) && filter_var($email, FILTER_VALIDATE_EMAIL)) {
 						$email_addresses[] = $email;
+					}
 					$_POST['paid_email_to'] = implode(',', $email_addresses);
 				}
 			}
 
 			// Can only handle this stuff if it's already enabled...
-			if (!empty(Config::$modSettings['paid_enabled']))
-			{
+			if (!empty(Config::$modSettings['paid_enabled'])) {
 				// Sort out the currency stuff.
-				if ($_POST['paid_currency'] != 'other')
-				{
+				if ($_POST['paid_currency'] != 'other') {
 					$_POST['paid_currency_code'] = $_POST['paid_currency'];
 					$_POST['paid_currency_symbol'] = Lang::$txt[$_POST['paid_currency'] . '_symbol'];
 				}
@@ -1370,8 +1336,9 @@ function toggleOther()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1391,101 +1358,96 @@ public static function call(): void
 	 */
 	public static function getConfigVars(): array
 	{
-		if (!empty(Config::$modSettings['paid_enabled']))
-		{
+		if (!empty(Config::$modSettings['paid_enabled'])) {
 			// If the currency is set to something different then we need to set it to other for this to work and set it back shortly.
 			Config::$modSettings['paid_currency'] = !empty(Config::$modSettings['paid_currency_code']) ? Config::$modSettings['paid_currency_code'] : '';
 
-			if (!empty(Config::$modSettings['paid_currency_code']) && !in_array(Config::$modSettings['paid_currency_code'], array('usd', 'eur', 'gbp', 'cad', 'aud')))
-			{
+			if (!empty(Config::$modSettings['paid_currency_code']) && !in_array(Config::$modSettings['paid_currency_code'], ['usd', 'eur', 'gbp', 'cad', 'aud'])) {
 				Config::$modSettings['paid_currency'] = 'other';
 			}
 
 			// These are all the default settings.
-			$config_vars = array(
-				array(
+			$config_vars = [
+				[
 					'check',
-					'paid_enabled'
-				),
+					'paid_enabled',
+				],
 				'',
 
-				array(
+				[
 					'select',
 					'paid_email',
-					array(
+					[
 						0 => Lang::$txt['paid_email_no'],
 						1 => Lang::$txt['paid_email_error'],
-						2 => Lang::$txt['paid_email_all']
-					),
-					'subtext' => Lang::$txt['paid_email_desc']
-				),
-				array(
+						2 => Lang::$txt['paid_email_all'],
+					],
+					'subtext' => Lang::$txt['paid_email_desc'],
+				],
+				[
 					'email',
 					'paid_email_to',
 					'subtext' => Lang::$txt['paid_email_to_desc'],
-					'size' => 60
-				),
+					'size' => 60,
+				],
 				'',
 
-				'dummy_currency' => array(
+				'dummy_currency' => [
 					'select',
 					'paid_currency',
-					array(
+					[
 						'usd' => Lang::$txt['usd'],
 						'eur' => Lang::$txt['eur'],
 						'gbp' => Lang::$txt['gbp'],
 						'cad' => Lang::$txt['cad'],
 						'aud' => Lang::$txt['aud'],
-						'other' => Lang::$txt['other']
-					),
-					'javascript' => 'onchange="toggleOther();"'
-				),
-				array(
+						'other' => Lang::$txt['other'],
+					],
+					'javascript' => 'onchange="toggleOther();"',
+				],
+				[
 					'text',
 					'paid_currency_code',
 					'subtext' => Lang::$txt['paid_currency_code_desc'],
 					'size' => 5,
-					'force_div_id' => 'custom_currency_code_div'
-				),
-				array(
+					'force_div_id' => 'custom_currency_code_div',
+				],
+				[
 					'text',
 					'paid_currency_symbol',
 					'subtext' => Lang::$txt['paid_currency_symbol_desc'],
 					'size' => 8,
-					'force_div_id' => 'custom_currency_symbol_div'
-				),
-				array(
+					'force_div_id' => 'custom_currency_symbol_div',
+				],
+				[
 					'check',
 					'paidsubs_test',
 					'subtext' => Lang::$txt['paidsubs_test_desc'],
-					'onclick' => 'return document.getElementById(\'paidsubs_test\').checked ? confirm(\'' . Lang::$txt['paidsubs_test_confirm'] . '\') : true;'
-				),
-			);
+					'onclick' => 'return document.getElementById(\'paidsubs_test\').checked ? confirm(\'' . Lang::$txt['paidsubs_test_confirm'] . '\') : true;',
+				],
+			];
 
 			// Now load all the other gateway settings.
 			$gateways = self::loadPaymentGateways();
-			foreach ($gateways as $gateway)
-			{
+
+			foreach ($gateways as $gateway) {
 				$gatewayClass = new $gateway['display_class']();
 
 				$setting_data = $gatewayClass->getGatewaySettings();
 
-				if (!empty($setting_data))
-				{
-					$config_vars[] = array('title', $gatewayClass->title, 'text_label' => (isset(Lang::$txt['paidsubs_gateway_title_' . $gatewayClass->title]) ? Lang::$txt['paidsubs_gateway_title_' . $gatewayClass->title] : $gatewayClass->title));
+				if (!empty($setting_data)) {
+					$config_vars[] = ['title', $gatewayClass->title, 'text_label' => (Lang::$txt['paidsubs_gateway_title_' . $gatewayClass->title] ?? $gatewayClass->title)];
 
 					$config_vars = array_merge($config_vars, $setting_data);
 				}
 			}
-		}
-		else
-		{
-			$config_vars = array(
-				array('check', 'paid_enabled'),
-			);
+		} else {
+			$config_vars = [
+				['check', 'paid_enabled'],
+			];
 		}
 
-		IntegrationHook::call('integrate_paidsubs_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_paidsubs_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -1504,42 +1466,39 @@ public static function getSubs(): array
 		Utils::$context['subscriptions'] = &self::$all;
 
 		// Avoid unnecessary repetition.
-		if (!empty(self::$all))
+		if (!empty(self::$all)) {
 			return self::$all;
+		}
 
 		// Make sure this is loaded, just in case.
 		Lang::load('ManagePaid');
 
-		$request = Db::$db->query('', '
-			SELECT id_subscribe, name, description, cost, length, id_group, add_groups, active, repeatable
+		$request = Db::$db->query(
+			'',
+			'SELECT id_subscribe, name, description, cost, length, id_group, add_groups, active, repeatable
 			FROM {db_prefix}subscriptions',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Pick a cost.
 			$costs = Utils::jsonDecode($row['cost'], true);
 
-			if ($row['length'] != 'F' && !empty(Config::$modSettings['paid_currency_symbol']) && !empty($costs['fixed']))
-			{
+			if ($row['length'] != 'F' && !empty(Config::$modSettings['paid_currency_symbol']) && !empty($costs['fixed'])) {
 				$cost = sprintf(Config::$modSettings['paid_currency_symbol'], $costs['fixed']);
-			}
-			else
-			{
+			} else {
 				$cost = '???';
 			}
 
 			// Do the span.
 			preg_match('~(\d*)(\w)~', $row['length'], $match);
 
-			if (isset($match[2]))
-			{
+			if (isset($match[2])) {
 				$num_length = $match[1];
 				$length = $match[1] . ' ';
 
-				switch ($match[2])
-				{
+				switch ($match[2]) {
 					case 'D':
 						$length .= Lang::$txt['paid_mod_span_days'];
 						$num_length *= 86400;
@@ -1560,13 +1519,11 @@ public static function getSubs(): array
 						$num_length *= 31556926;
 						break;
 				}
-			}
-			else
-			{
+			} else {
 				$length = '??';
 			}
 
-			self::$all[$row['id_subscribe']] = array(
+			self::$all[$row['id_subscribe']] = [
 				'id' => $row['id_subscribe'],
 				'name' => $row['name'],
 				'desc' => $row['description'],
@@ -1583,41 +1540,41 @@ public static function getSubs(): array
 				'add_groups' => $row['add_groups'],
 				'flexible' => $row['length'] == 'F' ? true : false,
 				'repeatable' => $row['repeatable'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Do the counts.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS member_count, id_subscribe, status
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS member_count, id_subscribe, status
 			FROM {db_prefix}log_subscribed
 			GROUP BY id_subscribe, status',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$ind = $row['status'] == 0 ? 'finished' : 'total';
 
-			if (isset(self::$all[$row['id_subscribe']]))
-			{
+			if (isset(self::$all[$row['id_subscribe']])) {
 				self::$all[$row['id_subscribe']][$ind] = $row['member_count'];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// How many payments are we waiting on?
-		$request = Db::$db->query('', '
-			SELECT SUM(payments_pending) AS total_pending, id_subscribe
+		$request = Db::$db->query(
+			'',
+			'SELECT SUM(payments_pending) AS total_pending, id_subscribe
 			FROM {db_prefix}log_subscribed
 			GROUP BY id_subscribe',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (isset(self::$all[$row['id_subscribe']]))
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (isset(self::$all[$row['id_subscribe']])) {
 				self::$all[$row['id_subscribe']]['pending'] = $row['total_pending'];
 			}
 		}
@@ -1641,8 +1598,9 @@ public static function add($id_subscribe, $id_member, $renewal = 0, $forceStartT
 		getSubs();
 
 		// Exists, yes?
-		if (!isset(self::$all[$id_subscribe]))
+		if (!isset(self::$all[$id_subscribe])) {
 			return;
+		}
 
 		$curSub = self::$all[$id_subscribe];
 
@@ -1650,10 +1608,8 @@ public static function add($id_subscribe, $id_member, $renewal = 0, $forceStartT
 		$duration = $curSub['num_length'];
 
 		// If this is a renewal change the duration to be correct.
-		if (!empty($renewal))
-		{
-			switch ($renewal)
-			{
+		if (!empty($renewal)) {
+			switch ($renewal) {
 				case 'D':
 					$duration = 86400;
 					break;
@@ -1676,47 +1632,51 @@ public static function add($id_subscribe, $id_member, $renewal = 0, $forceStartT
 		}
 
 		// Firstly, see whether it exists, and is active. If so then this is meerly an extension.
-		$request = Db::$db->query('', '
-			SELECT id_sublog, end_time, start_time
+		$request = Db::$db->query(
+			'',
+			'SELECT id_sublog, end_time, start_time
 			FROM {db_prefix}log_subscribed
 			WHERE id_subscribe = {int:current_subscription}
 				AND id_member = {int:current_member}
 				AND status = {int:is_active}',
-			array(
+			[
 				'current_subscription' => $id_subscribe,
 				'current_member' => $id_member,
 				'is_active' => 1,
-			)
+			],
 		);
 
-		if (Db::$db->num_rows($request) != 0)
-		{
+		if (Db::$db->num_rows($request) != 0) {
 			list($id_sublog, $endtime, $starttime) = Db::$db->fetch_row($request);
 
 			// If this has already expired but is active, extension means the period from now.
-			if ($endtime < time())
+			if ($endtime < time()) {
 				$endtime = time();
+			}
 
-			if ($starttime == 0)
+			if ($starttime == 0) {
 				$starttime = time();
+			}
 
 			// Work out the new expiry date.
 			$endtime += $duration;
 
-			if ($forceEndTime != 0)
+			if ($forceEndTime != 0) {
 				$endtime = $forceEndTime;
+			}
 
 			// As everything else should be good, just update!
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_subscribed
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_subscribed
 				SET end_time = {int:end_time}, start_time = {int:start_time}, reminder_sent = {int:no_reminder_sent}
 				WHERE id_sublog = {int:current_subscription_item}',
-				array(
+				[
 					'end_time' => $endtime,
 					'start_time' => $starttime,
 					'current_subscription_item' => $id_sublog,
 					'no_reminder_sent' => 0,
-				)
+				],
 			);
 
 			return;
@@ -1724,16 +1684,17 @@ public static function add($id_subscribe, $id_member, $renewal = 0, $forceStartT
 		Db::$db->free_result($request);
 
 		// If we're here, that means we don't have an active subscription - that means we need to do some work!
-		$request = Db::$db->query('', '
-			SELECT m.id_group, m.additional_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_group, m.additional_groups
 			FROM {db_prefix}members AS m
 			WHERE m.id_member = {int:current_member}',
-			array(
+			[
 				'current_member' => $id_member,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			return;
 		}
 		list($old_id_group, $additional_groups) = Db::$db->fetch_row($request);
@@ -1746,84 +1707,87 @@ public static function add($id_subscribe, $id_member, $renewal = 0, $forceStartT
 		$newAddGroups = array_merge($newAddGroups, $curAddGroups);
 
 		// Simple, simple, simple - hopefully... id_group first.
-		if ($curSub['prim_group'] != 0)
-		{
+		if ($curSub['prim_group'] != 0) {
 			$id_group = $curSub['prim_group'];
 
 			// Ensure their old privileges are maintained.
-			if ($old_id_group != 0)
+			if ($old_id_group != 0) {
 				$newAddGroups[] = $old_id_group;
-		}
-		else
-		{
+			}
+		} else {
 			$id_group = $old_id_group;
 		}
 
 		// Yep, make sure it's unique, and no empties.
-		foreach ($newAddGroups as $k => $v)
-		{
-			if (empty($v))
+		foreach ($newAddGroups as $k => $v) {
+			if (empty($v)) {
 				unset($newAddGroups[$k]);
+			}
 		}
 
 		$newAddGroups = array_unique($newAddGroups);
 		$newAddGroups = implode(',', $newAddGroups);
 
 		// Store the new settings.
-		Db::$db->query('', '
-			UPDATE {db_prefix}members
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}members
 			SET id_group = {int:primary_group}, additional_groups = {string:additional_groups}
 			WHERE id_member = {int:current_member}',
-			array(
+			[
 				'primary_group' => $id_group,
 				'current_member' => $id_member,
 				'additional_groups' => $newAddGroups,
-			)
+			],
 		);
 
 		// Now log the subscription - maybe we have a dorment subscription we can restore?
-		$request = Db::$db->query('', '
-			SELECT id_sublog, end_time, start_time
+		$request = Db::$db->query(
+			'',
+			'SELECT id_sublog, end_time, start_time
 			FROM {db_prefix}log_subscribed
 			WHERE id_subscribe = {int:current_subscription}
 				AND id_member = {int:current_member}',
-			array(
+			[
 				'current_subscription' => $id_subscribe,
 				'current_member' => $id_member,
-			)
+			],
 		);
 
 		// @todo Don't really need to do this twice...
-		if (Db::$db->num_rows($request) != 0)
-		{
-			list ($id_sublog, $endtime, $starttime) = Db::$db->fetch_row($request);
+		if (Db::$db->num_rows($request) != 0) {
+			list($id_sublog, $endtime, $starttime) = Db::$db->fetch_row($request);
 
 			// If this has already expired but is active, extension means the period from now.
-			if ($endtime < time())
+			if ($endtime < time()) {
 				$endtime = time();
+			}
 
-			if ($starttime == 0)
+			if ($starttime == 0) {
 				$starttime = time();
+			}
 
 			// Work out the new expiry date.
 			$endtime += $duration;
 
-			if ($forceEndTime != 0)
+			if ($forceEndTime != 0) {
 				$endtime = $forceEndTime;
+			}
 
 			// As everything else should be good, just update!
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_subscribed
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_subscribed
 				SET start_time = {int:start_time}, end_time = {int:end_time}, old_id_group = {int:old_id_group}, status = {int:is_active}, reminder_sent = {int:no_reminder_sent}
 				WHERE id_sublog = {int:current_subscription_item}',
-				array(
+				[
 					'start_time' => $starttime,
 					'end_time' => $endtime,
 					'old_id_group' => $old_id_group,
 					'is_active' => 1,
 					'no_reminder_sent' => 0,
 					'current_subscription_item' => $id_sublog,
-				)
+				],
 			);
 
 			return;
@@ -1834,17 +1798,18 @@ public static function add($id_subscribe, $id_member, $renewal = 0, $forceStartT
 		$endtime = !empty($forceEndTime) ? $forceEndTime : time() + $duration;
 		$starttime = !empty($forceStartTime) ? $forceStartTime : time();
 
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}log_subscribed',
-			array(
+			[
 				'id_subscribe' => 'int', 'id_member' => 'int', 'old_id_group' => 'int', 'start_time' => 'int',
 				'end_time' => 'int', 'status' => 'int', 'pending_details' => 'string',
-			),
-			array(
+			],
+			[
 				$id_subscribe, $id_member, $old_id_group, $starttime,
 				$endtime, 1, '',
-			),
-			array('id_sublog')
+			],
+			['id_sublog'],
 		);
 	}
 
@@ -1860,24 +1825,26 @@ public static function remove($id_subscribe, $id_member, $delete = false): void
 		self::getSubs();
 
 		// Load the user core bits.
-		$request = Db::$db->query('', '
-			SELECT m.id_group, m.additional_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_group, m.additional_groups
 			FROM {db_prefix}members AS m
 			WHERE m.id_member = {int:current_member}',
-			array(
+			[
 				'current_member' => $id_member,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			Db::$db->free_result($request);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_subscribed
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_subscribed
 				WHERE id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => $id_member,
-				)
+				],
 			);
 
 			return;
@@ -1886,45 +1853,43 @@ public static function remove($id_subscribe, $id_member, $delete = false): void
 		Db::$db->free_result($request);
 
 		// Get all of the subscriptions for this user that are active - it will be necessary!
-		$removals = array();
-		$allowed = array();
+		$removals = [];
+		$allowed = [];
 		$old_id_group = 0;
 		$new_id_group = -1;
 
-		$request = Db::$db->query('', '
-			SELECT id_subscribe, old_id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_subscribe, old_id_group
 			FROM {db_prefix}log_subscribed
 			WHERE id_member = {int:current_member}
 				AND status = {int:is_active}',
-			array(
+			[
 				'current_member' => $id_member,
 				'is_active' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset(self::$all[$row['id_subscribe']]))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset(self::$all[$row['id_subscribe']])) {
 				continue;
+			}
 
 			// The one we're removing?
-			if ($row['id_subscribe'] == $id_subscribe)
-			{
+			if ($row['id_subscribe'] == $id_subscribe) {
 				$removals = explode(',', self::$all[$row['id_subscribe']]['add_groups']);
 
-				if (self::$all[$row['id_subscribe']]['prim_group'] != 0)
-				{
+				if (self::$all[$row['id_subscribe']]['prim_group'] != 0) {
 					$removals[] = self::$all[$row['id_subscribe']]['prim_group'];
 				}
 
 				$old_id_group = $row['old_id_group'];
 			}
 			// Otherwise things we allow.
-			else
-			{
+			else {
 				$allowed = array_merge($allowed, explode(',', self::$all[$row['id_subscribe']]['add_groups']));
 
-				if (self::$all[$row['id_subscribe']]['prim_group'] != 0)
-				{
+				if (self::$all[$row['id_subscribe']]['prim_group'] != 0) {
 					$allowed[] = self::$all[$row['id_subscribe']]['prim_group'];
 
 					$new_id_group = self::$all[$row['id_subscribe']]['prim_group'];
@@ -1936,36 +1901,31 @@ public static function remove($id_subscribe, $id_member, $delete = false): void
 		// Now, for everything we are removing check they definitely are not allowed it.
 		$existingGroups = explode(',', $additional_groups);
 
-		foreach ($existingGroups as $key => $group)
-		{
-			if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed)))
-			{
+		foreach ($existingGroups as $key => $group) {
+			if (empty($group) || (in_array($group, $removals) && !in_array($group, $allowed))) {
 				unset($existingGroups[$key]);
 			}
 		}
 
 		// Finally, do something with the current primary group.
-		if (in_array($id_group, $removals))
-		{
+		if (in_array($id_group, $removals)) {
 			// If this primary group is actually allowed keep it.
-			if (in_array($id_group, $allowed))
+			if (in_array($id_group, $allowed)) {
 				$existingGroups[] = $id_group;
+			}
 
 			// Either way, change the id_group back.
-			if ($new_id_group < 1)
-			{
+			if ($new_id_group < 1) {
 				// If we revert to the old id-group we need to ensure it wasn't from a subscription.
-				foreach (self::$all as $id => $group)
-				{
+				foreach (self::$all as $id => $group) {
 					// It was? Make them a regular member then!
-					if ($group['prim_group'] == $old_id_group)
+					if ($group['prim_group'] == $old_id_group) {
 						$old_id_group = 0;
+					}
 				}
 
 				$id_group = $old_id_group;
-			}
-			else
-			{
+			} else {
 				$id_group = $new_id_group;
 			}
 		}
@@ -1975,43 +1935,44 @@ public static function remove($id_subscribe, $id_member, $delete = false): void
 		$existingGroups = implode(',', $existingGroups);
 
 		// Update the member
-		Db::$db->query('', '
-			UPDATE {db_prefix}members
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}members
 			SET id_group = {int:primary_group}, additional_groups = {string:existing_groups}
 			WHERE id_member = {int:current_member}',
-			array(
+			[
 				'primary_group' => $id_group,
 				'current_member' => $id_member,
 				'existing_groups' => $existingGroups,
-			)
+			],
 		);
 
 		// Disable the subscription.
-		if (!$delete)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_subscribed
+		if (!$delete) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_subscribed
 				SET status = {int:not_active}
 				WHERE id_member = {int:current_member}
 					AND id_subscribe = {int:current_subscription}',
-				array(
+				[
 					'not_active' => 0,
 					'current_member' => $id_member,
 					'current_subscription' => $id_subscribe,
-				)
+				],
 			);
 		}
 		// Otherwise delete it!
-		else
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_subscribed
+		else {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_subscribed
 				WHERE id_member = {int:current_member}
 					AND id_subscribe = {int:current_subscription}',
-				array(
+				[
 					'current_member' => $id_member,
 					'current_subscription' => $id_subscribe,
-				)
+				],
 			);
 		}
 	}
@@ -2026,48 +1987,49 @@ public static function remove($id_subscribe, $id_member, $delete = false): void
 	public static function reapply($users): void
 	{
 		// Make it an array.
-		if (!is_array($users))
-			$users = array($users);
+		if (!is_array($users)) {
+			$users = [$users];
+		}
 
 		// Get the current groups for each member.
-		$groups = array();
+		$groups = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, id_group, additional_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, id_group, additional_groups
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:user_list})',
-			array(
+			[
 				'user_list' => $users,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$groups[$row['id_member']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$groups[$row['id_member']] = [
 				'primary' => $row['id_group'],
 				'additional' => explode(',', $row['additional_groups']),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
-		$request = Db::$db->query('', '
-			SELECT ls.id_member, ls.old_id_group, s.id_group, s.add_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT ls.id_member, ls.old_id_group, s.id_group, s.add_groups
 			FROM {db_prefix}log_subscribed AS ls
 				INNER JOIN {db_prefix}subscriptions AS s ON (s.id_subscribe = ls.id_subscribe)
 			WHERE ls.id_member IN ({array_int:user_list})
 				AND ls.end_time > {int:current_time}',
-			array(
+			[
 				'user_list' => $users,
 				'current_time' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Specific primary group?
-			if ($row['id_group'] != 0)
-			{
+			if ($row['id_group'] != 0) {
 				// If this is changing - add the old one to the additional groups so it's not lost.
-				if ($row['id_group'] != $groups[$row['id_member']]['primary'])
-				{
+				if ($row['id_group'] != $groups[$row['id_member']]['primary']) {
 					$groups[$row['id_member']]['additional'][] = $groups[$row['id_member']]['primary'];
 				}
 
@@ -2075,36 +2037,35 @@ public static function reapply($users): void
 			}
 
 			// Additional groups.
-			if (!empty($row['add_groups']))
-			{
+			if (!empty($row['add_groups'])) {
 				$groups[$row['id_member']]['additional'] = array_merge($groups[$row['id_member']]['additional'], explode(',', $row['add_groups']));
 			}
 		}
 		Db::$db->free_result($request);
 
 		// Update all the members.
-		foreach ($groups as $id => $group)
-		{
+		foreach ($groups as $id => $group) {
 			$group['additional'] = array_unique($group['additional']);
 
-			foreach ($group['additional'] as $key => $value)
-			{
-				if (empty($value))
+			foreach ($group['additional'] as $key => $value) {
+				if (empty($value)) {
 					unset($group['additional'][$key]);
+				}
 			}
 
 			$addgroups = implode(',', $group['additional']);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET id_group = {int:primary_group}, additional_groups = {string:additional_groups}
 				WHERE id_member = {int:current_member}
 				LIMIT 1',
-				array(
+				[
 					'primary_group' => $group['primary'],
 					'current_member' => $id,
 					'additional_groups' => $addgroups,
-				)
+				],
 			);
 		}
 	}
@@ -2119,55 +2080,52 @@ public static function reapply($users): void
 	 */
 	public static function loadPaymentGateways(): array
 	{
-		$gateways = array();
+		$gateways = [];
 
 		// Check for autoloading payment gateways.
 		$subscriptions_dir = Config::$sourcedir . '/Subscriptions';
 
-		foreach (glob(Config::$sourcedir . '/Subscriptions/*') as $gateway_dir)
-		{
+		foreach (glob(Config::$sourcedir . '/Subscriptions/*') as $gateway_dir) {
 			$gateway_dir = basename($gateway_dir);
 
-			if ($gateway_dir === 'index.php')
+			if ($gateway_dir === 'index.php') {
 				continue;
+			}
 
-			$gateways[] = array(
+			$gateways[] = [
 				'filename' => null,
 				'code' => strtolower($gateway_dir),
 				'valid_version' => class_exists('SMF\\Subscriptions\\' . $gateway_dir . '\\Payment') && class_exists('SMF\\Subscriptions\\' . $gateway_dir . '\\Display'),
 				'payment_class' => 'SMF\\Subscriptions\\' . $gateway_dir . '\\Payment',
 				'display_class' => 'SMF\\Subscriptions\\' . $gateway_dir . '\\Display',
-			);
+			];
 		}
 
 		// Check for payment gateways using the old comment-based system.
 		// Kept for backward compatibility.
-		if (empty(glob(Config::$sourcedir . '/Subscriptions-*.php')))
+		if (empty(glob(Config::$sourcedir . '/Subscriptions-*.php'))) {
 			return $gateways;
+		}
 
-		if ($dh = opendir(Config::$sourcedir))
-		{
-			while (($file = readdir($dh)) !== false)
-			{
-				if (is_file(Config::$sourcedir . '/' . $file) && preg_match('~^Subscriptions-([A-Za-z\d]+)\.php$~', $file, $matches))
-				{
+		if ($dh = opendir(Config::$sourcedir)) {
+			while (($file = readdir($dh)) !== false) {
+				if (is_file(Config::$sourcedir . '/' . $file) && preg_match('~^Subscriptions-([A-Za-z\d]+)\.php$~', $file, $matches)) {
 					// Check this is definitely a valid gateway!
 					$fp = fopen(Config::$sourcedir . '/' . $file, 'rb');
 					$header = fread($fp, 4096);
 					fclose($fp);
 
-					if (strpos($header, '// SMF Payment Gateway: ' . strtolower($matches[1])) !== false)
-					{
-						require_once(Config::$sourcedir . '/' . $file);
+					if (strpos($header, '// SMF Payment Gateway: ' . strtolower($matches[1])) !== false) {
+						require_once Config::$sourcedir . '/' . $file;
 
-						$gateways[] = array(
+						$gateways[] = [
 							'filename' => $file,
 							'code' => strtolower($matches[1]),
 							// Don't need anything snazzier than this yet.
 							'valid_version' => class_exists(strtolower($matches[1]) . '_payment') && class_exists(strtolower($matches[1]) . '_display'),
 							'payment_class' => strtolower($matches[1]) . '_payment',
 							'display_class' => strtolower($matches[1]) . '_display',
-						);
+						];
 					}
 				}
 			}
@@ -2187,22 +2145,23 @@ public static function loadPaymentGateways(): array
 	 * @param array $search_vars An array of variables for the search string
 	 * @return int The number of subscribed users matching the given parameters
 	 */
-	public static function list_getSubscribedUserCount($id_sub, $search_string, $search_vars = array()): int
+	public static function list_getSubscribedUserCount($id_sub, $search_string, $search_vars = []): int
 	{
 		// Get the total amount of users.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS total_subs
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS total_subs
 			FROM {db_prefix}log_subscribed AS ls
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = ls.id_member)
 			WHERE ls.id_subscribe = {int:current_subscription} ' . $search_string . '
 				AND (ls.end_time != {int:no_end_time} OR ls.payments_pending != {int:no_pending_payments})',
-			array_merge($search_vars, array(
+			array_merge($search_vars, [
 				'current_subscription' => $id_sub,
 				'no_end_time' => 0,
 				'no_pending_payments' => 0,
-			))
+			]),
 		);
-		list ($memberCount) = Db::$db->fetch_row($request);
+		list($memberCount) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $memberCount;
@@ -2221,12 +2180,13 @@ public static function list_getSubscribedUserCount($id_sub, $search_string, $sea
 	 * @param array $search_vars The variables for the search string
 	 * @return array An array of information about the subscribed users matching the given parameters
 	 */
-	public static function list_getSubscribedUsers($start, $items_per_page, $sort, $id_sub, $search_string, $search_vars = array()): array
+	public static function list_getSubscribedUsers($start, $items_per_page, $sort, $id_sub, $search_string, $search_vars = []): array
 	{
-		$subscribers = array();
+		$subscribers = [];
 
-		$request = Db::$db->query('', '
-			SELECT ls.id_sublog, COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, {string:guest}) AS name, ls.start_time, ls.end_time,
+		$request = Db::$db->query(
+			'',
+			'SELECT ls.id_sublog, COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, {string:guest}) AS name, ls.start_time, ls.end_time,
 				ls.status, ls.payments_pending
 			FROM {db_prefix}log_subscribed AS ls
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = ls.id_member)
@@ -2234,7 +2194,7 @@ public static function list_getSubscribedUsers($start, $items_per_page, $sort, $
 				AND (ls.end_time != {int:no_end_time} OR ls.payments_pending != {int:no_payments_pending})
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array_merge($search_vars, array(
+			array_merge($search_vars, [
 				'current_subscription' => $id_sub,
 				'no_end_time' => 0,
 				'no_payments_pending' => 0,
@@ -2242,11 +2202,11 @@ public static function list_getSubscribedUsers($start, $items_per_page, $sort, $
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$subscribers[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$subscribers[] = [
 				'id' => $row['id_sublog'],
 				'id_member' => $row['id_member'],
 				'name' => $row['name'],
@@ -2255,7 +2215,7 @@ public static function list_getSubscribedUsers($start, $items_per_page, $sort, $
 				'pending' => $row['payments_pending'],
 				'status' => $row['status'],
 				'status_text' => $row['status'] == 0 ? ($row['payments_pending'] == 0 ? Lang::$txt['paid_finished'] : Lang::$txt['paid_pending']) : Lang::$txt['paid_active'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -2310,8 +2270,9 @@ public static function modifyUserSubscription(): void
 	 */
 	public static function modifySubscriptionSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
@@ -2334,39 +2295,38 @@ protected function __construct()
 		Utils::$context['page_title'] = Lang::$txt['paid_subscriptions'];
 
 		// Tabs for browsing the different subscription functions.
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['paid_subscriptions'],
 			'help' => '',
 			'description' => Lang::$txt['paid_subscriptions_desc'],
-		);
+		];
 
 		// If not enabled or not fully configured yet, only show the settings.
-		if (empty(Config::$modSettings['paid_enabled']) || empty(Config::$modSettings['paid_currency_symbol']))
-		{
-			self::$subactions = array_intersect_key(self::$subactions, array('settings' => true));
+		if (empty(Config::$modSettings['paid_enabled']) || empty(Config::$modSettings['paid_currency_symbol'])) {
+			self::$subactions = array_intersect_key(self::$subactions, ['settings' => true]);
 			$this->subaction = 'settings';
-		}
-		else
-		{
-			Menu::$loaded['admin']->tab_data['tabs'] = array(
-				'view' => array(
+		} else {
+			Menu::$loaded['admin']->tab_data['tabs'] = [
+				'view' => [
 					'description' => Lang::$txt['paid_subs_view_desc'],
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'description' => Lang::$txt['paid_subs_settings_desc'],
-				),
-			);
+				],
+			];
 		}
 
-		IntegrationHook::call('integrate_manage_subscriptions', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_subscriptions', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Subscriptions::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Subscriptions::exportStatic')) {
 	Subscriptions::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Tasks.php b/Sources/Actions/Admin/Tasks.php
index 6a0ad65de6..7ed14eabc4 100644
--- a/Sources/Actions/Admin/Tasks.php
+++ b/Sources/Actions/Admin/Tasks.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
@@ -28,8 +28,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Tasks\ScheduledTask;
 
 /**
  * This class concerns itself with scheduled tasks management.
@@ -43,13 +41,18 @@ class Tasks implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ManageScheduledTasks',
-			'getConfigVars' => false,
-		),
-	);
+			'list_getScheduledTasks' => 'list_getScheduledTasks',
+			'list_getTaskLogEntries' => 'list_getTaskLogEntries',
+			'list_getNumTaskLogEntries' => 'list_getNumTaskLogEntries',
+			'scheduledTasks' => 'ScheduledTasks',
+			'editTask' => 'EditTask',
+			'taskLog' => 'TaskLog',
+			'taskSettings' => 'TaskSettings',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -72,12 +75,12 @@ class Tasks implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'tasks' => 'tasks',
 		'taskedit' => 'edit',
 		'tasklog' => 'log',
 		'settings' => 'settings',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -100,10 +103,11 @@ class Tasks implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -117,167 +121,168 @@ public function tasks(): void
 		Utils::$context['page_title'] = Lang::$txt['maintain_tasks'];
 
 		// Saving changes?
-		if (isset($_REQUEST['save']) && isset($_POST['enable_task']))
-		{
+		if (isset($_REQUEST['save'], $_POST['enable_task'])) {
 			User::$me->checkSession();
 
 			// Enable and disable as required.
-			$enablers = array(0);
+			$enablers = [0];
 
-			foreach ($_POST['enable_task'] as $id => $enabled)
-			{
-				if ($enabled)
+			foreach ($_POST['enable_task'] as $id => $enabled) {
+				if ($enabled) {
 					$enablers[] = (int) $id;
+				}
 			}
 
 			// Do the update!
-			Db::$db->query('', '
-				UPDATE {db_prefix}scheduled_tasks
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}scheduled_tasks
 				SET disabled = CASE WHEN id_task IN ({array_int:id_task_enable}) THEN 0 ELSE 1 END',
-				array(
+				[
 					'id_task_enable' => $enablers,
-				)
+				],
 			);
 
 			// Update the "allow_expire_redirect" setting...
-			$request = Db::$db->query('', '
-				SELECT disabled
+			$request = Db::$db->query(
+				'',
+				'SELECT disabled
 				FROM {db_prefix}scheduled_tasks
 				WHERE task = {string:remove_redirect}',
-				array(
-					'remove_redirect' => 'remove_topic_redirect'
-				)
+				[
+					'remove_redirect' => 'remove_topic_redirect',
+				],
 			);
 			$row = Db::$db->fetch_assoc($request);
 			$task_disabled = !empty($row['disabled']) ? 0 : 1;
 			Db::$db->free_result($request);
 
-			Config::updateModSettings(array('allow_expire_redirect' => $task_disabled));
+			Config::updateModSettings(['allow_expire_redirect' => $task_disabled]);
 
 			// Pop along...
 			TaskRunner::calculateNextTrigger();
 		}
 
 		// Want to run any of the tasks?
-		if (isset($_REQUEST['run']) && isset($_POST['run_task']))
-		{
+		if (isset($_REQUEST['run'], $_POST['run_task'])) {
 			// Lets figure out which ones they want to run.
-			$tasks = array();
+			$tasks = [];
 
-			foreach ($_POST['run_task'] as $task => $dummy)
+			foreach ($_POST['run_task'] as $task => $dummy) {
 				$tasks[] = (int) $task;
+			}
 
 			// Run them.
 			(new TaskRunner())->runScheduledTasks($tasks);
 
 			// If we had any errors, push them to session so we can pick them up next time to tell the user.
-			if (!empty(Utils::$context['scheduled_errors']))
+			if (!empty(Utils::$context['scheduled_errors'])) {
 				$_SESSION['st_error'] = Utils::$context['scheduled_errors'];
+			}
 
 			Utils::redirectexit('action=admin;area=scheduledtasks;done');
 		}
 
-		if (isset($_SESSION['st_error']))
-		{
+		if (isset($_SESSION['st_error'])) {
 			Utils::$context['scheduled_errors'] = $_SESSION['st_error'];
-			unset ($_SESSION['st_error']);
+			unset($_SESSION['st_error']);
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'scheduled_tasks',
 			'title' => Lang::$txt['maintain_tasks'],
 			'base_href' => Config::$scripturl . '?action=admin;area=scheduledtasks',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getScheduledTasks',
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_tasks_name'],
 						'style' => 'width: 40%;',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '
 								<a href="' . Config::$scripturl . '?action=admin;area=scheduledtasks;sa=taskedit;tid=%1$d">%2$s</a><br><span class="smalltext">%3$s</span>',
-							'params' => array(
+							'params' => [
 								'id' => false,
 								'name' => false,
 								'desc' => false,
-							),
-						),
-					),
-				),
-				'next_due' => array(
-					'header' => array(
+							],
+						],
+					],
+				],
+				'next_due' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_tasks_next_time'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'next_time',
 						'class' => 'smalltext',
-					),
-				),
-				'regularity' => array(
-					'header' => array(
+					],
+				],
+				'regularity' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_tasks_regularity'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'regularity',
 						'class' => 'smalltext',
-					),
-				),
-				'run_now' => array(
-					'header' => array(
+					],
+				],
+				'run_now' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_tasks_run_now'],
 						'style' => 'width: 12%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' =>
 								'<input type="checkbox" name="run_task[%1$d]" id="run_task_%1$d">',
-							'params' => array(
+							'params' => [
 								'id' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-				'enabled' => array(
-					'header' => array(
+					],
+				],
+				'enabled' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_tasks_enabled'],
 						'style' => 'width: 6%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' =>
 								'<input type="hidden" name="enable_task[%1$d]" id="task_%1$d" value="0"><input type="checkbox" name="enable_task[%1$d]" id="task_check_%1$d" %2$s>',
-							'params' => array(
+							'params' => [
 								'id' => false,
 								'checked_state' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=admin;area=scheduledtasks',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '
 						<input type="submit" name="save" value="' . Lang::$txt['scheduled_tasks_save_changes'] . '" class="button">
 						<input type="submit" name="run" value="' . Lang::$txt['scheduled_tasks_run_now'] . '" class="button">',
-				),
-				array(
+				],
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['scheduled_tasks_time_offset'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		new ItemList($listOptions);
 
@@ -298,14 +303,14 @@ public function edit(): void
 		Utils::$context['server_time'] = Time::create('now', new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false);
 
 		// Cleaning...
-		if (!isset($_GET['tid']))
+		if (!isset($_GET['tid'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		$_GET['tid'] = (int) $_GET['tid'];
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-st');
 
@@ -318,35 +323,38 @@ public function edit(): void
 
 			// Walk back until we find a month that wasn't using DST.
 			// No sane environment will ever reach 1900, but just in case...
-			while ($when->format('I') && $when->format('Y') > 1900)
+			while ($when->format('I') && $when->format('Y') > 1900) {
 				$when->modify('-1 month');
+			}
 
 			$offset = $when->getTimestamp() % 86400;
 
 			// The other time bits are simple!
 			$interval = max((int) $_POST['regularity'], 1);
-			$unit = in_array(substr($_POST['unit'], 0, 1), array('m', 'h', 'd', 'w')) ? substr($_POST['unit'], 0, 1) : 'd';
+			$unit = in_array(substr($_POST['unit'], 0, 1), ['m', 'h', 'd', 'w']) ? substr($_POST['unit'], 0, 1) : 'd';
 
 			// Don't allow one minute intervals.
-			if ($interval == 1 && $unit == 'm')
+			if ($interval == 1 && $unit == 'm') {
 				$interval = 2;
+			}
 
 			// Is it disabled?
 			$disabled = !isset($_POST['enabled']) ? 1 : 0;
 
 			// Do the update!
-			Db::$db->query('', '
-				UPDATE {db_prefix}scheduled_tasks
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}scheduled_tasks
 				SET disabled = {int:disabled}, time_offset = {int:time_offset}, time_unit = {string:time_unit},
 					time_regularity = {int:time_regularity}
 				WHERE id_task = {int:id_task}',
-				array(
+				[
 					'disabled' => $disabled,
 					'time_offset' => $offset,
 					'time_regularity' => $interval,
 					'id_task' => $_GET['tid'],
 					'time_unit' => $unit,
-				)
+				],
 			);
 
 			// Check the next event.
@@ -357,25 +365,26 @@ public function edit(): void
 		}
 
 		// Load the task, understand? Que? Que?
-		$request = Db::$db->query('', '
-			SELECT id_task, next_time, time_offset, time_regularity, time_unit, disabled, task
+		$request = Db::$db->query(
+			'',
+			'SELECT id_task, next_time, time_offset, time_regularity, time_unit, disabled, task
 			FROM {db_prefix}scheduled_tasks
 			WHERE id_task = {int:id_task}',
-			array(
+			[
 				'id_task' => $_GET['tid'],
-			)
+			],
 		);
+
 		// Should never, ever, happen!
-		if (Db::$db->num_rows($request) == 0)
-		{
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Utils::$context['task'] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['task'] = [
 				'id' => $row['id_task'],
 				'function' => $row['task'],
-				'name' => isset(Lang::$txt['scheduled_task_' . $row['task']]) ? Lang::$txt['scheduled_task_' . $row['task']] : $row['task'],
+				'name' => Lang::$txt['scheduled_task_' . $row['task']] ?? $row['task'],
 				'desc' => isset(Lang::$txt['scheduled_task_desc_' . $row['task']]) ? sprintf(Lang::$txt['scheduled_task_desc_' . $row['task']], Config::$scripturl) : '',
 				'next_time' => $row['disabled'] ? Lang::$txt['scheduled_tasks_na'] : Time::create($row['next_time'] == 0 ? 'now' : '@' . $row['next_time'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(),
 				'disabled' => $row['disabled'],
@@ -383,7 +392,7 @@ public function edit(): void
 				'regularity' => $row['time_regularity'],
 				'offset_formatted' => date('H:i', $row['time_offset']),
 				'unit' => $row['time_unit'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -399,90 +408,89 @@ public function log(): void
 		Lang::load('ManageScheduledTasks');
 
 		// Empty the log?
-		if (!empty($_POST['removeAll']))
-		{
+		if (!empty($_POST['removeAll'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-tl');
 
-			Db::$db->query('truncate_table', '
-				TRUNCATE {db_prefix}log_scheduled_tasks',
-				array(
-				)
+			Db::$db->query(
+				'truncate_table',
+				'TRUNCATE {db_prefix}log_scheduled_tasks',
+				[
+				],
 			);
 		}
 
 		// Setup the list.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'task_log',
 			'items_per_page' => 30,
 			'title' => Lang::$txt['scheduled_log'],
 			'no_items_label' => Lang::$txt['scheduled_log_empty'],
 			'base_href' => Utils::$context['admin_area'] == 'scheduledtasks' ? Config::$scripturl . '?action=admin;area=scheduledtasks;sa=tasklog' : Config::$scripturl . '?action=admin;area=logs;sa=tasklog',
 			'default_sort_col' => 'date',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getTaskLogEntries',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumTaskLogEntries',
-			),
-			'columns' => array(
-				'name' => array(
-					'header' => array(
+			],
+			'columns' => [
+				'name' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_tasks_name'],
-					),
-					'data' => array(
-						'db' => 'name'
-					),
-				),
-				'date' => array(
-					'header' => array(
+					],
+					'data' => [
+						'db' => 'name',
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_log_time_run'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return Time::create('@' . $rowData['time_run'])->format();
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lst.id_log DESC',
 						'reverse' => 'lst.id_log',
-					),
-				),
-				'time_taken' => array(
-					'header' => array(
+					],
+				],
+				'time_taken' => [
+					'header' => [
 						'value' => Lang::$txt['scheduled_log_time_taken'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => Lang::$txt['scheduled_log_time_taken_seconds'],
-							'params' => array(
+							'params' => [
 								'time_taken' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'lst.time_taken',
 						'reverse' => 'lst.time_taken DESC',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Utils::$context['admin_area'] == 'scheduledtasks' ? Config::$scripturl . '?action=admin;area=scheduledtasks;sa=tasklog' : Config::$scripturl . '?action=admin;area=logs;sa=tasklog',
 				'token' => 'admin-tl',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '
 						<input type="submit" name="removeAll" value="' . Lang::$txt['scheduled_log_empty_log'] . '" data-confirm="' . Lang::$txt['scheduled_log_empty_log_confirm'] . '" class="button you_sure">',
-				),
-				array(
+				],
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['scheduled_tasks_time_offset'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		SecurityToken::create('admin-tl');
 
@@ -511,13 +519,12 @@ public function settings(): void
 		Utils::$context['settings_title'] = Lang::$txt['scheduled_tasks_settings'];
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			$save_vars = $config_vars;
 
-			IntegrationHook::call('integrate_save_scheduled_tasks_settings', array(&$save_vars));
+			IntegrationHook::call('integrate_save_scheduled_tasks_settings', [&$save_vars]);
 
 			ACP::saveDBSettings($save_vars);
 
@@ -540,8 +547,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -563,11 +571,11 @@ public static function getConfigVars(): array
 	{
 		Lang::load('Help+ManageScheduledTasks');
 
-		$config_vars = array(
-			array('check', 'cron_is_real_cron', 'subtext' => Lang::$txt['cron_is_real_cron_desc'], 'help' => 'cron_is_real_cron'),
-		);
+		$config_vars = [
+			['check', 'cron_is_real_cron', 'subtext' => Lang::$txt['cron_is_real_cron_desc'], 'help' => 'cron_is_real_cron'],
+		];
 
-		IntegrationHook::call('integrate_scheduled_tasks_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_scheduled_tasks_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -582,31 +590,32 @@ public static function getConfigVars(): array
 	 */
 	public static function list_getScheduledTasks($start, $items_per_page, $sort): array
 	{
-		$known_tasks = array();
+		$known_tasks = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_task, next_time, time_offset, time_regularity, time_unit, disabled, task
+		$request = Db::$db->query(
+			'',
+			'SELECT id_task, next_time, time_offset, time_regularity, time_unit, disabled, task
 			FROM {db_prefix}scheduled_tasks',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Find the next for regularity - don't offset as it's always server time!
 			$offset = sprintf(Lang::$txt['scheduled_task_reg_starting'], date('H:i', $row['time_offset']));
 
 			$repeating = sprintf(Lang::$txt['scheduled_task_reg_repeating'], $row['time_regularity'], Lang::$txt['scheduled_task_reg_unit_' . $row['time_unit']]);
 
-			$known_tasks[] = array(
+			$known_tasks[] = [
 				'id' => $row['id_task'],
 				'function' => $row['task'],
-				'name' => isset(Lang::$txt['scheduled_task_' . $row['task']]) ? Lang::$txt['scheduled_task_' . $row['task']] : $row['task'],
+				'name' => Lang::$txt['scheduled_task_' . $row['task']] ?? $row['task'],
 				'desc' => isset(Lang::$txt['scheduled_task_desc_' . $row['task']]) ? sprintf(Lang::$txt['scheduled_task_desc_' . $row['task']], Config::$scripturl) : '',
 				'next_time' => $row['disabled'] ? Lang::$txt['scheduled_tasks_na'] : Time::create($row['next_time'] == 0 ? 'now' : '@' . $row['next_time'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(),
 				'disabled' => $row['disabled'],
 				'checked_state' => $row['disabled'] ? '' : 'checked',
 				'regularity' => $offset . ', ' . $repeating,
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -623,28 +632,29 @@ public static function list_getScheduledTasks($start, $items_per_page, $sort): a
 	 */
 	public static function list_getTaskLogEntries($start, $items_per_page, $sort): array
 	{
-		$log_entries = array();
+		$log_entries = [];
 
-		$request = Db::$db->query('', '
-			SELECT lst.id_log, lst.id_task, lst.time_run, lst.time_taken, st.task
+		$request = Db::$db->query(
+			'',
+			'SELECT lst.id_log, lst.id_task, lst.time_run, lst.time_taken, st.task
 			FROM {db_prefix}log_scheduled_tasks AS lst
 				INNER JOIN {db_prefix}scheduled_tasks AS st ON (st.id_task = lst.id_task)
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items}',
-			array(
+			[
 				'sort' => $sort,
 				'start' => $start,
 				'items' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$log_entries[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$log_entries[] = [
 				'id' => $row['id_log'],
-				'name' => isset(Lang::$txt['scheduled_task_' . $row['task']]) ? Lang::$txt['scheduled_task_' . $row['task']] : $row['task'],
+				'name' => Lang::$txt['scheduled_task_' . $row['task']] ?? $row['task'],
 				'time_run' => $row['time_run'],
 				'time_taken' => $row['time_taken'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -658,13 +668,14 @@ public static function list_getTaskLogEntries($start, $items_per_page, $sort): a
 	 */
 	public static function list_getNumTaskLogEntries(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_scheduled_tasks',
-			array(
-			)
+			[
+			],
 		);
-		list ($num_entries) = Db::$db->fetch_row($request);
+		list($num_entries) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $num_entries;
@@ -708,15 +719,15 @@ public static function taskLog(): void
 	 */
 	public static function taskSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->subaction = 'settings';
 		self::$obj->execute();
 	}
 
-
 	/******************
 	 * Internal methods
 	 ******************/
@@ -732,36 +743,37 @@ protected function __construct()
 		Theme::loadTemplate('ManageScheduledTasks');
 
 		// Tab data might already be set if this was called from Logs::execute().
-		if (empty(Menu::$loaded['admin']->tab_data))
-		{
+		if (empty(Menu::$loaded['admin']->tab_data)) {
 			// Now for the lovely tabs. That we all love.
-			Menu::$loaded['admin']->tab_data = array(
+			Menu::$loaded['admin']->tab_data = [
 				'title' => Lang::$txt['scheduled_tasks_title'],
 				'help' => '',
 				'description' => Lang::$txt['maintain_info'],
-				'tabs' => array(
-					'tasks' => array(
+				'tabs' => [
+					'tasks' => [
 						'description' => Lang::$txt['maintain_tasks_desc'],
-					),
-					'tasklog' => array(
+					],
+					'tasklog' => [
 						'description' => Lang::$txt['scheduled_log_desc'],
-					),
-					'settings' => array(
+					],
+					'settings' => [
 						'description' => Lang::$txt['scheduled_tasks_settings_desc'],
-					),
-				),
-			);
+					],
+				],
+			];
 		}
 
-		IntegrationHook::call('integrate_manage_scheduled_tasks', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_scheduled_tasks', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Tasks::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Tasks::exportStatic')) {
 	Tasks::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Themes.php b/Sources/Actions/Admin/Themes.php
index 606b56b36b..088828fa6a 100644
--- a/Sources/Actions/Admin/Themes.php
+++ b/Sources/Actions/Admin/Themes.php
@@ -13,22 +13,21 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
+use SMF\PackageManager\{SubsPackage, XmlArray};
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\PackageManager\SubsPackage;
 
 /**
  * This class concerns itself almost completely with theme administration.
@@ -58,12 +57,19 @@ class Themes implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ThemesMain',
-		),
-	);
+			'themeAdmin' => 'ThemeAdmin',
+			'themeList' => 'ThemeList',
+			'setThemeOptions' => 'SetThemeOptions',
+			'removeTheme' => 'RemoveTheme',
+			'enableTheme' => 'EnableTheme',
+			'themeInstall' => 'ThemeInstall',
+			'editTheme' => 'EditTheme',
+			'copyTemplate' => 'CopyTemplate',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -86,7 +92,7 @@ class Themes implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'admin' => 'admin',
 		'list' => 'list',
 		'reset' => 'setOptions',
@@ -96,7 +102,7 @@ class Themes implements ActionInterface
 		'install' => 'install',
 		'edit' => 'edit',
 		'copy' => 'copy',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -122,17 +128,15 @@ public function execute(): void
 		// Whatever they decide to do, clean the minify cache.
 		Theme::deleteAllMinified();
 
-		if (isset(self::$subactions[$this->subaction]))
-		{
-			$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
-		}
-		else
-		{
+		if (isset(self::$subactions[$this->subaction])) {
+			$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
+		} else {
 			$call = Utils::getCallable($this->subaction);
 		}
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -148,34 +152,31 @@ public function execute(): void
 	public function admin()
 	{
 		// Are handling any settings?
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-tm');
 
-			if (isset($_POST['options']['known_themes']))
-			{
-				foreach ($_POST['options']['known_themes'] as $key => $id)
+			if (isset($_POST['options']['known_themes'])) {
+				foreach ($_POST['options']['known_themes'] as $key => $id) {
 					$_POST['options']['known_themes'][$key] = (int) $id;
-			}
-			else
-			{
+				}
+			} else {
 				ErrorHandler::fatalLang('themes_none_selectable', false);
 			}
 
-			if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes']))
+			if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes'])) {
 				ErrorHandler::fatalLang('themes_default_selectable', false);
+			}
 
 			// Commit the new settings.
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'theme_allow' => $_POST['options']['theme_allow'],
 				'theme_guests' => $_POST['options']['theme_guests'],
 				'knownThemes' => implode(',', $_POST['options']['known_themes']),
-			));
+			]);
 
-			if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes']))
-			{
-				User::updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+			if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes'])) {
+				User::updateMemberData(null, ['id_theme' => (int) $_POST['theme_reset']]);
 			}
 
 			Utils::redirectexit('action=admin;area=theme;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=admin');
@@ -193,8 +194,10 @@ public function admin()
 		// Look for a non existent theme directory. (ie theme87.)
 		$theme_dir = Config::$boarddir . '/Themes/theme';
 		$i = 1;
-		while (file_exists($theme_dir . $i))
+
+		while (file_exists($theme_dir . $i)) {
 			$i++;
+		}
 
 		Utils::$context['new_theme_name'] = 'theme' . $i;
 
@@ -211,46 +214,43 @@ public function admin()
 	 */
 	public function list()
 	{
-		if (isset($_REQUEST['th']))
-		{
+		if (isset($_REQUEST['th'])) {
 			$this->setSettings();
+
 			return;
 		}
 
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-tl');
 
 			$this->getInstalledThemes();
 
-			$setValues = array();
-			foreach (Utils::$context['themes'] as $id => $theme)
-			{
-				if (file_exists($_POST['reset_dir'] . '/' . basename($theme['theme_dir'])))
-				{
-					$setValues[] = array($id, 0, 'theme_dir', realpath($_POST['reset_dir'] . '/' . basename($theme['theme_dir'])));
-					$setValues[] = array($id, 0, 'theme_url', $_POST['reset_url'] . '/' . basename($theme['theme_dir']));
-					$setValues[] = array($id, 0, 'images_url', $_POST['reset_url'] . '/' . basename($theme['theme_dir']) . '/' . basename($theme['images_url']));
+			$setValues = [];
+
+			foreach (Utils::$context['themes'] as $id => $theme) {
+				if (file_exists($_POST['reset_dir'] . '/' . basename($theme['theme_dir']))) {
+					$setValues[] = [$id, 0, 'theme_dir', realpath($_POST['reset_dir'] . '/' . basename($theme['theme_dir']))];
+					$setValues[] = [$id, 0, 'theme_url', $_POST['reset_url'] . '/' . basename($theme['theme_dir'])];
+					$setValues[] = [$id, 0, 'images_url', $_POST['reset_url'] . '/' . basename($theme['theme_dir']) . '/' . basename($theme['images_url'])];
 				}
 
-				if (isset($theme['base_theme_dir']) && file_exists($_POST['reset_dir'] . '/' . basename($theme['base_theme_dir'])))
-				{
-					$setValues[] = array($id, 0, 'base_theme_dir', realpath($_POST['reset_dir'] . '/' . basename($theme['base_theme_dir'])));
-					$setValues[] = array($id, 0, 'base_theme_url', $_POST['reset_url'] . '/' . basename($theme['base_theme_dir']));
-					$setValues[] = array($id, 0, 'base_images_url', $_POST['reset_url'] . '/' . basename($theme['base_theme_dir']) . '/' . basename($theme['base_images_url']));
+				if (isset($theme['base_theme_dir']) && file_exists($_POST['reset_dir'] . '/' . basename($theme['base_theme_dir']))) {
+					$setValues[] = [$id, 0, 'base_theme_dir', realpath($_POST['reset_dir'] . '/' . basename($theme['base_theme_dir']))];
+					$setValues[] = [$id, 0, 'base_theme_url', $_POST['reset_url'] . '/' . basename($theme['base_theme_dir'])];
+					$setValues[] = [$id, 0, 'base_images_url', $_POST['reset_url'] . '/' . basename($theme['base_theme_dir']) . '/' . basename($theme['base_images_url'])];
 				}
 
 				CacheApi::put('theme_settings-' . $id, null, 90);
 			}
 
-			if (!empty($setValues))
-			{
-				Db::$db->insert('replace',
+			if (!empty($setValues)) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}themes',
-					array('id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
+					['id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
 					$setValues,
-					array('id_theme', 'variable', 'id_member')
+					['id_theme', 'variable', 'id_member'],
 				);
 			}
 
@@ -278,90 +278,90 @@ public function setOptions()
 	{
 		$_GET['th'] = (int) ($_GET['th'] ?? $_GET['id'] ?? 0);
 
-		if (empty($_GET['th']))
-		{
-			Utils::$context['themes'] = array();
+		if (empty($_GET['th'])) {
+			Utils::$context['themes'] = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_theme, variable, value
+			$request = Db::$db->query(
+				'',
+				'SELECT id_theme, variable, value
 				FROM {db_prefix}themes
 				WHERE variable IN ({string:name}, {string:theme_dir})
 					AND id_member = {int:no_member}',
-				array(
+				[
 					'no_member' => 0,
 					'name' => 'name',
 					'theme_dir' => 'theme_dir',
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!isset(Utils::$context['themes'][$row['id_theme']]))
-				{
-					Utils::$context['themes'][$row['id_theme']] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!isset(Utils::$context['themes'][$row['id_theme']])) {
+					Utils::$context['themes'][$row['id_theme']] = [
 						'id' => $row['id_theme'],
 						'num_default_options' => 0,
 						'num_members' => 0,
-					);
+					];
 				}
 
 				Utils::$context['themes'][$row['id_theme']][$row['variable']] = $row['value'];
 			}
 			Db::$db->free_result($request);
 
-			$request = Db::$db->query('', '
-				SELECT id_theme, COUNT(*) AS value
+			$request = Db::$db->query(
+				'',
+				'SELECT id_theme, COUNT(*) AS value
 				FROM {db_prefix}themes
 				WHERE id_member = {int:guest_member}
 				GROUP BY id_theme',
-				array(
+				[
 					'guest_member' => -1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
 			}
 			Db::$db->free_result($request);
 
 			// Need to make sure we don't do custom fields.
-			$customFields = array();
+			$customFields = [];
 
-			$request = Db::$db->query('', '
-				SELECT col_name
+			$request = Db::$db->query(
+				'',
+				'SELECT col_name
 				FROM {db_prefix}custom_fields',
-				array(
-				)
+				[
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$customFields[] = $row['col_name'];
 			}
 			Db::$db->free_result($request);
 
 			$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
 
-			$request = Db::$db->query('themes_count', '
-				SELECT COUNT(DISTINCT id_member) AS value, id_theme
+			$request = Db::$db->query(
+				'themes_count',
+				'SELECT COUNT(DISTINCT id_member) AS value, id_theme
 				FROM {db_prefix}themes
 				WHERE id_member > {int:no_member}
 					' . $customFieldsQuery . '
 				GROUP BY id_theme',
-				array(
+				[
 					'no_member' => 0,
-					'custom_fields' => empty($customFields) ? array() : $customFields,
-				)
+					'custom_fields' => empty($customFields) ? [] : $customFields,
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
 			}
 			Db::$db->free_result($request);
 
 			// There has to be a Settings template!
-			foreach (Utils::$context['themes'] as $k => $v)
-			{
-				if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
-				{
+			foreach (Utils::$context['themes'] as $k => $v) {
+				if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members']))) {
 					unset(Utils::$context['themes'][$k]);
 				}
 			}
@@ -370,62 +370,62 @@ public function setOptions()
 			Utils::$context['sub_template'] = 'reset_list';
 
 			SecurityToken::create('admin-stor', 'request');
+
 			return;
 		}
 
 		// Submit?
-		if (isset($_POST['submit']) && empty($_POST['who']))
-		{
+		if (isset($_POST['submit']) && empty($_POST['who'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-sto');
 
-			if (empty($_POST['options']))
-				$_POST['options'] = array();
+			if (empty($_POST['options'])) {
+				$_POST['options'] = [];
+			}
 
-			if (empty($_POST['default_options']))
-				$_POST['default_options'] = array();
+			if (empty($_POST['default_options'])) {
+				$_POST['default_options'] = [];
+			}
 
 			// Set up the sql query.
-			$setValues = array();
+			$setValues = [];
 
-			foreach ($_POST['options'] as $opt => $val)
-			{
-				$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+			foreach ($_POST['options'] as $opt => $val) {
+				$setValues[] = [-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val];
 			}
 
-			$old_settings = array();
+			$old_settings = [];
 
-			foreach ($_POST['default_options'] as $opt => $val)
-			{
+			foreach ($_POST['default_options'] as $opt => $val) {
 				$old_settings[] = $opt;
 
-				$setValues[] = array(-1, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+				$setValues[] = [-1, 1, $opt, is_array($val) ? implode(',', $val) : $val];
 			}
 
 			// If we're actually inserting something..
-			if (!empty($setValues))
-			{
+			if (!empty($setValues)) {
 				// Are there options in non-default themes set that should be cleared?
-				if (!empty($old_settings))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}themes
+				if (!empty($old_settings)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}themes
 						WHERE id_theme != {int:default_theme}
 							AND id_member = {int:guest_member}
 							AND variable IN ({array_string:old_settings})',
-						array(
+						[
 							'default_theme' => 1,
 							'guest_member' => -1,
 							'old_settings' => $old_settings,
-						)
+						],
 					);
 				}
 
-				Db::$db->insert('replace',
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}themes',
-					array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
+					['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
 					$setValues,
-					array('id_theme', 'variable', 'id_member')
+					['id_theme', 'variable', 'id_member'],
 				);
 			}
 
@@ -433,150 +433,146 @@ public function setOptions()
 			CacheApi::put('theme_settings-1', null, 90);
 
 			Utils::redirectexit('action=admin;area=theme;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=reset');
-		}
-		elseif (isset($_POST['submit']) && $_POST['who'] == 1)
-		{
+		} elseif (isset($_POST['submit']) && $_POST['who'] == 1) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-sto');
 
-			$_POST['options'] = empty($_POST['options']) ? array() : $_POST['options'];
-			$_POST['options_master'] = empty($_POST['options_master']) ? array() : $_POST['options_master'];
-			$_POST['default_options'] = empty($_POST['default_options']) ? array() : $_POST['default_options'];
-			$_POST['default_options_master'] = empty($_POST['default_options_master']) ? array() : $_POST['default_options_master'];
+			$_POST['options'] = empty($_POST['options']) ? [] : $_POST['options'];
+			$_POST['options_master'] = empty($_POST['options_master']) ? [] : $_POST['options_master'];
+			$_POST['default_options'] = empty($_POST['default_options']) ? [] : $_POST['default_options'];
+			$_POST['default_options_master'] = empty($_POST['default_options_master']) ? [] : $_POST['default_options_master'];
 
-			$old_settings = array();
+			$old_settings = [];
 
-			foreach ($_POST['default_options'] as $opt => $val)
-			{
-				if ($_POST['default_options_master'][$opt] == 0)
+			foreach ($_POST['default_options'] as $opt => $val) {
+				if ($_POST['default_options_master'][$opt] == 0) {
 					continue;
+				}
 
-				if ($_POST['default_options_master'][$opt] == 1)
-				{
+				if ($_POST['default_options_master'][$opt] == 1) {
 					// Delete then insert for ease of database compatibility!
-					Db::$db->query('substring', '
-						DELETE FROM {db_prefix}themes
+					Db::$db->query(
+						'substring',
+						'DELETE FROM {db_prefix}themes
 						WHERE id_theme = {int:default_theme}
 							AND id_member > {int:no_member}
 							AND variable = SUBSTRING({string:option}, 1, 255)',
-						array(
+						[
 							'default_theme' => 1,
 							'no_member' => 0,
 							'option' => $opt,
-						)
+						],
 					);
 
-					Db::$db->query('substring', '
-						INSERT INTO {db_prefix}themes
+					Db::$db->query(
+						'substring',
+						'INSERT INTO {db_prefix}themes
 							(id_member, id_theme, variable, value)
 						SELECT id_member, 1, SUBSTRING({string:option}, 1, 255), SUBSTRING({string:value}, 1, 65534)
 						FROM {db_prefix}members',
-						array(
+						[
 							'option' => $opt,
 							'value' => (is_array($val) ? implode(',', $val) : $val),
-						)
+						],
 					);
 
 					$old_settings[] = $opt;
-				}
-				elseif ($_POST['default_options_master'][$opt] == 2)
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}themes
+				} elseif ($_POST['default_options_master'][$opt] == 2) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}themes
 						WHERE variable = {string:option_name}
 							AND id_member > {int:no_member}',
-						array(
+						[
 							'no_member' => 0,
 							'option_name' => $opt,
-						)
+						],
 					);
 				}
 			}
 
 			// Delete options from other themes.
-			if (!empty($old_settings))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}themes
+			if (!empty($old_settings)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}themes
 					WHERE id_theme != {int:default_theme}
 						AND id_member > {int:no_member}
 						AND variable IN ({array_string:old_settings})',
-					array(
+					[
 						'default_theme' => 1,
 						'no_member' => 0,
 						'old_settings' => $old_settings,
-					)
+					],
 				);
 			}
 
-			foreach ($_POST['options'] as $opt => $val)
-			{
-				if ($_POST['options_master'][$opt] == 0)
+			foreach ($_POST['options'] as $opt => $val) {
+				if ($_POST['options_master'][$opt] == 0) {
 					continue;
+				}
 
-				if ($_POST['options_master'][$opt] == 1)
-				{
+				if ($_POST['options_master'][$opt] == 1) {
 					// Delete then insert for ease of database compatibility - again!
-					Db::$db->query('substring', '
-						DELETE FROM {db_prefix}themes
+					Db::$db->query(
+						'substring',
+						'DELETE FROM {db_prefix}themes
 						WHERE id_theme = {int:current_theme}
 							AND id_member > {int:no_member}
 							AND variable = SUBSTRING({string:option}, 1, 255)',
-						array(
+						[
 							'current_theme' => $_GET['th'],
 							'no_member' => 0,
 							'option' => $opt,
-						)
+						],
 					);
 
-					Db::$db->query('substring', '
-						INSERT INTO {db_prefix}themes
+					Db::$db->query(
+						'substring',
+						'INSERT INTO {db_prefix}themes
 							(id_member, id_theme, variable, value)
 						SELECT id_member, {int:current_theme}, SUBSTRING({string:option}, 1, 255), SUBSTRING({string:value}, 1, 65534)
 						FROM {db_prefix}members',
-						array(
+						[
 							'current_theme' => $_GET['th'],
 							'option' => $opt,
 							'value' => (is_array($val) ? implode(',', $val) : $val),
-						)
+						],
 					);
-				}
-				elseif ($_POST['options_master'][$opt] == 2)
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}themes
+				} elseif ($_POST['options_master'][$opt] == 2) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}themes
 						WHERE variable = {string:option}
 							AND id_member > {int:no_member}
 							AND id_theme = {int:current_theme}',
-						array(
+						[
 							'no_member' => 0,
 							'current_theme' => $_GET['th'],
 							'option' => $opt,
-						)
+						],
 					);
 				}
 			}
 
 			Utils::redirectexit('action=admin;area=theme;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=reset');
-		}
-		elseif (!empty($_GET['who']) && $_GET['who'] == 2)
-		{
+		} elseif (!empty($_GET['who']) && $_GET['who'] == 2) {
 			User::$me->checkSession('get');
 			SecurityToken::validate('admin-stor', 'request');
 
 			// Don't delete custom fields!!
-			if ($_GET['th'] == 1)
-			{
-				$customFields = array();
+			if ($_GET['th'] == 1) {
+				$customFields = [];
 
-				$request = Db::$db->query('', '
-					SELECT col_name
+				$request = Db::$db->query(
+					'',
+					'SELECT col_name
 					FROM {db_prefix}custom_fields',
-					array(
-					)
+					[
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$customFields[] = $row['col_name'];
 				}
 				Db::$db->free_result($request);
@@ -584,16 +580,17 @@ public function setOptions()
 
 			$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}themes
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}themes
 				WHERE id_member > {int:no_member}
 					AND id_theme = {int:current_theme}
 					' . $customFieldsQuery,
-				array(
+				[
 					'no_member' => 0,
 					'current_theme' => $_GET['th'],
-					'custom_fields' => empty($customFields) ? array() : $customFields,
-				)
+					'custom_fields' => empty($customFields) ? [] : $customFields,
+				],
 			);
 
 			Utils::redirectexit('action=admin;area=theme;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=reset');
@@ -622,62 +619,56 @@ public function setOptions()
 		Utils::$context['options'] = Utils::$context['theme_options'];
 		Utils::$context['theme_settings'] = Theme::$current->settings;
 
-		if (empty($_REQUEST['who']))
-		{
-			Utils::$context['theme_options'] = array();
+		if (empty($_REQUEST['who'])) {
+			Utils::$context['theme_options'] = [];
 
-			$request = Db::$db->query('', '
-				SELECT variable, value
+			$request = Db::$db->query(
+				'',
+				'SELECT variable, value
 				FROM {db_prefix}themes
 				WHERE id_theme IN (1, {int:current_theme})
 					AND id_member = {int:guest_member}',
-				array(
+				[
 					'current_theme' => $_GET['th'],
 					'guest_member' => -1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['theme_options'][$row['variable']] = $row['value'];
 			}
 			Db::$db->free_result($request);
 
 			Utils::$context['theme_options_reset'] = false;
-		}
-		else
-		{
-			Utils::$context['theme_options'] = array();
+		} else {
+			Utils::$context['theme_options'] = [];
 			Utils::$context['theme_options_reset'] = true;
 		}
 
-		foreach (Utils::$context['options'] as $i => $setting)
-		{
+		foreach (Utils::$context['options'] as $i => $setting) {
 			// Just skip separators
-			if (!is_array($setting))
+			if (!is_array($setting)) {
 				continue;
+			}
 
 			// Is this disabled?
-			if (isset($setting['enabled']) && $setting['enabled'] === false)
-			{
+			if (isset($setting['enabled']) && $setting['enabled'] === false) {
 				unset(Utils::$context['options'][$i]);
+
 				continue;
 			}
 
-			if (!isset($setting['type']) || $setting['type'] == 'bool')
-			{
+			if (!isset($setting['type']) || $setting['type'] == 'bool') {
 				Utils::$context['options'][$i]['type'] = 'checkbox';
-			}
-			elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			{
+			} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
 				Utils::$context['options'][$i]['type'] = 'number';
-			}
-			elseif ($setting['type'] == 'string')
-			{
+			} elseif ($setting['type'] == 'string') {
 				Utils::$context['options'][$i]['type'] = 'text';
 			}
 
-			if (isset($setting['options']))
+			if (isset($setting['options'])) {
 				Utils::$context['options'][$i]['type'] = 'list';
+			}
 
 			Utils::$context['options'][$i]['value'] = !isset(Utils::$context['theme_options'][$setting['id']]) ? '' : Utils::$context['theme_options'][$setting['id']];
 		}
@@ -700,9 +691,9 @@ public function setOptions()
 	 */
 	public function setSettings()
 	{
-		if (empty($_GET['th']) && empty($_GET['id']))
-		{
+		if (empty($_GET['th']) && empty($_GET['id'])) {
 			$this->admin();
+
 			return;
 		}
 
@@ -712,19 +703,21 @@ public function setSettings()
 		Menu::$loaded['admin']['current_subsection'] = 'list';
 
 		// Validate inputs/user.
-		if (empty($_GET['th']))
+		if (empty($_GET['th'])) {
 			ErrorHandler::fatalLang('no_theme', false);
+		}
 
 		// Fetch the smiley sets...
 		$sets = explode(',', 'none,' . Config::$modSettings['smiley_sets_known']);
 		$set_names = explode("\n", Lang::$txt['smileys_none'] . "\n" . Config::$modSettings['smiley_sets_names']);
 
-		Utils::$context['smiley_sets'] = array(
-			'' => Lang::$txt['smileys_no_default']
-		);
+		Utils::$context['smiley_sets'] = [
+			'' => Lang::$txt['smileys_no_default'],
+		];
 
-		foreach ($sets as $i => $set)
+		foreach ($sets as $i => $set) {
 			Utils::$context['smiley_sets'][$set] = Utils::htmlspecialchars($set_names[$i]);
+		}
 
 		$old_id = Theme::$current->id;
 
@@ -744,15 +737,13 @@ public function setSettings()
 		Theme::loadSubTemplate('settings');
 
 		// Load the variants separately...
-		Theme::$current->settings['theme_variants'] = array();
+		Theme::$current->settings['theme_variants'] = [];
 
-		if (file_exists(Theme::$current->settings['theme_dir'] . '/index.template.php'))
-		{
+		if (file_exists(Theme::$current->settings['theme_dir'] . '/index.template.php')) {
 			$file_contents = implode('', file(Theme::$current->settings['theme_dir'] . '/index.template.php'));
 
-			if (preg_match('~((?:SMF\\\\)?Theme::\$current(?:->|_)|\$)settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches))
-			{
-				eval('use SMF\Theme; global $settings; ' . $matches[0]);
+			if (preg_match('~((?:SMF\\\\)?Theme::\$current(?:->|_)|\$)settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
+				eval('use SMF\\Theme; global $settings; ' . $matches[0]);
 			}
 		}
 
@@ -760,63 +751,60 @@ public function setSettings()
 		IntegrationHook::call('integrate_theme_settings');
 
 		// Submitting!
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('admin-sts');
 
-			if (empty($_POST['options']))
-				$_POST['options'] = array();
+			if (empty($_POST['options'])) {
+				$_POST['options'] = [];
+			}
 
-			if (empty($_POST['default_options']))
-				$_POST['default_options'] = array();
+			if (empty($_POST['default_options'])) {
+				$_POST['default_options'] = [];
+			}
 
 			// Make sure items are cast correctly.
-			foreach (Utils::$context['theme_settings'] as $item)
-			{
+			foreach (Utils::$context['theme_settings'] as $item) {
 				// Disregard this item if this is just a separator.
-				if (!is_array($item))
+				if (!is_array($item)) {
 					continue;
+				}
 
-				foreach (array('options', 'default_options') as $option)
-				{
-					if (!isset($_POST[$option][$item['id']]))
+				foreach (['options', 'default_options'] as $option) {
+					if (!isset($_POST[$option][$item['id']])) {
 						continue;
+					}
 
 					// Checkbox.
-					if (empty($item['type']))
-					{
+					if (empty($item['type'])) {
 						$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
 					}
 					// Number
-					elseif ($item['type'] == 'number')
-					{
+					elseif ($item['type'] == 'number') {
 						$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
 					}
 				}
 			}
 
 			// Set up the sql query.
-			$inserts = array();
+			$inserts = [];
 
-			foreach ($_POST['options'] as $opt => $val)
-			{
-				$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+			foreach ($_POST['options'] as $opt => $val) {
+				$inserts[] = [0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val];
 			}
 
-			foreach ($_POST['default_options'] as $opt => $val)
-			{
-				$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+			foreach ($_POST['default_options'] as $opt => $val) {
+				$inserts[] = [0, 1, $opt, is_array($val) ? implode(',', $val) : $val];
 			}
 
 			// If we're actually inserting something..
-			if (!empty($inserts))
-			{
-				Db::$db->insert('replace',
+			if (!empty($inserts)) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}themes',
-					array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
+					['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
 					$inserts,
-					array('id_member', 'id_theme', 'variable')
+					['id_member', 'id_theme', 'variable'],
 				);
 			}
 
@@ -824,7 +812,7 @@ public function setSettings()
 			CacheApi::put('theme_settings-1', null, 90);
 
 			// Invalidate the cache.
-			Config::updateModSettings(array('settings_updated' => time()));
+			Config::updateModSettings(['settings_updated' => time()]);
 
 			Utils::redirectexit('action=admin;area=theme;sa=list;th=' . $_GET['th'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 		}
@@ -832,10 +820,8 @@ public function setSettings()
 		Utils::$context['sub_template'] = 'set_settings';
 		Utils::$context['page_title'] = Lang::$txt['theme_settings'];
 
-		foreach (Theme::$current->settings as $setting => $dummy)
-		{
-			if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs')))
-			{
+		foreach (Theme::$current->settings as $setting => $dummy) {
+			if (!in_array($setting, ['theme_url', 'theme_dir', 'images_url', 'template_dirs'])) {
 				Theme::$current->settings[$setting] = Utils::htmlspecialcharsRecursive(Theme::$current->settings[$setting]);
 			}
 		}
@@ -843,43 +829,37 @@ public function setSettings()
 		Utils::$context['settings'] = Utils::$context['theme_settings'];
 		Utils::$context['theme_settings'] = Theme::$current->settings;
 
-		foreach (Utils::$context['settings'] as $i => $setting)
-		{
+		foreach (Utils::$context['settings'] as $i => $setting) {
 			// Separators are dummies, so leave them alone.
-			if (!is_array($setting))
+			if (!is_array($setting)) {
 				continue;
+			}
 
-			if (!isset($setting['type']) || $setting['type'] == 'bool')
-			{
+			if (!isset($setting['type']) || $setting['type'] == 'bool') {
 				Utils::$context['settings'][$i]['type'] = 'checkbox';
-			}
-			elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			{
+			} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
 				Utils::$context['settings'][$i]['type'] = 'number';
-			}
-			elseif ($setting['type'] == 'string')
-			{
+			} elseif ($setting['type'] == 'string') {
 				Utils::$context['settings'][$i]['type'] = 'text';
 			}
 
-			if (isset($setting['options']))
+			if (isset($setting['options'])) {
 				Utils::$context['settings'][$i]['type'] = 'list';
+			}
 
 			Utils::$context['settings'][$i]['value'] = !isset(Theme::$current->settings[$setting['id']]) ? '' : Theme::$current->settings[$setting['id']];
 		}
 
 		// Do we support variants?
-		if (!empty(Theme::$current->settings['theme_variants']))
-		{
-			Utils::$context['theme_variants'] = array();
+		if (!empty(Theme::$current->settings['theme_variants'])) {
+			Utils::$context['theme_variants'] = [];
 
-			foreach (Theme::$current->settings['theme_variants'] as $variant)
-			{
+			foreach (Theme::$current->settings['theme_variants'] as $variant) {
 				// Have any text, old chap?
-				Utils::$context['theme_variants'][$variant] = array(
-					'label' => isset(Lang::$txt['variant_' . $variant]) ? Lang::$txt['variant_' . $variant] : $variant,
+				Utils::$context['theme_variants'][$variant] = [
+					'label' => Lang::$txt['variant_' . $variant] ?? $variant,
 					'thumbnail' => !file_exists(Theme::$current->settings['theme_dir'] . '/images/thumbnail.png') || file_exists(Theme::$current->settings['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? Theme::$current->settings['images_url'] . '/thumbnail_' . $variant . '.png' : (Theme::$current->settings['images_url'] . '/thumbnail.png'),
-				);
+				];
 			}
 
 			Utils::$context['default_variant'] = !empty(Theme::$current->settings['default_variant']) && isset(Utils::$context['theme_variants'][Theme::$current->settings['default_variant']]) ? Theme::$current->settings['default_variant'] : Theme::$current->settings['theme_variants'][0];
@@ -913,17 +893,19 @@ public function remove()
 		$themeID = (int) ($_GET['th'] ?? $_GET['id'] ?? 1);
 
 		// You can't delete the default theme!
-		if ($themeID == 1)
+		if ($themeID == 1) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
-		$theme_info = $this->getSingleTheme($themeID, array('theme_dir'));
+		$theme_info = $this->getSingleTheme($themeID, ['theme_dir']);
 
 		// Remove it from the DB.
 		$this->removeFromDb($themeID);
 
 		// And remove all its files and folders too.
-		if (!empty($theme_info) && !empty($theme_info['theme_dir']))
+		if (!empty($theme_info) && !empty($theme_info['theme_dir'])) {
 			$this->deltree($theme_info['theme_dir']);
+		}
 
 		// Go back to the list page.
 		Utils::redirectexit('action=admin;area=theme;sa=list;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';done=removing');
@@ -945,19 +927,17 @@ public function enable()
 		$enableThemes = explode(',', Config::$modSettings['enableThemes']);
 
 		// Are we disabling it?
-		if (isset($_GET['disabled']))
-		{
-			$enableThemes = array_diff($enableThemes, array($themeID));
+		if (isset($_GET['disabled'])) {
+			$enableThemes = array_diff($enableThemes, [$themeID]);
 		}
 		// Nope? then enable it!
-		else
-		{
+		else {
 			$enableThemes[] = (string) $themeID;
 		}
 
 		// Update the setting.
-		$enableThemes = strtr(implode(',', $enableThemes), array(',,' => ','));
-		Config::updateModSettings(array('enableThemes' => $enableThemes));
+		$enableThemes = strtr(implode(',', $enableThemes), [',,' => ',']);
+		Config::updateModSettings(['enableThemes' => $enableThemes]);
 
 		// Done!
 		Utils::redirectexit('action=admin;area=theme;sa=list;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';done=' . (isset($_GET['disabled']) ? 'disabling' : 'enabling'));
@@ -980,41 +960,40 @@ public function install()
 
 		Theme::loadTemplate('Themes');
 
-		$do_actions = array(
+		$do_actions = [
 			'file' => 'installFile',
 			'copy' => 'installCopy',
 			'dir' => 'installDir',
-		);
+		];
 
 		// Is there a function to call?
-		if (isset($_GET['do']) && !empty($_GET['do']) && isset($do_actions[$_GET['do']]))
-		{
+		if (isset($_GET['do']) && !empty($_GET['do']) && isset($do_actions[$_GET['do']])) {
 			$do_action = Utils::htmlspecialchars(trim($_GET['do']));
 
 			// Got any info from the specific form?
-			if (!isset($_POST['save_' . $do_action]))
+			if (!isset($_POST['save_' . $do_action])) {
 				ErrorHandler::fatalLang('theme_install_no_action', false);
+			}
 
 			SecurityToken::validate('admin-t-' . $do_action);
 
 			// Hopefully the themes directory is writable, or we might have a problem.
-			if (!is_writable(Utils::$context['themedir']))
+			if (!is_writable(Utils::$context['themedir'])) {
 				ErrorHandler::fatalLang('theme_install_write_error', 'critical');
+			}
 
 			// Call the function and handle the result.
-			$result = call_user_func(array($this, $do_actions[$do_action]));
+			$result = call_user_func([$this, $do_actions[$do_action]]);
 
 			// Everything went better than expected!
-			if (!empty($result))
-			{
+			if (!empty($result)) {
 				Utils::$context['sub_template'] = 'installed';
 				Utils::$context['page_title'] = Lang::$txt['theme_installed'];
 				Utils::$context['installed_theme'] = $result;
 			}
 		}
 		// Nope, show a nice error.
-		else
-		{
+		else {
 			ErrorHandler::fatalLang('theme_install_no_action', false);
 		}
 	}
@@ -1027,26 +1006,22 @@ public function install()
 	public function edit()
 	{
 		// @todo Should this be removed?
-		if (isset($_REQUEST['preview']))
+		if (isset($_REQUEST['preview'])) {
 			die('die() with fire');
+		}
 
 		Theme::loadTemplate('Themes');
 
 		$_GET['th'] = (int) ($_GET['th'] ?? $_GET['id'] ?? 0);
 
-		if (empty($_GET['th']))
-		{
+		if (empty($_GET['th'])) {
 			$this->getInstalledThemes();
 
-			foreach (Utils::$context['themes'] as $key => $theme)
-			{
+			foreach (Utils::$context['themes'] as $key => $theme) {
 				// There has to be a Settings template!
-				if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css'))
-				{
+				if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css')) {
 					unset(Utils::$context['themes'][$key]);
-				}
-				else
-				{
+				} else {
 					Utils::$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
 				}
 			}
@@ -1064,39 +1039,31 @@ public function edit()
 		Utils::$context['theme_id'] = $currentTheme['id'];
 		Utils::$context['browse_title'] = sprintf(Lang::$txt['themeadmin_browsing_theme'], $currentTheme['name']);
 
-		if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css'))
-		{
+		if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css')) {
 			ErrorHandler::fatalLang('theme_edit_missing', false);
 		}
 
-		if (!isset($_REQUEST['filename']))
-		{
-			if (isset($_GET['directory']))
-			{
-				if (substr($_GET['directory'], 0, 1) == '.')
-				{
+		if (!isset($_REQUEST['filename'])) {
+			if (isset($_GET['directory'])) {
+				if (substr($_GET['directory'], 0, 1) == '.') {
 					$_GET['directory'] = '';
-				}
-				else
-				{
-					$_GET['directory'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_GET['directory']);
+				} else {
+					$_GET['directory'] = preg_replace(['~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'], ['', '/', '/'], $_GET['directory']);
 
 					$temp = realpath($currentTheme['theme_dir'] . '/' . $_GET['directory']);
 
-					if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-					{
+					if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
 						$_GET['directory'] = '';
 					}
 				}
 			}
 
-			if (isset($_GET['directory']) && $_GET['directory'] != '')
-			{
+			if (isset($_GET['directory']) && $_GET['directory'] != '') {
 				Utils::$context['theme_files'] = $this->getFileList($currentTheme['theme_dir'] . '/' . $_GET['directory'], $_GET['directory'] . '/');
 
 				$temp = dirname($_GET['directory']);
 
-				array_unshift(Utils::$context['theme_files'], array(
+				array_unshift(Utils::$context['theme_files'], [
 					'filename' => $temp == '.' || $temp == '' ? '/ (..)' : $temp . ' (..)',
 					'is_writable' => is_writable($currentTheme['theme_dir'] . '/' . $temp),
 					'is_directory' => true,
@@ -1105,74 +1072,61 @@ public function edit()
 					'is_editable' => false,
 					'href' => Config::$scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=edit;directory=' . $temp,
 					'size' => '',
-				));
-			}
-			else
-			{
+				]);
+			} else {
 				Utils::$context['theme_files'] = $this->getFileList($currentTheme['theme_dir'], '');
 			}
 
 			// Do not list minified_ files
-			foreach (Utils::$context['theme_files'] as $key => $file)
-			{
-				if (strpos($file['filename'], 'minified_') !== false)
+			foreach (Utils::$context['theme_files'] as $key => $file) {
+				if (strpos($file['filename'], 'minified_') !== false) {
 					unset(Utils::$context['theme_files'][$key]);
+				}
 			}
 
 			Utils::$context['sub_template'] = 'edit_browse';
 
 			return;
 		}
-		else
-		{
-			if (substr($_REQUEST['filename'], 0, 1) == '.')
-			{
-				$_REQUEST['filename'] = '';
-			}
-			else
-			{
-				$_REQUEST['filename'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_REQUEST['filename']);
 
-				$temp = realpath($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
+		if (substr($_REQUEST['filename'], 0, 1) == '.') {
+			$_REQUEST['filename'] = '';
+		} else {
+			$_REQUEST['filename'] = preg_replace(['~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'], ['', '/', '/'], $_REQUEST['filename']);
 
-				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-				{
-					$_REQUEST['filename'] = '';
-				}
+			$temp = realpath($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
+
+			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+				$_REQUEST['filename'] = '';
 			}
+		}
 
-			if (empty($_REQUEST['filename']))
-				ErrorHandler::fatalLang('theme_edit_missing', false);
+		if (empty($_REQUEST['filename'])) {
+			ErrorHandler::fatalLang('theme_edit_missing', false);
 		}
 
-		if (isset($_POST['save']))
-		{
-			if (User::$me->checkSession('post', '', false) == '' && SecurityToken::validate('admin-te-' . md5($_GET['th'] . '-' . $_REQUEST['filename']), 'post', false) == true)
-			{
-				if (is_array($_POST['entire_file']))
+		if (isset($_POST['save'])) {
+			if (User::$me->checkSession('post', '', false) == '' && SecurityToken::validate('admin-te-' . md5($_GET['th'] . '-' . $_REQUEST['filename']), 'post', false) == true) {
+				if (is_array($_POST['entire_file'])) {
 					$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+				}
 
-				$_POST['entire_file'] = rtrim(strtr($_POST['entire_file'], array("\r" => '', '   ' => "\t")));
+				$_POST['entire_file'] = rtrim(strtr($_POST['entire_file'], ["\r" => '', '   ' => "\t"]));
 
 				// Check for a parse error!
-				if (substr($_REQUEST['filename'], -13) == '.template.php' && is_writable($currentTheme['theme_dir']) && ini_get('display_errors'))
-				{
+				if (substr($_REQUEST['filename'], -13) == '.template.php' && is_writable($currentTheme['theme_dir']) && ini_get('display_errors')) {
 					Config::safeFileWrite($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php', $_POST['entire_file']);
 
 					$error = @file_get_contents($currentTheme['theme_url'] . '/tmp_' . session_id() . '.php');
 
-					if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0)
-					{
+					if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0) {
 						$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
-					}
-					else
-					{
+					} else {
 						unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
 					}
 				}
 
-				if (!isset($error_file))
-				{
+				if (!isset($error_file)) {
 					Config::safeFileWrite($currentTheme['theme_dir'] . '/' . $_REQUEST['filename'], $_POST['entire_file']);
 
 					// Nuke any minified files and update Config::$modSettings['browser_cache']
@@ -1182,20 +1136,16 @@ public function edit()
 				}
 			}
 			// Session timed out.
-			else
-			{
+			else {
 				Lang::load('Errors');
 
 				Utils::$context['session_error'] = true;
 				Utils::$context['sub_template'] = 'edit_file';
 
 				// Recycle the submitted data.
-				if (is_array($_POST['entire_file']))
-				{
+				if (is_array($_POST['entire_file'])) {
 					Utils::$context['entire_file'] = Utils::htmlspecialchars(implode("\n", $_POST['entire_file']));
-				}
-				else
-				{
+				} else {
 					Utils::$context['entire_file'] = Utils::htmlspecialchars($_POST['entire_file']);
 				}
 
@@ -1213,28 +1163,21 @@ public function edit()
 
 		Utils::$context['allow_save'] = is_writable($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
 
-		Utils::$context['allow_save_filename'] = strtr($currentTheme['theme_dir'] . '/' . $_REQUEST['filename'], array(Config::$boarddir => '...'));
+		Utils::$context['allow_save_filename'] = strtr($currentTheme['theme_dir'] . '/' . $_REQUEST['filename'], [Config::$boarddir => '...']);
 
 		Utils::$context['edit_filename'] = Utils::htmlspecialchars($_REQUEST['filename']);
 
-		if (substr($_REQUEST['filename'], -4) == '.css')
-		{
+		if (substr($_REQUEST['filename'], -4) == '.css') {
 			Utils::$context['sub_template'] = 'edit_style';
 
-			Utils::$context['entire_file'] = Utils::htmlspecialchars(strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), array("\t" => '   ')));
-		}
-		elseif (substr($_REQUEST['filename'], -13) == '.template.php')
-		{
+			Utils::$context['entire_file'] = Utils::htmlspecialchars(strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), ["\t" => '   ']));
+		} elseif (substr($_REQUEST['filename'], -13) == '.template.php') {
 			Utils::$context['sub_template'] = 'edit_template';
 
-			if (!isset($error_file))
-			{
+			if (!isset($error_file)) {
 				$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-			}
-			else
-			{
-				if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0)
-				{
+			} else {
+				if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0) {
 					Utils::$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
 				}
 
@@ -1243,32 +1186,29 @@ public function edit()
 			}
 
 			$j = 0;
-			Utils::$context['file_parts'] = array(array('lines' => 0, 'line' => 1, 'data' => ''));
+			Utils::$context['file_parts'] = [['lines' => 0, 'line' => 1, 'data' => '']];
 
-			for ($i = 0, $n = count($file_data); $i < $n; $i++)
-			{
-				if (isset($file_data[$i + 1]) && substr($file_data[$i + 1], 0, 9) == 'function ')
-				{
+			for ($i = 0, $n = count($file_data); $i < $n; $i++) {
+				if (isset($file_data[$i + 1]) && substr($file_data[$i + 1], 0, 9) == 'function ') {
 					// Try to format the functions a little nicer...
 					Utils::$context['file_parts'][$j]['data'] = trim(Utils::$context['file_parts'][$j]['data']) . "\n";
 
-					if (empty(Utils::$context['file_parts'][$j]['lines']))
+					if (empty(Utils::$context['file_parts'][$j]['lines'])) {
 						unset(Utils::$context['file_parts'][$j]);
+					}
 
-					Utils::$context['file_parts'][++$j] = array('lines' => 0, 'line' => $i + 1, 'data' => '');
+					Utils::$context['file_parts'][++$j] = ['lines' => 0, 'line' => $i + 1, 'data' => ''];
 				}
 
 				Utils::$context['file_parts'][$j]['lines']++;
-				Utils::$context['file_parts'][$j]['data'] .= Utils::htmlspecialchars(strtr($file_data[$i], array("\t" => '   ')));
+				Utils::$context['file_parts'][$j]['data'] .= Utils::htmlspecialchars(strtr($file_data[$i], ["\t" => '   ']));
 			}
 
-			Utils::$context['entire_file'] = Utils::htmlspecialchars(strtr(implode('', $file_data), array("\t" => '   ')));
-		}
-		else
-		{
+			Utils::$context['entire_file'] = Utils::htmlspecialchars(strtr(implode('', $file_data), ["\t" => '   ']));
+		} else {
 			Utils::$context['sub_template'] = 'edit_file';
 
-			Utils::$context['entire_file'] = Utils::htmlspecialchars(strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), array("\t" => '   ')));
+			Utils::$context['entire_file'] = Utils::htmlspecialchars(strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), ["\t" => '   ']));
 		}
 
 		// Create a special token to allow editing of multiple files.
@@ -1288,21 +1228,18 @@ public function copy()
 
 		$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
-		if (empty($_GET['th']))
+		if (empty($_GET['th'])) {
 			ErrorHandler::fatalLang('theme_install_invalid_id');
+		}
 
 		// Get the theme info.
 		$theme = $this->getSingleTheme($_GET['th']);
 		Utils::$context['theme_id'] = $theme['id'];
 
-		if (isset($_REQUEST['template']) && preg_match('~[\./\\\\:\0]~', $_REQUEST['template']) == 0)
-		{
-			if (file_exists(Theme::$current->settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php'))
-			{
+		if (isset($_REQUEST['template']) && preg_match('~[\./\\\\:\0]~', $_REQUEST['template']) == 0) {
+			if (file_exists(Theme::$current->settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php')) {
 				$filename = Theme::$current->settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatalLang('no_access', false);
 			}
 
@@ -1311,15 +1248,10 @@ public function copy()
 			fclose($fp);
 
 			Utils::redirectexit('action=admin;area=theme;th=' . Utils::$context['theme_id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=copy');
-		}
-		elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
-		{
-			if (file_exists(Theme::$current->settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php'))
-			{
+		} elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0) {
+			if (file_exists(Theme::$current->settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php')) {
 				$filename = Theme::$current->settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatalLang('no_access', false);
 			}
 
@@ -1330,25 +1262,25 @@ public function copy()
 			Utils::redirectexit('action=admin;area=theme;th=' . Utils::$context['theme_id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=copy');
 		}
 
-		$templates = array();
-		$lang_files = array();
+		$templates = [];
+		$lang_files = [];
 
 		$dir = dir(Theme::$current->settings['default_theme_dir']);
 
-		while ($entry = $dir->read())
-		{
-			if (substr($entry, -13) == '.template.php')
+		while ($entry = $dir->read()) {
+			if (substr($entry, -13) == '.template.php') {
 				$templates[] = substr($entry, 0, -13);
+			}
 		}
 
 		$dir->close();
 
 		$dir = dir(Theme::$current->settings['default_theme_dir'] . '/languages');
 
-		while ($entry = $dir->read())
-		{
-			if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches))
+		while ($entry = $dir->read()) {
+			if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches)) {
 				$lang_files[] = $matches[1];
+			}
 		}
 
 		$dir->close();
@@ -1356,36 +1288,32 @@ public function copy()
 		natcasesort($templates);
 		natcasesort($lang_files);
 
-		Utils::$context['available_templates'] = array();
+		Utils::$context['available_templates'] = [];
 
-		foreach ($templates as $template)
-		{
-			Utils::$context['available_templates'][$template] = array(
+		foreach ($templates as $template) {
+			Utils::$context['available_templates'][$template] = [
 				'filename' => $template . '.template.php',
 				'value' => $template,
 				'already_exists' => false,
 				'can_copy' => is_writable($theme['theme_dir']),
-			);
+			];
 		}
 
-		Utils::$context['available_language_files'] = array();
+		Utils::$context['available_language_files'] = [];
 
-		foreach ($lang_files as $file)
-		{
-			Utils::$context['available_language_files'][$file] = array(
+		foreach ($lang_files as $file) {
+			Utils::$context['available_language_files'][$file] = [
 				'filename' => $file . '.php',
 				'value' => $file,
 				'already_exists' => false,
 				'can_copy' => file_exists($theme['theme_dir'] . '/languages') ? is_writable($theme['theme_dir'] . '/languages') : is_writable($theme['theme_dir']),
-			);
+			];
 		}
 
 		$dir = dir($theme['theme_dir']);
 
-		while ($entry = $dir->read())
-		{
-			if (substr($entry, -13) == '.template.php' && isset(Utils::$context['available_templates'][substr($entry, 0, -13)]))
-			{
+		while ($entry = $dir->read()) {
+			if (substr($entry, -13) == '.template.php' && isset(Utils::$context['available_templates'][substr($entry, 0, -13)])) {
 				Utils::$context['available_templates'][substr($entry, 0, -13)]['already_exists'] = true;
 
 				Utils::$context['available_templates'][substr($entry, 0, -13)]['can_copy'] = is_writable($theme['theme_dir'] . '/' . $entry);
@@ -1394,14 +1322,11 @@ public function copy()
 
 		$dir->close();
 
-		if (file_exists($theme['theme_dir'] . '/languages'))
-		{
+		if (file_exists($theme['theme_dir'] . '/languages')) {
 			$dir = dir($theme['theme_dir'] . '/languages');
 
-			while ($entry = $dir->read())
-			{
-				if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches) && isset(Utils::$context['available_language_files'][$matches[1]]))
-				{
+			while ($entry = $dir->read()) {
+				if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches) && isset(Utils::$context['available_language_files'][$matches[1]])) {
 					Utils::$context['available_language_files'][$matches[1]]['already_exists'] = true;
 
 					Utils::$context['available_language_files'][$matches[1]]['can_copy'] = is_writable($theme['theme_dir'] . '/languages/' . $entry);
@@ -1425,8 +1350,9 @@ public function copy()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1529,13 +1455,11 @@ public static function copyTemplate(): void
 	protected function __construct()
 	{
 		// PickTheme() has been migrated to SMF\Theme::pickTheme()
-		if (isset($_GET['sa']) && $_GET['sa'] === 'pick')
-		{
+		if (isset($_GET['sa']) && $_GET['sa'] === 'pick') {
 			Utils::redirectexit('action=theme;sa=pick' . (isset($_GET['u']) ? ';u=' . $_GET['u'] : ''));
 		}
 		// Everything in this file should be accessed via the ACP, not the 'theme' action.
-		elseif ($_REQUEST['action'] === 'theme')
-		{
+		elseif ($_REQUEST['action'] === 'theme') {
 			Utils::redirectexit('action=admin;area=theme;' . (isset($_GET['sa']) ? ';sa=' . $_GET['sa'] : '') . (isset($_GET['u']) ? ';u=' . $_GET['u'] : ''));
 		}
 
@@ -1550,33 +1474,33 @@ protected function __construct()
 		// Default the page title to Theme Administration by default.
 		Utils::$context['page_title'] = Lang::$txt['themeadmin_title'];
 
-		if (!empty(Utils::$context['admin_menu_name']))
-		{
-			Menu::$loaded['admin']->tab_data = array(
+		if (!empty(Utils::$context['admin_menu_name'])) {
+			Menu::$loaded['admin']->tab_data = [
 				'title' => Lang::$txt['themeadmin_title'],
 				'description' => Lang::$txt['themeadmin_description'],
-				'tabs' => array(
-					'admin' => array(
+				'tabs' => [
+					'admin' => [
 						'description' => Lang::$txt['themeadmin_admin_desc'],
-					),
-					'list' => array(
+					],
+					'list' => [
 						'description' => Lang::$txt['themeadmin_list_desc'],
-					),
-					'reset' => array(
+					],
+					'reset' => [
 						'description' => Lang::$txt['themeadmin_reset_desc'],
-					),
-					'edit' => array(
+					],
+					'edit' => [
 						'description' => Lang::$txt['themeadmin_edit_desc'],
-					),
-				),
-			);
+					],
+				],
+			];
 		}
 
 		// CRUD self::$subactions as needed.
-		IntegrationHook::call('integrate_manage_themes', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_themes', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -1594,52 +1518,50 @@ protected function installFile()
 		$dirtemp = Utils::$context['themedir'] . '/temp';
 
 		// Make sure the temp dir doesn't already exist
-		if (file_exists($dirtemp))
+		if (file_exists($dirtemp)) {
 			$this->deltree($dirtemp);
+		}
 
 		// Create the temp dir.
 		mkdir($dirtemp, 0777);
 
 		// Hopefully the temp directory is writable, or we might have a problem.
-		if (!is_writable($dirtemp))
-		{
+		if (!is_writable($dirtemp)) {
 			// Lets give it a try.
 			Utils::makeWritable($dirtemp, '0755');
 
 			// How about now?
-			if (!is_writable($dirtemp))
+			if (!is_writable($dirtemp)) {
 				ErrorHandler::fatalLang('theme_install_write_error', 'critical');
+			}
 		}
 
 		// This happens when the admin session is gone and the user has to login again.
-		if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz']))
-		{
+		if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz'])) {
 			Utils::redirectexit('action=admin;area=theme;sa=admin;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 		}
 
 		// Another error check layer, something went wrong with the upload.
-		if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0)
-		{
+		if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0) {
 			ErrorHandler::fatalLang('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
 		}
 
 		// Get the theme's name.
 		$name = pathinfo($_FILES['theme_gz']['name'], PATHINFO_FILENAME);
-		$name = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/', '/\.tar$/'), array('_', '.', '', ''), $name);
+		$name = preg_replace(['/\s/', '/\.[\.]+/', '/[^\w_\.\-]/', '/\.tar$/'], ['_', '.', '', ''], $name);
 
 		// Start setting some vars.
-		Utils::$context['to_install'] = array(
+		Utils::$context['to_install'] = [
 			'theme_dir' => Utils::$context['themedir'] . '/' . $name,
 			'theme_url' => Utils::$context['themeurl'] . '/' . $name,
 			'images_url' => Utils::$context['themeurl'] . '/' . $name . '/images',
 			'name' => $name,
-		);
+		];
 
 		// Extract the file on the proper themes dir.
 		$extracted = SubsPackage::read_tgz_file($_FILES['theme_gz']['tmp_name'], $dirtemp, false, true);
 
-		if ($extracted)
-		{
+		if ($extracted) {
 			// Read its info form the XML file.
 			$theme_info = $this->getThemeInfo($dirtemp);
 			Utils::$context['to_install'] += $theme_info;
@@ -1653,10 +1575,8 @@ protected function installFile()
 			// return all the info.
 			return Utils::$context['to_install'];
 		}
-		else
-		{
-			ErrorHandler::fatalLang('theme_install_error_title', false);
-		}
+
+		ErrorHandler::fatalLang('theme_install_error_title', false);
 	}
 
 	/**
@@ -1669,18 +1589,20 @@ protected function installFile()
 	protected function installCopy()
 	{
 		// There's gotta be something to work with.
-		if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy']))
+		if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy'])) {
 			ErrorHandler::fatalLang('theme_install_error_title', false);
+		}
 
 		// Get a cleaner version.
 		$name = preg_replace('~[^A-Za-z0-9_\- ]~', '', $_REQUEST['copy']);
 
 		// Is there a theme already named like this?
-		if (file_exists(Utils::$context['themedir'] . '/' . $name))
+		if (file_exists(Utils::$context['themedir'] . '/' . $name)) {
 			ErrorHandler::fatalLang('theme_install_already_dir', false);
+		}
 
 		// This is a brand new theme so set all possible values.
-		Utils::$context['to_install'] = array(
+		Utils::$context['to_install'] = [
 			'theme_dir' => Utils::$context['themedir'] . '/' . $name,
 			'theme_url' => Utils::$context['themeurl'] . '/' . $name,
 			'name' => $name,
@@ -1691,7 +1613,7 @@ protected function installCopy()
 			'based_on_dir' => Utils::$context['themedir'] . '/default',
 			'theme_layers' => 'html,body',
 			'theme_templates' => 'index',
-		);
+		];
 
 		// Create the specific dir.
 		umask(0);
@@ -1699,8 +1621,10 @@ protected function installCopy()
 
 		// Buy some time.
 		@set_time_limit(600);
-		if (function_exists('apache_reset_timeout'))
+
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		// Create subdirectories for css and javascript files.
 		mkdir(Utils::$context['to_install']['theme_dir'] . '/css', 0777);
@@ -1710,7 +1634,7 @@ protected function installCopy()
 		mkdir(Utils::$context['to_install']['theme_dir'] . '/languages', 0777);
 
 		// Copy over the default non-theme files.
-		$to_copy = array(
+		$to_copy = [
 			'/index.php',
 			'/index.template.php',
 			'/css/admin.css',
@@ -1722,10 +1646,9 @@ protected function installCopy()
 			'/scripts/theme.js',
 			'/languages/index.php',
 			'/languages/Settings.english.php',
-		);
+		];
 
-		foreach ($to_copy as $file)
-		{
+		foreach ($to_copy as $file) {
 			copy(Theme::$current->settings['default_theme_dir'] . $file, Utils::$context['to_install']['theme_dir'] . $file);
 			Utils::makeWritable(Utils::$context['to_install']['theme_dir'] . $file, 0777);
 		}
@@ -1735,9 +1658,11 @@ protected function installCopy()
 		SubsPackage::package_flush_cache();
 
 		// Any data from the default theme that we want?
-		foreach ($this->getSingleTheme(1, array('theme_layers', 'theme_templates')) as $variable => $value)
-			if ($variable == 'theme_templates' || $variable == 'theme_layers')
+		foreach ($this->getSingleTheme(1, ['theme_layers', 'theme_templates']) as $variable => $value) {
+			if ($variable == 'theme_templates' || $variable == 'theme_layers') {
 				Utils::$context['to_install'][$variable] = $value;
+			}
+		}
 
 		// Lets add a theme_info.xml to this theme.
 		$xml_info = '<' . '?xml version="1.0"?' . '>
@@ -1764,8 +1689,8 @@ protected function installCopy()
 
 		// Now write it.
 		$fp = @fopen(Utils::$context['to_install']['theme_dir'] . '/theme_info.xml', 'w+');
-		if ($fp)
-		{
+
+		if ($fp) {
 			fwrite($fp, $xml_info);
 			fclose($fp);
 		}
@@ -1788,23 +1713,25 @@ protected function installCopy()
 	protected function installDir()
 	{
 		// Cannot use the theme dir as a theme dir.
-		if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath(Utils::$context['themedir']))
+		if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath(Utils::$context['themedir'])) {
 			ErrorHandler::fatalLang('theme_install_invalid_dir', false);
+		}
 
 		// Check is there is "something" on the dir.
-		elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml'))
+		elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml')) {
 			ErrorHandler::fatalLang('theme_install_error', false);
+		}
 
 		$name = basename($_REQUEST['theme_dir']);
-		$name = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $name);
+		$name = preg_replace(['/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'], ['_', '.', ''], $name);
 
 		// All good! set some needed vars.
-		Utils::$context['to_install'] = array(
+		Utils::$context['to_install'] = [
 			'theme_dir' => $_REQUEST['theme_dir'],
 			'theme_url' => Utils::$context['themeurl'] . '/' . $name,
 			'name' => $name,
 			'images_url' => Utils::$context['themeurl'] . '/' . $name . '/images',
-		);
+		];
 
 		// Read its info form the XML file.
 		$theme_info = $this->getThemeInfo(Utils::$context['to_install']['theme_dir']);
@@ -1824,46 +1751,46 @@ protected function installDir()
 	 * @param string[] $variables
 	 * @return array The theme info as an array.
 	 */
-	protected function getSingleTheme($id, array $variables = array())
+	protected function getSingleTheme($id, array $variables = [])
 	{
 		// No data, no fun!
-		if (empty($id))
+		if (empty($id)) {
 			return false;
+		}
 
 		// Make sure $id is an int.
 		$id = (int) $id;
 
 		// Make changes if you really want it.
-		IntegrationHook::call('integrate_get_single_theme', array(&$variables, $id));
+		IntegrationHook::call('integrate_get_single_theme', [&$variables, $id]);
 
-		$single = array(
+		$single = [
 			'id' => $id,
-		);
+		];
 
 		// Make our known/enable themes a little easier to work with.
-		$knownThemes = !empty(Config::$modSettings['knownThemes']) ? explode(',', Config::$modSettings['knownThemes']) : array();
-		$enableThemes = !empty(Config::$modSettings['enableThemes']) ? explode(',', Config::$modSettings['enableThemes']) : array();
+		$knownThemes = !empty(Config::$modSettings['knownThemes']) ? explode(',', Config::$modSettings['knownThemes']) : [];
+		$enableThemes = !empty(Config::$modSettings['enableThemes']) ? explode(',', Config::$modSettings['enableThemes']) : [];
 
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE id_theme = ({int:id_theme})
 				AND id_member = {int:no_member}' . (!empty($variables) ? '
 				AND variable IN ({array_string:variables})' : ''),
-			array(
+			[
 				'variables' => $variables,
 				'id_theme' => $id,
 				'no_member' => 0,
-			)
+			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$single[$row['variable']] = $row['value'];
 
 			// Fix the path and tell if its a valid one.
-			if ($row['variable'] == 'theme_dir')
-			{
+			if ($row['variable'] == 'theme_dir') {
 				$single['theme_dir'] = realpath($row['value']);
 				$single['valid_path'] = file_exists($row['value']) && is_dir($row['value']);
 			}
@@ -1889,11 +1816,11 @@ protected function getSingleTheme($id, array $variables = array())
 	protected function getAllThemes($enable_only = false)
 	{
 		// Make our known/enable themes a little easier to work with.
-		$knownThemes = !empty(Config::$modSettings['knownThemes']) ? explode(',', Config::$modSettings['knownThemes']) : array();
-		$enableThemes = !empty(Config::$modSettings['enableThemes']) ? explode(',', Config::$modSettings['enableThemes']) : array();
+		$knownThemes = !empty(Config::$modSettings['knownThemes']) ? explode(',', Config::$modSettings['knownThemes']) : [];
+		$enableThemes = !empty(Config::$modSettings['enableThemes']) ? explode(',', Config::$modSettings['enableThemes']) : [];
 
 		// List of all possible themes values.
-		$themeValues = array(
+		$themeValues = [
 			'theme_dir',
 			'images_url',
 			'theme_url',
@@ -1903,42 +1830,42 @@ protected function getAllThemes($enable_only = false)
 			'version',
 			'install_for',
 			'based_on',
-		);
+		];
 
 		// Make changes if you really want it.
-		IntegrationHook::call('integrate_get_all_themes', array(&$themeValues, $enable_only));
+		IntegrationHook::call('integrate_get_all_themes', [&$themeValues, $enable_only]);
 
 		// So, what is it going to be?
 		$query_where = $enable_only ? $enableThemes : $knownThemes;
 
 		// Perform the query as requested.
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE variable IN ({array_string:theme_values})
 				AND id_theme IN ({array_string:query_where})
 				AND id_member = {int:no_member}',
-			array(
+			[
 				'query_where' => $query_where,
 				'theme_values' => $themeValues,
 				'no_member' => 0,
-			)
+			],
 		);
 
-		Utils::$context['themes'] = array();
+		Utils::$context['themes'] = [];
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset(Utils::$context['themes'][$row['id_theme']]))
-				Utils::$context['themes'][$row['id_theme']] = array(
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset(Utils::$context['themes'][$row['id_theme']])) {
+				Utils::$context['themes'][$row['id_theme']] = [
 					'id' => (int) $row['id_theme'],
 					'known' => in_array($row['id_theme'], $knownThemes),
-					'enable' => in_array($row['id_theme'], $enableThemes)
-				);
+					'enable' => in_array($row['id_theme'], $enableThemes),
+				];
+			}
 
 			// Fix the path and tell if its a valid one.
-			if ($row['variable'] == 'theme_dir')
-			{
+			if ($row['variable'] == 'theme_dir') {
 				$row['value'] = realpath($row['value']);
 				Utils::$context['themes'][$row['id_theme']]['valid_path'] = file_exists($row['value']) && is_dir($row['value']);
 			}
@@ -1958,11 +1885,11 @@ protected function getAllThemes($enable_only = false)
 	protected function getInstalledThemes()
 	{
 		// Make our known/enable themes a little easier to work with.
-		$knownThemes = !empty(Config::$modSettings['knownThemes']) ? explode(',', Config::$modSettings['knownThemes']) : array();
-		$enableThemes = !empty(Config::$modSettings['enableThemes']) ? explode(',', Config::$modSettings['enableThemes']) : array();
+		$knownThemes = !empty(Config::$modSettings['knownThemes']) ? explode(',', Config::$modSettings['knownThemes']) : [];
+		$enableThemes = !empty(Config::$modSettings['enableThemes']) ? explode(',', Config::$modSettings['enableThemes']) : [];
 
 		// List of all possible themes values.
-		$themeValues = array(
+		$themeValues = [
 			'theme_dir',
 			'images_url',
 			'theme_url',
@@ -1972,37 +1899,37 @@ protected function getInstalledThemes()
 			'version',
 			'install_for',
 			'based_on',
-		);
+		];
 
 		// Make changes if you really want it.
-		IntegrationHook::call('integrate_get_installed_themes', array(&$themeValues));
+		IntegrationHook::call('integrate_get_installed_themes', [&$themeValues]);
 
 		// Perform the query as requested.
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE variable IN ({array_string:theme_values})
 				AND id_member = {int:no_member}',
-			array(
+			[
 				'theme_values' => $themeValues,
 				'no_member' => 0,
-			)
+			],
 		);
 
-		Utils::$context['themes'] = array();
+		Utils::$context['themes'] = [];
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset(Utils::$context['themes'][$row['id_theme']]))
-				Utils::$context['themes'][$row['id_theme']] = array(
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset(Utils::$context['themes'][$row['id_theme']])) {
+				Utils::$context['themes'][$row['id_theme']] = [
 					'id' => (int) $row['id_theme'],
 					'known' => in_array($row['id_theme'], $knownThemes),
-					'enable' => in_array($row['id_theme'], $enableThemes)
-				);
+					'enable' => in_array($row['id_theme'], $enableThemes),
+				];
+			}
 
 			// Fix the path and tell if its a valid one.
-			if ($row['variable'] == 'theme_dir')
-			{
+			if ($row['variable'] == 'theme_dir') {
 				$row['value'] = realpath($row['value']);
 				Utils::$context['themes'][$row['id_theme']]['valid_path'] = file_exists($row['value']) && is_dir($row['value']);
 			}
@@ -2022,14 +1949,14 @@ protected function getInstalledThemes()
 	 */
 	protected function getThemeInfo($path)
 	{
-		if (empty($path))
+		if (empty($path)) {
 			return false;
+		}
 
-		$xml_data = array();
+		$xml_data = [];
 
 		// Perhaps they are trying to install a mod, lets tell them nicely this is the wrong function.
-		if (file_exists($path . '/package-info.xml'))
-		{
+		if (file_exists($path . '/package-info.xml')) {
 			Lang::load('Errors');
 
 			// We need to delete the dir otherwise the next time you try to install a theme you will get the same error.
@@ -2043,15 +1970,13 @@ protected function getThemeInfo($path)
 		$theme_info_xml = new XmlArray(file_get_contents($path . '/theme_info.xml'));
 
 		// Error message, there isn't any valid info.
-		if (!$theme_info_xml->exists('theme-info[0]'))
-		{
+		if (!$theme_info_xml->exists('theme-info[0]')) {
 			$this->deltree($path);
 			ErrorHandler::fatalLang('package_get_error_packageinfo_corrupt', false);
 		}
 
 		// Check for compatibility with 2.1 or greater.
-		if (!$theme_info_xml->exists('theme-info/install'))
-		{
+		if (!$theme_info_xml->exists('theme-info/install')) {
 			$this->deltree($path);
 			ErrorHandler::fatalLang('package_get_error_theme_not_compatible', false, SMF_FULL_VERSION);
 		}
@@ -2061,40 +1986,41 @@ protected function getThemeInfo($path)
 		$install_versions = $theme_info_xml->fetch('theme-info/install/@for');
 
 		// The theme isn't compatible with the current SMF version.
-		if (!$install_versions || !SubsPackage::matchPackageVersion($the_version, $install_versions))
-		{
+		if (!$install_versions || !SubsPackage::matchPackageVersion($the_version, $install_versions)) {
 			$this->deltree($path);
 			ErrorHandler::fatalLang('package_get_error_theme_not_compatible', false, SMF_FULL_VERSION);
 		}
 
 		$theme_info_xml = $theme_info_xml->to_array('theme-info[0]');
 
-		$xml_elements = array(
+		$xml_elements = [
 			'theme_layers' => 'layers',
 			'theme_templates' => 'templates',
 			'based_on' => 'based-on',
 			'version' => 'version',
-		);
+		];
 
 		// Assign the values to be stored.
-		foreach ($xml_elements as $var => $name)
-			if (!empty($theme_info_xml[$name]))
+		foreach ($xml_elements as $var => $name) {
+			if (!empty($theme_info_xml[$name])) {
 				$xml_data[$var] = $theme_info_xml[$name];
+			}
+		}
 
 		// Add the supported versions.
 		$xml_data['install_for'] = $install_versions;
 
 		// Overwrite the default images folder.
-		if (!empty($theme_info_xml['images']))
-		{
+		if (!empty($theme_info_xml['images'])) {
 			$xml_data['images_url'] = $path . '/' . $theme_info_xml['images'];
 			$xml_data['explicit_images'] = true;
-		}
-		else
+		} else {
 			$xml_data['explicit_images'] = false;
+		}
 
-		if (!empty($theme_info_xml['extra']))
+		if (!empty($theme_info_xml['extra'])) {
 			$xml_data += Utils::jsonDecode($theme_info_xml['extra'], true);
+		}
 
 		return $xml_data;
 	}
@@ -2107,53 +2033,52 @@ protected function getThemeInfo($path)
 	 * @param array $to_install An array containing all values to be stored into the DB.
 	 * @return int The newly created theme ID.
 	 */
-	protected function addToDb($to_install = array())
+	protected function addToDb($to_install = [])
 	{
 		// External use? no problem!
-		if (!empty($to_install))
+		if (!empty($to_install)) {
 			Utils::$context['to_install'] = $to_install;
+		}
 
 		// One last check.
-		if (empty(Utils::$context['to_install']['theme_dir']) || basename(Utils::$context['to_install']['theme_dir']) == 'Themes')
-		{
+		if (empty(Utils::$context['to_install']['theme_dir']) || basename(Utils::$context['to_install']['theme_dir']) == 'Themes') {
 			ErrorHandler::fatalLang('theme_install_invalid_dir', false);
 		}
 
 		// OK, is this a newer version of an already installed theme?
-		if (!empty(Utils::$context['to_install']['version']))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_theme
+		if (!empty(Utils::$context['to_install']['version'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_theme
 				FROM {db_prefix}themes
 				WHERE id_member = {int:no_member}
 					AND variable = {literal:name}
 					AND value LIKE {string:name_value}
 				LIMIT 1',
-				array(
+				[
 					'no_member' => 0,
 					'name_value' => '%' . Utils::$context['to_install']['name'] . '%',
-				)
+				],
 			);
-			list ($id_to_update) = Db::$db->fetch_row($request);
+			list($id_to_update) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			$to_update = $this->getSingleTheme($id_to_update, array('version'));
+			$to_update = $this->getSingleTheme($id_to_update, ['version']);
 
 			// Got something, lets figure it out what to do next.
-			if (!empty($id_to_update) && !empty($to_update['version']))
-			{
-				switch (SubsPackage::compareVersions(Utils::$context['to_install']['version'], $to_update['version']))
-				{
+			if (!empty($id_to_update) && !empty($to_update['version'])) {
+				switch (SubsPackage::compareVersions(Utils::$context['to_install']['version'], $to_update['version'])) {
 					case 1: // Got a newer version, update the old entry.
-						Db::$db->query('', '
-							UPDATE {db_prefix}themes
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}themes
 							SET value = {string:new_value}
 							WHERE variable = {literal:version}
 								AND id_theme = {int:id_theme}',
-							array(
+							[
 								'new_value' => Utils::$context['to_install']['version'],
 								'id_theme' => $id_to_update,
-							)
+							],
 						);
 
 						// Done with the update, tell the user about it.
@@ -2164,57 +2089,52 @@ protected function addToDb($to_install = array())
 					case 0: // This is exactly the same theme.
 					case -1: // The one being installed is older than the one already installed.
 					default: // Any other possible result.
-						ErrorHandler::fatalLang('package_get_error_theme_no_new_version', false, array(Utils::$context['to_install']['version'], $to_update['version']));
+						ErrorHandler::fatalLang('package_get_error_theme_no_new_version', false, [Utils::$context['to_install']['version'], $to_update['version']]);
 				}
 			}
 		}
 
-		if (!empty(Utils::$context['to_install']['based_on']))
-		{
+		if (!empty(Utils::$context['to_install']['based_on'])) {
 			// No need for elaborated stuff when the theme is based on the default one.
-			if (Utils::$context['to_install']['based_on'] == 'default')
-			{
+			if (Utils::$context['to_install']['based_on'] == 'default') {
 				Utils::$context['to_install']['theme_url'] = Theme::$current->settings['default_theme_url'];
 
 				Utils::$context['to_install']['images_url'] = Theme::$current->settings['default_images_url'];
 			}
 			// Custom theme based on another custom theme, lets get some info.
-			elseif (Utils::$context['to_install']['based_on'] != '')
-			{
+			elseif (Utils::$context['to_install']['based_on'] != '') {
 				Utils::$context['to_install']['based_on'] = preg_replace('~[^A-Za-z0-9\-_ ]~', '', Utils::$context['to_install']['based_on']);
 
 				// Get the theme info first.
-				$request = Db::$db->query('', '
-					SELECT id_theme
+				$request = Db::$db->query(
+					'',
+					'SELECT id_theme
 					FROM {db_prefix}themes
 					WHERE id_member = {int:no_member}
 						AND (value LIKE {string:based_on} OR value LIKE {string:based_on_path})
 					LIMIT 1',
-					array(
+					[
 						'no_member' => 0,
 						'based_on' => '%/' . Utils::$context['to_install']['based_on'],
-						'based_on_path' => '%' . "\\" . Utils::$context['to_install']['based_on'],
-					)
+						'based_on_path' => '%' . '\\' . Utils::$context['to_install']['based_on'],
+					],
 				);
-				list ($id_based_on) = Db::$db->fetch_row($request);
+				list($id_based_on) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
-				$temp = $this->getSingleTheme($id_based_on, array('theme_dir', 'images_url', 'theme_url'));
+				$temp = $this->getSingleTheme($id_based_on, ['theme_dir', 'images_url', 'theme_url']);
 
 				// Found the based on theme info, add it to the current one being installed.
-				if (!empty($temp))
-				{
+				if (!empty($temp)) {
 					Utils::$context['to_install']['base_theme_url'] = $temp['theme_url'];
 					Utils::$context['to_install']['base_theme_dir'] = $temp['theme_dir'];
 
-					if (empty(Utils::$context['to_install']['explicit_images']) && !empty(Utils::$context['to_install']['base_theme_url']))
-					{
+					if (empty(Utils::$context['to_install']['explicit_images']) && !empty(Utils::$context['to_install']['base_theme_url'])) {
 						Utils::$context['to_install']['theme_url'] = Utils::$context['to_install']['base_theme_url'];
 					}
 				}
 				// Nope, sorry, couldn't find any theme already installed.
-				else
-				{
+				else {
 					ErrorHandler::fatalLang('package_get_error_theme_no_based_on_found', false, Utils::$context['to_install']['based_on']);
 				}
 			}
@@ -2223,40 +2143,42 @@ protected function addToDb($to_install = array())
 		}
 
 		// Find the newest id_theme.
-		$result = Db::$db->query('', '
-			SELECT MAX(id_theme)
+		$result = Db::$db->query(
+			'',
+			'SELECT MAX(id_theme)
 			FROM {db_prefix}themes',
-			array(
-			)
+			[
+			],
 		);
-		list ($id_theme) = Db::$db->fetch_row($result);
+		list($id_theme) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// This will be theme number...
 		$id_theme++;
 
 		// Last minute changes? although, the actual array is a context value you might want to use the new ID.
-		IntegrationHook::call('integrate_theme_install', array(&Utils::$context['to_install'], $id_theme));
+		IntegrationHook::call('integrate_theme_install', [&Utils::$context['to_install'], $id_theme]);
 
-		$inserts = array();
+		$inserts = [];
 
-		foreach (Utils::$context['to_install'] as $var => $val)
-			$inserts[] = array($id_theme, $var, $val);
+		foreach (Utils::$context['to_install'] as $var => $val) {
+			$inserts[] = [$id_theme, $var, $val];
+		}
 
-		if (!empty($inserts))
-		{
-			Db::$db->insert('insert',
+		if (!empty($inserts)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}themes',
-				array('id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
+				['id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
 				$inserts,
-				array('id_theme', 'variable')
+				['id_theme', 'variable'],
 			);
 		}
 
 		// Update the known and enable Theme's settings.
-		$known = strtr(Config::$modSettings['knownThemes'] . ',' . $id_theme, array(',,' => ','));
-		$enable = strtr(Config::$modSettings['enableThemes'] . ',' . $id_theme, array(',,' => ','));
-		Config::updateModSettings(array('knownThemes' => $known, 'enableThemes' => $enable));
+		$known = strtr(Config::$modSettings['knownThemes'] . ',' . $id_theme, [',,' => ',']);
+		$enable = strtr(Config::$modSettings['enableThemes'] . ',' . $id_theme, [',,' => ',']);
+		Config::updateModSettings(['knownThemes' => $known, 'enableThemes' => $enable]);
 
 		return $id_theme;
 	}
@@ -2270,59 +2192,64 @@ protected function addToDb($to_install = array())
 	protected function removeFromDb($themeID)
 	{
 		// Can't delete the default theme, sorry!
-		if (empty($themeID) || $themeID == 1)
+		if (empty($themeID) || $themeID == 1) {
 			return false;
+		}
 
 		$known = explode(',', Config::$modSettings['knownThemes']);
 		$enable = explode(',', Config::$modSettings['enableThemes']);
 
 		// Remove it from the themes table.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}themes
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}themes
 			WHERE id_theme = {int:current_theme}',
-			array(
+			[
 				'current_theme' => $themeID,
-			)
+			],
 		);
 
 		// Update users preferences.
-		Db::$db->query('', '
-			UPDATE {db_prefix}members
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}members
 			SET id_theme = {int:default_theme}
 			WHERE id_theme = {int:current_theme}',
-			array(
+			[
 				'default_theme' => 0,
 				'current_theme' => $themeID,
-			)
+			],
 		);
 
 		// Some boards may have it as preferred theme.
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET id_theme = {int:default_theme}
 			WHERE id_theme = {int:current_theme}',
-			array(
+			[
 				'default_theme' => 0,
 				'current_theme' => $themeID,
-			)
+			],
 		);
 
 		// Remove it from the list of known themes.
-		$known = array_diff($known, array($themeID));
+		$known = array_diff($known, [$themeID]);
 
 		// And the enable list too.
-		$enable = array_diff($enable, array($themeID));
+		$enable = array_diff($enable, [$themeID]);
 
 		// Back to good old comma separated string.
-		$known = strtr(implode(',', $known), array(',,' => ','));
-		$enable = strtr(implode(',', $enable), array(',,' => ','));
+		$known = strtr(implode(',', $known), [',,' => ',']);
+		$enable = strtr(implode(',', $enable), [',,' => ',']);
 
 		// Update the enableThemes list.
-		Config::updateModSettings(array('enableThemes' => $enable, 'knownThemes' => $known));
+		Config::updateModSettings(['enableThemes' => $enable, 'knownThemes' => $known]);
 
 		// Fix it if the theme was the overall default theme.
-		if (Config::$modSettings['theme_guests'] == $themeID)
-			Config::updateModSettings(array('theme_guests' => '1'));
+		if (Config::$modSettings['theme_guests'] == $themeID) {
+			Config::updateModSettings(['theme_guests' => '1']);
+		}
 
 		return true;
 	}
@@ -2337,23 +2264,18 @@ protected function removeFromDb($themeID)
 	 */
 	protected function deltree($path)
 	{
-		if (empty($path))
+		if (empty($path)) {
 			return false;
+		}
 
-		if (is_dir($path))
-		{
+		if (is_dir($path)) {
 			$objects = scandir($path);
 
-			foreach ($objects as $object)
-			{
-				if ($object != '.' && $object != '..')
-				{
-					if (filetype($path . '/' . $object) == 'dir')
-					{
+			foreach ($objects as $object) {
+				if ($object != '.' && $object != '..') {
+					if (filetype($path . '/' . $object) == 'dir') {
 						$this->deltree($path . '/' . $object);
-					}
-					else
-					{
+					} else {
 						unlink($path . '/' . $object);
 					}
 				}
@@ -2374,31 +2296,32 @@ protected function deltree($path)
 	protected function getFileList($path, $relative)
 	{
 		// Is it even a directory?
-		if (!is_dir($path))
+		if (!is_dir($path)) {
 			ErrorHandler::fatalLang('error_invalid_dir', 'critical');
+		}
 
 		$dir = dir($path);
-		$entries = array();
+		$entries = [];
 
-		while ($entry = $dir->read())
+		while ($entry = $dir->read()) {
 			$entries[] = $entry;
+		}
 
 		$dir->close();
 
 		natcasesort($entries);
 
-		$list1 = array();
-		$list2 = array();
+		$list1 = [];
+		$list2 = [];
 
-		foreach ($entries as $entry)
-		{
+		foreach ($entries as $entry) {
 			// Skip all dot files, including .htaccess.
-			if (substr($entry, 0, 1) == '.' || $entry == 'CVS')
+			if (substr($entry, 0, 1) == '.' || $entry == 'CVS') {
 				continue;
+			}
 
-			if (is_dir($path . '/' . $entry))
-			{
-				$list1[] = array(
+			if (is_dir($path . '/' . $entry)) {
+				$list1[] = [
 					'filename' => $entry,
 					'is_writable' => is_writable($path . '/' . $entry),
 					'is_directory' => true,
@@ -2407,22 +2330,17 @@ protected function getFileList($path, $relative)
 					'is_editable' => false,
 					'href' => Config::$scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=edit;directory=' . $relative . $entry,
 					'size' => '',
-				);
-			}
-			else
-			{
+				];
+			} else {
 				$size = filesize($path . '/' . $entry);
 
-				if ($size > 2048 || $size == 1024)
-				{
+				if ($size > 2048 || $size == 1024) {
 					$size = Lang::numberFormat($size / 1024) . ' ' . Lang::$txt['themeadmin_edit_kilobytes'];
-				}
-				else
-				{
+				} else {
 					$size = Lang::numberFormat($size) . ' ' . Lang::$txt['themeadmin_edit_bytes'];
 				}
 
-				$list2[] = array(
+				$list2[] = [
 					'filename' => $entry,
 					'is_writable' => is_writable($path . '/' . $entry),
 					'is_directory' => false,
@@ -2432,7 +2350,7 @@ protected function getFileList($path, $relative)
 					'href' => Config::$scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';sa=edit;filename=' . $relative . $entry,
 					'size' => $size,
 					'last_modified' => Time::create('@' . filemtime($path . '/' . $entry))->format(),
-				);
+				];
 			}
 		}
 
@@ -2441,7 +2359,8 @@ protected function getFileList($path, $relative)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Themes::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Themes::exportStatic')) {
 	Themes::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/Warnings.php b/Sources/Actions/Admin/Warnings.php
index a8f039d83a..e11dbb646b 100644
--- a/Sources/Actions/Admin/Warnings.php
+++ b/Sources/Actions/Admin/Warnings.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Admin;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -35,13 +34,11 @@ class Warnings implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-			'getConfigVars' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'modifyWarningSettings' => 'ModifyWarningSettings',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -70,40 +67,37 @@ public function execute(): void
 		$config_vars = self::getConfigVars();
 
 		// Cannot use moderation if post moderation is not enabled.
-		if (!Config::$modSettings['postmod_active'])
+		if (!Config::$modSettings['postmod_active']) {
 			unset($config_vars['moderate']);
+		}
 
 		// Saving?
-		if (isset($_GET['save']))
-		{
+		if (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			// Make sure these don't have an effect.
-			if (!$currently_enabled && empty($_POST['warning_enable']))
-			{
+			if (!$currently_enabled && empty($_POST['warning_enable'])) {
 				$_POST['warning_watch'] = 0;
 				$_POST['warning_moderate'] = 0;
 				$_POST['warning_mute'] = 0;
 			}
 			// If it was disabled and we're enabling it now, set some sane defaults.
-			elseif (!$currently_enabled && !empty($_POST['warning_enable']))
-			{
+			elseif (!$currently_enabled && !empty($_POST['warning_enable'])) {
 				// Need to add these, these weren't there before...
-				$vars = array(
+				$vars = [
 					'warning_watch' => 10,
 					'warning_mute' => 60,
-				);
-				if (Config::$modSettings['postmod_active'])
+				];
+
+				if (Config::$modSettings['postmod_active']) {
 					$vars['warning_moderate'] = 35;
+				}
 
-				foreach ($vars as $var => $value)
-				{
-					$config_vars[] = array('int', $var);
+				foreach ($vars as $var => $value) {
+					$config_vars[] = ['int', $var];
 					$_POST[$var] = $value;
 				}
-			}
-			else
-			{
+			} else {
 				$_POST['warning_watch'] = min($_POST['warning_watch'], 100);
 				$_POST['warning_moderate'] = Config::$modSettings['postmod_active'] ? min($_POST['warning_moderate'], 100) : 0;
 				$_POST['warning_mute'] = min($_POST['warning_mute'], 100);
@@ -116,10 +110,10 @@ public function execute(): void
 			// Fix the warning setting array!
 			$_POST['warning_settings'] = (!empty($_POST['warning_enable']) ? 1 : 0) . ',' . min(100, $_POST['user_limit']) . ',' . min(100, $_POST['warning_decrement']);
 			$save_vars = $config_vars;
-			$save_vars[] = array('text', 'warning_settings');
+			$save_vars[] = ['text', 'warning_settings'];
 			unset($save_vars['enable'], $save_vars['rem1'], $save_vars['rem2']);
 
-			IntegrationHook::call('integrate_save_warning_settings', array(&$save_vars));
+			IntegrationHook::call('integrate_save_warning_settings', [&$save_vars]);
 
 			ACP::saveDBSettings($save_vars);
 			$_SESSION['adm-save'] = true;
@@ -134,11 +128,11 @@ public function execute(): void
 		Utils::$context['settings_title'] = Lang::$txt['warnings'];
 		Utils::$context['page_title'] = Lang::$txt['warnings'];
 
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['warnings'],
 			'help' => '',
 			'description' => Lang::$txt['warnings_desc'],
-		);
+		];
 
 		ACP::prepareDBSettingContext($config_vars);
 	}
@@ -154,8 +148,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -181,46 +176,45 @@ public static function getConfigVars(): array
 		// We need the existing ones for this
 		list($currently_enabled, Config::$modSettings['user_limit'], Config::$modSettings['warning_decrement']) = explode(',', Config::$modSettings['warning_settings']);
 
-		$config_vars = array(
+		$config_vars = [
 			// Warning system?
-			'enable' => array('check', 'warning_enable'),
-		);
+			'enable' => ['check', 'warning_enable'],
+		];
 
-		if (!empty(Config::$modSettings['warning_settings']) && $currently_enabled)
-		{
-			$config_vars += array(
+		if (!empty(Config::$modSettings['warning_settings']) && $currently_enabled) {
+			$config_vars += [
 				'',
-				array(
+				[
 					'int',
 					'warning_watch',
-					'subtext' => Lang::$txt['setting_warning_watch_note'] . ' ' . Lang::$txt['zero_to_disable']
-				),
-				'moderate' => array(
+					'subtext' => Lang::$txt['setting_warning_watch_note'] . ' ' . Lang::$txt['zero_to_disable'],
+				],
+				'moderate' => [
 					'int',
 					'warning_moderate',
-					'subtext' => Lang::$txt['setting_warning_moderate_note'] . ' ' . Lang::$txt['zero_to_disable']
-				),
-				array(
+					'subtext' => Lang::$txt['setting_warning_moderate_note'] . ' ' . Lang::$txt['zero_to_disable'],
+				],
+				[
 					'int',
 					'warning_mute',
-					'subtext' => Lang::$txt['setting_warning_mute_note'] . ' ' . Lang::$txt['zero_to_disable']
-				),
-				'rem1' => array(
+					'subtext' => Lang::$txt['setting_warning_mute_note'] . ' ' . Lang::$txt['zero_to_disable'],
+				],
+				'rem1' => [
 					'int',
 					'user_limit',
-					'subtext' => Lang::$txt['setting_user_limit_note']
-				),
-				'rem2' => array(
+					'subtext' => Lang::$txt['setting_user_limit_note'],
+				],
+				'rem2' => [
 					'int',
 					'warning_decrement',
-					'subtext' => Lang::$txt['setting_warning_decrement_note'] . ' ' . Lang::$txt['zero_to_disable']
-				),
-				array('permissions', 'view_warning_any'),
-				array('permissions', 'view_warning_own'),
-			);
+					'subtext' => Lang::$txt['setting_warning_decrement_note'] . ' ' . Lang::$txt['zero_to_disable'],
+				],
+				['permissions', 'view_warning_any'],
+				['permissions', 'view_warning_own'],
+			];
 		}
 
-		IntegrationHook::call('integrate_warning_settings', array(&$config_vars));
+		IntegrationHook::call('integrate_warning_settings', [&$config_vars]);
 
 		return $config_vars;
 	}
@@ -233,8 +227,9 @@ public static function getConfigVars(): array
 	 */
 	public static function modifyWarningSettings($return_config = false)
 	{
-		if (!empty($return_config))
+		if (!empty($return_config)) {
 			return self::getConfigVars();
+		}
 
 		self::load();
 		self::$obj->execute();
@@ -249,12 +244,12 @@ public static function modifyWarningSettings($return_config = false)
 	 */
 	protected function __construct()
 	{
-		
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Warnings::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Warnings::exportStatic')) {
 	Warnings::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Admin/index.php b/Sources/Actions/Admin/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Sources/Actions/Admin/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Sources/Actions/Agreement.php b/Sources/Actions/Agreement.php
index b0795eb357..389585fb09 100644
--- a/Sources/Actions/Agreement.php
+++ b/Sources/Actions/Agreement.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Config;
 use SMF\ErrorHandler;
@@ -37,12 +36,13 @@ class Agreement implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Agreement',
-		),
-	);
+			'canRequireAgreement' => 'canRequireAgreement',
+			'canRequirePrivacyPolicy' => 'canRequirePrivacyPolicy',
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -74,21 +74,24 @@ public function execute(): void
 		Theme::loadTemplate('Agreement');
 
 		$page_title = '';
-		if (!empty(Utils::$context['agreement']) && !empty(Utils::$context['privacy_policy']))
+
+		if (!empty(Utils::$context['agreement']) && !empty(Utils::$context['privacy_policy'])) {
 			$page_title = Lang::$txt['agreement_and_privacy_policy'];
-		elseif (!empty(Utils::$context['agreement']))
+		} elseif (!empty(Utils::$context['agreement'])) {
 			$page_title = Lang::$txt['agreement'];
-		elseif (!empty(Utils::$context['privacy_policy']))
+		} elseif (!empty(Utils::$context['privacy_policy'])) {
 			$page_title = Lang::$txt['privacy_policy'];
+		}
 
 		Utils::$context['page_title'] = $page_title;
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=agreement',
 			'name' => Utils::$context['page_title'],
-		);
+		];
 
-		if (isset($_SESSION['old_url']))
+		if (isset($_SESSION['old_url'])) {
 			$_SESSION['redirect_url'] = $_SESSION['old_url'];
+		}
 	}
 
 	/***********************
@@ -102,8 +105,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -124,13 +128,15 @@ public static function call(): void
 	public static function canRequireAgreement(): bool
 	{
 		// Guests can't agree
-		if (!empty(User::$me->is_guest) || empty(Config::$modSettings['requireAgreement']))
+		if (!empty(User::$me->is_guest) || empty(Config::$modSettings['requireAgreement'])) {
 			return false;
+		}
 
 		$agreement_lang = file_exists(Config::$boarddir . '/agreement.' . User::$me->language . '.txt') ? User::$me->language : 'default';
 
-		if (empty(Config::$modSettings['agreement_updated_' . $agreement_lang]))
+		if (empty(Config::$modSettings['agreement_updated_' . $agreement_lang])) {
 			return false;
+		}
 
 		Utils::$context['agreement_accepted_date'] = empty(Theme::$current->options['agreement_accepted']) ? 0 : Theme::$current->options['agreement_accepted'];
 
@@ -145,13 +151,15 @@ public static function canRequireAgreement(): bool
 	 */
 	public static function canRequirePrivacyPolicy(): bool
 	{
-		if (!empty(User::$me->is_guest) || empty(Config::$modSettings['requirePolicyAgreement']))
+		if (!empty(User::$me->is_guest) || empty(Config::$modSettings['requirePolicyAgreement'])) {
 			return false;
+		}
 
 		$policy_lang = !empty(Config::$modSettings['policy_' . User::$me->language]) ? User::$me->language : Lang::$default;
 
-		if (empty(Config::$modSettings['policy_updated_' . $policy_lang]))
+		if (empty(Config::$modSettings['policy_updated_' . $policy_lang])) {
 			return false;
+		}
 
 		Utils::$context['privacy_policy_accepted_date'] = empty(Theme::$current->options['policy_accepted']) ? 0 : Theme::$current->options['policy_accepted'];
 
@@ -180,40 +188,41 @@ protected function prepareAgreementContext(): void
 		Utils::$context['can_accept_privacy_policy'] = !empty(Config::$modSettings['requirePolicyAgreement']) && self::canRequirePrivacyPolicy();
 		Utils::$context['accept_doc'] = Utils::$context['can_accept_agreement'] || Utils::$context['can_accept_privacy_policy'];
 
-		if (!Utils::$context['accept_doc'] || Utils::$context['can_accept_agreement'])
-		{
+		if (!Utils::$context['accept_doc'] || Utils::$context['can_accept_agreement']) {
 			// Grab the agreement.
 			// Have we got a localized one?
-			if (file_exists(Config::$boarddir . '/agreement.' . User::$me->language . '.txt'))
+			if (file_exists(Config::$boarddir . '/agreement.' . User::$me->language . '.txt')) {
 				Utils::$context['agreement_file'] = Config::$boarddir . '/agreement.' . User::$me->language . '.txt';
-			elseif (file_exists(Config::$boarddir . '/agreement.txt'))
+			} elseif (file_exists(Config::$boarddir . '/agreement.txt')) {
 				Utils::$context['agreement_file'] = Config::$boarddir . '/agreement.txt';
+			}
 
-			if (!empty(Utils::$context['agreement_file']))
-			{
-				$cache_id = strtr(Utils::$context['agreement_file'], array(Config::$boarddir => '', '.txt' => '', '.' => '_'));
+			if (!empty(Utils::$context['agreement_file'])) {
+				$cache_id = strtr(Utils::$context['agreement_file'], [Config::$boarddir => '', '.txt' => '', '.' => '_']);
 				Utils::$context['agreement'] = BBCodeParser::load()->parse(file_get_contents(Utils::$context['agreement_file']), true, $cache_id);
-			}
-			elseif (Utils::$context['can_accept_agreement'])
+			} elseif (Utils::$context['can_accept_agreement']) {
 				ErrorHandler::fatalLang('error_no_agreement', false);
+			}
 		}
 
-		if (!Utils::$context['accept_doc'] || Utils::$context['can_accept_privacy_policy'])
-		{
+		if (!Utils::$context['accept_doc'] || Utils::$context['can_accept_privacy_policy']) {
 			// Have we got a localized policy?
-			if (!empty(Config::$modSettings['policy_' . User::$me->language]))
+			if (!empty(Config::$modSettings['policy_' . User::$me->language])) {
 				Utils::$context['privacy_policy'] = BBCodeParser::load()->parse(Config::$modSettings['policy_' . User::$me->language]);
-			elseif (!empty(Config::$modSettings['policy_' . Lang::$default]))
+			} elseif (!empty(Config::$modSettings['policy_' . Lang::$default])) {
 				Utils::$context['privacy_policy'] = BBCodeParser::load()->parse(Config::$modSettings['policy_' . Lang::$default]);
+			}
 			// Then I guess we've got nothing
-			elseif (Utils::$context['can_accept_privacy_policy'])
+			elseif (Utils::$context['can_accept_privacy_policy']) {
 				ErrorHandler::fatalLang('error_no_privacy_policy', false);
+			}
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Agreement::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Agreement::exportStatic')) {
 	Agreement::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/AgreementAccept.php b/Sources/Actions/AgreementAccept.php
index d97cb515f6..53cfff1859 100644
--- a/Sources/Actions/AgreementAccept.php
+++ b/Sources/Actions/AgreementAccept.php
@@ -14,12 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Logging;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Records when the user accepted the registration agreement and privacy policy.
@@ -33,12 +32,11 @@ class AgreementAccept extends Agreement
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AcceptAgreement',
-		),
-	);
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -68,32 +66,31 @@ public function execute(): void
 		$can_accept_agreement = !empty(Config::$modSettings['requireAgreement']) && parent::canRequireAgreement();
 		$can_accept_privacy_policy = !empty(Config::$modSettings['requirePolicyAgreement']) && parent::canRequirePrivacyPolicy();
 
-		if ($can_accept_agreement || $can_accept_privacy_policy)
-		{
+		if ($can_accept_agreement || $can_accept_privacy_policy) {
 			User::$me->checkSession();
 
-			if ($can_accept_agreement)
-			{
-				Db::$db->insert('replace',
+			if ($can_accept_agreement) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}themes',
-					array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'),
-					array(User::$me->id, 1, 'agreement_accepted', time()),
-					array('id_member', 'id_theme', 'variable')
+					['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'],
+					[User::$me->id, 1, 'agreement_accepted', time()],
+					['id_member', 'id_theme', 'variable'],
 				);
 
-				Logging::logAction('agreement_accepted', array('applicator' => User::$me->id), 'user');
+				Logging::logAction('agreement_accepted', ['applicator' => User::$me->id], 'user');
 			}
 
-			if ($can_accept_privacy_policy)
-			{
-				Db::$db->insert('replace',
+			if ($can_accept_privacy_policy) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}themes',
-					array('id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'),
-					array(User::$me->id, 1, 'policy_accepted', time()),
-					array('id_member', 'id_theme', 'variable')
+					['id_member' => 'int', 'id_theme' => 'int', 'variable' => 'string', 'value' => 'string'],
+					[User::$me->id, 1, 'policy_accepted', time()],
+					['id_member', 'id_theme', 'variable'],
 				);
 
-				Logging::logAction('policy_accepted', array('applicator' => User::$me->id), 'user');
+				Logging::logAction('policy_accepted', ['applicator' => User::$me->id], 'user');
 			}
 		}
 
@@ -112,8 +109,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -139,7 +137,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\AgreementAccept::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\AgreementAccept::exportStatic')) {
 	AgreementAccept::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Announce.php b/Sources/Actions/Announce.php
index 314b778971..36726457f9 100644
--- a/Sources/Actions/Announce.php
+++ b/Sources/Actions/Announce.php
@@ -14,23 +14,20 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
-use SMF\BrowserDetector;
 use SMF\Board;
+use SMF\BrowserDetector;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\Lang;
 use SMF\Logging;
 use SMF\Mail;
-use SMF\Msg;
 use SMF\Theme;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class handles sending announcements about topics.
@@ -44,14 +41,13 @@ class Announce implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AnnounceTopic',
 			'selectGroup' => 'AnnouncementSelectMembergroup',
-			'send' => 'AnnouncementSend',
-		),
-	);
+			'announcementSend' => 'AnnouncementSend',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -74,10 +70,10 @@ class Announce implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
-		'selectgroup' => 'selectGroup',
+	public static array $subactions = [
+		'selectgroup' => 'select',
 		'send' => 'send',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -100,41 +96,44 @@ class Announce implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
 	 *
 	 */
-	public function selectGroup(): void
+	public function select(): void
 	{
-		$groups = array_diff(array_map('intval', array_merge(Board::$info->groups, array(Group::ADMIN))), array(Group::GUEST));
+		$groups = array_diff(array_map('intval', array_merge(Board::$info->groups, [Group::ADMIN])), [Group::GUEST]);
 
 		// Get all membergroups that have access to the board the announcement was made on.
 		Utils::$context['groups'] = Group::load($groups);
 
 		// Count the members in each group.
-		$groups_to_count = array_map(fn($group) => $group->id, Utils::$context['groups']);
+		$groups_to_count = array_map(fn ($group) => $group->id, Utils::$context['groups']);
 
 		// Counting all the regular members could be a performance hit on large forums,
 		// so don't do that for anyone without high level permissions.
-		if (!User::$me->allowedTo('manage_membergroups'))
-			$groups_to_count = array_diff($groups_to_count, array(Group::REGULAR));
+		if (!User::$me->allowedTo('manage_membergroups')) {
+			$groups_to_count = array_diff($groups_to_count, [Group::REGULAR]);
+		}
 
 		Group::countMembersBatch($groups_to_count);
 
 		// Get the subject of the topic we're about to announce.
-		$request = Db::$db->query('', '
-			SELECT m.subject
+		$request = Db::$db->query(
+			'',
+			'SELECT m.subject
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 			WHERE t.id_topic = {int:current_topic}',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
 		list(Utils::$context['topic_subject']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -155,28 +154,32 @@ public function send(): void
 		User::$me->checkSession();
 
 		Utils::$context['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
-		$groups = array_merge(Board::$info->groups, array(1));
+		$groups = array_merge(Board::$info->groups, [1]);
 
-		if (isset($_POST['membergroups']))
+		if (isset($_POST['membergroups'])) {
 			$_POST['who'] = explode(',', $_POST['membergroups']);
+		}
 
 		// Check whether at least one membergroup was selected.
-		if (empty($_POST['who']))
+		if (empty($_POST['who'])) {
 			ErrorHandler::fatalLang('no_membergroup_selected');
+		}
 
 		// Make sure all membergroups are integers and can access the board of the announcement.
-		foreach ($_POST['who'] as $id => $mg)
+		foreach ($_POST['who'] as $id => $mg) {
 			$_POST['who'][$id] = in_array((int) $mg, $groups) ? (int) $mg : 0;
+		}
 
 		// Get the topic subject and censor it.
-		$request = Db::$db->query('', '
-			SELECT m.id_msg, m.subject, m.body
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_msg, m.subject, m.body
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 			WHERE t.id_topic = {int:current_topic}',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
 		list($id_msg, Utils::$context['topic_subject'], $message) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -184,52 +187,48 @@ public function send(): void
 		Lang::censorText(Utils::$context['topic_subject']);
 		Lang::censorText($message);
 
-		$message = trim(Utils::htmlspecialcharsDecode(strip_tags(strtr(BBCodeParser::load()->parse($message, false, $id_msg), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']')))));
+		$message = trim(Utils::htmlspecialcharsDecode(strip_tags(strtr(BBCodeParser::load()->parse($message, false, $id_msg), ['<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']']))));
 
 		// Select the email addresses for this batch.
-		$announcements = array();
-		$rows = array();
+		$announcements = [];
+		$rows = [];
 
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, mem.email_address, mem.lngfile
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, mem.email_address, mem.lngfile
 			FROM {db_prefix}members AS mem
 			WHERE (mem.id_group IN ({array_int:group_list}) OR mem.id_post_group IN ({array_int:group_list}) OR FIND_IN_SET({raw:additional_group_list}, mem.additional_groups) != 0)
 				AND mem.is_activated = {int:is_activated}
 				AND mem.id_member > {int:start}
 			ORDER BY mem.id_member
 			LIMIT {int:chunk_size}',
-			array(
+			[
 				'group_list' => $_POST['who'],
 				'is_activated' => 1,
 				'start' => Utils::$context['start'],
 				'additional_group_list' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $_POST['who']),
 				// @todo Might need an interface?
 				'chunk_size' => 500,
-			)
+			],
 		);
+
 		// All members have received a mail. Go to the next screen.
-		if (Db::$db->num_rows($request) == 0)
-		{
+		if (Db::$db->num_rows($request) == 0) {
 			Db::$db->free_result($request);
 
-			Logging::logAction('announce_topic', array('topic' => Topic::$topic_id), 'user');
+			Logging::logAction('announce_topic', ['topic' => Topic::$topic_id], 'user');
 
-			if (!empty($_REQUEST['move']) && User::$me->allowedTo('move_any'))
-			{
+			if (!empty($_REQUEST['move']) && User::$me->allowedTo('move_any')) {
 				Utils::redirectexit('action=movetopic;topic=' . Topic::$topic_id . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
-			}
-			elseif (!empty($_REQUEST['goback']))
-			{
+			} elseif (!empty($_REQUEST['goback'])) {
 				Utils::redirectexit('topic=' . Topic::$topic_id . '.new;boardseen#new', BrowserDetector::isBrowser('ie'));
-			}
-			else
-			{
+			} else {
 				Utils::redirectexit('board=' . Board::$info->id . '.0');
 			}
 		}
+
 		// Loop through all members that'll receive an announcement in this batch.
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$rows[$row['id_member']] = $row;
 		}
 		Db::$db->free_result($request);
@@ -237,51 +236,47 @@ public function send(): void
 		// Load their alert preferences
 		$prefs = Notify::getNotifyPrefs(array_keys($rows), 'announcements', true);
 
-		foreach ($rows as $row)
-		{
+		foreach ($rows as $row) {
 			Utils::$context['start'] = $row['id_member'];
 
 			// Force them to have it?
-			if (empty($prefs[$row['id_member']]['announcements']))
+			if (empty($prefs[$row['id_member']]['announcements'])) {
 				continue;
+			}
 
 			$cur_language = empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $row['lngfile'];
 
 			// If the language wasn't defined yet, load it and compose a notification message.
-			if (!isset($announcements[$cur_language]))
-			{
-				$replacements = array(
+			if (!isset($announcements[$cur_language])) {
+				$replacements = [
 					'TOPICSUBJECT' => Utils::$context['topic_subject'],
 					'MESSAGE' => $message,
 					'TOPICLINK' => Config::$scripturl . '?topic=' . Topic::$topic_id . '.0',
 					'UNSUBSCRIBELINK' => Config::$scripturl . '?action=notifyannouncements;u={UNSUBSCRIBE_ID};token={UNSUBSCRIBE_TOKEN}',
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('new_announcement', $replacements, $cur_language);
 
-				$announcements[$cur_language] = array(
+				$announcements[$cur_language] = [
 					'subject' => $emaildata['subject'],
 					'body' => $emaildata['body'],
 					'is_html' => $emaildata['is_html'],
-					'recipients' => array(),
-				);
+					'recipients' => [],
+				];
 			}
 
 			$announcements[$cur_language]['recipients'][$row['id_member']] = $row['email_address'];
 		}
 
 		// For each language send a different mail - low priority...
-		foreach ($announcements as $lang => $mail)
-		{
-			foreach ($mail['recipients'] as $member_id => $member_email)
-			{
+		foreach ($announcements as $lang => $mail) {
+			foreach ($mail['recipients'] as $member_id => $member_email) {
 				$token = Notify::createUnsubscribeToken($member_id, $member_email, 'announcements');
 
-				$body = str_replace(array('{UNSUBSCRIBE_ID}', '{UNSUBSCRIBE_TOKEN}'), array($member_id, $token), $mail['body']);
+				$body = str_replace(['{UNSUBSCRIBE_ID}', '{UNSUBSCRIBE_TOKEN}'], [$member_id, $token], $mail['body']);
 
 				Mail::send($member_email, $mail['subject'], $body, null, null, false, 5);
 			}
-
 		}
 
 		Utils::$context['percentage_done'] = round(100 * Utils::$context['start'] / Config::$modSettings['latestMember'], 1);
@@ -292,8 +287,9 @@ public function send(): void
 		Utils::$context['sub_template'] = 'announcement_send';
 
 		// Go back to the correct language for the user ;).
-		if (!empty(Config::$modSettings['userLanguage']))
+		if (!empty(Config::$modSettings['userLanguage'])) {
 			Lang::load('Post');
+		}
 	}
 
 	/***********************
@@ -307,8 +303,9 @@ public function send(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -321,6 +318,26 @@ public static function call(): void
 		self::load()->execute();
 	}
 
+	/**
+	 * Backward compatibility wrapper for the selectgroup sub-action.
+	 */
+	public static function selectGroup(): void
+	{
+		self::load();
+		self::$obj->subaction = 'selectgroup';
+		self::$obj->execute();
+	}
+
+	/**
+	 * Backward compatibility wrapper for the send sub-action.
+	 */
+	public static function announcementSend(): void
+	{
+		self::load();
+		self::$obj->subaction = 'send';
+		self::$obj->execute();
+	}
+
 	/******************
 	 * Internal methods
 	 ******************/
@@ -334,21 +351,24 @@ protected function __construct()
 
 		User::$me->validateSession();
 
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('topic_gone', false);
+		}
 
 		Lang::load('Post');
 		Theme::loadTemplate('Post');
 
 		Utils::$context['page_title'] = Lang::$txt['announce_topic'];
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Announce::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Announce::exportStatic')) {
 	Announce::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/AttachmentApprove.php b/Sources/Actions/AttachmentApprove.php
index c8ef3dc8e7..7f741f7731 100644
--- a/Sources/Actions/AttachmentApprove.php
+++ b/Sources/Actions/AttachmentApprove.php
@@ -13,13 +13,12 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Allows the moderator to approve or reject attachments.
@@ -33,12 +32,11 @@ class AttachmentApprove implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ApproveAttach',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -67,62 +65,61 @@ public function execute(): void
 		// If it approve or delete?
 		$is_approve = !isset($_GET['sa']) || $_GET['sa'] != 'reject';
 
-		$attachments = array();
+		$attachments = [];
 
 		// If we are approving all ID's in a message, get the ID's.
-		if ($_GET['sa'] == 'all' && !empty($_GET['mid']))
-		{
+		if ($_GET['sa'] == 'all' && !empty($_GET['mid'])) {
 			$id_msg = (int) $_GET['mid'];
 
-			$request = Db::$db->query('', '
-				SELECT id_attach
+			$request = Db::$db->query(
+				'',
+				'SELECT id_attach
 				FROM {db_prefix}attachments
 				WHERE id_msg = {int:id_msg}
 					AND approved = {int:is_approved}
 					AND attachment_type = {int:attachment_type}',
-				array(
+				[
 					'id_msg' => $id_msg,
 					'is_approved' => 0,
 					'attachment_type' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$attachments[] = $row['id_attach'];
 			}
 			Db::$db->free_result($request);
-		}
-		elseif (!empty($_GET['aid']))
-		{
+		} elseif (!empty($_GET['aid'])) {
 			$attachments[] = (int) $_GET['aid'];
 		}
 
-		if (empty($attachments))
+		if (empty($attachments)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Now we have some ID's cleaned and ready to approve, but first - let's check we have permission!
 		$allowed_boards = User::$me->boardsAllowedTo('approve_posts');
 
 		// Validate the attachments exist and are the right approval state.
-		$request = Db::$db->query('', '
-			SELECT a.id_attach, m.id_board, m.id_msg, m.id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT a.id_attach, m.id_board, m.id_msg, m.id_topic
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 			WHERE a.id_attach IN ({array_int:attachments})
 				AND a.attachment_type = {int:attachment_type}
 				AND a.approved = {int:is_approved}',
-			array(
+			[
 				'attachments' => $attachments,
 				'attachment_type' => 0,
 				'is_approved' => 0,
-			)
+			],
 		);
-		$attachments = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$attachments = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// We can only add it if we can approve in this board!
-			if ($allowed_boards = array(0) || in_array($row['id_board'], $allowed_boards))
-			{
+			if ($allowed_boards = [0] || in_array($row['id_board'], $allowed_boards)) {
 				$attachments[] = $row['id_attach'];
 
 				// Also come up with the redirection URL.
@@ -131,18 +128,16 @@ public function execute(): void
 		}
 		Db::$db->free_result($request);
 
-		if (empty($attachments))
+		if (empty($attachments)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Finally, we are there. Follow through!
-		if ($is_approve)
-		{
+		if ($is_approve) {
 			// Checked and deemed worthy.
 			Attachment::approve($attachments);
-		}
-		else
-		{
-			Attachment::remove(array('id_attach' => $attachments, 'do_logging' => true));
+		} else {
+			Attachment::remove(['id_attach' => $attachments, 'do_logging' => true]);
 		}
 
 		// Return to the topic....
@@ -160,8 +155,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -187,7 +183,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\AttachmentApprove::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\AttachmentApprove::exportStatic')) {
 	AttachmentApprove::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/AttachmentDownload.php b/Sources/Actions/AttachmentDownload.php
index eccc091713..32aacca34d 100644
--- a/Sources/Actions/AttachmentDownload.php
+++ b/Sources/Actions/AttachmentDownload.php
@@ -13,17 +13,16 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
 use SMF\BrowserDetector;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Downloads an avatar or attachment based on $_GET['attach'], and increments the download count.
@@ -42,12 +41,11 @@ class AttachmentDownload implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'showAttachment',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -96,31 +94,29 @@ public function execute(): void
 		header_remove('content-encoding');
 
 		// We need a valid ID.
-		if (empty($this->id))
-		{
+		if (empty($this->id)) {
 			Utils::sendHttpStatus(404, 'File Not Found');
+
 			die('404 File Not Found');
 		}
 
 		// No access in strict maintenance mode.
-		if (!empty(Config::$maintenance) && Config::$maintenance == 2)
-		{
+		if (!empty(Config::$maintenance) && Config::$maintenance == 2) {
 			Utils::sendHttpStatus(404, 'File Not Found');
+
 			die('404 File Not Found');
 		}
 
 		// Use cache when possible.
-		if (($cache = CacheApi::get('attachment_lookup_id-' . $this->id)) != null)
-		{
-			list ($file, $thumbFile) = $cache;
+		if (($cache = CacheApi::get('attachment_lookup_id-' . $this->id)) != null) {
+			list($file, $thumbFile) = $cache;
 
 			$file = @unserialize($file);
 			$thumbFile = @unserialize($thumbFile);
 		}
 
 		// Get the info from the DB.
-		if (empty($file) || empty($thumbFile) && !empty($file->thumb))
-		{
+		if (empty($file) || empty($thumbFile) && !empty($file->thumb)) {
 			/*
 			 * Do we have a hook wanting to use our attachment system?
 			 *
@@ -129,13 +125,13 @@ public function execute(): void
 			 * SMF\Attachment::load() method.
 			 */
 			$request = null;
-			IntegrationHook::call('integrate_download_request', array(&$request));
-			if (!is_null($request) && Db::$db->is_resource($request))
-			{
+			IntegrationHook::call('integrate_download_request', [&$request]);
+
+			if (!is_null($request) && Db::$db->is_resource($request)) {
 				// No attachment has been found.
-				if (Db::$db->num_rows($request) == 0)
-				{
+				if (Db::$db->num_rows($request) == 0) {
 					Utils::sendHttpStatus(404, 'File Not Found');
+
 					die('404 File Not Found');
 				}
 
@@ -144,46 +140,41 @@ public function execute(): void
 
 				$file = new Attachment(0, $row);
 				$file->setFileProperties();
-			}
-			else
-			{
+			} else {
 				Attachment::load($this->id);
 
-				if (!isset(Attachment::$loaded[$this->id]))
-				{
+				if (!isset(Attachment::$loaded[$this->id])) {
 					Utils::sendHttpStatus(404, 'File Not Found');
+
 					die('404 File Not Found');
 				}
 
 				$file = Attachment::$loaded[$this->id];
-				$file->set(array('source' => 'SMF'));
+				$file->set(['source' => 'SMF']);
 				$file->setFileProperties();
 			}
 
-			if (!empty($file->thumb))
-			{
+			if (!empty($file->thumb)) {
 				Attachment::load($file->thumb);
 				$thumbFile = Attachment::$loaded[$file->thumb];
-				$thumbFile->set(array('source' => 'SMF'));
+				$thumbFile->set(['source' => 'SMF']);
 				$thumbFile->setFileProperties();
 			}
 
 			// Cache it.
-			if (!empty($file) || !empty($thumbFile))
-				CacheApi::put('attachment_lookup_id-' . $this->id, array(serialize($file ?? null), serialize($thumbFile ?? null)), mt_rand(850, 900));
+			if (!empty($file) || !empty($thumbFile)) {
+				CacheApi::put('attachment_lookup_id-' . $this->id, [serialize($file ?? null), serialize($thumbFile ?? null)], mt_rand(850, 900));
+			}
 		}
 
 		// Can they see attachments on this board?
-		if (!empty($file->msg))
-		{
+		if (!empty($file->msg)) {
 			// Special case for profile exports.
-			if (!empty(Utils::$context['attachment_allow_hidden_boards']))
-			{
-				$boards_allowed = array(0);
+			if (!empty(Utils::$context['attachment_allow_hidden_boards'])) {
+				$boards_allowed = [0];
 			}
 			// Check permissions and board access.
-			elseif (($boards_allowed = CacheApi::get('view_attachment_boards_id-' . User::$me->id)) == null)
-			{
+			elseif (($boards_allowed = CacheApi::get('view_attachment_boards_id-' . User::$me->id)) == null) {
 				$boards_allowed = User::$me->boardsAllowedTo('view_attachments');
 				CacheApi::put('view_attachment_boards_id-' . User::$me->id, $boards_allowed, mt_rand(850, 900));
 			}
@@ -210,122 +201,128 @@ public function execute(): void
 					!empty($file->msg)
 					&& (
 						empty($file->board)
-						|| ($boards_allowed !== array(0) && !in_array($file->board, $boards_allowed))
+						|| ($boards_allowed !== [0] && !in_array($file->board, $boards_allowed))
 					)
 				)
 			)
 			// We are not previewing an attachment.
 			&& !isset($_SESSION['attachments_can_preview'][$this->id])
-		)
-		{
+		) {
 			Utils::sendHttpStatus(404, 'File Not Found');
+
 			die('404 File Not Found');
 		}
 
 		// If attachment is unapproved, see if user is allowed to approve
-		if (!$file->approved && Config::$modSettings['postmod_active'] && !User::$me->allowedTo('approve_posts'))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member
+		if (!$file->approved && Config::$modSettings['postmod_active'] && !User::$me->allowedTo('approve_posts')) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}messages
 				WHERE id_msg = {int:id_msg}
 				LIMIT 1',
-				array(
+				[
 					'id_msg' => $file->msg,
-				)
+				],
 			);
 
 			$id_member = Db::$db->fetch_assoc($request)['id_member'];
 			Db::$db->free_result($request);
 
 			// Let users see own unapproved attachments
-			if ($id_member != User::$me->id)
-			{
+			if ($id_member != User::$me->id) {
 				Utils::sendHttpStatus(403, 'Forbidden');
+
 				die('403 Forbidden');
 			}
 		}
 
 		// Replace the normal file with its thumbnail if it has one!
-		if (!empty($this->showThumb) && !empty($thumbFile))
+		if (!empty($this->showThumb) && !empty($thumbFile)) {
 			$file = $thumbFile;
+		}
 
 		// No point in a nicer message, because this is supposed to be an attachment anyway...
-		if (empty($file->exists))
-		{
+		if (empty($file->exists)) {
 			Utils::sendHttpStatus(404, 'File Not Found');
+
 			die('404 File Not Found');
 		}
 
 		// If it hasn't been modified since the last time this attachment was retrieved, there's no need to display it again.
-		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']))
-		{
+		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 			list($modified_since) = explode(';', $_SERVER['HTTP_IF_MODIFIED_SINCE']);
-			if (!empty($file->mtime) && strtotime($modified_since) >= $file->mtime)
-			{
+
+			if (!empty($file->mtime) && strtotime($modified_since) >= $file->mtime) {
 				ob_end_clean();
 				header_remove('content-encoding');
 
 				// Answer the question - no, it hasn't been modified ;).
 				Utils::sendHttpStatus(304);
+
 				exit;
 			}
 		}
 
 		// Check whether the ETag was sent back, and cache based on that...
-		if (!empty($file->etag) && !empty($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $file->etag) !== false)
-		{
+		if (!empty($file->etag) && !empty($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $file->etag) !== false) {
 			ob_end_clean();
 			header_remove('content-encoding');
 
 			Utils::sendHttpStatus(304);
+
 			exit;
 		}
 
 		// If this is a partial download, we need to determine what data range to send
 		$range = 0;
-		if (isset($_SERVER['HTTP_RANGE']))
-		{
-			list($a, $range) = explode("=", $_SERVER['HTTP_RANGE'], 2);
-			list($range) = explode(",", $range, 2);
-			list($range, $range_end) = explode("-", $range);
+
+		if (isset($_SERVER['HTTP_RANGE'])) {
+			list($a, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2);
+			list($range) = explode(',', $range, 2);
+			list($range, $range_end) = explode('-', $range);
 			$range = intval($range);
 			$range_end = !$range_end ? $file->size - 1 : intval($range_end);
 			$length = $range_end - $range + 1;
 		}
 
 		// Update the download counter (unless it's a thumbnail or resuming an incomplete download).
-		if ($file->type != 3 && empty($this->showThumb) && empty($_REQUEST['preview']) && $range === 0 && empty(Utils::$context['skip_downloads_increment']))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}attachments
+		if ($file->type != 3 && empty($this->showThumb) && empty($_REQUEST['preview']) && $range === 0 && empty(Utils::$context['skip_downloads_increment'])) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}attachments
 				SET downloads = downloads + 1
 				WHERE id_attach = {int:id_attach}',
-				array(
+				[
 					'id_attach' => $this->id,
-				)
+				],
 			);
 		}
 
 		// Make sure the mime type warrants an inline display.
-		if (empty($file->mime_type))
+		if (empty($file->mime_type)) {
 			$file->mime_type = 'application/octet-stream';
+		}
 
-		if (BrowserDetector::isBrowser('ie') || BrowserDetector::isBrowser('opera'))
-			$file->mime_type = strtr($file->mime_type, array('application/octet-stream' => 'application/octetstream'));
+		if (BrowserDetector::isBrowser('ie') || BrowserDetector::isBrowser('opera')) {
+			$file->mime_type = strtr($file->mime_type, ['application/octet-stream' => 'application/octetstream']);
+		}
 
-		if (strpos($file->mime_type, 'image/') !== 0)
+		if (strpos($file->mime_type, 'image/') !== 0) {
 			unset($_REQUEST['image']);
+		}
 
 		// On mobile devices, audio and video should be served inline so the browser can play them.
-		if (isset($_REQUEST['image']) || (BrowserDetector::isBrowser('is_mobile') && (strpos($file->mime_type, 'audio/') === 0 || strpos($file->mime_type, 'video/') === 0)))
+		if (isset($_REQUEST['image']) || (BrowserDetector::isBrowser('is_mobile') && (strpos($file->mime_type, 'audio/') === 0 || strpos($file->mime_type, 'video/') === 0))) {
 			$file->disposition = 'inline';
-		else
+		} else {
 			$file->disposition = 'attachment';
+		}
 
 		// If necessary, prepend the attachment ID to the file name.
-		if (!empty(Utils::$context['prepend_attachment_id']))
+		if (!empty(Utils::$context['prepend_attachment_id'])) {
 			$file->filename = $_REQUEST['attach'] . ' - ' . $file->filename;
+		}
 
 		Utils::emitFile($file, $this->showThumb);
 	}
@@ -341,8 +338,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -365,11 +363,13 @@ public static function call(): void
 	protected function __construct()
 	{
 		// Some defaults that we need.
-		if (!isset(Utils::$context['character_set']))
+		if (!isset(Utils::$context['character_set'])) {
 			Utils::$context['character_set'] = empty(Config::$modSettings['global_character_set']) ? (empty(Lang::$txt['lang_character_set']) ? 'ISO-8859-1' : Lang::$txt['lang_character_set']) : Config::$modSettings['global_character_set'];
+		}
 
-		if (!isset(Utils::$context['utf8']))
+		if (!isset(Utils::$context['utf8'])) {
 			Utils::$context['utf8'] = Utils::$context['character_set'] === 'UTF-8';
+		}
 
 		// Which attachment was requested?
 		$this->id = $_REQUEST['attach'] = isset($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : (int) (isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0);
@@ -380,7 +380,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\AttachmentDownload::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\AttachmentDownload::exportStatic')) {
 	AttachmentDownload::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/AttachmentUpload.php b/Sources/Actions/AttachmentUpload.php
index 099fdae544..4dad251024 100644
--- a/Sources/Actions/AttachmentUpload.php
+++ b/Sources/Actions/AttachmentUpload.php
@@ -15,12 +15,12 @@
 
 use SMF\Attachment;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class handles adding/deleting attachments
@@ -28,79 +28,79 @@
 class AttachmentUpload implements ActionInterface
 {
 	/**
-	 * @var int $_msg The ID of the message this attachment is associated with
+	 * @var int The ID of the message this attachment is associated with
 	 */
 	protected $_msg = 0;
 
 	/**
-	 * @var int|null $_board The ID of the board this attachment's post is in or null if it's not set
+	 * @var int|null The ID of the board this attachment's post is in or null if it's not set
 	 */
 	protected $_board = null;
 
 	/**
-	 * @var string|bool $_attachmentUploadDir An array of info about attachment upload directories or false
+	 * @var string|bool An array of info about attachment upload directories or false
 	 */
 	protected $_attachmentUploadDir = false;
 
 	/**
-	 * @var string $_attchDir The path to the current attachment directory
+	 * @var string The path to the current attachment directory
 	 */
 	protected $_attchDir = '';
 
 	/**
-	 * @var int $_currentAttachmentUploadDir ID of the current attachment directory
+	 * @var int ID of the current attachment directory
 	 */
 	protected $_currentAttachmentUploadDir;
 
 	/**
-	 * @var bool $_canPostAttachment Whether or not an attachment can be posted
+	 * @var bool Whether or not an attachment can be posted
 	 */
 	protected $_canPostAttachment;
 
 	/**
-	 * @var array $_generalErrors An array of information about any errors that occurred
+	 * @var array An array of information about any errors that occurred
 	 */
-	protected $_generalErrors = array();
+	protected $_generalErrors = [];
 
 	/**
-	 * @var mixed $_initialError Not used?
+	 * @var mixed Not used?
 	 */
 	protected $_initialError;
 
 	/**
-	 * @var array $_attachments Not used?
+	 * @var array Not used?
 	 */
-	protected $_attachments = array();
+	protected $_attachments = [];
 
 	/**
-	 * @var array $_attachResults An array of information about the results of each file
+	 * @var array An array of information about the results of each file
 	 */
-	protected $_attachResults = array();
+	protected $_attachResults = [];
 
 	/**
-	 * @var array $_attachSuccess An array of information about successful attachments
+	 * @var array An array of information about successful attachments
 	 */
-	protected $_attachSuccess = array();
+	protected $_attachSuccess = [];
 
 	/**
-	 * @var array $_response An array of response information. @used-by \sendResponse() when adding attachments
+	 * @var array An array of response information. @used-by \sendResponse() when adding attachments
 	 */
-	protected $_response = array(
+	protected $_response = [
 		'error' => true,
-		'data' => array(),
+		'data' => [],
 		'extra' => '',
-	);
+	];
 
 	/**
-	 * @var array $_subActions An array of all valid sub-actions
+	 * @var array An array of all valid sub-actions
 	 */
-	protected $_subActions = array(
+	protected $_subActions = [
 		'add',
 		'delete',
-	);
+	];
 
 	/**
-	 * @var string|bool $_sa The current sub-action, or false if there isn't one
+	 * @var string|bool The current sub-action, or false if there isn't one
 	 */
 	protected $_sa = false;
 
@@ -120,8 +120,9 @@ class AttachmentUpload implements ActionInterface
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -164,18 +165,16 @@ public function execute(): void
 
 		$this->_sa = !empty($_REQUEST['sa']) ? Utils::htmlspecialchars(Utils::htmlTrim($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-		{
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
 			$this->{$this->_sa}();
 		}
 		// Just send a generic message.
-		else
-		{
-			$this->setResponse(array(
+		else {
+			$this->setResponse([
 				'text' => $this->_sa == 'add' ? 'attach_error_title' : 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
-			));
+			]);
 		}
 
 		// Back to the future, oh, to the browser!
@@ -190,28 +189,28 @@ public function delete(): void
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-		{
-			$this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+			$this->setResponse([
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
-			));
+			]);
+
 			return;
 		}
 
 		// Lets pass some params and see what happens :P
-		$affectedMessage = Attachment::remove(array('id_attach' => $attachID), '', true, true);
+		$affectedMessage = Attachment::remove(['id_attach' => $attachID], '', true, true);
 
 		// Gotta also remove the attachment from the session var.
 		unset($_SESSION['already_attached'][$attachID]);
 
 		// $affectedMessage returns an empty array array(0) which php treats as non empty... awesome...
-		$this->setResponse(array(
+		$this->setResponse([
 			'text' => !empty($affectedMessage) ? 'attached_file_deleted' : 'attached_file_deleted_error',
 			'type' => !empty($affectedMessage) ? 'info' : 'warning',
 			'data' => $affectedMessage,
-		));
+		]);
 	}
 
 	/**
@@ -220,13 +219,12 @@ public function delete(): void
 	public function add(): void
 	{
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-		{
-			$this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+			$this->setResponse([
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
-			));
+			]);
 
 			return;
 		}
@@ -235,8 +233,9 @@ public function add(): void
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
+		if (!empty($_SESSION['temp_attachments'])) {
 			$this->createAttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -247,119 +246,115 @@ public function add(): void
 	 */
 	protected function processAttachments(): void
 	{
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+			$_FILES['attachment']['tmp_name'] = [];
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		Utils::$context['attachments']['total_size'] = 0;
 		Utils::$context['attachments']['quantity'] = 0;
 
 		// If this isn't a new post, check the current attachments.
-		if (isset($_REQUEST['msg']))
-		{
+		if (isset($_REQUEST['msg'])) {
 			Utils::$context['attachments']['quantity'] = count(Utils::$context['current_attachments']);
 
-			foreach (Utils::$context['current_attachments'] as $attachment)
+			foreach (Utils::$context['current_attachments'] as $attachment) {
 				Utils::$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
 			unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+			$_SESSION['temp_attachments'] = [];
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty(Config::$modSettings['automanage_attachments']))
+		if (!empty(Config::$modSettings['automanage_attachments'])) {
 			Attachment::automanageCheckDirectory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty(Utils::$context['dir_creation_error']))
-		{
+		if (!empty(Utils::$context['dir_creation_error'])) {
 			$this->_generalErrors[] = Utils::$context['dir_creation_error'];
 		}
 		// The current attach folder has some issues...
-		elseif (!is_dir($this->_attchDir))
-		{
+		elseif (!is_dir($this->_attchDir)) {
 			$this->_generalErrors[] = 'attach_folder_warning';
 
 			ErrorHandler::log(sprintf(Lang::$txt['attach_folder_admin_warning'], $this->_attchDir), 'critical');
 		}
 
 		// If this isn't a new post, check the current attachments.
-		if (empty($this->_generalErrors) && $this->_msg)
-		{
-			Utils::$context['attachments'] = array();
+		if (empty($this->_generalErrors) && $this->_msg) {
+			Utils::$context['attachments'] = [];
 
-			$request = Db::$db->query('', '
-				SELECT COUNT(*), SUM(size)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*), SUM(size)
 				FROM {db_prefix}attachments
 				WHERE id_msg = {int:id_msg}
 					AND attachment_type = {int:attachment_type}',
-				array(
+				[
 					'id_msg' => (int) $this->_msg,
 					'attachment_type' => 0,
-				)
+				],
 			);
 			list(Utils::$context['attachments']['quantity'], Utils::$context['attachments']['total_size']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
-		}
-		else
-		{
-			Utils::$context['attachments'] = array(
+		} else {
+			Utils::$context['attachments'] = [
 				'quantity' => 0,
 				'total_size' => 0,
-			);
+			];
 		}
 
 		// Check for other general errors here.
 
 		// If we have an initial error, delete the files.
-		if (!empty($this->_generalErrors))
-		{
+		if (!empty($this->_generalErrors)) {
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-			{
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
-			$_FILES['attachment']['tmp_name'] = array();
+			$_FILES['attachment']['tmp_name'] = [];
 
 			// No point in going further with this.
 			return;
 		}
 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
-		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-		{
-			if ($_FILES['attachment']['name'][$n] == '')
+		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+			if ($_FILES['attachment']['name'][$n] == '') {
 				continue;
+			}
 
 			// First, let's first check for PHP upload errors.
-			$errors = array();
-			if (!empty($_FILES['attachment']['error'][$n]))
-			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-				{
-					$errors[] = array('file_too_big', array(Config::$modSettings['attachmentSizeLimit']));
-				}
-				else
-				{
+			$errors = [];
+
+			if (!empty($_FILES['attachment']['error'][$n])) {
+				if ($_FILES['attachment']['error'][$n] == 2) {
+					$errors[] = ['file_too_big', [Config::$modSettings['attachmentSizeLimit']]];
+				} else {
 					ErrorHandler::log($_FILES['attachment']['name'][$n] . ': ' . Lang::$txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
 				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-				{
+				if ($_FILES['attachment']['error'][$n] == 6) {
 					ErrorHandler::log($_FILES['attachment']['name'][$n] . ': ' . Lang::$txt['php_upload_error_6'], 'critical');
 				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
+				if (empty($errors)) {
 					$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -367,54 +362,54 @@ protected function processAttachments(): void
 			$destName = $this->_attchDir . '/' . $attachID;
 
 			// No errors, YAY!
-			if (empty($errors))
-			{
+			if (empty($errors)) {
 				// The reported MIME type of the attachment might not be reliable.
 				$detected_mime_type = Utils::getMimeType($_FILES['attachment']['tmp_name'][$n], true);
 
-				if ($detected_mime_type !== false)
+				if ($detected_mime_type !== false) {
 					$_FILES['attachment']['type'][$n] = $detected_mime_type;
+				}
 
-				$_SESSION['temp_attachments'][$attachID] = array(
+				$_SESSION['temp_attachments'][$attachID] = [
 					'name' => Utils::htmlspecialchars(basename($_FILES['attachment']['name'][$n])),
 					'tmp_name' => $destName,
 					'size' => $_FILES['attachment']['size'][$n],
 					'type' => $_FILES['attachment']['type'][$n],
 					'id_folder' => Config::$modSettings['currentAttachmentUploadDir'],
-					'errors' => array(),
-				);
+					'errors' => [],
+				];
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				{
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
 					Utils::makeWritable($destName, 0644);
 				}
 				// This is madness!!
-				else
-				{
+				else {
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
 
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
 						unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 			// Fill up a nice array with some data from the file and the errors encountered so far.
-			else
-			{
-				$_SESSION['temp_attachments'][$attachID] = array(
+			else {
+				$_SESSION['temp_attachments'][$attachID] = [
 					'name' => Utils::htmlspecialchars(basename($_FILES['attachment']['name'][$n])),
 					'tmp_name' => $destName,
 					'errors' => $errors,
-				);
+				];
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
 				Attachment::check($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -427,7 +422,7 @@ protected function processAttachments(): void
 		//   id_folder => Config::$modSettings['currentAttachmentUploadDir']
 		//   errors => An array of errors (use the index of the Lang::$txt variable for that error).
 		// Template changes can be done using "integrate_upload_template".
-		IntegrationHook::call('integrate_attachment_upload', array());
+		IntegrationHook::call('integrate_attachment_upload', []);
 	}
 
 	/**
@@ -436,88 +431,82 @@ protected function processAttachments(): void
 	protected function createAttach(): void
 	{
 		// Create an empty session var to keep track of all the files we attached.
-		if (!isset($_SESSION['already_attached']))
-			$_SESSION['already_attached'] = array();
+		if (!isset($_SESSION['already_attached'])) {
+			$_SESSION['already_attached'] = [];
+		}
 
-		foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-		{
-			$attachmentOptions = array(
+		foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+			$attachmentOptions = [
 				'post' => $this->_msg,
 				'poster' => User::$me->id,
 				'name' => $attachment['name'],
 				'tmp_name' => $attachment['tmp_name'],
-				'size' => isset($attachment['size']) ? $attachment['size'] : 0,
-				'mime_type' => isset($attachment['type']) ? $attachment['type'] : '',
-				'id_folder' => isset($attachment['id_folder']) ? $attachment['id_folder'] : Config::$modSettings['currentAttachmentUploadDir'],
+				'size' => $attachment['size'] ?? 0,
+				'mime_type' => $attachment['type'] ?? '',
+				'id_folder' => $attachment['id_folder'] ?? Config::$modSettings['currentAttachmentUploadDir'],
 				'approved' => !Config::$modSettings['postmod_active'] || User::$me->allowedTo('post_attachment'),
-				'errors' => array(),
-			);
+				'errors' => [],
+			];
 
-			if (empty($attachment['errors']))
-			{
-				if (Attachment::create($attachmentOptions))
-				{
+			if (empty($attachment['errors'])) {
+				if (Attachment::create($attachmentOptions)) {
 					// Avoid JS getting confused.
 					$attachmentOptions['attachID'] = $attachmentOptions['id'];
 					unset($attachmentOptions['id']);
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-					{
+					if (!empty($attachmentOptions['thumb'])) {
 						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
 					}
 
-					if ($this->_msg)
+					if ($this->_msg) {
 						Attachment::assign($_SESSION['already_attached'], $this->_msg);
+					}
 				}
-			}
-			else
-			{
+			} else {
 				// Sort out the errors for display and delete any associated files.
-				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
+				$log_these = ['attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file'];
 
-				foreach ($attachment['errors'] as $error)
-				{
+				foreach ($attachment['errors'] as $error) {
 					$attachmentOptions['errors'][] = sprintf(Lang::$txt['attach_warning'], $attachment['name']);
 
-					if (!is_array($error))
-					{
+					if (!is_array($error)) {
 						$attachmentOptions['errors'][] = Lang::$txt[$error];
 
-						if (in_array($error, $log_these))
+						if (in_array($error, $log_these)) {
 							ErrorHandler::log($attachment['name'] . ': ' . Lang::$txt[$error], 'critical');
-					}
-					else
-					{
+						}
+					} else {
 						$attachmentOptions['errors'][] = vsprintf(Lang::$txt[$error[0]], (array) $error[1]);
 					}
 				}
 
-				if (file_exists($attachment['tmp_name']))
+				if (file_exists($attachment['tmp_name'])) {
 					unlink($attachment['tmp_name']);
+				}
 			}
 
 			// You don't need to know.
-			unset($attachmentOptions['tmp_name']);
-			unset($attachmentOptions['destination']);
+			unset($attachmentOptions['tmp_name'], $attachmentOptions['destination']);
 
 			// Regardless of errors, pass the results.
 			$this->_attachResults[] = $attachmentOptions;
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
+		if (!empty($_SESSION['already_attached'])) {
 			$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 
 		// Allow user to see previews for all of this post's attachments, even if the post hasn't been submitted yet.
-		if (!isset($_SESSION['attachments_can_preview']))
-			$_SESSION['attachments_can_preview'] = array();
+		if (!isset($_SESSION['attachments_can_preview'])) {
+			$_SESSION['attachments_can_preview'] = [];
+		}
 
-		if (!empty($_SESSION['already_attached']))
-		{
+		if (!empty($_SESSION['already_attached'])) {
 			$_SESSION['attachments_can_preview'] += array_fill_keys(array_keys($_SESSION['already_attached']), true);
 		}
 	}
@@ -527,46 +516,41 @@ protected function createAttach(): void
 	 *
 	 * @param array $data Data for the response if we're not adding an attachment
 	 */
-	protected function setResponse($data = array()): void
+	protected function setResponse($data = []): void
 	{
 		// Some default values in case something is missed or neglected :P
-		$this->_response = array(
+		$this->_response = [
 			'text' => 'attach_php_error',
 			'type' => 'error',
 			'data' => false,
-		);
+		];
 
 		// Adding needs some VIP treatment.
-		if ($this->_sa == 'add')
-		{
+		if ($this->_sa == 'add') {
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-			{
-				foreach ($this->_generalErrors as $k => $v)
-				{
+			if ($this->_generalErrors) {
+				foreach ($this->_generalErrors as $k => $v) {
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf(Lang::$txt[$v[0]], (array) $v[1]) : Lang::$txt[$v]);
 				}
 			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-			{
-				foreach ($this->_attachResults as $k => $v)
-				{
+			if ($this->_attachResults) {
+				foreach ($this->_attachResults as $k => $v) {
 					$this->_attachResults[$k]['name'] = urlencode($this->_attachResults[$k]['name']);
 				}
 			}
 
-			$this->_response = array(
+			$this->_response = [
 				'files' => $this->_attachResults ? $this->_attachResults : false,
 				'generalErrors' => $this->_generalErrors ? $this->_generalErrors : false,
-			);
+			];
 		}
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-		{
-			if (!empty($data['text']) && !empty(Lang::$txt[$data['text']]))
+		elseif (!empty($data)) {
+			if (!empty($data['text']) && !empty(Lang::$txt[$data['text']])) {
 				$this->_response['text'] = Lang::$txt[$data['text']];
+			}
 		}
 	}
 
@@ -577,22 +561,20 @@ protected function sendResponse(): void
 	{
 		ob_end_clean();
 
-		if (!empty(Config::$modSettings['enableCompressedOutput']))
-		{
+		if (!empty(Config::$modSettings['enableCompressedOutput'])) {
 			@ob_start('ob_gzhandler');
-		}
-		else
-		{
+		} else {
 			ob_start();
 		}
 
 		// Set the header.
 		header('content-type: application/json; charset=' . Utils::$context['character_set'] . '');
 
-		echo Utils::jsonEncode($this->_response ? $this->_response : array());
+		echo Utils::jsonEncode($this->_response ? $this->_response : []);
 
 		// Done.
 		Utils::obExit(false);
+
 		die;
 	}
 }
diff --git a/Sources/Actions/AutoSuggest.php b/Sources/Actions/AutoSuggest.php
index 3c591ebefd..b1fca12f76 100644
--- a/Sources/Actions/AutoSuggest.php
+++ b/Sources/Actions/AutoSuggest.php
@@ -14,12 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Suggests members, membergroups, or SMF versions in reply to AJAX requests.
@@ -33,13 +32,14 @@ class AutoSuggest implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-			'checkRegistered' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'AutoSuggestHandler' => 'AutoSuggestHandler',
+			'AutoSuggest_Search_Member' => 'AutoSuggest_Search_Member',
+			'AutoSuggest_Search_MemberGroups' => 'AutoSuggest_Search_MemberGroups',
+			'AutoSuggest_Search_SMFVersions' => 'AutoSuggest_Search_SMFVersions',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -67,7 +67,7 @@ class AutoSuggest implements ActionInterface
 	 * Optional search parameters.
 	 * This should be set by the constructor.
 	 */
-	public array $search_param = array();
+	public array $search_param = [];
 
 	/**************************
 	 * Public static properties
@@ -78,11 +78,11 @@ class AutoSuggest implements ActionInterface
 	 *
 	 * Available suggestion types.
 	 */
-	public static array $suggest_types = array(
+	public static array $suggest_types = [
 		'member' => 'member',
 		'membergroups' => 'membergroups',
 		'versions' => 'versions',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -105,24 +105,20 @@ class AutoSuggest implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!isset($this->suggest_type, $this->search, self::$suggest_types[$this->suggest_type]))
+		if (!isset($this->suggest_type, $this->search, self::$suggest_types[$this->suggest_type])) {
 			return;
+		}
 
 		User::$me->checkSession('get');
 
 		Theme::loadTemplate('Xml');
 		Utils::$context['sub_template'] = 'generic_xml';
 
-		if (method_exists($this, self::$suggest_types[$this->suggest_type]))
-		{
-			Utils::$context['xml_data'] = call_user_func(array($this, self::$suggest_types[$this->suggest_type]));
-		}
-		elseif (function_exists('AutoSuggest_Search_' . self::$suggest_types[$this->suggest_type]))
-		{
+		if (method_exists($this, self::$suggest_types[$this->suggest_type])) {
+			Utils::$context['xml_data'] = call_user_func([$this, self::$suggest_types[$this->suggest_type]]);
+		} elseif (function_exists('AutoSuggest_Search_' . self::$suggest_types[$this->suggest_type])) {
 			Utils::$context['xml_data'] = call_user_func('AutoSuggest_Search_' . self::$suggest_types[$this->suggest_type]);
-		}
-		elseif (function_exists('AutoSuggest_Search_' . $this->suggest_type))
-		{
+		} elseif (function_exists('AutoSuggest_Search_' . $this->suggest_type)) {
 			Utils::$context['xml_data'] = call_user_func('AutoSuggest_Search_' . $this->suggest_type);
 		}
 	}
@@ -136,37 +132,38 @@ public function member(): array
 	{
 		$this->sanitizeSearch();
 
-		$xml_data = array(
-			'items' => array(
+		$xml_data = [
+			'items' => [
 				'identifier' => 'item',
-				'children' => array(),
-			),
-		);
+				'children' => [],
+			],
+		];
 
 		// Find the member.
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name
 			FROM {db_prefix}members
 			WHERE {raw:real_name} LIKE {string:search}' . (!empty($this->search_param['buddies']) ? '
 				AND id_member IN ({array_int:buddy_list})' : '') . '
 				AND is_activated IN (1, 11)
 			LIMIT ' . (Utils::entityStrlen($this->search) <= 2 ? '100' : '800'),
-			array(
+			[
 				'real_name' => Db::$db->case_sensitive ? 'LOWER(real_name)' : 'real_name',
 				'buddy_list' => User::$me->buddies,
 				'search' => $this->search,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$row['real_name'] = strtr($row['real_name'], array('&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;'));
 
-			$xml_data['items']['children'][] = array(
-				'attributes' => array(
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$row['real_name'] = strtr($row['real_name'], ['&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;']);
+
+			$xml_data['items']['children'][] = [
+				'attributes' => [
 					'id' => $row['id_member'],
-				),
+				],
 				'value' => $row['real_name'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -182,41 +179,42 @@ public function membergroups(): array
 	{
 		$this->sanitizeSearch();
 
-		$xml_data = array(
-			'items' => array(
+		$xml_data = [
+			'items' => [
 				'identifier' => 'item',
-				'children' => array(),
-			),
-		);
+				'children' => [],
+			],
+		];
 
 		// Find the group.
 		// Only return groups which are not post-based and not "Hidden",
 		// but not the "Administrators" or "Moderators" groups.
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name
 			FROM {db_prefix}membergroups
 			WHERE {raw:group_name} LIKE {string:search}
 				AND min_posts = {int:min_posts}
 				AND id_group NOT IN ({array_int:invalid_groups})
 				AND hidden != {int:hidden}',
-			array(
+			[
 				'group_name' => Db::$db->case_sensitive ? 'LOWER(group_name)' : 'group_name',
 				'min_posts' => -1,
-				'invalid_groups' => array(1, 3),
+				'invalid_groups' => [1, 3],
 				'hidden' => 2,
 				'search' => $this->search,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$row['group_name'] = strtr($row['group_name'], array('&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;'));
 
-			$xml_data['items']['children'][] = array(
-				'attributes' => array(
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$row['group_name'] = strtr($row['group_name'], ['&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;']);
+
+			$xml_data['items']['children'][] = [
+				'attributes' => [
 					'id' => $row['id_group'],
-				),
+				],
 				'value' => $row['group_name'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -230,60 +228,57 @@ public function membergroups(): array
 	 */
 	public function versions(): array
 	{
-		$xml_data = array(
-			'items' => array(
+		$xml_data = [
+			'items' => [
 				'identifier' => 'item',
-				'children' => array(),
-			),
-		);
+				'children' => [],
+			],
+		];
 
 		// First try and get it from the database.
-		$versions = array();
-		$request = Db::$db->query('', '
-			SELECT data
+		$versions = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT data
 			FROM {db_prefix}admin_info_files
 			WHERE filename = {string:latest_versions}
 				AND path = {string:path}',
-			array(
+			[
 				'latest_versions' => 'latest-versions.txt',
 				'path' => '/smf/',
-			)
+			],
 		);
 
-		if (Db::$db->num_rows($request))
-		{
-			$versions = array();
-		}
-		elseif ($row = Db::$db->fetch_assoc($request) && !empty($row['data']))
-		{
+		if (Db::$db->num_rows($request)) {
+			$versions = [];
+		} elseif ($row = Db::$db->fetch_assoc($request) && !empty($row['data'])) {
 			// The file can have either Windows or Linux line endings, but let's
 			// ensure we clean it as best we can.
 			$possible_versions = explode("\n", $row['data']);
 
-			foreach ($possible_versions as $ver)
-			{
+			foreach ($possible_versions as $ver) {
 				$ver = trim($ver);
 
-				if (strpos($ver, 'SMF') === 0)
+				if (strpos($ver, 'SMF') === 0) {
 					$versions[] = $ver;
+				}
 			}
 		}
 		Db::$db->free_result($request);
 
 		// Just in case we don't have anything.
-		if (empty($versions))
-			$versions = array(SMF_FULL_VERSION);
-
-		foreach ($versions as $id => $version)
-		{
-			if (strpos(strtoupper($version), strtoupper($this->search)) !== false)
-			{
-				$xml_data['items']['children'][] = array(
-					'attributes' => array(
+		if (empty($versions)) {
+			$versions = [SMF_FULL_VERSION];
+		}
+
+		foreach ($versions as $id => $version) {
+			if (strpos(strtoupper($version), strtoupper($this->search)) !== false) {
+				$xml_data['items']['children'][] = [
+					'attributes' => [
 						'id' => $id,
-					),
+					],
 					'value' => $version,
-				);
+				];
 			}
 		}
 
@@ -301,8 +296,9 @@ public function versions(): array
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -322,7 +318,7 @@ public static function call(): void
 	 */
 	public static function checkRegistered(string $suggest_type): bool
 	{
-		IntegrationHook::call('integrate_autosuggest', array(&$suggest_types));
+		IntegrationHook::call('integrate_autosuggest', [&$suggest_types]);
 
 		return isset(self::$suggest_types[$suggest_type]) && (method_exists(__CLASS__, $suggest_type) || function_exists('AutoSuggest_Search_' . self::$suggest_types[$this->suggest_type]) || function_exists('AutoSuggest_Search_' . $suggest_type));
 	}
@@ -335,8 +331,9 @@ public static function checkRegistered(string $suggest_type): bool
 	 */
 	public static function AutoSuggestHandler($suggest_type = null)
 	{
-		if (isset($suggest_type))
+		if (isset($suggest_type)) {
 			return self::checkRegistered($suggest_type);
+		}
 
 		self::call();
 	}
@@ -380,17 +377,20 @@ public static function AutoSuggest_Search_SMFVersions(): void
 	 */
 	protected function __construct()
 	{
-		IntegrationHook::call('integrate_autosuggest', array(&self::$suggest_types));
+		IntegrationHook::call('integrate_autosuggest', [&self::$suggest_types]);
 
-		if (!empty($_REQUEST['suggest_type']) && isset(self::$suggest_types[$_REQUEST['suggest_type']]))
+		if (!empty($_REQUEST['suggest_type']) && isset(self::$suggest_types[$_REQUEST['suggest_type']])) {
 			$this->suggest_type = $_REQUEST['suggest_type'];
+		}
 
 		// Any parameters?
-		if (isset($_REQUEST['search_param']))
+		if (isset($_REQUEST['search_param'])) {
 			$this->search_param = Utils::jsonDecode(base64_decode($_REQUEST['search_param']), true);
+		}
 
-		if (isset($_REQUEST['search']))
+		if (isset($_REQUEST['search'])) {
 			$this->search = $_REQUEST['search'];
+		}
 	}
 
 	/**
@@ -400,12 +400,13 @@ protected function sanitizeSearch(): void
 	{
 		$this->search = trim(Utils::strtolower($this->search)) . '*';
 
-		$this->search = strtr($this->search, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '&#038;' => '&amp;'));
+		$this->search = strtr($this->search, ['%' => '\\%', '_' => '\\_', '*' => '%', '?' => '_', '&#038;' => '&amp;']);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\AutoSuggest::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\AutoSuggest::exportStatic')) {
 	AutoSuggest::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/BoardIndex.php b/Sources/Actions/BoardIndex.php
index d2a52c93f6..27558184d7 100644
--- a/Sources/Actions/BoardIndex.php
+++ b/Sources/Actions/BoardIndex.php
@@ -14,11 +14,10 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Category;
 use SMF\Config;
-use SMF\Group;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Logging;
@@ -27,7 +26,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
 
 /**
  * This class shows the board index.
@@ -47,12 +45,13 @@ class BoardIndex implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static array $backcompat = array(
-		'func_names' => array(
+	private static array $backcompat = [
+		'func_names' => [
 			'load' => 'BoardIndex',
+			'call' => 'call',
 			'get' => 'getBoardIndex',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -75,47 +74,43 @@ class BoardIndex implements ActionInterface
 	public function execute(): void
 	{
 		// Retrieve the categories and boards.
-		$boardIndexOptions = array(
+		$boardIndexOptions = [
 			'include_categories' => true,
 			'base_level' => 0,
 			'parent_id' => 0,
 			'set_latest_post' => true,
 			'countChildPosts' => !empty(Config::$modSettings['countChildPosts']),
-		);
+		];
 		Utils::$context['categories'] = self::get($boardIndexOptions);
 
 		// Now set up for the info center.
-		Utils::$context['info_center'] = array();
+		Utils::$context['info_center'] = [];
 
 		// Retrieve the latest posts if the theme settings require it.
-		if (!empty(Theme::$current->settings['number_recent_posts']))
-		{
-			if (Theme::$current->settings['number_recent_posts'] > 1)
-			{
-				Utils::$context['latest_posts'] = CacheApi::quickGet('boardindex-latest_posts:' . md5(User::$me->query_wanna_see_board . User::$me->language), '', array($this, 'cache_getLastPosts'), array(Theme::$current->settings['number_recent_posts']));
+		if (!empty(Theme::$current->settings['number_recent_posts'])) {
+			if (Theme::$current->settings['number_recent_posts'] > 1) {
+				Utils::$context['latest_posts'] = CacheApi::quickGet('boardindex-latest_posts:' . md5(User::$me->query_wanna_see_board . User::$me->language), '', [$this, 'cache_getLastPosts'], [Theme::$current->settings['number_recent_posts']]);
 			}
 
-			if (!empty(Utils::$context['latest_posts']) || !empty(Utils::$context['latest_post']))
-			{
-				Utils::$context['info_center'][] = array(
+			if (!empty(Utils::$context['latest_posts']) || !empty(Utils::$context['latest_post'])) {
+				Utils::$context['info_center'][] = [
 					'tpl' => 'recent',
 					'txt' => 'recent_posts',
-				);
+				];
 			}
 		}
 
 		// Load the calendar?
-		if (!empty(Config::$modSettings['cal_enabled']) && User::$me->allowedTo('calendar_view'))
-		{
+		if (!empty(Config::$modSettings['cal_enabled']) && User::$me->allowedTo('calendar_view')) {
 			// Retrieve the calendar data (events, birthdays, holidays).
-			$eventOptions = array(
+			$eventOptions = [
 				'include_holidays' => Config::$modSettings['cal_showholidays'] > 1,
 				'include_birthdays' => Config::$modSettings['cal_showbdays'] > 1,
 				'include_events' => Config::$modSettings['cal_showevents'] > 1,
 				'num_days_shown' => empty(Config::$modSettings['cal_days_for_index']) || Config::$modSettings['cal_days_for_index'] < 1 ? 1 : Config::$modSettings['cal_days_for_index'],
-			);
+			];
 
-			Utils::$context += CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', array($eventOptions));
+			Utils::$context += CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', [$eventOptions]);
 
 			// Whether one or multiple days are shown on the board index.
 			Utils::$context['calendar_only_today'] = Config::$modSettings['cal_days_for_index'] == 1;
@@ -123,52 +118,48 @@ public function execute(): void
 			// This is used to show the "how-do-I-edit" help.
 			Utils::$context['calendar_can_edit'] = User::$me->allowedTo('calendar_edit_any');
 
-			if (!empty(Utils::$context['show_calendar']))
-			{
-				Utils::$context['info_center'][] = array(
+			if (!empty(Utils::$context['show_calendar'])) {
+				Utils::$context['info_center'][] = [
 					'tpl' => 'calendar',
 					'txt' => Utils::$context['calendar_only_today'] ? 'calendar_today' : 'calendar_upcoming',
-				);
+				];
 			}
 		}
 
 		// And stats.
-		if (Theme::$current->settings['show_stats_index'])
-		{
-			Utils::$context['info_center'][] = array(
+		if (Theme::$current->settings['show_stats_index']) {
+			Utils::$context['info_center'][] = [
 				'tpl' => 'stats',
 				'txt' => 'forum_stats',
-			);
+			];
 		}
 
 		// Now the online stuff
-		Utils::$context += Logging::getMembersOnlineStats(array(
+		Utils::$context += Logging::getMembersOnlineStats([
 			'show_hidden' => User::$me->allowedTo('moderate_forum'),
 			'sort' => 'log_time',
 			'reverse_sort' => true,
-		));
+		]);
 
-		Utils::$context['info_center'][] = array(
+		Utils::$context['info_center'][] = [
 			'tpl' => 'online',
 			'txt' => 'online_users',
-		);
+		];
 
 		// Track most online statistics?
-		if (!empty(Config::$modSettings['trackStats']))
-		{
+		if (!empty(Config::$modSettings['trackStats'])) {
 			Logging::trackStatsUsersOnline(Utils::$context['num_guests'] + Utils::$context['num_users_online']);
 		}
 
 		// Are we showing all membergroups on the board index?
-		if (!empty(Theme::$current->settings['show_group_key']))
-		{
-			Utils::$context['membergroups'] = CacheApi::quickGet('membergroup_list', 'Group.php', 'SMF\\Group::getCachedList', array());
+		if (!empty(Theme::$current->settings['show_group_key'])) {
+			Utils::$context['membergroups'] = CacheApi::quickGet('membergroup_list', 'Group.php', 'SMF\\Group::getCachedList', []);
 		}
 
 		// Mark read button
-		Utils::$context['mark_read_button'] = array(
-			'markread' => array('text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . Lang::$txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => Config::$scripturl . '?action=markasread;sa=all;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']),
-		);
+		Utils::$context['mark_read_button'] = [
+			'markread' => ['text' => 'mark_as_read', 'image' => 'markread.png', 'custom' => 'data-confirm="' . Lang::$txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => Config::$scripturl . '?action=markasread;sa=all;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']],
+		];
 
 		// Allow mods to add additional buttons here
 		IntegrationHook::call('integrate_mark_read_button');
@@ -182,8 +173,8 @@ public function execute(): void
 	 */
 	public function getLastPosts(int $number_posts = 5)
 	{
-		$msg_load_options = array(
-			'selects' => array(
+		$msg_load_options = [
+			'selects' => [
 				'm.id_msg',
 				'm.id_topic',
 				'm.id_board',
@@ -193,38 +184,35 @@ public function getLastPosts(int $number_posts = 5)
 				'm.subject',
 				'm.body',
 				'm.smileys_enabled',
-			),
-			'joins' => array(
+			],
+			'joins' => [
 				'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)',
-			),
-			'where' => array(
+			],
+			'where' => [
 				'm.id_msg >= {int:likely_max_msg}',
 				'{query_wanna_see_message_board}',
-			),
-			'order' => array('m.id_msg DESC'),
+			],
+			'order' => ['m.id_msg DESC'],
 			'limit' => $number_posts,
-			'params' => array(
+			'params' => [
 				'likely_max_msg' => max(0, Config::$modSettings['maxMsgID'] - 50 * $number_posts),
-			),
-		);
+			],
+		];
 
-		if (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0)
-		{
+		if (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0) {
 			$msg_load_options['where'][] = 'm.id_board != {int:recycle_board}';
 			$msg_load_options['params']['recycle_board'] = Config::$modSettings['recycle_board'];
 		}
 
-		if (Config::$modSettings['postmod_active'])
-		{
+		if (Config::$modSettings['postmod_active']) {
 			$msg_load_options['joins'][] = 'INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)';
 			$msg_load_options['where'][] = 't.approved = {int:is_approved}';
 			$msg_load_options['where'][] = 'm.approved = {int:is_approved}';
 			$msg_load_options['params']['is_approved'] = 1;
 		}
 
-		foreach (Msg::get(0, $msg_load_options) as $msg)
-		{
-			$posts[$msg->id] = $msg->format(0, array(
+		foreach (Msg::get(0, $msg_load_options) as $msg) {
+			$posts[$msg->id] = $msg->format(0, [
 				'do_permissions' => false,
 				'do_icon' => false,
 				'load_author' => false,
@@ -232,8 +220,8 @@ public function getLastPosts(int $number_posts = 5)
 				'make_preview' => true,
 				'shorten_subject' => 24,
 				// Going to the last post counts as viewing the whole topic.
-				'url_params' => array('topicseen'),
-			));
+				'url_params' => ['topicseen'],
+			]);
 
 			// Backward compatibility.
 			$posts[$msg->id]['poster'] = &$posts[$msg->id]['member'];
@@ -249,7 +237,7 @@ public function getLastPosts(int $number_posts = 5)
 	 */
 	public function cache_getLastPosts(int $number_posts = 5)
 	{
-		return array(
+		return [
 			'data' => $this->getLastPosts($number_posts),
 			'expires' => time() + 60,
 			'post_retri_eval' => '
@@ -258,7 +246,7 @@ public function cache_getLastPosts(int $number_posts = 5)
 					$cache_block[\'data\'][$k][\'time\'] = \\SMF\\Time::create(\'@\' . $post[\'raw_timestamp\'])->format();
 					$cache_block[\'data\'][$k][\'timestamp\'] = $post[\'raw_timestamp\'];
 				}',
-		);
+		];
 	}
 
 	/***********************
@@ -272,8 +260,9 @@ public function cache_getLastPosts(int $number_posts = 5)
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -308,20 +297,20 @@ public static function get($board_index_options): array
 		$board_index_options['parent_id'] = $board_index_options['parent_id'] ?? 0;
 
 		// For performance, track the latest post while going through the boards.
-		if (!empty($board_index_options['set_latest_post']))
-		{
-			$latest_post = array(
+		if (!empty($board_index_options['set_latest_post'])) {
+			$latest_post = [
 				'timestamp' => 0,
-				'ref' => 0
-			);
+				'ref' => 0,
+			];
 		}
 
 		// This setting is not allowed to be empty
-		if (empty(Config::$modSettings['boardindex_max_depth']))
+		if (empty(Config::$modSettings['boardindex_max_depth'])) {
 			Config::$modSettings['boardindex_max_depth'] = 1;
+		}
 
 		// Stuff we always want to have in the query.
-		$selects = array(
+		$selects = [
 			'b.id_board',
 			'b.name AS board_name',
 			'b.description',
@@ -340,39 +329,37 @@ public static function get($board_index_options): array
 			'COALESCE(mem.id_member, 0) AS id_member',
 			'COALESCE(mem.member_name, m.poster_name) AS poster_name',
 			'COALESCE(mem.real_name, m.poster_name) AS real_name',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'current_member' => User::$me->id,
 			'child_level' => $board_index_options['base_level'],
 			'max_child_level' => $board_index_options['base_level'] + Config::$modSettings['boardindex_max_depth'],
-			'blank_string' => ''
-		);
+			'blank_string' => '',
+		];
 
-		$joins = array(
+		$joins = [
 			'LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = b.id_last_msg)',
 			'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)',
-		);
+		];
 
-		$where = array(
+		$where = [
 			'{query_see_board}',
 			'b.child_level BETWEEN {int:child_level} AND {int:max_child_level}',
-		);
+		];
 
-		$order = array(
+		$order = [
 			'b.child_level',
 			'b.board_order',
-		);
+		];
 
 		// Extra stuff based on the passed options.
-		if (!empty($board_index_options['parent_id']))
-		{
+		if (!empty($board_index_options['parent_id'])) {
 			$where[] = 'b.id_parent != 0';
 			$params['id_parent'] = (int) $board_index_options['parent_id'];
 		}
 
-		if (!empty($board_index_options['include_categories']))
-		{
+		if (!empty($board_index_options['include_categories'])) {
 			$selects[] = 'c.name AS cat_name';
 			$selects[] = 'c.description AS cat_desc';
 			$selects[] = 'c.cat_order';
@@ -380,24 +367,21 @@ public static function get($board_index_options): array
 			array_unshift($order, 'c.cat_order');
 		}
 
-		if (User::$me->is_guest)
-		{
+		if (User::$me->is_guest) {
 			$selects[] = '0 AS new_from';
 			$selects[] = '1 AS is_read';
-		}
-		else
-		{
+		} else {
 			$selects[] = 'COALESCE(lb.id_msg, -1) + 1 AS new_from';
 			$selects[] = '(CASE WHEN COALESCE(lb.id_msg, 0) >= b.id_last_msg THEN 1 ELSE 0 END) AS is_read';
 
-			if (!empty($board_index_options['include_categories']))
+			if (!empty($board_index_options['include_categories'])) {
 				$selects[] = 'c.can_collapse';
+			}
 
 			$joins[] = 'LEFT JOIN {db_prefix}log_boards AS lb ON (lb.id_board = b.id_board AND lb.id_member = {int:current_member})';
 		}
 
-		if (!empty(Theme::$current->settings['avatars_on_boardIndex']))
-		{
+		if (!empty(Theme::$current->settings['avatars_on_boardIndex'])) {
 			$selects[] = 'mem.email_address';
 			$selects[] = 'mem.avatar';
 			$selects[] = 'COALESCE(am.id_attach, 0) AS member_id_attach';
@@ -408,16 +392,15 @@ public static function get($board_index_options): array
 		}
 
 		// Give mods access to the query.
-		IntegrationHook::call('integrate_pre_boardindex', array(&$selects, &$params, &$joins, &$where, &$order));
+		IntegrationHook::call('integrate_pre_boardindex', [&$selects, &$params, &$joins, &$where, &$order]);
 
 		// Start with empty arrays.
-		$boards = array();
-		$cat_boards = array();
+		$boards = [];
+		$cat_boards = [];
 
 		// Find all boards and categories, as well as related information.
-		foreach (Board::queryData($selects, $params, $joins, $where, $order) as $row_board)
-		{
-			$row_board = array_filter($row_board, fn($prop) => !is_null($prop));
+		foreach (Board::queryData($selects, $params, $joins, $where, $order) as $row_board) {
+			$row_board = array_filter($row_board, fn ($prop) => !is_null($prop));
 
 			$parent = Board::$loaded[$row_board['id_parent']] ?? null;
 
@@ -425,12 +408,10 @@ public static function get($board_index_options): array
 			$ignoreThisBoard = in_array($row_board['id_board'], User::$me->ignoreboards);
 			$row_board['is_read'] = !empty($row_board['is_read']) || $ignoreThisBoard ? '1' : '0';
 
-			if ($board_index_options['include_categories'])
-			{
+			if ($board_index_options['include_categories']) {
 				// Haven't set this category yet.
-				if (!isset(Category::$loaded[$row_board['id_cat']]))
-				{
-					$category = Category::init($row_board['id_cat'], array(
+				if (!isset(Category::$loaded[$row_board['id_cat']])) {
+					$category = Category::init($row_board['id_cat'], [
 						'id' => $row_board['id_cat'],
 						'name' => $row_board['cat_name'],
 						'description' => $row_board['cat_desc'],
@@ -442,18 +423,15 @@ public static function get($board_index_options): array
 						'css_class' => '',
 						'link' => '<a id="c' . $row_board['id_cat'] . '"></a>' . (!User::$me->is_guest ?
 							'<a href="' . Config::$scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf(Lang::$txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']),
-					));
+					]);
 
 					$category->parseDescription();
-				}
-				else
-				{
+				} else {
 					$category = Category::$loaded[$row_board['id_cat']];
 				}
 
 				// If this board has new posts in it (and isn't the recycle bin!) then the category is new.
-				if (empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != $row_board['id_board'])
-				{
+				if (empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != $row_board['id_board']) {
 					$category->new |= empty($row_board['is_read']);
 				}
 
@@ -464,72 +442,63 @@ public static function get($board_index_options): array
 			}
 
 			// Is this a new board, or just another moderator?
-			if (!isset(Board::$loaded[$row_board['id_board']]->type))
-			{
-				$board = Board::init($row_board['id_board'], array(
+			if (!isset(Board::$loaded[$row_board['id_board']]->type)) {
+				$board = Board::init($row_board['id_board'], [
 					'cat' => Category::init($row_board['id_cat']),
 					'new' => empty($row_board['is_read']),
 					'type' => $row_board['is_redirect'] ? 'redirect' : 'board',
 					'name' => $row_board['board_name'],
 					'description' => $row_board['description'],
 					'short_description' => Utils::shorten($row_board['description'], 128),
-					'link_moderators' => array(),
-					'link_moderator_groups' => array(),
+					'link_moderators' => [],
+					'link_moderator_groups' => [],
 					'parent' => $row_board['id_parent'],
 					'child_level' => $row_board['child_level'],
-					'link_children' => array(),
+					'link_children' => [],
 					'children_new' => false,
 					'topics' => $row_board['num_topics'],
 					'posts' => $row_board['num_posts'],
 					'is_redirect' => $row_board['is_redirect'],
 					'unapproved_topics' => $row_board['unapproved_topics'],
 					'unapproved_posts' => $row_board['unapproved_posts'] - $row_board['unapproved_topics'],
-					'can_approve_posts' => !empty(User::$me->mod_cache['ap']) && (User::$me->mod_cache['ap'] == array(0) || in_array($row_board['id_board'], User::$me->mod_cache['ap'])),
+					'can_approve_posts' => !empty(User::$me->mod_cache['ap']) && (User::$me->mod_cache['ap'] == [0] || in_array($row_board['id_board'], User::$me->mod_cache['ap'])),
 					'href' => Config::$scripturl . '?board=' . $row_board['id_board'] . '.0',
 					'link' => '<a href="' . Config::$scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['board_name'] . '</a>',
 					'board_class' => 'off',
 					'css_class' => '',
 					'last_post' => self::prepareLastPost($row_board),
-				));
+				]);
 
 				$board->parseDescription();
 
 				// This is a parent board.
-				if (!isset($parent) || $parent->id == $board_index_options['parent_id'])
-				{
+				if (!isset($parent) || $parent->id == $board_index_options['parent_id']) {
 					// @todo Should this be called for every board, not just parent boards?
-					IntegrationHook::call('integrate_boardindex_board', array(&$cat_boards, $row_board));
+					IntegrationHook::call('integrate_boardindex_board', [&$cat_boards, $row_board]);
 
 					// Add parent boards to the $boards list later used to fetch moderators.
 					$boards[] = $row_board['id_board'];
 
 					// We can do some of the figuring-out-what-icon now.
 					// For certain types of thing we also set up what the tooltip is.
-					if ($board->is_redirect)
-					{
+					if ($board->is_redirect) {
 						$board->board_class = 'redirect';
 						$board->board_tooltip = Lang::$txt['redirect_board'];
-					}
-					elseif ($board->new || User::$me->is_guest)
-					{
+					} elseif ($board->new || User::$me->is_guest) {
 						// If we're showing to guests, we want to give them the idea that something interesting is going on!
 						$board->board_class = 'on';
 						$board->board_tooltip = Lang::$txt['new_posts'];
-					}
-					else
-					{
+					} else {
 						$board->board_tooltip = Lang::$txt['old_posts'];
 					}
 				}
 				// This is a child board.
-				elseif (isset($parent) && $parent->parent == $board_index_options['parent_id'])
-				{
+				elseif (isset($parent) && $parent->parent == $board_index_options['parent_id']) {
 					// Counting child board posts in the parent's totals?
 					self::propagateStatsToParents($board, $board_index_options);
 
 					// Update the icon if appropriate
-					if ($parent->children_new && $parent->board_class == 'off')
-					{
+					if ($parent->children_new && $parent->board_class == 'off') {
 						$parent->board_class = 'on2';
 						$parent->board_tooltip = Lang::$txt['new_posts'];
 					}
@@ -538,8 +507,7 @@ public static function get($board_index_options): array
 					$parent->link_children[] = $board->link;
 				}
 				// A further descendent (grandchild, great-grandchild, etc.)
-				else
-				{
+				else {
 					self::propagateStatsToParents($board, $board_index_options);
 				}
 			}
@@ -550,12 +518,11 @@ public static function get($board_index_options): array
 				&& !empty($row_board['poster_time'])
 				&& $row_board['poster_time'] > $latest_post['timestamp']
 				&& !$ignoreThisBoard
-			)
-			{
-				$latest_post = array(
+			) {
+				$latest_post = [
 					'timestamp' => $row_board['poster_time'],
 					'ref' => isset($parent) ? $parent->last_post : $board->last_post,
-				);
+				];
 			}
 		}
 
@@ -564,94 +531,75 @@ public static function get($board_index_options): array
 		$moderators = Board::getModerators($boards);
 		$groups = Board::getModeratorGroups($boards);
 
-		if ($board_index_options['include_categories'])
-		{
-			foreach (Category::$loaded as &$category)
-			{
-				foreach ($category->children as $board)
-				{
-					if (!empty($moderators[$board->id]))
-					{
+		if ($board_index_options['include_categories']) {
+			foreach (Category::$loaded as &$category) {
+				foreach ($category->children as $board) {
+					if (!empty($moderators[$board->id])) {
 						$board->moderators = $moderators[$board->id];
 
-						foreach ($moderators[$board->id] as $moderator)
+						foreach ($moderators[$board->id] as $moderator) {
 							$board->link_moderators[] = $moderator['link'];
+						}
 					}
 
-					if (!empty($groups[$board->id]))
-					{
+					if (!empty($groups[$board->id])) {
 						$board->moderator_groups = $groups[$board->id];
 
-						foreach ($groups[$board->id] as $group)
-						{
+						foreach ($groups[$board->id] as $group) {
 							$board->link_moderators[] = $group['link'];
 							$board->link_moderator_groups[] = $group['link'];
 						}
 					}
 
-					if (!empty($board->last_post))
-					{
+					if (!empty($board->last_post)) {
 						$board->last_post['last_post_message'] = sprintf(Lang::$txt['last_post_message'], $board->last_post['member']['link'], $board->last_post['link'], $board->last_post['timestamp'] > 0 ? $board->last_post['time'] : Lang::$txt['not_applicable']);
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$cat_boards = &Board::$loaded[$board_index_options['parent_id']]->children;
 
-			foreach ($cat_boards as &$board)
-			{
-				if (!empty($moderators[$board->id]))
-				{
+			foreach ($cat_boards as &$board) {
+				if (!empty($moderators[$board->id])) {
 					$board->moderators = $moderators[$board->id];
 
-					foreach ($moderators[$board->id] as $moderator)
+					foreach ($moderators[$board->id] as $moderator) {
 						$board->link_moderators[] = $moderator['link'];
+					}
 				}
 
-				if (!empty($groups[$board->id]))
-				{
+				if (!empty($groups[$board->id])) {
 					$board->moderator_groups = $groups[$board->id];
 
-					foreach ($groups[$board->id] as $group)
-					{
+					foreach ($groups[$board->id] as $group) {
 						$board->link_moderators[] = $group['link'];
 						$board->link_moderator_groups[] = $group['link'];
 					}
 				}
 
-				if (!empty($board->last_post))
-				{
+				if (!empty($board->last_post)) {
 					$board->last_post['last_post_message'] = sprintf(Lang::$txt['last_post_message'], $board->last_post['member']['link'], $board->last_post['link'], $board->last_post['timestamp'] > 0 ? $board->last_post['time'] : Lang::$txt['not_applicable']);
 				}
 			}
 		}
 
-		if ($board_index_options['include_categories'])
-		{
+		if ($board_index_options['include_categories']) {
 			Category::sort(Category::$loaded);
-		}
-		else
-		{
+		} else {
 			Board::sort($cat_boards);
 		}
 
 		// By now we should know the most recent post...if we wanna know it that is.
-		if (!empty($board_index_options['set_latest_post']) && !empty($latest_post['ref']))
-		{
+		if (!empty($board_index_options['set_latest_post']) && !empty($latest_post['ref'])) {
 			$latest_post['ref']['time'] = Time::create('@' . $latest_post['ref']['timestamp'])->format();
 			Utils::$context['latest_post'] = $latest_post['ref'];
 		}
 
 		// I can't remember why but trying to make a ternary to get this all in one line is actually a Very Bad Idea.
-		if ($board_index_options['include_categories'])
-		{
-			IntegrationHook::call('integrate_getboardtree', array($board_index_options, &Category::$loaded));
-		}
-		else
-		{
-			IntegrationHook::call('integrate_getboardtree', array($board_index_options, &$cat_boards));
+		if ($board_index_options['include_categories']) {
+			IntegrationHook::call('integrate_getboardtree', [$board_index_options, &Category::$loaded]);
+		} else {
+			IntegrationHook::call('integrate_getboardtree', [$board_index_options, &$cat_boards]);
 		}
 
 		return $board_index_options['include_categories'] ? Category::$loaded : $cat_boards;
@@ -677,17 +625,17 @@ protected function __construct()
 		Utils::$context['canonical_url'] = Config::$scripturl;
 
 		// Do not let search engines index anything if there is a random thing in $_GET.
-		if (!empty($_GET))
+		if (!empty($_GET)) {
 			Utils::$context['robot_no_index'] = true;
+		}
 
 		// Replace the collapse and expand default alts.
 		Theme::addJavaScriptVar('smf_expandAlt', Lang::$txt['show_category'], true);
 		Theme::addJavaScriptVar('smf_collapseAlt', Lang::$txt['hide_category'], true);
 
-		if (!empty(Theme::$current->settings['show_newsfader']))
-		{
-			Theme::loadJavaScriptFile('slippry.min.js', array(), 'smf_jquery_slippry');
-			Theme::loadCSSFile('slider.min.css', array(), 'smf_jquery_slider');
+		if (!empty(Theme::$current->settings['show_newsfader'])) {
+			Theme::loadJavaScriptFile('slippry.min.js', [], 'smf_jquery_slippry');
+			Theme::loadCSSFile('slider.min.css', [], 'smf_jquery_slider');
 		}
 
 		// Set a few minor things.
@@ -708,15 +656,15 @@ protected function __construct()
 	 */
 	protected static function propagateStatsToParents($board, $board_index_options): void
 	{
-		if ($board->is_redirect || empty($board->parent))
+		if ($board->is_redirect || empty($board->parent)) {
 			return;
+		}
 
 		// If the parent is already loaded, this will just return it.
 		// In the unlikely event that it isn't loaded, this will fix that.
 		$parent = Board::init($board->parent);
 
-		if (!empty($board_index_options['countChildPosts']))
-		{
+		if (!empty($board_index_options['countChildPosts'])) {
 			$parent->own_topics = $parent->own_topics ?? $parent->topics;
 			$parent->own_posts = $parent->own_posts ?? $parent->posts;
 
@@ -724,22 +672,22 @@ protected static function propagateStatsToParents($board, $board_index_options):
 			$parent->posts = $parent->own_posts + $board->posts;
 		}
 
-		if (($board->last_post['timestamp'] ?? 0) > ($parent->last_post['timestamp'] ?? 0))
-		{
+		if (($board->last_post['timestamp'] ?? 0) > ($parent->last_post['timestamp'] ?? 0)) {
 			$parent->last_post = $board->last_post;
 		}
 
-		if (!empty($parent->parent))
-		{
+		if (!empty($parent->parent)) {
 			// Does this board contain new boards?
 			$parent->children_new |= $board->new;
 
-			if ($parent->parent != $board_index_options['parent_id'])
+			if ($parent->parent != $board_index_options['parent_id']) {
 				$parent->new |= $board->new;
+			}
 
 			// Continue propagating up the tree.
-			if ($parent->id != $board_index_options['parent_id'])
+			if ($parent->id != $board_index_options['parent_id']) {
 				self::propagateStatsToParents($parent, $board_index_options);
+			}
 		}
 	}
 
@@ -762,67 +710,66 @@ protected static function propagateStatsToParents($board, $board_index_options):
 	 */
 	protected static function prepareLastPost($row_board): array
 	{
-		if (empty($row_board['id_msg']))
-		{
-			return array(
+		if (empty($row_board['id_msg'])) {
+			return [
 				'timestamp' => 0,
 				'href' => '',
 				'link' => Lang::$txt['not_applicable'],
-				'member' => array(
+				'member' => [
 					'id' => 0,
 					'name' => Lang::$txt['not_applicable'],
 					'username' => Lang::$txt['not_applicable'],
 					'href' => '',
 					'link' => Lang::$txt['not_applicable'],
-				),
-			);
+				],
+			];
 		}
 
 		Lang::censorText($row_board['subject']);
 		$short_subject = Utils::shorten($row_board['subject'], 24);
 
-		$msg = new Msg($row_board['id_msg'], array(
+		$msg = new Msg($row_board['id_msg'], [
 			'id_topic' => $row_board['id_topic'],
 			'id_board' => $row_board['id_board'],
 			'poster_time' => (int) $row_board['poster_time'],
 			'id_member' => $row_board['id_member'],
 			'poster_name' => $row_board['real_name'],
 			'subject' => $short_subject,
-		));
+		]);
 
 		$last_post = array_merge(
-			$msg->format(0, array(
+			$msg->format(0, [
 				'do_permissions' => false,
 				'do_icon' => false,
 				'load_author' => false,
-			)),
-			array(
+			]),
+			[
 				'start' => 'msg' . $row_board['new_from'],
 				'topic' => $row_board['id_topic'],
 				'href' => Config::$scripturl . '?topic=' . $row_board['id_topic'] . '.msg' . $row_board['id_msg'] . (empty($row_board['is_read']) ? ';boardseen' : '') . '#new',
 				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row_board['id_topic'] . '.msg' . $row_board['id_msg'] . (empty($row_board['is_read']) ? ';boardseen' : '') . '#new' . '" title="' . $row_board['subject'] . '">' . $short_subject . '</a>',
-			)
+			],
 		);
 
 		unset($msg, Msg::$loaded[$row_board['id_msg']]);
 
-		if (!empty(Theme::$current->settings['avatars_on_boardIndex']))
-		{
-			$last_post['member']['avatar'] = User::setAvatarData(array(
+		if (!empty(Theme::$current->settings['avatars_on_boardIndex'])) {
+			$last_post['member']['avatar'] = User::setAvatarData([
 				'avatar' => $row_board['avatar'],
 				'email' => $row_board['email_address'],
-				'filename' => !empty($row_board['member_filename']) ? $row_board['member_filename'] : ''
-			));
+				'filename' => !empty($row_board['member_filename']) ? $row_board['member_filename'] : '',
+			]);
 		}
 
-		IntegrationHook::call('integrate_boardindex_last_post', array(&$last_post, $row_board));
+		IntegrationHook::call('integrate_boardindex_last_post', [&$last_post, $row_board]);
 
 		return $last_post;
 	}
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\BoardIndex::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\BoardIndex::exportStatic')) {
 	BoardIndex::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/BuddyListToggle.php b/Sources/Actions/BuddyListToggle.php
index 6d1330ad66..8f95f3383a 100644
--- a/Sources/Actions/BuddyListToggle.php
+++ b/Sources/Actions/BuddyListToggle.php
@@ -14,12 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Cache\CacheApi;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This simple action adds/removes the passed user from the current user's buddy list.
@@ -36,12 +35,11 @@ class BuddyListToggle implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'BuddyListToggle',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -80,32 +78,39 @@ public function execute(): void
 		User::$me->isAllowedTo('profile_extra_own');
 		User::$me->kickIfGuest();
 
-		if (empty($this->userReceiver))
+		if (empty($this->userReceiver)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Remove if it's already there...
-		if (in_array($this->userReceiver, User::$me->buddies))
-		{
-			User::$me->buddies = array_diff(User::$me->buddies, array($this->userReceiver));
+		if (in_array($this->userReceiver, User::$me->buddies)) {
+			User::$me->buddies = array_diff(User::$me->buddies, [$this->userReceiver]);
 		}
 		// ...or add if it's not and if it's not you.
-		elseif (User::$me->id != $this->userReceiver)
-		{
+		elseif (User::$me->id != $this->userReceiver) {
 			User::$me->buddies[] = $this->userReceiver;
 
 			// And add a nice alert. Don't abuse though!
-			if ((CacheApi::get('Buddy-sent-' . User::$me->id . '-' . $this->userReceiver, 86400)) == null)
-			{
-				Db::$db->insert('insert',
+			if ((CacheApi::get('Buddy-sent-' . User::$me->id . '-' . $this->userReceiver, 86400)) == null) {
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}background_tasks',
-					array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-					array('$sourcedir/tasks/Buddy_Notify.php', 'SMF\Tasks\Buddy_Notify', Utils::jsonEncode(array(
-						'receiver_id' => $this->userReceiver,
-						'id_member' => User::$me->id,
-						'member_name' => User::$me->username,
-						'time' => time(),
-					)), 0),
-					array('id_task')
+					[
+						'task_class' => 'string',
+						'task_data' => 'string',
+						'claimed_time' => 'int',
+					],
+					[
+						'SMF\\Tasks\\Buddy_Notify',
+						Utils::jsonEncode([
+							'receiver_id' => $this->userReceiver,
+							'id_member' => User::$me->id,
+							'member_name' => User::$me->username,
+							'time' => time(),
+						]),
+						0,
+					],
+					['id_task'],
 				);
 
 				// Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle.
@@ -114,7 +119,7 @@ public function execute(): void
 		}
 
 		// Update the settings.
-		User::updateMemberData(User::$me->id, array('buddy_list' => implode(',', User::$me->buddies)));
+		User::updateMemberData(User::$me->id, ['buddy_list' => implode(',', User::$me->buddies)]);
 
 		// Redirect back to the profile
 		Utils::redirectexit('action=profile;u=' . $this->userReceiver);
@@ -131,8 +136,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -159,7 +165,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\BuddyListToggle::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\BuddyListToggle::exportStatic')) {
 	BuddyListToggle::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Calendar.php b/Sources/Actions/Calendar.php
index c582d727aa..cd953337a9 100644
--- a/Sources/Actions/Calendar.php
+++ b/Sources/Actions/Calendar.php
@@ -14,10 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\BrowserDetector;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Event;
 use SMF\IntegrationHook;
@@ -28,8 +29,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class has only one real task, showing the calendar.
@@ -44,12 +43,32 @@ class Calendar implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'CalendarMain',
-		),
-	);
+			'iCalDownload' => 'iCalDownload',
+			'CalendarPost' => 'CalendarPost',
+			'getBirthdayRange' => 'getBirthdayRange',
+			'getEventRange' => 'getEventRange',
+			'getHolidayRange' => 'getHolidayRange',
+			'canLinkEvent' => 'canLinkEvent',
+			'getTodayInfo' => 'getTodayInfo',
+			'getCalendarGrid' => 'getCalendarGrid',
+			'getCalendarWeek' => 'getCalendarWeek',
+			'getCalendarList' => 'getCalendarList',
+			'loadDatePicker' => 'loadDatePicker',
+			'loadTimePicker' => 'loadTimePicker',
+			'loadDatePair' => 'loadDatePair',
+			'cache_getOffsetIndependentEvents' => 'cache_getOffsetIndependentEvents',
+			'cache_getRecentEvents' => 'cache_getRecentEvents',
+			'validateEventPost' => 'validateEventPost',
+			'getEventPoster' => 'getEventPoster',
+			'list_getHolidays' => 'list_getHolidays',
+			'list_getNumHolidays' => 'list_getNumHolidays',
+			'removeHolidays' => 'removeHolidays',
+			'convertDateToEnglish' => 'convertDateToEnglish',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -72,12 +91,12 @@ class Calendar implements ActionInterface
 	 *
 	 * Available sub-actions of this action.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'show' => 'show',
 		'ical' => 'export',
 		'post' => 'post',
 		'clock' => 'clock',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -100,10 +119,11 @@ class Calendar implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -117,34 +137,34 @@ public function execute(): void
 	 * It goes to the month and year passed in 'month' and 'year' by get or post.
 	 * It is accessed through ?action=calendar.
 	 *
-	 * @return void
 	 */
 	public function show(): void
 	{
 		// You can't do anything if the calendar is off.
-		if (empty(Config::$modSettings['cal_enabled']))
+		if (empty(Config::$modSettings['cal_enabled'])) {
 			ErrorHandler::fatalLang('calendar_off', false);
+		}
 
 		// This is gonna be needed...
 		Theme::loadTemplate('Calendar');
-		Theme::loadCSSFile('calendar.css', array('force_current' => false, 'validate' => true, 'rtl' => 'calendar.rtl.css'), 'smf_calendar');
+		Theme::loadCSSFile('calendar.css', ['force_current' => false, 'validate' => true, 'rtl' => 'calendar.rtl.css'], 'smf_calendar');
 
 		// Did the specify an individual event ID? If so, let's splice the year/month in to what we would otherwise be doing.
-		if (isset($_GET['event']))
-		{
+		if (isset($_GET['event'])) {
 			$evid = (int) $_GET['event'];
-			if ($evid > 0)
-			{
-				$request = Db::$db->query('', '
-					SELECT start_date
+
+			if ($evid > 0) {
+				$request = Db::$db->query(
+					'',
+					'SELECT start_date
 					FROM {db_prefix}calendar
 					WHERE id_event = {int:event_id}',
-					array(
+					[
 						'event_id' => $evid,
-					)
+					],
 				);
-				if ($row = Db::$db->fetch_assoc($request))
-				{
+
+				if ($row = Db::$db->fetch_assoc($request)) {
 					$_REQUEST['start_date'] = $row['start_date'];
 
 					// We might use this later.
@@ -152,39 +172,41 @@ public function show(): void
 				}
 				Db::$db->free_result($request);
 			}
-			unset ($_GET['event']);
+			unset($_GET['event']);
 		}
 
 		// Set the page title to mention the calendar ;).
 		Utils::$context['page_title'] = Lang::$txt['calendar'];
 
 		// Ensure a default view is defined
-		if (empty(Theme::$current->options['calendar_default_view']))
+		if (empty(Theme::$current->options['calendar_default_view'])) {
 			Theme::$current->options['calendar_default_view'] = 'viewlist';
+		}
 
 		// What view do we want?
-		if (isset($_GET['viewweek']))
+		if (isset($_GET['viewweek'])) {
 			Utils::$context['calendar_view'] = 'viewweek';
-		elseif (isset($_GET['viewmonth']))
+		} elseif (isset($_GET['viewmonth'])) {
 			Utils::$context['calendar_view'] = 'viewmonth';
-		elseif (isset($_GET['viewlist']))
+		} elseif (isset($_GET['viewlist'])) {
 			Utils::$context['calendar_view'] = 'viewlist';
-		else
+		} else {
 			Utils::$context['calendar_view'] = Theme::$current->options['calendar_default_view'];
+		}
 
 		// Don't let search engines index the non-default calendar pages
-		if (Utils::$context['calendar_view'] !== Theme::$current->options['calendar_default_view'])
+		if (Utils::$context['calendar_view'] !== Theme::$current->options['calendar_default_view']) {
 			Utils::$context['robot_no_index'] = true;
+		}
 
 		// Get the current day of month...
 		$today = self::getTodayInfo();
 
 		// Need a start date for all views
-		if (!empty($_REQUEST['start_date']))
-		{
+		if (!empty($_REQUEST['start_date'])) {
 			$start_parsed = date_parse(str_replace(',', '', self::convertDateToEnglish($_REQUEST['start_date'])));
-			if (empty($start_parsed['error_count']) && empty($start_parsed['warning_count']))
-			{
+
+			if (empty($start_parsed['error_count']) && empty($start_parsed['warning_count'])) {
 				$_REQUEST['year'] = $start_parsed['year'];
 				$_REQUEST['month'] = $start_parsed['month'];
 				$_REQUEST['day'] = $start_parsed['day'];
@@ -194,14 +216,13 @@ public function show(): void
 		$month = !empty($_REQUEST['month']) ? (int) $_REQUEST['month'] : $today['month'];
 		$day = !empty($_REQUEST['day']) ? (int) $_REQUEST['day'] : (!empty($_REQUEST['month']) ? 1 : $today['day']);
 
-		$start_object = checkdate($month, $day, $year) === true ? new Time(implode('-', array($year, $month, $day)) . ' ' . User::getTimezone()) : new Time(implode('-', array($today['year'], $today['month'], $today['day'])) . ' ' . User::getTimezone());
+		$start_object = checkdate($month, $day, $year) === true ? new Time(implode('-', [$year, $month, $day]) . ' ' . User::getTimezone()) : new Time(implode('-', [$today['year'], $today['month'], $today['day']]) . ' ' . User::getTimezone());
 
 		// Need an end date for the list view
-		if (!empty($_REQUEST['end_date']))
-		{
+		if (!empty($_REQUEST['end_date'])) {
 			$end_parsed = date_parse(str_replace(',', '', self::convertDateToEnglish($_REQUEST['end_date'])));
-			if (empty($end_parsed['error_count']) && empty($end_parsed['warning_count']))
-			{
+
+			if (empty($end_parsed['error_count']) && empty($end_parsed['warning_count'])) {
 				$_REQUEST['end_year'] = $end_parsed['year'];
 				$_REQUEST['end_month'] = $end_parsed['month'];
 				$_REQUEST['end_day'] = $end_parsed['day'];
@@ -213,13 +234,11 @@ public function show(): void
 
 		$end_object = null;
 
-		if (isset($end_month, $end_day, $end_year) && checkdate($end_month, $end_day, $end_year))
-		{
-			$end_object = new Time(implode('-', array($end_year, $end_month, $end_day)) . ' ' . User::getTimezone());
+		if (isset($end_month, $end_day, $end_year) && checkdate($end_month, $end_day, $end_year)) {
+			$end_object = new Time(implode('-', [$end_year, $end_month, $end_day]) . ' ' . User::getTimezone());
 		}
 
-		if (empty($end_object) || $start_object >= $end_object)
-		{
+		if (empty($end_object) || $start_object >= $end_object) {
 			$num_days_shown = empty(Config::$modSettings['cal_days_for_index']) || Config::$modSettings['cal_days_for_index'] < 1 ? 1 : Config::$modSettings['cal_days_for_index'];
 
 			$end_object = new Time($start_object->format('Y-m-d') . ' ' . User::getTimezone());
@@ -227,7 +246,7 @@ public function show(): void
 			date_add($end_object, date_interval_create_from_date_string($num_days_shown . ' days'));
 		}
 
-		$curPage = array(
+		$curPage = [
 			'year' => $start_object->format('Y'),
 			'month' => $start_object->format('n'),
 			'day' => $start_object->format('j'),
@@ -236,66 +255,66 @@ public function show(): void
 			'end_month' => $end_object->format('n'),
 			'end_day' => $end_object->format('j'),
 			'end_date' => $end_object->format('Y-m-d'),
-		);
+		];
 
 		// Make sure the year and month are in valid ranges.
-		if ($curPage['month'] < 1 || $curPage['month'] > 12)
-		{
+		if ($curPage['month'] < 1 || $curPage['month'] > 12) {
 			ErrorHandler::fatalLang('invalid_month', false);
 		}
 
-		if ($curPage['year'] < Config::$modSettings['cal_minyear'] || $curPage['year'] > Config::$modSettings['cal_maxyear'])
-		{
+		if ($curPage['year'] < Config::$modSettings['cal_minyear'] || $curPage['year'] > Config::$modSettings['cal_maxyear']) {
 			ErrorHandler::fatalLang('invalid_year', false);
 		}
 
 		// If we have a day clean that too.
-		if (Utils::$context['calendar_view'] != 'viewmonth')
-		{
+		if (Utils::$context['calendar_view'] != 'viewmonth') {
 			$isValid = checkdate($curPage['month'], $curPage['day'], $curPage['year']);
 
-			if (!$isValid)
+			if (!$isValid) {
 				ErrorHandler::fatalLang('invalid_day', false);
+			}
 		}
 
 		// Load all the context information needed to show the calendar grid.
-		$calendarOptions = array(
+		$calendarOptions = [
 			'start_day' => !empty(Theme::$current->options['calendar_start_day']) ? Theme::$current->options['calendar_start_day'] : 0,
-			'show_birthdays' => in_array(Config::$modSettings['cal_showbdays'], array(1, 2)),
-			'show_events' => in_array(Config::$modSettings['cal_showevents'], array(1, 2)),
-			'show_holidays' => in_array(Config::$modSettings['cal_showholidays'], array(1, 2)),
+			'show_birthdays' => in_array(Config::$modSettings['cal_showbdays'], [1, 2]),
+			'show_events' => in_array(Config::$modSettings['cal_showevents'], [1, 2]),
+			'show_holidays' => in_array(Config::$modSettings['cal_showholidays'], [1, 2]),
 			'show_week_num' => true,
 			'short_day_titles' => !empty(Config::$modSettings['cal_short_days']),
 			'short_month_titles' => !empty(Config::$modSettings['cal_short_months']),
 			'show_next_prev' => !empty(Config::$modSettings['cal_prev_next_links']),
-			'show_week_links' => isset(Config::$modSettings['cal_week_links']) ? Config::$modSettings['cal_week_links'] : 0,
-		);
+			'show_week_links' => Config::$modSettings['cal_week_links'] ?? 0,
+		];
 
 		// Load up the main view.
-		if (Utils::$context['calendar_view'] == 'viewlist')
+		if (Utils::$context['calendar_view'] == 'viewlist') {
 			Utils::$context['calendar_grid_main'] = self::getCalendarList($curPage['start_date'], $curPage['end_date'], $calendarOptions);
-		elseif (Utils::$context['calendar_view'] == 'viewweek')
+		} elseif (Utils::$context['calendar_view'] == 'viewweek') {
 			Utils::$context['calendar_grid_main'] = self::getCalendarWeek($curPage['start_date'], $calendarOptions);
-		else
+		} else {
 			Utils::$context['calendar_grid_main'] = self::getCalendarGrid($curPage['start_date'], $calendarOptions);
+		}
 
 		// Load up the previous and next months.
 		Utils::$context['calendar_grid_current'] = self::getCalendarGrid($curPage['start_date'], $calendarOptions, false, false);
 
 		// Only show previous month if it isn't pre-January of the min-year
-		if (Utils::$context['calendar_grid_current']['previous_calendar']['year'] > Config::$modSettings['cal_minyear'] || $curPage['month'] != 1)
+		if (Utils::$context['calendar_grid_current']['previous_calendar']['year'] > Config::$modSettings['cal_minyear'] || $curPage['month'] != 1) {
 			Utils::$context['calendar_grid_prev'] = self::getCalendarGrid(Utils::$context['calendar_grid_current']['previous_calendar']['start_date'], $calendarOptions, true, false);
+		}
 
 		// Only show next month if it isn't post-December of the max-year
-		if (Utils::$context['calendar_grid_current']['next_calendar']['year'] < Config::$modSettings['cal_maxyear'] || $curPage['month'] != 12)
+		if (Utils::$context['calendar_grid_current']['next_calendar']['year'] < Config::$modSettings['cal_maxyear'] || $curPage['month'] != 12) {
 			Utils::$context['calendar_grid_next'] = self::getCalendarGrid(Utils::$context['calendar_grid_current']['next_calendar']['start_date'], $calendarOptions, false, false);
+		}
 
 		// Basic template stuff.
 		Utils::$context['allow_calendar_event'] = User::$me->allowedTo('calendar_post');
 
 		// If you don't allow events not linked to posts and you're not an admin, we have more work to do...
-		if (Utils::$context['allow_calendar_event'] && empty(Config::$modSettings['cal_allow_unlinked']) && !User::$me->is_admin)
-		{
+		if (Utils::$context['allow_calendar_event'] && empty(Config::$modSettings['cal_allow_unlinked']) && !User::$me->is_admin) {
 			$boards_can_post = User::$me->boardsAllowedTo('post_new');
 			Utils::$context['allow_calendar_event'] &= !empty($boards_can_post);
 		}
@@ -308,31 +327,35 @@ public function show(): void
 		Utils::$context['blocks_disabled'] = !empty(Config::$modSettings['cal_disable_prev_next']) ? 1 : 0;
 
 		// Set the page title to mention the month or week, too
-		if (Utils::$context['calendar_view'] != 'viewlist')
+		if (Utils::$context['calendar_view'] != 'viewlist') {
 			Utils::$context['page_title'] .= ' - ' . (Utils::$context['calendar_view'] == 'viewweek' ? Utils::$context['calendar_grid_main']['week_title'] : Lang::$txt['months_titles'][Utils::$context['current_month']] . ' ' . Utils::$context['current_year']);
+		}
 
 		// Load up the linktree!
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=calendar',
-			'name' => Lang::$txt['calendar']
-		);
+			'name' => Lang::$txt['calendar'],
+		];
 		// Add the current month to the linktree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=calendar;year=' . Utils::$context['current_year'] . ';month=' . Utils::$context['current_month'],
-			'name' => Lang::$txt['months_titles'][Utils::$context['current_month']] . ' ' . Utils::$context['current_year']
-		);
+			'name' => Lang::$txt['months_titles'][Utils::$context['current_month']] . ' ' . Utils::$context['current_year'],
+		];
+
 		// If applicable, add the current week to the linktree.
-		if (Utils::$context['calendar_view'] == 'viewweek')
-			Utils::$context['linktree'][] = array(
+		if (Utils::$context['calendar_view'] == 'viewweek') {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=calendar;viewweek;year=' . Utils::$context['current_year'] . ';month=' . Utils::$context['current_month'] . ';day=' . Utils::$context['current_day'],
 				'name' => Utils::$context['calendar_grid_main']['week_title'],
-			);
+			];
+		}
 
 		// Build the calendar button array.
-		Utils::$context['calendar_buttons'] = array();
+		Utils::$context['calendar_buttons'] = [];
 
-		if (Utils::$context['can_post'])
-			Utils::$context['calendar_buttons']['post_event'] = array('text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => Config::$scripturl . '?action=calendar;sa=post;month=' . Utils::$context['current_month'] . ';year=' . Utils::$context['current_year'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (Utils::$context['can_post']) {
+			Utils::$context['calendar_buttons']['post_event'] = ['text' => 'calendar_post_event', 'image' => 'calendarpe.png', 'url' => Config::$scripturl . '?action=calendar;sa=post;month=' . Utils::$context['current_month'] . ';year=' . Utils::$context['current_year'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
+		}
 
 		// Allow mods to add additional buttons here
 		IntegrationHook::call('integrate_calendar_buttons');
@@ -353,124 +376,116 @@ public function post(): void
 		User::$me->isAllowedTo('calendar_post');
 
 		// Cast this for safety...
-		if (isset($_REQUEST['eventid']))
+		if (isset($_REQUEST['eventid'])) {
 			$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
+		}
 
 		// Submitting?
-		if (isset($_POST[Utils::$context['session_var']], $_REQUEST['eventid']))
-		{
+		if (isset($_POST[Utils::$context['session_var']], $_REQUEST['eventid'])) {
 			User::$me->checkSession();
 
 			// Validate the post...
-			if (!isset($_POST['link_to_board']))
+			if (!isset($_POST['link_to_board'])) {
 				self::validateEventPost();
+			}
 
 			// If you're not allowed to edit any events, you have to be the poster.
-			if ($_REQUEST['eventid'] > 0 && !User::$me->allowedTo('calendar_edit_any'))
+			if ($_REQUEST['eventid'] > 0 && !User::$me->allowedTo('calendar_edit_any')) {
 				User::$me->isAllowedTo('calendar_edit_' . (!empty(User::$me->id) && self::getEventPoster($_REQUEST['eventid']) == User::$me->id ? 'own' : 'any'));
+			}
 
 			// New - and directing?
-			if (isset($_POST['link_to_board']) || empty(Config::$modSettings['cal_allow_unlinked']))
-			{
+			if (isset($_POST['link_to_board']) || empty(Config::$modSettings['cal_allow_unlinked'])) {
 				$_REQUEST['calendar'] = 1;
 				Post::call();
+
 				return;
 			}
+
 			// New...
-			elseif ($_REQUEST['eventid'] == -1)
-			{
-				$eventOptions = array(
+			if ($_REQUEST['eventid'] == -1) {
+				$eventOptions = [
 					'board' => 0,
 					'topic' => 0,
 					'title' => Utils::entitySubstr($_REQUEST['evtitle'], 0, 100),
 					'location' => Utils::entitySubstr($_REQUEST['event_location'], 0, 255),
 					'member' => User::$me->id,
-				);
+				];
 				Event::create($eventOptions);
 			}
 			// Deleting...
-			elseif (isset($_REQUEST['deleteevent']))
-			{
+			elseif (isset($_REQUEST['deleteevent'])) {
 				Event::remove($_REQUEST['eventid']);
 			}
 			// ... or just update it?
-			else
-			{
-				$eventOptions = array(
+			else {
+				$eventOptions = [
 					'title' => Utils::entitySubstr($_REQUEST['evtitle'], 0, 100),
 					'location' => Utils::entitySubstr($_REQUEST['event_location'], 0, 255),
-				);
+				];
 				Event::modify($_REQUEST['eventid'], $eventOptions);
 			}
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'calendar_updated' => time(),
-			));
+			]);
 
 			// No point hanging around here now...
-			if (isset($_POST['start_date']))
-			{
+			if (isset($_POST['start_date'])) {
 				$d = date_parse($_POST['start_date']);
 				$year = $d['year'];
 				$month = $d['month'];
 				$day = $d['day'];
-			}
-			elseif (isset($_POST['start_datetime']))
-			{
+			} elseif (isset($_POST['start_datetime'])) {
 				$d = date_parse($_POST['start_datetime']);
 				$year = $d['year'];
 				$month = $d['month'];
 				$day = $d['day'];
-			}
-			else
-			{
+			} else {
 				$today = getdate();
-				$year = isset($_POST['year']) ? $_POST['year'] : $today['year'];
-				$month = isset($_POST['month']) ? $_POST['month'] : $today['mon'];
-				$day = isset($_POST['day']) ? $_POST['day'] : $today['mday'];
+				$year = $_POST['year'] ?? $today['year'];
+				$month = $_POST['month'] ?? $today['mon'];
+				$day = $_POST['day'] ?? $today['mday'];
 			}
 
 			Utils::redirectexit(Config::$scripturl . '?action=calendar;month=' . $month . ';year=' . $year . ';day=' . $day);
 		}
 
 		// If we are not enabled... we are not enabled.
-		if (empty(Config::$modSettings['cal_allow_unlinked']) && empty($_REQUEST['eventid']))
-		{
+		if (empty(Config::$modSettings['cal_allow_unlinked']) && empty($_REQUEST['eventid'])) {
 			$_REQUEST['calendar'] = 1;
 			Post::call();
+
 			return;
 		}
 
 		// New?
-		if (!isset($_REQUEST['eventid']))
-		{
+		if (!isset($_REQUEST['eventid'])) {
 			Utils::$context['event'] = new Event(-1);
-		}
-		else
-		{
+		} else {
 			list(Utils::$context['event']) = Event::load($_REQUEST['eventid']);
 
-			if (empty(Utils::$context['event']))
+			if (empty(Utils::$context['event'])) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
 			// If it has a board, then they should be editing it within the topic.
-			if (!empty(Utils::$context['event']->topic) && !empty(Utils::$context['event']->msg))
-			{
+			if (!empty(Utils::$context['event']->topic) && !empty(Utils::$context['event']->msg)) {
 				// We load the board up, for a check on the board access rights...
 				Topic::$topic_id = Utils::$context['event']->topic;
 				Board::load();
 			}
 
 			// Make sure the user is allowed to edit this event.
-			if (Utils::$context['event']->member != User::$me->id)
+			if (Utils::$context['event']->member != User::$me->id) {
 				User::$me->isAllowedTo('calendar_edit_any');
-			elseif (!User::$me->allowedTo('calendar_edit_any'))
+			} elseif (!User::$me->allowedTo('calendar_edit_any')) {
 				User::$me->isAllowedTo('calendar_edit_own');
+			}
 		}
 
 		// An all day event? Set up some nice defaults in case the user wants to change that
-		if (Utils::$context['event']->allday == true)
-		{
+		if (Utils::$context['event']->allday == true) {
 			Utils::$context['event']->tz = User::getTimezone();
 			Utils::$context['event']->start->modify(Time::create('now')->format('%H:%M:%S'));
 			Utils::$context['event']->end->modify(Time::create('now + 1 hour')->format('%H:%M:%S'));
@@ -484,20 +499,18 @@ public function post(): void
 
 		// Get list of boards that can be posted in.
 		$boards = User::$me->boardsAllowedTo('post_new');
-		if (empty($boards))
-		{
+
+		if (empty($boards)) {
 			// You can post new events but can't link them to anything...
-			Utils::$context['event']->categories = array();
-		}
-		else
-		{
+			Utils::$context['event']->categories = [];
+		} else {
 			// Load the list of boards and categories in the context.
-			$boardListOptions = array(
+			$boardListOptions = [
 				'included_boards' => in_array(0, $boards) ? null : $boards,
 				'not_redirection' => true,
 				'use_permissions' => true,
 				'selected_board' => Config::$modSettings['cal_defaultboard'],
-			);
+			];
 			Utils::$context['event']->categories = MessageIndex::getBoardList($boardListOptions);
 		}
 
@@ -506,9 +519,9 @@ public function post(): void
 		Utils::$context['sub_template'] = 'event_post';
 
 		Utils::$context['page_title'] = isset($_REQUEST['eventid']) ? Lang::$txt['calendar_edit'] : Lang::$txt['calendar_post_event'];
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'name' => Utils::$context['page_title'],
-		);
+		];
 
 		self::loadDatePicker('#event_time_input .date_input');
 		self::loadTimePicker('#event_time_input .time_input', Time::getShortTimeFormat());
@@ -531,21 +544,24 @@ public function post(): void
 	public function export(): void
 	{
 		// You can't export if the calendar export feature is off.
-		if (empty(Config::$modSettings['cal_export']))
+		if (empty(Config::$modSettings['cal_export'])) {
 			ErrorHandler::fatalLang('calendar_export_off', false);
+		}
 
 		// Goes without saying that this is required.
-		if (!isset($_REQUEST['eventid']))
+		if (!isset($_REQUEST['eventid'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Load up the event in question and check it is valid.
 		list($event) = Event::load($_REQUEST['eventid']);
 
-		if (!($event instanceof Event))
+		if (!($event instanceof Event)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// This is what we will be sending later.
-		$filecontents = array();
+		$filecontents = [];
 		$filecontents[] = 'BEGIN:VCALENDAR';
 		$filecontents[] = 'METHOD:PUBLISH';
 		$filecontents[] = 'PRODID:-//SimpleMachines//' . SMF_FULL_VERSION . '//EN';
@@ -557,17 +573,20 @@ public function export(): void
 
 		// Send some standard headers.
 		ob_end_clean();
-		if (!empty(Config::$modSettings['enableCompressedOutput']))
+
+		if (!empty(Config::$modSettings['enableCompressedOutput'])) {
 			@ob_start('ob_gzhandler');
-		else
+		} else {
 			ob_start();
+		}
 
 		// Send the file headers
 		header('pragma: ');
 		header('cache-control: no-cache');
 
-		if (!BrowserDetector::isBrowser('gecko'))
+		if (!BrowserDetector::isBrowser('gecko')) {
 			header('content-transfer-encoding: binary');
+		}
 
 		header('expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
 		header('last-modified: ' . gmdate('D, d M Y H:i:s', $event->modified_time) . ' GMT');
@@ -575,8 +594,9 @@ public function export(): void
 		header('connection: close');
 		header('content-disposition: attachment; filename="' . $event->title . '.ics"');
 
-		if (empty(Config::$modSettings['enableCompressedOutput']))
+		if (empty(Config::$modSettings['enableCompressedOutput'])) {
 			header('content-length: ' . Utils::entityStrlen($filecontents));
+		}
 
 		// This is a calendar item!
 		header('content-type: text/calendar');
@@ -597,14 +617,14 @@ public function clock(): void
 		Utils::$context['offimg'] = Theme::$current->settings['images_url'] . '/bbc/bbc_bg.png';
 
 		Utils::$context['page_title'] = 'Anyone know what time it is?';
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=calendar',
 			'name' => Lang::$txt['calendar'],
-		);
-		Utils::$context['linktree'][] = array(
+		];
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=calendar;sa=clock',
 			'name' => 'Clock',
-		);
+		];
 		Utils::$context['robot_no_index'] = true;
 
 		$omfg = isset($_REQUEST['omfg']);
@@ -612,45 +632,35 @@ public function clock(): void
 
 		Theme::loadTemplate('Calendar');
 
-		if ($bcd)
-		{
+		if ($bcd) {
 			Utils::$context['sub_template'] = 'bcd';
-			Utils::$context['linktree'][] = array('url' => Config::$scripturl . '?action=calendar;sa=clock;bcd', 'name' => 'BCD');
+			Utils::$context['linktree'][] = ['url' => Config::$scripturl . '?action=calendar;sa=clock;bcd', 'name' => 'BCD'];
 			Utils::$context['clockicons'] = Utils::jsonDecode(base64_decode('eyJoMSI6WzIsMV0sImgyIjpbOCw0LDIsMV0sIm0xIjpbNCwyLDFdLCJtMiI6WzgsNCwyLDFdLCJzMSI6WzQsMiwxXSwiczIiOls4LDQsMiwxXX0='), true);
-		}
-		elseif (!$omfg && !isset($_REQUEST['time']))
-		{
+		} elseif (!$omfg && !isset($_REQUEST['time'])) {
 			Utils::$context['sub_template'] = 'hms';
-			Utils::$context['linktree'][] = array('url' => Config::$scripturl . '?action=calendar;sa=clock', 'name' => 'Binary');
+			Utils::$context['linktree'][] = ['url' => Config::$scripturl . '?action=calendar;sa=clock', 'name' => 'Binary'];
 			Utils::$context['clockicons'] = Utils::jsonDecode(base64_decode('eyJoIjpbMTYsOCw0LDIsMV0sIm0iOlszMiwxNiw4LDQsMiwxXSwicyI6WzMyLDE2LDgsNCwyLDFdfQ'), true);
-		}
-		elseif ($omfg)
-		{
+		} elseif ($omfg) {
 			Utils::$context['sub_template'] = 'omfg';
-			Utils::$context['linktree'][] = array('url' => Config::$scripturl . '?action=calendar;sa=clock;omfg', 'name' => 'OMFG');
+			Utils::$context['linktree'][] = ['url' => Config::$scripturl . '?action=calendar;sa=clock;omfg', 'name' => 'OMFG'];
 			Utils::$context['clockicons'] = Utils::jsonDecode(base64_decode('eyJ5ZWFyIjpbNjQsMzIsMTYsOCw0LDIsMV0sIm1vbnRoIjpbOCw0LDIsMV0sImRheSI6WzE2LDgsNCwyLDFdLCJob3VyIjpbMTYsOCw0LDIsMV0sIm1pbiI6WzMyLDE2LDgsNCwyLDFdLCJzZWMiOlszMiwxNiw4LDQsMiwxXX0='), true);
-		}
-		elseif (isset($_REQUEST['time']))
-		{
+		} elseif (isset($_REQUEST['time'])) {
 			Utils::$context['sub_template'] = 'thetime';
 			$_REQUEST['time'] = $_REQUEST['time'] == '' ? 'now' : $_REQUEST['time'];
 			$time = getdate($_REQUEST['time'] == 'now' ? time() : (int) $_REQUEST['time']);
-			Utils::$context['linktree'][] = array('url' => Config::$scripturl . '?action=calendar;sa=clock;time=' . $_REQUEST['time'], 'name' => 'Requested Time');
-			Utils::$context['clockicons'] = array(
-				'year' => array_fill_keys(array_map(fn($p) => 2**$p, range(6, 0)), false),
-				'mon' => array_fill_keys(array_map(fn($p) => 2**$p, range(3, 0)), false),
-				'mday' => array_fill_keys(array_map(fn($p) => 2**$p, range(4, 0)), false),
-				'hours' => array_fill_keys(array_map(fn($p) => 2**$p, range(5, 0)), false),
-				'minutes' => array_fill_keys(array_map(fn($p) => 2**$p, range(5, 0)), false),
-				'seconds' => array_fill_keys(array_map(fn($p) => 2**$p, range(5, 0)), false),
-			);
-
-			foreach (Utils::$context['clockicons'] as $t => $vs)
-			{
-				foreach ($vs as $v => $dumb)
-				{
-					if ($time[$t] >= $v)
-					{
+			Utils::$context['linktree'][] = ['url' => Config::$scripturl . '?action=calendar;sa=clock;time=' . $_REQUEST['time'], 'name' => 'Requested Time'];
+			Utils::$context['clockicons'] = [
+				'year' => array_fill_keys(array_map(fn ($p) => 2 ** $p, range(6, 0)), false),
+				'mon' => array_fill_keys(array_map(fn ($p) => 2 ** $p, range(3, 0)), false),
+				'mday' => array_fill_keys(array_map(fn ($p) => 2 ** $p, range(4, 0)), false),
+				'hours' => array_fill_keys(array_map(fn ($p) => 2 ** $p, range(5, 0)), false),
+				'minutes' => array_fill_keys(array_map(fn ($p) => 2 ** $p, range(5, 0)), false),
+				'seconds' => array_fill_keys(array_map(fn ($p) => 2 ** $p, range(5, 0)), false),
+			];
+
+			foreach (Utils::$context['clockicons'] as $t => $vs) {
+				foreach ($vs as $v => $dumb) {
+					if ($time[$t] >= $v) {
 						$time[$t] -= $v;
 						Utils::$context['clockicons'][$t][$v] = true;
 					}
@@ -670,8 +680,9 @@ public function clock(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -719,11 +730,11 @@ public static function getBirthdayRange($low_date, $high_date): array
 		$year_low = (int) substr($low_date, 0, 4);
 		$year_high = (int) substr($high_date, 0, 4);
 
-		if (Db::$db->title !== POSTGRE_TITLE)
-		{
+		if (Db::$db->title !== POSTGRE_TITLE) {
 			// Collect all of the birthdays for this month.  I know, it's a painful query.
-			$result = Db::$db->query('', '
-				SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
 				FROM {db_prefix}members
 				WHERE birthdate != {date:no_birthdate}
 					AND (
@@ -731,20 +742,19 @@ public static function getBirthdayRange($low_date, $high_date): array
 						OR DATE_FORMAT(birthdate, {string:year_high}) BETWEEN {date:low_date} AND {date:high_date}') . '
 					)
 					AND is_activated = {int:is_activated}',
-				array(
+				[
 					'is_activated' => 1,
 					'no_birthdate' => '1004-01-01',
 					'year_low' => $year_low . '-%m-%d',
 					'year_high' => $year_high . '-%m-%d',
 					'low_date' => $low_date,
 					'high_date' => $high_date,
-				)
+				],
 			);
-		}
-		else
-		{
-			$result = Db::$db->query('', '
-				SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
+		} else {
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
 				FROM {db_prefix}members
 				WHERE birthdate != {date:no_birthdate}
 					AND (
@@ -752,38 +762,40 @@ public static function getBirthdayRange($low_date, $high_date): array
 						OR indexable_month_day(birthdate) BETWEEN indexable_month_day({date:year_high_low_date}) AND indexable_month_day({date:year_high_high_date})') . '
 					)
 					AND is_activated = {int:is_activated}',
-				array(
+				[
 					'is_activated' => 1,
 					'no_birthdate' => '1004-01-01',
 					'year_low_low_date' => $low_date,
 					'year_low_high_date' => $year_low == $year_high ? $high_date : $year_low . '-12-31',
 					'year_high_low_date' => $year_low == $year_high ? $low_date : $year_high . '-01-01',
 					'year_high_high_date' => $high_date,
-				)
+				],
 			);
 		}
-		$bday = array();
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			if ($year_low != $year_high)
+		$bday = [];
+
+		while ($row = Db::$db->fetch_assoc($result)) {
+			if ($year_low != $year_high) {
 				$age_year = substr($row['birthdate'], 5) <= substr($high_date, 5) ? $year_high : $year_low;
-			else
+			} else {
 				$age_year = $year_low;
+			}
 
-			$bday[$age_year . substr($row['birthdate'], 4)][] = array(
+			$bday[$age_year . substr($row['birthdate'], 4)][] = [
 				'id' => $row['id_member'],
 				'name' => $row['real_name'],
 				'age' => $row['birth_year'] > 1004 && $row['birth_year'] <= $age_year ? $age_year - $row['birth_year'] : null,
-				'is_last' => false
-			);
+				'is_last' => false,
+			];
 		}
 		Db::$db->free_result($result);
 
 		ksort($bday);
 
 		// Set is_last, so the themes know when to stop placing separators.
-		foreach ($bday as $mday => $array)
+		foreach ($bday as $mday => $array) {
 			$bday[$mday][count($array) - 1]['is_last'] = true;
+		}
 
 		return $bday;
 	}
@@ -803,24 +815,23 @@ public static function getBirthdayRange($low_date, $high_date): array
 	 */
 	public static function getEventRange($low_date, $high_date, $use_permissions = true): array
 	{
-		$events = array();
+		$events = [];
 
 		$one_day = date_interval_create_from_date_string('1 day');
 		$tz = timezone_open(User::getTimezone());
 
-		foreach (Event::loadRange($low_date, $high_date, $use_permissions) as $event)
-		{
+		foreach (Event::loadRange($low_date, $high_date, $use_permissions) as $event) {
 			$cal_date = new Time($event->start_date_local, $tz);
 
-			while ($cal_date->getTimestamp() <= $event->end->getTimestamp() && $cal_date->format('Y-m-d') <= $high_date)
-			{
+			while ($cal_date->getTimestamp() <= $event->end->getTimestamp() && $cal_date->format('Y-m-d') <= $high_date) {
 				$events[$cal_date->format('Y-m-d')][] = $event;
 				date_add($cal_date, $one_day);
 			}
 		}
 
-		foreach ($events as $mday => $array)
+		foreach ($events as $mday => $array) {
 			$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 
 		ksort($events);
 
@@ -837,34 +848,37 @@ public static function getEventRange($low_date, $high_date, $use_permissions = t
 	public static function getHolidayRange($low_date, $high_date): array
 	{
 		// Get the lowest and highest dates for "all years".
-		if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
+		if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
 			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
 				OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}';
-		else
+		} else {
 			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+		}
 
 		// Find some holidays... ;).
-		$result = Db::$db->query('', '
-			SELECT event_date, YEAR(event_date) AS year, title
+		$result = Db::$db->query(
+			'',
+			'SELECT event_date, YEAR(event_date) AS year, title
 			FROM {db_prefix}calendar_holidays
 			WHERE event_date BETWEEN {date:low_date} AND {date:high_date}
 				OR ' . $allyear_part,
-			array(
+			[
 				'low_date' => $low_date,
 				'high_date' => $high_date,
 				'all_year_low' => '1004' . substr($low_date, 4),
 				'all_year_high' => '1004' . substr($high_date, 4),
 				'all_year_jan' => '1004-01-01',
 				'all_year_dec' => '1004-12-31',
-			)
+			],
 		);
-		$holidays = array();
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
+		$holidays = [];
+
+		while ($row = Db::$db->fetch_assoc($result)) {
+			if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
 				$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
-			else
+			} else {
 				$event_year = substr($low_date, 0, 4);
+			}
 
 			$holidays[$event_year . substr($row['event_date'], 4)][] = $row['title'];
 		}
@@ -889,34 +903,36 @@ public static function canLinkEvent(): void
 		User::$me->isAllowedTo('calendar_post');
 
 		// No board?  No topic?!?
-		if (empty(Board::$info->id))
+		if (empty(Board::$info->id)) {
 			ErrorHandler::fatalLang('missing_board_id', false);
+		}
 
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('missing_topic_id', false);
+		}
 
 		// Administrator, Moderator, or owner.  Period.
-		if (!User::$me->allowedTo('admin_forum') && !User::$me->allowedTo('moderate_board'))
-		{
+		if (!User::$me->allowedTo('admin_forum') && !User::$me->allowedTo('moderate_board')) {
 			// Not admin or a moderator of this board. You better be the owner - or else.
-			$result = Db::$db->query('', '
-				SELECT id_member_started
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member_started
 				FROM {db_prefix}topics
 				WHERE id_topic = {int:current_topic}
 				LIMIT 1',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
-				)
+				],
 			);
-			if ($row = Db::$db->fetch_assoc($result))
-			{
+
+			if ($row = Db::$db->fetch_assoc($result)) {
 				// Not the owner of the topic.
-				if ($row['id_member_started'] != User::$me->id)
+				if ($row['id_member_started'] != User::$me->id) {
 					ErrorHandler::fatalLang('not_your_topic', 'user');
+				}
 			}
 			// Topic/Board doesn't exist.....
-			else
-			{
+			else {
 				ErrorHandler::fatalLang('calendar_no_topic', 'general');
 			}
 			Db::$db->free_result($result);
@@ -932,12 +948,12 @@ public static function canLinkEvent(): void
 	 */
 	public static function getTodayInfo(): array
 	{
-		return array(
+		return [
 			'day' => (int) Time::strftime('%d', time(), User::getTimezone()),
 			'month' => (int) Time::strftime('%m', time(), User::getTimezone()),
 			'year' => (int) Time::strftime('%Y', time(), User::getTimezone()),
 			'date' => Time::strftime('%Y-%m-%d', time(), User::getTimezone()),
-		);
+		];
 	}
 
 	/**
@@ -960,32 +976,32 @@ public static function getCalendarGrid($selected_date, $calendarOptions, $is_pre
 		$prev_object->modify('first day of previous month');
 
 		// Eventually this is what we'll be returning.
-		$calendarGrid = array(
-			'week_days' => array(),
-			'weeks' => array(),
+		$calendarGrid = [
+			'week_days' => [],
+			'weeks' => [],
 			'short_day_titles' => !empty($calendarOptions['short_day_titles']),
 			'short_month_titles' => !empty($calendarOptions['short_month_titles']),
 			'current_month' => $selected_object->format('n'),
 			'current_year' => $selected_object->format('Y'),
 			'current_day' => $selected_object->format('d'),
 			'show_next_prev' => !empty($calendarOptions['show_next_prev']),
-			'show_week_links' => isset($calendarOptions['show_week_links']) ? $calendarOptions['show_week_links'] : 0,
-			'previous_calendar' => array(
+			'show_week_links' => $calendarOptions['show_week_links'] ?? 0,
+			'previous_calendar' => [
 				'year' => $prev_object->format('Y'),
 				'month' => $prev_object->format('n'),
 				'day' => $prev_object->format('d'),
 				'start_date' => $prev_object->format('Y-m-d'),
 				'disabled' => Config::$modSettings['cal_minyear'] > $prev_object->format('Y'),
-			),
-			'next_calendar' => array(
+			],
+			'next_calendar' => [
 				'year' => $next_object->format('Y'),
 				'month' => $next_object->format('n'),
 				'day' => $next_object->format('d'),
 				'start_date' => $next_object->format('Y-m-d'),
 				'disabled' => Config::$modSettings['cal_maxyear'] < $next_object->format('Y'),
-			),
+			],
 			'start_date' => $selected_object->format(Time::getDateFormat()),
-		);
+		];
 
 		// Get today's date.
 		$today = self::getTodayInfo();
@@ -994,19 +1010,19 @@ public static function getCalendarGrid($selected_date, $calendarOptions, $is_pre
 		$last_day_object = new Time($selected_object->format('Y-m-t') . ' ' . User::getTimezone());
 
 		// Get information about this month.
-		$month_info = array(
-			'first_day' => array(
+		$month_info = [
+			'first_day' => [
 				'day_of_week' => $first_day_object->format('w'),
 				'week_num' => $first_day_object->format('W'),
 				'date' => $first_day_object->format('Y-m-d'),
-			),
-			'last_day' => array(
+			],
+			'last_day' => [
 				'day_of_month' => $last_day_object->format('t'),
 				'date' => $last_day_object->format('Y-m-d'),
-			),
+			],
 			'first_day_of_year' => Time::create($selected_object->format('Y-01-01') . ' ' . User::getTimezone())->format('w'),
 			'first_day_of_next_year' => Time::create(($selected_object->format('Y') + 1) . '-01-01' . ' ' . User::getTimezone())->format('w'),
-		);
+		];
 
 		// The number of days the first row is shifted to the right for the starting day.
 		$nShift = $month_info['first_day']['day_of_week'];
@@ -1014,68 +1030,74 @@ public static function getCalendarGrid($selected_date, $calendarOptions, $is_pre
 		$calendarOptions['start_day'] = empty($calendarOptions['start_day']) ? 0 : (int) $calendarOptions['start_day'];
 
 		// Starting any day other than Sunday means a shift...
-		if (!empty($calendarOptions['start_day']))
-		{
+		if (!empty($calendarOptions['start_day'])) {
 			$nShift -= $calendarOptions['start_day'];
-			if ($nShift < 0)
+
+			if ($nShift < 0) {
 				$nShift = 7 + $nShift;
+			}
 		}
 
 		// Number of rows required to fit the month.
 		$nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7);
-		if (($month_info['last_day']['day_of_month'] + $nShift) % 7)
+
+		if (($month_info['last_day']['day_of_month'] + $nShift) % 7) {
 			$nRows++;
+		}
 
 		// Fetch the arrays for birthdays, posted events, and holidays.
-		$bday = $calendarOptions['show_birthdays'] ? self::getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
-		$events = $calendarOptions['show_events'] ? self::getEventRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
-		$holidays = $calendarOptions['show_holidays'] ? self::getHolidayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
+		$bday = $calendarOptions['show_birthdays'] ? self::getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : [];
+		$events = $calendarOptions['show_events'] ? self::getEventRange($month_info['first_day']['date'], $month_info['last_day']['date']) : [];
+		$holidays = $calendarOptions['show_holidays'] ? self::getHolidayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : [];
 
 		// Days of the week taking into consideration that they may want it to start on any day.
 		$count = $calendarOptions['start_day'];
-		for ($i = 0; $i < 7; $i++)
-		{
+
+		for ($i = 0; $i < 7; $i++) {
 			$calendarGrid['week_days'][] = $count;
 			$count++;
-			if ($count == 7)
+
+			if ($count == 7) {
 				$count = 0;
+			}
 		}
 
 		// Iterate through each week.
-		$calendarGrid['weeks'] = array();
-		for ($nRow = 0; $nRow < $nRows; $nRow++)
-		{
+		$calendarGrid['weeks'] = [];
+
+		for ($nRow = 0; $nRow < $nRows; $nRow++) {
 			// Start off the week - and don't let it go above 52, since that's the number of weeks in a year.
-			$calendarGrid['weeks'][$nRow] = array(
-				'days' => array(),
-			);
+			$calendarGrid['weeks'][$nRow] = [
+				'days' => [],
+			];
 
 			// And figure out all the days.
-			for ($nCol = 0; $nCol < 7; $nCol++)
-			{
+			for ($nCol = 0; $nCol < 7; $nCol++) {
 				$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
-				if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
+				if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) {
 					$nDay = 0;
+				}
 
 				$date = $selected_object->format('Y-m-') . sprintf('%02d', $nDay);
 
-				$calendarGrid['weeks'][$nRow]['days'][$nCol] = array(
+				$calendarGrid['weeks'][$nRow]['days'][$nCol] = [
 					'day' => $nDay,
 					'date' => $date,
 					'is_today' => $date == $today['date'],
 					'is_first_day' => !empty($calendarOptions['show_week_num']) && (($month_info['first_day']['day_of_week'] + $nDay - 1) % 7 == $calendarOptions['start_day']),
 					'is_first_of_month' => $nDay === 1,
-					'holidays' => !empty($holidays[$date]) ? $holidays[$date] : array(),
-					'events' => !empty($events[$date]) ? $events[$date] : array(),
-					'birthdays' => !empty($bday[$date]) ? $bday[$date] : array(),
-				);
+					'holidays' => !empty($holidays[$date]) ? $holidays[$date] : [],
+					'events' => !empty($events[$date]) ? $events[$date] : [],
+					'birthdays' => !empty($bday[$date]) ? $bday[$date] : [],
+				];
 			}
 		}
 
 		// What is the last day of the month?
-		if ($is_previous === true)
+		if ($is_previous === true) {
 			$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+		}
 
 		// We'll use the shift in the template.
 		$calendarGrid['shift'] = $nShift;
@@ -1085,8 +1107,7 @@ public static function getCalendarGrid($selected_date, $calendarOptions, $is_pre
 
 		$calendarGrid['next_calendar']['href'] = Config::$scripturl . '?action=calendar;viewmonth;year=' . $calendarGrid['next_calendar']['year'] . ';month=' . $calendarGrid['next_calendar']['month'] . ';day=' . $calendarGrid['previous_calendar']['day'];
 
-		if ($has_picker)
-		{
+		if ($has_picker) {
 			self::loadDatePicker('#calendar_navigation .date_input');
 			self::loadDatePair('#calendar_navigation', 'date_input');
 		}
@@ -1113,12 +1134,14 @@ public static function getCalendarWeek($selected_date, $calendarOptions): array
 
 		$day_of_week = $selected_object->format('w');
 		$first_day_object = new Time($selected_date . ' ' . User::getTimezone());
-		if ($day_of_week != $calendarOptions['start_day'])
-		{
+
+		if ($day_of_week != $calendarOptions['start_day']) {
 			// Here we offset accordingly to get things to the real start of a week.
 			$date_diff = $day_of_week - $calendarOptions['start_day'];
-			if ($date_diff < 0)
+
+			if ($date_diff < 0) {
 				$date_diff += 7;
+			}
 
 			date_sub($first_day_object, date_interval_create_from_date_string($date_diff . ' days'));
 		}
@@ -1137,62 +1160,62 @@ public static function getCalendarWeek($selected_date, $calendarOptions): array
 		date_sub($prev_object, date_interval_create_from_date_string('1 week'));
 
 		// Now start filling in the calendar grid.
-		$calendarGrid = array(
+		$calendarGrid = [
 			'show_next_prev' => !empty($calendarOptions['show_next_prev']),
-			'previous_week' => array(
+			'previous_week' => [
 				'year' => $prev_object->format('Y'),
 				'month' => $prev_object->format('n'),
 				'day' => $prev_object->format('d'),
 				'start_date' => $prev_object->format('Y-m-d'),
 				'disabled' => Config::$modSettings['cal_minyear'] > $prev_object->format('Y'),
-			),
-			'next_week' => array(
+			],
+			'next_week' => [
 				'year' => $next_object->format('Y'),
 				'month' => $next_object->format('n'),
 				'day' => $next_object->format('d'),
 				'start_date' => $next_object->format('Y-m-d'),
 				'disabled' => Config::$modSettings['cal_maxyear'] < $next_object->format('Y'),
-			),
+			],
 			'start_date' => $selected_object->format(Time::getDateFormat()),
 			'show_events' => $calendarOptions['show_events'],
 			'show_holidays' => $calendarOptions['show_holidays'],
 			'show_birthdays' => $calendarOptions['show_birthdays'],
-		);
+		];
 
 		// Fetch the arrays for birthdays, posted events, and holidays.
-		$bday = $calendarOptions['show_birthdays'] ? self::getBirthdayRange($first_day_object->format('Y-m-d'), $last_day_object->format('Y-m-d')) : array();
-		$events = $calendarOptions['show_events'] ? self::getEventRange($first_day_object->format('Y-m-d'), $last_day_object->format('Y-m-d')) : array();
-		$holidays = $calendarOptions['show_holidays'] ? self::getHolidayRange($first_day_object->format('Y-m-d'), $last_day_object->format('Y-m-d')) : array();
+		$bday = $calendarOptions['show_birthdays'] ? self::getBirthdayRange($first_day_object->format('Y-m-d'), $last_day_object->format('Y-m-d')) : [];
+		$events = $calendarOptions['show_events'] ? self::getEventRange($first_day_object->format('Y-m-d'), $last_day_object->format('Y-m-d')) : [];
+		$holidays = $calendarOptions['show_holidays'] ? self::getHolidayRange($first_day_object->format('Y-m-d'), $last_day_object->format('Y-m-d')) : [];
 
 		$calendarGrid['week_title'] = sprintf(Lang::$txt['calendar_week_beginning'], Lang::$txt['months'][$first_day_object->format('n')], $first_day_object->format('j'), $first_day_object->format('Y'));
 
 		// This holds all the main data - there is at least one month!
-		$calendarGrid['months'] = array();
+		$calendarGrid['months'] = [];
 
 		$current_day_object = new Time($first_day_object->format('Y-m-d') . ' ' . User::getTimezone());
 
-		for ($i = 0; $i < 7; $i++)
-		{
+		for ($i = 0; $i < 7; $i++) {
 			$current_month = $current_day_object->format('n');
 			$current_day = $current_day_object->format('j');
 			$current_date = $current_day_object->format('Y-m-d');
 
-			if (!isset($calendarGrid['months'][$current_month]))
-				$calendarGrid['months'][$current_month] = array(
+			if (!isset($calendarGrid['months'][$current_month])) {
+				$calendarGrid['months'][$current_month] = [
 					'current_month' => $current_month,
 					'current_year' => $current_day_object->format('Y'),
-					'days' => array(),
-				);
+					'days' => [],
+				];
+			}
 
-			$calendarGrid['months'][$current_month]['days'][$current_day] = array(
+			$calendarGrid['months'][$current_month]['days'][$current_day] = [
 				'day' => $current_day,
 				'day_of_week' => ($current_day_object->format('w') + 7) % 7,
 				'date' => $current_date,
 				'is_today' => $current_date == $today['date'],
-				'holidays' => !empty($holidays[$current_date]) ? $holidays[$current_date] : array(),
-				'events' => !empty($events[$current_date]) ? $events[$current_date] : array(),
-				'birthdays' => !empty($bday[$current_date]) ? $bday[$current_date] : array()
-			);
+				'holidays' => !empty($holidays[$current_date]) ? $holidays[$current_date] : [],
+				'events' => !empty($events[$current_date]) ? $events[$current_date] : [],
+				'birthdays' => !empty($bday[$current_date]) ? $bday[$current_date] : [],
+			];
 
 			date_add($current_day_object, date_interval_create_from_date_string('1 day'));
 		}
@@ -1222,7 +1245,7 @@ public static function getCalendarList($start_date, $end_date, $calendarOptions)
 		$start_object = new Time($start_date . ' ' . User::getTimezone());
 		$end_object = new Time($end_date . ' ' . User::getTimezone());
 
-		$calendarGrid = array(
+		$calendarGrid = [
 			'start_date' => $start_object->format(Time::getDateFormat()),
 			'start_year' => $start_object->format('Y'),
 			'start_month' => $start_object->format('m'),
@@ -1231,37 +1254,34 @@ public static function getCalendarList($start_date, $end_date, $calendarOptions)
 			'end_year' => $end_object->format('Y'),
 			'end_month' => $end_object->format('m'),
 			'end_day' => $end_object->format('d'),
-		);
+		];
 
-		$calendarGrid['birthdays'] = $calendarOptions['show_birthdays'] ? self::getBirthdayRange($start_date, $end_date) : array();
-		$calendarGrid['holidays'] = $calendarOptions['show_holidays'] ? self::getHolidayRange($start_date, $end_date) : array();
-		$calendarGrid['events'] = $calendarOptions['show_events'] ? self::getEventRange($start_date, $end_date) : array();
+		$calendarGrid['birthdays'] = $calendarOptions['show_birthdays'] ? self::getBirthdayRange($start_date, $end_date) : [];
+		$calendarGrid['holidays'] = $calendarOptions['show_holidays'] ? self::getHolidayRange($start_date, $end_date) : [];
+		$calendarGrid['events'] = $calendarOptions['show_events'] ? self::getEventRange($start_date, $end_date) : [];
 
 		// Get rid of duplicate events
-		$temp = array();
-		foreach ($calendarGrid['events'] as $date => $date_events)
-		{
-			foreach ($date_events as $event_key => $event_val)
-			{
-				if (in_array($event_val['id'], $temp))
-				{
+		$temp = [];
+
+		foreach ($calendarGrid['events'] as $date => $date_events) {
+			foreach ($date_events as $event_key => $event_val) {
+				if (in_array($event_val['id'], $temp)) {
 					unset($calendarGrid['events'][$date][$event_key]);
 
-					if (empty($calendarGrid['events'][$date]))
+					if (empty($calendarGrid['events'][$date])) {
 						unset($calendarGrid['events'][$date]);
-				}
-				else
+					}
+				} else {
 					$temp[] = $event_val['id'];
+				}
 			}
 		}
 
 		// Give birthdays and holidays a friendly format, without the year.
 		$date_format = Time::getShortDateFormat();
 
-		foreach (array('birthdays', 'holidays') as $type)
-		{
-			foreach ($calendarGrid[$type] as $date => $date_content)
-			{
+		foreach (['birthdays', 'holidays'] as $type) {
+			foreach ($calendarGrid[$type] as $date => $date_content) {
 				// Make sure to apply no offsets
 				$date_local = preg_replace('~(?<=\s)0+(\d)~', '$1', trim(Time::create($date)->format($date_format), " \t\n\r\0\x0B,./;:<>()[]{}\\|-_=+"));
 
@@ -1283,11 +1303,12 @@ public static function getCalendarList($start_date, $end_date, $calendarOptions)
 	 */
 	public static function loadDatePicker($selector = 'input.date_input', $date_format = ''): void
 	{
-		if (empty($date_format))
+		if (empty($date_format)) {
 			$date_format = Time::getDateFormat();
+		}
 
 		// Convert to format used by datepicker
-		$date_format = strtr($date_format, array(
+		$date_format = strtr($date_format, [
 			// Day
 			'%a' => 'D', '%A' => 'DD', '%e' => 'd', '%d' => 'dd', '%j' => 'oo', '%u' => '', '%w' => '',
 			// Week
@@ -1303,10 +1324,10 @@ public static function loadDatePicker($selector = 'input.date_input', $date_form
 			'%c' => 'D, d M yy', '%D' => 'mm/dd/y', '%F' => 'yy-mm-dd', '%s' => '@', '%x' => 'D, d M yy',
 			// Miscellaneous
 			'%n' => ' ', '%t' => ' ', '%%' => '%',
-		));
+		]);
 
-		Theme::loadCSSFile('jquery-ui.datepicker.css', array(), 'smf_datepicker');
-		Theme::loadJavaScriptFile('jquery-ui.datepicker.min.js', array('defer' => true), 'smf_datepicker');
+		Theme::loadCSSFile('jquery-ui.datepicker.css', [], 'smf_datepicker');
+		Theme::loadJavaScriptFile('jquery-ui.datepicker.min.js', ['defer' => true], 'smf_datepicker');
 		Theme::addInlineJavaScript('
 		$("' . $selector . '").datepicker({
 			dateFormat: "' . $date_format . '",
@@ -1336,11 +1357,12 @@ public static function loadDatePicker($selector = 'input.date_input', $date_form
 	 */
 	public static function loadTimePicker($selector = 'input.time_input', $time_format = ''): void
 	{
-		if (empty($time_format))
+		if (empty($time_format)) {
 			$time_format = Time::getTimeFormat();
+		}
 
 		// Format used for timepicker
-		$time_format = strtr($time_format, array(
+		$time_format = strtr($time_format, [
 			'%H' => 'H',
 			'%k' => 'G',
 			'%I' => 'h',
@@ -1353,10 +1375,10 @@ public static function loadTimePicker($selector = 'input.time_input', $time_form
 			'%S' => 's',
 			'%T' => 'H:i:s',
 			'%X' => 'H:i:s',
-		));
+		]);
 
-		Theme::loadCSSFile('jquery.timepicker.css', array(), 'smf_timepicker');
-		Theme::loadJavaScriptFile('jquery.timepicker.min.js', array('defer' => true), 'smf_timepicker');
+		Theme::loadCSSFile('jquery.timepicker.css', [], 'smf_timepicker');
+		Theme::loadJavaScriptFile('jquery.timepicker.min.js', ['defer' => true], 'smf_timepicker');
 		Theme::addInlineJavaScript('
 		$("' . $selector . '").timepicker({
 			timeFormat: "' . $time_format . '",
@@ -1390,22 +1412,20 @@ public static function loadDatePair($container, $date_class = '', $time_class =
 		$date_class = (string) $date_class;
 		$time_class = (string) $time_class;
 
-		if ($container == '')
+		if ($container == '') {
 			return;
+		}
 
-		Theme::loadJavaScriptFile('jquery.datepair.min.js', array('defer' => true), 'smf_datepair');
+		Theme::loadJavaScriptFile('jquery.datepair.min.js', ['defer' => true], 'smf_datepair');
 
 		$datepair_options = '';
 
 		// If we're not using a date input, we might as well disable these.
-		if ($date_class == '')
-		{
+		if ($date_class == '') {
 			$datepair_options .= '
 			parseDate: function (el) {},
 			updateDate: function (el, v) {},';
-		}
-		else
-		{
+		} else {
 			$datepair_options .= '
 			dateClass: "' . $date_class . '",';
 
@@ -1425,22 +1445,18 @@ public static function loadDatePair($container, $date_class = '', $time_class =
 		}
 
 		// If not using a time input, disable time functions.
-		if ($time_class == '')
-		{
+		if ($time_class == '') {
 			$datepair_options .= '
 			parseTime: function(input){},
 			updateTime: function(input, dateObj){},
 			setMinTime: function(input, dateObj){},';
-		}
-		else
-		{
+		} else {
 			$datepair_options .= '
 			timeClass: "' . $time_class . '",';
 		}
 
 		Theme::addInlineJavaScript('
 		$("' . $container . '").datepair({' . $datepair_options . "\n\t});", true);
-
 	}
 
 	/**
@@ -1459,15 +1475,15 @@ public static function cache_getOffsetIndependentEvents($eventOptions): array
 		$low_date = Time::strftime('%Y-%m-%d', time() - 24 * 3600);
 		$high_date = Time::strftime('%Y-%m-%d', time() + $days_to_index * 24 * 3600);
 
-		return array(
-			'data' => array(
-				'holidays' => (!empty($eventOptions['include_holidays']) ? self::getHolidayRange($low_date, $high_date) : array()),
-				'birthdays' => (!empty($eventOptions['include_birthdays']) ? self::getBirthdayRange($low_date, $high_date) : array()),
-				'events' => (!empty($eventOptions['include_events']) ? self::getEventRange($low_date, $high_date, false) : array()),
-			),
-			'refresh_eval' => 'return \'' . Time::strftime('%Y%m%d', time()) . '\' != \SMF\Time::strftime(\'%Y%m%d\', time()) || (!empty(\SMF\Config::$modSettings[\'calendar_updated\']) && ' . time() . ' < \SMF\Config::$modSettings[\'calendar_updated\']);',
+		return [
+			'data' => [
+				'holidays' => (!empty($eventOptions['include_holidays']) ? self::getHolidayRange($low_date, $high_date) : []),
+				'birthdays' => (!empty($eventOptions['include_birthdays']) ? self::getBirthdayRange($low_date, $high_date) : []),
+				'events' => (!empty($eventOptions['include_events']) ? self::getEventRange($low_date, $high_date, false) : []),
+			],
+			'refresh_eval' => 'return \'' . Time::strftime('%Y%m%d', time()) . '\' != \\SMF\\Time::strftime(\'%Y%m%d\', time()) || (!empty(\\SMF\\Config::$modSettings[\'calendar_updated\']) && ' . time() . ' < \\SMF\\Config::$modSettings[\'calendar_updated\']);',
 			'expires' => time() + 3600,
-		);
+		];
 	}
 
 	/**
@@ -1481,16 +1497,16 @@ public static function cache_getOffsetIndependentEvents($eventOptions): array
 	public static function cache_getRecentEvents($eventOptions): array
 	{
 		// With the 'static' cached data we can calculate the user-specific data.
-		$cached_data = CacheApi::quickGet('calendar_index', 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getOffsetIndependentEvents', array($eventOptions));
+		$cached_data = CacheApi::quickGet('calendar_index', 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getOffsetIndependentEvents', [$eventOptions]);
 
 		// Get the information about today (from user perspective).
 		$today = self::getTodayInfo();
 
-		$return_data = array(
-			'calendar_holidays' => array(),
-			'calendar_birthdays' => array(),
-			'calendar_events' => array(),
-		);
+		$return_data = [
+			'calendar_holidays' => [],
+			'calendar_birthdays' => [],
+			'calendar_events' => [],
+		];
 
 		// Set the event span to be shown in seconds.
 		$days_for_index = $eventOptions['num_days_shown'] * 86400;
@@ -1498,57 +1514,54 @@ public static function cache_getRecentEvents($eventOptions): array
 		// Get the current member time/date.
 		$now = time();
 
-		if (!empty($eventOptions['include_holidays']))
-		{
+		if (!empty($eventOptions['include_holidays'])) {
 			// Holidays between now and now + days.
-			for ($i = $now; $i < $now + $days_for_index; $i += 86400)
-			{
-				if (isset($cached_data['holidays'][Time::strftime('%Y-%m-%d', $i)]))
+			for ($i = $now; $i < $now + $days_for_index; $i += 86400) {
+				if (isset($cached_data['holidays'][Time::strftime('%Y-%m-%d', $i)])) {
 					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][Time::strftime('%Y-%m-%d', $i)]);
+				}
 			}
 		}
 
-		if (!empty($eventOptions['include_birthdays']))
-		{
+		if (!empty($eventOptions['include_birthdays'])) {
 			// Happy Birthday, guys and gals!
-			for ($i = $now; $i < $now + $days_for_index; $i += 86400)
-			{
+			for ($i = $now; $i < $now + $days_for_index; $i += 86400) {
 				$loop_date = Time::strftime('%Y-%m-%d', $i);
-				if (isset($cached_data['birthdays'][$loop_date]))
-				{
-					foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
+
+				if (isset($cached_data['birthdays'][$loop_date])) {
+					foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) {
 						$cached_data['birthdays'][Time::strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+					}
 					$return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]);
 				}
 			}
 		}
 
-		if (!empty($eventOptions['include_events']))
-		{
-			$duplicates = array();
-			for ($i = $now; $i < $now + $days_for_index; $i += 86400)
-			{
+		if (!empty($eventOptions['include_events'])) {
+			$duplicates = [];
+
+			for ($i = $now; $i < $now + $days_for_index; $i += 86400) {
 				// Determine the date of the current loop step.
 				$loop_date = Time::strftime('%Y-%m-%d', $i);
 
 				// No events today? Check the next day.
-				if (empty($cached_data['events'][$loop_date]))
+				if (empty($cached_data['events'][$loop_date])) {
 					continue;
+				}
 
 				// Loop through all events to add a few last-minute values.
-				foreach ($cached_data['events'][$loop_date] as $ev => $event)
-				{
+				foreach ($cached_data['events'][$loop_date] as $ev => $event) {
 					// Create a shortcut variable for easier access.
 					$this_event = &$cached_data['events'][$loop_date][$ev];
 
 					// Skip duplicates.
-					if (isset($duplicates[$this_event['topic'] . $this_event['title']]))
-					{
+					if (isset($duplicates[$this_event['topic'] . $this_event['title']])) {
 						unset($cached_data['events'][$loop_date][$ev]);
+
 						continue;
 					}
-					else
-						$duplicates[$this_event['topic'] . $this_event['title']] = true;
+
+					$duplicates[$this_event['topic'] . $this_event['title']] = true;
 
 					// Might be set to true afterwards, depending on the permissions.
 					$this_event['can_edit'] = false;
@@ -1556,35 +1569,39 @@ public static function cache_getRecentEvents($eventOptions): array
 					$this_event['date'] = $loop_date;
 				}
 
-				if (!empty($cached_data['events'][$loop_date]))
+				if (!empty($cached_data['events'][$loop_date])) {
 					$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+				}
 			}
 		}
 
 		// Mark the last item so that a list separator can be used in the template.
-		for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++)
+		for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) {
 			$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
-		for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++)
+		}
+
+		for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) {
 			$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+		}
 
-		return array(
+		return [
 			'data' => $return_data,
 			'expires' => time() + 3600,
-			'refresh_eval' => 'return \'' . Time::strftime('%Y%m%d', time()) . '\' != \SMF\Time::strftime(\'%Y%m%d\', time()) || (!empty(\SMF\Config::$modSettings[\'calendar_updated\']) && ' . time() . ' < \SMF\Config::$modSettings[\'calendar_updated\']);',
+			'refresh_eval' => 'return \'' . Time::strftime('%Y%m%d', time()) . '\' != \\SMF\\Time::strftime(\'%Y%m%d\', time()) || (!empty(\\SMF\\Config::$modSettings[\'calendar_updated\']) && ' . time() . ' < \\SMF\\Config::$modSettings[\'calendar_updated\']);',
 			'post_retri_eval' => '
 
 				foreach ($cache_block[\'data\'][\'calendar_events\'] as $k => $event)
 				{
 					// Remove events that the user may not see or wants to ignore.
-					if ((count(array_intersect(\SMF\User::$me->groups, $event[\'allowed_groups\'])) === 0 && !\SMF\User::$me->allowedTo(\'admin_forum\') && !empty($event[\'id_board\'])) || in_array($event[\'id_board\'], \SMF\User::$me->ignoreboards))
+					if ((count(array_intersect(\\SMF\\User::$me->groups, $event[\'allowed_groups\'])) === 0 && !\\SMF\\User::$me->allowedTo(\'admin_forum\') && !empty($event[\'id_board\'])) || in_array($event[\'id_board\'], \\SMF\\User::$me->ignoreboards))
 						unset($cache_block[\'data\'][\'calendar_events\'][$k]);
 					else
 					{
 						// Whether the event can be edited depends on the permissions.
-						$cache_block[\'data\'][\'calendar_events\'][$k][\'can_edit\'] = \SMF\User::$me->allowedTo(\'calendar_edit_any\') || ($event[\'poster\'] == \SMF\User::$me->id && \SMF\User::$me->allowedTo(\'calendar_edit_own\'));
+						$cache_block[\'data\'][\'calendar_events\'][$k][\'can_edit\'] = \\SMF\\User::$me->allowedTo(\'calendar_edit_any\') || ($event[\'poster\'] == \\SMF\\User::$me->id && \\SMF\\User::$me->allowedTo(\'calendar_edit_own\'));
 
 						// The added session code makes this URL not cachable.
-						$cache_block[\'data\'][\'calendar_events\'][$k][\'modify_href\'] = \SMF\Config::$scripturl . \'?action=\' . ($event[\'topic\'] == 0 ? \'calendar;sa=post;\' : \'post;msg=\' . $event[\'msg\'] . \';topic=\' . $event[\'topic\'] . \'.0;calendar;\') . \'eventid=\' . $event[\'id\'] . \';\' . \SMF\Utils::$context[\'session_var\'] . \'=\' . \SMF\Utils::$context[\'session_id\'];
+						$cache_block[\'data\'][\'calendar_events\'][$k][\'modify_href\'] = \\SMF\\Config::$scripturl . \'?action=\' . ($event[\'topic\'] == 0 ? \'calendar;sa=post;\' : \'post;msg=\' . $event[\'msg\'] . \';topic=\' . $event[\'topic\'] . \'.0;calendar;\') . \'eventid=\' . $event[\'id\'] . \';\' . \\SMF\\Utils::$context[\'session_var\'] . \'=\' . \\SMF\\Utils::$context[\'session_id\'];
 					}
 				}
 
@@ -1596,7 +1613,7 @@ public static function cache_getRecentEvents($eventOptions): array
 					$cache_block[\'data\'][\'calendar_events\'] = array();
 
 				$cache_block[\'data\'][\'show_calendar\'] = !empty($cache_block[\'data\'][\'calendar_holidays\']) || !empty($cache_block[\'data\'][\'calendar_birthdays\']) || !empty($cache_block[\'data\'][\'calendar_events\']);',
-		);
+		];
 	}
 
 	/**
@@ -1604,51 +1621,54 @@ public static function cache_getRecentEvents($eventOptions): array
 	 */
 	public static function validateEventPost(): void
 	{
-		if (!isset($_POST['deleteevent']))
-		{
+		if (!isset($_POST['deleteevent'])) {
 			// The 2.1 way
-			if (isset($_POST['start_date']))
-			{
+			if (isset($_POST['start_date'])) {
 				$d = date_parse(str_replace(',', '', self::convertDateToEnglish($_POST['start_date'])));
 
-				if (!empty($d['error_count']) || !empty($d['warning_count']))
+				if (!empty($d['error_count']) || !empty($d['warning_count'])) {
 					ErrorHandler::fatalLang('invalid_date', false);
+				}
 
-				if (empty($d['year']))
+				if (empty($d['year'])) {
 					ErrorHandler::fatalLang('event_year_missing', false);
+				}
 
-				if (empty($d['month']))
+				if (empty($d['month'])) {
 					ErrorHandler::fatalLang('event_month_missing', false);
-			}
-			elseif (isset($_POST['start_datetime']))
-			{
+				}
+			} elseif (isset($_POST['start_datetime'])) {
 				$d = date_parse(str_replace(',', '', self::convertDateToEnglish($_POST['start_datetime'])));
 
-				if (!empty($d['error_count']) || !empty($d['warning_count']))
+				if (!empty($d['error_count']) || !empty($d['warning_count'])) {
 					ErrorHandler::fatalLang('invalid_date', false);
+				}
 
-				if (empty($d['year']))
+				if (empty($d['year'])) {
 					ErrorHandler::fatalLang('event_year_missing', false);
+				}
 
-				if (empty($d['month']))
+				if (empty($d['month'])) {
 					ErrorHandler::fatalLang('event_month_missing', false);
+				}
 			}
 			// The 2.0 way
-			else
-			{
+			else {
 				// No month?  No year?
-				if (!isset($_POST['month']))
+				if (!isset($_POST['month'])) {
 					ErrorHandler::fatalLang('event_month_missing', false);
+				}
 
-				if (!isset($_POST['year']))
+				if (!isset($_POST['year'])) {
 					ErrorHandler::fatalLang('event_year_missing', false);
+				}
 
 				// Check the month and year...
-				if ($_POST['month'] < 1 || $_POST['month'] > 12)
+				if ($_POST['month'] < 1 || $_POST['month'] > 12) {
 					ErrorHandler::fatalLang('invalid_month', false);
+				}
 
-				if ($_POST['year'] < Config::$modSettings['cal_minyear'] || $_POST['year'] > Config::$modSettings['cal_maxyear'])
-				{
+				if ($_POST['year'] < Config::$modSettings['cal_minyear'] || $_POST['year'] > Config::$modSettings['cal_maxyear']) {
 					ErrorHandler::fatalLang('invalid_year', false);
 				}
 			}
@@ -1658,40 +1678,41 @@ public static function validateEventPost(): void
 		User::$me->isAllowedTo('calendar_post');
 
 		// If they want to us to calculate an end date, make sure it will fit in an acceptable range.
-		if (isset($_POST['span']) && (($_POST['span'] < 1) || (!empty(Config::$modSettings['cal_maxspan']) && $_POST['span'] > Config::$modSettings['cal_maxspan'])))
-		{
+		if (isset($_POST['span']) && (($_POST['span'] < 1) || (!empty(Config::$modSettings['cal_maxspan']) && $_POST['span'] > Config::$modSettings['cal_maxspan']))) {
 			ErrorHandler::fatalLang('invalid_days_numb', false);
 		}
 
 		// There is no need to validate the following values if we are just deleting the event.
-		if (!isset($_POST['deleteevent']))
-		{
+		if (!isset($_POST['deleteevent'])) {
 			// If we're doing things the 2.0 way, check the day
-			if (empty($_POST['start_date']) && empty($_POST['start_datetime']))
-			{
+			if (empty($_POST['start_date']) && empty($_POST['start_datetime'])) {
 				// No day?
-				if (!isset($_POST['day']))
+				if (!isset($_POST['day'])) {
 					ErrorHandler::fatalLang('event_day_missing', false);
+				}
 
 				// Bad day?
-				if (!checkdate($_POST['month'], $_POST['day'], $_POST['year']))
+				if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) {
 					ErrorHandler::fatalLang('invalid_date', false);
+				}
 			}
 
-			if (!isset($_POST['evtitle']))
-			{
-				if (!isset($_POST['subject']))
+			if (!isset($_POST['evtitle'])) {
+				if (!isset($_POST['subject'])) {
 					ErrorHandler::fatalLang('event_title_missing', false);
+				}
 
 				$_POST['evtitle'] = $_POST['subject'];
 			}
 
 			// No title?
-			if (Utils::htmlTrim($_POST['evtitle']) === '')
+			if (Utils::htmlTrim($_POST['evtitle']) === '') {
 				ErrorHandler::fatalLang('event_title_missing', false);
+			}
 
-			if (Utils::entityStrlen($_POST['evtitle']) > 100)
+			if (Utils::entityStrlen($_POST['evtitle']) > 100) {
 				$_POST['evtitle'] = Utils::entitySubstr($_POST['evtitle'], 0, 100);
+			}
 
 			$_POST['evtitle'] = str_replace(';', '', $_POST['evtitle']);
 		}
@@ -1706,23 +1727,26 @@ public static function validateEventPost(): void
 	public static function getEventPoster($event_id): int|bool
 	{
 		// A simple database query, how hard can that be?
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}calendar
 			WHERE id_event = {int:id_event}
 			LIMIT 1',
-			array(
+			[
 				'id_event' => $event_id,
-			)
+			],
 		);
 
 		// No results, return false.
-		if (Db::$db->num_rows($request) === 0)
+		if (Db::$db->num_rows($request) === 0) {
 			return false;
+		}
 
 		// Grab the results and return.
-		list ($poster) = Db::$db->fetch_row($request);
+		list($poster) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
+
 		return (int) $poster;
 	}
 
@@ -1736,20 +1760,23 @@ public static function getEventPoster($event_id): int|bool
 	 */
 	public static function list_getHolidays($start, $items_per_page, $sort): array
 	{
-		$request = Db::$db->query('', '
-			SELECT id_holiday, YEAR(event_date) AS year, MONTH(event_date) AS month, DAYOFMONTH(event_date) AS day, title
+		$request = Db::$db->query(
+			'',
+			'SELECT id_holiday, YEAR(event_date) AS year, MONTH(event_date) AS month, DAYOFMONTH(event_date) AS day, title
 			FROM {db_prefix}calendar_holidays
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		$holidays = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$holidays = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$holidays[] = $row;
+		}
 		Db::$db->free_result($request);
 
 		return $holidays;
@@ -1762,11 +1789,12 @@ public static function list_getHolidays($start, $items_per_page, $sort): array
 	 */
 	public static function list_getNumHolidays(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}calendar_holidays',
-			array(
-			)
+			[
+			],
 		);
 		list($num_items) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -1781,17 +1809,18 @@ public static function list_getNumHolidays(): int
 	 */
 	public static function removeHolidays($holiday_ids): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}calendar_holidays
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}calendar_holidays
 			WHERE id_holiday IN ({array_int:id_holiday})',
-			array(
+			[
 				'id_holiday' => $holiday_ids,
-			)
+			],
 		);
 
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 	}
 
 	/**
@@ -1803,33 +1832,34 @@ public static function removeHolidays($holiday_ids): void
 	 */
 	public static function convertDateToEnglish($date): string
 	{
-		if (User::$me->language == 'english')
+		if (User::$me->language == 'english') {
 			return $date;
+		}
 
-		$replacements = array_combine(array_map('strtolower', Lang::$txt['months_titles']), array(
+		$replacements = array_combine(array_map('strtolower', Lang::$txt['months_titles']), [
 			'January', 'February', 'March', 'April', 'May', 'June',
-			'July', 'August', 'September', 'October', 'November', 'December'
-		));
-		$replacements += array_combine(array_map('strtolower', Lang::$txt['months_short']), array(
+			'July', 'August', 'September', 'October', 'November', 'December',
+		]);
+		$replacements += array_combine(array_map('strtolower', Lang::$txt['months_short']), [
 			'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-			'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
-		));
-		$replacements += array_combine(array_map('strtolower', Lang::$txt['days']), array(
-			'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'
-		));
-		$replacements += array_combine(array_map('strtolower', Lang::$txt['days_short']), array(
-			'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
-		));
+			'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',
+		]);
+		$replacements += array_combine(array_map('strtolower', Lang::$txt['days']), [
+			'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday',
+		]);
+		$replacements += array_combine(array_map('strtolower', Lang::$txt['days_short']), [
+			'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat',
+		]);
 		// Find all possible variants of AM and PM for this language.
 		$replacements[strtolower(Lang::$txt['time_am'])] = 'AM';
 		$replacements[strtolower(Lang::$txt['time_pm'])] = 'PM';
-		if (($am = Time::strftime('%p', strtotime('01:00:00'))) !== 'p' && $am !== false)
-		{
+
+		if (($am = Time::strftime('%p', strtotime('01:00:00'))) !== 'p' && $am !== false) {
 			$replacements[strtolower($am)] = 'AM';
 			$replacements[strtolower(Time::strftime('%p', strtotime('23:00:00')))] = 'PM';
 		}
-		if (($am = Time::strftime('%P', strtotime('01:00:00'))) !== 'P' && $am !== false)
-		{
+
+		if (($am = Time::strftime('%P', strtotime('01:00:00'))) !== 'P' && $am !== false) {
 			$replacements[strtolower($am)] = 'AM';
 			$replacements[strtolower(Time::strftime('%P', strtotime('23:00:00')))] = 'PM';
 		}
@@ -1846,27 +1876,30 @@ public static function convertDateToEnglish($date): string
 	 */
 	protected function __construct()
 	{
-		if ($_GET['action'] === 'clock')
+		if ($_GET['action'] === 'clock') {
 			$this->subaction = 'clock';
-		elseif (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		} elseif (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 
-		if ($this->subaction === 'clock')
+		if ($this->subaction === 'clock') {
 			return;
+		}
 
 		// Permissions, permissions, permissions.
 		User::$me->isAllowedTo('calendar_view');
 
 		// Some global template resources.
-		Utils::$context['calendar_resources'] = array(
+		Utils::$context['calendar_resources'] = [
 			'min_year' => Config::$modSettings['cal_minyear'],
 			'max_year' => Config::$modSettings['cal_maxyear'],
-		);
+		];
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Calendar::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Calendar::exportStatic')) {
 	Calendar::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/CoppaForm.php b/Sources/Actions/CoppaForm.php
index da1a851407..874652b2d5 100644
--- a/Sources/Actions/CoppaForm.php
+++ b/Sources/Actions/CoppaForm.php
@@ -14,14 +14,13 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BrowserDetector;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Displays the COPPA form during registration.
@@ -35,12 +34,11 @@ class CoppaForm implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'CoppaForm',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -64,48 +62,46 @@ class CoppaForm implements ActionInterface
 	public function execute(): void
 	{
 		// Get the user details...
-		$request = Db::$db->query('', '
-			SELECT member_name
+		$request = Db::$db->query(
+			'',
+			'SELECT member_name
 			FROM {db_prefix}members
 			WHERE id_member = {int:id_member}
 				AND is_activated = {int:is_coppa}',
-			array(
+			[
 				'id_member' => (int) $_GET['member'],
 				'is_coppa' => 5,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			Db::$db->free_result($request);
 			ErrorHandler::fatalLang('no_access', false);
 		}
 		list($username) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if (isset($_GET['form']))
-		{
+		if (isset($_GET['form'])) {
 			// Some simple contact stuff for the forum.
 			Utils::$context['forum_contacts'] = (!empty(Config::$modSettings['coppaPost']) ? Config::$modSettings['coppaPost'] . '<br><br>' : '') . (!empty(Config::$modSettings['coppaFax']) ? Config::$modSettings['coppaFax'] . '<br>' : '');
 			Utils::$context['forum_contacts'] = !empty(Utils::$context['forum_contacts']) ? Utils::$context['forum_name_html_safe'] . '<br>' . Utils::$context['forum_contacts'] : '';
 
 			// Showing template?
-			if (!isset($_GET['dl']))
-			{
+			if (!isset($_GET['dl'])) {
 				// Shortcut for producing underlines.
 				Utils::$context['ul'] = '<u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</u>';
-				Utils::$context['template_layers'] = array();
+				Utils::$context['template_layers'] = [];
 				Utils::$context['sub_template'] = 'coppa_form';
 				Utils::$context['page_title'] = sprintf(Lang::$txt['coppa_form_title'], Utils::$context['forum_name_html_safe']);
-				Utils::$context['coppa_body'] = str_replace(array('{PARENT_NAME}', '{CHILD_NAME}', '{USER_NAME}'), array(Utils::$context['ul'], Utils::$context['ul'], $username), sprintf(Lang::$txt['coppa_form_body'], Utils::$context['forum_name_html_safe']));
+				Utils::$context['coppa_body'] = str_replace(['{PARENT_NAME}', '{CHILD_NAME}', '{USER_NAME}'], [Utils::$context['ul'], Utils::$context['ul'], $username], sprintf(Lang::$txt['coppa_form_body'], Utils::$context['forum_name_html_safe']));
 			}
 			// Downloading.
-			else
-			{
+			else {
 				// The data.
 				$ul = '                ';
 				$crlf = "\r\n";
 				$data = Utils::$context['forum_contacts'] . $crlf . Lang::$txt['coppa_form_address'] . ':' . $crlf . Lang::$txt['coppa_form_date'] . ':' . $crlf . $crlf . $crlf . sprintf(Lang::$txt['coppa_form_body'], Utils::$context['forum_name_html_safe']);
-				$data = str_replace(array('{PARENT_NAME}', '{CHILD_NAME}', '{USER_NAME}', '<br>', '<br>'), array($ul, $ul, $username, $crlf, $crlf), $data);
+				$data = str_replace(['{PARENT_NAME}', '{CHILD_NAME}', '{USER_NAME}', '<br>', '<br>'], [$ul, $ul, $username, $crlf, $crlf], $data);
 
 				// Send the headers.
 				header('connection: close');
@@ -116,22 +112,20 @@ public function execute(): void
 				echo $data;
 				Utils::obExit(false);
 			}
-		}
-		else
-		{
-			Utils::$context += array(
+		} else {
+			Utils::$context += [
 				'page_title' => Lang::$txt['coppa_title'],
 				'sub_template' => 'coppa',
-			);
+			];
 
-			Utils::$context['coppa'] = array(
+			Utils::$context['coppa'] = [
 				'body' => str_replace('{MINIMUM_AGE}', Config::$modSettings['coppaAge'], sprintf(Lang::$txt['coppa_after_registration'], Utils::$context['forum_name_html_safe'])),
 				'many_options' => !empty(Config::$modSettings['coppaPost']) && !empty(Config::$modSettings['coppaFax']),
 				'post' => empty(Config::$modSettings['coppaPost']) ? '' : Config::$modSettings['coppaPost'],
 				'fax' => empty(Config::$modSettings['coppaFax']) ? '' : Config::$modSettings['coppaFax'],
 				'phone' => empty(Config::$modSettings['coppaPhone']) ? '' : str_replace('{PHONE_NUMBER}', Config::$modSettings['coppaPhone'], Lang::$txt['coppa_send_by_phone']),
 				'id' => $_GET['member'],
-			);
+			];
 		}
 	}
 
@@ -146,8 +140,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -173,13 +168,15 @@ protected function __construct()
 		Theme::loadTemplate('Register');
 
 		// No User ID??
-		if (!isset($_GET['member']))
+		if (!isset($_GET['member'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\CoppaForm::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\CoppaForm::exportStatic')) {
 	CoppaForm::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Credits.php b/Sources/Actions/Credits.php
index 59eb690dea..a83067b87a 100644
--- a/Sources/Actions/Credits.php
+++ b/Sources/Actions/Credits.php
@@ -14,16 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This action prepares credit and copyright information for the credits page
@@ -38,12 +37,11 @@ class Credits implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Credits',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -80,33 +78,32 @@ public function execute(): void
 		// Discourage robots from indexing this page.
 		Utils::$context['robot_no_index'] = true;
 
-		if ($this->in_admin)
-		{
-			Menu::$loaded['admin']->tab_data = array(
+		if ($this->in_admin) {
+			Menu::$loaded['admin']->tab_data = [
 				'title' => Lang::$txt['support_credits_title'],
 				'help' => '',
 				'description' => '',
-			);
+			];
 		}
 
-		Utils::$context['credits'] = array(
-			array(
+		Utils::$context['credits'] = [
+			[
 				'pretext' => Lang::$txt['credits_intro'],
 				'title' => Lang::$txt['credits_team'],
-				'groups' => array(
-					array(
+				'groups' => [
+					[
 						'title' => Lang::$txt['credits_groups_pm'],
-						'members' => array(
+						'members' => [
 							'Aleksi "Lex" Kilpinen',
 							// Former Project Managers
 							'Michele "Illori" Davis',
 							'Jessica "Suki" González',
 							'Will "Kindred" Wagner',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_dev'],
-						'members' => array(
+						'members' => [
 							// Lead Developer
 							'Shawn Bulen',
 							// Developers
@@ -138,11 +135,11 @@ public function execute(): void
 							'Theodore "Orstio" Hildebrandt',
 							'Thorsten "TE" Eurich',
 							'winrules',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_support'],
-						'members' => array(
+						'members' => [
 							// Lead Support Specialist
 							'Will "Kindred" Wagner',
 							// Support Specialists
@@ -176,11 +173,11 @@ public function execute(): void
 							'Storman™',
 							'Wade "sησω" Poulsen',
 							'xenovanis',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_customize'],
-						'members' => array(
+						'members' => [
 							// Lead Customizer
 							'Diego Andrés',
 							// Customizers
@@ -201,11 +198,11 @@ public function execute(): void
 							'Ricky.',
 							'Russell "NEND" Najar',
 							'SA™',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_docs'],
-						'members' => array(
+						'members' => [
 							// Doc Coordinator
 							'Michele "Illori" Davis',
 							// Doc Writers
@@ -216,11 +213,11 @@ public function execute(): void
 							'Chainy',
 							'Graeme Spence',
 							'Joshua "groundup" Dickerson',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_internationalizers'],
-						'members' => array(
+						'members' => [
 							// Lead Localizer
 							'Nikola "Dzonny" Novaković',
 							// Localizers
@@ -229,11 +226,11 @@ public function execute(): void
 							'Francisco "d3vcho" Domínguez',
 							'Robert Monden',
 							'Relyana',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_marketing'],
-						'members' => array(
+						'members' => [
 							// Marketing Coordinator
 
 							// Marketing
@@ -243,105 +240,103 @@ public function execute(): void
 							'Bryan "Runic" Deakin',
 							'Marcus "cσσкιє мσηѕтєя" Forsberg',
 							'Ralph "[n3rve]" Otowo',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_site'],
-						'members' => array(
+						'members' => [
 							'Jeremy "SleePy" Darwood',
-						),
-					),
-					array(
+						],
+					],
+					[
 						'title' => Lang::$txt['credits_groups_servers'],
-						'members' => array(
+						'members' => [
 							'Derek Schwab',
 							'Michael Johnson',
 							'Liroy van Hoewijk',
-						),
-					),
-				),
-			),
-		);
+						],
+					],
+				],
+			],
+		];
 
 		// Give the translators some credit for their hard work.
-		if (!is_array(Lang::$txt['translation_credits']))
-		{
+		if (!is_array(Lang::$txt['translation_credits'])) {
 			Lang::$txt['translation_credits'] = array_filter(array_map('trim', explode(',', Lang::$txt['translation_credits'])));
 		}
 
-		if (!empty(Lang::$txt['translation_credits']))
-		{
-			Utils::$context['credits'][] = array(
+		if (!empty(Lang::$txt['translation_credits'])) {
+			Utils::$context['credits'][] = [
 				'title' => Lang::$txt['credits_groups_translation'],
-				'groups' => array(
-					array(
+				'groups' => [
+					[
 						'title' => Lang::$txt['credits_groups_translation'],
 						'members' => Lang::$txt['translation_credits'],
-					),
-				),
-			);
+					],
+				],
+			];
 		}
 
-		Utils::$context['credits'][] = array(
+		Utils::$context['credits'][] = [
 			'title' => Lang::$txt['credits_special'],
 			'posttext' => Lang::$txt['credits_anyone'],
-			'groups' => array(
-				array(
+			'groups' => [
+				[
 					'title' => Lang::$txt['credits_groups_consultants'],
-					'members' => array(
+					'members' => [
 						'albertlast',
 						'Brett Flannigan',
 						'Mark Rose',
 						'René-Gilles "Nao 尚" Deberdt',
 						'tinoest',
 						Lang::$txt['credits_code_contributors'],
-					),
-				),
-				array(
+					],
+				],
+				[
 					'title' => Lang::$txt['credits_groups_beta'],
-					'members' => array(
+					'members' => [
 						Lang::$txt['credits_beta_message'],
-					),
-				),
-				array(
+					],
+				],
+				[
 					'title' => Lang::$txt['credits_groups_translators'],
-					'members' => array(
+					'members' => [
 						Lang::$txt['credits_translators_message'],
-					),
-				),
-				array(
+					],
+				],
+				[
 					'title' => Lang::$txt['credits_groups_founder'],
-					'members' => array(
+					'members' => [
 						'Unknown W. "[Unknown]" Brackets',
-					),
-				),
-				array(
+					],
+				],
+				[
 					'title' => Lang::$txt['credits_groups_orignal_pm'],
-					'members' => array(
+					'members' => [
 						'Jeff Lewis',
 						'Joseph Fung',
 						'David Recordon',
-					),
-				),
-				array(
+					],
+				],
+				[
 					'title' => Lang::$txt['credits_in_memoriam'],
-					'members' => array(
+					'members' => [
 						'Crip',
 						'K@',
 						'metallica48423',
 						'Paul_Pauline',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Give credit to any graphic library's, software library's, plugins etc
-		Utils::$context['credits_software_graphics'] = array(
-			'graphics' => array(
+		Utils::$context['credits_software_graphics'] = [
+			'graphics' => [
 				'<a href="http://p.yusukekamiyamane.com/">Fugue Icons</a> | © 2012 Yusuke Kamiyamane | These icons are licensed under a Creative Commons Attribution 3.0 License',
 				'<a href="https://techbase.kde.org/Projects/Oxygen/Licensing#Use_on_Websites">Oxygen Icons</a> | These icons are licensed under <a href="http://www.gnu.org/copyleft/lesser.html">GNU LGPLv3</a>',
-			),
-			'software' => array(
+			],
+			'software' => [
 				'<a href="https://jquery.org/">JQuery</a> | © John Resig | Licensed under <a href="https://github.com/jquery/jquery/blob/master/LICENSE.txt">The MIT License (MIT)</a>',
 				'<a href="https://briancherne.github.io/jquery-hoverIntent/">hoverIntent</a> | © Brian Cherne | Licensed under <a href="https://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 				'<a href="https://www.sceditor.com/">SCEditor</a> | © Sam Clarke | Licensed under <a href="https://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
@@ -354,35 +349,35 @@ public function execute(): void
 				'<a href="https://github.com/enyo/dropzone">Dropzone.js</a> | © Matias Meno | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 				'<a href="https://github.com/matthiasmullie/minify">Minify</a> | © Matthias Mullie | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
 				'<a href="https://github.com/true/php-punycode">PHP-Punycode</a> | © True B.V. | Licensed under <a href="http://en.wikipedia.org/wiki/MIT_License">The MIT License (MIT)</a>',
-			),
-			'fonts' => array(
+			],
+			'fonts' => [
 				'<a href="https://fontlibrary.org/en/font/anonymous-pro"> Anonymous Pro</a> | © 2009 | This font is licensed under the SIL Open Font License, Version 1.1',
 				'<a href="https://fontlibrary.org/en/font/consolamono"> ConsolaMono</a> | © 2012 | This font is licensed under the SIL Open Font License, Version 1.1',
 				'<a href="https://fontlibrary.org/en/font/phennig"> Phennig</a> | © 2009-2012 | This font is licensed under the SIL Open Font License, Version 1.1',
-			),
-		);
+			],
+		];
 
 		// Support for mods that use the <credits> tag via the package manager
-		Utils::$context['credits_modifications'] = array();
+		Utils::$context['credits_modifications'] = [];
 
-		if (($mods = CacheApi::get('mods_credits', 86400)) === null)
-		{
-			$mods = array();
+		if (($mods = CacheApi::get('mods_credits', 86400)) === null) {
+			$mods = [];
 
-			$request = Db::$db->query('substring', '
-				SELECT version, name, credits
+			$request = Db::$db->query(
+				'substring',
+				'SELECT version, name, credits
 				FROM {db_prefix}log_packages
 				WHERE install_state = {int:installed_mods}
 					AND credits != {string:empty}
 					AND SUBSTRING(filename, 1, 9) != {string:patch_name}',
-				array(
+				[
 					'installed_mods' => 1,
 					'patch_name' => 'smf_patch',
 					'empty' => '',
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$credit_info = Utils::jsonDecode($row['credits'], true);
 
 				$copyright = empty($credit_info['copyright']) ? '' : Lang::$txt['credits_copyright'] . ' © ' . Utils::htmlspecialchars($credit_info['copyright']);
@@ -403,22 +398,21 @@ public function execute(): void
 
 		Utils::$context['credits_modifications'] = $mods;
 
-		Utils::$context['copyrights'] = array(
+		Utils::$context['copyrights'] = [
 			'smf' => sprintf(Lang::$forum_copyright, SMF_FULL_VERSION, SMF_SOFTWARE_YEAR, Config::$scripturl),
 			/* Modification Authors:  You may add a copyright statement to this array for your mods.
 				Copyright statements should be in the form of a value only without a array key.  I.E.:
 					'Some Mod by Thantos © 2010',
 					Lang::$txt['some_mod_copyright'],
 			*/
-			'mods' => array(
-			),
-		);
+			'mods' => [
+			],
+		];
 
 		// Support for those that want to use a hook as well
 		IntegrationHook::call('integrate_credits');
 
-		if (!$this->in_admin)
-		{
+		if (!$this->in_admin) {
 			Theme::loadTemplate('Who');
 			Utils::$context['sub_template'] = 'credits';
 			Utils::$context['robot_no_index'] = true;
@@ -437,8 +431,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -470,7 +465,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Credits::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Credits::exportStatic')) {
 	Credits::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Display.php b/Sources/Actions/Display.php
index be59159e64..a13630554f 100644
--- a/Sources/Actions/Display.php
+++ b/Sources/Actions/Display.php
@@ -13,12 +13,13 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Alert;
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Editor;
 use SMF\ErrorHandler;
 use SMF\Event;
@@ -33,8 +34,6 @@
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class loads the posts in a topic so they can be displayed.
@@ -58,12 +57,11 @@ class Display implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static array $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static array $backcompat = [
+		'func_names' => [
 			'call' => 'Display',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -85,14 +83,14 @@ class Display implements ActionInterface
 	 *
 	 * ID numbers of messages in this topic.
 	 */
-	private $messages = array();
+	private $messages = [];
 
 	/**
 	 * @var array
 	 *
 	 * ID numbers of the authors of the $messages.
 	 */
-	private $posters = array();
+	private $posters = [];
 
 	/**
 	 * @var int
@@ -171,122 +169,124 @@ public function prepareDisplayContext()
 		static $counter = null;
 
 		// Remember which message this is.  (ie. reply #83)
-		if ($counter === null)
-		{
+		if ($counter === null) {
 			$counter = empty(Theme::$current->options['view_newest_first']) ? Utils::$context['start'] : Topic::$info->total_visible_posts - Utils::$context['start'];
 		}
 
-		if (!(Msg::$getter instanceof \Generator))
+		if (!(Msg::$getter instanceof \Generator)) {
 			return false;
+		}
 
 		$message = Msg::$getter->current();
 		Msg::$getter->next();
 
-		if (!$message)
+		if (!$message) {
 			return false;
+		}
 
 		$output = $message->format($counter);
 
 		// Set up the quick buttons.
-		$output['quickbuttons'] = array(
-			'quote' => array(
+		$output['quickbuttons'] = [
+			'quote' => [
 				'label' => Lang::$txt['quote_action'],
 				'href' => Config::$scripturl . '?action=post;quote=' . $output['id'] . ';topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';last_msg=' . Topic::$info->id_last_msg,
 				'javascript' => 'onclick="return oQuickReply.quote(' . $output['id'] . ');"',
 				'icon' => 'quote',
 				'show' => Utils::$context['can_quote'],
-			),
-			'quote_selected' => array(
+			],
+			'quote_selected' => [
 				'label' => Lang::$txt['quote_selected_action'],
 				'id' => 'quoteSelected_' . $output['id'],
 				'href' => 'javascript:void(0)',
 				'custom' => 'style="display:none"',
 				'icon' => 'quote_selected',
 				'show' => Utils::$context['can_quote'],
-			),
-			'quick_edit' => array(
+			],
+			'quick_edit' => [
 				'label' => Lang::$txt['quick_edit'],
 				'class' => 'quick_edit',
 				'id' => 'modify_button_' . $output['id'],
 				'custom' => 'onclick="oQuickModify.modifyMsg(\'' . $output['id'] . '\', \'' . !empty(Config::$modSettings['toggle_subject']) . '\')"',
 				'icon' => 'quick_edit_button',
 				'show' => $output['can_modify'],
-			),
-			'more' => array(
-				'modify' => array(
+			],
+			'more' => [
+				'modify' => [
 					'label' => Lang::$txt['modify'],
 					'href' => Config::$scripturl . '?action=post;msg=' . $output['id'] . ';topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'],
 					'icon' => 'modify_button',
 					'show' => $output['can_modify'],
-				),
-				'remove_topic' => array(
+				],
+				'remove_topic' => [
 					'label' => Lang::$txt['remove_topic'],
 					'href' => Config::$scripturl . '?action=removetopic2;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'javascript' => 'data-confirm="' . Lang::$txt['are_sure_remove_topic'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button',
 					'show' => Utils::$context['can_delete'] && (Topic::$info->id_first_msg == $output['id']),
-				),
-				'remove' => array(
+				],
+				'remove' => [
 					'label' => Lang::$txt['remove'],
 					'href' => Config::$scripturl . '?action=deletemsg;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';msg=' . $output['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'javascript' => 'data-confirm="' . Lang::$txt['remove_message_question'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button',
 					'show' => $output['can_remove'] && (Topic::$info->id_first_msg != $output['id']),
-				),
-				'split' => array(
+				],
+				'split' => [
 					'label' => Lang::$txt['split'],
 					'href' => Config::$scripturl . '?action=splittopics;topic=' . Utils::$context['current_topic'] . '.0;at=' . $output['id'],
 					'icon' => 'split_button',
 					'show' => Utils::$context['can_split'] && !empty(Topic::$info->real_num_replies),
-				),
-				'report' => array(
+				],
+				'report' => [
 					'label' => Lang::$txt['report_to_mod'],
 					'href' => Config::$scripturl . '?action=reporttm;topic=' . Utils::$context['current_topic'] . '.' . $output['counter'] . ';msg=' . $output['id'],
 					'icon' => 'error',
 					'show' => Utils::$context['can_report_moderator'],
-				),
-				'warn' => array(
+				],
+				'warn' => [
 					'label' => Lang::$txt['issue_warning'],
 					'href' => Config::$scripturl . '?action=profile;area=issuewarning;u=' . $output['member']['id'] . ';msg=' . $output['id'],
 					'icon' => 'warn_button',
 					'show' => Utils::$context['can_issue_warning'] && !$output['is_message_author'] && !$output['member']['is_guest'],
-				),
-				'restore' => array(
+				],
+				'restore' => [
 					'label' => Lang::$txt['restore_message'],
 					'href' => Config::$scripturl . '?action=restoretopic;msgs=' . $output['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'icon' => 'restore_button',
 					'show' => Utils::$context['can_restore_msg'],
-				),
-				'approve' => array(
+				],
+				'approve' => [
 					'label' => Lang::$txt['approve'],
 					'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';msg=' . $output['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'icon' => 'approve_button',
 					'show' => $output['can_approve'],
-				),
-				'unapprove' => array(
+				],
+				'unapprove' => [
 					'label' => Lang::$txt['unapprove'],
 					'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=approve;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';msg=' . $output['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'icon' => 'unapprove_button',
 					'show' => $output['can_unapprove'],
-				),
-			),
-			'quickmod' => array(
+				],
+			],
+			'quickmod' => [
 				'class' => 'inline_mod_check',
 				'id' => 'in_topic_mod_check_' . $output['id'],
 				'custom' => 'style="display: none;"',
 				'content' => '',
 				'show' => !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1 && $output['can_remove'],
-			),
-		);
+			],
+		];
 
-		if (empty(Theme::$current->options['view_newest_first']))
+		if (empty(Theme::$current->options['view_newest_first'])) {
 			$counter++;
-		else
+		} else {
 			$counter--;
+		}
 
-		IntegrationHook::call('integrate_prepare_display_context', array(&$output, $message, $counter));
+		IntegrationHook::call('integrate_prepare_display_context', [&$output, $message, $counter]);
 
 		return $output;
 	}
@@ -302,8 +302,9 @@ public function prepareDisplayContext()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -331,8 +332,9 @@ public static function call(): void
 	protected function __construct()
 	{
 		// What are you gonna display if this is empty?!
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('no_board', false);
+		}
 
 		$this->checkPrevNextRedirect();
 		$this->preventPrefetch();
@@ -351,8 +353,9 @@ protected function __construct()
 		$this->setUnapprovedPostsMessage();
 
 		// Now set all the wonderful, wonderful permissions... like moderation ones...
-		foreach (Topic::$info->doPermissions() as $perm => $val)
+		foreach (Topic::$info->doPermissions() as $perm => $val) {
 			Utils::$context[$perm] = &Topic::$info->permissions[$perm];
+		}
 
 		$this->setupTemplate();
 	}
@@ -363,16 +366,16 @@ protected function __construct()
 	protected function checkPrevNextRedirect(): void
 	{
 		// Find the previous or next topic. But don't bother if there's only one.
-		if (isset($_REQUEST['prev_next']) && in_array($_REQUEST['prev_next'], array('prev', 'next')) && Board::$info->num_topics > 1)
-		{
+		if (isset($_REQUEST['prev_next']) && in_array($_REQUEST['prev_next'], ['prev', 'next']) && Board::$info->num_topics > 1) {
 			$prev = $_REQUEST['prev_next'] === 'prev';
 
 			// Just prepare some variables that are used in the query.
 			$gt_lt = $prev ? '>' : '<';
 			$order = $prev ? '' : ' DESC';
 
-			$request = Db::$db->query('', '
-				SELECT t2.id_topic
+			$request = Db::$db->query(
+				'',
+				'SELECT t2.id_topic
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}topics AS t2 ON (
 					(t2.id_last_msg ' . $gt_lt . ' t.id_last_msg AND t2.is_sticky ' . $gt_lt . '= t.is_sticky) OR t2.is_sticky ' . $gt_lt . ' t.is_sticky)
@@ -381,39 +384,39 @@ protected function checkPrevNextRedirect(): void
 					AND (t2.approved = {int:is_approved} OR (t2.id_member_started != {int:id_member_started} AND t2.id_member_started = {int:current_member}))') . '
 				ORDER BY t2.is_sticky' . $order . ', t2.id_last_msg' . $order . '
 				LIMIT 1',
-				array(
+				[
 					'current_board' => Board::$info->id,
 					'current_member' => User::$me->id,
 					'current_topic' => Topic::$topic_id,
 					'is_approved' => 1,
 					'id_member_started' => 0,
-				)
+				],
 			);
 
 			// No more left.
-			if (Db::$db->num_rows($request) == 0)
-			{
+			if (Db::$db->num_rows($request) == 0) {
 				Db::$db->free_result($request);
 
 				// Roll over - if we're going prev, get the last - otherwise the first.
-				$request = Db::$db->query('', '
-					SELECT id_topic
+				$request = Db::$db->query(
+					'',
+					'SELECT id_topic
 					FROM {db_prefix}topics
 					WHERE id_board = {int:current_board}' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 						AND (approved = {int:is_approved} OR (id_member_started != {int:id_member_started} AND id_member_started = {int:current_member}))') . '
 					ORDER BY is_sticky' . $order . ', id_last_msg' . $order . '
 					LIMIT 1',
-					array(
+					[
 						'current_board' => Board::$info->id,
 						'current_member' => User::$me->id,
 						'is_approved' => 1,
 						'id_member_started' => 0,
-					)
+					],
 				);
 			}
 
 			// Now you can be sure Topic::$topic_id is the id_topic to view.
-			list (Topic::$topic_id) = Db::$db->fetch_row($request);
+			list(Topic::$topic_id) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Go to the newest message on the prev/next topic.
@@ -426,20 +429,19 @@ protected function checkPrevNextRedirect(): void
 	 */
 	protected function checkMovedMergedRedirect(): void
 	{
-		if (!empty(Topic::$info->id_redirect_topic))
-		{
+		if (!empty(Topic::$info->id_redirect_topic)) {
 			// Mark this as read.
-			if (!User::$me->is_guest && Topic::$info->new_from != Topic::$info->id_first_msg)
-			{
-				Db::$db->insert(Topic::$info->new_from == 0 ? 'ignore' : 'replace',
+			if (!User::$me->is_guest && Topic::$info->new_from != Topic::$info->id_first_msg) {
+				Db::$db->insert(
+					Topic::$info->new_from == 0 ? 'ignore' : 'replace',
 					'{db_prefix}log_topics',
-					array(
+					[
 						'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int',
-					),
-					array(
+					],
+					[
 						User::$me->id, Topic::$info->id, Topic::$info->id_first_msg, Topic::$info->unwatched,
-					),
-					array('id_member', 'id_topic')
+					],
+					['id_member', 'id_topic'],
 				);
 			}
 
@@ -453,10 +455,10 @@ protected function checkMovedMergedRedirect(): void
 	protected function preventPrefetch(): void
 	{
 		// Not only does a prefetch make things slower for the server, but it makes it impossible to know if they read it.
-		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		{
+		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
 			ob_end_clean();
 			Utils::sendHttpStatus(403, 'Prefetch Forbidden');
+
 			die;
 		}
 	}
@@ -467,17 +469,17 @@ protected function preventPrefetch(): void
 	protected function setRobotNoIndex(): void
 	{
 		// Let's do some work on what to search index.
-		if (count($_GET) > 2)
-		{
-			foreach ($_GET as $k => $v)
-			{
-				if (!in_array($k, array('topic', 'board', 'start', session_name())))
+		if (count($_GET) > 2) {
+			foreach ($_GET as $k => $v) {
+				if (!in_array($k, ['topic', 'board', 'start', session_name()])) {
 					Utils::$context['robot_no_index'] = true;
+				}
 			}
 		}
 
-		if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % Utils::$context['messages_per_page'] != 0))
+		if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % Utils::$context['messages_per_page'] != 0)) {
 			Utils::$context['robot_no_index'] = true;
+		}
 	}
 
 	/**
@@ -485,15 +487,15 @@ protected function setRobotNoIndex(): void
 	 */
 	protected function incrementNumViews(): void
 	{
-		if (!User::$me->possibly_robot && (empty($_SESSION['last_read_topic']) || $_SESSION['last_read_topic'] != Topic::$info->id))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+		if (!User::$me->possibly_robot && (empty($_SESSION['last_read_topic']) || $_SESSION['last_read_topic'] != Topic::$info->id)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET num_views = num_views + 1
 				WHERE id_topic = {int:current_topic}',
-				array(
+				[
 					'current_topic' => Topic::$info->id,
-				)
+				],
 			);
 
 			$_SESSION['last_read_topic'] = Topic::$info->id;
@@ -506,75 +508,78 @@ protected function incrementNumViews(): void
 	protected function markRead(): void
 	{
 		// Guests can't mark topics read or for notifications, just can't sorry.
-		if (!User::$me->is_guest && !empty($this->messages))
-		{
+		if (!User::$me->is_guest && !empty($this->messages)) {
 			$mark_at_msg = max($this->messages);
-			if ($mark_at_msg >= Topic::$info->id_last_msg)
+
+			if ($mark_at_msg >= Topic::$info->id_last_msg) {
 				$mark_at_msg = Config::$modSettings['maxMsgID'];
-			if ($mark_at_msg >= Topic::$info->new_from)
-			{
-				Db::$db->insert(Topic::$info->new_from == 0 ? 'ignore' : 'replace',
+			}
+
+			if ($mark_at_msg >= Topic::$info->new_from) {
+				Db::$db->insert(
+					Topic::$info->new_from == 0 ? 'ignore' : 'replace',
 					'{db_prefix}log_topics',
-					array(
+					[
 						'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int',
-					),
-					array(
+					],
+					[
 						User::$me->id, Topic::$info->id, $mark_at_msg, Topic::$info->unwatched,
-					),
-					array('id_member', 'id_topic')
+					],
+					['id_member', 'id_topic'],
 				);
 			}
 
 			// Check for notifications on this topic OR board.
-			$request = Db::$db->query('', '
-				SELECT sent, id_topic
+			$request = Db::$db->query(
+				'',
+				'SELECT sent, id_topic
 				FROM {db_prefix}log_notify
 				WHERE (id_topic = {int:current_topic} OR id_board = {int:current_board})
 					AND id_member = {int:current_member}
 				LIMIT 2',
-				array(
+				[
 					'current_board' => Board::$info->id,
 					'current_member' => User::$me->id,
 					'current_topic' => Topic::$info->id,
-				)
+				],
 			);
 			$do_once = true;
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Find if this topic is marked for notification...
-				if (!empty($row['id_topic']))
+				if (!empty($row['id_topic'])) {
 					Utils::$context['is_marked_notify'] = true;
+				}
 
 				// Only do this once, but mark the notifications as "not sent yet" for next time.
-				if (!empty($row['sent']) && $do_once)
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_notify
+				if (!empty($row['sent']) && $do_once) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_notify
 						SET sent = {int:is_not_sent}
 						WHERE (id_topic = {int:current_topic} OR id_board = {int:current_board})
 							AND id_member = {int:current_member}',
-						array(
+						[
 							'current_board' => Board::$info->id,
 							'current_member' => User::$me->id,
 							'current_topic' => Topic::$info->id,
 							'is_not_sent' => 0,
-						)
+						],
 					);
 					$do_once = false;
 				}
 			}
 
 			// Have we recently cached the number of new topics in this board, and it's still a lot?
-			if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][Board::$info->id]) && $_SESSION['topicseen_cache'][Board::$info->id] > 5)
-			{
+			if (isset($_REQUEST['topicseen'], $_SESSION['topicseen_cache'][Board::$info->id])   && $_SESSION['topicseen_cache'][Board::$info->id] > 5) {
 				$_SESSION['topicseen_cache'][Board::$info->id]--;
 			}
 			// Mark board as seen if this is the only new topic.
-			elseif (isset($_REQUEST['topicseen']))
-			{
+			elseif (isset($_REQUEST['topicseen'])) {
 				// Use the mark read tables... and the last visit to figure out if this should be read or not.
-				$request = Db::$db->query('', '
-					SELECT COUNT(*)
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(*)
 					FROM {db_prefix}topics AS t
 						LEFT JOIN {db_prefix}log_boards AS lb ON (lb.id_board = {int:current_board} AND lb.id_member = {int:current_member})
 						LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})
@@ -582,41 +587,42 @@ protected function markRead(): void
 						AND t.id_last_msg > COALESCE(lb.id_msg, 0)
 						AND t.id_last_msg > COALESCE(lt.id_msg, 0)' . (empty($_SESSION['id_msg_last_visit']) ? '' : '
 						AND t.id_last_msg > {int:id_msg_last_visit}'),
-					array(
+					[
 						'current_board' => Board::$info->id,
 						'current_member' => User::$me->id,
 						'id_msg_last_visit' => (int) $_SESSION['id_msg_last_visit'],
-					)
+					],
 				);
-				list ($numNewTopics) = Db::$db->fetch_row($request);
+				list($numNewTopics) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
 				// If there're no real new topics in this board, mark the board as seen.
-				if (empty($numNewTopics))
+				if (empty($numNewTopics)) {
 					$_REQUEST['boardseen'] = true;
-				else
+				} else {
 					$_SESSION['topicseen_cache'][Board::$info->id] = $numNewTopics;
+				}
 			}
 			// Probably one less topic - maybe not, but even if we decrease this too fast it will only make us look more often.
-			elseif (isset($_SESSION['topicseen_cache'][Board::$info->id]))
+			elseif (isset($_SESSION['topicseen_cache'][Board::$info->id])) {
 				$_SESSION['topicseen_cache'][Board::$info->id]--;
+			}
 
 			// Mark board as seen if we came using last post link from BoardIndex. (or other places...)
-			if (isset($_REQUEST['boardseen']))
-			{
-				Db::$db->insert('replace',
+			if (isset($_REQUEST['boardseen'])) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}log_boards',
-					array('id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'),
-					array(Config::$modSettings['maxMsgID'], User::$me->id, Board::$info->id),
-					array('id_member', 'id_board')
+					['id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'],
+					[Config::$modSettings['maxMsgID'], User::$me->id, Board::$info->id],
+					['id_member', 'id_board'],
 				);
 			}
 
 			// Mark any alerts about this topic or the posts on this page as read.
-			if (!empty(User::$me->alerts))
-			{
+			if (!empty(User::$me->alerts)) {
 				Alert::markWhere(
-					array(
+					[
 						// Obviously, only for the current member.
 						'id_member = {int:current_member}',
 
@@ -635,13 +641,13 @@ protected function markRead(): void
 								')' .
 							')' .
 						')',
-					),
-					array(
+					],
+					[
 						'current_member' => User::$me->id,
 						'current_topic' => Topic::$info->id,
 						'messages' => $this->messages,
-					),
-					true
+					],
+					true,
 				);
 			}
 		}
@@ -666,34 +672,30 @@ protected function getNotificationMode(): void
 	protected function setStart(): void
 	{
 		// The start isn't a number; it's information about what to do, where to go.
-		if (!is_numeric($_REQUEST['start']))
-		{
+		if (!is_numeric($_REQUEST['start'])) {
 			// Redirect to the page and post with new messages, originally by Omar Bazavilvazo.
-			if ($_REQUEST['start'] == 'new')
-			{
+			if ($_REQUEST['start'] == 'new') {
 				// Guests automatically go to the last post.
-				if (User::$me->is_guest)
-				{
+				if (User::$me->is_guest) {
 					Utils::$context['start_from'] = Topic::$info->total_visible_posts - 1;
 					$_REQUEST['start'] = empty(Theme::$current->options['view_newest_first']) ? Utils::$context['start_from'] : 0;
-				}
-				else
-				{
+				} else {
 					// Find the earliest unread message in the topic. (the use of topics here is just for both tables.)
-					$request = Db::$db->query('', '
-						SELECT COALESCE(lt.id_msg, lmr.id_msg, -1) + 1 AS new_from
+					$request = Db::$db->query(
+						'',
+						'SELECT COALESCE(lt.id_msg, lmr.id_msg, -1) + 1 AS new_from
 						FROM {db_prefix}topics AS t
 							LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = {int:current_topic} AND lt.id_member = {int:current_member})
 							LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = {int:current_board} AND lmr.id_member = {int:current_member})
 						WHERE t.id_topic = {int:current_topic}
 						LIMIT 1',
-						array(
+						[
 							'current_board' => Board::$info->id,
 							'current_member' => User::$me->id,
 							'current_topic' => Topic::$topic_id,
-						)
+						],
 					);
-					list ($new_from) = Db::$db->fetch_row($request);
+					list($new_from) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
 					// Fall through to the next if statement.
@@ -702,28 +704,28 @@ protected function setStart(): void
 			}
 
 			// Start from a certain time index, not a message.
-			if (substr($_REQUEST['start'], 0, 4) == 'from')
-			{
+			if (substr($_REQUEST['start'], 0, 4) == 'from') {
 				$timestamp = (int) substr($_REQUEST['start'], 4);
-				if ($timestamp === 0)
+
+				if ($timestamp === 0) {
 					$_REQUEST['start'] = 0;
-				else
-				{
+				} else {
 					// Find the number of messages posted before said time...
-					$request = Db::$db->query('', '
-						SELECT COUNT(*)
+					$request = Db::$db->query(
+						'',
+						'SELECT COUNT(*)
 						FROM {db_prefix}messages
 						WHERE poster_time < {int:timestamp}
 							AND id_topic = {int:current_topic}' . (Config::$modSettings['postmod_active'] && Topic::$info->unapproved_posts && !User::$me->allowedTo('approve_posts') ? '
 							AND (approved = {int:is_approved}' . (User::$me->is_guest ? '' : ' OR id_member = {int:current_member}') . ')' : ''),
-						array(
+						[
 							'current_topic' => Topic::$topic_id,
 							'current_member' => User::$me->id,
 							'is_approved' => 1,
 							'timestamp' => $timestamp,
-						)
+						],
 					);
-					list (Utils::$context['start_from']) = Db::$db->fetch_row($request);
+					list(Utils::$context['start_from']) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
 					// Handle view_newest_first options, and get the correct start value.
@@ -732,31 +734,31 @@ protected function setStart(): void
 			}
 
 			// Link to a message...
-			elseif (substr($_REQUEST['start'], 0, 3) == 'msg')
-			{
+			elseif (substr($_REQUEST['start'], 0, 3) == 'msg') {
 				$this->virtual_msg = (int) substr($_REQUEST['start'], 3);
-				if (!Topic::$info->unapproved_posts && $this->virtual_msg >= Topic::$info->id_last_msg)
+
+				if (!Topic::$info->unapproved_posts && $this->virtual_msg >= Topic::$info->id_last_msg) {
 					Utils::$context['start_from'] = Topic::$info->total_visible_posts - 1;
-				elseif (!Topic::$info->unapproved_posts && $this->virtual_msg <= Topic::$info->id_first_msg)
+				} elseif (!Topic::$info->unapproved_posts && $this->virtual_msg <= Topic::$info->id_first_msg) {
 					Utils::$context['start_from'] = 0;
-				else
-				{
+				} else {
 					// Find the start value for that message......
-					$request = Db::$db->query('', '
-						SELECT COUNT(*)
+					$request = Db::$db->query(
+						'',
+						'SELECT COUNT(*)
 						FROM {db_prefix}messages
 						WHERE id_msg < {int:virtual_msg}
 							AND id_topic = {int:current_topic}' . (Config::$modSettings['postmod_active'] && Topic::$info->unapproved_posts && !User::$me->allowedTo('approve_posts') ? '
 							AND (approved = {int:is_approved}' . (User::$me->is_guest ? '' : ' OR id_member = {int:current_member}') . ')' : ''),
-						array(
+						[
 							'current_member' => User::$me->id,
 							'current_topic' => Topic::$topic_id,
 							'virtual_msg' => $this->virtual_msg,
 							'is_approved' => 1,
 							'no_member' => 0,
-						)
+						],
 					);
-					list (Utils::$context['start_from']) = Db::$db->fetch_row($request);
+					list(Utils::$context['start_from']) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 				}
 
@@ -771,50 +773,52 @@ protected function setStart(): void
 	 */
 	protected function getWhoViewing(): void
 	{
-		if (!empty(Theme::$current->settings['display_who_viewing']))
-		{
+		if (!empty(Theme::$current->settings['display_who_viewing'])) {
 			// Start out with no one at all viewing it.
-			Utils::$context['view_members'] = array();
-			Utils::$context['view_members_list'] = array();
+			Utils::$context['view_members'] = [];
+			Utils::$context['view_members_list'] = [];
 			Utils::$context['view_num_hidden'] = 0;
 
 			// Search for members who have this topic set in their GET data.
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					lo.id_member, lo.log_time, mem.real_name, mem.member_name, mem.show_online,
 					mg.online_color, mg.id_group, mg.group_name
 				FROM {db_prefix}log_online AS lo
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lo.id_member)
 					LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:reg_id_group} THEN mem.id_post_group ELSE mem.id_group END)
 				WHERE INSTR(lo.url, {string:in_url_string}) > 0 OR lo.session = {string:session}',
-				array(
+				[
 					'reg_id_group' => 0,
 					'in_url_string' => '"topic":' . Topic::$info->id,
 					'session' => User::$me->is_guest ? 'ip' . User::$me->ip : session_id(),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['id_member']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['id_member'])) {
 					continue;
+				}
 
-				if (!empty($row['online_color']))
+				if (!empty($row['online_color'])) {
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-				else
+				} else {
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+				}
 
 				$is_buddy = in_array($row['id_member'], User::$me->buddies);
 
-				if ($is_buddy)
+				if ($is_buddy) {
 					$link = '<strong>' . $link . '</strong>';
+				}
 
 				// Add them both to the list and to the more detailed list.
-				if (!empty($row['show_online']) || User::$me->allowedTo('moderate_forum'))
-				{
+				if (!empty($row['show_online']) || User::$me->allowedTo('moderate_forum')) {
 					Utils::$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
 				}
 
-				Utils::$context['view_members'][$row['log_time'] . $row['member_name']] = array(
+				Utils::$context['view_members'][$row['log_time'] . $row['member_name']] = [
 					'id' => $row['id_member'],
 					'username' => $row['member_name'],
 					'name' => $row['real_name'],
@@ -823,10 +827,11 @@ protected function getWhoViewing(): void
 					'link' => $link,
 					'is_buddy' => $is_buddy,
 					'hidden' => empty($row['show_online']),
-				);
+				];
 
-				if (empty($row['show_online']))
+				if (empty($row['show_online'])) {
 					Utils::$context['view_num_hidden']++;
+				}
 			}
 
 			// The number of guests is equal to the rows minus the ones we actually used ;).
@@ -853,11 +858,14 @@ protected function setPaginationAndLinks(): void
 
 		// If all is set, but not allowed... just unset it.
 		$this->can_show_all = !empty(Config::$modSettings['enableAllMessages']) && Topic::$info->total_visible_posts > Utils::$context['messages_per_page'] && Topic::$info->total_visible_posts < Config::$modSettings['enableAllMessages'];
-		if (isset($_REQUEST['all']) && !$this->can_show_all)
+
+		if (isset($_REQUEST['all']) && !$this->can_show_all) {
 			unset($_REQUEST['all']);
+		}
 		// Otherwise, it must be allowed... so pretend start was -1.
-		elseif (isset($_REQUEST['all']))
+		elseif (isset($_REQUEST['all'])) {
 			$_REQUEST['start'] = -1;
+		}
 
 		// Construct the page index, allowing for the .START method...
 		Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?topic=' . Topic::$info->id . '.%1$d', $_REQUEST['start'], Topic::$info->total_visible_posts, Utils::$context['messages_per_page'], true);
@@ -865,42 +873,37 @@ protected function setPaginationAndLinks(): void
 		Utils::$context['start'] = $_REQUEST['start'];
 
 		// This is information about which page is current, and which page we're on - in case you don't like the constructed page index. (again, wireless..)
-		Utils::$context['page_info'] = array(
+		Utils::$context['page_info'] = [
 			'current_page' => $_REQUEST['start'] / Utils::$context['messages_per_page'] + 1,
 			'num_pages' => floor((Topic::$info->total_visible_posts - 1) / Utils::$context['messages_per_page']) + 1,
-		);
+		];
 
 		// Figure out all the links to the next/prev/first/last/etc.
-		if (!($this->can_show_all && isset($_REQUEST['all'])))
-		{
-			Utils::$context['links'] = array(
+		if (!($this->can_show_all && isset($_REQUEST['all']))) {
+			Utils::$context['links'] = [
 				'first' => $_REQUEST['start'] >= Utils::$context['messages_per_page'] ? Config::$scripturl . '?topic=' . Topic::$info->id . '.0' : '',
 				'prev' => $_REQUEST['start'] >= Utils::$context['messages_per_page'] ? Config::$scripturl . '?topic=' . Topic::$info->id . '.' . ($_REQUEST['start'] - Utils::$context['messages_per_page']) : '',
 				'next' => $_REQUEST['start'] + Utils::$context['messages_per_page'] < Topic::$info->total_visible_posts ? Config::$scripturl . '?topic=' . Topic::$info->id . '.' . ($_REQUEST['start'] + Utils::$context['messages_per_page']) : '',
 				'last' => $_REQUEST['start'] + Utils::$context['messages_per_page'] < Topic::$info->total_visible_posts ? Config::$scripturl . '?topic=' . Topic::$info->id . '.' . (floor(Topic::$info->total_visible_posts / Utils::$context['messages_per_page']) * Utils::$context['messages_per_page']) : '',
-				'up' => Config::$scripturl . '?board=' . Board::$info->id . '.0'
-			);
+				'up' => Config::$scripturl . '?board=' . Board::$info->id . '.0',
+			];
 		}
 
 		// If they are viewing all the posts, show all the posts, otherwise limit the number.
-		if ($this->can_show_all)
-		{
-			if (isset($_REQUEST['all']))
-			{
+		if ($this->can_show_all) {
+			if (isset($_REQUEST['all'])) {
 				// No limit! (actually, there is a limit, but...)
 				Utils::$context['messages_per_page'] = -1;
-				Utils::$context['page_index'] .= sprintf(strtr(Theme::$current->settings['page_index']['current_page'], array('%1$d' => '%1$s')), Lang::$txt['all']);
+				Utils::$context['page_index'] .= sprintf(strtr(Theme::$current->settings['page_index']['current_page'], ['%1$d' => '%1$s']), Lang::$txt['all']);
 
 				// Set start back to 0...
 				$_REQUEST['start'] = 0;
 			}
 			// They aren't using it, but the *option* is there, at least.
-			else
-			{
-				Utils::$context['page_index'] .= sprintf(strtr(Theme::$current->settings['page_index']['page'], array('{URL}' => Config::$scripturl . '?topic=' . Topic::$info->id . '.0;all')), '', Lang::$txt['all']);
+			else {
+				Utils::$context['page_index'] .= sprintf(strtr(Theme::$current->settings['page_index']['page'], ['{URL}' => Config::$scripturl . '?topic=' . Topic::$info->id . '.0;all']), '', Lang::$txt['all']);
 			}
 		}
-
 	}
 
 	/**
@@ -911,22 +914,23 @@ protected function setModerators(): void
 		// Build a list of this board's moderators.
 		Utils::$context['moderators'] = &Board::$info->moderators;
 		Utils::$context['moderator_groups'] = &Board::$info->moderator_groups;
-		Utils::$context['link_moderators'] = array();
-		if (!empty(Board::$info->moderators))
-		{
+		Utils::$context['link_moderators'] = [];
+
+		if (!empty(Board::$info->moderators)) {
 			// Add a link for each moderator...
-			foreach (Board::$info->moderators as $mod)
+			foreach (Board::$info->moderators as $mod) {
 				Utils::$context['link_moderators'][] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . Lang::$txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+			}
 		}
-		if (!empty(Board::$info->moderator_groups))
-		{
+
+		if (!empty(Board::$info->moderator_groups)) {
 			// Add a link for each moderator group as well...
-			foreach (Board::$info->moderator_groups as $mod_group)
+			foreach (Board::$info->moderator_groups as $mod_group) {
 				Utils::$context['link_moderators'][] = '<a href="' . Config::$scripturl . '?action=groups;sa=viewmembers;group=' . $mod_group['id'] . '" title="' . Lang::$txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+			}
 		}
 
-		if (!empty(Utils::$context['link_moderators']))
-		{
+		if (!empty(Utils::$context['link_moderators'])) {
 			// And show it after the board's name.
 			Utils::$context['linktree'][count(Utils::$context['linktree']) - 1]['extra_after'] = '<span class="board_moderators">(' . (count(Utils::$context['link_moderators']) == 1 ? Lang::$txt['moderator'] : Lang::$txt['moderators']) . ': ' . implode(', ', Utils::$context['link_moderators']) . ')</span>';
 		}
@@ -949,7 +953,7 @@ protected function setupTemplate(): void
 	{
 		// Load the proper template.
 		Theme::loadTemplate('Display');
-		Theme::loadCSSFile('attachments.css', array('minimize' => true, 'order_pos' => 450), 'smf_attachments');
+		Theme::loadCSSFile('attachments.css', ['minimize' => true, 'order_pos' => 450], 'smf_attachments');
 
 		// Set a canonical URL for this page.
 		Utils::$context['canonical_url'] = Config::$scripturl . '?topic=' . Topic::$info->id . '.' . ($this->can_show_all ? '0;all' : Utils::$context['start']);
@@ -985,24 +989,22 @@ protected function setupTemplate(): void
 		Utils::$context['is_marked_notify'] = false;
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?topic=' . Topic::$info->id . '.0',
 			'name' => Topic::$info->subject,
-		);
+		];
 
-		Utils::$context['jump_to'] = array(
+		Utils::$context['jump_to'] = [
 			'label' => addslashes(Utils::htmlspecialcharsDecode(Lang::$txt['jump_to'])),
-			'board_name' => strtr(Utils::htmlspecialchars(strip_tags(Board::$info->name)), array('&amp;' => '&')),
+			'board_name' => strtr(Utils::htmlspecialchars(strip_tags(Board::$info->name)), ['&amp;' => '&']),
 			'child_level' => Board::$info->child_level,
-		);
+		];
 
 		// For quick reply we need a response prefix in the default forum language.
-		if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix', 600)))
-		{
-			if (Lang::$default === User::$me->language)
+		if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix', 600))) {
+			if (Lang::$default === User::$me->language) {
 				Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
-			else
-			{
+			} else {
 				Lang::load('index', Lang::$default, false);
 				Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
 				Lang::load('index');
@@ -1012,49 +1014,51 @@ protected function setupTemplate(): void
 
 		// Are we showing signatures - or disabled fields?
 		Utils::$context['signature_enabled'] = substr(Config::$modSettings['signature_settings'], 0, 1) == 1;
-		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : array();
+		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : [];
 
 		// Prevent signature images from going outside the box.
-		if (Utils::$context['signature_enabled'])
-		{
-			list ($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
+		if (Utils::$context['signature_enabled']) {
+			list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 			$sig_limits = explode(',', $sig_limits);
 
-			if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
+			if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
 				Theme::addInlineCss('.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
+			}
 		}
 
 		// Load the drafts js file.
-		if (!empty(Topic::$info->permissions['drafts_autosave']))
-			Theme::loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
+		if (!empty(Topic::$info->permissions['drafts_autosave'])) {
+			Theme::loadJavaScriptFile('drafts.js', ['defer' => false, 'minimize' => true], 'smf_drafts');
+		}
 
 		// And the drafts language file.
-		if (!empty(Topic::$info->permissions['drafts_save']))
+		if (!empty(Topic::$info->permissions['drafts_save'])) {
 			Lang::load('Drafts');
+		}
 
 		// Spellcheck
-		if (Utils::$context['show_spellchecking'])
-			Theme::loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+		if (Utils::$context['show_spellchecking']) {
+			Theme::loadJavaScriptFile('spellcheck.js', ['defer' => false, 'minimize' => true], 'smf_spellcheck');
+		}
 
 		// topic.js
-		Theme::loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
+		Theme::loadJavaScriptFile('topic.js', ['defer' => false, 'minimize' => true], 'smf_topic');
 
 		// quotedText.js
-		Theme::loadJavaScriptFile('quotedText.js', array('defer' => true, 'minimize' => true), 'smf_quotedText');
+		Theme::loadJavaScriptFile('quotedText.js', ['defer' => true, 'minimize' => true], 'smf_quotedText');
 
 		// Mentions
-		if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention'))
-		{
-			Theme::loadJavaScriptFile('jquery.atwho.min.js', array('defer' => true), 'smf_atwho');
-			Theme::loadJavaScriptFile('jquery.caret.min.js', array('defer' => true), 'smf_caret');
-			Theme::loadJavaScriptFile('mentions.js', array('defer' => true, 'minimize' => true), 'smf_mentions');
+		if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) {
+			Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho');
+			Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret');
+			Theme::loadJavaScriptFile('mentions.js', ['defer' => true, 'minimize' => true], 'smf_mentions');
 		}
 
 		// Did we report a post to a moderator just now?
 		Utils::$context['report_sent'] = isset($_GET['reportsent']);
 
-		Utils::$context['name'] = isset($_SESSION['guest_name']) ? $_SESSION['guest_name'] : '';
-		Utils::$context['email'] = isset($_SESSION['guest_email']) ? $_SESSION['guest_email'] : '';
+		Utils::$context['name'] = $_SESSION['guest_name'] ?? '';
+		Utils::$context['email'] = $_SESSION['guest_email'] ?? '';
 	}
 
 	/**
@@ -1063,12 +1067,12 @@ protected function setupTemplate(): void
 	protected function loadEvents(): void
 	{
 		// If we want to show event information in the topic, prepare the data.
-		if (User::$me->allowedTo('calendar_view') && !empty(Config::$modSettings['cal_showInTopic']) && !empty(Config::$modSettings['cal_enabled']))
-		{
+		if (User::$me->allowedTo('calendar_view') && !empty(Config::$modSettings['cal_showInTopic']) && !empty(Config::$modSettings['cal_enabled'])) {
 			Utils::$context['linked_calendar_events'] = Event::load(Topic::$info->id, true);
 
-			if (!empty(Utils::$context['linked_calendar_events']))
+			if (!empty(Utils::$context['linked_calendar_events'])) {
 				Utils::$context['linked_calendar_events'][count(Utils::$context['linked_calendar_events']) - 1]['is_last'] = true;
+			}
 		}
 	}
 
@@ -1077,18 +1081,16 @@ protected function loadEvents(): void
 	 */
 	protected function loadPoll(): void
 	{
-		if (!Utils::$context['is_poll'])
+		if (!Utils::$context['is_poll']) {
 			return;
+		}
 
 		$poll = Poll::load(Topic::$info->id, Poll::LOAD_BY_TOPIC);
 
 		// Create the poll info if it exists and is valid.
-		if (empty($poll))
-		{
+		if (empty($poll)) {
 			Utils::$context['is_poll'] = false;
-		}
-		else
-		{
+		} else {
 			Utils::$context['poll'] = $poll->format();
 		}
 	}
@@ -1101,8 +1103,9 @@ protected function setupVerification(): void
 		// Do we need to show the visual verification image?
 		Utils::$context['require_verification'] = !User::$me->is_mod && !User::$me->is_admin && !empty(Config::$modSettings['posts_require_captcha']) && (User::$me->posts < Config::$modSettings['posts_require_captcha'] || (User::$me->is_guest && Config::$modSettings['posts_require_captcha'] == -1));
 
-		if (Utils::$context['require_verification'])
-			$verifier = new Verifier(array('id' => 'post'));
+		if (Utils::$context['require_verification']) {
+			$verifier = new Verifier(['id' => 'post']);
+		}
 	}
 
 	/**
@@ -1118,52 +1121,53 @@ protected function getMessagesAndPosters(): void
 
 		// Jump to page
 		// Calculate the fastest way to get the messages!
-		if ($start >= Topic::$info->total_visible_posts / 2 && Utils::$context['messages_per_page'] != -1)
-		{
+		if ($start >= Topic::$info->total_visible_posts / 2 && Utils::$context['messages_per_page'] != -1) {
 			$DBascending = !$ascending;
 			$limit = Topic::$info->total_visible_posts <= $start + $limit ? Topic::$info->total_visible_posts - $start : $limit;
 			$start = Topic::$info->total_visible_posts <= $start + $limit ? 0 : Topic::$info->total_visible_posts - $start - $limit;
 			$this->firstIndex = empty(Theme::$current->options['view_newest_first']) ? $start - 1 : $limit - 1;
-		}
-		else
+		} else {
 			$DBascending = $ascending;
+		}
 
 		// Get each post and poster in this topic.
-		$request = Db::$db->query('', '
-			SELECT id_msg, id_member, approved
+		$request = Db::$db->query(
+			'',
+			'SELECT id_msg, id_member, approved
 			FROM {db_prefix}messages
 			WHERE id_topic = {int:current_topic}' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 				AND (approved = {int:is_approved}' . (User::$me->is_guest ? '' : ' OR id_member = {int:current_member}') . ')') . '
 			ORDER BY id_msg ' . ($DBascending ? '' : 'DESC') . (Utils::$context['messages_per_page'] == -1 ? '' : '
 			LIMIT {int:start}, {int:max}'),
-			array(
+			[
 				'current_member' => User::$me->id,
 				'current_topic' => Topic::$info->id,
 				'is_approved' => 1,
 				'blank_id_member' => 0,
 				'start' => $start,
 				'max' => $limit,
-			)
+			],
 		);
 
-		$this->messages = array();
-		$all_posters = array();
+		$this->messages = [];
+		$all_posters = [];
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!empty($row['id_member']))
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!empty($row['id_member'])) {
 				$all_posters[$row['id_msg']] = $row['id_member'];
+			}
 			$this->messages[] = $row['id_msg'];
 		}
 
 		// Sort the messages into the correct display order
-		if (!$DBascending)
+		if (!$DBascending) {
 			sort($this->messages);
+		}
 
 		Db::$db->free_result($request);
 		$this->posters = array_unique($all_posters);
 
-		IntegrationHook::call('integrate_display_message_list', array(&$this->messages, &$this->posters));
+		IntegrationHook::call('integrate_display_message_list', [&$this->messages, &$this->posters]);
 	}
 
 	/**
@@ -1171,50 +1175,45 @@ protected function getMessagesAndPosters(): void
 	 */
 	protected function initDisplayContext(): void
 	{
-		Utils::$context['loaded_attachments'] = array();
+		Utils::$context['loaded_attachments'] = [];
 
 		// If there _are_ messages here... (probably an error otherwise :!)
-		if (!empty($this->messages))
-		{
+		if (!empty($this->messages)) {
 			Msg::$getter = Msg::get($this->messages);
 
 			// Fetch attachments.
-			if (!empty(Config::$modSettings['attachmentEnable']) && User::$me->allowedTo('view_attachments'))
-			{
+			if (!empty(Config::$modSettings['attachmentEnable']) && User::$me->allowedTo('view_attachments')) {
 				Attachment::prepareByMsg($this->messages);
 			}
 
 			// And the likes
-			if (!empty(Config::$modSettings['enable_likes']))
+			if (!empty(Config::$modSettings['enable_likes'])) {
 				Utils::$context['my_likes'] = Topic::$info->getLikedMsgs();
+			}
 
 			// Go to the last message if the given time is beyond the time of the last message.
-			if (isset(Utils::$context['start_from']) && Utils::$context['start_from'] >= Topic::$info->num_replies)
+			if (isset(Utils::$context['start_from']) && Utils::$context['start_from'] >= Topic::$info->num_replies) {
 				Utils::$context['start_from'] = Topic::$info->num_replies;
+			}
 
 			// Since the anchor information is needed on the top of the page we load these variables beforehand.
-			Utils::$context['first_message'] = isset($this->messages[$this->firstIndex]) ? $this->messages[$this->firstIndex] : $this->messages[0];
+			Utils::$context['first_message'] = $this->messages[$this->firstIndex] ?? $this->messages[0];
 
-			if (empty(Theme::$current->options['view_newest_first']))
-			{
+			if (empty(Theme::$current->options['view_newest_first'])) {
 				Utils::$context['first_new_message'] = isset(Utils::$context['start_from']) && $_REQUEST['start'] == Utils::$context['start_from'];
-			}
-			else
-			{
+			} else {
 				Utils::$context['first_new_message'] = isset(Utils::$context['start_from']) && $_REQUEST['start'] == Topic::$info->num_replies - Utils::$context['start_from'];
 			}
-		}
-		else
-		{
-			Msg::$getter = array();
+		} else {
+			Msg::$getter = [];
 			Utils::$context['first_message'] = 0;
 			Utils::$context['first_new_message'] = false;
-			Utils::$context['likes'] = array();
+			Utils::$context['likes'] = [];
 		}
 
 		// Set the callback.  (do you REALIZE how much memory all the messages would take?!?)
 		// This will be called from the template.
-		Utils::$context['get_message'] = array($this, 'prepareDisplayContext');
+		Utils::$context['get_message'] = [$this, 'prepareDisplayContext'];
 	}
 
 	/**
@@ -1223,19 +1222,19 @@ protected function initDisplayContext(): void
 	protected function setOldTopicWarning(): void
 	{
 		// When was the last time this topic was replied to?  Should we warn them about it?
-		if (!empty(Config::$modSettings['oldTopicDays']) && (Topic::$info->permissions['can_reply'] || Topic::$info->permissions['can_reply_unapproved']) && empty(Topic::$info->is_sticky))
-		{
-			$request = Db::$db->query('', '
-				SELECT poster_time
+		if (!empty(Config::$modSettings['oldTopicDays']) && (Topic::$info->permissions['can_reply'] || Topic::$info->permissions['can_reply_unapproved']) && empty(Topic::$info->is_sticky)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT poster_time
 				FROM {db_prefix}messages
 				WHERE id_msg = {int:id_last_msg}
 				LIMIT 1',
-				array(
+				[
 					'id_last_msg' => Topic::$info->id_last_msg,
-				)
+				],
 			);
 
-			list ($lastPostTime) = Db::$db->fetch_row($request);
+			list($lastPostTime) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			Utils::$context['oldTopicError'] = $lastPostTime + Config::$modSettings['oldTopicDays'] * 86400 < time();
@@ -1248,12 +1247,12 @@ protected function setOldTopicWarning(): void
 	protected function loadEditor(): void
 	{
 		// Now create the editor.
-		new Editor(array(
+		new Editor([
 			'id' => 'quickReply',
 			'value' => '',
-			'labels' => array(
+			'labels' => [
 				'post_button' => Lang::$txt['post'],
-			),
+			],
 			// add height and width for the editor
 			'height' => '150px',
 			'width' => '100%',
@@ -1261,7 +1260,7 @@ protected function loadEditor(): void
 			'preview_type' => Editor::PREVIEW_HTML,
 			// This is required
 			'required' => true,
-		));
+		]);
 
 		Utils::$context['attached'] = '';
 		Utils::$context['make_poll'] = isset($_REQUEST['poll']);
@@ -1269,8 +1268,9 @@ protected function loadEditor(): void
 		// Message icons - customized icons are off?
 		Utils::$context['icons'] = Editor::getMessageIcons(Board::$info->id);
 
-		if (!empty(Utils::$context['icons']))
+		if (!empty(Utils::$context['icons'])) {
 			Utils::$context['icons'][count(Utils::$context['icons']) - 1]['is_last'] = true;
+		}
 	}
 
 	/**
@@ -1279,114 +1279,97 @@ protected function loadEditor(): void
 	protected function buildButtons(): void
 	{
 		// Build the normal button array.
-		Utils::$context['normal_buttons'] = array();
+		Utils::$context['normal_buttons'] = [];
 
-		if (Topic::$info->permissions['can_reply'])
-		{
-			Utils::$context['normal_buttons']['reply'] = array('text' => 'reply', 'url' => Config::$scripturl . '?action=post;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';last_msg=' . Topic::$info->id_last_msg, 'active' => true);
+		if (Topic::$info->permissions['can_reply']) {
+			Utils::$context['normal_buttons']['reply'] = ['text' => 'reply', 'url' => Config::$scripturl . '?action=post;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';last_msg=' . Topic::$info->id_last_msg, 'active' => true];
 		}
 
-		if (Topic::$info->permissions['can_add_poll'])
-		{
-			Utils::$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'url' => Config::$scripturl . '?action=editpoll;add;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start']);
+		if (Topic::$info->permissions['can_add_poll']) {
+			Utils::$context['normal_buttons']['add_poll'] = ['text' => 'add_poll', 'url' => Config::$scripturl . '?action=editpoll;add;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start']];
 		}
 
-		if (Topic::$info->permissions['can_mark_unread'])
-		{
-			Utils::$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'url' => Config::$scripturl . '?action=markasread;sa=topic;t=' . Utils::$context['mark_unread_time'] . ';topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (Topic::$info->permissions['can_mark_unread']) {
+			Utils::$context['normal_buttons']['mark_unread'] = ['text' => 'mark_unread', 'url' => Config::$scripturl . '?action=markasread;sa=topic;t=' . Utils::$context['mark_unread_time'] . ';topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
 		}
 
-		if (Topic::$info->permissions['can_print'])
-		{
-			Utils::$context['normal_buttons']['print'] = array('text' => 'print', 'custom' => 'rel="nofollow"', 'url' => Config::$scripturl . '?action=printpage;topic=' . Utils::$context['current_topic'] . '.0');
+		if (Topic::$info->permissions['can_print']) {
+			Utils::$context['normal_buttons']['print'] = ['text' => 'print', 'custom' => 'rel="nofollow"', 'url' => Config::$scripturl . '?action=printpage;topic=' . Utils::$context['current_topic'] . '.0'];
 		}
 
-		if (Topic::$info->permissions['can_set_notify'])
-		{
-			Utils::$context['normal_buttons']['notify'] = array(
+		if (Topic::$info->permissions['can_set_notify']) {
+			Utils::$context['normal_buttons']['notify'] = [
 				'text' => 'notify_topic_' . Utils::$context['topic_notification_mode'],
-				'sub_buttons' => array(
-					array(
+				'sub_buttons' => [
+					[
 						'test' => 'can_unwatch',
 						'text' => 'notify_topic_0',
 						'url' => Config::$scripturl . '?action=notifytopic;topic=' . Utils::$context['current_topic'] . ';mode=0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-					array(
+					],
+					[
 						'text' => 'notify_topic_1',
 						'url' => Config::$scripturl . '?action=notifytopic;topic=' . Utils::$context['current_topic'] . ';mode=1;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-					array(
+					],
+					[
 						'text' => 'notify_topic_2',
 						'url' => Config::$scripturl . '?action=notifytopic;topic=' . Utils::$context['current_topic'] . ';mode=2;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-					array(
+					],
+					[
 						'text' => 'notify_topic_3',
 						'url' => Config::$scripturl . '?action=notifytopic;topic=' . Utils::$context['current_topic'] . ';mode=3;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-				),
-			);
+					],
+				],
+			];
 		}
 
 		// Build the mod button array
-		Utils::$context['mod_buttons'] = array();
+		Utils::$context['mod_buttons'] = [];
 
-		if (Topic::$info->permissions['can_move'])
-		{
-			Utils::$context['mod_buttons']['move'] = array('text' => 'move_topic', 'url' => Config::$scripturl . '?action=movetopic;current_board=' . Utils::$context['current_board'] . ';topic=' . Utils::$context['current_topic'] . '.0');
+		if (Topic::$info->permissions['can_move']) {
+			Utils::$context['mod_buttons']['move'] = ['text' => 'move_topic', 'url' => Config::$scripturl . '?action=movetopic;current_board=' . Utils::$context['current_board'] . ';topic=' . Utils::$context['current_topic'] . '.0'];
 		}
 
-		if (Topic::$info->permissions['can_delete'])
-		{
-			Utils::$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'custom' => 'data-confirm="' . Lang::$txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => Config::$scripturl . '?action=removetopic2;topic=' . Utils::$context['current_topic'] . '.0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (Topic::$info->permissions['can_delete']) {
+			Utils::$context['mod_buttons']['delete'] = ['text' => 'remove_topic', 'custom' => 'data-confirm="' . Lang::$txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => Config::$scripturl . '?action=removetopic2;topic=' . Utils::$context['current_topic'] . '.0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
 		}
 
-		if (Topic::$info->permissions['can_lock'])
-		{
-			Utils::$context['mod_buttons']['lock'] = array('text' => empty(Utils::$context['is_locked']) ? 'set_lock' : 'set_unlock', 'url' => Config::$scripturl . '?action=lock;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';sa=' . (Utils::$context['is_locked'] ? 'unlock' : 'lock') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (Topic::$info->permissions['can_lock']) {
+			Utils::$context['mod_buttons']['lock'] = ['text' => empty(Utils::$context['is_locked']) ? 'set_lock' : 'set_unlock', 'url' => Config::$scripturl . '?action=lock;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';sa=' . (Utils::$context['is_locked'] ? 'unlock' : 'lock') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
 		}
 
-		if (Topic::$info->permissions['can_sticky'])
-		{
-			Utils::$context['mod_buttons']['sticky'] = array('text' => empty(Utils::$context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'url' => Config::$scripturl . '?action=sticky;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';sa=' . (Utils::$context['is_sticky'] ? 'nonsticky' : 'sticky') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (Topic::$info->permissions['can_sticky']) {
+			Utils::$context['mod_buttons']['sticky'] = ['text' => empty(Utils::$context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'url' => Config::$scripturl . '?action=sticky;topic=' . Utils::$context['current_topic'] . '.' . Utils::$context['start'] . ';sa=' . (Utils::$context['is_sticky'] ? 'nonsticky' : 'sticky') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
 		}
 
-		if (Topic::$info->permissions['can_merge'])
-		{
-			Utils::$context['mod_buttons']['merge'] = array('text' => 'merge', 'url' => Config::$scripturl . '?action=mergetopics;board=' . Utils::$context['current_board'] . '.0;from=' . Utils::$context['current_topic']);
+		if (Topic::$info->permissions['can_merge']) {
+			Utils::$context['mod_buttons']['merge'] = ['text' => 'merge', 'url' => Config::$scripturl . '?action=mergetopics;board=' . Utils::$context['current_board'] . '.0;from=' . Utils::$context['current_topic']];
 		}
 
-		if (Topic::$info->permissions['calendar_post'])
-		{
-			Utils::$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'url' => Config::$scripturl . '?action=post;calendar;msg=' . Topic::$info->id_first_msg . ';topic=' . Utils::$context['current_topic'] . '.0');
+		if (Topic::$info->permissions['calendar_post']) {
+			Utils::$context['mod_buttons']['calendar'] = ['text' => 'calendar_link', 'url' => Config::$scripturl . '?action=post;calendar;msg=' . Topic::$info->id_first_msg . ';topic=' . Utils::$context['current_topic'] . '.0'];
 		}
 
 		// Restore topic. eh?  No monkey business.
-		if (Topic::$info->permissions['can_restore_topic'])
-		{
-			Utils::$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'url' => Config::$scripturl . '?action=restoretopic;topics=' . Utils::$context['current_topic'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (Topic::$info->permissions['can_restore_topic']) {
+			Utils::$context['mod_buttons']['restore_topic'] = ['text' => 'restore_topic', 'url' => Config::$scripturl . '?action=restoretopic;topics=' . Utils::$context['current_topic'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
 		}
 
 		// Allow adding new buttons easily.
 		// Note: Utils::$context['normal_buttons'] and Utils::$context['mod_buttons'] are added for backward compatibility with 2.0, but are deprecated and should not be used
-		IntegrationHook::call('integrate_display_buttons', array(&Utils::$context['normal_buttons']));
+		IntegrationHook::call('integrate_display_buttons', [&Utils::$context['normal_buttons']]);
 		// Note: integrate_mod_buttons is no longer necessary and deprecated, but is kept for backward compatibility with 2.0
-		IntegrationHook::call('integrate_mod_buttons', array(&Utils::$context['mod_buttons']));
+		IntegrationHook::call('integrate_mod_buttons', [&Utils::$context['mod_buttons']]);
 
 		// If any buttons have a 'test' check, run those tests now to keep things clean.
-		foreach (array('normal_buttons', 'mod_buttons') as $button_strip)
-		{
-			foreach (Utils::$context[$button_strip] as $key => $value)
-			{
-				if (isset($value['test']) && empty(Utils::$context[$value['test']]))
-				{
+		foreach (['normal_buttons', 'mod_buttons'] as $button_strip) {
+			foreach (Utils::$context[$button_strip] as $key => $value) {
+				if (isset($value['test']) && empty(Utils::$context[$value['test']])) {
 					unset(Utils::$context[$button_strip][$key]);
-				}
-				elseif (isset($value['sub_buttons']))
-				{
-					foreach ($value['sub_buttons'] as $subkey => $subvalue)
-					{
-						if (isset($subvalue['test']) && empty(Utils::$context[$subvalue['test']]))
+				} elseif (isset($value['sub_buttons'])) {
+					foreach ($value['sub_buttons'] as $subkey => $subvalue) {
+						if (isset($subvalue['test']) && empty(Utils::$context[$subvalue['test']])) {
 							unset(Utils::$context[$button_strip][$key]['sub_buttons'][$subkey]);
+						}
 					}
 				}
 			}
@@ -1395,7 +1378,8 @@ protected function buildButtons(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Display::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Display::exportStatic')) {
 	Display::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/DisplayAdminFile.php b/Sources/Actions/DisplayAdminFile.php
index 8737c82609..709dc11a3e 100644
--- a/Sources/Actions/DisplayAdminFile.php
+++ b/Sources/Actions/DisplayAdminFile.php
@@ -14,11 +14,10 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -32,12 +31,11 @@ class DisplayAdminFile implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'DisplayAdminFile',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -62,44 +60,46 @@ public function execute(): void
 	{
 		Config::setMemoryLimit('32M');
 
-		if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
+		if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Strip off the forum cache part or we won't find it...
 		$_REQUEST['filename'] = str_replace(Utils::$context['browser_cache'], '', $_REQUEST['filename']);
 
-		$request = Db::$db->query('', '
-			SELECT data, filetype
+		$request = Db::$db->query(
+			'',
+			'SELECT data, filetype
 			FROM {db_prefix}admin_info_files
 			WHERE filename = {string:current_filename}
 			LIMIT 1',
-			array(
+			[
 				'current_filename' => $_REQUEST['filename'],
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
-			ErrorHandler::fatalLang('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+
+		if (Db::$db->num_rows($request) == 0) {
+			ErrorHandler::fatalLang('admin_file_not_found', true, [$_REQUEST['filename']], 404);
 		}
 		list($file_data, $filetype) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// @todo Temp
 		// Figure out if sesc is still being used.
-		if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		{
-			$file_data = "\n" . 'if (!(\'smfForum_sessionvar\' in window))' . "\n\t" . 'window.smfForum_sessionvar = \'sesc\';' . "\n" . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+		if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = "\n" . 'if (!(\'smfForum_sessionvar\' in window))' . "\n\t" . 'window.smfForum_sessionvar = \'sesc\';' . "\n" . strtr($file_data, [';sesc=' => ';\' + window.smfForum_sessionvar + \'=']);
 		}
 
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 
 		// Lets make sure we aren't going to output anything nasty.
 		@ob_end_clean();
 
-		if (!empty(Config::$modSettings['enableCompressedOutput']))
+		if (!empty(Config::$modSettings['enableCompressedOutput'])) {
 			@ob_start('ob_gzhandler');
-		else
+		} else {
 			@ob_start();
+		}
 
 		// Make sure they know what type of file we are.
 		header('content-type: ' . $filetype);
@@ -118,8 +118,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -145,7 +146,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\DisplayAdminFile::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\DisplayAdminFile::exportStatic')) {
 	DisplayAdminFile::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Feed.php b/Sources/Actions/Feed.php
index 49ed20d6f4..22b0c9948b 100644
--- a/Sources/Actions/Feed.php
+++ b/Sources/Actions/Feed.php
@@ -13,13 +13,14 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Attachment;
-use SMF\BrowserDetector;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Board;
+use SMF\BrowserDetector;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\IP;
@@ -29,8 +30,6 @@
 use SMF\Url;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains the code necessary to display XML feeds.
@@ -66,14 +65,13 @@ class Feed implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ShowXmlFeed',
 			'build' => 'buildXmlFeed',
 			'cdataParse' => 'cdata_parse',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -96,34 +94,34 @@ class Feed implements ActionInterface
 	 * These strings have been broken up and concatenated to help prevent any
 	 * automatic search and replace attempts from changing them.
 	 */
-	const XML_NAMESPACES = array(
-		'rss' => array(),
-		'rss2' => array(
-			'atom' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom',
-		),
-		'atom' => array(
-			'' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/2005/Atom',
-		),
-		'rdf' => array(
-			'' => 'htt'.'p:/'.'/purl.o'.'rg/rss/1.0/',
-			'rdf' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/02/22-rdf-syntax-ns#',
-			'dc' => 'htt'.'p:/'.'/purl.o'.'rg/dc/elements/1.1/',
-		),
-		'smf' => array(
-			'smf' => 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/%1s',
-		),
-	);
+	public const XML_NAMESPACES = [
+		'rss' => [],
+		'rss2' => [
+			'atom' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom',
+		],
+		'atom' => [
+			'' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/2005/Atom',
+		],
+		'rdf' => [
+			'' => 'htt' . 'p:/' . '/purl.o' . 'rg/rss/1.0/',
+			'rdf' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/02/22-rdf-syntax-ns#',
+			'dc' => 'htt' . 'p:/' . '/purl.o' . 'rg/dc/elements/1.1/',
+		],
+		'smf' => [
+			'smf' => 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/%1s',
+		],
+	];
 
 	/**
 	 * An array of MIME types for feed formats.
 	 */
-	const MIME_TYPES = array(
+	public const MIME_TYPES = [
 		'rss' => 'application/rss+xml',
 		'rss2' => 'application/rss+xml',
 		'atom' => 'application/atom+xml',
 		'rdf' => 'application/rdf+xml',
 		'smf' => 'text/xml',
-	);
+	];
 
 	/*******************
 	 * Public properties
@@ -182,21 +180,21 @@ class Feed implements ActionInterface
 	 *
 	 * Metadata about this feed.
 	 */
-	public array $metadata = array();
+	public array $metadata = [];
 
 	/**
 	 * @var array
 	 *
 	 * Main data in this feed.
 	 */
-	public array $data = array();
+	public array $data = [];
 
 	/**
 	 * @var array
 	 *
 	 * Boards to fetch posts from.
 	 */
-	public array $boards = array();
+	public array $boards = [];
 
 	/**
 	 * @var string
@@ -211,11 +209,11 @@ class Feed implements ActionInterface
 	 *
 	 * The constructed XML.
 	 */
-	public array $xml = array(
+	public array $xml = [
 		'header' => '',
 		'items' => '',
 		'footer' => '',
-	);
+	];
 
 	/**************************
 	 * Public static properties
@@ -226,14 +224,14 @@ class Feed implements ActionInterface
 	 *
 	 * List all the different types of data they can pull.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'recent' => 'getXmlRecent',
 		'news' => 'getXmlNews',
 		'members' => 'getXmlMembers',
 		'profile' => 'getXmlProfile',
 		'posts' => 'getXmlPosts',
 		'personal_messages' => 'getXmlPMs',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -244,10 +242,10 @@ class Feed implements ActionInterface
 	 *
 	 * Used to optimize SQL queries.
 	 */
-	protected array $optimize_msg = array(
+	protected array $optimize_msg = [
 		'highest' => 'm.id_msg <= b.id_last_msg',
 		'lowest' => 'm.id_msg >= 0',
-	);
+	];
 
 	/**
 	 * @var string
@@ -280,12 +278,12 @@ class Feed implements ActionInterface
 	 * @param int $member The member whose data is being requested.
 	 *     If null, will try $_GET['u'] and then User::$me->id.
 	 */
-	public function __construct(string $subaction = null, int $member = null)
+	public function __construct(?string $subaction = null, ?int $member = null)
 	{
 		$this->host = Url::create(Config::$scripturl)->host;
 
 		// Easy adding of sub actions
-		IntegrationHook::call('integrate_xmlfeeds', array(&self::$subactions));
+		IntegrationHook::call('integrate_xmlfeeds', [&self::$subactions]);
 
 		// These things are simple to set.
 		$this->setSubaction($subaction);
@@ -300,139 +298,135 @@ public function __construct(string $subaction = null, int $member = null)
 		Lang::load('Stats');
 
 		// Some general metadata for this feed. We'll change some of these values below.
-		$this->metadata = array(
+		$this->metadata = [
 			'title' => '',
 			'desc' => sprintf(Lang::$txt['xml_rss_desc'], Utils::$context['forum_name']),
 			'author' => Utils::$context['forum_name'],
 			'source' => Config::$scripturl,
 			'rights' => '© ' . date('Y') . ' ' . Utils::$context['forum_name'],
 			'icon' => !empty(Theme::$current->settings['og_image']) ? Theme::$current->settings['og_image'] : Config::$boardurl . '/favicon.ico',
-			'language' => !empty(Lang::$txt['lang_locale']) ? str_replace("_", "-", substr(Lang::$txt['lang_locale'], 0, strcspn(Lang::$txt['lang_locale'], "."))) : 'en',
+			'language' => !empty(Lang::$txt['lang_locale']) ? str_replace('_', '-', substr(Lang::$txt['lang_locale'], 0, strcspn(Lang::$txt['lang_locale'], '.'))) : 'en',
 			'self' => Config::$scripturl,
-		);
+		];
 
 		// Set $this->metadata['self'] to the canonical form of the requested URL.
-		foreach (array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset') as $var)
-		{
-			if (isset($_GET[$var]))
-			{
-				$this->metadata['self'] .= ($this->metadata['self'] === Config::$scripturl ? '?' : ';' ) . $var . '=' . $_GET[$var];
+		foreach (['action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit', 'offset'] as $var) {
+			if (isset($_GET[$var])) {
+				$this->metadata['self'] .= ($this->metadata['self'] === Config::$scripturl ? '?' : ';') . $var . '=' . $_GET[$var];
 			}
 		}
 
 		// Handle the cases where a board, boards, or category is asked for.
-		if (!empty($_GET['c']) && empty(Board::$info->id))
-		{
+		if (!empty($_GET['c']) && empty(Board::$info->id)) {
 			$_GET['c'] = explode(',', $_GET['c']);
 
-			foreach ($_GET['c'] as $i => $c)
+			foreach ($_GET['c'] as $i => $c) {
 				$_GET['c'][$i] = (int) $c;
+			}
 
-			if (count($_GET['c']) == 1)
-			{
-				$request = Db::$db->query('', '
-					SELECT name
+			if (count($_GET['c']) == 1) {
+				$request = Db::$db->query(
+					'',
+					'SELECT name
 					FROM {db_prefix}categories
 					WHERE id_cat = {int:current_category}',
-					array(
+					[
 						'current_category' => (int) $_GET['c'][0],
-					)
+					],
 				);
 				list($this->metadata['title']) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 			}
 
 			$total_cat_posts = 0;
-			$this->boards = array();
-			$request = Db::$db->query('', '
-				SELECT b.id_board, b.num_posts
+			$this->boards = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board, b.num_posts
 				FROM {db_prefix}boards AS b
 				WHERE b.id_cat IN ({array_int:current_category_list})
 					AND {query_see_board}',
-				array(
+				[
 					'current_category_list' => $_GET['c'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->boards[] = $row['id_board'];
 				$total_cat_posts += $row['num_posts'];
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($this->boards))
-			{
+			if (!empty($this->boards)) {
 				$this->query_this_board = 'b.id_board IN (' . implode(', ', $this->boards) . ')';
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatalLang('no_board', false);
 			}
 
 			// Try to limit the number of messages we look through.
-			if ($total_cat_posts > 100 && $total_cat_posts > Config::$modSettings['totalMessages'] / 15)
-			{
+			if ($total_cat_posts > 100 && $total_cat_posts > Config::$modSettings['totalMessages'] / 15) {
 				$this->optimize_msg['lowest'] = 'm.id_msg >= ' . max(0, Config::$modSettings['maxMsgID'] - 400 - $this->limit * 5);
 			}
-		}
-		elseif (!empty($_GET['boards']))
-		{
+		} elseif (!empty($_GET['boards'])) {
 			$_GET['boards'] = explode(',', $_GET['boards']);
 
-			foreach ($_GET['boards'] as $i => $b)
+			foreach ($_GET['boards'] as $i => $b) {
 				$_GET['boards'][$i] = (int) $b;
+			}
 
 			$total_posts = 0;
-			$this->boards = array();
+			$this->boards = [];
 			$num_boards = 0;
 
-			$request = Db::$db->query('', '
-				SELECT b.id_board, b.num_posts, b.name
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board, b.num_posts, b.name
 				FROM {db_prefix}boards AS b
 				WHERE b.id_board IN ({array_int:board_list})
 					AND {query_see_board}
 				LIMIT {int:limit}',
-				array(
+				[
 					'board_list' => $_GET['boards'],
 					'limit' => count($_GET['boards']),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (++$num_boards == 1)
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (++$num_boards == 1) {
 					$this->metadata['title'] = $row['name'];
+				}
 
 				$this->boards[] = $row['id_board'];
 				$total_posts += $row['num_posts'];
 			}
 			Db::$db->free_result($request);
 
-			if ($num_boards == 0)
+			if ($num_boards == 0) {
 				ErrorHandler::fatalLang('no_board', false);
+			}
 
-			if (!empty($this->boards))
+			if (!empty($this->boards)) {
 				$this->query_this_board = 'b.id_board IN (' . implode(', ', $this->boards) . ')';
+			}
 
 			// The more boards, the more we're going to look through...
-			if ($total_posts > 100 && $total_posts > Config::$modSettings['totalMessages'] / 12)
-			{
+			if ($total_posts > 100 && $total_posts > Config::$modSettings['totalMessages'] / 12) {
 				$this->optimize_msg['lowest'] = 'm.id_msg >= ' . max(0, Config::$modSettings['maxMsgID'] - 500 - $this->limit * 5);
 			}
-		}
-		elseif (!empty(Board::$info->id))
-		{
-			$request = Db::$db->query('', '
-				SELECT num_posts
+		} elseif (!empty(Board::$info->id)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT num_posts
 				FROM {db_prefix}boards AS b
 				WHERE id_board = {int:current_board}
 					AND {query_see_board}
 				LIMIT 1',
-				array(
+				[
 					'current_board' => Board::$info->id,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				Db::$db->free_result($request);
 				ErrorHandler::fatalLang('no_board', false);
 			}
@@ -447,13 +441,10 @@ public function __construct(string $subaction = null, int $member = null)
 			$this->query_this_board = 'b.id_board = ' . Board::$info->id;
 
 			// Try to look through just a few messages, if at all possible.
-			if ($total_posts > 80 && $total_posts > Config::$modSettings['totalMessages'] / 10)
-			{
+			if ($total_posts > 80 && $total_posts > Config::$modSettings['totalMessages'] / 10) {
 				$this->optimize_msg['lowest'] = 'm.id_msg >= ' . max(0, Config::$modSettings['maxMsgID'] - 600 - $this->limit * 5);
 			}
-		}
-		else
-		{
+		} else {
 			$this->query_this_board = '{query_see_board}' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 				AND b.id_board != ' . Config::$modSettings['recycle_board'] : '');
 
@@ -463,8 +454,9 @@ public function __construct(string $subaction = null, int $member = null)
 		$this->metadata['title'] .= (!empty($this->metadata['title']) ? ' - ' : '') . Utils::$context['forum_name'];
 
 		// Sanitize feed metadata values
-		foreach ($this->metadata as $key => $value)
+		foreach ($this->metadata as $key => $value) {
 			$this->metadata[$key] = strip_tags($value);
+		}
 	}
 
 	/**
@@ -486,37 +478,34 @@ public function execute(): void
 	public function getData(): array
 	{
 		// We only want some information, not all of it.
-		$cachekey = array($this->subaction, $this->limit, $this->ascending, $this->start_after);
+		$cachekey = [$this->subaction, $this->limit, $this->ascending, $this->start_after];
 
-		if (!empty($this->member))
+		if (!empty($this->member)) {
 			$cachekey[] = $this->member;
+		}
 
-		if (!empty($this->boards))
+		if (!empty($this->boards)) {
 			$cachekey[] = 'boards=' . implode(',', $this->boards);
+		}
 
 		$cachekey = md5(Utils::jsonEncode($cachekey) . (!empty($this->query_this_board) ? $this->query_this_board : ''));
 
 		$cache_t = microtime(true);
 
 		// Get the associative array representing the xml.
-		if (!empty(CacheApi::$enable) && (!User::$me->is_guest || CacheApi::$enable >= 3))
-		{
+		if (!empty(CacheApi::$enable) && (!User::$me->is_guest || CacheApi::$enable >= 3)) {
 			$this->data = CacheApi::get('xmlfeed-' . $this->format . ':' . (User::$me->is_guest ? '' : User::$me->id . '-') . $cachekey, 240);
 		}
 
-		if (empty($this->data))
-		{
+		if (empty($this->data)) {
 			// Should we call one of this class's own methods, or something added by a mod?
-			if (is_callable(array($this, self::$subactions[$this->subaction])))
-			{
-				$call = array($this, self::$subactions[$this->subaction]);
-			}
-			else
-			{
+			if (is_callable([$this, self::$subactions[$this->subaction]])) {
+				$call = [$this, self::$subactions[$this->subaction]];
+			} else {
 				$call = Utils::getCallable(self::$subactions[$this->subaction]);
 			}
 
-			$this->data = !empty($call) ? call_user_func($call, $this->format) : array();
+			$this->data = !empty($call) ? call_user_func($call, $this->format) : [];
 
 			if (
 				!empty(CacheApi::$enable)
@@ -524,8 +513,7 @@ public function getData(): array
 					(User::$me->is_guest && CacheApi::$enable >= 3)
 					|| (!User::$me->is_guest && (microtime(true) - $cache_t > 0.2))
 				)
-			)
-			{
+			) {
 				CacheApi::put('xmlfeed-' . $this->format . ':' . (User::$me->is_guest ? '' : User::$me->id . '-') . $cachekey, $this->data, 240);
 			}
 		}
@@ -542,17 +530,14 @@ public function emit(): void
 		$filename[] = $this->metadata['title'];
 		$filename[] = $this->subaction;
 
-		if (in_array($this->subaction, array('profile', 'posts', 'personal_messages')))
+		if (in_array($this->subaction, ['profile', 'posts', 'personal_messages'])) {
 			$filename[] = 'u=' . $this->member;
+		}
 
-		if (!empty($this->boards))
-		{
-			if (count($this->boards) > 1)
-			{
+		if (!empty($this->boards)) {
+			if (count($this->boards) > 1) {
 				$filename[] = 'boards=' . implode(',', $this->boards);
-			}
-			else
-			{
+			} else {
 				$filename[] = 'board=' . reset($this->boards);
 			}
 		}
@@ -561,15 +546,14 @@ public function emit(): void
 
 		$filename = preg_replace(Utils::$context['utf8'] ? '/[^\p{L}\p{M}\p{N}\-]+/u' : '/[\s_,.\/\\;:\'<>?|\[\]{}~!@#$%^&*()=+`]+/', '_', str_replace('"', '', Utils::htmlspecialcharsDecode(strip_tags(implode('-', $filename)))));
 
-		$file = array(
+		$file = [
 			'filename' => $filename . '.xml',
 			'mime_type' => self::MIME_TYPES[$this->format] . '; charset=' . (empty(Utils::$context['character_set']) ? 'UTF-8' : Utils::$context['character_set']),
 			'content' => implode('', $this->xml),
 			'disposition' => isset($_GET['download']) ? 'attachment' : 'inline',
-		);
+		];
 
-		if (isset($_GET['debug']) || (BrowserDetector::isBrowser('ie') && $this->format == 'rdf'))
-		{
+		if (isset($_GET['debug']) || (BrowserDetector::isBrowser('ie') && $this->format == 'rdf')) {
 			$file['mime_type'] = str_replace(self::MIME_TYPES[$this->format], self::MIME_TYPES['smf'], $file['mime_type']);
 		}
 
@@ -586,149 +570,145 @@ public function emit(): void
 	 */
 	public function getXmlMembers(): array
 	{
-		if (!User::$me->allowedTo('view_mlist'))
-			return array();
+		if (!User::$me->allowedTo('view_mlist')) {
+			return [];
+		}
 
 		Lang::load('Profile');
 
 		// Find the most (or least) recent members.
-		$data = array();
+		$data = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, member_name, real_name, date_registered, last_login
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, member_name, real_name, date_registered, last_login
 			FROM {db_prefix}members
 			ORDER BY id_member {raw:ascdesc}
 			LIMIT {int:limit}',
-			array(
+			[
 				'limit' => $this->limit,
 				'ascdesc' => !empty($this->ascending) ? 'ASC' : 'DESC',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// If any control characters slipped in somehow, kill the evil things
-			$row = filter_var($row, FILTER_CALLBACK, array('options' => '\\SMF\\Utils::cleanXml'));
+			$row = filter_var($row, FILTER_CALLBACK, ['options' => '\\SMF\\Utils::cleanXml']);
 
 			// Create a GUID for each member using the tag URI scheme
 			$guid = 'tag:' . $this->host . ',' . gmdate('Y-m-d', $row['date_registered']) . ':member=' . $row['id_member'];
 
 			// Make the data look rss-ish.
-			if ($this->format == 'rss' || $this->format == 'rss2')
-			{
-				$data[] = array(
+			if ($this->format == 'rss' || $this->format == 'rss2') {
+				$data[] = [
 					'tag' => 'item',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['real_name'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-						),
-						array(
+						],
+						[
 							'tag' => 'comments',
 							'content' => Config::$scripturl . '?action=pm;sa=send;u=' . $row['id_member'],
-						),
-						array(
+						],
+						[
 							'tag' => 'pubDate',
-							'content' => gmdate('D, d M Y H:i:s \G\M\T', $row['date_registered']),
-						),
-						array(
+							'content' => gmdate('D, d M Y H:i:s \\G\\M\\T', $row['date_registered']),
+						],
+						[
 							'tag' => 'guid',
 							'content' => $guid,
-							'attributes' => array(
+							'attributes' => [
 								'isPermaLink' => 'false',
-							),
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'rdf')
-			{
-				$data[] = array(
+							],
+						],
+					],
+				];
+			} elseif ($this->format == 'rdf') {
+				$data[] = [
 					'tag' => 'item',
-					'attributes' => array('rdf:about' => Config::$scripturl . '?action=profile;u=' . $row['id_member']),
-					'content' => array(
-						array(
+					'attributes' => ['rdf:about' => Config::$scripturl . '?action=profile;u=' . $row['id_member']],
+					'content' => [
+						[
 							'tag' => 'dc:format',
 							'content' => 'text/html',
-						),
-						array(
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['real_name'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'atom')
-			{
-				$data[] = array(
+						],
+					],
+				];
+			} elseif ($this->format == 'atom') {
+				$data[] = [
 					'tag' => 'entry',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['real_name'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array(
+							'attributes' => [
 								'rel' => 'alternate',
 								'type' => 'text/html',
 								'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'published',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['date_registered']),
-						),
-						array(
+						],
+						[
 							'tag' => 'updated',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['last_login']),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $guid,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 			// More logical format for the data, but harder to apply.
-			else
-			{
-				$data[] = array(
+			else {
+				$data[] = [
 					'tag' => 'member',
-					'attributes' => array('label' => Lang::$txt['who_member']),
-					'content' => array(
-						array(
+					'attributes' => ['label' => Lang::$txt['who_member']],
+					'content' => [
+						[
 							'tag' => 'name',
-							'attributes' => array('label' => Lang::$txt['name']),
+							'attributes' => ['label' => Lang::$txt['name']],
 							'content' => $row['real_name'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'time',
-							'attributes' => array('label' => Lang::$txt['date_registered'], 'UTC' => Time::gmstrftime('%F %T', $row['date_registered'])),
+							'attributes' => ['label' => Lang::$txt['date_registered'], 'UTC' => Time::gmstrftime('%F %T', $row['date_registered'])],
 							'content' => Utils::htmlspecialchars(strip_tags(Time::create('@' . $row['date_registered'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false))),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $row['id_member'],
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array('label' => Lang::$txt['url']),
+							'attributes' => ['label' => Lang::$txt['url']],
 							'content' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 		}
 		Db::$db->free_result($request);
@@ -750,15 +730,16 @@ public function getXmlNews(): array
 			- are on an any board OR in a specified board.
 			- can be seen by this user. */
 
-		$data = array();
+		$data = [];
 
 		$done = false;
 		$loops = 0;
-		while (!$done)
-		{
+
+		while (!$done) {
 			$optimize_msg = implode(' AND ', $this->optimize_msg);
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					m.smileys_enabled, m.poster_time, m.id_msg, m.subject, m.body, m.modified_time,
 					m.icon, t.id_topic, t.id_board, t.num_replies,
 					b.name AS bname,
@@ -775,45 +756,39 @@ public function getXmlNews(): array
 					AND t.approved = {int:is_approved}' : '') . '
 				ORDER BY t.id_first_msg {raw:ascdesc}
 				LIMIT {int:limit}',
-				array(
+				[
 					'current_board' => Board::$info->id,
 					'is_approved' => 1,
 					'limit' => $this->limit,
 					'optimize_msg' => $optimize_msg,
 					'ascdesc' => !empty($this->ascending) ? 'ASC' : 'DESC',
-				)
+				],
 			);
+
 			// If we don't have $this->limit results, try again with an unoptimized version covering all rows.
-			if ($loops < 2 && Db::$db->num_rows($request) < $this->limit)
-			{
+			if ($loops < 2 && Db::$db->num_rows($request) < $this->limit) {
 				Db::$db->free_result($request);
 
-				if (empty($_GET['boards']) && empty(Board::$info->id))
-				{
+				if (empty($_GET['boards']) && empty(Board::$info->id)) {
 					unset($this->optimize_msg['lowest']);
-				}
-				else
-				{
+				} else {
 					$this->optimize_msg['lowest'] = 'm.id_msg >= t.id_first_msg';
 				}
 
 				$this->optimize_msg['highest'] = 'm.id_msg <= t.id_last_msg';
 				$loops++;
-			}
-			else
-			{
+			} else {
 				$done = true;
 			}
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// If any control characters slipped in somehow, kill the evil things
-			$row = filter_var($row, FILTER_CALLBACK, array('options' => '\\SMF\\Utils::cleanXml'));
+			$row = filter_var($row, FILTER_CALLBACK, ['options' => '\\SMF\\Utils::cleanXml']);
 
 			// Limit the length of the message, if the option is set.
-			if (!empty(Config::$modSettings['xmlnews_maxlen']) && Utils::entityStrlen(str_replace('<br>', "\n", $row['body'])) > Config::$modSettings['xmlnews_maxlen'])
-			{
-				$row['body'] = strtr(Utils::entitySubstr(str_replace('<br>', "\n", $row['body']), 0, Config::$modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+			if (!empty(Config::$modSettings['xmlnews_maxlen']) && Utils::entityStrlen(str_replace('<br>', "\n", $row['body'])) > Config::$modSettings['xmlnews_maxlen']) {
+				$row['body'] = strtr(Utils::entitySubstr(str_replace('<br>', "\n", $row['body']), 0, Config::$modSettings['xmlnews_maxlen'] - 3), ["\n" => '<br>']) . '...';
 			}
 
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
@@ -822,31 +797,25 @@ public function getXmlNews(): array
 			Lang::censorText($row['subject']);
 
 			// Do we want to include any attachments?
-			if (!empty(Config::$modSettings['attachmentEnable']) && !empty(Config::$modSettings['xmlnews_attachments']) && User::$me->allowedTo('view_attachments', $row['id_board']))
-			{
+			if (!empty(Config::$modSettings['attachmentEnable']) && !empty(Config::$modSettings['xmlnews_attachments']) && User::$me->allowedTo('view_attachments', $row['id_board'])) {
 				$loaded_attachments = Attachment::loadByMsg($row['id_msg'], Attachment::APPROVED_TRUE);
 
 				// Sort the attachments by size to make things easier below
-				if (!empty($loaded_attachments))
-				{
+				if (!empty($loaded_attachments)) {
 					uasort(
 						$loaded_attachments,
-						function($a, $b)
-						{
-							if ($a->size == $b->size)
+						function ($a, $b) {
+							if ($a->size == $b->size) {
 								return 0;
+							}
 
 							return ($a->size < $b->size) ? -1 : 1;
-						}
+						},
 					);
-				}
-				else
-				{
+				} else {
 					$loaded_attachments = null;
 				}
-			}
-			else
-			{
+			} else {
 				$loaded_attachments = null;
 			}
 
@@ -854,318 +823,303 @@ function($a, $b)
 			$guid = 'tag:' . $this->host . ',' . gmdate('Y-m-d', $row['poster_time']) . ':topic=' . $row['id_topic'];
 
 			// Being news, this actually makes sense in rss format.
-			if ($this->format == 'rss' || $this->format == 'rss2')
-			{
+			if ($this->format == 'rss' || $this->format == 'rss2') {
 				// Only one attachment allowed in RSS.
-				if ($loaded_attachments !== null)
-				{
+				if ($loaded_attachments !== null) {
 					$attachment = array_pop($loaded_attachments);
-					$enclosure = array(
+					$enclosure = [
 						'url' => self::fixPossibleUrl(Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id),
 						'length' => $attachment->size,
 						'type' => $attachment->mime_type,
-					);
-				}
-				else
-				{
+					];
+				} else {
 					$enclosure = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'item',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
 							'content' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? $row['poster_email'] . ' (' . $row['poster_name'] . ')' : null,
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'comments',
 							'content' => Config::$scripturl . '?action=post;topic=' . $row['id_topic'] . '.0',
-						),
-						array(
+						],
+						[
 							'tag' => 'category',
 							'content' => $row['bname'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'pubDate',
-							'content' => gmdate('D, d M Y H:i:s \G\M\T', $row['poster_time']),
-						),
-						array(
+							'content' => gmdate('D, d M Y H:i:s \\G\\M\\T', $row['poster_time']),
+						],
+						[
 							'tag' => 'guid',
 							'content' => $guid,
-							'attributes' => array(
+							'attributes' => [
 								'isPermaLink' => 'false',
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'enclosure',
 							'attributes' => $enclosure,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'rdf')
-			{
-				$data[] = array(
+						],
+					],
+				];
+			} elseif ($this->format == 'rdf') {
+				$data[] = [
 					'tag' => 'item',
-					'attributes' => array('rdf:about' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0'),
-					'content' => array(
-						array(
+					'attributes' => ['rdf:about' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0'],
+					'content' => [
+						[
 							'tag' => 'dc:format',
 							'content' => 'text/html',
-						),
-						array(
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'atom')
-			{
+						],
+					],
+				];
+			} elseif ($this->format == 'atom') {
 				// Only one attachment allowed
-				if (!empty($loaded_attachments))
-				{
+				if (!empty($loaded_attachments)) {
 					$attachment = array_pop($loaded_attachments);
-					$enclosure = array(
+					$enclosure = [
 						'rel' => 'enclosure',
 						'href' => self::fixPossibleUrl(Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id),
 						'length' => $attachment->size,
 						'type' => $attachment->mime_type,
-					);
-				}
-				else
-				{
+					];
+				} else {
 					$enclosure = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'entry',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array(
+							'attributes' => [
 								'rel' => 'alternate',
 								'type' => 'text/html',
 								'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'summary',
-							'attributes' => array('type' => 'html'),
+							'attributes' => ['type' => 'html'],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'category',
-							'attributes' => array('term' => $row['bname']),
+							'attributes' => ['term' => $row['bname']],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
-							'content' => array(
-								array(
+							'content' => [
+								[
 									'tag' => 'name',
 									'content' => $row['poster_name'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'email',
 									'content' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? $row['poster_email'] : null,
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'uri',
 									'content' => !empty($row['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : null,
-								),
-							)
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'published',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['poster_time']),
-						),
-						array(
+						],
+						[
 							'tag' => 'updated',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', empty($row['modified_time']) ? $row['poster_time'] : $row['modified_time']),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $guid,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'attributes' => $enclosure,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 			// The biggest difference here is more information.
-			else
-			{
+			else {
 				Lang::load('Post');
 
-				$attachments = array();
-				if (!empty($loaded_attachments))
-				{
-					foreach ($loaded_attachments as $attachment)
-					{
-						$attachments[] = array(
+				$attachments = [];
+
+				if (!empty($loaded_attachments)) {
+					foreach ($loaded_attachments as $attachment) {
+						$attachments[] = [
 							'tag' => 'attachment',
-							'attributes' => array('label' => Lang::$txt['attachment']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['attachment']],
+							'content' => [
+								[
 									'tag' => 'id',
 									'content' => $attachment->id,
-								),
-								array(
+								],
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
-									'content' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $attachment->name),
-								),
-								array(
+									'attributes' => ['label' => Lang::$txt['name']],
+									'content' => preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\1;', $attachment->name),
+								],
+								[
 									'tag' => 'downloads',
-									'attributes' => array('label' => Lang::$txt['downloads']),
+									'attributes' => ['label' => Lang::$txt['downloads']],
 									'content' => $attachment->downloads,
-								),
-								array(
+								],
+								[
 									'tag' => 'size',
-									'attributes' => array('label' => Lang::$txt['filesize']),
+									'attributes' => ['label' => Lang::$txt['filesize']],
 									'content' => ($attachment->size < 1024000) ? round($attachment->size / 1024, 2) . ' ' . Lang::$txt['kilobyte'] : round($attachment->size / 1024 / 1024, 2) . ' ' . Lang::$txt['megabyte'],
-								),
-								array(
+								],
+								[
 									'tag' => 'byte_size',
-									'attributes' => array('label' => Lang::$txt['filesize']),
+									'attributes' => ['label' => Lang::$txt['filesize']],
 									'content' => $attachment->size,
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id,
-								),
-							)
-						);
+								],
+							],
+						];
 					}
-				}
-				else
-				{
+				} else {
 					$attachments = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'article',
-					'attributes' => array('label' => Lang::$txt['news']),
-					'content' => array(
-						array(
+					'attributes' => ['label' => Lang::$txt['news']],
+					'content' => [
+						[
 							'tag' => 'time',
-							'attributes' => array('label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['poster_time'])),
+							'attributes' => ['label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['poster_time'])],
 							'content' => Utils::htmlspecialchars(strip_tags(Time::create('@' . $row['poster_time'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false))),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $row['id_topic'],
-						),
-						array(
+						],
+						[
 							'tag' => 'subject',
-							'attributes' => array('label' => Lang::$txt['subject']),
+							'attributes' => ['label' => Lang::$txt['subject']],
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'body',
-							'attributes' => array('label' => Lang::$txt['message']),
+							'attributes' => ['label' => Lang::$txt['message']],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'poster',
-							'attributes' => array('label' => Lang::$txt['author']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['author']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $row['poster_name'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_member'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => !empty($row['id_member']) ? array('label' => Lang::$txt['url']) : null,
+									'attributes' => !empty($row['id_member']) ? ['label' => Lang::$txt['url']] : null,
 									'content' => !empty($row['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : '',
-								),
-							)
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'topic',
-							'attributes' => array('label' => Lang::$txt['topic']),
+							'attributes' => ['label' => Lang::$txt['topic']],
 							'content' => $row['id_topic'],
-						),
-						array(
+						],
+						[
 							'tag' => 'board',
-							'attributes' => array('label' => Lang::$txt['board']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['board']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $row['bname'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_board'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array('label' => Lang::$txt['url']),
+							'attributes' => ['label' => Lang::$txt['url']],
 							'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
-						),
-						array(
+						],
+						[
 							'tag' => 'attachments',
-							'attributes' => array('label' => Lang::$txt['attachments']),
+							'attributes' => ['label' => Lang::$txt['attachments']],
 							'content' => $attachments,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 		}
 		Db::$db->free_result($request);
@@ -1181,16 +1135,17 @@ function($a, $b)
 	 */
 	public function getXmlRecent(): array
 	{
-		$data = array();
-		$messages = array();
+		$data = [];
+		$messages = [];
 
 		$done = false;
 		$loops = 0;
-		while (!$done)
-		{
+
+		while (!$done) {
 			$optimize_msg = implode(' AND ', $this->optimize_msg);
-			$request = Db::$db->query('', '
-				SELECT m.id_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_msg
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}boards AS b ON (m.id_board = b.id_board)
 					INNER JOIN {db_prefix}topics AS t ON (m.id_topic = t.id_topic)
@@ -1201,38 +1156,42 @@ public function getXmlRecent(): array
 					AND t.approved = {int:is_approved}' : '') . '
 				ORDER BY m.id_msg DESC
 				LIMIT {int:limit}',
-				array(
+				[
 					'limit' => $this->limit,
 					'current_board' => Board::$info->id,
 					'is_approved' => 1,
 					'optimize_msg' => $optimize_msg,
-				)
+				],
 			);
+
 			// If we don't have $this->limit results, try again with an unoptimized version covering all rows.
-			if ($loops < 2 && Db::$db->num_rows($request) < $this->limit)
-			{
+			if ($loops < 2 && Db::$db->num_rows($request) < $this->limit) {
 				Db::$db->free_result($request);
-				if (empty($_GET['boards']) && empty(Board::$info->id))
+
+				if (empty($_GET['boards']) && empty(Board::$info->id)) {
 					unset($this->optimize_msg['lowest']);
-				else
+				} else {
 					$this->optimize_msg['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+				}
 				$loops++;
-			}
-			else
+			} else {
 				$done = true;
+			}
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$messages[] = $row['id_msg'];
 		}
 		Db::$db->free_result($request);
 
-		if (empty($messages))
-			return array();
+		if (empty($messages)) {
+			return [];
+		}
 
 		// Find the most recent posts this user can see.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.smileys_enabled, m.poster_time, m.id_msg, m.subject, m.body, m.id_topic, t.id_board,
 				b.name AS bname, t.num_replies, m.id_member, m.icon, mf.id_member AS id_first_member,
 				COALESCE(mem.real_name, m.poster_name) AS poster_name, mf.subject AS first_subject,
@@ -1248,21 +1207,20 @@ public function getXmlRecent(): array
 				' . (empty(Board::$info->id) ? '' : 'AND t.id_board = {int:current_board}') . '
 			ORDER BY m.id_msg DESC
 			LIMIT {int:limit}',
-			array(
+			[
 				'limit' => $this->limit,
 				'current_board' => Board::$info->id,
 				'message_list' => $messages,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// If any control characters slipped in somehow, kill the evil things
-			$row = filter_var($row, FILTER_CALLBACK, array('options' => '\\SMF\\Utils::cleanXml'));
+			$row = filter_var($row, FILTER_CALLBACK, ['options' => '\\SMF\\Utils::cleanXml']);
 
 			// Limit the length of the message, if the option is set.
-			if (!empty(Config::$modSettings['xmlnews_maxlen']) && Utils::entityStrlen(str_replace('<br>', "\n", $row['body'])) > Config::$modSettings['xmlnews_maxlen'])
-			{
-				$row['body'] = strtr(Utils::entitySubstr(str_replace('<br>', "\n", $row['body']), 0, Config::$modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+			if (!empty(Config::$modSettings['xmlnews_maxlen']) && Utils::entityStrlen(str_replace('<br>', "\n", $row['body'])) > Config::$modSettings['xmlnews_maxlen']) {
+				$row['body'] = strtr(Utils::entitySubstr(str_replace('<br>', "\n", $row['body']), 0, Config::$modSettings['xmlnews_maxlen'] - 3), ["\n" => '<br>']) . '...';
 			}
 
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
@@ -1271,31 +1229,25 @@ public function getXmlRecent(): array
 			Lang::censorText($row['subject']);
 
 			// Do we want to include any attachments?
-			if (!empty(Config::$modSettings['attachmentEnable']) && !empty(Config::$modSettings['xmlnews_attachments']) && User::$me->allowedTo('view_attachments', $row['id_board']))
-			{
+			if (!empty(Config::$modSettings['attachmentEnable']) && !empty(Config::$modSettings['xmlnews_attachments']) && User::$me->allowedTo('view_attachments', $row['id_board'])) {
 				$loaded_attachments = Attachment::loadByMsg($row['id_msg'], Attachment::APPROVED_TRUE);
 
 				// Sort the attachments by size to make things easier below
-				if (!empty($loaded_attachments))
-				{
+				if (!empty($loaded_attachments)) {
 					uasort(
 						$loaded_attachments,
-						function($a, $b)
-						{
-							if ($a->size == $b->size)
+						function ($a, $b) {
+							if ($a->size == $b->size) {
 								return 0;
+							}
 
 							return ($a->size < $b->size) ? -1 : 1;
-						}
+						},
 					);
-				}
-				else
-				{
+				} else {
 					$loaded_attachments = null;
 				}
-			}
-			else
-			{
+			} else {
 				$loaded_attachments = null;
 			}
 
@@ -1303,355 +1255,340 @@ function($a, $b)
 			$guid = 'tag:' . $this->host . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
 
 			// Doesn't work as well as news, but it kinda does..
-			if ($this->format == 'rss' || $this->format == 'rss2')
-			{
+			if ($this->format == 'rss' || $this->format == 'rss2') {
 				// Only one attachment allowed in RSS.
-				if ($loaded_attachments !== null)
-				{
+				if ($loaded_attachments !== null) {
 					$attachment = array_pop($loaded_attachments);
-					$enclosure = array(
+					$enclosure = [
 						'url' => self::fixPossibleUrl(Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id),
 						'length' => $attachment->size,
 						'type' => $attachment->mime_type,
-					);
-				}
-				else
-				{
+					];
+				} else {
 					$enclosure = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'item',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
 							'content' => (User::$me->allowedTo('moderate_forum') || (!empty($row['id_member']) && $row['id_member'] == User::$me->id)) ? $row['poster_email'] : null,
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'category',
 							'content' => $row['bname'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'comments',
 							'content' => Config::$scripturl . '?action=post;topic=' . $row['id_topic'] . '.0',
-						),
-						array(
+						],
+						[
 							'tag' => 'pubDate',
-							'content' => gmdate('D, d M Y H:i:s \G\M\T', $row['poster_time']),
-						),
-						array(
+							'content' => gmdate('D, d M Y H:i:s \\G\\M\\T', $row['poster_time']),
+						],
+						[
 							'tag' => 'guid',
 							'content' => $guid,
-							'attributes' => array(
+							'attributes' => [
 								'isPermaLink' => 'false',
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'enclosure',
 							'attributes' => $enclosure,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'rdf')
-			{
-				$data[] = array(
+						],
+					],
+				];
+			} elseif ($this->format == 'rdf') {
+				$data[] = [
 					'tag' => 'item',
-					'attributes' => array('rdf:about' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg']),
-					'content' => array(
-						array(
+					'attributes' => ['rdf:about' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg']],
+					'content' => [
+						[
 							'tag' => 'dc:format',
 							'content' => 'text/html',
-						),
-						array(
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'atom')
-			{
+						],
+					],
+				];
+			} elseif ($this->format == 'atom') {
 				// Only one attachment allowed
-				if (!empty($loaded_attachments))
-				{
+				if (!empty($loaded_attachments)) {
 					$attachment = array_pop($loaded_attachments);
-					$enclosure = array(
+					$enclosure = [
 						'rel' => 'enclosure',
 						'href' => self::fixPossibleUrl(Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id),
 						'length' => $attachment->size,
 						'type' => $attachment->mime_type,
-					);
-				}
-				else
-				{
+					];
+				} else {
 					$enclosure = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'entry',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array(
+							'attributes' => [
 								'rel' => 'alternate',
 								'type' => 'text/html',
 								'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'summary',
-							'attributes' => array('type' => 'html'),
+							'attributes' => ['type' => 'html'],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'category',
-							'attributes' => array('term' => $row['bname']),
+							'attributes' => ['term' => $row['bname']],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
-							'content' => array(
-								array(
+							'content' => [
+								[
 									'tag' => 'name',
 									'content' => $row['poster_name'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'email',
 									'content' => (User::$me->allowedTo('moderate_forum') || (!empty($row['id_member']) && $row['id_member'] == User::$me->id)) ? $row['poster_email'] : null,
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'uri',
 									'content' => !empty($row['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : null,
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'published',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['poster_time']),
-						),
-						array(
+						],
+						[
 							'tag' => 'updated',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', empty($row['modified_time']) ? $row['poster_time'] : $row['modified_time']),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $guid,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'attributes' => $enclosure,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 			// A lot of information here.  Should be enough to please the rss-ers.
-			else
-			{
+			else {
 				Lang::load('Post');
 
-				$attachments = array();
-				if (!empty($loaded_attachments))
-				{
-					foreach ($loaded_attachments as $attachment)
-					{
-						$attachments[] = array(
+				$attachments = [];
+
+				if (!empty($loaded_attachments)) {
+					foreach ($loaded_attachments as $attachment) {
+						$attachments[] = [
 							'tag' => 'attachment',
-							'attributes' => array('label' => Lang::$txt['attachment']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['attachment']],
+							'content' => [
+								[
 									'tag' => 'id',
 									'content' => $attachment->id,
-								),
-								array(
+								],
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
-									'content' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $attachment->name),
-								),
-								array(
+									'attributes' => ['label' => Lang::$txt['name']],
+									'content' => preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\1;', $attachment->name),
+								],
+								[
 									'tag' => 'downloads',
-									'attributes' => array('label' => Lang::$txt['downloads']),
+									'attributes' => ['label' => Lang::$txt['downloads']],
 									'content' => $attachment->downloads,
-								),
-								array(
+								],
+								[
 									'tag' => 'size',
-									'attributes' => array('label' => Lang::$txt['filesize']),
+									'attributes' => ['label' => Lang::$txt['filesize']],
 									'content' => ($attachment->size < 1024000) ? round($attachment->size / 1024, 2) . ' ' . Lang::$txt['kilobyte'] : round($attachment->size / 1024 / 1024, 2) . ' ' . Lang::$txt['megabyte'],
-								),
-								array(
+								],
+								[
 									'tag' => 'byte_size',
-									'attributes' => array('label' => Lang::$txt['filesize']),
+									'attributes' => ['label' => Lang::$txt['filesize']],
 									'content' => $attachment->size,
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id,
-								),
-							)
-						);
+								],
+							],
+						];
 					}
-				}
-				else
-				{
+				} else {
 					$attachments = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'recent-post', // Hyphen rather than underscore for backward compatibility reasons
-					'attributes' => array('label' => Lang::$txt['post']),
-					'content' => array(
-						array(
+					'attributes' => ['label' => Lang::$txt['post']],
+					'content' => [
+						[
 							'tag' => 'time',
-							'attributes' => array('label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['poster_time'])),
+							'attributes' => ['label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['poster_time'])],
 							'content' => Utils::htmlspecialchars(strip_tags(Time::create('@' . $row['poster_time'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false))),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'subject',
-							'attributes' => array('label' => Lang::$txt['subject']),
+							'attributes' => ['label' => Lang::$txt['subject']],
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'body',
-							'attributes' => array('label' => Lang::$txt['message']),
+							'attributes' => ['label' => Lang::$txt['message']],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'starter',
-							'attributes' => array('label' => Lang::$txt['topic_started']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['topic_started']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $row['first_poster_name'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_first_member'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => !empty($row['id_first_member']) ? array('label' => Lang::$txt['url']) : null,
+									'attributes' => !empty($row['id_first_member']) ? ['label' => Lang::$txt['url']] : null,
 									'content' => !empty($row['id_first_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_first_member'] : '',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'poster',
-							'attributes' => array('label' => Lang::$txt['author']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['author']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $row['poster_name'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_member'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => !empty($row['id_member']) ? array('label' => Lang::$txt['url']) : null,
+									'attributes' => !empty($row['id_member']) ? ['label' => Lang::$txt['url']] : null,
 									'content' => !empty($row['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : '',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'topic',
-							'attributes' => array('label' => Lang::$txt['topic']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['topic']],
+							'content' => [
+								[
 									'tag' => 'subject',
-									'attributes' => array('label' => Lang::$txt['subject']),
+									'attributes' => ['label' => Lang::$txt['subject']],
 									'content' => $row['first_subject'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_topic'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.new#new',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'board',
-							'attributes' => array('label' => Lang::$txt['board']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['board']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $row['bname'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_board'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array('label' => Lang::$txt['url']),
+							'attributes' => ['label' => Lang::$txt['url']],
 							'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'attachments',
-							'attributes' => array('label' => Lang::$txt['attachments']),
+							'attributes' => ['label' => Lang::$txt['attachments']],
 							'content' => $attachments,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 		}
 		Db::$db->free_result($request);
@@ -1668,298 +1605,287 @@ function($a, $b)
 	public function getXmlProfile(): array
 	{
 		// You must input a valid user, and you must be allowed to view that user's profile.
-		if (empty($this->member) || ($this->member != User::$me->id && !User::$me->allowedTo('profile_view')) || (User::load($this->member) === array()))
-		{
-			return array();
+		if (empty($this->member) || ($this->member != User::$me->id && !User::$me->allowedTo('profile_view')) || (User::load($this->member) === [])) {
+			return [];
 		}
 
 		// Load the member's contextual information! (Including custom fields for our proprietary XML type)
 		$profile = User::$loaded[$this->member]->format($this->format == 'smf');
 
 		// If any control characters slipped in somehow, kill the evil things
-		$profile = filter_var($profile, FILTER_CALLBACK, array('options' => '\\SMF\\Utils::cleanXml'));
+		$profile = filter_var($profile, FILTER_CALLBACK, ['options' => '\\SMF\\Utils::cleanXml']);
 
 		// Create a GUID for this member using the tag URI scheme
 		$guid = 'tag:' . $this->host . ',' . gmdate('Y-m-d', $profile['registered_timestamp']) . ':member=' . $profile['id'];
 
-		if ($this->format == 'rss' || $this->format == 'rss2')
-		{
-			$data[] = array(
+		if ($this->format == 'rss' || $this->format == 'rss2') {
+			$data[] = [
 				'tag' => 'item',
-				'content' => array(
-					array(
+				'content' => [
+					[
 						'tag' => 'title',
 						'content' => $profile['name'],
 						'cdata' => true,
-					),
-					array(
+					],
+					[
 						'tag' => 'link',
 						'content' => Config::$scripturl . '?action=profile;u=' . $profile['id'],
-					),
-					array(
+					],
+					[
 						'tag' => 'description',
-						'content' => isset($profile['group']) ? $profile['group'] : $profile['post_group'],
+						'content' => $profile['group'] ?? $profile['post_group'],
 						'cdata' => true,
-					),
-					array(
+					],
+					[
 						'tag' => 'comments',
 						'content' => Config::$scripturl . '?action=pm;sa=send;u=' . $profile['id'],
-					),
-					array(
+					],
+					[
 						'tag' => 'pubDate',
-						'content' => gmdate('D, d M Y H:i:s \G\M\T', $profile['registered_timestamp']),
-					),
-					array(
+						'content' => gmdate('D, d M Y H:i:s \\G\\M\\T', $profile['registered_timestamp']),
+					],
+					[
 						'tag' => 'guid',
 						'content' => $guid,
-						'attributes' => array(
+						'attributes' => [
 							'isPermaLink' => 'false',
-						),
-					),
-				)
-			);
-		}
-		elseif ($this->format == 'rdf')
-		{
-			$data[] = array(
+						],
+					],
+				],
+			];
+		} elseif ($this->format == 'rdf') {
+			$data[] = [
 				'tag' => 'item',
-				'attributes' => array('rdf:about' => Config::$scripturl . '?action=profile;u=' . $profile['id']),
-				'content' => array(
-					array(
+				'attributes' => ['rdf:about' => Config::$scripturl . '?action=profile;u=' . $profile['id']],
+				'content' => [
+					[
 						'tag' => 'dc:format',
 						'content' => 'text/html',
-					),
-					array(
+					],
+					[
 						'tag' => 'title',
 						'content' => $profile['name'],
 						'cdata' => true,
-					),
-					array(
+					],
+					[
 						'tag' => 'link',
 						'content' => Config::$scripturl . '?action=profile;u=' . $profile['id'],
-					),
-					array(
+					],
+					[
 						'tag' => 'description',
-						'content' => isset($profile['group']) ? $profile['group'] : $profile['post_group'],
+						'content' => $profile['group'] ?? $profile['post_group'],
 						'cdata' => true,
-					),
-				)
-			);
-		}
-		elseif ($this->format == 'atom')
-		{
-			$data[] = array(
+					],
+				],
+			];
+		} elseif ($this->format == 'atom') {
+			$data[] = [
 				'tag' => 'entry',
-				'content' => array(
-					array(
+				'content' => [
+					[
 						'tag' => 'title',
 						'content' => $profile['name'],
 						'cdata' => true,
-					),
-					array(
+					],
+					[
 						'tag' => 'link',
-						'attributes' => array(
+						'attributes' => [
 							'rel' => 'alternate',
 							'type' => 'text/html',
 							'href' => Config::$scripturl . '?action=profile;u=' . $profile['id'],
-						),
-					),
-					array(
+						],
+					],
+					[
 						'tag' => 'summary',
-						'attributes' => array('type' => 'html'),
-						'content' => isset($profile['group']) ? $profile['group'] : $profile['post_group'],
+						'attributes' => ['type' => 'html'],
+						'content' => $profile['group'] ?? $profile['post_group'],
 						'cdata' => true,
-					),
-					array(
+					],
+					[
 						'tag' => 'author',
-						'content' => array(
-							array(
+						'content' => [
+							[
 								'tag' => 'name',
 								'content' => $profile['name'],
 								'cdata' => true,
-							),
-							array(
+							],
+							[
 								'tag' => 'email',
 								'content' => $profile['show_email'] ? $profile['email'] : null,
 								'cdata' => true,
-							),
-							array(
+							],
+							[
 								'tag' => 'uri',
 								'content' => !empty($profile['website']['url']) ? $profile['website']['url'] : Config::$scripturl . '?action=profile;u=' . $profile['id_member'],
 								'cdata' => !empty($profile['website']['url']),
-							),
-						),
-					),
-					array(
+							],
+						],
+					],
+					[
 						'tag' => 'published',
 						'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $profile['registered_timestamp']),
-					),
-					array(
+					],
+					[
 						'tag' => 'updated',
 						'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $profile['last_login_timestamp']),
-					),
-					array(
+					],
+					[
 						'tag' => 'id',
 						'content' => $guid,
-					),
-				)
-			);
-		}
-		else
-		{
+					],
+				],
+			];
+		} else {
 			Lang::load('Profile');
 
-			$data = array(
-				array(
+			$data = [
+				[
 					'tag' => 'username',
-					'attributes' => User::$me->is_admin || User::$me->id == $profile['id'] ? array('label' => Lang::$txt['username']) : null,
+					'attributes' => User::$me->is_admin || User::$me->id == $profile['id'] ? ['label' => Lang::$txt['username']] : null,
 					'content' => User::$me->is_admin || User::$me->id == $profile['id'] ? $profile['username'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'name',
-					'attributes' => array('label' => Lang::$txt['name']),
+					'attributes' => ['label' => Lang::$txt['name']],
 					'content' => $profile['name'],
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'link',
-					'attributes' => array('label' => Lang::$txt['url']),
+					'attributes' => ['label' => Lang::$txt['url']],
 					'content' => Config::$scripturl . '?action=profile;u=' . $profile['id'],
-				),
-				array(
+				],
+				[
 					'tag' => 'posts',
-					'attributes' => array('label' => Lang::$txt['member_postcount']),
+					'attributes' => ['label' => Lang::$txt['member_postcount']],
 					'content' => $profile['posts'],
-				),
-				array(
+				],
+				[
 					'tag' => 'post-group',
-					'attributes' => array('label' => Lang::$txt['post_based_membergroup']),
+					'attributes' => ['label' => Lang::$txt['post_based_membergroup']],
 					'content' => $profile['post_group'],
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'language',
-					'attributes' => array('label' => Lang::$txt['preferred_language']),
+					'attributes' => ['label' => Lang::$txt['preferred_language']],
 					'content' => $profile['language'],
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'last-login',
-					'attributes' => array('label' => Lang::$txt['lastLoggedIn'], 'UTC' => Time::gmstrftime('%F %T', $profile['last_login_timestamp'])),
+					'attributes' => ['label' => Lang::$txt['lastLoggedIn'], 'UTC' => Time::gmstrftime('%F %T', $profile['last_login_timestamp'])],
 					'content' => Time::create('@' . $row['last_login_timestamp'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false),
-				),
-				array(
+				],
+				[
 					'tag' => 'registered',
-					'attributes' => array('label' => Lang::$txt['date_registered'], 'UTC' => Time::gmstrftime('%F %T', $profile['registered_timestamp'])),
+					'attributes' => ['label' => Lang::$txt['date_registered'], 'UTC' => Time::gmstrftime('%F %T', $profile['registered_timestamp'])],
 					'content' => Time::create('@' . $row['registered_timestamp'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false),
-				),
-				array(
+				],
+				[
 					'tag' => 'avatar',
-					'attributes' => !empty($profile['avatar']['url']) ? array('label' => Lang::$txt['personal_picture']) : null,
+					'attributes' => !empty($profile['avatar']['url']) ? ['label' => Lang::$txt['personal_picture']] : null,
 					'content' => !empty($profile['avatar']['url']) ? $profile['avatar']['url'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'signature',
-					'attributes' => !empty($profile['signature']) ? array('label' => Lang::$txt['signature']) : null,
+					'attributes' => !empty($profile['signature']) ? ['label' => Lang::$txt['signature']] : null,
 					'content' => !empty($profile['signature']) ? $profile['signature'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'blurb',
-					'attributes' => !empty($profile['blurb']) ? array('label' => Lang::$txt['personal_text']) : null,
+					'attributes' => !empty($profile['blurb']) ? ['label' => Lang::$txt['personal_text']] : null,
 					'content' => !empty($profile['blurb']) ? $profile['blurb'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'title',
-					'attributes' => !empty($profile['title']) ? array('label' => Lang::$txt['title']) : null,
+					'attributes' => !empty($profile['title']) ? ['label' => Lang::$txt['title']] : null,
 					'content' => !empty($profile['title']) ? $profile['title'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'position',
-					'attributes' => !empty($profile['group']) ? array('label' => Lang::$txt['position']) : null,
+					'attributes' => !empty($profile['group']) ? ['label' => Lang::$txt['position']] : null,
 					'content' => !empty($profile['group']) ? $profile['group'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'email',
-					'attributes' => !empty($profile['show_email']) || User::$me->is_admin || User::$me->id == $profile['id'] ? array('label' => Lang::$txt['user_email_address']) : null,
+					'attributes' => !empty($profile['show_email']) || User::$me->is_admin || User::$me->id == $profile['id'] ? ['label' => Lang::$txt['user_email_address']] : null,
 					'content' => !empty($profile['show_email']) || User::$me->is_admin || User::$me->id == $profile['id'] ? $profile['email'] : null,
 					'cdata' => true,
-				),
-				array(
+				],
+				[
 					'tag' => 'website',
-					'attributes' => empty($profile['website']['url']) ? null : array('label' => Lang::$txt['website']),
-					'content' => empty($profile['website']['url']) ? null : array(
-						array(
+					'attributes' => empty($profile['website']['url']) ? null : ['label' => Lang::$txt['website']],
+					'content' => empty($profile['website']['url']) ? null : [
+						[
 							'tag' => 'title',
-							'attributes' => !empty($profile['website']['title']) ? array('label' => Lang::$txt['website_title']) : null,
+							'attributes' => !empty($profile['website']['title']) ? ['label' => Lang::$txt['website_title']] : null,
 							'content' => !empty($profile['website']['title']) ? $profile['website']['title'] : null,
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array('label' => Lang::$txt['website_url']),
+							'attributes' => ['label' => Lang::$txt['website_url']],
 							'content' => $profile['website']['url'],
 							'cdata' => true,
-						),
-					),
-				),
-				array(
+						],
+					],
+				],
+				[
 					'tag' => 'online',
-					'attributes' => !empty($profile['online']['is_online']) ? array('label' => Lang::$txt['online']) : null,
+					'attributes' => !empty($profile['online']['is_online']) ? ['label' => Lang::$txt['online']] : null,
 					'content' => !empty($profile['online']['is_online']) ? 'true' : null,
-				),
-				array(
+				],
+				[
 					'tag' => 'ip_addresses',
-					'attributes' => array('label' => Lang::$txt['ip_address']),
-					'content' => User::$me->allowedTo('moderate_forum') || User::$me->id == $profile['id'] ? array(
-						array(
+					'attributes' => ['label' => Lang::$txt['ip_address']],
+					'content' => User::$me->allowedTo('moderate_forum') || User::$me->id == $profile['id'] ? [
+						[
 							'tag' => 'ip',
-							'attributes' => array('label' => Lang::$txt['most_recent_ip']),
+							'attributes' => ['label' => Lang::$txt['most_recent_ip']],
 							'content' => $profile['ip'],
-						),
-						array(
+						],
+						[
 							'tag' => 'ip2',
 							'content' => $profile['ip'] != $profile['ip2'] ? $profile['ip2'] : null,
-						),
-					) : null,
-				),
-			);
+						],
+					] : null,
+				],
+			];
 
-			if (!empty($profile['birth_date']) && substr($profile['birth_date'], 0, 4) != '0000' && substr($profile['birth_date'], 0, 4) != '1004')
-			{
+			if (!empty($profile['birth_date']) && substr($profile['birth_date'], 0, 4) != '0000' && substr($profile['birth_date'], 0, 4) != '1004') {
 				list($birth_year, $birth_month, $birth_day) = sscanf($profile['birth_date'], '%d-%d-%d');
 
 				$datearray = getdate(time());
 
 				$age = $datearray['year'] - $birth_year - (($datearray['mon'] > $birth_month || ($datearray['mon'] == $birth_month && $datearray['mday'] >= $birth_day)) ? 0 : 1);
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'age',
-					'attributes' => array('label' => Lang::$txt['age']),
+					'attributes' => ['label' => Lang::$txt['age']],
 					'content' => $age,
-				);
-				$data[] = array(
+				];
+				$data[] = [
 					'tag' => 'birthdate',
-					'attributes' => array('label' => Lang::$txt['dob']),
+					'attributes' => ['label' => Lang::$txt['dob']],
 					'content' => $profile['birth_date'],
-				);
+				];
 			}
 
-			if (!empty($profile['custom_fields']))
-			{
-				foreach ($profile['custom_fields'] as $custom_field)
-				{
-					$data[] = array(
+			if (!empty($profile['custom_fields'])) {
+				foreach ($profile['custom_fields'] as $custom_field) {
+					$data[] = [
 						'tag' => $custom_field['col_name'],
-						'attributes' => array('label' => $custom_field['title']),
+						'attributes' => ['label' => $custom_field['title']],
 						'content' => $custom_field['simple'],
 						'cdata' => true,
-					);
+					];
 				}
 			}
 		}
@@ -1978,57 +1904,56 @@ public function getXmlProfile(): array
 	 */
 	public function getXmlPosts(): array
 	{
-		if (empty($this->member) || ($this->member != User::$me->id && !User::$me->allowedTo('profile_view')))
-		{
-			return array();
+		if (empty($this->member) || ($this->member != User::$me->id && !User::$me->allowedTo('profile_view'))) {
+			return [];
 		}
 
-		$data = array();
+		$data = [];
 
 		$show_all = !empty(User::$me->is_admin) || defined('EXPORTING');
 
-		$query_this_message_board = str_replace(array('{query_see_board}', 'b.'), array('{query_see_message_board}', 'm.'), $this->query_this_board);
+		$query_this_message_board = str_replace(['{query_see_board}', 'b.'], ['{query_see_message_board}', 'm.'], $this->query_this_board);
 
 		/* MySQL can choke if we use joins in the main query when the user has
 		 * massively long posts. To avoid that, we get the names of the boards
 		 * and the user's displayed name in separate queries.
 		 */
-		$boardnames = array();
-		$request = Db::$db->query('', '
-			SELECT id_board, name
+		$boardnames = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, name
 			FROM {db_prefix}boards',
-			array()
+			[],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$boardnames[$row['id_board']] = $row['name'];
 		}
 		Db::$db->free_result($request);
 
-		if ($this->member == User::$me->id)
-		{
+		if ($this->member == User::$me->id) {
 			$poster_name = User::$me->name;
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT COALESCE(real_name, member_name) AS poster_name
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT COALESCE(real_name, member_name) AS poster_name
 				FROM {db_prefix}members
 				WHERE id_member = {int:uid}',
-				array(
+				[
 					'uid' => $this->member,
-				)
+				],
 			);
 			list($poster_name) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.id_msg, m.id_topic, m.id_board, m.id_member, m.poster_email, m.poster_ip,
 				m.poster_time, m.subject, m.modified_time, m.modified_name, m.modified_reason, m.body,
 				m.likes, m.approved, m.smileys_enabled
-			FROM {db_prefix}messages AS m' . (Config::$modSettings['postmod_active'] && !$show_all ?'
+			FROM {db_prefix}messages AS m' . (Config::$modSettings['postmod_active'] && !$show_all ? '
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
 			WHERE m.id_member = {int:uid}
 				AND m.id_msg > {int:start_after}
@@ -2037,424 +1962,403 @@ public function getXmlPosts(): array
 				AND t.approved = {int:is_approved}' : '') . '
 			ORDER BY m.id_msg {raw:ascdesc}
 			LIMIT {int:limit}',
-			array(
+			[
 				'limit' => $this->limit,
 				'start_after' => $this->start_after,
 				'uid' => $this->member,
 				'is_approved' => 1,
 				'ascdesc' => !empty($this->ascending) ? 'ASC' : 'DESC',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['last'] = $row['id_msg'];
 
 			// We want a readable version of the IP address
 			$row['poster_ip'] = new IP($row['poster_ip']);
 
 			// If any control characters slipped in somehow, kill the evil things
-			$row = filter_var($row, FILTER_CALLBACK, array('options' => '\\SMF\\Utils::cleanXml'));
+			$row = filter_var($row, FILTER_CALLBACK, ['options' => '\\SMF\\Utils::cleanXml']);
 
 			// If using our own format, we want both the raw and the parsed content.
 			$row[$this->format === 'smf' ? 'body_html' : 'body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
 			// Do we want to include any attachments?
-			if (!empty(Config::$modSettings['attachmentEnable']) && !empty(Config::$modSettings['xmlnews_attachments']))
-			{
+			if (!empty(Config::$modSettings['attachmentEnable']) && !empty(Config::$modSettings['xmlnews_attachments'])) {
 				$loaded_attachments = Attachment::loadByMsg($row['id_msg'], Attachment::APPROVED_TRUE);
 
 				// Sort the attachments by size to make things easier below
-				if (!empty($loaded_attachments))
-				{
+				if (!empty($loaded_attachments)) {
 					uasort(
 						$loaded_attachments,
-						function($a, $b)
-						{
-							if ($a->size == $b->size)
-						        return 0;
+						function ($a, $b) {
+							if ($a->size == $b->size) {
+								return 0;
+							}
 
-						    return ($a->size < $b->size) ? -1 : 1;
-						}
+							return ($a->size < $b->size) ? -1 : 1;
+						},
 					);
-				}
-				else
-				{
+				} else {
 					$loaded_attachments = null;
 				}
-			}
-			else
-			{
+			} else {
 				$loaded_attachments = null;
 			}
 
 			// Create a GUID for this post using the tag URI scheme
 			$guid = 'tag:' . $this->host . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
 
-			if ($this->format == 'rss' || $this->format == 'rss2')
-			{
+			if ($this->format == 'rss' || $this->format == 'rss2') {
 				// Only one attachment allowed in RSS.
-				if ($loaded_attachments !== null)
-				{
+				if ($loaded_attachments !== null) {
 					$attachment = array_pop($loaded_attachments);
-					$enclosure = array(
+					$enclosure = [
 						'url' => self::fixPossibleUrl(Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id),
 						'length' => $attachment->size,
 						'type' => $attachment->mime_type,
-					);
-				}
-				else
-				{
+					];
+				} else {
 					$enclosure = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'item',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?msg=' . $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
 							'content' => (User::$me->allowedTo('moderate_forum') || ($row['id_member'] == User::$me->id)) ? $row['poster_email'] : null,
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'category',
 							'content' => $boardnames[$row['id_board']],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'comments',
 							'content' => Config::$scripturl . '?action=post;topic=' . $row['id_topic'] . '.0',
-						),
-						array(
+						],
+						[
 							'tag' => 'pubDate',
-							'content' => gmdate('D, d M Y H:i:s \G\M\T', $row['poster_time']),
-						),
-						array(
+							'content' => gmdate('D, d M Y H:i:s \\G\\M\\T', $row['poster_time']),
+						],
+						[
 							'tag' => 'guid',
 							'content' => $guid,
-							'attributes' => array(
+							'attributes' => [
 								'isPermaLink' => 'false',
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'enclosure',
 							'attributes' => $enclosure,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'rdf')
-			{
-				$data[] = array(
+						],
+					],
+				];
+			} elseif ($this->format == 'rdf') {
+				$data[] = [
 					'tag' => 'item',
-					'attributes' => array('rdf:about' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg']),
-					'content' => array(
-						array(
+					'attributes' => ['rdf:about' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg']],
+					'content' => [
+						[
 							'tag' => 'dc:format',
 							'content' => 'text/html',
-						),
-						array(
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?msg=' . $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'atom')
-			{
+						],
+					],
+				];
+			} elseif ($this->format == 'atom') {
 				// Only one attachment allowed
-				if (!empty($loaded_attachments))
-				{
+				if (!empty($loaded_attachments)) {
 					$attachment = array_pop($loaded_attachments);
-					$enclosure = array(
+					$enclosure = [
 						'rel' => 'enclosure',
 						'href' => self::fixPossibleUrl(Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id),
 						'length' => $attachment->size,
 						'type' => $attachment->mime_type,
-					);
-				}
-				else
-				{
+					];
+				} else {
 					$enclosure = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'entry',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array(
+							'attributes' => [
 								'rel' => 'alternate',
 								'type' => 'text/html',
 								'href' => Config::$scripturl . '?msg=' . $row['id_msg'],
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'summary',
-							'attributes' => array('type' => 'html'),
+							'attributes' => ['type' => 'html'],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
-							'content' => array(
-								array(
+							'content' => [
+								[
 									'tag' => 'name',
 									'content' => $poster_name,
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'email',
 									'content' => (User::$me->allowedTo('moderate_forum') || ($row['id_member'] == User::$me->id)) ? $row['poster_email'] : null,
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'uri',
 									'content' => !empty($row['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : null,
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'published',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['poster_time']),
-						),
-						array(
+						],
+						[
 							'tag' => 'updated',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', empty($row['modified_time']) ? $row['poster_time'] : $row['modified_time']),
-						),
-						array(
+						],
+						[
 							'tag' => 'id',
 							'content' => $guid,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'attributes' => $enclosure,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 			// A lot of information here.  Should be enough to please the rss-ers.
-			else
-			{
+			else {
 				Lang::load('Post');
 
-				$attachments = array();
-				if (!empty($loaded_attachments))
-				{
-					foreach ($loaded_attachments as $attachment)
-					{
-						$attachments[] = array(
+				$attachments = [];
+
+				if (!empty($loaded_attachments)) {
+					foreach ($loaded_attachments as $attachment) {
+						$attachments[] = [
 							'tag' => 'attachment',
-							'attributes' => array('label' => Lang::$txt['attachment']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['attachment']],
+							'content' => [
+								[
 									'tag' => 'id',
 									'content' => $attachment->id,
-								),
-								array(
+								],
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
-									'content' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', $attachment->name),
-								),
-								array(
+									'attributes' => ['label' => Lang::$txt['name']],
+									'content' => preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\1;', $attachment->name),
+								],
+								[
 									'tag' => 'downloads',
-									'attributes' => array('label' => Lang::$txt['downloads']),
+									'attributes' => ['label' => Lang::$txt['downloads']],
 									'content' => $attachment->downloads,
-								),
-								array(
+								],
+								[
 									'tag' => 'size',
-									'attributes' => array('label' => Lang::$txt['filesize']),
+									'attributes' => ['label' => Lang::$txt['filesize']],
 									'content' => ($attachment->size < 1024000) ? round($attachment->size / 1024, 2) . ' ' . Lang::$txt['kilobyte'] : round($attachment->size / 1024 / 1024, 2) . ' ' . Lang::$txt['megabyte'],
-								),
-								array(
+								],
+								[
 									'tag' => 'byte_size',
-									'attributes' => array('label' => Lang::$txt['filesize']),
+									'attributes' => ['label' => Lang::$txt['filesize']],
 									'content' => $attachment->size,
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?action=dlattach;topic=' . $attachment->topic . '.0;attach=' . $attachment->id,
-								),
-								array(
+								],
+								[
 									'tag' => 'approval_status',
-									'attributes' => $show_all ? array('label' => Lang::$txt['approval_status']) : null,
+									'attributes' => $show_all ? ['label' => Lang::$txt['approval_status']] : null,
 									'content' => $show_all ? $attachment->approved : null,
-								),
-							)
-						);
+								],
+							],
+						];
 					}
-				}
-				else
-				{
+				} else {
 					$attachments = null;
 				}
 
-				$data[] = array(
+				$data[] = [
 					'tag' => 'member_post',
-					'attributes' => array('label' => Lang::$txt['post']),
-					'content' => array(
-						array(
+					'attributes' => ['label' => Lang::$txt['post']],
+					'content' => [
+						[
 							'tag' => 'id',
 							'content' => $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'subject',
-							'attributes' => array('label' => Lang::$txt['subject']),
+							'attributes' => ['label' => Lang::$txt['subject']],
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'body',
-							'attributes' => array('label' => Lang::$txt['message']),
+							'attributes' => ['label' => Lang::$txt['message']],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'body_html',
-							'attributes' => array('label' => Lang::$txt['html']),
+							'attributes' => ['label' => Lang::$txt['html']],
 							'content' => $row['body_html'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'poster',
-							'attributes' => array('label' => Lang::$txt['author']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['author']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $poster_name,
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_member'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-								),
-								array(
+								],
+								[
 									'tag' => 'email',
-									'attributes' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? array('label' => Lang::$txt['user_email_address']) : null,
+									'attributes' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? ['label' => Lang::$txt['user_email_address']] : null,
 									'content' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? $row['poster_email'] : null,
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'ip',
-									'attributes' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? array('label' => Lang::$txt['ip']) : null,
+									'attributes' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? ['label' => Lang::$txt['ip']] : null,
 									'content' => (User::$me->allowedTo('moderate_forum') || $row['id_member'] == User::$me->id) ? $row['poster_ip'] : null,
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'topic',
-							'attributes' => array('label' => Lang::$txt['topic']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['topic']],
+							'content' => [
+								[
 									'tag' => 'id',
 									'content' => $row['id_topic'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'board',
-							'attributes' => array('label' => Lang::$txt['board']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['board']],
+							'content' => [
+								[
 									'tag' => 'id',
 									'content' => $row['id_board'],
-								),
-								array(
+								],
+								[
 									'tag' => 'name',
 									'content' => $boardnames[$row['id_board']],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
-								),
-							),
-						),
-						array(
+								],
+							],
+						],
+						[
 							'tag' => 'link',
-							'attributes' => array('label' => Lang::$txt['url']),
+							'attributes' => ['label' => Lang::$txt['url']],
 							'content' => Config::$scripturl . '?msg=' . $row['id_msg'],
-						),
-						array(
+						],
+						[
 							'tag' => 'time',
-							'attributes' => array('label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['poster_time'])),
+							'attributes' => ['label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['poster_time'])],
 							'content' => Utils::htmlspecialchars(strip_tags(Time::create('@' . $row['poster_time'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false))),
-						),
-						array(
+						],
+						[
 							'tag' => 'modified_time',
-							'attributes' => !empty($row['modified_time']) ? array('label' => Lang::$txt['modified_time'], 'UTC' => Time::gmstrftime('%F %T', $row['modified_time'])) : null,
+							'attributes' => !empty($row['modified_time']) ? ['label' => Lang::$txt['modified_time'], 'UTC' => Time::gmstrftime('%F %T', $row['modified_time'])] : null,
 							'content' => !empty($row['modified_time']) ? Utils::htmlspecialchars(strip_tags(Time::create('@' . $row['modified_time'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false))) : null,
-						),
-						array(
+						],
+						[
 							'tag' => 'modified_by',
-							'attributes' => !empty($row['modified_name']) ? array('label' => Lang::$txt['modified_by']) : null,
+							'attributes' => !empty($row['modified_name']) ? ['label' => Lang::$txt['modified_by']] : null,
 							'content' => !empty($row['modified_name']) ? $row['modified_name'] : null,
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'modified_reason',
-							'attributes' => !empty($row['modified_reason']) ? array('label' => Lang::$txt['reason_for_edit']) : null,
+							'attributes' => !empty($row['modified_reason']) ? ['label' => Lang::$txt['reason_for_edit']] : null,
 							'content' => !empty($row['modified_reason']) ? $row['modified_reason'] : null,
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'likes',
-							'attributes' => array('label' => Lang::$txt['likes']),
+							'attributes' => ['label' => Lang::$txt['likes']],
 							'content' => $row['likes'],
-						),
-						array(
+						],
+						[
 							'tag' => 'approval_status',
-							'attributes' => $show_all ? array('label' => Lang::$txt['approval_status']) : null,
+							'attributes' => $show_all ? ['label' => Lang::$txt['approval_status']] : null,
 							'content' => $show_all ? $row['approved'] : null,
-						),
-						array(
+						],
+						[
 							'tag' => 'attachments',
-							'attributes' => array('label' => Lang::$txt['attachments']),
+							'attributes' => ['label' => Lang::$txt['attachments']],
 							'content' => $attachments,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 		}
 		Db::$db->free_result($request);
@@ -2471,10 +2375,11 @@ function($a, $b)
 	public function getXmlPMs(): array
 	{
 		// Personal messages are supposed to be private
-		if (empty($this->member) || ($this->member != User::$me->id))
-			return array();
+		if (empty($this->member) || ($this->member != User::$me->id)) {
+			return [];
+		}
 
-		$data = array();
+		$data = [];
 
 		// Use a private-use Unicode character to separate member names.
 		// This ensures that the separator will not occur in the names themselves.
@@ -2482,10 +2387,11 @@ public function getXmlPMs(): array
 
 		$select_id_members_to = Db::$db->title === POSTGRE_TITLE ? "string_agg(pmr.id_member::text, ',')" : 'GROUP_CONCAT(pmr.id_member)';
 
-		$select_to_names = Db::$db->title === POSTGRE_TITLE ? "string_agg(COALESCE(mem.real_name, mem.member_name), '$separator')" : "GROUP_CONCAT(COALESCE(mem.real_name, mem.member_name) SEPARATOR '$separator')";
+		$select_to_names = Db::$db->title === POSTGRE_TITLE ? "string_agg(COALESCE(mem.real_name, mem.member_name), '{$separator}')" : "GROUP_CONCAT(COALESCE(mem.real_name, mem.member_name) SEPARATOR '{$separator}')";
 
-		$request = Db::$db->query('', '
-			SELECT pm.id_pm, pm.msgtime, pm.subject, pm.body, pm.id_member_from, nis.from_name, nis.id_members_to, nis.to_names
+		$request = Db::$db->query(
+			'',
+			'SELECT pm.id_pm, pm.msgtime, pm.subject, pm.body, pm.id_member_from, nis.from_name, nis.id_members_to, nis.to_names
 			FROM {db_prefix}personal_messages AS pm
 			INNER JOIN
 			(
@@ -2504,20 +2410,20 @@ public function getXmlPMs(): array
 				LIMIT {int:limit}
 			) AS nis ON pm.id_pm = nis.id_pm
 			ORDER BY pm.id_pm {raw:ascdesc}',
-			array(
+			[
 				'limit' => $this->limit,
 				'start_after' => $this->start_after,
 				'uid' => $this->member,
 				'not_deleted' => 0,
 				'ascdesc' => !empty($this->ascending) ? 'ASC' : 'DESC',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$this->start_after = $row['id_pm'];
 
 			// If any control characters slipped in somehow, kill the evil things
-			$row = filter_var($row, FILTER_CALLBACK, array('options' => '\\SMF\\Utils::cleanXml'));
+			$row = filter_var($row, FILTER_CALLBACK, ['options' => '\\SMF\\Utils::cleanXml']);
 
 			// If using our own format, we want both the raw and the parsed content.
 			$row[$this->format === 'smf' ? 'body_html' : 'body'] = BBCodeParser::load()->parse($row['body']);
@@ -2527,218 +2433,208 @@ public function getXmlPMs(): array
 			// Create a GUID for this post using the tag URI scheme
 			$guid = 'tag:' . $this->host . ',' . gmdate('Y-m-d', $row['msgtime']) . ':pm=' . $row['id_pm'];
 
-			if ($this->format == 'rss' || $this->format == 'rss2')
-			{
-				$item = array(
+			if ($this->format == 'rss' || $this->format == 'rss2') {
+				$item = [
 					'tag' => 'item',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'guid',
 							'content' => $guid,
-							'attributes' => array(
+							'attributes' => [
 								'isPermaLink' => 'false',
-							),
-						),
-						array(
+							],
+						],
+						[
 							'tag' => 'pubDate',
-							'content' => gmdate('D, d M Y H:i:s \G\M\T', $row['msgtime']),
-						),
-						array(
+							'content' => gmdate('D, d M Y H:i:s \\G\\M\\T', $row['msgtime']),
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'smf:sender',
 							// This technically violates the RSS spec, but meh...
 							'content' => $row['from_name'],
 							'cdata' => true,
-						),
-					),
-				);
+						],
+					],
+				];
 
-				foreach ($recipients as $recipient_id => $recipient_name)
-				{
-					$item['content'][] = array(
+				foreach ($recipients as $recipient_id => $recipient_name) {
+					$item['content'][] = [
 						'tag' => 'smf:recipient',
 						'content' => $recipient_name,
 						'cdata' => true,
-					);
+					];
 				}
 
 				$data[] = $item;
-			}
-			elseif ($this->format == 'rdf')
-			{
-				$data[] = array(
+			} elseif ($this->format == 'rdf') {
+				$data[] = [
 					'tag' => 'item',
-					'attributes' => array('rdf:about' => Config::$scripturl . '?action=pm#msg' . $row['id_pm']),
-					'content' => array(
-						array(
+					'attributes' => ['rdf:about' => Config::$scripturl . '?action=pm#msg' . $row['id_pm']],
+					'content' => [
+						[
 							'tag' => 'dc:format',
 							'content' => 'text/html',
-						),
-						array(
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'link',
 							'content' => Config::$scripturl . '?action=pm#msg' . $row['id_pm'],
-						),
-						array(
+						],
+						[
 							'tag' => 'description',
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-					),
-				);
-			}
-			elseif ($this->format == 'atom')
-			{
-				$item = array(
+						],
+					],
+				];
+			} elseif ($this->format == 'atom') {
+				$item = [
 					'tag' => 'entry',
-					'content' => array(
-						array(
+					'content' => [
+						[
 							'tag' => 'id',
 							'content' => $guid,
-						),
-						array(
+						],
+						[
 							'tag' => 'updated',
 							'content' => Time::gmstrftime('%Y-%m-%dT%H:%M:%SZ', $row['msgtime']),
-						),
-						array(
+						],
+						[
 							'tag' => 'title',
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'content',
-							'attributes' => array('type' => 'html'),
+							'attributes' => ['type' => 'html'],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'author',
-							'content' => array(
-								array(
+							'content' => [
+								[
 									'tag' => 'name',
 									'content' => $row['from_name'],
 									'cdata' => true,
-								),
-							),
-						),
-					),
-				);
-
-				foreach ($recipients as $recipient_id => $recipient_name)
-				{
-					$item['content'][] = array(
+								],
+							],
+						],
+					],
+				];
+
+				foreach ($recipients as $recipient_id => $recipient_name) {
+					$item['content'][] = [
 						'tag' => 'contributor',
-						'content' => array(
-							array(
+						'content' => [
+							[
 								'tag' => 'smf:role',
 								'content' => 'recipient',
-							),
-							array(
+							],
+							[
 								'tag' => 'name',
 								'content' => $recipient_name,
 								'cdata' => true,
-							),
-						),
-					);
+							],
+						],
+					];
 				}
 
 				$data[] = $item;
-			}
-			else
-			{
+			} else {
 				Lang::load('PersonalMessage');
 
-				$item = array(
+				$item = [
 					'tag' => 'personal_message',
-					'attributes' => array('label' => Lang::$txt['pm']),
-					'content' => array(
-						array(
+					'attributes' => ['label' => Lang::$txt['pm']],
+					'content' => [
+						[
 							'tag' => 'id',
 							'content' => $row['id_pm'],
-						),
-						array(
+						],
+						[
 							'tag' => 'sent_date',
-							'attributes' => array('label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['msgtime'])),
+							'attributes' => ['label' => Lang::$txt['date'], 'UTC' => Time::gmstrftime('%F %T', $row['msgtime'])],
 							'content' => Utils::htmlspecialchars(strip_tags(Time::create('@' . $row['msgtime'], new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false))),
-						),
-						array(
+						],
+						[
 							'tag' => 'subject',
-							'attributes' => array('label' => Lang::$txt['subject']),
+							'attributes' => ['label' => Lang::$txt['subject']],
 							'content' => $row['subject'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'body',
-							'attributes' => array('label' => Lang::$txt['message']),
+							'attributes' => ['label' => Lang::$txt['message']],
 							'content' => $row['body'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'body_html',
-							'attributes' => array('label' => Lang::$txt['html']),
+							'attributes' => ['label' => Lang::$txt['html']],
 							'content' => $row['body_html'],
 							'cdata' => true,
-						),
-						array(
+						],
+						[
 							'tag' => 'sender',
-							'attributes' => array('label' => Lang::$txt['author']),
-							'content' => array(
-								array(
+							'attributes' => ['label' => Lang::$txt['author']],
+							'content' => [
+								[
 									'tag' => 'name',
-									'attributes' => array('label' => Lang::$txt['name']),
+									'attributes' => ['label' => Lang::$txt['name']],
 									'content' => $row['from_name'],
 									'cdata' => true,
-								),
-								array(
+								],
+								[
 									'tag' => 'id',
 									'content' => $row['id_member_from'],
-								),
-								array(
+								],
+								[
 									'tag' => 'link',
-									'attributes' => array('label' => Lang::$txt['url']),
+									'attributes' => ['label' => Lang::$txt['url']],
 									'content' => Config::$scripturl . '?action=profile;u=' . $row['id_member_from'],
-								),
-							),
-						),
-					),
-				);
-
-				foreach ($recipients as $recipient_id => $recipient_name)
-				{
-					$item['content'][] = array(
+								],
+							],
+						],
+					],
+				];
+
+				foreach ($recipients as $recipient_id => $recipient_name) {
+					$item['content'][] = [
 						'tag' => 'recipient',
-						'attributes' => array('label' => Lang::$txt['recipient']),
-						'content' => array(
-							array(
+						'attributes' => ['label' => Lang::$txt['recipient']],
+						'content' => [
+							[
 								'tag' => 'name',
-								'attributes' => array('label' => Lang::$txt['name']),
+								'attributes' => ['label' => Lang::$txt['name']],
 								'content' => $recipient_name,
 								'cdata' => true,
-							),
-							array(
+							],
+							[
 								'tag' => 'id',
 								'content' => $recipient_id,
-							),
-							array(
+							],
+							[
 								'tag' => 'link',
-								'attributes' => array('label' => Lang::$txt['url']),
+								'attributes' => ['label' => Lang::$txt['url']],
 								'content' => Config::$scripturl . '?action=profile;u=' . $recipient_id,
-							),
-						),
-					);
+							],
+						],
+					];
 				}
 
 				$data[] = $item;
@@ -2760,8 +2656,9 @@ public function getXmlPMs(): array
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -2799,25 +2696,24 @@ public static function build(string $format, array $data, array $metadata, strin
 		$namespaces['smf']['smf'] = sprintf($namespaces['smf']['smf'], $subaction);
 
 		// These sub-actions need the SMF namespace in other feed formats.
-		if (in_array($subaction, array('profile', 'posts', 'personal_messages')))
-		{
+		if (in_array($subaction, ['profile', 'posts', 'personal_messages'])) {
 			$namespaces['rss']['smf'] = $namespaces['smf']['smf'];
 			$namespaces['rss2']['smf'] = $namespaces['smf']['smf'];
 			$namespaces['atom']['smf'] = $namespaces['smf']['smf'];
 		}
 
 		// Allow mods to add extra feed-level tags to the feed/channel
-		$extraFeedTags = array(
-			'rss' => array(),
-			'rss2' => array(),
-			'atom' => array(),
-			'rdf' => array(),
-			'smf' => array(),
-		);
+		$extraFeedTags = [
+			'rss' => [],
+			'rss2' => [],
+			'atom' => [],
+			'rdf' => [],
+			'smf' => [],
+		];
 
 		// Allow mods to specify any keys that need special handling
-		$forceCdataKeys = array();
-		$nsKeys = array();
+		$forceCdataKeys = [];
+		$nsKeys = [];
 
 		// Maybe someone needs to insert a DOCTYPE declaration?
 		$doctype = '';
@@ -2827,44 +2723,45 @@ public static function build(string $format, array $data, array $metadata, strin
 
 		// If mods want to do something with this feed, let them do that now.
 		// Provide the feed's data, metadata, namespaces, extra feed-level tags, keys that need special handling, the feed format, and the requested subaction.
-		IntegrationHook::call('integrate_xml_data', array(&$data, &$metadata, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $format, $subaction, &$doctype));
+		IntegrationHook::call('integrate_xml_data', [&$data, &$metadata, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $format, $subaction, &$doctype]);
 
 		// These can't be empty.
-		foreach (array('title', 'desc', 'source', 'self') as $mkey)
+		foreach (['title', 'desc', 'source', 'self'] as $mkey) {
 			$metadata[$mkey] = !empty($metadata[$mkey]) ? $metadata[$mkey] : $orig_metadata[$mkey];
+		}
 
 		// Sanitize feed metadata values.
-		foreach ($metadata as $mkey => $mvalue)
+		foreach ($metadata as $mkey => $mvalue) {
 			$metadata[$mkey] = self::cdataParse(self::fixPossibleUrl($mvalue));
+		}
 
 		$ns_string = '';
-		if (!empty($namespaces[$format]))
-		{
-			foreach ($namespaces[$format] as $nsprefix => $nsurl)
-			{
+
+		if (!empty($namespaces[$format])) {
+			foreach ($namespaces[$format] as $nsprefix => $nsurl) {
 				$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
 			}
 		}
 
-		$i = in_array($format, array('atom', 'smf')) ? 1 : 2;
+		$i = in_array($format, ['atom', 'smf']) ? 1 : 2;
 
 		$extraFeedTags_string = '';
-		if (!empty($extraFeedTags[$format]))
-		{
+
+		if (!empty($extraFeedTags[$format])) {
 			$indent = str_repeat("\t", $i);
 
-			foreach ($extraFeedTags[$format] as $extraTag)
+			foreach ($extraFeedTags[$format] as $extraTag) {
 				$extraFeedTags_string .= "\n" . $indent . $extraTag;
+			}
 		}
 
-		Utils::$context['feed'] = array();
+		Utils::$context['feed'] = [];
 
 		// First, output the xml header.
 		Utils::$context['feed']['header'] = '<?xml version="1.0" encoding="' . Utils::$context['character_set'] . '"?' . '>' . ($doctype !== '' ? "\n" . trim($doctype) : '');
 
 		// Are we outputting an rss feed or one with more information?
-		if ($format == 'rss' || $format == 'rss2')
-		{
+		if ($format == 'rss' || $format == 'rss2') {
 			// Start with an RSS 2.0 header.
 			Utils::$context['feed']['header'] .= '
 <rss version="' . ($format == 'rss2' ? '2.0' : '0.92') . '" xml:lang="' . $metadata['language'] . '"' . $ns_string . '>
@@ -2873,26 +2770,30 @@ public static function build(string $format, array $data, array $metadata, strin
 		<link>' . $metadata['source'] . '</link>
 		<description>' . $metadata['desc'] . '</description>';
 
-			if (!empty($metadata['icon']))
+			if (!empty($metadata['icon'])) {
 				Utils::$context['feed']['header'] .= '
 		<image>
 			<url>' . $metadata['icon'] . '</url>
 			<title>' . $metadata['title'] . '</title>
 			<link>' . $metadata['source'] . '</link>
 		</image>';
+			}
 
-			if (!empty($metadata['rights']))
+			if (!empty($metadata['rights'])) {
 				Utils::$context['feed']['header'] .= '
 		<copyright>' . $metadata['rights'] . '</copyright>';
+			}
 
-			if (!empty($metadata['language']))
+			if (!empty($metadata['language'])) {
 				Utils::$context['feed']['header'] .= '
 		<language>' . $metadata['language'] . '</language>';
+			}
 
 			// RSS2 calls for this.
-			if ($format == 'rss2')
+			if ($format == 'rss2') {
 				Utils::$context['feed']['header'] .= '
 		<atom:link rel="self" type="application/rss+xml" href="' . $metadata['self'] . '" />';
+			}
 
 			Utils::$context['feed']['header'] .= $extraFeedTags_string;
 
@@ -2903,9 +2804,7 @@ public static function build(string $format, array $data, array $metadata, strin
 			Utils::$context['feed']['footer'] = '
 	</channel>
 </rss>';
-		}
-		elseif ($format == 'atom')
-		{
+		} elseif ($format == 'atom') {
 			Utils::$context['feed']['header'] .= '
 <feed xml:lang="' . $metadata['language'] . '"' . $ns_string . '>
 	<title>' . $metadata['title'] . '</title>
@@ -2916,19 +2815,22 @@ public static function build(string $format, array $data, array $metadata, strin
 	<subtitle>' . $metadata['desc'] . '</subtitle>
 	<generator uri="https://www.simplemachines.org" version="' . SMF_VERSION . '">SMF</generator>';
 
-			if (!empty($metadata['icon']))
+			if (!empty($metadata['icon'])) {
 				Utils::$context['feed']['header'] .= '
 	<icon>' . $metadata['icon'] . '</icon>';
+			}
 
-			if (!empty($metadata['author']))
+			if (!empty($metadata['author'])) {
 				Utils::$context['feed']['header'] .= '
 	<author>
 		<name>' . $metadata['author'] . '</name>
 	</author>';
+			}
 
-			if (!empty($metadata['rights']))
+			if (!empty($metadata['rights'])) {
 				Utils::$context['feed']['header'] .= '
 	<rights>' . $metadata['rights'] . '</rights>';
+			}
 
 			Utils::$context['feed']['header'] .= $extraFeedTags_string;
 
@@ -2936,9 +2838,7 @@ public static function build(string $format, array $data, array $metadata, strin
 
 			Utils::$context['feed']['footer'] = '
 </feed>';
-		}
-		elseif ($format == 'rdf')
-		{
+		} elseif ($format == 'rdf') {
 			Utils::$context['feed']['header'] .= '
 <rdf:RDF' . $ns_string . '>
 	<channel rdf:about="' . Config::$scripturl . '">
@@ -2952,14 +2852,12 @@ public static function build(string $format, array $data, array $metadata, strin
 		<items>
 			<rdf:Seq>';
 
-			foreach ($data as $item)
-			{
+			foreach ($data as $item) {
 				$link = array_filter(
 					$item['content'],
-					function($e)
-					{
+					function ($e) {
 						return ($e['tag'] == 'link');
-					}
+					},
 				);
 				$link = array_pop($link);
 
@@ -2978,8 +2876,7 @@ function($e)
 </rdf:RDF>';
 		}
 		// Otherwise, we're using our proprietary formats - they give more data, though.
-		else
-		{
+		else {
 			Utils::$context['feed']['header'] .= '
 <smf:xml-feed xml:lang="' . $metadata['language'] . '"' . $ns_string . ' version="' . SMF_VERSION . '" forum-name="' . Utils::$context['forum_name'] . '" forum-url="' . Config::$scripturl . '"' . (!empty($metadata['title']) && $metadata['title'] != Utils::$context['forum_name'] ? ' title="' . $metadata['title'] . '"' : '') . (!empty($metadata['desc']) ? ' description="' . $metadata['desc'] . '"' : '') . ' source="' . $metadata['source'] . '" generated-date-localized="' . strip_tags(Time::create('now', new \DateTimeZone(Config::$modSettings['default_timezone']))->format(null, false)) . '" generated-date-UTC="' . Time::gmstrftime('%F %T') . '"' . (!empty($metadata['page']) ? ' page="' . $metadata['page'] . '"' : '') . '>';
 
@@ -3007,57 +2904,52 @@ function($e)
 	public static function cdataParse(string $data, string $ns = '', bool $force = false): string
 	{
 		// Do we even need to do this?
-		if (strpbrk($data, '<>&') == false && $force !== true)
+		if (strpbrk($data, '<>&') == false && $force !== true) {
 			return $data;
+		}
 
 		$cdata = '<![CDATA[';
 
 		// If there's no namespace prefix to worry about, things are easy.
-		if ($ns === '')
-		{
+		if ($ns === '') {
 			$cdata .= str_replace(']]>', ']]]]><[CDATA[>', $data);
 		}
 		// Looks like we need to do it the hard way.
-		else
-		{
-			for ($pos = 0, $n = strlen($data); $pos < $n; null)
-			{
-				$positions = array(
+		else {
+			for ($pos = 0, $n = strlen($data); $pos < $n; null) {
+				$positions = [
 					strpos($data, ']]>', $pos),
 					strpos($data, '<', $pos),
-				);
+				];
 
 				$positions = array_filter($positions, 'is_int');
 
 				$old = $pos;
 				$pos = empty($positions) ? $n : min($positions);
 
-				if ($pos - $old > 0)
+				if ($pos - $old > 0) {
 					$cdata .= substr($data, $old, $pos - $old);
+				}
 
-				if ($pos >= $n)
+				if ($pos >= $n) {
 					break;
+				}
 
-				if (substr($data, $pos, 1) == '<')
-				{
+				if (substr($data, $pos, 1) == '<') {
 					$pos2 = strpos($data, '>', $pos);
 
-					if ($pos2 === false)
+					if ($pos2 === false) {
 						$pos2 = $n;
+					}
 
-					if (substr($data, $pos + 1, 1) == '/')
-					{
+					if (substr($data, $pos + 1, 1) == '/') {
 						$cdata .= ']]></' . $ns . ':' . substr($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-					}
-					else
-					{
+					} else {
 						$cdata .= ']]><' . $ns . ':' . substr($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
 					}
 
 					$pos = $pos2 + 1;
-				}
-				elseif (substr($data, $pos, 3) == ']]>')
-				{
+				} elseif (substr($data, $pos, 3) == ']]>') {
 					$cdata .= ']]]]><![CDATA[>';
 					$pos = $pos + 3;
 				}
@@ -3066,7 +2958,7 @@ public static function cdataParse(string $data, string $ns = '', bool $force = f
 
 		$cdata .= ']]>';
 
-		return strtr($cdata, array('<![CDATA[]]>' => ''));
+		return strtr($cdata, ['<![CDATA[]]>' => '']);
 	}
 
 	/******************
@@ -3075,16 +2967,11 @@ public static function cdataParse(string $data, string $ns = '', bool $force = f
 
 	protected function setSubaction($subaction)
 	{
-		if (isset($subaction) && isset(self::$subactions[$subaction]))
-		{
+		if (isset($subaction, self::$subactions[$subaction])) {
 			$this->subaction = $subaction;
-		}
-		elseif (isset($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
-		{
+		} elseif (isset($_GET['sa'], self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
-		}
-		else
-		{
+		} else {
 			$this->subaction = array_key_first(self::$subactions);
 		}
 	}
@@ -3092,23 +2979,19 @@ protected function setSubaction($subaction)
 	protected function setMember($member)
 	{
 		// Member ID was passed to the constructor.
-		if (isset($member))
-		{
+		if (isset($member)) {
 			$this->member = $member;
 		}
 		// Member ID was set via Utils::$context.
-		elseif (isset(Utils::$context['xmlnews_uid']))
-		{
+		elseif (isset(Utils::$context['xmlnews_uid'])) {
 			$this->member = Utils::$context['xmlnews_uid'];
 		}
 		// Member ID was set via URL parameter.
-		elseif (isset($_GET['u']))
-		{
+		elseif (isset($_GET['u'])) {
 			$this->member = $_GET['u'];
 		}
 		// Default to current user.
-		else
-		{
+		else {
 			$this->member = User::$me->id;
 		}
 
@@ -3121,20 +3004,19 @@ protected function setMember($member)
 
 	protected function setFormat()
 	{
-		if (isset($_GET['type']) && isset(self::XML_NAMESPACES[$_GET['type']]))
+		if (isset($_GET['type'], self::XML_NAMESPACES[$_GET['type']])) {
 			$this->format = $_GET['type'];
+		}
 	}
 
 	protected function setlimit()
 	{
 		// Limit was set via Utils::$context.
-		if (isset(Utils::$context['xmlnews_limit']))
-		{
+		if (isset(Utils::$context['xmlnews_limit'])) {
 			$this->limit = Utils::$context['xmlnews_limit'];
 		}
 		// Limit was set via URL parameter.
-		elseif (isset($_GET['limit']))
-		{
+		elseif (isset($_GET['limit'])) {
 			$this->limit = $_GET['limit'];
 		}
 
@@ -3148,14 +3030,14 @@ protected function setlimit()
 	protected function checkEnabled(): void
 	{
 		// Users can always export their own profile data.
-		if (in_array($this->subaction, array('profile', 'posts', 'personal_messages')) && $this->member == User::$me->id && !User::$me->is_guest)
-		{
+		if (in_array($this->subaction, ['profile', 'posts', 'personal_messages']) && $this->member == User::$me->id && !User::$me->is_guest) {
 			return;
 		}
 
 		// If it's not enabled, die.
-		if (empty(Config::$modSettings['xmlnews_enable']))
+		if (empty(Config::$modSettings['xmlnews_enable'])) {
 			Utils::obExit(false);
+		}
 	}
 
 	/*************************
@@ -3175,21 +3057,22 @@ protected function checkEnabled(): void
 	 * @param array $forceCdataKeys A list of keys on which to force cdata wrapping (used by mods, maybe)
 	 * @param array $nsKeys Key-value pairs of namespace prefixes to pass to self::cdataParse() (used by mods, maybe)
 	 */
-	protected static function dumpTags(array $data, int $i, string $format = '', array $forceCdataKeys = array(), array $nsKeys = array()): void
+	protected static function dumpTags(array $data, int $i, string $format = '', array $forceCdataKeys = [], array $nsKeys = []): void
 	{
-		if (empty(Utils::$context['feed']['items']))
+		if (empty(Utils::$context['feed']['items'])) {
 			Utils::$context['feed']['items'] = '';
+		}
 
 		// For every array in the data...
-		foreach ($data as $element)
-		{
-			$key = isset($element['tag']) ? $element['tag'] : null;
-			$val = isset($element['content']) ? $element['content'] : null;
-			$attrs = isset($element['attributes']) ? $element['attributes'] : null;
+		foreach ($data as $element) {
+			$key = $element['tag'] ?? null;
+			$val = $element['content'] ?? null;
+			$attrs = $element['attributes'] ?? null;
 
 			// Skip it, it's been set to null.
-			if ($key === null || ($val === null && $attrs === null))
+			if ($key === null || ($val === null && $attrs === null)) {
 				continue;
+			}
 
 			$forceCdata = in_array($key, $forceCdataKeys);
 			$ns = !empty($nsKeys[$key]) ? $nsKeys[$key] : '';
@@ -3200,38 +3083,30 @@ protected static function dumpTags(array $data, int $i, string $format = '', arr
 			// Beginning tag.
 			Utils::$context['feed']['items'] .= '<' . $key;
 
-			if (!empty($attrs))
-			{
-				foreach ($attrs as $attr_key => $attr_value)
-				{
+			if (!empty($attrs)) {
+				foreach ($attrs as $attr_key => $attr_value) {
 					Utils::$context['feed']['items'] .= ' ' . $attr_key . '="' . self::fixPossibleUrl($attr_value) . '"';
 				}
 			}
 
 			// If it's empty, simply output an empty element.
-			if (empty($val) && $val !== '0' && $val !== 0)
-			{
+			if (empty($val) && $val !== '0' && $val !== 0) {
 				Utils::$context['feed']['items'] .= ' />';
-			}
-			else
-			{
+			} else {
 				Utils::$context['feed']['items'] .= '>';
 
 				// The element's value.
-				if (is_array($val))
-				{
+				if (is_array($val)) {
 					// An array.  Dump it, and then indent the tag.
 					self::dumpTags($val, $i + 1, $format, $forceCdataKeys, $nsKeys);
 					Utils::$context['feed']['items'] .= "\n" . str_repeat("\t", $i);
 				}
 				// A string with returns in it.... show this as a multiline element.
-				elseif (strpos($val, "\n") !== false)
-				{
+				elseif (strpos($val, "\n") !== false) {
 					Utils::$context['feed']['items'] .= "\n" . (!empty($element['cdata']) || $forceCdata ? self::cdataParse(self::fixPossibleUrl($val), $ns, $forceCdata) : self::fixPossibleUrl($val)) . "\n" . str_repeat("\t", $i);
 				}
 				// A simple string.
-				else
-				{
+				else {
 					Utils::$context['feed']['items'] .= !empty($element['cdata']) || $forceCdata ? self::cdataParse(self::fixPossibleUrl($val), $ns, $forceCdata) : self::fixPossibleUrl($val);
 				}
 
@@ -3250,10 +3125,11 @@ protected static function dumpTags(array $data, int $i, string $format = '', arr
 	 */
 	protected static function fixPossibleUrl($val)
 	{
-		if (substr($val, 0, strlen(Config::$scripturl)) != Config::$scripturl)
+		if (substr($val, 0, strlen(Config::$scripturl)) != Config::$scripturl) {
 			return $val;
+		}
 
-		IntegrationHook::call('integrate_fix_url', array(&$val));
+		IntegrationHook::call('integrate_fix_url', [&$val]);
 
 		if (
 			empty(Config::$modSettings['queryless_urls'])
@@ -3266,18 +3142,16 @@ protected static function fixPossibleUrl($val)
 				!Utils::$context['server']['is_apache']
 				&& !Utils::$context['server']['is_lighttpd']
 			)
-		)
-		{
+		) {
 			return $val;
 		}
 
 		$val = preg_replace_callback(
 			'~\b' . preg_quote(Config::$scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~',
-			function($m)
-			{
-				return Config::$scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "");
+			function ($m) {
+				return Config::$scripturl . '/' . strtr("{$m[1]}", '&;=', '//,') . '.html' . ($m[2] ?? '');
 			},
-			$val
+			$val,
 		);
 
 		return $val;
@@ -3285,7 +3159,8 @@ function($m)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Feed::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Feed::exportStatic')) {
 	Feed::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/FindMember.php b/Sources/Actions/FindMember.php
index 7e4beaaa0e..08d0faf463 100644
--- a/Sources/Actions/FindMember.php
+++ b/Sources/Actions/FindMember.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\PageIndex;
 use SMF\Theme;
@@ -39,12 +38,11 @@ class FindMember implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'JSMembers',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -72,13 +70,14 @@ public function execute(): void
 		// Why is this in the Help template, you ask?  Well, erm... it helps you.  Does that work?
 		Theme::loadTemplate('Help');
 
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'find_members';
 
-		if (isset($_REQUEST['search']))
+		if (isset($_REQUEST['search'])) {
 			Utils::$context['last_search'] = Utils::htmlspecialchars($_REQUEST['search'], ENT_QUOTES);
-		else
+		} else {
 			$_REQUEST['start'] = 0;
+		}
 
 		// Allow the user to pass the input to be added to to the box.
 		Utils::$context['input_box_name'] = isset($_REQUEST['input']) && preg_match('~^[\w-]+$~', $_REQUEST['input']) === 1 ? $_REQUEST['input'] : 'to';
@@ -88,40 +87,39 @@ public function execute(): void
 		Utils::$context['quote_results'] = !empty($_REQUEST['quote']);
 
 		// List all the results.
-		Utils::$context['results'] = array();
+		Utils::$context['results'] = [];
 
 		// Some buddy related settings ;)
 		Utils::$context['show_buddies'] = !empty(User::$me->buddies);
 		Utils::$context['buddy_search'] = isset($_REQUEST['buddies']);
 
 		// If the user has done a search, well - search.
-		if (isset($_REQUEST['search']))
-		{
+		if (isset($_REQUEST['search'])) {
 			$_REQUEST['search'] = Utils::htmlspecialchars($_REQUEST['search'], ENT_QUOTES);
 
-			Utils::$context['results'] = User::find(array($_REQUEST['search']), true, Utils::$context['buddy_search']);
+			Utils::$context['results'] = User::find([$_REQUEST['search']], true, Utils::$context['buddy_search']);
 			$total_results = count(Utils::$context['results']);
 
 			Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?action=findmember;search=' . Utils::$context['last_search'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';input=' . Utils::$context['input_box_name'] . (Utils::$context['quote_results'] ? ';quote=1' : '') . (Utils::$context['buddy_search'] ? ';buddies' : ''), $_REQUEST['start'], $total_results, 7);
 
 			// Determine the navigation context.
 			$base_url = Config::$scripturl . '?action=findmember;search=' . urlencode(Utils::$context['last_search']) . (empty($_REQUEST['u']) ? '' : ';u=' . $_REQUEST['u']) . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
-			Utils::$context['links'] = array(
+			Utils::$context['links'] = [
 				'first' => $_REQUEST['start'] >= 7 ? $base_url . ';start=0' : '',
 				'prev' => $_REQUEST['start'] >= 7 ? $base_url . ';start=' . ($_REQUEST['start'] - 7) : '',
 				'next' => $_REQUEST['start'] + 7 < $total_results ? $base_url . ';start=' . ($_REQUEST['start'] + 7) : '',
 				'last' => $_REQUEST['start'] + 7 < $total_results ? $base_url . ';start=' . (floor(($total_results - 1) / 7) * 7) : '',
 				'up' => Config::$scripturl . '?action=pm;sa=send' . (empty($_REQUEST['u']) ? '' : ';u=' . $_REQUEST['u']),
-			);
-			Utils::$context['page_info'] = array(
+			];
+			Utils::$context['page_info'] = [
 				'current_page' => $_REQUEST['start'] / 7 + 1,
-				'num_pages' => floor(($total_results - 1) / 7) + 1
-			);
+				'num_pages' => floor(($total_results - 1) / 7) + 1,
+			];
 
 			Utils::$context['results'] = array_slice(Utils::$context['results'], $_REQUEST['start'], 7);
-		}
-		else
+		} else {
 			Utils::$context['links']['up'] = Config::$scripturl . '?action=pm;sa=send' . (empty($_REQUEST['u']) ? '' : ';u=' . $_REQUEST['u']);
+		}
 	}
 
 	/***********************
@@ -135,8 +133,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -159,11 +158,11 @@ public static function call(): void
 	protected function __construct()
 	{
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\FindMember::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\FindMember::exportStatic')) {
 	FindMember::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Groups.php b/Sources/Actions/Groups.php
index 05b035472a..adc3a6dcfd 100644
--- a/Sources/Actions/Groups.php
+++ b/Sources/Actions/Groups.php
@@ -13,16 +13,16 @@
 
 namespace SMF\Actions;
 
+use SMF\Actions\Moderation\Main as ModCenter;
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
-use SMF\Logging;
 use SMF\Menu;
 use SMF\PageIndex;
 use SMF\SecurityToken;
@@ -30,8 +30,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Moderation\Main as ModCenter;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Shows group info and allows certain priviledged members to add/remove members.
@@ -45,12 +43,18 @@ class Groups implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Groups',
-		),
-	);
+			'list_getMembergroups' => 'list_getMembergroups',
+			'listMembergroupMembers_Href' => 'listMembergroupMembers_Href',
+			'list_getGroupRequestCount' => 'list_getGroupRequestCount',
+			'list_getGroupRequests' => 'list_getGroupRequests',
+			'GroupList' => 'GroupList',
+			'MembergroupMembers' => 'MembergroupMembers',
+			'GroupRequests' => 'GroupRequests',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -73,11 +77,11 @@ class Groups implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'index' => 'index',
 		'members' => 'members',
 		'requests' => 'requests',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -125,8 +129,7 @@ public function execute(): void
 		Theme::loadTemplate('ManageMembergroups');
 
 		// If needed, set the mod center menu.
-		if (User::$me->allowedTo('access_mod_center') && (User::$me->mod_cache['gq'] != '0=1' || User::$me->allowedTo('manage_membergroups')) && !isset(Menu::$loaded['admin']) && !isset(Menu::$loaded['moderate']))
-		{
+		if (User::$me->allowedTo('access_mod_center') && (User::$me->mod_cache['gq'] != '0=1' || User::$me->allowedTo('manage_membergroups')) && !isset(Menu::$loaded['admin']) && !isset(Menu::$loaded['moderate'])) {
 			$_GET['area'] = $this->subaction == 'requests' ? 'groups' : 'viewgroups';
 
 			$this->action_url = '?action=moderate;area=' . $_GET['area'];
@@ -134,22 +137,22 @@ public function execute(): void
 			ModCenter::load()->createMenu();
 		}
 		// Otherwise add something to the link tree, for normal people.
-		else
-		{
+		else {
 			User::$me->isAllowedTo('view_mlist');
 
 			$this->action_url = '?action=groups';
 
-			Utils::$context['linktree'][] = array(
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . $this->action_url,
 				'name' => Lang::$txt['groups'],
-			);
+			];
 		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -160,97 +163,88 @@ public function index(): void
 		Utils::$context['page_title'] = Lang::$txt['viewing_groups'];
 
 		// Use the standard templates for showing this.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'group_lists',
 			'title' => Utils::$context['page_title'],
 			'base_href' => Config::$scripturl . $this->action_url . ';sa=view',
 			'default_sort_col' => 'group',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getMembergroups',
-				'params' => array(
+				'params' => [
 					'regular',
-				),
-			),
-			'columns' => array(
-				'group' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'group' => [
+					'header' => [
 						'value' => Lang::$txt['name'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// Since the moderator group has no explicit members, no link is needed.
-							if ($rowData['id_group'] == 3)
-							{
+							if ($rowData['id_group'] == 3) {
 								$group_name = $rowData['group_name'];
-							}
-							else
-							{
+							} else {
 								$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 								$group_name = sprintf('<a href="%1$s' . $this->action_url . ';sa=members;sa=members;group=%2$d"%3$s>%4$s</a>', Config::$scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 
 							// Add a help option for moderator and administrator.
-							if ($rowData['id_group'] == 1)
-							{
+							if ($rowData['id_group'] == 1) {
 								$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', Config::$scripturl);
-							}
-							elseif ($rowData['id_group'] == 3)
-							{
+							} elseif ($rowData['id_group'] == 3) {
 								$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', Config::$scripturl);
 							}
 
 							return $group_name;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, mg.group_name',
 						'reverse' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, mg.group_name DESC',
-					),
-				),
-				'icons' => array(
-					'header' => array(
+					],
+				],
+				'icons' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_icons'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'icons',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.icons',
 						'reverse' => 'mg.icons DESC',
-					)
-				),
-				'moderators' => array(
-					'header' => array(
+					],
+				],
+				'moderators' => [
+					'header' => [
 						'value' => Lang::$txt['moderators'],
-					),
-					'data' => array(
-						'function' => function($group)
-						{
+					],
+					'data' => [
+						'function' => function ($group) {
 							return empty($group['moderators']) ? '<em>' . Lang::$txt['membergroups_new_copy_none'] . '</em>' : implode(', ', $group['moderators']);
 						},
-					),
-				),
-				'members' => array(
-					'header' => array(
+					],
+				],
+				'members' => [
+					'header' => [
 						'value' => Lang::$txt['membergroups_members_top'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							// No explicit members for the moderator group.
 							return $rowData['id_group'] == 3 ? Lang::$txt['membergroups_guests_na'] : Lang::numberFormat($rowData['num_members']);
 						},
 						'class' => 'centercol',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, 1',
 						'reverse' => 'CASE WHEN mg.id_group < 4 THEN mg.id_group ELSE 4 END, 1 DESC',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the request list.
 		new ItemList($listOptions);
@@ -277,109 +271,109 @@ public function members(): void
 		$_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0;
 
 		// No browsing of guests, membergroup 0 or moderators.
-		if (in_array($_REQUEST['group'], array(-1, 0, 3)))
+		if (in_array($_REQUEST['group'], [-1, 0, 3])) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
 		// Load up the group details.
 		@list($group) = Group::load($_REQUEST['group']);
 
-		if (empty($group->id))
+		if (empty($group->id)) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
 		Utils::$context['group'] = $group;
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . $this->action_url . ';sa=members;group=' . $group->id,
 			'name' => $group->name,
-		);
+		];
 		Utils::$context['can_send_email'] = User::$me->allowedTo('moderate_forum');
 
 		// Load all the group moderators, for fun.
 		User::load($group->loadModerators(), User::LOAD_BY_ID, 'minimal');
 
-		foreach ($group->moderator_ids as $mod_id)
-		{
-			$group->moderators[] = array(
+		foreach ($group->moderator_ids as $mod_id) {
+			$group->moderators[] = [
 				'id' => $mod_id,
 				'name' => User::$loaded[$mod_id]->name,
-			);
+			];
 		}
 
 		// If this group is hidden then it can only "exist" if the user can moderate it!
-		if ($group->hidden === Group::INVISIBLE && !$group->can_moderate)
+		if ($group->hidden === Group::INVISIBLE && !$group->can_moderate) {
 			ErrorHandler::fatalLang('membergroup_does_not_exist', false);
+		}
 
 		// Removing member from group?
-		if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $group->assignable)
-		{
+		if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $group->assignable) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-mgm');
 
 			$group->removeMembers($_REQUEST['rem'], true);
 		}
 		// Must be adding new members to the group...
-		elseif (isset($_REQUEST['add']) && (!empty($_REQUEST['toAdd']) || !empty($_REQUEST['member_add'])) && $group->assignable)
-		{
+		elseif (isset($_REQUEST['add']) && (!empty($_REQUEST['toAdd']) || !empty($_REQUEST['member_add'])) && $group->assignable) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-mgm');
 
-			$member_query = array();
-			$member_parameters = array();
+			$member_query = [];
+			$member_parameters = [];
 
 			// Get all the members to be added... taking into account names can be quoted ;)
-			$_REQUEST['toAdd'] = strtr(Utils::htmlspecialchars($_REQUEST['toAdd'], ENT_QUOTES), array('&quot;' => '"'));
+			$_REQUEST['toAdd'] = strtr(Utils::htmlspecialchars($_REQUEST['toAdd'], ENT_QUOTES), ['&quot;' => '"']);
 
 			preg_match_all('~"([^"]+)"~', $_REQUEST['toAdd'], $matches);
 
 			$member_names = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_REQUEST['toAdd']))));
 
-			foreach ($member_names as $index => $member_name)
-			{
+			foreach ($member_names as $index => $member_name) {
 				$member_names[$index] = trim(Utils::strtolower($member_names[$index]));
 
-				if (strlen($member_names[$index]) == 0)
+				if (strlen($member_names[$index]) == 0) {
 					unset($member_names[$index]);
+				}
 			}
 
 			// Any passed by ID?
-			$member_ids = array();
-			if (!empty($_REQUEST['member_add']))
-			{
-				foreach ($_REQUEST['member_add'] as $id)
-				{
-					if ($id > 0)
+			$member_ids = [];
+
+			if (!empty($_REQUEST['member_add'])) {
+				foreach ($_REQUEST['member_add'] as $id) {
+					if ($id > 0) {
 						$member_ids[] = (int) $id;
+					}
 				}
 			}
 
 			// Construct the query pelements.
-			if (!empty($member_ids))
-			{
+			if (!empty($member_ids)) {
 				$member_query[] = 'id_member IN ({array_int:member_ids})';
 				$member_parameters['member_ids'] = $member_ids;
 			}
-			if (!empty($member_names))
-			{
+
+			if (!empty($member_names)) {
 				$member_query[] = 'LOWER(member_name) IN ({array_string:member_names})';
 				$member_query[] = 'LOWER(real_name) IN ({array_string:member_names})';
 				$member_parameters['member_names'] = $member_names;
 			}
 
-			$members = array();
-			if (!empty($member_query))
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member
+			$members = [];
+
+			if (!empty($member_query)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE (' . implode(' OR ', $member_query) . ')
 						AND id_group != {int:id_group}
 						AND FIND_IN_SET({int:id_group}, additional_groups) = 0',
-					array_merge($member_parameters, array(
+					array_merge($member_parameters, [
 						'id_group' => $_REQUEST['group'],
-					))
+					]),
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$members[] = $row['id_member'];
 				}
 				Db::$db->free_result($request);
@@ -388,35 +382,31 @@ public function members(): void
 			// @todo Add $_POST['additional'] to templates!
 
 			// Do the updates...
-			if (!empty($members))
-			{
+			if (!empty($members)) {
 				@list($group) = Group::load((int) $_REQUEST['group']);
 
-				if ($group instanceof Group)
-				{
+				if ($group instanceof Group) {
 					$group->addMembers($members, isset($_POST['additional']) ? 'only_additional' : 'auto', true);
 				}
 			}
 		}
 
 		// Sort out the sorting!
-		$sort_methods = array(
+		$sort_methods = [
 			'name' => 'real_name',
 			'email' => 'email_address',
 			'active' => 'last_login',
 			'registered' => 'date_registered',
 			'posts' => 'posts',
-		);
+		];
 
 		// They didn't pick one, default to by name..
-		if (!isset($_REQUEST['sort']) || !isset($sort_methods[$_REQUEST['sort']]))
-		{
+		if (!isset($_REQUEST['sort']) || !isset($sort_methods[$_REQUEST['sort']])) {
 			Utils::$context['sort_by'] = 'name';
 			$querySort = 'real_name';
 		}
 		// Otherwise default to ascending.
-		else
-		{
+		else {
 			Utils::$context['sort_by'] = $_REQUEST['sort'];
 			$querySort = $sort_methods[$_REQUEST['sort']];
 		}
@@ -433,12 +423,12 @@ public function members(): void
 		Utils::$context['can_moderate_forum'] = User::$me->allowedTo('moderate_forum');
 
 		// Load up all members of this group.
-		Utils::$context['members'] = array();
+		Utils::$context['members'] = [];
 
-		if ($group->loadMembers() !== array())
-		{
-			foreach (User::load($group->members, User::LOAD_BY_ID, 'normal') as $member)
+		if ($group->loadMembers() !== []) {
+			foreach (User::load($group->members, User::LOAD_BY_ID, 'normal') as $member) {
 				Utils::$context['members'][] = $member->format();
+			}
 		}
 
 		// Select the template.
@@ -446,9 +436,8 @@ public function members(): void
 		Utils::$context['page_title'] = Lang::$txt['membergroups_members_title'] . ': ' . $group->name;
 		SecurityToken::create('mod-mgm');
 
-		if ($group->assignable)
-		{
-			Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		if ($group->assignable) {
+			Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 		}
 	}
 
@@ -462,33 +451,33 @@ public function requests(): void
 		Utils::$context['sub_template'] = 'show_list';
 
 		// Verify we can be here.
-		if (User::$me->mod_cache['gq'] == '0=1')
+		if (User::$me->mod_cache['gq'] == '0=1') {
 			User::$me->isAllowedTo('manage_membergroups');
+		}
 
 		// Normally, we act normally...
 		$where = (User::$me->mod_cache['gq'] == '1=1' || User::$me->mod_cache['gq'] == '0=1' ? User::$me->mod_cache['gq'] : 'lgr.' . User::$me->mod_cache['gq']);
 
 		$where .= ' AND lgr.status ' . (isset($_GET['closed']) ? '!=' : '=') . ' {int:status_open}';
 
-		$where_parameters = array(
+		$where_parameters = [
 			'status_open' => 0,
-		);
+		];
 
 		// We've submitted?
-		if (isset($_POST[Utils::$context['session_var']]) && !empty($_POST['groupr']) && !empty($_POST['req_action']))
-		{
+		if (isset($_POST[Utils::$context['session_var']]) && !empty($_POST['groupr']) && !empty($_POST['req_action'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-gr');
 
 			// Clean the values.
-			foreach ($_POST['groupr'] as $k => $request)
+			foreach ($_POST['groupr'] as $k => $request) {
 				$_POST['groupr'][$k] = (int) $request;
+			}
 
-			$log_changes = array();
+			$log_changes = [];
 
 			// If we are giving a reason (And why shouldn't we?), then we don't actually do much.
-			if ($_POST['req_action'] == 'reason')
-			{
+			if ($_POST['req_action'] == 'reason') {
 				// Different sub template...
 				Utils::$context['sub_template'] = 'group_request_reason';
 
@@ -505,96 +494,92 @@ public function requests(): void
 				Utils::obExit();
 			}
 			// Otherwise we do something!
-			else
-			{
-				$request_list = array();
+			else {
+				$request_list = [];
 
-				$members_to_add = array();
+				$members_to_add = [];
 
-				$request = Db::$db->query('', '
-					SELECT lgr.id_request
+				$request = Db::$db->query(
+					'',
+					'SELECT lgr.id_request
 					FROM {db_prefix}log_group_requests AS lgr
 					WHERE ' . $where . '
 						AND lgr.id_request IN ({array_int:request_list})',
-					array(
+					[
 						'request_list' => $_POST['groupr'],
 						'status_open' => 0,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if ($_POST['req_action'] === 'approve')
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if ($_POST['req_action'] === 'approve') {
 						$members_to_add[$row['id_group']] = $row['id_member'];
+					}
 
-					if (!isset($log_changes[$row['id_request']]))
-					{
-						$log_changes[$row['id_request']] = array(
+					if (!isset($log_changes[$row['id_request']])) {
+						$log_changes[$row['id_request']] = [
 							'id_request' => $row['id_request'],
 							'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected
 							'id_member_acted' => User::$me->id,
 							'member_name_acted' => User::$me->name,
 							'time_acted' => time(),
 							'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? Utils::htmlspecialchars($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '',
-						);
+						];
 					}
 
 					$request_list[] = $row['id_request'];
 				}
 				Db::$db->free_result($request);
 
-				if (!empty($members_to_add))
-				{
-					foreach ($members_to_add as $group_id => $members)
-					{
+				if (!empty($members_to_add)) {
+					foreach ($members_to_add as $group_id => $members) {
 						@list($group) = Group::load((int) $group_id);
 
-						if ($group instanceof Group)
+						if ($group instanceof Group) {
 							$group->addMembers($members);
+						}
 					}
 				}
 
 				// Add a background task to handle notifying people of this request
-				$data = Utils::jsonEncode(array(
+				$data = Utils::jsonEncode([
 					'member_id' => User::$me->id,
 					'member_ip' => User::$me->ip,
 					'request_list' => $request_list,
 					'status' => $_POST['req_action'],
-					'reason' => isset($_POST['groupreason']) ? $_POST['groupreason'] : '',
+					'reason' => $_POST['groupreason'] ?? '',
 					'time' => time(),
-				));
+				]);
 
 				Db::$db->insert(
 					'insert',
 					'{db_prefix}background_tasks',
-					array(
-						'task_file' => 'string-255',
+					[
 						'task_class' => 'string-255',
 						'task_data' => 'string',
 						'claimed_time' => 'int',
-					),
-					array(
-						'$sourcedir/tasks/GroupAct_Notify.php',
-						'SMF\Tasks\GroupAct_Notify',
+					],
+					[
+						'SMF\\Tasks\\GroupAct_Notify',
 						$data,
 						0,
-					),
-					array()
+					],
+					[],
 				);
 
 				// Some changes to log?
-				if (!empty($log_changes))
-				{
-					foreach ($log_changes as $id_request => $details)
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}log_group_requests
+				if (!empty($log_changes)) {
+					foreach ($log_changes as $id_request => $details) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}log_group_requests
 							SET status = {int:status},
 								id_member_acted = {int:id_member_acted},
 								member_name_acted = {string:member_name_acted},
 								time_acted = {int:time_acted},
 								act_reason = {string:act_reason}
 							WHERE id_request = {int:id_request}',
-							$details
+							$details,
 						);
 					}
 				}
@@ -602,97 +587,97 @@ public function requests(): void
 		}
 
 		// This is all the information required for a group listing.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'group_request_list',
 			'width' => '100%',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['mc_groupr_none_found'],
 			'base_href' => Config::$scripturl . $this->action_url . ';sa=requests',
 			'default_sort_col' => 'member',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getGroupRequests',
-				'params' => array(
+				'params' => [
 					$where,
 					$where_parameters,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getGroupRequestCount',
-				'params' => array(
+				'params' => [
 					$where,
 					$where_parameters,
-				),
-			),
-			'columns' => array(
-				'member' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'member' => [
+					'header' => [
 						'value' => Lang::$txt['mc_groupr_member'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'member_link',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mem.member_name',
 						'reverse' => 'mem.member_name DESC',
-					),
-				),
-				'group' => array(
-					'header' => array(
+					],
+				],
+				'group' => [
+					'header' => [
 						'value' => Lang::$txt['mc_groupr_group'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'group_link',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.group_name',
 						'reverse' => 'mg.group_name DESC',
-					),
-				),
-				'reason' => array(
-					'header' => array(
+					],
+				],
+				'reason' => [
+					'header' => [
 						'value' => Lang::$txt['mc_groupr_reason'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'reason',
-					),
-				),
-				'date' => array(
-					'header' => array(
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
 						'style' => 'width: 18%; white-space:nowrap;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time_submitted',
-					),
-				),
-				'action' => array(
-					'header' => array(
+					],
+				],
+				'action' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="groupr[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . $this->action_url . ';sa=requests',
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-				),
+				],
 				'token' => 'mod-gr',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '
 						<select id="req_action" name="req_action" onchange="if (this.value != 0 &amp;&amp; (this.value == \'reason\' || confirm(\'' . Lang::$txt['mc_groupr_warning'] . '\'))) this.form.submit();">
@@ -704,12 +689,11 @@ public function requests(): void
 						</select>
 						<input type="submit" name="go" value="' . Lang::$txt['go'] . '" onclick="var sel = document.getElementById(\'req_action\'); if (sel.value != 0 &amp;&amp; sel.value != \'reason\' &amp;&amp; !confirm(\'' . Lang::$txt['mc_groupr_warning'] . '\')) return false;" class="button">',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
-		if (isset($_GET['closed']))
-		{
+		if (isset($_GET['closed'])) {
 			// Closed requests don't require interaction.
 			unset($listOptions['columns']['action'], $listOptions['form'], $listOptions['additional_rows'][0]);
 			$listOptions['base_href'] .= 'closed';
@@ -720,9 +704,9 @@ public function requests(): void
 		new ItemList($listOptions);
 
 		Utils::$context['default_list'] = 'group_request_list';
-		Menu::$loaded['moderate']->tab_data = array(
+		Menu::$loaded['moderate']->tab_data = [
 			'title' => Lang::$txt['mc_group_requests'],
-		);
+		];
 	}
 
 	/***********************
@@ -736,8 +720,9 @@ public function requests(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -762,31 +747,30 @@ public static function call(): void
 	public static function list_getMembergroups($start, $items_per_page, $sort, $membergroup_type): array
 	{
 		// Start collecting the data.
-		$groups = array();
-		$group_ids = array();
+		$groups = [];
+		$group_ids = [];
 		Utils::$context['can_moderate'] = User::$me->allowedTo('manage_membergroups');
 
-		$query_customizations = array(
-			'where' => array(
+		$query_customizations = [
+			'where' => [
 				'mg.min_posts' . ($membergroup_type === 'post_count' ? '!= ' : '= ') . '-1',
-			),
+			],
 			'order' => (array) $sort,
-		);
+		];
 
-		if (!User::$me->allowedTo('admin_forum'))
-		{
+		if (!User::$me->allowedTo('admin_forum')) {
 			$query_customizations['where'][] = 'mg.id_group != {int:mod_group}';
 			$query_customizations['params']['mod_group'] = Group::MOD;
 		}
 
-		$temp = Group::load(array(), $query_customizations);
-		Group::loadModeratorsBatch(array_map(fn($group) => $group->id, $temp));
+		$temp = Group::load([], $query_customizations);
+		Group::loadModeratorsBatch(array_map(fn ($group) => $group->id, $temp));
 
-		foreach ($temp as $group)
-		{
+		foreach ($temp as $group) {
 			// We only list the groups they can see.
-			if ($group->hidden === Group::INVISIBLE && !$group->can_moderate)
+			if ($group->hidden === Group::INVISIBLE && !$group->can_moderate) {
 				continue;
+			}
 
 			Utils::$context['can_moderate'] |= $group->can_moderate;
 
@@ -797,19 +781,17 @@ public static function list_getMembergroups($start, $items_per_page, $sort, $mem
 		}
 
 		// If we found any membergroups, get the amount of members in them.
-		if (!empty($group_ids))
-		{
+		if (!empty($group_ids)) {
 			Group::countMembersBatch($group_ids);
 			Group::loadModeratorsBatch($group_ids);
 
-			foreach ($group_ids as $group_id)
-			{
+			foreach ($group_ids as $group_id) {
 				User::load(Group::$loaded[$group_id]->moderator_ids);
 
-				foreach (Group::$loaded[$group_id]->moderator_ids as $mod_id)
-				{
-					if (!isset(User::$loaded[$mod_id]))
+				foreach (Group::$loaded[$group_id]->moderator_ids as $mod_id) {
+					if (!isset(User::$loaded[$mod_id])) {
 						continue;
+					}
 
 					Group::$loaded[$group_id]->moderators[] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $mod_id . '">' . User::$loaded[$mod_id]->name . '</a>';
 				}
@@ -817,12 +799,12 @@ public static function list_getMembergroups($start, $items_per_page, $sort, $mem
 		}
 
 		// Apply manual sorting if the 'number of members' column is selected.
-		if (substr($sort, 0, 1) == '1' || strpos($sort, ', 1') !== false)
-		{
+		if (substr($sort, 0, 1) == '1' || strpos($sort, ', 1') !== false) {
 			$sort_ascending = strpos($sort, 'DESC') === false;
 
-			foreach ($groups as $group)
+			foreach ($groups as $group) {
 				$sort_array[] = $group->id_group != Group::MOD ? (int) $group->num_members : Group::GUEST;
+			}
 
 			array_multisort($sort_array, $sort_ascending ? SORT_ASC : SORT_DESC, SORT_REGULAR, $groups);
 		}
@@ -841,33 +823,32 @@ public static function list_getMembergroups($start, $items_per_page, $sort, $mem
 	 */
 	public static function listMembergroupMembers_Href(&$members, $membergroup, $limit = null): bool
 	{
-		$members = array();
+		$members = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name
 			FROM {db_prefix}members
 			WHERE id_group = {int:id_group} OR FIND_IN_SET({int:id_group}, additional_groups) != 0' . ($limit === null ? '' : '
 			LIMIT ' . ($limit + 1)),
-			array(
+			[
 				'id_group' => $membergroup,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[$row['id_member']] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 		}
 		Db::$db->free_result($request);
 
 		// If there are more than $limit members, add a 'more' link.
-		if ($limit !== null && count($members) > $limit)
-		{
+		if ($limit !== null && count($members) > $limit) {
 			array_pop($members);
+
 			return true;
 		}
-		else
-		{
-			return false;
-		}
+
+		return false;
 	}
 
 	/**
@@ -879,12 +860,13 @@ public static function listMembergroupMembers_Href(&$members, $membergroup, $lim
 	 */
 	public static function list_getGroupRequestCount($where, $where_parameters): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_group_requests AS lgr
 			WHERE ' . $where,
-			array_merge($where_parameters, array(
-			))
+			array_merge($where_parameters, [
+			]),
 		);
 		list($totalRequests) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -910,10 +892,11 @@ public static function list_getGroupRequestCount($where, $where_parameters): int
 	 */
 	public static function list_getGroupRequests($start, $items_per_page, $sort, $where, $where_parameters): array
 	{
-		$group_requests = array();
+		$group_requests = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				lgr.id_request, lgr.id_member, lgr.id_group, lgr.time_applied, lgr.reason,
 				lgr.status, lgr.id_member_acted, lgr.member_name_acted, lgr.time_acted, lgr.act_reason,
 				mem.member_name, mg.group_name, mg.online_color, mem.real_name
@@ -923,47 +906,41 @@ public static function list_getGroupRequests($start, $items_per_page, $sort, $wh
 			WHERE ' . $where . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array_merge($where_parameters, array(
+			array_merge($where_parameters, [
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (empty($row['reason']))
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (empty($row['reason'])) {
 				$reason = '<em>(' . Lang::$txt['mc_groupr_no_reason'] . ')</em>';
-			}
-			else
-			{
+			} else {
 				$reason = Lang::censorText($row['reason']);
 			}
 
-			if (isset($_GET['closed']))
-			{
-				if ($row['status'] == 1)
-				{
+			if (isset($_GET['closed'])) {
+				if ($row['status'] == 1) {
 					$reason .= '<br><br><strong>' . Lang::$txt['mc_groupr_approved'] . '</strong>';
-				}
-				elseif ($row['status'] == 2)
-				{
+				} elseif ($row['status'] == 2) {
 					$reason .= '<br><br><strong>' . Lang::$txt['mc_groupr_rejected'] . '</strong>';
 				}
 
 				$reason .= ' (' . Time::create('@' . $row['time_acted'])->format() . ')';
 
-				if (!empty($row['act_reason']))
+				if (!empty($row['act_reason'])) {
 					$reason .= '<br><br>' . Lang::censorText($row['act_reason']);
+				}
 			}
 
-			$group_requests[] = array(
+			$group_requests[] = [
 				'id' => $row['id_request'],
 				'member_link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 				'group_link' => '<span style="color: ' . $row['online_color'] . '">' . $row['group_name'] . '</span>',
 				'reason' => $reason,
 				'time_submitted' => Time::create('@' . $row['time_applied'])->format(),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -1009,15 +986,17 @@ public static function GroupRequests(): void
 	 */
 	protected function __construct()
 	{
-		IntegrationHook::call('integrate_manage_groups', array(&self::$subactions));
+		IntegrationHook::call('integrate_manage_groups', [&self::$subactions]);
 
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Groups::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Groups::exportStatic')) {
 	Groups::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Help.php b/Sources/Actions/Help.php
index 1ed4956eaa..5d5742a0d0 100644
--- a/Sources/Actions/Help.php
+++ b/Sources/Actions/Help.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -33,12 +32,12 @@ class Help implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ShowHelp',
-		),
-	);
+			'HelpIndex' => 'HelpIndex',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -61,9 +60,9 @@ class Help implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'index' => 'index',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -86,10 +85,11 @@ class Help implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -104,7 +104,7 @@ public function index()
 		Utils::$context['canonical_url'] = Config::$scripturl . '?action=help';
 
 		// Sections were are going to link...
-		Utils::$context['manual_sections'] = array(
+		Utils::$context['manual_sections'] = [
 			'registering' => 'Registering',
 			'logging_in' => 'Logging_In',
 			'profile' => 'Profile',
@@ -115,13 +115,13 @@ public function index()
 			'memberlist' => 'Memberlist',
 			'calendar' => 'Calendar',
 			'features' => 'Features',
-		);
+		];
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=help',
 			'name' => Lang::$txt['help'],
-		);
+		];
 
 		// Lastly, some minor template stuff.
 		Utils::$context['page_title'] = Lang::$txt['manual_smf_user_help'];
@@ -139,8 +139,9 @@ public function index()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -182,15 +183,17 @@ protected function __construct()
 		Lang::load('Manual');
 
 		// CRUD $subactions as needed.
-		IntegrationHook::call('integrate_manage_help', array(&$subactions));
+		IntegrationHook::call('integrate_manage_help', [&$subactions]);
 
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Help::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Help::exportStatic')) {
 	Help::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/HelpAdmin.php b/Sources/Actions/HelpAdmin.php
index a73af97a81..0219386c03 100644
--- a/Sources/Actions/HelpAdmin.php
+++ b/Sources/Actions/HelpAdmin.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
@@ -36,12 +35,11 @@ class HelpAdmin implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ShowAdminHelp',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -71,15 +69,17 @@ class HelpAdmin implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!isset($_GET['help']) || !is_string($_GET['help']))
+		if (!isset($_GET['help']) || !is_string($_GET['help'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Load the admin help language file and template.
 		Lang::load('Help');
 
 		// Permission specific help?
-		if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp')
+		if (isset($_GET['help']) && substr($_GET['help'], 0, 14) == 'permissionhelp') {
 			Lang::load('ManagePermissions');
+		}
 
 		Theme::loadTemplate('Help');
 
@@ -87,21 +87,15 @@ public function execute(): void
 		IntegrationHook::call('integrate_helpadmin');
 
 		// What help string should be used?
-		if (isset(Lang::$helptxt[$_GET['help']]))
-		{
+		if (isset(Lang::$helptxt[$_GET['help']])) {
 			Utils::$context['help_text'] = Lang::$helptxt[$_GET['help']];
-		}
-		elseif (isset(Lang::$txt[$_GET['help']]))
-		{
+		} elseif (isset(Lang::$txt[$_GET['help']])) {
 			Utils::$context['help_text'] = Lang::$txt[$_GET['help']];
-		}
-		else
-		{
-			ErrorHandler::fatalLang('not_found', false, array(), 404);
+		} else {
+			ErrorHandler::fatalLang('not_found', false, [], 404);
 		}
 
-		switch ($_GET['help'])
-		{
+		switch ($_GET['help']) {
 			case 'cal_short_months':
 				Utils::$context['help_text'] = sprintf(Utils::$context['help_text'], Lang::$txt['months_short'][1], Lang::$txt['months_titles'][1]);
 				break;
@@ -120,8 +114,7 @@ public function execute(): void
 		}
 
 		// Does this text contain a link that we should fill in?
-		if (preg_match('~%([0-9]+\$)?s\?~', Utils::$context['help_text'], $match))
-		{
+		if (preg_match('~%([0-9]+\$)?s\?~', Utils::$context['help_text'], $match)) {
 			Utils::$context['help_text'] = sprintf(Utils::$context['help_text'], Config::$scripturl, Utils::$context['session_id'], Utils::$context['session_var']);
 		}
 
@@ -129,7 +122,7 @@ public function execute(): void
 		Utils::$context['page_title'] = Utils::$context['forum_name'] . ' - ' . Lang::$txt['help'];
 
 		// Don't show any template layers, just the popup sub template.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'popup';
 	}
 
@@ -144,8 +137,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -171,7 +165,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\HelpAdmin::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\HelpAdmin::exportStatic')) {
 	HelpAdmin::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/JavaScriptModify.php b/Sources/Actions/JavaScriptModify.php
index 0501a57293..953c13ddb5 100644
--- a/Sources/Actions/JavaScriptModify.php
+++ b/Sources/Actions/JavaScriptModify.php
@@ -14,10 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -27,9 +28,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-
 
 /**
  * Used to edit the body or subject of a message inline.
@@ -45,12 +43,11 @@ class JavaScriptModify implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'JavaScriptModify',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -74,8 +71,9 @@ class JavaScriptModify implements ActionInterface
 	public function execute(): void
 	{
 		// Assume the first message if no message ID was given.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				t.locked, t.num_replies, t.id_member_started, t.id_first_msg,
 				m.id_msg, m.id_member, m.poster_time, m.subject, m.smileys_enabled, m.body, m.icon,
 				m.modified_time, m.modified_name, m.modified_reason, m.approved,
@@ -86,49 +84,40 @@ public function execute(): void
 				AND m.id_topic = {int:current_topic}' . (User::$me->allowedTo('modify_any') || User::$me->allowedTo('approve_posts') ? '' : (!Config::$modSettings['postmod_active'] ? '
 				AND (m.id_member != {int:guest_id} AND m.id_member = {int:current_member})' : '
 				AND (m.approved = {int:is_approved} OR (m.id_member != {int:guest_id} AND m.id_member = {int:current_member}))')),
-			array(
+			[
 				'current_member' => User::$me->id,
 				'current_topic' => Topic::$topic_id,
 				'id_msg' => empty($_REQUEST['msg']) ? 't.id_first_msg' : (int) $_REQUEST['msg'],
 				'is_approved' => 1,
 				'guest_id' => 0,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_board', false);
 		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		// Change either body or subject requires permissions to modify messages.
-		if (isset($_POST['message']) || isset($_POST['subject']) || isset($_REQUEST['icon']))
-		{
-			if (!empty($row['locked']))
+		if (isset($_POST['message']) || isset($_POST['subject']) || isset($_REQUEST['icon'])) {
+			if (!empty($row['locked'])) {
 				User::$me->isAllowedTo('moderate_board');
+			}
 
-			if ($row['id_member'] == User::$me->id && !User::$me->allowedTo('modify_any'))
-			{
-				if ((!Config::$modSettings['postmod_active'] || $row['approved']) && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time())
-				{
+			if ($row['id_member'] == User::$me->id && !User::$me->allowedTo('modify_any')) {
+				if ((!Config::$modSettings['postmod_active'] || $row['approved']) && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time()) {
 					ErrorHandler::fatalLang('modify_post_time_passed', false);
-				}
-				elseif ($row['id_member_started'] == User::$me->id && !User::$me->allowedTo('modify_own'))
-				{
+				} elseif ($row['id_member_started'] == User::$me->id && !User::$me->allowedTo('modify_own')) {
 					User::$me->isAllowedTo('modify_replies');
-				}
-				else
-				{
+				} else {
 					User::$me->isAllowedTo('modify_own');
 				}
 			}
 			// Otherwise, they're locked out; someone who can modify the replies is needed.
-			elseif ($row['id_member_started'] == User::$me->id && !User::$me->allowedTo('modify_any'))
-			{
+			elseif ($row['id_member_started'] == User::$me->id && !User::$me->allowedTo('modify_any')) {
 				User::$me->isAllowedTo('modify_replies');
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('modify_any');
 			}
 
@@ -136,152 +125,124 @@ public function execute(): void
 			$moderationAction = $row['id_member'] != User::$me->id;
 		}
 
-		$post_errors = array();
-		if (isset($_POST['subject']) && Utils::htmlTrim(Utils::htmlspecialchars($_POST['subject'])) !== '')
-		{
-			$_POST['subject'] = strtr(Utils::htmlspecialchars($_POST['subject']), array("\r" => '', "\n" => '', "\t" => ''));
+		$post_errors = [];
+
+		if (isset($_POST['subject']) && Utils::htmlTrim(Utils::htmlspecialchars($_POST['subject'])) !== '') {
+			$_POST['subject'] = strtr(Utils::htmlspecialchars($_POST['subject']), ["\r" => '', "\n" => '', "\t" => '']);
 
 			// Maximum number of characters.
-			if (Utils::entityStrlen($_POST['subject']) > 100)
+			if (Utils::entityStrlen($_POST['subject']) > 100) {
 				$_POST['subject'] = Utils::entitySubstr($_POST['subject'], 0, 100);
-		}
-		elseif (isset($_POST['subject']))
-		{
+			}
+		} elseif (isset($_POST['subject'])) {
 			$post_errors[] = 'no_subject';
 			unset($_POST['subject']);
 		}
 
-		if (isset($_POST['message']))
-		{
-			if (Utils::htmlTrim(Utils::htmlspecialchars($_POST['message'])) === '')
-			{
+		if (isset($_POST['message'])) {
+			if (Utils::htmlTrim(Utils::htmlspecialchars($_POST['message'])) === '') {
 				$post_errors[] = 'no_message';
 				unset($_POST['message']);
-			}
-			elseif (!empty(Config::$modSettings['max_messageLength']) && Utils::entityStrlen($_POST['message']) > Config::$modSettings['max_messageLength'])
-			{
+			} elseif (!empty(Config::$modSettings['max_messageLength']) && Utils::entityStrlen($_POST['message']) > Config::$modSettings['max_messageLength']) {
 				$post_errors[] = 'long_message';
 				unset($_POST['message']);
-			}
-			else
-			{
+			} else {
 				$_POST['message'] = Utils::htmlspecialchars($_POST['message'], ENT_QUOTES);
 
 				Msg::preparsecode($_POST['message']);
 
-				if (Utils::htmlTrim(strip_tags(BBCodeParser::load()->parse($_POST['message'], false), implode('', Utils::$context['allowed_html_tags']))) === '')
-				{
+				if (Utils::htmlTrim(strip_tags(BBCodeParser::load()->parse($_POST['message'], false), implode('', Utils::$context['allowed_html_tags']))) === '') {
 					$post_errors[] = 'no_message';
 					unset($_POST['message']);
 				}
 			}
 		}
 
-	 	IntegrationHook::call('integrate_post_JavascriptModify', array(&$post_errors, $row));
+		IntegrationHook::call('integrate_post_JavascriptModify', [&$post_errors, $row]);
 
-		if (isset($_POST['lock']))
-		{
-			if (!User::$me->allowedTo(array('lock_any', 'lock_own')) || (!User::$me->allowedTo('lock_any') && User::$me->id != $row['id_member']))
-			{
+		if (isset($_POST['lock'])) {
+			if (!User::$me->allowedTo(['lock_any', 'lock_own']) || (!User::$me->allowedTo('lock_any') && User::$me->id != $row['id_member'])) {
 				unset($_POST['lock']);
-			}
-			elseif (!User::$me->allowedTo('lock_any'))
-			{
-				if ($row['locked'] == 1)
-				{
+			} elseif (!User::$me->allowedTo('lock_any')) {
+				if ($row['locked'] == 1) {
 					unset($_POST['lock']);
-				}
-				else
-				{
+				} else {
 					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
 				}
-			}
-			elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked'])
-			{
+			} elseif (!empty($row['locked']) && !empty($_POST['lock']) || $_POST['lock'] == $row['locked']) {
 				unset($_POST['lock']);
-			}
-			else
-			{
+			} else {
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 			}
 		}
 
-		if (isset($_POST['sticky']) && !User::$me->allowedTo('make_sticky'))
+		if (isset($_POST['sticky']) && !User::$me->allowedTo('make_sticky')) {
 			unset($_POST['sticky']);
+		}
 
-		if (isset($_POST['modify_reason']))
-		{
-			$_POST['modify_reason'] = strtr(Utils::htmlspecialchars($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
+		if (isset($_POST['modify_reason'])) {
+			$_POST['modify_reason'] = strtr(Utils::htmlspecialchars($_POST['modify_reason']), ["\r" => '', "\n" => '', "\t" => '']);
 
 			// Maximum number of characters.
-			if (Utils::entityStrlen($_POST['modify_reason']) > 100)
+			if (Utils::entityStrlen($_POST['modify_reason']) > 100) {
 				$_POST['modify_reason'] = Utils::entitySubstr($_POST['modify_reason'], 0, 100);
+			}
 		}
 
-		if (empty($post_errors))
-		{
-			$msgOptions = array(
+		if (empty($post_errors)) {
+			$msgOptions = [
 				'id' => $row['id_msg'],
-				'subject' => isset($_POST['subject']) ? $_POST['subject'] : null,
-				'body' => isset($_POST['message']) ? $_POST['message'] : null,
+				'subject' => $_POST['subject'] ?? null,
+				'body' => $_POST['message'] ?? null,
 				'icon' => isset($_REQUEST['icon']) ? preg_replace('~[\./\\\\*\':"<>]~', '', $_REQUEST['icon']) : null,
-				'modify_reason' => (isset($_POST['modify_reason']) ? $_POST['modify_reason'] : ''),
-				'approved' => (isset($row['approved']) ? $row['approved'] : null),
-			);
+				'modify_reason' => ($_POST['modify_reason'] ?? ''),
+				'approved' => ($row['approved'] ?? null),
+			];
 
-			$topicOptions = array(
+			$topicOptions = [
 				'id' => Topic::$topic_id,
 				'board' => Board::$info->id,
 				'lock_mode' => isset($_POST['lock']) ? (int) $_POST['lock'] : null,
 				'sticky_mode' => isset($_POST['sticky']) ? (int) $_POST['sticky'] : null,
 				'mark_as_read' => true,
-			);
+			];
 
-			$posterOptions = array(
+			$posterOptions = [
 				'id' => User::$me->id,
 				'name' => $row['poster_name'],
 				'email' => $row['poster_email'],
 				'update_post_count' => !User::$me->is_guest && !isset($_REQUEST['msg']) && Board::$info->posts_count,
-			);
+			];
 
 			// Only consider marking as editing if they have edited the subject, message or icon.
-			if ((isset($_POST['subject']) && $_POST['subject'] != $row['subject']) || (isset($_POST['message']) && $_POST['message'] != $row['body']) || (isset($_REQUEST['icon']) && $_REQUEST['icon'] != $row['icon']))
-			{
+			if ((isset($_POST['subject']) && $_POST['subject'] != $row['subject']) || (isset($_POST['message']) && $_POST['message'] != $row['body']) || (isset($_REQUEST['icon']) && $_REQUEST['icon'] != $row['icon'])) {
 				// And even then only if the time has passed...
-				if (time() - $row['poster_time'] > Config::$modSettings['edit_wait_time'] || User::$me->id != $row['id_member'])
-				{
+				if (time() - $row['poster_time'] > Config::$modSettings['edit_wait_time'] || User::$me->id != $row['id_member']) {
 					$msgOptions['modify_time'] = time();
 					$msgOptions['modify_name'] = User::$me->name;
 				}
 			}
 			// If nothing was changed there's no need to add an entry to the moderation log.
-			else
-			{
+			else {
 				$moderationAction = false;
 			}
 
 			Msg::modify($msgOptions, $topicOptions, $posterOptions);
 
 			// If we didn't change anything this time but had before put back the old info.
-			if (!isset($msgOptions['modify_time']) && !empty($row['modified_time']))
-			{
+			if (!isset($msgOptions['modify_time']) && !empty($row['modified_time'])) {
 				$msgOptions['modify_time'] = $row['modified_time'];
 				$msgOptions['modify_name'] = $row['modified_name'];
 				$msgOptions['modify_reason'] = $row['modified_reason'];
 			}
 
 			// Changing the first subject updates other subjects to 'Re: new_subject'.
-			if (isset($_POST['subject']) && isset($_REQUEST['change_all_subjects']) && $row['id_first_msg'] == $row['id_msg'] && !empty($row['num_replies']) && (User::$me->allowedTo('modify_any') || ($row['id_member_started'] == User::$me->id && User::$me->allowedTo('modify_replies'))))
-			{
+			if (isset($_POST['subject'], $_REQUEST['change_all_subjects'])   && $row['id_first_msg'] == $row['id_msg'] && !empty($row['num_replies']) && (User::$me->allowedTo('modify_any') || ($row['id_member_started'] == User::$me->id && User::$me->allowedTo('modify_replies')))) {
 				// Get the proper (default language) response prefix first.
-				if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix')))
-				{
-					if (Lang::$default === User::$me->language)
-					{
+				if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix'))) {
+					if (Lang::$default === User::$me->language) {
 						Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
-					}
-					else
-					{
+					} else {
 						Lang::load('index', Lang::$default, false);
 						Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
 						Lang::load('index');
@@ -289,43 +250,41 @@ public function execute(): void
 					CacheApi::put('response_prefix', Utils::$context['response_prefix'], 600);
 				}
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}messages
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}messages
 					SET subject = {string:subject}
 					WHERE id_topic = {int:current_topic}
 						AND id_msg != {int:id_first_msg}',
-					array(
+					[
 						'current_topic' => Topic::$topic_id,
 						'id_first_msg' => $row['id_first_msg'],
 						'subject' => Utils::$context['response_prefix'] . $_POST['subject'],
-					)
+					],
 				);
 			}
 
-			if (!empty($moderationAction))
-			{
-				Logging::logAction('modify', array('topic' => Topic::$topic_id, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => Board::$info->id));
+			if (!empty($moderationAction)) {
+				Logging::logAction('modify', ['topic' => Topic::$topic_id, 'message' => $row['id_msg'], 'member' => $row['id_member'], 'board' => Board::$info->id]);
 			}
 		}
 
-		if (isset($_REQUEST['xml']))
-		{
+		if (isset($_REQUEST['xml'])) {
 			Utils::$context['sub_template'] = 'modifydone';
 
-			if (empty($post_errors) && isset($msgOptions['subject']) && isset($msgOptions['body']))
-			{
-				Utils::$context['message'] = array(
+			if (empty($post_errors) && isset($msgOptions['subject'], $msgOptions['body'])) {
+				Utils::$context['message'] = [
 					'id' => $row['id_msg'],
-					'modified' => array(
+					'modified' => [
 						'time' => isset($msgOptions['modify_time']) ? Time::create('@' . $msgOptions['modify_time'])->format() : '',
-						'timestamp' => isset($msgOptions['modify_time']) ? $msgOptions['modify_time'] : 0,
+						'timestamp' => $msgOptions['modify_time'] ?? 0,
 						'name' => isset($msgOptions['modify_time']) ? $msgOptions['modify_name'] : '',
 						'reason' => $msgOptions['modify_reason'],
-					),
+					],
 					'subject' => $msgOptions['subject'],
 					'first_in_topic' => $row['id_msg'] == $row['id_first_msg'],
-					'body' => strtr($msgOptions['body'], array(']]>' => ']]]]><![CDATA[>')),
-				);
+					'body' => strtr($msgOptions['body'], [']]>' => ']]]]><![CDATA[>']),
+				];
 
 				Lang::censorText(Utils::$context['message']['subject']);
 				Lang::censorText(Utils::$context['message']['body']);
@@ -333,46 +292,41 @@ public function execute(): void
 				Utils::$context['message']['body'] = BBCodeParser::load()->parse(Utils::$context['message']['body'], $row['smileys_enabled'], $row['id_msg']);
 			}
 			// Topic?
-			elseif (empty($post_errors))
-			{
+			elseif (empty($post_errors)) {
 				Utils::$context['sub_template'] = 'modifytopicdone';
-				Utils::$context['message'] = array(
+				Utils::$context['message'] = [
 					'id' => $row['id_msg'],
-					'modified' => array(
+					'modified' => [
 						'time' => isset($msgOptions['modify_time']) ? Time::create('@' . $msgOptions['modify_time'])->format() : '',
-						'timestamp' => isset($msgOptions['modify_time']) ? $msgOptions['modify_time'] : 0,
+						'timestamp' => $msgOptions['modify_time'] ?? 0,
 						'name' => isset($msgOptions['modify_time']) ? $msgOptions['modify_name'] : '',
-					),
-					'subject' => isset($msgOptions['subject']) ? $msgOptions['subject'] : '',
-				);
+					],
+					'subject' => $msgOptions['subject'] ?? '',
+				];
 
 				Lang::censorText(Utils::$context['message']['subject']);
-			}
-			else
-			{
-				Utils::$context['message'] = array(
+			} else {
+				Utils::$context['message'] = [
 					'id' => $row['id_msg'],
-					'errors' => array(),
+					'errors' => [],
 					'error_in_subject' => in_array('no_subject', $post_errors),
 					'error_in_body' => in_array('no_message', $post_errors) || in_array('long_message', $post_errors),
-				);
+				];
 
 				Lang::load('Errors');
 
-				foreach ($post_errors as $post_error)
-				{
-					if ($post_error == 'long_message')
+				foreach ($post_errors as $post_error) {
+					if ($post_error == 'long_message') {
 						Utils::$context['message']['errors'][] = sprintf(Lang::$txt['error_' . $post_error], Config::$modSettings['max_messageLength']);
-					else
+					} else {
 						Utils::$context['message']['errors'][] = Lang::$txt['error_' . $post_error];
+					}
 				}
 			}
 
 			// Allow mods to do something with Utils::$context before we return.
 			IntegrationHook::call('integrate_jsmodify_xml');
-		}
-		else
-		{
+		} else {
 			Utils::obExit(false);
 		}
 	}
@@ -388,8 +342,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -412,15 +367,17 @@ public static function call(): void
 	protected function __construct()
 	{
 		// We have to have a topic!
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			Utils::obExit(false);
+		}
 
 		User::$me->checkSession('get');
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\JavaScriptModify::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\JavaScriptModify::exportStatic')) {
 	JavaScriptModify::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Like.php b/Sources/Actions/Like.php
index 1ad185bd56..7b844c79c4 100644
--- a/Sources/Actions/Like.php
+++ b/Sources/Actions/Like.php
@@ -14,15 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\Alert;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles liking posts and displaying the list of who liked a post.
@@ -55,20 +55,20 @@ class Like implements ActionInterface
 	 * called internally by the like() method. Moreover, the control flow
 	 * regarding hooks, etc., assumes that they are only called by like().
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'like' => 'like',
 		'view' => 'view',
 		'delete' => 'delete',
 		'insert' => 'insert',
 		'count' => 'count',
-	);
+	];
 
 	/*********************
 	 * Internal properties
 	 *********************/
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 *
 	 * Know if a request comes from an ajax call or not.
 	 * Depends on $_GET['js'] been set.
@@ -100,21 +100,21 @@ class Like implements ActionInterface
 	protected $extra = false;
 
 	/**
-	 * @var integer
+	 * @var int
 	 *
 	 * A valid ID to identify the content being liked.
 	 */
 	protected $content = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 *
 	 * The number of times the content has been liked.
 	 */
 	protected $num_likes = 0;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 *
 	 * If the current user has already liked this content.
 	 */
@@ -147,24 +147,24 @@ class Like implements ActionInterface
 	 * 'json'        bool        If true, the class will return a JSON object as
 	 *                           a response instead of HTML. Default: false.
 	 */
-	protected $valid_likes = array(
+	protected $valid_likes = [
 		'can_like' => false,
 		'redirect' => '',
 		'type' => '',
 		'flush_cache' => '',
 		'callback' => false,
 		'json' => false,
-	);
+	];
 
 	/**
-	 * @var integer
+	 * @var int
 	 *
 	 * The topic ID. Used for liking messages.
 	 */
 	protected $id_topic = 0;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 *
 	 * Whether respond() will be executed as normal.
 	 *
@@ -208,30 +208,27 @@ public function execute(): void
 		// Make sure the user can see and like your content.
 		$this->check();
 
-		if (is_string($this->error))
-		{
+		if (is_string($this->error)) {
 			$this->respond();
+
 			return;
 		}
 
 		// So at this point, whatever type of like the user supplied and the
 		// item of content in question, we know it exists.
 		// Now we need to figure out what we're doing with that.
-		if (isset(self::$subactions[$this->subaction]))
-		{
+		if (isset(self::$subactions[$this->subaction])) {
 			// Guest can only view likes.
-			if ($this->subaction != 'view')
+			if ($this->subaction != 'view') {
 				User::$me->kickIfGuest();
+			}
 
 			User::$me->checkSession('get');
 
 			// Call the appropriate method.
-			if (method_exists($this, self::$subactions[$this->subaction]))
-			{
-				call_user_func(array($this, self::$subactions[$this->subaction]));
-			}
-			else
-			{
+			if (method_exists($this, self::$subactions[$this->subaction])) {
+				call_user_func([$this, self::$subactions[$this->subaction]]);
+			} else {
 				call_user_func(self::$subactions[$this->subaction]);
 			}
 		}
@@ -265,8 +262,9 @@ public function get($property = ''): mixed
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -289,11 +287,13 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] === '_count')
+		if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] === '_count') {
 			$_REQUEST['sa'] = 'count';
+		}
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		$this->type = $_GET['ltype'] ?? '';
 		$this->content = (int) ($_GET['like'] ?? 0);
@@ -301,8 +301,9 @@ protected function __construct()
 		$this->extra = $_GET['extra'] ?? false;
 
 		// We do not want to output debug information here.
-		if ($this->js)
+		if ($this->js) {
 			Config::$db_show_debug = false;
+		}
 	}
 
 	/**
@@ -314,50 +315,50 @@ protected function __construct()
 	protected function check(): void
 	{
 		// This feature is currently disable.
-		if (empty(Config::$modSettings['enable_likes']))
-		{
+		if (empty(Config::$modSettings['enable_likes'])) {
 			$this->error = 'like_disable';
+
 			return;
 		}
 
 		// Zerothly, they did indicate some kind of content to like, right?
 		preg_match('~^([a-z0-9\-\_]{1,6})~i', $this->type, $matches);
 
-		$this->type = isset($matches[1]) ? $matches[1] : '';
+		$this->type = $matches[1] ?? '';
 
-		if ($this->type == '' || $this->content <= 0)
-		{
+		if ($this->type == '' || $this->content <= 0) {
 			$this->error = 'cannot_';
+
 			return;
 		}
 
 		// First we need to verify whether the user can see the type of content.
 		// This is set up to be extensible, so we'll check for the one type we
 		// do know about, and if it's not that, we'll defer to any hooks.
-		if ($this->type == 'msg')
-		{
+		if ($this->type == 'msg') {
 			// So we're doing something off a like. We need to verify that it
 			// exists, and that the current user can see it. Fortunately, this
 			// is quite easy to do for messages - and we'll get the topic ID
 			// while we're at it, because we need it later for other things.
-			$request = Db::$db->query('', '
-				SELECT m.id_topic, m.id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_topic, m.id_member
 				FROM {db_prefix}messages AS m
 				WHERE {query_see_message_board}
 					AND m.id_msg = {int:msg}',
-				array(
+				[
 					'msg' => $this->content,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 1)
-			{
+
+			if (Db::$db->num_rows($request) == 1) {
 				list($this->id_topic, $topicOwner) = Db::$db->fetch_row($request);
 			}
 			Db::$db->free_result($request);
 
-			if (empty($this->id_topic))
-			{
+			if (empty($this->id_topic)) {
 				$this->error = 'cannot_';
+
 				return;
 			}
 
@@ -368,9 +369,7 @@ protected function check(): void
 			$this->valid_likes['redirect'] = 'topic=' . $this->id_topic . '.msg' . $this->content . '#msg' . $this->content;
 
 			$this->valid_likes['can_like'] = (User::$me->id == $topicOwner ? 'cannot_like_content' : (User::$me->allowedTo('likes_like') ? true : 'cannot_like_content'));
-		}
-		else
-		{
+		} else {
 			/*
 			 * MOD AUTHORS: This will give you whatever the user offers up in
 			 * terms of liking, e.g. $this->type=msg, $this->content=1.
@@ -388,22 +387,19 @@ protected function check(): void
 			 *
 			 * See also issueLike() for further notes.
 			 */
-			$can_like = IntegrationHook::call('integrate_valid_likes', array($this->type, $this->content, $this->subaction, $this->js, $this->extra));
+			$can_like = IntegrationHook::call('integrate_valid_likes', [$this->type, $this->content, $this->subaction, $this->js, $this->extra]);
 
 			$found = false;
 
-			if (!empty($can_like))
-			{
+			if (!empty($can_like)) {
 				$can_like = (array) $can_like;
 
-				foreach ($can_like as $result)
-				{
-					if ($result !== false)
-					{
+				foreach ($can_like as $result) {
+					if ($result !== false) {
 						// Match the type with what we already have.
-						if (!isset($result['type']) || $result['type'] != $this->type)
-						{
+						if (!isset($result['type']) || $result['type'] != $this->type) {
 							$this->error = 'not_valid_like_type';
+
 							return;
 						}
 
@@ -412,24 +408,23 @@ protected function check(): void
 						$this->valid_likes = array_merge($this->valid_likes, $result);
 
 						$found = true;
-
 						break;
 					}
 				}
 			}
 
-			if (!$found)
-			{
+			if (!$found) {
 				$this->error = 'cannot_';
+
 				return;
 			}
 		}
 
 		// Is the user able to like this?
 		// Viewing a list of likes doesn't require this permission.
-		if ($this->subaction != 'view' && isset($this->valid_likes['can_like']) && is_string($this->valid_likes['can_like']))
-		{
+		if ($this->subaction != 'view' && isset($this->valid_likes['can_like']) && is_string($this->valid_likes['can_like'])) {
 			$this->error = $this->valid_likes['can_like'];
+
 			return;
 		}
 	}
@@ -439,38 +434,40 @@ protected function check(): void
 	 */
 	protected function delete(): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_likes
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_likes
 			WHERE content_id = {int:like_content}
 				AND content_type = {string:like_type}
 				AND id_member = {int:id_member}',
-			array(
+			[
 				'like_content' => $this->content,
 				'like_type' => $this->type,
 				'id_member' => User::$me->id,
-			)
+			],
 		);
 
 		// Are we calling this directly? If so, set the data for the response.
-		if ($this->subaction == __FUNCTION__)
+		if ($this->subaction == __FUNCTION__) {
 			$this->data = __FUNCTION__;
+		}
 
 		// Check to see if there is an unread alert to delete as well...
 		Alert::deleteWhere(
-			array(
+			[
 				'content_id = {int:like_content}',
 				'content_type = {string:like_type}',
 				'id_member_started = {int:id_member_started}',
 				'content_action = {string:content_action}',
-				'is_read = {int:unread}'
-			),
-			array(
+				'is_read = {int:unread}',
+			],
+			[
 				'like_content' => $this->content,
 				'like_type' => $this->type,
 				'id_member_started' => User::$me->id,
 				'content_action' => 'like',
 				'unread' => 0,
-			)
+			],
 		);
 	}
 
@@ -488,63 +485,63 @@ protected function insert(): void
 		$user = (array) User::$me;
 		$time = time();
 
-		IntegrationHook::call('integrate_issue_like_before', array(&$type, &$content, &$user, &$time));
+		IntegrationHook::call('integrate_issue_like_before', [&$type, &$content, &$user, &$time]);
 
 		// Insert the like.
-		Db::$db->insert('insert',
+		Db::$db->insert(
+			'insert',
 			'{db_prefix}user_likes',
-			array(
+			[
 				'content_id' => 'int',
 				'content_type' => 'string-6',
 				'id_member' => 'int',
 				'like_time' => 'int',
-			),
-			array(
+			],
+			[
 				$content,
 				$type,
 				$user['id'],
 				$time,
-			),
-			array(
+			],
+			[
 				'content_id',
 				'content_type',
 				'id_member',
-			)
+			],
 		);
 
 		// Add a background task to process sending alerts.
 		// MOD AUTHORS: you can add your own background task for your own custom
 		// like event using the "integrate_issue_like" hook or your callback,
 		// both are immediately called after this.
-		if ($this->type == 'msg')
-		{
-			Db::$db->insert('insert',
+		if ($this->type == 'msg') {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}background_tasks',
-				array(
-					'task_file' => 'string',
+				[
 					'task_class' => 'string',
 					'task_data' => 'string',
 					'claimed_time' => 'int',
-				),
-				array(
-					'$sourcedir/tasks/Likes_Notify.php',
-					'SMF\Tasks\Likes_Notify',
-					Utils::jsonEncode(array(
+				],
+				[
+					'SMF\\Tasks\\Likes_Notify',
+					Utils::jsonEncode([
 						'content_id' => $content,
 						'content_type' => $type,
 						'sender_id' => $user['id'],
 						'sender_name' => $user['name'],
 						'time' => $time,
-					)),
+					]),
 					0,
-				),
-				array('id_task')
+				],
+				['id_task'],
 			);
 		}
 
 		// Are we calling this directly? If so, set the data for the response.
-		if ($this->subaction == __FUNCTION__)
+		if ($this->subaction == __FUNCTION__) {
 			$this->data = __FUNCTION__;
+		}
 	}
 
 	/**
@@ -552,21 +549,23 @@ protected function insert(): void
 	 */
 	protected function count(): void
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}user_likes
 			WHERE content_id = {int:like_content}
 				AND content_type = {string:like_type}',
-			array(
+			[
 				'like_content' => $this->content,
 				'like_type' => $this->type,
-			)
+			],
 		);
 		list($this->num_likes) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if ($this->subaction == __FUNCTION__)
+		if ($this->subaction == __FUNCTION__) {
 			$this->data = $this->num_likes;
+		}
 	}
 
 	/**
@@ -577,34 +576,32 @@ protected function count(): void
 	protected function like(): void
 	{
 		// Safety first!
-		if (empty($this->type) || empty($this->content))
-		{
+		if (empty($this->type) || empty($this->content)) {
 			$this->error = 'cannot_';
+
 			return;
 		}
 
 		// Do we already like this?
-		$request = Db::$db->query('', '
-			SELECT content_id, content_type, id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT content_id, content_type, id_member
 			FROM {db_prefix}user_likes
 			WHERE content_id = {int:like_content}
 				AND content_type = {string:like_type}
 				AND id_member = {int:id_member}',
-			array(
+			[
 				'like_content' => $this->content,
 				'like_type' => $this->type,
 				'id_member' => User::$me->id,
-			)
+			],
 		);
 		$this->already_liked = Db::$db->num_rows($request) != 0;
 		Db::$db->free_result($request);
 
-		if ($this->already_liked)
-		{
+		if ($this->already_liked) {
 			$this->delete();
-		}
-		else
-		{
+		} else {
 			$this->insert();
 		}
 
@@ -613,47 +610,48 @@ protected function like(): void
 		$this->count();
 
 		// Update the likes count for messages.
-		if ($this->type == 'msg')
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+		if ($this->type == 'msg') {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET likes = {int:num_likes}
 				WHERE id_msg = {int:id_msg}',
-				array(
+				[
 					'id_msg' => $this->content,
 					'num_likes' => $this->num_likes,
-				)
+				],
 			);
 		}
 		// Any callbacks?
-		elseif (!empty($this->valid_likes['callback']))
-		{
+		elseif (!empty($this->valid_likes['callback'])) {
 			$call = Utils::getCallable($this->valid_likes['callback']);
 
-			if (!empty($call))
-				call_user_func_array($call, array($this));
+			if (!empty($call)) {
+				call_user_func_array($call, [$this]);
+			}
 		}
 
 		// Sometimes there might be other things that need updating after we do this like.
-		IntegrationHook::call('integrate_issue_like', array($this));
+		IntegrationHook::call('integrate_issue_like', [$this]);
 
 		// Now some clean up. This is provided here for any like handlers that
 		// want to do any cache flushing.
 		// This way a like handler doesn't need to explicitly declare anything
 		// in integrate_issue_like, but do so in integrate_valid_likes where it
 		// absolutely has to exist.
-		if (!empty($this->valid_likes['flush_cache']))
+		if (!empty($this->valid_likes['flush_cache'])) {
 			CacheApi::put($this->valid_likes['flush_cache'], null);
+		}
 
 		// All done, start building the data to pass as response.
-		$this->data = array(
+		$this->data = [
 			'id_topic' => !empty($this->id_topic) ? $this->id_topic : 0,
 			'id_content' => $this->content,
 			'count' => $this->num_likes,
 			'can_like' => $this->valid_likes['can_like'],
 			'already_liked' => empty($this->already_liked),
 			'type' => $this->type,
-		);
+		];
 	}
 
 	/**
@@ -667,22 +665,23 @@ protected function like(): void
 	protected function view(): void
 	{
 		// Firstly, load what we need. We already know we can see this, so that's something.
-		Utils::$context['likers'] = array();
+		Utils::$context['likers'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, like_time
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, like_time
 			FROM {db_prefix}user_likes
 			WHERE content_id = {int:like_content}
 				AND content_type = {string:like_type}
 			ORDER BY like_time DESC',
-			array(
+			[
 				'like_content' => $this->content,
 				'like_type' => $this->type,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Utils::$context['likers'][$row['id_member']] = array('timestamp' => $row['like_time']);
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['likers'][$row['id_member']] = ['timestamp' => $row['like_time']];
 		}
 		Db::$db->free_result($request);
 
@@ -690,19 +689,18 @@ protected function view(): void
 		$members = array_keys(Utils::$context['likers']);
 		$loaded = User::load($members);
 
-		if (count($loaded) != count($members))
-		{
-			$members = array_diff($members, array_map(fn($member) => $member->id, $loaded));
+		if (count($loaded) != count($members)) {
+			$members = array_diff($members, array_map(fn ($member) => $member->id, $loaded));
 
-			foreach ($members as $not_loaded)
+			foreach ($members as $not_loaded) {
 				unset(Utils::$context['likers'][$not_loaded]);
+			}
 		}
 
-		foreach (Utils::$context['likers'] as $liker => $dummy)
-		{
-			if (!isset(User::$loaded[$liker]))
-			{
+		foreach (Utils::$context['likers'] as $liker => $dummy) {
+			if (!isset(User::$loaded[$liker])) {
 				unset(Utils::$context['likers'][$liker]);
+
 				continue;
 			}
 
@@ -717,7 +715,7 @@ protected function view(): void
 		// Lastly, setting up for display.
 		Theme::loadTemplate('Likes');
 		Lang::load('Help'); // For the close window button.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'popup';
 
 		// We already took care of our response so there is no need to bother with respond().
@@ -732,68 +730,61 @@ protected function view(): void
 	protected function respond(): void
 	{
 		// Don't do anything if someone else has already take care of the response.
-		if (!$this->set_response)
+		if (!$this->set_response) {
 			return;
+		}
 
 		// Want a JSON response, do they?
-		if ($this->valid_likes['json'])
-		{
+		if ($this->valid_likes['json']) {
 			$this->sendJsonReponse();
+
 			return;
 		}
 
 		// Set everything up for display.
 		Theme::loadTemplate('Likes');
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 
 		// If there are any errors, process them first.
-		if ($this->error)
-		{
+		if ($this->error) {
 			// If this is a generic error, set it up good.
-			if ($this->error == 'cannot_')
-			{
+			if ($this->error == 'cannot_') {
 				$this->error = $this->subaction == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
 			}
 
 			// Is this request coming from an AJAX call?
-			if ($this->js)
-			{
+			if ($this->js) {
 				Utils::$context['sub_template'] = 'generic';
-				Utils::$context['data'] = isset(Lang::$txt[$this->error]) ? Lang::$txt[$this->error] : Lang::$txt['like_error'];
+				Utils::$context['data'] = Lang::$txt[$this->error] ?? Lang::$txt['like_error'];
 			}
 			// Nope? Then just do a redirect to whatever URL was provided.
-			else
-			{
+			else {
 				Utils::redirectexit(!empty($this->valid_likes['redirect']) ? $this->valid_likes['redirect'] . ';error=' . $this->error : '');
 			}
 
 			return;
 		}
+
 		// A like operation.
-		else
-		{
-			// Not an AJAX request so send the user back to the previous
-			// location or the main page.
-			if (!$this->js)
-			{
-				Utils::redirectexit(!empty($this->valid_likes['redirect']) ? $this->valid_likes['redirect'] : '');
-			}
 
-			// These fine gentlemen all share the same template.
-			$generic = array('delete', 'insert', 'count');
+		// Not an AJAX request so send the user back to the previous
+		// location or the main page.
+		if (!$this->js) {
+			Utils::redirectexit(!empty($this->valid_likes['redirect']) ? $this->valid_likes['redirect'] : '');
+		}
 
-			if (in_array($this->subaction, $generic))
-			{
-				Utils::$context['sub_template'] = 'generic';
-				Utils::$context['data'] = isset(Lang::$txt['like_' . $this->data]) ? Lang::$txt['like_' . $this->data] : $this->data;
-			}
-			// Directly pass the current called sub-action and the data
-			// generated by its associated Method.
-			else
-			{
-				Utils::$context['sub_template'] = $this->subaction;
-				Utils::$context['data'] = $this->data;
-			}
+		// These fine gentlemen all share the same template.
+		$generic = ['delete', 'insert', 'count'];
+
+		if (in_array($this->subaction, $generic)) {
+			Utils::$context['sub_template'] = 'generic';
+			Utils::$context['data'] = Lang::$txt['like_' . $this->data] ?? $this->data;
+		}
+		// Directly pass the current called sub-action and the data
+		// generated by its associated Method.
+		else {
+			Utils::$context['sub_template'] = $this->subaction;
+			Utils::$context['data'] = $this->data;
 		}
 	}
 
@@ -802,15 +793,13 @@ protected function respond(): void
 	 */
 	protected function sendJsonReponse(): void
 	{
-		$print = array(
+		$print = [
 			'data' => $this->data,
-		);
+		];
 
 		// If there is an error, send it.
-		if ($this->error)
-		{
-			if ($this->error == 'cannot_')
-			{
+		if ($this->error) {
+			if ($this->error == 'cannot_') {
 				$this->error = $this->subaction == 'view' ? 'cannot_view_likes' : 'cannot_like_content';
 			}
 
@@ -818,10 +807,11 @@ protected function sendJsonReponse(): void
 		}
 
 		// Do you want to add something at the very last minute?
-		IntegrationHook::call('integrate_likes_json_response', array(&$print));
+		IntegrationHook::call('integrate_likes_json_response', [&$print]);
 
 		// Print the data.
 		Utils::serverResponse(Utils::jsonEncode($print));
+
 		die;
 	}
 
@@ -849,33 +839,36 @@ public static function BookOfUnknown()
 	<body style="background-color: #444455; color: white; font-style: italic; font-family: serif;">
 		<div style="margin-top: 12%; font-size: 1.1em; line-height: 1.4; text-align: center;">';
 
-		if (!isset($_GET['verse']) || ($_GET['verse'] != '2:18' && $_GET['verse'] != '22:1-2'))
+		if (!isset($_GET['verse']) || ($_GET['verse'] != '2:18' && $_GET['verse'] != '22:1-2')) {
 			$_GET['verse'] = '4:16';
+		}
 
-		if ($_GET['verse'] == '2:18')
+		if ($_GET['verse'] == '2:18') {
 			echo '
 			Woe, it was that his name wasn\'t <em>known</em>, that he came in mystery, and was recognized by none.&nbsp;And it became to be in those days <em>something</em>.&nbsp; Something not yet <em id="unknown" name="[Unknown]">unknown</em> to mankind.&nbsp; And thus what was to be known the <em>secret project</em> began into its existence.&nbsp; Henceforth the opposition was only <em>weary</em> and <em>fearful</em>, for now their match was at arms against them.';
-		elseif ($_GET['verse'] == '4:16')
+		} elseif ($_GET['verse'] == '4:16') {
 			echo '
 			And it came to pass that the <em>unbelievers</em> dwindled in number and saw rise of many <em>proselytizers</em>, and the opposition found fear in the face of the <em>x</em> and the <em>j</em> while those who stood with the <em>something</em> grew stronger and came together.&nbsp; Still, this was only the <em>beginning</em>, and what lay in the future was <em id="unknown" name="[Unknown]">unknown</em> to all, even those on the right side.';
-		elseif ($_GET['verse'] == '22:1-2')
+		} elseif ($_GET['verse'] == '22:1-2') {
 			echo '
 			<p>Now <em>behold</em>, that which was once the secret project was <em id="unknown" name="[Unknown]">unknown</em> no longer.&nbsp; Alas, it needed more than <em>only one</em>, but yet even thought otherwise.&nbsp; It became that the opposition <em>rumored</em> and lied, but still to no avail.&nbsp; Their match, though not <em>perfect</em>, had them outdone.</p>
 			<p style="margin: 2ex 1ex 0 1ex; font-size: 1.05em; line-height: 1.5; text-align: center;">Let it continue.&nbsp; <em>The end</em>.</p>';
+		}
 
 		echo '
 		</div>
 		<div style="margin-top: 2ex; font-size: 2em; text-align: right;">';
 
-		if ($_GET['verse'] == '2:18')
+		if ($_GET['verse'] == '2:18') {
 			echo '
 			from <span style="font-family: Georgia, serif;"><strong><a href="', Config::$scripturl, '?action=about:unknown;verse=4:16" style="color: white; text-decoration: none; cursor: text;">The Book of Unknown</a></strong>, 2:18</span>';
-		elseif ($_GET['verse'] == '4:16')
+		} elseif ($_GET['verse'] == '4:16') {
 			echo '
 			from <span style="font-family: Georgia, serif;"><strong><a href="', Config::$scripturl, '?action=about:unknown;verse=22:1-2" style="color: white; text-decoration: none; cursor: text;">The Book of Unknown</a></strong>, 4:16</span>';
-		elseif ($_GET['verse'] == '22:1-2')
+		} elseif ($_GET['verse'] == '22:1-2') {
 			echo '
 			from <span style="font-family: Georgia, serif;"><strong>The Book of Unknown</strong>, 22:1-2</span>';
+		}
 
 		echo '
 		</div>
diff --git a/Sources/Actions/Login.php b/Sources/Actions/Login.php
index 08649184bf..e955bb845a 100644
--- a/Sources/Actions/Login.php
+++ b/Sources/Actions/Login.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\Lang;
 use SMF\SecurityToken;
@@ -34,12 +33,11 @@ class Login extends Login2
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Login',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -69,15 +67,11 @@ class Login extends Login2
 	public function execute(): void
 	{
 		// You are already logged in, go take a tour of the boards
-		if (!empty(User::$me->id))
-		{
-	 		// This came from a valid hashed return url.  Or something that knows our secrets...
-	 		if (!empty($_REQUEST['return_hash']) && !empty($_REQUEST['return_to']) && hash_hmac('sha1', Utils::htmlspecialcharsDecode($_REQUEST['return_to']), Config::getAuthSecret()) == $_REQUEST['return_hash'])
-	 		{
+		if (!empty(User::$me->id)) {
+			// This came from a valid hashed return url.  Or something that knows our secrets...
+			if (!empty($_REQUEST['return_hash']) && !empty($_REQUEST['return_to']) && hash_hmac('sha1', Utils::htmlspecialcharsDecode($_REQUEST['return_to']), Config::getAuthSecret()) == $_REQUEST['return_hash']) {
 				Utils::redirectexit(Utils::htmlspecialcharsDecode($_REQUEST['return_to']));
-	 		}
-			else
-			{
+			} else {
 				Utils::redirectexit();
 			}
 		}
@@ -97,23 +91,19 @@ public function execute(): void
 		Utils::$context['never_expire'] = false;
 
 		// Add the login chain to the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=login',
 			'name' => Lang::$txt['login'],
-		);
+		];
 
 		// Set the login URL - will be used when the login process is done (but careful not to send us to an attachment).
-		if (isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'dlattach') === false && preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0)
-		{
+		if (isset($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'dlattach') === false && preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0) {
 			$_SESSION['login_url'] = $_SESSION['old_url'];
 		}
 		// This came from a valid hashed return url.  Or something that knows our secrets...
-		elseif (!empty($_REQUEST['return_hash']) && !empty($_REQUEST['return_to']) && hash_hmac('sha1', Utils::htmlspecialcharsDecode($_REQUEST['return_to']), Config::getAuthSecret()) == $_REQUEST['return_hash'])
-		{
+		elseif (!empty($_REQUEST['return_hash']) && !empty($_REQUEST['return_to']) && hash_hmac('sha1', Utils::htmlspecialcharsDecode($_REQUEST['return_to']), Config::getAuthSecret()) == $_REQUEST['return_hash']) {
 			$_SESSION['login_url'] = Utils::htmlspecialcharsDecode($_REQUEST['return_to']);
-		}
-		elseif (isset($_SESSION['login_url']) && strpos($_SESSION['login_url'], 'dlattach') !== false)
-		{
+		} elseif (isset($_SESSION['login_url']) && strpos($_SESSION['login_url'], 'dlattach') !== false) {
 			unset($_SESSION['login_url']);
 		}
 
@@ -132,8 +122,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -159,7 +150,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Login::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Login::exportStatic')) {
 	Login::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Login2.php b/Sources/Actions/Login2.php
index 66345bfa7b..390fccd62d 100644
--- a/Sources/Actions/Login2.php
+++ b/Sources/Actions/Login2.php
@@ -14,9 +14,9 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\Cookie;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -25,7 +25,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Validates the submitted credentials and logs the user in if they pass.
@@ -39,12 +38,13 @@ class Login2 implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Login2',
-		),
-	);
+			'checkAjax' => 'checkAjax',
+			'validatePasswordFlood' => 'validatePasswordFlood',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -67,11 +67,11 @@ class Login2 implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'main' => 'main',
 		'salt' => 'updateSalt',
 		'check' => 'checkCookie',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -105,15 +105,17 @@ class Login2 implements ActionInterface
 	public function execute(): void
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
+		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 			ErrorHandler::fatalLang('login_ssl_required', false);
+		}
 
 		self::checkAjax();
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -121,42 +123,36 @@ public function execute(): void
 	 */
 	public function updateSalt(): void
 	{
-		if (User::$me->is_guest)
+		if (User::$me->is_guest) {
 			return;
+		}
 
 		// First check for 2.1 json-format cookie in $_COOKIE
-		if (isset($_COOKIE[Config::$cookiename]) && preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+~', $_COOKIE[Config::$cookiename]) === 1)
-		{
-			list(,, $timeout) = Utils::jsonDecode($_COOKIE[Config::$cookiename], true);
+		if (isset($_COOKIE[Config::$cookiename]) && preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+~', $_COOKIE[Config::$cookiename]) === 1) {
+			list(, , $timeout) = Utils::jsonDecode($_COOKIE[Config::$cookiename], true);
 		}
 		// Try checking for 2.1 json-format cookie in $_SESSION
-		elseif (isset($_SESSION['login_' . Config::$cookiename]) && preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+~', $_SESSION['login_' . Config::$cookiename]) === 1)
-		{
-			list(,, $timeout) = Utils::jsonDecode($_SESSION['login_' . Config::$cookiename]);
+		elseif (isset($_SESSION['login_' . Config::$cookiename]) && preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+~', $_SESSION['login_' . Config::$cookiename]) === 1) {
+			list(, , $timeout) = Utils::jsonDecode($_SESSION['login_' . Config::$cookiename]);
 		}
 		// Next, try checking for 2.0 serialized string cookie in $_COOKIE
-		elseif (isset($_COOKIE[Config::$cookiename]) && preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|40):"([a-fA-F0-9]{40})?";i:2;[id]:\d+;~', $_COOKIE[Config::$cookiename]) === 1)
-		{
-			list(,, $timeout) = Utils::safeUnserialize($_COOKIE[Config::$cookiename]);
+		elseif (isset($_COOKIE[Config::$cookiename]) && preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|40):"([a-fA-F0-9]{40})?";i:2;[id]:\d+;~', $_COOKIE[Config::$cookiename]) === 1) {
+			list(, , $timeout) = Utils::safeUnserialize($_COOKIE[Config::$cookiename]);
 		}
 		// Last, see if you need to fall back on checking for 2.0 serialized string cookie in $_SESSION
-		elseif (isset($_SESSION['login_' . Config::$cookiename]) && preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|40):"([a-fA-F0-9]{40})?";i:2;[id]:\d+;~', $_SESSION['login_' . Config::$cookiename]) === 1)
-		{
-			list(,, $timeout) = Utils::safeUnserialize($_SESSION['login_' . Config::$cookiename]);
-		}
-		else
-		{
+		elseif (isset($_SESSION['login_' . Config::$cookiename]) && preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|40):"([a-fA-F0-9]{40})?";i:2;[id]:\d+;~', $_SESSION['login_' . Config::$cookiename]) === 1) {
+			list(, , $timeout) = Utils::safeUnserialize($_SESSION['login_' . Config::$cookiename]);
+		} else {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['login_no_session_cookie'], E_USER_ERROR);
 		}
 
 		User::$me->password_salt = bin2hex(Utils::randomBytes(16));
-		User::updateMemberData(User::$me->id, array('password_salt' => User::$me->password_salt));
+		User::updateMemberData(User::$me->id, ['password_salt' => User::$me->password_salt]);
 
 		// Preserve the 2FA cookie?
-		if (!empty(Config::$modSettings['tfa_mode']) && !empty($_COOKIE[Config::$cookiename . '_tfa']))
-		{
-			list(,, $exp) = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);
+		if (!empty(Config::$modSettings['tfa_mode']) && !empty($_COOKIE[Config::$cookiename . '_tfa'])) {
+			list(, , $exp) = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);
 			Cookie::setTFACookie((int) $exp - time(), User::$me->password_salt, Cookie::encrypt(User::$me->tfa_backup, User::$me->password_salt));
 		}
 
@@ -171,27 +167,21 @@ public function updateSalt(): void
 	public function checkCookie(): void
 	{
 		// Strike!  You're outta there!
-		if ($_GET['member'] != User::$me->id)
+		if ($_GET['member'] != User::$me->id) {
 			ErrorHandler::fatalLang('login_cookie_error', false);
+		}
 
 		User::$me->can_mod = User::$me->allowedTo('access_mod_center') || (!User::$me->is_guest && (User::$me->mod_cache['gq'] != '0=1' || User::$me->mod_cache['bq'] != '0=1' || (Config::$modSettings['postmod_active'] && !empty(User::$me->mod_cache['ap']))));
 
 		// Some whitelisting for login_url...
-		if (empty($_SESSION['login_url']))
-		{
+		if (empty($_SESSION['login_url'])) {
 			Utils::redirectexit(empty(User::$me->tfa_secret) ? '' : 'action=logintfa');
-		}
-		elseif (!empty($_SESSION['login_url']) && (strpos($_SESSION['login_url'], 'http://') === false && strpos($_SESSION['login_url'], 'https://') === false))
-		{
+		} elseif (!empty($_SESSION['login_url']) && (strpos($_SESSION['login_url'], 'http://') === false && strpos($_SESSION['login_url'], 'https://') === false)) {
 			unset($_SESSION['login_url']);
 			Utils::redirectexit(empty(User::$me->tfa_secret) ? '' : 'action=logintfa');
-		}
-		elseif (!empty(User::$me->tfa_secret))
-		{
+		} elseif (!empty(User::$me->tfa_secret)) {
 			Utils::redirectexit('action=logintfa');
-		}
-		else
-		{
+		} else {
 			// Best not to clutter the session data too much...
 			$temp = $_SESSION['login_url'];
 			unset($_SESSION['login_url']);
@@ -206,8 +196,9 @@ public function checkCookie(): void
 	public function main(): void
 	{
 		// Beyond this point you are assumed to be a guest trying to login.
-		if (!User::$me->is_guest)
+		if (!User::$me->is_guest) {
 			Utils::redirectexit();
+		}
 
 		// Are you guessing with a script?
 		User::$me->checkSession();
@@ -223,12 +214,11 @@ public function main(): void
 				&& preg_match('~(board|topic)[=,]~', $_SESSION['old_url']) != 0
 			)
 			|| (
-				isset($_GET['quicklogin'])
-				&& isset($_SESSION['old_url'])
+				isset($_GET['quicklogin'], $_SESSION['old_url'])
+
 				&& strpos($_SESSION['old_url'], 'login') === false
 			)
-		)
-		{
+		) {
 			$_SESSION['login_url'] = $_SESSION['old_url'];
 		}
 
@@ -236,8 +226,7 @@ public function main(): void
 		if (
 			isset($_SESSION['failed_login'])
 			&& $_SESSION['failed_login'] >= Config::$modSettings['failed_login_threshold'] * 3
-		)
-		{
+		) {
 			ErrorHandler::fatalLang('login_threshold_fail', 'login');
 		}
 
@@ -248,18 +237,15 @@ public function main(): void
 				!empty($_POST['cookielength'])
 				&& $_POST['cookielength'] == -1
 			)
-		)
-		{
+		) {
 			Config::$modSettings['cookieTime'] = 3153600;
-		}
-		elseif (
+		} elseif (
 			!empty($_POST['cookielength'])
 			&& (
 				$_POST['cookielength'] >= 1
 				&& $_POST['cookielength'] <= 3153600
 			)
-		)
-		{
+		) {
 			Config::$modSettings['cookieTime'] = (int) $_POST['cookielength'];
 		}
 
@@ -273,26 +259,27 @@ public function main(): void
 		SecurityToken::create('login');
 
 		// Set up the default/fallback stuff.
-		Utils::$context['default_username'] = isset($_POST['user']) ? preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', Utils::htmlspecialchars($_POST['user'])) : '';
+		Utils::$context['default_username'] = isset($_POST['user']) ? preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#$1;', Utils::htmlspecialchars($_POST['user'])) : '';
 		Utils::$context['default_password'] = '';
 		Utils::$context['never_expire'] = Config::$modSettings['cookieTime'] <= 525600;
-		Utils::$context['login_errors'] = array(Lang::$txt['error_occured']);
+		Utils::$context['login_errors'] = [Lang::$txt['error_occured']];
 		Utils::$context['page_title'] = Lang::$txt['login'];
 
 		// Add the login chain to the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=login',
 			'name' => Lang::$txt['login'],
-		);
+		];
 
 		// Bail out if the username and/or password are obviously invalid.
-		if (!$this->validateInput())
+		if (!$this->validateInput()) {
 			return;
+		}
 
 		// Are we using any sort of integration to validate the login?
-		if (in_array('retry', IntegrationHook::call('integrate_validate_login', array($_POST['user'], isset($_POST['passwrd']) ? $_POST['passwrd'] : null, Config::$modSettings['cookieTime'])), true))
-		{
-			Utils::$context['login_errors'] = array(Lang::$txt['incorrect_password']);
+		if (in_array('retry', IntegrationHook::call('integrate_validate_login', [$_POST['user'], $_POST['passwrd'] ?? null, Config::$modSettings['cookieTime']]), true)) {
+			Utils::$context['login_errors'] = [Lang::$txt['incorrect_password']];
+
 			return;
 		}
 
@@ -300,47 +287,47 @@ public function main(): void
 		$loaded = User::load($_POST['user'], User::LOAD_BY_NAME, 'minimal');
 
 		// Probably mistyped or their email, try it as an email address. (member_name first, though!)
-		if (empty($loaded))
+		if (empty($loaded)) {
 			$loaded = User::load($_POST['user'], User::LOAD_BY_EMAIL, 'minimal');
+		}
 
 		// Let them try again, it didn't match anything...
-		if (empty($loaded))
-		{
-			Utils::$context['login_errors'] = array(Lang::$txt['username_no_exist']);
+		if (empty($loaded)) {
+			Utils::$context['login_errors'] = [Lang::$txt['username_no_exist']];
+
 			return;
 		}
 
 		User::$my_id = (reset($loaded))->id;
 
 		// Bad password! Thought you could fool the database?!
-		if (!Security::hashVerifyPassword(User::$profiles[User::$my_id]['member_name'], Utils::htmlspecialcharsDecode($_POST['passwrd']), User::$profiles[User::$my_id]['passwd']))
-		{
+		if (!Security::hashVerifyPassword(User::$profiles[User::$my_id]['member_name'], Utils::htmlspecialcharsDecode($_POST['passwrd']), User::$profiles[User::$my_id]['passwd'])) {
 			// If the forum was recently upgraded, password might be encrypted
 			// using a different algorithm. If so, fix it. Otherwise, bail out.
-			if (!$this->checkPasswordFallbacks())
+			if (!$this->checkPasswordFallbacks()) {
 				return;
+			}
 		}
 		// Correct password, but it took multiple tries...
-		elseif (!empty(User::$profiles[User::$my_id]['passwd_flood']))
-		{
+		elseif (!empty(User::$profiles[User::$my_id]['passwd_flood'])) {
 			// Let's be sure they weren't a little hacker.
 			self::validatePasswordFlood(User::$profiles[User::$my_id]['id_member'], User::$profiles[User::$my_id]['member_name'], User::$profiles[User::$my_id]['passwd_flood'], true);
 
 			// If we got here then we can reset the flood counter.
-			User::updateMemberData(User::$profiles[User::$my_id]['id_member'], array('passwd_flood' => ''));
+			User::updateMemberData(User::$profiles[User::$my_id]['id_member'], ['passwd_flood' => '']);
 		}
 
 		// Correct password, but they've got no salt. Fix it!
-		if (strlen(User::$profiles[User::$my_id]['password_salt']) < 32)
-		{
+		if (strlen(User::$profiles[User::$my_id]['password_salt']) < 32) {
 			User::$profiles[User::$my_id]['password_salt'] = bin2hex(Utils::randomBytes(16));
 
-			User::updateMemberData(User::$profiles[User::$my_id]['id_member'], array('password_salt' => User::$profiles[User::$my_id]['password_salt']));
+			User::updateMemberData(User::$profiles[User::$my_id]['id_member'], ['password_salt' => User::$profiles[User::$my_id]['password_salt']]);
 		}
 
 		// Check their activation status.
-		if (!$this->checkActivation())
+		if (!$this->checkActivation()) {
 			return;
+		}
 
 		$this->DoLogin();
 	}
@@ -356,8 +343,9 @@ public function main(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -400,16 +388,14 @@ public static function checkAjax(): void
 				!empty($_SERVER['HTTP_X_REQUESTED_WITH'])
 				&& $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
 			)
-			||
-			(
+			|| (
 				!empty(Utils::$context['valid_cors_found'])
 				&& !empty($_SERVER['HTTP_X_SMF_AJAX'])
 				&& isset($_REQUEST['ajax'])
 			)
-		)
-		{
+		) {
 			Utils::$context['from_ajax'] = true;
-			Utils::$context['template_layers'] = array();
+			Utils::$context['template_layers'] = [];
 		}
 	}
 
@@ -429,17 +415,16 @@ public static function validatePasswordFlood($id_member, $member_name, $password
 
 		// Destroy any session or cookie data about this member, as they validated wrong.
 		// Only if they're not validating for 2FA
-		if (!$tfa)
-		{
+		if (!$tfa) {
 			Cookie::setLoginCookie(-3600, 0);
 
-			if (isset($_SESSION['login_' . Config::$cookiename]))
+			if (isset($_SESSION['login_' . Config::$cookiename])) {
 				unset($_SESSION['login_' . Config::$cookiename]);
+			}
 		}
 
 		// We need a member!
-		if (!$id_member)
-		{
+		if (!$id_member) {
 			// Redirect back!
 			Utils::redirectexit();
 
@@ -448,36 +433,36 @@ public static function validatePasswordFlood($id_member, $member_name, $password
 		}
 
 		// Right, have we got a flood value?
-		if ($password_flood_value !== false)
+		if ($password_flood_value !== false) {
 			@list($time_stamp, $number_tries) = explode('|', $password_flood_value);
+		}
 
 		// Timestamp or number of tries invalid?
-		if (empty($number_tries) || empty($time_stamp))
-		{
+		if (empty($number_tries) || empty($time_stamp)) {
 			$number_tries = 0;
 			$time_stamp = time();
 		}
 
 		// They've failed logging in already
-		if (!empty($number_tries))
-		{
+		if (!empty($number_tries)) {
 			// Give them less chances if they failed before
 			$number_tries = $time_stamp < time() - 20 ? 2 : $number_tries;
 
 			// They are trying too fast, make them wait longer
-			if ($time_stamp < time() - 10)
+			if ($time_stamp < time() - 10) {
 				$time_stamp = time();
+			}
 		}
 
 		$number_tries++;
 
 		// Broken the law?
-		if ($number_tries > 5)
+		if ($number_tries > 5) {
 			ErrorHandler::fatalLang('login_threshold_brute_fail', 'login', [$member_name]);
+		}
 
 		// Otherwise set the members data. If they correct on their first attempt then we actually clear it, otherwise we set it!
-		User::updateMemberData($id_member, array('passwd_flood' => $was_correct && $number_tries == 1 ? '' : $time_stamp . '|' . $number_tries));
-
+		User::updateMemberData($id_member, ['passwd_flood' => $was_correct && $number_tries == 1 ? '' : $time_stamp . '|' . $number_tries]);
 	}
 
 	/******************
@@ -489,8 +474,9 @@ public static function validatePasswordFlood($id_member, $member_name, $password
 	 */
 	protected function __construct()
 	{
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 
 	/**
@@ -501,31 +487,30 @@ protected function __construct()
 	protected function validateInput(): bool
 	{
 		// You forgot to type your username, dummy!
-		if (!isset($_POST['user']) || $_POST['user'] == '')
-		{
-			Utils::$context['login_errors'] = array(Lang::$txt['need_username']);
+		if (!isset($_POST['user']) || $_POST['user'] == '') {
+			Utils::$context['login_errors'] = [Lang::$txt['need_username']];
+
 			return false;
 		}
 
 		// Hmm... maybe 'admin' will login with no password. Uhh... NO!
-		if (!isset($_POST['passwrd']) || $_POST['passwrd'] == '')
-		{
-			Utils::$context['login_errors'] = array(Lang::$txt['no_password']);
+		if (!isset($_POST['passwrd']) || $_POST['passwrd'] == '') {
+			Utils::$context['login_errors'] = [Lang::$txt['no_password']];
+
 			return false;
 		}
 
 		// No funky symbols either.
-		if (preg_match('~[<>&"\'=\\\]~', preg_replace('~(&#(\\d{1,7}|x[0-9a-fA-F]{1,6});)~', '', $_POST['user'])) != 0)
-		{
-			Utils::$context['login_errors'] = array(Lang::$txt['error_invalid_characters_username']);
+		if (preg_match('~[<>&"\'=\\\]~', preg_replace('~(&#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', '', $_POST['user'])) != 0) {
+			Utils::$context['login_errors'] = [Lang::$txt['error_invalid_characters_username']];
+
 			return false;
 		}
 
 		// And if it's too long, trim it back.
-		if (Utils::entityStrlen($_POST['user']) > 80)
-		{
+		if (Utils::entityStrlen($_POST['user']) > 80) {
 			$_POST['user'] = Utils::entitySubstr($_POST['user'], 0, 79);
-			Utils::$context['default_username'] = preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', Utils::htmlspecialchars($_POST['user']));
+			Utils::$context['default_username'] = preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#$1;', Utils::htmlspecialchars($_POST['user']));
 		}
 
 		return true;
@@ -548,11 +533,10 @@ protected function checkPasswordFallbacks(): bool
 		self::validatePasswordFlood(User::$profiles[User::$my_id]['id_member'], User::$profiles[User::$my_id]['member_name'], User::$profiles[User::$my_id]['passwd_flood']);
 
 		// Maybe we were too hasty... let's try some other authentication methods.
-		$other_passwords = array();
+		$other_passwords = [];
 
 		// None of the below cases will be used most of the time (because the salt is normally set.)
-		if (!empty(Config::$modSettings['enable_password_conversion']) && User::$profiles[User::$my_id]['password_salt'] == '')
-		{
+		if (!empty(Config::$modSettings['enable_password_conversion']) && User::$profiles[User::$my_id]['password_salt'] == '') {
 			// YaBB SE, Discus, MD5 (used a lot), SHA-1 (used some), SMF 1.0.x, IkonBoard, and none at all.
 			$other_passwords[] = crypt($_POST['passwrd'], substr($_POST['passwrd'], 0, 2));
 			$other_passwords[] = crypt($_POST['passwrd'], substr(User::$profiles[User::$my_id]['passwd'], 0, 2));
@@ -568,8 +552,9 @@ protected function checkPasswordFallbacks(): bool
 			$other_passwords[] = crypt(md5($_POST['passwrd']), md5($_POST['passwrd']));
 
 			// Snitz style - SHA-256.
-			if (strlen(User::$profiles[User::$my_id]['passwd']) == 64 && function_exists('mhash') && defined('MHASH_SHA256'))
+			if (strlen(User::$profiles[User::$my_id]['passwd']) == 64 && function_exists('mhash') && defined('MHASH_SHA256')) {
 				$other_passwords[] = bin2hex(mhash(MHASH_SHA256, $_POST['passwrd']));
+			}
 
 			// phpBB3.
 			$other_passwords[] = $this->phpBB3_password_check($_POST['passwrd'], User::$profiles[User::$my_id]['passwd']);
@@ -578,12 +563,10 @@ protected function checkPasswordFallbacks(): bool
 			$other_passwords[] = md5(crypt($_POST['passwrd'], 'CRYPT_MD5'));
 		}
 		// If the salt is set let's try some other options
-		elseif (!empty(Config::$modSettings['enable_password_conversion']) && User::$profiles[User::$my_id]['password_salt'] != '')
-		{
+		elseif (!empty(Config::$modSettings['enable_password_conversion']) && User::$profiles[User::$my_id]['password_salt'] != '') {
 			// PHPBB 3 check this function exists in PHP 5.5 or higher
-			if (function_exists('password_verify'))
-			{
-				$other_passwords[] = password_verify($_POST['passwrd'],User::$profiles[User::$my_id]['password_salt']);
+			if (function_exists('password_verify')) {
+				$other_passwords[] = password_verify($_POST['passwrd'], User::$profiles[User::$my_id]['password_salt']);
 			}
 
 			// PHP-Fusion
@@ -593,8 +576,7 @@ protected function checkPasswordFallbacks(): bool
 			$other_passwords[] = md5(md5(User::$profiles[User::$my_id]['password_salt']) . md5($_POST['passwrd']));
 		}
 		// The hash should be 40 if it's SHA-1, so we're safe with more here too.
-		elseif (!empty(Config::$modSettings['enable_password_conversion']) && strlen(User::$profiles[User::$my_id]['passwd']) == 32)
-		{
+		elseif (!empty(Config::$modSettings['enable_password_conversion']) && strlen(User::$profiles[User::$my_id]['passwd']) == 32) {
 			// vBulletin 3 style hashing?  Let's welcome them with open arms \o/.
 			$other_passwords[] = md5(md5($_POST['passwrd']) . stripslashes(User::$profiles[User::$my_id]['password_salt']));
 
@@ -604,16 +586,13 @@ protected function checkPasswordFallbacks(): bool
 			// Some common md5 ones.
 			$other_passwords[] = md5(User::$profiles[User::$my_id]['password_salt'] . $_POST['passwrd']);
 			$other_passwords[] = md5($_POST['passwrd'] . User::$profiles[User::$my_id]['password_salt']);
-		}
-		elseif (strlen(User::$profiles[User::$my_id]['passwd']) == 40)
-		{
+		} elseif (strlen(User::$profiles[User::$my_id]['passwd']) == 40) {
 			// Maybe they are using a hash from before the password fix.
 			// This is also valid for SMF 1.1 to 2.0 style of hashing, changed to bcrypt in SMF 2.1
 			$other_passwords[] = sha1(strtolower(User::$profiles[User::$my_id]['member_name']) . Utils::htmlspecialcharsDecode($_POST['passwrd']));
 
 			// BurningBoard3 style of hashing.
-			if (!empty(Config::$modSettings['enable_password_conversion']))
-			{
+			if (!empty(Config::$modSettings['enable_password_conversion'])) {
 				$other_passwords[] = sha1(User::$profiles[User::$my_id]['password_salt'] . sha1(User::$profiles[User::$my_id]['password_salt'] . sha1($_POST['passwrd'])));
 			}
 
@@ -621,52 +600,45 @@ protected function checkPasswordFallbacks(): bool
 			$other_passwords[] = sha1(User::$profiles[User::$my_id]['password_salt'] . sha1($_POST['passwrd']));
 
 			// Perhaps we converted to UTF-8 and have a valid password being hashed differently.
-			if (Utils::$context['character_set'] == 'UTF-8' && !empty(Config::$modSettings['previousCharacterSet']) && Config::$modSettings['previousCharacterSet'] != 'utf8')
-			{
+			if (Utils::$context['character_set'] == 'UTF-8' && !empty(Config::$modSettings['previousCharacterSet']) && Config::$modSettings['previousCharacterSet'] != 'utf8') {
 				// Try iconv first, for no particular reason.
-				if (function_exists('iconv'))
-				{
+				if (function_exists('iconv')) {
 					$other_passwords['iconv'] = sha1(strtolower(iconv('UTF-8', Config::$modSettings['previousCharacterSet'], User::$profiles[User::$my_id]['member_name'])) . Utils::htmlspecialcharsDecode(iconv('UTF-8', Config::$modSettings['previousCharacterSet'], $_POST['passwrd'])));
 				}
 
 				// Say it aint so, iconv failed!
-				if (empty($other_passwords['iconv']) && function_exists('mb_convert_encoding'))
-				{
+				if (empty($other_passwords['iconv']) && function_exists('mb_convert_encoding')) {
 					$other_passwords[] = sha1(strtolower(mb_convert_encoding(User::$profiles[User::$my_id]['member_name'], 'UTF-8', Config::$modSettings['previousCharacterSet'])) . Utils::htmlspecialcharsDecode(mb_convert_encoding($_POST['passwrd'], 'UTF-8', Config::$modSettings['previousCharacterSet'])));
 				}
 			}
 		}
 
 		// Allows mods to easily extend the $other_passwords array
-		IntegrationHook::call('integrate_other_passwords', array(&$other_passwords));
+		IntegrationHook::call('integrate_other_passwords', [&$other_passwords]);
 
 		// Whichever encryption it was using, let's make it use SMF's now ;).
-		if (in_array(User::$profiles[User::$my_id]['passwd'], $other_passwords))
-		{
+		if (in_array(User::$profiles[User::$my_id]['passwd'], $other_passwords)) {
 			User::$profiles[User::$my_id]['passwd'] = Security::hashPassword(User::$profiles[User::$my_id]['member_name'], Utils::htmlspecialcharsDecode($_POST['passwrd']));
 			User::$profiles[User::$my_id]['password_salt'] = bin2hex(Utils::randomBytes(16));
 
 			// Update the password and set up the hash.
-			User::updateMemberData(User::$profiles[User::$my_id]['id_member'], array('passwd' => User::$profiles[User::$my_id]['passwd'], 'password_salt' => User::$profiles[User::$my_id]['password_salt'], 'passwd_flood' => ''));
+			User::updateMemberData(User::$profiles[User::$my_id]['id_member'], ['passwd' => User::$profiles[User::$my_id]['passwd'], 'password_salt' => User::$profiles[User::$my_id]['password_salt'], 'passwd_flood' => '']);
 		}
 		// Okay, they for sure didn't enter the password!
-		else
-		{
+		else {
 			// They've messed up again - keep a count to see if they need a hand.
 			$_SESSION['failed_login'] = isset($_SESSION['failed_login']) ? ($_SESSION['failed_login'] + 1) : 1;
 
 			// Hmm... don't remember it, do you?  Here, try the password reminder ;).
-			if ($_SESSION['failed_login'] >= Config::$modSettings['failed_login_threshold'])
-			{
+			if ($_SESSION['failed_login'] >= Config::$modSettings['failed_login_threshold']) {
 				Utils::redirectexit('action=reminder');
 			}
 			// We'll give you another chance...
-			else
-			{
+			else {
 				// Log an error so we know that it didn't go well in the error log.
 				ErrorHandler::log(Lang::$txt['incorrect_password'] . ' - <span class="remove">' . User::$profiles[User::$my_id]['member_name'] . '</span>', 'user');
 
-				Utils::$context['login_errors'] = array(Lang::$txt['incorrect_password']);
+				Utils::$context['login_errors'] = [Lang::$txt['incorrect_password']];
 
 				return false;
 			}
@@ -686,8 +658,9 @@ protected function phpBB3_password_check()
 		$passwd_hash = User::$profiles[User::$my_id]['passwd'];
 
 		// Too long or too short?
-		if (strlen($passwd_hash) != 34)
+		if (strlen($passwd_hash) != 34) {
 			return;
+		}
 
 		// Range of characters allowed.
 		$range = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
@@ -698,31 +671,37 @@ protected function phpBB3_password_check()
 		$salt = substr($passwd_hash, 4, 8);
 
 		$hash = md5($salt . $passwd, true);
-		for (; $count != 0; --$count)
+
+		for (; $count != 0; --$count) {
 			$hash = md5($hash . $passwd, true);
+		}
 
 		$output = substr($passwd_hash, 0, 12);
 		$i = 0;
-		while ($i < 16)
-		{
+
+		while ($i < 16) {
 			$value = ord($hash[$i++]);
 			$output .= $range[$value & 0x3f];
 
-			if ($i < 16)
+			if ($i < 16) {
 				$value |= ord($hash[$i]) << 8;
+			}
 
 			$output .= $range[($value >> 6) & 0x3f];
 
-			if ($i++ >= 16)
+			if ($i++ >= 16) {
 				break;
+			}
 
-			if ($i < 16)
+			if ($i < 16) {
 				$value |= ord($hash[$i]) << 16;
+			}
 
 			$output .= $range[($value >> 12) & 0x3f];
 
-			if ($i++ >= 16)
+			if ($i++ >= 16) {
 				break;
+			}
 
 			$output .= $range[($value >> 18) & 0x3f];
 		}
@@ -736,35 +715,31 @@ protected function phpBB3_password_check()
 	 */
 	protected function checkActivation()
 	{
-		if (!isset(Utils::$context['login_errors']))
-			Utils::$context['login_errors'] = array();
+		if (!isset(Utils::$context['login_errors'])) {
+			Utils::$context['login_errors'] = [];
+		}
 
 		// What is the true activation status of this account?
 		$activation_status = User::$profiles[User::$my_id]['is_activated'] > 10 ? User::$profiles[User::$my_id]['is_activated'] - 10 : User::$profiles[User::$my_id]['is_activated'];
 
 		// Check if the account is activated - COPPA first...
-		if ($activation_status == 5)
-		{
+		if ($activation_status == 5) {
 			Utils::$context['login_errors'][] = Lang::$txt['coppa_no_consent'] . ' <a href="' . Config::$scripturl . '?action=coppa;member=' . User::$profiles[User::$my_id]['id_member'] . '">' . Lang::$txt['coppa_need_more_details'] . '</a>';
 
 			return false;
 		}
+
 		// Awaiting approval still?
-		elseif ($activation_status == 3)
-		{
+		if ($activation_status == 3) {
 			ErrorHandler::fatalLang('still_awaiting_approval', 'user');
 		}
 		// Awaiting deletion, changed their mind?
-		elseif ($activation_status == 4)
-		{
-			if (isset($_REQUEST['undelete']))
-			{
-				User::updateMemberData(User::$profiles[User::$my_id]['id_member'], array('is_activated' => 1));
+		elseif ($activation_status == 4) {
+			if (isset($_REQUEST['undelete'])) {
+				User::updateMemberData(User::$profiles[User::$my_id]['id_member'], ['is_activated' => 1]);
 
-				Config::updateModSettings(array('unapprovedMembers' => (Config::$modSettings['unapprovedMembers'] > 0 ? Config::$modSettings['unapprovedMembers'] - 1 : 0)));
-			}
-			else
-			{
+				Config::updateModSettings(['unapprovedMembers' => (Config::$modSettings['unapprovedMembers'] > 0 ? Config::$modSettings['unapprovedMembers'] - 1 : 0)]);
+			} else {
 				Utils::$context['disable_login_hashing'] = true;
 				Utils::$context['login_errors'][] = Lang::$txt['awaiting_delete_account'];
 				Utils::$context['login_show_undelete'] = true;
@@ -773,8 +748,7 @@ protected function checkActivation()
 			}
 		}
 		// Standard activation?
-		elseif ($activation_status != 1)
-		{
+		elseif ($activation_status != 1) {
 			ErrorHandler::log(Lang::$txt['activate_not_completed1'] . ' - <span class="remove">' . User::$profiles[User::$my_id]['member_name'] . '</span>', 'user');
 
 			Utils::$context['login_errors'][] = Lang::$txt['activate_not_completed1'] . ' <a href="' . Config::$scripturl . '?action=activate;sa=resend;u=' . User::$profiles[User::$my_id]['id_member'] . '">' . Lang::$txt['activate_not_completed2'] . '</a>';
@@ -791,7 +765,7 @@ protected function checkActivation()
 	protected function DoLogin()
 	{
 		// Call login integration functions.
-		IntegrationHook::call('integrate_login', array(User::$profiles[User::$my_id]['member_name'], null, Config::$modSettings['cookieTime']));
+		IntegrationHook::call('integrate_login', [User::$profiles[User::$my_id]['member_name'], null, Config::$modSettings['cookieTime']]);
 
 		// Get ready to set the cookie...
 		User::setMe(User::$my_id);
@@ -800,8 +774,9 @@ protected function DoLogin()
 		Cookie::setLoginCookie(60 * Config::$modSettings['cookieTime'], User::$me->id, Cookie::encrypt(User::$me->passwd, User::$me->password_salt));
 
 		// Reset the login threshold.
-		if (isset($_SESSION['failed_login']))
+		if (isset($_SESSION['failed_login'])) {
 			unset($_SESSION['failed_login']);
+		}
 
 		// Are you banned?
 		User::$me->kickIfBanned(true);
@@ -810,65 +785,61 @@ protected function DoLogin()
 		unset($_SESSION['language'], $_SESSION['id_theme']);
 
 		// First login?
-		if (User::$me->last_login === 0)
-		{
+		if (User::$me->last_login === 0) {
 			$_SESSION['first_login'] = true;
-		}
-		else
-		{
+		} else {
 			unset($_SESSION['first_login']);
 		}
 
 		// You've logged in, haven't you?
-		$update = array('member_ip' => User::$me->ip, 'member_ip2' => $_SERVER['BAN_CHECK_IP']);
+		$update = ['member_ip' => User::$me->ip, 'member_ip2' => $_SERVER['BAN_CHECK_IP']];
 
-		if (empty(User::$me->tfa_secret))
+		if (empty(User::$me->tfa_secret)) {
 			$update['last_login'] = time();
+		}
 
 		User::updateMemberData(User::$me->id, $update);
 
 		// Get rid of the online entry for that old guest....
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_online
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_online
 			WHERE session = {string:session}',
-			array(
+			[
 				'session' => 'ip' . User::$me->ip,
-			)
+			],
 		);
 		$_SESSION['log_time'] = 0;
 
 		// Log this entry, only if we have it enabled.
-		if (!empty(Config::$modSettings['loginHistoryDays']))
-		{
-			Db::$db->insert('insert',
+		if (!empty(Config::$modSettings['loginHistoryDays'])) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}member_logins',
-				array(
+				[
 					'id_member' => 'int', 'time' => 'int', 'ip' => 'inet', 'ip2' => 'inet',
-				),
-				array(
-					User::$me->id, time(), User::$me->ip, User::$me->ip2
-				),
-				array(
-					'id_member', 'time'
-				)
+				],
+				[
+					User::$me->id, time(), User::$me->ip, User::$me->ip2,
+				],
+				[
+					'id_member', 'time',
+				],
 			);
 		}
 
 		// Just log you back out if it's in maintenance mode and you AREN'T an admin.
-		if (empty(Config::$maintenance) || User::$me->allowedTo('admin_forum'))
-		{
+		if (empty(Config::$maintenance) || User::$me->allowedTo('admin_forum')) {
 			Utils::redirectexit('action=login2;sa=check;member=' . User::$me->id, Utils::$context['server']['needs_login_fix']);
-		}
-		else
-		{
+		} else {
 			Utils::redirectexit('action=logout;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], Utils::$context['server']['needs_login_fix']);
 		}
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Login2::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Login2::exportStatic')) {
 	Login2::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/LoginTFA.php b/Sources/Actions/LoginTFA.php
index 06c8af3a89..6eaf99c194 100644
--- a/Sources/Actions/LoginTFA.php
+++ b/Sources/Actions/LoginTFA.php
@@ -14,16 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\Cookie;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Security;
 use SMF\Theme;
+use SMF\TOTP\Auth as Tfa;
 use SMF\User;
 use SMF\Utils;
-use SMF\TOTP\Auth as Tfa;
 
 /**
  * Handles Two-Factor Authentication credentials.
@@ -37,12 +36,11 @@ class LoginTFA extends Login2
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'LoginTFA',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -65,8 +63,7 @@ class LoginTFA extends Login2
 	 */
 	public function execute(): void
 	{
-		if (!User::$me->is_guest || empty(Utils::$context['tfa_member']) || empty(Config::$modSettings['tfa_mode']))
-		{
+		if (!User::$me->is_guest || empty(Utils::$context['tfa_member']) || empty(Config::$modSettings['tfa_mode'])) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
@@ -75,65 +72,55 @@ public function execute(): void
 		$member = Utils::$context['tfa_member'];
 
 		// Prevent replay attacks by limiting at least 2 minutes before they can log in again via 2FA
-		if (time() - $member['last_login'] < 120)
+		if (time() - $member['last_login'] < 120) {
 			ErrorHandler::fatalLang('tfa_wait', false);
+		}
 
 		$totp = new Tfa($member['tfa_secret']);
 		$totp->setRange(1);
 
 		parent::checkAjax();
 
-		if (!empty($_POST['tfa_code']) && empty($_POST['tfa_backup']))
-		{
+		if (!empty($_POST['tfa_code']) && empty($_POST['tfa_backup'])) {
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
-			{
+			if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 				ErrorHandler::fatalLang('login_ssl_required', false);
 			}
 
 			$code = $_POST['tfa_code'];
 
-			if (strlen($code) == $totp->getCodeLength() && $totp->validateCode($code))
-			{
-				User::updateMemberData($member['id_member'], array('last_login' => time()));
+			if (strlen($code) == $totp->getCodeLength() && $totp->validateCode($code)) {
+				User::updateMemberData($member['id_member'], ['last_login' => time()]);
 
 				Cookie::setTFACookie(3153600, $member['id_member'], Cookie::encrypt($member['tfa_backup'], $member['password_salt']));
 
 				Utils::redirectexit();
-			}
-			else
-			{
+			} else {
 				parent::validatePasswordFlood($member['id_member'], $member['member_name'], $member['passwd_flood'], false, true);
 
 				Utils::$context['tfa_error'] = true;
 				Utils::$context['tfa_value'] = $_POST['tfa_code'];
 			}
-		}
-		elseif (!empty($_POST['tfa_backup']))
-		{
+		} elseif (!empty($_POST['tfa_backup'])) {
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
-			{
+			if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 				ErrorHandler::fatalLang('login_ssl_required', false);
 			}
 
 			$backup = $_POST['tfa_backup'];
 
-			if (Security::hashVerifyPassword($member['member_name'], $backup, $member['tfa_backup']))
-			{
+			if (Security::hashVerifyPassword($member['member_name'], $backup, $member['tfa_backup'])) {
 				// Get rid of their current TFA settings
-				User::updateMemberData($member['id_member'], array(
+				User::updateMemberData($member['id_member'], [
 					'tfa_secret' => '',
 					'tfa_backup' => '',
 					'last_login' => time(),
-				));
+				]);
 
 				Cookie::setTFACookie(3153600, $member['id_member'], Cookie::encrypt($member['tfa_backup'], $member['password_salt']));
 
 				Utils::redirectexit('action=profile;area=tfasetup;backup');
-			}
-			else
-			{
+			} else {
 				parent::validatePasswordFlood($member['id_member'], $member['member_name'], $member['passwd_flood'], false, true);
 
 				Utils::$context['tfa_backup_error'] = true;
@@ -159,8 +146,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -186,7 +174,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\LoginTFA::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\LoginTFA::exportStatic')) {
 	LoginTFA::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Logout.php b/Sources/Actions/Logout.php
index a504c23727..e92d9ca312 100644
--- a/Sources/Actions/Logout.php
+++ b/Sources/Actions/Logout.php
@@ -14,15 +14,14 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\Cookie;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Logs the user out.
@@ -36,12 +35,11 @@ class Logout extends Login2
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Logout',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -75,26 +73,22 @@ class Logout extends Login2
 	public function execute(bool $internal = false, bool $redirect = true): void
 	{
 		// They decided to cancel a logout?
-		if (!$internal && isset($_POST['cancel']) && isset($_GET[Utils::$context['session_var']]))
-		{
+		if (!$internal && isset($_POST['cancel'], $_GET[Utils::$context['session_var']])) {
 			Utils::redirectexit(!empty($_SESSION['logout_return']) ? $_SESSION['logout_return'] : '');
 		}
 		// Prompt to logout?
-		elseif (!$internal && !isset($_GET[Utils::$context['session_var']]))
-		{
+		elseif (!$internal && !isset($_GET[Utils::$context['session_var']])) {
 			Lang::load('Login');
 			Theme::loadTemplate('Login');
 			Utils::$context['sub_template'] = 'logout';
 
 			// This came from a valid hashed return url.  Or something that knows our secrets...
-			if (!empty($_REQUEST['return_hash']) && !empty($_REQUEST['return_to']) && hash_hmac('sha1', Utils::htmlspecialcharsDecode($_REQUEST['return_to']), Config::getAuthSecret()) == $_REQUEST['return_hash'])
-			{
+			if (!empty($_REQUEST['return_hash']) && !empty($_REQUEST['return_to']) && hash_hmac('sha1', Utils::htmlspecialcharsDecode($_REQUEST['return_to']), Config::getAuthSecret()) == $_REQUEST['return_hash']) {
 				$_SESSION['logout_url'] = Utils::htmlspecialcharsDecode($_REQUEST['return_to']);
 				$_SESSION['logout_return'] = $_SESSION['logout_url'];
 			}
 			// Setup the return address.
-			elseif (isset($_SESSION['old_url']))
-			{
+			elseif (isset($_SESSION['old_url'])) {
 				$_SESSION['logout_return'] = $_SESSION['old_url'];
 			}
 
@@ -102,30 +96,30 @@ public function execute(bool $internal = false, bool $redirect = true): void
 			return;
 		}
 		// Make sure they aren't being auto-logged out.
-		elseif (!$internal && isset($_GET[Utils::$context['session_var']]))
-		{
+		elseif (!$internal && isset($_GET[Utils::$context['session_var']])) {
 			User::$me->checkSession('get');
 		}
 
-		if (isset($_SESSION['pack_ftp']))
+		if (isset($_SESSION['pack_ftp'])) {
 			$_SESSION['pack_ftp'] = null;
+		}
 
 		// It won't be first login anymore.
 		unset($_SESSION['first_login']);
 
 		// Just ensure they aren't a guest!
-		if (!User::$me->is_guest)
-		{
+		if (!User::$me->is_guest) {
 			// Pass the logout information to integrations.
-			IntegrationHook::call('integrate_logout', array(User::$me->username));
+			IntegrationHook::call('integrate_logout', [User::$me->username]);
 
 			// If you log out, you aren't online anymore :P.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_online
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_online
 				WHERE id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 		}
 
@@ -137,12 +131,12 @@ public function execute(bool $internal = false, bool $redirect = true): void
 		// And some other housekeeping while we're at it.
 		$salt = bin2hex(Utils::randomBytes(16));
 
-		if (!empty(User::$me->id))
-			User::updateMemberData(User::$me->id, array('password_salt' => $salt));
+		if (!empty(User::$me->id)) {
+			User::updateMemberData(User::$me->id, ['password_salt' => $salt]);
+		}
 
-		if (!empty(Config::$modSettings['tfa_mode']) && !empty(User::$me->id) && !empty($_COOKIE[Config::$cookiename . '_tfa']))
-		{
-			list(,, $exp) = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);
+		if (!empty(Config::$modSettings['tfa_mode']) && !empty(User::$me->id) && !empty($_COOKIE[Config::$cookiename . '_tfa'])) {
+			list(, , $exp) = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);
 
 			Cookie::setTFACookie((int) $exp - time(), $salt, Cookie::encrypt(User::$me->tfa_backup, $salt));
 		}
@@ -150,19 +144,13 @@ public function execute(bool $internal = false, bool $redirect = true): void
 		session_destroy();
 
 		// Off to the merry board index we go!
-		if ($redirect)
-		{
-			if (empty($_SESSION['logout_url']))
-			{
+		if ($redirect) {
+			if (empty($_SESSION['logout_url'])) {
 				Utils::redirectexit('', Utils::$context['server']['needs_login_fix']);
-			}
-			elseif (!empty($_SESSION['logout_url']) && (strpos($_SESSION['logout_url'], 'http://') === false && strpos($_SESSION['logout_url'], 'https://') === false))
-			{
+			} elseif (!empty($_SESSION['logout_url']) && (strpos($_SESSION['logout_url'], 'http://') === false && strpos($_SESSION['logout_url'], 'https://') === false)) {
 				unset($_SESSION['logout_url']);
 				Utils::redirectexit();
-			}
-			else
-			{
+			} else {
 				$temp = $_SESSION['logout_url'];
 				unset($_SESSION['logout_url']);
 
@@ -182,8 +170,9 @@ public function execute(bool $internal = false, bool $redirect = true): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -212,7 +201,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Logout::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Logout::exportStatic')) {
 	Logout::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Memberlist.php b/Sources/Actions/Memberlist.php
index 80fccd03dc..4df6e61490 100644
--- a/Sources/Actions/Memberlist.php
+++ b/Sources/Actions/Memberlist.php
@@ -14,9 +14,9 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -25,7 +25,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains the methods for displaying and searching in the
@@ -40,14 +39,15 @@ class Memberlist implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Memberlist',
+			'MLAll' => 'MLAll',
+			'MLSearch' => 'MLSearch',
 			'printRows' => 'printMemberListRows',
 			'getCustFields' => 'getCustFieldsMList',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -68,18 +68,18 @@ class Memberlist implements ActionInterface
 	 * Labels will be replaced with the indicated $txt strings.
 	 * Selected will be changed to match the current sub-action.
 	 */
-	public array $sort_links = array(
-		'all' => array(
+	public array $sort_links = [
+		'all' => [
 			'label' => 'view_all_members',
 			'action' => 'all',
 			'selected' => true,
-		),
-		'search' => array(
+		],
+		'search' => [
 			'label' => 'mlist_search',
 			'action' => 'search',
 			'selected' => false,
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var int
@@ -97,10 +97,10 @@ class Memberlist implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'all' => 'all',
 		'search' => 'search',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -135,8 +135,7 @@ public function execute(): void
 
 		Theme::loadTemplate('Memberlist');
 
-		foreach ($this->sort_links as $sa => &$sort_link)
-		{
+		foreach ($this->sort_links as $sa => &$sort_link) {
 			$sort_link['label'] = Lang::$txt[$sort_link['label']] ?? ($sort_link['label'] ?? ($sort_link['action'] ?? $sa));
 
 			$sort_link['selected'] = $this->subaction === ($sort_link['action'] ?? $sa);
@@ -148,96 +147,98 @@ public function execute(): void
 		Utils::$context['num_members'] = Config::$modSettings['totalMembers'];
 
 		// Set up the columns...
-		Utils::$context['columns'] = array(
-			'is_online' => array(
+		Utils::$context['columns'] = [
+			'is_online' => [
 				'label' => Lang::$txt['status'],
-				'sort' => array(
+				'sort' => [
 					'down' => User::$me->allowedTo('moderate_forum') ? 'COALESCE(lo.log_time, 1) ASC, real_name ASC' : 'CASE WHEN mem.show_online THEN COALESCE(lo.log_time, 1) ELSE 1 END ASC, real_name ASC',
-					'up' => User::$me->allowedTo('moderate_forum') ? 'COALESCE(lo.log_time, 1) DESC, real_name DESC' : 'CASE WHEN mem.show_online THEN COALESCE(lo.log_time, 1) ELSE 1 END DESC, real_name DESC'
-				),
-			),
-			'real_name' => array(
+					'up' => User::$me->allowedTo('moderate_forum') ? 'COALESCE(lo.log_time, 1) DESC, real_name DESC' : 'CASE WHEN mem.show_online THEN COALESCE(lo.log_time, 1) ELSE 1 END DESC, real_name DESC',
+				],
+			],
+			'real_name' => [
 				'label' => Lang::$txt['name'],
 				'class' => 'lefttext',
-				'sort' => array(
+				'sort' => [
 					'down' => 'mem.real_name DESC',
-					'up' => 'mem.real_name ASC'
-				),
-			),
-			'website_url' => array(
+					'up' => 'mem.real_name ASC',
+				],
+			],
+			'website_url' => [
 				'label' => Lang::$txt['website'],
 				'link_with' => 'website',
-				'sort' => array(
+				'sort' => [
 					'down' => User::$me->is_guest ? '1=1' : 'mem.website_url = \'\', mem.website_url is null, mem.website_url DESC',
-					'up' => User::$me->is_guest ? ' 1=1' : 'mem.website_url != \'\', mem.website_url is not null, mem.website_url ASC'
-				),
-			),
-			'id_group' => array(
+					'up' => User::$me->is_guest ? ' 1=1' : 'mem.website_url != \'\', mem.website_url is not null, mem.website_url ASC',
+				],
+			],
+			'id_group' => [
 				'label' => Lang::$txt['position'],
-				'sort' => array(
+				'sort' => [
 					'down' => 'mg.group_name is null, mg.group_name DESC',
-					'up' => 'mg.group_name is not null, mg.group_name ASC'
-				),
-			),
-			'registered' => array(
+					'up' => 'mg.group_name is not null, mg.group_name ASC',
+				],
+			],
+			'registered' => [
 				'label' => Lang::$txt['date_registered'],
-				'sort' => array(
+				'sort' => [
 					'down' => 'mem.date_registered DESC',
-					'up' => 'mem.date_registered ASC'
-				),
-			),
-			'post_count' => array(
+					'up' => 'mem.date_registered ASC',
+				],
+			],
+			'post_count' => [
 				'label' => Lang::$txt['posts'],
 				'default_sort_rev' => true,
-				'sort' => array(
+				'sort' => [
 					'down' => 'mem.posts DESC',
-					'up' => 'mem.posts ASC'
-				),
-			)
-		);
+					'up' => 'mem.posts ASC',
+				],
+			],
+		];
 
 		Utils::$context['custom_profile_fields'] = $this->getCustFields();
 
-		if (!empty(Utils::$context['custom_profile_fields']['columns']))
+		if (!empty(Utils::$context['custom_profile_fields']['columns'])) {
 			Utils::$context['columns'] += Utils::$context['custom_profile_fields']['columns'];
+		}
 
 		Utils::$context['colspan'] = 0;
-		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : array();
-		foreach (Utils::$context['columns'] as $key => $column)
-		{
-			if (isset(Utils::$context['disabled_fields'][$key]) || (isset($column['link_with']) && isset(Utils::$context['disabled_fields'][$column['link_with']])))
-			{
+		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : [];
+
+		foreach (Utils::$context['columns'] as $key => $column) {
+			if (isset(Utils::$context['disabled_fields'][$key]) || (isset($column['link_with'], Utils::$context['disabled_fields'][$column['link_with']]))) {
 				unset(Utils::$context['columns'][$key]);
+
 				continue;
 			}
 
-			Utils::$context['colspan'] += isset($column['colspan']) ? $column['colspan'] : 1;
+			Utils::$context['colspan'] += $column['colspan'] ?? 1;
 		}
 
 		// Aesthetic stuff.
 		end(Utils::$context['columns']);
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=mlist',
-			'name' => Lang::$txt['members_list']
-		);
+			'name' => Lang::$txt['members_list'],
+		];
 
 		Utils::$context['can_send_pm'] = User::$me->allowedTo('pm_send');
 		Utils::$context['can_send_email'] = User::$me->allowedTo('moderate_forum');
 
 		// Build the memberlist button array.
-		Utils::$context['memberlist_buttons'] = array(
-			'view_all_members' => array('text' => 'view_all_members', 'image' => 'mlist.png', 'url' => Config::$scripturl . '?action=mlist' . ';sa=all', 'active' => true),
-			'mlist_search' => array('text' => 'mlist_search', 'image' => 'mlist.png', 'url' => Config::$scripturl . '?action=mlist' . ';sa=search'),
-		);
+		Utils::$context['memberlist_buttons'] = [
+			'view_all_members' => ['text' => 'view_all_members', 'image' => 'mlist.png', 'url' => Config::$scripturl . '?action=mlist' . ';sa=all', 'active' => true],
+			'mlist_search' => ['text' => 'mlist_search', 'image' => 'mlist.png', 'url' => Config::$scripturl . '?action=mlist' . ';sa=search'],
+		];
 
 		// Allow mods to add additional buttons here
 		IntegrationHook::call('integrate_memberlist_buttons');
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -254,107 +255,107 @@ public function all()
 		// 3. the page shown is high enough to make a DB filesort unprofitable.
 		$use_cache = Config::$modSettings['totalMembers'] > 2000 && (!isset($_REQUEST['sort']) || $_REQUEST['sort'] === 'real_name') && isset($_REQUEST['start']) && $_REQUEST['start'] > $this->cache_step_size;
 
-		if ($use_cache)
-		{
+		if ($use_cache) {
 			// Maybe there's something cached already.
-			if (!empty(Config::$modSettings['memberlist_cache']))
+			if (!empty(Config::$modSettings['memberlist_cache'])) {
 				$memberlist_cache = Utils::jsonDecode(Config::$modSettings['memberlist_cache'], true);
+			}
 
 			// Only update the cache if something changed or no cache existed yet.
-			if (empty($memberlist_cache) || empty(Config::$modSettings['memberlist_updated']) || $memberlist_cache['last_update'] < Config::$modSettings['memberlist_updated'])
-			{
-				$request = Db::$db->query('', '
-					SELECT real_name
+			if (empty($memberlist_cache) || empty(Config::$modSettings['memberlist_updated']) || $memberlist_cache['last_update'] < Config::$modSettings['memberlist_updated']) {
+				$request = Db::$db->query(
+					'',
+					'SELECT real_name
 					FROM {db_prefix}members
 					WHERE is_activated = {int:is_activated}
 					ORDER BY real_name',
-					array(
+					[
 						'is_activated' => 1,
-					)
+					],
 				);
 
-				$memberlist_cache = array(
+				$memberlist_cache = [
 					'last_update' => time(),
 					'num_members' => Db::$db->num_rows($request),
-					'index' => array(),
-				);
+					'index' => [],
+				];
 
-				for ($i = 0, $n = Db::$db->num_rows($request); $i < $n; $i += $this->cache_step_size)
-				{
+				for ($i = 0, $n = Db::$db->num_rows($request); $i < $n; $i += $this->cache_step_size) {
 					Db::$db->data_seek($request, $i);
 					list($memberlist_cache['index'][$i]) = Db::$db->fetch_row($request);
 				}
 				Db::$db->data_seek($request, $memberlist_cache['num_members'] - 1);
-				list ($memberlist_cache['index'][$memberlist_cache['num_members'] - 1]) = Db::$db->fetch_row($request);
+				list($memberlist_cache['index'][$memberlist_cache['num_members'] - 1]) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
 				// Now we've got the cache...store it.
-				Config::updateModSettings(array('memberlist_cache' => Utils::jsonEncode($memberlist_cache)));
+				Config::updateModSettings(['memberlist_cache' => Utils::jsonEncode($memberlist_cache)]);
 			}
 
 			Utils::$context['num_members'] = $memberlist_cache['num_members'];
 		}
 		// Without cache we need an extra query to get the amount of members.
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		else {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}members
 				WHERE is_activated = {int:is_activated}',
-				array(
+				[
 					'is_activated' => 1,
-				)
+				],
 			);
-			list (Utils::$context['num_members']) = Db::$db->fetch_row($request);
+			list(Utils::$context['num_members']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// Set defaults for sort (real_name) and start. (0)
-		if (!isset($_REQUEST['sort']) || !isset(Utils::$context['columns'][$_REQUEST['sort']]))
+		if (!isset($_REQUEST['sort']) || !isset(Utils::$context['columns'][$_REQUEST['sort']])) {
 			$_REQUEST['sort'] = 'real_name';
+		}
 
-		if (!is_numeric($_REQUEST['start']))
-		{
-			if (preg_match('~^[^\'\\\\/]~' . (Utils::$context['utf8'] ? 'u' : ''), Utils::strtolower($_REQUEST['start']), $match) === 0)
+		if (!is_numeric($_REQUEST['start'])) {
+			if (preg_match('~^[^\'\\\\/]~' . (Utils::$context['utf8'] ? 'u' : ''), Utils::strtolower($_REQUEST['start']), $match) === 0) {
 				ErrorHandler::fatal('Are you a wannabe hacker?', false);
+			}
 
 			$_REQUEST['start'] = $match[0];
 
-			$request = Db::$db->query('substring', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'substring',
+				'SELECT COUNT(*)
 				FROM {db_prefix}members
 				WHERE LOWER(SUBSTRING(real_name, 1, 1)) < {string:first_letter}
 					AND is_activated = {int:is_activated}',
-				array(
+				[
 					'is_activated' => 1,
 					'first_letter' => $_REQUEST['start'],
-				)
+				],
 			);
-			list ($_REQUEST['start']) = Db::$db->fetch_row($request);
+			list($_REQUEST['start']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		Utils::$context['letter_links'] = '';
-		for ($i = 97; $i < 123; $i++)
-		{
+
+		for ($i = 97; $i < 123; $i++) {
 			Utils::$context['letter_links'] .= '<a href="' . Config::$scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> ';
 		}
 
 		// Sort out the column information.
-		foreach (Utils::$context['columns'] as $col => $column_details)
-		{
+		foreach (Utils::$context['columns'] as $col => $column_details) {
 			Utils::$context['columns'][$col]['href'] = Config::$scripturl . '?action=mlist;sort=' . $col . ';start=' . $_REQUEST['start'];
 
-			if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev'])))
+			if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) {
 				Utils::$context['columns'][$col]['href'] .= ';desc';
+			}
 
 			Utils::$context['columns'][$col]['link'] = '<a href="' . Utils::$context['columns'][$col]['href'] . '" rel="nofollow">' . Utils::$context['columns'][$col]['label'] . '</a>';
 			Utils::$context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col;
 		}
 
 		// Don't offer website sort to guests
-		if (User::$me->is_guest)
-		{
+		if (User::$me->is_guest) {
 			Utils::$context['columns']['website_url']['href'] = '';
 			Utils::$context['columns']['website_url']['link'] = Utils::$context['columns']['website_url']['label'];
 		}
@@ -372,23 +373,22 @@ public function all()
 
 		Utils::$context['can_moderate_forum'] = User::$me->allowedTo('moderate_forum');
 		Utils::$context['page_title'] = sprintf(Lang::$txt['viewing_members'], Utils::$context['start'], Utils::$context['end']);
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=mlist;sort=' . $_REQUEST['sort'] . ';start=' . $_REQUEST['start'],
 			'name' => &Utils::$context['page_title'],
-			'extra_after' => '(' . sprintf(Lang::$txt['of_total_members'], Utils::$context['num_members']) . ')'
-		);
+			'extra_after' => '(' . sprintf(Lang::$txt['of_total_members'], Utils::$context['num_members']) . ')',
+		];
 
 		$limit = $_REQUEST['start'];
-		$query_parameters = array(
+		$query_parameters = [
 			'regular_id_group' => 0,
 			'is_activated' => 1,
 			'sort' => Utils::$context['columns'][$_REQUEST['sort']]['sort'][Utils::$context['sort_direction']],
 			'blank_string' => '',
-		);
+		];
 
 		// Using cache allows to narrow down the list to be retrieved.
-		if ($use_cache && $_REQUEST['sort'] === 'real_name' && !isset($_REQUEST['desc']))
-		{
+		if ($use_cache && $_REQUEST['sort'] === 'real_name' && !isset($_REQUEST['desc'])) {
 			$first_offset = max(0, $_REQUEST['start'] - ($_REQUEST['start'] % $this->cache_step_size));
 
 			$second_offset = min($memberlist_cache['num_members'] - 1, ceil(($_REQUEST['start'] + Config::$modSettings['defaultMaxMembers']) / $this->cache_step_size) * $this->cache_step_size);
@@ -400,8 +400,7 @@ public function all()
 		}
 
 		// Reverse sorting is a bit more complicated...
-		elseif ($use_cache && $_REQUEST['sort'] === 'real_name')
-		{
+		elseif ($use_cache && $_REQUEST['sort'] === 'real_name') {
 			$first_offset = max(0, floor(($memberlist_cache['num_members'] - Config::$modSettings['defaultMaxMembers'] - $_REQUEST['start']) / $this->cache_step_size) * $this->cache_step_size);
 
 			$second_offset = min($memberlist_cache['num_members'] - 1, ceil(($memberlist_cache['num_members'] - $_REQUEST['start']) / $this->cache_step_size) * $this->cache_step_size);
@@ -413,12 +412,15 @@ public function all()
 		}
 
 		$custom_fields_qry = '';
-		if (!empty(Utils::$context['custom_profile_fields']['join'][$_REQUEST['sort']]))
+
+		if (!empty(Utils::$context['custom_profile_fields']['join'][$_REQUEST['sort']])) {
 			$custom_fields_qry = Utils::$context['custom_profile_fields']['join'][$_REQUEST['sort']];
+		}
 
 		// Select the members from the database.
-		$request = Db::$db->query('', '
-			SELECT mem.id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member
 			FROM {db_prefix}members AS mem' . ($_REQUEST['sort'] === 'is_online' ? '
 				LEFT JOIN {db_prefix}log_online AS lo ON (lo.id_member = mem.id_member)' : '') . ($_REQUEST['sort'] === 'id_group' ? '
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)' : '') . '
@@ -427,25 +429,23 @@ public function all()
 				AND ' . $where) . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array_merge($query_parameters, array(
+			array_merge($query_parameters, [
 				'sort' => $query_parameters['sort'],
 				'start' => $limit,
 				'max' => Config::$modSettings['defaultMaxMembers'],
-			))
+			]),
 		);
 		$this->printRows($request);
 		Db::$db->free_result($request);
 
 		// Add anchors at the start of each letter.
-		if ($_REQUEST['sort'] == 'real_name')
-		{
+		if ($_REQUEST['sort'] == 'real_name') {
 			$last_letter = '';
-			foreach (Utils::$context['members'] as $i => $dummy)
-			{
+
+			foreach (Utils::$context['members'] as $i => $dummy) {
 				$this_letter = Utils::strtolower(Utils::entitySubstr(Utils::$context['members'][$i]['name'], 0, 1));
 
-				if ($this_letter != $last_letter && preg_match('~[a-z]~', $this_letter) === 1)
-				{
+				if ($this_letter != $last_letter && preg_match('~[a-z]~', $this_letter) === 1) {
 					Utils::$context['members'][$i]['sort_letter'] = Utils::htmlspecialchars($this_letter);
 					$last_letter = $this_letter;
 				}
@@ -465,34 +465,36 @@ public function search()
 		Utils::$context['can_moderate_forum'] = User::$me->allowedTo('moderate_forum');
 
 		// Can they search custom fields?
-		$request = Db::$db->query('', '
-			SELECT col_name, field_name, field_desc
+		$request = Db::$db->query(
+			'',
+			'SELECT col_name, field_name, field_desc
 			FROM {db_prefix}custom_fields
 			WHERE active = {int:active}
 				' . (User::$me->allowedTo('admin_forum') ? '' : ' AND private < {int:private_level}') . '
 				AND can_search = {int:can_search}
 				AND (field_type = {string:field_type_text} OR field_type = {string:field_type_textarea} OR field_type = {string:field_type_select})',
-			array(
+			[
 				'active' => 1,
 				'can_search' => 1,
 				'private_level' => 2,
 				'field_type_text' => 'text',
 				'field_type_textarea' => 'textarea',
 				'field_type_select' => 'select',
-			)
+			],
 		);
-		Utils::$context['custom_search_fields'] = array();
-		while ($row = Db::$db->fetch_assoc($request))
-			Utils::$context['custom_search_fields'][$row['col_name']] = array(
+		Utils::$context['custom_search_fields'] = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['custom_search_fields'][$row['col_name']] = [
 				'colname' => $row['col_name'],
 				'name' => $row['field_name'],
 				'desc' => $row['field_desc'],
-			);
+			];
+		}
 		Db::$db->free_result($request);
 
 		// They're searching..
-		if (isset($_REQUEST['search']) && isset($_REQUEST['fields']))
-		{
+		if (isset($_REQUEST['search'], $_REQUEST['fields'])) {
 			$_POST['search'] = trim(isset($_GET['search']) ? html_entity_decode(htmlspecialchars_decode($_GET['search'], ENT_QUOTES), ENT_QUOTES) : $_POST['search']);
 			$_POST['fields'] = isset($_GET['fields']) ? explode(',', $_GET['fields']) : $_POST['fields'];
 
@@ -502,25 +504,28 @@ public function search()
 			Utils::$context['old_search_value'] = urlencode($_POST['search']);
 
 			// No fields?  Use default...
-			if (empty($_POST['fields']))
-				$_POST['fields'] = array('name');
+			if (empty($_POST['fields'])) {
+				$_POST['fields'] = ['name'];
+			}
 
-			$_POST['fields'] = array_intersect($_POST['fields'], array_merge(array('name', 'website', 'group', 'email'), array_keys($context['custom_search_fields'])));
+			$_POST['fields'] = array_intersect($_POST['fields'], array_merge(['name', 'website', 'group', 'email'], array_keys(Utils::$context['custom_search_fields'])));
 
 			// Set defaults for how the results are sorted
-			if (!isset($_REQUEST['sort']) || !isset(Utils::$context['columns'][$_REQUEST['sort']]))
+			if (!isset($_REQUEST['sort']) || !isset(Utils::$context['columns'][$_REQUEST['sort']])) {
 				$_REQUEST['sort'] = 'real_name';
+			}
 
 			// Build the column link / sort information.
-			foreach (Utils::$context['columns'] as $col => $column_details)
-			{
+			foreach (Utils::$context['columns'] as $col => $column_details) {
 				Utils::$context['columns'][$col]['href'] = Config::$scripturl . '?action=mlist;sa=search;start=' . (int) $_REQUEST['start'] . ';sort=' . $col;
 
-				if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev'])))
+				if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) {
 					Utils::$context['columns'][$col]['href'] .= ';desc';
+				}
 
-				if (isset($_POST['search']) && isset($_POST['fields']))
+				if (isset($_POST['search'], $_POST['fields'])) {
 					Utils::$context['columns'][$col]['href'] .= ';search=' . urlencode($_POST['search']) . ';fields=' . implode(',', $_POST['fields']);
+				}
 
 				Utils::$context['columns'][$col]['link'] = '<a href="' . Utils::$context['columns'][$col]['href'] . '" rel="nofollow">' . Utils::$context['columns'][$col]['label'] . '</a>';
 				Utils::$context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col;
@@ -530,92 +535,93 @@ public function search()
 			Utils::$context['sort_direction'] = !isset($_REQUEST['desc']) ? 'up' : 'down';
 			Utils::$context['sort_by'] = $_REQUEST['sort'];
 
-			$query_parameters = array(
+			$query_parameters = [
 				'regular_id_group' => 0,
 				'is_activated' => 1,
 				'blank_string' => '',
-				'search' => '%' . strtr($_POST['search'], array('_' => '\\_', '%' => '\\%', '*' => '%')) . '%',
+				'search' => '%' . strtr($_POST['search'], ['_' => '\\_', '%' => '\\%', '*' => '%']) . '%',
 				'sort' => Utils::$context['columns'][$_REQUEST['sort']]['sort'][Utils::$context['sort_direction']],
-			);
+			];
 
 			// Search for a name
-			if (in_array('name', $_POST['fields']))
-			{
-				$fields = User::$me->allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
+			if (in_array('name', $_POST['fields'])) {
+				$fields = User::$me->allowedTo('moderate_forum') ? ['member_name', 'real_name'] : ['real_name'];
 				$search_fields[] = 'name';
-			}
-			else
-			{
-				$fields = array();
-				$search_fields = array();
+			} else {
+				$fields = [];
+				$search_fields = [];
 			}
 
 			// Search for websites.
-			if (in_array('website', $_POST['fields']))
-			{
-				$fields += array(7 => 'website_title', 'website_url');
+			if (in_array('website', $_POST['fields'])) {
+				$fields += [7 => 'website_title', 'website_url'];
 				$search_fields[] = 'website';
 			}
+
 			// Search for groups.
-			if (in_array('group', $_POST['fields']))
-			{
-				$fields += array(9 => 'COALESCE(group_name, {string:blank_string})');
+			if (in_array('group', $_POST['fields'])) {
+				$fields += [9 => 'COALESCE(group_name, {string:blank_string})'];
 				$search_fields[] = 'group';
 			}
+
 			// Search for an email address?
-			if (in_array('email', $_POST['fields']) && User::$me->allowedTo('moderate_forum'))
-			{
-				$fields += array(2 => 'email_address');
+			if (in_array('email', $_POST['fields']) && User::$me->allowedTo('moderate_forum')) {
+				$fields += [2 => 'email_address'];
 				$search_fields[] = 'email';
 			}
 
-			if (Db::$db->case_sensitive)
-				foreach ($fields as $key => $field)
+			if (Db::$db->case_sensitive) {
+				foreach ($fields as $key => $field) {
 					$fields[$key] = 'LOWER(' . $field . ')';
+				}
+			}
 
-			$customJoin = array();
+			$customJoin = [];
 			$customCount = 10;
 
 			// Any custom fields to search for - these being tricky?
-			foreach ($_POST['fields'] as $field)
-			{
-				if (substr($field, 0, 5) == 'cust_' && isset(Utils::$context['custom_search_fields'][$field]))
-				{
+			foreach ($_POST['fields'] as $field) {
+				if (substr($field, 0, 5) == 'cust_' && isset(Utils::$context['custom_search_fields'][$field])) {
 					$customJoin[] = 'LEFT JOIN {db_prefix}themes AS t' . $field . ' ON (t' . $field . '.variable = {string:t' . $field . '} AND t' . $field . '.id_theme = 1 AND t' . $field . '.id_member = mem.id_member)';
 					$query_parameters['t' . $field] = $field;
-					$fields += array($customCount++ => 'COALESCE(t' . $field . '.value, {string:blank_string})');
+					$fields += [$customCount++ => 'COALESCE(t' . $field . '.value, {string:blank_string})'];
 					$search_fields[] = $field;
 				}
 			}
 
 			// No search fields? That means you're trying to hack things
-			if (empty($search_fields))
+			if (empty($search_fields)) {
 				ErrorHandler::fatalLang('invalid_search_string', false);
+			}
 
 			$query = $_POST['search'] == '' ? '= {string:blank_string}' : (Db::$db->case_sensitive ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}');
 
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}members AS mem
 					LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)
 					' . (empty($customJoin) ? '' : implode('
 					', $customJoin)) . '
 				WHERE (' . implode(' ' . $query . ' OR ', $fields) . ' ' . $query . ')
 					AND mem.is_activated = {int:is_activated}',
-				$query_parameters
+				$query_parameters,
 			);
-			list ($numResults) = Db::$db->fetch_row($request);
+			list($numResults) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?action=mlist;sa=search;search=' . urlencode($_POST['search']) . ';fields=' . implode(',', $_POST['fields']), $_REQUEST['start'], $numResults, Config::$modSettings['defaultMaxMembers']);
 
 			$custom_fields_qry = '';
-			if (array_search($_REQUEST['sort'], $_POST['fields']) === false && !empty(Utils::$context['custom_profile_fields']['join'][$_REQUEST['sort']]))
+
+			if (array_search($_REQUEST['sort'], $_POST['fields']) === false && !empty(Utils::$context['custom_profile_fields']['join'][$_REQUEST['sort']])) {
 				$custom_fields_qry = Utils::$context['custom_profile_fields']['join'][$_REQUEST['sort']];
+			}
 
 			// Find the members from the database.
-			$request = Db::$db->query('', '
-				SELECT mem.id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member
 				FROM {db_prefix}members AS mem
 					LEFT JOIN {db_prefix}log_online AS lo ON (lo.id_member = mem.id_member)
 					LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:regular_id_group} THEN mem.id_post_group ELSE mem.id_group END)' .
@@ -626,49 +632,45 @@ public function search()
 					AND mem.is_activated = {int:is_activated}
 				ORDER BY {raw:sort}
 				LIMIT {int:start}, {int:max}',
-				array_merge($query_parameters, array(
+				array_merge($query_parameters, [
 					'start' => $_REQUEST['start'],
 					'max' => Config::$modSettings['defaultMaxMembers'],
-				))
+				]),
 			);
 			$this->printRows($request);
 			Db::$db->free_result($request);
-		}
-		else
-		{
+		} else {
 			// These are all the possible fields.
-			Utils::$context['search_fields'] = array(
+			Utils::$context['search_fields'] = [
 				'name' => Lang::$txt['mlist_search_name'],
 				'email' => Lang::$txt['mlist_search_email'],
 				'website' => Lang::$txt['mlist_search_website'],
 				'group' => Lang::$txt['mlist_search_group'],
-			);
+			];
 
 			// Sorry, but you can't search by email unless you can view emails
-			if (!User::$me->allowedTo('moderate_forum'))
-			{
+			if (!User::$me->allowedTo('moderate_forum')) {
 				unset(Utils::$context['search_fields']['email']);
-				Utils::$context['search_defaults'] = array('name');
-			}
-			else
-			{
-				Utils::$context['search_defaults'] = array('name', 'email');
+				Utils::$context['search_defaults'] = ['name'];
+			} else {
+				Utils::$context['search_defaults'] = ['name', 'email'];
 			}
 
-			foreach (Utils::$context['custom_search_fields'] as $field)
+			foreach (Utils::$context['custom_search_fields'] as $field) {
 				Utils::$context['search_fields'][$field['colname']] = sprintf(Lang::$txt['mlist_search_by'], Lang::tokenTxtReplace($field['name']));
+			}
 
 			Utils::$context['sub_template'] = 'search';
-			Utils::$context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? Utils::htmlspecialchars($_POST['search']) : '');
+			Utils::$context['old_search'] = $_GET['search'] ?? (isset($_POST['search']) ? Utils::htmlspecialchars($_POST['search']) : '');
 
 			// Since we're nice we also want to default focus on to the search field.
 			Theme::addInlineJavaScript("\n\t" . '$(\'input[name="search"]\').focus();', true);
 		}
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=mlist;sa=search',
-			'name' => &Utils::$context['page_title']
-		);
+			'name' => &Utils::$context['page_title'],
+		];
 
 		// Highlight the correct button, too!
 		unset(Utils::$context['memberlist_buttons']['view_all_members']['active']);
@@ -686,8 +688,9 @@ public function search()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -729,74 +732,79 @@ public static function MLSearch(): void
 	public static function printRows($request)
 	{
 		// Get the most posts.
-		$result = Db::$db->query('', '
-			SELECT MAX(posts)
+		$result = Db::$db->query(
+			'',
+			'SELECT MAX(posts)
 			FROM {db_prefix}members',
-			array(
-			)
+			[
+			],
 		);
-		list ($most_posts) = Db::$db->fetch_row($result);
+		list($most_posts) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// Avoid division by zero...
-		if ($most_posts == 0)
+		if ($most_posts == 0) {
 			$most_posts = 1;
+		}
 
-		$members = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$members = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
+		}
 
 		// Load all the members for display.
 		User::load($members);
 
-		Utils::$context['members'] = array();
-		foreach ($members as $member)
-		{
-			if (!isset(User::$loaded[$member]))
+		Utils::$context['members'] = [];
+
+		foreach ($members as $member) {
+			if (!isset(User::$loaded[$member])) {
 				continue;
+			}
 
 			Utils::$context['members'][$member] = User::$loaded[$member]->format();
 			Utils::$context['members'][$member]['post_percent'] = round((Utils::$context['members'][$member]['real_posts'] * 100) / $most_posts);
 			Utils::$context['members'][$member]['registered_date'] = Time::strftime('%Y-%m-%d', Utils::$context['members'][$member]['registered_timestamp']);
 
-			if (!empty(Utils::$context['custom_profile_fields']['columns']))
-			{
-				foreach (Utils::$context['custom_profile_fields']['columns'] as $key => $column)
-				{
+			if (!empty(Utils::$context['custom_profile_fields']['columns'])) {
+				foreach (Utils::$context['custom_profile_fields']['columns'] as $key => $column) {
 					// Don't show anything if there isn't anything to show.
-					if (!isset(Utils::$context['members'][$member]['options'][$key]))
-					{
-						Utils::$context['members'][$member]['options'][$key] = isset($column['default_value']) ? $column['default_value'] : '';
+					if (!isset(Utils::$context['members'][$member]['options'][$key])) {
+						Utils::$context['members'][$member]['options'][$key] = $column['default_value'] ?? '';
+
 						continue;
 					}
 
 					Utils::$context['members'][$member]['options'][$key] = Lang::tokenTxtReplace(Utils::$context['members'][$member]['options'][$key]);
 					$currentKey = 0;
-					if (!empty($column['options']))
-					{
+
+					if (!empty($column['options'])) {
 						$fieldOptions = explode(',', $column['options']);
-						foreach ($fieldOptions as $k => $v)
-						{
-							if (empty($currentKey))
+
+						foreach ($fieldOptions as $k => $v) {
+							if (empty($currentKey)) {
 								$currentKey = $v === Utils::$context['members'][$member]['options'][$key] ? $k : 0;
+							}
 						}
 					}
 
-					if ($column['bbc'] && !empty(Utils::$context['members'][$member]['options'][$key]))
+					if ($column['bbc'] && !empty(Utils::$context['members'][$member]['options'][$key])) {
 						Utils::$context['members'][$member]['options'][$key] = strip_tags(BBCodeParser::load()->parse(Utils::$context['members'][$member]['options'][$key]));
-
-					elseif ($column['type'] == 'check')
+					} elseif ($column['type'] == 'check') {
 						Utils::$context['members'][$member]['options'][$key] = Utils::$context['members'][$member]['options'][$key] == 0 ? Lang::$txt['no'] : Lang::$txt['yes'];
+					}
 
 					// Enclosing the user input within some other text?
-					if (!empty($column['enclose']))
-						Utils::$context['members'][$member]['options'][$key] = strtr($column['enclose'], array(
+					if (!empty($column['enclose'])) {
+						Utils::$context['members'][$member]['options'][$key] = strtr($column['enclose'], [
 							'{SCRIPTURL}' => Config::$scripturl,
 							'{IMAGES_URL}' => Theme::$current->settings['images_url'],
 							'{DEFAULT_IMAGES_URL}' => Theme::$current->settings['default_images_url'],
 							'{INPUT}' => Lang::tokenTxtReplace(Utils::$context['members'][$member]['options'][$key]),
-							'{KEY}' => $currentKey
-						));
+							'{KEY}' => $currentKey,
+						]);
+					}
 				}
 			}
 		}
@@ -809,45 +817,45 @@ public static function printRows($request)
 	 */
 	public static function getCustFields()
 	{
-		$cpf = array();
+		$cpf = [];
 
-		$request = Db::$db->query('', '
-			SELECT col_name, field_name, field_desc, field_type, field_options, bbc, enclose, default_value
+		$request = Db::$db->query(
+			'',
+			'SELECT col_name, field_name, field_desc, field_type, field_options, bbc, enclose, default_value
 			FROM {db_prefix}custom_fields
 			WHERE active = {int:active}
 				AND show_mlist = {int:show}
 				AND private < {int:private_level}',
-			array(
+			[
 				'active' => 1,
 				'show' => 1,
 				'private_level' => 2,
-			)
+			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Get all the data we're gonna need.
-			$cpf['columns'][$row['col_name']] = array(
+			$cpf['columns'][$row['col_name']] = [
 				'label' => Lang::tokenTxtReplace($row['field_name']),
 				'type' => $row['field_type'],
 				'options' => Lang::tokenTxtReplace($row['field_options']),
 				'bbc' => !empty($row['bbc']),
 				'enclose' => $row['enclose'],
 				'default_value' => Lang::tokenTxtReplace($row['default_value']),
-			);
+			];
 
 			// Get the right sort method depending on the cust field type.
-			if ($row['field_type'] != 'check')
-				$cpf['columns'][$row['col_name']]['sort'] = array(
+			if ($row['field_type'] != 'check') {
+				$cpf['columns'][$row['col_name']]['sort'] = [
 					'down' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 ASC, COALESCE(t' . $row['col_name'] . '.value, \'\') DESC',
-					'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, \'\') ASC'
-				);
-
-			else
-				$cpf['columns'][$row['col_name']]['sort'] = array(
+					'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, \'\') ASC',
+				];
+			} else {
+				$cpf['columns'][$row['col_name']]['sort'] = [
 					'down' => 't' . $row['col_name'] . '.value DESC',
-					'up' => 't' . $row['col_name'] . '.value ASC'
-				);
+					'up' => 't' . $row['col_name'] . '.value ASC',
+				];
+			}
 
 			$cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)';
 		}
@@ -866,15 +874,17 @@ public static function getCustFields()
 	protected function __construct()
 	{
 		// Allow mods to add sub-actions and sort_links.
-		IntegrationHook::call('integrate_memberlist_subactions', array(&self::$subactions, $this->sort_links));
+		IntegrationHook::call('integrate_memberlist_subactions', [&self::$subactions, $this->sort_links]);
 
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Memberlist::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Memberlist::exportStatic')) {
 	Memberlist::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/MessageIndex.php b/Sources/Actions/MessageIndex.php
index 1dbeb4bffd..943887bf00 100644
--- a/Sources/Actions/MessageIndex.php
+++ b/Sources/Actions/MessageIndex.php
@@ -14,11 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -27,7 +27,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class shows the list of topics in a board.
@@ -44,11 +43,13 @@ class MessageIndex implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static array $backcompat = array(
-		'func_names' => array(
+	private static array $backcompat = [
+		'func_names' => [
 			'call' => 'MessageIndex',
-		),
-	);
+			'getBoardList' => 'getBoardList',
+			'buildTopicContext' => 'buildTopicContext',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -59,43 +60,43 @@ class MessageIndex implements ActionInterface
 	 *
 	 * Default sort methods.
 	 */
-	public array $sort_methods = array(
-		'subject' => array(
+	public array $sort_methods = [
+		'subject' => [
 			'column' => 'mf.subject',
 			'joins' => 'JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)',
 			'asc_default' => true,
-		),
-		'starter' => array(
+		],
+		'starter' => [
 			'column' => 'COALESCE(memf.real_name, mf.poster_name)',
 			'joins' => 'JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)' . "\n\t\t\t" . 'LEFT JOIN {db_prefix}members AS memf ON (memf.id_member = mf.id_member)',
 			'asc_default' => true,
-		),
-		'last_poster' => array(
+		],
+		'last_poster' => [
 			'column' => 'COALESCE(meml.real_name, ml.poster_name)',
 			'joins' => 'JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)' . "\n\t\t\t" . 'LEFT JOIN {db_prefix}members AS meml ON (meml.id_member = ml.id_member)',
 			'asc_default' => true,
-		),
-		'replies' => array(
+		],
+		'replies' => [
 			'column' => 't.num_replies',
 			'joins' => '',
 			'asc_default' => true,
-		),
-		'views' => array(
+		],
+		'views' => [
 			'column' => 't.num_views',
 			'joins' => '',
 			'asc_default' => true,
-		),
-		'first_post' => array(
+		],
+		'first_post' => [
 			'column' => 't.id_topic',
 			'joins' => '',
 			'asc_default' => false,
-		),
-		'last_post' => array(
+		],
+		'last_post' => [
 			'column' => 't.id_last_msg',
 			'joins' => '',
 			'asc_default' => false,
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var string
@@ -182,8 +183,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -202,68 +204,66 @@ public static function call(): void
 	 * @param array $boardListOptions An array of options for the board list.
 	 * @return array An array of board info.
 	 */
-	public static function getBoardList($boardListOptions = array()): array
+	public static function getBoardList($boardListOptions = []): array
 	{
-		if (isset($boardListOptions['excluded_boards']) && isset($boardListOptions['included_boards']))
-		{
+		if (isset($boardListOptions['excluded_boards'], $boardListOptions['included_boards'])) {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['get_board_list_cannot_include_and_exclude'], E_USER_ERROR);
 		}
 
-		$where = array();
-		$where_parameters = array();
-		if (isset($boardListOptions['excluded_boards']))
-		{
+		$where = [];
+		$where_parameters = [];
+
+		if (isset($boardListOptions['excluded_boards'])) {
 			$where[] = 'b.id_board NOT IN ({array_int:excluded_boards})';
 			$where_parameters['excluded_boards'] = $boardListOptions['excluded_boards'];
 		}
 
-		if (isset($boardListOptions['included_boards']))
-		{
+		if (isset($boardListOptions['included_boards'])) {
 			$where[] = 'b.id_board IN ({array_int:included_boards})';
 			$where_parameters['included_boards'] = $boardListOptions['included_boards'];
 		}
 
-		if (!empty($boardListOptions['ignore_boards']))
+		if (!empty($boardListOptions['ignore_boards'])) {
 			$where[] = '{query_wanna_see_board}';
-
-		elseif (!empty($boardListOptions['use_permissions']))
+		} elseif (!empty($boardListOptions['use_permissions'])) {
 			$where[] = '{query_see_board}';
+		}
 
-		if (!empty($boardListOptions['not_redirection']))
-		{
+		if (!empty($boardListOptions['not_redirection'])) {
 			$where[] = 'b.redirect = {string:blank_redirect}';
 			$where_parameters['blank_redirect'] = '';
 		}
 
-		$request = Db::$db->query('order_by_board_order', '
-			SELECT c.name AS cat_name, c.id_cat, b.id_board, b.name AS board_name, b.child_level, b.redirect
+		$request = Db::$db->query(
+			'order_by_board_order',
+			'SELECT c.name AS cat_name, c.id_cat, b.id_board, b.name AS board_name, b.child_level, b.redirect
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)' . (empty($where) ? '' : '
 			WHERE ' . implode('
 				AND ', $where)),
-			$where_parameters
+			$where_parameters,
 		);
 
-		$return_value = array();
-		if (Db::$db->num_rows($request) !== 0)
-		{
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!isset($return_value[$row['id_cat']]))
-					$return_value[$row['id_cat']] = array(
+		$return_value = [];
+
+		if (Db::$db->num_rows($request) !== 0) {
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!isset($return_value[$row['id_cat']])) {
+					$return_value[$row['id_cat']] = [
 						'id' => $row['id_cat'],
 						'name' => $row['cat_name'],
-						'boards' => array(),
-					);
+						'boards' => [],
+					];
+				}
 
-				$return_value[$row['id_cat']]['boards'][$row['id_board']] = array(
+				$return_value[$row['id_cat']]['boards'][$row['id_board']] = [
 					'id' => $row['id_board'],
 					'name' => $row['board_name'],
 					'child_level' => $row['child_level'],
 					'redirect' => $row['redirect'],
 					'selected' => isset($boardListOptions['selected_board']) && $boardListOptions['selected_board'] == $row['id_board'],
-				);
+				];
 			}
 		}
 		Db::$db->free_result($request);
@@ -285,106 +285,110 @@ public static function buildTopicContext(array $row)
 		$colorClass = 'windowbg';
 
 		// Does the theme support message previews?
-		if (!empty(Config::$modSettings['preview_characters']))
-		{
+		if (!empty(Config::$modSettings['preview_characters'])) {
 			// Limit them to Config::$modSettings['preview_characters'] characters
-			$row['first_body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
-			if (Utils::entityStrlen($row['first_body']) > Config::$modSettings['preview_characters'])
+			$row['first_body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['first_body'], $row['first_smileys'], $row['id_first_msg']), ['<br>' => '&#10;']));
+
+			if (Utils::entityStrlen($row['first_body']) > Config::$modSettings['preview_characters']) {
 				$row['first_body'] = Utils::entitySubstr($row['first_body'], 0, Config::$modSettings['preview_characters']) . '...';
+			}
 
 			// Censor the subject and message preview.
 			Lang::censorText($row['first_subject']);
 			Lang::censorText($row['first_body']);
 
 			// Don't censor them twice!
-			if ($row['id_first_msg'] == $row['id_last_msg'])
-			{
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
 				$row['last_subject'] = $row['first_subject'];
 				$row['last_body'] = $row['first_body'];
-			}
-			else
-			{
-				$row['last_body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
-				if (Utils::entityStrlen($row['last_body']) > Config::$modSettings['preview_characters'])
+			} else {
+				$row['last_body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['last_body'], $row['last_smileys'], $row['id_last_msg']), ['<br>' => '&#10;']));
+
+				if (Utils::entityStrlen($row['last_body']) > Config::$modSettings['preview_characters']) {
 					$row['last_body'] = Utils::entitySubstr($row['last_body'], 0, Config::$modSettings['preview_characters']) . '...';
+				}
 
 				Lang::censorText($row['last_subject']);
 				Lang::censorText($row['last_body']);
 			}
-		}
-		else
-		{
+		} else {
 			$row['first_body'] = '';
 			$row['last_body'] = '';
 			Lang::censorText($row['first_subject']);
 
-			if ($row['id_first_msg'] == $row['id_last_msg'])
+			if ($row['id_first_msg'] == $row['id_last_msg']) {
 				$row['last_subject'] = $row['first_subject'];
-			else
+			} else {
 				Lang::censorText($row['last_subject']);
+			}
 		}
 
 		// Decide how many pages the topic should have.
-		if ($row['num_replies'] + 1 > Utils::$context['messages_per_page'])
-		{
+		if ($row['num_replies'] + 1 > Utils::$context['messages_per_page']) {
 			// We can't pass start by reference.
 			$start = -1;
 			$pages = new PageIndex(Config::$scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, Utils::$context['messages_per_page'], true, false);
 
 			// If we can use all, show all.
-			if (!empty(Config::$modSettings['enableAllMessages']) && $row['num_replies'] + 1 < Config::$modSettings['enableAllMessages'])
-				$pages .= sprintf(strtr(Theme::$current->settings['page_index']['page'], array('{URL}' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0;all')), '', Lang::$txt['all']);
-		}
-		else
+			if (!empty(Config::$modSettings['enableAllMessages']) && $row['num_replies'] + 1 < Config::$modSettings['enableAllMessages']) {
+				$pages .= sprintf(strtr(Theme::$current->settings['page_index']['page'], ['{URL}' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0;all']), '', Lang::$txt['all']);
+			}
+		} else {
 			$pages = '';
+		}
 
 		// We need to check the topic icons exist...
-		if (!empty(Config::$modSettings['messageIconChecks_enable']))
-		{
-			if (!isset(Utils::$context['icon_sources'][$row['first_icon']]))
+		if (!empty(Config::$modSettings['messageIconChecks_enable'])) {
+			if (!isset(Utils::$context['icon_sources'][$row['first_icon']])) {
 				Utils::$context['icon_sources'][$row['first_icon']] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-			if (!isset(Utils::$context['icon_sources'][$row['last_icon']]))
+			}
+
+			if (!isset(Utils::$context['icon_sources'][$row['last_icon']])) {
 				Utils::$context['icon_sources'][$row['last_icon']] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		}
-		else
-		{
-			if (!isset(Utils::$context['icon_sources'][$row['first_icon']]))
+			}
+		} else {
+			if (!isset(Utils::$context['icon_sources'][$row['first_icon']])) {
 				Utils::$context['icon_sources'][$row['first_icon']] = 'images_url';
-			if (!isset(Utils::$context['icon_sources'][$row['last_icon']]))
+			}
+
+			if (!isset(Utils::$context['icon_sources'][$row['last_icon']])) {
 				Utils::$context['icon_sources'][$row['last_icon']] = 'images_url';
+			}
 		}
 
 		// Force the recycling icon if appropriate
-		if (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $row['id_board'])
-		{
+		if (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $row['id_board']) {
 			$row['first_icon'] = 'recycled';
 			$row['last_icon'] = 'recycled';
 		}
 
 		// Is this topic pending approval, or does it have any posts pending approval?
-		if (!empty($row['unapproved_posts']) && User::$me->allowedTo('approve_posts'))
+		if (!empty($row['unapproved_posts']) && User::$me->allowedTo('approve_posts')) {
 			$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
+		}
 
 		// Sticky topics should get a different color, too.
-		if ($row['is_sticky'])
+		if ($row['is_sticky']) {
 			$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($row['locked'])
+		if ($row['locked']) {
 			$colorClass .= ' locked';
+		}
 
 		// 'Print' the topic info.
-		Utils::$context['topics'][$row['id_topic']] = array_merge($row, array(
+		Utils::$context['topics'][$row['id_topic']] = array_merge($row, [
 			'id' => $row['id_topic'],
-			'first_post' => array(
+			'first_post' => [
 				'id' => $row['id_first_msg'],
-				'member' => array(
+				'member' => [
 					'username' => $row['first_member_name'],
 					'name' => $row['first_display_name'],
 					'id' => $row['first_id_member'],
 					'href' => !empty($row['first_id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['first_id_member'] : '',
-					'link' => !empty($row['first_id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['first_id_member'] . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $row['first_display_name']) . '" class="preview">' . $row['first_display_name'] . '</a>' : $row['first_display_name']
-				),
+					'link' => !empty($row['first_id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['first_id_member'] . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $row['first_display_name']) . '" class="preview">' . $row['first_display_name'] . '</a>' : $row['first_display_name'],
+				],
 				'time' => Time::create('@' . $row['first_poster_time'])->format(),
 				'timestamp' => $row['first_poster_time'],
 				'subject' => $row['first_subject'],
@@ -393,16 +397,16 @@ public static function buildTopicContext(array $row)
 				'icon_url' => Theme::$current->settings[Utils::$context['icon_sources'][$row['first_icon']]] . '/post/' . $row['first_icon'] . '.png',
 				'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
 				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['first_subject'] . '</a>',
-			),
-			'last_post' => array(
+			],
+			'last_post' => [
 				'id' => $row['id_last_msg'],
-				'member' => array(
+				'member' => [
 					'username' => $row['last_member_name'],
 					'name' => $row['last_display_name'],
 					'id' => $row['last_id_member'],
 					'href' => !empty($row['last_id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['last_id_member'] : '',
-					'link' => !empty($row['last_id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['last_id_member'] . '">' . $row['last_display_name'] . '</a>' : $row['last_display_name']
-				),
+					'link' => !empty($row['last_id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['last_id_member'] . '">' . $row['last_display_name'] . '</a>' : $row['last_display_name'],
+				],
 				'time' => Time::create('@' . $row['last_poster_time'])->format(),
 				'timestamp' => $row['last_poster_time'],
 				'subject' => $row['last_subject'],
@@ -410,8 +414,8 @@ public static function buildTopicContext(array $row)
 				'icon' => $row['last_icon'],
 				'icon_url' => Theme::$current->settings[Utils::$context['icon_sources'][$row['last_icon']]] . '/post/' . $row['last_icon'] . '.png',
 				'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . (User::$me->is_guest ? ('.' . (!empty(Theme::$current->options['view_newest_first']) ? 0 : ((int) (($row['num_replies']) / Utils::$context['messages_per_page'])) * Utils::$context['messages_per_page']) . '#msg' . $row['id_last_msg']) : (($row['num_replies'] == 0 ? '.0' : '.msg' . $row['id_last_msg']) . '#new')),
-				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . (User::$me->is_guest ? ('.' . (!empty(Theme::$current->options['view_newest_first']) ? 0 : ((int) (($row['num_replies']) / Utils::$context['messages_per_page'])) * Utils::$context['messages_per_page']) . '#msg' . $row['id_last_msg']) : (($row['num_replies'] == 0 ? '.0' : '.msg' . $row['id_last_msg']) . '#new')) . '" ' . ($row['num_replies'] == 0 ? '' : 'rel="nofollow"') . '>' . $row['last_subject'] . '</a>'
-			),
+				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . (User::$me->is_guest ? ('.' . (!empty(Theme::$current->options['view_newest_first']) ? 0 : ((int) (($row['num_replies']) / Utils::$context['messages_per_page'])) * Utils::$context['messages_per_page']) . '#msg' . $row['id_last_msg']) : (($row['num_replies'] == 0 ? '.0' : '.msg' . $row['id_last_msg']) . '#new')) . '" ' . ($row['num_replies'] == 0 ? '' : 'rel="nofollow"') . '>' . $row['last_subject'] . '</a>',
+			],
 			'is_sticky' => !empty($row['is_sticky']),
 			'is_locked' => !empty($row['locked']),
 			'is_redirect' => !empty($row['id_redirect_topic']),
@@ -431,22 +435,22 @@ public static function buildTopicContext(array $row)
 			'approved' => $row['approved'],
 			'unapproved_posts' => $row['unapproved_posts'],
 			'css_class' => $colorClass,
-		));
-		if (!empty(Theme::$current->settings['avatars_on_indexes']))
-		{
+		]);
+
+		if (!empty(Theme::$current->settings['avatars_on_indexes'])) {
 			// Last post member avatar
-			Utils::$context['topics'][$row['id_topic']]['last_post']['member']['avatar'] = User::setAvatarData(array(
+			Utils::$context['topics'][$row['id_topic']]['last_post']['member']['avatar'] = User::setAvatarData([
 				'avatar' => $row['avatar'],
 				'email' => $row['email_address'],
 				'filename' => !empty($row['last_member_filename']) ? $row['last_member_filename'] : '',
-			));
+			]);
 
 			// First post member avatar
-			Utils::$context['topics'][$row['id_topic']]['first_post']['member']['avatar'] = User::setAvatarData(array(
+			Utils::$context['topics'][$row['id_topic']]['first_post']['member']['avatar'] = User::setAvatarData([
 				'avatar' => $row['first_member_avatar'],
 				'email' => $row['first_member_mail'],
 				'filename' => !empty($row['first_member_filename']) ? $row['first_member_filename'] : '',
-			));
+			]);
 		}
 	}
 
@@ -461,8 +465,9 @@ public static function buildTopicContext(array $row)
 	 */
 	protected function __construct()
 	{
-		if (empty(Board::$info->id))
+		if (empty(Board::$info->id)) {
 			ErrorHandler::fatalLang('no_board', false);
+		}
 
 		$this->checkRedirect();
 		$this->preventPrefetch();
@@ -482,15 +487,15 @@ protected function __construct()
 	 */
 	protected function checkRedirect(): void
 	{
-		if (Board::$info->redirect)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		if (Board::$info->redirect) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET num_posts = num_posts + 1
 				WHERE id_board = {int:current_board}',
-				array(
+				[
 					'current_board' => Board::$info->id,
-				)
+				],
 			);
 
 			Utils::redirectexit(Board::$info->redirect);
@@ -502,14 +507,13 @@ protected function checkRedirect(): void
 	 */
 	protected function preventPrefetch(): void
 	{
-		if (!User::$me->is_guest)
-		{
+		if (!User::$me->is_guest) {
 			// We can't know they read it if we allow prefetches.
 			// But we'll actually mark it read later after we've done everything else.
-			if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-			{
+			if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
 				ob_end_clean();
 				Utils::sendHttpStatus(403, 'Prefetch Forbidden');
+
 				die;
 			}
 		}
@@ -522,15 +526,14 @@ protected function setSortMethod(): void
 	{
 		// This is a bit convoluted, but it's necessary to maintain backward
 		// compatibility for the expected parameters of the integration hook.
-		foreach ($this->sort_methods as $method => $sort_info)
-		{
+		foreach ($this->sort_methods as $method => $sort_info) {
 			$sort_columns[$method] = &$this->sort_methods[$method]['column'];
 			$sort_joins[$method] = &$this->sort_methods[$method]['joins'];
 			$sort_asc_defaults[$method] = &$this->sort_methods[$method]['asc_default'];
 		}
 
 		// Bring in any changes we want to make before the query.
-		IntegrationHook::call('integrate_pre_messageindex', array(&$sort_columns, &$sort_joins, &$sort_asc_defaults, &$this->sort_default));
+		IntegrationHook::call('integrate_pre_messageindex', [&$sort_columns, &$sort_joins, &$sort_asc_defaults, &$this->sort_default]);
 
 		// Default to sorting by last post descending.
 		$this->sort_by = !isset($_REQUEST['sort']) || !isset($this->sort_methods[$_REQUEST['sort']]) ? $this->sort_default : $_REQUEST['sort'];
@@ -544,8 +547,7 @@ protected function setSortMethod(): void
 		Utils::$context['sort_by'] = $this->sort_by;
 		Lang::$txt['starter'] = Lang::$txt['started_by'];
 
-		foreach ($this->sort_methods as $key => $val)
-		{
+		foreach ($this->sort_methods as $key => $val) {
 			Utils::$context['topics_headers'][$key] = '<a href="' . Config::$scripturl . '?board=' . Utils::$context['current_board'] . '.' . $_REQUEST['start'] . ($this->sort_default == $key ? '' : ';sort=' . $key) . ($this->sort_by == $key && $this->ascending_is_default ? ($this->ascending ? ';desc' : ';asc') : '') . '">' . Lang::$txt[$key] . ($this->sort_by == $key ? ' <span class="main_icons sort_' . ($this->ascending ? 'up' : 'down') . '"></span>' : '') . '</a>';
 		}
 	}
@@ -566,12 +568,9 @@ protected function setPaginationAndLinks(): void
 		Utils::$context['maxindex'] = isset($_REQUEST['all']) && !empty(Config::$modSettings['enableAllMessages']) ? Board::$info->total_topics : Utils::$context['topics_per_page'];
 
 		// Make sure the starting place makes sense and construct the page index.
-		if ($this->sort_by !== $this->sort_default || !$this->ascending_is_default)
-		{
+		if ($this->sort_by !== $this->sort_default || !$this->ascending_is_default) {
 			Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?board=' . Board::$info->id . '.%1$d' . ($this->sort_default == $this->sort_by ? '' : ';sort=' . $this->sort_by) . ($this->ascending_is_default ? '' : ($this->ascending ? ';asc' : ';desc')), $_REQUEST['start'], Board::$info->total_topics, Utils::$context['maxindex'], true);
-		}
-		else
-		{
+		} else {
 			Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?board=' . Board::$info->id . '.%1$d', $_REQUEST['start'], Board::$info->total_topics, Utils::$context['maxindex'], true);
 		}
 
@@ -579,24 +578,22 @@ protected function setPaginationAndLinks(): void
 
 		$can_show_all = !empty(Config::$modSettings['enableAllMessages']) && Utils::$context['maxindex'] > Config::$modSettings['enableAllMessages'];
 
-		if (!($can_show_all && isset($_REQUEST['all'])))
-		{
-			Utils::$context['links'] = array(
+		if (!($can_show_all && isset($_REQUEST['all']))) {
+			Utils::$context['links'] = [
 				'first' => $_REQUEST['start'] >= Utils::$context['topics_per_page'] ? Config::$scripturl . '?board=' . Board::$info->id . '.0' : '',
 				'prev' => $_REQUEST['start'] >= Utils::$context['topics_per_page'] ? Config::$scripturl . '?board=' . Board::$info->id . '.' . ($_REQUEST['start'] - Utils::$context['topics_per_page']) : '',
 				'next' => $_REQUEST['start'] + Utils::$context['topics_per_page'] < Board::$info->total_topics ? Config::$scripturl . '?board=' . Board::$info->id . '.' . ($_REQUEST['start'] + Utils::$context['topics_per_page']) : '',
 				'last' => $_REQUEST['start'] + Utils::$context['topics_per_page'] < Board::$info->total_topics ? Config::$scripturl . '?board=' . Board::$info->id . '.' . (floor((Board::$info->total_topics - 1) / Utils::$context['topics_per_page']) * Utils::$context['topics_per_page']) : '',
-				'up' => Board::$info->parent == 0 ? Config::$scripturl . '?' : Config::$scripturl . '?board=' . Board::$info->parent . '.0'
-			);
+				'up' => Board::$info->parent == 0 ? Config::$scripturl . '?' : Config::$scripturl . '?board=' . Board::$info->parent . '.0',
+			];
 		}
 
-		Utils::$context['page_info'] = array(
+		Utils::$context['page_info'] = [
 			'current_page' => $_REQUEST['start'] / Utils::$context['topics_per_page'] + 1,
-			'num_pages' => floor((Board::$info->total_topics - 1) / Utils::$context['topics_per_page']) + 1
-		);
+			'num_pages' => floor((Board::$info->total_topics - 1) / Utils::$context['topics_per_page']) + 1,
+		];
 
-		if (isset($_REQUEST['all']) && $can_show_all)
-		{
+		if (isset($_REQUEST['all']) && $can_show_all) {
 			Utils::$context['maxindex'] = Config::$modSettings['enableAllMessages'];
 			$_REQUEST['start'] = 0;
 		}
@@ -608,27 +605,29 @@ protected function setPaginationAndLinks(): void
 	protected function buildTopicList(): void
 	{
 		// Set up the default topic icons. We'll need them below.
-		Utils::$context['icon_sources'] = array();
-		foreach (Utils::$context['stable_icons'] as $icon)
+		Utils::$context['icon_sources'] = [];
+
+		foreach (Utils::$context['stable_icons'] as $icon) {
 			Utils::$context['icon_sources'][$icon] = 'images_url';
+		}
 
 		// Calculate the fastest way to get the topics.
 		$start = (int) $_REQUEST['start'];
-		if ($start > (Board::$info->total_topics - 1) / 2)
-		{
+
+		if ($start > (Board::$info->total_topics - 1) / 2) {
 			$this->ascending = !$this->ascending;
 			$fake_ascending = true;
 			Utils::$context['maxindex'] = Board::$info->total_topics < $start + Utils::$context['maxindex'] + 1 ? Board::$info->total_topics - $start : Utils::$context['maxindex'];
 			$start = Board::$info->total_topics < $start + Utils::$context['maxindex'] + 1 ? 0 : Board::$info->total_topics - $start - Utils::$context['maxindex'];
-		}
-		else
+		} else {
 			$fake_ascending = false;
+		}
 
-		$topic_ids = array();
-		Utils::$context['topics'] = array();
+		$topic_ids = [];
+		Utils::$context['topics'] = [];
 
 		// Grab the appropriate topic information...
-		$params = array(
+		$params = [
 			'current_board' => Board::$info->id,
 			'current_member' => User::$me->id,
 			'topic_list' => $topic_ids,
@@ -636,19 +635,20 @@ protected function buildTopicList(): void
 			'find_set_topics' => implode(',', $topic_ids),
 			'start' => $start,
 			'maxindex' => Utils::$context['maxindex'],
-		);
+		];
 
-		$selects = array();
-		$joins = array();
-		$main_where = array();
-		$sort_where = array();
+		$selects = [];
+		$joins = [];
+		$main_where = [];
+		$sort_where = [];
 
-		IntegrationHook::call('integrate_message_index', array(&$selects, &$joins, &$params, &$main_where, &$topic_ids, &$sort_where));
+		IntegrationHook::call('integrate_message_index', [&$selects, &$joins, &$params, &$main_where, &$topic_ids, &$sort_where]);
 
-		if (!empty(Config::$modSettings['enableParticipation']) && !User::$me->is_guest)
+		if (!empty(Config::$modSettings['enableParticipation']) && !User::$me->is_guest) {
 			$enableParticipation = true;
-		else
+		} else {
 			$enableParticipation = false;
+		}
 
 		$sort_table = '
 			SELECT t.id_topic, t.id_first_msg, t.id_last_msg' . (!empty($selects) ? (', ' . implode(', ', $selects)) : '') . '
@@ -658,13 +658,14 @@ protected function buildTopicList(): void
 			WHERE t.id_board = {int:current_board} '
 				. (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 				AND (t.approved = {int:is_approved}' . (User::$me->is_guest ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . (!empty($sort_where) ? '
-				AND ' . implode("\n\t\t\t\tAND ", $sort_where) : ''). '
+				AND ' . implode("\n\t\t\t\tAND ", $sort_where) : '') . '
 			ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $this->sort_column . ($this->ascending ? '' : ' DESC') . '
 			LIMIT {int:maxindex}
 				OFFSET {int:start} ';
 
-		$result = Db::$db->query('substring', '
-			SELECT
+		$result = Db::$db->query(
+			'substring',
+			'SELECT
 				t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_board, t.id_previous_board,
 				' . (User::$me->is_guest ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
 				' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
@@ -692,14 +693,14 @@ protected function buildTopicList(): void
 				' . (!empty($joins) ? implode("\n\t\t\t\t", $joins) : '') . '
 				' . (!empty($main_where) ? ' WHERE ' . implode("\n\t\t\t\tAND ", $main_where) : '') . '
 			ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $this->sort_column . ($this->ascending ? '' : ' DESC'),
-			$params
+			$params,
 		);
 
 		// Begin 'printing' the message index for current board.
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			if ($row['id_poll'] > 0 && Config::$modSettings['pollMode'] == '0')
+		while ($row = Db::$db->fetch_assoc($result)) {
+			if ($row['id_poll'] > 0 && Config::$modSettings['pollMode'] == '0') {
 				continue;
+			}
 
 			$topic_ids[] = $row['id_topic'];
 
@@ -708,8 +709,9 @@ protected function buildTopicList(): void
 		Db::$db->free_result($result);
 
 		// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
-		if ($fake_ascending)
+		if ($fake_ascending) {
 			Utils::$context['topics'] = array_reverse(Utils::$context['topics'], true);
+		}
 	}
 
 	/**
@@ -717,13 +719,13 @@ protected function buildTopicList(): void
 	 */
 	protected function buildChildBoardIndex(): void
 	{
-		$boardIndexOptions = array(
+		$boardIndexOptions = [
 			'include_categories' => false,
 			'base_level' => Board::$info->child_level + 1,
 			'parent_id' => Board::$info->id,
 			'set_latest_post' => false,
 			'countChildPosts' => !empty(Config::$modSettings['countChildPosts']),
-		);
+		];
 		Utils::$context['boards'] = BoardIndex::get($boardIndexOptions);
 	}
 
@@ -732,84 +734,87 @@ protected function buildChildBoardIndex(): void
 	 */
 	protected function markViewed(): void
 	{
-		if (!User::$me->is_guest)
-		{
-			Db::$db->insert('replace',
+		if (!User::$me->is_guest) {
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_boards',
-				array('id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'),
-				array(Config::$modSettings['maxMsgID'], User::$me->id, Board::$info->id),
-				array('id_member', 'id_board')
+				['id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'],
+				[Config::$modSettings['maxMsgID'], User::$me->id, Board::$info->id],
+				['id_member', 'id_board'],
 			);
 
-			if (!empty(Board::$info->parent_boards))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}log_boards
+			if (!empty(Board::$info->parent_boards)) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}log_boards
 					SET id_msg = {int:id_msg}
 					WHERE id_member = {int:current_member}
 						AND id_board IN ({array_int:board_list})',
-					array(
+					[
 						'current_member' => User::$me->id,
 						'board_list' => array_keys(Board::$info->parent_boards),
 						'id_msg' => Config::$modSettings['maxMsgID'],
-					)
+					],
 				);
 
 				// We've seen all these boards now!
-				foreach (Board::$info->parent_boards as $k => $dummy)
-					if (isset($_SESSION['topicseen_cache'][$k]))
+				foreach (Board::$info->parent_boards as $k => $dummy) {
+					if (isset($_SESSION['topicseen_cache'][$k])) {
 						unset($_SESSION['topicseen_cache'][$k]);
+					}
+				}
 			}
 
-			if (isset($_SESSION['topicseen_cache'][Board::$info->id]))
+			if (isset($_SESSION['topicseen_cache'][Board::$info->id])) {
 				unset($_SESSION['topicseen_cache'][Board::$info->id]);
+			}
 
-			$request = Db::$db->query('', '
-				SELECT id_topic, id_board, sent
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, id_board, sent
 				FROM {db_prefix}log_notify
 				WHERE id_member = {int:current_member}
 					AND (' . (!empty(Utils::$context['topics']) ? 'id_topic IN ({array_int:topics}) OR ' : '') . 'id_board = {int:current_board})',
-				array(
+				[
 					'current_board' => Board::$info->id,
-					'topics' => !empty(Utils::$context['topics']) ? array_keys(Utils::$context['topics']) : array(),
+					'topics' => !empty(Utils::$context['topics']) ? array_keys(Utils::$context['topics']) : [],
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 			Utils::$context['is_marked_notify'] = false; // this is for the *board* only
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!empty($row['id_board']))
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!empty($row['id_board'])) {
 					Utils::$context['is_marked_notify'] = true;
 					$board_sent = $row['sent'];
 				}
-				if (!empty($row['id_topic']))
+
+				if (!empty($row['id_topic'])) {
 					Utils::$context['topics'][$row['id_topic']]['is_watched'] = true;
+				}
 			}
 			Db::$db->free_result($request);
 
-			if (Utils::$context['is_marked_notify'] && !empty($board_sent))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}log_notify
+			if (Utils::$context['is_marked_notify'] && !empty($board_sent)) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}log_notify
 					SET sent = {int:is_sent}
 					WHERE id_member = {int:current_member}
 						AND id_board = {int:current_board}',
-					array(
+					[
 						'current_board' => Board::$info->id,
 						'current_member' => User::$me->id,
 						'is_sent' => 0,
-					)
+					],
 				);
 			}
 
-			$pref = Notify::getNotifyPrefs(User::$me->id, array('board_notify', 'board_notify_' . Board::$info->id), true);
-			$pref = !empty($pref[User::$me->id]) ? $pref[User::$me->id] : array();
-			$pref = isset($pref['board_notify_' . Board::$info->id]) ? $pref['board_notify_' . Board::$info->id] : (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
+			$pref = Notify::getNotifyPrefs(User::$me->id, ['board_notify', 'board_notify_' . Board::$info->id], true);
+			$pref = !empty($pref[User::$me->id]) ? $pref[User::$me->id] : [];
+			$pref = $pref['board_notify_' . Board::$info->id] ?? (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
 			Utils::$context['board_notification_mode'] = !Utils::$context['is_marked_notify'] ? 1 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
-		}
-		else
-		{
+		} else {
 			Utils::$context['is_marked_notify'] = false;
 			Utils::$context['board_notification_mode'] = 1;
 		}
@@ -820,45 +825,50 @@ protected function markViewed(): void
 	 */
 	protected function getWhoViewing(): void
 	{
-		if (!empty(Theme::$current->settings['display_who_viewing']))
-		{
-			Utils::$context['view_members'] = array();
-			Utils::$context['view_members_list'] = array();
+		if (!empty(Theme::$current->settings['display_who_viewing'])) {
+			Utils::$context['view_members'] = [];
+			Utils::$context['view_members_list'] = [];
 			Utils::$context['view_num_hidden'] = 0;
 
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					lo.id_member, lo.log_time, mem.real_name, mem.member_name, mem.show_online,
 					mg.online_color, mg.id_group, mg.group_name
 				FROM {db_prefix}log_online AS lo
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lo.id_member)
 					LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:reg_member_group} THEN mem.id_post_group ELSE mem.id_group END)
 				WHERE INSTR(lo.url, {string:in_url_string}) > 0 OR lo.session = {string:session}',
-				array(
+				[
 					'reg_member_group' => 0,
 					'in_url_string' => '"board":' . Board::$info->id,
 					'session' => User::$me->is_guest ? 'ip' . User::$me->ip : session_id(),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['id_member']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['id_member'])) {
 					continue;
+				}
 
-				if (!empty($row['online_color']))
+				if (!empty($row['online_color'])) {
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-				else
+				} else {
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+				}
 
 				$is_buddy = in_array($row['id_member'], User::$me->buddies);
-				if ($is_buddy)
+
+				if ($is_buddy) {
 					$link = '<strong>' . $link . '</strong>';
+				}
 
-				if (!empty($row['show_online']) || User::$me->allowedTo('moderate_forum'))
+				if (!empty($row['show_online']) || User::$me->allowedTo('moderate_forum')) {
 					Utils::$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+				}
 
 				// @todo why are we filling this array of data that are just counted (twice) and discarded? ???
-				Utils::$context['view_members'][$row['log_time'] . $row['member_name']] = array(
+				Utils::$context['view_members'][$row['log_time'] . $row['member_name']] = [
 					'id' => $row['id_member'],
 					'username' => $row['member_name'],
 					'name' => $row['real_name'],
@@ -867,10 +877,11 @@ protected function getWhoViewing(): void
 					'link' => $link,
 					'is_buddy' => $is_buddy,
 					'hidden' => empty($row['show_online']),
-				);
+				];
 
-				if (empty($row['show_online']))
+				if (empty($row['show_online'])) {
 					Utils::$context['view_num_hidden']++;
+				}
 			}
 			Utils::$context['view_num_guests'] = Db::$db->num_rows($request) - count(Utils::$context['view_members']);
 			Db::$db->free_result($request);
@@ -889,24 +900,23 @@ protected function setModerators(): void
 		// Build a list of the board's moderators.
 		Utils::$context['moderators'] = &Board::$info->moderators;
 		Utils::$context['moderator_groups'] = &Board::$info->moderator_groups;
-		Utils::$context['link_moderators'] = array();
+		Utils::$context['link_moderators'] = [];
 
-		if (!empty(Board::$info->moderators))
-		{
-			foreach (Board::$info->moderators as $mod)
+		if (!empty(Board::$info->moderators)) {
+			foreach (Board::$info->moderators as $mod) {
 				Utils::$context['link_moderators'][] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . Lang::$txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+			}
 		}
 
-		if (!empty(Board::$info->moderator_groups))
-		{
+		if (!empty(Board::$info->moderator_groups)) {
 			// By default just tack the moderator groups onto the end of the members
-			foreach (Board::$info->moderator_groups as $mod_group)
+			foreach (Board::$info->moderator_groups as $mod_group) {
 				Utils::$context['link_moderators'][] = '<a href="' . Config::$scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . Lang::$txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+			}
 		}
 
 		// Now we tack the info onto the end of the linktree
-		if (!empty(Utils::$context['link_moderators']))
-		{
+		if (!empty(Utils::$context['link_moderators'])) {
 			Utils::$context['linktree'][count(Utils::$context['linktree']) - 1]['extra_after'] = '<span class="board_moderators">(' . (count(Utils::$context['link_moderators']) == 1 ? Lang::$txt['moderator'] : Lang::$txt['moderators']) . ': ' . implode(', ', Utils::$context['link_moderators']) . ')</span>';
 		}
 	}
@@ -917,8 +927,7 @@ protected function setModerators(): void
 	protected function setUnapprovedPostsMessage(): void
 	{
 		// If we can view unapproved messages and there are some build up a list.
-		if (User::$me->allowedTo('approve_posts') && (Board::$info->unapproved_topics || Board::$info->unapproved_posts))
-		{
+		if (User::$me->allowedTo('approve_posts') && (Board::$info->unapproved_topics || Board::$info->unapproved_posts)) {
 			$untopics = Board::$info->unapproved_topics ? '<a href="' . Config::$scripturl . '?action=moderate;area=postmod;sa=topics;brd=' . Board::$info->id . '">' . Board::$info->unapproved_topics . '</a>' : 0;
 
 			$unposts = Board::$info->unapproved_posts ? '<a href="' . Config::$scripturl . '?action=moderate;area=postmod;sa=posts;brd=' . Board::$info->id . '">' . (Board::$info->unapproved_posts - Board::$info->unapproved_topics) . '</a>' : 0;
@@ -927,7 +936,7 @@ protected function setUnapprovedPostsMessage(): void
 				Lang::$txt['there_are_unapproved_topics'],
 				$untopics,
 				$unposts,
-				Config::$scripturl . '?action=moderate;area=postmod;sa=' . (Board::$info->unapproved_topics ? 'topics' : 'posts') . ';brd=' . Board::$info->id
+				Config::$scripturl . '?action=moderate;area=postmod;sa=' . (Board::$info->unapproved_topics ? 'topics' : 'posts') . ';brd=' . Board::$info->id,
 			);
 		}
 
@@ -944,7 +953,7 @@ protected function setupTemplate(): void
 		Theme::loadTemplate('MessageIndex');
 
 		// Javascript for inline editing.
-		Theme::loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
+		Theme::loadJavaScriptFile('topic.js', ['defer' => false, 'minimize' => true], 'smf_topic');
 
 		// 'Print' the header and board info.
 		Utils::$context['page_title'] = strip_tags(Board::$info->name);
@@ -954,8 +963,9 @@ protected function setupTemplate(): void
 		Utils::$context['name'] = Board::$info->name;
 		Utils::$context['description'] = Board::$info->description;
 
-		if (!empty(Board::$info->description))
+		if (!empty(Board::$info->description)) {
 			Utils::$context['meta_description'] = strip_tags(Board::$info->description);
+		}
 
 		// Set a canonical URL for this page.
 		Utils::$context['canonical_url'] = Config::$scripturl . '?board=' . Board::$info->id . '.' . Utils::$context['start'];
@@ -966,11 +976,11 @@ protected function setupTemplate(): void
 		Utils::$context['can_moderate_forum'] = User::$me->allowedTo('moderate_forum');
 		Utils::$context['can_approve_posts'] = User::$me->allowedTo('approve_posts');
 
-		Utils::$context['jump_to'] = array(
+		Utils::$context['jump_to'] = [
 			'label' => addslashes(Utils::htmlspecialcharsDecode(Lang::$txt['jump_to'])),
-			'board_name' => strtr(Utils::htmlspecialchars(strip_tags(Board::$info->name)), array('&amp;' => '&')),
+			'board_name' => strtr(Utils::htmlspecialchars(strip_tags(Board::$info->name)), ['&amp;' => '&']),
 			'child_level' => Board::$info->child_level,
-		);
+		];
 	}
 
 	/**
@@ -979,18 +989,19 @@ protected function setupTemplate(): void
 	protected function setRobotNoIndex(): void
 	{
 		// Right, let's only index normal stuff!
-		if (count($_GET) > 1)
-		{
+		if (count($_GET) > 1) {
 			$session_name = session_name();
-			foreach ($_GET as $k => $v)
-			{
-				if (!in_array($k, array('board', 'start', $session_name)))
+
+			foreach ($_GET as $k => $v) {
+				if (!in_array($k, ['board', 'start', $session_name])) {
 					Utils::$context['robot_no_index'] = true;
+				}
 			}
 		}
 
-		if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % Utils::$context['topics_per_page'] != 0))
+		if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % Utils::$context['topics_per_page'] != 0)) {
 			Utils::$context['robot_no_index'] = true;
+		}
 	}
 
 	/**
@@ -999,8 +1010,7 @@ protected function setRobotNoIndex(): void
 	protected function buildQuickMod(): void
 	{
 		// Is Quick Moderation active/needed?
-		if (!empty(Theme::$current->options['display_quick_mod']) && !empty(Utils::$context['topics']))
-		{
+		if (!empty(Theme::$current->options['display_quick_mod']) && !empty(Utils::$context['topics'])) {
 			Utils::$context['can_markread'] = User::$me->is_logged;
 			Utils::$context['can_lock'] = User::$me->allowedTo('lock_any');
 			Utils::$context['can_sticky'] = User::$me->allowedTo('make_sticky');
@@ -1012,10 +1022,9 @@ protected function buildQuickMod(): void
 			// Can we restore topics?
 			Utils::$context['can_restore'] = User::$me->allowedTo('move_any') && !empty(Board::$info->recycle);
 
-			if (User::$me->is_admin || Config::$modSettings['topic_move_any'])
+			if (User::$me->is_admin || Config::$modSettings['topic_move_any']) {
 				Utils::$context['can_move_any'] = true;
-			else
-			{
+			} else {
 				// We'll use this in a minute
 				$boards_allowed = User::$me->boardsAllowedTo('post_new');
 
@@ -1024,32 +1033,32 @@ protected function buildQuickMod(): void
 			}
 
 			// Set permissions for all the topics.
-			foreach (Utils::$context['topics'] as $t => $topic)
-			{
+			foreach (Utils::$context['topics'] as $t => $topic) {
 				$started = $topic['first_post']['member']['id'] == User::$me->id;
-				Utils::$context['topics'][$t]['quick_mod'] = array(
+				Utils::$context['topics'][$t]['quick_mod'] = [
 					'lock' => User::$me->allowedTo('lock_any') || ($started && User::$me->allowedTo('lock_own')),
 					'sticky' => User::$me->allowedTo('make_sticky'),
 					'move' => (User::$me->allowedTo('move_any') || ($started && User::$me->allowedTo('move_own')) && Utils::$context['can_move_any']),
 					'modify' => User::$me->allowedTo('modify_any') || ($started && User::$me->allowedTo('modify_own')),
 					'remove' => User::$me->allowedTo('remove_any') || ($started && User::$me->allowedTo('remove_own')),
-					'approve' => Utils::$context['can_approve'] && $topic['unapproved_posts']
-				);
+					'approve' => Utils::$context['can_approve'] && $topic['unapproved_posts'],
+				];
 				Utils::$context['can_lock'] |= ($started && User::$me->allowedTo('lock_own'));
 				Utils::$context['can_move'] |= ($started && User::$me->allowedTo('move_own') && Utils::$context['can_move_any']);
 				Utils::$context['can_remove'] |= ($started && User::$me->allowedTo('remove_own'));
 			}
 
 			// Can we use quick moderation checkboxes?
-			if (Theme::$current->options['display_quick_mod'] == 1)
+			if (Theme::$current->options['display_quick_mod'] == 1) {
 				Utils::$context['can_quick_mod'] = User::$me->is_logged || Utils::$context['can_approve'] || Utils::$context['can_remove'] || Utils::$context['can_lock'] || Utils::$context['can_sticky'] || Utils::$context['can_move'] || Utils::$context['can_merge'] || Utils::$context['can_restore'];
+			}
 			// Or the icons?
-			else
+			else {
 				Utils::$context['can_quick_mod'] = Utils::$context['can_remove'] || Utils::$context['can_lock'] || Utils::$context['can_sticky'] || Utils::$context['can_move'];
+			}
 		}
 
-		if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1)
-		{
+		if (!empty(Utils::$context['can_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
 			// Sets Utils::$context['qmod_actions']
 			// This is also where the integrate_quick_mod_actions hook now lives.
 			QuickModeration::getActions();
@@ -1061,46 +1070,50 @@ protected function buildQuickMod(): void
 	 */
 	protected function buildButtons(): void
 	{
-		Utils::$context['normal_buttons'] = array();
+		Utils::$context['normal_buttons'] = [];
 
-		if (Utils::$context['can_post_new'])
-			Utils::$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => Config::$scripturl . '?action=post;board=' . Utils::$context['current_board'] . '.0', 'active' => true);
+		if (Utils::$context['can_post_new']) {
+			Utils::$context['normal_buttons']['new_topic'] = ['text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => Config::$scripturl . '?action=post;board=' . Utils::$context['current_board'] . '.0', 'active' => true];
+		}
 
-		if (Utils::$context['can_post_poll'])
-			Utils::$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => Config::$scripturl . '?action=post;board=' . Utils::$context['current_board'] . '.0;poll');
+		if (Utils::$context['can_post_poll']) {
+			Utils::$context['normal_buttons']['post_poll'] = ['text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => Config::$scripturl . '?action=post;board=' . Utils::$context['current_board'] . '.0;poll'];
+		}
 
-		if (User::$me->is_logged)
-			Utils::$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . Lang::$txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => Config::$scripturl . '?action=markasread;sa=board;board=' . Utils::$context['current_board'] . '.0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+		if (User::$me->is_logged) {
+			Utils::$context['normal_buttons']['markread'] = ['text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . Lang::$txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => Config::$scripturl . '?action=markasread;sa=board;board=' . Utils::$context['current_board'] . '.0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']];
+		}
 
-		if (Utils::$context['can_mark_notify'])
-			Utils::$context['normal_buttons']['notify'] = array(
+		if (Utils::$context['can_mark_notify']) {
+			Utils::$context['normal_buttons']['notify'] = [
 				'lang' => true,
 				'text' => 'notify_board_' . Utils::$context['board_notification_mode'],
-				'sub_buttons' => array(
-					array(
+				'sub_buttons' => [
+					[
 						'text' => 'notify_board_1',
 						'url' => Config::$scripturl . '?action=notifyboard;board=' . Board::$info->id . ';mode=1;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-					array(
+					],
+					[
 						'text' => 'notify_board_2',
 						'url' => Config::$scripturl . '?action=notifyboard;board=' . Board::$info->id . ';mode=2;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-					array(
+					],
+					[
 						'text' => 'notify_board_3',
 						'url' => Config::$scripturl . '?action=notifyboard;board=' . Board::$info->id . ';mode=3;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-					),
-				),
-			);
+					],
+				],
+			];
+		}
 
 		// Allow adding new buttons easily.
 		// Note: Utils::$context['normal_buttons'] is added for backward compatibility with 2.0, but is deprecated and should not be used
-		IntegrationHook::call('integrate_messageindex_buttons', array(&Utils::$context['normal_buttons']));
+		IntegrationHook::call('integrate_messageindex_buttons', [&Utils::$context['normal_buttons']]);
 	}
-
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\MessageIndex::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\MessageIndex::exportStatic')) {
 	MessageIndex::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/EndSession.php b/Sources/Actions/Moderation/EndSession.php
index 1d4e1f9886..86e62434ef 100644
--- a/Sources/Actions/Moderation/EndSession.php
+++ b/Sources/Actions/Moderation/EndSession.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Utils;
 
 /**
@@ -31,12 +30,11 @@ class EndSession implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ModEndSession',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -63,10 +61,10 @@ public function execute(): void
 		unset($_SESSION['moderate_time']);
 
 		// Clean any moderator tokens as well.
-		foreach ($_SESSION['token'] as $key => $token)
-		{
-			if (strpos($key, '-mod') !== false)
+		foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-mod') !== false) {
 				unset($_SESSION['token'][$key]);
+			}
 		}
 
 		Utils::redirectexit();
@@ -83,8 +81,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -110,7 +109,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\EndSession::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\EndSession::exportStatic')) {
 	EndSession::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/Groups.php b/Sources/Actions/Moderation/Groups.php
index 333a92a5a4..51d07d29fe 100644
--- a/Sources/Actions/Moderation/Groups.php
+++ b/Sources/Actions/Moderation/Groups.php
@@ -11,8 +11,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 // Just an alias to help people looking for the action in the wrong namespace.
 class_alias('SMF\\Actions\\Groups', 'SMF\\Actions\\Moderation\\Groups');
diff --git a/Sources/Actions/Moderation/Home.php b/Sources/Actions/Moderation/Home.php
index 411aa54a99..56a0887165 100644
--- a/Sources/Actions/Moderation/Home.php
+++ b/Sources/Actions/Moderation/Home.php
@@ -13,11 +13,12 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -27,8 +28,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This is the home page of the moderation center.
@@ -42,12 +41,11 @@ class Home implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ModerationHome',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -58,33 +56,33 @@ class Home implements ActionInterface
 	 *
 	 * Blocks of data to show on the moderation center home page.
 	 */
-	public array $blocks = array(
-		'g' => array(
+	public array $blocks = [
+		'g' => [
 			'func' => 'groupRequests',
 			'sub_template' => 'group_requests_block',
 			'context_var' => 'group_requests',
-			'permissions' => array('can_moderate_groups'),
-		),
-		'r' => array(
+			'permissions' => ['can_moderate_groups'],
+		],
+		'r' => [
 			'func' => 'reportedPosts',
 			'sub_template' => 'reported_posts_block',
 			'context_var' => 'reported_posts',
-			'permissions' => array('can_moderate_boards'),
-		),
-		'w' => array(
+			'permissions' => ['can_moderate_boards'],
+		],
+		'w' => [
 			'func' => 'watchedUsers',
 			'sub_template' => 'watched_users',
 			'context_var' => 'watched_users',
 			// There are two possible reasons to grant someone access to this.
-			'permissions' => array('can_moderate_boards', 'can_moderate_users'),
-		),
-		'rm' => array(
+			'permissions' => ['can_moderate_boards', 'can_moderate_users'],
+		],
+		'rm' => [
 			'func' => 'reportedMembers',
 			'sub_template' => 'reported_users_block',
 			'context_var' => 'reported_users',
-			'permissions' => array('can_moderate_users'),
-		),
-	);
+			'permissions' => ['can_moderate_users'],
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -110,37 +108,36 @@ public function execute(): void
 		// Normally this will already have been done, but just in case...
 		Main::checkAccessPermissions();
 
-		Utils::$context['mod_blocks'] = array();
+		Utils::$context['mod_blocks'] = [];
 
 		// Handle moderators' notes.
 		$this->notes();
 
-		IntegrationHook::call('integrate_moderation_home_blocks', array(&$this->blocks));
+		IntegrationHook::call('integrate_moderation_home_blocks', [&$this->blocks]);
 
-		foreach ($this->blocks as $k => $block)
-		{
+		foreach ($this->blocks as $k => $block) {
 			// Define the context variable even if the block is disabled.
-			Utils::$context[$block['context_var']] = array();
+			Utils::$context[$block['context_var']] = [];
 
 			// Is this block enabled?
 			$enabled = false;
 
-			foreach ($block['permissions'] as $permission)
+			foreach ($block['permissions'] as $permission) {
 				$enabled |= Utils::$context[$permission];
+			}
 
-			if (!$enabled)
+			if (!$enabled) {
 				continue;
-
-			if (method_exists($this, $block['func']))
-			{
-				call_user_func(array($this, $block['func']));
 			}
-			else
-			{
+
+			if (method_exists($this, $block['func'])) {
+				call_user_func([$this, $block['func']]);
+			} else {
 				$call = Utils::getCallable($block['func']);
 
-				if (!empty($call))
+				if (!empty($call)) {
 					call_user_func($call);
+				}
 			}
 
 			Utils::$context['mod_blocks'][] = $this->blocks[$k]['sub_template'];
@@ -149,7 +146,7 @@ public function execute(): void
 		// Backward compatibility for mods using the integrate_mod_centre_blocks hook.
 		self::integrateModBlocks();
 
-		Utils::$context['admin_prefs'] = !empty(Theme::$current->options['admin_preferences']) ? Utils::jsonDecode(Theme::$current->options['admin_preferences'], true) : array();
+		Utils::$context['admin_prefs'] = !empty(Theme::$current->options['admin_preferences']) ? Utils::jsonDecode(Theme::$current->options['admin_preferences'], true) : [];
 	}
 
 	/***********************
@@ -163,8 +160,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -187,7 +185,7 @@ public static function call(): void
 	protected function __construct()
 	{
 		Theme::loadTemplate('ModerationCenter');
-		Theme::loadJavaScriptFile('admin.js', array('minimize' => true), 'smf_admin');
+		Theme::loadJavaScriptFile('admin.js', ['minimize' => true], 'smf_admin');
 
 		Utils::$context['page_title'] = Lang::$txt['moderation_center'];
 		Utils::$context['sub_template'] = 'moderation_center';
@@ -199,31 +197,31 @@ protected function __construct()
 	protected function notes(): void
 	{
 		// Set a nice and informative message.
-		Utils::$context['report_post_action'] = !empty($_SESSION['rc_confirmation']) ? $_SESSION['rc_confirmation'] : array();
+		Utils::$context['report_post_action'] = !empty($_SESSION['rc_confirmation']) ? $_SESSION['rc_confirmation'] : [];
 
 		unset($_SESSION['rc_confirmation']);
 
 		// Are we saving a note?
-		if (isset($_GET['modnote']) && isset($_POST['makenote']) && isset($_POST['new_note']))
-		{
+		if (isset($_GET['modnote'], $_POST['makenote'], $_POST['new_note'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-modnote-add');
 
 			$_POST['new_note'] = Utils::htmlspecialchars(trim($_POST['new_note']));
+
 			// Make sure they actually entered something.
-			if (!empty($_POST['new_note']))
-			{
+			if (!empty($_POST['new_note'])) {
 				// Insert it into the database then!
-				Db::$db->insert('',
+				Db::$db->insert(
+					'',
 					'{db_prefix}log_comments',
-					array(
+					[
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'recipient_name' => 'string',
 						'body' => 'string', 'log_time' => 'int',
-					),
-					array(
+					],
+					[
 						User::$me->id, User::$me->name, 'modnote', '', $_POST['new_note'], time(),
-					),
-					array('id_comment')
+					],
+					['id_comment'],
 				);
 
 				// Clear the cache.
@@ -239,42 +237,43 @@ protected function notes(): void
 		}
 
 		// Bye... bye...
-		if (isset($_GET['notes']) && isset($_GET['delete']) && is_numeric($_GET['delete']))
-		{
+		if (isset($_GET['notes'], $_GET['delete'])   && is_numeric($_GET['delete'])) {
 			User::$me->checkSession('get');
 			SecurityToken::validate('mod-modnote-del', 'get');
 
 			// No sneaky stuff now!
-			if (!User::$me->allowedTo('admin_forum'))
-			{
+			if (!User::$me->allowedTo('admin_forum')) {
 				// Is this your note?
-				$get_owner = Db::$db->query('', '
-					SELECT id_member
+				$get_owner = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}log_comments
 					WHERE id_comment = {int:note}
 						AND comment_type = {literal:modnote}
 						AND id_member = {int:user}',
-					array(
+					[
 						'note' => $_GET['delete'],
 						'user' => User::$me->id,
-					)
+					],
 				);
 
 				$note_owner = Db::$db->num_rows($get_owner);
 				Db::$db->free_result($get_owner);
 
-				if (empty($note_owner))
+				if (empty($note_owner)) {
 					ErrorHandler::fatalLang('mc_notes_delete_own', false);
+				}
 			}
 
 			// Lets delete it.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_comments
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_comments
 				WHERE id_comment = {int:note}
 					AND comment_type = {literal:modnote}',
-				array(
+				[
 					'note' => $_GET['delete'],
-				)
+				],
 			);
 
 			// Clear the cache.
@@ -288,17 +287,17 @@ protected function notes(): void
 		}
 
 		// How many notes in total?
-		if (($moderator_notes_total = CacheApi::get('moderator_notes_total', 240)) === null)
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		if (($moderator_notes_total = CacheApi::get('moderator_notes_total', 240)) === null) {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}log_comments AS lc
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lc.id_member)
 				WHERE lc.comment_type = {literal:modnote}',
-				array(
-				)
+				[
+				],
 			);
-			list ($moderator_notes_total) = Db::$db->fetch_row($request);
+			list($moderator_notes_total) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			CacheApi::put('moderator_notes_total', $moderator_notes_total, 240);
@@ -306,51 +305,52 @@ protected function notes(): void
 
 		// Grab the current notes. We can only use the cache for the first page of notes.
 		$offset = isset($_GET['notes']) && isset($_GET['start']) ? $_GET['start'] : 0;
+		$start = (int) ($_GET['start'] ?? 0);
 
-		if ($offset != 0 || ($moderator_notes = CacheApi::get('moderator_notes', 240)) === null)
-		{
-			$moderator_notes = array();
+		if ($offset != 0 || ($moderator_notes = CacheApi::get('moderator_notes', 240)) === null) {
+			$moderator_notes = [];
 
-			$request = Db::$db->query('', '
-				SELECT COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS member_name,
+			$request = Db::$db->query(
+				'',
+				'SELECT COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS member_name,
 					lc.log_time, lc.body, lc.id_comment AS id_note
 				FROM {db_prefix}log_comments AS lc
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lc.id_member)
 				WHERE lc.comment_type = {literal:modnote}
 				ORDER BY id_comment DESC
 				LIMIT {int:offset}, 10',
-				array(
+				[
 					'offset' => $offset,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$moderator_notes[] = $row;
 			}
 			Db::$db->free_result($request);
 
-			if ($offset == 0)
+			if ($offset == 0) {
 				CacheApi::put('moderator_notes', $moderator_notes, 240);
+			}
 		}
 
 		// Lets construct a page index.
-		Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?action=moderate;area=index;notes', $_GET['start'], $moderator_notes_total, 10);
-		Utils::$context['start'] = $_GET['start'];
+		Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?action=moderate;area=index;notes', $start, $moderator_notes_total, 10);
+		Utils::$context['start'] = $start;
 
-		Utils::$context['notes'] = array();
+		Utils::$context['notes'] = [];
 
-		foreach ($moderator_notes as $note)
-		{
-			Utils::$context['notes'][] = array(
-				'author' => array(
+		foreach ($moderator_notes as $note) {
+			Utils::$context['notes'][] = [
+				'author' => [
 					'id' => $note['id_member'],
 					'link' => $note['id_member'] ? ('<a href="' . Config::$scripturl . '?action=profile;u=' . $note['id_member'] . '">' . $note['member_name'] . '</a>') : $note['member_name'],
-				),
+				],
 				'time' => Time::create('@' . $note['log_time'])->format(),
 				'text' => BBCodeParser::load()->parse($note['body']),
 				'delete_href' => Config::$scripturl . '?action=moderate;area=index;notes;delete=' . $note['id_note'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 				'can_delete' => User::$me->allowedTo('admin_forum') || $note['id_member'] == User::$me->id,
-			);
+			];
 		}
 
 		// Couple tokens for add/delete modnotes
@@ -364,12 +364,14 @@ protected function notes(): void
 	protected function groupRequests(): void
 	{
 		// Make sure they can even moderate someone!
-		if (User::$me->mod_cache['gq'] == '0=1')
+		if (User::$me->mod_cache['gq'] == '0=1') {
 			return;
+		}
 
 		// What requests are outstanding?
-		$request = Db::$db->query('', '
-			SELECT lgr.id_request, lgr.id_member, lgr.id_group, lgr.time_applied, mem.member_name, mg.group_name, mem.real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT lgr.id_request, lgr.id_member, lgr.id_group, lgr.time_applied, mem.member_name, mg.group_name, mem.real_name
 			FROM {db_prefix}log_group_requests AS lgr
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = lgr.id_member)
 				INNER JOIN {db_prefix}membergroups AS mg ON (mg.id_group = lgr.id_group)
@@ -377,27 +379,27 @@ protected function groupRequests(): void
 				AND lgr.status = {int:status_open}
 			ORDER BY lgr.id_request DESC
 			LIMIT 10',
-			array(
+			[
 				'status_open' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Utils::$context['group_requests'][] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['group_requests'][] = [
 				'id' => $row['id_request'],
 				'request_href' => Config::$scripturl . '?action=groups;sa=requests;gid=' . $row['id_group'],
-				'member' => array(
+				'member' => [
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 					'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 					'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-				),
-				'group' => array(
+				],
+				'group' => [
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
-				),
+				],
 				'time_submitted' => Time::create('@' . $row['time_applied'])->format(),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 	}
@@ -407,24 +409,24 @@ protected function groupRequests(): void
 	 */
 	protected function watchedUsers(): void
 	{
-		if (($watched_users = CacheApi::get('recent_user_watches', 240)) === null)
-		{
+		if (($watched_users = CacheApi::get('recent_user_watches', 240)) === null) {
 			Config::$modSettings['warning_watch'] = empty(Config::$modSettings['warning_watch']) ? 1 : Config::$modSettings['warning_watch'];
 
-			$watched_users = array();
+			$watched_users = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_member, real_name, last_login
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, real_name, last_login
 				FROM {db_prefix}members
 				WHERE warning >= {int:warning_watch}
 				ORDER BY last_login DESC
 				LIMIT 10',
-				array(
+				[
 					'warning_watch' => Config::$modSettings['warning_watch'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$watched_users[] = $row;
 			}
 			Db::$db->free_result($request);
@@ -432,15 +434,14 @@ protected function watchedUsers(): void
 			CacheApi::put('recent_user_watches', $watched_users, 240);
 		}
 
-		foreach ($watched_users as $user)
-		{
-			Utils::$context['watched_users'][] = array(
+		foreach ($watched_users as $user) {
+			Utils::$context['watched_users'][] = [
 				'id' => $user['id_member'],
 				'name' => $user['real_name'],
 				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $user['id_member'] . '">' . $user['real_name'] . '</a>',
 				'href' => Config::$scripturl . '?action=profile;u=' . $user['id_member'],
 				'last_login' => !empty($user['last_login']) ? Time::create('@' . $user['last_login'])->format() : '',
-			);
+			];
 		}
 	}
 
@@ -449,19 +450,20 @@ protected function watchedUsers(): void
 	 */
 	protected function reportedPosts(): void
 	{
-		if (User::$me->mod_cache['bq'] == '0=1')
+		if (User::$me->mod_cache['bq'] == '0=1') {
 			return;
+		}
 
 		// Got the info already?
 		$cachekey = md5(Utils::jsonEncode(User::$me->mod_cache['bq']));
 
-		if (($reported_posts = CacheApi::get('reported_posts_' . $cachekey, 90)) === null)
-		{
+		if (($reported_posts = CacheApi::get('reported_posts_' . $cachekey, 90)) === null) {
 			// By George, that means we in a position to get the reports, jolly good.
-			$reported_posts = array();
+			$reported_posts = [];
 
-			$request = Db::$db->query('', '
-				SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject,
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject,
 					lr.num_reports, COALESCE(mem.real_name, lr.membername) AS author_name,
 					COALESCE(mem.id_member, 0) AS id_author
 				FROM {db_prefix}log_reported AS lr
@@ -472,14 +474,14 @@ protected function reportedPosts(): void
 					AND lr.ignore_all = {int:not_ignored}
 				ORDER BY lr.time_updated DESC
 				LIMIT 10',
-				array(
+				[
 					'not_a_reported_post' => 0,
 					'not_closed' => 0,
 					'not_ignored' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$reported_posts[] = $row;
 			}
 			Db::$db->free_result($request);
@@ -487,22 +489,21 @@ protected function reportedPosts(): void
 			CacheApi::put('reported_posts_' . $cachekey, $reported_posts, 90);
 		}
 
-		foreach ($reported_posts as $i => $row)
-		{
-			Utils::$context['reported_posts'][] = array(
+		foreach ($reported_posts as $i => $row) {
+			Utils::$context['reported_posts'][] = [
 				'id' => $row['id_report'],
 				'topic_href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
 				'report_href' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $row['id_report'],
 				'report_link' => '<a href="' . Config::$scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $row['id_report'] . '">' . $row['subject'] . '</a>',
-				'author' => array(
+				'author' => [
 					'id' => $row['id_author'],
 					'name' => $row['author_name'],
 					'link' => $row['id_author'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_author'] . '">' . $row['author_name'] . '</a>' : $row['author_name'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $row['id_author'],
-				),
+				],
 				'subject' => $row['subject'],
 				'num_reports' => $row['num_reports'],
-			);
+			];
 		}
 	}
 
@@ -511,17 +512,18 @@ protected function reportedPosts(): void
 	 */
 	protected function reportedMembers(): void
 	{
-		if (!User::$me->allowedTo('moderate_forum'))
+		if (!User::$me->allowedTo('moderate_forum')) {
 			return;
+		}
 
 		$cachekey = md5(Utils::jsonEncode((int) User::$me->allowedTo('moderate_forum')));
-		
-		if (($reported_users = CacheApi::get('reported_users_' . $cachekey, 90)) === null)
-		{
-			$reported_users = array();
 
-			$request = Db::$db->query('', '
-				SELECT lr.id_report, lr.id_member,
+		if (($reported_users = CacheApi::get('reported_users_' . $cachekey, 90)) === null) {
+			$reported_users = [];
+
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.id_report, lr.id_member,
 					lr.num_reports, COALESCE(mem.real_name, lr.membername) AS user_name,
 					COALESCE(mem.id_member, 0) AS id_user
 				FROM {db_prefix}log_reported AS lr
@@ -531,14 +533,14 @@ protected function reportedMembers(): void
 					AND lr.ignore_all = {int:not_ignored}
 				ORDER BY lr.time_updated DESC
 				LIMIT 10',
-				array(
+				[
 					'not_a_reported_post' => 0,
 					'not_closed' => 0,
 					'not_ignored' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$reported_users[] = $row;
 			}
 			Db::$db->free_result($request);
@@ -546,19 +548,18 @@ protected function reportedMembers(): void
 			CacheApi::put('reported_users_' . $cachekey, $reported_users, 90);
 		}
 
-		foreach ($reported_users as $i => $row)
-		{
-			Utils::$context['reported_users'][] = array(
+		foreach ($reported_users as $i => $row) {
+			Utils::$context['reported_users'][] = [
 				'id' => $row['id_report'],
 				'report_href' => Config::$scripturl . '?action=moderate;area=reportedmembers;report=' . $row['id_report'],
-				'user' => array(
+				'user' => [
 					'id' => $row['id_user'],
 					'name' => $row['user_name'],
 					'link' => $row['id_user'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_user'] . '">' . $row['user_name'] . '</a>' : $row['user_name'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $row['id_user'],
-				),
+				],
 				'num_reports' => $row['num_reports'],
-			);
+			];
 		}
 	}
 
@@ -568,30 +569,32 @@ protected function reportedMembers(): void
 
 	/**
 	 * Provides a home for the deprecated integrate_mod_centre_blocks hook.
-	 * 
+	 *
 	 * MOD AUTHORS: Please use the integrate_moderation_home_blocks instead.
 	 */
 	protected static function integrateModBlocks()
 	{
-		$valid_blocks = array();
+		$valid_blocks = [];
 
-		IntegrationHook::call('integrate_mod_centre_blocks', array(&$valid_blocks));
+		IntegrationHook::call('integrate_mod_centre_blocks', [&$valid_blocks]);
 
-		if (empty($valid_blocks))
+		if (empty($valid_blocks)) {
 			return;
-		
-		foreach ($valid_blocks as $k => $func)
-		{
+		}
+
+		foreach ($valid_blocks as $k => $func) {
 			$func = 'ModBlock' . $func;
 
-			if (is_callable($func))
+			if (is_callable($func)) {
 				Utils::$context['mod_blocks'][] = $func();
+			}
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Home::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Home::exportStatic')) {
 	Home::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/Logs.php b/Sources/Actions/Moderation/Logs.php
index 946d90dcc3..b3e823d946 100644
--- a/Sources/Actions/Moderation/Logs.php
+++ b/Sources/Actions/Moderation/Logs.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\IP;
 use SMF\ItemList;
@@ -27,7 +27,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * The moderation and adminstration logs are this class's only job.
@@ -42,12 +41,13 @@ class Logs implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ViewModlog',
-		),
-	);
+			'list_getModLogEntryCount' => 'list_getModLogEntryCount',
+			'list_getModLogEntries' => 'list_getModLogEntries',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -91,67 +91,67 @@ class Logs implements ActionInterface
 	 *
 	 * Actions that might call this class.
 	 */
-	public static array $actions = array(
+	public static array $actions = [
 		'moderate',
 		'admin',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'modlog' => 'modlog',
 		'adminlog' => 'adminlog',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Actions whose log entries cannot be deleted.
 	 */
-	public static array $uneditable_actions = array(
+	public static array $uneditable_actions = [
 		'agreement_updated',
 		'policy_updated',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Instructions for how to sort columns.
 	 */
-	public static array $sort_types = array(
+	public static array $sort_types = [
 		'action' => 'lm.action',
 		'time' => 'lm.log_time',
 		'member' => 'mem.real_name',
 		'group' => 'mg.group_name',
 		'ip' => 'lm.ip',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * This array houses all the valid search types.
 	 */
-	public static array $search_types = array(
-		'action' => array(
+	public static array $search_types = [
+		'action' => [
 			'sql' => 'lm.action',
 			'label' => 'modlog_action',
-		),
-		'member' => array(
+		],
+		'member' => [
 			'sql' => 'mem.real_name',
 			'label' => 'modlog_member',
-		),
-		'group' => array(
+		],
+		'group' => [
 			'sql' => 'mg.group_name',
 			'label' => 'modlog_position',
-		),
-		'ip' => array(
+		],
+		'ip' => [
 			'sql' => 'lm.ip',
 			'label' => 'modlog_ip',
-		),
-	);
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -250,10 +250,11 @@ class Logs implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -293,8 +294,9 @@ public function modlog()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -317,12 +319,13 @@ public static function call(): void
 	 * @param bool $ignore_boards Whether to ignore board restrictions
 	 * @return int Total number of visible log entries.
 	 */
-	public static function list_getModLogEntryCount($query_string = '', $query_params = array(), $log_type = 1, $ignore_boards = false): int
+	public static function list_getModLogEntryCount($query_string = '', $query_params = [], $log_type = 1, $ignore_boards = false): int
 	{
-		$modlog_query = User::$me->allowedTo('admin_forum') || User::$me->mod_cache['bq'] == '1=1' ? '1=1' : ((User::$me->mod_cache['bq'] == '0=1' || $ignore_boards) ? 'lm.id_board = 0 AND lm.id_topic = 0' : (strtr(User::$me->mod_cache['bq'], array('id_board' => 'b.id_board')) . ' AND ' . strtr(User::$me->mod_cache['bq'], array('id_board' => 't.id_board'))));
+		$modlog_query = User::$me->allowedTo('admin_forum') || User::$me->mod_cache['bq'] == '1=1' ? '1=1' : ((User::$me->mod_cache['bq'] == '0=1' || $ignore_boards) ? 'lm.id_board = 0 AND lm.id_topic = 0' : (strtr(User::$me->mod_cache['bq'], ['id_board' => 'b.id_board']) . ' AND ' . strtr(User::$me->mod_cache['bq'], ['id_board' => 't.id_board'])));
 
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_actions AS lm
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lm.id_member)
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:reg_group_id} THEN mem.id_post_group ELSE mem.id_group END)
@@ -332,11 +335,11 @@ public static function list_getModLogEntryCount($query_string = '', $query_param
 				AND {raw:modlog_query}'
 				. (!empty($query_string) ? '
 				AND ' . $query_string : ''),
-			array_merge($query_params, array(
+			array_merge($query_params, [
 				'reg_group_id' => 0,
 				'log_type' => $log_type,
 				'modlog_query' => $modlog_query,
-			))
+			]),
 		);
 		list($entry_count) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
@@ -357,19 +360,21 @@ public static function list_getModLogEntryCount($query_string = '', $query_param
 	 * @param bool $ignore_boards Whether to ignore board restrictions
 	 * @return array An array of info about the mod log entries
 	 */
-	public static function list_getModLogEntries($start, $items_per_page, $sort, $query_string = '', $query_params = array(), $log_type = 1, $ignore_boards = false): array
+	public static function list_getModLogEntries($start, $items_per_page, $sort, $query_string = '', $query_params = [], $log_type = 1, $ignore_boards = false): array
 	{
-		$modlog_query = User::$me->allowedTo('admin_forum') || User::$me->mod_cache['bq'] == '1=1' ? '1=1' : ((User::$me->mod_cache['bq'] == '0=1' || $ignore_boards) ? 'lm.id_board = 0 AND lm.id_topic = 0' : (strtr(User::$me->mod_cache['bq'], array('id_board' => 'b.id_board')) . ' AND ' . strtr(User::$me->mod_cache['bq'], array('id_board' => 't.id_board'))));
+		$modlog_query = User::$me->allowedTo('admin_forum') || User::$me->mod_cache['bq'] == '1=1' ? '1=1' : ((User::$me->mod_cache['bq'] == '0=1' || $ignore_boards) ? 'lm.id_board = 0 AND lm.id_topic = 0' : (strtr(User::$me->mod_cache['bq'], ['id_board' => 'b.id_board']) . ' AND ' . strtr(User::$me->mod_cache['bq'], ['id_board' => 't.id_board'])));
 
-		if (!isset(self::$uneditable_actions))
-			self::$uneditable_actions = array();
+		if (!isset(self::$uneditable_actions)) {
+			self::$uneditable_actions = [];
+		}
 
 		// Can they see the IP address?
 		$seeIP = User::$me->allowedTo('moderate_forum');
 
 		// Here we have the query getting the log details.
-		$result = Db::$db->query('', '
-			SELECT
+		$result = Db::$db->query(
+			'',
+			'SELECT
 				lm.id_action, lm.id_member, lm.ip, lm.log_time, lm.action, lm.id_board, lm.id_topic, lm.id_msg, lm.extra,
 				mem.real_name, mg.group_name
 			FROM {db_prefix}log_actions AS lm
@@ -383,96 +388,111 @@ public static function list_getModLogEntries($start, $items_per_page, $sort, $qu
 				AND ' . $query_string : '') . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array_merge($query_params, array(
+			array_merge($query_params, [
 				'reg_group_id' => 0,
 				'log_type' => $log_type,
 				'modlog_query' => $modlog_query,
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			))
+			]),
 		);
 
 		// Arrays for decoding objects into.
-		$topics = array();
-		$boards = array();
-		$members = array();
-		$messages = array();
-		$entries = array();
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+		$topics = [];
+		$boards = [];
+		$members = [];
+		$messages = [];
+		$entries = [];
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			$row['extra'] = Utils::jsonDecode($row['extra'], true);
 
 			// Corrupt?
-			$row['extra'] = is_array($row['extra']) ? $row['extra'] : array();
+			$row['extra'] = is_array($row['extra']) ? $row['extra'] : [];
 
 			// Add on some of the column stuff info
-			if (!empty($row['id_board']))
-			{
-				if ($row['action'] == 'move')
+			if (!empty($row['id_board'])) {
+				if ($row['action'] == 'move') {
 					$row['extra']['board_to'] = $row['id_board'];
-				else
+				} else {
 					$row['extra']['board'] = $row['id_board'];
+				}
 			}
 
-			if (!empty($row['id_topic']))
+			if (!empty($row['id_topic'])) {
 				$row['extra']['topic'] = $row['id_topic'];
-			if (!empty($row['id_msg']))
+			}
+
+			if (!empty($row['id_msg'])) {
 				$row['extra']['message'] = $row['id_msg'];
+			}
 
 			// Is this associated with a topic?
-			if (isset($row['extra']['topic']))
+			if (isset($row['extra']['topic'])) {
 				$topics[(int) $row['extra']['topic']][] = $row['id_action'];
-			if (isset($row['extra']['new_topic']))
+			}
+
+			if (isset($row['extra']['new_topic'])) {
 				$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+			}
 
 			// How about a member?
-			if (isset($row['extra']['member']))
-			{
+			if (isset($row['extra']['member'])) {
 				// Guests don't have names!
-				if (empty($row['extra']['member']))
+				if (empty($row['extra']['member'])) {
 					$row['extra']['member'] = Lang::$txt['modlog_parameter_guest'];
-				else
-				{
+				} else {
 					// Try to find it...
 					$members[(int) $row['extra']['member']][] = $row['id_action'];
 				}
 			}
 
 			// Associated with a board?
-			if (isset($row['extra']['board_to']))
+			if (isset($row['extra']['board_to'])) {
 				$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
-			if (isset($row['extra']['board_from']))
+			}
+
+			if (isset($row['extra']['board_from'])) {
 				$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
-			if (isset($row['extra']['board']))
+			}
+
+			if (isset($row['extra']['board'])) {
 				$boards[(int) $row['extra']['board']][] = $row['id_action'];
+			}
 
 			// A message?
-			if (isset($row['extra']['message']))
+			if (isset($row['extra']['message'])) {
 				$messages[(int) $row['extra']['message']][] = $row['id_action'];
+			}
 
 			// IP Info?
-			if (isset($row['extra']['ip_range']))
-				if ($seeIP)
+			if (isset($row['extra']['ip_range'])) {
+				if ($seeIP) {
 					$row['extra']['ip_range'] = '<a href="' . Config::$scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
-				else
+				} else {
 					$row['extra']['ip_range'] = Lang::$txt['logged'];
+				}
+			}
 
 			// Email?
-			if (isset($row['extra']['email']))
+			if (isset($row['extra']['email'])) {
 				$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+			}
 
 			// Bans are complex.
-			if ($row['action'] == 'ban' || $row['action'] == 'banremove')
-			{
+			if ($row['action'] == 'ban' || $row['action'] == 'banremove') {
 				$row['action_text'] = Lang::$txt['modlog_ac_ban' . ($row['action'] == 'banremove' ? '_remove' : '')];
-				foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
-					if (isset($row['extra'][$type]))
+
+				foreach (['member', 'email', 'ip_range', 'hostname'] as $type) {
+					if (isset($row['extra'][$type])) {
 						$row['action_text'] .= Lang::$txt['modlog_ac_ban_trigger_' . $type];
+					}
+				}
 			}
 
 			// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
-			$entries[$row['id_action']] = array(
+			$entries[$row['id_action']] = [
 				'id' => $row['id_action'],
 				'ip' => $seeIP ? new IP($row['ip']) : Lang::$txt['logged'],
 				'position' => empty($row['real_name']) && empty($row['group_name']) ? Lang::$txt['guest'] : $row['group_name'],
@@ -482,133 +502,132 @@ public static function list_getModLogEntries($start, $items_per_page, $sort, $qu
 				'editable' => substr($row['action'], 0, 8) !== 'clearlog' && !in_array($row['action'], self::$uneditable_actions),
 				'extra' => $row['extra'],
 				'action' => $row['action'],
-				'action_text' => isset($row['action_text']) ? $row['action_text'] : '',
-			);
+				'action_text' => $row['action_text'] ?? '',
+			];
 		}
 		Db::$db->free_result($result);
 
-		if (!empty($boards))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_board, name
+		if (!empty($boards)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board, name
 				FROM {db_prefix}boards
 				WHERE id_board IN ({array_int:board_list})
 				LIMIT {int:limit}',
-				array(
+				[
 					'board_list' => array_keys($boards),
 					'limit' => count(array_keys($boards)),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				foreach ($boards[$row['id_board']] as $action)
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				foreach ($boards[$row['id_board']] as $action) {
 					// Make the board number into a link - dealing with moving too.
-					if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
+					if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board']) {
 						$entries[$action]['extra']['board_to'] = '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-					elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
+					} elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board']) {
 						$entries[$action]['extra']['board_from'] = '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-					elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
+					} elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board']) {
 						$entries[$action]['extra']['board'] = '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+					}
 				}
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (!empty($topics))
-		{
-			$request = Db::$db->query('', '
-				SELECT ms.subject, t.id_topic
+		if (!empty($topics)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT ms.subject, t.id_topic
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)
 				WHERE t.id_topic IN ({array_int:topic_list})
 				LIMIT {int:limit}',
-				array(
+				[
 					'topic_list' => array_keys($topics),
 					'limit' => count(array_keys($topics)),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				foreach ($topics[$row['id_topic']] as $action)
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				foreach ($topics[$row['id_topic']] as $action) {
 					$this_action = &$entries[$action];
 
 					// This isn't used in the current theme.
-					$this_action['topic'] = array(
+					$this_action['topic'] = [
 						'id' => $row['id_topic'],
 						'subject' => $row['subject'],
 						'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
-						'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>'
-					);
+						'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>',
+					];
 
 					// Make the topic number into a link - dealing with splitting too.
-					if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
+					if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic']) {
 						$this_action['extra']['topic'] = '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
-					elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
+					} elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic']) {
 						$this_action['extra']['new_topic'] = '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+					}
 				}
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (!empty($messages))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_msg, subject
+		if (!empty($messages)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg, subject
 				FROM {db_prefix}messages
 				WHERE id_msg IN ({array_int:message_list})
 				LIMIT {int:limit}',
-				array(
+				[
 					'message_list' => array_keys($messages),
 					'limit' => count(array_keys($messages)),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				foreach ($messages[$row['id_msg']] as $action)
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				foreach ($messages[$row['id_msg']] as $action) {
 					$this_action = &$entries[$action];
 
 					// This isn't used in the current theme.
-					$this_action['message'] = array(
+					$this_action['message'] = [
 						'id' => $row['id_msg'],
 						'subject' => $row['subject'],
 						'href' => Config::$scripturl . '?msg=' . $row['id_msg'],
 						'link' => '<a href="' . Config::$scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>',
-					);
+					];
 
 					// Make the message number into a link.
-					if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
+					if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg']) {
 						$this_action['extra']['message'] = '<a href="' . Config::$scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+					}
 				}
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (!empty($members))
-		{
-			$request = Db::$db->query('', '
-				SELECT real_name, id_member
+		if (!empty($members)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT real_name, id_member
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:member_list})
 				LIMIT {int:limit}',
-				array(
+				[
 					'member_list' => array_keys($members),
 					'limit' => count(array_keys($members)),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				foreach ($members[$row['id_member']] as $action)
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				foreach ($members[$row['id_member']] as $action) {
 					// Not used currently.
-					$entries[$action]['member'] = array(
+					$entries[$action]['member'] = [
 						'id' => $row['id_member'],
 						'name' => $row['real_name'],
 						'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-						'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>'
-					);
+						'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
+					];
 					// Make the member number into a name.
 					$entries[$action]['extra']['member'] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 				}
@@ -617,36 +636,38 @@ public static function list_getModLogEntries($start, $items_per_page, $sort, $qu
 		}
 
 		// Do some formatting of the action string.
-		foreach ($entries as $k => $entry)
-		{
+		foreach ($entries as $k => $entry) {
 			// Make any message info links so its easier to go find that message.
-			if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
+			if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id']))) {
 				$entries[$k]['extra']['message'] = '<a href="' . Config::$scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+			}
 
 			// Mark up any deleted members, topics and boards.
-			foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
-				if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
+			foreach (['board', 'board_from', 'board_to', 'member', 'topic', 'new_topic'] as $type) {
+				if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type])) {
 					$entries[$k]['extra'][$type] = sprintf(Lang::$txt['modlog_id'], $entry['extra'][$type]);
+				}
+			}
 
-			if (isset($entry['extra']['report']))
-			{
+			if (isset($entry['extra']['report'])) {
 				// Member profile reports go in a different area
-				if (stristr($entry['action'], 'user_report'))
+				if (stristr($entry['action'], 'user_report')) {
 					$entries[$k]['extra']['report'] = '<a href="' . Config::$scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . Lang::$txt['modlog_report'] . '</a>';
-				else
+				} else {
 					$entries[$k]['extra']['report'] = '<a href="' . Config::$scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . Lang::$txt['modlog_report'] . '</a>';
+				}
 			}
 
-			if (empty($entries[$k]['action_text']))
-				$entries[$k]['action_text'] = isset(Lang::$txt['modlog_ac_' . $entry['action']]) ? Lang::$txt['modlog_ac_' . $entry['action']] : $entry['action'];
+			if (empty($entries[$k]['action_text'])) {
+				$entries[$k]['action_text'] = Lang::$txt['modlog_ac_' . $entry['action']] ?? $entry['action'];
+			}
 
 			$entries[$k]['action_text'] = preg_replace_callback(
 				'~\{([A-Za-z\d_]+)\}~i',
-				function($matches) use ($entries, $k)
-				{
-					return isset($entries[$k]['extra'][$matches[1]]) ? $entries[$k]['extra'][$matches[1]] : '';
+				function ($matches) use ($entries, $k) {
+					return $entries[$k]['extra'][$matches[1]] ?? '';
 				},
-				$entries[$k]['action_text']
+				$entries[$k]['action_text'],
 			);
 		}
 
@@ -663,21 +684,20 @@ function($matches) use ($entries, $k)
 	 */
 	protected function __construct()
 	{
-		if (!empty($_REQUEST['action']) && in_array($_REQUEST['action'], self::$actions))
+		if (!empty($_REQUEST['action']) && in_array($_REQUEST['action'], self::$actions)) {
 			$this->action = $_REQUEST['action'];
+		}
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		$this->log_type = $this->subaction == 'adminlog' ? 3 : 1;
 
 		// These change dependant on whether we are viewing the moderation or admin log.
-		if ($this->action == 'admin')
-		{
+		if ($this->action == 'admin') {
 			$this->url_start = '?action=admin;area=logs;sa=' . ($this->log_type == 3 ? 'adminlog' : 'modlog') . ';type=' . $this->log_type;
-		}
-		else
-		{
+		} else {
 			$this->url_start = '?action=moderate;area=modlog';
 		}
 
@@ -686,8 +706,9 @@ protected function __construct()
 		Lang::load('Admin+Modlog');
 
 		// Setup the direction stuff...
-		if (!empty($_REQUEST['sort']) && isset(self::$sort_types[$_REQUEST['sort']]))
+		if (!empty($_REQUEST['sort']) && isset(self::$sort_types[$_REQUEST['sort']])) {
 			$this->sort = $_REQUEST['sort'];
+		}
 
 		// If we're coming from a search, set those variables.
 		$this->setupSearch();
@@ -698,53 +719,43 @@ protected function __construct()
 	 */
 	protected function setupSearch(): void
 	{
-		if (!empty($_REQUEST['params']) && empty($_REQUEST['is_search']))
-		{
-			$this->search_params = base64_decode(strtr($_REQUEST['params'], array(' ' => '+')));
+		if (!empty($_REQUEST['params']) && empty($_REQUEST['is_search'])) {
+			$this->search_params = base64_decode(strtr($_REQUEST['params'], [' ' => '+']));
 			$this->search_params = Utils::jsonDecode($this->search_params, true);
 		}
 
-		if (!isset($this->search_params['string']) || (!empty($_REQUEST['search']) && $this->search_params['string'] != $_REQUEST['search']))
-		{
+		if (!isset($this->search_params['string']) || (!empty($_REQUEST['search']) && $this->search_params['string'] != $_REQUEST['search'])) {
 			$this->search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-		}
-		else
-		{
+		} else {
 			$this->search_params_string = $this->search_params['string'];
 		}
 
-		if (isset($_REQUEST['search_type']) || empty($this->search_params['type']) || !isset(self::$search_types[$this->search_params['type']]))
-		{
+		if (isset($_REQUEST['search_type']) || empty($this->search_params['type']) || !isset(self::$search_types[$this->search_params['type']])) {
 			$this->search_params_type = isset($_REQUEST['search_type']) && isset(self::$search_types[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset(self::$search_types[$this->sort]) ? $this->sort : 'member');
-		}
-		else
-		{
+		} else {
 			$this->search_params_type = $this->search_params['type'];
 		}
 
 		$this->search_params_column = self::$search_types[$this->search_params_type]['sql'];
-		$this->search_params = array(
+		$this->search_params = [
 			'string' => $this->search_params_string,
 			'type' => $this->search_params_type,
-		);
+		];
 
 		// Setup the search context.
 		$this->encoded_search_params = empty($this->search_params['string']) ? '' : base64_encode(Utils::jsonEncode($this->search_params));
 
-		$this->search_info = array(
+		$this->search_info = [
 			'string' => $this->search_params['string'],
 			'type' => $this->search_params['type'],
 			'label' => Lang::$txt[self::$search_types[$this->search_params_type]['label']],
-		);
+		];
 
 		// If they are searching by action, then we must do some manual intervention to search in their language!
-		if ($this->search_params['type'] == 'action' && !empty($this->search_params['string']))
-		{
+		if ($this->search_params['type'] == 'action' && !empty($this->search_params['string'])) {
 			// For the moment they can only search for ONE action!
-			foreach (Lang::$txt as $key => $text)
-			{
-				if (substr($key, 0, 10) == 'modlog_ac_' && strpos($text, $this->search_params['string']) !== false)
-				{
+			foreach (Lang::$txt as $key => $text) {
+				if (substr($key, 0, 10) == 'modlog_ac_' && strpos($text, $this->search_params['string']) !== false) {
 					$this->search_params['string'] = substr($key, 10);
 					break;
 				}
@@ -757,12 +768,9 @@ protected function setupSearch(): void
 	 */
 	protected function deleteEntries(): void
 	{
-		if (isset($_POST['removeall']) && $this->can_delete)
-		{
+		if (isset($_POST['removeall']) && $this->can_delete) {
 			$this->deleteAll();
-		}
-		elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $this->can_delete)
-		{
+		} elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $this->can_delete) {
 			$this->deleteEntry();
 		}
 	}
@@ -775,19 +783,19 @@ protected function deleteAll(): void
 		User::$me->checkSession();
 		SecurityToken::validate('mod-ml');
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_actions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_actions
 			WHERE id_log = {int:moderate_log}
 			AND action NOT IN ({array_string:uneditable})',
-
-			array(
+			[
 				'moderate_log' => $this->log_type,
 				'uneditable' => self::$uneditable_actions,
-			)
+			],
 		);
 
 		$log_type = isset($this->subaction) && $this->subaction == 'adminlog' ? 'admin' : 'moderate';
-		Logging::logAction('clearlog_' . $log_type, array(), $log_type);
+		Logging::logAction('clearlog_' . $log_type, [], $log_type);
 	}
 
 	/**
@@ -799,18 +807,19 @@ protected function deleteEntry(): void
 		SecurityToken::validate('mod-ml');
 
 		// No sneaky removing the 'cleared the log' entries.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_actions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_actions
 			WHERE id_log = {int:moderate_log}
 				AND id_action IN ({array_string:delete_actions})
 				AND action NOT LIKE {string:clearlog}
 				AND action NOT IN ({array_string:uneditable})',
-			array(
+			[
 				'delete_actions' => array_unique($_POST['delete']),
 				'moderate_log' => $this->log_type,
 				'uneditable' => self::$uneditable_actions,
 				'clearlog' => 'clearlog_%',
-			)
+			],
 		);
 	}
 
@@ -820,7 +829,7 @@ protected function deleteEntry(): void
 	protected function createList(): void
 	{
 		// This is all the information required for a watched user listing.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'moderation_log_list',
 			'title' => $this->log_type == 3 ? Lang::$txt['admin_log'] : Lang::$txt['moderation_log'],
 			'width' => '100%',
@@ -828,120 +837,119 @@ protected function createList(): void
 			'no_items_label' => Lang::$txt['modlog_' . ($this->log_type == 3 ? 'admin_log_' : '') . 'no_entries_found'],
 			'base_href' => Config::$scripturl . $this->url_start . (!empty($this->encoded_search_params) ? ';params=' . $this->encoded_search_params : ''),
 			'default_sort_col' => 'time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getModLogEntries',
-				'params' => array(
+				'params' => [
 					(!empty($this->search_params['string']) ? ' INSTR({raw:sql_type}, {string:search_string}) > 0' : ''),
-					array('sql_type' => $this->search_params_column, 'search_string' => $this->search_params['string']),
+					['sql_type' => $this->search_params_column, 'search_string' => $this->search_params['string']],
 					$this->log_type,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getModLogEntryCount',
-				'params' => array(
+				'params' => [
 					(!empty($this->search_params['string']) ? ' INSTR({raw:sql_type}, {string:search_string}) > 0' : ''),
-					array('sql_type' => $this->search_params_column, 'search_string' => $this->search_params['string']),
+					['sql_type' => $this->search_params_column, 'search_string' => $this->search_params['string']],
 					$this->log_type,
-				),
-			),
+				],
+			],
 			// This assumes we are viewing by user.
-			'columns' => array(
-				'action' => array(
-					'header' => array(
+			'columns' => [
+				'action' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_action'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'action_text',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lm.action',
 						'reverse' => 'lm.action DESC',
-					),
-				),
-				'time' => array(
-					'header' => array(
+					],
+				],
+				'time' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_date'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lm.log_time DESC',
 						'reverse' => 'lm.log_time',
-					),
-				),
-				'moderator' => array(
-					'header' => array(
+					],
+				],
+				'moderator' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_member'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'moderator_link',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mem.real_name',
 						'reverse' => 'mem.real_name DESC',
-					),
-				),
-				'position' => array(
-					'header' => array(
+					],
+				],
+				'position' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_position'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'position',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.group_name',
 						'reverse' => 'mg.group_name DESC',
-					),
-				),
-				'ip' => array(
-					'header' => array(
+					],
+				],
+				'ip' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_ip'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'ip',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lm.ip',
 						'reverse' => 'lm.ip DESC',
-					),
-				),
-				'delete' => array(
-					'header' => array(
+					],
+				],
+				'delete' => [
+					'header' => [
 						'value' => '<input type="checkbox" name="all" onclick="invertAll(this, this.form);">',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($entry)
-						{
+					],
+					'data' => [
+						'function' => function ($entry) {
 							return '<input type="checkbox" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled') . '>';
 						},
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . $this->url_start,
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-					'params' => $this->encoded_search_params
-				),
+					'params' => $this->encoded_search_params,
+				],
 				'token' => 'mod-ml',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => '
 						' . Lang::$txt['modlog_search'] . ' (' . Lang::$txt['modlog_by'] . ': ' . $this->search_info['label'] . '):
@@ -951,20 +959,20 @@ protected function createList(): void
 						<input type="submit" name="remove" value="' . Lang::$txt['modlog_remove'] . '" data-confirm="' . Lang::$txt['modlog_remove_selected_confirm'] . '" class="button you_sure">
 						<input type="submit" name="removeall" value="' . Lang::$txt['modlog_removeall'] . '" data-confirm="' . Lang::$txt['modlog_remove_all_confirm'] . '" class="button you_sure">' : ''),
 					'class' => '',
-				),
-				array(
+				],
+				[
 					'position' => 'below_table_data',
 					'value' => $this->can_delete ? '
 						<input type="submit" name="remove" value="' . Lang::$txt['modlog_remove'] . '" data-confirm="' . Lang::$txt['modlog_remove_selected_confirm'] . '" class="button you_sure">
 						<input type="submit" name="removeall" value="' . Lang::$txt['modlog_removeall'] . '" data-confirm="' . Lang::$txt['modlog_remove_all_confirm'] . '" class="button you_sure">' : '',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Overriding this with a hook?
-		$moderation_menu_name = array();
-		IntegrationHook::call('integrate_viewModLog', array(&$listOptions, &$moderation_menu_name));
+		$moderation_menu_name = [];
+		IntegrationHook::call('integrate_viewModLog', [&$listOptions, &$moderation_menu_name]);
 
 		SecurityToken::create('mod-ml');
 
@@ -975,17 +983,14 @@ protected function createList(): void
 		Utils::$context['default_list'] = 'moderation_log_list';
 
 		// If a hook has changed this, respect it.
-		if (!empty($moderation_menu_name))
-		{
+		if (!empty($moderation_menu_name)) {
 			Menu::$loaded['moderate']->tab_data = $moderation_menu_name;
-		}
-		elseif (isset(Utils::$context['moderation_menu_name']))
-		{
-			Menu::$loaded['moderate']->tab_data = array(
+		} elseif (isset(Utils::$context['moderation_menu_name'])) {
+			Menu::$loaded['moderate']->tab_data = [
 				'title' => Lang::$txt['modlog_' . ($this->log_type == 3 ? 'admin' : 'moderation') . '_log'],
 				'help' => $this->log_type == 3 ? 'adminlog' : 'modlog',
-				'description' => Lang::$txt['modlog_' . ($this->log_type == 3 ? 'admin' : 'moderation') . '_log_desc']
-			);
+				'description' => Lang::$txt['modlog_' . ($this->log_type == 3 ? 'admin' : 'moderation') . '_log_desc'],
+			];
 		}
 	}
 
@@ -994,11 +999,11 @@ protected function createList(): void
 	 *************************/
 
 	// code...
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Logs::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Logs::exportStatic')) {
 	Logs::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/Main.php b/Sources/Actions/Moderation/Main.php
index 37843a86e4..06a8fc4502 100644
--- a/Sources/Actions/Moderation/Main.php
+++ b/Sources/Actions/Moderation/Main.php
@@ -15,9 +15,8 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\Lang;
@@ -38,12 +37,12 @@ class Main implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'checkAccessPermissions' => 'checkAccessPermissions',
+			'ModerationMain' => 'ModerationMain',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -69,148 +68,148 @@ class Main implements ActionInterface
 	 * MOD AUTHORS: You can use the integration_moderation_areas hook to add
 	 * things to this menu. The hook can be found in SMF\Menu::_construct().
 	 */
-	public array $moderation_areas = array(
-		'main' => array(
+	public array $moderation_areas = [
+		'main' => [
 			'title' => 'mc_main',
-			'areas' => array(
-				'index' => array(
+			'areas' => [
+				'index' => [
 					'label' => 'moderation_center',
 					'function' => __NAMESPACE__ . '\\Home::call',
 					'icon' => 'administration',
-				),
-				'modlogoff' => array(
+				],
+				'modlogoff' => [
 					'label' => 'mc_logoff',
 					'function' => __NAMESPACE__ . '\\EndSession::call',
 					'enabled' => true,
 					'icon' => 'exit',
-				),
-				'notice' => array(
+				],
+				'notice' => [
 					'function' => __NAMESPACE__ . '\\ShowNotice::call',
-					'select' => 'index'
-				),
-			),
-		),
-		'logs' => array(
+					'select' => 'index',
+				],
+			],
+		],
+		'logs' => [
 			'title' => 'mc_logs',
-			'areas' => array(
-				'modlog' => array(
+			'areas' => [
+				'modlog' => [
 					'label' => 'modlog_view',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\Logs::call',
 					'icon' => 'logs',
-				),
-				'warnings' => array(
+				],
+				'warnings' => [
 					'label' => 'mc_warnings',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\Warnings::call',
 					'icon' => 'warning',
-					'subsections' => array(
-						'log' => array(
+					'subsections' => [
+						'log' => [
 							'label' => 'mc_warning_log',
-							'permission' => array('view_warning_any', 'moderate_forum'),
-						),
-						'templates' => array(
+							'permission' => ['view_warning_any', 'moderate_forum'],
+						],
+						'templates' => [
 							'label' => 'mc_warning_templates',
 							'permission' => 'issue_warning',
-						),
-					),
-				),
-			),
-		),
-		'posts' => array(
+						],
+					],
+				],
+			],
+		],
+		'posts' => [
 			'title' => 'mc_posts',
 			'enabled' => true,
-			'areas' => array(
-				'postmod' => array(
+			'areas' => [
+				'postmod' => [
 					'label' => 'mc_unapproved_posts',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\Posts::call',
 					'icon' => 'posts',
 					'custom_url' => '{scripturl}?action=moderate;area=postmod',
-					'subsections' => array(
-						'posts' => array(
+					'subsections' => [
+						'posts' => [
 							'label' => 'mc_unapproved_replies',
-						),
-						'topics' => array(
+						],
+						'topics' => [
 							'label' => 'mc_unapproved_topics',
-						),
-					),
-				),
-				'attachmod' => array(
+						],
+					],
+				],
+				'attachmod' => [
 					'label' => 'mc_unapproved_attachments',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\Posts::call',
 					'icon' => 'post_moderation_attach',
 					'custom_url' => '{scripturl}?action=moderate;area=attachmod;sa=attachments',
-				),
-				'reportedposts' => array(
+				],
+				'reportedposts' => [
 					'label' => 'mc_reported_posts',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\ReportedContent::call',
 					'icon' => 'reports',
-					'subsections' => array(
-						'show' => array(
+					'subsections' => [
+						'show' => [
 							'label' => 'mc_reportedp_active',
-						),
-						'closed' => array(
+						],
+						'closed' => [
 							'label' => 'mc_reportedp_closed',
-						),
-					),
-				),
-			),
-		),
-		'groups' => array(
+						],
+					],
+				],
+			],
+		],
+		'groups' => [
 			'title' => 'mc_groups',
 			'enabled' => true,
-			'areas' => array(
-				'groups' => array(
+			'areas' => [
+				'groups' => [
 					'label' => 'mc_group_requests',
 					'function' => '\\SMF\\Actions\\Groups::call',
 					'icon' => 'members_request',
 					'custom_url' => '{scripturl}?action=moderate;area=groups;sa=requests',
-				),
-				'viewgroups' => array(
+				],
+				'viewgroups' => [
 					'label' => 'mc_view_groups',
 					'function' => '\\SMF\\Actions\\Groups::call',
 					'icon' => 'membergroups',
-				),
-			),
-		),
-		'members' => array(
+				],
+			],
+		],
+		'members' => [
 			'title' => 'mc_members',
 			'enabled' => true,
-			'areas' => array(
-				'userwatch' => array(
+			'areas' => [
+				'userwatch' => [
 					'label' => 'mc_watched_users_title',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\WatchedUsers::call',
 					'icon' => 'members_watched',
-					'subsections' => array(
-						'member' => array(
+					'subsections' => [
+						'member' => [
 							'label' => 'mc_watched_users_member',
-						),
-						'post' => array(
+						],
+						'post' => [
 							'label' => 'mc_watched_users_post',
-						),
-					),
-				),
-				'reportedmembers' => array(
+						],
+					],
+				],
+				'reportedmembers' => [
 					'label' => 'mc_reported_members_title',
 					'enabled' => true,
 					'function' => __NAMESPACE__ . '\\ReportedContent::call',
 					'icon' => 'members_watched',
-					'subsections' => array(
-						'open' => array(
+					'subsections' => [
+						'open' => [
 							'label' => 'mc_reportedp_active',
-						),
-						'closed' => array(
+						],
+						'closed' => [
 							'label' => 'mc_reportedp_closed',
-						),
-					),
-				),
-			),
-		)
-	);
+						],
+					],
+				],
+			],
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -242,15 +241,15 @@ public function execute(): void
 	{
 		$this->createMenu();
 
-		if (isset(Menu::$loaded['moderate']->include_data['file']))
-		{
-			require_once(Config::$sourcedir . '/' . Menu::$loaded['moderate']->include_data['file']);
+		if (isset(Menu::$loaded['moderate']->include_data['file'])) {
+			require_once Config::$sourcedir . '/' . Menu::$loaded['moderate']->include_data['file'];
 		}
 
-		$call = method_exists($this, Menu::$loaded['moderate']->include_data['function']) ? array($this, Menu::$loaded['moderate']->include_data['function']) : Utils::getCallable(Menu::$loaded['moderate']->include_data['function']);
+		$call = method_exists($this, Menu::$loaded['moderate']->include_data['function']) ? [$this, Menu::$loaded['moderate']->include_data['function']] : Utils::getCallable(Menu::$loaded['moderate']->include_data['function']);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -265,54 +264,53 @@ public function createMenu(): void
 		User::$me->validateSession('moderate');
 
 		// I don't know where we're going - I don't know where we've been...
-		$menuOptions = array(
+		$menuOptions = [
 			'action' => 'moderate',
 			'disable_url_session_check' => true,
-		);
+		];
 
 		$menu = new Menu($this->moderation_areas, $menuOptions);
 
 		// We got something - didn't we? DIDN'T WE!
-		if (empty($menu->include_data))
+		if (empty($menu->include_data)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Retain the ID information in case required by a subaction.
 		Utils::$context['moderation_menu_id'] = $menu->id;
 		Utils::$context['moderation_menu_name'] = $menu->name;
 
 		// @todo: html in here is not good
-		$menu->tab_data = array(
+		$menu->tab_data = [
 			'title' => Lang::$txt['moderation_center'],
 			'help' => '',
 			'description' => '
 				<strong>' . Lang::$txt['hello_guest'] . ' ' . User::$me->name . '!</strong>
 				<br><br>
-				' . Lang::$txt['mc_description']
-		);
+				' . Lang::$txt['mc_description'],
+		];
 
 		// What a pleasant shortcut - even tho we're not *really* on the admin screen who cares...
 		Utils::$context['admin_area'] = $menu->current_area;
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=moderate',
 			'name' => Lang::$txt['moderation_center'],
-		);
+		];
 
-		if (isset($menu->current_area) && $menu->current_area != 'index')
-		{
-			Utils::$context['linktree'][] = array(
+		if (isset($menu->current_area) && $menu->current_area != 'index') {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=moderate;area=' . $menu->current_area,
 				'name' => $menu->include_data['label'],
-			);
+			];
 		}
 
-		if (!empty($menu->current_subsection) && $menu->include_data['subsections'][$menu->current_subsection]['label'] != $menu->include_data['label'])
-		{
-			Utils::$context['linktree'][] = array(
+		if (!empty($menu->current_subsection) && $menu->include_data['subsections'][$menu->current_subsection]['label'] != $menu->include_data['label']) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=moderate;area=' . $menu->current_area . ';sa=' . $menu->current_subsection,
 				'name' => $menu->include_data['subsections'][$menu->current_subsection]['label'],
-			);
+			];
 		}
 	}
 
@@ -327,8 +325,9 @@ public function createMenu(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -354,8 +353,9 @@ public static function call(): void
 	public static function checkAccessPermissions(): void
 	{
 		// No need to repeat these checks.
-		if (self::$access_checked)
+		if (self::$access_checked) {
 			return;
+		}
 
 		Utils::$context['can_moderate_boards'] = User::$me->mod_cache['bq'] != '0=1';
 		Utils::$context['can_moderate_groups'] = User::$me->mod_cache['gq'] != '0=1';
@@ -363,8 +363,7 @@ public static function checkAccessPermissions(): void
 		Utils::$context['can_moderate_users'] = User::$me->allowedTo('moderate_forum');
 
 		// Everyone using this area must be allowed here!
-		if (!Utils::$context['can_moderate_boards'] && !Utils::$context['can_moderate_groups'] && !Utils::$context['can_moderate_approvals'] && !Utils::$context['can_moderate_users'])
-		{
+		if (!Utils::$context['can_moderate_boards'] && !Utils::$context['can_moderate_groups'] && !Utils::$context['can_moderate_approvals'] && !Utils::$context['can_moderate_users']) {
 			User::$me->isAllowedTo('access_mod_center');
 		}
 
@@ -380,12 +379,9 @@ public static function checkAccessPermissions(): void
 	 */
 	public static function ModerationMain(bool $dont_call = false): void
 	{
-		if ($dont_call)
-		{
+		if ($dont_call) {
 			self::load()->createMenu();
-		}
-		else
-		{
+		} else {
 			self::call();
 		}
 	}
@@ -400,8 +396,9 @@ public static function ModerationMain(bool $dont_call = false): void
 	protected function __construct()
 	{
 		// Don't run this twice... and don't conflict with the admin bar.
-		if (isset(Utils::$context['admin_area']))
+		if (isset(Utils::$context['admin_area'])) {
 			return;
+		}
 
 		self::checkAccessPermissions();
 
@@ -409,7 +406,7 @@ protected function __construct()
 		Lang::load('ModerationCenter');
 		Theme::loadTemplate(false, 'admin');
 
-		Utils::$context['admin_preferences'] = !empty(Theme::$current->options['admin_preferences']) ? Utils::jsonDecode(Theme::$current->options['admin_preferences'], true) : array();
+		Utils::$context['admin_preferences'] = !empty(Theme::$current->options['admin_preferences']) ? Utils::jsonDecode(Theme::$current->options['admin_preferences'], true) : [];
 		Utils::$context['robot_no_index'] = true;
 
 		$this->setModerationAreas();
@@ -423,16 +420,16 @@ protected function setModerationAreas(): void
 		// Finalize various string values.
 		array_walk_recursive(
 			$this->moderation_areas,
-			function(&$value, $key)
-			{
-				if (in_array($key, array('title', 'label')))
+			function (&$value, $key) {
+				if (in_array($key, ['title', 'label'])) {
 					$value = Lang::$txt[$value] ?? $value;
+				}
 
-				$value = strtr($value, array(
+				$value = strtr($value, [
 					'{scripturl}' => Config::$scripturl,
 					'{boardurl}' => Config::$boardurl,
-				));
-			}
+				]);
+			},
 		);
 
 		// Is moderation security enabled?
@@ -441,7 +438,7 @@ function(&$value, $key)
 		// Which logs should be enabled?
 		$this->moderation_areas['logs']['areas']['modlog']['enabled'] = !empty(Config::$modSettings['modlog_enabled']) && Utils::$context['can_moderate_boards'];
 
-		$this->moderation_areas['logs']['areas']['warnings']['enabled'] = Config::$modSettings['warning_settings'][0] == 1 && User::$me->allowedTo(array('issue_warning', 'view_warning_any'));
+		$this->moderation_areas['logs']['areas']['warnings']['enabled'] = Config::$modSettings['warning_settings'][0] == 1 && User::$me->allowedTo(['issue_warning', 'view_warning_any']);
 
 		// Which parts of post moderation should be enabled?
 		$this->moderation_areas['posts']['enabled'] = Utils::$context['can_moderate_boards'] || Utils::$context['can_moderate_approvals'];
@@ -465,7 +462,8 @@ function(&$value, $key)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Main::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Main::exportStatic')) {
 	Main::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/Posts.php b/Sources/Actions/Moderation/Posts.php
index cc3cf73a57..20150eaa91 100644
--- a/Sources/Actions/Moderation/Posts.php
+++ b/Sources/Actions/Moderation/Posts.php
@@ -13,13 +13,13 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
@@ -33,7 +33,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles things related to post moderation.
@@ -47,12 +46,17 @@ class Posts implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'PostModerationMain',
-		),
-	);
+			'approveAllData' => 'approveAllData',
+			'list_getUnapprovedAttachments' => 'list_getUnapprovedAttachments',
+			'list_getNumUnapprovedAttachments' => 'list_getNumUnapprovedAttachments',
+			'unapprovedPosts' => 'UnapprovedPosts',
+			'unapprovedAttachments' => 'UnapprovedAttachments',
+			'approveMessage' => 'ApproveMessage',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -75,12 +79,12 @@ class Posts implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'replies' => 'posts',
 		'topics' => 'posts',
 		'attachments' => 'attachments',
 		'approve' => 'approve',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -103,10 +107,11 @@ class Posts implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -122,97 +127,84 @@ public function posts(): void
 
 		// If we filtered by board remove ones outside of this board.
 		// @todo Put a message saying we're filtered?
-		if (isset($_REQUEST['brd']))
-		{
-			$filter_board = array((int) $_REQUEST['brd']);
+		if (isset($_REQUEST['brd'])) {
+			$filter_board = [(int) $_REQUEST['brd']];
 
-			$approve_boards = $approve_boards == array(0) ? $filter_board : array_intersect($approve_boards, $filter_board);
+			$approve_boards = $approve_boards == [0] ? $filter_board : array_intersect($approve_boards, $filter_board);
 		}
 
-		if ($approve_boards == array(0))
-		{
+		if ($approve_boards == [0]) {
 			$approve_query = '';
-		}
-		elseif (!empty($approve_boards))
-		{
+		} elseif (!empty($approve_boards)) {
 			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
 		}
 		// Nada, zip, etc...
-		else
-		{
+		else {
 			$approve_query = ' AND 1=0';
 		}
 
 		// We also need to know where we can delete topics and/or replies to.
-		$boards_can = User::$me->boardsAllowedTo(array('remove_any', 'remove_own', 'delete_own', 'delete_any', 'delete_own_replies'), true, false);
+		$boards_can = User::$me->boardsAllowedTo(['remove_any', 'remove_own', 'delete_own', 'delete_any', 'delete_own_replies'], true, false);
 
-		if (Utils::$context['current_view'] == 'topics')
-		{
+		if (Utils::$context['current_view'] == 'topics') {
 			$delete_own_boards = $boards_can['remove_own'];
 			$delete_any_boards = $boards_can['remove_any'];
-			$delete_own_replies = array();
-		}
-		else
-		{
+			$delete_own_replies = [];
+		} else {
 			$delete_own_boards = $boards_can['delete_own'];
 			$delete_any_boards = $boards_can['delete_any'];
 			$delete_own_replies = $boards_can['delete_own_replies'];
 		}
 
-		$toAction = array();
+		$toAction = [];
 
 		// Check if we have something to do?
-		if (isset($_GET['approve']))
-		{
+		if (isset($_GET['approve'])) {
 			$toAction[] = (int) $_GET['approve'];
 		}
 		// Just a deletion?
-		elseif (isset($_GET['delete']))
-		{
+		elseif (isset($_GET['delete'])) {
 			$toAction[] = (int) $_GET['delete'];
 		}
 		// Lots of approvals?
-		elseif (isset($_POST['item']))
-		{
-			foreach ($_POST['item'] as $item)
+		elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item) {
 				$toAction[] = (int) $item;
+			}
 		}
 
 		// What are we actually doing.
-		if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		{
+		if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
 			$curAction = 'approve';
-		}
-		elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		{
+		} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
 			$curAction = 'delete';
 		}
 
 		// Right, so we have something to do?
-		if (!empty($toAction) && isset($curAction))
-		{
+		if (!empty($toAction) && isset($curAction)) {
 			User::$me->checkSession('request');
 
 			// Handy shortcut.
 			$any_array = $curAction == 'approve' ? $approve_boards : $delete_any_boards;
 
 			// Now for each message work out whether it's actually a topic, and what board it's on.
-			$request = Db::$db->query('', '
-				SELECT m.id_msg, m.id_member, m.id_board, m.subject, t.id_topic, t.id_first_msg, t.id_member_started
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_msg, m.id_member, m.id_board, m.subject, t.id_topic, t.id_first_msg, t.id_member_started
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				WHERE m.id_msg IN ({array_int:message_list})
 					AND m.approved = {int:not_approved}
 					AND {query_see_message_board}',
-				array(
+				[
 					'message_list' => $toAction,
 					'not_approved' => 0,
-				)
+				],
 			);
-			$toAction = array();
-			$details = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$toAction = [];
+			$details = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// If it's not within what our view is ignore it...
 				if (
 					(
@@ -223,30 +215,26 @@ public function posts(): void
 						$row['id_msg'] != $row['id_first_msg']
 						&& Utils::$context['current_view'] != 'replies'
 					)
-				)
-				{
+				) {
 					continue;
 				}
 
 				$can_add = false;
 
 				// If we're approving this is simple.
-				if ($curAction == 'approve' && ($any_array == array(0) || in_array($row['id_board'], $any_array)))
-				{
+				if ($curAction == 'approve' && ($any_array == [0] || in_array($row['id_board'], $any_array))) {
 					$can_add = true;
 				}
 				// Delete requires more permission checks...
-				elseif ($curAction == 'delete')
-				{
+				elseif ($curAction == 'delete') {
 					// Own post is easy!
 					if (
 						$row['id_member'] == User::$me->id
 						&& (
-							$delete_own_boards == array(0)
+							$delete_own_boards == [0]
 							|| in_array($row['id_board'], $delete_own_boards)
 						)
-					)
-					{
+					) {
 						$can_add = true;
 					}
 					// Is it a reply to their own topic?
@@ -254,82 +242,77 @@ public function posts(): void
 						$row['id_member'] == $row['id_member_started']
 						&& $row['id_msg'] != $row['id_first_msg']
 						&& (
-							$delete_own_replies == array(0)
+							$delete_own_replies == [0]
 							|| in_array($row['id_board'], $delete_own_replies)
 						)
-					)
-					{
+					) {
 						$can_add = true;
 					}
 					// Someone elses?
 					elseif (
 						$row['id_member'] != User::$me->id
 						&& (
-							$delete_any_boards == array(0)
+							$delete_any_boards == [0]
 							|| in_array($row['id_board'], $delete_any_boards)
 						)
-					)
-					{
+					) {
 						$can_add = true;
 					}
 				}
 
-				if ($can_add)
-				{
+				if ($can_add) {
 					$anItem = Utils::$context['current_view'] == 'topics' ? $row['id_topic'] : $row['id_msg'];
 
 					$toAction[] = $anItem;
 
 					// All clear. What have we got now, what, what?
-					$details[$anItem] = array();
-					$details[$anItem]["subject"] = $row['subject'];
-					$details[$anItem]["topic"] = $row['id_topic'];
-					$details[$anItem]["member"] = (Utils::$context['current_view'] == 'topics') ? $row['id_member_started'] : $row['id_member'];
-					$details[$anItem]["board"] = $row['id_board'];
+					$details[$anItem] = [];
+					$details[$anItem]['subject'] = $row['subject'];
+					$details[$anItem]['topic'] = $row['id_topic'];
+					$details[$anItem]['member'] = (Utils::$context['current_view'] == 'topics') ? $row['id_member_started'] : $row['id_member'];
+					$details[$anItem]['board'] = $row['id_board'];
 				}
 			}
 			Db::$db->free_result($request);
 
 			// If we have anything left we can actually do the approving (etc).
-			if (!empty($toAction))
-			{
-				if ($curAction == 'approve')
-				{
+			if (!empty($toAction)) {
+				if ($curAction == 'approve') {
 					approveMessages($toAction, $details, Utils::$context['current_view']);
-				}
-				else
-				{
+				} else {
 					removeMessages($toAction, $details, Utils::$context['current_view']);
 				}
 			}
 		}
 
 		// How many unapproved posts are there?
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic AND t.id_first_msg != m.id_msg)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
 			WHERE m.approved = {int:not_approved}
 				AND {query_see_board}
 				' . $approve_query,
-			array(
+			[
 				'not_approved' => 0,
-			)
+			],
 		);
 		list(Utils::$context['total_unapproved_posts']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// What about topics?  Normally we'd use the table alias t for topics but lets use m so we don't have to redo our approve query.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}topics AS m
 			WHERE m.approved = {int:not_approved}
 				AND {query_see_message_board}
 				' . $approve_query,
-			array(
+			[
 				'not_approved' => 0,
-			)
+			],
 		);
 		list(Utils::$context['total_unapproved_topics']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -344,28 +327,28 @@ public function posts(): void
 
 		// We have enough to make some pretty tabs!
 		$menu = Menu::$loaded['moderate'];
-		$menu->tab_data = array(
+		$menu->tab_data = [
 			'title' => Lang::$txt['mc_unapproved_posts'],
 			'help' => 'postmod',
 			'description' => Lang::$txt['mc_unapproved_posts_desc'],
-		);
+		];
 
 		// Update the tabs with the correct number of posts.
 		$menu->sections['posts']['areas']['postmod']['subsections']['posts']['label'] .= ' (' . Utils::$context['total_unapproved_posts'] . ')';
 		$menu->sections['posts']['areas']['postmod']['subsections']['topics']['label'] .= ' (' . Utils::$context['total_unapproved_topics'] . ')';
 
 		// If we are filtering some boards out then make sure to send that along with the links.
-		if (isset($_REQUEST['brd']))
-		{
+		if (isset($_REQUEST['brd'])) {
 			$menu->sections['posts']['areas']['postmod']['subsections']['posts']['add_params'] = ';brd=' . (int) $_REQUEST['brd'];
 			$menu->sections['posts']['areas']['postmod']['subsections']['topics']['add_params'] = ';brd=' . (int) $_REQUEST['brd'];
 		}
 
 		// Get all unapproved posts.
-		Utils::$context['unapproved_items'] = array();
+		Utils::$context['unapproved_items'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT m.id_msg, m.id_topic, m.id_board, m.subject, m.body, m.id_member,
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_msg, m.id_topic, m.id_board, m.subject, m.body, m.id_member,
 				COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.smileys_enabled,
 				t.id_member_started, t.id_first_msg, b.name AS board_name, c.id_cat, c.name AS cat_name
 			FROM {db_prefix}messages AS m
@@ -378,23 +361,22 @@ public function posts(): void
 				AND {query_see_board}
 				' . $approve_query . '
 			LIMIT {int:start}, {int:limit}',
-			array(
+			[
 				'not_approved' => 0,
 				'start' => Utils::$context['start'],
 				'limit' => $limit,
-			)
+			],
 		);
-		for ($i = 1; $row = Db::$db->fetch_assoc($request); $i++)
-		{
+
+		for ($i = 1; $row = Db::$db->fetch_assoc($request); $i++) {
 			// Can delete is complicated, let's solve it first... is it their own post?
 			if (
 				$row['id_member'] == User::$me->id
 				&& (
-					$delete_own_boards == array(0)
+					$delete_own_boards == [0]
 					|| in_array($row['id_board'], $delete_own_boards)
 				)
-			)
-			{
+			) {
 				$can_delete = true;
 			}
 			// Is it a reply to their own topic?
@@ -402,30 +384,26 @@ public function posts(): void
 				$row['id_member'] == $row['id_member_started']
 				&& $row['id_msg'] != $row['id_first_msg']
 				&& (
-					$delete_own_replies == array(0)
+					$delete_own_replies == [0]
 					|| in_array($row['id_board'], $delete_own_replies)
 				)
-			)
-			{
+			) {
 				$can_delete = true;
 			}
 			// Someone elses?
 			elseif (
 				$row['id_member'] != User::$me->id
 				&& (
-					$delete_any_boards == array(0)
+					$delete_any_boards == [0]
 					|| in_array($row['id_board'], $delete_any_boards)
 				)
-			)
-			{
+			) {
 				$can_delete = true;
-			}
-			else
-			{
+			} else {
 				$can_delete = false;
 			}
 
-			Utils::$context['unapproved_items'][] = array(
+			Utils::$context['unapproved_items'][] = [
 				'id' => $row['id_msg'],
 				'counter' => Utils::$context['start'] + $i,
 				'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
@@ -433,27 +411,27 @@ public function posts(): void
 				'subject' => $row['subject'],
 				'body' => BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']),
 				'time' => Time::create('@' . $row['poster_time'])->format(),
-				'poster' => array(
+				'poster' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'link' => $row['id_member'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>' : $row['poster_name'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-				),
-				'topic' => array(
+				],
+				'topic' => [
 					'id' => $row['id_topic'],
-				),
-				'board' => array(
+				],
+				'board' => [
 					'id' => $row['id_board'],
 					'name' => $row['board_name'],
 					'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['board_name'] . '</a>',
-				),
-				'category' => array(
+				],
+				'category' => [
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
 					'link' => '<a href="' . Config::$scripturl . '#c' . $row['id_cat'] . '">' . $row['cat_name'] . '</a>',
-				),
+				],
 				'can_delete' => $can_delete,
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -470,54 +448,42 @@ public function attachments(): void
 		// Once again, permissions are king!
 		$approve_boards = User::$me->boardsAllowedTo('approve_posts');
 
-		if ($approve_boards == array(0))
-		{
+		if ($approve_boards == [0]) {
 			$approve_query = '';
-		}
-		elseif (!empty($approve_boards))
-		{
+		} elseif (!empty($approve_boards)) {
 			$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
-		}
-		else
-		{
+		} else {
 			$approve_query = ' AND 1=0';
 		}
 
 		// Get together the array of things to act on, if any.
-		$attachments = array();
+		$attachments = [];
 
-		if (isset($_GET['approve']))
-		{
+		if (isset($_GET['approve'])) {
 			$attachments[] = (int) $_GET['approve'];
-		}
-		elseif (isset($_GET['delete']))
-		{
+		} elseif (isset($_GET['delete'])) {
 			$attachments[] = (int) $_GET['delete'];
-		}
-		elseif (isset($_POST['item']))
-		{
-			foreach ($_POST['item'] as $item)
+		} elseif (isset($_POST['item'])) {
+			foreach ($_POST['item'] as $item) {
 				$attachments[] = (int) $item;
+			}
 		}
 
 		// Are we approving or deleting?
-		if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve'))
-		{
+		if (isset($_GET['approve']) || (isset($_POST['do']) && $_POST['do'] == 'approve')) {
 			$curAction = 'approve';
-		}
-		elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete'))
-		{
+		} elseif (isset($_GET['delete']) || (isset($_POST['do']) && $_POST['do'] == 'delete')) {
 			$curAction = 'delete';
 		}
 
 		// Something to do, let's do it!
-		if (!empty($attachments) && isset($curAction))
-		{
+		if (!empty($attachments) && isset($curAction)) {
 			User::$me->checkSession('request');
 
 			// Confirm the attachments are eligible for changing!
-			$request = Db::$db->query('', '
-				SELECT a.id_attach
+			$request = Db::$db->query(
+				'',
+				'SELECT a.id_attach
 				FROM {db_prefix}attachments AS a
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 				WHERE a.id_attach IN ({array_int:attachments})
@@ -525,152 +491,146 @@ public function attachments(): void
 					AND a.attachment_type = {int:attachment_type}
 					AND {query_see_message_board}
 					' . $approve_query,
-				array(
+				[
 					'attachments' => $attachments,
 					'not_approved' => 0,
 					'attachment_type' => 0,
-				)
+				],
 			);
-			$attachments = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$attachments = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$attachments[] = $row['id_attach'];
 			}
 			Db::$db->free_result($request);
 
 			// Assuming it wasn't all like, proper illegal, we can do the approving.
-			if (!empty($attachments))
-			{
-				if ($curAction == 'approve')
-				{
+			if (!empty($attachments)) {
+				if ($curAction == 'approve') {
 					Attachment::approve($attachments);
-				}
-				else
-				{
-					Attachment::remove(array('id_attach' => $attachments, 'do_logging' => true));
+				} else {
+					Attachment::remove(['id_attach' => $attachments, 'do_logging' => true]);
 				}
 			}
 		}
 
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'mc_unapproved_attach',
 			'width' => '100%',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['mc_unapproved_attachments_none_found'],
 			'base_href' => Config::$scripturl . '?action=moderate;area=attachmod;sa=attachments',
 			'default_sort_col' => 'attach_name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getUnapprovedAttachments',
-				'params' => array(
+				'params' => [
 					$approve_query,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumUnapprovedAttachments',
-				'params' => array(
+				'params' => [
 					$approve_query,
-				),
-			),
-			'columns' => array(
-				'attach_name' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'attach_name' => [
+					'header' => [
 						'value' => Lang::$txt['mc_unapproved_attach_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'filename',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'a.filename',
 						'reverse' => 'a.filename DESC',
-					),
-				),
-				'attach_size' => array(
-					'header' => array(
+					],
+				],
+				'attach_size' => [
+					'header' => [
 						'value' => Lang::$txt['mc_unapproved_attach_size'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'size',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'a.size',
 						'reverse' => 'a.size DESC',
-					),
-				),
-				'attach_poster' => array(
-					'header' => array(
+					],
+				],
+				'attach_poster' => [
+					'header' => [
 						'value' => Lang::$txt['mc_unapproved_attach_poster'],
-					),
-					'data' => array(
-						'function' => function($data)
-						{
+					],
+					'data' => [
+						'function' => function ($data) {
 							return $data['poster']['link'];
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.id_member',
 						'reverse' => 'm.id_member DESC',
-					),
-				),
-				'date' => array(
-					'header' => array(
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
 						'style' => 'width: 18%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
 						'class' => 'smalltext',
 						'style' => 'white-space:nowrap;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.poster_time',
 						'reverse' => 'm.poster_time DESC',
-					),
-				),
-				'message' => array(
-					'header' => array(
+					],
+				],
+				'message' => [
+					'header' => [
 						'value' => Lang::$txt['post'],
-					),
-					'data' => array(
-						'function' => function($data)
-						{
+					],
+					'data' => [
+						'function' => function ($data) {
 							return '<a href="' . $data['message']['href'] . '">' . Utils::shorten($data['message']['subject'], 20) . '</a>';
 						},
 						'class' => 'smalltext',
 						'style' => 'width:15em;',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.subject',
 						'reverse' => 'm.subject DESC',
-					),
-				),
-				'action' => array(
-					'header' => array(
+					],
+				],
+				'action' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);" checked>',
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="item[]" value="%1$d" checked>',
-							'params' => array(
+							'params' => [
 								'id' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=moderate;area=attachmod;sa=attachments',
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-				),
+				],
 				'token' => 'mod-ap',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '
 						<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm(\'' . Lang::$txt['mc_unapproved_sure'] . '\')) submit();">
@@ -681,9 +641,9 @@ public function attachments(): void
 						</select>
 						<noscript><input type="submit" name="ml_go" value="' . Lang::$txt['go'] . '" class="button"></noscript>',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the request list.
 		SecurityToken::create('mod-ap');
@@ -692,11 +652,11 @@ public function attachments(): void
 		Utils::$context['sub_template'] = 'show_list';
 		Utils::$context['default_list'] = 'mc_unapproved_attach';
 
-		Menu::$loaded['moderate']->tab_data = array(
+		Menu::$loaded['moderate']->tab_data = [
 			'title' => Lang::$txt['mc_unapproved_attachments'],
 			'help' => '',
-			'description' => Lang::$txt['mc_unapproved_attachments_desc']
-		);
+			'description' => Lang::$txt['mc_unapproved_attachments_desc'],
+		];
 	}
 
 	/**
@@ -710,38 +670,34 @@ public function approve(): void
 
 		User::$me->isAllowedTo('approve_posts');
 
-		$request = Db::$db->query('', '
-			SELECT t.id_member_started, t.id_first_msg, m.id_member, m.subject, m.approved
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_member_started, t.id_first_msg, m.id_member, m.subject, m.approved
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:current_topic})
 			WHERE m.id_msg = {int:id_msg}
 				AND m.id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'id_msg' => $_REQUEST['msg'],
-			)
+			],
 		);
 		list($starter, $first_msg, $poster, $subject, $approved) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// If it's the first in a topic then the whole topic gets approved!
-		if ($first_msg == $_REQUEST['msg'])
-		{
+		if ($first_msg == $_REQUEST['msg']) {
 			Topic::approve(Topic::$topic_id, !$approved);
 
-			if ($starter != User::$me->id)
-			{
-				Logging::logAction(($approved ? 'un' : '') . 'approve_topic', array('topic' => Topic::$topic_id, 'subject' => $subject, 'member' => $starter, 'board' => Board::$info->id));
+			if ($starter != User::$me->id) {
+				Logging::logAction(($approved ? 'un' : '') . 'approve_topic', ['topic' => Topic::$topic_id, 'subject' => $subject, 'member' => $starter, 'board' => Board::$info->id]);
 			}
-		}
-		else
-		{
+		} else {
 			Msg::approve($_REQUEST['msg'], !$approved);
 
-			if ($poster != User::$me->id)
-			{
-				Logging::logAction(($approved ? 'un' : '') . 'approve', array('topic' => Topic::$topic_id, 'subject' => $subject, 'member' => $poster, 'board' => Board::$info->id));
+			if ($poster != User::$me->id) {
+				Logging::logAction(($approved ? 'un' : '') . 'approve', ['topic' => Topic::$topic_id, 'subject' => $subject, 'member' => $poster, 'board' => Board::$info->id]);
 			}
 		}
 
@@ -759,8 +715,9 @@ public function approve(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -779,44 +736,48 @@ public static function call(): void
 	public static function approveAllData(): void
 	{
 		// Start with messages and topics.
-		$msgs = array();
+		$msgs = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT id_msg
 			FROM {db_prefix}messages
 			WHERE approved = {int:not_approved}',
-			array(
+			[
 				'not_approved' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_row($request))
-		{
+
+		while ($row = Db::$db->fetch_row($request)) {
 			$msgs[] = $row[0];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($msgs))
+		if (!empty($msgs)) {
 			Msg::approve($msgs);
+		}
 
 		// Now do attachments
-		$attachments = array();
+		$attachments = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_attach
+		$request = Db::$db->query(
+			'',
+			'SELECT id_attach
 			FROM {db_prefix}attachments
 			WHERE approved = {int:not_approved}',
-			array(
+			[
 				'not_approved' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_row($request))
-		{
+
+		while ($row = Db::$db->fetch_row($request)) {
 			$attachments[] = $row[0];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($attachments))
+		if (!empty($attachments)) {
 			Attachment::approve($attachments);
+		}
 	}
 
 	/**
@@ -832,10 +793,11 @@ public static function approveAllData(): void
 	public static function list_getUnapprovedAttachments($start, $items_per_page, $sort, $approve_query): array
 	{
 		// Get all unapproved attachments.
-		$unapproved_items = array();
+		$unapproved_items = [];
 
-		$request = Db::$db->query('', '
-			SELECT a.id_attach, a.filename, a.size, m.id_msg, m.id_topic, m.id_board, m.subject, m.body, m.id_member,
+		$request = Db::$db->query(
+			'',
+			'SELECT a.id_attach, a.filename, a.size, m.id_msg, m.id_topic, m.id_board, m.subject, m.body, m.id_member,
 				COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time,
 				t.id_member_started, t.id_first_msg, b.name AS board_name, c.id_cat, c.name AS cat_name
 			FROM {db_prefix}attachments AS a
@@ -850,47 +812,47 @@ public static function list_getUnapprovedAttachments($start, $items_per_page, $s
 				{raw:approve_query}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:items_per_page}',
-			array(
+			[
 				'not_approved' => 0,
 				'attachment_type' => 0,
 				'start' => $start,
 				'sort' => $sort,
 				'items_per_page' => $items_per_page,
 				'approve_query' => $approve_query,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$unapproved_items[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$unapproved_items[] = [
 				'id' => $row['id_attach'],
 				'filename' => $row['filename'],
 				'size' => round($row['size'] / 1024, 2),
 				'time' => Time::create('@' . $row['poster_time'])->format(),
-				'poster' => array(
+				'poster' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'link' => $row['id_member'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>' : $row['poster_name'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-				),
-				'message' => array(
+				],
+				'message' => [
 					'id' => $row['id_msg'],
 					'subject' => $row['subject'],
 					'body' => BBCodeParser::load()->parse($row['body']),
 					'time' => Time::create('@' . $row['poster_time'])->format(),
 					'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
-				),
-				'topic' => array(
+				],
+				'topic' => [
 					'id' => $row['id_topic'],
-				),
-				'board' => array(
+				],
+				'board' => [
 					'id' => $row['id_board'],
 					'name' => $row['board_name'],
-				),
-				'category' => array(
+				],
+				'category' => [
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
-				),
-			);
+				],
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -907,18 +869,19 @@ public static function list_getUnapprovedAttachments($start, $items_per_page, $s
 	public static function list_getNumUnapprovedAttachments($approve_query): int
 	{
 		// How many unapproved attachments in total?
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 			WHERE a.approved = {int:not_approved}
 				AND a.attachment_type = {int:attachment_type}
 				AND {query_see_message_board}
 				' . $approve_query,
-			array(
+			[
 				'not_approved' => 0,
 				'attachment_type' => 0,
-			)
+			],
 		);
 		list($total_unapproved_attachments) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -968,10 +931,11 @@ protected function __construct()
 		Lang::load('ModerationCenter');
 		Theme::loadTemplate('ModerationCenter');
 
-		IntegrationHook::call('integrate_post_moderation', array(&self::$subactions));
+		IntegrationHook::call('integrate_post_moderation', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -983,24 +947,19 @@ protected function __construct()
 	 */
 	protected function approveMessages($messages, $messageDetails, $current_view = 'replies'): void
 	{
-		if ($current_view == 'topics')
-		{
+		if ($current_view == 'topics') {
 			Topic::approve($messages);
 
 			// and tell the world about it
-			foreach ($messages as $topic)
-			{
-				Logging::logAction('approve_topic', array('topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']));
+			foreach ($messages as $topic) {
+				Logging::logAction('approve_topic', ['topic' => $topic, 'subject' => $messageDetails[$topic]['subject'], 'member' => $messageDetails[$topic]['member'], 'board' => $messageDetails[$topic]['board']]);
 			}
-		}
-		else
-		{
+		} else {
 			Msg::approve($messages);
 
 			// and tell the world about it again
-			foreach ($messages as $post)
-			{
-				Logging::logAction('approve', array('topic' => $messageDetails[$post]['topic'], 'subject' => $messageDetails[$post]['subject'], 'member' => $messageDetails[$post]['member'], 'board' => $messageDetails[$post]['board']));
+			foreach ($messages as $post) {
+				Logging::logAction('approve', ['topic' => $messageDetails[$post]['topic'], 'subject' => $messageDetails[$post]['subject'], 'member' => $messageDetails[$post]['member'], 'board' => $messageDetails[$post]['board']]);
 			}
 		}
 	}
@@ -1015,45 +974,41 @@ protected function approveMessages($messages, $messageDetails, $current_view = '
 	protected function removeMessages($messages, $messageDetails, $current_view = 'replies'): void
 	{
 		// @todo something's not right, Msg::remove() checks permissions, Topic::remove() doesn't
-		if ($current_view == 'topics')
-		{
+		if ($current_view == 'topics') {
 			Topic::remove($messages);
 
 			// and tell the world about it
-			foreach ($messages as $topic)
-			{
+			foreach ($messages as $topic) {
 				// Note, only log topic ID in native form if it's not gone forever.
 				$topic_key = empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != $messageDetails[$topic]['board'] ? 'topic' : 'old_topic_id';
 
-				Logging::logAction('remove', array(
+				Logging::logAction('remove', [
 					$topic_key => $topic,
 					'subject' => $messageDetails[$topic]['subject'],
 					'member' => $messageDetails[$topic]['member'],
 					'board' => $messageDetails[$topic]['board'],
-				));
+				]);
 			}
-		}
-		else
-		{
-			foreach ($messages as $post)
-			{
+		} else {
+			foreach ($messages as $post) {
 				Msg::remove($post);
 
 				$topic_key = empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != $messageDetails[$post]['board'] ? 'topic' : 'old_topic_id';
 
-				Logging::logAction('delete', array(
+				Logging::logAction('delete', [
 					$topic_key => $messageDetails[$post]['topic'],
 					'subject' => $messageDetails[$post]['subject'],
 					'member' => $messageDetails[$post]['member'],
 					'board' => $messageDetails[$post]['board'],
-				));
+				]);
 			}
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Posts::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Posts::exportStatic')) {
 	Posts::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/ReportedContent.php b/Sources/Actions/Moderation/ReportedContent.php
index c98534aad0..27239513b7 100644
--- a/Sources/Actions/Moderation/ReportedContent.php
+++ b/Sources/Actions/Moderation/ReportedContent.php
@@ -13,12 +13,12 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
 use SMF\Alert;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\IP;
@@ -32,7 +32,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles reported members and posts, as well as moderation comments.
@@ -46,12 +45,18 @@ class ReportedContent implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ReportedContent',
-		),
-	);
+			'recountOpenReports' => 'recountOpenReports',
+			'showReports' => 'ShowReports',
+			'showClosedReports' => 'ShowClosedReports',
+			'reportDetails' => 'ReportDetails',
+			'handleReport' => 'HandleReport',
+			'handleComment' => 'HandleComment',
+			'editComment' => 'EditComment',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -81,24 +86,24 @@ class ReportedContent implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'show' => 'show',
 		'closed' => 'showClosed',
 		'details' => 'details',
 		'handle' => 'setState',
 		'handlecomment' => 'comment',
 		'editcomment' => 'modifyComment',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Supported report types
 	 */
-	public static array $types = array(
+	public static array $types = [
 		'posts',
 		'members',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -109,7 +114,7 @@ class ReportedContent implements ActionInterface
 	 *
 	 * Boards where the current user can remove any message.
 	 */
-	protected array $remove_any_boards = array();
+	protected array $remove_any_boards = [];
 
 	/**
 	 * @var bool
@@ -139,10 +144,11 @@ class ReportedContent implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -168,19 +174,20 @@ public function show(): void
 		Utils::$context['reports'] = $this->getReports(Utils::$context['view_closed']);
 
 		// Are we closing multiple reports?
-		if (isset($_POST['close']) && isset($_POST['close_selected']))
-		{
+		if (isset($_POST['close'], $_POST['close_selected'])) {
 			User::$me->checkSession('post');
 			SecurityToken::validate('mod-report-close-all');
 
 			// All the ones to update...
-			$toClose = array();
+			$toClose = [];
 
-			foreach ($_POST['close'] as $rid)
+			foreach ($_POST['close'] as $rid) {
 				$toClose[] = (int) $rid;
+			}
 
-			if (!empty($toClose))
+			if (!empty($toClose)) {
 				$this->updateReport('closed', 1, $toClose);
+			}
 
 			// Set the confirmation message.
 			$_SESSION['rc_confirmation'] = 'close_all';
@@ -232,8 +239,9 @@ public function showClosed(): void
 	public function details(): void
 	{
 		// Have to at least give us something to work with.
-		if (empty($_REQUEST['rid']))
+		if (empty($_REQUEST['rid'])) {
 			ErrorHandler::fatalLang('mc_reportedp_none_found');
+		}
 
 		// Integers only please
 		$report_id = (int) $_REQUEST['rid'];
@@ -241,189 +249,183 @@ public function details(): void
 		// Get the report details.
 		$report = $this->getReportDetails($report_id);
 
-		if (empty($report))
+		if (empty($report)) {
 			ErrorHandler::fatalLang('mc_no_modreport_found', false);
+		}
 
 		// Build the report data - basic details first, then extra stuff based on the type
-		Utils::$context['report'] = array(
+		Utils::$context['report'] = [
 			'id' => $report['id_report'],
 			'report_href' => Config::$scripturl . '?action=moderate;area=reported' . $this->type . ';rid=' . $report['id_report'],
-			'comments' => array(),
-			'mod_comments' => array(),
+			'comments' => [],
+			'mod_comments' => [],
 			'time_started' => Time::create('@' . $report['time_started'])->format(),
 			'last_updated' => Time::create('@' . $report['time_updated'])->format(),
 			'num_reports' => $report['num_reports'],
 			'closed' => $report['closed'],
-			'ignore' => $report['ignore_all']
-		);
+			'ignore' => $report['ignore_all'],
+		];
 
 		// Different reports have different "extra" data attached to them
-		if ($this->type == 'members')
-		{
-			$extraDetails = array(
-				'user' => array(
+		if ($this->type == 'members') {
+			$extraDetails = [
+				'user' => [
 					'id' => $report['id_user'],
 					'name' => $report['user_name'],
 					'link' => $report['id_user'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $report['id_user'] . '">' . $report['user_name'] . '</a>' : $report['user_name'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $report['id_user'],
-				),
-			);
-		}
-		else
-		{
-			$extraDetails = array(
+				],
+			];
+		} else {
+			$extraDetails = [
 				'topic_id' => $report['id_topic'],
 				'board_id' => $report['id_board'],
 				'message_id' => $report['id_msg'],
 				'message_href' => Config::$scripturl . '?msg=' . $report['id_msg'],
 				'message_link' => '<a href="' . Config::$scripturl . '?msg=' . $report['id_msg'] . '">' . $report['subject'] . '</a>',
-				'author' => array(
+				'author' => [
 					'id' => $report['id_author'],
 					'name' => $report['author_name'],
 					'link' => $report['id_author'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $report['id_author'] . '">' . $report['author_name'] . '</a>' : $report['author_name'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $report['id_author'],
-				),
+				],
 				'subject' => $report['subject'],
 				'body' => BBCodeParser::load()->parse($report['body']),
-			);
+			];
 		}
 
 		Utils::$context['report'] = array_merge(Utils::$context['report'], $extraDetails);
 
 		$reportComments = $this->getReportComments($report_id);
 
-		if (!empty($reportComments))
+		if (!empty($reportComments)) {
 			Utils::$context['report'] = array_merge(Utils::$context['report'], $reportComments);
+		}
 
 		// What have the other moderators done to this message?
 		// Parameters are slightly different depending on what we're doing here...
-		if ($this->type == 'members')
-		{
+		if ($this->type == 'members') {
 			// Find their ID in the serialized action string...
 			$user_id_length = strlen((string) Utils::$context['report']['user']['id']);
 			$member = 's:6:"member";s:' . $user_id_length . ':"' . Utils::$context['report']['user']['id'] . '";}';
 
-			$params = array(
+			$params = [
 				'lm.extra LIKE {raw:member}
 					AND lm.action LIKE {raw:report}',
-				array('member' => '\'%' . $member . '\'', 'report' => '\'%_user_report\''),
+				['member' => '\'%' . $member . '\'', 'report' => '\'%_user_report\''],
 				1,
 				true,
-			);
-		}
-		else
-		{
-			$params = array(
+			];
+		} else {
+			$params = [
 				'lm.id_topic = {int:id_topic}
 					AND lm.id_board != {int:not_a_reported_post}',
-				array('id_topic' => Utils::$context['report']['topic_id'], 'not_a_reported_post' => 0),
+				['id_topic' => Utils::$context['report']['topic_id'], 'not_a_reported_post' => 0],
 				1,
-			);
+			];
 		}
 
 		Lang::load('Modlog');
 
 		// This is all the information from the moderation log.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'moderation_actions_list',
 			'title' => Lang::$txt['mc_modreport_modactions'],
 			'items_per_page' => 15,
 			'no_items_label' => Lang::$txt['modlog_no_entries_found'],
 			'base_href' => Config::$scripturl . '?action=moderate;area=reported' . $this->type . ';sa=details;rid=' . Utils::$context['report']['id'],
 			'default_sort_col' => 'time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __NAMESPACE__ . '\\Logs::list_getModLogEntries',
 				'params' => $params,
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __NAMESPACE__ . '\\Logs::list_getModLogEntryCount',
 				'params' => $params,
-			),
+			],
 			// This assumes we are viewing by user.
-			'columns' => array(
-				'action' => array(
-					'header' => array(
+			'columns' => [
+				'action' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_action'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'action_text',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lm.action',
 						'reverse' => 'lm.action DESC',
-					),
-				),
-				'time' => array(
-					'header' => array(
+					],
+				],
+				'time' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lm.log_time',
 						'reverse' => 'lm.log_time DESC',
-					),
-				),
-				'moderator' => array(
-					'header' => array(
+					],
+				],
+				'moderator' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_member'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'moderator_link',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mem.real_name',
 						'reverse' => 'mem.real_name DESC',
-					),
-				),
-				'position' => array(
-					'header' => array(
+					],
+				],
+				'position' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_position'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'position',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mg.group_name',
 						'reverse' => 'mg.group_name DESC',
-					),
-				),
-				'ip' => array(
-					'header' => array(
+					],
+				],
+				'ip' => [
+					'header' => [
 						'value' => Lang::$txt['modlog_ip'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'ip',
 						'class' => 'smalltext',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lm.ip',
 						'reverse' => 'lm.ip DESC',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the watched user list.
 		new ItemList($listOptions);
 
 		// Make sure to get the correct tab selected.
-		if (Utils::$context['report']['closed'])
+		if (Utils::$context['report']['closed']) {
 			Menu::$loaded['moderate']->current_subsection = 'closed';
+		}
 
 		// Finally we are done :P
-		if ($this->type == 'members')
-		{
+		if ($this->type == 'members') {
 			Utils::$context['page_title'] = sprintf(Lang::$txt['mc_viewmemberreport'], Utils::$context['report']['user']['name']);
 			Utils::$context['sub_template'] = 'viewmemberreport';
-		}
-		else
-		{
+		} else {
 			Utils::$context['page_title'] = sprintf(Lang::$txt['mc_viewmodreport'], Utils::$context['report']['subject'], Utils::$context['report']['author']['name']);
 			Utils::$context['sub_template'] = 'viewmodreport';
 		}
@@ -444,8 +446,9 @@ public function setState(): void
 		User::$me->checkSession('get');
 
 		// We need to do something!
-		if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed'])))
+		if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed']))) {
 			ErrorHandler::fatalLang('mc_reportedp_none_found');
+		}
 
 		// What are we gonna do?
 		$action = isset($_GET['ignore']) ? 'ignore' : 'closed';
@@ -477,34 +480,34 @@ public function setState(): void
 	public function comment(): void
 	{
 		// The report ID is a must.
-		if (empty($_REQUEST['rid']))
+		if (empty($_REQUEST['rid'])) {
 			ErrorHandler::fatalLang('mc_reportedp_none_found');
+		}
 
 		// Integers only please.
 		$report_id = (int) $_REQUEST['rid'];
 
 		// If they are adding a comment then... add a comment.
-		if (isset($_POST['add_comment']) && !empty($_POST['mod_comment']))
-		{
+		if (isset($_POST['add_comment']) && !empty($_POST['mod_comment'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-reportC-add');
 
 			$new_comment = trim(Utils::htmlspecialchars($_POST['mod_comment']));
 
-			$this->saveModComment($report_id, array($report_id, $new_comment, time()));
+			$this->saveModComment($report_id, [$report_id, $new_comment, time()]);
 
 			// Everything went better than expected!
 			$_SESSION['rc_confirmation'] = 'message_saved';
 		}
 
 		// Deleting a comment?
-		if (isset($_REQUEST['delete']) && isset($_REQUEST['mid']))
-		{
+		if (isset($_REQUEST['delete'], $_REQUEST['mid'])) {
 			User::$me->checkSession('get');
 			SecurityToken::validate('mod-reportC-delete', 'get');
 
-			if (empty($_REQUEST['mid']))
+			if (empty($_REQUEST['mid'])) {
 				ErrorHandler::fatalLang('mc_reportedp_comment_none_found');
+			}
 
 			$comment_id = (int) $_REQUEST['mid'];
 
@@ -512,12 +515,14 @@ public function comment(): void
 			$comment = $this->getCommentModDetails($comment_id);
 
 			// Perhaps somebody else already deleted this fine gem...
-			if (empty($comment))
+			if (empty($comment)) {
 				ErrorHandler::fatalLang('report_action_message_delete_issue');
+			}
 
 			// Can you actually do this?
-			if (!User::$me->allowedTo('admin_forum') && User::$me->id != $comment['id_member'])
+			if (!User::$me->allowedTo('admin_forum') && User::$me->id != $comment['id_member']) {
 				ErrorHandler::fatalLang('report_action_message_delete_cannot');
+			}
 
 			// All good!
 			$this->deleteModComment($comment_id);
@@ -540,11 +545,13 @@ public function modifyComment(): void
 		User::$me->checkSession(isset($_REQUEST['save']) ? 'post' : 'get');
 
 		// The report ID is a must.
-		if (empty($_REQUEST['rid']))
+		if (empty($_REQUEST['rid'])) {
 			ErrorHandler::fatalLang('mc_reportedp_none_found');
+		}
 
-		if (empty($_REQUEST['mid']))
+		if (empty($_REQUEST['mid'])) {
 			ErrorHandler::fatalLang('mc_reportedp_comment_none_found');
+		}
 
 		// Integers only please.
 		Utils::$context['report_id'] = (int) $_REQUEST['rid'];
@@ -552,24 +559,24 @@ public function modifyComment(): void
 
 		Utils::$context['comment'] = $this->getCommentModDetails(Utils::$context['comment_id']);
 
-		if (empty(Utils::$context['comment']))
+		if (empty(Utils::$context['comment'])) {
 			ErrorHandler::fatalLang('mc_reportedp_comment_none_found');
+		}
 
 		// Set up the comforting bits...
 		Utils::$context['page_title'] = Lang::$txt['mc_reported_posts'];
 		Utils::$context['sub_template'] = 'edit_comment';
 
-		if (isset($_REQUEST['save']) && isset($_POST['edit_comment']) && !empty($_POST['mod_comment']))
-		{
+		if (isset($_REQUEST['save'], $_POST['edit_comment'])   && !empty($_POST['mod_comment'])) {
 			SecurityToken::validate('mod-reportC-edit');
 
 			// Make sure there is some data to edit in the DB.
-			if (empty(Utils::$context['comment']))
+			if (empty(Utils::$context['comment'])) {
 				ErrorHandler::fatalLang('report_action_message_edit_issue');
+			}
 
 			// So, you aren't neither an admin or the comment owner huh? that's too bad.
-			if (!User::$me->allowedTo('admin_forum') && User::$me->id != Utils::$context['comment']['id_member'])
-			{
+			if (!User::$me->allowedTo('admin_forum') && User::$me->id != Utils::$context['comment']['id_member']) {
 				ErrorHandler::fatalLang('report_action_message_edit_cannot');
 			}
 
@@ -597,8 +604,9 @@ public function modifyComment(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -621,30 +629,31 @@ public static function recountOpenReports(string $type): int
 	{
 		$bq = $type == 'members' ? '' : "\n\t\t\t\t" . 'AND ' . User::$me->mod_cache['bq'];
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_reported
 			WHERE closed = {int:not_closed}
 				AND ignore_all = {int:not_ignored}
 				AND id_board' . ($type == 'members' ? '' : '!') . '= {int:not_a_reported_post}'
 				. $bq,
-			array(
+			[
 				'not_closed' => 0,
 				'not_ignored' => 0,
 				'not_a_reported_post' => 0,
-			)
+			],
 		);
 		list($open_reports) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		$arr = ($type == 'members' ? 'member_reports' : 'reports');
 		$_SESSION['rc'] = array_merge(
-			!empty($_SESSION['rc']) ? $_SESSION['rc'] : array(),
-			array(
+			!empty($_SESSION['rc']) ? $_SESSION['rc'] : [],
+			[
 				'id' => User::$me->id,
 				'time' => time(),
 				$arr => $open_reports,
-			)
+			],
 		);
 
 		return $open_reports;
@@ -723,8 +732,9 @@ protected function __construct()
 		// area=reported{type}
 		$this->type = substr($_GET['area'], 8);
 
-		if (!in_array($this->type, self::$types))
+		if (!in_array($this->type, self::$types)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		Utils::$context['report_type'] = $this->type;
 
@@ -732,28 +742,30 @@ protected function __construct()
 		Theme::loadTemplate('ReportedContent');
 
 		// Do we need to show a confirmation message?
-		Utils::$context['report_post_action'] = !empty($_SESSION['rc_confirmation']) ? $_SESSION['rc_confirmation'] : array();
+		Utils::$context['report_post_action'] = !empty($_SESSION['rc_confirmation']) ? $_SESSION['rc_confirmation'] : [];
 		unset($_SESSION['rc_confirmation']);
 
 		// Set up the comforting bits...
 		Utils::$context['page_title'] = Lang::$txt['mc_reported_' . $this->type];
 
 		// Put the open and closed options into tabs, because we can...
-		Menu::$loaded['moderate']->tab_data = array(
+		Menu::$loaded['moderate']->tab_data = [
 			'title' => Lang::$txt['mc_reported_' . $this->type],
 			'help' => '',
 			'description' => Lang::$txt['mc_reported_' . $this->type . '_desc'],
-		);
+		];
 
 		// This comes under the umbrella of moderating posts.
-		if ($this->type == 'members' || User::$me->mod_cache['bq'] == '0=1')
+		if ($this->type == 'members' || User::$me->mod_cache['bq'] == '0=1') {
 			User::$me->isAllowedTo('moderate_forum');
+		}
 
 		// Go ahead and add your own sub-actions.
-		IntegrationHook::call('integrate_reported_' . $this->type, array(&self::$subactions));
+		IntegrationHook::call('integrate_reported_' . $this->type, [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -768,106 +780,108 @@ protected function __construct()
 	protected function updateReport(string $action, int $value, int|array $report_id): void
 	{
 		// Don't bother.
-		if (empty($action) || empty($report_id))
+		if (empty($action) || empty($report_id)) {
 			return;
+		}
 
 		// Add the "_all" thingy.
-		if ($action == 'ignore')
+		if ($action == 'ignore') {
 			$action = 'ignore_all';
+		}
 
 		// We don't need the board query for reported members
-		if ($this->type == 'members')
-		{
+		if ($this->type == 'members') {
 			$board_query = '';
-		}
-		else
-		{
+		} else {
 			$board_query = ' AND ' . User::$me->mod_cache['bq'];
 		}
 
 		// Update the report...
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_reported
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_reported
 			SET  {raw:action} = {string:value}
 			' . (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') . '
 				' . $board_query,
-			array(
+			[
 				'action' => $action,
 				'value' => $value,
 				'id_report' => $report_id,
-			)
+			],
 		);
 
 		// From now on, lets work with arrays, makes life easier.
 		$report_id = (array) $report_id;
 
 		// Set up the data for the log...
-		$extra = array();
+		$extra = [];
 
-		if ($this->type == 'posts')
-		{
+		if ($this->type == 'posts') {
 			// Get the board, topic and message for this report
-			$request = Db::$db->query('', '
-				SELECT id_board, id_topic, id_msg, id_report
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board, id_topic, id_msg, id_report
 				FROM {db_prefix}log_reported
 				WHERE id_report IN ({array_int:id_report})',
-				array(
+				[
 					'id_report' => $report_id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$extra[$row['id_report']] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$extra[$row['id_report']] = [
 					'report' => $row['id_report'],
 					'board' => $row['id_board'],
 					'message' => $row['id_msg'],
 					'topic' => $row['id_topic'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT id_report, id_member, membername
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_report, id_member, membername
 				FROM {db_prefix}log_reported
 				WHERE id_report IN ({array_int:id_report})',
-				array(
+				[
 					'id_report' => $report_id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$extra[$row['id_report']] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$extra[$row['id_report']] = [
 					'report' => $row['id_report'],
 					'member' => $row['id_member'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Back to "ignore".
-		if ($action == 'ignore_all')
+		if ($action == 'ignore_all') {
 			$action = 'ignore';
+		}
 
 		$log_report = $action == 'ignore' ? (!empty($value) ? 'ignore' : 'unignore') : (!empty($value) ? 'close' : 'open');
 
-		if ($this->type == 'members')
+		if ($this->type == 'members') {
 			$log_report .= '_user';
+		}
 
 		// See if any report alerts need to be cleaned up upon close/ignore
-		if (in_array($log_report, array('close', 'ignore', 'close_user', 'ignore_user')))
+		if (in_array($log_report, ['close', 'ignore', 'close_user', 'ignore_user'])) {
 			$this->clearReportAlerts($log_report, $extra);
+		}
 
 		// Log this action.
-		if (!empty($extra))
-		{
-			foreach ($extra as $report)
+		if (!empty($extra)) {
+			foreach ($extra as $report) {
 				Logging::logAction($log_report . '_report', $report);
+			}
 		}
 
 		// Time to update.
-		Config::updateModSettings(array('last_mod_report_action' => time()));
+		Config::updateModSettings(['last_mod_report_action' => time()]);
 		self::recountOpenReports($this->type);
 	}
 
@@ -881,13 +895,10 @@ protected function clearReportAlerts(string $log_report, array $extra): void
 	{
 		// Setup the query, depending on if it's a member report or a msg report.
 		// In theory, these should be unique (reports for the same things get combined), but since $extra is an array, treat as an array.
-		if (strpos($log_report, '_user') !== false)
-		{
+		if (strpos($log_report, '_user') !== false) {
 			$content_ids = array_unique(array_column($extra, 'member'));
 			$content_type = 'member';
-		}
-		else
-		{
+		} else {
 			$content_ids = array_unique(array_column($extra, 'message'));
 			$content_type = 'msg';
 		}
@@ -895,17 +906,17 @@ protected function clearReportAlerts(string $log_report, array $extra): void
 		// Check to see if there are unread alerts to flag as read...
 		// Might be multiple alerts, for multiple moderators...
 		Alert::markWhere(
-			array(
+			[
 				'content_id IN ({array_int:content_ids})',
 				'content_type = {string:content_type}',
 				'content_action = {string:content_action}',
-			),
-			array(
+			],
+			[
 				'content_ids' => $content_ids,
 				'content_type' => $content_type,
 				'content_action' => 'report',
-			),
-			true
+			],
+			true,
 		);
 	}
 
@@ -918,18 +929,12 @@ protected function clearReportAlerts(string $log_report, array $extra): void
 	protected function countReports(int $closed = 0): int
 	{
 		// Skip entries with id_board = 0 if we're viewing member reports
-		if ($this->type == 'members')
-		{
+		if ($this->type == 'members') {
 			$and = 'lr.id_board = 0';
-		}
-		else
-		{
-			if (User::$me->mod_cache['bq'] == '1=1' || User::$me->mod_cache['bq'] == '0=1')
-			{
+		} else {
+			if (User::$me->mod_cache['bq'] == '1=1' || User::$me->mod_cache['bq'] == '0=1') {
 				$bq = User::$me->mod_cache['bq'];
-			}
-			else
-			{
+			} else {
 				$bq = 'lr.' . User::$me->mod_cache['bq'];
 			}
 
@@ -937,14 +942,15 @@ protected function countReports(int $closed = 0): int
 		}
 
 		// How many entries are we viewing?
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_reported AS lr
 			WHERE lr.closed = {int:view_closed}
 				AND ' . $and,
-			array(
+			[
 				'view_closed' => $closed,
-			)
+			],
 		);
 		list($total_reports) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -961,16 +967,16 @@ protected function countReports(int $closed = 0): int
 	protected function getReports(int $closed = 0): array
 	{
 		// Lonely, standalone var.
-		$reports = array();
+		$reports = [];
 
-		$report_ids = array();
-		$report_boards_ids = array();
+		$report_ids = [];
+		$report_boards_ids = [];
 
 		// By George, that means we are in a position to get the reports, jolly good.
-		if ($this->type == 'members')
-		{
-			$request = Db::$db->query('', '
-				SELECT lr.id_report, lr.id_member,
+		if ($this->type == 'members') {
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.id_report, lr.id_member,
 					lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
 					COALESCE(mem.real_name, lr.membername) AS user_name, COALESCE(mem.id_member, 0) AS id_user
 				FROM {db_prefix}log_reported AS lr
@@ -979,17 +985,16 @@ protected function getReports(int $closed = 0): array
 					AND lr.id_board = 0
 				ORDER BY lr.time_updated DESC
 				LIMIT {int:start}, {int:max}',
-				array(
+				[
 					'view_closed' => $closed,
 					'start' => Utils::$context['start'],
 					'max' => 10,
-				)
+				],
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
 					lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
 					COALESCE(mem.real_name, lr.membername) AS author_name, COALESCE(mem.id_member, 0) AS id_author
 				FROM {db_prefix}log_reported AS lr
@@ -999,57 +1004,54 @@ protected function getReports(int $closed = 0): array
 					AND ' . (User::$me->mod_cache['bq'] == '1=1' || User::$me->mod_cache['bq'] == '0=1' ? User::$me->mod_cache['bq'] : 'lr.' . User::$me->mod_cache['bq']) . '
 				ORDER BY lr.time_updated DESC
 				LIMIT {int:start}, {int:max}',
-				array(
+				[
 					'view_closed' => (int) $closed,
 					'start' => Utils::$context['start'],
 					'max' => 10,
-				)
+				],
 			);
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$report_ids[] = $row['id_report'];
-			$reports[$row['id_report']] = array(
+			$reports[$row['id_report']] = [
 				'id' => $row['id_report'],
 				'report_href' => Config::$scripturl . '?action=moderate;area=reported' . $this->type . ';sa=details;rid=' . $row['id_report'],
-				'comments' => array(),
+				'comments' => [],
 				'time_started' => Time::create('@' . $row['time_started'])->format(),
 				'last_updated' => Time::create('@' . $row['time_updated'])->format(),
 				'num_reports' => $row['num_reports'],
 				'closed' => $row['closed'],
-				'ignore' => $row['ignore_all']
-			);
+				'ignore' => $row['ignore_all'],
+			];
 
-			if ($this->type == 'members')
-			{
-				$extraDetails = array(
-					'user' => array(
+			if ($this->type == 'members') {
+				$extraDetails = [
+					'user' => [
 						'id' => $row['id_user'],
 						'name' => $row['user_name'],
 						'link' => $row['id_user'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_user'] . '">' . $row['user_name'] . '</a>' : $row['user_name'],
 						'href' => Config::$scripturl . '?action=profile;u=' . $row['id_user'],
-					),
-				);
-			}
-			else
-			{
+					],
+				];
+			} else {
 				$report_boards_ids[] = $row['id_board'];
-				$extraDetails = array(
-					'topic' => array(
+				$extraDetails = [
+					'topic' => [
 						'id' => $row['id_topic'],
 						'id_msg' => $row['id_msg'],
 						'id_board' => $row['id_board'],
 						'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
-					),
-					'author' => array(
+					],
+					'author' => [
 						'id' => $row['id_author'],
 						'name' => $row['author_name'],
 						'link' => $row['id_author'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_author'] . '">' . $row['author_name'] . '</a>' : $row['author_name'],
 						'href' => Config::$scripturl . '?action=profile;u=' . $row['id_author'],
-					),
+					],
 					'subject' => $row['subject'],
 					'body' => BBCodeParser::load()->parse($row['body']),
-				);
+				];
 			}
 
 			$reports[$row['id_report']] = array_merge($reports[$row['id_report']], $extraDetails);
@@ -1057,59 +1059,57 @@ protected function getReports(int $closed = 0): array
 		Db::$db->free_result($request);
 
 		// Get the names of boards those topics are in. Slightly faster this way.
-		if (!empty($report_boards_ids))
-		{
+		if (!empty($report_boards_ids)) {
 			$report_boards_ids = array_unique($report_boards_ids);
-			$board_names = array();
-			$request = Db::$db->query('', '
-				SELECT id_board, name
+			$board_names = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board, name
 				FROM {db_prefix}boards
 				WHERE id_board IN ({array_int:boards})',
-				array(
+				[
 					'boards' => $report_boards_ids,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$board_names[$row['id_board']] = $row['name'];
 			}
 			Db::$db->free_result($request);
 
-			foreach ($reports as $id_report => $report)
-			{
-				if (!empty($board_names[$report['topic']['id_board']]))
-				{
+			foreach ($reports as $id_report => $report) {
+				if (!empty($board_names[$report['topic']['id_board']])) {
 					$reports[$id_report]['topic']['board_name'] = $board_names[$report['topic']['id_board']];
 				}
 			}
 		}
 
 		// Now get all the people who reported it.
-		if (!empty($report_ids))
-		{
-			$request = Db::$db->query('', '
-				SELECT lrc.id_comment, lrc.id_report, lrc.time_sent, lrc.comment,
+		if (!empty($report_ids)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT lrc.id_comment, lrc.id_report, lrc.time_sent, lrc.comment,
 					COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lrc.membername) AS reporter
 				FROM {db_prefix}log_reported_comments AS lrc
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lrc.id_member)
 				WHERE lrc.id_report IN ({array_int:report_list})',
-				array(
+				[
 					'report_list' => $report_ids,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$reports[$row['id_report']]['comments'][] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$reports[$row['id_report']]['comments'][] = [
 					'id' => $row['id_comment'],
 					'message' => $row['comment'],
 					'time' => Time::create('@' . $row['time_sent'])->format(),
-					'member' => array(
+					'member' => [
 						'id' => $row['id_member'],
 						'name' => empty($row['reporter']) ? Lang::$txt['guest'] : $row['reporter'],
 						'link' => $row['id_member'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['reporter'] . '</a>' : (empty($row['reporter']) ? Lang::$txt['guest'] : $row['reporter']),
 						'href' => $row['id_member'] ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : '',
-					),
-				);
+					],
+				];
 			}
 			Db::$db->free_result($request);
 		}
@@ -1129,14 +1129,15 @@ protected function getReports(int $closed = 0): array
 	 */
 	protected function getReportDetails(int $report_id): array
 	{
-		if (empty($report_id))
-			return array();
+		if (empty($report_id)) {
+			return [];
+		}
 
 		// We don't need all this info if we're only getting user info
-		if ($this->type == 'members')
-		{
-			$request = Db::$db->query('', '
-				SELECT lr.id_report, lr.id_member,
+		if ($this->type == 'members') {
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.id_report, lr.id_member,
 					lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
 					COALESCE(mem.real_name, lr.membername) AS user_name, COALESCE(mem.id_member, 0) AS id_user
 				FROM {db_prefix}log_reported AS lr
@@ -1144,16 +1145,15 @@ protected function getReportDetails(int $report_id): array
 				WHERE lr.id_report = {int:id_report}
 					AND lr.id_board = 0
 				LIMIT 1',
-				array(
+				[
 					'id_report' => $report_id,
-				)
+				],
 			);
-		}
-		else
-		{
+		} else {
 			// Get the report details, need this so we can limit access to a particular board.
-			$request = Db::$db->query('', '
-				SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.id_report, lr.id_msg, lr.id_topic, lr.id_board, lr.id_member, lr.subject, lr.body,
 					lr.time_started, lr.time_updated, lr.num_reports, lr.closed, lr.ignore_all,
 					COALESCE(mem.real_name, lr.membername) AS author_name, COALESCE(mem.id_member, 0) AS id_author
 				FROM {db_prefix}log_reported AS lr
@@ -1161,18 +1161,16 @@ protected function getReportDetails(int $report_id): array
 				WHERE lr.id_report = {int:id_report}
 					AND ' . (User::$me->mod_cache['bq'] == '1=1' || User::$me->mod_cache['bq'] == '0=1' ? User::$me->mod_cache['bq'] : 'lr.' . User::$me->mod_cache['bq']) . '
 				LIMIT 1',
-				array(
+				[
 					'id_report' => $report_id,
-				)
+				],
 			);
 		}
+
 		// So did we find anything?
-		if (!Db::$db->num_rows($request))
-		{
-			$row = array();
-		}
-		else
-		{
+		if (!Db::$db->num_rows($request)) {
+			$row = [];
+		} else {
 			// Woohoo we found a report and they can see it!
 			$row = Db::$db->fetch_assoc($request);
 		}
@@ -1189,70 +1187,73 @@ protected function getReportDetails(int $report_id): array
 	 */
 	protected function getReportComments(int $report_id): array
 	{
-		if (empty($report_id))
-			return array();
+		if (empty($report_id)) {
+			return [];
+		}
 
-		$report = array(
-			'comments' => array(),
-			'mod_comments' => array()
-		);
+		$report = [
+			'comments' => [],
+			'mod_comments' => [],
+		];
 
 		// So what bad things do the reporters have to say about it?
-		$request = Db::$db->query('', '
-			SELECT lrc.id_comment, lrc.id_report, lrc.time_sent, lrc.comment, lrc.member_ip,
+		$request = Db::$db->query(
+			'',
+			'SELECT lrc.id_comment, lrc.id_report, lrc.time_sent, lrc.comment, lrc.member_ip,
 				COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lrc.membername) AS reporter
 			FROM {db_prefix}log_reported_comments AS lrc
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lrc.id_member)
 			WHERE lrc.id_report = {int:id_report}',
-			array(
+			[
 				'id_report' => $report_id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['member_ip'] = new IP($row['member_ip']);
 
-			$report['comments'][] = array(
+			$report['comments'][] = [
 				'id' => $row['id_comment'],
-				'message' => strtr($row['comment'], array("\n" => '<br>')),
+				'message' => strtr($row['comment'], ["\n" => '<br>']),
 				'time' => Time::create('@' . $row['time_sent'])->format(),
-				'member' => array(
+				'member' => [
 					'id' => $row['id_member'],
 					'name' => empty($row['reporter']) ? Lang::$txt['guest'] : $row['reporter'],
 					'link' => $row['id_member'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['reporter'] . '</a>' : (empty($row['reporter']) ? Lang::$txt['guest'] : $row['reporter']),
 					'href' => $row['id_member'] ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : '',
 					'ip' => !empty($row['member_ip']) && User::$me->allowedTo('moderate_forum') ? '<a href="' . Config::$scripturl . '?action=trackip;searchip=' . $row['member_ip'] . '">' . $row['member_ip'] . '</a>' : '',
-				),
-			);
+				],
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Hang about old chap, any comments from moderators on this one?
-		$request = Db::$db->query('', '
-			SELECT lc.id_comment, lc.id_notice, lc.log_time, lc.body,
+		$request = Db::$db->query(
+			'',
+			'SELECT lc.id_comment, lc.id_notice, lc.log_time, lc.body,
 				COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS moderator
 			FROM {db_prefix}log_comments AS lc
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lc.id_member)
 			WHERE lc.id_notice = {int:id_report}
 				AND lc.comment_type = {literal:reportc}',
-			array(
+			[
 				'id_report' => $report_id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$report['mod_comments'][] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$report['mod_comments'][] = [
 				'id' => $row['id_comment'],
 				'message' => BBCodeParser::load()->parse($row['body']),
 				'time' => Time::create('@' . $row['log_time'])->format(),
 				'can_edit' => User::$me->allowedTo('admin_forum') || ((User::$me->id == $row['id_member'])),
-				'member' => array(
+				'member' => [
 					'id' => $row['id_member'],
 					'name' => $row['moderator'],
 					'link' => $row['id_member'] ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['moderator'] . '</a>' : $row['moderator'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-				),
-			);
+				],
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -1270,24 +1271,25 @@ protected function getReportComments(int $report_id): array
 	 */
 	protected function getCommentModDetails(int $comment_id): array
 	{
-		if (empty($comment_id))
-			return array();
+		if (empty($comment_id)) {
+			return [];
+		}
 
-		$request = Db::$db->query('', '
-			SELECT id_comment, id_notice, log_time, body, id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_comment, id_notice, log_time, body, id_member
 			FROM {db_prefix}log_comments
 			WHERE id_comment = {int:id_comment}
 				AND comment_type = {literal:reportc}',
-			array(
+			[
 				'id_comment' => $comment_id,
-			)
+			],
 		);
 		$comment = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		// Add the permission
-		if (!empty($comment))
-		{
+		if (!empty($comment)) {
 			$comment['can_edit'] = User::$me->allowedTo('admin_forum') || ((User::$me->id == $comment['id_member']));
 		}
 
@@ -1302,28 +1304,29 @@ protected function getCommentModDetails(int $comment_id): array
 	 */
 	protected function saveModComment(int $report_id, array $data): void
 	{
-		if (empty($data))
+		if (empty($data)) {
 			return;
+		}
 
-		$data = array_merge(array(User::$me->id, User::$me->name, 'reportc', ''), $data);
+		$data = array_merge([User::$me->id, User::$me->name, 'reportc', ''], $data);
 
-		$last_comment = Db::$db->insert('',
+		$last_comment = Db::$db->insert(
+			'',
 			'{db_prefix}log_comments',
-			array(
+			[
 				'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'recipient_name' => 'string',
 				'id_notice' => 'int', 'body' => 'string', 'log_time' => 'int',
-			),
+			],
 			$data,
-			array('id_comment'),
-			1
+			['id_comment'],
+			1,
 		);
 
 		$report = $this->getReportDetails($report_id);
 
-		if ($this->type == 'members')
-		{
+		if ($this->type == 'members') {
 			$prefix = 'Member';
-			$data = array(
+			$data = [
 				'report_id' => $report_id,
 				'user_id' => $report['id_user'],
 				'user_name' => $report['user_name'],
@@ -1331,12 +1334,10 @@ protected function saveModComment(int $report_id, array $data): void
 				'sender_name' => User::$me->name,
 				'comment_id' => $last_comment,
 				'time' => time(),
-			);
-		}
-		else
-		{
+			];
+		} else {
 			$prefix = 'Msg';
-			$data = array(
+			$data = [
 				'report_id' => $report_id,
 				'comment_id' => $last_comment,
 				'msg_id' => $report['id_msg'],
@@ -1345,17 +1346,25 @@ protected function saveModComment(int $report_id, array $data): void
 				'sender_id' => User::$me->id,
 				'sender_name' => User::$me->name,
 				'time' => time(),
-			);
+			];
 		}
 
 		// And get ready to notify people.
-		if (!empty($report))
-		{
-			Db::$db->insert('insert',
+		if (!empty($report)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array('$sourcedir/tasks/' . $prefix . 'ReportReply-Notify.php', 'SMF\Tasks\\' . $prefix . 'ReportReply_Notify', Utils::jsonEncode($data), 0),
-				array('id_task')
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\' . $prefix . 'ReportReply_Notify',
+					Utils::jsonEncode($data),
+					0,
+				],
+				['id_task'],
 			);
 		}
 	}
@@ -1368,17 +1377,19 @@ protected function saveModComment(int $report_id, array $data): void
 	 */
 	protected function editModComment(int $comment_id, string $edited_comment): void
 	{
-		if (empty($comment_id) || empty($edited_comment))
+		if (empty($comment_id) || empty($edited_comment)) {
 			return;
+		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_comments
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_comments
 			SET  body = {string:body}
 			WHERE id_comment = {int:id_comment}',
-			array(
+			[
 				'body' => $edited_comment,
 				'id_comment' => $comment_id,
-			)
+			],
 		);
 	}
 
@@ -1389,15 +1400,17 @@ protected function editModComment(int $comment_id, string $edited_comment): void
 	 */
 	protected function deleteModComment(int $comment_id): void
 	{
-		if (empty($comment_id))
+		if (empty($comment_id)) {
 			return;
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_comments
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_comments
 			WHERE id_comment = {int:comment_id}',
-			array(
+			[
 				'comment_id' => $comment_id,
-			)
+			],
 		);
 	}
 
@@ -1407,70 +1420,66 @@ protected function deleteModComment(int $comment_id): void
 	protected function buildQuickButtons(): void
 	{
 		// Quickbuttons for each report
-		foreach (Utils::$context['reports'] as $key => $report)
-		{
-			Utils::$context['reports'][$key]['quickbuttons'] = array(
-				'details' => array(
+		foreach (Utils::$context['reports'] as $key => $report) {
+			Utils::$context['reports'][$key]['quickbuttons'] = [
+				'details' => [
 					'label' => Lang::$txt['mc_reportedp_details'],
 					'href' => $report['report_href'],
 					'icon' => 'details',
-				),
-				'ignore' => array(
+				],
+				'ignore' => [
 					'label' => $report['ignore'] ? Lang::$txt['mc_reportedp_unignore'] : Lang::$txt['mc_reportedp_ignore'],
-					'href' => Config::$scripturl.'?action=moderate;area=reported'.$this->type.';sa=handle;ignore='.(int)!$report['ignore'].';rid='.$report['id'].';start='.Utils::$context['start'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-ignore_token_var'].'='.Utils::$context['mod-report-ignore_token'],
+					'href' => Config::$scripturl . '?action=moderate;area=reported' . $this->type . ';sa=handle;ignore=' . (int) !$report['ignore'] . ';rid=' . $report['id'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-ignore_token_var'] . '=' . Utils::$context['mod-report-ignore_token'],
 					'javascript' => !$report['ignore'] ? ' data-confirm="' . Lang::$txt['mc_reportedp_ignore_confirm'] . '"' : '',
 					'class' => 'you_sure',
-					'icon' => 'ignore'
-				),
-				'close' => array(
+					'icon' => 'ignore',
+				],
+				'close' => [
 					'label' => Utils::$context['view_closed'] ? Lang::$txt['mc_reportedp_open'] : Lang::$txt['mc_reportedp_close'],
-					'href' => Config::$scripturl.'?action=moderate;area=reported'.$this->type.';sa=handle;closed='.(int)!$report['closed'].';rid='.$report['id'].';start='.Utils::$context['start'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'].';'.Utils::$context['mod-report-closed_token_var'].'='.Utils::$context['mod-report-closed_token'],
+					'href' => Config::$scripturl . '?action=moderate;area=reported' . $this->type . ';sa=handle;closed=' . (int) !$report['closed'] . ';rid=' . $report['id'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context['mod-report-closed_token_var'] . '=' . Utils::$context['mod-report-closed_token'],
 					'icon' => Utils::$context['view_closed'] ? 'folder' : 'close',
-				),
-			);
+				],
+			];
 
 			// Only reported posts can be deleted
-			if ($this->type == 'posts')
-			{
-				Utils::$context['reports'][$key]['quickbuttons']['delete'] = array(
+			if ($this->type == 'posts') {
+				Utils::$context['reports'][$key]['quickbuttons']['delete'] = [
 					'label' => Lang::$txt['mc_reportedp_delete'],
-					'href' => Config::$scripturl.'?action=deletemsg;topic='.$report['topic']['id'].'.0;msg='.$report['topic']['id_msg'].';modcenter;'.Utils::$context['session_var'].'='.Utils::$context['session_id'],
-					'javascript' => 'data-confirm="'.Lang::$txt['mc_reportedp_delete_confirm'].'"',
+					'href' => Config::$scripturl . '?action=deletemsg;topic=' . $report['topic']['id'] . '.0;msg=' . $report['topic']['id_msg'] . ';modcenter;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
+					'javascript' => 'data-confirm="' . Lang::$txt['mc_reportedp_delete_confirm'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'delete',
-					'show' => !$report['closed'] && (is_array($this->remove_any_boards) && in_array($report['topic']['id_board'], $this->remove_any_boards))
-				);
+					'show' => !$report['closed'] && (is_array($this->remove_any_boards) && in_array($report['topic']['id_board'], $this->remove_any_boards)),
+				];
 			}
 
 			// Ban reported member/post author link
-			if ($this->type == 'members')
-			{
-				$ban_link = Config::$scripturl.'?action=admin;area=ban;sa=add;u='.$report['user']['id'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'];
-			}
-			else
-			{
-				$ban_link = Config::$scripturl.'?action=admin;area=ban;sa=add'.(!empty($report['author']['id']) ? ';u='.$report['author']['id'] : ';msg='.$report['topic']['id_msg']).';'.Utils::$context['session_var'].'='.Utils::$context['session_id'];
+			if ($this->type == 'members') {
+				$ban_link = Config::$scripturl . '?action=admin;area=ban;sa=add;u=' . $report['user']['id'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
+			} else {
+				$ban_link = Config::$scripturl . '?action=admin;area=ban;sa=add' . (!empty($report['author']['id']) ? ';u=' . $report['author']['id'] : ';msg=' . $report['topic']['id_msg']) . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 			}
 
-			Utils::$context['reports'][$key]['quickbuttons'] += array(
-				'ban' => array(
+			Utils::$context['reports'][$key]['quickbuttons'] += [
+				'ban' => [
 					'label' => Lang::$txt['mc_reportedp_ban'],
 					'href' => $ban_link,
 					'icon' => 'error',
-					'show' => !$report['closed'] && !empty($this->manage_bans) && ($this->type == 'posts' || $this->type == 'members' && !empty($report['user']['id']))
-				),
-				'quickmod' => array(
+					'show' => !$report['closed'] && !empty($this->manage_bans) && ($this->type == 'posts' || $this->type == 'members' && !empty($report['user']['id'])),
+				],
+				'quickmod' => [
 					'class' => 'inline_mod_check',
-					'content' => '<input type="checkbox" name="close[]" value="'.$report['id'].'">',
-					'show' => !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1
-				)
-			);
+					'content' => '<input type="checkbox" name="close[]" value="' . $report['id'] . '">',
+					'show' => !Utils::$context['view_closed'] && !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1,
+				],
+			];
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ReportedContent::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ReportedContent::exportStatic')) {
 	ReportedContent::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/ShowNotice.php b/Sources/Actions/Moderation/ShowNotice.php
index c54f4a7b22..1c9252b8d4 100644
--- a/Sources/Actions/Moderation/ShowNotice.php
+++ b/Sources/Actions/Moderation/ShowNotice.php
@@ -13,16 +13,15 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Shows a notice sent to a user.
@@ -36,12 +35,11 @@ class ShowNotice implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ShowNotice',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -66,16 +64,17 @@ public function execute(): void
 	{
 		$id_notice = (int) $_GET['nid'];
 
-		$request = Db::$db->query('', '
-			SELECT body, subject
+		$request = Db::$db->query(
+			'',
+			'SELECT body, subject
 			FROM {db_prefix}log_member_notices
 			WHERE id_notice = {int:id_notice}',
-			array(
+			[
 				'id_notice' => $id_notice,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 		list(Utils::$context['notice_body'], Utils::$context['notice_subject']) = Db::$db->fetch_row($request);
@@ -95,8 +94,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -119,18 +119,19 @@ public static function call(): void
 	protected function __construct()
 	{
 		// Before we get too excited, is the current user allowed to see this?
-		User::$me->isAllowedTo(array('issue_warning', 'view_warning_any'));
+		User::$me->isAllowedTo(['issue_warning', 'view_warning_any']);
 
 		Utils::$context['page_title'] = Lang::$txt['show_notice'];
 		Utils::$context['sub_template'] = 'show_notice';
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 
 		Theme::loadTemplate('ModerationCenter');
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ShowNotice::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ShowNotice::exportStatic')) {
 	ShowNotice::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/Warnings.php b/Sources/Actions/Moderation/Warnings.php
index 90e57f3ef9..f20667d5ed 100644
--- a/Sources/Actions/Moderation/Warnings.php
+++ b/Sources/Actions/Moderation/Warnings.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\ItemList;
 use SMF\Lang;
@@ -28,7 +28,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Allows the moderator to view stuff related to warnings.
@@ -42,12 +41,18 @@ class Warnings implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ViewWarnings',
-		),
-	);
+			'list_getWarningCount' => 'list_getWarningCount',
+			'list_getWarnings' => 'list_getWarnings',
+			'list_getWarningTemplateCount' => 'list_getWarningTemplateCount',
+			'list_getWarningTemplates' => 'list_getWarningTemplates',
+			'ViewWarningLog' => 'ViewWarningLog',
+			'ViewWarningTemplates' => 'ViewWarningTemplates',
+			'ModifyWarningTemplate' => 'ModifyWarningTemplate',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -70,11 +75,11 @@ class Warnings implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
-		'log' => array('log', array('view_warning_any', 'moderate_forum')),
-		'templates' => array('templates', 'issue_warning'),
-		'templateedit' => array('templateEdit', 'issue_warning'),
-	);
+	public static array $subactions = [
+		'log' => ['log', ['view_warning_any', 'moderate_forum']],
+		'templates' => ['templates', 'issue_warning'],
+		'templateedit' => ['templateEdit', 'issue_warning'],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -100,15 +105,16 @@ public function execute(): void
 		Theme::loadTemplate('ModerationCenter');
 		Lang::load('Profile');
 
-		Menu::$loaded['moderate']->tab_data = array(
+		Menu::$loaded['moderate']->tab_data = [
 			'title' => Lang::$txt['mc_warnings'],
 			'description' => Lang::$txt['mc_warnings_description'],
-		);
+		];
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -122,161 +128,155 @@ public function log(): void
 		Lang::load('Modlog');
 
 		// If we're coming from a search, get the variables.
-		if (!empty($_REQUEST['params']) && empty($_REQUEST['is_search']))
-		{
-			$search_params = base64_decode(strtr($_REQUEST['params'], array(' ' => '+')));
+		if (!empty($_REQUEST['params']) && empty($_REQUEST['is_search'])) {
+			$search_params = base64_decode(strtr($_REQUEST['params'], [' ' => '+']));
 			$search_params = Utils::jsonDecode($search_params, true);
 		}
 
 		// This array houses all the valid search types.
-		$searchTypes = array(
-			'member' => array('sql' => 'member_name_col', 'label' => Lang::$txt['profile_warning_previous_issued']),
-			'recipient' => array('sql' => 'recipient_name', 'label' => Lang::$txt['mc_warnings_recipient']),
-		);
+		$searchTypes = [
+			'member' => ['sql' => 'member_name_col', 'label' => Lang::$txt['profile_warning_previous_issued']],
+			'recipient' => ['sql' => 'recipient_name', 'label' => Lang::$txt['mc_warnings_recipient']],
+		];
 
 		// Do the column stuff!
-		$sort_types = array(
+		$sort_types = [
 			'member' => 'member_name_col',
 			'recipient' => 'recipient_name',
-		);
+		];
 
 		// Setup the direction stuff...
 		Utils::$context['order'] = isset($_REQUEST['sort']) && isset($sort_types[$_REQUEST['sort']]) ? $_REQUEST['sort'] : 'member';
 
-		if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		{
+		if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
 			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-		}
-		else
-		{
+		} else {
 			$search_params_string = $search_params['string'];
 		}
 
-		if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		{
+		if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
 			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[Utils::$context['order']]) ? Utils::$context['order'] : 'member');
-		}
-		else
-		{
+		} else {
 			$search_params_type = $search_params['type'];
 		}
 
-		$search_params = array(
+		$search_params = [
 			'string' => $search_params_string,
 			'type' => $search_params_type,
-		);
+		];
 
 		Utils::$context['url_start'] = '?action=moderate;area=warnings;sa=log;sort=' . Utils::$context['order'];
 
 		// Setup the search context.
 		Utils::$context['search_params'] = empty($search_params['string']) ? '' : base64_encode(Utils::jsonEncode($search_params));
-		
-		Utils::$context['search'] = array(
+
+		Utils::$context['search'] = [
 			'string' => $search_params['string'],
 			'type' => $search_params['type'],
 			'label' => $searchTypes[$search_params_type]['label'],
-		);
+		];
 
 		// This is all the information required for a watched user listing.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'warning_list',
 			'title' => Lang::$txt['mc_warning_log_title'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['mc_warnings_none'],
 			'base_href' => Config::$scripturl . '?action=moderate;area=warnings;sa=log;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 			'default_sort_col' => 'time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getWarnings',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getWarningCount',
-			),
+			],
 			// This assumes we are viewing by user.
-			'columns' => array(
-				'issuer' => array(
-					'header' => array(
+			'columns' => [
+				'issuer' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_issued'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'issuer_link',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'member_name_col',
 						'reverse' => 'member_name_col DESC',
-					),
-				),
-				'recipient' => array(
-					'header' => array(
+					],
+				],
+				'recipient' => [
+					'header' => [
 						'value' => Lang::$txt['mc_warnings_recipient'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'recipient_link',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'recipient_name',
 						'reverse' => 'recipient_name DESC',
-					),
-				),
-				'time' => array(
-					'header' => array(
+					],
+				],
+				'time' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_time'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.log_time DESC',
 						'reverse' => 'lc.log_time',
-					),
-				),
-				'reason' => array(
-					'header' => array(
+					],
+				],
+				'reason' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_reason'],
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							$output = '
 								<div class="floatleft">
 									' . $rowData['reason'] . '
 								</div>';
 
-							if (!empty($rowData['id_notice']))
+							if (!empty($rowData['id_notice'])) {
 								$output .= '
 									&nbsp;<a href="' . Config::$scripturl . '?action=moderate;area=notice;nid=' . $rowData['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . Lang::$txt['profile_warning_previous_notice'] . '"><span class="main_icons filter centericon"></span></a>';
+							}
+
 							return $output;
 						},
-					),
-				),
-				'points' => array(
-					'header' => array(
+					],
+				],
+				'points' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_level'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'counter',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . Utils::$context['url_start'],
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-					'params' => false
-				),
-			),
-			'additional_rows' => array(
-				array(
+					'params' => false,
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'below_table_data',
 					'value' => '
 						' . Lang::$txt['modlog_search'] . ':
 						<input type="text" name="search" size="18" value="' . Utils::htmlspecialchars(Utils::$context['search']['string']) . '">
 						<input type="submit" name="is_search" value="' . Lang::$txt['modlog_go'] . '" class="button">',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the watched user list.
 		new ItemList($listOptions);
@@ -291,49 +291,50 @@ public function log(): void
 	public function templates(): void
 	{
 		// Submitting a new one?
-		if (isset($_POST['add']))
-		{
+		if (isset($_POST['add'])) {
 			$this->ModifyWarningTemplate();
+
 			return;
 		}
 
-		if (isset($_POST['delete']) && !empty($_POST['deltpl']))
-		{
+		if (isset($_POST['delete']) && !empty($_POST['deltpl'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-wt');
 
 			// Log the actions.
-			$request = Db::$db->query('', '
-				SELECT recipient_name
+			$request = Db::$db->query(
+				'',
+				'SELECT recipient_name
 				FROM {db_prefix}log_comments
 				WHERE id_comment IN ({array_int:delete_ids})
 					AND comment_type = {string:warntpl}
 					AND (id_recipient = {int:generic} OR id_recipient = {int:current_member})',
-				array(
+				[
 					'delete_ids' => $_POST['deltpl'],
 					'warntpl' => 'warntpl',
 					'generic' => 0,
 					'current_member' => User::$me->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				Logging::logAction('delete_warn_template', array('template' => $row['recipient_name']));
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				Logging::logAction('delete_warn_template', ['template' => $row['recipient_name']]);
 			}
 			Db::$db->free_result($request);
 
 			// Do the deletes.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_comments
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_comments
 				WHERE id_comment IN ({array_int:delete_ids})
 					AND comment_type = {string:warntpl}
 					AND (id_recipient = {int:generic} OR id_recipient = {int:current_member})',
-				array(
+				[
 					'delete_ids' => $_POST['deltpl'],
 					'warntpl' => 'warntpl',
 					'generic' => 0,
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 		}
 
@@ -341,94 +342,93 @@ public function templates(): void
 		Utils::$context['page_title'] = Lang::$txt['mc_warning_templates_title'];
 
 		// This is all the information required for a watched user listing.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'warning_template_list',
 			'title' => Lang::$txt['mc_warning_templates_title'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['mc_warning_templates_none'],
 			'base_href' => Config::$scripturl . '?action=moderate;area=warnings;sa=templates;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 			'default_sort_col' => 'title',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getWarningTemplates',
-			),
-			'get_count' => array(
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getWarningTemplateCount',
-			),
+			],
 			// This assumes we are viewing by user.
-			'columns' => array(
-				'title' => array(
-					'header' => array(
+			'columns' => [
+				'title' => [
+					'header' => [
 						'value' => Lang::$txt['mc_warning_templates_name'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=moderate;area=warnings;sa=templateedit;tid=%1$d">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id_comment' => false,
 								'title' => false,
 								'body' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'template_title',
 						'reverse' => 'template_title DESC',
-					),
-				),
-				'creator' => array(
-					'header' => array(
+					],
+				],
+				'creator' => [
+					'header' => [
 						'value' => Lang::$txt['mc_warning_templates_creator'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'creator',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'creator_name',
 						'reverse' => 'creator_name DESC',
-					),
-				),
-				'time' => array(
-					'header' => array(
+					],
+				],
+				'time' => [
+					'header' => [
 						'value' => Lang::$txt['mc_warning_templates_time'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.log_time DESC',
 						'reverse' => 'lc.log_time',
-					),
-				),
-				'delete' => array(
-					'header' => array(
+					],
+				],
+				'delete' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'function' => function($rowData)
-						{
+					],
+					'data' => [
+						'function' => function ($rowData) {
 							return '<input type="checkbox" name="deltpl[]" value="' . $rowData['id_comment'] . '">';
 						},
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=moderate;area=warnings;sa=templates',
 				'token' => 'mod-wt',
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '&nbsp;<input type="submit" name="delete" value="' . Lang::$txt['mc_warning_template_delete'] . '" data-confirm="' . Lang::$txt['mc_warning_template_delete_confirm'] . '" class="button you_sure">',
-				),
-				array(
+				],
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="submit" name="add" value="' . Lang::$txt['mc_warning_template_add'] . '" class="button">',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the watched user list.
 		SecurityToken::create('mod-wt');
@@ -452,44 +452,43 @@ public function templateEdit(): void
 		Menu::$loaded['moderate']['current_subsection'] = 'templates';
 
 		// Defaults.
-		Utils::$context['template_data'] = array(
+		Utils::$context['template_data'] = [
 			'title' => '',
 			'body' => Lang::$txt['mc_warning_template_body_default'],
 			'personal' => false,
 			'can_edit_personal' => true,
-		);
+		];
 
 		// If it's an edit load it.
-		if (Utils::$context['is_edit'])
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member, id_recipient, recipient_name AS template_title, body
+		if (Utils::$context['is_edit']) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, id_recipient, recipient_name AS template_title, body
 				FROM {db_prefix}log_comments
 				WHERE id_comment = {int:id}
 					AND comment_type = {string:warntpl}
 					AND (id_recipient = {int:generic} OR id_recipient = {int:current_member})',
-				array(
+				[
 					'id' => Utils::$context['id_template'],
 					'warntpl' => 'warntpl',
 					'generic' => 0,
 					'current_member' => User::$me->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				Utils::$context['template_data'] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				Utils::$context['template_data'] = [
 					'title' => $row['template_title'],
 					'body' => Utils::htmlspecialchars($row['body']),
 					'personal' => $row['id_recipient'],
 					'can_edit_personal' => $row['id_member'] == User::$me->id,
-				);
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Wait, we are saving?
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('mod-wt');
 
@@ -498,8 +497,7 @@ public function templateEdit(): void
 			$_POST['template_title'] = trim($_POST['template_title']);
 
 			// Need something in both boxes.
-			if (!empty($_POST['template_body']) && !empty($_POST['template_title']))
-			{
+			if (!empty($_POST['template_body']) && !empty($_POST['template_title'])) {
 				// Safety first.
 				$_POST['template_title'] = Utils::htmlspecialchars($_POST['template_title']);
 
@@ -507,23 +505,23 @@ public function templateEdit(): void
 				Msg::preparsecode($_POST['template_body']);
 
 				// But put line breaks back!
-				$_POST['template_body'] = strtr($_POST['template_body'], array('<br>' => "\n"));
+				$_POST['template_body'] = strtr($_POST['template_body'], ['<br>' => "\n"]);
 
 				// Is this personal?
 				$recipient_id = !empty($_POST['make_personal']) ? User::$me->id : 0;
 
 				// If we are this far it's save time.
-				if (Utils::$context['is_edit'])
-				{
+				if (Utils::$context['is_edit']) {
 					// Simple update...
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_comments
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_comments
 						SET id_recipient = {int:personal}, recipient_name = {string:title}, body = {string:body}
 						WHERE id_comment = {int:id}
 							AND comment_type = {string:warntpl}
-							AND (id_recipient = {int:generic} OR id_recipient = {int:current_member})'.
+							AND (id_recipient = {int:generic} OR id_recipient = {int:current_member})' .
 							($recipient_id ? ' AND id_member = {int:current_member}' : ''),
-						array(
+						[
 							'personal' => $recipient_id,
 							'title' => $_POST['template_title'],
 							'body' => $_POST['template_body'],
@@ -531,60 +529,52 @@ public function templateEdit(): void
 							'warntpl' => 'warntpl',
 							'generic' => 0,
 							'current_member' => User::$me->id,
-						)
+						],
 					);
 
 					// If it wasn't visible and now is they've effectively added it.
-					if (Utils::$context['template_data']['personal'] && !$recipient_id)
-					{
-						Logging::logAction('add_warn_template', array('template' => $_POST['template_title']));
+					if (Utils::$context['template_data']['personal'] && !$recipient_id) {
+						Logging::logAction('add_warn_template', ['template' => $_POST['template_title']]);
 					}
 					// Conversely if they made it personal it's a delete.
-					elseif (!Utils::$context['template_data']['personal'] && $recipient_id)
-					{
-						Logging::logAction('delete_warn_template', array('template' => $_POST['template_title']));
+					elseif (!Utils::$context['template_data']['personal'] && $recipient_id) {
+						Logging::logAction('delete_warn_template', ['template' => $_POST['template_title']]);
 					}
 					// Otherwise just an edit.
-					else
-					{
-						Logging::logAction('modify_warn_template', array('template' => $_POST['template_title']));
+					else {
+						Logging::logAction('modify_warn_template', ['template' => $_POST['template_title']]);
 					}
-				}
-				else
-				{
-					Db::$db->insert('',
+				} else {
+					Db::$db->insert(
+						'',
 						'{db_prefix}log_comments',
-						array(
+						[
 							'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int',
 							'recipient_name' => 'string-255', 'body' => 'string-65535', 'log_time' => 'int',
-						),
-						array(
+						],
+						[
 							User::$me->id, User::$me->name, 'warntpl', $recipient_id,
 							$_POST['template_title'], $_POST['template_body'], time(),
-						),
-						array('id_comment')
+						],
+						['id_comment'],
 					);
 
-					Logging::logAction('add_warn_template', array('template' => $_POST['template_title']));
+					Logging::logAction('add_warn_template', ['template' => $_POST['template_title']]);
 				}
 
 				// Get out of town...
 				Utils::redirectexit('action=moderate;area=warnings;sa=templates');
-			}
-			else
-			{
-				Utils::$context['warning_errors'] = array();
+			} else {
+				Utils::$context['warning_errors'] = [];
 				Utils::$context['template_data']['title'] = !empty($_POST['template_title']) ? $_POST['template_title'] : '';
 				Utils::$context['template_data']['body'] = !empty($_POST['template_body']) ? $_POST['template_body'] : Lang::$txt['mc_warning_template_body_default'];
 				Utils::$context['template_data']['personal'] = !empty($_POST['make_personal']);
 
-				if (empty($_POST['template_title']))
-				{
+				if (empty($_POST['template_title'])) {
 					Utils::$context['warning_errors'][] = Lang::$txt['mc_warning_template_error_no_title'];
 				}
 
-				if (empty($_POST['template_body']))
-				{
+				if (empty($_POST['template_body'])) {
 					Utils::$context['warning_errors'][] = Lang::$txt['mc_warning_template_error_no_body'];
 				}
 			}
@@ -604,8 +594,9 @@ public function templateEdit(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -625,15 +616,16 @@ public static function call(): void
 	 */
 	public static function list_getWarningCount(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_comments
 			WHERE comment_type = {string:warning}',
-			array(
+			[
 				'warning' => 'warning',
-			)
+			],
 		);
-		list ($totalWarns) = Db::$db->fetch_row($request);
+		list($totalWarns) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $totalWarns;
@@ -649,10 +641,11 @@ public static function list_getWarningCount(): int
 	 */
 	public static function list_getWarnings($start, $items_per_page, $sort): array
 	{
-		$warnings = array();
+		$warnings = [];
 
-		$request = Db::$db->query('', '
-			SELECT COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS member_name_col,
+		$request = Db::$db->query(
+			'',
+			'SELECT COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS member_name_col,
 				COALESCE(mem2.id_member, 0) AS id_recipient, COALESCE(mem2.real_name, lc.recipient_name) AS recipient_name,
 				lc.log_time, lc.body, lc.id_notice, lc.counter
 			FROM {db_prefix}log_comments AS lc
@@ -661,23 +654,23 @@ public static function list_getWarnings($start, $items_per_page, $sort): array
 			WHERE lc.comment_type = {string:warning}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'warning' => 'warning',
 				'start' => $start,
 				'max' => $items_per_page,
 				'sort' => $sort,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$warnings[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$warnings[] = [
 				'issuer_link' => $row['id_member'] ? ('<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['member_name_col'] . '</a>') : $row['member_name_col'],
 				'recipient_link' => $row['id_recipient'] ? ('<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_recipient'] . '">' . $row['recipient_name'] . '</a>') : $row['recipient_name'],
 				'time' => Time::create('@' . $row['log_time'])->format(),
 				'reason' => $row['body'],
 				'counter' => $row['counter'] > 0 ? '+' . $row['counter'] : $row['counter'],
 				'id_notice' => $row['id_notice'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -691,18 +684,19 @@ public static function list_getWarnings($start, $items_per_page, $sort): array
 	 */
 	public static function list_getWarningTemplateCount(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_comments
 			WHERE comment_type = {string:warntpl}
 				AND (id_recipient = {string:generic} OR id_recipient = {int:current_member})',
-			array(
+			[
 				'warntpl' => 'warntpl',
 				'generic' => 0,
 				'current_member' => User::$me->id,
-			)
+			],
 		);
-		list ($totalWarns) = Db::$db->fetch_row($request);
+		list($totalWarns) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $totalWarns;
@@ -718,10 +712,11 @@ public static function list_getWarningTemplateCount(): int
 	 */
 	public static function list_getWarningTemplates($start, $items_per_page, $sort): array
 	{
-		$templates = array();
+		$templates = [];
 
-		$request = Db::$db->query('', '
-			SELECT lc.id_comment, COALESCE(mem.id_member, 0) AS id_member,
+		$request = Db::$db->query(
+			'',
+			'SELECT lc.id_comment, COALESCE(mem.id_member, 0) AS id_member,
 				COALESCE(mem.real_name, lc.member_name) AS creator_name, recipient_name AS template_title,
 				lc.log_time, lc.body
 			FROM {db_prefix}log_comments AS lc
@@ -730,21 +725,21 @@ public static function list_getWarningTemplates($start, $items_per_page, $sort):
 				AND (id_recipient = {string:generic} OR id_recipient = {int:current_member})
 			ORDER BY ' . $sort . '
 			LIMIT ' . $start . ', ' . $items_per_page,
-			array(
+			[
 				'warntpl' => 'warntpl',
 				'generic' => 0,
 				'current_member' => User::$me->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$templates[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$templates[] = [
 				'id_comment' => $row['id_comment'],
 				'creator' => $row['id_member'] ? ('<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['creator_name'] . '</a>') : $row['creator_name'],
 				'time' => Time::create('@' . $row['log_time'])->format(),
 				'title' => $row['template_title'],
 				'body' => Utils::htmlspecialchars($row['body']),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -790,31 +785,31 @@ public static function ModifyWarningTemplate(): void
 	 */
 	protected function __construct()
 	{
-		IntegrationHook::call('integrate_warning_log_actions', array(&self::$subactions));
+		IntegrationHook::call('integrate_warning_log_actions', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
 		// If the user can't do the specified sub-action, choose the first one they can.
-		if (!User::$me->allowedTo(self::$subactions[$this->subaction][1]))
-		{
+		if (!User::$me->allowedTo(self::$subactions[$this->subaction][1])) {
 			$this->subaction = '';
 
-			foreach (self::$subactions as $sa => $sa_info)
-			{
-				if ($sa === $this->subaction)
+			foreach (self::$subactions as $sa => $sa_info) {
+				if ($sa === $this->subaction) {
 					continue;
+				}
 
-				if (User::$me->allowedTo(self::$subactions[$sa][1]))
-				{
+				if (User::$me->allowedTo(self::$subactions[$sa][1])) {
 					$this->subaction = $sa;
 					break;
 				}
 			}
 
 			// This shouldn't happen, but just in case...
-			if (empty($this->subaction))
+			if (empty($this->subaction)) {
 				Utils::redirectexit('action=moderate;area=index');
+			}
 		}
 	}
 
@@ -823,11 +818,11 @@ protected function __construct()
 	 *************************/
 
 	// code...
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Warnings::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Warnings::exportStatic')) {
 	Warnings::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/WatchedUsers.php b/Sources/Actions/Moderation/WatchedUsers.php
index f1e4b30b62..46d97f4abb 100644
--- a/Sources/Actions/Moderation/WatchedUsers.php
+++ b/Sources/Actions/Moderation/WatchedUsers.php
@@ -13,11 +13,11 @@
 
 namespace SMF\Actions\Moderation;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ItemList;
 use SMF\Lang;
 use SMF\Menu;
@@ -26,12 +26,11 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
  */
-class WatchUsers implements ActionInterface
+class WatchedUsers implements ActionInterface
 {
 	use BackwardCompatibility;
 
@@ -40,12 +39,15 @@ class WatchUsers implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ViewWatchedUsers',
-		),
-	);
+			'list_getWatchedUserCount' => 'list_getWatchedUserCount',
+			'list_getWatchedUsers' => 'list_getWatchedUsers',
+			'list_getWatchedUserPostsCount' => 'list_getWatchedUserPostsCount',
+			'list_getWatchedUserPosts' => 'list_getWatchedUserPosts',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -69,180 +71,178 @@ class WatchUsers implements ActionInterface
 	public function execute(): void
 	{
 		// First off - are we deleting?
-		if (!empty($_REQUEST['delete']))
-		{
+		if (!empty($_REQUEST['delete'])) {
 			User::$me->checkSession(!is_array($_REQUEST['delete']) ? 'get' : 'post');
 
-			$toDelete = array();
-			if (!is_array($_REQUEST['delete']))
+			$toDelete = [];
+
+			if (!is_array($_REQUEST['delete'])) {
 				$toDelete[] = (int) $_REQUEST['delete'];
-			else
-				foreach ($_REQUEST['delete'] as $did)
+			} else {
+				foreach ($_REQUEST['delete'] as $did) {
 					$toDelete[] = (int) $did;
+				}
+			}
 
-			if (!empty($toDelete))
-			{
+			if (!empty($toDelete)) {
 				// If they don't have permission we'll let it error - either way no chance of a security slip here!
-				foreach ($toDelete as $did)
+				foreach ($toDelete as $did) {
 					Msg::remove($did);
+				}
 			}
 		}
 
 		// Start preparing the list by grabbing relevant permissions.
-		if (!Utils::$context['view_posts'])
-		{
+		if (!Utils::$context['view_posts']) {
 			$approve_query = '';
-			$delete_boards = array();
-		}
-		else
-		{
+			$delete_boards = [];
+		} else {
 			// Still obey permissions!
 			$approve_boards = User::$me->boardsAllowedTo('approve_posts');
 			$delete_boards = User::$me->boardsAllowedTo('delete_any');
 
-			if ($approve_boards == array(0))
+			if ($approve_boards == [0]) {
 				$approve_query = '';
-			elseif (!empty($approve_boards))
+			} elseif (!empty($approve_boards)) {
 				$approve_query = ' AND m.id_board IN (' . implode(',', $approve_boards) . ')';
+			}
 			// Nada, zip, etc...
-			else
+			else {
 				$approve_query = ' AND 1=0';
+			}
 		}
 
 		// This is all the information required for a watched user listing.
-		$listOptions = array(
+		$listOptions = [
 			'id' => 'watch_user_list',
 			'title' => Lang::$txt['mc_watched_users_title'] . ' - ' . (Utils::$context['view_posts'] ? Lang::$txt['mc_watched_users_post'] : Lang::$txt['mc_watched_users_member']),
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Utils::$context['view_posts'] ? Lang::$txt['mc_watched_users_no_posts'] : Lang::$txt['mc_watched_users_none'],
 			'base_href' => Config::$scripturl . '?action=moderate;area=userwatch;sa=' . (Utils::$context['view_posts'] ? 'post' : 'member'),
 			'default_sort_col' => Utils::$context['view_posts'] ? '' : 'member',
-			'get_items' => array(
+			'get_items' => [
 				'function' => Utils::$context['view_posts'] ? __CLASS__ . '::list_getWatchedUserPosts' : __CLASS__ . '::list_getWatchedUsers',
-				'params' => array(
+				'params' => [
 					$approve_query,
 					$delete_boards,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => Utils::$context['view_posts'] ? 'list_getWatchedUserPostsCount' : __CLASS__ . '::list_getWatchedUserCount',
-				'params' => array(
+				'params' => [
 					$approve_query,
-				),
-			),
+				],
+			],
 			// This assumes we are viewing by user.
-			'columns' => array(
-				'member' => array(
-					'header' => array(
+			'columns' => [
+				'member' => [
+					'header' => [
 						'value' => Lang::$txt['mc_watched_users_member'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=profile;u=%1$d">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id' => false,
 								'name' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'real_name',
 						'reverse' => 'real_name DESC',
-					),
-				),
-				'warning' => array(
-					'header' => array(
+					],
+				],
+				'warning' => [
+					'header' => [
 						'value' => Lang::$txt['mc_watched_users_warning'],
-					),
-					'data' => array(
-						'function' => function($member)
-						{
+					],
+					'data' => [
+						'function' => function ($member) {
 							return User::$me->allowedTo('issue_warning') ? '<a href="' . Config::$scripturl . '?action=profile;area=issuewarning;u=' . $member['id'] . '">' . $member['warning'] . '%</a>' : $member['warning'] . '%';
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'warning',
 						'reverse' => 'warning DESC',
-					),
-				),
-				'posts' => array(
-					'header' => array(
+					],
+				],
+				'posts' => [
+					'header' => [
 						'value' => Lang::$txt['posts'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=profile;u=%1$d;area=showposts;sa=messages">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id' => false,
 								'posts' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'posts',
 						'reverse' => 'posts DESC',
-					),
-				),
-				'last_login' => array(
-					'header' => array(
+					],
+				],
+				'last_login' => [
+					'header' => [
 						'value' => Lang::$txt['mc_watched_users_last_login'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'last_login',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'last_login',
 						'reverse' => 'last_login DESC',
-					),
-				),
-				'last_post' => array(
-					'header' => array(
+					],
+				],
+				'last_post' => [
+					'header' => [
 						'value' => Lang::$txt['mc_watched_users_last_post'],
-					),
-					'data' => array(
-						'function' => function($member)
-						{
-							if ($member['last_post_id'])
+					],
+					'data' => [
+						'function' => function ($member) {
+							if ($member['last_post_id']) {
 								return '<a href="' . Config::$scripturl . '?msg=' . $member['last_post_id'] . '">' . $member['last_post'] . '</a>';
-							else
-								return $member['last_post'];
+							}
+
+							return $member['last_post'];
 						},
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=moderate;area=userwatch;sa=post',
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-				),
-			),
-			'additional_rows' => array(
+				],
+			],
+			'additional_rows' => [
 				Utils::$context['view_posts'] ?
-					array(
+					[
 						'position' => 'bottom_of_list',
 						'value' => '
 						<input type="submit" name="delete_selected" value="' . Lang::$txt['quickmod_delete_selected'] . '" class="button">',
 						'class' => 'floatright',
-					) : array(),
-			),
-		);
+					] : [],
+			],
+		];
 
 		// If this is being viewed by posts we actually change the columns to call a template each time.
-		if (Utils::$context['view_posts'])
-		{
-			$listOptions['columns'] = array(
-				'posts' => array(
-					'data' => array(
-						'function' => function($post)
-						{
+		if (Utils::$context['view_posts']) {
+			$listOptions['columns'] = [
+				'posts' => [
+					'data' => [
+						'function' => function ($post) {
 							return template_user_watch_post_callback($post);
 						},
-						'class' => 'unique'
-					),
-				),
-			);
+						'class' => 'unique',
+					],
+				],
+			];
 		}
 
 		// Create the watched user list.
@@ -263,8 +263,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -285,15 +286,16 @@ public static function call(): void
 	 */
 	public static function list_getWatchedUserCount($approve_query): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}members
 			WHERE warning >= {int:warning_watch}',
-			array(
+			[
 				'warning_watch' => Config::$modSettings['warning_watch'],
-			)
+			],
 		);
-		list ($totalMembers) = Db::$db->fetch_row($request);
+		list($totalMembers) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $totalMembers;
@@ -311,24 +313,25 @@ public static function list_getWatchedUserCount($approve_query): int
 	 */
 	public static function list_getWatchedUsers($start, $items_per_page, $sort, $approve_query, $dummy): array
 	{
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name, last_login, posts, warning
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, last_login, posts, warning
 			FROM {db_prefix}members
 			WHERE warning >= {int:warning_watch}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'warning_watch' => Config::$modSettings['warning_watch'],
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		$watched_users = array();
-		$members = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$watched_users[$row['id_member']] = array(
+		$watched_users = [];
+		$members = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$watched_users[$row['id_member']] = [
 				'id' => $row['id_member'],
 				'name' => $row['real_name'],
 				'last_login' => $row['last_login'] ? Time::create('@' . $row['last_login'])->format() : Lang::$txt['never'],
@@ -336,16 +339,16 @@ public static function list_getWatchedUsers($start, $items_per_page, $sort, $app
 				'last_post_id' => 0,
 				'warning' => $row['warning'],
 				'posts' => $row['posts'],
-			);
+			];
 			$members[] = $row['id_member'];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($members))
-		{
+		if (!empty($members)) {
 			// First get the latest messages from these users.
-			$request = Db::$db->query('', '
-				SELECT m.id_member, MAX(m.id_msg) AS last_post_id
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_member, MAX(m.id_msg) AS last_post_id
 				FROM {db_prefix}messages AS m' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)') . '
 				WHERE {query_see_message_board}
@@ -353,28 +356,30 @@ public static function list_getWatchedUsers($start, $items_per_page, $sort, $app
 					AND m.approved = {int:is_approved}
 					AND t.approved = {int:is_approved}') . '
 				GROUP BY m.id_member',
-				array(
+				[
 					'member_list' => $members,
 					'is_approved' => 1,
-				)
+				],
 			);
-			$latest_posts = array();
-			while ($row = Db::$db->fetch_assoc($request))
+			$latest_posts = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$latest_posts[$row['id_member']] = $row['last_post_id'];
+			}
 
-			if (!empty($latest_posts))
-			{
+			if (!empty($latest_posts)) {
 				// Now get the time those messages were posted.
-				$request = Db::$db->query('', '
-					SELECT id_member, poster_time
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, poster_time
 					FROM {db_prefix}messages
 					WHERE id_msg IN ({array_int:message_list})',
-					array(
+					[
 						'message_list' => $latest_posts,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$watched_users[$row['id_member']]['last_post'] = Time::create('@' . $row['poster_time'])->format();
 					$watched_users[$row['id_member']]['last_post_id'] = $latest_posts[$row['id_member']];
 				}
@@ -382,20 +387,21 @@ public static function list_getWatchedUsers($start, $items_per_page, $sort, $app
 				Db::$db->free_result($request);
 			}
 
-			$request = Db::$db->query('', '
-				SELECT MAX(m.poster_time) AS last_post, MAX(m.id_msg) AS last_post_id, m.id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT MAX(m.poster_time) AS last_post, MAX(m.id_msg) AS last_post_id, m.id_member
 				FROM {db_prefix}messages AS m
 				WHERE {query_see_message_board}
 					AND m.id_member IN ({array_int:member_list})' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 					AND m.approved = {int:is_approved}') . '
 				GROUP BY m.id_member',
-				array(
+				[
 					'member_list' => $members,
 					'is_approved' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$watched_users[$row['id_member']]['last_post'] = Time::create('@' . $row['last_post'])->format();
 				$watched_users[$row['id_member']]['last_post_id'] = $row['last_post_id'];
 			}
@@ -413,19 +419,20 @@ public static function list_getWatchedUsers($start, $items_per_page, $sort, $app
 	 */
 	public static function list_getWatchedUserPostsCount($approve_query): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 			WHERE mem.warning >= {int:warning_watch}
 				AND {query_see_board}
 				' . $approve_query,
-			array(
+			[
 				'warning_watch' => Config::$modSettings['warning_watch'],
-			)
+			],
 		);
-		list ($totalMemberPosts) = Db::$db->fetch_row($request);
+		list($totalMemberPosts) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return $totalMemberPosts;
@@ -443,8 +450,9 @@ public static function list_getWatchedUserPostsCount($approve_query): int
 	 */
 	public static function list_getWatchedUserPosts($start, $items_per_page, $sort, $approve_query, $delete_boards): array
 	{
-		$request = Db::$db->query('', '
-			SELECT m.id_msg, m.id_topic, m.id_board, m.id_member, m.subject, m.body, m.poster_time,
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_msg, m.id_topic, m.id_board, m.id_member, m.subject, m.body, m.poster_time,
 				m.approved, mem.real_name, m.smileys_enabled
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
@@ -454,19 +462,19 @@ public static function list_getWatchedUserPosts($start, $items_per_page, $sort,
 				' . $approve_query . '
 			ORDER BY m.id_msg DESC
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'warning_watch' => Config::$modSettings['warning_watch'],
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		$member_posts = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$member_posts = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['subject'] = Lang::censorText($row['subject']);
 			$row['body'] = Lang::censorText($row['body']);
 
-			$member_posts[$row['id_msg']] = array(
+			$member_posts[$row['id_msg']] = [
 				'id' => $row['id_msg'],
 				'id_topic' => $row['id_topic'],
 				'author_link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
@@ -474,8 +482,8 @@ public static function list_getWatchedUserPosts($start, $items_per_page, $sort,
 				'body' => BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']),
 				'poster_time' => Time::create('@' . $row['poster_time'])->format(),
 				'approved' => $row['approved'],
-				'can_delete' => $delete_boards == array(0) || in_array($row['id_board'], $delete_boards),
-			);
+				'can_delete' => $delete_boards == [0] || in_array($row['id_board'], $delete_boards),
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -502,16 +510,17 @@ protected function __construct()
 		Config::$modSettings['warning_watch'] = empty(Config::$modSettings['warning_watch']) ? 1 : Config::$modSettings['warning_watch'];
 
 		// Put some pretty tabs on cause we're gonna be doing hot stuff here...
-		Menu::$loaded['moderate']->tab_data = array(
+		Menu::$loaded['moderate']->tab_data = [
 			'title' => Lang::$txt['mc_watched_users_title'],
 			'help' => '',
 			'description' => Lang::$txt['mc_watched_users_desc'],
-		);
+		];
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\WatchUsers::exportStatic'))
-	WatchUsers::exportStatic();
+if (is_callable(__NAMESPACE__ . '\\WatchedUsers::exportStatic')) {
+	WatchedUsers::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Moderation/index.php b/Sources/Actions/Moderation/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Sources/Actions/Moderation/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Sources/Actions/MsgDelete.php b/Sources/Actions/MsgDelete.php
index a728ab3a71..4cb095bc0b 100644
--- a/Sources/Actions/MsgDelete.php
+++ b/Sources/Actions/MsgDelete.php
@@ -14,16 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Logging;
 use SMF\Msg;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This action handles the deletion of posts.
@@ -37,12 +36,11 @@ class MsgDelete implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'DeleteMessage',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -71,85 +69,65 @@ public function execute(): void
 		$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 		// Is Topic::$topic_id set?
-		if (empty(Topic::$topic_id) && isset($_REQUEST['topic']))
+		if (empty(Topic::$topic_id) && isset($_REQUEST['topic'])) {
 			Topic::$topic_id = (int) $_REQUEST['topic'];
+		}
 
 		TopicRemove::removeDeleteConcurrence();
 
-		$request = Db::$db->query('', '
-			SELECT t.id_member_started, m.id_member, m.subject, m.poster_time, m.approved
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_member_started, m.id_member, m.subject, m.poster_time, m.approved
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = {int:id_msg} AND m.id_topic = {int:current_topic})
 			WHERE t.id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'id_msg' => $_REQUEST['msg'],
-			)
+			],
 		);
 		list($starter, $poster, $subject, $post_time, $approved) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Verify they can see this!
-		if (Config::$modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != User::$me->id)
-		{
+		if (Config::$modSettings['postmod_active'] && !$approved && !empty($poster) && $poster != User::$me->id) {
 			User::$me->isAllowedTo('approve_posts');
 		}
 
-		if ($poster == User::$me->id)
-		{
-			if (!User::$me->allowedTo('delete_own'))
-			{
-				if ($starter == User::$me->id && !User::$me->allowedTo('delete_any'))
-				{
+		if ($poster == User::$me->id) {
+			if (!User::$me->allowedTo('delete_own')) {
+				if ($starter == User::$me->id && !User::$me->allowedTo('delete_any')) {
 					User::$me->isAllowedTo('delete_replies');
-				}
-				elseif (!User::$me->allowedTo('delete_any'))
-				{
+				} elseif (!User::$me->allowedTo('delete_any')) {
 					User::$me->isAllowedTo('delete_own');
 				}
-			}
-			elseif (!User::$me->allowedTo('delete_any') && ($starter != User::$me->id || !User::$me->allowedTo('delete_replies')) && !empty(Config::$modSettings['edit_disable_time']) && $post_time + Config::$modSettings['edit_disable_time'] * 60 < time())
-			{
+			} elseif (!User::$me->allowedTo('delete_any') && ($starter != User::$me->id || !User::$me->allowedTo('delete_replies')) && !empty(Config::$modSettings['edit_disable_time']) && $post_time + Config::$modSettings['edit_disable_time'] * 60 < time()) {
 				ErrorHandler::fatalLang('modify_post_time_passed', false);
 			}
-		}
-		elseif ($starter == User::$me->id && !User::$me->allowedTo('delete_any'))
-		{
+		} elseif ($starter == User::$me->id && !User::$me->allowedTo('delete_any')) {
 			User::$me->isAllowedTo('delete_replies');
-		}
-		else
-		{
+		} else {
 			User::$me->isAllowedTo('delete_any');
 		}
 
 		// If the full topic was removed go back to the board.
 		$full_topic = Msg::remove($_REQUEST['msg']);
 
-		if (User::$me->allowedTo('delete_any') && (!User::$me->allowedTo('delete_own') || $poster != User::$me->id))
-		{
-			Logging::logAction('delete', array('topic' => Topic::$topic_id, 'subject' => $subject, 'member' => $poster, 'board' => Board::$info->id));
+		if (User::$me->allowedTo('delete_any') && (!User::$me->allowedTo('delete_own') || $poster != User::$me->id)) {
+			Logging::logAction('delete', ['topic' => Topic::$topic_id, 'subject' => $subject, 'member' => $poster, 'board' => Board::$info->id]);
 		}
 
 		// We want to redirect back to recent action.
-		if (isset($_REQUEST['modcenter']))
-		{
+		if (isset($_REQUEST['modcenter'])) {
 			Utils::redirectexit('action=moderate;area=reportedposts;done');
-		}
-		elseif (isset($_REQUEST['recent']))
-		{
+		} elseif (isset($_REQUEST['recent'])) {
 			Utils::redirectexit('action=recent');
-		}
-		elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
-		{
+		} elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u'])) {
 			Utils::redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);
-		}
-		elseif ($full_topic)
-		{
+		} elseif ($full_topic) {
 			Utils::redirectexit('board=' . Board::$info->id . '.0');
-		}
-		else
-		{
+		} else {
 			Utils::redirectexit('topic=' . Topic::$topic_id . '.' . $_REQUEST['start']);
 		}
 	}
@@ -165,8 +143,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -192,7 +171,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\MsgDelete::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\MsgDelete::exportStatic')) {
 	MsgDelete::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Notify.php b/Sources/Actions/Notify.php
index fa9438f9e6..4c14c018c7 100644
--- a/Sources/Actions/Notify.php
+++ b/Sources/Actions/Notify.php
@@ -14,14 +14,13 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This abstract class contains the main functionality to toggle email
@@ -40,29 +39,34 @@ abstract class Notify
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'getNotifyPrefs' => 'getNotifyPrefs',
+			'setNotifyPrefs' => 'setNotifyPrefs',
+			'deleteNotifyPrefs' => 'deleteNotifyPrefs',
+			'getMemberWithToken' => 'getMemberWithToken',
+			'createUnsubscribeToken' => 'createUnsubscribeToken',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
 	// Pref refers to the value that will be saved to user_alerts_prefs table.
-	const PREF_NONE = 0;
-	const PREF_ALERT = 1;
-	const PREF_EMAIL = 2;
-	const PREF_BOTH = 3;
+	public const PREF_NONE = 0;
+	public const PREF_ALERT = 1;
+	public const PREF_EMAIL = 2;
+	public const PREF_BOTH = 3;
 
 	// Mode refers to the input submitted by $_GET or $_POST.
 	// Unfortunately, mode != pref.
-	const MODE_NO_EMAIL = -2;
-	const MODE_NO_ALERT = -1;
-	const MODE_IGNORE = 0;
-	const MODE_NONE = 1;
-	const MODE_ALERT = 2;
-	const MODE_BOTH = 3;
+	public const MODE_NO_EMAIL = -2;
+	public const MODE_NO_ALERT = -1;
+	public const MODE_IGNORE = 0;
+	public const MODE_NONE = 1;
+	public const MODE_ALERT = 2;
+	public const MODE_BOTH = 3;
 
 	/*******************
 	 * Public properties
@@ -128,29 +132,30 @@ public function execute(): void
 		$this->setId();
 		$this->setMode();
 
-		if (!isset($this->mode))
+		if (!isset($this->mode)) {
 			return;
+		}
 
 		// We don't tolerate imposters around here.
-		if (empty($this->token))
+		if (empty($this->token)) {
 			User::$me->checkSession('get');
+		}
 
 		$this->changePref();
 
 		// AJAX call.
-		if (isset($_GET['xml']))
-		{
+		if (isset($_GET['xml'])) {
 			$this->prepareAjaxResponse();
 		}
 		// Nothing to redirect to or they got here via an unsubscribe link,
 		// so just show a confirmation message.
-		elseif (!isset($this->id) || !empty($this->token))
-		{
+		elseif (!isset($this->id) || !empty($this->token)) {
 			$this->showConfirmation();
 		}
 		// Send them back to wherever they came from.
-		else
+		else {
 			Utils::redirectexit($this->type . '=' . $this->id . '.' . ($_REQUEST['start'] ?? 0));
+		}
 	}
 
 	/***********************
@@ -169,39 +174,44 @@ public function execute(): void
 	public static function getNotifyPrefs($members, $prefs = '', $process_default = false)
 	{
 		// We want this as an array whether it is or not.
-		$members = is_array($members) ? $members : (array) $members;
+		$members = array_map('intval', (array) $members);
 
-		if (!empty($prefs))
+		if (!empty($prefs)) {
 			$prefs = is_array($prefs) ? $prefs : (array) $prefs;
+		}
 
-		$result = array();
+		$result = [];
 
 		// We want to now load the default, which is stored with a member id of 0.
 		$members[] = 0;
 
-		$request = Db::$db->query('', '
-			SELECT id_member, alert_pref, alert_value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, alert_pref, alert_value
 			FROM {db_prefix}user_alerts_prefs
 			WHERE id_member IN ({array_int:members})' . (!empty($prefs) ? '
 				AND alert_pref IN ({array_string:prefs})' : ''),
-			array(
+			[
 				'members' => $members,
 				'prefs' => $prefs,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$result[$row['id_member']][$row['alert_pref']] = $row['alert_value'];
+		}
 
 		// We may want to keep the default values separate from a given user's. Or we might not.
-		if ($process_default && isset($result[0]))
-		{
-			foreach ($members as $member)
-				if (isset($result[$member]))
+		if ($process_default && isset($result[0])) {
+			foreach ($members as $member) {
+				if (isset($result[$member])) {
 					$result[$member] += $result[0];
-				else
+				} else {
 					$result[$member] = $result[0];
+				}
+			}
 
-			unset ($result[0]);
+			unset($result[0]);
 		}
 
 		return $result;
@@ -213,20 +223,24 @@ public static function getNotifyPrefs($members, $prefs = '', $process_default =
 	 * @param int $memID The user whose preferences you are setting
 	 * @param array $prefs An array key of pref -> value
 	 */
-	public static function setNotifyPrefs($memID, $prefs = array())
+	public static function setNotifyPrefs($memID, $prefs = [])
 	{
-		if (empty($prefs) || !is_int($memID))
+		if (empty($prefs) || !is_int($memID)) {
 			return;
+		}
+
+		$update_rows = [];
 
-		$update_rows = array();
-		foreach ($prefs as $k => $v)
-			$update_rows[] = array($memID, $k, min(max((int) $v, -128), 127));
+		foreach ($prefs as $k => $v) {
+			$update_rows[] = [$memID, $k, min(max((int) $v, -128), 127)];
+		}
 
-		Db::$db->insert('replace',
+		Db::$db->insert(
+			'replace',
 			'{db_prefix}user_alerts_prefs',
-			array('id_member' => 'int', 'alert_pref' => 'string', 'alert_value' => 'int'),
+			['id_member' => 'int', 'alert_pref' => 'string', 'alert_value' => 'int'],
 			$update_rows,
-			array('id_member', 'alert_pref')
+			['id_member', 'alert_pref'],
 		);
 	}
 
@@ -238,17 +252,19 @@ public static function setNotifyPrefs($memID, $prefs = array())
 	 */
 	public static function deleteNotifyPrefs($memID, array $prefs)
 	{
-		if (empty($prefs) || empty($memID))
+		if (empty($prefs) || empty($memID)) {
 			return;
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_alerts_prefs
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_alerts_prefs
 			WHERE id_member = {int:member}
 				AND alert_pref IN ({array_string:prefs})',
-			array(
+			[
 				'member' => $memID,
 				'prefs' => $prefs,
-			)
+			],
 		);
 	}
 
@@ -264,31 +280,34 @@ public static function getMemberWithToken($type)
 		$id_member = !empty($_REQUEST['u']) ? (int) $_REQUEST['u'] : 0;
 
 		// We can't do anything without these
-		if (empty($id_member) || empty($_REQUEST['token']))
+		if (empty($id_member) || empty($_REQUEST['token'])) {
 			ErrorHandler::fatalLang('unsubscribe_invalid', false);
+		}
 
 		// Get the user info we need
-		$request = Db::$db->query('', '
-			SELECT id_member AS id, email_address AS email
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member AS id, email_address AS email
 			FROM {db_prefix}members
 			WHERE id_member = {int:id_member}',
-			array(
+			[
 				'id_member' => $id_member,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('unsubscribe_invalid', false);
 		}
 		$this->member_info = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		// What token are we expecting?
-		$expected_token = Notify::createUnsubscribeToken($this->member_info['id'], $this->member_info['email'], $type, in_array($type, array('board', 'topic')) && !empty($$type) ? $$type : 0);
+		$expected_token = Notify::createUnsubscribeToken($this->member_info['id'], $this->member_info['email'], $type, in_array($type, ['board', 'topic']) && !empty($$type) ? $$type : 0);
 
 		// Don't do anything if the token they gave is wrong
-		if ($_REQUEST['token'] !== $expected_token)
+		if ($_REQUEST['token'] !== $expected_token) {
 			ErrorHandler::fatalLang('unsubscribe_invalid', false);
+		}
 
 		// At this point, we know we have a legitimate unsubscribe request
 		return $this->member_info;
@@ -305,7 +324,7 @@ public static function getMemberWithToken($type)
 	 */
 	public static function createUnsubscribeToken($memID, $email, $type = '', $itemID = 0)
 	{
-		$token_items = implode(' ', array($memID, $email, $type, $itemID));
+		$token_items = implode(' ', [$memID, $email, $type, $itemID]);
 
 		// When the message is public and the key is secret, an HMAC is the appropriate tool.
 		$token = hash_hmac('sha256', $token_items, Config::getAuthSecret(), true);
@@ -314,7 +333,7 @@ public static function createUnsubscribeToken($memID, $email, $type = '', $itemI
 		$token = substr($token, 0, 10);
 
 		// Use base64 (with URL-friendly characters) to make the token shorter.
-		return strtr(base64_encode($token), array('+' => '_', '/' => '-', '=' => ''));
+		return strtr(base64_encode($token), ['+' => '_', '/' => '-', '=' => '']);
 	}
 
 	/******************
@@ -326,14 +345,12 @@ public static function createUnsubscribeToken($memID, $email, $type = '', $itemI
 	 */
 	protected function setMemberInfo()
 	{
-		if (isset($_REQUEST['u']) && isset($_REQUEST['token']))
-		{
+		if (isset($_REQUEST['u'], $_REQUEST['token'])) {
 			$this->member_info = self::getMemberWithToken($this->type);
 			$this->token = $_REQUEST['token'];
 		}
 		// No token, so try with the current user.
-		else
-		{
+		else {
 			// Permissions are an important part of anything ;).
 			User::$me->kickIfGuest();
 			$this->member_info = (array) User::$me;
@@ -360,11 +377,13 @@ protected function setMode()
 		$this->saToMode();
 
 		// What do we do?  Better ask if they didn't say..
-		if (!isset($_GET['mode']) && !isset($_GET['xml']))
+		if (!isset($_GET['mode']) && !isset($_GET['xml'])) {
 			$this->ask();
+		}
 
-		if (isset($_GET['mode']))
+		if (isset($_GET['mode'])) {
 			$this->mode = (int) $_GET['mode'];
+		}
 	}
 
 	/**
@@ -375,12 +394,11 @@ protected function ask()
 		Theme::loadTemplate('Notify');
 		Utils::$context['page_title'] = Lang::$txt['notification'];
 
-		if ($this->member_info['id'] !== User::$me->id)
-		{
-			Utils::$context['notify_info'] = array(
+		if ($this->member_info['id'] !== User::$me->id) {
+			Utils::$context['notify_info'] = [
 				'u' => $this->member_info['id'],
 				'token' => $_REQUEST['token'],
-			);
+			];
 		}
 
 		$this->askTemplateData();
@@ -403,8 +421,7 @@ abstract protected function changePref();
 	 */
 	protected function setAlertPref()
 	{
-		switch ($this->mode)
-		{
+		switch ($this->mode) {
 			case self::MODE_IGNORE:
 			case self::MODE_NONE:
 				$this->alert_pref = self::PREF_NONE;
@@ -422,7 +439,7 @@ protected function setAlertPref()
 			// while leaving the alert preference unchanged.
 			case self::MODE_NO_EMAIL:
 				// Use bitwise operator to turn off the email part of the setting.
-				$this->alert_pref = self::getNotifyPrefs($this->member_info['id'], array($this->type . '_notify_' . $this->id), true) & self::PREF_ALERT;
+				$this->alert_pref = self::getNotifyPrefs($this->member_info['id'], [$this->type . '_notify_' . $this->id], true) & self::PREF_ALERT;
 				break;
 		}
 	}
@@ -432,32 +449,31 @@ protected function setAlertPref()
 	 */
 	protected function changeBoardTopicPref()
 	{
-		self::setNotifyPrefs((int) $this->member_info['id'], array($this->type . '_notify_' . $this->id => $this->alert_pref));
+		self::setNotifyPrefs((int) $this->member_info['id'], [$this->type . '_notify_' . $this->id => $this->alert_pref]);
 
-		if ($this->alert_pref > self::PREF_NONE)
-		{
+		if ($this->alert_pref > self::PREF_NONE) {
 			$id_board = $this->type === 'board' ? $this->id : 0;
 			$id_topic = $this->type === 'topic' ? $this->id : 0;
 
 			// Turn notification on.  (note this just blows smoke if it's already on.)
-			Db::$db->insert('ignore',
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_notify',
-				array('id_member' => 'int', 'id_topic' => 'int', 'id_board' => 'int'),
-				array(User::$me->id, $id_topic, $id_board),
-				array('id_member', 'id_topic', 'id_board')
+				['id_member' => 'int', 'id_topic' => 'int', 'id_board' => 'int'],
+				[User::$me->id, $id_topic, $id_board],
+				['id_member', 'id_topic', 'id_board'],
 			);
-		}
-		else
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_notify
+		} else {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_notify
 				WHERE id_member = {int:member}
 					AND {raw:column} = {int:id}',
-				array(
+				[
 					'column' => 'id_' . $this->type,
 					'id' => $this->id,
 					'member' => $this->member_info['id'],
-				)
+				],
 			);
 		}
 	}
@@ -467,14 +483,14 @@ protected function changeBoardTopicPref()
 	 */
 	protected function prepareAjaxResponse()
 	{
-		Utils::$context['xml_data']['errors'] = array(
+		Utils::$context['xml_data']['errors'] = [
 			'identifier' => 'error',
-			'children' => array(
-				array(
+			'children' => [
+				[
 					'value' => 0,
-				),
-			),
-		);
+				],
+			],
+		];
 
 		Utils::$context['sub_template'] = 'generic_xml';
 	}
@@ -498,7 +514,8 @@ abstract protected function getSuccessMsg();
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Notify::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Notify::exportStatic')) {
 	Notify::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/NotifyAnnouncements.php b/Sources/Actions/NotifyAnnouncements.php
index fb22325560..5b981a2abf 100644
--- a/Sources/Actions/NotifyAnnouncements.php
+++ b/Sources/Actions/NotifyAnnouncements.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Lang;
 use SMF\Utils;
 
@@ -30,12 +29,11 @@ class NotifyAnnouncements extends Notify implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'AnnouncementsNotify',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -71,8 +69,9 @@ class NotifyAnnouncements extends Notify implements ActionInterface
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -110,8 +109,7 @@ protected function setId()
 	 */
 	protected function saToMode()
 	{
-		if (!isset($_GET['mode']) && isset($_GET['sa']))
-		{
+		if (!isset($_GET['mode']) && isset($_GET['sa'])) {
 			$_GET['mode'] = $_GET['sa'] == 'on' ? 3 : 0;
 			unset($_GET['sa']);
 		}
@@ -125,10 +123,11 @@ protected function setMode()
 		$this->saToMode();
 
 		// What do we do?  Better ask if they didn't say..
-		if (!isset($_GET['mode']))
+		if (!isset($_GET['mode'])) {
 			$this->ask();
-		else
+		} else {
 			$this->mode = $_GET['mode'];
+		}
 	}
 
 	/**
@@ -149,7 +148,7 @@ protected function changePref()
 		$this->alert_pref = $this->alert_pref & parent::PREF_EMAIL;
 
 		// Update their announcement notification preference.
-		parent::setNotifyPrefs((int) $this->member_info['id'], array('announcements' => $this->alert_pref));
+		parent::setNotifyPrefs((int) $this->member_info['id'], ['announcements' => $this->alert_pref]);
 
 		// Show a confirmation message.
 		Utils::$context['sub_template'] = 'notify_pref_changed';
@@ -166,7 +165,8 @@ protected function getSuccessMsg()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\NotifyAnnouncements::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\NotifyAnnouncements::exportStatic')) {
 	NotifyAnnouncements::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/NotifyBoard.php b/Sources/Actions/NotifyBoard.php
index 2a5235f141..cb0a7c573f 100644
--- a/Sources/Actions/NotifyBoard.php
+++ b/Sources/Actions/NotifyBoard.php
@@ -14,8 +14,8 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
+use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Utils;
@@ -32,12 +32,11 @@ class NotifyBoard extends Notify implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'BoardNotify',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -73,8 +72,9 @@ class NotifyBoard extends Notify implements ActionInterface
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -103,8 +103,9 @@ protected function __construct()
 	 */
 	protected function setId()
 	{
-		if (empty(Board::$info->id))
+		if (empty(Board::$info->id)) {
 			ErrorHandler::fatalLang('no_board', false);
+		}
 
 		$this->id = Board::$info->id;
 	}
@@ -116,8 +117,7 @@ protected function setId()
 	 */
 	protected function saToMode()
 	{
-		if (!isset($_GET['mode']) && isset($_GET['sa']))
-		{
+		if (!isset($_GET['mode']) && isset($_GET['sa'])) {
 			$_GET['mode'] = $_GET['sa'] == 'on' ? 3 : -1;
 			unset($_GET['sa']);
 		}
@@ -156,11 +156,11 @@ protected function getSuccessMsg()
 	 *************************/
 
 	// code...
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\NotifyBoard::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\NotifyBoard::exportStatic')) {
 	NotifyBoard::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/NotifyTopic.php b/Sources/Actions/NotifyTopic.php
index 04ff92a911..9bfb667407 100644
--- a/Sources/Actions/NotifyTopic.php
+++ b/Sources/Actions/NotifyTopic.php
@@ -14,11 +14,12 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Topic;
-use SMF\Db\DatabaseApi as Db;
+use SMF\Utils;
 
 /**
  * Toggles email notification preferences for topics.
@@ -32,12 +33,11 @@ class NotifyTopic extends Notify implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'TopicNotify',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -73,8 +73,9 @@ class NotifyTopic extends Notify implements ActionInterface
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -103,8 +104,9 @@ protected function __construct()
 	 */
 	protected function setId()
 	{
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('not_a_topic', false);
+		}
 
 		$this->id = Topic::$topic_id;
 	}
@@ -116,8 +118,7 @@ protected function setId()
 	 */
 	protected function saToMode()
 	{
-		if (!isset($_GET['mode']) && isset($_GET['sa']))
-		{
+		if (!isset($_GET['mode']) && isset($_GET['sa'])) {
 			$_GET['mode'] = $_GET['sa'] == 'on' ? 3 : -1;
 			unset($_GET['sa']);
 		}
@@ -139,42 +140,42 @@ protected function changePref()
 	{
 		$this->setAlertPref();
 
-		$request = Db::$db->query('', '
-			SELECT id_member, id_topic, id_msg, unwatched
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, id_topic, id_msg, unwatched
 			FROM {db_prefix}log_topics
 			WHERE id_member = {int:member}
 				AND {raw:column} = {int:id}',
-			array(
+			[
 				'column' => 'id_' . $this->type,
 				'id' => $this->id,
 				'member' => $this->member_info['id'],
-			)
+			],
 		);
 		$log = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
-		if (empty($log))
-		{
+
+		if (empty($log)) {
 			$insert = true;
-			$log = array(
+			$log = [
 				'id_member' => $this->member_info['id'],
 				'id_topic' => $this->id,
 				'id_msg' => 0,
 				'unwatched' => (int) ($this->mode === parent::MODE_IGNORE),
-			);
-		}
-		else
-		{
+			];
+		} else {
 			$insert = false;
 			$log['unwatched'] = (int) ($this->mode === parent::MODE_IGNORE);
 		}
 
-		Db::$db->insert($insert ? 'insert' : 'replace',
+		Db::$db->insert(
+			$insert ? 'insert' : 'replace',
 			'{db_prefix}log_topics',
-			array(
+			[
 				'id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int',
-			),
+			],
 			$log,
-			array('id_member', 'id_topic')
+			['id_member', 'id_topic'],
 		);
 
 		$this->changeBoardTopicPref();
@@ -187,11 +188,11 @@ protected function getSuccessMsg()
 	{
 		return sprintf(Lang::$txt['notify_topic' . (!empty($this->alert_pref & parent::PREF_EMAIL) ? '_subscribed' : '_unsubscribed')], $this->member_info['email']);
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\NotifyTopic::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\NotifyTopic::exportStatic')) {
 	NotifyTopic::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/PersonalMessage.php b/Sources/Actions/PersonalMessage.php
index a7f72dd4bf..447dd0303b 100644
--- a/Sources/Actions/PersonalMessage.php
+++ b/Sources/Actions/PersonalMessage.php
@@ -14,21 +14,14 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
-use SMF\BBCodeParser;
 use SMF\BrowserDetector;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
-use SMF\Msg;
-use SMF\Profile;
-use SMF\Theme;
-use SMF\User;
-use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 use SMF\PersonalMessage\{
 	Conversation,
 	DraftPM,
@@ -41,6 +34,10 @@
 	Search,
 	SearchResult,
 };
+use SMF\Profile;
+use SMF\Theme;
+use SMF\User;
+use SMF\Utils;
 
 /**
  * This class is mainly meant for controlling the actions related to personal
@@ -56,12 +53,25 @@ class PersonalMessage implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'MessageMain',
-		),
-	);
+			'messageFolder' => 'MessageFolder',
+			'messagePopup' => 'MessagePopup',
+			'manageLabels' => 'ManageLabels',
+			'manageRules' => 'ManageRules',
+			'messageActionsApply' => 'MessageActionsApply',
+			'messagePrune' => 'MessagePrune',
+			'messageKillAll' => 'MessageKillAll',
+			'reportMessage' => 'ReportMessage',
+			'messageSearch' => 'MessageSearch',
+			'messageSearch2' => 'MessageSearch2',
+			'messagePost' => 'MessagePost',
+			'messagePost2' => 'MessagePost2',
+			'messageSettings' => 'MessageSettings',
+			'messageDrafts' => 'MessageDrafts',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -70,17 +80,17 @@ class PersonalMessage implements ActionInterface
 	/**
 	 * Display mode to show all personal messages in a paginated list.
 	 */
-	const VIEW_ALL = 0;
+	public const VIEW_ALL = 0;
 
 	/**
 	 * Display mode to show one personal message at a time.
 	 */
-	const VIEW_ONE = 1;
+	public const VIEW_ONE = 1;
 
 	/**
 	 * Display mode to show personal messages in a conversation view.
 	 */
-	const VIEW_CONV = 2;
+	public const VIEW_CONV = 2;
 
 	/*******************
 	 * Public properties
@@ -102,72 +112,72 @@ class PersonalMessage implements ActionInterface
 	 * In this default definintion, all parts of the menu are set as enabled.
 	 * At runtime, however, various parts may be turned on or off.
 	 */
-	public array $pm_areas = array(
-		'folders' => array(
+	public array $pm_areas = [
+		'folders' => [
 			'title' => 'pm_messages',
-			'areas' => array(
-				'inbox' => array(
+			'areas' => [
+				'inbox' => [
 					'label' => 'inbox',
 					'custom_url' => '{scripturl}?action=pm',
 					'amt' => 0,
-				),
-				'send' => array(
+				],
+				'send' => [
 					'label' => 'new_message',
 					'custom_url' => '{scripturl}?action=pm;sa=send',
 					'permission' => 'pm_send',
 					'amt' => 0,
-				),
-				'sent' => array(
+				],
+				'sent' => [
 					'label' => 'sent_items',
 					'custom_url' => '{scripturl}?action=pm;f=sent',
 					'amt' => 0,
-				),
-				'drafts' => array(
+				],
+				'drafts' => [
 					'label' => 'drafts_show',
 					'custom_url' => '{scripturl}?action=pm;sa=showpmdrafts',
 					'permission' => 'pm_draft',
 					'enabled' => true,
 					'amt' => 0,
-				),
-			),
+				],
+			],
 			'amt' => 0,
-		),
-		'labels' => array(
+		],
+		'labels' => [
 			'title' => 'pm_labels',
-			'areas' => array(),
+			'areas' => [],
 			'amt' => 0,
-		),
-		'actions' => array(
+		],
+		'actions' => [
 			'title' => 'pm_actions',
-			'areas' => array(
-				'search' => array(
+			'areas' => [
+				'search' => [
 					'label' => 'pm_search_bar_title',
 					'custom_url' => '{scripturl}?action=pm;sa=search',
-				),
-				'prune' => array(
+				],
+				'prune' => [
 					'label' => 'pm_prune',
-					'custom_url' => '{scripturl}?action=pm;sa=prune'
-				),
-			),
-		),
-		'pref' => array(
+					'custom_url' => '{scripturl}?action=pm;sa=prune',
+				],
+			],
+		],
+		'pref' => [
 			'title' => 'pm_preferences',
-			'areas' => array(
-				'manlabels' => array(
+			'areas' => [
+				'manlabels' => [
 					'label' => 'pm_manage_labels',
 					'custom_url' => '{scripturl}?action=pm;sa=manlabels',
-				),
-				'manrules' => array(
+				],
+				'manrules' => [
 					'label' => 'pm_manage_rules',
 					'custom_url' => '{scripturl}?action=pm;sa=manrules',
-				),
-				'settings' => array(
+				],
+				'settings' => [
 					'label' => 'pm_settings',
 					'custom_url' => '{scripturl}?action=pm;sa=settings',
-				),
-			),
-		),
-	);
+				],
+			],
+		],
+	];
 
 	/**
 	 * @var string
@@ -212,7 +222,7 @@ class PersonalMessage implements ActionInterface
 	 *
 	 * Keys are the IDs of some PMs. Values are arrays of label IDs.
 	 */
-	public array $labels_in_use = array();
+	public array $labels_in_use = [];
 
 	/**
 	 * @var array
@@ -221,7 +231,7 @@ class PersonalMessage implements ActionInterface
 	 *
 	 * Keys are the IDs of some PMs. Values are booleans.
 	 */
-	public array $replied = array();
+	public array $replied = [];
 
 	/**
 	 * @var array
@@ -230,7 +240,7 @@ class PersonalMessage implements ActionInterface
 	 *
 	 * Keys are the IDs of some PMs. Values are booleans.
 	 */
-	public array $unread = array();
+	public array $unread = [];
 
 	/**************************
 	 * Public static properties
@@ -241,7 +251,7 @@ class PersonalMessage implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'show' => 'show',
 		'popup' => 'popup',
 		'showpmdrafts' => 'drafts',
@@ -256,18 +266,18 @@ class PersonalMessage implements ActionInterface
 		'manlabels' => 'labels',
 		'manrules' => 'rules',
 		'settings' => 'settings',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Instructions for sorting the personal messages.
 	 */
-	public static $sort_methods = array(
+	public static $sort_methods = [
 		'date' => 'pm.id_pm',
 		'name' => 'COALESCE(mem.real_name, \'\')',
 		'subject' => 'pm.subject',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -308,30 +318,26 @@ public function execute(): void
 		User::$me->isAllowedTo('pm_read');
 
 		// If we have unsorted mail, apply our rules!
-		if (User::$me->new_pm)
-		{
+		if (User::$me->new_pm) {
 			Rule::apply();
 			Received::setNotNew();
 		}
 
 		// No menu in AJAX requests or the popup.
-		if (!isset($_REQUEST['xml']) && $this->subaction !== 'popup')
-		{
-			if ($this->subaction === 'show')
-			{
+		if (!isset($_REQUEST['xml']) && $this->subaction !== 'popup') {
+			if ($this->subaction === 'show') {
 				$this->createMenu($this->current_label_id == -1 ? $this->folder : 'label' . $this->current_label_id);
-			}
-			else
-			{
+			} else {
 				$this->createMenu($this->subaction);
 			}
 		}
 
 		// Now let's get on with the main job...
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -355,8 +361,9 @@ public function popup(): void
 	 */
 	public function drafts(): void
 	{
-		if (empty(User::$me->id))
+		if (empty(User::$me->id)) {
 			ErrorHandler::fatalLang('not_a_user', false);
+		}
 
 		DraftPM::showInProfile(User::$me->id);
 	}
@@ -374,7 +381,10 @@ public function send(): void
 	 */
 	public function send2(): void
 	{
-		PM::compose2();
+		// Message sent successfully?
+		if (PM::compose2()) {
+			Utils::redirectexit($this->current_label_redirect . ';done=sent');
+		}
 	}
 
 	/**
@@ -400,93 +410,81 @@ public function applyActions(): void
 	{
 		User::$me->checkSession('request');
 
-		if (isset($_REQUEST['del_selected']))
+		if (isset($_REQUEST['del_selected'])) {
 			$_REQUEST['pm_action'] = 'delete';
+		}
 
-		if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms']))
-		{
-			foreach ($_REQUEST['pms'] as $pm)
+		if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms'])) {
+			foreach ($_REQUEST['pms'] as $pm) {
 				$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+			}
 		}
 
-		if (empty($_REQUEST['pm_actions']))
+		if (empty($_REQUEST['pm_actions'])) {
 			Utils::redirectexit($this->current_label_redirect);
+		}
 
 		// Don't act on a conversation unless the view mode and the $_REQUEST var match.
-		if (($this->mode == self::VIEW_CONV) != (isset($_REQUEST['conversation'])))
+		if (($this->mode == self::VIEW_CONV) != (isset($_REQUEST['conversation']))) {
 			Utils::redirectexit($this->current_label_redirect);
+		}
 
 		// Don't do labels unless we're in the inbox.
-		if ($this->folder !== 'inbox')
-		{
-			$_REQUEST['pm_actions'] = array_filter($_REQUEST['pm_actions'], fn($action) => $action === 'delete');
+		if ($this->folder !== 'inbox') {
+			$_REQUEST['pm_actions'] = array_filter($_REQUEST['pm_actions'], fn ($action) => $action === 'delete');
 		}
 
 		// If we are in conversation, we may need to apply this to every PM in the conversation.
-		if ($this->mode == self::VIEW_CONV)
-		{
-			foreach (array_keys($_REQUEST['pm_actions']) as $pm)
-			{
+		if ($this->mode == self::VIEW_CONV) {
+			foreach (array_keys($_REQUEST['pm_actions']) as $pm) {
 				$conversation = new Conversation($pm);
 
-				foreach ($conversation->pms as $id => $info)
-				{
+				foreach ($conversation->pms as $id => $info) {
 					// We only label received PMs, not sent ones.
-					if ($_REQUEST['pm_actions'][$pm] == 'delete' || $info['sender'] != User::$me->id)
-					{
+					if ($_REQUEST['pm_actions'][$pm] == 'delete' || $info['sender'] != User::$me->id) {
 						$_REQUEST['pm_actions'][$id] = $_REQUEST['pm_actions'][$pm];
 					}
 				}
 			}
 		}
 
-		$to_delete = array();
-		$to_label = array();
-		$label_type = array();
-		foreach ($_REQUEST['pm_actions'] as $pm => $action)
-		{
+		$to_delete = [];
+		$to_label = [];
+		$label_type = [];
+
+		foreach ($_REQUEST['pm_actions'] as $pm => $action) {
 			// Deleting.
-			if ($action === 'delete')
-			{
+			if ($action === 'delete') {
 				$to_delete[] = (int) $pm;
 			}
 			// Adding a label.
-			elseif (substr($action, 0, 4) == 'add_')
-			{
+			elseif (substr($action, 0, 4) == 'add_') {
 				$type = 'add';
 				$action = substr($action, 4);
 			}
 			// Removing a label.
-			elseif (substr($action, 0, 4) == 'rem_')
-			{
+			elseif (substr($action, 0, 4) == 'rem_') {
 				$type = 'rem';
 				$action = substr($action, 4);
 			}
 
-			if (in_array($type, array('add', 'rem')) && ($action == '-1' || (int) $action > 0))
-			{
+			if (in_array($type, ['add', 'rem']) && ($action == '-1' || (int) $action > 0)) {
 				$to_label[(int) $pm] = (int) $action;
 				$label_type[(int) $pm] = $type;
 			}
 		}
 
 		// Deleting, it looks like?
-		if (!empty($to_delete))
-		{
+		if (!empty($to_delete)) {
 			PM::delete($to_delete, $this->folder);
 		}
 
 		// Are we labeling anything?
-		if (!empty($to_label) && $this->folder === 'inbox')
-		{
-			foreach (Received::loadByPm(array_keys($to_label)) as $received)
-			{
-				if ($label_type[$received->id] === 'add')
-				{
+		if (!empty($to_label) && $this->folder === 'inbox') {
+			foreach (Received::loadByPm(array_keys($to_label)) as $received) {
+				if ($label_type[$received->id] === 'add') {
 					$received->addLabel($to_label[$received->id]);
-				}
-				elseif ($label_type[$received->id] === 'rem')
-				{
+				} elseif ($label_type[$received->id] === 'rem') {
 					$received->removeLabel($to_label[$received->id]);
 				}
 			}
@@ -516,8 +514,7 @@ public function removeAll(): void
 	 */
 	public function prune(): void
 	{
-		if (isset($_REQUEST['age']))
-		{
+		if (isset($_REQUEST['age'])) {
 			User::$me->checkSession();
 
 			// Calculate the time to delete before.
@@ -531,10 +528,10 @@ public function prune(): void
 		}
 
 		// Build the link tree elements.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=prune',
-			'name' => Lang::$txt['pm_prune']
-		);
+			'name' => Lang::$txt['pm_prune'],
+		];
 
 		Utils::$context['sub_template'] = 'prune';
 		Utils::$context['page_title'] = Lang::$txt['pm_prune'];
@@ -552,37 +549,39 @@ public function prune(): void
 	public function report(): void
 	{
 		// Check that this feature is even enabled!
-		if (empty(Config::$modSettings['enableReportPM']) || empty($_REQUEST['pmsg']))
+		if (empty(Config::$modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		$pm = current(PM::load((int) $_REQUEST['pmsg']));
 
 		// Users are not allowed to report messages that they can't see.
-		if (!$pm->canAccess('inbox'))
+		if (!$pm->canAccess('inbox')) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		Utils::$context['pm_id'] = $pm->id;
 		Utils::$context['page_title'] = Lang::$txt['pm_report_title'];
 
 		// If we're here, just send the user to the template, with a few useful context bits.
-		if (!isset($_POST['report']))
-		{
+		if (!isset($_POST['report'])) {
 			Utils::$context['sub_template'] = 'report_message';
 
 			// @todo I don't like being able to pick who to send it to.  Favoritism, etc. sucks.
 			// Now, get all the administrators.
-			Utils::$context['admins'] = array();
-			$request = Db::$db->query('', '
-				SELECT id_member, real_name
+			Utils::$context['admins'] = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, real_name
 				FROM {db_prefix}members
 				WHERE id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0
 				ORDER BY real_name',
-				array(
+				[
 					'admin_group' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['admins'][$row['id_member']] = $row['real_name'];
 			}
 			Db::$db->free_result($request);
@@ -591,8 +590,7 @@ public function report(): void
 			Utils::$context['admin_count'] = count(Utils::$context['admins']);
 		}
 		// Otherwise, let's get down to the sending stuff.
-		else
-		{
+		else {
 			// Check the session before proceeding any further!
 			User::$me->checkSession();
 
@@ -600,80 +598,77 @@ public function report(): void
 			$body = preg_replace('~<br ?/?' . '>~i', "\n", $this->body);
 
 			// Get any other recipients of the email.
-			$recipients = array();
+			$recipients = [];
 			$hidden_recipients = 0;
 
-			foreach ($pm->received as $received)
-			{
-				if ($received->member === User::$me->id)
+			foreach ($pm->received as $received) {
+				if ($received->member === User::$me->id) {
 					continue;
+				}
 
 				// If it's hidden still don't reveal their names - privacy after all ;)
-				if (!empty($received->bcc))
-				{
+				if (!empty($received->bcc)) {
 					$hidden_recipients++;
-				}
-				else
-				{
+				} else {
 					$recipients[] = '[url=' . Config::$scripturl . '?action=profile;u=' . $received->member . ']' . $received->name . '[/url]';
 				}
 			}
 
-			if ($hidden_recipients)
+			if ($hidden_recipients) {
 				$recipients[] = sprintf(Lang::$txt['pm_report_pm_hidden'], $hidden_recipients);
+			}
 
 			// Prepare the message storage array.
-			$messagesToSend = array();
+			$messagesToSend = [];
 
 			// Now let's get out and loop through the admins.
 			$memberFromName = Utils::htmlspecialcharsDecode($this->from_name);
-			$request = Db::$db->query('', '
-				SELECT id_member, real_name, lngfile
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, real_name, lngfile
 				FROM {db_prefix}members
 				WHERE (id_group = {int:admin_id} OR FIND_IN_SET({int:admin_id}, additional_groups) != 0)
 					' . (empty($_POST['id_admin']) ? '' : 'AND id_member = {int:specific_admin}') . '
 				ORDER BY lngfile',
-				array(
+				[
 					'admin_id' => 1,
 					'specific_admin' => isset($_POST['id_admin']) ? (int) $_POST['id_admin'] : 0,
-				)
+				],
 			);
+
 			// Maybe we shouldn't advertise this?
-			if (Db::$db->num_rows($request) == 0)
-			{
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('no_access', false);
 			}
+
 			// Loop through each admin, and add them to the right language pile...
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Need to send in the correct language!
 				$cur_language = empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $row['lngfile'];
 
-				if (!isset($messagesToSend[$cur_language]))
-				{
+				if (!isset($messagesToSend[$cur_language])) {
 					Lang::load('PersonalMessage', $cur_language, false);
 
 					// Make the body.
-					$report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(Utils::htmlspecialcharsDecode(User::$me->name), $memberFromName), Lang::$txt['pm_report_pm_user_sent']);
+					$report_body = str_replace(['{REPORTER}', '{SENDER}'], [Utils::htmlspecialcharsDecode(User::$me->name), $memberFromName], Lang::$txt['pm_report_pm_user_sent']);
 
 					$report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n";
 
-					if (!empty($recipients))
-					{
+					if (!empty($recipients)) {
 						$report_body .= Lang::$txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
 					}
 
 					$report_body .= Lang::$txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($this->member_from) ? '"' . $memberFromName . '"' : $memberFromName . ' link=action=profile;u=' . $this->member_from . ' date=' . $this->msgtime) . ']' . "\n" . Utils::htmlspecialcharsDecode($body) . '[/quote]';
 
 					// Plonk it in the array ;)
-					$messagesToSend[$cur_language] = array(
+					$messagesToSend[$cur_language] = [
 						'subject' => (Utils::entityStrpos($this->subject, Lang::$txt['pm_report_pm_subject']) === false ? Lang::$txt['pm_report_pm_subject'] : '') . Utils::htmlspecialcharsDecode($this->subject),
 						'body' => $report_body,
-						'recipients' => array(
-							'to' => array(),
-							'bcc' => array()
-						),
-					);
+						'recipients' => [
+							'to' => [],
+							'bcc' => [],
+						],
+					];
 				}
 
 				// Add them to the list.
@@ -682,12 +677,14 @@ public function report(): void
 			Db::$db->free_result($request);
 
 			// Send a different email for each language.
-			foreach ($messagesToSend as $lang => $message)
+			foreach ($messagesToSend as $lang => $message) {
 				PM::send($message['recipients'], $message['subject'], $message['body']);
+			}
 
 			// Give the user their own language back!
-			if (!empty(Config::$modSettings['userLanguage']))
+			if (!empty(Config::$modSettings['userLanguage'])) {
 				Lang::load('PersonalMessage', '', false);
+			}
 
 			// Leave them with a template.
 			Utils::$context['sub_template'] = 'report_message_complete';
@@ -744,19 +741,18 @@ public function settings(): void
 		Profile::$member->loadCustomFields('pmprefs');
 
 		// Add our position to the linktree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=settings',
-			'name' => Lang::$txt['pm_settings']
-		);
+			'name' => Lang::$txt['pm_settings'],
+		];
 
 		// Are they saving?
-		if (isset($_REQUEST['save']))
-		{
+		if (isset($_REQUEST['save'])) {
 			User::$me->checkSession();
 			Profile::$member->save();
 		}
 
-		Profile::$member->setupContext(array('pm_prefs'));
+		Profile::$member->setupContext(['pm_prefs']);
 	}
 
 	/***********************
@@ -770,8 +766,9 @@ public function settings(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -935,14 +932,17 @@ protected function __construct()
 	{
 		Lang::load('PersonalMessage+Drafts');
 
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('PersonalMessage');
+		}
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 
-		if (isset($_REQUEST['f']) && $_REQUEST['f'] === 'sent')
+		if (isset($_REQUEST['f']) && $_REQUEST['f'] === 'sent') {
 			$this->folder = 'sent';
+		}
 
 		$this->buildLimitBar();
 
@@ -959,8 +959,9 @@ protected function __construct()
 		$this->mode = User::$me->pm_prefs & 3;
 
 		// A previous message was sent successfully? Show a small indication.
-		if (isset($_GET['done']) && ($_GET['done'] == 'sent'))
+		if (isset($_GET['done']) && ($_GET['done'] == 'sent')) {
 			Utils::$context['pm_sent'] = true;
+		}
 
 		// Some context stuff for the templates.
 		Utils::$context['display_mode'] = &$this->mode;
@@ -977,10 +978,10 @@ protected function __construct()
 		Utils::$context['drafts_autosave'] = !empty(Utils::$context['drafts_save']) && !empty(Config::$modSettings['drafts_autosave_enabled']) && !empty(Theme::$current->options['drafts_autosave_enabled']);
 
 		// Build the linktree for all the actions...
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm',
-			'name' => Lang::$txt['personal_messages']
-		);
+			'name' => Lang::$txt['personal_messages'],
+		];
 	}
 
 	/**
@@ -993,48 +994,45 @@ protected function createMenu($area): void
 		// Finalize string values in the menu.
 		array_walk_recursive(
 			$this->pm_areas,
-			function(&$value, $key)
-			{
-				if (in_array($key, array('title', 'label')))
+			function (&$value, $key) {
+				if (in_array($key, ['title', 'label'])) {
 					$value = Lang::$txt[$value] ?? $value;
+				}
 
-				$value = strtr($value, array(
+				$value = strtr($value, [
 					'{scripturl}' => Config::$scripturl,
 					'{boardurl}' => Config::$boardurl,
-				));
-			}
+				]);
+			},
 		);
 
 		$this->pm_areas['folders']['areas']['drafts']['enabled'] = !empty(Config::$modSettings['drafts_pm_enabled']);
 
 		// Give mods access to the menu.
-		IntegrationHook::call('integrate_pm_areas', array(&$this->pm_areas));
+		IntegrationHook::call('integrate_pm_areas', [&$this->pm_areas]);
 
 		// Handle labels.
-		if (empty(Label::$loaded))
-		{
+		if (empty(Label::$loaded)) {
 			unset($this->pm_areas['labels']);
-		}
-		else
-		{
+		} else {
 			// Note we send labels by id as it will have less problems in the querystring.
-			foreach (Label::$loaded as $label)
-			{
-				if ($label['id'] == -1)
+			foreach (Label::$loaded as $label) {
+				if ($label['id'] == -1) {
 					continue;
+				}
 
 				// Count the amount of unread items in labels.
 				$this->pm_areas['labels']['amt'] += $label['unread_messages'];
 
 				// Add the label to the menu.
-				$this->pm_areas['labels']['areas']['label' . $label['id']] = array(
+				$this->pm_areas['labels']['areas']['label' . $label['id']] = [
 					'label' => $label['name'],
 					'custom_url' => Config::$scripturl . '?action=pm;l=' . $label['id'],
 					'amt' => $label['unread_messages'],
 					'unread_messages' => $label['unread_messages'],
 					'messages' => $label['messages'],
 					'icon' => 'folder',
-				);
+				];
 			}
 		}
 
@@ -1042,25 +1040,25 @@ function(&$value, $key)
 
 		$this->pm_areas['folders']['areas']['inbox']['messages'] = Label::$loaded[-1]['messages'];
 
-		if (!empty(Label::$loaded[-1]['unread_messages']))
-		{
+		if (!empty(Label::$loaded[-1]['unread_messages'])) {
 			$this->pm_areas['folders']['areas']['inbox']['amt'] = Label::$loaded[-1]['unread_messages'];
 
 			$this->pm_areas['folders']['amt'] = Label::$loaded[-1]['unread_messages'];
 		}
 
 		// Set a few options for the menu.
-		$menuOptions = array(
+		$menuOptions = [
 			'current_area' => $area,
 			'disable_url_session_check' => true,
-		);
+		];
 
 		// Actually create the menu!
 		$menu = new Menu($this->pm_areas, $menuOptions);
 
 		// No menu means no access.
-		if (empty($menu->include_data) && (!User::$me->is_guest || User::$me->validateSession()))
+		if (empty($menu->include_data) && (!User::$me->is_guest || User::$me->validateSession())) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Make a note of the Unique ID for this menu.
 		Utils::$context['pm_menu_id'] = $menu->id;
@@ -1070,8 +1068,9 @@ function(&$value, $key)
 		Utils::$context['menu_item_selected'] = $menu->current_area;
 
 		// Set the template for this area and add the profile layer.
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Utils::$context['template_layers'][] = 'pm';
+		}
 	}
 
 	/**
@@ -1079,19 +1078,20 @@ function(&$value, $key)
 	 */
 	protected function buildLimitBar()
 	{
-		if (User::$me->is_admin)
+		if (User::$me->is_admin) {
 			return;
+		}
 
-		if (($limit = CacheApi::get('msgLimit:' . User::$me->id, 360)) === null)
-		{
+		if (($limit = CacheApi::get('msgLimit:' . User::$me->id, 360)) === null) {
 			// @todo Why do we do this?  It seems like if they have any limit we should use it.
-			$request = Db::$db->query('', '
-				SELECT MAX(max_messages) AS top_limit, MIN(max_messages) AS bottom_limit
+			$request = Db::$db->query(
+				'',
+				'SELECT MAX(max_messages) AS top_limit, MIN(max_messages) AS bottom_limit
 				FROM {db_prefix}membergroups
 				WHERE id_group IN ({array_int:users_groups})',
-				array(
+				[
 					'users_groups' => User::$me->groups,
-				)
+				],
 			);
 			list($maxMessage, $minMessage) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -1103,23 +1103,23 @@ protected function buildLimitBar()
 		}
 
 		// Prepare the context for the capacity bar.
-		if (!empty($limit))
-		{
+		if (!empty($limit)) {
 			$bar = round((User::$me->messages * 100) / $limit, 1);
 
-			Utils::$context['limit_bar'] = array(
+			Utils::$context['limit_bar'] = [
 				'messages' => User::$me->messages,
 				'allowed' => $limit,
 				'percent' => $bar,
 				'bar' => min(100, (int) $bar),
 				'text' => sprintf(Lang::$txt['pm_currently_using'], User::$me->messages, $bar),
-			);
+			];
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\PersonalMessage::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\PersonalMessage::exportStatic')) {
 	PersonalMessage::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Post.php b/Sources/Actions/Post.php
index 4f23b5b1ba..6315ddd292 100644
--- a/Sources/Actions/Post.php
+++ b/Sources/Actions/Post.php
@@ -13,13 +13,13 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Attachment;
-use SMF\BrowserDetector;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Draft;
 use SMF\Editor;
 use SMF\ErrorHandler;
@@ -36,9 +36,6 @@
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * This class handles posting and modifying replies and new topics.
@@ -52,12 +49,11 @@ class Post implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'post' => 'Post',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -66,9 +62,9 @@ class Post implements ActionInterface
 	/**
 	 * Constants to indicate what the user intends to do with this post.
 	 */
-	const INTENT_NEW_TOPIC = 0;
-	const INTENT_NEW_REPLY = 1;
-	const INTENT_EDIT_POST = 2;
+	public const INTENT_NEW_TOPIC = 0;
+	public const INTENT_NEW_REPLY = 1;
+	public const INTENT_EDIT_POST = 2;
 
 	/*******************
 	 * Public properties
@@ -86,7 +82,7 @@ class Post implements ActionInterface
 	 *
 	 * Errors encountered while trying to post.
 	 */
-	public array $errors = array();
+	public array $errors = [];
 
 	/**
 	 * @var array
@@ -96,7 +92,7 @@ class Post implements ActionInterface
 	 * errors are like warnings that let them know that something with
 	 * their post isn't right.
 	 */
-	public array $minor_errors = array(
+	public array $minor_errors = [
 		'not_approved',
 		'new_replies',
 		'old_topic',
@@ -107,7 +103,7 @@ class Post implements ActionInterface
 		'topic_stickied',
 		'topic_unstickied',
 		'cannot_post_attachment',
-	);
+	];
 
 	/**
 	 * @var string
@@ -153,9 +149,9 @@ class Post implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'show' => 'show',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -170,7 +166,7 @@ class Post implements ActionInterface
 	 * of that board. Otherwise, it will contain a list of boards that the user
 	 * is allowed to post in.
 	 */
-	protected array $boards = array();
+	protected array $boards = [];
 
 	/**
 	 * @var array
@@ -178,7 +174,7 @@ class Post implements ActionInterface
 	 * A list of categories and boards produced by MessageIndex::getBoardList().
 	 * Not used if a board was specified in the URL parameters.
 	 */
-	protected array $board_list = array();
+	protected array $board_list = [];
 
 	/**
 	 * @var bool
@@ -220,16 +216,18 @@ public function execute(): void
 		$this->can_approve = User::$me->allowedTo('approve_posts');
 
 		// If there is an existing topic, load it.
-		if ($this->intent !== self::INTENT_NEW_TOPIC)
+		if ($this->intent !== self::INTENT_NEW_TOPIC) {
 			$this->loadTopic();
+		}
 
 		// Allow mods to add new sub-actions.
-		IntegrationHook::call('integrate_post_subactions', array(&self::$subactions));
+		IntegrationHook::call('integrate_post_subactions', [&self::$subactions]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -248,12 +246,14 @@ public function show(): void
 	{
 		Lang::load('Post');
 
-		if (!empty(Config::$modSettings['drafts_post_enabled']))
+		if (!empty(Config::$modSettings['drafts_post_enabled'])) {
 			Lang::load('Drafts');
+		}
 
 		// You can't reply with a poll... hacker.
-		if (isset($_REQUEST['poll']) && !empty(Topic::$topic_id) && !isset($_REQUEST['msg']))
+		if (isset($_REQUEST['poll']) && !empty(Topic::$topic_id) && !isset($_REQUEST['msg'])) {
 			unset($_REQUEST['poll']);
+		}
 
 		// Posting an event?
 		Utils::$context['make_event'] = isset($_REQUEST['calendar']);
@@ -264,8 +264,7 @@ public function show(): void
 		// Where are we posting this (or where might we)?
 		$this->setBoards();
 
-		if (isset($_REQUEST['xml']))
-		{
+		if (isset($_REQUEST['xml'])) {
 			Utils::$context['sub_template'] = 'post';
 
 			// Just in case of an earlier error...
@@ -277,19 +276,18 @@ public function show(): void
 		$this->loadNotifyPrefs();
 
 		// Replying to an existing topic.
-		if ($this->intent !== self::INTENT_NEW_TOPIC)
-		{
+		if ($this->intent !== self::INTENT_NEW_TOPIC) {
 			$this->initiateReply();
 		}
 		// Starting a new topic.
-		else
-		{
+		else {
 			$this->initiateNewTopic();
 		}
 
 		// Don't allow a post if it's locked and you aren't all powerful.
-		if ($this->locked && !User::$me->allowedTo('moderate_board'))
+		if ($this->locked && !User::$me->allowedTo('moderate_board')) {
 			ErrorHandler::fatalLang('topic_locked', false);
+		}
 
 		Utils::$context['notify'] = !empty(Utils::$context['notify']);
 
@@ -300,7 +298,7 @@ public function show(): void
 		Utils::$context['can_quote'] = empty(Config::$modSettings['disabledBBC']) || !in_array('quote', explode(',', Config::$modSettings['disabledBBC']));
 
 		// An array to hold all the attachments for this topic.
-		Utils::$context['current_attachments'] = array();
+		Utils::$context['current_attachments'] = [];
 
 		// Does the user want to create a poll?
 		$this->initiatePoll();
@@ -315,18 +313,15 @@ public function show(): void
 		$this->setResponsePrefix();
 
 		// Previewing, modifying, or posting?
-		if (isset($_REQUEST['message']) || isset($_REQUEST['quickReply']) || !empty(Utils::$context['post_error']))
-		{
+		if (isset($_REQUEST['message']) || isset($_REQUEST['quickReply']) || !empty(Utils::$context['post_error'])) {
 			$this->showPreview();
 		}
 		// Editing a message...
-		elseif ($this->intent === self::INTENT_EDIT_POST)
-		{
+		elseif ($this->intent === self::INTENT_EDIT_POST) {
 			$this->showEdit();
 		}
 		// Posting...
-		else
-		{
+		else {
 			$this->showNew();
 		}
 
@@ -346,7 +341,7 @@ public function show(): void
 		$this->setLinktree();
 
 		Utils::$context['subject'] = addcslashes($this->form_subject, '"');
-		Utils::$context['message'] = str_replace(array('"', '<', '>', '&nbsp;'), array('&quot;', '&lt;', '&gt;', ' '), $this->form_message);
+		Utils::$context['message'] = str_replace(['"', '<', '>', '&nbsp;'], ['&quot;', '&lt;', '&gt;', ' '], $this->form_message);
 
 		// Are there any drafts to show in the editor?
 		$this->loadDrafts();
@@ -369,19 +364,19 @@ public function show(): void
 		Security::checkSubmitOnce('register');
 
 		// Mentions
-		if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention'))
-		{
-			Theme::loadJavaScriptFile('jquery.caret.min.js', array('defer' => true), 'smf_caret');
-			Theme::loadJavaScriptFile('jquery.atwho.min.js', array('defer' => true), 'smf_atwho');
-			Theme::loadJavaScriptFile('mentions.js', array('defer' => true, 'minimize' => true), 'smf_mentions');
+		if (!empty(Config::$modSettings['enable_mentions']) && User::$me->allowedTo('mention')) {
+			Theme::loadJavaScriptFile('jquery.caret.min.js', ['defer' => true], 'smf_caret');
+			Theme::loadJavaScriptFile('jquery.atwho.min.js', ['defer' => true], 'smf_atwho');
+			Theme::loadJavaScriptFile('mentions.js', ['defer' => true, 'minimize' => true], 'smf_mentions');
 		}
 
 		// Load the drafts.js file
-		if (Utils::$context['drafts_autosave'])
-			Theme::loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
+		if (Utils::$context['drafts_autosave']) {
+			Theme::loadJavaScriptFile('drafts.js', ['defer' => false, 'minimize' => true], 'smf_drafts');
+		}
 
 		// quotedText.js
-		Theme::loadJavaScriptFile('quotedText.js', array('defer' => true, 'minimize' => true), 'smf_quotedText');
+		Theme::loadJavaScriptFile('quotedText.js', ['defer' => true, 'minimize' => true], 'smf_quotedText');
 
 		// Knowing the current board ID might be handy.
 		Theme::addInlineJavaScript('
@@ -391,8 +386,9 @@ public function show(): void
 		$this->setupPostingFields();
 
 		// Finally, load the template.
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('Post');
+		}
 
 		IntegrationHook::call('integrate_post_end');
 	}
@@ -408,8 +404,9 @@ public function show(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -427,7 +424,7 @@ public static function call(): void
 	 *
 	 * Needed to allow old mods to pass $post_errors as a function parameter.
 	 */
-	public static function post($post_errors = array()): void
+	public static function post($post_errors = []): void
 	{
 		self::load();
 		self::$obj->errors = (array) $post_errors;
@@ -460,24 +457,23 @@ protected function __construct()
 	 */
 	protected function getTopicSummary(): void
 	{
-		if (empty(Topic::$info->id) || empty(Config::$modSettings['topicSummaryPosts']))
+		if (empty(Topic::$info->id) || empty(Config::$modSettings['topicSummaryPosts'])) {
 			return;
+		}
 
-		if (isset($_REQUEST['xml']))
-		{
+		if (isset($_REQUEST['xml'])) {
 			$limit = '
 			LIMIT ' . (empty(Utils::$context['new_replies']) ? '0' : Utils::$context['new_replies']);
-		}
-		else
-		{
+		} else {
 			$limit = empty(Config::$modSettings['topicSummaryPosts']) ? '' : '
 			LIMIT ' . (int) Config::$modSettings['topicSummaryPosts'];
 		}
 
 		// If you're modifying, get only those posts before the current one. (otherwise get all.)
-		Utils::$context['previous_posts'] = array();
-		$request = Db::$db->query('', '
-			SELECT
+		Utils::$context['previous_posts'] = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time,
 				m.body, m.smileys_enabled, m.id_msg, m.id_member
 			FROM {db_prefix}messages AS m
@@ -486,23 +482,23 @@ protected function getTopicSummary(): void
 				AND m.id_msg < {int:id_msg}' : '') . (!Config::$modSettings['postmod_active'] || $this->can_approve ? '' : '
 				AND m.approved = {int:approved}') . '
 			ORDER BY m.id_msg DESC' . $limit,
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'id_msg' => isset($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0,
 				'approved' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Censor, BBC, ...
 			Lang::censorText($row['body']);
 
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-		 	IntegrationHook::call('integrate_getTopic_previous_post', array(&$row));
+			IntegrationHook::call('integrate_getTopic_previous_post', [&$row]);
 
 			// ...and store.
-			Utils::$context['previous_posts'][] = array(
+			Utils::$context['previous_posts'][] = [
 				'counter' => $this->counter++,
 				'poster' => $row['poster_name'],
 				'message' => $row['body'],
@@ -511,10 +507,11 @@ protected function getTopicSummary(): void
 				'id' => $row['id_msg'],
 				'is_new' => !empty(Utils::$context['new_replies']),
 				'is_ignored' => !empty(Config::$modSettings['enable_buddylist']) && !empty(Theme::$current->options['posts_apply_ignore_list']) && in_array($row['id_member'], User::$me->ignoreusers),
-			);
+			];
 
-			if (!empty(Utils::$context['new_replies']))
+			if (!empty(Utils::$context['new_replies'])) {
 				Utils::$context['new_replies']--;
+			}
 		}
 		Db::$db->free_result($request);
 	}
@@ -527,14 +524,11 @@ protected function getTopicSummary(): void
 	 */
 	protected function loadNotifyPrefs(): void
 	{
-		if (!empty(Topic::$info->id))
-		{
+		if (!empty(Topic::$info->id)) {
 			Utils::$context['notify_prefs'] = Topic::$info->getNotificationPrefs();
 			Utils::$context['auto_notify'] = !empty(Topic::$info->notify_prefs['msg_auto_notify']);
-		}
-		else
-		{
-			Utils::$context['notify_prefs'] = Notify::getNotifyPrefs(User::$me->id, array('topic_notify', 'msg_auto_notify'), true);
+		} else {
+			Utils::$context['notify_prefs'] = Notify::getNotifyPrefs(User::$me->id, ['topic_notify', 'msg_auto_notify'], true);
 			Utils::$context['auto_notify'] = !empty(Utils::$context['notify_prefs']['msg_auto_notify']);
 		}
 
@@ -547,33 +541,33 @@ protected function loadNotifyPrefs(): void
 	protected function setBoards(): void
 	{
 		// Not in a board? Fine, but we'll make them pick one eventually.
-		if (empty(Board::$info->id) || Utils::$context['make_event'])
-		{
+		if (empty(Board::$info->id) || Utils::$context['make_event']) {
 			// Get ids of all the boards they can post in.
-			$post_permissions = array('post_new');
+			$post_permissions = ['post_new'];
 
-			if (Config::$modSettings['postmod_active'])
+			if (Config::$modSettings['postmod_active']) {
 				$post_permissions[] = 'post_unapproved_topics';
+			}
 
 			$this->boards = User::$me->boardsAllowedTo($post_permissions);
 
-			if (empty($this->boards))
+			if (empty($this->boards)) {
 				ErrorHandler::fatalLang('cannot_post_new', false);
+			}
 
 			// Get a list of boards for the select menu
-			$boardListOptions = array(
+			$boardListOptions = [
 				'included_boards' => in_array(0, $this->boards) ? null : $this->boards,
 				'not_redirection' => true,
 				'use_permissions' => true,
 				'selected_board' => !empty(Board::$info->id) ? Board::$info->id : (Utils::$context['make_event'] && !empty(Config::$modSettings['cal_defaultboard']) ? Config::$modSettings['cal_defaultboard'] : $this->boards[0]),
-			);
+			];
 
 			$this->board_list = MessageIndex::getBoardList($boardListOptions);
 		}
 		// Let's keep things simple for ourselves.
-		else
-		{
-			$this->boards = array(Board::$info->id);
+		else {
+			$this->boards = [Board::$info->id];
 		}
 	}
 
@@ -584,41 +578,42 @@ protected function setBoards(): void
 	 */
 	protected function loadTopic(): void
 	{
-		if (empty(Topic::$topic_id) && !empty($_REQUEST['msg']))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic
+		if (empty(Topic::$topic_id) && !empty($_REQUEST['msg'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}messages
 				WHERE id_msg = {int:msg}
 				LIMIT 1',
-				array(
+				[
 					'msg' => (int) $_REQUEST['msg'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) != 1)
-			{
+
+			if (Db::$db->num_rows($request) != 1) {
 				unset($_REQUEST['msg'], $_POST['msg'], $_GET['msg']);
-			}
-			else
-			{
+			} else {
 				list(Topic::$topic_id) = Db::$db->fetch_row($request);
 			}
 			Db::$db->free_result($request);
 		}
 
 		// We expected a topic, but we don't have one.
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('not_a_topic');
+		}
 
 		Topic::load(Topic::$topic_id);
 
 		// Though the topic should be there, it might have vanished.
-		if (empty(Topic::$info->id))
+		if (empty(Topic::$info->id)) {
 			ErrorHandler::fatalLang('topic_doesnt_exist', 404);
+		}
 
 		// Did this topic suddenly move? Just checking...
-		if (isset(Board::$info->id) && Topic::$info->id_board != Board::$info->id)
+		if (isset(Board::$info->id) && Topic::$info->id_board != Board::$info->id) {
 			ErrorHandler::fatalLang('not_a_topic');
+		}
 	}
 
 	/**
@@ -630,47 +625,36 @@ protected function initiateReply(): void
 		Utils::$context['topic_last_message'] = Topic::$info->id_last_msg;
 
 		// If this topic already has a poll, they sure can't add another.
-		if (isset($_REQUEST['poll']) && Topic::$info->id_poll > 0)
+		if (isset($_REQUEST['poll']) && Topic::$info->id_poll > 0) {
 			unset($_REQUEST['poll']);
+		}
 
 		// New reply.
-		if ($this->intent === self::INTENT_NEW_REPLY)
-		{
+		if ($this->intent === self::INTENT_NEW_REPLY) {
 			// If guests can't post, kick them out.
-			if (User::$me->is_guest && !User::$me->allowedTo('post_reply_any') && (!Config::$modSettings['postmod_active'] || !User::$me->allowedTo('post_unapproved_replies_any')))
-			{
+			if (User::$me->is_guest && !User::$me->allowedTo('post_reply_any') && (!Config::$modSettings['postmod_active'] || !User::$me->allowedTo('post_unapproved_replies_any'))) {
 				User::$me->kickIfGuest();
 			}
 
 			// By default the reply will be approved...
 			$this->becomes_approved = true;
 
-			if (Topic::$info->id_member_started != User::$me->id || User::$me->is_guest)
-			{
-				if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_replies_any') && !User::$me->allowedTo('post_reply_any'))
-				{
+			if (Topic::$info->id_member_started != User::$me->id || User::$me->is_guest) {
+				if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_replies_any') && !User::$me->allowedTo('post_reply_any')) {
 					$this->becomes_approved = false;
-				}
-				else
-				{
+				} else {
 					User::$me->isAllowedTo('post_reply_any');
 				}
-			}
-			elseif (!User::$me->allowedTo('post_reply_any'))
-			{
-				if (Config::$modSettings['postmod_active'] && ((User::$me->allowedTo('post_unapproved_replies_own') && !User::$me->allowedTo('post_reply_own')) || User::$me->allowedTo('post_unapproved_replies_any')))
-				{
+			} elseif (!User::$me->allowedTo('post_reply_any')) {
+				if (Config::$modSettings['postmod_active'] && ((User::$me->allowedTo('post_unapproved_replies_own') && !User::$me->allowedTo('post_reply_own')) || User::$me->allowedTo('post_unapproved_replies_any'))) {
 					$this->becomes_approved = false;
-				}
-				else
-				{
+				} else {
 					User::$me->isAllowedTo('post_reply_own');
 				}
 			}
 		}
 		// Modifying an existing reply.
-		else
-		{
+		else {
 			$this->becomes_approved = true;
 		}
 
@@ -688,9 +672,8 @@ protected function initiateReply(): void
 		Utils::$context['sticky'] = isset($_REQUEST['sticky']) ? !empty($_REQUEST['sticky']) : Topic::$info->is_sticky;
 
 		// Check whether this is a really old post being bumped...
-		if (!empty(Config::$modSettings['oldTopicDays']) && Topic::$info->updated_timestamp + Config::$modSettings['oldTopicDays'] * 86400 < time() && empty(Topic::$info->is_sticky) && !isset($_REQUEST['subject']))
-		{
-			$this->errors[] = array('old_topic', array(Config::$modSettings['oldTopicDays']));
+		if (!empty(Config::$modSettings['oldTopicDays']) && Topic::$info->updated_timestamp + Config::$modSettings['oldTopicDays'] * 86400 < time() && empty(Topic::$info->is_sticky) && !isset($_REQUEST['subject'])) {
+			$this->errors[] = ['old_topic', [Config::$modSettings['oldTopicDays']]];
 		}
 	}
 
@@ -702,12 +685,9 @@ protected function initiateNewTopic(): void
 		// @todo Should use JavaScript to hide and show the warning based on the selection in the board select menu
 		$this->becomes_approved = true;
 
-		if (Config::$modSettings['postmod_active'] && !User::$me->allowedTo('post_new', $this->boards, true) && User::$me->allowedTo('post_unapproved_topics', $this->boards, true))
-		{
+		if (Config::$modSettings['postmod_active'] && !User::$me->allowedTo('post_new', $this->boards, true) && User::$me->allowedTo('post_unapproved_topics', $this->boards, true)) {
 			$this->becomes_approved = false;
-		}
-		else
-		{
+		} else {
 			User::$me->isAllowedTo('post_new', $this->boards, true);
 		}
 
@@ -717,7 +697,7 @@ protected function initiateNewTopic(): void
 		Utils::$context['sticky'] = !empty($_REQUEST['sticky']);
 
 		// What options should we show?
-		Utils::$context['can_lock'] = User::$me->allowedTo(array('lock_any', 'lock_own'), $this->boards, true);
+		Utils::$context['can_lock'] = User::$me->allowedTo(['lock_any', 'lock_own'], $this->boards, true);
 		Utils::$context['can_sticky'] = User::$me->allowedTo('make_sticky', $this->boards, true);
 		Utils::$context['can_move'] = User::$me->allowedTo('move_any', $this->boards, true);
 		Utils::$context['can_announce'] = User::$me->allowedTo('announce_topic', $this->boards, true) && $this->becomes_approved;
@@ -730,10 +710,10 @@ protected function initiateNewTopic(): void
 	protected function initiatePoll(): void
 	{
 		// Check the users permissions - is the user allowed to add or post a poll?
-		if (!isset($_REQUEST['poll']) || Config::$modSettings['pollMode'] != '1')
-		{
+		if (!isset($_REQUEST['poll']) || Config::$modSettings['pollMode'] != '1') {
 			unset($_REQUEST['poll'], $_POST['poll'], $_GET['poll']);
 			Utils::$context['make_poll'] = false;
+
 			return;
 		}
 
@@ -751,19 +731,23 @@ protected function initiatePoll(): void
 	 */
 	protected function initiateEvent(): void
 	{
-		if (empty(Utils::$context['make_event']))
+		if (empty(Utils::$context['make_event'])) {
 			return;
+		}
 
 		// They might want to pick a board.
-		if (!isset(Utils::$context['current_board']))
+		if (!isset(Utils::$context['current_board'])) {
 			Utils::$context['current_board'] = 0;
+		}
 
 		// Start loading up the event info.
-		if (isset($_REQUEST['eventid']))
+		if (isset($_REQUEST['eventid'])) {
 			list(Utils::$context['event']) = Event::load((int) $_REQUEST['eventid']);
+		}
 
-		if (!(Utils::$context['event'] instanceof Event))
+		if (!(Utils::$context['event'] instanceof Event)) {
 			Utils::$context['event'] = new Event(-1);
+		}
 
 		// Permissions check!
 		User::$me->isAllowedTo('calendar_post');
@@ -772,27 +756,22 @@ protected function initiateEvent(): void
 		$time_string = Time::getShortTimeFormat();
 
 		// Editing an event?  (but NOT previewing!?)
-		if (empty(Utils::$context['event']->new) && !isset($_REQUEST['subject']))
-		{
+		if (empty(Utils::$context['event']->new) && !isset($_REQUEST['subject'])) {
 			// If the user doesn't have permission to edit the post in this topic, redirect them.
-			if ((empty(Topic::$info->id_member_started) || Topic::$info->id_member_started != User::$me->id || !User::$me->allowedTo('modify_own')) && !User::$me->allowedTo('modify_any'))
-			{
+			if ((empty(Topic::$info->id_member_started) || Topic::$info->id_member_started != User::$me->id || !User::$me->allowedTo('modify_own')) && !User::$me->allowedTo('modify_any')) {
 				$calendar_action = Calendar::load();
 				$calendar_action->subaction = 'post';
 				$calendar_action->execute();
+
 				return;
 			}
-		}
-		else
-		{
+		} else {
 			// Make sure the year and month are in the valid range.
-			if (Utils::$context['event']->month < 1 || Utils::$context['event']->month > 12)
-			{
+			if (Utils::$context['event']->month < 1 || Utils::$context['event']->month > 12) {
 				ErrorHandler::fatalLang('invalid_month', false);
 			}
 
-			if (Utils::$context['event']->year < Config::$modSettings['cal_minyear'] || Utils::$context['event']->year > Config::$modSettings['cal_maxyear'])
-			{
+			if (Utils::$context['event']->year < Config::$modSettings['cal_minyear'] || Utils::$context['event']->year > Config::$modSettings['cal_maxyear']) {
 				ErrorHandler::fatalLang('invalid_year', false);
 			}
 
@@ -800,8 +779,7 @@ protected function initiateEvent(): void
 		}
 
 		// An all day event? Set up some nice defaults in case the user wants to change that
-		if (Utils::$context['event']->allday == true)
-		{
+		if (Utils::$context['event']->allday == true) {
 			Utils::$context['event']->tz = User::getTimezone();
 			Utils::$context['event']->start->modify(Time::create('now')->format('%H:%M:%S'));
 			Utils::$context['event']->end->modify(Time::create('now + 1 hour')->format('%H:%M:%S'));
@@ -833,42 +811,42 @@ protected function initiateEvent(): void
 	protected function checkForNewReplies(): void
 	{
 		// Only check if the user is trying to submit a new reply to a topic.
-		if (!empty($_REQUEST['msg']) || empty(Topic::$info->id))
+		if (!empty($_REQUEST['msg']) || empty(Topic::$info->id)) {
 			return;
+		}
 
 		// Only check if the user wants to be warned about new replies.
-		if (!empty(Theme::$current->options['no_new_reply_warning']))
+		if (!empty(Theme::$current->options['no_new_reply_warning'])) {
 			return;
+		}
 
 		// Is the last post when they started writing still the last post now?
-		if (!isset($_REQUEST['last_msg']) || Topic::$info->id_last_msg <= $_REQUEST['last_msg'])
+		if (!isset($_REQUEST['last_msg']) || Topic::$info->id_last_msg <= $_REQUEST['last_msg']) {
 			return;
+		}
 
 		// Figure out how many new replies were made while the user was writing.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}messages
 			WHERE id_topic = {int:current_topic}
 				AND id_msg > {int:last_msg}' . (!Config::$modSettings['postmod_active'] || $this->can_approve ? '' : '
 				AND approved = {int:approved}') . '
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$info->id,
 				'last_msg' => (int) $_REQUEST['last_msg'],
 				'approved' => 1,
-			)
+			],
 		);
 		list(Utils::$context['new_replies']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if (!empty(Utils::$context['new_replies']))
-		{
-			if (Utils::$context['new_replies'] == 1)
-			{
+		if (!empty(Utils::$context['new_replies'])) {
+			if (Utils::$context['new_replies'] == 1) {
 				Lang::$txt['error_new_replies'] = isset($_GET['last_msg']) ? Lang::$txt['error_new_reply_reading'] : Lang::$txt['error_new_reply'];
-			}
-			else
-			{
+			} else {
 				Lang::$txt['error_new_replies'] = sprintf(isset($_GET['last_msg']) ? Lang::$txt['error_new_replies_reading'] : Lang::$txt['error_new_replies'], Utils::$context['new_replies']);
 			}
 
@@ -883,14 +861,10 @@ protected function checkForNewReplies(): void
 	 */
 	protected function setResponsePrefix(): void
 	{
-		if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix')))
-		{
-			if (Lang::$default === User::$me->language)
-			{
+		if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix'))) {
+			if (Lang::$default === User::$me->language) {
 				Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
-			}
-			else
-			{
+			} else {
 				Lang::load('index', Lang::$default, false);
 				Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
 				Lang::load('index');
@@ -904,25 +878,26 @@ protected function setResponsePrefix(): void
 	 */
 	protected function showPreview(): void
 	{
-		if (isset($_REQUEST['quickReply']))
+		if (isset($_REQUEST['quickReply'])) {
 			$_REQUEST['message'] = $_REQUEST['quickReply'];
+		}
 
 		// Validate inputs.
-		if (empty(Utils::$context['post_error']))
-		{
+		if (empty(Utils::$context['post_error'])) {
 			// This means they didn't click Post and get an error.
 			$really_previewing = true;
-		}
-		else
-		{
-			if (!isset($_REQUEST['subject']))
+		} else {
+			if (!isset($_REQUEST['subject'])) {
 				$_REQUEST['subject'] = '';
+			}
 
-			if (!isset($_REQUEST['message']))
+			if (!isset($_REQUEST['message'])) {
 				$_REQUEST['message'] = '';
+			}
 
-			if (!isset($_REQUEST['icon']))
+			if (!isset($_REQUEST['icon'])) {
 				$_REQUEST['icon'] = 'xx';
+			}
 
 			// They are previewing if they asked to preview (i.e. came from quick reply).
 			$really_previewing = !empty($_POST['preview']);
@@ -934,58 +909,57 @@ protected function showPreview(): void
 		Utils::$context['can_announce'] &= $this->becomes_approved;
 
 		// Set up the inputs for the form.
-		$this->form_subject = strtr(Utils::htmlspecialchars($_REQUEST['subject']), array("\r" => '', "\n" => '', "\t" => ''));
+		$this->form_subject = strtr(Utils::htmlspecialchars($_REQUEST['subject']), ["\r" => '', "\n" => '', "\t" => '']);
 		$this->form_message = Utils::htmlspecialchars($_REQUEST['message'], ENT_QUOTES);
 
 		// Make sure the subject isn't too long - taking into account special characters.
-		if (Utils::entityStrlen($this->form_subject) > 100)
+		if (Utils::entityStrlen($this->form_subject) > 100) {
 			$this->form_subject = Utils::entitySubstr($this->form_subject, 0, 100);
+		}
 
-		if (isset($_REQUEST['poll']))
-		{
+		if (isset($_REQUEST['poll'])) {
 			Utils::$context['question'] = isset($_REQUEST['question']) ? Utils::htmlspecialchars(trim($_REQUEST['question'])) : '';
 
-			Utils::$context['choices'] = array();
+			Utils::$context['choices'] = [];
 			$choice_id = 0;
 
-			$_POST['options'] = empty($_POST['options']) ? array() : Utils::htmlspecialcharsRecursive($_POST['options']);
-			foreach ($_POST['options'] as $option)
-			{
-				if (trim($option) == '')
+			$_POST['options'] = empty($_POST['options']) ? [] : Utils::htmlspecialcharsRecursive($_POST['options']);
+
+			foreach ($_POST['options'] as $option) {
+				if (trim($option) == '') {
 					continue;
+				}
 
-				Utils::$context['choices'][] = array(
+				Utils::$context['choices'][] = [
 					'id' => $choice_id++,
 					'number' => $choice_id,
 					'label' => $option,
-					'is_last' => false
-				);
+					'is_last' => false,
+				];
 			}
 
 			// One empty option for those with js disabled...I know are few... :P
-			Utils::$context['choices'][] = array(
+			Utils::$context['choices'][] = [
 				'id' => $choice_id++,
 				'number' => $choice_id,
 				'label' => '',
-				'is_last' => false
-			);
+				'is_last' => false,
+			];
 
-			if (count(Utils::$context['choices']) < 2)
-			{
-				Utils::$context['choices'][] = array(
+			if (count(Utils::$context['choices']) < 2) {
+				Utils::$context['choices'][] = [
 					'id' => $choice_id++,
 					'number' => $choice_id,
 					'label' => '',
-					'is_last' => false
-				);
+					'is_last' => false,
+				];
 			}
 			Utils::$context['last_choice_id'] = $choice_id;
 			Utils::$context['choices'][count(Utils::$context['choices']) - 1]['is_last'] = true;
 		}
 
 		// Are you... a guest?
-		if (User::$me->is_guest)
-		{
+		if (User::$me->is_guest) {
 			$_REQUEST['guestname'] = !isset($_REQUEST['guestname']) ? '' : trim($_REQUEST['guestname']);
 			$_REQUEST['email'] = !isset($_REQUEST['email']) ? '' : trim($_REQUEST['email']);
 
@@ -998,8 +972,7 @@ protected function showPreview(): void
 		}
 
 		// Only show the preview stuff if they hit Preview.
-		if (($really_previewing == true || isset($_REQUEST['xml'])) && !isset($_REQUEST['save_draft']))
-		{
+		if (($really_previewing == true || isset($_REQUEST['xml'])) && !isset($_REQUEST['save_draft'])) {
 			// Set up the preview message and subject and censor them...
 			Utils::$context['preview_message'] = $this->form_message;
 			Msg::preparsecode($this->form_message, true);
@@ -1009,23 +982,19 @@ protected function showPreview(): void
 			Utils::$context['preview_message'] = BBCodeParser::load()->parse(Utils::$context['preview_message'], !isset($_REQUEST['ns']));
 			Lang::censorText(Utils::$context['preview_message']);
 
-			if ($this->form_subject != '')
-			{
+			if ($this->form_subject != '') {
 				Utils::$context['preview_subject'] = $this->form_subject;
 
 				Lang::censorText(Utils::$context['preview_subject']);
-			}
-			else
-			{
+			} else {
 				Utils::$context['preview_subject'] = '<em>' . Lang::$txt['no_subject'] . '</em>';
 			}
 
-			IntegrationHook::call('integrate_preview_post', array(&$this->form_message, &$this->form_subject));
+			IntegrationHook::call('integrate_preview_post', [&$this->form_message, &$this->form_subject]);
 
 			// Protect any CDATA blocks.
-			if (isset($_REQUEST['xml']))
-			{
-				Utils::$context['preview_message'] = strtr(Utils::$context['preview_message'], array(']]>' => ']]]]><![CDATA[>'));
+			if (isset($_REQUEST['xml'])) {
+				Utils::$context['preview_message'] = strtr(Utils::$context['preview_message'], [']]>' => ']]]]><![CDATA[>']);
 			}
 		}
 
@@ -1033,7 +1002,7 @@ protected function showPreview(): void
 		Utils::$context['notify'] = !empty($_REQUEST['notify']);
 		Utils::$context['use_smileys'] = !isset($_REQUEST['ns']);
 
-		Utils::$context['icon'] = isset($_REQUEST['icon']) ? preg_replace('~[\./\\\\*\':"<>]~', '', $_REQUEST['icon']) : 'xx';
+		Utils::$context['icon'] = isset($_REQUEST['icon']) ? preg_replace('~[./\\\\*\':"<>]~', '', $_REQUEST['icon']) : 'xx';
 
 		// Set the destination action for submission.
 		Utils::$context['destination'] = 'post2;start=' . $_REQUEST['start'] . (isset($_REQUEST['msg']) ? ';msg=' . $_REQUEST['msg'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] : '') . (isset($_REQUEST['poll']) ? ';poll' : '');
@@ -1041,11 +1010,11 @@ protected function showPreview(): void
 		Utils::$context['submit_label'] = isset($_REQUEST['msg']) ? Lang::$txt['save'] : Lang::$txt['post'];
 
 		// Previewing an edit?
-		if (isset($_REQUEST['msg']) && !empty(Topic::$info->id))
-		{
+		if (isset($_REQUEST['msg']) && !empty(Topic::$info->id)) {
 			// Get the existing message. Previewing.
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					m.id_member, m.modified_time, m.smileys_enabled, m.body,
 					m.poster_name, m.poster_email, m.subject, m.icon, m.approved,
 					t.id_member_started AS id_member_poster,
@@ -1055,76 +1024,63 @@ protected function showPreview(): void
 					LEFT JOIN {db_prefix}log_actions AS log ON (m.id_topic = log.id_topic AND log.action = {string:announce_action})
 				WHERE m.id_msg = {int:id_msg}
 					AND m.id_topic = {int:current_topic}',
-				array(
+				[
 					'current_topic' => Topic::$info->id,
 					'id_msg' => $_REQUEST['msg'],
 					'announce_action' => 'announce_topic',
-				)
+				],
 			);
+
 			// The message they were trying to edit was most likely deleted.
 			// @todo Change this error message?
-			if (Db::$db->num_rows($request) == 0)
-			{
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('no_board', false);
 			}
 			$row = Db::$db->fetch_assoc($request);
 			Db::$db->free_result($request);
 
-			if ($row['id_member'] == User::$me->id && !User::$me->allowedTo('modify_any'))
-			{
+			if ($row['id_member'] == User::$me->id && !User::$me->allowedTo('modify_any')) {
 				// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
-				if ($row['approved'] && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time())
-				{
+				if ($row['approved'] && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time()) {
 					ErrorHandler::fatalLang('modify_post_time_passed', false);
-				}
-				elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_own'))
-				{
+				} elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_own')) {
 					User::$me->isAllowedTo('modify_replies');
-				}
-				else
-				{
+				} else {
 					User::$me->isAllowedTo('modify_own');
 				}
-			}
-			elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_any'))
-			{
+			} elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_any')) {
 				User::$me->isAllowedTo('modify_replies');
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('modify_any');
 			}
 
-			if (Utils::$context['can_announce'] && !empty($row['id_action']) && $row['id_first_msg'] == $_REQUEST['msg'])
-			{
+			if (Utils::$context['can_announce'] && !empty($row['id_action']) && $row['id_first_msg'] == $_REQUEST['msg']) {
 				Lang::load('Errors');
 				Utils::$context['post_error']['already_announced'] = Lang::$txt['error_topic_already_announced'];
 			}
 
-			if (!empty(Config::$modSettings['attachmentEnable']))
-			{
+			if (!empty(Config::$modSettings['attachmentEnable'])) {
 				Utils::$context['current_attachments'] = Attachment::loadByMsg($_REQUEST['msg'], Attachment::APPROVED_ANY);
 			}
 
 			// Allow moderators to change names....
-			if (User::$me->allowedTo('moderate_forum') && !empty(Topic::$info->id))
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member, poster_name, poster_email
+			if (User::$me->allowedTo('moderate_forum') && !empty(Topic::$info->id)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, poster_name, poster_email
 					FROM {db_prefix}messages
 					WHERE id_msg = {int:id_msg}
 						AND id_topic = {int:current_topic}
 					LIMIT 1',
-					array(
+					[
 						'current_topic' => Topic::$info->id,
 						'id_msg' => (int) $_REQUEST['msg'],
-					)
+					],
 				);
 				$row = Db::$db->fetch_assoc($request);
 				Db::$db->free_result($request);
 
-				if (empty($row['id_member']))
-				{
+				if (empty($row['id_member'])) {
 					Utils::$context['name'] = Utils::htmlspecialchars($row['poster_name']);
 					Utils::$context['email'] = Utils::htmlspecialchars($row['poster_email']);
 				}
@@ -1145,8 +1101,9 @@ protected function showEdit(): void
 		$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 		// Get the existing message. Editing.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.id_member, m.modified_time, m.modified_name, m.modified_reason, m.smileys_enabled, m.body,
 				m.poster_name, m.poster_email, m.subject, m.icon, m.approved,
 				t.id_member_started AS id_member_poster,
@@ -1156,54 +1113,42 @@ protected function showEdit(): void
 				LEFT JOIN {db_prefix}log_actions AS log ON (m.id_topic = log.id_topic AND log.action = {string:announce_action})
 			WHERE m.id_msg = {int:id_msg}
 				AND m.id_topic = {int:current_topic}',
-			array(
+			[
 				'current_topic' => Topic::$info->id,
 				'id_msg' => $_REQUEST['msg'],
 				'announce_action' => 'announce_topic',
-			)
+			],
 		);
+
 		// The message they were trying to edit was most likely deleted.
-		if (Db::$db->num_rows($request) == 0)
-		{
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_message', false);
 		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
-		if ($row['id_member'] == User::$me->id && !User::$me->allowedTo('modify_any'))
-		{
+		if ($row['id_member'] == User::$me->id && !User::$me->allowedTo('modify_any')) {
 			// Give an extra five minutes over the disable time threshold, so they can type - assuming the post is public.
-			if ($row['approved'] && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time())
-			{
+			if ($row['approved'] && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time()) {
 				ErrorHandler::fatalLang('modify_post_time_passed', false);
-			}
-			elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_own'))
-			{
+			} elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_own')) {
 				User::$me->isAllowedTo('modify_replies');
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('modify_own');
 			}
-		}
-		elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_any'))
-		{
+		} elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('modify_any')) {
 			User::$me->isAllowedTo('modify_replies');
-		}
-		else
-		{
+		} else {
 			User::$me->isAllowedTo('modify_any');
 		}
 
-		if (Utils::$context['can_announce'] && !empty($row['id_action']) && $row['id_first_msg'] == $_REQUEST['msg'])
-		{
+		if (Utils::$context['can_announce'] && !empty($row['id_action']) && $row['id_first_msg'] == $_REQUEST['msg']) {
 			Lang::load('Errors');
 			Utils::$context['post_error']['already_announced'] = Lang::$txt['error_topic_already_announced'];
 		}
 
 		// When was it last modified?
-		if (!empty($row['modified_time']))
-		{
+		if (!empty($row['modified_time'])) {
 			Utils::$context['last_modified'] = Time::create('@' . $row['modified_time'])->format();
 			Utils::$context['last_modified_reason'] = Lang::censorText($row['modified_reason']);
 			Utils::$context['last_modified_text'] = sprintf(Lang::$txt['last_edit_by'], Utils::$context['last_modified'], $row['modified_name']) . empty($row['modified_reason']) ? '' : '&nbsp;' . Lang::$txt['last_edit_reason'] . ':&nbsp;' . $row['modified_reason'];
@@ -1220,18 +1165,17 @@ protected function showEdit(): void
 		Utils::$context['icon'] = $row['icon'];
 
 		// Leave the approval checkbox unchecked by default for unapproved messages.
-		if (!$row['approved'] && !empty(Utils::$context['show_approval']))
+		if (!$row['approved'] && !empty(Utils::$context['show_approval'])) {
 			Utils::$context['show_approval'] = 1;
+		}
 
 		// Load up 'em attachments!
-		if (!empty(Config::$modSettings['attachmentEnable']))
-		{
+		if (!empty(Config::$modSettings['attachmentEnable'])) {
 			Utils::$context['current_attachments'] = Attachment::loadByMsg($_REQUEST['msg'], Attachment::APPROVED_ANY);
 		}
 
 		// Allow moderators to change names....
-		if (User::$me->allowedTo('moderate_forum') && empty($row['id_member']))
-		{
+		if (User::$me->allowedTo('moderate_forum') && empty($row['id_member'])) {
 			Utils::$context['name'] = Utils::htmlspecialchars($row['poster_name']);
 			Utils::$context['email'] = Utils::htmlspecialchars($row['poster_email']);
 		}
@@ -1251,21 +1195,20 @@ protected function showNew(): void
 		Utils::$context['use_smileys'] = true;
 		Utils::$context['icon'] = 'xx';
 
-		if (User::$me->is_guest)
-		{
-			Utils::$context['name'] = isset($_SESSION['guest_name']) ? $_SESSION['guest_name'] : '';
-			Utils::$context['email'] = isset($_SESSION['guest_email']) ? $_SESSION['guest_email'] : '';
+		if (User::$me->is_guest) {
+			Utils::$context['name'] = $_SESSION['guest_name'] ?? '';
+			Utils::$context['email'] = $_SESSION['guest_email'] ?? '';
 		}
 		Utils::$context['destination'] = 'post2;start=' . $_REQUEST['start'] . (isset($_REQUEST['poll']) ? ';poll' : '');
 
 		Utils::$context['submit_label'] = Lang::$txt['post'];
 
 		// Posting a quoted reply?
-		if (!empty(Topic::$info->id) && !empty($_REQUEST['quote']))
-		{
+		if (!empty(Topic::$info->id) && !empty($_REQUEST['quote'])) {
 			// Make sure they _can_ quote this post, and if so get it.
-			$request = Db::$db->query('', '
-				SELECT m.subject, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.body
+			$request = Db::$db->query(
+				'',
+				'SELECT m.subject, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.body
 				FROM {db_prefix}messages AS m
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)' . (!Config::$modSettings['postmod_active'] || $this->can_approve ? '' : '
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)') . '
@@ -1274,21 +1217,20 @@ protected function showNew(): void
 					AND m.approved = {int:is_approved}
 					AND t.approved = {int:is_approved}') . '
 				LIMIT 1',
-				array(
+				[
 					'id_msg' => (int) $_REQUEST['quote'],
 					'is_approved' => 1,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('quoted_post_deleted', false);
 			}
 			list($this->form_subject, $mname, $mdate, $this->form_message) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Add 'Re: ' to the front of the quoted subject.
-			if (trim(Utils::$context['response_prefix']) != '' && Utils::entityStrpos($this->form_subject, trim(Utils::$context['response_prefix'])) !== 0)
-			{
+			if (trim(Utils::$context['response_prefix']) != '' && Utils::entityStrpos($this->form_subject, trim(Utils::$context['response_prefix'])) !== 0) {
 				$this->form_subject = Utils::$context['response_prefix'] . $this->form_subject;
 			}
 
@@ -1297,22 +1239,20 @@ protected function showNew(): void
 			Lang::censorText($this->form_subject);
 
 			// But if it's in HTML world, turn them into htmlspecialchar's so they can be edited!
-			if (strpos($this->form_message, '[html]') !== false)
-			{
+			if (strpos($this->form_message, '[html]') !== false) {
 				$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $this->form_message, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-				for ($i = 0, $n = count($parts); $i < $n; $i++)
-				{
+				for ($i = 0, $n = count($parts); $i < $n; $i++) {
 					// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
-					if ($i % 4 == 0)
+					if ($i % 4 == 0) {
 						$parts[$i] = preg_replace_callback(
 							'~\[html\](.+?)\[/html\]~is',
-							function($m)
-							{
-								return '[html]' . preg_replace('~<br\s?/?' . '>~i', '&lt;br /&gt;<br>', "$m[1]") . '[/html]';
+							function ($m) {
+								return '[html]' . preg_replace('~<br\s?/?' . '>~i', '&lt;br /&gt;<br>', "{$m[1]}") . '[/html]';
 							},
-							$parts[$i]
+							$parts[$i],
 						);
+					}
 				}
 
 				$this->form_message = implode('', $parts);
@@ -1321,23 +1261,20 @@ function($m)
 			$this->form_message = preg_replace('~<br ?/?' . '>~i', "\n", $this->form_message);
 
 			// Remove any nested quotes, if necessary.
-			if (!empty(Config::$modSettings['removeNestedQuotes']))
-			{
-				$this->form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $this->form_message);
+			if (!empty(Config::$modSettings['removeNestedQuotes'])) {
+				$this->form_message = preg_replace(['~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'], '', $this->form_message);
 			}
 
 			// Add a quote string on the front and end.
 			$this->form_message = '[quote author=' . $mname . ' link=msg=' . (int) $_REQUEST['quote'] . ' date=' . $mdate . ']' . "\n" . rtrim($this->form_message) . "\n" . '[/quote]';
 		}
 		// Posting a reply without a quote?
-		elseif (!empty(Topic::$info->id) && empty($_REQUEST['quote']))
-		{
+		elseif (!empty(Topic::$info->id) && empty($_REQUEST['quote'])) {
 			// Get the first message's subject.
 			$this->form_subject = Topic::$info->subject;
 
 			// Add 'Re: ' to the front of the subject.
-			if (trim(Utils::$context['response_prefix']) != '' && $this->form_subject != '' && Utils::entityStrpos($this->form_subject, trim(Utils::$context['response_prefix'])) !== 0)
-			{
+			if (trim(Utils::$context['response_prefix']) != '' && $this->form_subject != '' && Utils::entityStrpos($this->form_subject, trim(Utils::$context['response_prefix'])) !== 0) {
 				$this->form_subject = Utils::$context['response_prefix'] . $this->form_subject;
 			}
 
@@ -1345,10 +1282,8 @@ function($m)
 			Lang::censorText($this->form_subject);
 
 			$this->form_message = '';
-		}
-		else
-		{
-			$this->form_subject = isset($_GET['subject']) ? $_GET['subject'] : '';
+		} else {
+			$this->form_subject = $_GET['subject'] ?? '';
 			$this->form_message = '';
 		}
 	}
@@ -1359,132 +1294,115 @@ function($m)
 	protected function showAttachments(): void
 	{
 		// Clear out prior attachment activity when starting afresh
-		if (empty($_REQUEST['message']) && empty($_REQUEST['preview']) && !empty($_SESSION['already_attached']))
-		{
-			foreach ($_SESSION['already_attached'] as $attachID => $attachment)
-				Attachment::remove(array('id_attach' => $attachID));
+		if (empty($_REQUEST['message']) && empty($_REQUEST['preview']) && !empty($_SESSION['already_attached'])) {
+			foreach ($_SESSION['already_attached'] as $attachID => $attachment) {
+				Attachment::remove(['id_attach' => $attachID]);
+			}
 
 			unset($_SESSION['already_attached']);
 		}
 
 		Utils::$context['can_post_attachment'] = !empty(Config::$modSettings['attachmentEnable']) && Config::$modSettings['attachmentEnable'] == 1 && (User::$me->allowedTo('post_attachment', $this->boards, true) || (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_attachments', $this->boards, true)));
 
-		if (Utils::$context['can_post_attachment'])
-		{
+		if (Utils::$context['can_post_attachment']) {
 			// If there are attachments, calculate the total size and how many.
 			Utils::$context['attachments']['total_size'] = 0;
 			Utils::$context['attachments']['quantity'] = 0;
 
 			// If this isn't a new post, check the current attachments.
-			if (isset($_REQUEST['msg']))
-			{
+			if (isset($_REQUEST['msg'])) {
 				Utils::$context['attachments']['quantity'] = count(Utils::$context['current_attachments']);
 
-				foreach (Utils::$context['current_attachments'] as $attachment)
+				foreach (Utils::$context['current_attachments'] as $attachment) {
 					Utils::$context['attachments']['total_size'] += $attachment['size'];
+				}
 			}
 
 			// A bit of house keeping first.
-			if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
+			if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
 				unset($_SESSION['temp_attachments']);
+			}
 
-			if (!empty($_SESSION['temp_attachments']))
-			{
+			if (!empty($_SESSION['temp_attachments'])) {
 				// Is this a request to delete them?
-				if (isset($_GET['delete_temp']))
-				{
-					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-					{
-						if (strpos($attachID, 'post_tmp_' . User::$me->id) !== false)
-						{
-							if (file_exists($attachment['tmp_name']))
+				if (isset($_GET['delete_temp'])) {
+					foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+						if (strpos($attachID, 'post_tmp_' . User::$me->id) !== false) {
+							if (file_exists($attachment['tmp_name'])) {
 								unlink($attachment['tmp_name']);
+							}
 						}
 					}
 
 					$this->errors[] = 'temp_attachments_gone';
-					$_SESSION['temp_attachments'] = array();
+					$_SESSION['temp_attachments'] = [];
 				}
 				// Hmm, coming in fresh and there are files in session.
-				elseif ($this->subaction != 'submit' || !empty($_POST['from_qr']))
-				{
+				elseif ($this->subaction != 'submit' || !empty($_POST['from_qr'])) {
 					// Let's be nice and see if they belong here first.
-					if ((empty($_REQUEST['msg']) && empty($_SESSION['temp_attachments']['post']['msg']) && $_SESSION['temp_attachments']['post']['board'] == (!empty(Board::$info->id) ? Board::$info->id : 0)) || (!empty($_REQUEST['msg']) && $_SESSION['temp_attachments']['post']['msg'] == $_REQUEST['msg']))
-					{
+					if ((empty($_REQUEST['msg']) && empty($_SESSION['temp_attachments']['post']['msg']) && $_SESSION['temp_attachments']['post']['board'] == (!empty(Board::$info->id) ? Board::$info->id : 0)) || (!empty($_REQUEST['msg']) && $_SESSION['temp_attachments']['post']['msg'] == $_REQUEST['msg'])) {
 						// See if any files still exist before showing the warning message and the files attached.
-						foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-						{
-							if (strpos($attachID, 'post_tmp_' . User::$me->id) === false)
+						foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+							if (strpos($attachID, 'post_tmp_' . User::$me->id) === false) {
 								continue;
+							}
 
-							if (file_exists($attachment['tmp_name']))
-							{
+							if (file_exists($attachment['tmp_name'])) {
 								$this->errors[] = 'temp_attachments_new';
 								Utils::$context['files_in_session_warning'] = Lang::$txt['attached_files_in_session'];
 								unset($_SESSION['temp_attachments']['post']['files']);
 								break;
 							}
 						}
-					}
-					else
-					{
+					} else {
 						// Since, they don't belong here. Let's inform the user that they exist..
-						if (!empty(Topic::$info->id))
-						{
+						if (!empty(Topic::$info->id)) {
 							$delete_url = Config::$scripturl . '?action=post' . (!empty($_REQUEST['msg']) ? (';msg=' . $_REQUEST['msg']) : '') . (!empty($_REQUEST['last_msg']) ? (';last_msg=' . $_REQUEST['last_msg']) : '') . ';topic=' . Topic::$info->id . ';delete_temp';
-						}
-						else
-						{
+						} else {
 							$delete_url = Config::$scripturl . '?action=post' . (!empty(Board::$info->id) ? ';board=' . Board::$info->id : '') . ';delete_temp';
 						}
 
 						// Compile a list of the files to show the user.
-						$file_list = array();
+						$file_list = [];
 
-						foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-						{
-							if (strpos($attachID, 'post_tmp_' . User::$me->id) !== false)
+						foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+							if (strpos($attachID, 'post_tmp_' . User::$me->id) !== false) {
 								$file_list[] = $attachment['name'];
+							}
 						}
 
 						$_SESSION['temp_attachments']['post']['files'] = $file_list;
 						$file_list = '<div class="attachments">' . implode('<br>', $file_list) . '</div>';
 
-						if (!empty($_SESSION['temp_attachments']['post']['msg']))
-						{
+						if (!empty($_SESSION['temp_attachments']['post']['msg'])) {
 							// We have a message id, so we can link back to the old topic they were trying to edit..
 							$goback_url = Config::$scripturl . '?action=post' . (!empty($_SESSION['temp_attachments']['post']['msg']) ? (';msg=' . $_SESSION['temp_attachments']['post']['msg']) : '') . (!empty($_SESSION['temp_attachments']['post']['last_msg']) ? (';last_msg=' . $_SESSION['temp_attachments']['post']['last_msg']) : '') . ';topic=' . $_SESSION['temp_attachments']['post']['topic'] . ';additionalOptions';
 
-							$this->errors[] = array('temp_attachments_found', array($delete_url, $goback_url, $file_list));
+							$this->errors[] = ['temp_attachments_found', [$delete_url, $goback_url, $file_list]];
 
 							Utils::$context['ignore_temp_attachments'] = true;
-						}
-						else
-						{
-							$this->errors[] = array('temp_attachments_lost', array($delete_url, $file_list));
+						} else {
+							$this->errors[] = ['temp_attachments_lost', [$delete_url, $file_list]];
 
 							Utils::$context['ignore_temp_attachments'] = true;
 						}
 					}
 				}
 
-				if (!empty(Utils::$context['we_are_history']))
+				if (!empty(Utils::$context['we_are_history'])) {
 					$this->errors[] = Utils::$context['we_are_history'];
+				}
 
-				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				{
-					if (isset(Utils::$context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files']))
-					{
+				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+					if (isset(Utils::$context['ignore_temp_attachments']) || isset($_SESSION['temp_attachments']['post']['files'])) {
 						break;
 					}
 
-					if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . User::$me->id) === false)
-					{
+					if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . User::$me->id) === false) {
 						continue;
 					}
 
-					if ($attachID == 'initial_error')
-					{
+					if ($attachID == 'initial_error') {
 						Lang::$txt['error_attach_initial_error'] = Lang::$txt['attach_no_upload'] . '<div style="padding: 0 1em;">' . (is_array($attachment) ? vsprintf(Lang::$txt[$attachment[0]], (array) $attachment[1]) : Lang::$txt[$attachment]) . '</div>';
 
 						$this->errors[] = 'attach_initial_error';
@@ -1495,14 +1413,12 @@ protected function showAttachments(): void
 					}
 
 					// Show any errors which might have occurred.
-					if (!empty($attachment['errors']))
-					{
+					if (!empty($attachment['errors'])) {
 						Lang::$txt['error_attach_errors'] = empty(Lang::$txt['error_attach_errors']) ? '<br>' : '';
 
 						Lang::$txt['error_attach_errors'] .= sprintf(Lang::$txt['attach_warning'], $attachment['name']) . '<div style="padding: 0 1em;">';
 
-						foreach ($attachment['errors'] as $error)
-						{
+						foreach ($attachment['errors'] as $error) {
 							Lang::$txt['error_attach_errors'] .= (is_array($error) ? vsprintf(Lang::$txt[$error[0]], (array) $error[1]) : Lang::$txt[$error]) . '<br >';
 						}
 
@@ -1513,15 +1429,15 @@ protected function showAttachments(): void
 						// Take out the trash.
 						unset($_SESSION['temp_attachments'][$attachID]);
 
-						if (file_exists($attachment['tmp_name']))
+						if (file_exists($attachment['tmp_name'])) {
 							unlink($attachment['tmp_name']);
+						}
 
 						continue;
 					}
 
 					// More house keeping.
-					if (!file_exists($attachment['tmp_name']))
-					{
+					if (!file_exists($attachment['tmp_name'])) {
 						unset($_SESSION['temp_attachments'][$attachID]);
 
 						continue;
@@ -1530,12 +1446,11 @@ protected function showAttachments(): void
 					Utils::$context['attachments']['quantity']++;
 					Utils::$context['attachments']['total_size'] += $attachment['size'];
 
-					if (!isset(Utils::$context['files_in_session_warning']))
-					{
+					if (!isset(Utils::$context['files_in_session_warning'])) {
 						Utils::$context['files_in_session_warning'] = Lang::$txt['attached_files_in_session'];
 					}
 
-					Utils::$context['current_attachments'][$attachID] = array(
+					Utils::$context['current_attachments'][$attachID] = [
 						'name' => $attachment['name'],
 						'size' => $attachment['size'],
 						'attachID' => $attachID,
@@ -1544,67 +1459,59 @@ protected function showAttachments(): void
 						'approved' => 1,
 						'mime_type' => '',
 						'thumb' => 0,
-					);
+					];
 				}
 			}
 		}
 
 		// Allow user to see previews for all of this post's attachments, even if the post hasn't been submitted yet.
-		if (!isset($_SESSION['attachments_can_preview']))
-			$_SESSION['attachments_can_preview'] = array();
+		if (!isset($_SESSION['attachments_can_preview'])) {
+			$_SESSION['attachments_can_preview'] = [];
+		}
 
-		if (!empty($_SESSION['already_attached']))
-		{
+		if (!empty($_SESSION['already_attached'])) {
 			$_SESSION['attachments_can_preview'] += array_fill_keys(array_keys($_SESSION['already_attached']), true);
 		}
 
-		foreach (Utils::$context['current_attachments'] as $attachID => $attachment)
-		{
+		foreach (Utils::$context['current_attachments'] as $attachID => $attachment) {
 			$_SESSION['attachments_can_preview'][$attachID] = true;
 
-			if (!empty($attachment['thumb']))
+			if (!empty($attachment['thumb'])) {
 				$_SESSION['attachments_can_preview'][$attachment['thumb']] = true;
+			}
 		}
 
 		// Previously uploaded attachments have 2 flavors:
 		// - Existing post - at this point, now in Utils::$context['current_attachments']
 		// - Just added, current session only - at this point, now in $_SESSION['already_attached']
 		// We need to make sure *all* of these are in Utils::$context['current_attachments'], otherwise they won't show in dropzone during edits.
-		if (!empty($_SESSION['already_attached']))
-		{
+		if (!empty($_SESSION['already_attached'])) {
 			Utils::$context['current_attachments'] = Attachment::load($_SESSION['already_attached'], Attachment::APPROVED_ANY, Attachment::TYPE_STANDARD);
 		}
 
 		// If the user can post attachments prepare the warning labels.
-		if (Utils::$context['can_post_attachment'])
-		{
+		if (Utils::$context['can_post_attachment']) {
 			// If they've unchecked an attachment, they may still want to attach that many more files, but don't allow more than num_allowed_attachments.
 			Utils::$context['num_allowed_attachments'] = empty(Config::$modSettings['attachmentNumPerPostLimit']) ? PHP_INT_MAX : Config::$modSettings['attachmentNumPerPostLimit'];
 
 			Utils::$context['can_post_attachment_unapproved'] = User::$me->allowedTo('post_attachment');
 
-			Utils::$context['attachment_restrictions'] = array();
+			Utils::$context['attachment_restrictions'] = [];
 
-			Utils::$context['allowed_extensions'] = !empty(Config::$modSettings['attachmentCheckExtensions']) ? (strtr(strtolower(Config::$modSettings['attachmentExtensions']), array(',' => ', '))) : '';
+			Utils::$context['allowed_extensions'] = !empty(Config::$modSettings['attachmentCheckExtensions']) ? (strtr(strtolower(Config::$modSettings['attachmentExtensions']), [',' => ', '])) : '';
 
-			$attachmentRestrictionTypes = array('attachmentNumPerPostLimit', 'attachmentPostLimit', 'attachmentSizeLimit');
+			$attachmentRestrictionTypes = ['attachmentNumPerPostLimit', 'attachmentPostLimit', 'attachmentSizeLimit'];
 
-			foreach ($attachmentRestrictionTypes as $type)
-			{
-				if (!empty(Config::$modSettings[$type]))
-				{
+			foreach ($attachmentRestrictionTypes as $type) {
+				if (!empty(Config::$modSettings[$type])) {
 					Utils::$context['attachment_restrictions'][$type] = sprintf(Lang::$txt['attach_restrict_' . $type . (Config::$modSettings[$type] >= 1024 ? '_MB' : '')], Lang::numberFormat(Config::$modSettings[$type] >= 1024 ? Config::$modSettings[$type] / 1024 : Config::$modSettings[$type], 2));
 
 					// Show the max number of attachments if not 0.
-					if ($type == 'attachmentNumPerPostLimit')
-					{
+					if ($type == 'attachmentNumPerPostLimit') {
 						Utils::$context['attachment_restrictions'][$type] .= ' (' . sprintf(Lang::$txt['attach_remaining'], max(Config::$modSettings['attachmentNumPerPostLimit'] - Utils::$context['attachments']['quantity'], 0)) . ')';
+					} elseif ($type == 'attachmentPostLimit' && Utils::$context['attachments']['total_size'] > 0) {
+						Utils::$context['attachment_restrictions'][$type] .= '<span class="attach_available"> (' . sprintf(Lang::$txt['attach_available'], round(max(Config::$modSettings['attachmentPostLimit'] - (Utils::$context['attachments']['total_size'] / 1024), 0), 2)) . ')</span>';
 					}
-					elseif ($type == 'attachmentPostLimit' && Utils::$context['attachments']['total_size'] > 0)
-					{
-	 					Utils::$context['attachment_restrictions'][$type] .= '<span class="attach_available"> (' . sprintf(Lang::$txt['attach_available'], round(max(Config::$modSettings['attachmentPostLimit'] - (Utils::$context['attachments']['total_size'] / 1024), 0), 2)) . ')</span>';
-					}
-
 				}
 			}
 		}
@@ -1612,10 +1519,9 @@ protected function showAttachments(): void
 		Theme::addInlineJavaScript('
 		var current_attachments = [];');
 
-		if (!empty(Utils::$context['current_attachments']))
-		{
+		if (!empty(Utils::$context['current_attachments'])) {
 			// Mock files to show already attached files.
-			foreach (Utils::$context['current_attachments'] as $key => $mock)
+			foreach (Utils::$context['current_attachments'] as $key => $mock) {
 				Theme::addInlineJavaScript('
 		current_attachments.push({
 			name: ' . Utils::JavaScriptEscape($mock['name']) . ',
@@ -1625,21 +1531,20 @@ protected function showAttachments(): void
 			type: ' . Utils::JavaScriptEscape(!empty($mock['mime_type']) ? $mock['mime_type'] : '') . ',
 			thumbID: ' . (!empty($mock['thumb']) ? $mock['thumb'] : 0) . '
 		});');
+			}
 		}
 
 		// File Upload.
-		if (Utils::$context['can_post_attachment'])
-		{
+		if (Utils::$context['can_post_attachment']) {
 			$acceptedFiles = empty(Utils::$context['allowed_extensions']) ? '' : implode(',', array_map(
-				function ($val)
-				{
+				function ($val) {
 					return !empty($val) ? ('.' . Utils::htmlTrim($val)) : '';
 				},
-				explode(',', Utils::$context['allowed_extensions'])
+				explode(',', Utils::$context['allowed_extensions']),
 			));
 
-			Theme::loadJavaScriptFile('dropzone.min.js', array('defer' => true), 'smf_dropzone');
-			Theme::loadJavaScriptFile('smf_fileUpload.js', array('defer' => true, 'minimize' => true), 'smf_fileUpload');
+			Theme::loadJavaScriptFile('dropzone.min.js', ['defer' => true], 'smf_dropzone');
+			Theme::loadJavaScriptFile('smf_fileUpload.js', ['defer' => true, 'minimize' => true], 'smf_fileUpload');
 			Theme::addInlineJavaScript('
 		$(function() {
 			smf_fileUpload({
@@ -1671,7 +1576,7 @@ function ($val)
 		});', true);
 		}
 
-		Theme::loadCSSFile('attachments.css', array('minimize' => true, 'order_pos' => 450), 'smf_attachments');
+		Theme::loadCSSFile('attachments.css', ['minimize' => true, 'order_pos' => 450], 'smf_attachments');
 	}
 
 	/**
@@ -1681,12 +1586,14 @@ protected function showVerification(): void
 	{
 		Utils::$context['require_verification'] = !User::$me->is_mod && !User::$me->is_admin && !empty(Config::$modSettings['posts_require_captcha']) && (User::$me->posts < Config::$modSettings['posts_require_captcha'] || (User::$me->is_guest && Config::$modSettings['posts_require_captcha'] == -1));
 
-		if (Utils::$context['require_verification'])
-			$verifier = new Verifier(array('id' => 'post'));
+		if (Utils::$context['require_verification']) {
+			$verifier = new Verifier(['id' => 'post']);
+		}
 
 		// If they came from quick reply, and have to enter verification details, give them some notice.
-		if (!empty($_REQUEST['from_qr']) && !empty(Utils::$context['require_verification']))
+		if (!empty($_REQUEST['from_qr']) && !empty(Utils::$context['require_verification'])) {
 			$this->errors[] = 'need_qr_verification';
+		}
 	}
 
 	/**
@@ -1694,33 +1601,32 @@ protected function showVerification(): void
 	 */
 	protected function checkForErrors(): void
 	{
-		IntegrationHook::call('integrate_post_errors', array(&$this->errors, &$this->minor_errors, $this->form_message, $this->form_subject));
+		IntegrationHook::call('integrate_post_errors', [&$this->errors, &$this->minor_errors, $this->form_message, $this->form_subject]);
 
-		if (empty($this->errors))
+		if (empty($this->errors)) {
 			return;
+		}
 
 		Lang::load('Errors');
 		Utils::$context['error_type'] = 'minor';
 
-		foreach ($this->errors as $post_error)
-		{
-			if (is_array($post_error))
-			{
+		foreach ($this->errors as $post_error) {
+			if (is_array($post_error)) {
 				$post_error_id = $post_error[0];
 
 				Utils::$context['post_error'][$post_error_id] = vsprintf(Lang::$txt['error_' . $post_error_id], (array) $post_error[1]);
 
 				// If it's not a minor error flag it as such.
-				if (!in_array($post_error_id, $this->minor_errors))
+				if (!in_array($post_error_id, $this->minor_errors)) {
 					Utils::$context['error_type'] = 'serious';
-			}
-			else
-			{
+				}
+			} else {
 				Utils::$context['post_error'][$post_error] = Lang::$txt['error_' . $post_error];
 
 				// If it's not a minor error flag it as such.
-				if (!in_array($post_error, $this->minor_errors))
+				if (!in_array($post_error, $this->minor_errors)) {
 					Utils::$context['error_type'] = 'serious';
+				}
 			}
 		}
 	}
@@ -1730,28 +1636,17 @@ protected function checkForErrors(): void
 	 */
 	protected function setPageTitle(): void
 	{
-		if (isset($_REQUEST['poll']))
-		{
+		if (isset($_REQUEST['poll'])) {
 			Utils::$context['page_title'] = Lang::$txt['new_poll'];
-		}
-		elseif (Utils::$context['make_event'])
-		{
+		} elseif (Utils::$context['make_event']) {
 			Utils::$context['page_title'] = Utils::$context['event']->id == -1 ? Lang::$txt['calendar_post_event'] : Lang::$txt['calendar_edit'];
-		}
-		elseif (isset($_REQUEST['msg']))
-		{
+		} elseif (isset($_REQUEST['msg'])) {
 			Utils::$context['page_title'] = Lang::$txt['modify_msg'];
-		}
-		elseif (isset($_REQUEST['subject'], Utils::$context['preview_subject']))
-		{
+		} elseif (isset($_REQUEST['subject'], Utils::$context['preview_subject'])) {
 			Utils::$context['page_title'] = Lang::$txt['preview'] . ' - ' . strip_tags(Utils::$context['preview_subject']);
-		}
-		elseif (empty(Topic::$info->id))
-		{
+		} elseif (empty(Topic::$info->id)) {
 			Utils::$context['page_title'] = Lang::$txt['start_new_topic'];
-		}
-		else
-		{
+		} else {
 			Utils::$context['page_title'] = Lang::$txt['post_reply'];
 		}
 	}
@@ -1761,20 +1656,17 @@ protected function setPageTitle(): void
 	 */
 	protected function setLinktree(): void
 	{
-		if (empty(Topic::$info->id))
-		{
-			Utils::$context['linktree'][] = array(
-				'name' => '<em>' . Lang::$txt['start_new_topic'] . '</em>'
-			);
-		}
-		else
-		{
-			Utils::$context['linktree'][] = array(
+		if (empty(Topic::$info->id)) {
+			Utils::$context['linktree'][] = [
+				'name' => '<em>' . Lang::$txt['start_new_topic'] . '</em>',
+			];
+		} else {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?topic=' . Topic::$info->id . '.' . $_REQUEST['start'],
 				'name' => $this->form_subject,
 				'extra_before' => '<span><strong class="nav">' . Utils::$context['page_title'] . ' (</strong></span>',
-				'extra_after' => '<span><strong class="nav">)</strong></span>'
-			);
+				'extra_after' => '<span><strong class="nav">)</strong></span>',
+			];
 		}
 	}
 
@@ -1789,14 +1681,12 @@ protected function loadDrafts(): void
 		Utils::$context['drafts_autosave'] = !empty(Utils::$context['drafts_save']) && !empty(Config::$modSettings['drafts_autosave_enabled']) && User::$me->allowedTo('post_autosave_draft') && !empty(Theme::$current->options['drafts_autosave_enabled']);
 
 		// Build a list of drafts that they can load in to the editor
-		if (!empty(Utils::$context['drafts_save']))
-		{
+		if (!empty(Utils::$context['drafts_save'])) {
 			Draft::showInEditor(User::$me->id, Topic::$topic_id);
 
 			// Has a specific draft has been selected?
 			// Load its data if there is not a message already in the editor.
-			if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-			{
+			if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
 				$draft = new Draft((int) $_REQUEST['id_draft'], true);
 				$draft->prepare();
 			}
@@ -1808,19 +1698,19 @@ protected function loadDrafts(): void
 	 */
 	protected function loadEditor(): void
 	{
-		new Editor(array(
+		new Editor([
 			'id' => 'message',
 			'value' => Utils::$context['message'],
-			'labels' => array(
+			'labels' => [
 				'post_button' => Utils::$context['submit_label'],
-			),
+			],
 			// add height and width for the editor
 			'height' => '175px',
 			'width' => '100%',
 			// We do XML preview here.
 			'preview_type' => Editor::PREVIEW_XML,
 			'required' => true,
-		));
+		]);
 	}
 
 	/**
@@ -1831,16 +1721,14 @@ protected function setMessageIcons(): void
 		// Message icons - customized icons are off?
 		Utils::$context['icons'] = Editor::getMessageIcons(!empty(Board::$info->id) ? Board::$info->id : 0);
 
-		if (!empty(Utils::$context['icons']))
+		if (!empty(Utils::$context['icons'])) {
 			Utils::$context['icons'][count(Utils::$context['icons']) - 1]['is_last'] = true;
+		}
 
 		// Are we starting a poll? if set the poll icon as selected if its available
-		if (isset($_REQUEST['poll']))
-		{
-			foreach (Utils::$context['icons'] as $icons)
-			{
-				if (isset($icons['value']) && $icons['value'] == 'poll')
-				{
+		if (isset($_REQUEST['poll'])) {
+			foreach (Utils::$context['icons'] as $icons) {
+				if (isset($icons['value']) && $icons['value'] == 'poll') {
 					// if found we are done
 					Utils::$context['icon'] = 'poll';
 					break;
@@ -1850,25 +1738,24 @@ protected function setMessageIcons(): void
 
 		Utils::$context['icon_url'] = '';
 
-		for ($i = 0, $n = count(Utils::$context['icons']); $i < $n; $i++)
-		{
+		for ($i = 0, $n = count(Utils::$context['icons']); $i < $n; $i++) {
 			Utils::$context['icons'][$i]['selected'] = Utils::$context['icon'] == Utils::$context['icons'][$i]['value'];
 
-			if (Utils::$context['icons'][$i]['selected'])
+			if (Utils::$context['icons'][$i]['selected']) {
 				Utils::$context['icon_url'] = Utils::$context['icons'][$i]['url'];
+			}
 		}
 
-		if (empty(Utils::$context['icon_url']))
-		{
+		if (empty(Utils::$context['icon_url'])) {
 			Utils::$context['icon_url'] = Theme::$current->settings[file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . Utils::$context['icon'] . '.png') ? 'images_url' : 'default_images_url'] . '/post/' . Utils::$context['icon'] . '.png';
 
-			array_unshift(Utils::$context['icons'], array(
+			array_unshift(Utils::$context['icons'], [
 				'value' => Utils::$context['icon'],
 				'name' => Lang::$txt['current_icon'],
 				'url' => Utils::$context['icon_url'],
 				'is_last' => empty(Utils::$context['icons']),
 				'selected' => true,
-			));
+			]);
 		}
 	}
 
@@ -1998,139 +1885,134 @@ protected function setupPostingFields(): void
 			normally be generated in the template file using the other
 			information in the array. This should be avoided if at all possible.
 		*/
-		Utils::$context['posting_fields'] = array();
+		Utils::$context['posting_fields'] = [];
 
 		// Guests must supply their name and email.
-		if (isset(Utils::$context['name']) && isset(Utils::$context['email']))
-		{
-			Utils::$context['posting_fields']['guestname'] = array(
-				'label' => array(
+		if (isset(Utils::$context['name'], Utils::$context['email'])) {
+			Utils::$context['posting_fields']['guestname'] = [
+				'label' => [
 					'text' => Lang::$txt['name'],
 					'class' => isset(Utils::$context['post_error']['long_name']) || isset(Utils::$context['post_error']['no_name']) || isset(Utils::$context['post_error']['bad_name']) ? 'error' : '',
-				),
-				'input' => array(
+				],
+				'input' => [
 					'type' => 'text',
-					'attributes' => array(
+					'attributes' => [
 						'size' => 25,
 						'maxlength' => 25,
 						'value' => Utils::$context['name'],
 						'required' => true,
-					),
-				),
-			);
+					],
+				],
+			];
 
-			if (empty(Config::$modSettings['guest_post_no_email']))
-			{
-				Utils::$context['posting_fields']['email'] = array(
-					'label' => array(
+			if (empty(Config::$modSettings['guest_post_no_email'])) {
+				Utils::$context['posting_fields']['email'] = [
+					'label' => [
 						'text' => Lang::$txt['email'],
 						'class' => isset(Utils::$context['post_error']['no_email']) || isset(Utils::$context['post_error']['bad_email']) ? 'error' : '',
-					),
-					'input' => array(
+					],
+					'input' => [
 						'type' => 'email',
-						'attributes' => array(
+						'attributes' => [
 							'size' => 25,
 							'value' => Utils::$context['email'],
 							'required' => true,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 		}
 
 		// Gotta post it somewhere.
-		if (empty(Board::$info->id))
-		{
-			Utils::$context['posting_fields']['board'] = array(
-				'label' => array(
+		if (empty(Board::$info->id)) {
+			Utils::$context['posting_fields']['board'] = [
+				'label' => [
 					'text' => Lang::$txt['calendar_post_in'],
-				),
-				'input' => array(
+				],
+				'input' => [
 					'type' => 'select',
-					'options' => array(),
-				),
-			);
+					'options' => [],
+				],
+			];
 
-			foreach ($this->board_list as $category)
-			{
-				Utils::$context['posting_fields']['board']['input']['options'][$category['name']] = array('options' => array());
+			foreach ($this->board_list as $category) {
+				Utils::$context['posting_fields']['board']['input']['options'][$category['name']] = ['options' => []];
 
-				foreach ($category['boards'] as $brd)
-				{
-					Utils::$context['posting_fields']['board']['input']['options'][$category['name']]['options'][$brd['name']] = array(
+				foreach ($category['boards'] as $brd) {
+					Utils::$context['posting_fields']['board']['input']['options'][$category['name']]['options'][$brd['name']] = [
 						'value' => $brd['id'],
 						'selected' => (bool) $brd['selected'],
 						'label' => ($brd['child_level'] > 0 ? str_repeat('==', $brd['child_level'] - 1) . '=&gt;' : '') . ' ' . $brd['name'],
-					);
+					];
 				}
 			}
 		}
 
 		// Gotta have a subject.
-		Utils::$context['posting_fields']['subject'] = array(
-			'label' => array(
+		Utils::$context['posting_fields']['subject'] = [
+			'label' => [
 				'text' => Lang::$txt['subject'],
 				'class' => isset(Utils::$context['post_error']['no_subject']) ? 'error' : '',
-			),
-			'input' => array(
+			],
+			'input' => [
 				'type' => 'text',
-				'attributes' => array(
+				'attributes' => [
 					'size' => 80,
 					'maxlength' => 80 + (!empty(Topic::$info->id) ? Utils::entityStrlen(Utils::$context['response_prefix']) : 0),
 					'value' => Utils::$context['subject'],
 					'required' => true,
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Icons are fun.
-		Utils::$context['posting_fields']['icon'] = array(
-			'label' => array(
+		Utils::$context['posting_fields']['icon'] = [
+			'label' => [
 				'text' => Lang::$txt['message_icon'],
-			),
-			'input' => array(
+			],
+			'input' => [
 				'type' => 'select',
-				'attributes' => array(
+				'attributes' => [
 					'id' => 'icon',
 					'onchange' => 'showimage();',
-				),
-				'options' => array(),
+				],
+				'options' => [],
 				'after' => ' <img id="icons" src="' . Utils::$context['icon_url'] . '">',
-			),
-		);
-		foreach (Utils::$context['icons'] as $icon)
-		{
-			Utils::$context['posting_fields']['icon']['input']['options'][$icon['name']] = array(
+			],
+		];
+
+		foreach (Utils::$context['icons'] as $icon) {
+			Utils::$context['posting_fields']['icon']['input']['options'][$icon['name']] = [
 				'value' => $icon['value'],
 				'selected' => $icon['value'] == Utils::$context['icon'],
-			);
+			];
 		}
 
 		// If we're editing and displaying edit details, show a box where they can say why.
-		if (isset(Utils::$context['editing']) && Config::$modSettings['show_modify'])
-		{
-			Utils::$context['posting_fields']['modify_reason'] = array(
-				'label' => array(
+		if (isset(Utils::$context['editing']) && Config::$modSettings['show_modify']) {
+			Utils::$context['posting_fields']['modify_reason'] = [
+				'label' => [
 					'text' => Lang::$txt['reason_for_edit'],
-				),
-				'input' => array(
+				],
+				'input' => [
 					'type' => 'text',
-					'attributes' => array(
+					'attributes' => [
 						'size' => 80,
 						'maxlength' => 80,
 						// If same user is editing again, keep the previous edit reason by default.
 						'value' => isset($modified_reason) && isset(Utils::$context['last_modified_name']) && Utils::$context['last_modified_name'] === User::$me->name ? $modified_reason : '',
-					),
+					],
 					// If message has been edited before, show info about that.
 					'after' => empty(Utils::$context['last_modified_text']) ? '' : '<div class="smalltext em">' . Utils::$context['last_modified_text'] . '</div>',
-				),
-			);
+				],
+			];
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Post::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Post::exportStatic')) {
 	Post::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Post2.php b/Sources/Actions/Post2.php
index a099db69a9..9ea07257d0 100644
--- a/Sources/Actions/Post2.php
+++ b/Sources/Actions/Post2.php
@@ -13,31 +13,29 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
-use SMF\BrowserDetector;
 use SMF\Board;
+use SMF\BrowserDetector;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Draft;
 use SMF\ErrorHandler;
 use SMF\Event;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Logging;
-use SMF\MessageIndex;
 use SMF\Msg;
 use SMF\Poll;
+use SMF\Search\SearchApi;
 use SMF\Security;
 use SMF\Theme;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * This class handles posting and modifying replies and new topics.
@@ -51,12 +49,11 @@ class Post2 extends Post
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Post2',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -88,10 +85,10 @@ class Post2 extends Post
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'submit' => 'submit',
 		'show' => 'show',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -136,16 +133,18 @@ public function execute(): void
 		$this->can_approve = User::$me->allowedTo('approve_posts');
 
 		// If there is an existing topic, load it.
-		if ($this->intent !== self::INTENT_NEW_TOPIC)
+		if ($this->intent !== self::INTENT_NEW_TOPIC) {
 			$this->loadTopic();
+		}
 
 		// Allow mods to add new sub-actions.
-		IntegrationHook::call('integrate_post2_subactions', array(&self::$subactions));
+		IntegrationHook::call('integrate_post2_subactions', [&self::$subactions]);
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -159,18 +158,12 @@ public function execute(): void
 	public function submit(): void
 	{
 		// Sneaking off, are we?
-		if (empty($_POST))
-		{
-			if (!empty(Topic::$topic_id))
-			{
+		if (empty($_POST)) {
+			if (!empty(Topic::$topic_id)) {
 				Utils::redirectexit('action=post;topic=' . Topic::$topic_id . '.0');
-			}
-			elseif (empty($_SERVER['CONTENT_LENGTH']))
-			{
+			} elseif (empty($_SERVER['CONTENT_LENGTH'])) {
 				Utils::redirectexit('action=post;board=' . Board::$info->id . '.0');
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatalLang('post_upload_error', false);
 			}
 		}
@@ -182,24 +175,24 @@ public function submit(): void
 		Security::checkSubmitOnce('check');
 
 		// No errors as yet.
-		$this->errors = array();
+		$this->errors = [];
 
 		// If the session has timed out, let the user re-submit their form.
-		if (User::$me->checkSession('post', '', false) != '')
+		if (User::$me->checkSession('post', '', false) != '') {
 			$this->errors[] = 'session_timeout';
+		}
 
 		// Wrong verification code?
 		$this->checkVerification();
 
 		Lang::load('Post');
 
-		IntegrationHook::call('integrate_post2_start', array(&$this->errors));
+		IntegrationHook::call('integrate_post2_start', [&$this->errors]);
 
 		$this->submitAttachments();
 
 		// Replies to unapproved topics are unapproved by default (but not for moderators)
-		if (empty(Topic::$info->is_approved) && !$this->can_approve)
-		{
+		if (empty(Topic::$info->is_approved) && !$this->can_approve) {
 			$this->becomes_approved = false;
 
 			// Set a nice session var...
@@ -207,54 +200,47 @@ public function submit(): void
 		}
 
 		// Replying to a topic?
-		if ($this->intent === self::INTENT_NEW_REPLY)
-		{
+		if ($this->intent === self::INTENT_NEW_REPLY) {
 			$this->prepareNewReply();
 		}
 		// Posting a new topic.
-		elseif ($this->intent === self::INTENT_NEW_TOPIC)
-		{
+		elseif ($this->intent === self::INTENT_NEW_TOPIC) {
 			$this->prepareNewTopic();
 		}
 		// Modifying an existing message?
-		elseif ($this->intent === self::INTENT_EDIT_POST)
-		{
+		elseif ($this->intent === self::INTENT_EDIT_POST) {
 			$this->prepareEdit();
 		}
 
 		// In case we have approval permissions and want to override.
-		if ($this->can_approve && Config::$modSettings['postmod_active'])
-		{
+		if ($this->can_approve && Config::$modSettings['postmod_active']) {
 			$this->becomes_approved = isset($_POST['quickReply']) || !empty($_REQUEST['approve']) ? 1 : 0;
 
 			$approve_has_changed = isset($this->existing_msg->approved) ? $this->existing_msg->approved != $this->becomes_approved : false;
 		}
 
 		// If the poster is a guest evaluate the legality of name and email.
-		if ($this->authorIsGuest)
-		{
-			$_POST['guestname'] = !isset($_POST['guestname']) ? '' : trim(Utils::normalizeSpaces(Utils::sanitizeChars($_POST['guestname'], 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
+		if ($this->authorIsGuest) {
+			$_POST['guestname'] = !isset($_POST['guestname']) ? '' : trim(Utils::normalizeSpaces(Utils::sanitizeChars($_POST['guestname'], 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
 
 			$_POST['email'] = !isset($_POST['email']) ? '' : trim($_POST['email']);
 
-			if ($_POST['guestname'] == '' || $_POST['guestname'] == '_')
+			if ($_POST['guestname'] == '' || $_POST['guestname'] == '_') {
 				$this->errors[] = 'no_name';
+			}
 
-			if (Utils::entityStrlen($_POST['guestname']) > 25)
+			if (Utils::entityStrlen($_POST['guestname']) > 25) {
 				$this->errors[] = 'long_name';
+			}
 
-			if (empty(Config::$modSettings['guest_post_no_email']))
-			{
+			if (empty(Config::$modSettings['guest_post_no_email'])) {
 				// Only check if they changed it!
-				if (!isset($this->existing_msg) || $this->existing_msg->poster_email != $_POST['email'])
-				{
-					if (!User::$me->allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == ''))
-					{
+				if (!isset($this->existing_msg) || $this->existing_msg->poster_email != $_POST['email']) {
+					if (!User::$me->allowedTo('moderate_forum') && (!isset($_POST['email']) || $_POST['email'] == '')) {
 						$this->errors[] = 'no_email';
 					}
 
-					if (!User::$me->allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL))
-					{
+					if (!User::$me->allowedTo('moderate_forum') && !filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
 						$this->errors[] = 'bad_email';
 					}
 				}
@@ -264,250 +250,227 @@ public function submit(): void
 			}
 
 			// In case they are making multiple posts this visit, help them along by storing their name.
-			if (empty($this->errors))
-			{
+			if (empty($this->errors)) {
 				$_SESSION['guest_name'] = $_POST['guestname'];
 				$_SESSION['guest_email'] = $_POST['email'];
 			}
 		}
 
 		// Coming from the quickReply?
-		if (isset($_POST['quickReply']))
+		if (isset($_POST['quickReply'])) {
 			$_POST['message'] = $_POST['quickReply'];
+		}
 
 		// Check the subject and message.
-		if (!isset($_POST['subject']) || Utils::htmlTrim(Utils::htmlspecialchars($_POST['subject'])) === '')
-		{
+		if (!isset($_POST['subject']) || Utils::htmlTrim(Utils::htmlspecialchars($_POST['subject'])) === '') {
 			$this->errors[] = 'no_subject';
 		}
 
-		if (!isset($_POST['message']) || Utils::htmlTrim(Utils::htmlspecialchars($_POST['message']), ENT_QUOTES) === '')
-		{
+		if (!isset($_POST['message']) || Utils::htmlTrim(Utils::htmlspecialchars($_POST['message']), ENT_QUOTES) === '') {
 			$this->errors[] = 'no_message';
-		}
-		elseif (!empty(Config::$modSettings['max_messageLength']) && Utils::entityStrlen($_POST['message']) > Config::$modSettings['max_messageLength'])
-		{
-			$this->errors[] = array('long_message', array(Config::$modSettings['max_messageLength']));
-		}
-		else
-		{
+		} elseif (!empty(Config::$modSettings['max_messageLength']) && Utils::entityStrlen($_POST['message']) > Config::$modSettings['max_messageLength']) {
+			$this->errors[] = ['long_message', [Config::$modSettings['max_messageLength']]];
+		} else {
 			// Prepare the message a bit for some additional testing.
 			$_POST['message'] = Utils::htmlspecialchars($_POST['message'], ENT_QUOTES);
 
 			// Preparse code. (Zef)
-			if (User::$me->is_guest)
+			if (User::$me->is_guest) {
 				User::$me->name = $_POST['guestname'];
+			}
 
 			Msg::preparsecode($_POST['message']);
 
 			// Let's see if there's still some content left without the tags.
-			if (Utils::htmlTrim(strip_tags(BBCodeParser::load()->parse($_POST['message'], false), implode('', Utils::$context['allowed_html_tags']))) === '' && (!User::$me->allowedTo('bbc_html') || strpos($_POST['message'], '[html]') === false))
-			{
+			if (Utils::htmlTrim(strip_tags(BBCodeParser::load()->parse($_POST['message'], false), implode('', Utils::$context['allowed_html_tags']))) === '' && (!User::$me->allowedTo('bbc_html') || strpos($_POST['message'], '[html]') === false)) {
 				$this->errors[] = 'no_message';
 			}
-
 		}
 
-		if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && Utils::htmlTrim($_POST['evtitle']) === '')
-		{
+		if (isset($_POST['calendar']) && !isset($_REQUEST['deleteevent']) && Utils::htmlTrim($_POST['evtitle']) === '') {
 			$this->errors[] = 'no_event';
 		}
 
 		// You are not!
-		if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !User::$me->is_admin)
-		{
+		if (isset($_POST['message']) && strtolower($_POST['message']) == 'i am the administrator.' && !User::$me->is_admin) {
 			ErrorHandler::fatal('Knave! Masquerader! Charlatan!', false);
 		}
 
 		// Build the poll...
-		if (isset($_REQUEST['poll']) && Config::$modSettings['pollMode'] == '1')
-		{
-			if (!empty(Topic::$topic_id) && !isset($_REQUEST['msg']))
+		if (isset($_REQUEST['poll']) && Config::$modSettings['pollMode'] == '1') {
+			if (!empty(Topic::$topic_id) && !isset($_REQUEST['msg'])) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
 			$poll = Poll::create($this->errors);
 		}
 
-		if ($this->authorIsGuest)
-		{
+		if ($this->authorIsGuest) {
 			// If user is a guest, make sure the chosen name isn't taken.
-			if (User::isReservedName($_POST['guestname'], 0, true, false) && (!isset($this->existing_msg->poster_name) || $_POST['guestname'] != $this->existing_msg->poster_name))
-			{
+			if (User::isReservedName($_POST['guestname'], 0, true, false) && (!isset($this->existing_msg->poster_name) || $_POST['guestname'] != $this->existing_msg->poster_name)) {
 				$this->errors[] = 'bad_name';
 			}
 		}
 		// If the user isn't a guest, get his or her name and email.
-		elseif (!isset($_REQUEST['msg']))
-		{
+		elseif (!isset($_REQUEST['msg'])) {
 			$_POST['guestname'] = User::$me->username;
 			$_POST['email'] = User::$me->email;
 		}
 
-	 	IntegrationHook::call('integrate_post2_pre', array(&$this->errors));
+		IntegrationHook::call('integrate_post2_pre', [&$this->errors]);
 
 		// Any mistakes?
-		if (!empty($this->errors))
-		{
+		if (!empty($this->errors)) {
 			// Previewing.
 			$_REQUEST['preview'] = true;
 			$this->show();
+
 			return;
 		}
 
 		// Previewing? Go back to start.
-		if (isset($_REQUEST['preview']))
-		{
-			if (User::$me->checkSession('post', '', false) != '')
-			{
+		if (isset($_REQUEST['preview'])) {
+			if (User::$me->checkSession('post', '', false) != '') {
 				Lang::load('Errors');
 				$this->errors[] = 'session_timeout';
 				unset($_POST['preview'], $_REQUEST['xml']); // just in case
 			}
 
 			$this->show();
+
 			return;
 		}
 
 		// Make sure the user isn't spamming the board.
-		if (!isset($_REQUEST['msg']))
+		if (!isset($_REQUEST['msg'])) {
 			Security::spamProtection('post');
+		}
 
 		// At about this point, we're posting and that's that.
 		ignore_user_abort(true);
 		@set_time_limit(300);
 
 		// Add special html entities to the subject, name, and email.
-		$_POST['subject'] = strtr(Utils::htmlspecialchars($_POST['subject']), array("\r" => '', "\n" => '', "\t" => ''));
+		$_POST['subject'] = strtr(Utils::htmlspecialchars($_POST['subject']), ["\r" => '', "\n" => '', "\t" => '']);
 		$_POST['guestname'] = Utils::htmlspecialchars($_POST['guestname']);
 		$_POST['email'] = Utils::htmlspecialchars($_POST['email']);
-		$_POST['modify_reason'] = empty($_POST['modify_reason']) ? '' : strtr(Utils::htmlspecialchars($_POST['modify_reason']), array("\r" => '', "\n" => '', "\t" => ''));
+		$_POST['modify_reason'] = empty($_POST['modify_reason']) ? '' : strtr(Utils::htmlspecialchars($_POST['modify_reason']), ["\r" => '', "\n" => '', "\t" => '']);
 
 		// At this point, we want to make sure the subject isn't too long.
-		if (Utils::entityStrlen($_POST['subject']) > 100)
+		if (Utils::entityStrlen($_POST['subject']) > 100) {
 			$_POST['subject'] = Utils::entitySubstr($_POST['subject'], 0, 100);
+		}
 
 		// Same with the "why did you edit this" text.
-		if (Utils::entityStrlen($_POST['modify_reason']) > 100)
+		if (Utils::entityStrlen($_POST['modify_reason']) > 100) {
 			$_POST['modify_reason'] = Utils::entitySubstr($_POST['modify_reason'], 0, 100);
+		}
 
 		// Attach any new files.
-		if (Utils::$context['can_post_attachment'] && !empty($_SESSION['temp_attachments']) && empty($_POST['from_qr']))
-		{
-			$attachIDs = array();
-			$attach_errors = array();
+		if (Utils::$context['can_post_attachment'] && !empty($_SESSION['temp_attachments']) && empty($_POST['from_qr'])) {
+			$attachIDs = [];
+			$attach_errors = [];
 
-			if (!empty(Utils::$context['we_are_history']))
-			{
+			if (!empty(Utils::$context['we_are_history'])) {
 				$attach_errors[] = '<dd>' . Lang::$txt['error_temp_attachments_flushed'] . '<br><br></dd>';
 			}
 
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-			{
-				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . User::$me->id) === false)
-				{
+			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+				if ($attachID != 'initial_error' && strpos($attachID, 'post_tmp_' . User::$me->id) === false) {
 					continue;
 				}
 
 				// If there was an initial error just show that message.
-				if ($attachID == 'initial_error')
-				{
+				if ($attachID == 'initial_error') {
 					$attach_errors[] = '<dt>' . Lang::$txt['attach_no_upload'] . '</dt>';
 					$attach_errors[] = '<dd>' . (is_array($attachment) ? vsprintf(Lang::$txt[$attachment[0]], (array) $attachment[1]) : Lang::$txt[$attachment]) . '</dd>';
 
 					unset($_SESSION['temp_attachments']);
+
 					break;
 				}
 
-				$attachmentOptions = array(
-					'post' => isset($_REQUEST['msg']) ? $_REQUEST['msg'] : 0,
+				$attachmentOptions = [
+					'post' => $_REQUEST['msg'] ?? 0,
 					'poster' => User::$me->id,
 					'name' => $attachment['name'],
 					'tmp_name' => $attachment['tmp_name'],
-					'size' => isset($attachment['size']) ? $attachment['size'] : 0,
-					'mime_type' => isset($attachment['type']) ? $attachment['type'] : '',
-					'id_folder' => isset($attachment['id_folder']) ? $attachment['id_folder'] : Config::$modSettings['currentAttachmentUploadDir'],
+					'size' => $attachment['size'] ?? 0,
+					'mime_type' => $attachment['type'] ?? '',
+					'id_folder' => $attachment['id_folder'] ?? Config::$modSettings['currentAttachmentUploadDir'],
 					'approved' => !Config::$modSettings['postmod_active'] || User::$me->allowedTo('post_attachment'),
 					'errors' => $attachment['errors'],
-				);
+				];
 
-				if (empty($attachment['errors']))
-				{
-					if (Attachment::create($attachmentOptions))
-					{
+				if (empty($attachment['errors'])) {
+					if (Attachment::create($attachmentOptions)) {
 						$attachIDs[] = $attachmentOptions['id'];
 
-						if (!empty($attachmentOptions['thumb']))
+						if (!empty($attachmentOptions['thumb'])) {
 							$attachIDs[] = $attachmentOptions['thumb'];
+						}
 					}
-				}
-				else
-				{
+				} else {
 					$attach_errors[] = '<dt>&nbsp;</dt>';
 				}
 
-				if (!empty($attachmentOptions['errors']))
-				{
+				if (!empty($attachmentOptions['errors'])) {
 					// Sort out the errors for display and delete any associated files.
 					$attach_errors[] = '<dt>' . sprintf(Lang::$txt['attach_warning'], $attachment['name']) . '</dt>';
 
-					$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
+					$log_these = ['attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file'];
 
-					foreach ($attachmentOptions['errors'] as $error)
-					{
-						if (!is_array($error))
-						{
+					foreach ($attachmentOptions['errors'] as $error) {
+						if (!is_array($error)) {
 							$attach_errors[] = '<dd>' . Lang::$txt[$error] . '</dd>';
 
-							if (in_array($error, $log_these))
+							if (in_array($error, $log_these)) {
 								ErrorHandler::log($attachment['name'] . ': ' . Lang::$txt[$error], 'critical');
-						}
-						else
-						{
+							}
+						} else {
 							$attach_errors[] = '<dd>' . vsprintf(Lang::$txt[$error[0]], (array) $error[1]) . '</dd>';
 						}
 					}
 
-					if (file_exists($attachment['tmp_name']))
+					if (file_exists($attachment['tmp_name'])) {
 						unlink($attachment['tmp_name']);
+					}
 				}
 			}
 		}
 		unset($_SESSION['temp_attachments']);
 
 		// Save the poll to the database.
-		if (isset($poll))
+		if (isset($poll)) {
 			$poll->save();
+		}
 
 		// Creating a new topic?
 		$newTopic = empty($_REQUEST['msg']) && empty(Topic::$topic_id);
 
 		// Check the icon.
-		if (!isset($_POST['icon']))
-		{
+		if (!isset($_POST['icon'])) {
 			$_POST['icon'] = 'xx';
-		}
-		else
-		{
+		} else {
 			$_POST['icon'] = Utils::htmlspecialchars($_POST['icon']);
 
 			// Need to figure it out if this is a valid icon name.
-			if ((!file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists(Theme::$current->settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')))
-			{
+			if ((!file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $_POST['icon'] . '.png')) && (!file_exists(Theme::$current->settings['default_theme_dir'] . '/images/post/' . $_POST['icon'] . '.png'))) {
 				$_POST['icon'] = 'xx';
 			}
 		}
 
 		// Collect all parameters for the creation or modification of a post.
-		$msgOptions = array(
+		$msgOptions = [
 			'id' => empty($_REQUEST['msg']) ? 0 : (int) $_REQUEST['msg'],
 			'subject' => $_POST['subject'],
 			'body' => $_POST['message'],
-			'icon' => preg_replace('~[\./\\\\*:"\'<>]~', '', $_POST['icon']),
+			'icon' => preg_replace('~[./\\\\*:"\'<>]~', '', $_POST['icon']),
 			'smileys_enabled' => !isset($_POST['ns']),
-			'attachments' => empty($attachIDs) ? array() : $attachIDs,
+			'attachments' => empty($attachIDs) ? [] : $attachIDs,
 			'approved' => $this->becomes_approved,
-		);
-		$topicOptions = array(
+		];
+		$topicOptions = [
 			'id' => empty(Topic::$topic_id) ? 0 : Topic::$topic_id,
 			'board' => Board::$info->id,
 			'poll' => isset($poll) ? $poll->id : null,
@@ -517,20 +480,18 @@ public function submit(): void
 			'is_approved' => !Config::$modSettings['postmod_active'] || empty(Topic::$topic_id) || !empty(Board::$info->cur_topic_approved),
 			'first_msg' => empty(Topic::$info->id_first_msg) ? null : Topic::$info->id_first_msg,
 			'last_msg' => empty(Topic::$info->id_last_msg) ? null : Topic::$info->id_last_msg,
-		);
-		$posterOptions = array(
+		];
+		$posterOptions = [
 			'id' => User::$me->id,
 			'name' => $_POST['guestname'],
 			'email' => $_POST['email'],
 			'update_post_count' => !User::$me->is_guest && !isset($_REQUEST['msg']) && Board::$info->posts_count,
-		);
+		];
 
 		// This is an already existing message. Edit it.
-		if (!empty($_REQUEST['msg']))
-		{
+		if (!empty($_REQUEST['msg'])) {
 			// Have admins allowed people to hide their screwups?
-			if (time() - $this->existing_msg->poster_time > Config::$modSettings['edit_wait_time'] || User::$me->id != $this->existing_msg->id_member)
-			{
+			if (time() - $this->existing_msg->poster_time > Config::$modSettings['edit_wait_time'] || User::$me->id != $this->existing_msg->id_member) {
 				$msgOptions['modify_time'] = time();
 				$msgOptions['modify_name'] = User::$me->name;
 				$msgOptions['modify_reason'] = $_POST['modify_reason'];
@@ -540,180 +501,166 @@ public function submit(): void
 			Msg::modify($msgOptions, $topicOptions, $posterOptions);
 		}
 		// This is a new topic or an already existing one. Save it.
-		else
-		{
+		else {
 			Msg::create($msgOptions, $topicOptions, $posterOptions);
 
-			if (isset($topicOptions['id']))
+			if (isset($topicOptions['id'])) {
 				Topic::$topic_id = $topicOptions['id'];
+			}
 		}
 
 		// Are there attachments already uploaded and waiting to be assigned?
-		if (!empty($msgOptions['id']) && !empty($_SESSION['already_attached']))
-		{
+		if (!empty($msgOptions['id']) && !empty($_SESSION['already_attached'])) {
 			Attachment::assign($_SESSION['already_attached'], $msgOptions['id']);
 			unset($_SESSION['already_attached']);
 		}
 
 		// If we had a draft for this, its time to remove it since it was just posted
-		if (!empty(Config::$modSettings['drafts_post_enabled']) && !empty($_POST['id_draft']))
+		if (!empty(Config::$modSettings['drafts_post_enabled']) && !empty($_POST['id_draft'])) {
 			Draft::delete($_POST['id_draft']);
+		}
 
 		// Editing or posting an event?
-		if (isset($_POST['calendar']) && (!isset($_REQUEST['eventid']) || $_REQUEST['eventid'] == -1))
-		{
+		if (isset($_POST['calendar']) && (!isset($_REQUEST['eventid']) || $_REQUEST['eventid'] == -1)) {
 			// Make sure they can link an event to this post.
 			Calendar::canLinkEvent();
 
 			// Insert the event.
-			$eventOptions = array(
+			$eventOptions = [
 				'board' => Board::$info->id,
 				'topic' => Topic::$topic_id,
 				'title' => $_POST['evtitle'],
 				'location' => $_POST['event_location'],
 				'member' => User::$me->id,
-			);
+			];
 			Event::create($eventOptions);
-		}
-		elseif (isset($_POST['calendar']))
-		{
+		} elseif (isset($_POST['calendar'])) {
 			$_REQUEST['eventid'] = (int) $_REQUEST['eventid'];
 
 			// Validate the post...
 			Calendar::validateEventPost();
 
 			// If you're not allowed to edit any and all events, you have to be the poster.
-			if (!User::$me->allowedTo('calendar_edit_any'))
-			{
-				User::$me->isAllowedTo('calendar_edit_' . (!empty(User::$me->id) && self::getEventPoster($_REQUEST['eventid']) == User::$me->id ? 'own' : 'any'));
+			if (!User::$me->allowedTo('calendar_edit_any')) {
+				User::$me->isAllowedTo('calendar_edit_' . (!empty(User::$me->id) && Calendar::getEventPoster($_REQUEST['eventid']) == User::$me->id ? 'own' : 'any'));
 			}
 
 			// Delete it?
-			if (isset($_REQUEST['deleteevent']))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}calendar
+			if (isset($_REQUEST['deleteevent'])) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}calendar
 					WHERE id_event = {int:id_event}',
-					array(
+					[
 						'id_event' => $_REQUEST['eventid'],
-					)
+					],
 				);
 			}
 			// ... or just update it?
-			else
-			{
+			else {
 				// Set up our options
-				$eventOptions = array(
+				$eventOptions = [
 					'board' => Board::$info->id,
 					'topic' => Topic::$topic_id,
 					'title' => $_POST['evtitle'],
 					'location' => $_POST['event_location'],
 					'member' => User::$me->id,
-				);
+				];
 				Event::modify($_REQUEST['eventid'], $eventOptions);
 			}
 		}
 
 		// Marking read should be done even for editing messages....
 		// Mark all the parents read.  (since you just posted and they will be unread.)
-		if (!User::$me->is_guest && !empty(Board::$info->parent_boards))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_boards
+		if (!User::$me->is_guest && !empty(Board::$info->parent_boards)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_boards
 				SET id_msg = {int:id_msg}
 				WHERE id_member = {int:current_member}
 					AND id_board IN ({array_int:board_list})',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'board_list' => array_keys(Board::$info->parent_boards),
 					'id_msg' => Config::$modSettings['maxMsgID'],
-				)
+				],
 			);
 		}
 
 		// Turn notification on or off.  (note this just blows smoke if it's already on or off.)
-		if (!empty($_POST['notify']) && !User::$me->is_guest)
-		{
-			Db::$db->insert('ignore',
+		if (!empty($_POST['notify']) && !User::$me->is_guest) {
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_notify',
-				array('id_member' => 'int', 'id_topic' => 'int', 'id_board' => 'int'),
-				array(User::$me->id, Topic::$topic_id, 0),
-				array('id_member', 'id_topic', 'id_board')
+				['id_member' => 'int', 'id_topic' => 'int', 'id_board' => 'int'],
+				[User::$me->id, Topic::$topic_id, 0],
+				['id_member', 'id_topic', 'id_board'],
 			);
-		}
-		elseif (!$newTopic)
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_notify
+		} elseif (!$newTopic) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_notify
 				WHERE id_member = {int:current_member}
 					AND id_topic = {int:current_topic}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'current_topic' => Topic::$topic_id,
-				)
+				],
 			);
 		}
 
 		// Log an act of moderation - modifying.
-		if (!empty($moderationAction))
-		{
-			Logging::logAction('modify', array('topic' => $this->existing_msg->id_topic, 'message' => $this->existing_msg->id, 'member' => $this->existing_msg->id_member, 'board' => $this->existing_msg->id_board));
+		if (!empty($moderationAction)) {
+			Logging::logAction('modify', ['topic' => $this->existing_msg->id_topic, 'message' => $this->existing_msg->id, 'member' => $this->existing_msg->id_member, 'board' => $this->existing_msg->id_board]);
 		}
 
-		if (isset($_POST['lock']) && $_POST['lock'] != 2)
-		{
-			Logging::logAction(empty($_POST['lock']) ? 'unlock' : 'lock', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+		if (isset($_POST['lock']) && $_POST['lock'] != 2) {
+			Logging::logAction(empty($_POST['lock']) ? 'unlock' : 'lock', ['topic' => $topicOptions['id'], 'board' => $topicOptions['board']]);
 		}
 
-		if (isset($_POST['sticky']))
-		{
-			Logging::logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', array('topic' => $topicOptions['id'], 'board' => $topicOptions['board']));
+		if (isset($_POST['sticky'])) {
+			Logging::logAction(empty($_POST['sticky']) ? 'unsticky' : 'sticky', ['topic' => $topicOptions['id'], 'board' => $topicOptions['board']]);
 		}
 
 		// Returning to the topic?
-		if (!empty($_REQUEST['goback']))
-		{
+		if (!empty($_REQUEST['goback'])) {
 			// Mark the board as read.... because it might get confusing otherwise.
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_boards
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_boards
 				SET id_msg = {int:maxMsgID}
 				WHERE id_member = {int:current_member}
 					AND id_board = {int:current_board}',
-				array(
+				[
 					'current_board' => Board::$info->id,
 					'current_member' => User::$me->id,
 					'maxMsgID' => Config::$modSettings['maxMsgID'],
-				)
+				],
 			);
 		}
 
-		if (Board::$info->num_topics == 0)
+		if (Board::$info->num_topics == 0) {
 			CacheApi::put('board-' . Board::$info->id, null, 120);
+		}
 
 		IntegrationHook::call('integrate_post2_end');
 
-		if (!empty($_POST['announce_topic']) && User::$me->allowedTo('announce_topic'))
-		{
+		if (!empty($_POST['announce_topic']) && User::$me->allowedTo('announce_topic')) {
 			Utils::redirectexit('action=announce;sa=selectgroup;topic=' . Topic::$topic_id . (!empty($_POST['move']) && User::$me->allowedTo('move_any') ? ';move' : '') . (empty($_REQUEST['goback']) ? '' : ';goback'));
 		}
 
-		if (!empty($_POST['move']) && User::$me->allowedTo('move_any'))
-		{
+		if (!empty($_POST['move']) && User::$me->allowedTo('move_any')) {
 			Utils::redirectexit('action=movetopic;topic=' . Topic::$topic_id . '.0' . (empty($_REQUEST['goback']) ? '' : ';goback'));
 		}
 
 		// Return to post if the mod is on.
-		if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback']))
-		{
+		if (isset($_REQUEST['msg']) && !empty($_REQUEST['goback'])) {
 			Utils::redirectexit('topic=' . Topic::$topic_id . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg'], BrowserDetector::isBrowser('ie'));
-		}
-		elseif (!empty($_REQUEST['goback']))
-		{
+		} elseif (!empty($_REQUEST['goback'])) {
 			Utils::redirectexit('topic=' . Topic::$topic_id . '.new#new', BrowserDetector::isBrowser('ie'));
 		}
 		// Dut-dut-duh-duh-DUH-duh-dut-duh-duh!  *dances to the Final Fantasy Fanfare...*
-		else
-		{
+		else {
 			Utils::redirectexit('board=' . Board::$info->id . '.0');
 		}
 	}
@@ -729,8 +676,9 @@ public function submit(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -771,9 +719,8 @@ protected function checkVerification(): void
 					&& Config::$modSettings['posts_require_captcha'] == -1
 				)
 			)
-		)
-		{
-			$verifier = new Verifier(array('id' => 'post'));
+		) {
+			$verifier = new Verifier(['id' => 'post']);
 			$this->errors = array_merge($this->errors, $verifier->errors);
 		}
 	}
@@ -784,27 +731,20 @@ protected function checkVerification(): void
 	protected function submitAttachments(): void
 	{
 		// First check to see if they are trying to delete any current attachments.
-		if (isset($_POST['attach_del']))
-		{
-			$keep_temp = array();
-			$keep_ids = array();
-
-			foreach ($_POST['attach_del'] as $dummy)
-			{
-				if (strpos($dummy, 'post_tmp_' . User::$me->id) !== false)
-				{
+		if (isset($_POST['attach_del'])) {
+			$keep_temp = [];
+			$keep_ids = [];
+
+			foreach ($_POST['attach_del'] as $dummy) {
+				if (strpos($dummy, 'post_tmp_' . User::$me->id) !== false) {
 					$keep_temp[] = $dummy;
-				}
-				else
-				{
+				} else {
 					$keep_ids[] = (int) $dummy;
 				}
 			}
 
-			if (isset($_SESSION['temp_attachments']))
-			{
-				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				{
+			if (isset($_SESSION['temp_attachments'])) {
+				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
 					if (
 						(
 							isset($_SESSION['temp_attachments']['post']['files'], $attachment['name'])
@@ -812,8 +752,7 @@ protected function submitAttachments(): void
 						)
 						|| in_array($attachID, $keep_temp)
 						|| strpos($attachID, 'post_tmp_' . User::$me->id) === false
-					)
-					{
+					) {
 						continue;
 					}
 
@@ -822,13 +761,12 @@ protected function submitAttachments(): void
 				}
 			}
 
-			if (!empty($_REQUEST['msg']))
-			{
-				$attachmentQuery = array(
+			if (!empty($_REQUEST['msg'])) {
+				$attachmentQuery = [
 					'attachment_type' => 0,
 					'id_msg' => (int) $_REQUEST['msg'],
 					'not_id_attach' => $keep_ids,
-				);
+				];
 				Attachment::remove($attachmentQuery);
 			}
 		}
@@ -836,21 +774,20 @@ protected function submitAttachments(): void
 		// Then try to upload any attachments.
 		Utils::$context['can_post_attachment'] = !empty(Config::$modSettings['attachmentEnable']) && Config::$modSettings['attachmentEnable'] == 1 && (User::$me->allowedTo('post_attachment') || (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_attachments')));
 
-		if (Utils::$context['can_post_attachment'] && empty($_POST['from_qr']))
-		{
+		if (Utils::$context['can_post_attachment'] && empty($_POST['from_qr'])) {
 			Attachment::process();
 		}
 
 		// They've already uploaded some attachments, but they don't have permission to post them
 		// This can sometimes happen when they came from ?action=calendar;sa=post
-		if (!Utils::$context['can_post_attachment'] && !empty($_SESSION['already_attached']))
-		{
-			foreach ($_SESSION['already_attached'] as $attachID => $attachment)
-				Attachment::remove(array('id_attach' => $attachID));
+		if (!Utils::$context['can_post_attachment'] && !empty($_SESSION['already_attached'])) {
+			foreach ($_SESSION['already_attached'] as $attachID => $attachment) {
+				Attachment::remove(['id_attach' => $attachID]);
+			}
 
 			unset($_SESSION['already_attached']);
 
-			$this->errors[] = array('cannot_post_attachment', array(Board::$info->name));
+			$this->errors[] = ['cannot_post_attachment', [Board::$info->name]];
 		}
 	}
 
@@ -860,102 +797,82 @@ protected function submitAttachments(): void
 	protected function prepareNewReply(): void
 	{
 		// Don't allow a post if it's locked.
-		if (Topic::$info->is_locked != 0 && !User::$me->allowedTo('moderate_board'))
+		if (Topic::$info->is_locked != 0 && !User::$me->allowedTo('moderate_board')) {
 			ErrorHandler::fatalLang('topic_locked', false);
+		}
 
 		// Sorry, multiple polls aren't allowed... yet.  You should stop giving me ideas :P.
-		if (isset($_REQUEST['poll']) && Topic::$info->id_poll > 0)
+		if (isset($_REQUEST['poll']) && Topic::$info->id_poll > 0) {
 			unset($_REQUEST['poll']);
+		}
 
-		if (Topic::$info->id_member_started != User::$me->id)
-		{
-			if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_replies_any') && !User::$me->allowedTo('post_reply_any'))
-			{
+		if (Topic::$info->id_member_started != User::$me->id) {
+			if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_replies_any') && !User::$me->allowedTo('post_reply_any')) {
 				$this->becomes_approved = false;
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('post_reply_any');
 			}
-		}
-		elseif (!User::$me->allowedTo('post_reply_any'))
-		{
-			if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_replies_own') && !User::$me->allowedTo('post_reply_own'))
-			{
+		} elseif (!User::$me->allowedTo('post_reply_any')) {
+			if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('post_unapproved_replies_own') && !User::$me->allowedTo('post_reply_own')) {
 				$this->becomes_approved = false;
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('post_reply_own');
 			}
 		}
 
-		if (isset($_POST['lock']))
-		{
+		if (isset($_POST['lock'])) {
 			// Nothing is changed to the lock.
-			if (empty(Topic::$info->is_locked) == empty($_POST['lock']))
-			{
+			if (empty(Topic::$info->is_locked) == empty($_POST['lock'])) {
 				unset($_POST['lock']);
 			}
 			// You have no permission to lock this topic.
-			elseif (!User::$me->allowedTo(array('lock_any', 'lock_own')) || (!User::$me->allowedTo('lock_any') && User::$me->id != Topic::$info->id_member_started))
-			{
+			elseif (!User::$me->allowedTo(['lock_any', 'lock_own']) || (!User::$me->allowedTo('lock_any') && User::$me->id != Topic::$info->id_member_started)) {
 				unset($_POST['lock']);
 			}
 			// You are allowed to (un)lock your own topic only.
-			elseif (!User::$me->allowedTo('lock_any'))
-			{
+			elseif (!User::$me->allowedTo('lock_any')) {
 				// You cannot override a moderator lock.
-				if (Topic::$info->is_locked == 1)
-				{
+				if (Topic::$info->is_locked == 1) {
 					unset($_POST['lock']);
-				}
-				else
-				{
+				} else {
 					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
 				}
 			}
 			// Hail mighty moderator, (un)lock this topic immediately.
-			else
-			{
+			else {
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 
 				// Did someone (un)lock this while you were posting?
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != Topic::$info->is_locked)
-				{
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != Topic::$info->is_locked) {
 					$this->errors[] = 'topic_' . (empty(Topic::$info->is_locked) ? 'un' : '') . 'locked';
 				}
 			}
 		}
 
 		// So you wanna (un)sticky this...let's see.
-		if (isset($_POST['sticky']) && ($_POST['sticky'] == Topic::$info->is_sticky || !User::$me->allowedTo('make_sticky')))
-		{
+		if (isset($_POST['sticky']) && ($_POST['sticky'] == Topic::$info->is_sticky || !User::$me->allowedTo('make_sticky'))) {
 			unset($_POST['sticky']);
-		}
-		elseif (isset($_POST['sticky']))
-		{
+		} elseif (isset($_POST['sticky'])) {
 			// Did someone (un)sticky this while you were posting?
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != Topic::$info->is_sticky)
-			{
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != Topic::$info->is_sticky) {
 				$this->errors[] = 'topic_' . (empty(Topic::$info->is_sticky) ? 'un' : '') . 'sticky';
 			}
 		}
 
 		// If drafts are enabled, then pass this off
-		if (!empty(Config::$modSettings['drafts_post_enabled']) && isset($_POST['save_draft']))
-		{
+		if (!empty(Config::$modSettings['drafts_post_enabled']) && isset($_POST['save_draft'])) {
 			$draft = new Draft((int) $_POST['id_draft']);
 			$draft->save($this->errors);
 			$this->show();
+
 			return;
 		}
 
 		// If the number of replies has changed, if the setting is enabled, go back to Post() - which handles the error.
-		if (empty(Theme::$current->options['no_new_reply_warning']) && isset($_POST['last_msg']) && Topic::$info->id_last_msg > $_POST['last_msg'])
-		{
+		if (empty(Theme::$current->options['no_new_reply_warning']) && isset($_POST['last_msg']) && Topic::$info->id_last_msg > $_POST['last_msg']) {
 			$_REQUEST['preview'] = true;
 			$this->show();
+
 			return;
 		}
 
@@ -975,43 +892,37 @@ protected function prepareNewTopic(): void
 		// Do like, the permissions, for safety and stuff...
 		$this->becomes_approved = true;
 
-		if (Config::$modSettings['postmod_active'] && !User::$me->allowedTo('post_new') && User::$me->allowedTo('post_unapproved_topics'))
-		{
+		if (Config::$modSettings['postmod_active'] && !User::$me->allowedTo('post_new') && User::$me->allowedTo('post_unapproved_topics')) {
 			$this->becomes_approved = false;
-		}
-		else
-		{
+		} else {
 			User::$me->isAllowedTo('post_new');
 		}
 
-		if (isset($_POST['lock']))
-		{
+		if (isset($_POST['lock'])) {
 			// New topics are by default not locked.
-			if (empty($_POST['lock']))
-			{
+			if (empty($_POST['lock'])) {
 				unset($_POST['lock']);
 			}
 			// Besides, you need permission.
-			elseif (!User::$me->allowedTo(array('lock_any', 'lock_own')))
-			{
+			elseif (!User::$me->allowedTo(['lock_any', 'lock_own'])) {
 				unset($_POST['lock']);
 			}
 			// A moderator-lock (1) can override a user-lock (2).
-			else
-			{
+			else {
 				$_POST['lock'] = User::$me->allowedTo('lock_any') ? 1 : 2;
 			}
 		}
 
-		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !User::$me->allowedTo('make_sticky')))
+		if (isset($_POST['sticky']) && (empty($_POST['sticky']) || !User::$me->allowedTo('make_sticky'))) {
 			unset($_POST['sticky']);
+		}
 
 		// Saving your new topic as a draft first?
-		if (!empty(Config::$modSettings['drafts_post_enabled']) && isset($_POST['save_draft']))
-		{
+		if (!empty(Config::$modSettings['drafts_post_enabled']) && isset($_POST['save_draft'])) {
 			$draft = new Draft((int) $_POST['id_draft']);
 			$draft->save($this->errors);
 			$this->show();
+
 			return;
 		}
 
@@ -1029,69 +940,58 @@ protected function prepareEdit(): void
 
 		$msgs = Msg::load($_REQUEST['msg']);
 
-		if (empty($msgs))
+		if (empty($msgs)) {
 			ErrorHandler::fatalLang('cant_find_messages', false);
+		}
 
 		$this->existing_msg = current($msgs);
 
-		if (!empty(Topic::$info->is_locked) && !User::$me->allowedTo('moderate_board'))
+		if (!empty(Topic::$info->is_locked) && !User::$me->allowedTo('moderate_board')) {
 			ErrorHandler::fatalLang('topic_locked', false);
+		}
 
-		if (isset($_POST['lock']))
-		{
+		if (isset($_POST['lock'])) {
 			// Nothing changes to the lock status.
-			if ((empty($_POST['lock']) && empty(Topic::$info->is_locked)) || (!empty($_POST['lock']) && !empty(Topic::$info->is_locked)))
-			{
+			if ((empty($_POST['lock']) && empty(Topic::$info->is_locked)) || (!empty($_POST['lock']) && !empty(Topic::$info->is_locked))) {
 				unset($_POST['lock']);
 			}
 			// You're simply not allowed to (un)lock this.
-			elseif (!User::$me->allowedTo(array('lock_any', 'lock_own')) || (!User::$me->allowedTo('lock_any') && User::$me->id != Topic::$info->id_member_started))
-			{
+			elseif (!User::$me->allowedTo(['lock_any', 'lock_own']) || (!User::$me->allowedTo('lock_any') && User::$me->id != Topic::$info->id_member_started)) {
 				unset($_POST['lock']);
 			}
 			// You're only allowed to lock your own topics.
-			elseif (!User::$me->allowedTo('lock_any'))
-			{
+			elseif (!User::$me->allowedTo('lock_any')) {
 				// You're not allowed to break a moderator's lock.
-				if (Topic::$info->is_locked == 1)
-				{
+				if (Topic::$info->is_locked == 1) {
 					unset($_POST['lock']);
 				}
 				// Lock it with a soft lock or unlock it.
-				else
-				{
+				else {
 					$_POST['lock'] = empty($_POST['lock']) ? 0 : 2;
 				}
 			}
 			// You must be the moderator.
-			else
-			{
+			else {
 				$_POST['lock'] = empty($_POST['lock']) ? 0 : 1;
 
 				// Did someone (un)lock this while you were posting?
-				if (isset($_POST['already_locked']) && $_POST['already_locked'] != Topic::$info->is_locked)
-				{
+				if (isset($_POST['already_locked']) && $_POST['already_locked'] != Topic::$info->is_locked) {
 					$this->errors[] = 'topic_' . (empty(Topic::$info->is_locked) ? 'un' : '') . 'locked';
 				}
 			}
 		}
 
 		// Change the sticky status of this topic?
-		if (isset($_POST['sticky']) && (!User::$me->allowedTo('make_sticky') || $_POST['sticky'] == Topic::$info->is_sticky))
-		{
+		if (isset($_POST['sticky']) && (!User::$me->allowedTo('make_sticky') || $_POST['sticky'] == Topic::$info->is_sticky)) {
 			unset($_POST['sticky']);
-		}
-		elseif (isset($_POST['sticky']))
-		{
+		} elseif (isset($_POST['sticky'])) {
 			// Did someone (un)sticky this while you were posting?
-			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != Topic::$info->is_sticky)
-			{
+			if (isset($_POST['already_sticky']) && $_POST['already_sticky'] != Topic::$info->is_sticky) {
 				$this->errors[] = 'topic_' . (empty(Topic::$info->is_locked) ? 'un' : '') . 'stickied';
 			}
 		}
 
-		if ($this->existing_msg->id_member == User::$me->id && !User::$me->allowedTo('modify_any'))
-		{
+		if ($this->existing_msg->id_member == User::$me->id && !User::$me->allowedTo('modify_any')) {
 			if (
 				(
 					!Config::$modSettings['postmod_active']
@@ -1099,41 +999,33 @@ protected function prepareEdit(): void
 				)
 				&& !empty(Config::$modSettings['edit_disable_time'])
 				&& $this->existing_msg->poster_time + (Config::$modSettings['edit_disable_time'] + 5) * 60 < time()
-			)
-			{
+			) {
 				ErrorHandler::fatalLang('modify_post_time_passed', false);
-			}
-			elseif (Topic::$info->id_member_started == User::$me->id && !User::$me->allowedTo('modify_own'))
-			{
+			} elseif (Topic::$info->id_member_started == User::$me->id && !User::$me->allowedTo('modify_own')) {
 				User::$me->isAllowedTo('modify_replies');
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('modify_own');
 			}
-		}
-		elseif (Topic::$info->id_member_started == User::$me->id && !User::$me->allowedTo('modify_any'))
-		{
+		} elseif (Topic::$info->id_member_started == User::$me->id && !User::$me->allowedTo('modify_any')) {
 			User::$me->isAllowedTo('modify_replies');
 
 			// If you're modifying a reply, I say it better be logged...
 			$moderationAction = true;
-		}
-		else
-		{
+		} else {
 			User::$me->isAllowedTo('modify_any');
 
 			// Log it, assuming you're not modifying your own post.
-			if ($this->existing_msg->id_member != User::$me->id)
+			if ($this->existing_msg->id_member != User::$me->id) {
 				$moderationAction = true;
+			}
 		}
 
 		// If drafts are enabled, then lets send this off to save
-		if (!empty(Config::$modSettings['drafts_post_enabled']) && isset($_POST['save_draft']))
-		{
+		if (!empty(Config::$modSettings['drafts_post_enabled']) && isset($_POST['save_draft'])) {
 			$draft = new Draft((int) $_POST['id_draft']);
 			$draft->save($this->errors);
 			$this->show();
+
 			return;
 		}
 
@@ -1145,8 +1037,7 @@ protected function prepareEdit(): void
 		$approve_checked = (!empty($REQUEST['approve']) ? 1 : 0);
 		$this->becomes_approved = Config::$modSettings['postmod_active'] ? ($this->can_approve && !$this->existing_msg->approved ? $approve_checked : $this->existing_msg->approved) : 1;
 
-		if (!User::$me->allowedTo('moderate_forum') || !$this->authorIsGuest)
-		{
+		if (!User::$me->allowedTo('moderate_forum') || !$this->authorIsGuest) {
 			$_POST['guestname'] = $this->existing_msg->poster_name;
 			$_POST['email'] = $this->existing_msg->poster_email;
 		}
@@ -1154,14 +1045,15 @@ protected function prepareEdit(): void
 		// Update search api
 		$searchAPI = SearchApi::load();
 
-		if ($searchAPI->supportsMethod('postRemoved'))
+		if ($searchAPI->supportsMethod('postRemoved')) {
 			$searchAPI->postRemoved($_REQUEST['msg']);
+		}
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Post2::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Post2::exportStatic')) {
 	Post2::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Account.php b/Sources/Actions/Profile/Account.php
index c4ebacfba8..0910f92674 100644
--- a/Sources/Actions/Profile/Account.php
+++ b/Sources/Actions/Profile/Account.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Lang;
 use SMF\Profile;
 use SMF\User;
@@ -33,12 +32,11 @@ class Account implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'account',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -63,34 +61,33 @@ public function execute(): void
 	{
 		Profile::$member->loadThemeOptions();
 
-		if (User::$me->allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any')))
-		{
+		if (User::$me->allowedTo(['profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any'])) {
 			Profile::$member->loadCustomFields('account');
 		}
 
 		Utils::$context['page_desc'] = Lang::$txt['account_info'];
 
 		Profile::$member->setupContext(
-			array(
-				'member_name', 
-				'real_name', 
-				'date_registered', 
-				'posts', 
-				'lngfile', 
-			'hr',
-				'id_group', 
-			'hr',
-				'email_address', 
-				'show_online', 
-			'hr',
-				'tfa', 
-			'hr',
-				'passwrd1', 
-				'passwrd2', 
-			'hr',
-				'secret_question', 
+			[
+				'member_name',
+				'real_name',
+				'date_registered',
+				'posts',
+				'lngfile',
+				'hr',
+				'id_group',
+				'hr',
+				'email_address',
+				'show_online',
+				'hr',
+				'tfa',
+				'hr',
+				'passwrd1',
+				'passwrd2',
+				'hr',
+				'secret_question',
 				'secret_answer',
-			),
+			],
 		);
 	}
 
@@ -105,8 +102,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -128,13 +126,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Account::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Account::exportStatic')) {
 	Account::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Activate.php b/Sources/Actions/Profile/Activate.php
index 5218d44a68..9da1631d8c 100644
--- a/Sources/Actions/Profile/Activate.php
+++ b/Sources/Actions/Profile/Activate.php
@@ -13,17 +13,14 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Logging;
 use SMF\Profile;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Activates an account.
@@ -37,12 +34,11 @@ class Activate implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'activateAccount',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -67,11 +63,9 @@ public function execute(): void
 	{
 		User::$me->isAllowedTo('moderate_forum');
 
-		if (isset($_REQUEST['save']) && isset(Profile::$member->is_activated) && Profile::$member->is_activated != 1)
-		{
+		if (isset($_REQUEST['save'], Profile::$member->is_activated)   && Profile::$member->is_activated != 1) {
 			// If we are approving the deletion of an account, we do something special ;)
-			if (Profile::$member->is_activated == 4)
-			{
+			if (Profile::$member->is_activated == 4) {
 				User::delete(Utils::$context['id_member']);
 				Utils::redirectexit();
 			}
@@ -79,18 +73,17 @@ public function execute(): void
 			$prev_is_activated = Profile::$member->is_activated;
 
 			// Let the integrations know of the activation.
-			IntegrationHook::call('integrate_activate', array(Profile::$member->username));
+			IntegrationHook::call('integrate_activate', [Profile::$member->username]);
 
 			// Actually update this member now, as it guarantees the unapproved count can't get corrupted.
-			User::updateMemberData(Utils::$context['id_member'], array('is_activated' => Profile::$member->is_activated >= 10 ? 11 : 1, 'validation_code' => ''));
+			User::updateMemberData(Utils::$context['id_member'], ['is_activated' => Profile::$member->is_activated >= 10 ? 11 : 1, 'validation_code' => '']);
 
 			// Log what we did?
-			Logging::logAction('approve_member', array('member' => Profile::$member->id), 'admin');
+			Logging::logAction('approve_member', ['member' => Profile::$member->id], 'admin');
 
 			// If we are doing approval, update the stats for the member just in case.
-			if (in_array($prev_is_activated, array(3, 4, 5, 13, 14, 15)))
-			{
-				Config::updateModSettings(array('unapprovedMembers' => max(0, Config::$modSettings['unapprovedMembers'] - 1)));
+			if (in_array($prev_is_activated, [3, 4, 5, 13, 14, 15])) {
+				Config::updateModSettings(['unapprovedMembers' => max(0, Config::$modSettings['unapprovedMembers'] - 1)]);
 			}
 
 			// Make sure we update the stats too.
@@ -109,8 +102,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -132,13 +126,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Activate::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Activate::exportStatic')) {
 	Activate::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/AlertsPopup.php b/Sources/Actions/Profile/AlertsPopup.php
index a142ae4629..bee62be9e9 100644
--- a/Sources/Actions/Profile/AlertsPopup.php
+++ b/Sources/Actions/Profile/AlertsPopup.php
@@ -13,10 +13,9 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
 use SMF\Alert;
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\Lang;
 use SMF\User;
@@ -34,12 +33,11 @@ class AlertsPopup implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'alerts_popup',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -66,20 +64,19 @@ public function execute(): void
 		Config::$db_show_debug = false;
 
 		// We only want to output our little layer here.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 
 		// No funny business allowed
 		$counter = isset($_REQUEST['counter']) ? max(0, (int) $_REQUEST['counter']) : 0;
 
 		$limit = !empty(Config::$modSettings['alerts_per_page']) && (int) Config::$modSettings['alerts_per_page'] < 1000 ? min((int) Config::$modSettings['alerts_per_page'], 1000) : 25;
 
-		Utils::$context['unread_alerts'] = array();
+		Utils::$context['unread_alerts'] = [];
 
-		if ($counter < User::$me->alerts)
-		{
+		if ($counter < User::$me->alerts) {
 			// Now fetch me my unread alerts, pronto!
 			Utils::$context['unread_alerts'] = Alert::fetch(User::$me->id, false, !empty($counter) ? User::$me->alerts - $counter : $limit, 0, !isset($_REQUEST['counter']));
-		}	
+		}
 	}
 
 	/***********************
@@ -93,8 +90,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -122,7 +120,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\AlertsPopup::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\AlertsPopup::exportStatic')) {
 	AlertsPopup::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/BuddyIgnoreLists.php b/Sources/Actions/Profile/BuddyIgnoreLists.php
index 908be0ac0a..ff8c398a47 100644
--- a/Sources/Actions/Profile/BuddyIgnoreLists.php
+++ b/Sources/Actions/Profile/BuddyIgnoreLists.php
@@ -13,11 +13,11 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -26,7 +26,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -40,12 +39,13 @@ class BuddyIgnoreLists implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'editBuddyIgnoreLists',
-		),
-	);
+			'editBuddies' => 'editBuddies',
+			'editIgnoreList' => 'editIgnoreList',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -68,20 +68,20 @@ class BuddyIgnoreLists implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'buddies' => 'buddies',
 		'ignore' => 'ignore',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subtemplates = array(
+	public static array $subtemplates = [
 		'buddies' => 'editBuddies',
 		'ignore' => 'editIgnoreList',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -105,8 +105,9 @@ class BuddyIgnoreLists implements ActionInterface
 	public function execute(): void
 	{
 		// Do a quick check to ensure people aren't getting here illegally!
-		if (!User::$me->is_owner || empty(Config::$modSettings['enable_buddylist']))
+		if (!User::$me->is_owner || empty(Config::$modSettings['enable_buddylist'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Can we email the user directly?
 		Utils::$context['can_moderate_forum'] = User::$me->allowedTo('moderate_forum');
@@ -115,22 +116,23 @@ public function execute(): void
 		Utils::$context['sub_template'] = self::$subtemplates[$this->subaction];
 
 		// Create the tabs for the template.
-		Menu::$loaded['profile']->tab_data = array(
+		Menu::$loaded['profile']->tab_data = [
 			'title' => Lang::$txt['editBuddyIgnoreLists'],
 			'description' => Lang::$txt['buddy_ignore_desc'],
 			'icon_class' => 'main_icons profile_hd',
-			'tabs' => array(
-				'buddies' => array(),
-				'ignore' => array(),
-			),
-		);
+			'tabs' => [
+				'buddies' => [],
+				'ignore' => [],
+			],
+		];
 
-		Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-		
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 
-		if (!empty($call))
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
+
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -141,26 +143,23 @@ public function buddies(): void
 		// For making changes!
 		$buddiesArray = explode(',', Profile::$member->data['buddy_list']);
 
-		foreach ($buddiesArray as $k => $dummy)
-		{
-			if ($dummy == '')
+		foreach ($buddiesArray as $k => $dummy) {
+			if ($dummy == '') {
 				unset($buddiesArray[$k]);
+			}
 		}
 
 		// Removing a buddy?
-		if (isset($_GET['remove']))
-		{
+		if (isset($_GET['remove'])) {
 			User::$me->checkSession('get');
 
-			IntegrationHook::call('integrate_remove_buddy', array(Profile::$member->id));
+			IntegrationHook::call('integrate_remove_buddy', [Profile::$member->id]);
 
 			$_SESSION['prf-save'] = Lang::$txt['could_not_remove_person'];
 
 			// Heh, I'm lazy, do it the easy way...
-			foreach ($buddiesArray as $key => $buddy)
-			{
-				if ($buddy == (int) $_GET['remove'])
-				{
+			foreach ($buddiesArray as $key => $buddy) {
+				if ($buddy == (int) $_GET['remove']) {
 					unset($buddiesArray[$key]);
 					$_SESSION['prf-save'] = true;
 				}
@@ -168,58 +167,56 @@ public function buddies(): void
 
 			// Make the changes.
 			Profile::$member->data['buddy_list'] = implode(',', $buddiesArray);
-			User::updateMemberData(Profile::$member->id, array('buddy_list' => Profile::$member->data['buddy_list']));
+			User::updateMemberData(Profile::$member->id, ['buddy_list' => Profile::$member->data['buddy_list']]);
 
 			// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 			Utils::redirectexit('action=profile;area=lists;sa=buddies;u=' . Profile::$member->id);
 		}
 
 		// Adding a buddy?
-		if (isset($_POST['new_buddy']))
-		{
+		if (isset($_POST['new_buddy'])) {
 			User::$me->checkSession();
 
 			// Prepare the string for extraction...
-			$_POST['new_buddy'] = strtr(Utils::htmlspecialchars($_POST['new_buddy'], ENT_QUOTES), array('&quot;' => '"'));
+			$_POST['new_buddy'] = strtr(Utils::htmlspecialchars($_POST['new_buddy'], ENT_QUOTES), ['&quot;' => '"']);
 
 			preg_match_all('~"([^"]+)"~', $_POST['new_buddy'], $matches);
 
 			$new_buddies = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST['new_buddy']))));
 
-			foreach ($new_buddies as $k => $dummy)
-			{
-				$new_buddies[$k] = strtr(trim($new_buddies[$k]), array('\'' => '&#039;'));
+			foreach ($new_buddies as $k => $dummy) {
+				$new_buddies[$k] = strtr(trim($new_buddies[$k]), ['\'' => '&#039;']);
 
-				if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array(Profile::$member->data['member_name'], Profile::$member->data['real_name'])))
-				{
+				if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], [Profile::$member->data['member_name'], Profile::$member->data['real_name']])) {
 					unset($new_buddies[$k]);
 				}
 			}
 
-			IntegrationHook::call('integrate_add_buddies', array(Profile::$member->id, &$new_buddies));
+			IntegrationHook::call('integrate_add_buddies', [Profile::$member->id, &$new_buddies]);
 
 			$_SESSION['prf-save'] = Lang::$txt['could_not_add_person'];
 
-			if (!empty($new_buddies))
-			{
+			if (!empty($new_buddies)) {
 				// Now find out the id_member of the buddy.
-				$request = Db::$db->query('', '
-					SELECT id_member
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE member_name IN ({array_string:new_buddies}) OR real_name IN ({array_string:new_buddies})
 					LIMIT {int:count_new_buddies}',
-					array(
+					[
 						'new_buddies' => $new_buddies,
 						'count_new_buddies' => count($new_buddies),
-					)
+					],
 				);
+
 				// Add the new member to the buddies array.
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$_SESSION['prf-save'] = true;
 
-					if (in_array($row['id_member'], $buddiesArray))
+					if (in_array($row['id_member'], $buddiesArray)) {
 						continue;
+					}
 
 					$buddiesArray[] = (int) $row['id_member'];
 				}
@@ -227,7 +224,7 @@ public function buddies(): void
 
 				// Now update the current user's buddy list.
 				Profile::$member->data['buddy_list'] = implode(',', $buddiesArray);
-				User::updateMemberData(Profile::$member->id, array('buddy_list' => Profile::$member->data['buddy_list']));
+				User::updateMemberData(Profile::$member->id, ['buddy_list' => Profile::$member->data['buddy_list']]);
 			}
 
 			// Back to the buddy list!
@@ -235,53 +232,53 @@ public function buddies(): void
 		}
 
 		// Get all the users "buddies"...
-		$buddies = array();
+		$buddies = [];
 
 		// Gotta load the custom profile fields names.
-		Utils::$context['custom_pf'] = array();
-		
-		$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : array();
-		
-		$request = Db::$db->query('', '
-			SELECT col_name, field_name, field_desc, field_type, field_options, show_mlist, bbc, enclose
+		Utils::$context['custom_pf'] = [];
+
+		$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : [];
+
+		$request = Db::$db->query(
+			'',
+			'SELECT col_name, field_name, field_desc, field_type, field_options, show_mlist, bbc, enclose
 			FROM {db_prefix}custom_fields
 			WHERE active = {int:active}
 				AND private < {int:private_level}',
-			array(
+			[
 				'active' => 1,
 				'private_level' => 2,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset($disabled_fields[$row['col_name']]) && !empty($row['show_mlist']))
-			{
-				Utils::$context['custom_pf'][$row['col_name']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset($disabled_fields[$row['col_name']]) && !empty($row['show_mlist'])) {
+				Utils::$context['custom_pf'][$row['col_name']] = [
 					'label' => Lang::tokenTxtReplace($row['field_name']),
 					'type' => $row['field_type'],
-					'options' => !empty($row['field_options']) ? explode(',', $row['field_options']) : array(),
+					'options' => !empty($row['field_options']) ? explode(',', $row['field_options']) : [],
 					'bbc' => !empty($row['bbc']),
 					'enclose' => $row['enclose'],
-				);
+				];
 			}
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($buddiesArray))
-		{
-			$result = Db::$db->query('', '
-				SELECT id_member
+		if (!empty($buddiesArray)) {
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:buddy_list})
 				ORDER BY real_name
 				LIMIT {int:buddy_list_count}',
-				array(
+				[
 					'buddy_list' => $buddiesArray,
 					'buddy_list_count' => count(explode(',', Profile::$member->data['buddy_list'])),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$buddies[] = $row['id_member'];
 			}
 			Db::$db->free_result($result);
@@ -293,76 +290,62 @@ public function buddies(): void
 		User::load($buddies, User::LOAD_BY_ID, 'profile');
 
 		// Setup the context for each buddy.
-		Utils::$context['buddies'] = array();
+		Utils::$context['buddies'] = [];
 
-		foreach ($buddies as $buddy)
-		{
+		foreach ($buddies as $buddy) {
 			Utils::$context['buddies'][$buddy] = User::$loaded[$buddy]->format();
 
 			// Make sure to load the appropriate fields for each user
-			if (!empty(Utils::$context['custom_pf']))
-			{
-				foreach (Utils::$context['custom_pf'] as $key => $column)
-				{
+			if (!empty(Utils::$context['custom_pf'])) {
+				foreach (Utils::$context['custom_pf'] as $key => $column) {
 					// Don't show anything if there isn't anything to show.
-					if (!isset(Utils::$context['buddies'][$buddy]['options'][$key]))
-					{
+					if (!isset(Utils::$context['buddies'][$buddy]['options'][$key])) {
 						Utils::$context['buddies'][$buddy]['options'][$key] = '';
+
 						continue;
 					}
 
 					$currentKey = 0;
-					if (!empty($column['options']))
-					{
-						foreach ($column['options'] as $k => $v)
-						{
-							if (empty($currentKey))
-							{
+
+					if (!empty($column['options'])) {
+						foreach ($column['options'] as $k => $v) {
+							if (empty($currentKey)) {
 								$currentKey = $v == Utils::$context['buddies'][$buddy]['options'][$key] ? $k : 0;
 							}
 						}
 					}
 
-					if ($column['bbc'] && !empty(Utils::$context['buddies'][$buddy]['options'][$key]))
-					{
+					if ($column['bbc'] && !empty(Utils::$context['buddies'][$buddy]['options'][$key])) {
 						Utils::$context['buddies'][$buddy]['options'][$key] = strip_tags(BBCodeParser::load()->parse(Utils::$context['buddies'][$buddy]['options'][$key]));
-					}
-
-					elseif ($column['type'] == 'check')
-					{
+					} elseif ($column['type'] == 'check') {
 						Utils::$context['buddies'][$buddy]['options'][$key] = Utils::$context['buddies'][$buddy]['options'][$key] == 0 ? Lang::$txt['no'] : Lang::$txt['yes'];
 					}
 
 					// Enclosing the user input within some other text?
-					if (!empty($column['enclose']) && !empty(Utils::$context['buddies'][$buddy]['options'][$key]))
-					{
-						Utils::$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
+					if (!empty($column['enclose']) && !empty(Utils::$context['buddies'][$buddy]['options'][$key])) {
+						Utils::$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], [
 							'{SCRIPTURL}' => Config::$scripturl,
 							'{IMAGES_URL}' => Theme::$current->settings['images_url'],
 							'{DEFAULT_IMAGES_URL}' => Theme::$current->settings['default_images_url'],
 							'{KEY}' => $currentKey,
 							'{INPUT}' => Lang::tokenTxtReplace(Utils::$context['buddies'][$buddy]['options'][$key]),
-						));
+						]);
 					}
 				}
 			}
 		}
 
-		if (isset($_SESSION['prf-save']))
-		{
-			if ($_SESSION['prf-save'] === true)
-			{
+		if (isset($_SESSION['prf-save'])) {
+			if ($_SESSION['prf-save'] === true) {
 				Utils::$context['saved_successful'] = true;
-			}
-			else
-			{
+			} else {
 				Utils::$context['saved_failed'] = $_SESSION['prf-save'];
 			}
 
 			unset($_SESSION['prf-save']);
 		}
 
-		IntegrationHook::call('integrate_view_buddies', array(Profile::$member->id));
+		IntegrationHook::call('integrate_view_buddies', [Profile::$member->id]);
 	}
 
 	/**
@@ -373,24 +356,21 @@ public function ignore(): void
 		// For making changes!
 		$ignoreArray = explode(',', Profile::$member->data['pm_ignore_list']);
 
-		foreach ($ignoreArray as $k => $dummy)
-		{
-			if ($dummy == '')
+		foreach ($ignoreArray as $k => $dummy) {
+			if ($dummy == '') {
 				unset($ignoreArray[$k]);
+			}
 		}
 
 		// Removing a member from the ignore list?
-		if (isset($_GET['remove']))
-		{
+		if (isset($_GET['remove'])) {
 			User::$me->checkSession('get');
 
 			$_SESSION['prf-save'] = Lang::$txt['could_not_remove_person'];
 
 			// Heh, I'm lazy, do it the easy way...
-			foreach ($ignoreArray as $key => $id_remove)
-			{
-				if ($id_remove == (int) $_GET['remove'])
-				{
+			foreach ($ignoreArray as $key => $id_remove) {
+				if ($id_remove == (int) $_GET['remove']) {
 					unset($ignoreArray[$key]);
 					$_SESSION['prf-save'] = true;
 				}
@@ -398,56 +378,54 @@ public function ignore(): void
 
 			// Make the changes.
 			Profile::$member->data['pm_ignore_list'] = implode(',', $ignoreArray);
-			User::updateMemberData(Profile::$member->id, array('pm_ignore_list' => Profile::$member->data['pm_ignore_list']));
+			User::updateMemberData(Profile::$member->id, ['pm_ignore_list' => Profile::$member->data['pm_ignore_list']]);
 
 			// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 			Utils::redirectexit('action=profile;area=lists;sa=ignore;u=' . Profile::$member->id);
 		}
-		
+
 		// Adding a member to the ignore list?
-		if (isset($_POST['new_ignore']))
-		{
+		if (isset($_POST['new_ignore'])) {
 			User::$me->checkSession();
-			
+
 			// Prepare the string for extraction...
-			$_POST['new_ignore'] = strtr(Utils::htmlspecialchars($_POST['new_ignore'], ENT_QUOTES), array('&quot;' => '"'));
-			
+			$_POST['new_ignore'] = strtr(Utils::htmlspecialchars($_POST['new_ignore'], ENT_QUOTES), ['&quot;' => '"']);
+
 			preg_match_all('~"([^"]+)"~', $_POST['new_ignore'], $matches);
-			
+
 			$new_entries = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $_POST['new_ignore']))));
 
-			foreach ($new_entries as $k => $dummy)
-			{
-				$new_entries[$k] = strtr(trim($new_entries[$k]), array('\'' => '&#039;'));
+			foreach ($new_entries as $k => $dummy) {
+				$new_entries[$k] = strtr(trim($new_entries[$k]), ['\'' => '&#039;']);
 
-				if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array(Profile::$member->data['member_name'], Profile::$member->data['real_name'])))
-				{
+				if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], [Profile::$member->data['member_name'], Profile::$member->data['real_name']])) {
 					unset($new_entries[$k]);
 				}
 			}
 
 			$_SESSION['prf-save'] = Lang::$txt['could_not_add_person'];
 
-			if (!empty($new_entries))
-			{
+			if (!empty($new_entries)) {
 				// Now find out the id_member for the members in question.
-				$request = Db::$db->query('', '
-					SELECT id_member
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE member_name IN ({array_string:new_entries}) OR real_name IN ({array_string:new_entries})
 					LIMIT {int:count_new_entries}',
-					array(
+					[
 						'new_entries' => $new_entries,
 						'count_new_entries' => count($new_entries),
-					)
+					],
 				);
+
 				// Add the new member to the ignored array.
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$_SESSION['prf-save'] = true;
 
-					if (in_array($row['id_member'], $ignoreArray))
+					if (in_array($row['id_member'], $ignoreArray)) {
 						continue;
+					}
 
 					$ignoreArray[] = (int) $row['id_member'];
 				}
@@ -455,7 +433,7 @@ public function ignore(): void
 
 				// Now update the current user's ignored list.
 				Profile::$member->data['pm_ignore_list'] = implode(',', $ignoreArray);
-				User::updateMemberData(Profile::$member->id, array('pm_ignore_list' => Profile::$member->data['pm_ignore_list']));
+				User::updateMemberData(Profile::$member->id, ['pm_ignore_list' => Profile::$member->data['pm_ignore_list']]);
 			}
 
 			// Back to the list of pitiful people!
@@ -463,23 +441,23 @@ public function ignore(): void
 		}
 
 		// Initialise the list of members we're ignoring.
-		$ignored = array();
+		$ignored = [];
 
-		if (!empty($ignoreArray))
-		{
-			$result = Db::$db->query('', '
-				SELECT id_member
+		if (!empty($ignoreArray)) {
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:ignore_list})
 				ORDER BY real_name
 				LIMIT {int:ignore_list_count}',
-				array(
+				[
 					'ignore_list' => $ignoreArray,
 					'ignore_list_count' => count(explode(',', Profile::$member->data['pm_ignore_list'])),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$ignored[] = $row['id_member'];
 			}
 			Db::$db->free_result($result);
@@ -491,21 +469,16 @@ public function ignore(): void
 		User::load($ignored, User::LOAD_BY_ID, 'profile');
 
 		// Setup the context for each buddy.
-		Utils::$context['ignore_list'] = array();
+		Utils::$context['ignore_list'] = [];
 
-		foreach ($ignored as $ignore_member)
-		{
+		foreach ($ignored as $ignore_member) {
 			Utils::$context['ignore_list'][$ignore_member] = User::$loaded[$ignore_member]->format();
 		}
 
-		if (isset($_SESSION['prf-save']))
-		{
-			if ($_SESSION['prf-save'] === true)
-			{
+		if (isset($_SESSION['prf-save'])) {
+			if ($_SESSION['prf-save'] === true) {
 				Utils::$context['saved_successful'] = true;
-			}
-			else
-			{
+			} else {
 				Utils::$context['saved_failed'] = $_SESSION['prf-save'];
 			}
 
@@ -524,8 +497,9 @@ public function ignore(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -573,16 +547,19 @@ public static function editIgnoreList($memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\BuddyIgnoreLists::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\BuddyIgnoreLists::exportStatic')) {
 	BuddyIgnoreLists::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Delete.php b/Sources/Actions/Profile/Delete.php
index 8f80b18138..9bb256b64a 100644
--- a/Sources/Actions/Profile/Delete.php
+++ b/Sources/Actions/Profile/Delete.php
@@ -13,10 +13,11 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Logout;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Msg;
@@ -24,8 +25,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Logout;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles deleting an account.
@@ -39,12 +38,12 @@ class Delete implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'deleteAccount',
-		),
-	);
+			'deleteAccount2' => 'deleteAccount2',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -67,12 +66,9 @@ class Delete implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!empty(Utils::$context['completed_save']))
-		{
+		if (!empty(Utils::$context['completed_save'])) {
 			$this->delete();
-		}
-		else
-		{
+		} else {
 			$this->show();
 		}
 	}
@@ -82,12 +78,9 @@ public function execute(): void
 	 */
 	public function show(): void
 	{
-		if (!User::$me->is_owner)
-		{
+		if (!User::$me->is_owner) {
 			User::$me->isAllowedTo('profile_remove_any');
-		}
-		elseif (!User::$me->allowedTo('profile_remove_any'))
-		{
+		} elseif (!User::$me->allowedTo('profile_remove_any')) {
 			User::$me->isAllowedTo('profile_remove_own');
 		}
 
@@ -103,18 +96,14 @@ public function show(): void
 		Utils::$context['page_title'] = Lang::$txt['deleteAccount'] . ': ' . Profile::$member->name;
 	}
 
-
 	/**
 	 * Actually deletes the account.
 	 */
 	public function delete()
 	{
-		if (!User::$me->is_owner)
-		{
+		if (!User::$me->is_owner) {
 			User::$me->isAllowedTo('profile_remove_any');
-		}
-		elseif (!User::$me->allowedTo('profile_remove_any'))
-		{
+		} elseif (!User::$me->allowedTo('profile_remove_any')) {
 			User::$me->isAllowedTo('profile_remove_own');
 		}
 
@@ -124,119 +113,122 @@ public function delete()
 		User::$me->checkSession();
 
 		// Too often, people remove/delete their own only account.
-		if (in_array(1, Profile::$member->groups))
-		{
+		if (in_array(1, Profile::$member->groups)) {
 			// Are you allowed to administrate the forum, as they are?
 			User::$me->isAllowedTo('admin_forum');
 
-			$request = Db::$db->query('', '
-				SELECT id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}members
 				WHERE (id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0)
 					AND id_member != {int:selected_member}
 				LIMIT 1',
-				array(
+				[
 					'admin_group' => 1,
 					'selected_member' => Profile::$member->id,
-				)
+				],
 			);
 			list($another) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			if (empty($another))
+			if (empty($another)) {
 				ErrorHandler::fatalLang('at_least_one_admin', 'critical');
+			}
 		}
 
 		// Deleting someone else's account.
-		if (!User::$me->is_owner)
-		{
+		if (!User::$me->is_owner) {
 			// Now, have you been naughty and need your posts deleting?
 			// @todo Should this check board permissions?
-			if (!empty($_POST['deleteVotes']) && User::$me->allowedTo('moderate_forum'))
-			{
+			if (!empty($_POST['deleteVotes']) && User::$me->allowedTo('moderate_forum')) {
 				// First we find any polls that this user has voted in...
-				$polls_to_update = array();
-				$get_voted_polls = Db::$db->query('', '
-					SELECT DISTINCT id_poll
+				$polls_to_update = [];
+				$get_voted_polls = Db::$db->query(
+					'',
+					'SELECT DISTINCT id_poll
 					FROM {db_prefix}log_polls
 					WHERE id_member = {int:selected_member}',
-					array(
+					[
 						'selected_member' => Profile::$member->id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($get_voted_polls))
-				{
+
+				while ($row = Db::$db->fetch_assoc($get_voted_polls)) {
 					$polls_to_update[] = $row['id_poll'];
 				}
 				Db::$db->free_result($get_voted_polls);
 
 				// Now we delete the votes and update the polls
-				if (!empty($polls_to_update))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}log_polls
+				if (!empty($polls_to_update)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}log_polls
 						WHERE id_member = {int:selected_member}',
-						array(
+						[
 							'selected_member' => Profile::$member->id,
-						)
+						],
 					);
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}polls
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}polls
 						SET votes = votes - 1
 						WHERE id_poll IN ({array_int:polls_to_update})',
-						array(
-							'polls_to_update' => $polls_to_update
-						)
+						[
+							'polls_to_update' => $polls_to_update,
+						],
 					);
 				}
 
 				// Next, delete the posts, if requested.
-				if (in_array($_POST['remove_type'], array('posts', 'topics')))
-				{
+				if (in_array($_POST['remove_type'], ['posts', 'topics'])) {
 					$extra = empty($_POST['perma_delete']) ? ' AND t.id_board != {int:recycle_board}' : '';
 
 					$recycle_board = empty(Config::$modSettings['recycle_board']) ? 0 : Config::$modSettings['recycle_board'];
 
 					// First off we delete any topics the member has started, if requested.
-					if ($_POST['remove_type'] == 'topics')
-					{
+					if ($_POST['remove_type'] == 'topics') {
 						// Fetch all topics started by this user.
-						$request = Db::$db->query('', '
-							SELECT t.id_topic
+						$request = Db::$db->query(
+							'',
+							'SELECT t.id_topic
 							FROM {db_prefix}topics AS t
 							WHERE t.id_member_started = {int:selected_member}' . $extra,
-							array(
+							[
 								'selected_member' => Profile::$member->id,
 								'recycle_board' => $recycle_board,
-							)
+							],
 						);
 						$topic_ids = Db::$db->fetch_all($request);
 						Db::$db->free_result($request);
 
 						// Actually remove the topics.
 						// Ignore recycling if we want to perma-delete things...
-						if (!empty($topic_ids))
+						if (!empty($topic_ids)) {
 							Topic::remove($topic_ids, true, !empty($extra));
+						}
 					}
 
 					// Now delete the remaining messages.
-					$request = Db::$db->query('', '
-						SELECT m.id_msg
+					$request = Db::$db->query(
+						'',
+						'SELECT m.id_msg
 						FROM {db_prefix}messages AS m
 							INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic
 								AND t.id_first_msg != m.id_msg)
 						WHERE m.id_member = {int:selected_member}' . $extra,
-						array(
+						[
 							'selected_member' => Profile::$member->id,
 							'recycle_board' => $recycle_board,
-						)
+						],
 					);
+
 					// This could take a while... but ya know it's gonna be worth it in the end.
-					while ($row = Db::$db->fetch_assoc($request))
-					{
-						if (function_exists('apache_reset_timeout'))
+					while ($row = Db::$db->fetch_assoc($request)) {
+						if (function_exists('apache_reset_timeout')) {
 							@apache_reset_timeout();
+						}
 
 						Msg::remove($row['id_msg']);
 					}
@@ -245,21 +237,20 @@ public function delete()
 			}
 
 			// Only delete this poor member's account if they are actually being booted out of camp.
-			if (isset($_POST['deleteAccount']))
+			if (isset($_POST['deleteAccount'])) {
 				User::delete(Profile::$member->id);
+			}
 		}
 		// Deleting their own account, but they need approval to delete.
-		elseif (!empty(Config::$modSettings['approveAccountDeletion']) && !User::$me->allowedTo('moderate_forum'))
-		{
+		elseif (!empty(Config::$modSettings['approveAccountDeletion']) && !User::$me->allowedTo('moderate_forum')) {
 			// Setup their account for deletion.
-			User::updateMemberData(Profile::$member->id, array('is_activated' => 4));
+			User::updateMemberData(Profile::$member->id, ['is_activated' => 4]);
 
 			// Another account needs approval...
-			Config::updateModSettings(array('unapprovedMembers' => true), true);
+			Config::updateModSettings(['unapprovedMembers' => true], true);
 		}
 		// Deleting their own account, and they don't need approval.
-		else
-		{
+		else {
 			User::delete(Profile::$member->id);
 
 			Logout::call(true);
@@ -279,8 +270,9 @@ public function delete()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -324,13 +316,15 @@ public static function deleteAccount2(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Delete::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Delete::exportStatic')) {
 	Delete::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Export.php b/Sources/Actions/Profile/Export.php
index ecc97edcd6..48146a96c0 100644
--- a/Sources/Actions/Profile/Export.php
+++ b/Sources/Actions/Profile/Export.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Security;
@@ -25,7 +25,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains functions to export a member's profile data to a
@@ -42,14 +41,13 @@ class Export implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'export_profile_data',
 			'createDir' => 'create_export_dir',
 			'getFormats' => 'get_export_formats',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -84,25 +82,25 @@ class Export implements ActionInterface
 	 * Supported formats for the export files.
 	 * Protected to force access via Export::getFormats()
 	 */
-	protected static $formats = array(
-		'XML_XSLT' => array(
+	protected static $formats = [
+		'XML_XSLT' => [
 			'extension' => 'styled.xml',
 			'mime' => 'text/xml',
 			'description' => 'export_format_xml_xslt',
 			'per_page' => 500,
-		),
-		'HTML' => array(
+		],
+		'HTML' => [
 			'extension' => 'html',
 			'mime' => 'text/html',
 			'description' => 'export_format_html',
 			'per_page' => 500,
-		),
-		'XML' => array(
+		],
+		'XML' => [
 			'extension' => 'xml',
 			'mime' => 'text/xml',
 			'description' => 'export_format_xml',
 			'per_page' => 2000,
-		),
+		],
 		// 'CSV' => array(
 		// 	'extension' => 'csv',
 		// 	'mime' => 'text/csv',
@@ -115,7 +113,7 @@ class Export implements ActionInterface
 		// 	'description' => 'export_format_json',
 		//	'per_page' => 2000,
 		// ),
-	);
+	];
 
 	/**
 	 * @var object
@@ -134,8 +132,7 @@ class Export implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (empty(Config::$modSettings['export_dir']) || !is_dir(Config::$modSettings['export_dir']) || !Utils::makeWritable(Config::$modSettings['export_dir']))
-		{
+		if (empty(Config::$modSettings['export_dir']) || !is_dir(Config::$modSettings['export_dir']) || !Utils::makeWritable(Config::$modSettings['export_dir'])) {
 			self::createDir();
 		}
 
@@ -144,124 +141,118 @@ public function execute(): void
 		$idhash = hash_hmac('sha1', Utils::$context['id_member'], Config::getAuthSecret());
 		$dltoken = hash_hmac('sha1', $idhash, Config::getAuthSecret());
 
-		Utils::$context['completed_exports'] = array();
-		Utils::$context['active_exports'] = array();
-		$existing_export_formats = array();
-		$latest = array();
+		Utils::$context['completed_exports'] = [];
+		Utils::$context['active_exports'] = [];
+		$existing_export_formats = [];
+		$latest = [];
 
-		foreach (self::$formats as $format => $format_settings)
-		{
+		foreach (self::$formats as $format => $format_settings) {
 			$idhash_ext = $idhash . '.' . $format_settings['extension'];
 
 			$done = null;
-			Utils::$context['outdated_exports'][$idhash_ext] = array();
+			Utils::$context['outdated_exports'][$idhash_ext] = [];
 
 			// $realfile needs to be the highest numbered one, or 1_*** if none exist.
 			$filenum = 1;
 			$realfile = $export_dir_slash . $filenum . '_' . $idhash_ext;
-			while (file_exists($export_dir_slash . ($filenum + 1) . '_' . $idhash_ext))
+
+			while (file_exists($export_dir_slash . ($filenum + 1) . '_' . $idhash_ext)) {
 				$realfile = $export_dir_slash . ++$filenum . '_' . $idhash_ext;
+			}
 
 			$tempfile = $export_dir_slash . $idhash_ext . '.tmp';
 			$progressfile = $export_dir_slash . $idhash_ext . '.progress.json';
 
 			// If requested by the user, delete any existing export files and background tasks.
-			if (isset($_POST['delete']) && isset($_POST['format']) && $_POST['format'] === $format && isset($_POST['t']) && $_POST['t'] === $dltoken)
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}background_tasks
+			if (isset($_POST['delete'], $_POST['format'])   && $_POST['format'] === $format && isset($_POST['t']) && $_POST['t'] === $dltoken) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}background_tasks
 					WHERE task_class = {string:class}
 						AND task_data LIKE {string:details}',
-					array(
-						'class' => 'SMF\Tasks\ExportProfileData',
-						'details' => substr(Utils::jsonEncode(array('format' => $format, 'uid' => Utils::$context['id_member'])), 0, -1) . ',%',
-					)
+					[
+						'class' => 'SMF\\Tasks\\ExportProfileData',
+						'details' => substr(Utils::jsonEncode(['format' => $format, 'uid' => Utils::$context['id_member']]), 0, -1) . ',%',
+					],
 				);
 
-				foreach (glob($export_dir_slash . '*' . $idhash_ext . '*') as $fpath)
+				foreach (glob($export_dir_slash . '*' . $idhash_ext . '*') as $fpath) {
 					@unlink($fpath);
+				}
 
-				if (empty($_POST['export_begin']))
+				if (empty($_POST['export_begin'])) {
 					Utils::redirectexit('action=profile;area=getprofiledata;u=' . Utils::$context['id_member']);
+				}
 			}
 
-			$progress = file_exists($progressfile) ? Utils::jsonDecode(file_get_contents($progressfile), true) : array();
+			$progress = file_exists($progressfile) ? Utils::jsonDecode(file_get_contents($progressfile), true) : [];
 
-			if (!empty($progress))
-			{
+			if (!empty($progress)) {
 				$included = array_keys($progress);
-			}
-			else
-			{
+			} else {
 				$included = array_intersect(array_keys($this->datatypes), array_keys($_POST));
 			}
 
 			// If we're starting a new export in this format, we're done here.
-			if (!empty($_POST['export_begin']) && isset($_POST['format']) && $_POST['format'] === $format)
-			{
+			if (!empty($_POST['export_begin']) && isset($_POST['format']) && $_POST['format'] === $format) {
 				break;
 			}
 
 			// The rest of this loop deals with current exports, if any.
 
-			$included_desc = array();
+			$included_desc = [];
 
-			foreach ($included as $datatype)
+			foreach ($included as $datatype) {
 				$included_desc[] = Lang::$txt[$datatype];
+			}
 
-			$dlfilename = array_merge(array(Utils::$context['forum_name'], Utils::$context['member']['username']), $included_desc);
+			$dlfilename = array_merge([Utils::$context['forum_name'], Utils::$context['member']['username']], $included_desc);
 
 			$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', Utils::htmlspecialcharsDecode(strip_tags(implode('_', $dlfilename)))));
 
-			if (file_exists($tempfile) && file_exists($progressfile))
-			{
+			if (file_exists($tempfile) && file_exists($progressfile)) {
 				$done = false;
-			}
-			elseif (file_exists($realfile))
-			{
+			} elseif (file_exists($realfile)) {
 				// It looks like we're done.
 				$done = true;
 
 				// But let's check whether it's outdated.
-				foreach ($this->datatypes as $datatype => $datatype_settings)
-				{
-					if (!isset($progress[$datatype]))
+				foreach ($this->datatypes as $datatype => $datatype_settings) {
+					if (!isset($progress[$datatype])) {
 						continue;
+					}
 
-					if (!isset($latest[$datatype]))
-					{
+					if (!isset($latest[$datatype])) {
 						$latest[$datatype] = is_callable($datatype_settings['latest']) ? $datatype_settings['latest'](Utils::$context['id_member']) : $datatype_settings['latest'];
 					}
 
-					if ($latest[$datatype] > $progress[$datatype])
+					if ($latest[$datatype] > $progress[$datatype]) {
 						Utils::$context['outdated_exports'][$idhash_ext][] = $datatype;
+					}
 				}
 			}
 
-			if ($done === true)
-			{
+			if ($done === true) {
 				$exportfilepaths = glob($export_dir_slash . '*_' . $idhash_ext);
 
-				foreach ($exportfilepaths as $exportfilepath)
-				{
+				foreach ($exportfilepaths as $exportfilepath) {
 					$exportbasename = basename($exportfilepath);
 
 					$part = substr($exportbasename, 0, strcspn($exportbasename, '_'));
 					$suffix = count($exportfilepaths) == 1 ? '' : '_' . $part;
 
 					$size = filesize($exportfilepath) / 1024;
-					$units = array('KB', 'MB', 'GB', 'TB');
+					$units = ['KB', 'MB', 'GB', 'TB'];
 					$unitkey = 0;
 
-					while ($size > 1024)
-					{
+					while ($size > 1024) {
 						$size = $size / 1024;
 						$unitkey++;
 					}
 
 					$size = round($size, 2) . $units[$unitkey];
 
-					Utils::$context['completed_exports'][$idhash_ext][$part] = array(
+					Utils::$context['completed_exports'][$idhash_ext][$part] = [
 						'realname' => $exportbasename,
 						'dlbasename' => $dlfilename . $suffix . '.' . $format_settings['extension'],
 						'dltoken' => $dltoken,
@@ -270,89 +261,92 @@ public function execute(): void
 						'format' => $format,
 						'mtime' => Time::create('@' . filemtime($exportfilepath))->format(),
 						'size' => $size,
-					);
+					];
 				}
 
 				ksort(Utils::$context['completed_exports'][$idhash_ext], SORT_NUMERIC);
 
 				$existing_export_formats[] = $format;
-			}
-			elseif ($done === false)
-			{
-				Utils::$context['active_exports'][$idhash_ext] = array(
+			} elseif ($done === false) {
+				Utils::$context['active_exports'][$idhash_ext] = [
 					'dltoken' => $dltoken,
 					'included' => $included,
 					'included_desc' => Lang::sentenceList($included_desc),
 					'format' => $format,
-				);
+				];
 
 				$existing_export_formats[] = $format;
 			}
 		}
 
-		if (!empty($_POST['export_begin']))
-		{
+		if (!empty($_POST['export_begin'])) {
 			User::$me->checkSession();
 			SecurityToken::validate(Utils::$context['token_check'], 'post');
 
 			$format = isset($_POST['format']) && isset(self::$formats[$_POST['format']]) ? $_POST['format'] : 'XML';
 
-			$included = array();
-			$included_desc = array();
+			$included = [];
+			$included_desc = [];
 
-			foreach ($this->datatypes as $datatype => $datatype_settings)
-			{
-				if ($datatype == 'profile' || !empty($_POST[$datatype]))
-				{
+			foreach ($this->datatypes as $datatype => $datatype_settings) {
+				if ($datatype == 'profile' || !empty($_POST[$datatype])) {
 					$included[$datatype] = $datatype_settings[$format];
 
 					$included_desc[] = Lang::$txt[$datatype];
 
 					$start[$datatype] = !empty($start[$datatype]) ? $start[$datatype] : 0;
 
-					if (!isset($latest[$datatype]))
-					{
+					if (!isset($latest[$datatype])) {
 						$latest[$datatype] = is_callable($datatype_settings['latest']) ? $datatype_settings['latest'](Utils::$context['id_member']) : $datatype_settings['latest'];
 					}
 
-					if (!isset($total[$datatype]))
-					{
+					if (!isset($total[$datatype])) {
 						$total[$datatype] = is_callable($datatype_settings['total']) ? $datatype_settings['total'](Utils::$context['id_member']) : $datatype_settings['total'];
 					}
 				}
 			}
 
-			$dlfilename = array_merge(array(Utils::$context['forum_name'], Utils::$context['member']['username']), $included_desc);
+			$dlfilename = array_merge([Utils::$context['forum_name'], Utils::$context['member']['username']], $included_desc);
 
 			$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', Utils::htmlspecialcharsDecode(strip_tags(implode('_', $dlfilename)))));
 
 			$last_page = ceil(array_sum($total) / self::$formats[$format]['per_page']);
 
-			$data = Utils::jsonEncode(array(
+			$data = Utils::jsonEncode([
 				'format' => $format,
 				'uid' => Utils::$context['id_member'],
 				'lang' => Utils::$context['member']['language'],
 				'included' => $included,
 				'start' => $start,
 				'latest' => $latest,
-				'datatype' => isset($current_datatype) ? $current_datatype : key($included),
+				'datatype' => $current_datatype ?? key($included),
 				'format_settings' => self::$formats[$format],
 				'last_page' => $last_page,
 				'dlfilename' => $dlfilename,
-			));
-
-			Db::$db->insert('insert', '{db_prefix}background_tasks',
-				array('task_file' => 'string-255', 'task_class' => 'string-255', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array('$sourcedir/tasks/ExportProfileData.php', 'SMF\Tasks\ExportProfileData', $data, 0),
-				array()
+			]);
+
+			Db::$db->insert(
+				'insert',
+				'{db_prefix}background_tasks',
+				[
+					'task_class' => 'string-255',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\ExportProfileData',
+					$data,
+					0,
+				],
+				[],
 			);
 
 			// So the user can see that we've started.
-			if (!file_exists($tempfile))
+			if (!file_exists($tempfile)) {
 				touch($tempfile);
+			}
 
-			if (!file_exists($progressfile))
-			{
+			if (!file_exists($progressfile)) {
 				file_put_contents($progressfile, Utils::jsonEncode(array_fill_keys(array_keys($included), 0)));
 			}
 
@@ -363,12 +357,9 @@ public function execute(): void
 
 		Utils::$context['page_title'] = Lang::$txt['export_profile_data'];
 
-		if (empty(Config::$modSettings['export_expiry']))
-		{
+		if (empty(Config::$modSettings['export_expiry'])) {
 			unset(Lang::$txt['export_profile_data_desc_list']['expiry']);
-		}
-		else
-		{
+		} else {
 			Lang::$txt['export_profile_data_desc_list']['expiry'] = sprintf(Lang::$txt['export_profile_data_desc_list']['expiry'], Config::$modSettings['export_expiry']);
 		}
 
@@ -388,8 +379,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -414,42 +406,42 @@ public static function call(): void
 	public static function createDir($fallback = ''): string|bool
 	{
 		// No supplied fallback, so use the default location.
-		if (empty($fallback))
+		if (empty($fallback)) {
 			$fallback = Config::$boarddir . DIRECTORY_SEPARATOR . 'exports';
+		}
 
 		// Automatically set it to the fallback if it is missing.
-		if (empty(Config::$modSettings['export_dir']))
-			Config::updateModSettings(array('export_dir' => $fallback));
+		if (empty(Config::$modSettings['export_dir'])) {
+			Config::updateModSettings(['export_dir' => $fallback]);
+		}
 
 		// Make sure the directory exists.
-		if (!file_exists(Config::$modSettings['export_dir']))
+		if (!file_exists(Config::$modSettings['export_dir'])) {
 			@mkdir(Config::$modSettings['export_dir'], null, true);
+		}
 
 		// Make sure the directory has the correct permissions.
-		if (!is_dir(Config::$modSettings['export_dir']) || !Utils::makeWritable(Config::$modSettings['export_dir']))
-		{
+		if (!is_dir(Config::$modSettings['export_dir']) || !Utils::makeWritable(Config::$modSettings['export_dir'])) {
 			Lang::load('Errors');
 
 			// Try again at the fallback location.
-			if (Config::$modSettings['export_dir'] != $fallback)
-			{
+			if (Config::$modSettings['export_dir'] != $fallback) {
 				ErrorHandler::log(sprintf(Lang::$txt['export_dir_forced_change'], Config::$modSettings['export_dir'], $fallback));
 
-				Config::updateModSettings(array('export_dir' => $fallback));
+				Config::updateModSettings(['export_dir' => $fallback]);
 
 				// Secondary fallback will be the default location, so no parameter this time.
 				self::createDir();
 			}
 			// Uh-oh. Even the default location failed.
-			else
-			{
+			else {
 				ErrorHandler::log(Lang::$txt['export_dir_not_writable']);
 
 				return false;
 			}
 		}
 
-		return Security::secureDirectory(array(Config::$modSettings['export_dir']), true);
+		return Security::secureDirectory([Config::$modSettings['export_dir']], true);
 	}
 
 	/**
@@ -462,23 +454,23 @@ public static function getFormats()
 		static $finalized = false;
 
 		// Finalize various string values.
-		if (!$finalized)
-		{
+		if (!$finalized) {
 			array_walk_recursive(
 				self::$formats,
-				function(&$value, $key)
-				{
-					if ($key === 'description')
+				function (&$value, $key) {
+					if ($key === 'description') {
 						$value = Lang::$txt[$value] ?? $value;
-				}
+					}
+				},
 			);
 
 			$finalized = true;
 		}
 
 		// If these are missing, we can't transform the XML on the server.
-		if (!class_exists('DOMDocument') || !class_exists('XSLTProcessor'))
+		if (!class_exists('DOMDocument') || !class_exists('XSLTProcessor')) {
 			unset(self::$formats['HTML']);
+		}
 
 		return self::$formats;
 	}
@@ -492,60 +484,63 @@ function(&$value, $key)
 	 */
 	protected function __construct()
 	{
-		if (!isset(Utils::$context['token_check']))
+		if (!isset(Utils::$context['token_check'])) {
 			Utils::$context['token_check'] = 'profile-ex' . Utils::$context['id_member'];
+		}
 
 		self::getFormats();
 
-		if (!isset($_POST['format']) || !isset(self::$formats[$_POST['format']]))
+		if (!isset($_POST['format']) || !isset(self::$formats[$_POST['format']])) {
 			unset($_POST['format'], $_POST['delete'], $_POST['export_begin']);
+		}
 
 		// This lists the types of data we can export and info for doing so.
-		$this->datatypes = array(
-			'profile' => array(
+		$this->datatypes = [
+			'profile' => [
 				'label' => null,
 				'total' => 0,
 				'latest' => 1,
 				// Instructions to pass to ExportProfileData background task:
-				'XML' => array(
+				'XML' => [
 					'func' => 'getXmlProfile',
 					'langfile' => 'Profile',
-				),
-				'HTML' => array(
+				],
+				'HTML' => [
 					'func' => 'getXmlProfile',
 					'langfile' => 'Profile',
-				),
-				'XML_XSLT' => array(
+				],
+				'XML_XSLT' => [
 					'func' => 'getXmlProfile',
 					'langfile' => 'Profile',
-				),
+				],
 				// 'CSV' => array(),
 				// 'JSON' => array(),
-			),
-			'posts' => array(
+			],
+			'posts' => [
 				'label' => Lang::$txt['export_include_posts'],
 				'total' => Utils::$context['member']['real_posts'],
-				'latest' => function($uid)
-				{
+				'latest' => function ($uid) {
 					static $latest_post;
 
-					if (isset($latest_post))
+					if (isset($latest_post)) {
 						return $latest_post;
+					}
 
 					$query_this_board = !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? 'b.id_board != ' . Config::$modSettings['recycle_board'] : '1=1';
 
-					$request = Db::$db->query('', '
-						SELECT m.id_msg
+					$request = Db::$db->query(
+						'',
+						'SELECT m.id_msg
 						FROM {db_prefix}messages as m
 							INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 						WHERE id_member = {int:uid}
 							AND ' . $query_this_board . '
 						ORDER BY id_msg DESC
 						LIMIT {int:limit}',
-						array(
+						[
 							'limit' => 1,
 							'uid' => $uid,
-						)
+						],
 					);
 					list($latest_post) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
@@ -553,66 +548,68 @@ protected function __construct()
 					return $latest_post;
 				},
 				// Instructions to pass to ExportProfileData background task:
-				'XML' => array(
+				'XML' => [
 					'func' => 'getXmlPosts',
 					'langfile' => 'Post',
-				),
-				'HTML' => array(
+				],
+				'HTML' => [
 					'func' => 'getXmlPosts',
 					'langfile' => 'Post',
-				),
-				'XML_XSLT' => array(
+				],
+				'XML_XSLT' => [
 					'func' => 'getXmlPosts',
 					'langfile' => 'Post',
-				),
+				],
 				// 'CSV' => array(),
 				// 'JSON' => array(),
-			),
-			'personal_messages' => array(
+			],
+			'personal_messages' => [
 				'label' => Lang::$txt['export_include_personal_messages'],
-				'total' => function($uid)
-				{
+				'total' => function ($uid) {
 					static $total_pms;
 
-					if (isset($total_pms))
+					if (isset($total_pms)) {
 						return $total_pms;
+					}
 
-					$request = Db::$db->query('', '
-						SELECT COUNT(*)
+					$request = Db::$db->query(
+						'',
+						'SELECT COUNT(*)
 						FROM {db_prefix}personal_messages AS pm
 							INNER JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm)
 						WHERE (pm.id_member_from = {int:uid} AND pm.deleted_by_sender = {int:not_deleted})
 							OR (pmr.id_member = {int:uid} AND pmr.deleted = {int:not_deleted})',
-						array(
+						[
 							'uid' => $uid,
 							'not_deleted' => 0,
-						)
+						],
 					);
 					list($total_pms) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
 					return $total_pms;
 				},
-				'latest' => function($uid)
-				{
+				'latest' => function ($uid) {
 					static $latest_pm;
 
-					if (isset($latest_pm))
+					if (isset($latest_pm)) {
 						return $latest_pm;
+					}
 
-					$request = Db::$db->query('', '
-						SELECT pm.id_pm
+					$request = Db::$db->query(
+						'',
+						'SELECT pm.id_pm
 						FROM {db_prefix}personal_messages AS pm
 							INNER JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm)
 						WHERE (pm.id_member_from = {int:uid} AND pm.deleted_by_sender = {int:not_deleted})
 							OR (pmr.id_member = {int:uid} AND pmr.deleted = {int:not_deleted})
 						ORDER BY pm.id_pm DESC
 						LIMIT {int:limit}',
-						array(
+						[
 							'limit' => 1,
 							'uid' => $uid,
 							'not_deleted' => 0,
-						)
+						],
 					);
 					list($latest_pm) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
@@ -620,22 +617,22 @@ protected function __construct()
 					return $latest_pm;
 				},
 				// Instructions to pass to ExportProfileData background task:
-				'XML' => array(
+				'XML' => [
 					'func' => 'getXmlPMs',
 					'langfile' => 'PersonalMessage',
-				),
-				'HTML' => array(
+				],
+				'HTML' => [
 					'func' => 'getXmlPMs',
 					'langfile' => 'PersonalMessage',
-				),
-				'XML_XSLT' => array(
+				],
+				'XML_XSLT' => [
 					'func' => 'getXmlPMs',
 					'langfile' => 'PersonalMessage',
-				),
+				],
 				// 'CSV' => array(),
 				// 'JSON' => array(),
-			),
-		);
+			],
+		];
 
 		Utils::$context['export_datatypes'] = $this->datatypes;
 		Utils::$context['export_formats'] = self::$formats;
@@ -643,7 +640,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Export::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Export::exportStatic')) {
 	Export::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ExportAttachment.php b/Sources/Actions/Profile/ExportAttachment.php
index f15921e8a7..533aa3a0c5 100644
--- a/Sources/Actions/Profile/ExportAttachment.php
+++ b/Sources/Actions/Profile/ExportAttachment.php
@@ -13,14 +13,13 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\AttachmentDownload;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Profile;
 use SMF\Utils;
-use SMF\Actions\AttachmentDownload;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Downloads an attachment that was linked from a profile export.
@@ -34,12 +33,11 @@ class ExportAttachment implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'export_attachment',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -87,34 +85,36 @@ class ExportAttachment implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!isset($_GET['t']) || $_GET['t'] !== $this->dltoken)
-		{
+		if (!isset($_GET['t']) || $_GET['t'] !== $this->dltoken) {
 			Utils::sendHttpStatus(403);
+
 			exit;
 		}
 
-		if (empty($this->attach))
-		{
+		if (empty($this->attach)) {
 			Utils::sendHttpStatus(404);
+
 			die('404 File Not Found');
 		}
 
 		// Does this attachment belong to this member?
-		$request = Db::$db->query('', '
-			SELECT m.id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_topic
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}attachments AS a ON (m.id_msg = a.id_msg)
 			WHERE m.id_member = {int:uid}
 				AND a.id_attach = {int:attach}',
-			array(
+			[
 				'uid' => Profile::$member->id,
 				'attach' => $this->attach,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			Db::$db->free_result($request);
 			Utils::sendHttpStatus(403);
+
 			exit;
 		}
 		Db::$db->free_result($request);
@@ -144,8 +144,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -167,8 +168,9 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
 		$this->idhash = hash_hmac('sha1', Profile::$member->id, Config::getAuthSecret());
 		$this->dltoken = hash_hmac('sha1', $this->idhash, Config::getAuthSecret());
@@ -178,7 +180,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ExportAttachment::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ExportAttachment::exportStatic')) {
 	ExportAttachment::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ExportDownload.php b/Sources/Actions/Profile/ExportDownload.php
index 6b7b428e2a..a3cd3c9ac7 100644
--- a/Sources/Actions/Profile/ExportDownload.php
+++ b/Sources/Actions/Profile/ExportDownload.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\Lang;
 use SMF\Utils;
@@ -32,12 +31,11 @@ class ExportDownload implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'download_export_file',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -116,66 +114,66 @@ public function execute(): void
 		$formats = Export::getFormats();
 
 		// No access in strict maintenance mode.
-		if (!empty(Config::$maintenance) && Config::$maintenance == 2)
-		{
+		if (!empty(Config::$maintenance) && Config::$maintenance == 2) {
 			Utils::sendHttpStatus(404);
+
 			exit;
 		}
 
 		// We can't give them anything without these.
-		if (empty($_GET['t']) || empty($_GET['format']) || !isset($formats[$_GET['format']]))
-		{
+		if (empty($_GET['t']) || empty($_GET['format']) || !isset($formats[$_GET['format']])) {
 			Utils::sendHttpStatus(400);
+
 			exit;
 		}
 
 		// Make sure they gave the correct authentication token.
 		// We use these tokens so the user can download without logging in, as required by the GDPR.
-		if ($_GET['t'] !== $this->dltoken)
-		{
+		if ($_GET['t'] !== $this->dltoken) {
 			Utils::sendHttpStatus(403);
+
 			exit;
 		}
 
 		// Obviously we can't give what we don't have.
-		if (empty(Config::$modSettings['export_dir']) || !file_exists($this->path))
-		{
+		if (empty(Config::$modSettings['export_dir']) || !file_exists($this->path)) {
 			Utils::sendHttpStatus(404);
+
 			exit;
 		}
 
-		$file = array(
+		$file = [
 			'path' => $this->path,
 			'filename' => $this->buildFilename(),
 			'mtime' => filemtime($this->path),
 			'size' => filesize($this->path),
 			'mime_type' => $formats[$_GET['format']]['mime'],
-		);
+		];
 
-		$file['etag'] = md5(implode(' ', array($file['filename'], $file['size'], $file['mtime'])));
+		$file['etag'] = md5(implode(' ', [$file['filename'], $file['size'], $file['mtime']]));
 
 		// If it hasn't been modified since the last time it was retrieved, there's no need to serve it again.
-		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE']))
-		{
+		if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 			list($modified_since) = explode(';', $_SERVER['HTTP_IF_MODIFIED_SINCE']);
-			if (strtotime($modified_since) >= $file['mtime'])
-			{
+
+			if (strtotime($modified_since) >= $file['mtime']) {
 				ob_end_clean();
 				header_remove('content-encoding');
 
 				// Answer the question - no, it hasn't been modified ;).
 				Utils::sendHttpStatus(304);
+
 				exit;
 			}
 		}
 
 		// Check whether the ETag was sent back, and cache based on that...
-		if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $file['etag']) !== false)
-		{
+		if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $file['etag']) !== false) {
 			ob_end_clean();
 			header_remove('content-encoding');
 
 			Utils::sendHttpStatus(304);
+
 			exit;
 		}
 
@@ -194,8 +192,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -237,17 +236,16 @@ protected function __construct()
 	 */
 	protected function buildFilename(): string
 	{
-		$datatypes = file_exists($this->progressfile) ? array_keys(Utils::jsonDecode(file_get_contents($this->progressfile), true)) : array('profile');
+		$datatypes = file_exists($this->progressfile) ? array_keys(Utils::jsonDecode(file_get_contents($this->progressfile), true)) : ['profile'];
 
 		$included_desc = array_map(
-			function ($datatype)
-			{
+			function ($datatype) {
 				return Lang::$txt[$datatype];
 			},
-			$datatypes
+			$datatypes,
 		);
 
-		$dlfilename = array_merge(array(Utils::$context['forum_name'], Utils::$context['member']['username']), $included_desc);
+		$dlfilename = array_merge([Utils::$context['forum_name'], Utils::$context['member']['username']], $included_desc);
 		$dlfilename = preg_replace('/[^\p{L}\p{M}\p{N}_]+/u', '-', str_replace('"', '', Utils::htmlspecialcharsDecode(strip_tags(implode('_', $dlfilename)))));
 
 		$suffix = ($this->part > 1 || file_exists($this->export_dir_slash . '2_' . $this->idhash . '.' . $this->extension)) ? '_' . $this->part : '';
@@ -257,7 +255,8 @@ function ($datatype)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ExportDownload::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ExportDownload::exportStatic')) {
 	ExportDownload::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ForumProfile.php b/Sources/Actions/Profile/ForumProfile.php
index b3b94abbf4..de85e79d23 100644
--- a/Sources/Actions/Profile/ForumProfile.php
+++ b/Sources/Actions/Profile/ForumProfile.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Lang;
 use SMF\Profile;
 use SMF\User;
@@ -33,12 +32,11 @@ class ForumProfile implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'forumProfile',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -63,8 +61,7 @@ public function execute(): void
 	{
 		Profile::$member->loadThemeOptions();
 
-		if (User::$me->allowedTo(array('profile_forum_own', 'profile_forum_any')))
-		{
+		if (User::$me->allowedTo(['profile_forum_own', 'profile_forum_any'])) {
 			Profile::$member->loadCustomFields('forumprofile');
 		}
 
@@ -73,18 +70,18 @@ public function execute(): void
 		Utils::$context['show_preview_button'] = true;
 
 		Profile::$member->setupContext(
-			array(
-				'avatar_choice', 
-			'hr', 
-				'personal_text', 
-			'hr',
-				'bday1', 
-				'usertitle', 
-				'signature', 
-			'hr',
-				'website_title', 
+			[
+				'avatar_choice',
+				'hr',
+				'personal_text',
+				'hr',
+				'bday1',
+				'usertitle',
+				'signature',
+				'hr',
+				'website_title',
 				'website_url',
-			),
+			],
 		);
 	}
 
@@ -99,8 +96,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -122,13 +120,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ForumProfile::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ForumProfile::exportStatic')) {
 	ForumProfile::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/GroupMembership.php b/Sources/Actions/Profile/GroupMembership.php
index b87607b2ea..32e0b63d5f 100644
--- a/Sources/Actions/Profile/GroupMembership.php
+++ b/Sources/Actions/Profile/GroupMembership.php
@@ -13,17 +13,16 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\Lang;
 use SMF\Profile;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Allows a user to choose, or at least request, group memberships.
@@ -37,12 +36,12 @@ class GroupMembership implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'groupMembership',
-		),
-	);
+			'groupMembership2' => 'groupMembership2',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -76,12 +75,9 @@ class GroupMembership implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!empty(Utils::$context['completed_save']))
-		{
+		if (!empty(Utils::$context['completed_save'])) {
 			$this->save();
-		}
-		else
-		{
+		} else {
 			$this->show();
 		}
 	}
@@ -91,8 +87,9 @@ public function execute(): void
 	 */
 	public function show(): void
 	{
-		if (!User::$me->allowedTo('manage_membergroups') && !User::$me->is_owner)
+		if (!User::$me->allowedTo('manage_membergroups') && !User::$me->is_owner) {
 			ErrorHandler::fatalLang('cannot_manage_membergroups', false);
+		}
 
 		Utils::$context['primary_group'] = Profile::$member->group_id;
 		Utils::$context['update_message'] = Lang::$txt['group_membership_msg_' . ($_GET['msg'] ?? '')] ?? '';
@@ -101,41 +98,43 @@ public function show(): void
 		Utils::$context['can_edit_primary'] = $this->canEditPrimary();
 
 		// This beast will be our group holder.
-		Utils::$context['groups'] = array(
-			'member' => array(),
-			'available' => array()
-		);
+		Utils::$context['groups'] = [
+			'member' => [],
+			'available' => [],
+		];
 
 		// Get all the membergroups they can join.
 		$this->loadCurrentAndAssignableGroups();
 
 		// Get any pending join requests.
-		$request = Db::$db->query('', '
-			SELECT id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group
 			FROM {db_prefix}log_group_requests
 			WHERE id_member = {int:selected_member}
 				AND status = {int:status_open}',
-			array(
+			[
 				'selected_member' => Profile::$member->id,
 				'status_open' => 0,
-			)
+			],
 		);
 		$open_requests = Db::$db->fetch_all($request);
 		Db::$db->free_result($request);
 
 		// Show the assignable groups in the templates.
-		foreach (Profile::$member->current_and_assignable_groups as $id => $group)
-		{
+		foreach (Profile::$member->current_and_assignable_groups as $id => $group) {
 			// Skip "Regular Members" for now.
-			if ($id == 0)
+			if ($id == 0) {
 				continue;
+			}
 
 			// Are they in this group?
 			$member_or_available = in_array($id, Profile::$member->groups) ? 'member' : 'available';
 
 			// Can't join private or protected groups.
-			if ($group->type < Group::TYPE_REQUESTABLE && $member_or_available == 'available')
+			if ($group->type < Group::TYPE_REQUESTABLE && $member_or_available == 'available') {
 				continue;
+			}
 
 			Utils::$context['groups'][$member_or_available][$id] = $group;
 
@@ -144,23 +143,22 @@ public function show(): void
 		}
 
 		// If needed, add "Regular Members" on the end.
-		if (Utils::$context['can_edit_primary'] || Profile::$member->group_id == Group::REGULAR)
-		{
+		if (Utils::$context['can_edit_primary'] || Profile::$member->group_id == Group::REGULAR) {
 			Utils::$context['groups']['member'][Group::REGULAR] = Profile::$member->assignable_groups[Group::REGULAR];
 			Utils::$context['groups']['member'][Group::REGULAR]->name = Lang::$txt['regular_members'];
 		}
 
 		// No changing primary group unless you have enough groups!
-		if (count(Utils::$context['groups']['member']) < 2)
+		if (count(Utils::$context['groups']['member']) < 2) {
 			Utils::$context['can_edit_primary'] = false;
+		}
 
 		// In the special case that someone is requesting membership of a group, setup some special context vars.
 		if (
-			isset($_REQUEST['request']) 
-			&& isset(Utils::$context['groups']['available'][(int) $_REQUEST['request']]) 
+			isset($_REQUEST['request'], Utils::$context['groups']['available'][(int) $_REQUEST['request']])
+
 			&& Utils::$context['groups']['available'][(int) $_REQUEST['request']]->type == Group::TYPE_REQUESTABLE
-		)
-		{
+		) {
 			Utils::$context['group_request'] = Utils::$context['groups']['available'][(int) $_REQUEST['request']];
 		}
 	}
@@ -170,12 +168,14 @@ public function show(): void
 	 */
 	public function save(): void
 	{
-		if (!isset($_REQUEST['gid']) && !isset($_POST['primary']))
+		if (!isset($_REQUEST['gid']) && !isset($_POST['primary'])) {
 			return;
+		}
 
 		// Let's be extra cautious...
-		if (!User::$me->is_owner || empty(Config::$modSettings['show_group_membership']))
+		if (!User::$me->is_owner || empty(Config::$modSettings['show_group_membership'])) {
 			User::$me->isAllowedTo('manage_membergroups');
+		}
 
 		User::$me->checkSession(isset($_GET['gid']) ? 'get' : 'post');
 
@@ -192,81 +192,80 @@ public function save(): void
 		// Which groups can they be assigned to?
 		$this->loadCurrentAndAssignableGroups();
 
-		if (!isset(Profile::$member->current_and_assignable_groups[$new_group_id]))
+		if (!isset(Profile::$member->current_and_assignable_groups[$new_group_id])) {
 			ErrorHandler::fatalLang('cannot_manage_membergroups', false);
+		}
 
 		// Just for improved legibility...
 		$new_group_info = Profile::$member->current_and_assignable_groups[$new_group_id];
 
 		// Can't request a non-requestable group.
-		if ($this->change_type == 'request' && $new_group_info['type'] != 2)
+		if ($this->change_type == 'request' && $new_group_info['type'] != 2) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
-		if ($this->change_type == 'free')
-		{
+		if ($this->change_type == 'free') {
 			// Can't freely join or leave private or protected groups.
-			if ($new_group_info['type'] <= 1)
+			if ($new_group_info['type'] <= 1) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
 			// Can't leave a requestable group that you're not part of.
-			if ($new_group_info['type'] == 2 && !in_array($new_group_id, Profile::$member->groups))
+			if ($new_group_info['type'] == 2 && !in_array($new_group_id, Profile::$member->groups)) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 		}
 
 		// Whatever we are doing, we need to determine if changing primary is possible.
 		$can_edit_primary = $this->canEditPrimary($new_group_id);
 
-		switch ($this->change_type)
-		{
+		switch ($this->change_type) {
 			// If they're requesting, add the note then return.
 			case 'request':
 				$this->sendJoinRequest($new_group_id);
+
 				return;
 
 			// Leaving/joining a group.
 			case 'free':
 				// Are they leaving?
-				if (Profile::$member->group_id == $new_group_id)
-				{
+				if (Profile::$member->group_id == $new_group_id) {
 					$new_primary = $can_edit_primary ? 0 : Profile::$member->group_id;
-				}
-				elseif (in_array($new_group_id, Profile::$member->additional_groups))
-				{
-					$new_additional_groups = array_diff($new_additional_groups, array($new_group_id));
+				} elseif (in_array($new_group_id, Profile::$member->additional_groups)) {
+					$new_additional_groups = array_diff($new_additional_groups, [$new_group_id]);
 				}
 				// ... if not, must be joining.
-				else
-				{
+				else {
 					// If they're just a regular member and this can be a primary group,
 					// then make it the primary.
-					if (Profile::$member->group_id == 0 && $can_edit_primary && !empty($new_group_info['can_be_primary']))
-					{
+					if (Profile::$member->group_id == 0 && $can_edit_primary && !empty($new_group_info['can_be_primary'])) {
 						$new_primary = $new_group_id;
 					}
 					// Otherwise, make it an addtional group.
-					else
-					{
+					else {
 						$new_additional_groups[] = $new_group_id;
 					}
 				}
+
 				break;
 
 			// Finally, we must be setting the primary.
 			default:
-				if (Profile::$member->group_id != 0)
+				if (Profile::$member->group_id != 0) {
 					$new_additional_groups[] = Profile::$member->group_id;
+				}
 
-				if (in_array($new_group_id, $new_additional_groups))
-				{
-					$new_additional_groups = array_diff($new_additional_groups, array($new_group_id));
+				if (in_array($new_group_id, $new_additional_groups)) {
+					$new_additional_groups = array_diff($new_additional_groups, [$new_group_id]);
 				}
 
 				$new_primary = $new_group_id;
+
 				break;
 		}
 
 		// Run the changes through the validation method for group membership.
-		Profile::$member->validateGroups($new_primary, $new_additional_groups ?? array());
+		Profile::$member->validateGroups($new_primary, $new_additional_groups ?? []);
 		Profile::$member->new_data['id_group'] = $new_primary;
 	}
 
@@ -281,8 +280,9 @@ public function save(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -327,8 +327,9 @@ public static function groupMembership2(int $memID): string
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 
 	/**
@@ -336,23 +337,24 @@ protected function __construct()
 	 */
 	protected function loadCurrentAndAssignableGroups(): void
 	{
-		if (isset(Profile::$member->current_and_assignable_groups))
+		if (isset(Profile::$member->current_and_assignable_groups)) {
 			return;
+		}
 
-		if (empty(Profile::$member->assignable_groups))
+		if (empty(Profile::$member->assignable_groups)) {
 			Profile::$member->loadAssignableGroups();
+		}
 
 		$current_and_assignable_groups = Profile::$member->assignable_groups;
 
 		// If they are already in an unassignable group, show that too.
 		$current_unassignable_groups = array_intersect(Profile::$member->groups, Group::getUnassignable());
 
-		if ($current_unassignable_groups !== array())
-		{
-			foreach (Group::load($current_unassignable_groups) as $group)
-			{
-				if ($group->min_posts > -1)
+		if ($current_unassignable_groups !== []) {
+			foreach (Group::load($current_unassignable_groups) as $group) {
+				if ($group->min_posts > -1) {
 					continue;
+				}
 
 				$group->is_primary = $group->id == Profile::$member->group_id;
 				$group->is_additional = in_array($group->id, Profile::$member->additional_groups);
@@ -363,13 +365,13 @@ protected function loadCurrentAndAssignableGroups(): void
 
 		uasort(
 			$current_and_assignable_groups,
-			function($a, $b)
-			{
-				if ($a['id'] >= 4 && $b['id'] >= 4)
+			function ($a, $b) {
+				if ($a['id'] >= 4 && $b['id'] >= 4) {
 					return $a['name'] <=> $b['name'];
+				}
 
 				return $a['id'] <=> $b['id'];
-			}
+			},
 		);
 
 		Profile::$member->current_and_assignable_groups = $current_and_assignable_groups;
@@ -379,18 +381,15 @@ function($a, $b)
 	 * Figures out whether the current user can change the primary membergroup
 	 * of the member whose profile is being viewed.
 	 */
-	protected function canEditPrimary(int $new_group_id = null): bool
+	protected function canEditPrimary(?int $new_group_id = null): bool
 	{
 		$this->loadCurrentAndAssignableGroups();
 
 		// Hidden groups cannot be primary groups.
-		if (isset($new_group_id))
-		{
+		if (isset($new_group_id)) {
 			$can_edit_primary = Profile::$member->current_and_assignable_groups[$new_group_id]->can_be_primary;
-		}
-		else
-		{
-			$possible_primary_groups = array_filter(Profile::$member->current_and_assignable_groups, fn($group) => !empty($group->can_be_primary));
+		} else {
+			$possible_primary_groups = array_filter(Profile::$member->current_and_assignable_groups, fn ($group) => !empty($group->can_be_primary));
 
 			$can_edit_primary = !empty($possible_primary_groups);
 		}
@@ -407,28 +406,31 @@ protected function canEditPrimary(int $new_group_id = null): bool
 	 */
 	protected function sendJoinRequest(int $new_group_id): void
 	{
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}log_group_requests
 			WHERE id_member = {int:selected_member}
 				AND id_group = {int:selected_group}
 				AND status = {int:status_open}',
-			array(
+			[
 				'selected_member' => Profile::$member->id,
 				'selected_group' => $new_group_id,
 				'status_open' => 0,
-			)
+			],
 		);
 		$already_requested = Db::$db->num_rows($request) != 0;
 		Db::$db->free_result($request);
 
-		if ($already_requested)
+		if ($already_requested) {
 			ErrorHandler::fatalLang('profile_error_already_requested_group');
+		}
 
 		// Log the request.
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}log_group_requests',
-			array(
+			[
 				'id_member' => 'int',
 				'id_group' => 'int',
 				'time_applied' => 'int',
@@ -438,8 +440,8 @@ protected function sendJoinRequest(int $new_group_id): void
 				'member_name_acted' => 'string',
 				'time_acted' => 'int',
 				'act_reason' => 'string',
-			),
-			array(
+			],
+			[
 				Profile::$member->id,
 				$new_group_id,
 				time(),
@@ -449,43 +451,42 @@ protected function sendJoinRequest(int $new_group_id): void
 				'',
 				0,
 				'',
-			),
-			array('id_request')
+			],
+			['id_request'],
 		);
 
 		// Set up some data for our background task...
-		$data = Utils::jsonEncode(array(
+		$data = Utils::jsonEncode([
 			'id_member' => Profile::$member->id,
 			'member_name' => User::$me->name,
 			'id_group' => $new_group_id,
 			'group_name' => Profile::$member->assignable_groups[$new_group_id]['name'],
 			'reason' => $_POST['reason'],
 			'time' => time(),
-		));
+		]);
 
 		// Add a background task to handle notifying people of this request
 		Db::$db->insert(
 			'insert',
 			'{db_prefix}background_tasks',
-			array(
-				'task_file' => 'string-255',
+			[
 				'task_class' => 'string-255',
 				'task_data' => 'string',
 				'claimed_time' => 'int',
-			),
-			array(
-				'$sourcedir/tasks/GroupReq_Notify.php',
-				'SMF\Tasks\GroupReq_Notify',
+			],
+			[
+				'SMF\\Tasks\\GroupReq_Notify',
 				$data,
 				0,
-			),
-			array()
+			],
+			[],
 		);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\GroupMembership::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\GroupMembership::exportStatic')) {
 	GroupMembership::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/IgnoreBoards.php b/Sources/Actions/Profile/IgnoreBoards.php
index 57db9c08cf..f5e6de2ed8 100644
--- a/Sources/Actions/Profile/IgnoreBoards.php
+++ b/Sources/Actions/Profile/IgnoreBoards.php
@@ -13,16 +13,15 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Profile;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles the "ignored boards" section of the profile (if enabled)
@@ -36,12 +35,11 @@ class IgnoreBoards implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ignoreboards',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -65,62 +63,63 @@ class IgnoreBoards implements ActionInterface
 	public function execute(): void
 	{
 		// Have the admins enabled this option?
-		if (empty(Config::$modSettings['allow_ignore_boards']))
+		if (empty(Config::$modSettings['allow_ignore_boards'])) {
 			ErrorHandler::fatalLang('ignoreboards_disallowed', 'user');
+		}
 
 		// Find all the boards this user is allowed to see.
 		Utils::$context['num_boards'] = 0;
-		Utils::$context['categories'] = array();
+		Utils::$context['categories'] = [];
 
-		$request = Db::$db->query('order_by_board_order', '
-			SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level,
+		$request = Db::$db->query(
+			'order_by_board_order',
+			'SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level,
 				' . (!empty(Profile::$member->data['ignore_boards']) ? 'b.id_board IN ({array_int:ignore_boards})' : '0') . ' AS is_ignored
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 			WHERE {query_see_board}
 				AND redirect = {string:empty_string}',
-			array(
-				'ignore_boards' => !empty(Profile::$member->data['ignore_boards']) ? explode(',', Profile::$member->data['ignore_boards']) : array(),
+			[
+				'ignore_boards' => !empty(Profile::$member->data['ignore_boards']) ? explode(',', Profile::$member->data['ignore_boards']) : [],
 				'empty_string' => '',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['num_boards']++;
 
 			// This category hasn't been set up yet..
-			if (!isset(Utils::$context['categories'][$row['id_cat']]))
-			{
-				Utils::$context['categories'][$row['id_cat']] = array(
+			if (!isset(Utils::$context['categories'][$row['id_cat']])) {
+				Utils::$context['categories'][$row['id_cat']] = [
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
-					'boards' => array()
-				);
+					'boards' => [],
+				];
 			}
 
 			// Set this board up, and let the template know when it's a child.  (indent them..)
-			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
+			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = [
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'child_level' => $row['child_level'],
 				'selected' => $row['is_ignored'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		Category::sort(Utils::$context['categories']);
 
 		// Now, let's sort the list of categories into the boards for templates that like that.
-		$temp_boards = array();
-		foreach (Utils::$context['categories'] as $category)
-		{
+		$temp_boards = [];
+
+		foreach (Utils::$context['categories'] as $category) {
 			// Include a list of boards per category for easy toggling.
 			Utils::$context['categories'][$category['id']]['child_ids'] = array_keys($category['boards']);
 
-			$temp_boards[] = array(
+			$temp_boards[] = [
 				'name' => $category['name'],
-				'child_ids' => array_keys($category['boards'])
-			);
+				'child_ids' => array_keys($category['boards']),
+			];
 
 			$temp_boards = array_merge($temp_boards, array_values($category['boards']));
 		}
@@ -128,18 +127,15 @@ public function execute(): void
 		$max_boards = max(2, ceil(count($temp_boards) / 2));
 
 		// Now, alternate them so they can be shown left and right ;).
-		Utils::$context['board_columns'] = array();
-		for ($i = 0; $i < $max_boards; $i++)
-		{
+		Utils::$context['board_columns'] = [];
+
+		for ($i = 0; $i < $max_boards; $i++) {
 			Utils::$context['board_columns'][] = $temp_boards[$i];
 
-			if (isset($temp_boards[$i + $max_boards]))
-			{
+			if (isset($temp_boards[$i + $max_boards])) {
 				Utils::$context['board_columns'][] = $temp_boards[$i + $max_boards];
-			}
-			else
-			{
-				Utils::$context['board_columns'][] = array();
+			} else {
+				Utils::$context['board_columns'][] = [];
 			}
 		}
 
@@ -157,8 +153,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -180,13 +177,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\IgnoreBoards::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\IgnoreBoards::exportStatic')) {
 	IgnoreBoards::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/IssueWarning.php b/Sources/Actions/Profile/IssueWarning.php
index d1d427276d..95ef59ad53 100644
--- a/Sources/Actions/Profile/IssueWarning.php
+++ b/Sources/Actions/Profile/IssueWarning.php
@@ -13,21 +13,20 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\ItemList;
 use SMF\Lang;
 use SMF\Msg;
+use SMF\PersonalMessage\PM;
 use SMF\Profile;
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
-use SMF\PersonalMessage\PM;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
@@ -41,12 +40,13 @@ class IssueWarning implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'list_getUserWarnings' => 'list_getUserWarnings',
+			'list_getUserWarningCount' => 'list_getUserWarningCount',
+			'issueWarning' => 'issueWarning',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -57,7 +57,7 @@ class IssueWarning implements ActionInterface
 	 *
 	 * This stores any legitimate errors.
 	 */
-	public array $issueErrors = array();
+	public array $issueErrors = [];
 
 	/****************************
 	 * Internal static properties
@@ -81,8 +81,7 @@ class IssueWarning implements ActionInterface
 	public function execute(): void
 	{
 		// Doesn't hurt to be overly cautious.
-		if (empty(Config::$modSettings['warning_enable']) || (User::$me->is_owner && !Profile::$member->warning) || !User::$me->allowedTo('issue_warning'))
-		{
+		if (empty(Config::$modSettings['warning_enable']) || (User::$me->is_owner && !Profile::$member->warning) || !User::$me->allowedTo('issue_warning')) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
@@ -96,22 +95,22 @@ public function execute(): void
 		Utils::$context['min_allowed'] = 0;
 		Utils::$context['max_allowed'] = 100;
 
-		if (Utils::$context['warning_limit'] > 0)
-		{
+		if (Utils::$context['warning_limit'] > 0) {
 			// Make sure we cannot go outside of our limit for the day.
-			$request = Db::$db->query('', '
-				SELECT SUM(counter)
+			$request = Db::$db->query(
+				'',
+				'SELECT SUM(counter)
 				FROM {db_prefix}log_comments
 				WHERE id_recipient = {int:selected_member}
 					AND id_member = {int:current_member}
 					AND comment_type = {string:warning}
 					AND log_time > {int:day_time_period}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'selected_member' => Profile::$member->id,
 					'day_time_period' => time() - 86400,
 					'warning' => 'warning',
-				)
+				],
 			);
 			list($current_applied) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -122,148 +121,149 @@ public function execute(): void
 		}
 
 		// Defaults.
-		Utils::$context['warning_data'] = array(
+		Utils::$context['warning_data'] = [
 			'reason' => '',
 			'notify' => '',
 			'notify_subject' => '',
 			'notify_body' => '',
-		);
+		];
 
 		// Are we saving?
-		if (isset($_POST['save']))
+		if (isset($_POST['save'])) {
 			$this->save();
+		}
 
-		if (isset($_POST['preview']))
+		if (isset($_POST['preview'])) {
 			$this->preview();
+		}
 
-		if (!empty($this->issueErrors))
-		{
+		if (!empty($this->issueErrors)) {
 			// Fill in the suite of errors.
-			Utils::$context['post_errors'] = array();
+			Utils::$context['post_errors'] = [];
 
-			foreach ($this->issueErrors as $error)
+			foreach ($this->issueErrors as $error) {
 				Utils::$context['post_errors'][] = Lang::$txt[$error];
+			}
 		}
 
 		Utils::$context['page_title'] = Lang::$txt['profile_issue_warning'];
 
 		// Work our the various levels.
-		Utils::$context['level_effects'] = array(
+		Utils::$context['level_effects'] = [
 			0 => Lang::$txt['profile_warning_effect_none'],
 			Config::$modSettings['warning_watch'] => Lang::$txt['profile_warning_effect_watch'],
 			Config::$modSettings['warning_moderate'] => Lang::$txt['profile_warning_effect_moderation'],
 			Config::$modSettings['warning_mute'] => Lang::$txt['profile_warning_effect_mute'],
-		);
+		];
 
 		Utils::$context['current_level'] = 0;
 
-		foreach (Utils::$context['level_effects'] as $limit => $dummy)
-		{
-			if (Utils::$context['member']['warning'] >= $limit)
+		foreach (Utils::$context['level_effects'] as $limit => $dummy) {
+			if (Utils::$context['member']['warning'] >= $limit) {
 				Utils::$context['current_level'] = $limit;
+			}
 		}
 
-		$list_options = array(
+		$list_options = [
 			'id' => 'view_warnings',
 			'title' => Lang::$txt['profile_viewwarning_previous_warnings'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['profile_viewwarning_no_warnings'],
 			'base_href' => Config::$scripturl . '?action=profile;area=issuewarning;sa=user;u=' . Profile::$member->id,
 			'default_sort_col' => 'log_time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getUserWarnings',
-				'params' => array(),
-			),
-			'get_count' => array(
+				'params' => [],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getUserWarningCount',
-				'params' => array(),
-			),
-			'columns' => array(
-				'issued_by' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'issued_by' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_issued'],
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
-						'function' => function($warning)
-						{
+					],
+					'data' => [
+						'function' => function ($warning) {
 							return $warning['issuer']['link'];
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.member_name DESC',
 						'reverse' => 'lc.member_name',
-					),
-				),
-				'log_time' => array(
-					'header' => array(
+					],
+				],
+				'log_time' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_time'],
 						'style' => 'width: 30%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.log_time DESC',
 						'reverse' => 'lc.log_time',
-					),
-				),
-				'reason' => array(
-					'header' => array(
+					],
+				],
+				'reason' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_reason'],
-					),
-					'data' => array(
-						'function' => function($warning)
-						{
+					],
+					'data' => [
+						'function' => function ($warning) {
 							$ret = '
 							<div class="floatleft">
 								' . $warning['reason'] . '
 							</div>';
 
-							if (!empty($warning['id_notice']))
+							if (!empty($warning['id_notice'])) {
 								$ret .= '
 							<div class="floatright">
 								<a href="' . Config::$scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" rel="noopener" title="' . Lang::$txt['profile_warning_previous_notice'] . '"><span class="main_icons filter centericon"></span></a>
 							</div>';
+							}
 
 							return $ret;
 						},
-					),
-				),
-				'level' => array(
-					'header' => array(
+					],
+				],
+				'level' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_level'],
 						'style' => 'width: 6%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'counter',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.counter DESC',
 						'reverse' => 'lc.counter',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the list for viewing.
 		new ItemList($list_options);
 
 		// Are they warning because of a message?
-		if (isset($_REQUEST['msg']) && 0 < (int) $_REQUEST['msg'])
-		{
-			$request = Db::$db->query('', '
-				SELECT m.subject
+		if (isset($_REQUEST['msg']) && 0 < (int) $_REQUEST['msg']) {
+			$request = Db::$db->query(
+				'',
+				'SELECT m.subject
 				FROM {db_prefix}messages AS m
 				WHERE m.id_msg = {int:message}
 					AND {query_see_message_board}
 				LIMIT 1',
-				array(
+				[
 					'message' => (int) $_REQUEST['msg'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) != 0)
-			{
+
+			if (Db::$db->num_rows($request) != 0) {
 				Utils::$context['warning_for_message'] = (int) $_REQUEST['msg'];
 				list(Utils::$context['warned_message_subject']) = Db::$db->fetch_row($request);
 			}
@@ -271,59 +271,56 @@ public function execute(): void
 		}
 
 		// Didn't find the message?
-		if (empty(Utils::$context['warning_for_message']))
-		{
+		if (empty(Utils::$context['warning_for_message'])) {
 			Utils::$context['warning_for_message'] = 0;
 			Utils::$context['warned_message_subject'] = '';
 		}
 
 		// Any custom templates?
-		Utils::$context['notification_templates'] = array();
+		Utils::$context['notification_templates'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT recipient_name AS template_title, body
+		$request = Db::$db->query(
+			'',
+			'SELECT recipient_name AS template_title, body
 			FROM {db_prefix}log_comments
 			WHERE comment_type = {literal:warntpl}
 				AND (id_recipient = {int:generic} OR id_recipient = {int:current_member})',
-			array(
+			[
 				'generic' => 0,
 				'current_member' => User::$me->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// If we're not warning for a message skip any that are.
-			if (!Utils::$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			{
+			if (!Utils::$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
 				continue;
 			}
 
-			Utils::$context['notification_templates'][] = array(
+			Utils::$context['notification_templates'][] = [
 				'title' => $row['template_title'],
 				'body' => $row['body'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Setup the "default" templates.
-		foreach (array('spamming', 'offence', 'insulting') as $type)
-		{
-			Utils::$context['notification_templates'][] = array(
+		foreach (['spamming', 'offence', 'insulting'] as $type) {
+			Utils::$context['notification_templates'][] = [
 				'title' => Lang::$txt['profile_warning_notify_title_' . $type],
 				'body' => sprintf(Lang::$txt['profile_warning_notify_template_outline' . (!empty(Utils::$context['warning_for_message']) ? '_post' : '')], Lang::$txt['profile_warning_notify_for_' . $type]),
-			);
+			];
 		}
 
 		// Replace all the common variables in the templates.
-		foreach (Utils::$context['notification_templates'] as $k => $name)
-		{
-			Utils::$context['notification_templates'][$k]['body'] = strtr($name['body'], array(
+		foreach (Utils::$context['notification_templates'] as $k => $name) {
+			Utils::$context['notification_templates'][$k]['body'] = strtr($name['body'], [
 				'{MEMBER}' => Utils::htmlspecialcharsDecode(Utils::$context['member']['name']),
 				'{MESSAGE}' => '[url=' . Config::$scripturl . '?msg=' . Utils::$context['warning_for_message'] . ']' . Utils::htmlspecialcharsDecode(Utils::$context['warned_message_subject']) . '[/url]',
 				'{SCRIPTURL}' => Config::$scripturl,
 				'{FORUMNAME}' => Config::$mbname,
-				'{REGARDS}' => sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name'])
-			));
+				'{REGARDS}' => sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name']),
+			]);
 		}
 	}
 
@@ -338,8 +335,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -362,10 +360,11 @@ public static function call(): void
 	 */
 	public static function list_getUserWarnings(int $start, int $items_per_page, string $sort): array
 	{
-		$previous_warnings = array();
+		$previous_warnings = [];
 
-		$request = Db::$db->query('', '
-			SELECT COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS member_name,
+		$request = Db::$db->query(
+			'',
+			'SELECT COALESCE(mem.id_member, 0) AS id_member, COALESCE(mem.real_name, lc.member_name) AS member_name,
 				lc.log_time, lc.body, lc.counter, lc.id_notice
 			FROM {db_prefix}log_comments AS lc
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lc.id_member)
@@ -373,25 +372,25 @@ public static function list_getUserWarnings(int $start, int $items_per_page, str
 				AND lc.comment_type = {literal:warning}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'selected_member' => Profile::$member->id,
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$previous_warnings[] = array(
-				'issuer' => array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$previous_warnings[] = [
+				'issuer' => [
 					'id' => $row['id_member'],
 					'link' => $row['id_member'] ? ('<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['member_name'] . '</a>') : $row['member_name'],
-				),
+				],
 				'time' => Time::create('@' . $row['log_time'])->format(),
 				'reason' => $row['body'],
 				'counter' => $row['counter'] > 0 ? '+' . $row['counter'] : $row['counter'],
 				'id_notice' => $row['id_notice'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -405,14 +404,15 @@ public static function list_getUserWarnings(int $start, int $items_per_page, str
 	 */
 	public static function list_getUserWarningCount(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_comments
 			WHERE id_recipient = {int:selected_member}
 				AND comment_type = {literal:warning}',
-			array(
+			[
 				'selected_member' => Profile::$member->id,
-			)
+			],
 		);
 		list($total_warnings) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -446,8 +446,9 @@ public static function issueWarning(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
 		// Get all the actual settings.
 		list(Config::$modSettings['warning_enable'], Config::$modSettings['user_limit']) = explode(',', Config::$modSettings['warning_settings']);
@@ -467,8 +468,9 @@ protected function save(): void
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
 
-		if ($_POST['warn_reason'] == '' && !User::$me->is_owner)
+		if ($_POST['warn_reason'] == '' && !User::$me->is_owner) {
 			$this->issueErrors[] = 'warning_no_reason';
+		}
 
 		$_POST['warn_reason'] = Utils::htmlspecialchars($_POST['warn_reason']);
 
@@ -478,46 +480,45 @@ protected function save(): void
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
-		if (!empty($_POST['warn_notify']) && empty($this->issueErrors))
-		{
+
+		if (!empty($_POST['warn_notify']) && empty($this->issueErrors)) {
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
 
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			{
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
 				$this->issueErrors[] = 'warning_notify_blank';
 			}
 			// Send the PM?
-			else
-			{
+			else {
 				PM::send(
-					array(
-						'to' => array(Profile::$member->id),
-						'bcc' => array(),
-					),
+					[
+						'to' => [Profile::$member->id],
+						'bcc' => [],
+					],
 					$_POST['warn_sub'],
 					$_POST['warn_body'],
 					false,
-					array(
+					[
 						'id' => 0,
 						'name' => Utils::$context['forum_name_html_safe'],
 						'username' => Utils::$context['forum_name_html_safe'],
-					)
+					],
 				);
 
 				// Log the notice!
-				$id_notice = Db::$db->insert('',
+				$id_notice = Db::$db->insert(
+					'',
 					'{db_prefix}log_member_notices',
-					array(
+					[
 						'subject' => 'string-255',
 						'body' => 'string-65534',
-					),
-					array(
+					],
+					[
 						Utils::htmlspecialchars($_POST['warn_sub']),
 						Utils::htmlspecialchars($_POST['warn_body']),
-					),
-					array('id_notice'),
-					1
+					],
+					['id_notice'],
+					1,
 				);
 			}
 		}
@@ -526,14 +527,13 @@ protected function save(): void
 		$level_change = $_POST['warning_level'] - Profile::$member->warning;
 
 		// No errors? Proceed! Only log if you're not the owner.
-		if (empty($this->issueErrors))
-		{
+		if (empty($this->issueErrors)) {
 			// Log what we've done!
-			if (!User::$me->is_owner)
-			{
-				Db::$db->insert('',
+			if (!User::$me->is_owner) {
+				Db::$db->insert(
+					'',
 					'{db_prefix}log_comments',
-					array(
+					[
 						'id_member' => 'int',
 						'member_name' => 'string',
 						'comment_type' => 'string',
@@ -543,8 +543,8 @@ protected function save(): void
 						'id_notice' => 'int',
 						'counter' => 'int',
 						'body' => 'string-65534',
-					),
-					array(
+					],
+					[
 						User::$me->id,
 						User::$me->name,
 						'warning',
@@ -554,26 +554,24 @@ protected function save(): void
 						(int) $id_notice,
 						$level_change,
 						$_POST['warn_reason'],
-					),
-					array('id_comment')
+					],
+					['id_comment'],
 				);
 			}
 
 			// Make the change.
-			User::updateMemberData(Profile::$member->id, array('warning' => $_POST['warning_level']));
+			User::updateMemberData(Profile::$member->id, ['warning' => $_POST['warning_level']]);
 
 			// Leave a lovely message.
 			Utils::$context['profile_updated'] = User::$me->is_owner ? Lang::$txt['profile_updated_own'] : Lang::$txt['profile_warning_success'];
-		}
-		else
-		{
+		} else {
 			// Try to remember some bits.
-			Utils::$context['warning_data'] = array(
+			Utils::$context['warning_data'] = [
 				'reason' => $_POST['warn_reason'],
 				'notify' => !empty($_POST['warn_notify']),
-				'notify_subject' => isset($_POST['warn_sub']) ? $_POST['warn_sub'] : '',
-				'notify_body' => isset($_POST['warn_body']) ? $_POST['warn_body'] : '',
-			);
+				'notify_subject' => $_POST['warn_sub'] ?? '',
+				'notify_body' => $_POST['warn_body'] ?? '',
+			];
 		}
 
 		// Show the new improved warning level.
@@ -589,28 +587,29 @@ protected function preview(): void
 
 		Utils::$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim(Utils::htmlspecialchars($_POST['warn_sub'])) : '';
 
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
 			$this->issueErrors[] = 'warning_notify_blank';
+		}
 
-		if (!empty($_POST['warn_body']))
-		{
+		if (!empty($_POST['warn_body'])) {
 			Msg::preparsecode($warning_body);
 			$warning_body = BBCodeParser::load()->parse($warning_body);
 		}
 
 		// Try to remember some bits.
-		Utils::$context['warning_data'] = array(
+		Utils::$context['warning_data'] = [
 			'reason' => $_POST['warn_reason'],
 			'notify' => !empty($_POST['warn_notify']),
-			'notify_subject' => isset($_POST['warn_sub']) ? $_POST['warn_sub'] : '',
-			'notify_body' => isset($_POST['warn_body']) ? $_POST['warn_body'] : '',
+			'notify_subject' => $_POST['warn_sub'] ?? '',
+			'notify_body' => $_POST['warn_body'] ?? '',
 			'body_preview' => $warning_body,
-		);
+		];
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\IssueWarning::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\IssueWarning::exportStatic')) {
 	IssueWarning::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Main.php b/Sources/Actions/Profile/Main.php
index 21dc6b2b8b..144677749a 100644
--- a/Sources/Actions/Profile/Main.php
+++ b/Sources/Actions/Profile/Main.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -27,7 +27,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class has the primary job of showing and editing people's profiles.
@@ -43,12 +42,11 @@ class Main implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'modifyProfile' => 'ModifyProfile',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -57,7 +55,6 @@ class Main implements ActionInterface
 	/**
 	 * @var array
 	 *
-	 *
 	 * Defines the menu structure for the profile area.
 	 * See {@link Menu.php Menu.php} for details!
 	 *
@@ -119,159 +116,159 @@ class Main implements ActionInterface
 	 *     array $permission:   Array of permissions to determine who can access
 	 *                          this area. Should contain arrays $own and $any.
 	 */
-	public array $profile_areas = array(
-		'info' => array(
+	public array $profile_areas = [
+		'info' => [
 			'title' => 'profileInfo',
-			'areas' => array(
-				'summary' => array(
+			'areas' => [
+				'summary' => [
 					'label' => 'summary',
 					'function' => __NAMESPACE__ . '\\Summary::call',
 					'sub_template' => 'summary',
 					'icon' => 'administration',
-					'permission' => array(
+					'permission' => [
 						'own' => 'is_not_guest',
 						'any' => 'profile_view',
-					),
-				),
-				'popup' => array(
+					],
+				],
+				'popup' => [
 					'function' => __NAMESPACE__ . '\\Popup::call',
 					'sub_template' => 'profile_popup',
-					'permission' => array(
+					'permission' => [
 						'own' => 'is_not_guest',
-						'any' => array(),
-					),
+						'any' => [],
+					],
 					'select' => 'summary',
-				),
-				'alerts_popup' => array(
+				],
+				'alerts_popup' => [
 					'function' => __NAMESPACE__ . '\\AlertsPopup::call',
 					'sub_template' => 'alerts_popup',
-					'permission' => array(
+					'permission' => [
 						'own' => 'is_not_guest',
-						'any' => array(),
-					),
+						'any' => [],
+					],
 					'select' => 'summary',
-				),
-				'statistics' => array(
+				],
+				'statistics' => [
 					'label' => 'statPanel',
 					'function' => __NAMESPACE__ . '\\StatPanel::call',
 					'sub_template' => 'statPanel',
 					'icon' => 'stats',
-					'permission' => array(
+					'permission' => [
 						'own' => 'is_not_guest',
 						'any' => 'profile_view',
-					),
-				),
-				'showposts' => array(
+					],
+				],
+				'showposts' => [
 					'label' => 'showPosts',
 					'function' => __NAMESPACE__ . '\\ShowPosts::call',
 					'sub_template' => 'showPosts',
 					'icon' => 'posts',
-					'subsections' => array(
-						'messages' => array(
+					'subsections' => [
+						'messages' => [
 							'label' => 'showMessages',
-							'permission' => array('is_not_guest', 'profile_view'),
-						),
-						'topics' => array(
+							'permission' => ['is_not_guest', 'profile_view'],
+						],
+						'topics' => [
 							'label' => 'showTopics',
-							'permission' => array('is_not_guest', 'profile_view'),
-						),
-						'unwatchedtopics' => array(
+							'permission' => ['is_not_guest', 'profile_view'],
+						],
+						'unwatchedtopics' => [
 							'label' => 'showUnwatched',
-							'permission' => array('is_not_guest', 'profile_view'),
+							'permission' => ['is_not_guest', 'profile_view'],
 							'enabled' => true,
-						),
-						'attach' => array(
+						],
+						'attach' => [
 							'label' => 'showAttachments',
-							'permission' => array('is_not_guest', 'profile_view'),
-						),
-					),
-					'permission' => array(
+							'permission' => ['is_not_guest', 'profile_view'],
+						],
+					],
+					'permission' => [
 						'own' => 'is_not_guest',
 						'any' => 'profile_view',
-					),
-				),
-				'showdrafts' => array(
+					],
+				],
+				'showdrafts' => [
 					'label' => 'drafts_show',
 					'function' => 'SMF\\Draft::showInProfile',
 					'icon' => 'drafts',
 					'enabled' => true,
-					'permission' => array(
+					'permission' => [
 						'own' => 'is_not_guest',
-						'any' => array(),
-					),
-				),
-				'showalerts' => array(
+						'any' => [],
+					],
+				],
+				'showalerts' => [
 					'label' => 'alerts_show',
 					'function' => __NAMESPACE__ . '\\ShowAlerts::call',
 					'sub_template' => 'showAlerts',
 					'icon' => 'alerts',
-					'permission' => array(
+					'permission' => [
 						'own' => 'is_not_guest',
-						'any' => array(),
-					),
-				),
-				'permissions' => array(
+						'any' => [],
+					],
+				],
+				'permissions' => [
 					'label' => 'showPermissions',
 					'function' => __NAMESPACE__ . '\\ShowPermissions::call',
 					'sub_template' => 'showPermissions',
 					'icon' => 'permissions',
-					'permission' => array(
+					'permission' => [
 						'own' => 'manage_permissions',
 						'any' => 'manage_permissions',
-					),
-				),
-				'tracking' => array(
+					],
+				],
+				'tracking' => [
 					'label' => 'trackUser',
 					'function' => __NAMESPACE__ . '\\Tracking::call',
 					'sub_template' => 'tracking',
 					'icon' => 'logs',
-					'subsections' => array(
-						'activity' => array(
+					'subsections' => [
+						'activity' => [
 							'label' => 'trackActivity',
 							'permission' => 'moderate_forum',
-						),
-						'ip' => array(
+						],
+						'ip' => [
 							'label' => 'trackIP',
 							'permission' => 'moderate_forum',
-						),
-						'edits' => array(
+						],
+						'edits' => [
 							'label' => 'trackEdits',
 							'permission' => 'moderate_forum',
 							'enabled' => true,
-						),
-						'groupreq' => array(
+						],
+						'groupreq' => [
 							'label' => 'trackGroupRequests',
 							'permission' => 'approve_group_requests',
 							'enabled' => true,
-						),
-						'logins' => array(
+						],
+						'logins' => [
 							'label' => 'trackLogins',
 							'permission' => 'moderate_forum',
 							'enabled' => true,
-						),
-					),
-					'permission' => array(
-						'own' => array('moderate_forum', 'approve_group_requests'),
-						'any' => array('moderate_forum', 'approve_group_requests'),
-					),
-				),
-				'viewwarning' => array(
+						],
+					],
+					'permission' => [
+						'own' => ['moderate_forum', 'approve_group_requests'],
+						'any' => ['moderate_forum', 'approve_group_requests'],
+					],
+				],
+				'viewwarning' => [
 					'label' => 'profile_view_warnings',
 					'function' => __NAMESPACE__ . '\\ViewWarning::call',
 					'sub_template' => 'viewWarning',
 					'icon' => 'warning',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array('view_warning_own', 'view_warning_any', 'issue_warning', 'moderate_forum'),
-						'any' => array('view_warning_any', 'issue_warning', 'moderate_forum'),
-					),
-				),
-			),
-		),
-		'edit_profile' => array(
+					'permission' => [
+						'own' => ['view_warning_own', 'view_warning_any', 'issue_warning', 'moderate_forum'],
+						'any' => ['view_warning_any', 'issue_warning', 'moderate_forum'],
+					],
+				],
+			],
+		],
+		'edit_profile' => [
 			'title' => 'forumprofile',
-			'areas' => array(
-				'account' => array(
+			'areas' => [
+				'account' => [
 					'label' => 'account',
 					'function' => __NAMESPACE__ . '\\Account::call',
 					'sub_template' => 'edit_options',
@@ -280,12 +277,12 @@ class Main implements ActionInterface
 					'sc' => 'post',
 					'token' => 'profile-ac%u',
 					'password' => true,
-					'permission' => array(
-						'own' => array('profile_identity_any', 'profile_identity_own', 'profile_password_any', 'profile_password_own', 'manage_membergroups'),
-						'any' => array('profile_identity_any', 'profile_password_any', 'manage_membergroups'),
-					),
-				),
-				'tfasetup' => array(
+					'permission' => [
+						'own' => ['profile_identity_any', 'profile_identity_own', 'profile_password_any', 'profile_password_own', 'manage_membergroups'],
+						'any' => ['profile_identity_any', 'profile_password_any', 'manage_membergroups'],
+					],
+				],
+				'tfasetup' => [
 					'label' => 'account',
 					'function' => __NAMESPACE__ . '\\TFASetup::call',
 					'sub_template' => 'tfasetup',
@@ -293,12 +290,12 @@ class Main implements ActionInterface
 					'enabled' => true,
 					'hidden' => true,
 					'select' => 'account',
-					'permission' => array(
-						'own' => array('profile_password_own'),
-						'any' => array('profile_password_any'),
-					),
-				),
-				'tfadisable' => array(
+					'permission' => [
+						'own' => ['profile_password_own'],
+						'any' => ['profile_password_any'],
+					],
+				],
+				'tfadisable' => [
 					'label' => 'account',
 					'function' => __NAMESPACE__ . '\\TFADisable::call',
 					'sub_template' => 'tfadisable',
@@ -308,62 +305,62 @@ class Main implements ActionInterface
 					'enabled' => true,
 					'hidden' => true,
 					'select' => 'account',
-					'permission' => array(
-						'own' => array('profile_password_own'),
-						'any' => array('profile_password_any'),
-					),
-				),
-				'forumprofile' => array(
+					'permission' => [
+						'own' => ['profile_password_own'],
+						'any' => ['profile_password_any'],
+					],
+				],
+				'forumprofile' => [
 					'label' => 'forumprofile',
 					'function' => __NAMESPACE__ . '\\ForumProfile::call',
 					'sub_template' => 'edit_options',
 					'icon' => 'members',
 					'sc' => 'post',
 					'token' => 'profile-fp%u',
-					'permission' => array(
-						'own' => array('profile_forum_any', 'profile_forum_own'),
-						'any' => array('profile_forum_any'),
-					),
-				),
-				'theme' => array(
+					'permission' => [
+						'own' => ['profile_forum_any', 'profile_forum_own'],
+						'any' => ['profile_forum_any'],
+					],
+				],
+				'theme' => [
 					'label' => 'theme',
 					'function' => __NAMESPACE__ . '\\ThemeOptions::call',
 					'sub_template' => 'edit_options',
 					'icon' => 'features',
 					'sc' => 'post',
 					'token' => 'profile-th%u',
-					'permission' => array(
-						'own' => array('profile_extra_any', 'profile_extra_own'),
-						'any' => array('profile_extra_any'),
-					),
-				),
-				'notification' => array(
+					'permission' => [
+						'own' => ['profile_extra_any', 'profile_extra_own'],
+						'any' => ['profile_extra_any'],
+					],
+				],
+				'notification' => [
 					'label' => 'notification',
 					'function' => __NAMESPACE__ . '\\Notification::call',
 					'sub_template' => 'notification',
 					'icon' => 'alerts',
 					'sc' => 'post',
-					//'token' => 'profile-nt%u', This is not checked here. We do it in the function itself - but if it was checked, this is what it'd be.
-					'subsections' => array(
-						'alerts' => array(
+					// 'token' => 'profile-nt%u', This is not checked here. We do it in the function itself - but if it was checked, this is what it'd be.
+					'subsections' => [
+						'alerts' => [
 							'label' => 'alert_prefs',
-							'permission' => array('is_not_guest', 'profile_extra_any'),
-						),
-						'topics' => array(
+							'permission' => ['is_not_guest', 'profile_extra_any'],
+						],
+						'topics' => [
 							'label' => 'watched_topics',
-							'permission' => array('is_not_guest', 'profile_extra_any'),
-						),
-						'boards' => array(
+							'permission' => ['is_not_guest', 'profile_extra_any'],
+						],
+						'boards' => [
 							'label' => 'watched_boards',
-							'permission' => array('is_not_guest', 'profile_extra_any'),
-						),
-					),
-					'permission' => array(
-						'own' => array('is_not_guest'),
-						'any' => array('profile_extra_any'), // If you change this, update it in the functions themselves; we delegate all saving checks there.
-					),
-				),
-				'ignoreboards' => array(
+							'permission' => ['is_not_guest', 'profile_extra_any'],
+						],
+					],
+					'permission' => [
+						'own' => ['is_not_guest'],
+						'any' => ['profile_extra_any'], // If you change this, update it in the functions themselves; we delegate all saving checks there.
+					],
+				],
+				'ignoreboards' => [
 					'label' => 'ignoreboards',
 					'function' => __NAMESPACE__ . '\\IgnoreBoards::call',
 					'sub_template' => 'ignoreboards',
@@ -371,32 +368,32 @@ class Main implements ActionInterface
 					'enabled' => true,
 					'sc' => 'post',
 					'token' => 'profile-ib%u',
-					'permission' => array(
-						'own' => array('profile_extra_any', 'profile_extra_own'),
-						'any' => array('profile_extra_any'),
-					),
-				),
-				'lists' => array(
+					'permission' => [
+						'own' => ['profile_extra_any', 'profile_extra_own'],
+						'any' => ['profile_extra_any'],
+					],
+				],
+				'lists' => [
 					'label' => 'editBuddyIgnoreLists',
 					'function' => __NAMESPACE__ . '\\BuddyIgnoreLists::call',
 					'sub_template' => 'editBuddyIgnoreLists',
 					'icon' => 'frenemy',
 					'enabled' => true,
 					'sc' => 'post',
-					'subsections' => array(
-						'buddies' => array(
+					'subsections' => [
+						'buddies' => [
 							'label' => 'editBuddies',
-						),
-						'ignore' => array(
+						],
+						'ignore' => [
 							'label' => 'editIgnoreList',
-						),
-					),
-					'permission' => array(
-						'own' => array('profile_extra_any', 'profile_extra_own'),
-						'any' => array(),
-					),
-				),
-				'groupmembership' => array(
+						],
+					],
+					'permission' => [
+						'own' => ['profile_extra_any', 'profile_extra_own'],
+						'any' => [],
+					],
+				],
+				'groupmembership' => [
 					'label' => 'groupmembership',
 					'function' => __NAMESPACE__ . '\\GroupMembership::call',
 					'sub_template' => 'groupMembership',
@@ -405,104 +402,104 @@ class Main implements ActionInterface
 					'sc' => 'request',
 					'token' => 'profile-gm%u',
 					'token_type' => 'request',
-					'permission' => array(
-						'own' => array('is_not_guest'),
-						'any' => array('manage_membergroups'),
-					),
-				),
-			),
-		),
-		'profile_action' => array(
+					'permission' => [
+						'own' => ['is_not_guest'],
+						'any' => ['manage_membergroups'],
+					],
+				],
+			],
+		],
+		'profile_action' => [
 			'title' => 'profileAction',
-			'areas' => array(
-				'sendpm' => array(
+			'areas' => [
+				'sendpm' => [
 					'label' => 'profileSendIm',
 					'custom_url' => '{scripturl}?action=pm;sa=send',
 					'icon' => 'personal_message',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array(),
-						'any' => array('pm_send'),
-					),
-				),
-				'report' => array(
+					'permission' => [
+						'own' => [],
+						'any' => ['pm_send'],
+					],
+				],
+				'report' => [
 					'label' => 'report_profile',
 					'custom_url' => '{scripturl}?action=reporttm;{session_var}={session_id}',
 					'icon' => 'warning',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array(),
-						'any' => array('report_user'),
-					),
-				),
-				'issuewarning' => array(
+					'permission' => [
+						'own' => [],
+						'any' => ['report_user'],
+					],
+				],
+				'issuewarning' => [
 					'label' => 'profile_issue_warning',
 					'function' => __NAMESPACE__ . '\\IssueWarning::call',
 					'sub_template' => 'issueWarning',
 					'icon' => 'warning',
 					'token' => 'profile-iw%u',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array(),
-						'any' => array('issue_warning'),
-					),
-				),
-				'banuser' => array(
+					'permission' => [
+						'own' => [],
+						'any' => ['issue_warning'],
+					],
+				],
+				'banuser' => [
 					'label' => 'profileBanUser',
 					'custom_url' => '{scripturl}?action=admin;area=ban;sa=add',
 					'icon' => 'ban',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array(),
-						'any' => array('manage_bans'),
-					),
-				),
-				'subscriptions' => array(
+					'permission' => [
+						'own' => [],
+						'any' => ['manage_bans'],
+					],
+				],
+				'subscriptions' => [
 					'label' => 'subscriptions',
 					'function' => __NAMESPACE__ . '\\PaidSubs::call',
 					'icon' => 'paid',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array('is_not_guest'),
-						'any' => array('moderate_forum'),
-					),
-				),
-				'getprofiledata' => array(
+					'permission' => [
+						'own' => ['is_not_guest'],
+						'any' => ['moderate_forum'],
+					],
+				],
+				'getprofiledata' => [
 					'label' => 'export_profile_data',
 					'function' => __NAMESPACE__ . '\\Export::call',
 					'sub_template' => 'export_profile_data',
 					'icon' => 'packages',
 					// 'token' => 'profile-ex%u', // This is not checked here. We do it in the function itself - but if it was checked, this is what it'd be.
-					'permission' => array(
-						'own' => array('profile_view_own'),
-						'any' => array('moderate_forum'),
-					),
-				),
-				'download' => array(
+					'permission' => [
+						'own' => ['profile_view_own'],
+						'any' => ['moderate_forum'],
+					],
+				],
+				'download' => [
 					'label' => 'export_profile_data',
 					'function' => __NAMESPACE__ . '\\ExportDownload::call',
 					'sub_template' => 'download_export_file',
 					'icon' => 'packages',
 					'hidden' => true,
 					'select' => 'getprofiledata',
-					'permission' => array(
-						'own' => array('profile_view_own'),
-						'any' => array('moderate_forum'),
-					),
-				),
-				'dlattach' => array(
+					'permission' => [
+						'own' => ['profile_view_own'],
+						'any' => ['moderate_forum'],
+					],
+				],
+				'dlattach' => [
 					'label' => 'export_profile_data',
 					'function' => __NAMESPACE__ . '\\ExportAttachment::call',
 					'sub_template' => 'export_attachment',
 					'icon' => 'packages',
 					'hidden' => true,
 					'select' => 'getprofiledata',
-					'permission' => array(
-						'own' => array('profile_view_own'),
-						'any' => array(),
-					),
-				),
-				'deleteaccount' => array(
+					'permission' => [
+						'own' => ['profile_view_own'],
+						'any' => [],
+					],
+				],
+				'deleteaccount' => [
 					'label' => 'deleteAccount',
 					'function' => __NAMESPACE__ . '\\Delete::call',
 					'sub_template' => 'deleteAccount',
@@ -510,37 +507,37 @@ class Main implements ActionInterface
 					'sc' => 'post',
 					'token' => 'profile-da%u',
 					'password' => true,
-					'permission' => array(
-						'own' => array('profile_remove_any', 'profile_remove_own'),
-						'any' => array('profile_remove_any'),
-					),
-				),
-				'activateaccount' => array(
+					'permission' => [
+						'own' => ['profile_remove_any', 'profile_remove_own'],
+						'any' => ['profile_remove_any'],
+					],
+				],
+				'activateaccount' => [
 					'file' => 'Profile-Actions.php',
 					'function' => 'activateAccount',
 					'icon' => 'regcenter',
 					'sc' => 'get',
 					'token' => 'profile-aa%u',
 					'token_type' => 'get',
-					'permission' => array(
-						'own' => array(),
-						'any' => array('moderate_forum'),
-					),
-				),
+					'permission' => [
+						'own' => [],
+						'any' => ['moderate_forum'],
+					],
+				],
 				// A logout link just for the popup menu.
-				'logout' => array(
+				'logout' => [
 					'label' => 'logout',
 					'custom_url' => '{scripturl}?action=logout;{session_var}={session_id}',
 					'icon' => 'logout',
 					'enabled' => true,
-					'permission' => array(
-						'own' => array('is_not_guest'),
-						'any' => array(),
-					),
-				),
-			),
-		),
-	);
+					'permission' => [
+						'own' => ['is_not_guest'],
+						'any' => [],
+					],
+				],
+			],
+		],
+	];
 
 	/**
 	 * @var bool
@@ -572,37 +569,37 @@ class Main implements ActionInterface
 	public function execute(): void
 	{
 		// Is there an updated message to show?
-		if (isset($_GET['updated']))
+		if (isset($_GET['updated'])) {
 			Utils::$context['profile_updated'] = Lang::$txt['profile_updated_own'];
+		}
 
 		$menu = $this->createMenu();
 
 		$this->securityChecks();
 
 		// File to include?
-		if (!empty($menu->include_data['file']))
-			require_once(Config::$sourcedir . '/' . $menu->include_data['file']);
+		if (!empty($menu->include_data['file'])) {
+			require_once Config::$sourcedir . '/' . $menu->include_data['file'];
+		}
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=profile' . (Profile::$member->id != User::$me->id ? ';u=' . Profile::$member->id : ''),
 			'name' => sprintf(Lang::$txt['profile_of_username'], Profile::$member->formatted['name']),
-		);
+		];
 
-		if (!empty($menu->include_data['label']))
-		{
-			Utils::$context['linktree'][] = array(
+		if (!empty($menu->include_data['label'])) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=profile' . (Profile::$member->id != User::$me->id ? ';u=' . Profile::$member->id : '') . ';area=' . $menu->current_area,
 				'name' => $menu->include_data['label'],
-			);
+			];
 		}
 
-		if (!empty($menu->current_subsection) && $menu->include_data['subsections'][$menu->current_subsection]['label'] != $menu->include_data['label'])
-		{
-			Utils::$context['linktree'][] = array(
+		if (!empty($menu->current_subsection) && $menu->include_data['subsections'][$menu->current_subsection]['label'] != $menu->include_data['label']) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=profile' . (Profile::$member->id != User::$me->id ? ';u=' . Profile::$member->id : '') . ';area=' . $menu->current_area . ';sa=' . $menu->current_subsection,
 				'name' => $menu->include_data['subsections'][$menu->current_subsection]['label'],
-			);
+			];
 		}
 
 		// Set the template for this area and add the profile layer.
@@ -610,102 +607,91 @@ public function execute(): void
 
 		Utils::$context['template_layers'][] = 'profile';
 
-		Theme::loadJavaScriptFile('profile.js', array('defer' => false, 'minimize' => true), 'smf_profile');
+		Theme::loadJavaScriptFile('profile.js', ['defer' => false, 'minimize' => true], 'smf_profile');
 
 		// Right - are we saving - if so let's save the old data first.
-		if (Utils::$context['completed_save'])
-		{
+		if (Utils::$context['completed_save']) {
 			// Clean up the POST variables.
 			$_POST = Utils::htmlTrimRecursive($_POST);
 			$_POST = Utils::htmlspecialcharsRecursive($_POST);
 			Profile::$member->post_sanitized = true;
 
-			if ($this->check_password)
-			{
+			if ($this->check_password) {
 				// Check to ensure we're forcing SSL for authentication
-				if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
-				{
+				if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 					ErrorHandler::fatalLang('login_ssl_required', false);
 				}
 
-				$password = isset($_POST['oldpasswrd']) ? $_POST['oldpasswrd'] :  '';
+				$password = $_POST['oldpasswrd'] ?? '';
 
 				// You didn't even enter a password!
-				if (trim($password) == '')
+				if (trim($password) == '') {
 					Profile::$member->save_errors[] = 'no_password';
+				}
 
 				// Since the password got modified due to all the $_POST cleaning, lets undo it so we can get the correct password
 				$password = Utils::htmlspecialcharsDecode($password);
 
 				// Does the integration want to check passwords?
-				$good_password = in_array(true, IntegrationHook::call('integrate_verify_password', array(Profile::$member->username, $password, false)), true);
+				$good_password = in_array(true, IntegrationHook::call('integrate_verify_password', [Profile::$member->username, $password, false]), true);
 
 				// Bad password!!!
-				if (!$good_password && !Security::hashVerifyPassword(Profile::$member->username, $password, Profile::$member->passwd))
-				{
+				if (!$good_password && !Security::hashVerifyPassword(Profile::$member->username, $password, Profile::$member->passwd)) {
 					Profile::$member->save_errors[] = 'bad_password';
 				}
 
 				// Warn other elements not to jump the gun and do custom changes!
-				if (in_array('bad_password', Profile::$member->save_errors))
+				if (in_array('bad_password', Profile::$member->save_errors)) {
 					Utils::$context['password_auth_failed'] = true;
+				}
 			}
 
 			// Change the IP address in the database.
-			if (User::$me->is_owner && ($_REQUEST['area'] ?? null) != 'tfasetup')
+			if (User::$me->is_owner && ($_REQUEST['area'] ?? null) != 'tfasetup') {
 				Profile::$member->new_data['member_ip'] = User::$me->ip;
+			}
 
 			// Now call the sub-action function...
-			if ($menu->current_area == 'activateaccount')
-			{
-				if (empty(Profile::$member->save_errors))
-				{
+			if ($menu->current_area == 'activateaccount') {
+				if (empty(Profile::$member->save_errors)) {
 					Activate::call();
 					Utils::redirectexit('action=profile;u=' . Profile::$member->id . ';area=summary');
 				}
-			}
-			elseif ($menu->current_area == 'deleteaccount')
-			{
-				if (empty(Profile::$member->save_errors))
-				{
+			} elseif ($menu->current_area == 'deleteaccount') {
+				if (empty(Profile::$member->save_errors)) {
 					Delete::call();
 					Utils::redirectexit();
 				}
-			}
-			elseif (empty(Profile::$member->save_errors))
-			{
-				if (($_REQUEST['area'] ?? null) == 'tfadisable')
-				{
+			} elseif (empty(Profile::$member->save_errors)) {
+				if (($_REQUEST['area'] ?? null) == 'tfadisable') {
 					// Already checked the password, token, permissions, and session.
-					Profile::$member->new_data += array(
+					Profile::$member->new_data += [
 						'tfa_secret' => '',
 						'tfa_backup' => '',
-					);
+					];
 				}
 
-				if ($menu->current_area == 'groupmembership')
-				{
+				if ($menu->current_area == 'groupmembership') {
 					$gm_action = GroupMembership::load();
 					$gm_action->execute();
 					$msg = $gm_action->change_type;
 				}
 
-				$force_redirect = !in_array($menu->current_area, array('account', 'forumprofile', 'theme'));
+				$force_redirect = !in_array($menu->current_area, ['account', 'forumprofile', 'theme']);
 
 				Profile::$member->save();
 			}
 		}
 
 		// Have some errors for some reason?
-		if (!empty(Profile::$member->save_errors))
-		{
+		if (!empty(Profile::$member->save_errors)) {
 			// Set all the errors so the template knows what went wrong.
-			foreach (Profile::$member->save_errors as $error_type)
+			foreach (Profile::$member->save_errors as $error_type) {
 				Utils::$context['modify_error'][$error_type] = true;
+			}
 		}
 		// If it's you or it's forced then we should redirect upon save.
-		elseif ((!empty(Profile::$member->new_data) && User::$me->is_owner && !Utils::$context['do_preview']) || !empty($force_redirect))
-		{
+		elseif ((!empty(Profile::$member->new_data) && User::$me->is_owner && !Utils::$context['do_preview']) || !empty($force_redirect)) {
 			Utils::redirectexit('action=profile' . (User::$me->is_owner ? '' : ';u=' . Profile::$member->id) . ';area=' . $menu->current_area . (!empty($msg) ? ';msg=' . $msg : ';updated'));
 		}
 
@@ -713,12 +699,12 @@ public function execute(): void
 		$call = Utils::getCallable($menu->include_data['function']);
 
 		// Is it valid?
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call, Profile::$member->id);
+		}
 
 		// Set the page title if it's not already set...
-		if (!isset(Utils::$context['page_title']))
-		{
+		if (!isset(Utils::$context['page_title'])) {
 			Utils::$context['page_title'] = Lang::$txt['profile'] . (isset(Lang::$txt[$menu->current_area]) ? ' - ' . Lang::$txt[$menu->current_area] : '');
 		}
 	}
@@ -734,8 +720,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -751,7 +738,7 @@ public static function call(): void
 	/**
 	 * Backward compatibility wrapper.
 	 */
-	public static function modifyProfile($post_errors = array()): void
+	public static function modifyProfile($post_errors = []): void
 	{
 		self::load();
 		Profile::$member->save_errors = $post_errors;
@@ -768,8 +755,9 @@ public static function modifyProfile($post_errors = array()): void
 	protected function __construct()
 	{
 		// Don't reload this as we may have processed error strings.
-		if (empty(Profile::$member->save_errors))
+		if (empty(Profile::$member->save_errors)) {
 			Lang::load('Profile+Drafts');
+		}
 
 		Theme::loadTemplate('Profile');
 
@@ -778,20 +766,22 @@ protected function __construct()
 
 		// Group management isn't actually a permission. But we need it to be for this, so we need a phantom permission.
 		// And we care about what the current user can do, not what the user whose profile it is.
-		if (User::$me->mod_cache['gq'] != '0=1')
+		if (User::$me->mod_cache['gq'] != '0=1') {
 			User::$me->permissions[] = 'approve_group_requests';
+		}
 
 		// If paid subscriptions are enabled, make sure we actually have at least one subscription available...
 		Utils::$context['subs_available'] = false;
 
-		if (!empty(Config::$modSettings['paid_enabled']))
-		{
-			$get_active_subs = Db::$db->query('', '
-				SELECT COUNT(*)
+		if (!empty(Config::$modSettings['paid_enabled'])) {
+			$get_active_subs = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}subscriptions
-				WHERE active = {int:active}', array(
+				WHERE active = {int:active}',
+				[
 					'active' => 1,
-				)
+				],
 			);
 			list($num_subs) = Db::$db->fetch_row($get_active_subs);
 			Db::$db->free_result($get_active_subs);
@@ -810,18 +800,18 @@ protected function setProfileAreas(): void
 		// Finalize various string values.
 		array_walk_recursive(
 			$this->profile_areas,
-			function(&$value, $key)
-			{
-				if (in_array($key, array('title', 'label')))
+			function (&$value, $key) {
+				if (in_array($key, ['title', 'label'])) {
 					$value = Lang::$txt[$value] ?? $value;
+				}
 
-				$value = strtr($value, array(
+				$value = strtr($value, [
 					'{scripturl}' => Config::$scripturl,
 					'{boardurl}' => Config::$boardurl,
 					'{session_var}' => Utils::$context['session_var'],
 					'{session_id}' => Utils::$context['session_id'],
-				));
-			}
+				]);
+			},
 		);
 
 		$this->profile_areas['info']['areas']['showposts']['subsections']['unwatchedtopics']['enabled'] = User::$me->is_owner;
@@ -836,7 +826,6 @@ function(&$value, $key)
 
 		$this->profile_areas['info']['areas']['viewwarning']['enabled'] = Config::$modSettings['warning_settings'][0] == 1 && Profile::$member->warning;
 
-
 		$this->profile_areas['edit_profile']['areas']['account']['enabled'] = User::$me->is_admin || (Profile::$member->group_id != 1 && !in_array(1, Profile::$member->additional_groups));
 
 		$this->profile_areas['edit_profile']['areas']['tfasetup']['enabled'] = !empty(Config::$modSettings['tfa_mode']);
@@ -849,7 +838,6 @@ function(&$value, $key)
 
 		$this->profile_areas['edit_profile']['areas']['groupmembership']['enabled'] = !empty(Config::$modSettings['show_group_membership']) && User::$me->is_owner;
 
-
 		$this->profile_areas['profile_action']['areas']['sendpm']['enabled'] = User::$me->allowedTo('profile_view');
 
 		$this->profile_areas['profile_action']['areas']['report']['enabled'] = User::$me->allowedTo('profile_view');
@@ -863,30 +851,27 @@ function(&$value, $key)
 		$this->profile_areas['profile_action']['areas']['logout']['enabled'] = !empty($_REQUEST['area']) && $_REQUEST['area'] === 'popup';
 
 		// Give mods access to the menu.
-		IntegrationHook::call('integrate_profile_areas', array(&$this->profile_areas));
+		IntegrationHook::call('integrate_profile_areas', [&$this->profile_areas]);
 
 		// Do some cleaning ready for the menu function.
-		Utils::$context['password_areas'] = array();
+		Utils::$context['password_areas'] = [];
 
-		foreach ($this->profile_areas as $section_id => $section)
-		{
+		foreach ($this->profile_areas as $section_id => $section) {
 			// Do a bit of spring cleaning so to speak.
-			foreach ($section['areas'] as $area_id => $area)
-			{
+			foreach ($section['areas'] as $area_id => $area) {
 				// If it said no permissions that meant it wasn't valid!
-				if (empty($area['permission'][User::$me->is_owner ? 'own' : 'any']))
-				{
+				if (empty($area['permission'][User::$me->is_owner ? 'own' : 'any'])) {
 					$this->profile_areas[$section_id]['areas'][$area_id]['enabled'] = false;
 				}
 				// Otherwise pick the right set.
-				else
-				{
+				else {
 					$this->profile_areas[$section_id]['areas'][$area_id]['permission'] = $area['permission'][User::$me->is_owner ? 'own' : 'any'];
 				}
 
 				// Password required in most cases
-				if (!empty($area['password']))
+				if (!empty($area['password'])) {
 					Utils::$context['password_areas'][] = $area_id;
+				}
 			}
 		}
 	}
@@ -902,21 +887,22 @@ function(&$value, $key)
 	protected function createMenu(): object
 	{
 		// Set a few options for the menu.
-		$menuOptions = array(
+		$menuOptions = [
 			'disable_hook_call' => true,
 			'disable_url_session_check' => true,
-			'current_area' => isset($_REQUEST['area']) ? $_REQUEST['area'] : '',
-			'extra_url_parameters' => array(
+			'current_area' => $_REQUEST['area'] ?? '',
+			'extra_url_parameters' => [
 				'u' => Profile::$member->id,
-			),
-		);
+			],
+		];
 
 		// Actually create the menu!
 		$menu = new Menu($this->profile_areas, $menuOptions);
 
 		// No menu means no access.
-		if (empty($menu->include_data) && (!User::$me->is_guest || User::$me->validateSession()))
+		if (empty($menu->include_data) && (!User::$me->is_guest || User::$me->validateSession())) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Backward compatibility.
 		Utils::$context['profile_menu_id'] = $menu->id;
@@ -935,49 +921,41 @@ protected function securityChecks(): void
 		Utils::$context['completed_save'] = false;
 		Utils::$context['do_preview'] = isset($_REQUEST['preview_signature']);
 
-		$security_checks = array();
+		$security_checks = [];
 		$found_area = false;
 
-		foreach ($this->profile_areas as $section_id => $section)
-		{
+		foreach ($this->profile_areas as $section_id => $section) {
 			// Do a bit of spring cleaning so to speak.
-			foreach ($section['areas'] as $area_id => $area)
-			{
+			foreach ($section['areas'] as $area_id => $area) {
 				// Is this our area?
-				if (Menu::$loaded['profile']->current_area == $area_id)
-				{
+				if (Menu::$loaded['profile']->current_area == $area_id) {
 					// This can't happen - but is a security check.
-					if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false))
-					{
+					if ((isset($section['enabled']) && $section['enabled'] == false) || (isset($area['enabled']) && $area['enabled'] == false)) {
 						ErrorHandler::fatalLang('no_access', false);
 					}
 
 					// Are we saving data in a valid area?
-					if (isset($area['sc']) && (isset($_REQUEST['save']) || Utils::$context['do_preview']))
-					{
+					if (isset($area['sc']) && (isset($_REQUEST['save']) || Utils::$context['do_preview'])) {
 						$security_checks['session'] = $area['sc'];
 						Utils::$context['completed_save'] = true;
 					}
 
 					// Do we need to perform a token check?
-					if (!empty($area['token']))
-					{
+					if (!empty($area['token'])) {
 						$security_checks[isset($_REQUEST['save']) ? 'validateToken' : 'needsToken'] = $area['token'];
 
 						$token_name = $area['token'] !== true ? str_replace('%u', Profile::$member->id, $area['token']) : 'profile-u' . Profile::$member->id;
 
-						$token_type = isset($area['token_type']) && in_array($area['token_type'], array('request', 'post', 'get')) ? $area['token_type'] : 'post';
+						$token_type = isset($area['token_type']) && in_array($area['token_type'], ['request', 'post', 'get']) ? $area['token_type'] : 'post';
 					}
 
 					// Does this require session validating?
-					if (!empty($area['validate']) || (isset($_REQUEST['save']) && !User::$me->is_owner && ($area_id != 'issuewarning' || empty(Config::$modSettings['securityDisable_moderate']))))
-					{
+					if (!empty($area['validate']) || (isset($_REQUEST['save']) && !User::$me->is_owner && ($area_id != 'issuewarning' || empty(Config::$modSettings['securityDisable_moderate'])))) {
 						$security_checks['validate'] = true;
 					}
 
 					// Permissions for good measure.
-					if (!empty(Menu::$loaded['profile']->include_data['permission']))
-					{
+					if (!empty(Menu::$loaded['profile']->include_data['permission'])) {
 						$security_checks['permission'] = Menu::$loaded['profile']->include_data['permission'];
 					}
 
@@ -988,25 +966,29 @@ protected function securityChecks(): void
 		}
 
 		// Oh dear, some serious security lapse is going on here... we'll put a stop to that!
-		if (!$found_area)
+		if (!$found_area) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Now the context is setup have we got any security checks to carry out additional to that above?
-		if (isset($security_checks['session']))
+		if (isset($security_checks['session'])) {
 			User::$me->checkSession($security_checks['session']);
+		}
 
-		if (isset($security_checks['validate']))
+		if (isset($security_checks['validate'])) {
 			User::$me->validateSession();
+		}
 
-		if (isset($security_checks['validateToken']))
+		if (isset($security_checks['validateToken'])) {
 			SecurityToken::validate($token_name, $token_type);
+		}
 
-		if (isset($security_checks['permission']))
+		if (isset($security_checks['permission'])) {
 			User::$me->isAllowedTo($security_checks['permission']);
+		}
 
 		// Create a token if needed.
-		if (isset($security_checks['needsToken']) || isset($security_checks['validateToken']))
-		{
+		if (isset($security_checks['needsToken']) || isset($security_checks['validateToken'])) {
 			SecurityToken::create($token_name, $token_type);
 			Utils::$context['token_check'] = $token_name;
 		}
@@ -1019,7 +1001,8 @@ protected function securityChecks(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Main::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Main::exportStatic')) {
 	Main::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Notification.php b/Sources/Actions/Profile/Notification.php
index db9226d676..c3f69364ca 100644
--- a/Sources/Actions/Profile/Notification.php
+++ b/Sources/Actions/Profile/Notification.php
@@ -13,11 +13,12 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Notify;
 use SMF\Alert;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
@@ -29,8 +30,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles preferences related to notifications.
@@ -44,12 +43,19 @@ class Notification implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'notification',
-		),
-	);
+			'list_getTopicNotificationCount' => 'list_getTopicNotificationCount',
+			'list_getTopicNotifications' => 'list_getTopicNotifications',
+			'list_getBoardNotifications' => 'list_getBoardNotifications',
+			'alert_configuration' => 'alert_configuration',
+			'alert_markread' => 'alert_markread',
+			'alert_notifications_topics' => 'alert_notifications_topics',
+			'alert_notifications_boards' => 'alert_notifications_boards',
+			'makeNotificationChanges' => 'makeNotificationChanges',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -67,220 +73,220 @@ class Notification implements ActionInterface
 	 * @var array
 	 *
 	 * Defines all the types of alerts and their default values.
-	 * 
+	 *
 	 * The 'alert' and 'email' keys are required for each alert type.
 	 * The 'help' and 'permission' keys are optional.
-	 * 
+	 *
 	 * Valid values for 'alert' and 'email' keys are: 'always', 'yes', 'never'.
 	 * If using 'always' or 'never' you should add a help string.
 	 */
-	public array $alert_types = array(
-		'board' => array(
-			'topic_notify' => array(
-				'alert' => 'yes', 
+	public array $alert_types = [
+		'board' => [
+			'topic_notify' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-			'board_notify' => array(
-				'alert' => 'yes', 
+			],
+			'board_notify' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-		),
-		'msg' => array(
-			'msg_mention' => array(
-				'alert' => 'yes', 
+			],
+		],
+		'msg' => [
+			'msg_mention' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-			'msg_quote' => array(
-				'alert' => 'yes', 
+			],
+			'msg_quote' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-			'msg_like' => array(
-				'alert' => 'yes', 
+			],
+			'msg_like' => [
+				'alert' => 'yes',
 				'email' => 'never',
-			),
-			'unapproved_reply' => array(
-				'alert' => 'yes', 
+			],
+			'unapproved_reply' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-		),
-		'pm' => array(
-			'pm_new' => array(
-				'alert' => 'never', 
-				'email' => 'yes', 
-				'help' => 'alert_pm_new', 
-				'permission' => array(
-					'name' => 'pm_read', 
+			],
+		],
+		'pm' => [
+			'pm_new' => [
+				'alert' => 'never',
+				'email' => 'yes',
+				'help' => 'alert_pm_new',
+				'permission' => [
+					'name' => 'pm_read',
 					'is_board' => false,
-				),
-			),
-			'pm_reply' => array(
+				],
+			],
+			'pm_reply' => [
 				'alert' => 'never',
 				'email' => 'yes',
 				'help' => 'alert_pm_new',
-				'permission' => array(
+				'permission' => [
 					'name' => 'pm_send',
 					'is_board' => false,
-				),
-			),
-		),
-		'groupr' => array(
-			'groupr_approved' => array(
-				'alert' => 'yes', 
+				],
+			],
+		],
+		'groupr' => [
+			'groupr_approved' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-			'groupr_rejected' => array(
-				'alert' => 'yes', 
+			],
+			'groupr_rejected' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-		),
-		'moderation' => array(
-			'unapproved_attachment' => array(
+			],
+		],
+		'moderation' => [
+			'unapproved_attachment' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'approve_posts',
 					'is_board' => true,
-				),
-			),
-			'unapproved_post' => array(
+				],
+			],
+			'unapproved_post' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'approve_posts',
 					'is_board' => true,
-				),
-			),
-			'msg_report' => array(
+				],
+			],
+			'msg_report' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'moderate_board',
 					'is_board' => true,
-				),
-			),
-			'msg_report_reply' => array(
+				],
+			],
+			'msg_report_reply' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'moderate_board',
 					'is_board' => true,
-				),
-			),
-			'member_report' => array(
+				],
+			],
+			'member_report' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'moderate_forum',
 					'is_board' => false,
-				),
-			),
-			'member_report_reply' => array(
+				],
+			],
+			'member_report_reply' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'moderate_forum',
 					'is_board' => false,
-				),
-			),
-		),
-		'members' => array(
-			'member_register' => array(
+				],
+			],
+		],
+		'members' => [
+			'member_register' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'moderate_forum',
 					'is_board' => false,
-				),
-			),
-			'request_group' => array(
+				],
+			],
+			'request_group' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-			),
-			'warn_any' => array(
+			],
+			'warn_any' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-				'permission' => array(
+				'permission' => [
 					'name' => 'issue_warning',
 					'is_board' => false,
-				),
-			),
-			'buddy_request' => array(
+				],
+			],
+			'buddy_request' => [
 				'alert' => 'yes',
 				'email' => 'never',
-			),
-			'birthday' => array(
+			],
+			'birthday' => [
 				'alert' => 'yes',
 				'email' => 'yes',
-			),
-		),
-		'calendar' => array(
-			'event_new' => array(
+			],
+		],
+		'calendar' => [
+			'event_new' => [
 				'alert' => 'yes',
 				'email' => 'yes',
 				'help' => 'alert_event_new',
-			),
-		),
-		'paidsubs' => array(
-			'paidsubs_expiring' => array(
-				'alert' => 'yes', 
+			],
+		],
+		'paidsubs' => [
+			'paidsubs_expiring' => [
+				'alert' => 'yes',
 				'email' => 'yes',
-			),
-		),
-	);
+			],
+		],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * The group level options.
 	 */
-	public array $group_options = array(
-		'board' => array(
-			'msg_auto_notify' => array(
-				'check', 
-				'msg_auto_notify', 
+	public array $group_options = [
+		'board' => [
+			'msg_auto_notify' => [
+				'check',
+				'msg_auto_notify',
 				'label' => 'after',
-			),
-			'msg_receive_body' => array(
-				'check', 
-				'msg_receive_body', 
+			],
+			'msg_receive_body' => [
+				'check',
+				'msg_receive_body',
 				'label' => 'after',
-			),
-			'msg_notify_pref' => array(
-				'select', 
-				'msg_notify_pref', 
-				'label' => 'before', 
-				'opts' => array(
+			],
+			'msg_notify_pref' => [
+				'select',
+				'msg_notify_pref',
+				'label' => 'before',
+				'opts' => [
 					0 => 'alert_opt_msg_notify_pref_never',
 					1 => 'alert_opt_msg_notify_pref_instant',
 					2 => 'alert_opt_msg_notify_pref_first',
 					3 => 'alert_opt_msg_notify_pref_daily',
 					4 => 'alert_opt_msg_notify_pref_weekly',
-				),
-			),
-			'msg_notify_type' => array(
-				'select', 
-				'msg_notify_type', 
-				'label' => 'before', 
-				'opts' => array(
+				],
+			],
+			'msg_notify_type' => [
+				'select',
+				'msg_notify_type',
+				'label' => 'before',
+				'opts' => [
 					1 => 'notify_send_type_everything',
 					2 => 'notify_send_type_everything_own',
 					3 => 'notify_send_type_only_replies',
 					4 => 'notify_send_type_nothing',
-				),
-			),
-		),
-		'pm' => array(
-			'pm_notify' => array(
-				'select', 
-				'pm_notify', 
-				'label' => 'before', 
-				'opts' => array(
+				],
+			],
+		],
+		'pm' => [
+			'pm_notify' => [
+				'select',
+				'pm_notify',
+				'label' => 'before',
+				'opts' => [
 					1 => 'email_notify_all',
 					2 => 'email_notify_buddies',
-				),
-			),
-		),
-	);
+				],
+			],
+		],
+	];
 
 	/**************************
 	 * Public static properties
@@ -291,24 +297,24 @@ class Notification implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'alerts' => 'configuration',
 		'markread' => 'markRead',
 		'topics' => 'topics',
 		'boards' => 'boards',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subtemplates = array(
+	public static array $subtemplates = [
 		'alerts' => 'alert_configuration',
 		'markread' => 'alert_markread',
 		'topics' => 'alert_notifications_topics',
 		'boards' => 'alert_notifications_boards',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -332,23 +338,23 @@ class Notification implements ActionInterface
 	public function execute(): void
 	{
 		// Going to want this for consistency.
-		Theme::loadCSSFile('admin.css', array(), 'smf_admin');
+		Theme::loadCSSFile('admin.css', [], 'smf_admin');
 
 		Utils::$context['sub_template'] = self::$subtemplates[$this->subaction];
 
-		if (isset(Menu::$loaded['profile']))
-		{
-			Menu::$loaded['profile']->tab_data = array(
+		if (isset(Menu::$loaded['profile'])) {
+			Menu::$loaded['profile']->tab_data = [
 				'title' => Lang::$txt['notification'],
 				'help' => '',
 				'description' => Lang::$txt['notification_info'],
-			);
+			];
 		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -356,100 +362,101 @@ public function execute(): void
 	 *
 	 * @param bool $defaultSettings If true, we are loading default options.
 	 */
-	function configuration($defaultSettings = false)
+	public function configuration($defaultSettings = false)
 	{
-		if (!isset(Utils::$context['token_check']))
+		if (!isset(Utils::$context['token_check'])) {
 			Utils::$context['token_check'] = 'profile-nt' . Profile::$member->id;
+		}
 
 		User::$me->kickIfGuest();
 
-		if (!User::$me->is_owner)
+		if (!User::$me->is_owner) {
 			User::$me->isAllowedTo('profile_extra_any');
+		}
 
 		// Set the post action if we're coming from the profile...
-		if (!isset(Utils::$context['action']))
-		{
+		if (!isset(Utils::$context['action'])) {
 			Utils::$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . Profile::$member->id;
 		}
 
 		// What options are set?
 		Profile::$member->loadThemeOptions($defaultSettings);
 
-		Theme::loadJavaScriptFile('alertSettings.js', array('minimize' => true), 'smf_alertSettings');
+		Theme::loadJavaScriptFile('alertSettings.js', ['minimize' => true], 'smf_alertSettings');
 
 		// Now load all the values for this user.
 		$prefs = Notify::getNotifyPrefs(Profile::$member->id, '', Profile::$member->id != 0);
 
-		Utils::$context['alert_prefs'] = !empty($prefs[Profile::$member->id]) ? $prefs[Profile::$member->id] : array();
+		Utils::$context['alert_prefs'] = !empty($prefs[Profile::$member->id]) ? $prefs[Profile::$member->id] : [];
 
-		Utils::$context['member'] += array(
-			'alert_timeout' => isset(Utils::$context['alert_prefs']['alert_timeout']) ? Utils::$context['alert_prefs']['alert_timeout'] : 10,
-			'notify_announcements' => isset(Utils::$context['alert_prefs']['announcements']) ? Utils::$context['alert_prefs']['announcements'] : 0,
-		);
+		Utils::$context['member'] += [
+			'alert_timeout' => Utils::$context['alert_prefs']['alert_timeout'] ?? 10,
+			'notify_announcements' => Utils::$context['alert_prefs']['announcements'] ?? 0,
+		];
 
 		// There are certain things that are disabled at the group level.
-		if (empty(Config::$modSettings['cal_enabled']))
+		if (empty(Config::$modSettings['cal_enabled'])) {
 			unset($this->alert_types['calendar']);
+		}
 
 		// Disable paid subscriptions at group level if they're disabled.
-		if (empty(Config::$modSettings['paid_enabled']))
+		if (empty(Config::$modSettings['paid_enabled'])) {
 			unset($this->alert_types['paidsubs']);
+		}
 
 		// Disable membergroup requests at group level if they're disabled.
-		if (empty(Config::$modSettings['show_group_membership']))
+		if (empty(Config::$modSettings['show_group_membership'])) {
 			unset($this->alert_types['groupr'], $this->alert_types['members']['request_group']);
+		}
 
 		// Disable mentions if they're disabled.
-		if (empty(Config::$modSettings['enable_mentions']))
+		if (empty(Config::$modSettings['enable_mentions'])) {
 			unset($this->alert_types['msg']['msg_mention']);
+		}
 
 		// Disable likes if they're disabled.
-		if (empty(Config::$modSettings['enable_likes']))
+		if (empty(Config::$modSettings['enable_likes'])) {
 			unset($this->alert_types['msg']['msg_like']);
+		}
 
 		// Disable buddy requests if they're disabled.
-		if (empty(Config::$modSettings['enable_buddylist']))
+		if (empty(Config::$modSettings['enable_buddylist'])) {
 			unset($this->alert_types['members']['buddy_request']);
+		}
 
 		// Disable sending the body if it's disabled.
-		if (!empty(Config::$modSettings['disallow_sendBody']))
+		if (!empty(Config::$modSettings['disallow_sendBody'])) {
 			$this->group_options['board']['msg_receive_body'][0] = 'hide';
+		}
 
 		// Finalize the string values of the options.
-		foreach ($this->group_options as &$options)
-		{
-			foreach ($options as &$option)
-			{
-				if (!isset($option['opts']))
+		foreach ($this->group_options as &$options) {
+			foreach ($options as &$option) {
+				if (!isset($option['opts'])) {
 					continue;
+				}
 
-				foreach ($option['opts'] as &$value)
+				foreach ($option['opts'] as &$value) {
 					$value = Lang::$txt[$value] ?? $value;
+				}
 			}
 		}
 
 		// Now, now, we could pass this through global but we should really get into the habit of
 		// passing content to hooks, not expecting hooks to splatter everything everywhere.
-		IntegrationHook::call('integrate_alert_types', array(&$this->alert_types, &$this->group_options));
+		IntegrationHook::call('integrate_alert_types', [&$this->alert_types, &$this->group_options]);
 
 		// Now we have to do some permissions testing - but only if we're not loading this from the admin center
-		if (!empty(Profile::$member->id))
-		{
-			$group_permissions = array('manage_membergroups');
-			$board_permissions = array();
-
-			foreach ($this->alert_types as $group => $items)
-			{
-				foreach ($items as $alert_key => $alert_value)
-				{
-					if (isset($alert_value['permission']))
-					{
-						if (empty($alert_value['permission']['is_board']))
-						{
+		if (!empty(Profile::$member->id)) {
+			$group_permissions = ['manage_membergroups'];
+			$board_permissions = [];
+
+			foreach ($this->alert_types as $group => $items) {
+				foreach ($items as $alert_key => $alert_value) {
+					if (isset($alert_value['permission'])) {
+						if (empty($alert_value['permission']['is_board'])) {
 							$group_permissions[] = $alert_value['permission']['name'];
-						}
-						else
-						{
+						} else {
 							$board_permissions[] = $alert_value['permission']['name'];
 						}
 					}
@@ -458,38 +465,38 @@ function configuration($defaultSettings = false)
 
 			$member_groups = User::getGroupsWithPermissions($group_permissions, $board_permissions);
 
-			if (empty($member_groups['manage_membergroups']['allowed']))
-			{
-				$request = Db::$db->query('', '
-					SELECT COUNT(*)
+			if (empty($member_groups['manage_membergroups']['allowed'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(*)
 					FROM {db_prefix}group_moderators
 					WHERE id_member = {int:memID}',
-					array(
+					[
 						'memID' => Profile::$member->id,
-					)
+					],
 				);
 				list($is_group_moderator) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
-				if (empty($is_group_moderator))
+				if (empty($is_group_moderator)) {
 					unset($this->alert_types['members']['request_group']);
+				}
 			}
 
-			foreach ($this->alert_types as $group => $items)
-			{
-				foreach ($items as $alert_key => $alert_value)
-				{
-					if (isset($alert_value['permission']))
-					{
+			foreach ($this->alert_types as $group => $items) {
+				foreach ($items as $alert_key => $alert_value) {
+					if (isset($alert_value['permission'])) {
 						$allowed = count(array_intersect(Profile::$member->groups, $member_groups[$alert_value['permission']['name']]['allowed'])) != 0;
 
-						if (!$allowed)
+						if (!$allowed) {
 							unset($this->alert_types[$group][$alert_key]);
+						}
 					}
 				}
 
-				if (empty($this->alert_types[$group]))
+				if (empty($this->alert_types[$group])) {
 					unset($this->alert_types[$group]);
+				}
 			}
 		}
 
@@ -497,37 +504,30 @@ function configuration($defaultSettings = false)
 		Utils::$context['alert_types'] = $this->alert_types;
 		Utils::$context['alert_group_options'] = $this->group_options;
 
-		Utils::$context['alert_bits'] = array(
+		Utils::$context['alert_bits'] = [
 			'alert' => 0b01,
 			'email' => 0b10,
-		);
+		];
 
-		if (isset($_POST['notify_submit']))
-		{
+		if (isset($_POST['notify_submit'])) {
 			User::$me->checkSession();
 			SecurityToken::validate(Utils::$context['token_check'], 'post');
 
 			// We need to step through the list of valid settings and figure out what the user has set.
-			$update_prefs = array();
+			$update_prefs = [];
 
 			// Now the group level options
-			foreach ($this->group_options as $opt_group => $group)
-			{
-				foreach ($group as $this_option)
-				{
-					switch ($this_option[0])
-					{
+			foreach ($this->group_options as $opt_group => $group) {
+				foreach ($group as $this_option) {
+					switch ($this_option[0]) {
 						case 'check':
 							$update_prefs[$this_option[1]] = !empty($_POST['opt_' . $this_option[1]]) ? 1 : 0;
 							break;
 
 						case 'select':
-							if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]]))
-							{
+							if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]])) {
 								$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
-							}
-							else
-							{
+							} else {
 								// We didn't have a sane value. Let's grab the first item from the possibles.
 								$keys = array_keys($this_option['opts']);
 								$first = array_shift($keys);
@@ -539,16 +539,12 @@ function configuration($defaultSettings = false)
 			}
 
 			// Now the individual options
-			foreach (Utils::$context['alert_types'] as $alert_group => $items)
-			{
-				foreach ($items as $item_key => $this_options)
-				{
+			foreach (Utils::$context['alert_types'] as $alert_group => $items) {
+				foreach ($items as $item_key => $this_options) {
 					$this_value = 0;
 
-					foreach (Utils::$context['alert_bits'] as $type => $bitvalue)
-					{
-						if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always')
-						{
+					foreach (Utils::$context['alert_bits'] as $type => $bitvalue) {
+						if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always') {
 							$this_value |= $bitvalue;
 						}
 					}
@@ -557,21 +553,15 @@ function configuration($defaultSettings = false)
 				}
 			}
 
-			if (isset($_POST['opt_alert_timeout']))
-			{
+			if (isset($_POST['opt_alert_timeout'])) {
 				$update_prefs['alert_timeout'] = Utils::$context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
-			}
-			else
-			{
+			} else {
 				$update_prefs['alert_timeout'] = Utils::$context['alert_prefs']['alert_timeout'];
 			}
 
-			if (isset($_POST['notify_announcements']))
-			{
+			if (isset($_POST['notify_announcements'])) {
 				$update_prefs['announcements'] = Utils::$context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
-			}
-			else
-			{
+			} else {
 				$update_prefs['announcements'] = Utils::$context['alert_prefs']['announcements'];
 			}
 
@@ -579,8 +569,9 @@ function configuration($defaultSettings = false)
 
 			Notify::setNotifyPrefs((int) Profile::$member->id, $update_prefs);
 
-			foreach ($update_prefs as $pref => $value)
+			foreach ($update_prefs as $pref => $value) {
 				Utils::$context['alert_prefs'][$pref] = $value;
+			}
 
 			$this->changeNotifications();
 
@@ -599,7 +590,7 @@ public function markRead()
 		Config::$db_show_debug = false;
 
 		// We only want to output our little layer here.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'alerts_all_read';
 
 		Lang::load('Alerts');
@@ -607,8 +598,9 @@ public function markRead()
 		// Now we're all set up.
 		User::$me->kickIfGuest();
 
-		if (!User::$me->is_owner)
+		if (!User::$me->is_owner) {
 			ErrorHandler::fatal('no_access');
+		}
 
 		User::$me->checkSession('get');
 
@@ -621,8 +613,7 @@ public function markRead()
 	public function topics()
 	{
 		// Because of the way this stuff works, we want to do this ourselves.
-		if (isset($_POST['edit_notify_topics']) || isset($_POST['remove_notify_topics']))
-		{
+		if (isset($_POST['edit_notify_topics']) || isset($_POST['remove_notify_topics'])) {
 			User::$me->checkSession();
 			SecurityToken::validate(str_replace('%u', Profile::$member->id, 'profile-nt%u'), 'post');
 
@@ -635,7 +626,7 @@ public function topics()
 		SecurityToken::create(Utils::$context['token_check'], 'post');
 
 		// Do the topic notifications.
-		$list_options = array(
+		$list_options = [
 			'id' => 'topic_notification_list',
 			'width' => '100%',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
@@ -643,27 +634,25 @@ public function topics()
 			'no_items_align' => 'left',
 			'base_href' => Config::$scripturl . '?action=profile;u=' . Profile::$member->id . ';area=notification;sa=topics',
 			'default_sort_col' => 'last_post',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getTopicNotifications',
-				'params' => array(),
-			),
-			'get_count' => array(
+				'params' => [],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getTopicNotificationCount',
-				'params' => array(),
-			),
-			'columns' => array(
-				'subject' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'subject' => [
+					'header' => [
 						'value' => Lang::$txt['notifications_topics'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
-						'function' => function($topic)
-						{
+					],
+					'data' => [
+						'function' => function ($topic) {
 							$link = $topic['link'];
 
-							if ($topic['new'])
-							{
+							if ($topic['new']) {
 								$link .= ' <a href="' . $topic['new_href'] . '" class="new_posts">' . Lang::$txt['new'] . '</a>';
 							}
 
@@ -671,95 +660,95 @@ public function topics()
 
 							return $link;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'ms.subject',
 						'reverse' => 'ms.subject DESC',
-					),
-				),
-				'started_by' => array(
-					'header' => array(
+					],
+				],
+				'started_by' => [
+					'header' => [
 						'value' => Lang::$txt['started_by'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'poster_link',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'real_name_col',
 						'reverse' => 'real_name_col DESC',
-					),
-				),
-				'last_post' => array(
-					'header' => array(
+					],
+				],
+				'last_post' => [
+					'header' => [
 						'value' => Lang::$txt['last_post'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<span class="smalltext">%1$s<br>' . Lang::$txt['by'] . ' %2$s</span>',
-							'params' => array(
+							'params' => [
 								'updated' => false,
 								'poster_updated_link' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'ml.id_msg DESC',
 						'reverse' => 'ml.id_msg',
-					),
-				),
-				'alert_pref' => array(
-					'header' => array(
+					],
+				],
+				'alert_pref' => [
+					'header' => [
 						'value' => Lang::$txt['notify_what_how'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
-						'function' => function($topic)
-						{
+					],
+					'data' => [
+						'function' => function ($topic) {
 							$pref = $topic['notify_pref'];
 							$mode = !empty($topic['unwatched']) ? 0 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
+
 							return Lang::$txt['notify_topic_' . $mode];
 						},
-					),
-				),
-				'delete' => array(
-					'header' => array(
+					],
+				],
+				'delete' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="notify_topics[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=profile;area=notification;sa=topics',
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					'u' => Profile::$member->id,
 					'sa' => Utils::$context['menu_item_selected'],
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-				),
+				],
 				'token' => Utils::$context['token_check'],
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="submit" name="edit_notify_topics" value="' . Lang::$txt['notifications_update'] . '" class="button">
 								<input type="submit" name="remove_notify_topics" value="' . Lang::$txt['notification_remove_pref'] . '" class="button">',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the notification list.
 		new ItemList($list_options);
@@ -771,8 +760,7 @@ public function topics()
 	public function boards()
 	{
 		// Because of the way this stuff works, we want to do this ourselves.
-		if (isset($_POST['edit_notify_boards']) || isset($_POSt['remove_notify_boards']))
-		{
+		if (isset($_POST['edit_notify_boards']) || isset($_POSt['remove_notify_boards'])) {
 			User::$me->checkSession();
 			SecurityToken::validate(str_replace('%u', Profile::$member->id, 'profile-nt%u'), 'post');
 
@@ -785,92 +773,90 @@ public function boards()
 		SecurityToken::create(Utils::$context['token_check'], 'post');
 
 		// Fine, start with the board list.
-		$list_options = array(
+		$list_options = [
 			'id' => 'board_notification_list',
 			'width' => '100%',
 			'no_items_label' => Lang::$txt['notifications_boards_none'] . '<br><br>' . Lang::$txt['notifications_boards_howto'],
 			'no_items_align' => 'left',
 			'base_href' => Config::$scripturl . '?action=profile;u=' . Profile::$member->id . ';area=notification;sa=boards',
 			'default_sort_col' => 'board_name',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getBoardNotifications',
-				'params' => array(),
-			),
-			'columns' => array(
-				'board_name' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'board_name' => [
+					'header' => [
 						'value' => Lang::$txt['notifications_boards'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
-						'function' => function($board)
-						{
+					],
+					'data' => [
+						'function' => function ($board) {
 							$link = $board['link'];
 
-							if ($board['new'])
-							{
+							if ($board['new']) {
 								$link .= ' <a href="' . $board['href'] . '" class="new_posts">' . Lang::$txt['new'] . '</a>';
 							}
 
 							return $link;
 						},
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'name',
 						'reverse' => 'name DESC',
-					),
-				),
-				'alert_pref' => array(
-					'header' => array(
+					],
+				],
+				'alert_pref' => [
+					'header' => [
 						'value' => Lang::$txt['notify_what_how'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
-						'function' => function($board)
-						{
+					],
+					'data' => [
+						'function' => function ($board) {
 							$pref = $board['notify_pref'];
 							$mode = $pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1);
+
 							return Lang::$txt['notify_board_' . $mode];
 						},
-					),
-				),
-				'delete' => array(
-					'header' => array(
+					],
+				],
+				'delete' => [
+					'header' => [
 						'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 						'style' => 'width: 4%;',
 						'class' => 'centercol',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<input type="checkbox" name="notify_boards[]" value="%1$d">',
-							'params' => array(
+							'params' => [
 								'id' => false,
-							),
-						),
+							],
+						],
 						'class' => 'centercol',
-					),
-				),
-			),
-			'form' => array(
+					],
+				],
+			],
+			'form' => [
 				'href' => Config::$scripturl . '?action=profile;area=notification;sa=boards',
 				'include_sort' => true,
 				'include_start' => true,
-				'hidden_fields' => array(
+				'hidden_fields' => [
 					'u' => Profile::$member->id,
 					'sa' => Utils::$context['menu_item_selected'],
 					Utils::$context['session_var'] => Utils::$context['session_id'],
-				),
+				],
 				'token' => Utils::$context['token_check'],
-			),
-			'additional_rows' => array(
-				array(
+			],
+			'additional_rows' => [
+				[
 					'position' => 'bottom_of_list',
 					'value' => '<input type="submit" name="edit_notify_boards" value="' . Lang::$txt['notifications_update'] . '" class="button">
 								<input type="submit" name="remove_notify_boards" value="' . Lang::$txt['notification_remove_pref'] . '" class="button">',
 					'class' => 'floatright',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the board notification list.
 		new ItemList($list_options);
@@ -887,8 +873,9 @@ public function boards()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -908,17 +895,18 @@ public static function call(): void
 	 */
 	public static function list_getTopicNotificationCount()
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_notify AS ln' . (!Config::$modSettings['postmod_active'] && User::$me->query_see_board === '1=1' ? '' : '
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = ln.id_topic)') . '
 			WHERE ln.id_member = {int:selected_member}' . (User::$me->query_see_topic_board === '1=1' ? '' : '
 				AND {query_see_topic_board}') . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : ''),
-			array(
+			[
 				'selected_member' => Profile::$member->id,
 				'is_approved' => 1,
-			)
+			],
 		);
 		list($totalNotifications) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -937,13 +925,14 @@ public static function list_getTopicNotificationCount()
 	public static function list_getTopicNotifications($start, $items_per_page, $sort)
 	{
 		$prefs = Notify::getNotifyPrefs(Profile::$member->id);
-		$prefs = isset($prefs[Profile::$member->id]) ? $prefs[Profile::$member->id] : array();
+		$prefs = $prefs[Profile::$member->id] ?? [];
 
 		// All the topics with notification on...
-		$notification_topics = array();
+		$notification_topics = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				COALESCE(lt.id_msg, lmr.id_msg, -1) + 1 AS new_from, b.id_board, b.name,
 				t.id_topic, ms.subject, ms.id_member, COALESCE(mem.real_name, ms.poster_name) AS real_name_col,
 				ml.id_msg_modified, ml.poster_time, ml.id_member AS id_member_updated,
@@ -961,20 +950,20 @@ public static function list_getTopicNotifications($start, $items_per_page, $sort
 			WHERE ln.id_member = {int:selected_member}
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:items_per_page}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'is_approved' => 1,
 				'selected_member' => Profile::$member->id,
 				'sort' => $sort,
 				'offset' => $start,
 				'items_per_page' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Lang::censorText($row['subject']);
 
-			$notification_topics[] = array(
+			$notification_topics[] = [
 				'id' => $row['id_topic'],
 				'poster_link' => empty($row['id_member']) ? $row['real_name_col'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name_col'] . '</a>',
 				'poster_updated_link' => empty($row['id_member_updated']) ? $row['last_real_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_updated'] . '">' . $row['last_real_name'] . '</a>',
@@ -987,9 +976,9 @@ public static function list_getTopicNotifications($start, $items_per_page, $sort
 				'new_href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['new_from'] . '#new',
 				'new_link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['new_from'] . '#new">' . $row['subject'] . '</a>',
 				'board_link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
-				'notify_pref' => isset($prefs['topic_notify_' . $row['id_topic']]) ? $prefs['topic_notify_' . $row['id_topic']] : (!empty($prefs['topic_notify']) ? $prefs['topic_notify'] : 0),
+				'notify_pref' => $prefs['topic_notify_' . $row['id_topic']] ?? (!empty($prefs['topic_notify']) ? $prefs['topic_notify'] : 0),
 				'unwatched' => $row['unwatched'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -1007,34 +996,35 @@ public static function list_getTopicNotifications($start, $items_per_page, $sort
 	public static function list_getBoardNotifications($start, $items_per_page, $sort)
 	{
 		$prefs = Notify::getNotifyPrefs(Profile::$member->id);
-		$prefs = isset($prefs[Profile::$member->id]) ? $prefs[Profile::$member->id] : array();
+		$prefs = $prefs[Profile::$member->id] ?? [];
 
-		$notification_boards = array();
+		$notification_boards = [];
 
-		$request = Db::$db->query('', '
-			SELECT b.id_board, b.name, COALESCE(lb.id_msg, 0) AS board_read, b.id_msg_updated
+		$request = Db::$db->query(
+			'',
+			'SELECT b.id_board, b.name, COALESCE(lb.id_msg, 0) AS board_read, b.id_msg_updated
 			FROM {db_prefix}log_notify AS ln
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = ln.id_board)
 				LEFT JOIN {db_prefix}log_boards AS lb ON (lb.id_board = b.id_board AND lb.id_member = {int:current_member})
 			WHERE ln.id_member = {int:selected_member}
 				AND {query_see_board}
 			ORDER BY {raw:sort}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'selected_member' => Profile::$member->id,
 				'sort' => $sort,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$notification_boards[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$notification_boards[] = [
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'href' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
 				'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
 				'new' => $row['board_read'] < $row['id_msg_updated'],
-				'notify_pref' => isset($prefs['board_notify_' . $row['id_board']]) ? $prefs['board_notify_' . $row['id_board']] : (!empty($prefs['board_notify']) ? $prefs['board_notify'] : 0),
-			);
+				'notify_pref' => $prefs['board_notify_' . $row['id_board']] ?? (!empty($prefs['board_notify']) ? $prefs['board_notify'] : 0),
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -1115,11 +1105,13 @@ public static function makeNotificationChanges($memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -1128,77 +1120,79 @@ protected function __construct()
 	protected function changeNotifications()
 	{
 		// Update the boards they are being notified about.
-		if (isset($_POST['edit_notify_boards']) && !empty($_POST['notify_boards']))
-		{
+		if (isset($_POST['edit_notify_boards']) && !empty($_POST['notify_boards'])) {
 			// Make sure only integers are deleted.
-			foreach ($_POST['notify_boards'] as $index => $id)
+			foreach ($_POST['notify_boards'] as $index => $id) {
 				$_POST['notify_boards'][$index] = (int) $id;
+			}
 
 			// id_board = 0 is reserved for topic notifications.
-			$_POST['notify_boards'] = array_diff($_POST['notify_boards'], array(0));
+			$_POST['notify_boards'] = array_diff($_POST['notify_boards'], [0]);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_notify
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_notify
 				WHERE id_board IN ({array_int:board_list})
 					AND id_member = {int:selected_member}',
-				array(
+				[
 					'board_list' => $_POST['notify_boards'],
 					'selected_member' => Profile::$member->id,
-				)
+				],
 			);
 		}
 
 		// Update the topics they are being notified about.
-		if (isset($_POST['edit_notify_topics']) && !empty($_POST['notify_topics']))
-		{
-			foreach ($_POST['notify_topics'] as $index => $id)
+		if (isset($_POST['edit_notify_topics']) && !empty($_POST['notify_topics'])) {
+			foreach ($_POST['notify_topics'] as $index => $id) {
 				$_POST['notify_topics'][$index] = (int) $id;
+			}
 
 			// Make sure there are no zeros left.
 			$_POST['notify_topics'] = array_filter($_POST['notify_topics']);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_notify
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_notify
 				WHERE id_topic IN ({array_int:topic_list})
 					AND id_member = {int:selected_member}',
-				array(
+				[
 					'topic_list' => $_POST['notify_topics'],
 					'selected_member' => Profile::$member->id,
-				)
+				],
 			);
 
-			foreach ($_POST['notify_topics'] as $topic)
-			{
-				Notify::setNotifyPrefs(Profile::$member->id, array('topic_notify_' . $topic => 0));
+			foreach ($_POST['notify_topics'] as $topic) {
+				Notify::setNotifyPrefs(Profile::$member->id, ['topic_notify_' . $topic => 0]);
 			}
 		}
 
 		// Are we removing topic preferences?
-		if (isset($_POST['remove_notify_topics']) && !empty($_POST['notify_topics']))
-		{
-			$prefs = array();
+		if (isset($_POST['remove_notify_topics']) && !empty($_POST['notify_topics'])) {
+			$prefs = [];
 
-			foreach ($_POST['notify_topics'] as $topic)
+			foreach ($_POST['notify_topics'] as $topic) {
 				$prefs[] = 'topic_notify_' . $topic;
+			}
 
 			Notify::deleteNotifyPrefs(Profile::$member->id, $prefs);
 		}
 
 		// Are we removing board preferences?
-		if (isset($_POST['remove_notify_board']) && !empty($_POST['notify_boards']))
-		{
-			$prefs = array();
+		if (isset($_POST['remove_notify_board']) && !empty($_POST['notify_boards'])) {
+			$prefs = [];
 
-			foreach ($_POST['notify_boards'] as $board)
+			foreach ($_POST['notify_boards'] as $board) {
 				$prefs[] = 'board_notify_' . $board;
-			
+			}
+
 			Notify::deleteNotifyPrefs(Profile::$member->id, $prefs);
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Notification::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Notification::exportStatic')) {
 	Notification::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/PaidSubs.php b/Sources/Actions/Profile/PaidSubs.php
index ef561e7607..ccc47d5ebb 100644
--- a/Sources/Actions/Profile/PaidSubs.php
+++ b/Sources/Actions/Profile/PaidSubs.php
@@ -13,18 +13,17 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Admin\Subscriptions;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Profile;
 use SMF\Theme;
 use SMF\Time;
 use SMF\Utils;
-use SMF\Actions\Admin\Subscriptions;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Class for doing all the paid subscription stuff - kinda.
@@ -38,12 +37,11 @@ class PaidSubs implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'subscriptions',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -74,31 +72,25 @@ public function execute(): void
 		Subscriptions::getSubs();
 
 		// Remove any invalid ones.
-		foreach (Subscriptions::$all as $id => $sub)
-		{
+		foreach (Subscriptions::$all as $id => $sub) {
 			// Work out the costs.
 			$costs = Utils::jsonDecode($sub['real_cost'], true);
 
-			$cost_array = array();
-			if ($sub['real_length'] == 'F')
-			{
-				foreach ($costs as $duration => $cost)
-				{
-					if ($cost != 0)
+			$cost_array = [];
+
+			if ($sub['real_length'] == 'F') {
+				foreach ($costs as $duration => $cost) {
+					if ($cost != 0) {
 						$cost_array[$duration] = $cost;
+					}
 				}
-			}
-			else
-			{
+			} else {
 				$cost_array['fixed'] = $costs['fixed'];
 			}
 
-			if (empty($cost_array))
-			{
+			if (empty($cost_array)) {
 				unset(Subscriptions::$all[$id]);
-			}
-			else
-			{
+			} else {
 				Subscriptions::$all[$id]['member'] = 0;
 				Subscriptions::$all[$id]['subscribed'] = false;
 				Subscriptions::$all[$id]['costs'] = $cost_array;
@@ -107,36 +99,40 @@ public function execute(): void
 
 		// Work out what gateways are enabled.
 		$gateways = Subscriptions::loadPaymentGateways();
-		foreach ($gateways as $id => $gateway)
-		{
+
+		foreach ($gateways as $id => $gateway) {
 			$gateways[$id] = new $gateway['display_class']();
 
-			if (!$gateways[$id]->gatewayEnabled())
+			if (!$gateways[$id]->gatewayEnabled()) {
 				unset($gateways[$id]);
+			}
 		}
 
 		// No gateways yet?
-		if (empty($gateways))
+		if (empty($gateways)) {
 			ErrorHandler::fatal(Lang::$txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Get the current subscriptions.
-		Utils::$context['current'] = array();
+		Utils::$context['current'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_sublog, id_subscribe, start_time, end_time, status, payments_pending, pending_details
+		$request = Db::$db->query(
+			'',
+			'SELECT id_sublog, id_subscribe, start_time, end_time, status, payments_pending, pending_details
 			FROM {db_prefix}log_subscribed
 			WHERE id_member = {int:selected_member}',
-			array(
+			[
 				'selected_member' => Profile::$member->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// The subscription must exist!
-			if (!isset(Subscriptions::$all[$row['id_subscribe']]))
+			if (!isset(Subscriptions::$all[$row['id_subscribe']])) {
 				continue;
+			}
 
-			Utils::$context['current'][$row['id_subscribe']] = array(
+			Utils::$context['current'][$row['id_subscribe']] = [
 				'id' => $row['id_sublog'],
 				'sub_id' => $row['id_subscribe'],
 				'hide' => $row['status'] == 0 && $row['end_time'] == 0 && $row['payments_pending'] == 0,
@@ -146,33 +142,29 @@ public function execute(): void
 				'pending_details' => $row['pending_details'],
 				'status' => $row['status'],
 				'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? Lang::$txt['paid_pending'] : Lang::$txt['paid_finished']) : Lang::$txt['paid_active'],
-			);
+			];
 
-			if ($row['status'] == 1)
+			if ($row['status'] == 1) {
 				Subscriptions::$all[$row['id_subscribe']]['subscribed'] = true;
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Simple "done"?
-		if (isset($_GET['done']))
-		{
+		if (isset($_GET['done'])) {
 			$_GET['sub_id'] = (int) $_GET['sub_id'];
 
 			// Must exist but let's be sure...
-			if (isset(Utils::$context['current'][$_GET['sub_id']]))
-			{
+			if (isset(Utils::$context['current'][$_GET['sub_id']])) {
 				// What are the details like?
 				$current_pending = Utils::jsonDecode(Utils::$context['current'][$_GET['sub_id']]['pending_details'], true);
 
-				if (!empty($current_pending))
-				{
+				if (!empty($current_pending)) {
 					$current_pending = array_reverse($current_pending);
 
-					foreach ($current_pending as $id => $sub)
-					{
+					foreach ($current_pending as $id => $sub) {
 						// Just find one and change it.
-						if ($sub[0] == $_GET['sub_id'] && $sub[3] == 'prepay')
-						{
+						if ($sub[0] == $_GET['sub_id'] && $sub[3] == 'prepay') {
 							$current_pending[$id][3] = 'payback';
 							break;
 						}
@@ -181,16 +173,17 @@ public function execute(): void
 					// Save the details back.
 					$pending_details = Utils::jsonEncode($current_pending);
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_subscribed
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_subscribed
 						SET payments_pending = payments_pending + 1, pending_details = {string:pending_details}
 						WHERE id_sublog = {int:current_subscription_id}
 							AND id_member = {int:selected_member}',
-						array(
+						[
 							'current_subscription_id' => Utils::$context['current'][$_GET['sub_id']]['id'],
 							'selected_member' => Profile::$member->id,
 							'pending_details' => $pending_details,
-						)
+						],
 					);
 				}
 			}
@@ -201,43 +194,42 @@ public function execute(): void
 		}
 
 		// If this is confirmation then it's simpler...
-		if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
-		{
+		if (isset($_GET['confirm'], $_POST['sub_id'])   && is_array($_POST['sub_id'])) {
 			// Hopefully just one.
-			foreach ($_POST['sub_id'] as $k => $v)
+			foreach ($_POST['sub_id'] as $k => $v) {
 				$id_sub = (int) $k;
+			}
 
-			if (!isset(Subscriptions::$all[$id_sub]) || Subscriptions::$all[$id_sub]['active'] == 0)
+			if (!isset(Subscriptions::$all[$id_sub]) || Subscriptions::$all[$id_sub]['active'] == 0) {
 				ErrorHandler::fatalLang('paid_sub_not_active');
+			}
 
 			// Simplify...
 			Utils::$context['sub'] = Subscriptions::$all[$id_sub];
 
 			$period = 'xx';
-			if (Utils::$context['sub']['flexible'])
-			{
+
+			if (Utils::$context['sub']['flexible']) {
 				$period = isset($_POST['cur'][$id_sub]) && isset(Utils::$context['sub']['costs'][$_POST['cur'][$id_sub]]) ? $_POST['cur'][$id_sub] : 'xx';
 			}
 
 			// Check we have a valid cost.
-			if (Utils::$context['sub']['flexible'] && $period == 'xx')
+			if (Utils::$context['sub']['flexible'] && $period == 'xx') {
 				ErrorHandler::fatalLang('paid_sub_not_active');
+			}
 
 			// Sort out the cost/currency.
 			Utils::$context['currency'] = Config::$modSettings['paid_currency_code'];
 			Utils::$context['recur'] = Utils::$context['sub']['repeatable'];
 
-			if (Utils::$context['sub']['flexible'])
-			{
+			if (Utils::$context['sub']['flexible']) {
 				// Real cost...
 				Utils::$context['value'] = Utils::$context['sub']['costs'][$_POST['cur'][$id_sub]];
 				Utils::$context['cost'] = sprintf(Config::$modSettings['paid_currency_symbol'], Utils::$context['value']) . '/' . Lang::$txt[$_POST['cur'][$id_sub]];
 
 				// The period value for paypal.
 				Utils::$context['paypal_period'] = strtoupper(substr($_POST['cur'][$id_sub], 0, 1));
-			}
-			else
-			{
+			} else {
 				// Real cost...
 				Utils::$context['value'] = Utils::$context['sub']['costs']['fixed'];
 				Utils::$context['cost'] = sprintf(Config::$modSettings['paid_currency_symbol'], Utils::$context['value']);
@@ -249,75 +241,76 @@ public function execute(): void
 			}
 
 			// Setup the gateway context.
-			Utils::$context['gateways'] = array();
+			Utils::$context['gateways'] = [];
 
-			foreach ($gateways as $id => $gateway)
-			{
+			foreach ($gateways as $id => $gateway) {
 				$fields = $gateways[$id]->fetchGatewayFields(
 					Utils::$context['sub']['id'] . '+' . Profile::$member->id,
 					Utils::$context['sub'],
 					Utils::$context['value'],
 					$period,
-					Config::$scripturl . '?action=profile&u=' . Profile::$member->id . '&area=subscriptions&sub_id=' . Utils::$context['sub']['id'] . '&done'
+					Config::$scripturl . '?action=profile&u=' . Profile::$member->id . '&area=subscriptions&sub_id=' . Utils::$context['sub']['id'] . '&done',
 				);
 
-				if (!empty($fields['form']))
+				if (!empty($fields['form'])) {
 					Utils::$context['gateways'][] = $fields;
+				}
 			}
 
 			// Bugger?!
-			if (empty(Utils::$context['gateways']))
+			if (empty(Utils::$context['gateways'])) {
 				ErrorHandler::fatal(Lang::$txt['paid_admin_not_setup_gateway']);
+			}
 
 			// Now we are going to assume they want to take this out ;)
-			$new_data = array(Utils::$context['sub']['id'], Utils::$context['value'], $period, 'prepay');
+			$new_data = [Utils::$context['sub']['id'], Utils::$context['value'], $period, 'prepay'];
 
-			if (isset(Utils::$context['current'][Utils::$context['sub']['id']]))
-			{
+			if (isset(Utils::$context['current'][Utils::$context['sub']['id']])) {
 				// What are the details like?
-				$current_pending = array();
+				$current_pending = [];
 
-				if (Utils::$context['current'][Utils::$context['sub']['id']]['pending_details'] != '')
-				{
+				if (Utils::$context['current'][Utils::$context['sub']['id']]['pending_details'] != '') {
 					$current_pending = Utils::jsonDecode(Utils::$context['current'][Utils::$context['sub']['id']]['pending_details'], true);
 				}
 
 				// Don't get silly.
-				if (count($current_pending) > 9)
-					$current_pending = array();
+				if (count($current_pending) > 9) {
+					$current_pending = [];
+				}
 
 				// Only record real pending payments as will otherwise confuse the admin!
 				$pending_count = 0;
-				foreach ($current_pending as $pending)
-				{
-					if ($pending[3] == 'payback')
+
+				foreach ($current_pending as $pending) {
+					if ($pending[3] == 'payback') {
 						$pending_count++;
+					}
 				}
 
-				if (!in_array($new_data, $current_pending))
-				{
+				if (!in_array($new_data, $current_pending)) {
 					$current_pending[] = $new_data;
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_subscribed
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_subscribed
 						SET payments_pending = {int:pending_count}, pending_details = {string:pending_details}
 						WHERE id_sublog = {int:current_subscription_item}
 							AND id_member = {int:selected_member}',
-						array(
+						[
 							'pending_count' => $pending_count,
 							'current_subscription_item' => Utils::$context['current'][Utils::$context['sub']['id']]['id'],
 							'selected_member' => Profile::$member->id,
 							'pending_details' => Utils::jsonEncode($current_pending),
-						)
+						],
 					);
 				}
 			}
 			// Never had this before, lovely.
-			else
-			{
-				Db::$db->insert('',
+			else {
+				Db::$db->insert(
+					'',
 					'{db_prefix}log_subscribed',
-					array(
+					[
 						'id_subscribe' => 'int',
 						'id_member' => 'int',
 						'status' => 'int',
@@ -325,17 +318,17 @@ public function execute(): void
 						'pending_details' => 'string-65534',
 						'start_time' => 'int',
 						'vendor_ref' => 'string-255',
-					),
-					array(
+					],
+					[
 						Utils::$context['sub']['id'],
 						Profile::$member->id,
 						0,
 						0,
-						Utils::jsonEncode(array($new_data)),
+						Utils::jsonEncode([$new_data]),
 						time(),
 						'',
-					),
-					array('id_sublog')
+					],
+					['id_sublog'],
 				);
 			}
 
@@ -345,10 +338,8 @@ public function execute(): void
 			// Quit.
 			return;
 		}
-		else
-		{
-			Utils::$context['sub_template'] = 'user_subscription';
-		}
+
+		Utils::$context['sub_template'] = 'user_subscription';
 	}
 
 	/***********************
@@ -362,8 +353,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -385,13 +377,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\PaidSubs::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\PaidSubs::exportStatic')) {
 	PaidSubs::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Popup.php b/Sources/Actions/Profile/Popup.php
index 3a9636ebd9..94383bd792 100644
--- a/Sources/Actions/Profile/Popup.php
+++ b/Sources/Actions/Profile/Popup.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -34,12 +33,11 @@ class Popup implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'profile_popup',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -49,68 +47,67 @@ class Popup implements ActionInterface
 	 * @var array
 	 *
 	 * A list of menu items to pull from the main profile menu.
-	 * 
-	 * The values of all 'title' elements are Lang::$txt keys, and will be 
+	 *
+	 * The values of all 'title' elements are Lang::$txt keys, and will be
 	 * replaced at runtime with the values of those Lang::$txt strings.
-	 * 
-	 * Occurrences of '{scripturl}' in value strings will be replaced at runtime 
+	 *
+	 * Occurrences of '{scripturl}' in value strings will be replaced at runtime
 	 * with the value of Config::$scripturl.
 	 */
-	public array $profile_items = array(
-		array(
+	public array $profile_items = [
+		[
 			'menu' => 'edit_profile',
 			'area' => 'account',
-		),
-		array(
+		],
+		[
 			'menu' => 'edit_profile',
 			'area' => 'forumprofile',
 			'title' => 'popup_forumprofile',
-		),
-		array(
+		],
+		[
 			'menu' => 'edit_profile',
 			'area' => 'theme',
 			'title' => 'theme',
-		),
-		array(
+		],
+		[
 			'menu' => 'edit_profile',
 			'area' => 'notification',
-		),
-		array(
+		],
+		[
 			'menu' => 'edit_profile',
 			'area' => 'ignoreboards',
-		),
-		array(
+		],
+		[
 			'menu' => 'edit_profile',
 			'area' => 'lists',
 			'url' => '{scripturl}?action=profile;area=lists;sa=ignore',
 			'title' => 'popup_ignore',
-		),
-		array(
+		],
+		[
 			'menu' => 'info',
 			'area' => 'showposts',
 			'title' => 'popup_showposts',
-		),
-		array(
+		],
+		[
 			'menu' => 'info',
 			'area' => 'showdrafts',
 			'title' => 'popup_showdrafts',
-		),
-		array(
+		],
+		[
 			'menu' => 'edit_profile',
 			'area' => 'groupmembership',
 			'title' => 'popup_groupmembership',
-		),
-		array(
+		],
+		[
 			'menu' => 'profile_action',
 			'area' => 'subscriptions',
 			'title' => 'popup_subscriptions',
-		),
-		array(
+		],
+		[
 			'menu' => 'profile_action',
 			'area' => 'logout',
-		),
-	);
-
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -137,20 +134,18 @@ public function execute(): void
 		Config::$db_show_debug = false;
 
 		// We only want to output our little layer here.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 
-		IntegrationHook::call('integrate_profile_popup', array(&$this->profile_items));
+		IntegrationHook::call('integrate_profile_popup', [&$this->profile_items]);
 
 		// Now check if these items are available
-		Utils::$context['profile_items'] = array();
-				
-		foreach ($this->profile_items as $item)
-		{
-			if (isset(Menu::$loaded['profile']['sections'][$item['menu']]['areas'][$item['area']]))
-			{
+		Utils::$context['profile_items'] = [];
+
+		foreach ($this->profile_items as $item) {
+			if (isset(Menu::$loaded['profile']['sections'][$item['menu']]['areas'][$item['area']])) {
 				Utils::$context['profile_items'][] = $item;
 			}
-		}	
+		}
 	}
 
 	/***********************
@@ -164,8 +159,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -190,19 +186,20 @@ protected function __construct()
 		// Finalize various string values.
 		array_walk_recursive(
 			$this->profile_items,
-			function(&$value, $key)
-			{
-				if ($key === 'title')
+			function (&$value, $key) {
+				if ($key === 'title') {
 					$value = Lang::$txt[$value] ?? $value;
+				}
 
-				$value = strtr($value, array('{scripturl}' => Config::$scripturl));
-			}
+				$value = strtr($value, ['{scripturl}' => Config::$scripturl]);
+			},
 		);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Popup::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Popup::exportStatic')) {
 	Popup::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ShowAlerts.php b/Sources/Actions/Profile/ShowAlerts.php
index ea57778f48..7c09830d27 100644
--- a/Sources/Actions/Profile/ShowAlerts.php
+++ b/Sources/Actions/Profile/ShowAlerts.php
@@ -13,10 +13,9 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
 use SMF\Alert;
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\Lang;
 use SMF\PageIndex;
@@ -37,12 +36,11 @@ class ShowAlerts implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'showAlerts' => 'showAlerts',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -65,11 +63,8 @@ class ShowAlerts implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		require_once(Config::$sourcedir . '/Actions/Profile/Modify.php');
-
 		// Are we opening a specific alert? (i.e.: ?action=profile;area=showalerts;alert=12345)
-		if (!empty($_REQUEST['alert']))
-		{
+		if (!empty($_REQUEST['alert'])) {
 			$alert_id = (int) $_REQUEST['alert'];
 			$alerts = Alert::fetch(User::$me->id, $alert_id);
 			$alert = array_pop($alerts);
@@ -82,8 +77,9 @@ public function execute(): void
 			 */
 
 			// In case it failed to determine this alert's link
-			if (empty($alert->target_href))
+			if (empty($alert->target_href)) {
 				Utils::redirectexit('action=profile;area=showalerts');
+			}
 
 			// Mark the alert as read while we're at it.
 			Alert::mark(User::$me->id, $alert_id, 1);
@@ -97,12 +93,9 @@ public function execute(): void
 		Utils::$context['start'] = (int) isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
 
 		// Fix invalid 'start' offsets.
-		if (Utils::$context['start'] > User::$me->alerts)
-		{
+		if (Utils::$context['start'] > User::$me->alerts) {
 			Utils::$context['start'] = User::$me->alerts - (User::$me->alerts % $maxIndex);
-		}
-		else
-		{
+		} else {
 			Utils::$context['start'] = Utils::$context['start'] - (Utils::$context['start'] % $maxIndex);
 		}
 
@@ -118,8 +111,7 @@ public function execute(): void
 		Utils::$context['pagination'] = new PageIndex(Config::$scripturl . '?action=profile;area=showalerts;u=' . User::$me->id, Utils::$context['start'], User::$me->alerts, $maxIndex, false);
 
 		// Set some JavaScript for checking all alerts at once.
-		if (Utils::$context['showCheckboxes'])
-		{
+		if (Utils::$context['showCheckboxes']) {
 			Theme::addInlineJavaScript('
 			$(function(){
 				$(\'#select_all\').on(\'change\', function() {
@@ -135,46 +127,43 @@ public function execute(): void
 		}
 
 		// The quickbuttons
-		foreach (Utils::$context['alerts'] as $id => $alert)
-		{
-			Utils::$context['alerts'][$id]['quickbuttons'] = array(
-				'delete' => array(
+		foreach (Utils::$context['alerts'] as $id => $alert) {
+			Utils::$context['alerts'][$id]['quickbuttons'] = [
+				'delete' => [
 					'label' => Lang::$txt['delete'],
 					'href' => Config::$scripturl . '?action=profile;u=' . Utils::$context['id_member'] . ';area=showalerts;do=remove;aid=' . $id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . (!empty(Utils::$context['start']) ? ';start=' . Utils::$context['start'] : ''),
 					'class' => 'you_sure',
-					'icon' => 'remove_button'
-				),
-				'mark' => array(
+					'icon' => 'remove_button',
+				],
+				'mark' => [
 					'label' => $alert['is_read'] != 0 ? Lang::$txt['mark_unread'] : Lang::$txt['mark_read_short'],
 					'href' => Config::$scripturl . '?action=profile;u=' . Utils::$context['id_member'] . ';area=showalerts;do=' . ($alert['is_read'] != 0 ? 'unread' : 'read') . ';aid=' . $id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . (!empty(Utils::$context['start']) ? ';start=' . Utils::$context['start'] : ''),
 					'icon' => $alert['is_read'] != 0 ? 'unread_button' : 'read_button',
-				),
-				'view' => array(
+				],
+				'view' => [
 					'label' => Lang::$txt['view'],
 					'href' => Config::$scripturl . '?action=profile;area=showalerts;alert=' . $id . ';',
 					'icon' => 'move',
-				),
-				'quickmod' => array(
-	    			'class' => 'inline_mod_check',
+				],
+				'quickmod' => [
+					'class' => 'inline_mod_check',
 					'content' => '<input type="checkbox" name="mark[' . $id . ']" value="' . $id . '">',
-					'show' => Utils::$context['showCheckboxes']
-				)
-			);
+					'show' => Utils::$context['showCheckboxes'],
+				],
+			];
 		}
 
 		// The Delete all unread link.
 		Utils::$context['alert_purge_link'] = Config::$scripturl . '?action=profile;u=' . Utils::$context['id_member'] . ';area=showalerts;do=purge;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . (!empty(Utils::$context['start']) ? ';start=' . Utils::$context['start'] : '');
 
 		// Set a nice message.
-		if (!empty($_SESSION['update_message']))
-		{
+		if (!empty($_SESSION['update_message'])) {
 			Utils::$context['update_message'] = Lang::$txt['profile_updated_own'];
 			unset($_SESSION['update_message']);
 		}
 
 		// Saving multiple changes?
-		if (isset($_GET['save']) && !empty($_POST['mark']))
-		{
+		if (isset($_GET['save']) && !empty($_POST['mark'])) {
 			// Get the values.
 			$toMark = array_map('intval', (array) $_POST['mark']);
 
@@ -183,25 +172,21 @@ public function execute(): void
 		}
 
 		// A single change.
-		if (!empty($_GET['do']) && !empty($_GET['aid']))
-		{
+		if (!empty($_GET['do']) && !empty($_GET['aid'])) {
 			$toMark = (int) $_GET['aid'];
 			$action = Utils::htmlspecialchars(Utils::htmlTrim($_GET['do']));
 		}
 		// Delete all read alerts.
-		elseif (!empty($_GET['do']) && $_GET['do'] === 'purge')
-		{
+		elseif (!empty($_GET['do']) && $_GET['do'] === 'purge') {
 			$action = 'purge';
 		}
 
 		// Save the changes.
-		if (!empty($action) && (!empty($toMark) || $action === 'purge'))
-		{
+		if (!empty($action) && (!empty($toMark) || $action === 'purge')) {
 			User::$me->checkSession('request');
 
 			// Call it!
-			switch ($action)
-			{
+			switch ($action) {
 				case 'remove':
 					Alert::delete($toMark, User::$me->id);
 					break;
@@ -234,8 +219,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -272,17 +258,20 @@ public static function showAlerts(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
 		// Users may only view their own alerts.
-		if (!User::$me->is_owner)
+		if (!User::$me->is_owner) {
 			Utils::redirectexit('action=profile;u=' . Profile::$member->id);
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ShowAlerts::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ShowAlerts::exportStatic')) {
 	ShowAlerts::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ShowPermissions.php b/Sources/Actions/Profile/ShowPermissions.php
index adaa63676d..8f9c50611a 100644
--- a/Sources/Actions/Profile/ShowPermissions.php
+++ b/Sources/Actions/Profile/ShowPermissions.php
@@ -13,17 +13,16 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Admin\Permissions;
+use SMF\BackwardCompatibility;
 use SMF\Board;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Lang;
 use SMF\Profile;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Admin\Permissions;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
@@ -37,12 +36,11 @@ class ShowPermissions implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'showPermissions' => 'showPermissions',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -73,8 +71,9 @@ public function execute(): void
 		// If they're an admin we know they can do everything, so we might as well leave.
 		Profile::$member->formatted['has_all_permissions'] = Profile::$member->is_admin;
 
-		if (Profile::$member->formatted['has_all_permissions'])
+		if (Profile::$member->formatted['has_all_permissions']) {
 			return;
+		}
 
 		// Load all the permission profiles.
 		Permissions::loadPermissionProfiles();
@@ -83,89 +82,86 @@ public function execute(): void
 		Utils::$context['board'] = Board::$info->id;
 
 		// Load a list of boards for the jump box - except the defaults.
-		Utils::$context['boards'] = array();
-		Utils::$context['no_access_boards'] = array();
+		Utils::$context['boards'] = [];
+		Utils::$context['no_access_boards'] = [];
 
-		$request = Db::$db->query('order_by_board_order', '
-			SELECT b.id_board, b.name, b.id_profile, b.member_groups, COALESCE(mods.id_member, modgs.id_group, 0) AS is_mod
+		$request = Db::$db->query(
+			'order_by_board_order',
+			'SELECT b.id_board, b.name, b.id_profile, b.member_groups, COALESCE(mods.id_member, modgs.id_group, 0) AS is_mod
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_board = b.id_board AND mods.id_member = {int:current_member})
 				LEFT JOIN {db_prefix}moderator_groups AS modgs ON (modgs.id_board = b.id_board AND modgs.id_group IN ({array_int:current_groups}))
 			WHERE {query_see_board}',
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'current_groups' => Profile::$member->groups,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!$row['is_mod'] && !Profile::$member->can_manage_boards && count(array_intersect(Profile::$member->groups, explode(',', $row['member_groups']))) === 0)
-			{
-				Utils::$context['no_access_boards'][] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!$row['is_mod'] && !Profile::$member->can_manage_boards && count(array_intersect(Profile::$member->groups, explode(',', $row['member_groups']))) === 0) {
+				Utils::$context['no_access_boards'][] = [
 					'id' => $row['id_board'],
 					'name' => $row['name'],
 					'is_last' => false,
-				);
-			}
-			elseif ($row['id_profile'] != 1 || $row['is_mod'])
-			{
-				Utils::$context['boards'][$row['id_board']] = array(
+				];
+			} elseif ($row['id_profile'] != 1 || $row['is_mod']) {
+				Utils::$context['boards'][$row['id_board']] = [
 					'id' => $row['id_board'],
 					'name' => $row['name'],
 					'selected' => Board::$info->id == $row['id_board'],
 					'profile' => $row['id_profile'],
 					'profile_name' => Utils::$context['profiles'][$row['id_profile']]['name'],
-				);
+				];
 			}
 		}
 		Db::$db->free_result($request);
 
 		Board::sort(Utils::$context['boards']);
 
-		if (!empty(Utils::$context['no_access_boards']))
-		{
+		if (!empty(Utils::$context['no_access_boards'])) {
 			Utils::$context['no_access_boards'][count(Utils::$context['no_access_boards']) - 1]['is_last'] = true;
 		}
 
-		Profile::$member->formatted['permissions'] = array(
-			'general' => array(),
-			'board' => array(),
-		);
+		Profile::$member->formatted['permissions'] = [
+			'general' => [],
+			'board' => [],
+		];
 
 		// For legibility below.
 		$general_perms = &Profile::$member->formatted['permissions']['general'];
 		$board_perms = &Profile::$member->formatted['permissions']['board'];
 
-		$denied = array();
+		$denied = [];
 
 		// Get all general permissions.
-		$result = Db::$db->query('', '
-			SELECT p.permission, p.add_deny, mg.group_name, p.id_group
+		$result = Db::$db->query(
+			'',
+			'SELECT p.permission, p.add_deny, mg.group_name, p.id_group
 			FROM {db_prefix}permissions AS p
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = p.id_group)
 			WHERE p.id_group IN ({array_int:group_list})
 			ORDER BY p.add_deny DESC, p.permission, mg.min_posts, CASE WHEN mg.id_group < {int:newbie_group} THEN mg.id_group ELSE 4 END, mg.group_name',
-			array(
+			[
 				'group_list' => Profile::$member->groups,
 				'newbie_group' => 4,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			// We don't know about this permission, it doesn't exist :P.
-			if (!isset(Lang::$txt['permissionname_' . $row['permission']]))
+			if (!isset(Lang::$txt['permissionname_' . $row['permission']])) {
 				continue;
+			}
 
-			if (empty($row['add_deny']))
+			if (empty($row['add_deny'])) {
 				$denied[] = $row['permission'];
+			}
 
 			// Permissions that end with _own or _any consist of two parts.
-			if (in_array(substr($row['permission'], -4), array('_own', '_any')) && isset(Lang::$txt['permissionname_' . substr($row['permission'], 0, -4)]))
-			{
+			if (in_array(substr($row['permission'], -4), ['_own', '_any']) && isset(Lang::$txt['permissionname_' . substr($row['permission'], 0, -4)])) {
 				$name = Lang::$txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . Lang::$txt['permissionname_' . $row['permission']];
-			}
-			else
-			{
+			} else {
 				$name = Lang::$txt['permissionname_' . $row['permission']];
 			}
 
@@ -176,18 +172,17 @@ public function execute(): void
 			$group_name = $row['id_group'] == 0 ? Lang::$txt['membergroups_members'] : $row['group_name'];
 
 			// Add this permission if it doesn't exist yet.
-			if (!isset($general_perms[$row['permission']]))
-			{
-				$general_perms[$row['permission']] = array(
+			if (!isset($general_perms[$row['permission']])) {
+				$general_perms[$row['permission']] = [
 					'id' => $row['permission'],
-					'groups' => array(
-						'allowed' => array(),
-						'denied' => array(),
-					),
+					'groups' => [
+						'allowed' => [],
+						'denied' => [],
+					],
 					'name' => $name,
 					'is_denied' => false,
 					'is_global' => true,
-				);
+				];
 			}
 
 			// Add the membergroup to either the denied or the allowed groups.
@@ -198,8 +193,9 @@ public function execute(): void
 		}
 		Db::$db->free_result($result);
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				bp.add_deny, bp.permission, bp.id_group, mg.group_name' . (empty(Board::$info->id) ? '' : ',
 				b.id_profile, CASE WHEN (mods.id_member IS NULL AND modgs.id_group IS NULL) THEN 0 ELSE 1 END AS is_moderator') . '
 			FROM {db_prefix}board_permissions AS bp' . (empty(Board::$info->id) ? '' : '
@@ -210,30 +206,28 @@ public function execute(): void
 			WHERE bp.id_profile = {raw:current_profile}
 				AND bp.id_group IN ({array_int:group_list}' . (empty(Board::$info->id) ? ')' : ', {int:moderator_group})
 				AND (mods.id_member IS NOT NULL OR modgs.id_group IS NOT NULL OR bp.id_group != {int:moderator_group})'),
-			array(
+			[
 				'current_board' => Board::$info->id,
 				'group_list' => Profile::$member->groups,
 				'current_member' => Profile::$member->id,
 				'current_profile' => empty(Board::$info->id) ? '1' : 'b.id_profile',
 				'moderator_group' => 3,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// We don't know about this permission, it doesn't exist :P.
-			if (!isset(Lang::$txt['permissionname_' . $row['permission']]))
+			if (!isset(Lang::$txt['permissionname_' . $row['permission']])) {
 				continue;
+			}
 
 			// The name of the permission using the format 'permission name' - 'own/any topic/event/etc.'.
 			if (
-				in_array(substr($row['permission'], -4), array('_own', '_any'))
+				in_array(substr($row['permission'], -4), ['_own', '_any'])
 				&& isset(Lang::$txt['permissionname_' . substr($row['permission'], 0, -4)])
-			)
-			{
+			) {
 				$name = Lang::$txt['permissionname_' . substr($row['permission'], 0, -4)] . ' - ' . Lang::$txt['permissionname_' . $row['permission']];
-			}
-			else
-			{
+			} else {
 				$name = Lang::$txt['permissionname_' . $row['permission']];
 			}
 
@@ -244,18 +238,17 @@ public function execute(): void
 			$group_name = $row['id_group'] == 0 ? Lang::$txt['membergroups_members'] : $row['group_name'];
 
 			// Create the structure for this permission.
-			if (!isset($board_perms[$row['permission']]))
-			{
-				$board_perms[$row['permission']] = array(
+			if (!isset($board_perms[$row['permission']])) {
+				$board_perms[$row['permission']] = [
 					'id' => $row['permission'],
-					'groups' => array(
-						'allowed' => array(),
-						'denied' => array()
-					),
+					'groups' => [
+						'allowed' => [],
+						'denied' => [],
+					],
 					'name' => $name,
 					'is_denied' => false,
 					'is_global' => empty(Board::$info->id),
-				);
+				];
 			}
 
 			$board_perms[$row['permission']]['groups'][$denied_allowed][$row['id_group']] = $group_name;
@@ -276,8 +269,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -318,13 +312,15 @@ protected function __construct()
 		Lang::load('Admin');
 		Theme::loadTemplate('ManageMembers');
 
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ShowPermissions::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ShowPermissions::exportStatic')) {
 	ShowPermissions::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ShowPosts.php b/Sources/Actions/Profile/ShowPosts.php
index 15996d7018..08cdc164ff 100644
--- a/Sources/Actions/Profile/ShowPosts.php
+++ b/Sources/Actions/Profile/ShowPosts.php
@@ -13,12 +13,12 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
@@ -32,7 +32,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
@@ -46,12 +45,17 @@ class ShowPosts implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'list_getUnwatched' => 'list_getUnwatched',
+			'list_getNumUnwatched' => 'list_getNumUnwatched',
+			'list_getAttachments' => 'list_getAttachments',
+			'list_getNumAttachments' => 'list_getNumAttachments',
+			'showPosts' => 'showPosts',
+			'showUnwatched' => 'showUnwatched',
+			'showAttachments' => 'showAttachments',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -74,12 +78,12 @@ class ShowPosts implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'messages' => 'messages',
 		'topics' => 'topics',
 		'unwatchedtopics' => 'unwatched',
 		'attach' => 'attachments',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -107,21 +111,21 @@ public function execute(): void
 		Utils::$context['current_member'] = Profile::$member->id;
 
 		// Create the tabs for the template.
-		Menu::$loaded['profile']->tab_data = array(
+		Menu::$loaded['profile']->tab_data = [
 			'title' => Lang::$txt['showPosts'],
 			'description' => Lang::$txt['showPosts_help'],
 			'icon_class' => 'main_icons profile_hd',
-			'tabs' => array(
-				'messages' => array(
-				),
-				'topics' => array(
-				),
-				'unwatchedtopics' => array(
-				),
-				'attach' => array(
-				),
-			),
-		);
+			'tabs' => [
+				'messages' => [
+				],
+				'topics' => [
+				],
+				'unwatchedtopics' => [
+				],
+				'attach' => [
+				],
+			],
+		];
 
 		$this->setPageTitle();
 
@@ -130,15 +134,15 @@ public function execute(): void
 			!empty(Utils::$context['load_average'])
 			&& !empty(Config::$modSettings['loadavg_show_posts'])
 			&& Utils::$context['load_average'] >= Config::$modSettings['loadavg_show_posts']
-		)
-		{
+		) {
 			ErrorHandler::fatalLang('loadavg_show_posts_disabled', false);
 		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -149,8 +153,9 @@ public function messages(): void
 		Utils::$context['is_topics'] = false;
 
 		// If just deleting a message, do it and then redirect back.
-		if (isset($_GET['delete']))
+		if (isset($_GET['delete'])) {
 			$this->deletePost();
+		}
 
 		$this->loadPosts();
 	}
@@ -171,104 +176,105 @@ public function topics(): void
 	public function unwatched(): void
 	{
 		// Only the owner can see the list (if the function is enabled of course)
-		if (!User::$me->is_owner)
-			Utils::redirectexit('action=profile;u=' . Profile::$member->id . ';area=showposts');;
+		if (!User::$me->is_owner) {
+			Utils::redirectexit('action=profile;u=' . Profile::$member->id . ';area=showposts');
+		}
 
 		// And here they are: the topics you don't like
-		$list_options = array(
+		$list_options = [
 			'id' => 'unwatched_topics',
 			'width' => '100%',
 			'items_per_page' => (empty(Config::$modSettings['disableCustomPerPage']) && !empty(Theme::$current->options['topics_per_page'])) ? Theme::$current->options['topics_per_page'] : Config::$modSettings['defaultMaxTopics'],
 			'no_items_label' => Lang::$txt['unwatched_topics_none'],
 			'base_href' => Config::$scripturl . '?action=profile;area=showposts;sa=unwatchedtopics;u=' . Profile::$member->id,
 			'default_sort_col' => 'started_on',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getUnwatched',
-				'params' => array(),
-			),
-			'get_count' => array(
+				'params' => [],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumUnwatched',
-				'params' => array(),
-			),
-			'columns' => array(
-				'subject' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'subject' => [
+					'header' => [
 						'value' => Lang::$txt['subject'],
 						'class' => 'lefttext',
 						'style' => 'width: 30%;',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?topic=%1$d.0">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'id_topic' => false,
 								'subject' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'm.subject',
 						'reverse' => 'm.subject DESC',
-					),
-				),
-				'started_by' => array(
-					'header' => array(
+					],
+				],
+				'started_by' => [
+					'header' => [
 						'value' => Lang::$txt['started_by'],
 						'style' => 'width: 15%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'started_by',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mem.real_name',
 						'reverse' => 'mem.real_name DESC',
-					),
-				),
-				'started_on' => array(
-					'header' => array(
+					],
+				],
+				'started_on' => [
+					'header' => [
 						'value' => Lang::$txt['on'],
 						'class' => 'lefttext',
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'started_on',
 						'timeformat' => true,
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.poster_time',
 						'reverse' => 'm.poster_time DESC',
-					),
-				),
-				'last_post_by' => array(
-					'header' => array(
+					],
+				],
+				'last_post_by' => [
+					'header' => [
 						'value' => Lang::$txt['last_post'],
 						'style' => 'width: 15%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'last_post_by',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'mem.real_name',
 						'reverse' => 'mem.real_name DESC',
-					),
-				),
-				'last_post_on' => array(
-					'header' => array(
+					],
+				],
+				'last_post_on' => [
+					'header' => [
 						'value' => Lang::$txt['on'],
 						'class' => 'lefttext',
 						'style' => 'width: 20%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'last_post_on',
 						'timeformat' => true,
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.poster_time',
 						'reverse' => 'm.poster_time DESC',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the request list.
 		new ItemList($list_options);
@@ -286,108 +292,108 @@ public function attachments(): void
 		$boards_allowed = User::$me->boardsAllowedTo('view_attachments');
 
 		// Make sure we can't actually see anything...
-		if (empty($boards_allowed))
-			$boards_allowed = array(-1);
+		if (empty($boards_allowed)) {
+			$boards_allowed = [-1];
+		}
 
 		// This is all the information required to list attachments.
-		$list_options = array(
+		$list_options = [
 			'id' => 'attachments',
 			'width' => '100%',
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['show_attachments_none'],
 			'base_href' => Config::$scripturl . '?action=profile;area=showposts;sa=attach;u=' . Profile::$member->id,
 			'default_sort_col' => 'filename',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getAttachments',
-				'params' => array(
+				'params' => [
 					$boards_allowed,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getNumAttachments',
-				'params' => array(
+				'params' => [
 					$boards_allowed,
-				),
-			),
-			'data_check' => array(
-				'class' => function($data)
-				{
+				],
+			],
+			'data_check' => [
+				'class' => function ($data) {
 					return $data['approved'] ? '' : 'approvebg';
-				}
-			),
-			'columns' => array(
-				'filename' => array(
-					'header' => array(
+				},
+			],
+			'columns' => [
+				'filename' => [
+					'header' => [
 						'value' => Lang::$txt['show_attach_filename'],
 						'class' => 'lefttext',
 						'style' => 'width: 25%;',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=dlattach;topic=%1$d.0;attach=%2$d">%3$s</a>%4$s',
-							'params' => array(
+							'params' => [
 								'topic' => true,
 								'id' => true,
 								'filename' => false,
 								'awaiting_approval' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'a.filename',
 						'reverse' => 'a.filename DESC',
-					),
-				),
-				'downloads' => array(
-					'header' => array(
+					],
+				],
+				'downloads' => [
+					'header' => [
 						'value' => Lang::$txt['show_attach_downloads'],
 						'style' => 'width: 12%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'downloads',
 						'comma_format' => true,
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'a.downloads',
 						'reverse' => 'a.downloads DESC',
-					),
-				),
-				'subject' => array(
-					'header' => array(
+					],
+				],
+				'subject' => [
+					'header' => [
 						'value' => Lang::$txt['message'],
 						'class' => 'lefttext',
 						'style' => 'width: 30%;',
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?msg=%1$d">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'msg' => true,
 								'subject' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'm.subject',
 						'reverse' => 'm.subject DESC',
-					),
-				),
-				'posted' => array(
-					'header' => array(
+					],
+				],
+				'posted' => [
+					'header' => [
 						'value' => Lang::$txt['show_attach_posted'],
 						'class' => 'lefttext',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'posted',
 						'timeformat' => true,
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.poster_time',
 						'reverse' => 'm.poster_time DESC',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the request list.
 		new ItemList($list_options);
@@ -404,8 +410,9 @@ public function attachments(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -429,51 +436,52 @@ public static function call(): void
 	public static function list_getUnwatched(int $start, int $items_per_page, string $sort): array
 	{
 		// Get the list of topics we can see
-		$topics = array();
+		$topics = [];
 
-		$request = Db::$db->query('', '
-			SELECT lt.id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT lt.id_topic
 			FROM {db_prefix}log_topics as lt
 				LEFT JOIN {db_prefix}topics as t ON (lt.id_topic = t.id_topic)
-				LEFT JOIN {db_prefix}messages as m ON (t.id_first_msg = m.id_msg)' . (in_array($sort, array('mem.real_name', 'mem.real_name DESC', 'mem.poster_time', 'mem.poster_time DESC')) ? '
+				LEFT JOIN {db_prefix}messages as m ON (t.id_first_msg = m.id_msg)' . (in_array($sort, ['mem.real_name', 'mem.real_name DESC', 'mem.poster_time', 'mem.poster_time DESC']) ? '
 				LEFT JOIN {db_prefix}members as mem ON (m.id_member = mem.id_member)' : '') . '
 			WHERE lt.id_member = {int:current_member}
 				AND unwatched = 1
 				AND {query_see_message_board}
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:limit}',
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'sort' => $sort,
 				'offset' => $start,
 				'limit' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$topics[] = $row['id_topic'];
 		}
 		Db::$db->free_result($request);
 
 		// Any topics found?
-		$topics_info = array();
+		$topics_info = [];
 
-		if (!empty($topics))
-		{
-			$request = Db::$db->query('', '
-				SELECT mf.subject, mf.poster_time as started_on, COALESCE(memf.real_name, mf.poster_name) as started_by, ml.poster_time as last_post_on, COALESCE(meml.real_name, ml.poster_name) as last_post_by, t.id_topic
+		if (!empty($topics)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT mf.subject, mf.poster_time as started_on, COALESCE(memf.real_name, mf.poster_name) as started_by, ml.poster_time as last_post_on, COALESCE(meml.real_name, ml.poster_name) as last_post_by, t.id_topic
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
 					INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)
 					LEFT JOIN {db_prefix}members AS meml ON (meml.id_member = ml.id_member)
 					LEFT JOIN {db_prefix}members AS memf ON (memf.id_member = mf.id_member)
 				WHERE t.id_topic IN ({array_int:topics})',
-				array(
+				[
 					'topics' => $topics,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$topics_info[] = $row;
 			}
 			Db::$db->free_result($request);
@@ -490,16 +498,17 @@ public static function list_getUnwatched(int $start, int $items_per_page, string
 	public static function list_getNumUnwatched(): int
 	{
 		// Get the total number of attachments they have posted.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_topics as lt
 			LEFT JOIN {db_prefix}topics as t ON (lt.id_topic = t.id_topic)
 			WHERE lt.id_member = {int:current_member}
 				AND lt.unwatched = 1
 				AND {query_see_topic_board}',
-			array(
+			[
 				'current_member' => Profile::$member->id,
-			)
+			],
 		);
 		list($unwatched_count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -519,10 +528,11 @@ public static function list_getNumUnwatched(): int
 	public static function list_getAttachments(int $start, int $items_per_page, string $sort, array $boards_allowed): array
 	{
 		// Retrieve some attachments.
-		$attachments = array();
+		$attachments = [];
 
-		$request = Db::$db->query('', '
-			SELECT a.id_attach, a.id_msg, a.filename, a.downloads, a.approved, m.id_msg, m.id_topic,
+		$request = Db::$db->query(
+			'',
+			'SELECT a.id_attach, a.id_msg, a.filename, a.downloads, a.approved, m.id_msg, m.id_topic,
 				m.id_board, m.poster_time, m.subject, b.name
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
@@ -535,7 +545,7 @@ public static function list_getAttachments(int $start, int $items_per_page, stri
 				AND a.approved = {int:is_approved}') . '
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:limit}',
-			array(
+			[
 				'boards_list' => $boards_allowed,
 				'attachment_type' => 0,
 				'no_message' => 0,
@@ -545,11 +555,11 @@ public static function list_getAttachments(int $start, int $items_per_page, stri
 				'sort' => $sort,
 				'offset' => $start,
 				'limit' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$attachments[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$attachments[] = [
 				'id' => $row['id_attach'],
 				'filename' => $row['filename'],
 				'downloads' => $row['downloads'],
@@ -561,7 +571,7 @@ public static function list_getAttachments(int $start, int $items_per_page, stri
 				'board_name' => $row['name'],
 				'approved' => $row['approved'],
 				'awaiting_approval' => (empty($row['approved']) ? ' <em>(' . Lang::$txt['awaiting_approval'] . ')</em>' : ''),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -577,8 +587,9 @@ public static function list_getAttachments(int $start, int $items_per_page, stri
 	public static function list_getNumAttachments(array $boards_allowed): int
 	{
 		// Get the total number of attachments they have posted.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board AND {query_see_board})' . (!Config::$modSettings['postmod_active'] || User::$me->is_owner || User::$me->allowedTo('approve_posts') ? '' : '
@@ -590,14 +601,14 @@ public static function list_getNumAttachments(array $boards_allowed): int
 				AND b.id_board IN ({array_int:boards_list})' : '') . (!Config::$modSettings['postmod_active'] || User::$me->is_owner || User::$me->allowedTo('approve_posts') ? '' : '
 				AND m.approved = {int:is_approved}
 				AND t.approved = {int:is_approved}'),
-			array(
+			[
 				'boards_list' => $boards_allowed,
 				'attachment_type' => 0,
 				'no_message' => 0,
 				'current_member' => Profile::$member->id,
 				'is_approved' => 1,
 				'board' => Board::$info->id ?? 0,
-			)
+			],
 		);
 		list($attach_count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -661,11 +672,13 @@ public static function showAttachments(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 
 	/**
@@ -674,12 +687,12 @@ protected function __construct()
 	protected function setPageTitle(): void
 	{
 		// Shortcut used to determine which Lang::$txt['show*'] string to use for the title, based on the SA
-		$title = array(
+		$title = [
 			'messages' => 'showPosts',
 			'topics' => 'showTopics',
 			'unwatchedtopics' => User::$me->is_owner ? 'showUnwatched' : 'showPosts',
 			'attach' => 'showAttachments',
-		);
+		];
 
 		// Set the page title
 		Utils::$context['page_title'] = Lang::$txt[$title[$_REQUEST['sa'] ?? 'messages'] ?? $title['messages']] . ' - ' . Profile::$member->name;
@@ -691,26 +704,27 @@ protected function setPageTitle(): void
 	protected function deletePost(): void
 	{
 		// Double check, just in case...
-		if (!isset($_GET['delete']))
+		if (!isset($_GET['delete'])) {
 			return;
+		}
 
 		User::$me->checkSession('get');
 
 		// We need msg info for logging.
-		$request = Db::$db->query('', '
-			SELECT subject, id_member, id_topic, id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT subject, id_member, id_topic, id_board
 			FROM {db_prefix}messages
 			WHERE id_msg = {int:id_msg}',
-			array(
+			[
 				'id_msg' => (int) $_GET['delete'],
-			)
+			],
 		);
 		$info = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Trying to remove a message that doesn't exist.
-		if (empty($info))
-		{
+		if (empty($info)) {
 			Utils::redirectexit('action=profile;u=' . Profile::$member->id . ';area=showposts;start=' . $_GET['start']);
 		}
 
@@ -718,14 +732,13 @@ protected function deletePost(): void
 		Msg::remove((int) $_GET['delete']);
 
 		// Add it to the mod log.
-		if (User::$me->allowedTo('delete_any') && (!User::$me->allowedTo('delete_own') || $info[1] != User::$me->id))
-		{
-			Logging::logAction('delete', array(
+		if (User::$me->allowedTo('delete_any') && (!User::$me->allowedTo('delete_own') || $info[1] != User::$me->id)) {
+			Logging::logAction('delete', [
 				'topic' => $info[2],
 				'subject' => $info[0],
 				'member' => $info[1],
 				'board' => $info[3],
-			));
+			]);
 		}
 
 		// Back to... where we are now ;).
@@ -738,70 +751,68 @@ protected function deletePost(): void
 	protected function loadPosts($is_topics = false): void
 	{
 		// Default to 10.
-		if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
+		if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
 			$_REQUEST['viewscount'] = '10';
+		}
 
-		if ($is_topics)
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		if ($is_topics) {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}topics AS t' . '
 				WHERE {query_see_topic_board}
 					AND t.id_member_started = {int:current_member}' . (!empty(Board::$info->id) ? '
 					AND t.id_board = {int:board}' : '') . (!Config::$modSettings['postmod_active'] || User::$me->is_owner ? '' : '
 					AND t.approved = {int:is_approved}'),
-				array(
+				[
 					'current_member' => Profile::$member->id,
 					'is_approved' => 1,
 					'board' => Board::$info->id ?? 0,
-				)
+				],
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}messages AS m' . (!Config::$modSettings['postmod_active'] || User::$me->is_owner ? '' : '
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)') . '
 				WHERE {query_see_message_board} AND m.id_member = {int:current_member}' . (!empty(Board::$info->id) ? '
 					AND m.id_board = {int:board}' : '') . (!Config::$modSettings['postmod_active'] || User::$me->is_owner ? '' : '
 					AND m.approved = {int:is_approved}
 					AND t.approved = {int:is_approved}'),
-				array(
+				[
 					'current_member' => Profile::$member->id,
 					'is_approved' => 1,
 					'board' => Board::$info->id ?? 0,
-				)
+				],
 			);
 		}
 		list($msg_count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		$request = Db::$db->query('', '
-			SELECT MIN(id_msg), MAX(id_msg)
+		$request = Db::$db->query(
+			'',
+			'SELECT MIN(id_msg), MAX(id_msg)
 			FROM {db_prefix}messages AS m' . (!Config::$modSettings['postmod_active'] || User::$me->is_owner ? '' : '
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)') . '
 			WHERE m.id_member = {int:current_member}' . (!empty(Board::$info->id) ? '
 				AND m.id_board = {int:board}' : '') . (!Config::$modSettings['postmod_active'] || User::$me->is_owner ? '' : '
 				AND m.approved = {int:is_approved}
 				AND t.approved = {int:is_approved}'),
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'is_approved' => 1,
 				'board' => Board::$info->id ?? 0,
-			)
+			],
 		);
 		list($min_msg_member, $max_msg_member) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		$range_limit = '';
 
-		if ($is_topics)
-		{
+		if ($is_topics) {
 			$max_per_page = empty(Config::$modSettings['disableCustomPerPage']) && !empty(Theme::$current->options['topics_per_page']) ? Theme::$current->options['topics_per_page'] : Config::$modSettings['defaultMaxTopics'];
-		}
-		else
-		{
+		} else {
 			$max_per_page = empty(Config::$modSettings['disableCustomPerPage']) && !empty(Theme::$current->options['messages_per_page']) ? Theme::$current->options['messages_per_page'] : Config::$modSettings['defaultMaxMessages'];
 		}
 
@@ -816,41 +827,36 @@ protected function loadPosts($is_topics = false): void
 		$start = Utils::$context['start'];
 		$reverse = $_REQUEST['start'] > $msg_count / 2;
 
-		if ($reverse)
-		{
+		if ($reverse) {
 			$max_index = $msg_count < Utils::$context['start'] + $max_per_page + 1 && $msg_count > Utils::$context['start'] ? $msg_count - Utils::$context['start'] : $max_per_page;
 			$start = $msg_count < Utils::$context['start'] + $max_per_page + 1 || $msg_count < Utils::$context['start'] + $max_per_page ? 0 : $msg_count - Utils::$context['start'] - $max_per_page;
 		}
 
 		// Guess the range of messages to be shown.
-		if ($msg_count > 1000)
-		{
+		if ($msg_count > 1000) {
 			$margin = floor(($max_msg_member - $min_msg_member) * (($start + $max_per_page) / $msg_count) + .1 * ($max_msg_member - $min_msg_member));
 
 			// Make a bigger margin for topics only.
-			if ($is_topics)
-			{
+			if ($is_topics) {
 				$margin *= 5;
 				$range_limit = $reverse ? 't.id_first_msg < ' . ($min_msg_member + $margin) : 't.id_first_msg > ' . ($max_msg_member - $margin);
-			}
-			else
-			{
+			} else {
 				$range_limit = $reverse ? 'm.id_msg < ' . ($min_msg_member + $margin) : 'm.id_msg > ' . ($max_msg_member - $margin);
 			}
 		}
 
 		// Find this user's posts.  The left join on categories somehow makes this faster, weird as it looks.
 		$counter = $reverse ? Utils::$context['start'] + $max_index + 1 : Utils::$context['start'];
-		Utils::$context['posts'] = array();
-		$board_ids = array('own' => array(), 'any' => array());
+		Utils::$context['posts'] = [];
+		$board_ids = ['own' => [], 'any' => []];
 
 		$looped = false;
-		while (true)
-		{
-			if ($is_topics)
-			{
-				$request = Db::$db->query('', '
-					SELECT
+
+		while (true) {
+			if ($is_topics) {
+				$request = Db::$db->query(
+					'',
+					'SELECT
 						b.id_board, b.name AS bname, c.id_cat, c.name AS cname, t.id_member_started, t.id_first_msg, t.id_last_msg,
 						t.approved, m.body, m.smileys_enabled, m.subject, m.poster_time, m.id_topic, m.id_msg
 					FROM {db_prefix}topics AS t
@@ -864,19 +870,18 @@ protected function loadPosts($is_topics = false): void
 						AND t.approved = {int:is_approved} AND m.approved = {int:is_approved}') . '
 					ORDER BY t.id_first_msg ' . ($reverse ? 'ASC' : 'DESC') . '
 					LIMIT {int:start}, {int:max}',
-					array(
+					[
 						'current_member' => Profile::$member->id,
 						'is_approved' => 1,
 						'board' => Board::$info->id ?? 0,
 						'start' => $start,
 						'max' => $max_index,
-					)
+					],
 				);
-			}
-			else
-			{
-				$request = Db::$db->query('', '
-					SELECT
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SELECT
 						b.id_board, b.name AS bname, c.id_cat, c.name AS cname, m.id_topic, m.id_msg,
 						t.id_member_started, t.id_first_msg, t.id_last_msg, m.body, m.smileys_enabled,
 						m.subject, m.poster_time, m.approved
@@ -891,26 +896,27 @@ protected function loadPosts($is_topics = false): void
 						AND t.approved = {int:is_approved} AND m.approved = {int:is_approved}') . '
 					ORDER BY m.id_msg ' . ($reverse ? 'ASC' : 'DESC') . '
 					LIMIT {int:start}, {int:max}',
-					array(
+					[
 						'current_member' => Profile::$member->id,
 						'is_approved' => 1,
 						'board' => Board::$info->id ?? 0,
 						'start' => $start,
 						'max' => $max_index,
-					)
+					],
 				);
 			}
 
 			// Make sure we quit this loop.
-			if (Db::$db->num_rows($request) === $max_index || $looped || $range_limit == '')
+			if (Db::$db->num_rows($request) === $max_index || $looped || $range_limit == '') {
 				break;
+			}
 
 			$looped = true;
 			$range_limit = '';
 		}
+
 		// Start counting at the number of the first message displayed.
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Censor....
 			Lang::censorText($row['body']);
 			Lang::censorText($row['subject']);
@@ -919,17 +925,17 @@ protected function loadPosts($is_topics = false): void
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
 			// And the array...
-			Utils::$context['posts'][$counter += $reverse ? -1 : 1] = array(
+			Utils::$context['posts'][$counter += $reverse ? -1 : 1] = [
 				'body' => $row['body'],
 				'counter' => $counter,
-				'category' => array(
+				'category' => [
 					'name' => $row['cname'],
-					'id' => $row['id_cat']
-				),
-				'board' => array(
+					'id' => $row['id_cat'],
+				],
+				'board' => [
 					'name' => $row['bname'],
-					'id' => $row['id_board']
-				),
+					'id' => $row['id_board'],
+				],
 				'topic' => $row['id_topic'],
 				'subject' => $row['subject'],
 				'start' => 'msg' . $row['id_msg'],
@@ -942,43 +948,42 @@ protected function loadPosts($is_topics = false): void
 				'delete_possible' => ($row['id_first_msg'] != $row['id_msg'] || $row['id_last_msg'] == $row['id_msg']) && (empty(Config::$modSettings['edit_disable_time']) || $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 >= time()),
 				'approved' => $row['approved'],
 				'css_class' => $row['approved'] ? 'windowbg' : 'approvebg',
-			);
+			];
 
-			if (User::$me->id == $row['id_member_started'])
+			if (User::$me->id == $row['id_member_started']) {
 				$board_ids['own'][$row['id_board']][] = $counter;
+			}
 
 			$board_ids['any'][$row['id_board']][] = $counter;
 		}
 		Db::$db->free_result($request);
 
 		// All posts were retrieved in reverse order, get them right again.
-		if ($reverse)
+		if ($reverse) {
 			Utils::$context['posts'] = array_reverse(Utils::$context['posts'], true);
+		}
 
 		// These are all the permissions that are different from board to board..
-		if ($is_topics)
-		{
-			$permissions = array(
-				'own' => array(
+		if ($is_topics) {
+			$permissions = [
+				'own' => [
 					'post_reply_own' => 'can_reply',
-				),
-				'any' => array(
+				],
+				'any' => [
 					'post_reply_any' => 'can_reply',
-				)
-			);
-		}
-		else
-		{
-			$permissions = array(
-				'own' => array(
+				],
+			];
+		} else {
+			$permissions = [
+				'own' => [
 					'post_reply_own' => 'can_reply',
 					'delete_own' => 'can_delete',
-				),
-				'any' => array(
+				],
+				'any' => [
 					'post_reply_any' => 'can_reply',
 					'delete_any' => 'can_delete',
-				)
-			);
+				],
+			];
 		}
 
 		// Create an array for the permissions.
@@ -986,36 +991,36 @@ protected function loadPosts($is_topics = false): void
 			array_keys(
 				iterator_to_array(
 					new \RecursiveIteratorIterator(
-						new \RecursiveArrayIterator($permissions)
-					)
-				)
+						new \RecursiveArrayIterator($permissions),
+					),
+				),
 			),
 			true,
-			false
+			false,
 		);
 
 		// For every permission in the own/any lists...
-		foreach ($permissions as $type => $list)
-		{
-			foreach ($list as $permission => $allowed)
-			{
+		foreach ($permissions as $type => $list) {
+			foreach ($list as $permission => $allowed) {
 				// Get the boards they can do this on...
 				$boards = $boards_can[$permission];
 
 				// Hmm, they can do it on all boards, can they?
-				if (!empty($boards) && $boards[0] == 0)
+				if (!empty($boards) && $boards[0] == 0) {
 					$boards = array_keys($board_ids[$type]);
+				}
 
 				// Now go through each board they can do the permission on.
-				foreach ($boards as $board_id)
-				{
+				foreach ($boards as $board_id) {
 					// There aren't any posts displayed from this board.
-					if (!isset($board_ids[$type][$board_id]))
+					if (!isset($board_ids[$type][$board_id])) {
 						continue;
+					}
 
 					// Set the permission to true ;).
-					foreach ($board_ids[$type][$board_id] as $counter)
+					foreach ($board_ids[$type][$board_id] as $counter) {
 						Utils::$context['posts'][$counter][$allowed] = true;
+					}
 				}
 			}
 		}
@@ -1023,8 +1028,7 @@ protected function loadPosts($is_topics = false): void
 		// Clean up after posts that cannot be deleted and quoted.
 		$quote_enabled = empty(Config::$modSettings['disabledBBC']) || !in_array('quote', explode(',', Config::$modSettings['disabledBBC']));
 
-		foreach (Utils::$context['posts'] as $counter => $dummy)
-		{
+		foreach (Utils::$context['posts'] as $counter => $dummy) {
 			Utils::$context['posts'][$counter]['can_delete'] &= Utils::$context['posts'][$counter]['delete_possible'];
 
 			Utils::$context['posts'][$counter]['can_quote'] = Utils::$context['posts'][$counter]['can_reply'] && $quote_enabled;
@@ -1033,36 +1037,36 @@ protected function loadPosts($is_topics = false): void
 		// Allow last minute changes.
 		IntegrationHook::call('integrate_profile_showPosts');
 
-		foreach (Utils::$context['posts'] as $key => $post)
-		{
-			Utils::$context['posts'][$key]['quickbuttons'] = array(
-				'reply' => array(
+		foreach (Utils::$context['posts'] as $key => $post) {
+			Utils::$context['posts'][$key]['quickbuttons'] = [
+				'reply' => [
 					'label' => Lang::$txt['reply'],
 					'href' => Config::$scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'],
 					'icon' => 'reply_button',
-					'show' => $post['can_reply']
-				),
-				'quote' => array(
+					'show' => $post['can_reply'],
+				],
+				'quote' => [
 					'label' => Lang::$txt['quote_action'],
 					'href' => Config::$scripturl . '?action=post;topic=' . $post['topic'] . '.' . $post['start'] . ';quote=' . $post['id'],
 					'icon' => 'quote',
-					'show' => $post['can_quote']
-				),
-				'remove' => array(
+					'show' => $post['can_quote'],
+				],
+				'remove' => [
 					'label' => Lang::$txt['remove'],
 					'href' => Config::$scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';profile;u=' . Utils::$context['member']['id'] . ';start=' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'javascript' => 'data-confirm="' . Lang::$txt['remove_message'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button',
-					'show' => $post['can_delete']
-				)
-			);
+					'show' => $post['can_delete'],
+				],
+			];
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ShowPosts::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ShowPosts::exportStatic')) {
 	ShowPosts::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/StatPanel.php b/Sources/Actions/Profile/StatPanel.php
index d9b60b855a..f4167dd47f 100644
--- a/Sources/Actions/Profile/StatPanel.php
+++ b/Sources/Actions/Profile/StatPanel.php
@@ -13,10 +13,10 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -24,7 +24,6 @@
 use SMF\Profile;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
@@ -38,12 +37,11 @@ class StatPanel implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'statPanel' => 'statPanel',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -69,14 +67,13 @@ public function execute(): void
 		Utils::$context['page_title'] = Lang::$txt['statPanel_showStats'] . ' ' . Profile::$member->name;
 
 		// Menu tab
-		Menu::$loaded['profile']->tab_data = array(
+		Menu::$loaded['profile']->tab_data = [
 			'title' => Lang::$txt['statPanel_generalStats'] . ' - ' . Profile::$member->name,
-			'icon' => 'stats_info.png'
-		);
+			'icon' => 'stats_info.png',
+		];
 
 		// Is the load average too high to allow searching just now?
-		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_userstats']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_userstats'])
-		{
+		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_userstats']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_userstats']) {
 			ErrorHandler::fatalLang('loadavg_userstats_disabled', false);
 		}
 
@@ -86,28 +83,30 @@ public function execute(): void
 		Utils::$context['num_posts'] = Lang::numberFormat(Profile::$member->posts);
 
 		// Number of topics started and Number polls started
-		$result = Db::$db->query('', '
-			SELECT COUNT(*), COUNT( CASE WHEN id_poll != {int:no_poll} THEN 1 ELSE NULL END )
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*), COUNT( CASE WHEN id_poll != {int:no_poll} THEN 1 ELSE NULL END )
 			FROM {db_prefix}topics
 			WHERE id_member_started = {int:current_member}' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 				AND id_board != {int:recycle_board}' : ''),
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'recycle_board' => Config::$modSettings['recycle_board'],
 				'no_poll' => 0,
-			)
+			],
 		);
 		list(Utils::$context['num_topics'], Utils::$context['num_polls']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// Number polls voted in.
-		$result = Db::$db->query('distinct_poll_votes', '
-			SELECT COUNT(DISTINCT id_poll)
+		$result = Db::$db->query(
+			'distinct_poll_votes',
+			'SELECT COUNT(DISTINCT id_poll)
 			FROM {db_prefix}log_polls
 			WHERE id_member = {int:current_member}',
-			array(
+			[
 				'current_member' => Profile::$member->id,
-			)
+			],
 		);
 		list(Utils::$context['num_votes']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
@@ -118,10 +117,11 @@ public function execute(): void
 		Utils::$context['num_votes'] = Lang::numberFormat(Utils::$context['num_votes']);
 
 		// Grab the boards this member posted in most often.
-		Utils::$context['popular_boards'] = array();
+		Utils::$context['popular_boards'] = [];
 
-		$result = Db::$db->query('', '
-			SELECT
+		$result = Db::$db->query(
+			'',
+			'SELECT
 				b.id_board, MAX(b.name) AS name, MAX(b.num_posts) AS num_posts, COUNT(*) AS message_count
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
@@ -131,14 +131,14 @@ public function execute(): void
 			GROUP BY b.id_board
 			ORDER BY message_count DESC
 			LIMIT 10',
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'count_enabled' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			Utils::$context['popular_boards'][$row['id_board']] = array(
+
+		while ($row = Db::$db->fetch_assoc($result)) {
+			Utils::$context['popular_boards'][$row['id_board']] = [
 				'id' => $row['id_board'],
 				'posts' => $row['message_count'],
 				'href' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
@@ -146,15 +146,16 @@ public function execute(): void
 				'posts_percent' => Profile::$member->posts == 0 ? 0 : ($row['message_count'] * 100) / Profile::$member->posts,
 				'total_posts' => $row['num_posts'],
 				'total_posts_member' => Profile::$member->posts,
-			);
+			];
 		}
 		Db::$db->free_result($result);
 
 		// Now get the 10 boards this user has most often participated in.
-		Utils::$context['board_activity'] = array();
+		Utils::$context['board_activity'] = [];
 
-		$result = Db::$db->query('profile_board_stats', '
-			SELECT
+		$result = Db::$db->query(
+			'profile_board_stats',
+			'SELECT
 				b.id_board, MAX(b.name) AS name, b.num_posts, COUNT(*) AS message_count,
 				CASE WHEN COUNT(*) > MAX(b.num_posts) THEN 1 ELSE COUNT(*) / MAX(b.num_posts) END * 100 AS percentage
 			FROM {db_prefix}messages AS m
@@ -164,13 +165,13 @@ public function execute(): void
 			GROUP BY b.id_board, b.num_posts
 			ORDER BY percentage DESC
 			LIMIT 10',
-			array(
+			[
 				'current_member' => Profile::$member->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			Utils::$context['board_activity'][$row['id_board']] = array(
+
+		while ($row = Db::$db->fetch_assoc($result)) {
+			Utils::$context['board_activity'][$row['id_board']] = [
 				'id' => $row['id_board'],
 				'posts' => $row['message_count'],
 				'href' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
@@ -178,16 +179,17 @@ public function execute(): void
 				'percent' => Lang::numberFormat((float) $row['percentage'], 2),
 				'posts_percent' => (float) $row['percentage'],
 				'total_posts' => $row['num_posts'],
-			);
+			];
 		}
 		Db::$db->free_result($result);
 
 		// Posting activity by time.
 		$maxPosts = $realPosts = 0;
-		Utils::$context['posts_by_time'] = array();
+		Utils::$context['posts_by_time'] = [];
 
-		$result = Db::$db->query('user_activity_by_time', '
-			SELECT
+		$result = Db::$db->query(
+			'user_activity_by_time',
+			'SELECT
 				HOUR(FROM_UNIXTIME(poster_time + {int:time_offset})) AS hour,
 				COUNT(*) AS post_count
 			FROM (
@@ -197,45 +199,42 @@ public function execute(): void
 				LIMIT {int:max_messages}
 			) a
 			GROUP BY hour',
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'time_offset' => User::$me->time_offset * 3600,
 				'max_messages' => 1001,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			// Cast as an integer to remove the leading 0.
 			$row['hour'] = (int) $row['hour'];
 
 			$maxPosts = max($row['post_count'], $maxPosts);
 			$realPosts += $row['post_count'];
 
-			Utils::$context['posts_by_time'][$row['hour']] = array(
+			Utils::$context['posts_by_time'][$row['hour']] = [
 				'hour' => $row['hour'],
 				'hour_format' => stripos(User::$me->time_format, '%p') === false ? $row['hour'] : date('g a', mktime($row['hour'])),
 				'posts' => $row['post_count'],
 				'posts_percent' => 0,
 				'is_last' => $row['hour'] == 23,
-			);
+			];
 		}
 		Db::$db->free_result($result);
 
-		if ($maxPosts > 0)
-		{
-			for ($hour = 0; $hour < 24; $hour++)
-			{
-				if (!isset(Utils::$context['posts_by_time'][$hour]))
-					Utils::$context['posts_by_time'][$hour] = array(
+		if ($maxPosts > 0) {
+			for ($hour = 0; $hour < 24; $hour++) {
+				if (!isset(Utils::$context['posts_by_time'][$hour])) {
+					Utils::$context['posts_by_time'][$hour] = [
 						'hour' => $hour,
 						'hour_format' => stripos(User::$me->time_format, '%p') === false ? $hour : date('g a', mktime($hour)),
 						'posts' => 0,
 						'posts_percent' => 0,
 						'relative_percent' => 0,
 						'is_last' => $hour == 23,
-					);
-				else
-				{
+					];
+				} else {
 					Utils::$context['posts_by_time'][$hour]['posts_percent'] = round((Utils::$context['posts_by_time'][$hour]['posts'] * 100) / $realPosts);
 					Utils::$context['posts_by_time'][$hour]['relative_percent'] = round((Utils::$context['posts_by_time'][$hour]['posts'] * 100) / $maxPosts);
 				}
@@ -245,7 +244,7 @@ public function execute(): void
 		// Put it in the right order.
 		ksort(Utils::$context['posts_by_time']);
 
-		/**
+		/*
 		 * Adding new entries:
 		 * 'key' => array(
 		 * 		'text' => string, // The text that will be shown next to the entry.
@@ -255,28 +254,28 @@ public function execute(): void
 		 * 'key' will be used to look up the language string as Lang::$txt['statPanel_' . $key].
 		 * Make sure to add a new entry when writing your mod!
 		 */
-		Utils::$context['text_stats'] = array(
-			'total_time_online' => array(
+		Utils::$context['text_stats'] = [
+			'total_time_online' => [
 				'text' => Utils::$context['time_logged_in'],
-			),
-			'total_posts' => array(
+			],
+			'total_posts' => [
 				'text' => Utils::$context['num_posts'] . ' ' . Lang::$txt['statPanel_posts'],
-				'url' => Config::$scripturl . '?action=profile;area=showposts;sa=messages;u=' . Profile::$member->id
-			),
-			'total_topics' => array(
+				'url' => Config::$scripturl . '?action=profile;area=showposts;sa=messages;u=' . Profile::$member->id,
+			],
+			'total_topics' => [
 				'text' => Utils::$context['num_topics'] . ' ' . Lang::$txt['statPanel_topics'],
-				'url' => Config::$scripturl . '?action=profile;area=showposts;sa=topics;u=' . Profile::$member->id
-			),
-			'users_polls' => array(
+				'url' => Config::$scripturl . '?action=profile;area=showposts;sa=topics;u=' . Profile::$member->id,
+			],
+			'users_polls' => [
 				'text' => Utils::$context['num_polls'] . ' ' . Lang::$txt['statPanel_polls'],
-			),
-			'users_votes' => array(
-				'text' => Utils::$context['num_votes'] . ' ' . Lang::$txt['statPanel_votes']
-			)
-		);
+			],
+			'users_votes' => [
+				'text' => Utils::$context['num_votes'] . ' ' . Lang::$txt['statPanel_votes'],
+			],
+		];
 
 		// Custom stats (just add a template_layer to add it to the template!)
-		IntegrationHook::call('integrate_profile_stats', array(Profile::$member->id, &Utils::$context['text_stats']));
+		IntegrationHook::call('integrate_profile_stats', [Profile::$member->id, &Utils::$context['text_stats']]);
 	}
 
 	/***********************
@@ -290,8 +289,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -328,13 +328,15 @@ public static function statPanel(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\StatPanel::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\StatPanel::exportStatic')) {
 	StatPanel::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Summary.php b/Sources/Actions/Profile/Summary.php
index c4442ee7a7..19e2b3b1b4 100644
--- a/Sources/Actions/Profile/Summary.php
+++ b/Sources/Actions/Profile/Summary.php
@@ -13,10 +13,11 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\Who;
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IP;
 use SMF\Lang;
 use SMF\Menu;
@@ -25,8 +26,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Who;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Shows a summary of a member's profile.
@@ -40,12 +39,11 @@ class Summary implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'summary' => 'summary',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -69,71 +67,59 @@ class Summary implements ActionInterface
 	public function execute(): void
 	{
 		// Menu tab
-		Menu::$loaded['profile']->tab_data = array(
+		Menu::$loaded['profile']->tab_data = [
 			'title' => Lang::$txt['summary'],
-			'icon_class' => 'main_icons profile_hd'
-		);
+			'icon_class' => 'main_icons profile_hd',
+		];
 
 		// Set up the stuff and load the user.
-		Utils::$context += array(
+		Utils::$context += [
 			'page_title' => sprintf(Lang::$txt['profile_of_username'], Profile::$member->formatted['name']),
 			'can_send_pm' => User::$me->allowedTo('pm_send'),
 			'can_have_buddy' => User::$me->allowedTo('profile_extra_own') && !empty(Config::$modSettings['enable_buddylist']),
 			'can_issue_warning' => User::$me->allowedTo('issue_warning') && Config::$modSettings['warning_settings'][0] == 1,
-			'can_view_warning' => (User::$me->allowedTo('moderate_forum') || User::$me->allowedTo('issue_warning') || User::$me->allowedTo('view_warning_any') || (User::$me->is_owner && User::$me->allowedTo('view_warning_own'))) && Config::$modSettings['warning_settings'][0] === '1'
-		);
+			'can_view_warning' => (User::$me->allowedTo('moderate_forum') || User::$me->allowedTo('issue_warning') || User::$me->allowedTo('view_warning_any') || (User::$me->is_owner && User::$me->allowedTo('view_warning_own'))) && Config::$modSettings['warning_settings'][0] === '1',
+		];
 
 		// Set a canonical URL for this page.
 		Utils::$context['canonical_url'] = Config::$scripturl . '?action=profile;u=' . Profile::$member->id;
 
 		// See if they have broken any warning levels...
-		if (!empty(Config::$modSettings['warning_mute']) && Config::$modSettings['warning_mute'] <= Profile::$member->formatted['warning'])
-		{
+		if (!empty(Config::$modSettings['warning_mute']) && Config::$modSettings['warning_mute'] <= Profile::$member->formatted['warning']) {
 			Utils::$context['warning_status'] = Lang::$txt['profile_warning_is_muted'];
-		}
-		elseif (!empty(Config::$modSettings['warning_moderate']) && Config::$modSettings['warning_moderate'] <= Profile::$member->formatted['warning'])
-		{
+		} elseif (!empty(Config::$modSettings['warning_moderate']) && Config::$modSettings['warning_moderate'] <= Profile::$member->formatted['warning']) {
 			Utils::$context['warning_status'] = Lang::$txt['profile_warning_is_moderation'];
-		}
-		elseif (!empty(Config::$modSettings['warning_watch']) && Config::$modSettings['warning_watch'] <= Profile::$member->formatted['warning'])
-		{
+		} elseif (!empty(Config::$modSettings['warning_watch']) && Config::$modSettings['warning_watch'] <= Profile::$member->formatted['warning']) {
 			Utils::$context['warning_status'] = Lang::$txt['profile_warning_is_watch'];
 		}
 
 		// They haven't even been registered for a full day!?
 		$days_registered = (int) ((time() - Profile::$member->date_registered) / (3600 * 24));
 
-		if (empty(Profile::$member->date_registered) || $days_registered < 1)
-		{
+		if (empty(Profile::$member->date_registered) || $days_registered < 1) {
 			Profile::$member->formatted['posts_per_day'] = Lang::$txt['not_applicable'];
-		}
-		else
-		{
+		} else {
 			Profile::$member->formatted['posts_per_day'] = Lang::numberFormat(Profile::$member->formatted['real_posts'] / $days_registered, 3);
 		}
 
 		// Set the age...
-		if (empty(Profile::$member->formatted['birth_date']) || substr(Profile::$member->formatted['birth_date'], 0, 4) < 1002)
-		{
-			Profile::$member->formatted += array(
+		if (empty(Profile::$member->formatted['birth_date']) || substr(Profile::$member->formatted['birth_date'], 0, 4) < 1002) {
+			Profile::$member->formatted += [
 				'age' => Lang::$txt['not_applicable'],
-				'today_is_birthday' => false
-			);
-		}
-		else
-		{
+				'today_is_birthday' => false,
+			];
+		} else {
 			list($birth_year, $birth_month, $birth_day) = sscanf(Profile::$member->formatted['birth_date'], '%d-%d-%d');
 
 			$datearray = getdate(time());
 
-			Profile::$member->formatted += array(
+			Profile::$member->formatted += [
 				'age' => $birth_year <= 1004 ? Lang::$txt['not_applicable'] : $datearray['year'] - $birth_year - (($datearray['mon'] > $birth_month || ($datearray['mon'] == $birth_month && $datearray['mday'] >= $birth_day)) ? 0 : 1),
-				'today_is_birthday' => $datearray['mon'] == $birth_month && $datearray['mday'] == $birth_day && $birth_year > 1004
-			);
+				'today_is_birthday' => $datearray['mon'] == $birth_month && $datearray['mday'] == $birth_day && $birth_year > 1004,
+			];
 		}
 
-		if (Utils::$context['can_see_ip'] && empty(Config::$modSettings['disableHostnameLookup']) && filter_var(Profile::$member->formatted['ip'], FILTER_VALIDATE_IP) !== false)
-		{
+		if (Utils::$context['can_see_ip'] && empty(Config::$modSettings['disableHostnameLookup']) && filter_var(Profile::$member->formatted['ip'], FILTER_VALIDATE_IP) !== false) {
 			$ip = new IP(Profile::$member->formatted['ip']);
 			Profile::$member->formatted['hostname'] = $ip->getHost();
 		}
@@ -142,126 +128,120 @@ public function execute(): void
 		Profile::$member->formatted['is_hidden'] = empty(Profile::$member->show_online);
 		Profile::$member->formatted['show_last_login'] = User::$me->allowedTo('admin_forum') || !Profile::$member->formatted['is_hidden'];
 
-		if (!empty(Config::$modSettings['who_enabled']) && Profile::$member->formatted['show_last_login'])
-		{
+		if (!empty(Config::$modSettings['who_enabled']) && Profile::$member->formatted['show_last_login']) {
 			$action = Who::determineActions(Profile::$member->url);
 
-			if ($action !== false)
+			if ($action !== false) {
 				Profile::$member->formatted['action'] = $action;
+			}
 		}
 
 		// If the user is awaiting activation, and the viewer has permission, set up some activation context messages.
-		if (Profile::$member->formatted['is_activated'] % 10 != 1 && User::$me->allowedTo('moderate_forum'))
-		{
+		if (Profile::$member->formatted['is_activated'] % 10 != 1 && User::$me->allowedTo('moderate_forum')) {
 			Utils::$context['activate_type'] = Profile::$member->formatted['is_activated'];
 
 			// What should the link text be?
-			Utils::$context['activate_link_text'] = in_array(Profile::$member->formatted['is_activated'], array(3, 4, 5, 13, 14, 15)) ? Lang::$txt['account_approve'] : Lang::$txt['account_activate'];
+			Utils::$context['activate_link_text'] = in_array(Profile::$member->formatted['is_activated'], [3, 4, 5, 13, 14, 15]) ? Lang::$txt['account_approve'] : Lang::$txt['account_activate'];
 
 			// Should we show a custom message?
-			Utils::$context['activate_message'] = isset(Lang::$txt['account_activate_method_' . Profile::$member->formatted['is_activated'] % 10]) ? Lang::$txt['account_activate_method_' . Profile::$member->formatted['is_activated'] % 10] : Lang::$txt['account_not_activated'];
+			Utils::$context['activate_message'] = Lang::$txt['account_activate_method_' . Profile::$member->formatted['is_activated'] % 10] ?? Lang::$txt['account_not_activated'];
 
 			// If they can be approved, we need to set up a token for them.
 			Utils::$context['token_check'] = 'profile-aa' . Profile::$member->id;
 			SecurityToken::create(Utils::$context['token_check'], 'get');
 
 			// Puerile comment
-			$type = in_array(Profile::$member->formatted['is_activated'], array(3, 4, 5, 13, 14, 15)) ? 'approve' : 'activate';
+			$type = in_array(Profile::$member->formatted['is_activated'], [3, 4, 5, 13, 14, 15]) ? 'approve' : 'activate';
 
 			Utils::$context['activate_link'] = Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=' . $type . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . ';' . Utils::$context[Utils::$context['token_check'] . '_token_var'] . '=' . Utils::$context[Utils::$context['token_check'] . '_token'];
 		}
 
 		// Prevent signature images from going outside the box.
-		if (Utils::$context['signature_enabled'])
-		{
+		if (Utils::$context['signature_enabled']) {
 			list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 			$sig_limits = explode(',', $sig_limits);
 
-			if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
-			{
+			if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
 				Theme::addInlineCss("\n\t" . '.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
 			}
 		}
 
 		// How about, are they banned?
-		Profile::$member->formatted['bans'] = array();
+		Profile::$member->formatted['bans'] = [];
 
-		if (User::$me->allowedTo('moderate_forum'))
-		{
+		if (User::$me->allowedTo('moderate_forum')) {
 			// Can they edit the ban?
 			Utils::$context['can_edit_ban'] = User::$me->allowedTo('manage_bans');
 
-			$ban_query = array();
-			$ban_query_vars = array(
+			$ban_query = [];
+			$ban_query_vars = [
 				'time' => time(),
-			);
+			];
 			$ban_query[] = 'id_member = ' . Profile::$member->formatted['id'];
 			$ban_query[] = ' {inet:ip} BETWEEN bi.ip_low and bi.ip_high';
 			$ban_query_vars['ip'] = Profile::$member->formatted['ip'];
 
 			// Do we have a hostname already?
-			if (!empty(Profile::$member->formatted['hostname']))
-			{
+			if (!empty(Profile::$member->formatted['hostname'])) {
 				$ban_query[] = '({string:hostname} LIKE hostname)';
 				$ban_query_vars['hostname'] = Profile::$member->formatted['hostname'];
 			}
 
 			// Check their email as well...
-			if (strlen(Profile::$member->formatted['email']) != 0)
-			{
+			if (strlen(Profile::$member->formatted['email']) != 0) {
 				$ban_query[] = '({string:email} LIKE bi.email_address)';
 				$ban_query_vars['email'] = Profile::$member->formatted['email'];
 			}
 
 			// So... are they banned?  Dying to know!
-			$request = Db::$db->query('', '
-				SELECT bg.id_ban_group, bg.name, bg.cannot_access, bg.cannot_post,
+			$request = Db::$db->query(
+				'',
+				'SELECT bg.id_ban_group, bg.name, bg.cannot_access, bg.cannot_post,
 					bg.cannot_login, bg.reason
 				FROM {db_prefix}ban_items AS bi
 					INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group AND (bg.expire_time IS NULL OR bg.expire_time > {int:time}))
 				WHERE (' . implode(' OR ', $ban_query) . ')',
-				$ban_query_vars
+				$ban_query_vars,
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Work out what restrictions we actually have.
-				$ban_restrictions = array();
+				$ban_restrictions = [];
 
-				foreach (array('access', 'login', 'post') as $type)
-				{
-					if ($row['cannot_' . $type])
+				foreach (['access', 'login', 'post'] as $type) {
+					if ($row['cannot_' . $type]) {
 						$ban_restrictions[] = Lang::$txt['ban_type_' . $type];
+					}
 				}
 
 				// No actual ban in place?
-				if (empty($ban_restrictions))
+				if (empty($ban_restrictions)) {
 					continue;
+				}
 
 				// Prepare the link for context.
 				$ban_explanation = sprintf(Lang::$txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . Config::$scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
 
-				Profile::$member->formatted['bans'][$row['id_ban_group']] = array(
+				Profile::$member->formatted['bans'][$row['id_ban_group']] = [
 					'reason' => empty($row['reason']) ? '' : '<br><br><strong>' . Lang::$txt['ban_reason'] . ':</strong> ' . $row['reason'],
-					'cannot' => array(
+					'cannot' => [
 						'access' => !empty($row['cannot_access']),
 						'post' => !empty($row['cannot_post']),
 						'login' => !empty($row['cannot_login']),
-					),
+					],
 					'explanation' => $ban_explanation,
-				);
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
 		Profile::$member->loadCustomFields();
 
-		Utils::$context['print_custom_fields'] = array();
+		Utils::$context['print_custom_fields'] = [];
 
 		// Any custom profile fields?
-		if (!empty(Utils::$context['custom_fields']))
-		{
-			foreach (Utils::$context['custom_fields'] as $custom)
-			{
+		if (!empty(Utils::$context['custom_fields'])) {
+			foreach (Utils::$context['custom_fields'] as $custom) {
 				Utils::$context['print_custom_fields'][Utils::$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
 			}
 		}
@@ -278,8 +258,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -316,11 +297,12 @@ public static function summary(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
 		// Are there things we don't show?
-		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : array();
+		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : [];
 
 		// Is the signature even enabled on this forum?
 		Utils::$context['signature_enabled'] = substr(Config::$modSettings['signature_settings'], 0, 1) == 1;
@@ -334,7 +316,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Summary::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Summary::exportStatic')) {
 	Summary::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/TFADisable.php b/Sources/Actions/Profile/TFADisable.php
index 6a867dd339..519dfe7509 100644
--- a/Sources/Actions/Profile/TFADisable.php
+++ b/Sources/Actions/Profile/TFADisable.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Profile;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Provides interface to disable two-factor authentication in SMF.
@@ -35,12 +34,11 @@ class TFADisable implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'tfadisable',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -63,35 +61,39 @@ class TFADisable implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (empty(User::$me->tfa_secret))
+		if (empty(User::$me->tfa_secret)) {
 			Utils::redirectexit('action=profile;area=account;u=' . Profile::$member->id);
+		}
 
 		// Bail if we're forcing SSL for authentication and the network connection isn't secure.
-		if (!empty(Config::$modSettings['force_ssl']) && !Config::httpsOn())
+		if (!empty(Config::$modSettings['force_ssl']) && !Config::httpsOn()) {
 			ErrorHandler::fatalLang('login_ssl_required', false);
+		}
 
 		// The admin giveth...
-		if (Config::$modSettings['tfa_mode'] == 3 && User::$me->is_owner)
+		if (Config::$modSettings['tfa_mode'] == 3 && User::$me->is_owner) {
 			ErrorHandler::fatalLang('cannot_disable_tfa', false);
+		}
 
-		if (Config::$modSettings['tfa_mode'] == 2 && User::$me->is_owner)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_group
+		if (Config::$modSettings['tfa_mode'] == 2 && User::$me->is_owner) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group
 				FROM {db_prefix}membergroups
 				WHERE tfa_required = {int:tfa_required}
 					AND id_group IN ({array_int:groups})',
-				array(
+				[
 					'tfa_required' => 1,
-					'groups' => array_diff(User::$me->groups, array(User::$me->post_group_id)),
-				)
+					'groups' => array_diff(User::$me->groups, [User::$me->post_group_id]),
+				],
 			);
 			$tfa_required_groups = Db::$db->num_rows($request);
 			Db::$db->free_result($request);
 
 			// They belong to a membergroup that requires tfa.
-			if (!empty($tfa_required_groups))
+			if (!empty($tfa_required_groups)) {
 				ErrorHandler::fatalLang('cannot_disable_tfa2', false);
+			}
 		}
 	}
 
@@ -106,8 +108,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -129,13 +132,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TFADisable::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TFADisable::exportStatic')) {
 	TFADisable::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/TFASetup.php b/Sources/Actions/Profile/TFASetup.php
index 61b2cbfdee..830e7c3174 100644
--- a/Sources/Actions/Profile/TFASetup.php
+++ b/Sources/Actions/Profile/TFASetup.php
@@ -13,18 +13,17 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\Cookie;
 use SMF\ErrorHandler;
 use SMF\Profile;
 use SMF\Security;
 use SMF\Theme;
+use SMF\TOTP\Auth as Tfa;
 use SMF\User;
 use SMF\Utils;
-use SMF\TOTP\Auth as Tfa;
 
 /**
  * Provides interface to set up two-factor authentication in SMF.
@@ -38,12 +37,11 @@ class TFASetup implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'tfasetup',
-		),
-	);
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -78,33 +76,29 @@ class TFASetup implements ActionInterface
 	public function execute(): void
 	{
 		// Users have to do this for themselves, and can't do it again if they already did.
-		if (!User::$me->is_owner || !empty(User::$me->tfa_secret))
+		if (!User::$me->is_owner || !empty(User::$me->tfa_secret)) {
 			Utils::redirectexit('action=profile;area=account;u=' . Profile::$member->id);
+		}
 
 		// Load JS lib for QR
-		Theme::loadJavaScriptFile('qrcode.js', array('force_current' => false, 'validate' => true));
+		Theme::loadJavaScriptFile('qrcode.js', ['force_current' => false, 'validate' => true]);
 
 		// Check to ensure we're forcing SSL for authentication.
-		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
-		{
+		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 			ErrorHandler::fatalLang('login_ssl_required', false);
 		}
 
 		// In some cases (forced 2FA or backup code) they would be forced to be redirected here,
 		// we do not want too much AJAX to confuse them.
-		if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' && !isset($_REQUEST['backup']) && !isset($_REQUEST['forced']))
-		{
+		if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' && !isset($_REQUEST['backup']) && !isset($_REQUEST['forced'])) {
 			Utils::$context['from_ajax'] = true;
-			Utils::$context['template_layers'] = array();
+			Utils::$context['template_layers'] = [];
 		}
 
 		// When the code is being sent, verify to make sure the user got it right
-		if (!empty($_REQUEST['save']) && !empty($_SESSION['tfa_secret']))
-		{
+		if (!empty($_REQUEST['save']) && !empty($_SESSION['tfa_secret'])) {
 			$this->validateAndSave();
-		}
-		else
-		{
+		} else {
 			$this->generate();
 		}
 
@@ -122,8 +116,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -145,8 +140,9 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 
 	/**
@@ -160,15 +156,14 @@ protected function validateAndSave(): void
 		$this->totp->setRange(1);
 		$valid_code = strlen($code) == $this->totp->getCodeLength() && $this->totp->validateCode($code);
 
-		if (empty(Utils::$context['password_auth_failed']) && $valid_code)
-		{
+		if (empty(Utils::$context['password_auth_failed']) && $valid_code) {
 			$backup = substr(sha1(Utils::randomInt()), 0, 16);
 			$backup_encrypted = Security::hashPassword(User::$me->username, $backup);
 
-			User::updateMemberData(Profile::$member->id, array(
+			User::updateMemberData(Profile::$member->id, [
 				'tfa_secret' => $_SESSION['tfa_secret'],
 				'tfa_backup' => $backup_encrypted,
-			));
+			]);
 
 			Cookie::setTFACookie(3153600, Profile::$member->id, Cookie::encrypt($backup_encrypted, User::$me->password_salt));
 
@@ -176,9 +171,7 @@ protected function validateAndSave(): void
 
 			Utils::$context['tfa_backup'] = $backup;
 			Utils::$context['sub_template'] = 'tfasetup_backup';
-		}
-		else
-		{
+		} else {
 			Utils::$context['tfa_secret'] = $_SESSION['tfa_secret'];
 			Utils::$context['tfa_error'] = !$valid_code;
 			Utils::$context['tfa_pass_value'] = $_POST['oldpasswrd'];
@@ -200,7 +193,8 @@ protected function generate(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TFASetup::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TFASetup::exportStatic')) {
 	TFASetup::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ThemeOptions.php b/Sources/Actions/Profile/ThemeOptions.php
index 7c4cbbebe1..0546dec658 100644
--- a/Sources/Actions/Profile/ThemeOptions.php
+++ b/Sources/Actions/Profile/ThemeOptions.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Profile;
@@ -35,12 +34,11 @@ class ThemeOptions implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'theme',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -71,23 +69,22 @@ public function execute(): void
 
 		Profile::$member->loadThemeOptions();
 
-		if (User::$me->allowedTo(array('profile_extra_own', 'profile_extra_any')))
-		{
+		if (User::$me->allowedTo(['profile_extra_own', 'profile_extra_any'])) {
 			Profile::$member->loadCustomFields('theme');
 		}
 
 		Utils::$context['page_desc'] = Lang::$txt['theme_info'];
 
 		Profile::$member->setupContext(
-			array(
-				'id_theme', 
-				'smiley_set', 
-			'hr',
-				'time_format', 
-				'timezone', 
-			'hr',
+			[
+				'id_theme',
+				'smiley_set',
+				'hr',
+				'time_format',
+				'timezone',
+				'hr',
 				'theme_settings',
-			),
+			],
 		);
 	}
 
@@ -102,8 +99,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -125,13 +123,15 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ThemeOptions::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ThemeOptions::exportStatic')) {
 	ThemeOptions::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/Tracking.php b/Sources/Actions/Profile/Tracking.php
index 5c63d256ff..0a88b402b0 100644
--- a/Sources/Actions/Profile/Tracking.php
+++ b/Sources/Actions/Profile/Tracking.php
@@ -13,11 +13,12 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\Actions\TrackIP;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IP;
 use SMF\ItemList;
@@ -27,8 +28,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\TrackIP;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
@@ -42,12 +41,23 @@ class Tracking implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'tracking',
-		),
-	);
+			'list_getUserErrors' => 'list_getUserErrors',
+			'list_getUserErrorCount' => 'list_getUserErrorCount',
+			'list_getProfileEdits' => 'list_getProfileEdits',
+			'list_getProfileEditCount' => 'list_getProfileEditCount',
+			'list_getGroupRequests' => 'list_getGroupRequests',
+			'list_getGroupRequestsCount' => 'list_getGroupRequestsCount',
+			'list_getLogins' => 'list_getLogins',
+			'list_getLoginCount' => 'list_getLoginCount',
+			'trackActivity' => 'trackActivity',
+			'trackEdits' => 'trackEdits',
+			'trackGroupReq' => 'trackGroupReq',
+			'trackLogins' => 'TrackLogins',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -75,33 +85,33 @@ class Tracking implements ActionInterface
 	 *
 	 *    array('method', 'txt_key_for_page_title', 'permission')
 	 */
-	public static array $subactions = array(
-		'activity' => array(
+	public static array $subactions = [
+		'activity' => [
 			'activity',
 			'trackActivity',
 			'moderate_forum',
-		),
-		'ip' => array(
+		],
+		'ip' => [
 			'ip',
 			'trackIP',
 			'moderate_forum',
-		),
-		'edits' => array(
+		],
+		'edits' => [
 			'edits',
 			'trackEdits',
 			'moderate_forum',
-		),
-		'groupreq' => array(
+		],
+		'groupreq' => [
 			'groupRequests',
 			'trackGroupRequests',
 			'approve_group_requests',
-		),
-		'logins' => array(
+		],
+		'logins' => [
 			'logins',
 			'trackLogins',
 			'moderate_forum',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -124,30 +134,33 @@ class Tracking implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!isset($this->subaction, self::$subactions))
+		if (!isset($this->subaction, self::$subactions)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// This is only here for backward compatiblity in case a mod needs it.
 		Utils::$context['tracking_area'] = &$this->subaction;
 
 		// Create the tabs for the template.
-		Menu::$loaded['profile']->tab_data = array(
+		Menu::$loaded['profile']->tab_data = [
 			'title' => Lang::$txt['tracking'],
 			'description' => Lang::$txt['tracking_description'],
 			'icon_class' => 'main_icons profile_hd',
-			'tabs' => array(),
-		);
+			'tabs' => [],
+		];
 
-		foreach (self::$subactions as $sa => $dummy)
-			Menu::$loaded['profile']->tab_data['tabs'][$sa] = array();
+		foreach (self::$subactions as $sa => $dummy) {
+			Menu::$loaded['profile']->tab_data['tabs'][$sa] = [];
+		}
 
 		// Set a page title.
 		Utils::$context['page_title'] = Lang::$txt['trackUser'] . ' - ' . Lang::$txt[self::$subactions[$this->subaction][1]] . ' - ' . Profile::$member->name;
 
-		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? array($this, self::$subactions[$this->subaction][0]) : Utils::getCallable(self::$subactions[$this->subaction][0]);
+		$call = method_exists($this, self::$subactions[$this->subaction][0]) ? [$this, self::$subactions[$this->subaction][0]] : Utils::getCallable(self::$subactions[$this->subaction][0]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -163,100 +176,101 @@ public function activity(): void
 
 		Utils::$context['last_ip'] = Profile::$member->ip;
 
-		if (Utils::$context['last_ip'] != Profile::$member->ip2)
+		if (Utils::$context['last_ip'] != Profile::$member->ip2) {
 			Utils::$context['last_ip2'] = Profile::$member->ip2;
+		}
 
 		Utils::$context['member']['name'] = Profile::$member->name;
 
 		// Set the options for the list component.
-		$list_options = array(
+		$list_options = [
 			'id' => 'track_user_list',
 			'title' => Lang::$txt['errors_by'] . ' ' . Utils::$context['member']['name'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['no_errors_from_user'],
 			'base_href' => Config::$scripturl . '?action=profile;area=tracking;sa=user;u=' . Profile::$member->id,
 			'default_sort_col' => 'date',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getUserErrors',
-				'params' => array(
+				'params' => [
 					'le.id_member = {int:current_member}',
-					array('current_member' => Profile::$member->id),
-				),
-			),
-			'get_count' => array(
+					['current_member' => Profile::$member->id],
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getUserErrorCount',
-				'params' => array(
+				'params' => [
 					'id_member = {int:current_member}',
-					array('current_member' => Profile::$member->id),
-				),
-			),
-			'columns' => array(
-				'ip_address' => array(
-					'header' => array(
+					['current_member' => Profile::$member->id],
+				],
+			],
+			'columns' => [
+				'ip_address' => [
+					'header' => [
 						'value' => Lang::$txt['ip_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?action=profile;area=tracking;sa=ip;searchip=%1$s;u=' . Profile::$member->id . '">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'ip' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'le.ip',
 						'reverse' => 'le.ip DESC',
-					),
-				),
-				'message' => array(
-					'header' => array(
+					],
+				],
+				'message' => [
+					'header' => [
 						'value' => Lang::$txt['message'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '%1$s<br><a href="%2$s">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'message' => false,
 								'url' => false,
-							),
-						),
-					),
-				),
-				'date' => array(
-					'header' => array(
+							],
+						],
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'le.id_error DESC',
 						'reverse' => 'le.id_error',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['errors_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the list for viewing.
 		new ItemList($list_options);
 
 		// @todo cache this
 		// If this is a big forum, or a large posting user, let's limit the search.
-		if (Config::$modSettings['totalMessages'] > 50000 && Profile::$member->posts > 500)
-		{
-			$request = Db::$db->query('', '
-				SELECT MAX(id_msg)
+		if (Config::$modSettings['totalMessages'] > 50000 && Profile::$member->posts > 500) {
+			$request = Db::$db->query(
+				'',
+				'SELECT MAX(id_msg)
 				FROM {db_prefix}messages AS m
 				WHERE m.id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => Profile::$member->id,
-				)
+				],
 			);
 			list($max_msg_member) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -266,30 +280,31 @@ public function activity(): void
 		}
 
 		// Default to at least the ones we know about.
-		$ips = array(
+		$ips = [
 			Profile::$member->ip,
 			Profile::$member->ip2,
-		);
+		];
 
 		// @todo cache this
 		// Get all IP addresses this user has used for his messages.
-		Utils::$context['ips'] = array();
+		Utils::$context['ips'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT poster_ip
+		$request = Db::$db->query(
+			'',
+			'SELECT poster_ip
 			FROM {db_prefix}messages
 			WHERE id_member = {int:current_member}
 			' . (isset($min_msg_member) ? '
 				AND id_msg >= {int:min_msg_member} AND id_msg <= {int:max_msg_member}' : '') . '
 			GROUP BY poster_ip',
-			array(
+			[
 				'current_member' => Profile::$member->id,
 				'min_msg_member' => !empty($min_msg_member) ? $min_msg_member : 0,
 				'max_msg_member' => !empty($max_msg_member) ? $max_msg_member : 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['poster_ip'] = new IP($row['poster_ip']);
 
 			Utils::$context['ips'][] = '<a href="' . Config::$scripturl . '?action=profile;area=tracking;sa=ip;searchip=' . $row['poster_ip'] . ';u=' . Profile::$member->id . '">' . $row['poster_ip'] . '</a>';
@@ -299,19 +314,20 @@ public function activity(): void
 		Db::$db->free_result($request);
 
 		// Now also get the IP addresses from the error messages.
-		Utils::$context['error_ips'] = array();
+		Utils::$context['error_ips'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS error_count, ip
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS error_count, ip
 			FROM {db_prefix}log_errors
 			WHERE id_member = {int:current_member}
 			GROUP BY ip',
-			array(
+			[
 				'current_member' => Profile::$member->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['ip'] = new IP($row['ip']);
 
 			Utils::$context['error_ips'][] = '<a href="' . Config::$scripturl . '?action=profile;area=tracking;sa=ip;searchip=' . $row['ip'] . ';u=' . Profile::$member->id . '">' . $row['ip'] . '</a>';
@@ -322,60 +338,61 @@ public function activity(): void
 
 		// Find other users that might use the same IP.
 		$ips = array_unique($ips);
-		Utils::$context['members_in_range'] = array();
+		Utils::$context['members_in_range'] = [];
 
-		if (!empty($ips))
-		{
+		if (!empty($ips)) {
 			// Get member ID's which are in messages...
-			$message_members = array();
-			$request = Db::$db->query('', '
-				SELECT DISTINCT mem.id_member
+			$message_members = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT DISTINCT mem.id_member
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 				WHERE m.poster_ip IN ({array_inet:ip_list})
 					AND mem.id_member != {int:current_member}',
-				array(
+				[
 					'current_member' => Profile::$member->id,
 					'ip_list' => $ips,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$message_members[] = $row['id_member'];
 			}
 			Db::$db->free_result($request);
 
 			// Fetch their names, cause of the GROUP BY doesn't like giving us that normally.
-			if (!empty($message_members))
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member, real_name
+			if (!empty($message_members)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, real_name
 					FROM {db_prefix}members
 					WHERE id_member IN ({array_int:message_members})',
-					array(
+					[
 						'message_members' => $message_members,
 						'ip_list' => $ips,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					Utils::$context['members_in_range'][$row['id_member']] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 				}
 				Db::$db->free_result($request);
 			}
 
-			$request = Db::$db->query('', '
-				SELECT id_member, real_name
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, real_name
 				FROM {db_prefix}members
 				WHERE id_member != {int:current_member}
 					AND member_ip IN ({array_inet:ip_list})',
-				array(
+				[
 					'current_member' => Profile::$member->id,
 					'ip_list' => $ips,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['members_in_range'][$row['id_member']] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 			}
 			Db::$db->free_result($request);
@@ -396,86 +413,87 @@ public function ip(): void
 	public function edits(): void
 	{
 		// Get the names of any custom fields.
-		Utils::$context['custom_field_titles'] = array();
+		Utils::$context['custom_field_titles'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT col_name, field_name, bbc
+		$request = Db::$db->query(
+			'',
+			'SELECT col_name, field_name, bbc
 			FROM {db_prefix}custom_fields',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Utils::$context['custom_field_titles']['customfield_' . $row['col_name']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['custom_field_titles']['customfield_' . $row['col_name']] = [
 				'title' => $row['field_name'],
 				'parse_bbc' => $row['bbc'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Set the options for the error lists.
-		$list_options = array(
+		$list_options = [
 			'id' => 'edit_list',
 			'title' => Lang::$txt['trackEdits'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['trackEdit_no_edits'],
 			'base_href' => Config::$scripturl . '?action=profile;area=tracking;sa=edits;u=' . Profile::$member->id,
 			'default_sort_col' => 'time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getProfileEdits',
-				'params' => array(),
-			),
-			'get_count' => array(
+				'params' => [],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getProfileEditCount',
-				'params' => array(),
-			),
-			'columns' => array(
-				'action' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'action' => [
+					'header' => [
 						'value' => Lang::$txt['trackEdit_action'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'action_text',
-					),
-				),
-				'before' => array(
-					'header' => array(
+					],
+				],
+				'before' => [
+					'header' => [
 						'value' => Lang::$txt['trackEdit_before'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'before',
-					),
-				),
-				'after' => array(
-					'header' => array(
+					],
+				],
+				'after' => [
+					'header' => [
 						'value' => Lang::$txt['trackEdit_after'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'after',
-					),
-				),
-				'time' => array(
-					'header' => array(
+					],
+				],
+				'time' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'id_action DESC',
 						'reverse' => 'id_action',
-					),
-				),
-				'applicator' => array(
-					'header' => array(
+					],
+				],
+				'applicator' => [
+					'header' => [
 						'value' => Lang::$txt['trackEdit_applicator'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'member_link',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the error list.
 		new ItemList($list_options);
@@ -490,61 +508,61 @@ public function edits(): void
 	public function groupRequests(): void
 	{
 		// Set the options for the error lists.
-		$list_options = array(
+		$list_options = [
 			'id' => 'request_list',
 			'title' => sprintf(Lang::$txt['trackGroupRequests_title'], Utils::$context['member']['name']),
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['requested_none'],
 			'base_href' => Config::$scripturl . '?action=profile;area=tracking;sa=groupreq;u=' . Profile::$member->id,
 			'default_sort_col' => 'time_applied',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getGroupRequests',
-				'params' => array(),
-			),
-			'get_count' => array(
+				'params' => [],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getGroupRequestsCount',
-				'params' => array(),
-			),
-			'columns' => array(
-				'group' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'group' => [
+					'header' => [
 						'value' => Lang::$txt['requested_group'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'group_name',
-					),
-				),
-				'group_reason' => array(
-					'header' => array(
+					],
+				],
+				'group_reason' => [
+					'header' => [
 						'value' => Lang::$txt['requested_group_reason'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'group_reason',
-					),
-				),
-				'time_applied' => array(
-					'header' => array(
+					],
+				],
+				'time_applied' => [
+					'header' => [
 						'value' => Lang::$txt['requested_group_time'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time_applied',
 						'timeformat' => true,
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'time_applied DESC',
 						'reverse' => 'time_applied',
-					),
-				),
-				'outcome' => array(
-					'header' => array(
+					],
+				],
+				'outcome' => [
+					'header' => [
 						'value' => Lang::$txt['requested_group_outcome'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'outcome',
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 
 		// Create the error list.
 		new ItemList($list_options);
@@ -561,56 +579,56 @@ public function logins(): void
 		Utils::$context['base_url'] = Config::$scripturl . '?action=profile;area=tracking;sa=ip;u=' . Profile::$member->id;
 
 		// Start with the user messages.
-		$list_options = array(
+		$list_options = [
 			'id' => 'track_logins_list',
 			'title' => Lang::$txt['trackLogins'],
 			'no_items_label' => Lang::$txt['trackLogins_none_found'],
 			'base_href' => Utils::$context['base_url'],
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getLogins',
-				'params' => array(
+				'params' => [
 					'id_member = {int:current_member}',
-					array('current_member' => Profile::$member->id),
-				),
-			),
-			'get_count' => array(
+					['current_member' => Profile::$member->id],
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getLoginCount',
-				'params' => array(
+				'params' => [
 					'id_member = {int:current_member}',
-					array('current_member' => Profile::$member->id),
-				),
-			),
-			'columns' => array(
-				'time' => array(
-					'header' => array(
+					['current_member' => Profile::$member->id],
+				],
+			],
+			'columns' => [
+				'time' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-				),
-				'ip' => array(
-					'header' => array(
+					],
+				],
+				'ip' => [
+					'header' => [
 						'value' => Lang::$txt['ip_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Utils::$context['base_url'] . ';searchip=%1$s">%1$s</a> (<a href="' . Utils::$context['base_url'] . ';searchip=%2$s">%2$s</a>) ',
-							'params' => array(
+							'params' => [
 								'ip' => false,
-								'ip2' => false
-							),
-						),
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+								'ip2' => false,
+							],
+						],
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['trackLogins_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the messages list.
 		new ItemList($list_options);
@@ -630,8 +648,9 @@ public function logins(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -654,13 +673,14 @@ public static function call(): void
 	 * @param array $where_vars An array of parameters for $where
 	 * @return array An array of information about the error messages
 	 */
-	public static function list_getUserErrors($start, $items_per_page, $sort, $where, $where_vars = array()): array
+	public static function list_getUserErrors($start, $items_per_page, $sort, $where, $where_vars = []): array
 	{
 		// Get a list of error messages from this ip (range).
-		$error_messages = array();
+		$error_messages = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				le.log_time, le.ip, le.url, le.message, COALESCE(mem.id_member, 0) AS id_member,
 				COALESCE(mem.real_name, {string:guest_title}) AS display_name, mem.member_name
 			FROM {db_prefix}log_errors AS le
@@ -668,23 +688,23 @@ public static function list_getUserErrors($start, $items_per_page, $sort, $where
 			WHERE ' . $where . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array_merge($where_vars, array(
+			array_merge($where_vars, [
 				'guest_title' => Lang::$txt['guest_title'],
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$error_messages[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$error_messages[] = [
 				'ip' => new IP($row['ip']),
 				'member_link' => $row['id_member'] > 0 ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>' : $row['display_name'],
-				'message' => strtr($row['message'], array('&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '')),
+				'message' => strtr($row['message'], ['&lt;span class=&quot;remove&quot;&gt;' => '', '&lt;/span&gt;' => '']),
 				'url' => $row['url'],
 				'time' => Time::create('@' . $row['log_time'])->format(),
 				'timestamp' => $row['log_time'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -698,13 +718,14 @@ public static function list_getUserErrors($start, $items_per_page, $sort, $where
 	 * @param array $where_vars The parameters for $where
 	 * @return int Number of user errors
 	 */
-	public static function list_getUserErrorCount($where, $where_vars = array()): int
+	public static function list_getUserErrorCount($where, $where_vars = []): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_errors
 			WHERE ' . $where,
-			$where_vars
+			$where_vars,
 		);
 		list($count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -722,56 +743,52 @@ public static function list_getUserErrorCount($where, $where_vars = array()): in
 	 */
 	public static function list_getProfileEdits(int $start, int $items_per_page, string $sort): array
 	{
-		$edits = array();
-		$applicators = array();
+		$edits = [];
+		$applicators = [];
 
 		// Get a list of error messages from this ip (range).
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				id_action, id_member, ip, log_time, action, extra
 			FROM {db_prefix}log_actions
 			WHERE id_log = {int:log_type}
 				AND id_member = {int:owner}
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'log_type' => 2,
 				'owner' => Profile::$member->id,
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$extra = Utils::jsonDecode($row['extra'], true);
 
-			if (!empty($extra['applicator']))
+			if (!empty($extra['applicator'])) {
 				$applicators[] = $extra['applicator'];
+			}
 
 			// Work out what the name of the action is.
-			if (isset(Lang::$txt['trackEdit_action_' . $row['action']]))
-			{
+			if (isset(Lang::$txt['trackEdit_action_' . $row['action']])) {
 				$action_text = Lang::$txt['trackEdit_action_' . $row['action']];
-			}
-			elseif (isset(Lang::$txt[$row['action']]))
-			{
+			} elseif (isset(Lang::$txt[$row['action']])) {
 				$action_text = Lang::$txt[$row['action']];
 			}
 			// Custom field?
-			elseif (isset(Utils::$context['custom_field_titles'][$row['action']]))
-			{
+			elseif (isset(Utils::$context['custom_field_titles'][$row['action']])) {
 				$action_text = Utils::$context['custom_field_titles'][$row['action']]['title'];
-			}
-			else
-			{
+			} else {
 				$action_text = $row['action'];
 			}
 
 			// Parse BBC?
 			$parse_bbc = isset(Utils::$context['custom_field_titles'][$row['action']]) && Utils::$context['custom_field_titles'][$row['action']]['parse_bbc'] ? true : false;
 
-			$edits[] = array(
+			$edits[] = [
 				'id' => $row['id_action'],
 				'ip' => new IP($row['ip']),
 				'id_member' => !empty($extra['applicator']) ? $extra['applicator'] : 0,
@@ -781,34 +798,32 @@ public static function list_getProfileEdits(int $start, int $items_per_page, str
 				'before' => !empty($extra['previous']) ? ($parse_bbc ? BBCodeParser::load()->parse($extra['previous']) : $extra['previous']) : '',
 				'after' => !empty($extra['new']) ? ($parse_bbc ? BBCodeParser::load()->parse($extra['new']) : $extra['new']) : '',
 				'time' => Time::create('@' . $row['log_time'])->format(),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Get any member names.
-		if (!empty($applicators))
-		{
-			$members = array();
+		if (!empty($applicators)) {
+			$members = [];
 
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					id_member, real_name
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:applicators})',
-				array(
+				[
 					'applicators' => $applicators,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$members[$row['id_member']] = $row['real_name'];
 			}
 			Db::$db->free_result($request);
 
-			foreach ($edits as $key => $value)
-			{
-				if (isset($members[$value['id_member']]))
-				{
+			foreach ($edits as $key => $value) {
+				if (isset($members[$value['id_member']])) {
 					$edits[$key]['member_link'] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $value['id_member'] . '">' . $members[$value['id_member']] . '</a>';
 				}
 			}
@@ -824,15 +839,16 @@ public static function list_getProfileEdits(int $start, int $items_per_page, str
 	 */
 	public static function list_getProfileEditCount(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS edit_count
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS edit_count
 			FROM {db_prefix}log_actions
 			WHERE id_log = {int:log_type}
 				AND id_member = {int:owner}',
-			array(
+			[
 				'log_type' => 2,
 				'owner' => Profile::$member->id,
-			)
+			],
 		);
 		list($edit_count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -850,10 +866,11 @@ public static function list_getProfileEditCount(): int
 	 */
 	public static function list_getGroupRequests(int $start, int $items_per_page, string $sort): array
 	{
-		$groupreq = array();
+		$groupreq = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				lgr.id_group, mg.group_name, mg.online_color, lgr.time_applied, lgr.reason, lgr.status,
 				ma.id_member AS id_member_acted, COALESCE(ma.member_name, lgr.member_name_acted) AS act_name, lgr.time_acted, lgr.act_reason
 			FROM {db_prefix}log_group_requests AS lgr
@@ -863,29 +880,31 @@ public static function list_getGroupRequests(int $start, int $items_per_page, st
 				AND ' . (User::$me->mod_cache['gq'] == '1=1' ? User::$me->mod_cache['gq'] : 'lgr.' . User::$me->mod_cache['gq']) . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'memID' => Profile::$member->id,
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$this_req = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$this_req = [
 				'group_name' => empty($row['online_color']) ? $row['group_name'] : '<span style="color:' . $row['online_color'] . '">' . $row['group_name'] . '</span>',
 				'group_reason' => $row['reason'],
 				'time_applied' => $row['time_applied'],
-			);
-			switch ($row['status'])
-			{
+			];
+
+			switch ($row['status']) {
 				case 0:
 					$this_req['outcome'] = Lang::$txt['outcome_pending'];
 					break;
+
 				case 1:
 					$member_link = empty($row['id_member_acted']) ? $row['act_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_acted'] . '">' . $row['act_name'] . '</a>';
 					$this_req['outcome'] = sprintf(Lang::$txt['outcome_approved'], $member_link, Time::create('@' . $row['time_acted'])->format());
 					break;
+
 				case 2:
 					$member_link = empty($row['id_member_acted']) ? $row['act_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_acted'] . '">' . $row['act_name'] . '</a>';
 					$this_req['outcome'] = sprintf(!empty($row['act_reason']) ? Lang::$txt['outcome_refused_reason'] : Lang::$txt['outcome_refused'], $member_link, Time::create('@' . $row['time_acted'])->format(), $row['act_reason']);
@@ -906,14 +925,15 @@ public static function list_getGroupRequests(int $start, int $items_per_page, st
 	 */
 	public static function list_getGroupRequestsCount(): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS req_count
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS req_count
 			FROM {db_prefix}log_group_requests AS lgr
 			WHERE id_member = {int:memID}
 				AND ' . (User::$me->mod_cache['gq'] == '1=1' ? User::$me->mod_cache['gq'] : 'lgr.' . User::$me->mod_cache['gq']),
-			array(
+			[
 				'memID' => Profile::$member->id,
-			)
+			],
 		);
 		list($report_count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -931,24 +951,27 @@ public static function list_getGroupRequestsCount(): int
 	 * @param array $where_vars An array of parameters for $where. Only 'current_member' (the ID of the member) is used here
 	 * @return array An array of information about user logins
 	 */
-	public static function list_getLogins(int $start, int $items_per_page, string $sort, string $where, array $where_vars = array()): array
+	public static function list_getLogins(int $start, int $items_per_page, string $sort, string $where, array $where_vars = []): array
 	{
-		$request = Db::$db->query('', '
-			SELECT time, ip, ip2
+		$request = Db::$db->query(
+			'',
+			'SELECT time, ip, ip2
 			FROM {db_prefix}member_logins
 			WHERE id_member = {int:id_member}
 			ORDER BY time DESC',
-			array(
+			[
 				'id_member' => $where_vars['current_member'],
-			)
+			],
 		);
-		$logins = array();
-		while ($row = Db::$db->fetch_assoc($request))
-			$logins[] = array(
+		$logins = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$logins[] = [
 				'time' => Time::create('@' . $row['time'])->format(),
 				'ip' => new IP($row['ip']),
 				'ip2' => new IP($row['ip2']),
-			);
+			];
+		}
 		Db::$db->free_result($request);
 
 		return $logins;
@@ -961,15 +984,16 @@ public static function list_getLogins(int $start, int $items_per_page, string $s
 	 * @param array $where_vars An array of parameters for $where
 	 * @return int count of messages matching the IP
 	 */
-	public static function list_getLoginCount(string $where, array $where_vars = array()): int
+	public static function list_getLoginCount(string $where, array $where_vars = []): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*) AS message_count
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*) AS message_count
 			FROM {db_prefix}member_logins
 			WHERE id_member = {int:id_member}',
-			array(
+			[
 				'id_member' => $where_vars['current_member'],
-			)
+			],
 		);
 		list($count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -1058,39 +1082,40 @@ public static function trackLogins(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
 		// Moderation must be on to track edits.
-		if (empty(Config::$modSettings['userlog_enabled']))
+		if (empty(Config::$modSettings['userlog_enabled'])) {
 			unset(self::$subactions['edits']);
+		}
 
 		// Group requests must be active to show it...
-		if (empty(Config::$modSettings['show_group_membership']))
+		if (empty(Config::$modSettings['show_group_membership'])) {
 			unset(self::$subactions['groupreq']);
+		}
 
 		// Only show the sub-actions they are allowed to see.
-		foreach (self::$subactions as $sa => $action)
-		{
-			if (!User::$me->allowedTo($action[2]))
+		foreach (self::$subactions as $sa => $action) {
+			if (!User::$me->allowedTo($action[2])) {
 				unset(self::$subactions[$sa]);
+			}
 		}
 
 		// Now that we've filtered out all the sub-actions they cannot do,
 		// let them choose from whatever is left.
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
-		{
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
-		}
-		elseif (!empty(self::$subactions))
-		{
+		} elseif (!empty(self::$subactions)) {
 			$this->subaction = array_key_first(self::$subactions);
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Tracking::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Tracking::exportStatic')) {
 	Tracking::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/ViewWarning.php b/Sources/Actions/Profile/ViewWarning.php
index 8997d047f3..cc095ab499 100644
--- a/Sources/Actions/Profile/ViewWarning.php
+++ b/Sources/Actions/Profile/ViewWarning.php
@@ -13,9 +13,8 @@
 
 namespace SMF\Actions\Profile;
 
-use SMF\BackwardCompatibility;
 use SMF\Actions\ActionInterface;
-
+use SMF\BackwardCompatibility;
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\ItemList;
@@ -36,12 +35,11 @@ class ViewWarning implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'viewWarning' => 'viewWarning',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -70,90 +68,89 @@ public function execute(): void
 			&& !User::$me->allowedTo('view_warning_any')
 			&& !User::$me->allowedTo('issue_warning')
 			&& !User::$me->allowedTo('moderate_forum')
-		)
-		{
+		) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
 		// Let's use a generic list to get all the current warnings, and use the issue warnings grab-a-granny thing.
-		$list_options = array(
+		$list_options = [
 			'id' => 'view_warnings',
 			'title' => Lang::$txt['profile_viewwarning_previous_warnings'],
 			'items_per_page' => Config::$modSettings['defaultMaxListItems'],
 			'no_items_label' => Lang::$txt['profile_viewwarning_no_warnings'],
 			'base_href' => Config::$scripturl . '?action=profile;area=viewwarning;sa=user;u=' . Profile::$member->id,
 			'default_sort_col' => 'log_time',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __NAMESPACE__ . '\\IssueWarning::list_getUserWarnings',
-				'params' => array(),
-			),
-			'get_count' => array(
+				'params' => [],
+			],
+			'get_count' => [
 				'function' => __NAMESPACE__ . '\\IssueWarning::list_getUserWarningCount',
-				'params' => array(),
-			),
-			'columns' => array(
-				'log_time' => array(
-					'header' => array(
+				'params' => [],
+			],
+			'columns' => [
+				'log_time' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_time'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.log_time DESC',
 						'reverse' => 'lc.log_time',
-					),
-				),
-				'reason' => array(
-					'header' => array(
+					],
+				],
+				'reason' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_reason'],
 						'style' => 'width: 50%;',
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'reason',
-					),
-				),
-				'level' => array(
-					'header' => array(
+					],
+				],
+				'level' => [
+					'header' => [
 						'value' => Lang::$txt['profile_warning_previous_level'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'counter',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'lc.counter DESC',
 						'reverse' => 'lc.counter',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['profile_viewwarning_desc'],
 					'class' => 'smalltext',
 					'style' => 'padding: 2ex;',
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the list for viewing.
 		new ItemList($list_options);
 
 		// Create some common text bits for the template.
-		Utils::$context['level_effects'] = array(
+		Utils::$context['level_effects'] = [
 			0 => '',
 			Config::$modSettings['warning_watch'] => Lang::$txt['profile_warning_effect_own_watched'],
 			Config::$modSettings['warning_moderate'] => Lang::$txt['profile_warning_effect_own_moderated'],
 			Config::$modSettings['warning_mute'] => Lang::$txt['profile_warning_effect_own_muted'],
-		);
+		];
 
 		// Figure out which warning level this member is at.
 		Utils::$context['current_level'] = 0;
 
-		foreach (Utils::$context['level_effects'] as $limit => $dummy)
-		{
-			if (Utils::$context['member']['warning'] >= $limit)
+		foreach (Utils::$context['level_effects'] as $limit => $dummy) {
+			if (Utils::$context['member']['warning'] >= $limit) {
 				Utils::$context['current_level'] = $limit;
+			}
 		}
 	}
 
@@ -168,8 +165,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -206,8 +204,9 @@ public static function viewWarning(int $memID): void
 	 */
 	protected function __construct()
 	{
-		if (!isset(Profile::$member))
+		if (!isset(Profile::$member)) {
 			Profile::load();
+		}
 
 		// Make sure things which are disabled stay disabled.
 		Config::$modSettings['warning_watch'] = !empty(Config::$modSettings['warning_watch']) ? Config::$modSettings['warning_watch'] : 110;
@@ -219,7 +218,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ViewWarning::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ViewWarning::exportStatic')) {
 	ViewWarning::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Profile/index.php b/Sources/Actions/Profile/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Sources/Actions/Profile/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Sources/Actions/QuickModeration.php b/Sources/Actions/QuickModeration.php
index c20beae2a6..02dd47e69a 100644
--- a/Sources/Actions/QuickModeration.php
+++ b/Sources/Actions/QuickModeration.php
@@ -14,18 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Logging;
 use SMF\Mail;
-use SMF\Msg;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles moderation from the message index.
@@ -39,13 +36,11 @@ class QuickModeration implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'QuickModeration',
-			'getActions' => false,
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -65,7 +60,7 @@ class QuickModeration implements ActionInterface
 	 * Note: it is better to access this via self::getActions() in case any mods
 	 * have something to add to the list.
 	 */
-	public static array $known_actions = array(
+	public static array $known_actions = [
 		'approve',
 		'remove',
 		'lock',
@@ -74,43 +69,43 @@ class QuickModeration implements ActionInterface
 		'merge',
 		'restore',
 		'markread',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Permissions need to carry out different actions.
 	 */
-	public static array $action_permissions = array(
-		'markread' => array(
+	public static array $action_permissions = [
+		'markread' => [
 			'any' => 'is_not_guest',
-		),
-		'sticky' => array(
+		],
+		'sticky' => [
 			'any' => 'make_sticky',
-		),
-		'lock' => array(
+		],
+		'lock' => [
 			'any' => 'lock_any',
 			'own' => 'lock_own',
-		),
-		'approve' => array(
+		],
+		'approve' => [
 			'any' => 'approve_posts',
-		),
-		'remove' => array(
+		],
+		'remove' => [
 			'any' => 'remove_any',
 			'own' => 'remove_own',
-		),
-		'move' => array(
+		],
+		'move' => [
 			'any' => 'move_any',
 			'own' => 'move_own',
-		),
-		'merge' => array(
+		],
+		'merge' => [
 			'any' => 'merge_any',
-		),
-		'restore' => array(
+		],
+		'restore' => [
 			'any' => 'move_any',
 			'where' => 'recycle_board',
-		),
-	);
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -121,14 +116,14 @@ class QuickModeration implements ActionInterface
 	 *
 	 * Actions that this user is allowed perform on topics.
 	 */
-	protected array $possible_actions = array();
+	protected array $possible_actions = [];
 
 	/**
 	 * @var array
 	 *
 	 * Boards where this user can do different actions.
 	 */
-	protected array $boards_can = array();
+	protected array $boards_can = [];
 
 	/**
 	 * @var string
@@ -157,19 +152,19 @@ class QuickModeration implements ActionInterface
 	 * sub-array contains info about the board that each topic should be
 	 * moved to.
 	 */
-	protected array $topic_actions = array(
-		'markread' => array(),
-		'sticky' => array(),
-		'lock' => array(),
-		'approve' => array(),
-		'remove' => array(),
-		'move' => array(
-			'topics' => array(),
-			'to' => array(),
-		),
-		'merge' => array(),
-		'restore' => array(),
-	);
+	protected array $topic_actions = [
+		'markread' => [],
+		'sticky' => [],
+		'lock' => [],
+		'approve' => [],
+		'remove' => [],
+		'move' => [
+			'topics' => [],
+			'to' => [],
+		],
+		'merge' => [],
+		'restore' => [],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -196,8 +191,9 @@ public function execute(): void
 		User::$me->checkSession('request');
 
 		// This won't be valid anymore.
-		if (isset($_SESSION['topicseen_cache']))
-			$_SESSION['topicseen_cache'] = array();
+		if (isset($_SESSION['topicseen_cache'])) {
+			$_SESSION['topicseen_cache'] = [];
+		}
 
 		// Which actions can this user perform?
 		$this->setPossibleActions();
@@ -218,12 +214,13 @@ public function execute(): void
 		// Update stats and such.
 		Logging::updateStats('topic');
 		Logging::updateStats('message');
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 
-		if ($this->should_redirect)
+		if ($this->should_redirect) {
 			Utils::redirectexit($this->redirect_url);
+		}
 	}
 
 	/***********************
@@ -237,8 +234,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -265,16 +263,13 @@ public static function getActions(bool $search = false): array
 	{
 		Utils::$context['qmod_actions'] = &self::$known_actions;
 
-		if ($search)
-		{
+		if ($search) {
 			// Approve isn't applicable when viewing search results.
-			self::$known_actions = array_diff(self::$known_actions, array('approve'));
+			self::$known_actions = array_diff(self::$known_actions, ['approve']);
 
-			IntegrationHook::call('integrate_quick_mod_actions_search', array(self::$known_actions));
-		}
-		else
-		{
-			IntegrationHook::call('integrate_quick_mod_actions', array(self::$known_actions));
+			IntegrationHook::call('integrate_quick_mod_actions_search', [self::$known_actions]);
+		} else {
+			IntegrationHook::call('integrate_quick_mod_actions', [self::$known_actions]);
 		}
 
 		return self::$known_actions;
@@ -296,8 +291,9 @@ protected function __construct()
 		$this->topic_actions = array_intersect_key($this->topic_actions, array_flip(self::$known_actions));
 
 		// Add any custom actions to topic_actions.
-		foreach (self::$known_actions as $action)
-			$this->topic_actions[$action] = array();
+		foreach (self::$known_actions as $action) {
+			$this->topic_actions[$action] = [];
+		}
 
 		$this->setRequestActions();
 	}
@@ -322,20 +318,22 @@ protected function __construct()
 	 */
 	protected function setRequestActions(): void
 	{
-		if (!empty($_REQUEST['topics']))
-		{
+		if (!empty($_REQUEST['topics'])) {
 			// If the action isn't valid, just quit now.
-			if (empty($_REQUEST['qaction']) || !isset($this->topic_actions[$_REQUEST['qaction']]))
+			if (empty($_REQUEST['qaction']) || !isset($this->topic_actions[$_REQUEST['qaction']])) {
 				Utils::redirectexit($this->redirect_url);
+			}
 
 			// Just convert to the other method, to make it easier.
-			foreach ($_REQUEST['topics'] as $topic)
+			foreach ($_REQUEST['topics'] as $topic) {
 				$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
+			}
 		}
 
 		// Weird... how'd you get here?
-		if (empty($_REQUEST['actions']))
+		if (empty($_REQUEST['actions'])) {
 			Utils::redirectexit($this->redirect_url);
+		}
 	}
 
 	/**
@@ -347,69 +345,61 @@ protected function setRequestActions(): void
 	protected function setPossibleActions(): void
 	{
 		// Which permissions do we need to check?
-		$permissions_to_check = array();
-		foreach (self::$action_permissions as $action => $permissions)
-		{
+		$permissions_to_check = [];
+
+		foreach (self::$action_permissions as $action => $permissions) {
 			// Skip permissions for actions that weren't requested.
 			// Exception: always check the approval permission.
-			if (!in_array($action, $_REQUEST['actions']) && $action !== 'approve')
+			if (!in_array($action, $_REQUEST['actions']) && $action !== 'approve') {
 				continue;
+			}
 
 			// If the permission specifies a particular board, only proceed
 			// if we are in that board.
-			if (!empty($permissions['where']))
-			{
+			if (!empty($permissions['where'])) {
 				// The 'where' can be a $modSettings key or a raw board ID.
-				if (!is_numeric($permissions['where']))
+				if (!is_numeric($permissions['where'])) {
 					$permissions['where'] = Config::$modSettings[$permissions['where']] ?? null;
+				}
 
 				// Can't do it if not in the required board.
-				if (!empty($permissions['where']) && !empty(Board::$info->id) && Board::$info->id != $permissions['where'])
+				if (!empty($permissions['where']) && !empty(Board::$info->id) && Board::$info->id != $permissions['where']) {
 					continue;
+				}
 			}
 
 			$permissions_to_check = array_unique(array_merge($permissions_to_check, array_values($permissions)));
 		}
 
-		if (!empty(Board::$info->id))
-		{
-			foreach ($permissions_to_check as $permission)
-			{
-				$this->boards_can[$permission] = User::$me->allowedTo($permission) ? array(Board::$info->id) : array();
+		if (!empty(Board::$info->id)) {
+			foreach ($permissions_to_check as $permission) {
+				$this->boards_can[$permission] = User::$me->allowedTo($permission) ? [Board::$info->id] : [];
 			}
 
 			$this->redirect_url = 'board=' . Board::$info->id . '.' . $_REQUEST['start'];
-		}
-		else
-		{
+		} else {
 			$this->boards_can = User::$me->boardsAllowedTo($permissions_to_check, true, false);
 
-			$this->redirect_url = isset($_POST['redirect_url']) ? $_POST['redirect_url'] : (isset($_SESSION['old_url']) ? $_SESSION['old_url'] : '');
+			$this->redirect_url = $_POST['redirect_url'] ?? ($_SESSION['old_url'] ?? '');
 		}
 
 		// Are we enforcing the "no moving topics to boards where you can't post new ones" rule?
-		if (!User::$me->is_admin && !Config::$modSettings['topic_move_any'])
-		{
+		if (!User::$me->is_admin && !Config::$modSettings['topic_move_any']) {
 			// Don't count this board, if it's specified
-			if (!empty(Board::$info->id))
-			{
-				$this->boards_can['post_new'] = array_diff(User::$me->boardsAllowedTo('post_new'), array(Board::$info->id));
-			}
-			else
-			{
+			if (!empty(Board::$info->id)) {
+				$this->boards_can['post_new'] = array_diff(User::$me->boardsAllowedTo('post_new'), [Board::$info->id]);
+			} else {
 				$this->boards_can['post_new'] = User::$me->boardsAllowedTo('post_new');
 			}
 
-			if (empty($this->boards_can['post_new']))
-				$this->boards_can['move_any'] = $this->boards_can['move_own'] = array();
+			if (empty($this->boards_can['post_new'])) {
+				$this->boards_can['move_any'] = $this->boards_can['move_own'] = [];
+			}
 		}
 
-		foreach (self::$action_permissions as $action => $permissions)
-		{
-			foreach (array('any', 'own') as $scope)
-			{
-				if (isset($permissions[$scope]) && !empty($this->boards_can[$permissions[$scope]]))
-				{
+		foreach (self::$action_permissions as $action => $permissions) {
+			foreach (['any', 'own'] as $scope) {
+				if (isset($permissions[$scope]) && !empty($this->boards_can[$permissions[$scope]])) {
 					$this->possible_actions[] = $action;
 					break;
 				}
@@ -423,102 +413,106 @@ protected function setPossibleActions(): void
 	protected function setTopicActions(): void
 	{
 		// Validate each action.
-		$temp = array();
-		foreach ($_REQUEST['actions'] as $topic => $action)
-		{
-			if (in_array($action, $this->possible_actions))
+		$temp = [];
+
+		foreach ($_REQUEST['actions'] as $topic => $action) {
+			if (in_array($action, $this->possible_actions)) {
 				$temp[(int) $topic] = $action;
+			}
 		}
 		$_REQUEST['actions'] = $temp;
 
-		if (!empty($_REQUEST['actions']))
-		{
+		if (!empty($_REQUEST['actions'])) {
 			// Find all topics...
-			$request = Db::$db->query('', '
-				SELECT id_topic, id_member_started, id_board, locked, approved, unapproved_posts
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, id_member_started, id_board, locked, approved, unapproved_posts
 				FROM {db_prefix}topics
 				WHERE id_topic IN ({array_int:action_topic_ids})
 				LIMIT {int:limit}',
-				array(
+				[
 					'action_topic_ids' => array_keys($_REQUEST['actions']),
 					'limit' => count($_REQUEST['actions']),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Can't act on topics that aren't in this board.
-				if (!empty(Board::$info->id) && $row['id_board'] != Board::$info->id)
-				{
+				if (!empty(Board::$info->id) && $row['id_board'] != Board::$info->id) {
 					unset($_REQUEST['actions'][$row['id_topic']]);
+
 					continue;
 				}
 
 				// Can't act on topics that they can't see...
-				if (Config::$modSettings['postmod_active'] && !$row['approved'] && array_intersect(array(0, $row['id_board']), $this->boards_can['approve_posts']) === array())
-				{
+				if (Config::$modSettings['postmod_active'] && !$row['approved'] && array_intersect([0, $row['id_board']], $this->boards_can['approve_posts']) === []) {
 					unset($_REQUEST['actions'][$row['id_topic']]);
+
 					continue;
 				}
 
-				foreach (self::$action_permissions as $action => $permissions)
-				{
-					if ($action !== $_REQUEST['actions'][$row['id_topic']])
+				foreach (self::$action_permissions as $action => $permissions) {
+					if ($action !== $_REQUEST['actions'][$row['id_topic']]) {
 						continue;
+					}
 
-					$boards_can_any = isset($permissions['any']) ? array_intersect(array(0, $row['id_board']), $this->boards_can[$permissions['any']]) : array();
+					$boards_can_any = isset($permissions['any']) ? array_intersect([0, $row['id_board']], $this->boards_can[$permissions['any']]) : [];
 
-					$boards_can_own = isset($permissions['own']) ? array_intersect(array(0, $row['id_board']), $this->boards_can[$permissions['own']]) : array();
+					$boards_can_own = isset($permissions['own']) ? array_intersect([0, $row['id_board']], $this->boards_can[$permissions['own']]) : [];
 
 					$own_topic = $row['id_member_started'] == User::$me->id;
 
 					// If locked by a moderator, non-moderators cannot unlock.
 					$mod_locked = $action === 'lock' && $row['locked'] == 1;
 
-					if (empty($boards_can_any) && (!$own_topic || empty($boards_can_own) || $mod_locked))
+					if (empty($boards_can_any) && (!$own_topic || empty($boards_can_own) || $mod_locked)) {
 						unset($_REQUEST['actions'][$row['id_topic']]);
+					}
 
 					// Don't bother approving if there are no unapproved posts.
-					if ($action === 'approve' && empty($row['unapproved_posts']))
+					if ($action === 'approve' && empty($row['unapproved_posts'])) {
 						unset($_REQUEST['actions'][$row['id_topic']]);
+					}
 				}
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Separate the actions.
-		foreach ($_REQUEST['actions'] as $topic => $action)
-		{
+		foreach ($_REQUEST['actions'] as $topic => $action) {
 			$topic = (int) $topic;
 
-			switch ($action)
-			{
+			switch ($action) {
 				case 'move':
 					TopicMove2::moveTopicConcurrence();
 
 					// If action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.
-					$this->topic_actions['move']['to'][$topic] = (int) (isset($_REQUEST['move_tos'][$topic]) ? $_REQUEST['move_tos'][$topic] : $_REQUEST['move_to']);
+					$this->topic_actions['move']['to'][$topic] = (int) ($_REQUEST['move_tos'][$topic] ?? $_REQUEST['move_to']);
 
-					if (empty($this->topic_actions['move']['to'][$topic]))
+					if (empty($this->topic_actions['move']['to'][$topic])) {
 						break;
+					}
 
 					// Never move topics to redirect boards
-					$redirect_boards = array();
-					$request = Db::$db->query('', '
-						SELECT id_board
+					$redirect_boards = [];
+					$request = Db::$db->query(
+						'',
+						'SELECT id_board
 						FROM {db_prefix}boards
 						WHERE redirect != {string:blank_redirect}',
-						array(
+						[
 							'blank_redirect' => '',
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_row($request))
-					{
+
+					while ($row = Db::$db->fetch_row($request)) {
 						$redirect_boards[] = $row[0];
 					}
 					Db::$db->free_result($request);
 
-					if (in_array($this->topic_actions['move']['to'][$topic], $redirect_boards))
+					if (in_array($this->topic_actions['move']['to'][$topic], $redirect_boards)) {
 						break;
+					}
 
 					$this->topic_actions['move']['topics'][] = $topic;
 					break;
@@ -535,38 +529,41 @@ protected function setTopicActions(): void
 	 */
 	protected function doMarkRead(): void
 	{
-		if (empty($this->topic_actions['markread']))
+		if (empty($this->topic_actions['markread'])) {
 			return;
+		}
 
-		$logged_topics = array();
+		$logged_topics = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_topic, unwatched
+		$request = Db::$db->query(
+			'',
+			'SELECT id_topic, unwatched
 			FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:selected_topics})
 				AND id_member = {int:current_user}',
-			array(
+			[
 				'selected_topics' => $this->topic_actions['markread'],
 				'current_user' => User::$me->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$logged_topics[$row['id_topic']] = $row['unwatched'];
 		}
 		Db::$db->free_result($request);
 
-		$markreadArray = array();
-		foreach ($this->topic_actions['markread'] as $topic)
-		{
-			$markreadArray[] = array(Config::$modSettings['maxMsgID'], User::$me->id, $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
+		$markreadArray = [];
+
+		foreach ($this->topic_actions['markread'] as $topic) {
+			$markreadArray[] = [Config::$modSettings['maxMsgID'], User::$me->id, $topic, ($logged_topics[$topic] ?? 0)];
 		}
 
-		Db::$db->insert('replace',
+		Db::$db->insert(
+			'replace',
 			'{db_prefix}log_topics',
-			array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'),
+			['id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'],
 			$markreadArray,
-			array('id_member', 'id_topic')
+			['id_member', 'id_topic'],
 		);
 	}
 
@@ -575,43 +572,45 @@ protected function doMarkRead(): void
 	 */
 	protected function doSticky(): void
 	{
-		if (empty($this->topic_actions['sticky']))
+		if (empty($this->topic_actions['sticky'])) {
 			return;
+		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET is_sticky = CASE WHEN is_sticky = {int:is_sticky} THEN 0 ELSE 1 END
 			WHERE id_topic IN ({array_int:sticky_topic_ids})',
-			array(
+			[
 				'sticky_topic_ids' => $this->topic_actions['sticky'],
 				'is_sticky' => 1,
-			)
+			],
 		);
 
 		// Get the board IDs and Sticky status
-		$sticky_cache_boards = array();
-		$sticky_cache_status = array();
+		$sticky_cache_boards = [];
+		$sticky_cache_status = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_topic, id_board, is_sticky
+		$request = Db::$db->query(
+			'',
+			'SELECT id_topic, id_board, is_sticky
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:sticky_topic_ids})
 			LIMIT {int:limit}',
-			array(
+			[
 				'sticky_topic_ids' => $this->topic_actions['sticky'],
 				'limit' => count($this->topic_actions['sticky']),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$sticky_cache_boards[$row['id_topic']] = $row['id_board'];
 			$sticky_cache_status[$row['id_topic']] = empty($row['is_sticky']);
 		}
 		Db::$db->free_result($request);
 
-		foreach ($this->topic_actions['sticky'] as $topic)
-		{
-			Logging::logAction($sticky_cache_status[$topic] ? 'unsticky' : 'sticky', array('topic' => $topic, 'board' => $sticky_cache_boards[$topic]));
+		foreach ($this->topic_actions['sticky'] as $topic) {
+			Logging::logAction($sticky_cache_status[$topic] ? 'unsticky' : 'sticky', ['topic' => $topic, 'board' => $sticky_cache_boards[$topic]]);
 
 			Mail::sendNotifications($topic, 'sticky');
 		}
@@ -622,33 +621,34 @@ protected function doSticky(): void
 	 */
 	protected function doLock(): void
 	{
-		if (empty($this->topic_actions['lock']))
+		if (empty($this->topic_actions['lock'])) {
 			return;
+		}
 
-		$lock_status = array();
+		$lock_status = [];
 
 		// Gotta make sure they CAN lock/unlock these topics...
-		if (!empty(Board::$info->id) && !User::$me->allowedTo('lock_any'))
-		{
+		if (!empty(Board::$info->id) && !User::$me->allowedTo('lock_any')) {
 			// Make sure they started the topic AND it isn't already locked by someone with higher priv's.
-			$locked_topic_ids = array();
-			$lock_cache_boards = array();
+			$locked_topic_ids = [];
+			$lock_cache_boards = [];
 
-			$result = Db::$db->query('', '
-				SELECT id_topic, locked, id_board
+			$result = Db::$db->query(
+				'',
+				'SELECT id_topic, locked, id_board
 				FROM {db_prefix}topics
 				WHERE id_topic IN ({array_int:locked_topic_ids})
 					AND id_member_started = {int:current_member}
 					AND locked IN (2, 0)
 				LIMIT {int:limit}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'locked_topic_ids' => $this->topic_actions['lock'],
 					'limit' => count($locked_topic_ids),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$locked_topic_ids[] = $row['id_topic'];
 				$lock_cache_boards[$row['id_topic']] = $row['id_board'];
 				$lock_status[$row['id_topic']] = empty($row['locked']);
@@ -656,23 +656,22 @@ protected function doLock(): void
 			Db::$db->free_result($result);
 
 			$this->topic_actions['lock'] = $locked_topic_ids;
-		}
-		else
-		{
-			$lock_cache_boards = array();
+		} else {
+			$lock_cache_boards = [];
 
-			$result = Db::$db->query('', '
-				SELECT id_topic, locked, id_board
+			$result = Db::$db->query(
+				'',
+				'SELECT id_topic, locked, id_board
 				FROM {db_prefix}topics
 				WHERE id_topic IN ({array_int:locked_topic_ids})
 				LIMIT {int:limit}',
-				array(
+				[
 					'locked_topic_ids' => $this->topic_actions['lock'],
-					'limit' => count($this->topic_actions['lock'])
-				)
+					'limit' => count($this->topic_actions['lock']),
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$lock_status[$row['id_topic']] = empty($row['locked']);
 				$lock_cache_boards[$row['id_topic']] = $row['id_board'];
 			}
@@ -680,23 +679,22 @@ protected function doLock(): void
 		}
 
 		// It could just be that *none* were their own topics...
-		if (!empty($this->topic_actions['lock']))
-		{
+		if (!empty($this->topic_actions['lock'])) {
 			// Alternate the locked value.
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET locked = CASE WHEN locked = {int:is_locked} THEN ' . (User::$me->allowedTo('lock_any') ? '1' : '2') . ' ELSE 0 END
 				WHERE id_topic IN ({array_int:locked_topic_ids})',
-				array(
+				[
 					'locked_topic_ids' => $this->topic_actions['lock'],
 					'is_locked' => 0,
-				)
+				],
 			);
 		}
 
-		foreach ($this->topic_actions['lock'] as $topic)
-		{
-			Logging::logAction($lock_status[$topic] ? 'lock' : 'unlock', array('topic' => $topic, 'board' => $lock_cache_boards[$topic]));
+		foreach ($this->topic_actions['lock'] as $topic) {
+			Logging::logAction($lock_status[$topic] ? 'lock' : 'unlock', ['topic' => $topic, 'board' => $lock_cache_boards[$topic]]);
 
 			Mail::sendNotifications($topic, $lock_status[$topic] ? 'lock' : 'unlock');
 		}
@@ -711,79 +709,82 @@ protected function doLock(): void
 	protected function doMove(): void
 	{
 		// Remember the last board they moved things to.
-		if (isset($_REQUEST['move_to']))
+		if (isset($_REQUEST['move_to'])) {
 			$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
+		}
 
-		if (empty($this->topic_actions['move']['topics']))
+		if (empty($this->topic_actions['move']['topics'])) {
 			return;
+		}
 
 		// I know - I just KNOW you're trying to beat the system.  Too bad for you... we CHECK :P.
-		$moveTos = array();
-		$moveCache2 = array();
-		$countPosts = array();
+		$moveTos = [];
+		$moveCache2 = [];
+		$countPosts = [];
 
-		$request = Db::$db->query('', '
-			SELECT t.id_topic, t.id_board, b.count_posts
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_topic, t.id_board, b.count_posts
 			FROM {db_prefix}topics AS t
 				LEFT JOIN {db_prefix}boards AS b ON (t.id_board = b.id_board)
 			WHERE t.id_topic IN ({array_int:move_topic_ids})' . (!empty(Board::$info->id) && !User::$me->allowedTo('move_any') ? '
 				AND t.id_member_started = {int:current_member}' : '') . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'move_topic_ids' => $this->topic_actions['move']['topics'],
-				'limit' => count($this->topic_actions['move']['topics'])
-			)
+				'limit' => count($this->topic_actions['move']['topics']),
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$to = $this->topic_actions['move']['to'][$row['id_topic']];
 
-			if (empty($to))
+			if (empty($to)) {
 				continue;
+			}
 
 			// Does this topic's board count the posts or not?
 			$countPosts[$row['id_topic']] = empty($row['count_posts']);
 
-			if (!isset($moveTos[$to]))
-				$moveTos[$to] = array();
+			if (!isset($moveTos[$to])) {
+				$moveTos[$to] = [];
+			}
 
 			$moveTos[$to][] = $row['id_topic'];
 
 			// For reporting...
-			$moveCache2[] = array($row['id_topic'], $row['id_board'], $to);
+			$moveCache2[] = [$row['id_topic'], $row['id_board'], $to];
 		}
 		Db::$db->free_result($request);
 
 		$this->topic_actions['move'] = $moveCache2;
 
 		// Do the actual moves...
-		foreach ($moveTos as $to => $topics)
+		foreach ($moveTos as $to => $topics) {
 			Topic::move($topics, $to);
+		}
 
 		// Does the post counts need to be updated?
-		if (!empty($moveTos))
-		{
-			$topicRecounts = array();
-			$request = Db::$db->query('', '
-				SELECT id_board, count_posts
+		if (!empty($moveTos)) {
+			$topicRecounts = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board, count_posts
 				FROM {db_prefix}boards
 				WHERE id_board IN ({array_int:move_boards})',
-				array(
+				[
 					'move_boards' => array_keys($moveTos),
-				)
+				],
 			);
 
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$cp = empty($row['count_posts']);
 
 				// Go through all the topics that are being moved to this board.
-				foreach ($moveTos[$row['id_board']] as $topic)
-				{
+				foreach ($moveTos[$row['id_board']] as $topic) {
 					// If both boards have the same value for post counting then no adjustment needs to be made.
-					if ($countPosts[$topic] != $cp)
-					{
+					if ($countPosts[$topic] != $cp) {
 						// If the board being moved to does count the posts then the other one doesn't so add to their post count.
 						$topicRecounts[$topic] = $cp ? '+' : '-';
 					}
@@ -792,30 +793,28 @@ protected function doMove(): void
 
 			Db::$db->free_result($request);
 
-			if (!empty($topicRecounts))
-			{
-				$members = array();
+			if (!empty($topicRecounts)) {
+				$members = [];
 
 				// Get all the members who have posted in the moved topics.
-				$request = Db::$db->query('', '
-					SELECT id_member, id_topic
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, id_topic
 					FROM {db_prefix}messages
 					WHERE id_topic IN ({array_int:moved_topic_ids})',
-					array(
+					[
 						'moved_topic_ids' => array_keys($topicRecounts),
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if (!isset($members[$row['id_member']]))
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if (!isset($members[$row['id_member']])) {
 						$members[$row['id_member']] = 0;
+					}
 
-					if ($topicRecounts[$row['id_topic']] === '+')
-					{
+					if ($topicRecounts[$row['id_topic']] === '+') {
 						$members[$row['id_member']]++;
-					}
-					else
-					{
+					} else {
 						$members[$row['id_member']]--;
 					}
 
@@ -824,18 +823,19 @@ protected function doMove(): void
 				Db::$db->free_result($request);
 
 				// And now update them member's post counts
-				foreach ($members as $id_member => $post_adj)
-					User::updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
+				foreach ($members as $id_member => $post_adj) {
+					User::updateMemberData($id_member, ['posts' => 'posts + ' . $post_adj]);
+				}
 			}
 		}
 
-		foreach ($this->topic_actions['move'] as $topic)
-		{
+		foreach ($this->topic_actions['move'] as $topic) {
 			// Didn't actually move anything!
-			if (!isset($topic[0]))
+			if (!isset($topic[0])) {
 				break;
+			}
 
-			Logging::logAction('move', array('topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]));
+			Logging::logAction('move', ['topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]]);
 
 			Mail::sendNotifications($topic[0], 'move');
 		}
@@ -849,27 +849,29 @@ protected function doMove(): void
 	 */
 	protected function doRemove(): void
 	{
-		if (empty($this->topic_actions['remove']))
+		if (empty($this->topic_actions['remove'])) {
 			return;
+		}
 
 		// They can only delete their own topics. (we wouldn't be here if they couldn't do that..)
-		$removed_topic_ids = array();
-		$remove_cache_boards = array();
+		$removed_topic_ids = [];
+		$remove_cache_boards = [];
 
-		$result = Db::$db->query('', '
-			SELECT id_topic, id_board
+		$result = Db::$db->query(
+			'',
+			'SELECT id_topic, id_board
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:removed_topic_ids})' . (!empty(Board::$info->id) && !User::$me->allowedTo('remove_any') ? '
 				AND id_member_started = {int:current_member}' : '') . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'removed_topic_ids' => $this->topic_actions['remove'],
 				'limit' => count($this->topic_actions['remove']),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			$removed_topic_ids[] = $row['id_topic'];
 			$remove_cache_boards[$row['id_topic']] = $row['id_board'];
 		}
@@ -878,13 +880,11 @@ protected function doRemove(): void
 		$this->topic_actions['remove'] = $removed_topic_ids;
 
 		// Maybe *none* were their own topics.
-		if (!empty($this->topic_actions['remove']))
-		{
+		if (!empty($this->topic_actions['remove'])) {
 			// Gotta send the notifications *first*!
-			foreach ($this->topic_actions['remove'] as $topic)
-			{
+			foreach ($this->topic_actions['remove'] as $topic) {
 				// Only log the topic ID if it's not in the recycle board.
-				Logging::logAction('remove', array((empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != $remove_cache_boards[$topic] ? 'topic' : 'old_topic_id') => $topic, 'board' => $remove_cache_boards[$topic]));
+				Logging::logAction('remove', [(empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != $remove_cache_boards[$topic] ? 'topic' : 'old_topic_id') => $topic, 'board' => $remove_cache_boards[$topic]]);
 
 				Mail::sendNotifications($topic, 'remove');
 			}
@@ -901,27 +901,29 @@ protected function doRemove(): void
 	 */
 	protected function doApprove(): void
 	{
-		if (empty($this->topic_actions['approve']))
+		if (empty($this->topic_actions['approve'])) {
 			return;
+		}
 
 		// We need unapproved topic ids and their authors!
-		$approve_topic_ids = array();
-		$approve_cache_members = array();
+		$approve_topic_ids = [];
+		$approve_cache_members = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_topic, id_member_started
+		$request = Db::$db->query(
+			'',
+			'SELECT id_topic, id_member_started
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:approve_topic_ids})
 				AND approved = {int:not_approved}
 			LIMIT {int:limit}',
-			array(
+			[
 				'approve_topic_ids' => $this->topic_actions['approve'],
 				'not_approved' => 0,
 				'limit' => count($this->topic_actions['approve']),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$approve_topic_ids[] = $row['id_topic'];
 			$approve_cache_members[$row['id_topic']] = $row['id_member_started'];
 		}
@@ -930,15 +932,13 @@ protected function doApprove(): void
 		$this->topic_actions['approve'] = $approve_topic_ids;
 
 		// Any topics to approve?
-		if (!empty($this->topic_actions['approve']))
-		{
+		if (!empty($this->topic_actions['approve'])) {
 			// Handle the approval part...
 			Topic::approve($this->topic_actions['approve']);
 
 			// Time for some logging!
-			foreach ($this->topic_actions['approve'] as $topic)
-			{
-				Logging::logAction('approve_topic', array('topic' => $topic, 'member' => $approve_cache_members[$topic]));
+			foreach ($this->topic_actions['approve'] as $topic) {
+				Logging::logAction('approve_topic', ['topic' => $topic, 'member' => $approve_cache_members[$topic]]);
 			}
 		}
 	}
@@ -952,8 +952,9 @@ protected function doApprove(): void
 	protected function doMerge(): void
 	{
 		// Merge requires at least two topics.
-		if (count($this->topic_actions['merge']) < 2)
+		if (count($this->topic_actions['merge']) < 2) {
 			return;
+		}
 
 		TopicMerge::initiate($this->topic_actions['merge']);
 
@@ -969,15 +970,17 @@ protected function doMerge(): void
 	protected function doRestore(): void
 	{
 		// Merge requires at least two topics.
-		if (empty($this->topic_actions['restore']))
+		if (empty($this->topic_actions['restore'])) {
 			return;
+		}
 
 		Utils::redirectexit('action=restoretopic;topics=' . implode(',', $this->topic_actions['restore']) . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\QuickModeration::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\QuickModeration::exportStatic')) {
 	QuickModeration::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/QuickModerationInTopic.php b/Sources/Actions/QuickModerationInTopic.php
index 6f659329c1..b38d36e666 100644
--- a/Sources/Actions/QuickModerationInTopic.php
+++ b/Sources/Actions/QuickModerationInTopic.php
@@ -14,15 +14,14 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Logging;
 use SMF\Msg;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles quick moderation actions from within a topic.
@@ -39,12 +38,11 @@ class QuickModerationInTopic implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'QuickInTopicModeration',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -55,7 +53,7 @@ class QuickModerationInTopic implements ActionInterface
 	 *
 	 * IDs of the messages to act on.
 	 */
-	public array $messages = array();
+	public array $messages = [];
 
 	/****************************
 	 * Internal static properties
@@ -81,12 +79,13 @@ public function execute(): void
 		// Check the session = get or post.
 		User::$me->checkSession('request');
 
-		if (isset($_REQUEST['restore_selected']))
+		if (isset($_REQUEST['restore_selected'])) {
 			$this->restore();
-		elseif (isset($_REQUEST['split_selection']))
+		} elseif (isset($_REQUEST['split_selection'])) {
 			$this->split();
-		else
+		} else {
 			$this->delete();
+		}
 	}
 
 	/***********************
@@ -100,8 +99,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -139,14 +139,15 @@ protected function restore()
 	 */
 	protected function split()
 	{
-		$request = Db::$db->query('', '
-			SELECT subject
+		$request = Db::$db->query(
+			'',
+			'SELECT subject
 			FROM {db_prefix}messages
 			WHERE id_msg = {int:message}
 			LIMIT 1',
-			array(
+			[
 				'message' => min($this->messages),
-			)
+			],
 		);
 		list($subname) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -164,92 +165,92 @@ protected function split()
 	protected function delete()
 	{
 		// Allowed to delete any message?
-		if (User::$me->allowedTo('delete_any'))
-		{
+		if (User::$me->allowedTo('delete_any')) {
 			$allowed_all = true;
 		}
 		// Allowed to delete replies to their messages?
-		elseif (User::$me->allowedTo('delete_replies'))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member_started
+		elseif (User::$me->allowedTo('delete_replies')) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member_started
 				FROM {db_prefix}topics
 				WHERE id_topic = {int:current_topic}
 				LIMIT 1',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
-				)
+				],
 			);
-			list ($starter) = Db::$db->fetch_row($request);
+			list($starter) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			$allowed_all = $starter == User::$me->id;
-		}
-		else
+		} else {
 			$allowed_all = false;
+		}
 
 		// Make sure they're allowed to delete their own messages, if not any.
-		if (!$allowed_all)
+		if (!$allowed_all) {
 			User::$me->isAllowedTo('delete_own');
+		}
 
 		// Allowed to remove which messages?
-		$request = Db::$db->query('', '
-			SELECT id_msg, subject, id_member, poster_time
+		$request = Db::$db->query(
+			'',
+			'SELECT id_msg, subject, id_member, poster_time
 			FROM {db_prefix}messages
 			WHERE id_msg IN ({array_int:message_list})
 				AND id_topic = {int:current_topic}' . (!$allowed_all ? '
 				AND id_member = {int:current_member}' : '') . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'current_topic' => Topic::$topic_id,
 				'message_list' => $this->messages,
 				'limit' => count($this->messages),
-			)
+			],
 		);
-		$message_info = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!$allowed_all && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 < time())
+		$message_info = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!$allowed_all && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 < time()) {
 				continue;
+			}
 
-			$message_info[$row['id_msg']] = array($row['subject'], $row['id_member']);
+			$message_info[$row['id_msg']] = [$row['subject'], $row['id_member']];
 		}
 		Db::$db->free_result($request);
 
 		// Get the first message in the topic - because you can't delete that!
-		$request = Db::$db->query('', '
-			SELECT id_first_msg, id_last_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT id_first_msg, id_last_msg
 			FROM {db_prefix}topics
 			WHERE id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
-		list ($first_message, $last_message) = Db::$db->fetch_row($request);
+		list($first_message, $last_message) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Delete all the messages we know they can delete. ($message_info)
-		foreach ($message_info as $message => $info)
-		{
+		foreach ($message_info as $message => $info) {
 			// Just skip the first message - if it's not the last.
-			if ($message == $first_message && $message != $last_message)
-			{
+			if ($message == $first_message && $message != $last_message) {
 				continue;
 			}
+
 			// If the first message is going then don't bother going back to the topic as we're effectively deleting it.
-			elseif ($message == $first_message)
-			{
+			if ($message == $first_message) {
 				$topicGone = true;
 			}
 
 			Msg::remove($message);
 
 			// Log this moderation action ;).
-			if (User::$me->allowedTo('delete_any') && (!User::$me->allowedTo('delete_own') || $info[1] != User::$me->id))
-			{
-				Logging::logAction('delete', array('topic' => Topic::$topic_id, 'subject' => $info[0], 'member' => $info[1], 'board' => Board::$info->id));
+			if (User::$me->allowedTo('delete_any') && (!User::$me->allowedTo('delete_own') || $info[1] != User::$me->id)) {
+				Logging::logAction('delete', ['topic' => Topic::$topic_id, 'subject' => $info[0], 'member' => $info[1], 'board' => Board::$info->id]);
 			}
 		}
 
@@ -258,7 +259,8 @@ protected function delete()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\QuickModerationInTopic::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\QuickModerationInTopic::exportStatic')) {
 	QuickModerationInTopic::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/QuoteFast.php b/Sources/Actions/QuoteFast.php
index 7c2503048b..16df05b605 100644
--- a/Sources/Actions/QuoteFast.php
+++ b/Sources/Actions/QuoteFast.php
@@ -14,15 +14,13 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Lang;
 use SMF\Msg;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
-
 
 /**
  * This class handles quoting posts via JavaScript.
@@ -42,12 +40,11 @@ class QuoteFast implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'QuoteFast',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -72,8 +69,9 @@ public function execute(): void
 	{
 		$moderate_boards = User::$me->boardsAllowedTo('moderate_board');
 
-		$request = Db::$db->query('', '
-			SELECT COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.body, m.id_topic, m.subject,
+		$request = Db::$db->query(
+			'',
+			'SELECT COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.body, m.id_topic, m.subject,
 				m.id_board, m.id_member, m.approved, m.modified_time, m.modified_name, m.modified_reason
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
@@ -82,23 +80,24 @@ public function execute(): void
 				AND m.id_msg = {int:id_msg}' . (isset($_REQUEST['modify']) || (!empty($moderate_boards) && $moderate_boards[0] == 0) ? '' : '
 				AND (t.locked = {int:not_locked}' . (empty($moderate_boards) ? '' : ' OR m.id_board IN ({array_int:moderation_board_list})') . ')') . '
 			LIMIT 1',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'moderation_board_list' => $moderate_boards,
 				'id_msg' => (int) $_REQUEST['quote'],
 				'not_locked' => 0,
-			)
+			],
 		);
 		Utils::$context['close_window'] = Db::$db->num_rows($request) == 0;
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		Utils::$context['sub_template'] = 'quotefast';
-		if (!empty($row))
+
+		if (!empty($row)) {
 			$can_view_post = $row['approved'] || ($row['id_member'] != 0 && $row['id_member'] == User::$me->id) || User::$me->allowedTo('approve_posts', $row['id_board']);
+		}
 
-		if (!empty($can_view_post))
-		{
+		if (!empty($can_view_post)) {
 			// Remove special formatting we don't want anymore.
 			$row['body'] = Msg::un_preparsecode($row['body']);
 
@@ -106,60 +105,59 @@ public function execute(): void
 			Lang::censorText($row['body']);
 
 			// Want to modify a single message by double clicking it?
-			if (isset($_REQUEST['modify']))
-			{
+			if (isset($_REQUEST['modify'])) {
 				Lang::censorText($row['subject']);
 
 				Utils::$context['sub_template'] = 'modifyfast';
-				Utils::$context['message'] = array(
+				Utils::$context['message'] = [
 					'id' => $_REQUEST['quote'],
 					'body' => $row['body'],
 					'subject' => addcslashes($row['subject'], '"'),
-					'reason' => array(
+					'reason' => [
 						'name' => $row['modified_name'],
 						'text' => $row['modified_reason'],
 						'time' => $row['modified_time'],
-					),
-				);
+					],
+				];
 
 				return;
 			}
 
 			// Remove any nested quotes.
-			if (!empty(Config::$modSettings['removeNestedQuotes']))
-				$row['body'] = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $row['body']);
+			if (!empty(Config::$modSettings['removeNestedQuotes'])) {
+				$row['body'] = preg_replace(['~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'], '', $row['body']);
+			}
 
 			$lb = "\n";
 
 			// Add a quote string on the front and end.
 			Utils::$context['quote']['xml'] = '[quote author=' . $row['poster_name'] . ' link=msg=' . (int) $_REQUEST['quote'] . ' date=' . $row['poster_time'] . ']' . $lb . $row['body'] . $lb . '[/quote]';
-			Utils::$context['quote']['text'] = strtr(Utils::htmlspecialcharsDecode(Utils::$context['quote']['xml']), array('\'' => '\\\'', '\\' => '\\\\', "\n" => '\\n', '</script>' => '</\' + \'script>'));
-			Utils::$context['quote']['xml'] = strtr(Utils::$context['quote']['xml'], array('&nbsp;' => '&#160;', '<' => '&lt;', '>' => '&gt;'));
+			Utils::$context['quote']['text'] = strtr(Utils::htmlspecialcharsDecode(Utils::$context['quote']['xml']), ['\'' => '\\\'', '\\' => '\\\\', "\n" => '\\n', '</script>' => '</\' + \'script>']);
+			Utils::$context['quote']['xml'] = strtr(Utils::$context['quote']['xml'], ['&nbsp;' => '&#160;', '<' => '&lt;', '>' => '&gt;']);
 
-			Utils::$context['quote']['mozilla'] = strtr(Utils::htmlspecialchars(Utils::$context['quote']['text']), array('&quot;' => '"'));
+			Utils::$context['quote']['mozilla'] = strtr(Utils::htmlspecialchars(Utils::$context['quote']['text']), ['&quot;' => '"']);
 		}
-		//@todo Needs a nicer interface.
+		// @todo Needs a nicer interface.
 		// In case our message has been removed in the meantime.
-		elseif (isset($_REQUEST['modify']))
-		{
+		elseif (isset($_REQUEST['modify'])) {
 			Utils::$context['sub_template'] = 'modifyfast';
-			Utils::$context['message'] = array(
+			Utils::$context['message'] = [
 				'id' => 0,
 				'body' => '',
 				'subject' => '',
-				'reason' => array(
+				'reason' => [
 					'name' => '',
 					'text' => '',
 					'time' => '',
-				),
-			);
-		}
-		else
-			Utils::$context['quote'] = array(
+				],
+			];
+		} else {
+			Utils::$context['quote'] = [
 				'xml' => '',
 				'mozilla' => '',
 				'text' => '',
-			);
+			];
+		}
 	}
 
 	/***********************
@@ -173,8 +171,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -198,13 +197,15 @@ protected function __construct()
 	{
 		Lang::load('Post');
 
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('Post');
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\QuoteFast::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\QuoteFast::exportStatic')) {
 	QuoteFast::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Recent.php b/Sources/Actions/Recent.php
index 6566ef713f..b4559a708a 100644
--- a/Sources/Actions/Recent.php
+++ b/Sources/Actions/Recent.php
@@ -14,10 +14,11 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -27,8 +28,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Finds and retrieves information about recently posted messages.
@@ -42,19 +41,19 @@ class Recent implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RecentPosts',
-		),
-	);
+			'getLastPost' => 'getLastPost',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const PER_PAGE = 10;
-	const PAGES = 10;
+	public const PER_PAGE = 10;
+	public const PAGES = 10;
 
 	/*********************
 	 * Internal properties
@@ -79,7 +78,7 @@ class Recent implements ActionInterface
 	 *
 	 * Parameters for the main query.
 	 */
-	protected array $query_parameters = array();
+	protected array $query_parameters = [];
 
 	/**
 	 * @var string
@@ -100,18 +99,17 @@ class Recent implements ActionInterface
 	 *
 	 * IDs of some recent messages.
 	 */
-	protected array $messages = array();
+	protected array $messages = [];
 
 	/**
 	 * @var array
 	 *
 	 * Boards that we need to check for some own/any permissions.
 	 */
-	protected array $permission_boards = array(
-		'own' => array(),
-		'any' => array(),
-	);
-
+	protected array $permission_boards = [
+		'own' => [],
+		'any' => [],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -142,8 +140,9 @@ public function execute(): void
 		$this->getMsgIds();
 
 		// Nothing here... Or at least, nothing you can see...
-		if (empty($this->messages))
+		if (empty($this->messages)) {
 			return;
+		}
 
 		$this->getMessages();
 		$this->doPermissions();
@@ -164,8 +163,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -189,8 +189,9 @@ public static function call(): void
 	public static function getLastPost()
 	{
 		// Find it by the board - better to order by board than sort the entire messages table.
-		$request = Db::$db->query('substring', '
-			SELECT m.poster_time, m.subject, m.id_topic, m.poster_name, SUBSTRING(m.body, 1, 385) AS body,
+		$request = Db::$db->query(
+			'substring',
+			'SELECT m.poster_time, m.subject, m.id_topic, m.poster_name, SUBSTRING(m.body, 1, 385) AS body,
 				m.smileys_enabled
 			FROM {db_prefix}messages AS m' . (!empty(Config::$modSettings['postmod_active']) ? '
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
@@ -200,13 +201,15 @@ public static function getLastPost()
 				AND t.approved = {int:is_approved}' : '') . '
 			ORDER BY m.id_msg DESC
 			LIMIT 1',
-			array(
+			[
 				'recycle_board' => Config::$modSettings['recycle_board'],
 				'is_approved' => 1,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-			return array();
+
+		if (Db::$db->num_rows($request) == 0) {
+			return [];
+		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
@@ -214,12 +217,14 @@ public static function getLastPost()
 		Lang::censorText($row['subject']);
 		Lang::censorText($row['body']);
 
-		$row['body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['body'], $row['smileys_enabled']), array('<br>' => '&#10;')));
-		if (Utils::entityStrlen($row['body']) > 128)
+		$row['body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['body'], $row['smileys_enabled']), ['<br>' => '&#10;']));
+
+		if (Utils::entityStrlen($row['body']) > 128) {
 			$row['body'] = Utils::entitySubstr($row['body'], 0, 128) . '...';
+		}
 
 		// Send the data.
-		return array(
+		return [
 			'topic' => $row['id_topic'],
 			'subject' => $row['subject'],
 			'short_subject' => Utils::shorten($row['subject'], 24),
@@ -227,8 +232,8 @@ public static function getLastPost()
 			'time' => Time::create('@' . $row['poster_time'])->format(),
 			'timestamp' => $row['poster_time'],
 			'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.new;topicseen#new',
-			'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.new;topicseen#new">' . $row['subject'] . '</a>'
-		);
+			'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.new;topicseen#new">' . $row['subject'] . '</a>',
+		];
 	}
 
 	/******************
@@ -242,7 +247,7 @@ protected function __construct()
 	{
 		$this->action_url = Config::$scripturl . '?action=recent';
 
-		Utils::$context['posts'] = array();
+		Utils::$context['posts'] = [];
 
 		Theme::loadTemplate('Recent');
 		Utils::$context['page_title'] = Lang::$txt['recent_posts'];
@@ -256,16 +261,19 @@ protected function __construct()
 		Utils::$context['start'] -= Utils::$context['start'] % self::PER_PAGE;
 
 		// Convert $_REQUEST['boards'] to an array of integers.
-		if (!empty($_REQUEST['boards']))
+		if (!empty($_REQUEST['boards'])) {
 			$_REQUEST['boards'] = array_map('intval', explode(',', $_REQUEST['boards']));
+		}
 
 		// Board requests takes precedence over category requests.
-		if (!empty($_REQUEST['boards']) || !empty(Board::$info->id))
+		if (!empty($_REQUEST['boards']) || !empty(Board::$info->id)) {
 			unset($_REQUEST['c']);
+		}
 
 		// Convert $_REQUEST['c'] to an array of integers.
-		if (!empty($_REQUEST['c']))
+		if (!empty($_REQUEST['c'])) {
 			$_REQUEST['c'] = array_map('intval', explode(',', $_REQUEST['c']));
+		}
 	}
 
 	/**
@@ -278,38 +286,38 @@ protected function __construct()
 	protected function getBoards()
 	{
 		// Requested one or more categories.
-		if (!empty($_REQUEST['c']))
-		{
-			$boards = array();
-			$request = Db::$db->query('', '
-				SELECT b.id_board, b.num_posts
+		if (!empty($_REQUEST['c'])) {
+			$boards = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board, b.num_posts
 				FROM {db_prefix}boards AS b
 				WHERE b.id_cat IN ({array_int:category_list})
 					AND b.redirect = {string:empty}' . (!empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? '
 					AND b.id_board != {int:recycle_board}' : '') . '
 					AND {query_wanna_see_board}',
-				array(
+				[
 					'category_list' => $_REQUEST['c'],
 					'empty' => '',
 					'recycle_board' => !empty(Config::$modSettings['recycle_board']) ? Config::$modSettings['recycle_board'] : 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards[] = $row['id_board'];
 				$this->total_posts += $row['num_posts'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($boards))
+			if (empty($boards)) {
 				ErrorHandler::fatalLang('error_no_boards_selected');
+			}
 
 			$this->query_this_board = 'm.id_board IN ({array_int:boards})';
 			$this->query_parameters['boards'] = $boards;
 
 			// If this category has a significant number of posts in it...
-			if ($this->total_posts > 100 && $this->total_posts > Config::$modSettings['totalMessages'] / 15)
-			{
+			if ($this->total_posts > 100 && $this->total_posts > Config::$modSettings['totalMessages'] / 15) {
 				$this->query_this_board .= '
 						AND m.id_msg >= {int:max_id_msg}';
 				$this->query_parameters['max_id_msg'] = max(0, Config::$modSettings['maxMsgID'] - 400 - Utils::$context['start'] * 7);
@@ -318,42 +326,44 @@ protected function getBoards()
 			$this->action_url .= ';c=' . implode(',', $_REQUEST['c']);
 		}
 		// Requested some boards.
-		elseif (!empty($_REQUEST['boards']))
-		{
+		elseif (!empty($_REQUEST['boards'])) {
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-			foreach ($_REQUEST['boards'] as $i => $b)
+
+			foreach ($_REQUEST['boards'] as $i => $b) {
 				$_REQUEST['boards'][$i] = (int) $b;
+			}
 
-			$request = Db::$db->query('', '
-				SELECT b.id_board, b.num_posts
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board, b.num_posts
 				FROM {db_prefix}boards AS b
 				WHERE b.id_board IN ({array_int:board_list})
 					AND b.redirect = {string:empty}
 					AND {query_see_board}
 				LIMIT {int:limit}',
-				array(
+				[
 					'board_list' => $_REQUEST['boards'],
 					'limit' => count($_REQUEST['boards']),
 					'empty' => '',
-				)
+				],
 			);
-			$boards = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$boards = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards[] = $row['id_board'];
 				$this->total_posts += $row['num_posts'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($boards))
+			if (empty($boards)) {
 				ErrorHandler::fatalLang('error_no_boards_selected');
+			}
 
 			$this->query_this_board = 'm.id_board IN ({array_int:boards})';
 			$this->query_parameters['boards'] = $boards;
 
 			// If these boards have a significant number of posts in them...
-			if ($this->total_posts > 100 && $this->total_posts > Config::$modSettings['totalMessages'] / 12)
-			{
+			if ($this->total_posts > 100 && $this->total_posts > Config::$modSettings['totalMessages'] / 12) {
 				$this->query_this_board .= '
 						AND m.id_msg >= {int:max_id_msg}';
 				$this->query_parameters['max_id_msg'] = max(0, Config::$modSettings['maxMsgID'] - 500 - Utils::$context['start'] * 9);
@@ -362,23 +372,22 @@ protected function getBoards()
 			$this->action_url .= ';boards=' . implode(',', $_REQUEST['boards']);
 		}
 		// Requested a single board.
-		elseif (!empty(Board::$info->id))
-		{
-			$request = Db::$db->query('', '
-				SELECT num_posts, redirect
+		elseif (!empty(Board::$info->id)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT num_posts, redirect
 				FROM {db_prefix}boards
 				WHERE id_board = {int:current_board}
 				LIMIT 1',
-				array(
+				[
 					'current_board' => Board::$info->id,
-				)
+				],
 			);
-			list ($this->total_posts, $redirect) = Db::$db->fetch_row($request);
+			list($this->total_posts, $redirect) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// If this is a redirection board, don't bother counting topics here...
-			if ($redirect != '')
-			{
+			if ($redirect != '') {
 				Utils::$context['is_redirect'] = true;
 			}
 
@@ -386,8 +395,7 @@ protected function getBoards()
 			$this->query_parameters['board'] = Board::$info->id;
 
 			// If this board has a significant number of posts in it...
-			if ($this->total_posts > 80 && $this->total_posts > Config::$modSettings['totalMessages'] / 10)
-			{
+			if ($this->total_posts > 80 && $this->total_posts > Config::$modSettings['totalMessages'] / 10) {
 				$this->query_this_board .= '
 						AND m.id_msg >= {int:max_id_msg}';
 				$this->query_parameters['max_id_msg'] = max(0, Config::$modSettings['maxMsgID'] - 600 - Utils::$context['start'] * 10);
@@ -396,8 +404,7 @@ protected function getBoards()
 			$this->action_url .= ';board=' . Board::$info->id . '.%1$d';
 		}
 		// Requested recent posts from across the whole forum.
-		else
-		{
+		else {
 			$this->query_this_board = '{query_wanna_see_message_board}' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 						AND m.id_board != {int:recycle_board}' : '') . '
 						AND m.id_msg >= {int:max_id_msg}';
@@ -409,12 +416,13 @@ protected function getBoards()
 			$query_these_boards_params = $this->query_parameters;
 			unset($query_these_boards_params['max_id_msg']);
 
-			$get_num_posts = Db::$db->query('', '
-				SELECT COALESCE(SUM(b.num_posts), 0)
+			$get_num_posts = Db::$db->query(
+				'',
+				'SELECT COALESCE(SUM(b.num_posts), 0)
 				FROM {db_prefix}boards AS b
 				WHERE ' . $query_these_boards . '
 					AND b.redirect = {string:empty}',
-				array_merge($query_these_boards_params, array('empty' => ''))
+				array_merge($query_these_boards_params, ['empty' => '']),
 			);
 
 			list($this->total_posts) = Db::$db->fetch_row($get_num_posts);
@@ -428,18 +436,18 @@ protected function getBoards()
 	 */
 	protected function getCatName()
 	{
-		if (!empty($_REQUEST['c']) && is_array($_REQUEST['c']) && count($_REQUEST['c']) == 1)
-		{
-			$request = Db::$db->query('', '
-				SELECT name
+		if (!empty($_REQUEST['c']) && is_array($_REQUEST['c']) && count($_REQUEST['c']) == 1) {
+			$request = Db::$db->query(
+				'',
+				'SELECT name
 				FROM {db_prefix}categories
 				WHERE id_cat = {int:id_cat}
 				LIMIT 1',
-				array(
+				[
 					'id_cat' => (int) $_REQUEST['c'][0],
-				)
+				],
 			);
-			list ($this->cat_name) = Db::$db->fetch_row($request);
+			list($this->cat_name) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 	}
@@ -450,21 +458,21 @@ protected function getCatName()
 	protected function getMsgIds()
 	{
 		// If you selected a redirection board, don't try getting posts for it...
-		if (Utils::$context['is_redirect'])
+		if (Utils::$context['is_redirect']) {
 			return;
+		}
 
-		$cache_key = 'recent-' . User::$me->id . '-' . md5(Utils::jsonEncode(array_diff_key($this->query_parameters, array('max_id_msg' => 0)))) . '-' . Utils::$context['start'];
+		$cache_key = 'recent-' . User::$me->id . '-' . md5(Utils::jsonEncode(array_diff_key($this->query_parameters, ['max_id_msg' => 0]))) . '-' . Utils::$context['start'];
 
-		if (empty(CacheApi::$enable) || ($this->messages = CacheApi::get($cache_key, 120)) == null)
-		{
+		if (empty(CacheApi::$enable) || ($this->messages = CacheApi::get($cache_key, 120)) == null) {
 			$done = false;
 
-			while (!$done)
-			{
+			while (!$done) {
 				// Find the most recent messages they can *view*.
 				// @todo SLOW This query is really slow still, probably?
-				$request = Db::$db->query('', '
-					SELECT m.id_msg
+				$request = Db::$db->query(
+					'',
+					'SELECT m.id_msg
 					FROM {db_prefix}messages AS m ' . (!empty(Config::$modSettings['postmod_active']) ? '
 						INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)' : '') . '
 					WHERE ' . $this->query_this_board . (!empty(Config::$modSettings['postmod_active']) ? '
@@ -472,16 +480,15 @@ protected function getMsgIds()
 						AND t.approved = {int:is_approved}' : '') . '
 					ORDER BY m.id_msg DESC
 					LIMIT {int:offset}, {int:limit}',
-					array_merge($this->query_parameters, array(
+					array_merge($this->query_parameters, [
 						'is_approved' => 1,
 						'offset' => Utils::$context['start'],
 						'limit' => self::PER_PAGE,
-					))
+					]),
 				);
 
 				// If we don't have enough results, try again with an unoptimized version covering all rows, and cache the result.
-				if (isset($this->query_parameters['max_id_msg']) && Db::$db->num_rows($request) < self::PER_PAGE)
-				{
+				if (isset($this->query_parameters['max_id_msg']) && Db::$db->num_rows($request) < self::PER_PAGE) {
 					Db::$db->free_result($request);
 
 					$this->query_this_board = str_replace('AND m.id_msg >= {int:max_id_msg}', '', $this->query_this_board);
@@ -489,18 +496,19 @@ protected function getMsgIds()
 					$cache_results = true;
 
 					unset($this->query_parameters['max_id_msg']);
-				}
-				else
+				} else {
 					$done = true;
+				}
 			}
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->messages[] = $row['id_msg'];
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($cache_results))
+			if (!empty($cache_results)) {
 				CacheApi::put($cache_key, $this->messages, 120);
+			}
 		}
 	}
 
@@ -509,49 +517,50 @@ protected function getMsgIds()
 	 */
 	protected function getMessages()
 	{
-		$query_customizations = array(
-			'selects' => array(
+		$query_customizations = [
+			'selects' => [
 				'm.*',
 				'COALESCE(mem.real_name, m.poster_name) AS poster_name',
 				'b.name AS bname',
 				't.id_member_started',
 				't.id_first_msg',
 				't.id_last_msg',
-			),
-			'joins' => array(
+			],
+			'joins' => [
 				'INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)',
 				'INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)',
 				'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)',
-			),
-			'order' => array('m.id_msg DESC'),
+			],
+			'order' => ['m.id_msg DESC'],
 			'limit' => count($this->messages),
-			'params' => array(),
-		);
+			'params' => [],
+		];
 
 		$counter = Utils::$context['start'] + 1;
-		foreach (Msg::get($this->messages, $query_customizations) as $msg)
-		{
-			Utils::$context['posts'][$msg->id] = $msg->format($counter++, array(
+
+		foreach (Msg::get($this->messages, $query_customizations) as $msg) {
+			Utils::$context['posts'][$msg->id] = $msg->format($counter++, [
 				'do_permissions' => false,
 				'do_icon' => false,
 				'load_author' => false,
 				'shorten_subject' => 30,
-			));
+			]);
 
-			Utils::$context['posts'][$msg->id]['board'] = array(
+			Utils::$context['posts'][$msg->id]['board'] = [
 				'id' => $msg->id_board,
 				'name' => $msg->bname,
 				'href' => Config::$scripturl . '?board=' . $msg->id_board . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?board=' . $msg->id_board . '.0">' . $msg->bname . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?board=' . $msg->id_board . '.0">' . $msg->bname . '</a>',
+			];
 
 			Utils::$context['posts'][$msg->id]['can_reply'] = false;
 			Utils::$context['posts'][$msg->id]['can_delete'] = false;
 
 			Utils::$context['posts'][$msg->id]['delete_possible'] = ($msg->id_first_msg != $msg->id || $msg->id_last_msg == $msg->id) && (empty(Config::$modSettings['edit_disable_time']) || $msg->poster_time + Config::$modSettings['edit_disable_time'] * 60 >= time());
 
-			if (User::$me->id == $msg->id_member_started)
+			if (User::$me->id == $msg->id_member_started) {
 				$this->permission_boards['own'][$msg->id_board][] = $msg->id;
+			}
 
 			$this->permission_boards['any'][$msg->id_board][] = $msg->id;
 		}
@@ -563,46 +572,45 @@ protected function getMessages()
 	protected function doPermissions(): void
 	{
 		// There might be - and are - different permissions between any and own.
-		$permissions = array(
-			'own' => array(
+		$permissions = [
+			'own' => [
 				'post_reply_own' => 'can_reply',
 				'delete_own' => 'can_delete',
-			),
-			'any' => array(
+			],
+			'any' => [
 				'post_reply_any' => 'can_reply',
 				'delete_any' => 'can_delete',
-			)
-		);
+			],
+		];
 
 		// Create an array for the permissions.
-		$boards_can = User::$me->boardsAllowedTo(array_keys(iterator_to_array(
-			new \RecursiveIteratorIterator(new \RecursiveArrayIterator($permissions)))
+		$boards_can = User::$me->boardsAllowedTo(array_keys(
+			iterator_to_array(
+				new \RecursiveIteratorIterator(new \RecursiveArrayIterator($permissions)),
+			),
 		), true, false);
 
 		// Now go through all the permissions, looking for boards they can do it on.
-		foreach ($permissions as $type => $list)
-		{
-			foreach ($list as $permission => $allowed)
-			{
+		foreach ($permissions as $type => $list) {
+			foreach ($list as $permission => $allowed) {
 				// They can do it on these boards...
 				$boards = $boards_can[$permission];
 
 				// If 0 is the only thing in the array, they can do it everywhere!
-				if (!empty($boards) && $boards[0] == 0)
+				if (!empty($boards) && $boards[0] == 0) {
 					$boards = array_keys($this->permission_boards[$type]);
+				}
 
 				// Go through the boards, and look for posts they can do this on.
-				foreach ($boards as $board_id)
-				{
+				foreach ($boards as $board_id) {
 					// Hmm, they have permission, but there are no topics from that board on this page.
-					if (!isset($this->permission_boards[$type][$board_id]))
+					if (!isset($this->permission_boards[$type][$board_id])) {
 						continue;
+					}
 
 					// Okay, looks like they can do it for these posts.
-					foreach ($this->permission_boards[$type][$board_id] as $counter)
-					{
-						if ($type == 'any' || Utils::$context['posts'][$counter]['poster']['id'] == User::$me->id)
-						{
+					foreach ($this->permission_boards[$type][$board_id] as $counter) {
+						if ($type == 'any' || Utils::$context['posts'][$counter]['poster']['id'] == User::$me->id) {
 							Utils::$context['posts'][$counter][$allowed] = true;
 						}
 					}
@@ -612,8 +620,7 @@ protected function doPermissions(): void
 
 		$quote_enabled = empty(Config::$modSettings['disabledBBC']) || !in_array('quote', explode(',', Config::$modSettings['disabledBBC']));
 
-		foreach (Utils::$context['posts'] as $counter => $dummy)
-		{
+		foreach (Utils::$context['posts'] as $counter => $dummy) {
 			// Some posts - the first posts - can't just be deleted.
 			Utils::$context['posts'][$counter]['can_delete'] &= Utils::$context['posts'][$counter]['delete_possible'];
 
@@ -631,35 +638,34 @@ protected function setPaginationAndLinks()
 		$not_first_page = Utils::$context['start'] >= self::PER_PAGE;
 		$not_last_page = Utils::$context['start'] + self::PER_PAGE < $this->total_posts;
 
-		if (isset($this->cat_name))
-		{
-			Utils::$context['linktree'][] = array(
+		if (isset($this->cat_name)) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '#c' . (int) $_REQUEST['c'][0],
 				'name' => $this->cat_name,
-			);
+			];
 		}
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => sprintf($this->action_url, 0),
 			'name' => Utils::$context['page_title'],
-		);
+		];
 
 		Utils::$context['page_index'] = new PageIndex($this->action_url, Utils::$context['start'], $total, self::PER_PAGE, !empty(Board::$info->id));
 
 		Utils::$context['current_page'] = floor(Utils::$context['start'] / self::PER_PAGE);
 
-		Utils::$context['links'] = array(
+		Utils::$context['links'] = [
 			'first' => $not_first_page ? sprintf($this->action_url, 0) : '',
 			'prev' => $not_first_page ? sprintf($this->action_url, Utils::$context['start'] - self::PER_PAGE) : '',
 			'next' => $not_last_page ? sprintf($this->action_url, Utils::$context['start'] + self::PER_PAGE) : '',
 			'last' => $not_last_page ? sprintf($this->action_url, $total - ($total % self::PER_PAGE)) : '',
 			'up' => Config::$scripturl,
-		);
+		];
 
-		Utils::$context['page_info'] = array(
+		Utils::$context['page_info'] = [
 			'current_page' => Utils::$context['current_page'] + 1,
 			'num_pages' => floor(($total - 1) / self::PER_PAGE) + 1,
-		);
+		];
 	}
 
 	/**
@@ -667,36 +673,36 @@ protected function setPaginationAndLinks()
 	 */
 	protected function buildQuickButtons()
 	{
-		foreach (Utils::$context['posts'] as $key => $post)
-		{
-			Utils::$context['posts'][$key]['quickbuttons'] = array(
-				'reply' => array(
+		foreach (Utils::$context['posts'] as $key => $post) {
+			Utils::$context['posts'][$key]['quickbuttons'] = [
+				'reply' => [
 					'label' => Lang::$txt['reply'],
-					'href' => Config::$scripturl . '?action=post;topic=' . $post['topic'] .'.0',
+					'href' => Config::$scripturl . '?action=post;topic=' . $post['topic'] . '.0',
 					'icon' => 'reply_button',
-					'show' => $post['can_reply']
-				),
-				'quote' => array(
+					'show' => $post['can_reply'],
+				],
+				'quote' => [
 					'label' => Lang::$txt['quote_action'],
 					'href' => Config::$scripturl . '?action=post;topic=' . $post['topic'] . '.0;quote=' . $post['id'],
 					'icon' => 'quote',
-					'show' => $post['can_quote']
-				),
-				'delete' => array(
+					'show' => $post['can_quote'],
+				],
+				'delete' => [
 					'label' => Lang::$txt['remove'],
 					'href' => Config::$scripturl . '?action=deletemsg;msg=' . $post['id'] . ';topic=' . $post['topic'] . ';recent;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'javascript' => 'data-confirm="' . Lang::$txt['remove_message'] . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button',
-					'show' => $post['can_delete']
-				),
-			);
+					'show' => $post['can_delete'],
+				],
+			];
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Recent::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Recent::exportStatic')) {
 	Recent::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Register.php b/Sources/Actions/Register.php
index 12b240dc27..aa4006ce9b 100644
--- a/Sources/Actions/Register.php
+++ b/Sources/Actions/Register.php
@@ -14,19 +14,16 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\Lang;
-use SMF\Mail;
 use SMF\Profile;
 use SMF\SecurityToken;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Shows the registration form.
@@ -40,12 +37,11 @@ class Register implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'register' => 'Register',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -63,7 +59,7 @@ class Register implements ActionInterface
 	 *
 	 * Errors encountered while trying to register.
 	 */
-	public array $errors = array();
+	public array $errors = [];
 
 	/**************************
 	 * Public static properties
@@ -74,10 +70,10 @@ class Register implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'show' => 'show',
 		'usernamecheck' => 'checkUsername',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -100,10 +96,11 @@ class Register implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -112,15 +109,18 @@ public function execute(): void
 	public function show(): void
 	{
 		// Check if the administrator has it disabled.
-		if (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == '3')
+		if (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == '3') {
 			ErrorHandler::fatalLang('registration_disabled', false);
+		}
 
 		// If this user is an admin - redirect them to the admin registration page.
-		if (User::$me->allowedTo('moderate_forum') && !User::$me->is_guest)
+		if (User::$me->allowedTo('moderate_forum') && !User::$me->is_guest) {
 			Utils::redirectexit('action=admin;area=regcenter;sa=register');
+		}
 		// You are not a guest, so you are a member - and members don't get to register twice!
-		elseif (empty(User::$me->is_guest))
+		elseif (empty(User::$me->is_guest)) {
 			Utils::redirectexit();
+		}
 
 		Lang::load('Login');
 		Theme::loadTemplate('Register');
@@ -133,86 +133,85 @@ public function show(): void
 		Utils::$context['show_coppa'] = !empty(Config::$modSettings['coppaAge']);
 
 		$agree_txt_key = '';
-		if ($current_step == 1)
-		{
-			if (!empty(Config::$modSettings['requireAgreement']) && !empty(Config::$modSettings['requirePolicyAgreement']))
+
+		if ($current_step == 1) {
+			if (!empty(Config::$modSettings['requireAgreement']) && !empty(Config::$modSettings['requirePolicyAgreement'])) {
 				$agree_txt_key = 'agreement_policy_';
-			elseif (!empty(Config::$modSettings['requireAgreement']))
+			} elseif (!empty(Config::$modSettings['requireAgreement'])) {
 				$agree_txt_key = 'agreement_';
-			elseif (!empty(Config::$modSettings['requirePolicyAgreement']))
+			} elseif (!empty(Config::$modSettings['requirePolicyAgreement'])) {
 				$agree_txt_key = 'policy_';
+			}
 		}
 
 		// Under age restrictions?
-		if (Utils::$context['show_coppa'])
-		{
+		if (Utils::$context['show_coppa']) {
 			Utils::$context['skip_coppa'] = false;
 			Utils::$context['coppa_agree_above'] = sprintf(Lang::$txt[$agree_txt_key . 'agree_coppa_above'], Config::$modSettings['coppaAge']);
 			Utils::$context['coppa_agree_below'] = sprintf(Lang::$txt[$agree_txt_key . 'agree_coppa_below'], Config::$modSettings['coppaAge']);
-		}
-		elseif ($agree_txt_key != '')
+		} elseif ($agree_txt_key != '') {
 			Utils::$context['agree'] = Lang::$txt[$agree_txt_key . 'agree'];
+		}
 
 		// Does this user agree to the registration agreement?
-		if ($current_step == 1 && (isset($_POST['accept_agreement']) || isset($_POST['accept_agreement_coppa'])))
-		{
+		if ($current_step == 1 && (isset($_POST['accept_agreement']) || isset($_POST['accept_agreement_coppa']))) {
 			Utils::$context['registration_passed_agreement'] = $_SESSION['registration_agreed'] = true;
 			$current_step = 2;
 
 			// Skip the coppa procedure if the user says he's old enough.
-			if (Utils::$context['show_coppa'])
-			{
+			if (Utils::$context['show_coppa']) {
 				$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
 
 				// Are they saying they're under age, while under age registration is disabled?
-				if (empty(Config::$modSettings['coppaType']) && empty($_SESSION['skip_coppa']))
-				{
+				if (empty(Config::$modSettings['coppaType']) && empty($_SESSION['skip_coppa'])) {
 					Lang::load('Login');
-					ErrorHandler::fatalLang('under_age_registration_prohibited', false, array(Config::$modSettings['coppaAge']));
+					ErrorHandler::fatalLang('under_age_registration_prohibited', false, [Config::$modSettings['coppaAge']]);
 				}
 			}
 		}
 		// Make sure they don't squeeze through without agreeing.
-		elseif ($current_step > 1 && (!empty(Config::$modSettings['requireAgreement']) || !empty(Config::$modSettings['requirePolicyAgreement'])) && !Utils::$context['registration_passed_agreement'])
+		elseif ($current_step > 1 && (!empty(Config::$modSettings['requireAgreement']) || !empty(Config::$modSettings['requirePolicyAgreement'])) && !Utils::$context['registration_passed_agreement']) {
 			$current_step = 1;
+		}
 
 		// Show the user the right form.
 		Utils::$context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form';
 		Utils::$context['page_title'] = $current_step == 1 ? Lang::$txt['registration_agreement'] : Lang::$txt['registration_form'];
 
 		// Kinda need this.
-		if (Utils::$context['sub_template'] == 'registration_form')
-			Theme::loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register');
+		if (Utils::$context['sub_template'] == 'registration_form') {
+			Theme::loadJavaScriptFile('register.js', ['defer' => false, 'minimize' => true], 'smf_register');
+		}
 
 		// Add the register chain to the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=signup',
 			'name' => Lang::$txt['register'],
-		);
+		];
 
 		// Prepare the time gate! Do it like so, in case later steps want to reset the limit for any reason, but make sure the time is the current one.
-		if (!isset($_SESSION['register']))
-			$_SESSION['register'] = array(
+		if (!isset($_SESSION['register'])) {
+			$_SESSION['register'] = [
 				'timenow' => time(),
 				'limit' => 10, // minimum number of seconds required on this page for registration
-			);
-		else
+			];
+		} else {
 			$_SESSION['register']['timenow'] = time();
+		}
 
 		// If you have to agree to the agreement, it needs to be fetched from the file.
-		if (!empty(Config::$modSettings['requireAgreement']))
-		{
+		if (!empty(Config::$modSettings['requireAgreement'])) {
 			// Have we got a localized one?
-			if (file_exists(Config::$boarddir . '/agreement.' . User::$me->language . '.txt'))
+			if (file_exists(Config::$boarddir . '/agreement.' . User::$me->language . '.txt')) {
 				Utils::$context['agreement'] = BBCodeParser::load()->parse(file_get_contents(Config::$boarddir . '/agreement.' . User::$me->language . '.txt'), true, 'agreement_' . User::$me->language);
-			elseif (file_exists(Config::$boarddir . '/agreement.txt'))
+			} elseif (file_exists(Config::$boarddir . '/agreement.txt')) {
 				Utils::$context['agreement'] = BBCodeParser::load()->parse(file_get_contents(Config::$boarddir . '/agreement.txt'), true, 'agreement');
-			else
+			} else {
 				Utils::$context['agreement'] = '';
+			}
 
 			// Nothing to show, lets disable registration and inform the admin of this error
-			if (empty(Utils::$context['agreement']))
-			{
+			if (empty(Utils::$context['agreement'])) {
 				// No file found or a blank file, log the error so the admin knows there is a problem!
 				ErrorHandler::log(Lang::$txt['registration_agreement_missing'], 'critical');
 				ErrorHandler::fatalLang('registration_disabled', false);
@@ -222,35 +221,33 @@ public function show(): void
 		$prefs = Notify::getNotifyPrefs(0, 'announcements');
 		Utils::$context['notify_announcements'] = !empty($prefs[0]['announcements']);
 
-		if (!empty(Config::$modSettings['userLanguage']))
-		{
+		if (!empty(Config::$modSettings['userLanguage'])) {
 			$selectedLanguage = empty($_SESSION['language']) ? Lang::$default : $_SESSION['language'];
 
 			// Do we have any languages?
-			if (empty(Utils::$context['languages']))
+			if (empty(Utils::$context['languages'])) {
 				Lang::get();
+			}
 
 			// Try to find our selected language.
-			foreach (Utils::$context['languages'] as $key => $lang)
-			{
-				Utils::$context['languages'][$key]['name'] = strtr($lang['name'], array('-utf8' => ''));
+			foreach (Utils::$context['languages'] as $key => $lang) {
+				Utils::$context['languages'][$key]['name'] = strtr($lang['name'], ['-utf8' => '']);
 
 				// Found it!
-				if ($selectedLanguage == $lang['filename'])
+				if ($selectedLanguage == $lang['filename']) {
 					Utils::$context['languages'][$key]['selected'] = true;
+				}
 			}
 		}
 
 		// If you have to agree to the privacy policy, it needs to be loaded from the database.
-		if (!empty(Config::$modSettings['requirePolicyAgreement']))
-		{
+		if (!empty(Config::$modSettings['requirePolicyAgreement'])) {
 			// Have we got a localized one?
-			if (!empty(Config::$modSettings['policy_' . User::$me->language]))
+			if (!empty(Config::$modSettings['policy_' . User::$me->language])) {
 				Utils::$context['privacy_policy'] = BBCodeParser::load()->parse(Config::$modSettings['policy_' . User::$me->language]);
-			elseif (!empty(Config::$modSettings['policy_' . Lang::$default]))
+			} elseif (!empty(Config::$modSettings['policy_' . Lang::$default])) {
 				Utils::$context['privacy_policy'] = BBCodeParser::load()->parse(Config::$modSettings['policy_' . Lang::$default]);
-			else
-			{
+			} else {
 				// None was found; log the error so the admin knows there is a problem!
 				ErrorHandler::log(Lang::$txt['registration_policy_missing'], 'critical');
 				ErrorHandler::fatalLang('registration_disabled', false);
@@ -262,9 +259,8 @@ public function show(): void
 		Profile::$member->loadCustomFields('register');
 
 		// Or any standard ones?
-		if (!empty(Config::$modSettings['registration_fields']))
-		{
-			require_once(Config::$sourcedir . '/Profile-Modify.php');
+		if (!empty(Config::$modSettings['registration_fields'])) {
+			require_once Config::$sourcedir . '/Profile-Modify.php';
 
 			// Setup some important context.
 			Lang::load('Profile');
@@ -273,47 +269,54 @@ public function show(): void
 			User::$me->is_owner = true;
 
 			// Here, and here only, emulate the permissions the user would have to do this.
-			User::$me->permissions = array_merge(User::$me->permissions, array('profile_account_own', 'profile_extra_own', 'profile_other_own', 'profile_password_own', 'profile_website_own', 'profile_blurb'));
+			User::$me->permissions = array_merge(User::$me->permissions, ['profile_account_own', 'profile_extra_own', 'profile_other_own', 'profile_password_own', 'profile_website_own', 'profile_blurb']);
 			$reg_fields = explode(',', Config::$modSettings['registration_fields']);
 
 			// Website is a little different
-			if (in_array('website', $reg_fields))
-			{
+			if (in_array('website', $reg_fields)) {
 				unset($reg_fields['website']);
-				if (isset($_POST['website_title']))
+
+				if (isset($_POST['website_title'])) {
 					User::$profiles[User::$me->id]['website_title'] = Utils::htmlspecialchars($_POST['website_title']);
-				if (isset($_POST['website_url']))
+				}
+
+				if (isset($_POST['website_url'])) {
 					User::$profiles[User::$me->id]['website_url'] = Utils::htmlspecialchars($_POST['website_url']);
+				}
 			}
 
 			// We might have had some submissions on this front - go check.
-			foreach ($reg_fields as $field)
-				if (isset($_POST[$field]))
+			foreach ($reg_fields as $field) {
+				if (isset($_POST[$field])) {
 					User::$profiles[User::$me->id][$field] = Utils::htmlspecialchars($_POST[$field]);
+				}
+			}
 
 			// Load all the fields in question.
 			Profile::$member->setupContext($reg_fields);
 		}
 
 		// Generate a visual verification code to make sure the user is no bot.
-		if (!empty(Config::$modSettings['reg_verification']))
-		{
-			$verifier = new Verifier(array('id' => 'register'));
+		if (!empty(Config::$modSettings['reg_verification'])) {
+			$verifier = new Verifier(['id' => 'register']);
 		}
 		// Otherwise we have nothing to show.
-		else
+		else {
 			Utils::$context['visual_verification'] = false;
+		}
 
-		Utils::$context += array(
+		Utils::$context += [
 			'username' => isset($_POST['user']) ? Utils::htmlspecialchars($_POST['user']) : '',
 			'email' => isset($_POST['email']) ? Utils::htmlspecialchars($_POST['email']) : '',
 			'notify_announcements' => !empty($_POST['notify_announcements']) ? 1 : 0,
-		);
+		];
 
 		// Were there any errors?
-		Utils::$context['registration_errors'] = array();
-		if (!empty($this->errors))
+		Utils::$context['registration_errors'] = [];
+
+		if (!empty($this->errors)) {
 			Utils::$context['registration_errors'] = $this->errors;
+		}
 
 		SecurityToken::create('register');
 	}
@@ -330,7 +333,7 @@ public function checkUsername()
 		Utils::$context['valid_username'] = true;
 
 		// Clean it up like mother would.
-		Utils::$context['checked_username'] = trim(Utils::normalizeSpaces(Utils::sanitizeChars(Utils::$context['checked_username'], 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
+		Utils::$context['checked_username'] = trim(Utils::normalizeSpaces(Utils::sanitizeChars(Utils::$context['checked_username'], 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
 
 		$errors = User::validateUsername(0, Utils::$context['checked_username'], true);
 
@@ -348,8 +351,9 @@ public function checkUsername()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -367,7 +371,7 @@ public static function call(): void
 	 *
 	 * @param array $reg_errors Holds information about any errors that occurred.
 	 */
-	public static function register($reg_errors = array()): void
+	public static function register($reg_errors = []): void
 	{
 		self::load();
 		self::$obj->subaction = 'show';
@@ -384,13 +388,15 @@ public static function register($reg_errors = array()): void
 	 */
 	protected function __construct()
 	{
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Register::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Register::exportStatic')) {
 	Register::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Register2.php b/Sources/Actions/Register2.php
index 85984e6f8d..72a5cf6f20 100644
--- a/Sources/Actions/Register2.php
+++ b/Sources/Actions/Register2.php
@@ -14,14 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\Cookie;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Logging;
+use SMF\Mail;
 use SMF\Profile;
 use SMF\Security;
 use SMF\SecurityToken;
@@ -32,7 +33,6 @@
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Actually registers the new member.
@@ -46,12 +46,12 @@ class Register2 extends Register
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Register2',
-		),
-	);
+			'registerMember' => 'registerMember',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -62,7 +62,7 @@ class Register2 extends Register
 	 *
 	 * Registration fields that take strings.
 	 */
-	public array $possible_strings = array(
+	public array $possible_strings = [
 		'birthdate',
 		'timezone',
 		'buddy_list',
@@ -73,34 +73,34 @@ class Register2 extends Register
 		'lngfile',
 		'secret_question',
 		'secret_answer',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Registration fields that take integers.
 	 */
-	public array $possible_ints = array(
+	public array $possible_ints = [
 		'id_theme',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Registration fields that take floats.
 	 */
-	public array $possible_floats = array(
+	public array $possible_floats = [
 		'time_offset',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Registration fields that take booleans.
 	 */
-	public array $possible_bools = array(
+	public array $possible_bools = [
 		'show_online',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -127,158 +127,146 @@ public function execute(): void
 		SecurityToken::validate('register');
 
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
+		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 			ErrorHandler::fatalLang('register_ssl_required');
+		}
 
 		// You can't register if it's disabled.
-		if (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 3)
+		if (!empty(Config::$modSettings['registration_method']) && Config::$modSettings['registration_method'] == 3) {
 			ErrorHandler::fatalLang('registration_disabled', false);
+		}
 
 		// Well, if you don't agree, you can't register.
-		if ((!empty(Config::$modSettings['requireAgreement']) || !empty(Config::$modSettings['requirePolicyAgreement'])) && empty($_SESSION['registration_agreed']))
+		if ((!empty(Config::$modSettings['requireAgreement']) || !empty(Config::$modSettings['requirePolicyAgreement'])) && empty($_SESSION['registration_agreed'])) {
 			Utils::redirectexit();
+		}
 
 		// Make sure they came from *somewhere*, have a session.
-		if (!isset($_SESSION['old_url']))
+		if (!isset($_SESSION['old_url'])) {
 			Utils::redirectexit('action=signup');
+		}
 
 		// If we require neither an agreement nor a privacy policy, we need a extra check for coppa.
-		if (empty(Config::$modSettings['requireAgreement']) && empty(Config::$modSettings['requirePolicyAgreement']) && !empty(Config::$modSettings['coppaAge']))
-		{
+		if (empty(Config::$modSettings['requireAgreement']) && empty(Config::$modSettings['requirePolicyAgreement']) && !empty(Config::$modSettings['coppaAge'])) {
 			$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
 		}
 
 		// Are they under age, and under age users are banned?
-		if (!empty(Config::$modSettings['coppaAge']) && empty(Config::$modSettings['coppaType']) && empty($_SESSION['skip_coppa']))
-		{
+		if (!empty(Config::$modSettings['coppaAge']) && empty(Config::$modSettings['coppaType']) && empty($_SESSION['skip_coppa'])) {
 			Lang::load('Errors');
-			ErrorHandler::fatalLang('under_age_registration_prohibited', false, array(Config::$modSettings['coppaAge']));
+			ErrorHandler::fatalLang('under_age_registration_prohibited', false, [Config::$modSettings['coppaAge']]);
 		}
 
 		// Check the time gate for miscreants. First make sure they came from somewhere that actually set it up.
-		if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit']))
+		if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) {
 			Utils::redirectexit('action=signup');
+		}
 
 		// Failing that, check the time on it.
-		if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit'])
-		{
+		if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit']) {
 			Lang::load('Errors');
 			$this->errors[] = Lang::$txt['error_too_quickly'];
 		}
 
 		// Check whether the visual verification code was entered correctly.
-		if (!empty(Config::$modSettings['reg_verification']))
-		{
-			$verifier = new Verifier(array('id' => 'register'));
+		if (!empty(Config::$modSettings['reg_verification'])) {
+			$verifier = new Verifier(['id' => 'register']);
 
-			if (!empty($verifier->errors))
-			{
+			if (!empty($verifier->errors)) {
 				Lang::load('Errors');
 
-				foreach ($verifier->errors as $error)
+				foreach ($verifier->errors as $error) {
 					$this->errors[] = Lang::$txt['error_' . $error];
+				}
 			}
 		}
 
 		array_walk_recursive(
 			$_POST,
-			function (&$value, $key)
-			{
+			function (&$value, $key) {
 				// Normalize Unicode characters. (Does nothing if not in UTF-8 mode.)
 				$value = Utils::normalize($value);
 
 				// Replace any kind of space or illegal character with a normal space, and then trim.
-				$value = Utils::htmlTrim(Utils::normalizeSpaces(Utils::sanitizeChars($value, 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
-			}
+				$value = Utils::htmlTrim(Utils::normalizeSpaces(Utils::sanitizeChars($value, 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
+			},
 		);
 
 		// We may want to add certain things to these if selected in the admin panel.
-		if (!empty(Config::$modSettings['registration_fields']))
-		{
+		if (!empty(Config::$modSettings['registration_fields'])) {
 			$reg_fields = explode(',', Config::$modSettings['registration_fields']);
 
 			// Website is a little different
-			if (in_array('website', $reg_fields))
-			{
-				$this->possible_strings = array_merge(array('website_url', 'website_title'), $this->possible_strings);
+			if (in_array('website', $reg_fields)) {
+				$this->possible_strings = array_merge(['website_url', 'website_title'], $this->possible_strings);
 
 				// Make sure their website URL is squeaky clean
-				if (isset($_POST['website_url']))
-				{
+				if (isset($_POST['website_url'])) {
 					$_POST['website_url'] = (string) Url::create($_POST['website_url'], true)->validate();
 				}
 			}
 		}
 
-		if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '')
+		if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') {
 			$_POST['secret_answer'] = Security::hashPassword($_POST['user'], $_POST['secret_answer']);
+		}
 
 		// Maybe you want set the displayed name during registration
-		if (isset($_POST['real_name']))
-		{
+		if (isset($_POST['real_name'])) {
 			// Are you already allowed to edit the displayed name?
-			if (User::$me->allowedTo('profile_displayed_name') || User::$me->allowedTo('moderate_forum'))
-			{
+			if (User::$me->allowedTo('profile_displayed_name') || User::$me->allowedTo('moderate_forum')) {
 				$can_edit_display_name = true;
 			}
 			// If you are a guest, will you be allowed to once you register?
-			else
-			{
-				$request = Db::$db->query('', '
-					SELECT add_deny
+			else {
+				$request = Db::$db->query(
+					'',
+					'SELECT add_deny
 					FROM {db_prefix}permissions
 					WHERE id_group = {int:id_group} AND permission = {string:permission}',
-					array(
+					[
 						'id_group' => 0,
 						'permission' => 'profile_displayed_name_own',
-					)
+					],
 				);
 				list($can_edit_display_name) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 			}
 
 			// Only set it if you can and if we are sure it is good
-			if ($can_edit_display_name && Utils::htmlTrim($_POST['real_name']) != '' && !User::isReservedName($_POST['real_name']) && Utils::entityStrlen($_POST['real_name']) < 60)
-			{
+			if ($can_edit_display_name && Utils::htmlTrim($_POST['real_name']) != '' && !User::isReservedName($_POST['real_name']) && Utils::entityStrlen($_POST['real_name']) < 60) {
 				$this->possible_strings[] = 'real_name';
 			}
 		}
 
 		// Handle a string as a birthdate...
-		if (isset($_POST['birthdate']) && $_POST['birthdate'] != '')
-		{
+		if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') {
 			$_POST['birthdate'] = Time::strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
 		}
 		// Or birthdate parts...
-		elseif (!empty($_POST['bday1']) && !empty($_POST['bday2']))
-		{
+		elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) {
 			$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
 		}
 
 		// Validate the passed language file.
-		if (isset($_POST['lngfile']) && !empty(Config::$modSettings['userLanguage']))
-		{
+		if (isset($_POST['lngfile']) && !empty(Config::$modSettings['userLanguage'])) {
 			// Do we have any languages?
-			if (empty(Utils::$context['languages']))
+			if (empty(Utils::$context['languages'])) {
 				Lang::get();
+			}
 
 			// Did we find it?
-			if (isset(Utils::$context['languages'][$_POST['lngfile']]))
-			{
+			if (isset(Utils::$context['languages'][$_POST['lngfile']])) {
 				$_SESSION['language'] = $_POST['lngfile'];
-			}
-			else
-			{
+			} else {
 				unset($_POST['lngfile']);
 			}
-		}
-		else
-		{
+		} else {
 			unset($_POST['lngfile']);
 		}
 
 		// Set the options needed for registration.
-		$reg_options = array(
+		$reg_options = [
 			'interface' => 'guest',
 			'username' => !empty($_POST['user']) ? $_POST['user'] : '',
 			'email' => !empty($_POST['email']) ? $_POST['email'] : '',
@@ -289,134 +277,133 @@ function (&$value, $key)
 			'check_email_ban' => true,
 			'send_welcome_email' => !empty(Config::$modSettings['send_welcomeEmail']),
 			'require' => !empty(Config::$modSettings['coppaAge']) && empty($_SESSION['skip_coppa']) ? 'coppa' : (empty(Config::$modSettings['registration_method']) ? 'nothing' : (Config::$modSettings['registration_method'] == 1 ? 'activation' : 'approval')),
-			'extra_register_vars' => array(),
-			'theme_vars' => array(),
-		);
+			'extra_register_vars' => [],
+			'theme_vars' => [],
+		];
 
 		// Include the additional options that might have been filled in.
-		foreach ($this->possible_strings as $var)
-		{
-			if (isset($_POST[$var]))
+		foreach ($this->possible_strings as $var) {
+			if (isset($_POST[$var])) {
 				$reg_options['extra_register_vars'][$var] = Utils::htmlspecialchars($_POST[$var], ENT_QUOTES);
+			}
 		}
 
-		foreach ($this->possible_ints as $var)
-		{
-			if (isset($_POST[$var]))
+		foreach ($this->possible_ints as $var) {
+			if (isset($_POST[$var])) {
 				$reg_options['extra_register_vars'][$var] = (int) $_POST[$var];
+			}
 		}
 
-		foreach ($this->possible_floats as $var)
-		{
-			if (isset($_POST[$var]))
+		foreach ($this->possible_floats as $var) {
+			if (isset($_POST[$var])) {
 				$reg_options['extra_register_vars'][$var] = (float) $_POST[$var];
+			}
 		}
 
-		foreach ($this->possible_bools as $var)
-		{
-			if (isset($_POST[$var]))
+		foreach ($this->possible_bools as $var) {
+			if (isset($_POST[$var])) {
 				$reg_options['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1;
+			}
 		}
 
 		// Registration options are always default options...
-		if (isset($_POST['default_options']))
-		{
+		if (isset($_POST['default_options'])) {
 			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
 		}
 
-		$reg_options['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array();
+		$reg_options['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : [];
 
 		// Note when they accepted the agreement and privacy policy
-		if (!empty(Config::$modSettings['requireAgreement']))
+		if (!empty(Config::$modSettings['requireAgreement'])) {
 			$reg_options['theme_vars']['agreement_accepted'] = time();
+		}
 
-		if (!empty(Config::$modSettings['requirePolicyAgreement']))
+		if (!empty(Config::$modSettings['requirePolicyAgreement'])) {
 			$reg_options['theme_vars']['policy_accepted'] = time();
+		}
 
 		// Make sure they are clean, dammit!
 		$reg_options['theme_vars'] = Utils::htmlspecialcharsRecursive($reg_options['theme_vars']);
 
 		// Check whether we have fields that simply MUST be displayed?
-		$request = Db::$db->query('', '
-			SELECT col_name, field_name, field_type, field_length, mask, show_reg
+		$request = Db::$db->query(
+			'',
+			'SELECT col_name, field_name, field_type, field_length, mask, show_reg
 			FROM {db_prefix}custom_fields
 			WHERE active = {int:is_active}
 			ORDER BY field_order',
-			array(
+			[
 				'is_active' => 1,
-			)
+			],
 		);
-		$custom_field_errors = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$custom_field_errors = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Don't allow overriding of the theme variables.
-			if (isset($reg_options['theme_vars'][$row['col_name']]))
+			if (isset($reg_options['theme_vars'][$row['col_name']])) {
 				unset($reg_options['theme_vars'][$row['col_name']]);
+			}
 
 			// Not actually showing it then?
-			if (!$row['show_reg'])
+			if (!$row['show_reg']) {
 				continue;
+			}
 
 			// Prepare the value!
 			$value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : '';
 
 			// We only care for text fields as the others are valid to be empty.
-			if (!in_array($row['field_type'], array('check', 'select', 'radio')))
-			{
+			if (!in_array($row['field_type'], ['check', 'select', 'radio'])) {
 				// Is it too long?
-				if ($row['field_length'] && $row['field_length'] < Utils::entityStrlen($value))
-					$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+				if ($row['field_length'] && $row['field_length'] < Utils::entityStrlen($value)) {
+					$custom_field_errors[] = ['custom_field_too_long', [$row['field_name'], $row['field_length']]];
+				}
 
 				// Any masks to apply?
-				if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
-				{
-					if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
-					{
-						$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
-					}
-					elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value))
-					{
-						$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
-					}
-					elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
-					{
-						$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none') {
+					if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) {
+						$custom_field_errors[] = ['custom_field_invalid_email', [$row['field_name']]];
+					} elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) {
+						$custom_field_errors[] = ['custom_field_not_number', [$row['field_name']]];
+					} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) {
+						$custom_field_errors[] = ['custom_field_inproper_format', [$row['field_name']]];
 					}
 				}
 			}
 
 			// Is this required but not there?
-			if (trim($value) == '' && $row['show_reg'] > 1)
-				$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+			if (trim($value) == '' && $row['show_reg'] > 1) {
+				$custom_field_errors[] = ['custom_field_empty', [$row['field_name']]];
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Process any errors.
-		if (!empty($custom_field_errors))
-		{
+		if (!empty($custom_field_errors)) {
 			Lang::load('Errors');
 
-			foreach ($custom_field_errors as $error)
+			foreach ($custom_field_errors as $error) {
 				$this->errors[] = vsprintf(Lang::$txt['error_' . $error[0]], (array) $error[1]);
+			}
 		}
 
 		// Lets check for other errors before trying to register the member.
-		if (!empty($this->errors))
-		{
+		if (!empty($this->errors)) {
 			$_REQUEST['step'] = 2;
 			$_SESSION['register']['limit'] = 5; // If they've filled in some details, they won't need the full 10 seconds of the limit.
 			$this->show();
+
 			return;
 		}
 
 		$member_id = self::registerMember($reg_options, true);
 
 		// What there actually an error of some kind dear boy?
-		if (is_array($member_id))
-		{
+		if (is_array($member_id)) {
 			$this->errors = array_merge($this->errors, $member_id);
 			$_REQUEST['step'] = 2;
 			$this->show();
+
 			return;
 		}
 
@@ -429,39 +416,33 @@ function (&$value, $key)
 		$pref = !empty($prefs[$member_id]['announcements']);
 
 		// Don't update if the default is the same.
-		if ($var != $pref)
-		{
-			setNotifyPrefs($member_id, array('announcements' => (int) !empty($_POST['notify_announcements'])));
+		if ($var != $pref) {
+			Notify::setNotifyPrefs($member_id, ['announcements' => (int) !empty($_POST['notify_announcements'])]);
 		}
 
 		// We'll do custom fields after as then we get to use the helper function!
-		if (!empty($_POST['customfield']))
-		{
+		if (!empty($_POST['customfield'])) {
 			Profile::load($member_id);
 			Profile::$member->loadCustomFields('register');
 			Profile::$member->save();
 		}
 
 		// If COPPA has been selected then things get complicated, setup the template.
-		if (!empty(Config::$modSettings['coppaAge']) && empty($_SESSION['skip_coppa']))
-		{
+		if (!empty(Config::$modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) {
 			Utils::redirectexit('action=coppa;member=' . $member_id);
 		}
 		// Basic template variable setup.
-		elseif (!empty(Config::$modSettings['registration_method']))
-		{
+		elseif (!empty(Config::$modSettings['registration_method'])) {
 			Theme::loadTemplate('Register');
 
-			Utils::$context += array(
+			Utils::$context += [
 				'page_title' => Lang::$txt['register'],
 				'title' => Lang::$txt['registration_successful'],
 				'sub_template' => 'after',
-				'description' => Config::$modSettings['registration_method'] == 2 ? Lang::$txt['approval_after_registration'] : Lang::$txt['activate_after_registration']
-			);
-		}
-		else
-		{
-			IntegrationHook::call('integrate_activate', array($reg_options['username']));
+				'description' => Config::$modSettings['registration_method'] == 2 ? Lang::$txt['approval_after_registration'] : Lang::$txt['activate_after_registration'],
+			];
+		} else {
+			IntegrationHook::call('integrate_activate', [$reg_options['username']]);
 
 			Cookie::setLoginCookie(60 * Config::$modSettings['cookieTime'], $member_id, Cookie::encrypt($reg_options['register_vars']['passwd'], $reg_options['register_vars']['password_salt']));
 
@@ -480,8 +461,9 @@ function (&$value, $key)
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -514,143 +496,139 @@ public static function registerMember(&$reg_options, $return_errors = false)
 		Lang::load('Login');
 
 		// Put any errors in here.
-		$reg_errors = array();
+		$reg_errors = [];
 
 		// Registration from the admin center, let them sweat a little more.
-		if ($reg_options['interface'] == 'admin')
-		{
+		if ($reg_options['interface'] == 'admin') {
 			User::$me->kickIfGuest();
 			User::$me->isAllowedTo('moderate_forum');
 		}
 		// If you're an admin, you're special ;).
-		elseif ($reg_options['interface'] == 'guest')
-		{
+		elseif ($reg_options['interface'] == 'guest') {
 			// You cannot register twice...
-			if (empty(User::$me->is_guest))
+			if (empty(User::$me->is_guest)) {
 				Utils::redirectexit();
+			}
 
 			// Make sure they didn't just register with this session.
-			if (!empty($_SESSION['just_registered']) && empty(Config::$modSettings['disableRegisterCheck']))
+			if (!empty($_SESSION['just_registered']) && empty(Config::$modSettings['disableRegisterCheck'])) {
 				ErrorHandler::fatalLang('register_only_once', false);
+			}
 		}
 
 		// Spaces and other odd characters are evil...
-		$reg_options['username'] = trim(Utils::normalizeSpaces(Utils::sanitizeChars($reg_options['username'], 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
+		$reg_options['username'] = trim(Utils::normalizeSpaces(Utils::sanitizeChars($reg_options['username'], 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
 
 		// Convert character encoding for non-utf8mb4 database
 		$reg_options['username'] = Utils::htmlspecialchars($reg_options['username']);
 
 		// @todo Separate the sprintf?
-		if (empty($reg_options['email']) || !filter_var($reg_options['email'], FILTER_VALIDATE_EMAIL) || strlen($reg_options['email']) > 255)
-		{
-			$reg_errors[] = array('lang', 'profile_error_bad_email');
+		if (empty($reg_options['email']) || !filter_var($reg_options['email'], FILTER_VALIDATE_EMAIL) || strlen($reg_options['email']) > 255) {
+			$reg_errors[] = ['lang', 'profile_error_bad_email'];
 		}
 
 		$username_validation_errors = User::validateUsername(0, $reg_options['username'], true, !empty($reg_options['check_reserved_name']));
 
-		if (!empty($username_validation_errors))
+		if (!empty($username_validation_errors)) {
 			$reg_errors = array_merge($reg_errors, $username_validation_errors);
+		}
 
 		// Generate a validation code if it's supposed to be emailed.
 		$validation_code = '';
 
-		if ($reg_options['require'] == 'activation')
+		if ($reg_options['require'] == 'activation') {
 			$validation_code = User::generateValidationCode();
+		}
 
 		// If you haven't put in a password generate one.
-		if ($reg_options['interface'] == 'admin' && $reg_options['password'] == '')
-		{
+		if ($reg_options['interface'] == 'admin' && $reg_options['password'] == '') {
 			$reg_options['password'] = User::generateValidationCode();
 			$reg_options['password_check'] = $reg_options['password'];
 		}
 		// Does the first password match the second?
-		elseif ($reg_options['password'] != $reg_options['password_check'])
-		{
-			$reg_errors[] = array('lang', 'passwords_dont_match');
+		elseif ($reg_options['password'] != $reg_options['password_check']) {
+			$reg_errors[] = ['lang', 'passwords_dont_match'];
 		}
 
 		// That's kind of easy to guess...
-		if ($reg_options['password'] == '')
-		{
-			$reg_errors[] = array('lang', 'no_password');
+		if ($reg_options['password'] == '') {
+			$reg_errors[] = ['lang', 'no_password'];
 		}
 
 		// Now perform hard password validation as required.
-		if (!empty($reg_options['check_password_strength']) && $reg_options['password'] != '')
-		{
-			$password_error = User::validatePassword($reg_options['password'], $reg_options['username'], array($reg_options['email']));
+		if (!empty($reg_options['check_password_strength']) && $reg_options['password'] != '') {
+			$password_error = User::validatePassword($reg_options['password'], $reg_options['username'], [$reg_options['email']]);
 
 			// Password isn't legal?
-			if ($password_error != null)
-			{
-				$error_code = array('lang', 'profile_error_password_' . $password_error, false);
+			if ($password_error != null) {
+				$error_code = ['lang', 'profile_error_password_' . $password_error, false];
 
-				if ($password_error == 'short')
-					$error_code[] = array(empty(Config::$modSettings['password_strength']) ? 4 : 8);
+				if ($password_error == 'short') {
+					$error_code[] = [empty(Config::$modSettings['password_strength']) ? 4 : 8];
+				}
 
 				$reg_errors[] = $error_code;
 			}
 		}
 
 		// You may not be allowed to register this email.
-		if (!empty($reg_options['check_email_ban']))
-		{
+		if (!empty($reg_options['check_email_ban'])) {
 			User::isBannedEmail($reg_options['email'], 'cannot_register', Lang::$txt['ban_register_prohibited']);
 		}
 
 		// Check if the email address is in use.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}members
 			WHERE email_address = {string:email_address}
 				OR email_address = {string:username}
 			LIMIT 1',
-			array(
+			[
 				'email_address' => $reg_options['email'],
 				'username' => $reg_options['username'],
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) != 0)
-		{
-			$reg_errors[] = array('lang', 'email_in_use', false, array(Utils::htmlspecialchars($reg_options['email'])));
+
+		if (Db::$db->num_rows($request) != 0) {
+			$reg_errors[] = ['lang', 'email_in_use', false, [Utils::htmlspecialchars($reg_options['email'])]];
 		}
 		Db::$db->free_result($request);
 
 		// Perhaps someone else wants to check this user.
-		IntegrationHook::call('integrate_register_check', array(&$reg_options, &$reg_errors));
+		IntegrationHook::call('integrate_register_check', [&$reg_options, &$reg_errors]);
 
 		// If we found any errors we need to do something about it right away!
-		foreach ($reg_errors as $key => $error)
-		{
+		foreach ($reg_errors as $key => $error) {
 			/* Note for each error:
 				0 = 'lang' if it's an index, 'done' if it's clear text.
 				1 = The text/index.
 				2 = Whether to log.
 				3 = sprintf data if necessary. */
-			if ($error[0] == 'lang')
+			if ($error[0] == 'lang') {
 				Lang::load('Errors');
+			}
 
 			$message = $error[0] == 'lang' ? (empty($error[3]) ? Lang::$txt[$error[1]] : vsprintf(Lang::$txt[$error[1]], (array) $error[3])) : $error[1];
 
 			// What to do, what to do, what to do.
-			if ($return_errors)
-			{
-				if (!empty($error[2]))
+			if ($return_errors) {
+				if (!empty($error[2])) {
 					ErrorHandler::log($message, $error[2]);
+				}
 
 				$reg_errors[$key] = $message;
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatal($message, empty($error[2]) ? false : $error[2]);
 			}
 		}
 
 		// If there's any errors left return them at once!
-		if (!empty($reg_errors))
+		if (!empty($reg_errors)) {
 			return $reg_errors;
+		}
 
-		$reserved_vars = array(
+		$reserved_vars = [
 			'actual_theme_url',
 			'actual_images_url',
 			'base_theme_dir',
@@ -667,16 +645,15 @@ public static function registerMember(&$reg_options, $return_errors = false)
 			'theme_layers',
 			'theme_templates',
 			'theme_url',
-		);
+		];
 
 		// Can't change reserved vars.
-		if (isset($reg_options['theme_vars']) && count(array_intersect(array_keys($reg_options['theme_vars']), $reserved_vars)) != 0)
-		{
+		if (isset($reg_options['theme_vars']) && count(array_intersect(array_keys($reg_options['theme_vars']), $reserved_vars)) != 0) {
 			ErrorHandler::fatalLang('no_theme');
 		}
 
 		// Some of these might be overwritten. (the lower ones that are in the arrays below.)
-		$reg_options['register_vars'] = array(
+		$reg_options['register_vars'] = [
 			'member_name' => $reg_options['username'],
 			'email_address' => $reg_options['email'],
 			'passwd' => Security::hashPassword($reg_options['username'], $reg_options['password']),
@@ -705,35 +682,30 @@ public static function registerMember(&$reg_options, $return_errors = false)
 			'ignore_boards' => '',
 			'smiley_set' => '',
 			'timezone' => empty(Config::$modSettings['default_timezone']) || !array_key_exists(Config::$modSettings['default_timezone'], TimeZone::list()) ? 'UTC' : Config::$modSettings['default_timezone'],
-		);
+		];
 
 		// Setup the activation status on this new account so it is correct - firstly is it an under age account?
-		if ($reg_options['require'] == 'coppa')
-		{
+		if ($reg_options['require'] == 'coppa') {
 			$reg_options['register_vars']['is_activated'] = 5;
 
 			// @todo This should be changed.  To what should be it be changed??
 			$reg_options['register_vars']['validation_code'] = '';
 		}
 		// Maybe it can be activated right away?
-		elseif ($reg_options['require'] == 'nothing')
-		{
+		elseif ($reg_options['require'] == 'nothing') {
 			$reg_options['register_vars']['is_activated'] = 1;
 		}
 		// Maybe it must be activated by email?
-		elseif ($reg_options['require'] == 'activation')
-		{
+		elseif ($reg_options['require'] == 'activation') {
 			$reg_options['register_vars']['is_activated'] = 0;
 		}
 		// Otherwise it must be awaiting approval!
-		else
-		{
+		else {
 			$reg_options['register_vars']['is_activated'] = 3;
 		}
 
 		// Check if this group is assignable.
-		if (isset($reg_options['memberGroup']))
-		{
+		if (isset($reg_options['memberGroup'])) {
 			$reg_options['register_vars']['id_group'] = in_array($reg_options['memberGroup'], Group::getUnassignable()) ? Group::REGULAR : $reg_options['memberGroup'];
 		}
 
@@ -742,64 +714,55 @@ public static function registerMember(&$reg_options, $return_errors = false)
 			!empty($reg_options['extra_register_vars'])
 			&& !empty($reg_options['extra_register_vars']['timezone'])
 			&& !array_key_exists($reg_options['extra_register_vars']['timezone'], TimeZone::list())
-		)
-		{
+		) {
 			unset($reg_options['extra_register_vars']['timezone']);
 		}
 
 		// Integrate optional member settings to be set.
-		if (!empty($reg_options['extra_register_vars']))
-		{
-			foreach ($reg_options['extra_register_vars'] as $var => $value)
+		if (!empty($reg_options['extra_register_vars'])) {
+			foreach ($reg_options['extra_register_vars'] as $var => $value) {
 				$reg_options['register_vars'][$var] = $value;
+			}
 		}
 
 		// Integrate optional user theme options to be set.
-		$theme_vars = array();
+		$theme_vars = [];
 
-		if (!empty($reg_options['theme_vars']))
-		{
-			foreach ($reg_options['theme_vars'] as $var => $value)
+		if (!empty($reg_options['theme_vars'])) {
+			foreach ($reg_options['theme_vars'] as $var => $value) {
 				$theme_vars[$var] = $value;
+			}
 		}
 
 		// Right, now let's prepare for insertion.
-		$known_ints = array(
+		$known_ints = [
 			'date_registered', 'posts', 'id_group', 'last_login', 'instant_messages', 'unread_messages',
 			'new_pm', 'pm_prefs', 'show_online',
 			'id_theme', 'is_activated', 'id_msg_last_visit', 'id_post_group', 'total_time_logged_in', 'warning',
-		);
-		$known_floats = array(
+		];
+		$known_floats = [
 			'time_offset',
-		);
-		$known_inets = array(
+		];
+		$known_inets = [
 			'member_ip', 'member_ip2',
-		);
+		];
 
 		// Call an optional function to validate the users' input.
-		IntegrationHook::call('integrate_register', array(&$reg_options, &$theme_vars, &$known_ints, &$known_floats));
+		IntegrationHook::call('integrate_register', [&$reg_options, &$theme_vars, &$known_ints, &$known_floats]);
 
-		$column_names = array();
-		$values = array();
+		$column_names = [];
+		$values = [];
 
-		foreach ($reg_options['register_vars'] as $var => $val)
-		{
+		foreach ($reg_options['register_vars'] as $var => $val) {
 			$type = 'string';
 
-			if (in_array($var, $known_ints))
-			{
+			if (in_array($var, $known_ints)) {
 				$type = 'int';
-			}
-			elseif (in_array($var, $known_floats))
-			{
+			} elseif (in_array($var, $known_floats)) {
 				$type = 'float';
-			}
-			elseif (in_array($var, $known_inets))
-			{
+			} elseif (in_array($var, $known_inets)) {
 				$type = 'inet';
-			}
-			elseif ($var == 'birthdate')
-			{
+			} elseif ($var == 'birthdate') {
 				$type = 'date';
 			}
 
@@ -808,70 +771,62 @@ public static function registerMember(&$reg_options, $return_errors = false)
 		}
 
 		// Register them into the database.
-		$member_id = Db::$db->insert('',
+		$member_id = Db::$db->insert(
+			'',
 			'{db_prefix}members',
 			$column_names,
 			$values,
-			array('id_member'),
-			1
+			['id_member'],
+			1,
 		);
 
 		// Call an optional function as notification of registration.
-		IntegrationHook::call('integrate_post_register', array(&$reg_options, &$theme_vars, &$member_id));
+		IntegrationHook::call('integrate_post_register', [&$reg_options, &$theme_vars, &$member_id]);
 
 		// Update the number of members and latest member's info - and pass the name, but remove the 's.
-		if ($reg_options['register_vars']['is_activated'] == 1)
-		{
+		if ($reg_options['register_vars']['is_activated'] == 1) {
 			Logging::updateStats('member', $member_id, $reg_options['register_vars']['real_name']);
-		}
-		else
-		{
+		} else {
 			Logging::updateStats('member');
 		}
 
 		// Theme variables too?
-		if (!empty($theme_vars))
-		{
-			$inserts = array();
+		if (!empty($theme_vars)) {
+			$inserts = [];
 
-			foreach ($theme_vars as $var => $val)
-				$inserts[] = array($member_id, $var, $val);
+			foreach ($theme_vars as $var => $val) {
+				$inserts[] = [$member_id, $var, $val];
+			}
 
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}themes',
-				array('id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
+				['id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
 				$inserts,
-				array('id_member', 'variable')
+				['id_member', 'variable'],
 			);
 		}
 
 		// Log their acceptance of the agreement and privacy policy, for future reference.
-		foreach (array('agreement_accepted', 'policy_accepted') as $key)
-		{
-			if (!empty($theme_vars[$key]))
-			{
-				Logging::logAction($key, array('member_affected' => $member_id, 'applicator' => $member_id), 'user');
+		foreach (['agreement_accepted', 'policy_accepted'] as $key) {
+			if (!empty($theme_vars[$key])) {
+				Logging::logAction($key, ['member_affected' => $member_id, 'applicator' => $member_id], 'user');
 			}
 		}
 
 		// If it's enabled, increase the registrations for today.
-		Logging::trackStats(array('registers' => '+'));
+		Logging::trackStats(['registers' => '+']);
 
 		// Administrative registrations are a bit different...
-		if ($reg_options['interface'] == 'admin')
-		{
-			if ($reg_options['require'] == 'activation')
-			{
+		if ($reg_options['interface'] == 'admin') {
+			if ($reg_options['require'] == 'activation') {
 				$email_message = 'admin_register_activate';
-			}
-			elseif (!empty($reg_options['send_welcome_email']))
-			{
+			} elseif (!empty($reg_options['send_welcome_email'])) {
 				$email_message = 'admin_register_immediate';
 			}
 
-			if (isset($email_message))
-			{
-				$replacements = array(
+			if (isset($email_message)) {
+				$replacements = [
 					'REALNAME' => $reg_options['register_vars']['real_name'],
 					'USERNAME' => $reg_options['username'],
 					'PASSWORD' => $reg_options['password'],
@@ -879,7 +834,7 @@ public static function registerMember(&$reg_options, $return_errors = false)
 					'ACTIVATIONLINK' => Config::$scripturl . '?action=activate;u=' . $member_id . ';code=' . $validation_code,
 					'ACTIVATIONLINKWITHOUTCODE' => Config::$scripturl . '?action=activate;u=' . $member_id,
 					'ACTIVATIONCODE' => $validation_code,
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate($email_message, $replacements);
 
@@ -891,16 +846,14 @@ public static function registerMember(&$reg_options, $return_errors = false)
 		}
 
 		// Can post straight away - welcome them to your fantastic community...
-		if ($reg_options['require'] == 'nothing')
-		{
-			if (!empty($reg_options['send_welcome_email']))
-			{
-				$replacements = array(
+		if ($reg_options['require'] == 'nothing') {
+			if (!empty($reg_options['send_welcome_email'])) {
+				$replacements = [
 					'REALNAME' => $reg_options['register_vars']['real_name'],
 					'USERNAME' => $reg_options['username'],
 					'PASSWORD' => $reg_options['password'],
 					'FORGOTPASSWORDLINK' => Config::$scripturl . '?action=reminder',
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('register_immediate', $replacements);
 
@@ -911,28 +864,24 @@ public static function registerMember(&$reg_options, $return_errors = false)
 			Mail::adminNotify('standard', $member_id, $reg_options['username']);
 		}
 		// Need to activate their account - or fall under COPPA.
-		elseif ($reg_options['require'] == 'activation' || $reg_options['require'] == 'coppa')
-		{
-			$replacements = array(
+		elseif ($reg_options['require'] == 'activation' || $reg_options['require'] == 'coppa') {
+			$replacements = [
 				'REALNAME' => $reg_options['register_vars']['real_name'],
 				'USERNAME' => $reg_options['username'],
 				'PASSWORD' => $reg_options['password'],
 				'FORGOTPASSWORDLINK' => Config::$scripturl . '?action=reminder',
-			);
+			];
 
-			if ($reg_options['require'] == 'activation')
-			{
-				$replacements += array(
+			if ($reg_options['require'] == 'activation') {
+				$replacements += [
 					'ACTIVATIONLINK' => Config::$scripturl . '?action=activate;u=' . $member_id . ';code=' . $validation_code,
 					'ACTIVATIONLINKWITHOUTCODE' => Config::$scripturl . '?action=activate;u=' . $member_id,
 					'ACTIVATIONCODE' => $validation_code,
-				);
-			}
-			else
-			{
-				$replacements += array(
+				];
+			} else {
+				$replacements += [
 					'COPPALINK' => Config::$scripturl . '?action=coppa;member=' . $member_id,
-				);
+				];
 			}
 
 			$emaildata = Mail::loadEmailTemplate('register_' . ($reg_options['require'] == 'activation' ? 'activate' : 'coppa'), $replacements);
@@ -940,14 +889,13 @@ public static function registerMember(&$reg_options, $return_errors = false)
 			Mail::send($reg_options['email'], $emaildata['subject'], $emaildata['body'], null, 'reg_' . $reg_options['require'] . $member_id, $emaildata['is_html'], 0);
 		}
 		// Must be awaiting approval.
-		else
-		{
-			$replacements = array(
+		else {
+			$replacements = [
 				'REALNAME' => $reg_options['register_vars']['real_name'],
 				'USERNAME' => $reg_options['username'],
 				'PASSWORD' => $reg_options['password'],
 				'FORGOTPASSWORDLINK' => Config::$scripturl . '?action=reminder',
-			);
+			];
 
 			$emaildata = Mail::loadEmailTemplate('register_pending', $replacements);
 
@@ -961,7 +909,7 @@ public static function registerMember(&$reg_options, $return_errors = false)
 		$_SESSION['just_registered'] = 1;
 
 		// If they are for sure registered, let other people to know about it
-		IntegrationHook::call('integrate_register_after', array($reg_options, $member_id));
+		IntegrationHook::call('integrate_register_after', [$reg_options, $member_id]);
 
 		return $member_id;
 	}
@@ -975,12 +923,12 @@ public static function registerMember(&$reg_options, $return_errors = false)
 	 */
 	protected function __construct()
 	{
-
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Register2::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Register2::exportStatic')) {
 	Register2::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Reminder.php b/Sources/Actions/Reminder.php
index 9d62ebf9cf..35f02e2cc0 100644
--- a/Sources/Actions/Reminder.php
+++ b/Sources/Actions/Reminder.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
@@ -25,7 +24,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handle sending out reminders, and checking the secret answer and question.
@@ -39,12 +37,11 @@ class Reminder implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RemindMe',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -78,13 +75,13 @@ class Reminder implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'main' => 'main',
 		'picktype' => 'pickType',
 		'secret2' => 'secretAnswer2',
 		'setpassword' => 'setPassword',
-		'setpassword2' => 'setPassword2'
-	);
+		'setpassword2' => 'setPassword2',
+	];
 
 	/****************************
 	 * Internal static properties
@@ -107,10 +104,11 @@ class Reminder implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -132,51 +130,47 @@ public function pickType()
 
 		// Make sure we are not being slammed
 		// Don't call this if you're coming from the "Choose a reminder type" page - otherwise you'll likely get an error
-		if (!in_array($_POST['reminder_type'] ?? null, array('email', 'secret')))
+		if (!in_array($_POST['reminder_type'] ?? null, ['email', 'secret'])) {
 			Security::spamProtection('remind');
+		}
 
 		$this->loadMember();
 
 		// If the user isn't activated/approved, give them some feedback on what to do next.
-		if ($this->member->is_activated != 1)
-		{
+		if ($this->member->is_activated != 1) {
 			// Awaiting approval...
-			if (trim($this->member->validation_code) == '')
-			{
+			if (trim($this->member->validation_code) == '') {
 				ErrorHandler::fatal(sprintf(Lang::$txt['registration_not_approved'], Config::$scripturl . '?action=activate;user=' . $_POST['user']), false);
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatal(sprintf(Lang::$txt['registration_not_activated'], Config::$scripturl . '?action=activate;user=' . $_POST['user']), false);
 			}
 		}
 
 		// You can't get emailed if you have no email address.
 		$this->member->email = trim($this->member->email);
-		if ($this->member->email == '')
-		{
+
+		if ($this->member->email == '') {
 			ErrorHandler::fatal(Lang::$txt['no_reminder_email'] . '<br>' . Lang::$txt['send_email_to'] . ' <a href="mailto:' . Config::$webmaster_email . '">' . Lang::$txt['webmaster'] . '</a> ' . Lang::$txt['to_ask_password']);
 		}
 
 		// If they have no secret question then they can only get emailed the item, or they are requesting the email, send them an email.
-		if (empty($this->member->secret_question) || (isset($_POST['reminder_type']) && $_POST['reminder_type'] == 'email'))
-		{
+		if (empty($this->member->secret_question) || (isset($_POST['reminder_type']) && $_POST['reminder_type'] == 'email')) {
 			// Randomly generate a validation code with a max length of 10 chars.
 			$code = User::generateValidationCode();
 
-			$replacements = array(
+			$replacements = [
 				'REALNAME' => $this->member->name,
 				'REMINDLINK' => Config::$scripturl . '?action=reminder;sa=setpassword;u=' . $this->member->id . ';code=' . $code,
 				'IP' => User::$me->ip,
 				'MEMBERNAME' => $this->member->username,
-			);
+			];
 
 			$emaildata = Mail::loadEmailTemplate('forgot_password', $replacements, empty($this->member->lngfile) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $this->member->lngfile);
 
 			Mail::send($this->member->email, $emaildata['subject'], $emaildata['body'], null, 'reminder', $emaildata['is_html'], 1);
 
 			// Set the validation code in the database.
-			User::updateMemberData($this->member->id, array('validation_code' => substr(md5($code), 0, 10)));
+			User::updateMemberData($this->member->id, ['validation_code' => substr(md5($code), 0, 10)]);
 
 			// Set up the template.
 			Utils::$context['description'] = Lang::$txt['reminder_sent'];
@@ -185,18 +179,18 @@ public function pickType()
 			// Don't really.
 			return;
 		}
+
 		// Otherwise are ready to answer the question?
-		elseif (isset($_POST['reminder_type']) && $_POST['reminder_type'] == 'secret')
-		{
+		if (isset($_POST['reminder_type']) && $_POST['reminder_type'] == 'secret') {
 			return self::secretAnswerInput();
 		}
 
 		// Now we're here setup the context for template number 2!
 		Utils::$context['sub_template'] = 'reminder_pick';
-		Utils::$context['current_member'] = array(
+		Utils::$context['current_member'] = [
 			'id' => $this->member->id,
 			'name' => $this->member->username,
-		);
+		];
 	}
 
 	/**
@@ -207,18 +201,19 @@ public function setPassword()
 		Lang::load('Login');
 
 		// You need a code!
-		if (!isset($_REQUEST['code']))
+		if (!isset($_REQUEST['code'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Fill the context array.
-		Utils::$context += array(
+		Utils::$context += [
 			'page_title' => Lang::$txt['reminder_set_password'],
 			'sub_template' => 'set_password',
 			'code' => $_REQUEST['code'],
-			'memID' => (int) $_REQUEST['u']
-		);
+			'memID' => (int) $_REQUEST['u'],
+		];
 
-		Theme::loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register');
+		Theme::loadJavaScriptFile('register.js', ['defer' => false, 'minimize' => true], 'smf_register');
 
 		// Tokens!
 		SecurityToken::create('remind-sp');
@@ -232,40 +227,38 @@ public function setPassword2()
 		User::$me->checkSession();
 		SecurityToken::validate('remind-sp');
 
-		if (empty($_POST['u']) || !isset($_POST['passwrd1']) || !isset($_POST['passwrd2']))
+		if (empty($_POST['u']) || !isset($_POST['passwrd1']) || !isset($_POST['passwrd2'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		$_POST['u'] = (int) $_POST['u'];
 
-		if ($_POST['passwrd1'] != $_POST['passwrd2'])
+		if ($_POST['passwrd1'] != $_POST['passwrd2']) {
 			ErrorHandler::fatalLang('passwords_dont_match', false);
+		}
 
-		if ($_POST['passwrd1'] == '')
+		if ($_POST['passwrd1'] == '') {
 			ErrorHandler::fatalLang('no_password', false);
+		}
 
 		Lang::load('Login');
 
 		$this->loadMember();
 
 		// Is the password actually valid?
-		$passwordError = User::validatePassword($_POST['passwrd1'], $this->member->username, array($this->member->email));
+		$passwordError = User::validatePassword($_POST['passwrd1'], $this->member->username, [$this->member->email]);
 
 		// What - it's not?
-		if ($passwordError != null)
-		{
-			if ($passwordError == 'short')
-			{
-				ErrorHandler::fatalLang('profile_error_password_' . $passwordError, false, array(empty(Config::$modSettings['password_strength']) ? 4 : 8));
-			}
-			else
-			{
+		if ($passwordError != null) {
+			if ($passwordError == 'short') {
+				ErrorHandler::fatalLang('profile_error_password_' . $passwordError, false, [empty(Config::$modSettings['password_strength']) ? 4 : 8]);
+			} else {
 				ErrorHandler::fatalLang('profile_error_password_' . $passwordError, false);
 			}
 		}
 
 		// Quit if this code is not right.
-		if (empty($_POST['code']) || substr($this->member->validation_code, 0, 10) !== substr(md5($_POST['code']), 0, 10))
-		{
+		if (empty($_POST['code']) || substr($this->member->validation_code, 0, 10) !== substr(md5($_POST['code']), 0, 10)) {
 			// Stop brute force attacks like this.
 			Login2::validatePasswordFlood($this->member->id, $this->member->username, $this->member->passwd_flood, false);
 
@@ -276,19 +269,19 @@ public function setPassword2()
 		Login2::validatePasswordFlood($this->member->id, $this->member->username, $this->member->passwd_flood, true);
 
 		// User validated.  Update the database!
-		User::updateMemberData($this->member->id, array('validation_code' => '', 'passwd' => Security::hashPassword($this->member->username, $_POST['passwrd1'])));
+		User::updateMemberData($this->member->id, ['validation_code' => '', 'passwd' => Security::hashPassword($this->member->username, $_POST['passwrd1'])]);
 
-		IntegrationHook::call('integrate_reset_pass', array($this->member->username, $this->member->username, $_POST['passwrd1']));
+		IntegrationHook::call('integrate_reset_pass', [$this->member->username, $this->member->username, $_POST['passwrd1']]);
 
 		Theme::loadTemplate('Login');
-		Utils::$context += array(
+		Utils::$context += [
 			'page_title' => Lang::$txt['reminder_password_set'],
 			'sub_template' => 'login',
 			'default_username' => $this->member->username,
 			'default_password' => $_POST['passwrd1'],
 			'never_expire' => false,
-			'description' => Lang::$txt['reminder_password_set']
-		);
+			'description' => Lang::$txt['reminder_password_set'],
+		];
 
 		SecurityToken::create('login');
 	}
@@ -304,12 +297,14 @@ public function secretAnswerInput()
 		Lang::load('Login');
 
 		// This should never happen, but just in case...
-		if (!isset($this->member))
+		if (!isset($this->member)) {
 			$this->loadMember();
+		}
 
 		// If there is NO secret question - then throw an error.
-		if (trim($this->member->secret_question) == '')
+		if (trim($this->member->secret_question) == '') {
 			ErrorHandler::fatalLang('registration_no_secret_question', false);
+		}
 
 		// Ask for the answer...
 		Utils::$context['remind_user'] = $this->member->id_member;
@@ -318,7 +313,7 @@ public function secretAnswerInput()
 
 		Utils::$context['sub_template'] = 'ask';
 		SecurityToken::create('remind-sai');
-		Theme::loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register');
+		Theme::loadJavaScriptFile('register.js', ['defer' => false, 'minimize' => true], 'smf_register');
 	}
 
 	/**
@@ -330,8 +325,9 @@ public function secretAnswer2()
 		SecurityToken::validate('remind-sai');
 
 		// Hacker?  How did you get this far without an email or username?
-		if (empty($_REQUEST['uid']))
+		if (empty($_REQUEST['uid'])) {
 			ErrorHandler::fatalLang('username_no_exist', false);
+		}
 
 		Lang::load('Login');
 
@@ -357,57 +353,53 @@ public function secretAnswer2()
 				!Security::hashVerifyPassword($this->member->username, $_POST['secret_answer'], $this->member->secret_answer)
 				&& md5($_POST['secret_answer']) != $this->member->secret_answer
 			)
-		)
-		{
+		) {
 			ErrorHandler::log(sprintf(Lang::$txt['reminder_error'], $this->member->username), 'user');
 			ErrorHandler::fatalLang('incorrect_answer', false);
 		}
 
 		// If the secret answer was right, but stored using md5, upgrade it now.
-		if (md5($_POST['secret_answer']) === $this->member->secret_answer)
-		{
-			User::updateMemberData($this->member->id_member, array('secret_answer' => Security::hashPassword($this->member->username, $_POST['secret_answer'])));
+		if (md5($_POST['secret_answer']) === $this->member->secret_answer) {
+			User::updateMemberData($this->member->id_member, ['secret_answer' => Security::hashPassword($this->member->username, $_POST['secret_answer'])]);
 		}
 
 		// You can't use a blank one!
-		if (strlen(trim($_POST['passwrd1'])) === 0)
+		if (strlen(trim($_POST['passwrd1'])) === 0) {
 			ErrorHandler::fatalLang('no_password', false);
+		}
 
 		// They have to be the same too.
-		if ($_POST['passwrd1'] != $_POST['passwrd2'])
+		if ($_POST['passwrd1'] != $_POST['passwrd2']) {
 			ErrorHandler::fatalLang('passwords_dont_match', false);
+		}
 
 		// Make sure they have a strong enough password.
-		$passwordError = User::validatePassword($_POST['passwrd1'], $this->member->username, array($this->member->email));
+		$passwordError = User::validatePassword($_POST['passwrd1'], $this->member->username, [$this->member->email]);
 
 		// Invalid?
-		if ($passwordError != null)
-		{
-			if ($passwordError == 'short')
-			{
-				ErrorHandler::fatalLang('profile_error_password_' . $passwordError, false, array(empty(Config::$modSettings['password_strength']) ? 4 : 8));
-			}
-			else
-			{
+		if ($passwordError != null) {
+			if ($passwordError == 'short') {
+				ErrorHandler::fatalLang('profile_error_password_' . $passwordError, false, [empty(Config::$modSettings['password_strength']) ? 4 : 8]);
+			} else {
 				ErrorHandler::fatalLang('profile_error_password_' . $passwordError, false);
 			}
 		}
 
 		// Alright, so long as 'yer sure.
-		User::updateMemberData($this->member->id_member, array('passwd' => Security::hashPassword($this->member->username, $_POST['passwrd1'])));
+		User::updateMemberData($this->member->id_member, ['passwd' => Security::hashPassword($this->member->username, $_POST['passwrd1'])]);
 
-		IntegrationHook::call('integrate_reset_pass', array($this->member->username, $this->member->username, $_POST['passwrd1']));
+		IntegrationHook::call('integrate_reset_pass', [$this->member->username, $this->member->username, $_POST['passwrd1']]);
 
 		// Tell them it went fine.
 		Theme::loadTemplate('Login');
-		Utils::$context += array(
+		Utils::$context += [
 			'page_title' => Lang::$txt['reminder_password_set'],
 			'sub_template' => 'login',
 			'default_username' => $this->member->username,
 			'default_password' => $_POST['passwrd1'],
 			'never_expire' => false,
-			'description' => Lang::$txt['reminder_password_set']
-		);
+			'description' => Lang::$txt['reminder_password_set'],
+		];
 
 		SecurityToken::create('login');
 	}
@@ -423,8 +415,9 @@ public function secretAnswer2()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -452,8 +445,9 @@ protected function __construct()
 		Utils::$context['page_title'] = Lang::$txt['authentication_reminder'];
 		Utils::$context['robot_no_index'] = true;
 
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 
 	/**
@@ -461,41 +455,43 @@ protected function __construct()
 	 */
 	protected function loadMember()
 	{
-		$loaded = array();
+		$loaded = [];
 		$err_msg = 'username_no_exist';
 
 		// Coming with a known ID?
 		$uid = intval(!empty($_REQUEST['uid']) ? $_REQUEST['uid'] : (!empty($_POST['u']) ? $_POST['u'] : 0));
 
 		// If given a name or email, clean it up like we do during registration.
-		if (isset($_POST['user']))
-			$_POST['user'] = Utils::htmlTrim(Utils::normalizeSpaces(Utils::sanitizeChars($_POST['user'], 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
+		if (isset($_POST['user'])) {
+			$_POST['user'] = Utils::htmlTrim(Utils::normalizeSpaces(Utils::sanitizeChars($_POST['user'], 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
+		}
 
 		// Load by ID.
-		if (!empty($uid))
-		{
+		if (!empty($uid)) {
 			$err_msg = 'invalid_userid';
 			$loaded = User::load($uid, User::LOAD_BY_ID, 'minimal');
 		}
 		// Load by name or email.
-		elseif (isset($_POST['user']) && $_POST['user'] != '')
-		{
+		elseif (isset($_POST['user']) && $_POST['user'] != '') {
 			$loaded = User::load($_POST['user'], User::LOAD_BY_NAME, 'minimal');
 
-			if (empty($loaded))
+			if (empty($loaded)) {
 				$loaded = User::load($_POST['user'], User::LOAD_BY_EMAIL, 'minimal');
+			}
 		}
 
 		// Nothing found.
-		if (empty($loaded))
+		if (empty($loaded)) {
 			ErrorHandler::fatalLang($err_msg, false);
+		}
 
 		$this->member = reset($loaded);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Reminder::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Reminder::exportStatic')) {
 	Reminder::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/ReportToMod.php b/Sources/Actions/ReportToMod.php
index 2c766f0edf..77f2af0afc 100644
--- a/Sources/Actions/ReportToMod.php
+++ b/Sources/Actions/ReportToMod.php
@@ -14,8 +14,8 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Msg;
@@ -24,7 +24,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Deals with reporting posts or profiles to mods and admins.
@@ -38,12 +37,14 @@ class ReportToMod implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ReportToModerator',
-		),
-	);
+			'ReportToModerator2' => 'ReportToModerator2',
+			'reportPost' => 'reportPost',
+			'reportUser' => 'reportUser',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -72,10 +73,10 @@ class ReportToMod implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'show' => 'show',
 		'submit' => 'submit',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -135,19 +136,17 @@ public function execute(): void
 
 		// You can't use this if it's off or you are not allowed to do it.
 		// If we don't have the ID of something to report, we'll die with a no_access error below
-		if (isset($_REQUEST['msg']))
-		{
+		if (isset($_REQUEST['msg'])) {
 			User::$me->isAllowedTo('report_any');
-		}
-		elseif (isset($_REQUEST['u']))
-		{
+		} elseif (isset($_REQUEST['u'])) {
 			User::$me->isAllowedTo('report_user');
 		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -160,47 +159,49 @@ public function execute(): void
 	public function show(): void
 	{
 		// Previewing or modifying?
-		if ($this->previewing)
+		if ($this->previewing) {
 			$this->setPreview();
+		}
 
 		// We need a message ID or user ID to check!
-		if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u']))
+		if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// For compatibility, accept mid, but we should be using msg. (not the flavor kind!)
-		if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid']))
-		{
+		if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) {
 			$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
 		}
 		// msg and mid empty - assume we're reporting a user
-		elseif (!empty($_REQUEST['u']))
-		{
+		elseif (!empty($_REQUEST['u'])) {
 			$_REQUEST['u'] = (int) $_REQUEST['u'];
 		}
 
 		// Set up some form values
 		Utils::$context['report_type'] = isset($_REQUEST['msg']) ? 'msg' : 'u';
-		Utils::$context['reported_item'] = isset($_REQUEST['msg']) ? $_REQUEST['msg'] : $_REQUEST['u'];
+		Utils::$context['reported_item'] = $_REQUEST['msg'] ?? $_REQUEST['u'];
 
-		if (isset($_REQUEST['msg']))
-		{
+		if (isset($_REQUEST['msg'])) {
 			// Check the message's ID - don't want anyone reporting a post they can't even see!
-			$result = Db::$db->query('', '
-				SELECT m.id_msg, m.id_member, t.id_member_started
+			$result = Db::$db->query(
+				'',
+				'SELECT m.id_msg, m.id_member, t.id_member_started
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:current_topic})
 				WHERE m.id_msg = {int:id_msg}
 					AND m.id_topic = {int:current_topic}
 				LIMIT 1',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'id_msg' => $_REQUEST['msg'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($result) == 0)
+
+			if (Db::$db->num_rows($result) == 0) {
 				ErrorHandler::fatalLang('no_board', false);
+			}
 
-			list ($_REQUEST['msg'], $member, $starter) = Db::$db->fetch_row($result);
+			list($_REQUEST['msg'], $member, $starter) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
 
 			// This is here so that the user could, in theory, be redirected back to the topic.
@@ -209,21 +210,21 @@ public function show(): void
 
 			// The submit URL is different for users than it is for posts
 			Utils::$context['submit_url'] = Config::$scripturl . '?action=reporttm;msg=' . $_REQUEST['msg'] . ';topic=' . Topic::$topic_id;
-		}
-		else
-		{
+		} else {
 			// Check the user's ID
-			$result = Db::$db->query('', '
-				SELECT id_member, real_name, member_name
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member, real_name, member_name
 				FROM {db_prefix}members
 				WHERE id_member = {int:current_user}',
-				array(
+				[
 					'current_user' => $_REQUEST['u'],
-				)
+				],
 			);
 
-			if (Db::$db->num_rows($result) == 0)
+			if (Db::$db->num_rows($result) == 0) {
 				ErrorHandler::fatalLang('no_user', false);
+			}
 
 			list($_REQUEST['u'], $display_name, $username) = Db::$db->fetch_row($result);
 
@@ -276,39 +277,41 @@ public function submit(): void
 		Security::checkSubmitOnce('check');
 
 		// No errors, yet.
-		$post_errors = array();
+		$post_errors = [];
 
 		// Check their session.
-		if (User::$me->checkSession('post', '', false) != '')
+		if (User::$me->checkSession('post', '', false) != '') {
 			$post_errors[] = 'session_timeout';
+		}
 
 		// Make sure we have a comment and it's clean.
-		if ($this->comment === '')
+		if ($this->comment === '') {
 			$post_errors[] = 'no_comment';
+		}
 
-		if (Utils::entityStrlen(Utils::htmlspecialchars($this->comment)) > 254)
+		if (Utils::entityStrlen(Utils::htmlspecialchars($this->comment)) > 254) {
 			$post_errors[] = 'post_too_long';
+		}
 
 		// Any errors?
-		if (!empty($post_errors))
-		{
+		if (!empty($post_errors)) {
 			Lang::load('Errors');
 
-			Utils::$context['post_errors'] = array();
-			foreach ($post_errors as $post_error)
+			Utils::$context['post_errors'] = [];
+
+			foreach ($post_errors as $post_error) {
 				Utils::$context['post_errors'][$post_error] = Lang::$txt['error_' . $post_error];
+			}
 
 			$this->previewing = false;
 			$this->show();
+
 			return;
 		}
 
-		if (isset($_POST['msg']))
-		{
+		if (isset($_POST['msg'])) {
 			$this->reportMsg($_POST['msg']);
-		}
-		else
-		{
+		} else {
 			$this->reportMember($_POST['u']);
 		}
 	}
@@ -324,8 +327,9 @@ public function submit(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -389,15 +393,17 @@ protected function __construct()
 		Utils::$context['robot_no_index'] = true;
 		Utils::$context['comment_body'] = '';
 
-		if (isset($_POST['comment']))
+		if (isset($_POST['comment'])) {
 			$this->comment = trim(Utils::normalizeSpaces(Utils::sanitizeChars(Utils::normalize($_POST['comment']), 0), true, true));
+		}
 
 		$this->previewing = isset($_POST['preview']) && $this->comment !== '';
 		$this->submitting = isset($_POST['save']);
 		$this->can_submit = isset($_POST[Utils::$context['session_var']]);
 
-		if ($this->submitting && $this->can_submit && !$this->previewing)
+		if ($this->submitting && $this->can_submit && !$this->previewing) {
 			$this->subaction = 'submit';
+		}
 	}
 
 	/**
@@ -421,114 +427,133 @@ protected function setPreview()
 	protected function reportMsg(int $msg)
 	{
 		// Get the basic topic information, and make sure they can see it.
-		$request = Db::$db->query('', '
-			SELECT m.id_topic, m.id_board, m.subject, m.body, m.id_member AS id_poster, m.poster_name, mem.real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_topic, m.id_board, m.subject, m.body, m.id_member AS id_poster, m.poster_name, mem.real_name
 			FROM {db_prefix}messages AS m
 				LEFT JOIN {db_prefix}members AS mem ON (m.id_member = mem.id_member)
 			WHERE m.id_msg = {int:id_msg}
 				AND m.id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'id_msg' => $msg,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_board', false);
+		}
 		$message = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
-		$request = Db::$db->query('', '
-			SELECT id_report, ignore_all
+		$request = Db::$db->query(
+			'',
+			'SELECT id_report, ignore_all
 			FROM {db_prefix}log_reported
 			WHERE id_msg = {int:id_msg}
 				AND (closed = {int:not_closed} OR ignore_all = {int:ignored})
 			ORDER BY ignore_all DESC',
-			array(
+			[
 				'id_msg' => $msg,
 				'not_closed' => 0,
 				'ignored' => 1,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) != 0)
-			list ($id_report, $ignore) = Db::$db->fetch_row($request);
+
+		if (Db::$db->num_rows($request) != 0) {
+			list($id_report, $ignore) = Db::$db->fetch_row($request);
+		}
 
 		Db::$db->free_result($request);
 
 		// If we're just going to ignore these, then who gives a monkeys...
-		if (!empty($ignore))
+		if (!empty($ignore)) {
 			Utils::redirectexit('topic=' . Topic::$topic_id . '.msg' . $msg . '#msg' . $msg);
+		}
 
 		// Already reported? My god, we could be dealing with a real rogue here...
-		if (!empty($id_report))
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_reported
+		if (!empty($id_report)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_reported
 				SET num_reports = num_reports + 1, time_updated = {int:current_time}
 				WHERE id_report = {int:id_report}',
-				array(
+				[
 					'current_time' => time(),
 					'id_report' => $id_report,
-				)
+				],
 			);
+		}
 		// Otherwise, we shall make one!
-		else
-		{
-			if (empty($message['real_name']))
+		else {
+			if (empty($message['real_name'])) {
 				$message['real_name'] = $message['poster_name'];
+			}
 
-			$id_report = Db::$db->insert('',
+			$id_report = Db::$db->insert(
+				'',
 				'{db_prefix}log_reported',
-				array(
+				[
 					'id_msg' => 'int', 'id_topic' => 'int', 'id_board' => 'int', 'id_member' => 'int', 'membername' => 'string',
 					'subject' => 'string', 'body' => 'string', 'time_started' => 'int', 'time_updated' => 'int',
 					'num_reports' => 'int', 'closed' => 'int',
-				),
-				array(
+				],
+				[
 					$msg, $message['id_topic'], $message['id_board'], $message['id_poster'], $message['real_name'],
 					$message['subject'], $message['body'], time(), time(), 1, 0,
-				),
-				array('id_report'),
-				1
+				],
+				['id_report'],
+				1,
 			);
 		}
 
 		// Now just add our report...
-		if ($id_report)
-		{
-			$id_comment = Db::$db->insert('',
+		if ($id_report) {
+			$id_comment = Db::$db->insert(
+				'',
 				'{db_prefix}log_reported_comments',
-				array(
+				[
 					'id_report' => 'int', 'id_member' => 'int', 'membername' => 'string',
 					'member_ip' => 'inet', 'comment' => 'string', 'time_sent' => 'int',
-				),
-				array(
+				],
+				[
 					$id_report, User::$me->id, User::$me->name,
 					User::$me->ip, Utils::htmlspecialchars($this->comment), time(),
-				),
-				array('id_comment'),
-				1
+				],
+				['id_comment'],
+				1,
 			);
 
 			// And get ready to notify people.
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array('$sourcedir/tasks/MsgReport_Notify.php', 'SMF\Tasks\MsgReport_Notify', Utils::jsonEncode(array(
-					'report_id' => $id_report,
-					'msg_id' => $msg,
-					'topic_id' => $message['id_topic'],
-					'board_id' => $message['id_board'],
-					'sender_id' => User::$me->id,
-					'sender_name' => User::$me->name,
-					'time' => time(),
-					'comment_id' => $id_comment,
-				)), 0),
-				array('id_task')
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\MsgReport_Notify',
+					Utils::jsonEncode([
+						'report_id' => $id_report,
+						'msg_id' => $msg,
+						'topic_id' => $message['id_topic'],
+						'board_id' => $message['id_board'],
+						'sender_id' => User::$me->id,
+						'sender_name' => User::$me->name,
+						'time' => time(),
+						'comment_id' => $id_comment,
+					]),
+					0,
+				],
+				['id_task'],
 			);
 		}
 
 		// Keep track of when the mod reports get updated, that way we know when we need to look again.
-		Config::updateModSettings(array('last_mod_report_action' => time()));
+		Config::updateModSettings(['last_mod_report_action' => time()]);
 
 		// Back to the post we reported!
 		Utils::redirectexit('reportsent;topic=' . Topic::$topic_id . '.msg' . $msg . '#msg' . $msg);
@@ -544,109 +569,127 @@ protected function reportMember($id_member)
 		// Get the basic topic information, and make sure they can see it.
 		$_POST['u'] = (int) $id_member;
 
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name, member_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, member_name
 			FROM {db_prefix}members
 			WHERE id_member = {int:id_member}',
-			array(
-				'id_member' => $_POST['u']
-			)
+			[
+				'id_member' => $_POST['u'],
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_user', false);
+		}
 		$user = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		$user_name = Utils::htmlspecialcharsDecode($user['real_name']) . ($user['real_name'] != $user['member_name'] ? ' (' . $user['member_name'] . ')' : '');
 
-		$request = Db::$db->query('', '
-			SELECT id_report, ignore_all
+		$request = Db::$db->query(
+			'',
+			'SELECT id_report, ignore_all
 			FROM {db_prefix}log_reported
 			WHERE id_member = {int:id_member}
 				AND id_msg = {int:not_a_reported_post}
 				AND (closed = {int:not_closed} OR ignore_all = {int:ignored})
 			ORDER BY ignore_all DESC',
-			array(
+			[
 				'id_member' => $_POST['u'],
 				'not_a_reported_post' => 0,
 				'not_closed' => 0,
 				'ignored' => 1,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) != 0)
-			list ($id_report, $ignore) = Db::$db->fetch_row($request);
+
+		if (Db::$db->num_rows($request) != 0) {
+			list($id_report, $ignore) = Db::$db->fetch_row($request);
+		}
 
 		Db::$db->free_result($request);
 
 		// If we're just going to ignore these, then who gives a monkeys...
-		if (!empty($ignore))
+		if (!empty($ignore)) {
 			Utils::redirectexit('action=profile;u=' . $_POST['u']);
+		}
 
 		// Already reported? My god, we could be dealing with a real rogue here...
-		if (!empty($id_report))
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_reported
+		if (!empty($id_report)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_reported
 				SET num_reports = num_reports + 1, time_updated = {int:current_time}
 				WHERE id_report = {int:id_report}',
-				array(
+				[
 					'current_time' => time(),
 					'id_report' => $id_report,
-				)
+				],
 			);
+		}
 		// Otherwise, we shall make one!
-		else
-		{
-			$id_report = Db::$db->insert('',
+		else {
+			$id_report = Db::$db->insert(
+				'',
 				'{db_prefix}log_reported',
-				array(
+				[
 					'id_msg' => 'int', 'id_topic' => 'int', 'id_board' => 'int', 'id_member' => 'int', 'membername' => 'string',
 					'subject' => 'string', 'body' => 'string', 'time_started' => 'int', 'time_updated' => 'int',
 					'num_reports' => 'int', 'closed' => 'int',
-				),
-				array(
+				],
+				[
 					0, 0, 0, $user['id_member'], $user_name,
 					'', '', time(), time(), 1, 0,
-				),
-				array('id_report'),
-				1
+				],
+				['id_report'],
+				1,
 			);
 		}
 
 		// Now just add our report...
-		if ($id_report)
-		{
-			Db::$db->insert('',
+		if ($id_report) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}log_reported_comments',
-				array(
+				[
 					'id_report' => 'int', 'id_member' => 'int', 'membername' => 'string',
 					'member_ip' => 'inet', 'comment' => 'string', 'time_sent' => 'int',
-				),
-				array(
+				],
+				[
 					$id_report, User::$me->id, User::$me->name,
 					User::$me->ip, Utils::htmlspecialchars($this->comment), time(),
-				),
-				array('id_comment')
+				],
+				['id_comment'],
 			);
 
 			// And get ready to notify people.
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array('$sourcedir/tasks/MemberReport_Notify.php', 'SMF\Tasks\MemberReport_Notify', Utils::jsonEncode(array(
-					'report_id' => $id_report,
-					'user_id' => $user['id_member'],
-					'user_name' => $user_name,
-					'sender_id' => User::$me->id,
-					'sender_name' => User::$me->name,
-					'comment' => Utils::htmlspecialchars($this->comment),
-					'time' => time(),
-				)), 0),
-				array('id_task')
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\MemberReport_Notify',
+					Utils::jsonEncode([
+						'report_id' => $id_report,
+						'user_id' => $user['id_member'],
+						'user_name' => $user_name,
+						'sender_id' => User::$me->id,
+						'sender_name' => User::$me->name,
+						'comment' => Utils::htmlspecialchars($this->comment),
+						'time' => time(),
+					]),
+					0,
+				],
+				['id_task'],
 			);
 		}
 
 		// Keep track of when the mod reports get updated, that way we know when we need to look again.
-		Config::updateModSettings(array('last_mod_report_action' => time()));
+		Config::updateModSettings(['last_mod_report_action' => time()]);
 
 		// Back to the profile we reported!
 		Utils::redirectexit('reportsent;action=profile;u=' . $id_member);
@@ -654,7 +697,8 @@ protected function reportMember($id_member)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ReportToMod::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ReportToMod::exportStatic')) {
 	ReportToMod::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/RequestMembers.php b/Sources/Actions/RequestMembers.php
index 6e614bfd37..a7ae71351c 100644
--- a/Sources/Actions/RequestMembers.php
+++ b/Sources/Actions/RequestMembers.php
@@ -14,10 +14,9 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Db\DatabaseApi as Db;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Outputs each member name on its own line.
@@ -36,12 +35,11 @@ class RequestMembers implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RequestMembers',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -77,31 +75,33 @@ public function execute(): void
 	{
 		User::$me->checkSession('get');
 
-		if (Utils::$context['utf8'] || function_exists('mb_convert_encoding'))
+		if (Utils::$context['utf8'] || function_exists('mb_convert_encoding')) {
 			header('content-type: text/plain; charset=UTF-8');
+		}
 
-		$request = Db::$db->query('', '
-			SELECT real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT real_name
 			FROM {db_prefix}members
 			WHERE {raw:real_name} LIKE {string:search}' . (isset($_REQUEST['buddies']) ? '
 				AND id_member IN ({array_int:buddy_list})' : '') . '
 				AND is_activated IN (1, 11)
 			LIMIT ' . (Utils::entityStrlen($this->search) <= 2 ? '100' : '800'),
-			array(
+			[
 				'real_name' => Db::$db->case_sensitive ? 'LOWER(real_name)' : 'real_name',
 				'buddy_list' => User::$me->buddies,
 				'search' => $this->search,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!Utils::$context['utf8'])
-			{
-				if (($temp = @mb_convert_encoding($row['real_name'], 'UTF-8', Utils::$context['character_set'])) !== false)
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!Utils::$context['utf8']) {
+				if (($temp = @mb_convert_encoding($row['real_name'], 'UTF-8', Utils::$context['character_set'])) !== false) {
 					$row['real_name'] = $temp;
+				}
 			}
 
-			$row['real_name'] = strtr($row['real_name'], array('&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;'));
+			$row['real_name'] = strtr($row['real_name'], ['&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;']);
 
 			$row['real_name'] = Utils::entityDecode($row['real_name'], true);
 
@@ -123,8 +123,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -150,12 +151,13 @@ protected function __construct()
 
 		$this->search = Utils::htmlspecialchars($this->search);
 		$this->search = trim(Utils::strtolower($this->search)) . '*';
-		$this->search = strtr($this->search, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '&#038;' => '&amp;'));
+		$this->search = strtr($this->search, ['%' => '\\%', '_' => '\\_', '*' => '%', '?' => '_', '&#038;' => '&amp;']);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\RequestMembers::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\RequestMembers::exportStatic')) {
 	RequestMembers::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Search.php b/Sources/Actions/Search.php
index 761d1cdb7c..84657a0681 100644
--- a/Sources/Actions/Search.php
+++ b/Sources/Actions/Search.php
@@ -14,18 +14,17 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
+use SMF\Search\SearchApi;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * Shows the search form.
@@ -39,12 +38,11 @@ class Search implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'PlushSearch1',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -76,94 +74,94 @@ class Search implements ActionInterface
 	public function execute(): void
 	{
 		// Is the load average too high to allow searching just now?
-		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_search']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_search'])
-		{
+		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_search']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_search']) {
 			ErrorHandler::fatalLang('loadavg_search_disabled', false);
 		}
 
 		Lang::load('Search');
 
 		// Don't load this in XML mode.
-		if (!isset($_REQUEST['xml']))
-		{
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('Search');
-			Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+			Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 		}
 
 		// Check the user's permissions.
 		User::$me->isAllowedTo('search_posts');
 
 		// Link tree....
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=search',
-			'name' => Lang::$txt['search']
-		);
+			'name' => Lang::$txt['search'],
+		];
 
 		Utils::$context['search_string_limit'] = SearchApi::MAX_LENGTH;
 
 		Utils::$context['require_verification'] = User::$me->is_guest && !empty(Config::$modSettings['search_enable_captcha']) && empty($_SESSION['ss_vv_passed']);
 
-		if (Utils::$context['require_verification'])
-			$verifier = new Verifier(array('id' => 'search'));
+		if (Utils::$context['require_verification']) {
+			$verifier = new Verifier(['id' => 'search']);
+		}
 
 		// If you got back from search2 by using the linktree, you get your original search parameters back.
-		if (isset($_REQUEST['params']))
-		{
+		if (isset($_REQUEST['params'])) {
 			// Due to IE's 2083 character limit, we have to compress long search strings
-			$temp_params = base64_decode(str_replace(array('-', '_', '.'), array('+', '/', '='), $_REQUEST['params']));
+			$temp_params = base64_decode(str_replace(['-', '_', '.'], ['+', '/', '='], $_REQUEST['params']));
 			// Test for gzuncompress failing
 			$temp_params2 = @gzuncompress($temp_params);
 			$temp_params = explode('|"|', !empty($temp_params2) ? $temp_params2 : $temp_params);
 
-			Utils::$context['search_params'] = array();
+			Utils::$context['search_params'] = [];
 
-			foreach ($temp_params as $i => $data)
-			{
-				@list ($k, $v) = explode('|\'|', $data);
+			foreach ($temp_params as $i => $data) {
+				@list($k, $v) = explode('|\'|', $data);
 				Utils::$context['search_params'][$k] = $v;
 			}
 
-			if (isset(Utils::$context['search_params']['brd']))
-			{
-				Utils::$context['search_params']['brd'] = Utils::$context['search_params']['brd'] == '' ? array() : explode(',', Utils::$context['search_params']['brd']);
+			if (isset(Utils::$context['search_params']['brd'])) {
+				Utils::$context['search_params']['brd'] = Utils::$context['search_params']['brd'] == '' ? [] : explode(',', Utils::$context['search_params']['brd']);
 			}
 		}
 
-		if (isset($_REQUEST['search']))
+		if (isset($_REQUEST['search'])) {
 			Utils::$context['search_params']['search'] = Utils::htmlspecialcharsDecode($_REQUEST['search']);
+		}
 
-		if (isset(Utils::$context['search_params']['search']))
+		if (isset(Utils::$context['search_params']['search'])) {
 			Utils::$context['search_params']['search'] = Utils::htmlspecialchars(Utils::$context['search_params']['search']);
+		}
 
-		if (isset(Utils::$context['search_params']['userspec']))
+		if (isset(Utils::$context['search_params']['userspec'])) {
 			Utils::$context['search_params']['userspec'] = Utils::htmlspecialchars(Utils::$context['search_params']['userspec']);
+		}
 
-		if (!empty(Utils::$context['search_params']['searchtype']))
+		if (!empty(Utils::$context['search_params']['searchtype'])) {
 			Utils::$context['search_params']['searchtype'] = 2;
+		}
 
-		if (!empty(Utils::$context['search_params']['minage']))
+		if (!empty(Utils::$context['search_params']['minage'])) {
 			Utils::$context['search_params']['minage'] = (int) Utils::$context['search_params']['minage'];
+		}
 
-		if (!empty(Utils::$context['search_params']['maxage']))
+		if (!empty(Utils::$context['search_params']['maxage'])) {
 			Utils::$context['search_params']['maxage'] = (int) Utils::$context['search_params']['maxage'];
+		}
 
 		Utils::$context['search_params']['show_complete'] = !empty(Utils::$context['search_params']['show_complete']);
 
 		Utils::$context['search_params']['subject_only'] = !empty(Utils::$context['search_params']['subject_only']);
 
 		// Load the error text strings if there were errors in the search.
-		if (!empty(Utils::$context['search_errors']))
-		{
+		if (!empty(Utils::$context['search_errors'])) {
 			Lang::load('Errors');
-			Utils::$context['search_errors']['messages'] = array();
+			Utils::$context['search_errors']['messages'] = [];
 
-			foreach (Utils::$context['search_errors'] as $search_error => $dummy)
-			{
-				if ($search_error === 'messages')
+			foreach (Utils::$context['search_errors'] as $search_error => $dummy) {
+				if ($search_error === 'messages') {
 					continue;
+				}
 
-				if ($search_error == 'string_too_long')
-				{
+				if ($search_error == 'string_too_long') {
 					Lang::$txt['error_string_too_long'] = sprintf(Lang::$txt['error_string_too_long'], SearchApi::MAX_LENGTH);
 				}
 
@@ -172,54 +170,51 @@ public function execute(): void
 		}
 
 		// Find all the boards this user is allowed to see.
-		$request = Db::$db->query('order_by_board_order', '
-			SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level
+		$request = Db::$db->query(
+			'order_by_board_order',
+			'SELECT b.id_cat, c.name AS cat_name, b.id_board, b.name, b.child_level
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)
 			WHERE {query_see_board}
 				AND redirect = {string:empty_string}',
-			array(
+			[
 				'empty_string' => '',
-			)
+			],
 		);
 		Utils::$context['num_boards'] = Db::$db->num_rows($request);
 		Utils::$context['boards_check_all'] = true;
-		Utils::$context['categories'] = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		Utils::$context['categories'] = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// This category hasn't been set up yet..
-			if (!isset(Utils::$context['categories'][$row['id_cat']]))
-			{
-				Utils::$context['categories'][$row['id_cat']] = array(
+			if (!isset(Utils::$context['categories'][$row['id_cat']])) {
+				Utils::$context['categories'][$row['id_cat']] = [
 					'id' => $row['id_cat'],
 					'name' => $row['cat_name'],
-					'boards' => array()
-				);
+					'boards' => [],
+				];
 			}
 
 			$is_recycle_board = !empty(Config::$modSettings['recycle_enable']) && $row['id_board'] == Config::$modSettings['recycle_board'];
 
 			// Set this board up, and let the template know when it's a child.  (indent them..)
-			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
+			Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = [
 				'id' => $row['id_board'],
 				'name' => $row['name'],
 				'child_level' => $row['child_level'],
-			);
+			];
 
 			// If user selected some particular boards, is this one of them?
-			if (!empty(Utils::$context['search_params']['brd']))
-			{
+			if (!empty(Utils::$context['search_params']['brd'])) {
 				Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] = in_array($row['id_board'], Utils::$context['search_params']['brd']);
 			}
 			// User didn't select any boards, so select all except ignored and recycle boards.
-			else
-			{
+			else {
 				Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] = !$is_recycle_board && !in_array($row['id_board'], User::$me->ignoreboards);
 			}
 
 			// If a board wasn't checked that probably should have been ensure the board selection is selected, yo!
-			if (!Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && !$is_recycle_board)
-			{
+			if (!Utils::$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && !$is_recycle_board) {
 				Utils::$context['boards_check_all'] = false;
 			}
 		}
@@ -228,13 +223,13 @@ public function execute(): void
 		Category::sort(Utils::$context['categories']);
 
 		// Now, let's sort the list of categories into the boards for templates that like that.
-		$temp_boards = array();
-		foreach (Utils::$context['categories'] as $category)
-		{
-			$temp_boards[] = array(
+		$temp_boards = [];
+
+		foreach (Utils::$context['categories'] as $category) {
+			$temp_boards[] = [
 				'name' => $category['name'],
-				'child_ids' => array_keys($category['boards'])
-			);
+				'child_ids' => array_keys($category['boards']),
+			];
 			$temp_boards = array_merge($temp_boards, array_values($category['boards']));
 
 			// Include a list of boards per category for easy toggling.
@@ -243,54 +238,56 @@ public function execute(): void
 
 		$max_boards = ceil(count($temp_boards) / 2);
 
-		if ($max_boards == 1)
+		if ($max_boards == 1) {
 			$max_boards = 2;
+		}
 
 		// Now, alternate them so they can be shown left and right ;).
-		Utils::$context['board_columns'] = array();
-		for ($i = 0; $i < $max_boards; $i++)
-		{
+		Utils::$context['board_columns'] = [];
+
+		for ($i = 0; $i < $max_boards; $i++) {
 			Utils::$context['board_columns'][] = $temp_boards[$i];
 
-			if (isset($temp_boards[$i + $max_boards]))
+			if (isset($temp_boards[$i + $max_boards])) {
 				Utils::$context['board_columns'][] = $temp_boards[$i + $max_boards];
-			else
-				Utils::$context['board_columns'][] = array();
+			} else {
+				Utils::$context['board_columns'][] = [];
+			}
 		}
 
-		if (!empty($_REQUEST['topic']))
-		{
+		if (!empty($_REQUEST['topic'])) {
 			Utils::$context['search_params']['topic'] = (int) $_REQUEST['topic'];
 			Utils::$context['search_params']['show_complete'] = true;
 		}
 
-		if (!empty(Utils::$context['search_params']['topic']))
-		{
+		if (!empty(Utils::$context['search_params']['topic'])) {
 			Utils::$context['search_params']['topic'] = (int) Utils::$context['search_params']['topic'];
 
-			Utils::$context['search_topic'] = array(
+			Utils::$context['search_topic'] = [
 				'id' => Utils::$context['search_params']['topic'],
 				'href' => Config::$scripturl . '?topic=' . Utils::$context['search_params']['topic'] . '.0',
-			);
+			];
 
-			$request = Db::$db->query('', '
-				SELECT subject
+			$request = Db::$db->query(
+				'',
+				'SELECT subject
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				WHERE t.id_topic = {int:search_topic_id}
 					AND {query_see_message_board} ' . (Config::$modSettings['postmod_active'] ? '
 					AND t.approved = {int:is_approved_true}' : '') . '
 				LIMIT 1',
-				array(
+				[
 					'is_approved_true' => 1,
 					'search_topic_id' => Utils::$context['search_params']['topic'],
-				)
+				],
 			);
 
-			if (Db::$db->num_rows($request) == 0)
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('topic_gone', false);
+			}
 
-			list (Utils::$context['search_topic']['subject']) = Db::$db->fetch_row($request);
+			list(Utils::$context['search_topic']['subject']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			Utils::$context['search_topic']['link'] = '<a href="' . Utils::$context['search_topic']['href'] . '">' . Utils::$context['search_topic']['subject'] . '</a>';
@@ -312,8 +309,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -339,7 +337,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Search::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Search::exportStatic')) {
 	Search::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Search2.php b/Sources/Actions/Search2.php
index 526a5111fa..4c65de61f6 100644
--- a/Sources/Actions/Search2.php
+++ b/Sources/Actions/Search2.php
@@ -14,22 +14,19 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
-use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\PageIndex;
+use SMF\Search\SearchApi;
+use SMF\Search\SearchResult;
 use SMF\Security;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
-use SMF\Search\SearchResult;
 
 /**
  * Shows the search form.
@@ -43,12 +40,11 @@ class Search2 implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'PlushSearch2',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -66,14 +62,14 @@ class Search2 implements ActionInterface
 	 *
 	 * ID numbers of messages in the search results.
 	 */
-	public array $messages = array();
+	public array $messages = [];
 
 	/**
 	 * @var array
 	 *
 	 * ID numbers of the authors of the $messages.
 	 */
-	public array $posters = array();
+	public array $posters = [];
 
 	/****************************
 	 * Internal static properties
@@ -115,8 +111,9 @@ public function execute(): void
 		$this->setupVerification();
 
 		// Did we encounter any errors?
-		if ($this->errorCheck())
+		if ($this->errorCheck()) {
 			return;
+		}
 
 		// Spam me not, Spam-a-lot?
 		$this->spamCheck();
@@ -133,7 +130,7 @@ public function execute(): void
 			SearchApi::$loadedApi->searchWords,
 			SearchApi::$loadedApi->excludedIndexWords,
 			SearchApi::$loadedApi->participants,
-			SearchApi::$loadedApi->searchArray
+			SearchApi::$loadedApi->searchArray,
 		);
 
 		$this->initSearchContext();
@@ -155,39 +152,43 @@ public function prepareSearchContext($reset = false)
 		static $recycle_board = null;
 		static $counter = null;
 
-		if ($recycle_board === null)
+		if ($recycle_board === null) {
 			$recycle_board = !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : 0;
+		}
 
 		// Remember which message this is.  (ie. reply #83)
-		if ($counter == null || $reset)
+		if ($counter == null || $reset) {
 			$counter = ((int) $_REQUEST['start']) + 1;
+		}
 
 		// Start from the beginning...
-		if ($reset)
+		if ($reset) {
 			return @Db::$db->data_seek(SearchResult::$messages_request, 0);
+		}
 
-		if (!isset(SearchResult::$getter))
+		if (!isset(SearchResult::$getter)) {
 			return false;
+		}
 
 		$message = SearchResult::$getter->current();
 		SearchResult::$getter->next();
 
-		if (!$message)
+		if (!$message) {
 			return false;
+		}
 
 		$output = $message->format($counter);
 
-		if (!empty(Theme::$current->options['display_quick_mod']))
-		{
+		if (!empty(Theme::$current->options['display_quick_mod'])) {
 			$started = $output['first_post']['member']['id'] == User::$me->id;
 
-			$output['quick_mod'] = array(
+			$output['quick_mod'] = [
 				'lock' => in_array(0, SearchResult::$boards_can['lock_any']) || in_array($output['board']['id'], SearchResult::$boards_can['lock_any']) || ($started && (in_array(0, SearchResult::$boards_can['lock_own']) || in_array($output['board']['id'], SearchResult::$boards_can['lock_own']))),
 				'sticky' => (in_array(0, SearchResult::$boards_can['make_sticky']) || in_array($output['board']['id'], SearchResult::$boards_can['make_sticky'])),
 				'move' => in_array(0, SearchResult::$boards_can['move_any']) || in_array($output['board']['id'], SearchResult::$boards_can['move_any']) || ($started && (in_array(0, SearchResult::$boards_can['move_own']) || in_array($output['board']['id'], SearchResult::$boards_can['move_own']))),
 				'remove' => in_array(0, SearchResult::$boards_can['remove_any']) || in_array($output['board']['id'], SearchResult::$boards_can['remove_any']) || ($started && (in_array(0, SearchResult::$boards_can['remove_own']) || in_array($output['board']['id'], SearchResult::$boards_can['remove_own']))),
 				'restore' => Utils::$context['can_restore_perm'] && (Config::$modSettings['recycle_board'] == $output['board']['id']),
-			);
+			];
 
 			Utils::$context['can_lock'] |= $output['quick_mod']['lock'];
 			Utils::$context['can_sticky'] |= $output['quick_mod']['sticky'];
@@ -204,7 +205,7 @@ public function prepareSearchContext($reset = false)
 
 		$counter++;
 
-		IntegrationHook::call('integrate_search_message_context', array(&$output, &$message, $counter));
+		IntegrationHook::call('integrate_search_message_context', [&$output, &$message, $counter]);
 
 		return $output;
 	}
@@ -220,8 +221,9 @@ public function prepareSearchContext($reset = false)
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -249,8 +251,7 @@ protected function __construct()
 		// Number of pages hard maximum - normally not set at all.
 		Config::$modSettings['search_max_results'] = empty(Config::$modSettings['search_max_results']) ? 200 * Config::$modSettings['search_results_per_page'] : (int) Config::$modSettings['search_max_results'];
 
-		if (isset($_REQUEST['start']))
-			$_REQUEST['start'] = (int) $_REQUEST['start'];
+		$_REQUEST['start'] = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] - ((int) $_REQUEST['start'] % Config::$modSettings['search_results_per_page']) : 0;
 
 		Lang::load('Search');
 
@@ -263,8 +264,7 @@ protected function __construct()
 	 */
 	protected function redirectToMemberSearch(): void
 	{
-		if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members')
-		{
+		if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members') {
 			Utils::redirectexit(Config::$scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
 		}
 	}
@@ -274,8 +274,7 @@ protected function redirectToMemberSearch(): void
 	 */
 	protected function checkLoadAverage(): void
 	{
-		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_search']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_search'])
-		{
+		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_search']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_search']) {
 			ErrorHandler::fatalLang('loadavg_search_disabled', false);
 		}
 	}
@@ -286,10 +285,10 @@ protected function checkLoadAverage(): void
 	protected function preventPrefetch(): void
 	{
 		// No, no, no... this is a bit hard on the server, so don't you go prefetching it!
-		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		{
+		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
 			ob_end_clean();
 			Utils::sendHttpStatus(403);
+
 			die;
 		}
 	}
@@ -302,10 +301,10 @@ protected function errorCheck(): bool
 		IntegrationHook::call('integrate_search_errors');
 
 		// One or more search errors? Go back to the first search screen.
-		if (!empty(Utils::$context['search_errors']))
-		{
+		if (!empty(Utils::$context['search_errors'])) {
 			$_REQUEST['params'] = SearchApi::$loadedApi->compressParams();
 			Search::call();
+
 			return true;
 		}
 
@@ -317,8 +316,9 @@ protected function errorCheck(): bool
 	 */
 	protected function spamCheck(): void
 	{
-		if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != SearchApi::$loadedApi->params['search'])
+		if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != SearchApi::$loadedApi->params['search']) {
 			Security::spamProtection('search');
+		}
 
 		// Store the last search string to allow pages of results to be browsed.
 		$_SESSION['last_ss'] = SearchApi::$loadedApi->params['search'];
@@ -329,8 +329,9 @@ protected function spamCheck(): void
 	 */
 	protected function setupTemplate(): void
 	{
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('Search');
+		}
 
 		// If we're doing XML we need to use the results template regardless really.
 		Utils::$context['sub_template'] = 'results';
@@ -346,23 +347,25 @@ protected function setupTemplate(): void
 		// Let the user adjust the search query, should they wish?
 		Utils::$context['search_params'] = SearchApi::$loadedApi->params;
 
-		if (isset(Utils::$context['search_params']['search']))
+		if (isset(Utils::$context['search_params']['search'])) {
 			Utils::$context['search_params']['search'] = Utils::htmlspecialchars(Utils::$context['search_params']['search']);
+		}
 
-		if (isset(Utils::$context['search_params']['userspec']))
+		if (isset(Utils::$context['search_params']['userspec'])) {
 			Utils::$context['search_params']['userspec'] = Utils::htmlspecialchars(Utils::$context['search_params']['userspec']);
+		}
 
 		Utils::$context['params'] = SearchApi::$loadedApi->compressParams();
 
 		// ... and add the links to the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=search;params=' . SearchApi::$loadedApi->compressParams(),
-			'name' => Lang::$txt['search']
-		);
-		Utils::$context['linktree'][] = array(
+			'name' => Lang::$txt['search'],
+		];
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=search2;params=' . SearchApi::$loadedApi->compressParams(),
-			'name' => Lang::$txt['search_results']
-		);
+			'name' => Lang::$txt['search_results'],
+		];
 
 		// Now that we know how many results to expect we can start calculating the page numbers.
 		Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?action=search2;params=' . SearchApi::$loadedApi->compressParams(), $_REQUEST['start'], $this->num_results, Config::$modSettings['search_results_per_page'], false);
@@ -370,19 +373,21 @@ protected function setupTemplate(): void
 		Utils::$context['key_words'] = SearchApi::$loadedApi->searchArray;
 
 		// Setup the default topic icons... for checking they exist and the like!
-		Utils::$context['icon_sources'] = array();
-		foreach (Utils::$context['stable_icons'] as $icon)
+		Utils::$context['icon_sources'] = [];
+
+		foreach (Utils::$context['stable_icons'] as $icon) {
 			Utils::$context['icon_sources'][$icon] = 'images_url';
+		}
 
 		Utils::$context['page_title'] = Lang::$txt['search_results'];
-		Utils::$context['get_topics'] = array($this, 'prepareSearchContext');
+		Utils::$context['get_topics'] = [$this, 'prepareSearchContext'];
 		Utils::$context['can_restore_perm'] = User::$me->allowedTo('move_any') && !empty(Config::$modSettings['recycle_enable']);
 		Utils::$context['can_restore'] = false; // We won't know until we handle the context later whether we can actually restore...
 
-		Utils::$context['jump_to'] = array(
+		Utils::$context['jump_to'] = [
 			'label' => addslashes(Utils::htmlspecialcharsDecode(Lang::$txt['jump_to'])),
 			'board_name' => addslashes(Utils::htmlspecialcharsDecode(Lang::$txt['select_destination'])),
-		);
+		];
 	}
 
 	/**
@@ -391,18 +396,16 @@ protected function setupTemplate(): void
 	protected function setupVerification(): void
 	{
 		// Do we have captcha enabled?
-		if (User::$me->is_guest && !empty(Config::$modSettings['search_enable_captcha']) && empty($_SESSION['ss_vv_passed']) && (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != SearchApi::$loadedApi->params['search']))
-		{
-			$verifier = new Verifier(array('id' => 'search'));
+		if (User::$me->is_guest && !empty(Config::$modSettings['search_enable_captcha']) && empty($_SESSION['ss_vv_passed']) && (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != SearchApi::$loadedApi->params['search'])) {
+			$verifier = new Verifier(['id' => 'search']);
 
-			if (!empty($verifier->errors))
-			{
-				foreach ($verifier->errors as $error)
+			if (!empty($verifier->errors)) {
+				foreach ($verifier->errors as $error) {
 					Utils::$context['search_errors'][$error] = true;
+				}
 			}
 			// Don't keep asking for it - they've proven themselves worthy.
-			else
-			{
+			else {
 				$_SESSION['ss_vv_passed'] = true;
 			}
 		}
@@ -413,20 +416,21 @@ protected function setupVerification(): void
 	 */
 	protected function getPosters()
 	{
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}messages
 			WHERE id_member != {int:no_member}
 				AND id_msg IN ({array_int:message_list})
 			LIMIT {int:limit}',
-			array(
+			[
 				'message_list' => $this->messages,
 				'no_member' => 0,
 				'limit' => count(SearchApi::$loadedApi->results),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$this->posters[] = $row['id_member'];
 		}
 		Db::$db->free_result($request);
@@ -437,80 +441,76 @@ protected function getPosters()
 	 */
 	protected function spellCheck()
 	{
-		if (Utils::$context['show_spellchecking'])
-		{
+		if (Utils::$context['show_spellchecking']) {
 			// Don't hardcode spellchecking functions!
 			$link = SearchResult::spell_init();
 
-			$did_you_mean = array('search' => array(), 'display' => array());
+			$did_you_mean = ['search' => [], 'display' => []];
 			$found_misspelling = false;
-			foreach (SearchApi::$loadedApi->searchArray as $word)
-			{
-				if (empty($link))
+
+			foreach (SearchApi::$loadedApi->searchArray as $word) {
+				if (empty($link)) {
 					continue;
+				}
 
 				// Don't check phrases.
-				if (preg_match('~^\w+$~', $word) === 0)
-				{
+				if (preg_match('~^\w+$~', $word) === 0) {
 					$did_you_mean['search'][] = '"' . $word . '"';
 					$did_you_mean['display'][] = '&quot;' . Utils::htmlspecialchars($word) . '&quot;';
+
 					continue;
 				}
+
 				// For some strange reason spell check can crash PHP on decimals.
-				elseif (preg_match('~\d~', $word) === 1)
-				{
+				if (preg_match('~\d~', $word) === 1) {
 					$did_you_mean['search'][] = $word;
 					$did_you_mean['display'][] = Utils::htmlspecialchars($word);
+
 					continue;
 				}
-				elseif (SearchResult::spell_check($link, $word))
-				{
+
+				if (SearchResult::spell_check($link, $word)) {
 					$did_you_mean['search'][] = $word;
 					$did_you_mean['display'][] = Utils::htmlspecialchars($word);
+
 					continue;
 				}
 
 				$suggestions = SearchResult::spell_suggest($link, $word);
-				foreach ($suggestions as $i => $s)
-				{
+
+				foreach ($suggestions as $i => $s) {
 					// Search is case insensitive.
-					if (Utils::strtolower($s) == Utils::strtolower($word))
+					if (Utils::strtolower($s) == Utils::strtolower($word)) {
 						unset($suggestions[$i]);
+					}
 
 					// Plus, don't suggest something the user thinks is rude!
-					elseif ($suggestions[$i] != Lang::censorText($s))
+					elseif ($suggestions[$i] != Lang::censorText($s)) {
 						unset($suggestions[$i]);
+					}
 				}
 
 				// Anything found?  If so, correct it!
-				if (!empty($suggestions))
-				{
+				if (!empty($suggestions)) {
 					$suggestions = array_values($suggestions);
 					$did_you_mean['search'][] = $suggestions[0];
 					$did_you_mean['display'][] = '<em><strong>' . Utils::htmlspecialchars($suggestions[0]) . '</strong></em>';
 					$found_misspelling = true;
-				}
-				else
-				{
+				} else {
 					$did_you_mean['search'][] = $word;
 					$did_you_mean['display'][] = Utils::htmlspecialchars($word);
 				}
 			}
 
-			if ($found_misspelling)
-			{
+			if ($found_misspelling) {
 				// Don't spell check excluded words, but add them still...
-				$temp_excluded = array('search' => array(), 'display' => array());
+				$temp_excluded = ['search' => [], 'display' => []];
 
-				foreach (SearchApi::$loadedApi->excludedWords as $word)
-				{
-					if (preg_match('~^\w+$~', $word) == 0)
-					{
+				foreach (SearchApi::$loadedApi->excludedWords as $word) {
+					if (preg_match('~^\w+$~', $word) == 0) {
 						$temp_excluded['search'][] = '-"' . $word . '"';
 						$temp_excluded['display'][] = '-&quot;' . Utils::htmlspecialchars($word) . '&quot;';
-					}
-					else
-					{
+					} else {
 						$temp_excluded['search'][] = '-' . $word;
 						$temp_excluded['display'][] = '-' . Utils::htmlspecialchars($word);
 					}
@@ -522,13 +522,15 @@ protected function spellCheck()
 				$temp_params = SearchApi::$loadedApi->params;
 				$temp_params['search'] = implode(' ', $did_you_mean['search']);
 
-				if (isset($temp_params['brd']))
+				if (isset($temp_params['brd'])) {
 					$temp_params['brd'] = implode(',', $temp_params['brd']);
+				}
 
-				Utils::$context['params'] = array();
+				Utils::$context['params'] = [];
 
-				foreach ($temp_params as $k => $v)
+				foreach ($temp_params as $k => $v) {
 					Utils::$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+				}
 
 				Utils::$context['did_you_mean_params'] = base64_encode(implode('|"|', Utils::$context['did_you_mean_params']));
 				Utils::$context['did_you_mean'] = implode(' ', $did_you_mean['display']);
@@ -541,8 +543,9 @@ protected function spellCheck()
 	 */
 	protected function initSearchContext()
 	{
-		if (empty(SearchApi::$loadedApi->results))
+		if (empty(SearchApi::$loadedApi->results)) {
 			return;
+		}
 
 		SearchResult::setBoardsCan();
 
@@ -552,10 +555,11 @@ protected function initSearchContext()
 		// Load the posters...
 		$this->getPosters();
 
-		IntegrationHook::call('integrate_search_message_list', array(&$this->messages, &$this->posters));
+		IntegrationHook::call('integrate_search_message_list', [&$this->messages, &$this->posters]);
 
-		if (!empty($this->posters))
+		if (!empty($this->posters)) {
 			User::load(array_unique($this->posters));
+		}
 
 		SearchResult::$getter = SearchResult::get($this->messages);
 
@@ -563,9 +567,9 @@ protected function initSearchContext()
 		$this->num_results = !empty($_SESSION['search_cache']['num_results']) ? $_SESSION['search_cache']['num_results'] : SearchResult::getNumResults();
 
 		// If there are no results that means the things in the cache got deleted, so pretend we have no topics anymore.
-		if ($this->num_results == 0)
-		{
-			SearchApi::$loadedApi->results = array();
+		if ($this->num_results == 0) {
+			SearchApi::$loadedApi->results = [];
+
 			return;
 		}
 
@@ -574,7 +578,8 @@ protected function initSearchContext()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Search2::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Search2::exportStatic')) {
 	Search2::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/SendActivation.php b/Sources/Actions/SendActivation.php
index cf2784d214..668d5a3a7b 100644
--- a/Sources/Actions/SendActivation.php
+++ b/Sources/Actions/SendActivation.php
@@ -14,7 +14,6 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
@@ -33,12 +32,11 @@ class SendActivation implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'SendActivation',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -86,8 +84,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -109,12 +108,12 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SendActivation::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SendActivation::exportStatic')) {
 	SendActivation::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/SmStats.php b/Sources/Actions/SmStats.php
index a54f0d5921..c919170f50 100644
--- a/Sources/Actions/SmStats.php
+++ b/Sources/Actions/SmStats.php
@@ -13,11 +13,10 @@
 
 namespace SMF\Actions;
 
+use SMF\Actions\Admin\ACP;
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\User;
-use SMF\Actions\Admin\ACP;
 
 /**
  * Lets simplemachines.org gather statistics if, and only if, the admin allows.
@@ -31,12 +30,11 @@ class SmStats implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'SMStats',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -69,26 +67,29 @@ class SmStats implements ActionInterface
 	public function execute(): void
 	{
 		// First, is it disabled?
-		if (empty(Config::$modSettings['enable_sm_stats']) || empty(Config::$modSettings['sm_stats_key']))
+		if (empty(Config::$modSettings['enable_sm_stats']) || empty(Config::$modSettings['sm_stats_key'])) {
 			die();
+		}
 
 		// Are we saying who we are, and are we right? (OR an admin)
-		if (!User::$me->is_admin && (!isset($_GET['sid']) || $_GET['sid'] != Config::$modSettings['sm_stats_key']))
+		if (!User::$me->is_admin && (!isset($_GET['sid']) || $_GET['sid'] != Config::$modSettings['sm_stats_key'])) {
 			die();
+		}
 
 		// Verify the referer...
-		if (!User::$me->is_admin && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085'))
+		if (!User::$me->is_admin && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085')) {
 			die();
+		}
 
 		// Get some server versions.
-		$checkFor = array(
+		$checkFor = [
 			'php',
 			'db_server',
-		);
+		];
 		$serverVersions = ACP::getServerVersions($checkFor);
 
 		// Get the actual stats.
-		$stats_to_send = array(
+		$stats_to_send = [
 			'UID' => Config::$modSettings['sm_stats_key'],
 			'time_added' => time(),
 			'members' => Config::$modSettings['totalMembers'],
@@ -100,30 +101,28 @@ public function execute(): void
 			'database_version' => $serverVersions['db_server']['version'],
 			'smf_version' => SMF_FULL_VERSION,
 			'smfd_version' => Config::$modSettings['smfVersion'],
-		);
+		];
 
 		// Encode all the data, for security.
-		foreach ($stats_to_send as $k => $v)
+		foreach ($stats_to_send as $k => $v) {
 			$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+		}
 
 		// Turn this into the query string!
 		$stats_to_send = implode('&', $stats_to_send);
 
 		// If we're an admin, just plonk them out.
-		if (User::$me->is_admin)
-		{
+		if (User::$me->is_admin) {
 			echo $stats_to_send;
-		}
-		else
-		{
+		} else {
 			// Connect to the collection script.
 			$fp = @fsockopen('www.simplemachines.org', 443, $errno, $errstr);
 
-			if (!$fp)
+			if (!$fp) {
 				$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
+			}
 
-			if ($fp)
-			{
+			if ($fp) {
 				$length = strlen($stats_to_send);
 
 				$out = 'POST /smf/stats/collect_stats.php HTTP/1.1' . "\r\n";
@@ -153,8 +152,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -180,7 +180,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SmStats::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SmStats::exportStatic')) {
 	SmStats::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Stats.php b/Sources/Actions/Stats.php
index b645888d09..49fdf37675 100644
--- a/Sources/Actions/Stats.php
+++ b/Sources/Actions/Stats.php
@@ -14,8 +14,9 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -23,8 +24,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Provides a display for forum statistics.
@@ -38,12 +37,11 @@ class Stats implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'DisplayStats',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -74,74 +72,76 @@ public function execute(): void
 		User::$me->isAllowedTo('view_stats');
 
 		// Page disabled - redirect them out
-		if (empty(Config::$modSettings['trackStats']))
+		if (empty(Config::$modSettings['trackStats'])) {
 			ErrorHandler::fatalLang('feature_disabled', true);
+		}
 
-		if (!empty($_REQUEST['expand']))
-		{
+		if (!empty($_REQUEST['expand'])) {
 			Utils::$context['robot_no_index'] = true;
 
 			$month = (int) substr($_REQUEST['expand'], 4);
 			$year = (int) substr($_REQUEST['expand'], 0, 4);
 
-			if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12)
+			if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12) {
 				$_SESSION['expanded_stats'][$year][] = $month;
-		}
-		elseif (!empty($_REQUEST['collapse']))
-		{
+			}
+		} elseif (!empty($_REQUEST['collapse'])) {
 			Utils::$context['robot_no_index'] = true;
 
 			$month = (int) substr($_REQUEST['collapse'], 4);
 			$year = (int) substr($_REQUEST['collapse'], 0, 4);
 
-			if (!empty($_SESSION['expanded_stats'][$year]))
-				$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+			if (!empty($_SESSION['expanded_stats'][$year])) {
+				$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], [$month]);
+			}
 		}
 
 		// Handle the XMLHttpRequest.
-		if (isset($_REQUEST['xml']))
-		{
+		if (isset($_REQUEST['xml'])) {
 			// Collapsing stats only needs adjustments of the session variables.
-			if (!empty($_REQUEST['collapse']))
+			if (!empty($_REQUEST['collapse'])) {
 				Utils::obExit(false);
+			}
 
 			Utils::$context['sub_template'] = 'stats';
-			Utils::$context['yearly'] = array();
+			Utils::$context['yearly'] = [];
 
-			if (empty($month) || empty($year))
+			if (empty($month) || empty($year)) {
 				return;
+			}
 
-			$this->getDailyStats('YEAR(date) = {int:year} AND MONTH(date) = {int:month}', array('year' => $year, 'month' => $month));
+			$this->getDailyStats('YEAR(date) = {int:year} AND MONTH(date) = {int:month}', ['year' => $year, 'month' => $month]);
 
-			Utils::$context['yearly'][$year]['months'][$month]['date'] = array(
+			Utils::$context['yearly'][$year]['months'][$month]['date'] = [
 				'month' => sprintf('%02d', $month),
 				'year' => $year,
-			);
+			];
 
 			return;
 		}
 
 		Lang::load('Stats');
 		Theme::loadTemplate('Stats');
-		Theme::loadJavaScriptFile('stats.js', array('default_theme' => true, 'defer' => false, 'minimize' => true), 'smf_stats');
+		Theme::loadJavaScriptFile('stats.js', ['default_theme' => true, 'defer' => false, 'minimize' => true], 'smf_stats');
 
 		// Build the link tree......
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=stats',
-			'name' => Lang::$txt['stats_center']
-		);
+			'name' => Lang::$txt['stats_center'],
+		];
 		Utils::$context['page_title'] = Utils::$context['forum_name'] . ' - ' . Lang::$txt['stats_center'];
 
 		Utils::$context['show_member_list'] = User::$me->allowedTo('view_mlist');
 
 		// Get averages...
-		$result = Db::$db->query('', '
-			SELECT
+		$result = Db::$db->query(
+			'',
+			'SELECT
 				SUM(posts) AS posts, SUM(topics) AS topics, SUM(registers) AS registers,
 				SUM(most_on) AS most_on, MIN(date) AS date, SUM(hits) AS hits
 			FROM {db_prefix}log_activity',
-			array(
-			)
+			[
+			],
 		);
 		$row = Db::$db->fetch_assoc($result);
 		Db::$db->free_result($result);
@@ -158,34 +158,37 @@ public function execute(): void
 		Utils::$context['num_hits'] = Lang::numberFormat($row['hits'], 0);
 
 		// How many users are online now.
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_online',
-			array(
-			)
+			[
+			],
 		);
-		list (Utils::$context['users_online']) = Db::$db->fetch_row($result);
+		list(Utils::$context['users_online']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// Statistics such as number of boards, categories, etc.
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}boards AS b
 			WHERE b.redirect = {string:blank_redirect}',
-			array(
+			[
 				'blank_redirect' => '',
-			)
+			],
 		);
-		list (Utils::$context['num_boards']) = Db::$db->fetch_row($result);
+		list(Utils::$context['num_boards']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}categories AS c',
-			array(
-			)
+			[
+			],
 		);
-		list (Utils::$context['num_categories']) = Db::$db->fetch_row($result);
+		list(Utils::$context['num_categories']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// Format the numbers nicely.
@@ -196,33 +199,33 @@ public function execute(): void
 		Utils::$context['num_members'] = Lang::numberFormat(Config::$modSettings['totalMembers']);
 		Utils::$context['num_posts'] = Lang::numberFormat(Config::$modSettings['totalMessages']);
 		Utils::$context['num_topics'] = Lang::numberFormat(Config::$modSettings['totalTopics']);
-		Utils::$context['most_members_online'] = array(
+		Utils::$context['most_members_online'] = [
 			'number' => Lang::numberFormat(Config::$modSettings['mostOnline']),
 			'date' => Time::create('@' . Config::$modSettings['mostDate'])->format(),
-		);
+		];
 		Utils::$context['latest_member'] = &Utils::$context['common_stats']['latest_member'];
 
 		// Let's calculate gender stats only every four minutes.
-		$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : array();
-
-		if (!in_array('gender', $disabled_fields))
-		{
-			if ((Utils::$context['gender'] = CacheApi::get('stats_gender', 240)) == null)
-			{
-				$result = Db::$db->query('', '
-					SELECT default_value
+		$disabled_fields = isset(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : [];
+
+		if (!in_array('gender', $disabled_fields)) {
+			if ((Utils::$context['gender'] = CacheApi::get('stats_gender', 240)) == null) {
+				$result = Db::$db->query(
+					'',
+					'SELECT default_value
 					FROM {db_prefix}custom_fields
 					WHERE col_name= {string:gender_var}',
-					array(
+					[
 						'gender_var' => 'cust_gender',
-					)
+					],
 				);
 				$row = Db::$db->fetch_assoc($result);
 				$default_gender = !empty($row['default_value']) ? $row['default_value'] : '{gender_0}';
 				Db::$db->free_result($result);
 
-				$result = Db::$db->query('', '
-					SELECT COUNT(*) AS total_members, value AS gender
+				$result = Db::$db->query(
+					'',
+					'SELECT COUNT(*) AS total_members, value AS gender
 					FROM {db_prefix}members AS mem
 					INNER JOIN {db_prefix}themes AS t ON (
 						t.id_member = mem.id_member
@@ -231,16 +234,16 @@ public function execute(): void
 					)
 					WHERE is_activated = {int:is_activated}
 					GROUP BY value',
-					array(
+					[
 						'gender_var' => 'cust_gender',
 						'default_theme' => 1,
 						'is_activated' => 1,
 						'default_gender' => $default_gender,
-					)
+					],
 				);
-				Utils::$context['gender'] = array($default_gender => 0);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+				Utils::$context['gender'] = [$default_gender => 0];
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					Utils::$context['gender'][$row['gender']] = $row['total_members'];
 				}
 				Db::$db->free_result($result);
@@ -254,119 +257,123 @@ public function execute(): void
 		$date = Time::strftime('%Y-%m-%d', time());
 
 		// Members online so far today.
-		$result = Db::$db->query('', '
-			SELECT most_on
+		$result = Db::$db->query(
+			'',
+			'SELECT most_on
 			FROM {db_prefix}log_activity
 			WHERE date = {date:today_date}
 			LIMIT 1',
-			array(
+			[
 				'today_date' => $date,
-			)
+			],
 		);
-		list (Utils::$context['online_today']) = Db::$db->fetch_row($result);
+		list(Utils::$context['online_today']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		Utils::$context['online_today'] = Lang::numberFormat((int) Utils::$context['online_today']);
 
 		// Poster top 10.
-		$members_result = Db::$db->query('', '
-			SELECT id_member, real_name, posts
+		$members_result = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, posts
 			FROM {db_prefix}members
 			WHERE posts > {int:no_posts}
 			ORDER BY posts DESC
 			LIMIT 10',
-			array(
+			[
 				'no_posts' => 0,
-			)
+			],
 		);
-		Utils::$context['stats_blocks']['posters'] = array();
+		Utils::$context['stats_blocks']['posters'] = [];
 		$max_num_posts = 1;
-		while ($row_members = Db::$db->fetch_assoc($members_result))
-		{
-			Utils::$context['stats_blocks']['posters'][] = array(
+
+		while ($row_members = Db::$db->fetch_assoc($members_result)) {
+			Utils::$context['stats_blocks']['posters'][] = [
 				'name' => $row_members['real_name'],
 				'id' => $row_members['id_member'],
 				'num' => $row_members['posts'],
 				'href' => Config::$scripturl . '?action=profile;u=' . $row_members['id_member'],
-				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>',
+			];
 
-			if ($max_num_posts < $row_members['posts'])
+			if ($max_num_posts < $row_members['posts']) {
 				$max_num_posts = $row_members['posts'];
+			}
 		}
 		Db::$db->free_result($members_result);
 
-		foreach (Utils::$context['stats_blocks']['posters'] as $i => $poster)
-		{
+		foreach (Utils::$context['stats_blocks']['posters'] as $i => $poster) {
 			Utils::$context['stats_blocks']['posters'][$i]['percent'] = round(($poster['num'] * 100) / $max_num_posts);
 			Utils::$context['stats_blocks']['posters'][$i]['num'] = Lang::numberFormat(Utils::$context['stats_blocks']['posters'][$i]['num']);
 		}
 
 		// Board top 10.
-		$boards_result = Db::$db->query('', '
-			SELECT id_board, name, num_posts
+		$boards_result = Db::$db->query(
+			'',
+			'SELECT id_board, name, num_posts
 			FROM {db_prefix}boards AS b
 			WHERE {query_see_board}' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 				AND b.id_board != {int:recycle_board}' : '') . '
 				AND b.redirect = {string:blank_redirect}
 			ORDER BY num_posts DESC
 			LIMIT 10',
-			array(
+			[
 				'recycle_board' => Config::$modSettings['recycle_board'],
 				'blank_redirect' => '',
-			)
+			],
 		);
-		Utils::$context['stats_blocks']['boards'] = array();
+		Utils::$context['stats_blocks']['boards'] = [];
 		$max_num_posts = 1;
-		while ($row_board = Db::$db->fetch_assoc($boards_result))
-		{
-			Utils::$context['stats_blocks']['boards'][] = array(
+
+		while ($row_board = Db::$db->fetch_assoc($boards_result)) {
+			Utils::$context['stats_blocks']['boards'][] = [
 				'id' => $row_board['id_board'],
 				'name' => $row_board['name'],
 				'num' => $row_board['num_posts'],
 				'href' => Config::$scripturl . '?board=' . $row_board['id_board'] . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['name'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['name'] . '</a>',
+			];
 
-			if ($max_num_posts < $row_board['num_posts'])
+			if ($max_num_posts < $row_board['num_posts']) {
 				$max_num_posts = $row_board['num_posts'];
+			}
 		}
 		Db::$db->free_result($boards_result);
 
-		foreach (Utils::$context['stats_blocks']['boards'] as $i => $board)
-		{
+		foreach (Utils::$context['stats_blocks']['boards'] as $i => $board) {
 			Utils::$context['stats_blocks']['boards'][$i]['percent'] = round(($board['num'] * 100) / $max_num_posts);
 			Utils::$context['stats_blocks']['boards'][$i]['num'] = Lang::numberFormat(Utils::$context['stats_blocks']['boards'][$i]['num']);
 		}
 
 		// Are you on a larger forum?  If so, let's try to limit the number of topics we search through.
-		if (Config::$modSettings['totalMessages'] > 100000)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic
+		if (Config::$modSettings['totalMessages'] > 100000) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}topics
 				WHERE num_replies != {int:no_replies}' . (Config::$modSettings['postmod_active'] ? '
 					AND approved = {int:is_approved}' : '') . '
 				ORDER BY num_replies DESC
 				LIMIT 100',
-				array(
+				[
 					'no_replies' => 0,
 					'is_approved' => 1,
-				)
+				],
 			);
-			$topic_ids = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$topic_ids = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$topic_ids[] = $row['id_topic'];
 			}
 			Db::$db->free_result($request);
+		} else {
+			$topic_ids = [];
 		}
-		else
-			$topic_ids = array();
 
 		// Topic replies top 10.
-		$topic_reply_result = Db::$db->query('', '
-			SELECT m.subject, t.num_replies, t.id_board, t.id_topic, b.name
+		$topic_reply_result = Db::$db->query(
+			'',
+			'SELECT m.subject, t.num_replies, t.id_board, t.id_topic, b.name
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
@@ -376,70 +383,70 @@ public function execute(): void
 				AND t.approved = {int:is_approved}' : '')) . '
 			ORDER BY t.num_replies DESC
 			LIMIT 10',
-			array(
+			[
 				'topic_list' => $topic_ids,
 				'recycle_board' => Config::$modSettings['recycle_board'],
 				'is_approved' => 1,
-			)
+			],
 		);
-		Utils::$context['stats_blocks']['topics_replies'] = array();
+		Utils::$context['stats_blocks']['topics_replies'] = [];
 		$max_num_replies = 1;
 
-		while ($row_topic_reply = Db::$db->fetch_assoc($topic_reply_result))
-		{
+		while ($row_topic_reply = Db::$db->fetch_assoc($topic_reply_result)) {
 			Lang::censorText($row_topic_reply['subject']);
 
-			Utils::$context['stats_blocks']['topics_replies'][] = array(
+			Utils::$context['stats_blocks']['topics_replies'][] = [
 				'id' => $row_topic_reply['id_topic'],
-				'board' => array(
+				'board' => [
 					'id' => $row_topic_reply['id_board'],
 					'name' => $row_topic_reply['name'],
 					'href' => Config::$scripturl . '?board=' . $row_topic_reply['id_board'] . '.0',
-					'link' => '<a href="' . Config::$scripturl . '?board=' . $row_topic_reply['id_board'] . '.0">' . $row_topic_reply['name'] . '</a>'
-				),
+					'link' => '<a href="' . Config::$scripturl . '?board=' . $row_topic_reply['id_board'] . '.0">' . $row_topic_reply['name'] . '</a>',
+				],
 				'subject' => $row_topic_reply['subject'],
 				'num' => $row_topic_reply['num_replies'],
 				'href' => Config::$scripturl . '?topic=' . $row_topic_reply['id_topic'] . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row_topic_reply['id_topic'] . '.0">' . $row_topic_reply['subject'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row_topic_reply['id_topic'] . '.0">' . $row_topic_reply['subject'] . '</a>',
+			];
 
-			if ($max_num_replies < $row_topic_reply['num_replies'])
+			if ($max_num_replies < $row_topic_reply['num_replies']) {
 				$max_num_replies = $row_topic_reply['num_replies'];
+			}
 		}
 		Db::$db->free_result($topic_reply_result);
 
-		foreach (Utils::$context['stats_blocks']['topics_replies'] as $i => $topic)
-		{
+		foreach (Utils::$context['stats_blocks']['topics_replies'] as $i => $topic) {
 			Utils::$context['stats_blocks']['topics_replies'][$i]['percent'] = round(($topic['num'] * 100) / $max_num_replies);
 			Utils::$context['stats_blocks']['topics_replies'][$i]['num'] = Lang::numberFormat(Utils::$context['stats_blocks']['topics_replies'][$i]['num']);
 		}
 
 		// Large forums may need a bit more prodding...
-		if (Config::$modSettings['totalMessages'] > 100000)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic
+		if (Config::$modSettings['totalMessages'] > 100000) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}topics
 				WHERE num_views != {int:no_views}
 				ORDER BY num_views DESC
 				LIMIT 100',
-				array(
+				[
 					'no_views' => 0,
-				)
+				],
 			);
-			$topic_ids = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$topic_ids = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$topic_ids[] = $row['id_topic'];
 			}
 			Db::$db->free_result($request);
+		} else {
+			$topic_ids = [];
 		}
-		else
-			$topic_ids = array();
 
 		// Topic views top 10.
-		$topic_view_result = Db::$db->query('', '
-			SELECT m.subject, t.num_views, t.id_board, t.id_topic, b.name
+		$topic_view_result = Db::$db->query(
+			'',
+			'SELECT m.subject, t.num_views, t.id_board, t.id_topic, b.name
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
@@ -449,60 +456,60 @@ public function execute(): void
 				AND t.approved = {int:is_approved}' : '')) . '
 			ORDER BY t.num_views DESC
 			LIMIT 10',
-			array(
+			[
 				'topic_list' => $topic_ids,
 				'recycle_board' => Config::$modSettings['recycle_board'],
 				'is_approved' => 1,
-			)
+			],
 		);
-		Utils::$context['stats_blocks']['topics_views'] = array();
+		Utils::$context['stats_blocks']['topics_views'] = [];
 		$max_num = 1;
-		while ($row_topic_views = Db::$db->fetch_assoc($topic_view_result))
-		{
+
+		while ($row_topic_views = Db::$db->fetch_assoc($topic_view_result)) {
 			Lang::censorText($row_topic_views['subject']);
 
-			Utils::$context['stats_blocks']['topics_views'][] = array(
+			Utils::$context['stats_blocks']['topics_views'][] = [
 				'id' => $row_topic_views['id_topic'],
-				'board' => array(
+				'board' => [
 					'id' => $row_topic_views['id_board'],
 					'name' => $row_topic_views['name'],
 					'href' => Config::$scripturl . '?board=' . $row_topic_views['id_board'] . '.0',
-					'link' => '<a href="' . Config::$scripturl . '?board=' . $row_topic_views['id_board'] . '.0">' . $row_topic_views['name'] . '</a>'
-				),
+					'link' => '<a href="' . Config::$scripturl . '?board=' . $row_topic_views['id_board'] . '.0">' . $row_topic_views['name'] . '</a>',
+				],
 				'subject' => $row_topic_views['subject'],
 				'num' => $row_topic_views['num_views'],
 				'href' => Config::$scripturl . '?topic=' . $row_topic_views['id_topic'] . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row_topic_views['id_topic'] . '.0">' . $row_topic_views['subject'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row_topic_views['id_topic'] . '.0">' . $row_topic_views['subject'] . '</a>',
+			];
 
-			if ($max_num < $row_topic_views['num_views'])
+			if ($max_num < $row_topic_views['num_views']) {
 				$max_num = $row_topic_views['num_views'];
+			}
 		}
 		Db::$db->free_result($topic_view_result);
 
-		foreach (Utils::$context['stats_blocks']['topics_views'] as $i => $topic)
-		{
+		foreach (Utils::$context['stats_blocks']['topics_views'] as $i => $topic) {
 			Utils::$context['stats_blocks']['topics_views'][$i]['percent'] = round(($topic['num'] * 100) / $max_num);
 			Utils::$context['stats_blocks']['topics_views'][$i]['num'] = Lang::numberFormat(Utils::$context['stats_blocks']['topics_views'][$i]['num']);
 		}
 
 		// Try to cache this when possible, because it's a little unavoidably slow.
-		if (($members = CacheApi::get('stats_top_starters', 360)) == null)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member_started, COUNT(*) AS hits
+		if (($members = CacheApi::get('stats_top_starters', 360)) == null) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member_started, COUNT(*) AS hits
 				FROM {db_prefix}topics' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 				WHERE id_board != {int:recycle_board}' : '') . '
 				GROUP BY id_member_started
 				ORDER BY hits DESC
 				LIMIT 20',
-				array(
+				[
 					'recycle_board' => Config::$modSettings['recycle_board'],
-				)
+				],
 			);
-			$members = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$members = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$members[$row['id_member_started']] = $row['hits'];
 			}
 			Db::$db->free_result($request);
@@ -510,70 +517,76 @@ public function execute(): void
 			CacheApi::put('stats_top_starters', $members, 360);
 		}
 
-		if (empty($members))
-			$members = array(0 => 0);
+		if (empty($members)) {
+			$members = [0 => 0];
+		}
 
 		// Topic poster top 10.
-		$members_result = Db::$db->query('', '
-			SELECT id_member, real_name
+		$members_result = Db::$db->query(
+			'',
+			'SELECT id_member, real_name
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:member_list})',
-			array(
+			[
 				'member_list' => array_keys($members),
-			)
+			],
 		);
-		Utils::$context['stats_blocks']['starters'] = array();
+		Utils::$context['stats_blocks']['starters'] = [];
 		$max_num = 1;
-		while ($row_members = Db::$db->fetch_assoc($members_result))
-		{
+
+		while ($row_members = Db::$db->fetch_assoc($members_result)) {
 			$i = array_search($row_members['id_member'], array_keys($members));
 
 			// skip all not top 10
-			if ($i > 10)
+			if ($i > 10) {
 				continue;
+			}
 
-			Utils::$context['stats_blocks']['starters'][$i] = array(
+			Utils::$context['stats_blocks']['starters'][$i] = [
 				'name' => $row_members['real_name'],
 				'id' => $row_members['id_member'],
 				'num' => $members[$row_members['id_member']],
 				'href' => Config::$scripturl . '?action=profile;u=' . $row_members['id_member'],
-				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>',
+			];
 
-			if ($max_num < $members[$row_members['id_member']])
+			if ($max_num < $members[$row_members['id_member']]) {
 				$max_num = $members[$row_members['id_member']];
+			}
 		}
 		ksort(Utils::$context['stats_blocks']['starters']);
 		Db::$db->free_result($members_result);
 
-		foreach (Utils::$context['stats_blocks']['starters'] as $i => $topic)
-		{
+		foreach (Utils::$context['stats_blocks']['starters'] as $i => $topic) {
 			Utils::$context['stats_blocks']['starters'][$i]['percent'] = round(($topic['num'] * 100) / $max_num);
 			Utils::$context['stats_blocks']['starters'][$i]['num'] = Lang::numberFormat(Utils::$context['stats_blocks']['starters'][$i]['num']);
 		}
 
 		// Time online top 10.
 		$temp = CacheApi::get('stats_total_time_members', 600);
-		$members_result = Db::$db->query('', '
-			SELECT id_member, real_name, total_time_logged_in
+		$members_result = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, total_time_logged_in
 			FROM {db_prefix}members
 			WHERE is_activated = {int:is_activated}' .
 			(!empty($temp) ? ' AND id_member IN ({array_int:member_list_cached})' : '') . '
 			ORDER BY total_time_logged_in DESC
 			LIMIT 20',
-			array(
+			[
 				'member_list_cached' => $temp,
 				'is_activated' => 1,
-			)
+			],
 		);
-		Utils::$context['stats_blocks']['time_online'] = array();
-		$temp2 = array();
+		Utils::$context['stats_blocks']['time_online'] = [];
+		$temp2 = [];
 		$max_time_online = 1;
-		while ($row_members = Db::$db->fetch_assoc($members_result))
-		{
+
+		while ($row_members = Db::$db->fetch_assoc($members_result)) {
 			$temp2[] = (int) $row_members['id_member'];
-			if (count(Utils::$context['stats_blocks']['time_online']) >= 10)
+
+			if (count(Utils::$context['stats_blocks']['time_online']) >= 10) {
 				continue;
+			}
 
 			// Figure out the days, hours and minutes.
 			$timeDays = floor($row_members['total_time_logged_in'] / 86400);
@@ -581,43 +594,48 @@ public function execute(): void
 
 			// Figure out which things to show... (days, hours, minutes, etc.)
 			$timelogged = '';
-			if ($timeDays > 0)
+
+			if ($timeDays > 0) {
 				$timelogged .= $timeDays . Lang::$txt['total_time_logged_d'];
-			if ($timeHours > 0)
+			}
+
+			if ($timeHours > 0) {
 				$timelogged .= $timeHours . Lang::$txt['total_time_logged_h'];
+			}
 			$timelogged .= floor(($row_members['total_time_logged_in'] % 3600) / 60) . Lang::$txt['total_time_logged_m'];
 
-			Utils::$context['stats_blocks']['time_online'][] = array(
+			Utils::$context['stats_blocks']['time_online'][] = [
 				'id' => $row_members['id_member'],
 				'name' => $row_members['real_name'],
 				'num' => $timelogged,
 				'seconds_online' => $row_members['total_time_logged_in'],
 				'href' => Config::$scripturl . '?action=profile;u=' . $row_members['id_member'],
-				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>',
+			];
 
-			if ($max_time_online < $row_members['total_time_logged_in'])
+			if ($max_time_online < $row_members['total_time_logged_in']) {
 				$max_time_online = $row_members['total_time_logged_in'];
+			}
 		}
 		Db::$db->free_result($members_result);
 
-		foreach (Utils::$context['stats_blocks']['time_online'] as $i => $member)
-		{
+		foreach (Utils::$context['stats_blocks']['time_online'] as $i => $member) {
 			Utils::$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
 		}
 
 		// Cache the ones we found for a bit, just so we don't have to look again.
-		if ($temp !== $temp2)
+		if ($temp !== $temp2) {
 			CacheApi::put('stats_total_time_members', $temp2, 480);
+		}
 
 		// Likes.
-		if (!empty(Config::$modSettings['enable_likes']))
-		{
+		if (!empty(Config::$modSettings['enable_likes'])) {
 			// Liked messages top 10.
-			Utils::$context['stats_blocks']['liked_messages'] = array();
+			Utils::$context['stats_blocks']['liked_messages'] = [];
 			$max_liked_message = 1;
-			$liked_messages = Db::$db->query('', '
-				SELECT m.id_msg, m.subject, m.likes, m.id_board, m.id_topic, t.approved
+			$liked_messages = Db::$db->query(
+				'',
+				'SELECT m.id_msg, m.subject, m.likes, m.id_board, m.id_topic, t.approved
 				FROM (
 					SELECT n.id_msg, n.subject, n.likes, n.id_board, n.id_topic
 					FROM {db_prefix}messages as n
@@ -631,39 +649,39 @@ public function execute(): void
 					AND t.approved = {int:is_approved}' : '') . '
 				ORDER BY m.likes DESC
 				LIMIT 10',
-				array(
+				[
 					'recycle_board' => Config::$modSettings['recycle_board'],
 					'is_approved' => 1,
-				)
+				],
 			);
 
-			while ($row_liked_message = Db::$db->fetch_assoc($liked_messages))
-			{
+			while ($row_liked_message = Db::$db->fetch_assoc($liked_messages)) {
 				Lang::censorText($row_liked_message['subject']);
 
-				Utils::$context['stats_blocks']['liked_messages'][] = array(
+				Utils::$context['stats_blocks']['liked_messages'][] = [
 					'id' => $row_liked_message['id_topic'],
 					'subject' => $row_liked_message['subject'],
 					'num' => $row_liked_message['likes'],
 					'href' => Config::$scripturl . '?msg=' . $row_liked_message['id_msg'],
-					'link' => '<a href="' . Config::$scripturl . '?msg=' . $row_liked_message['id_msg'] . '">' . $row_liked_message['subject'] . '</a>'
-				);
+					'link' => '<a href="' . Config::$scripturl . '?msg=' . $row_liked_message['id_msg'] . '">' . $row_liked_message['subject'] . '</a>',
+				];
 
-				if ($max_liked_message < $row_liked_message['likes'])
+				if ($max_liked_message < $row_liked_message['likes']) {
 					$max_liked_message = $row_liked_message['likes'];
+				}
 			}
 			Db::$db->free_result($liked_messages);
 
-			foreach (Utils::$context['stats_blocks']['liked_messages'] as $i => $liked_messages)
-			{
+			foreach (Utils::$context['stats_blocks']['liked_messages'] as $i => $liked_messages) {
 				Utils::$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
 			}
 
 			// Liked users top 10.
-			Utils::$context['stats_blocks']['liked_users'] = array();
+			Utils::$context['stats_blocks']['liked_users'] = [];
 			$max_liked_users = 1;
-			$liked_users = Db::$db->query('', '
-				SELECT m.id_member AS liked_user, COUNT(l.content_id) AS count, mem.real_name
+			$liked_users = Db::$db->query(
+				'',
+				'SELECT m.id_member AS liked_user, COUNT(l.content_id) AS count, mem.real_name
 				FROM {db_prefix}user_likes AS l
 					INNER JOIN {db_prefix}messages AS m ON (l.content_id = m.id_msg)
 					INNER JOIN {db_prefix}members AS mem ON (m.id_member = mem.id_member)
@@ -672,51 +690,51 @@ public function execute(): void
 				GROUP BY m.id_member, mem.real_name
 				ORDER BY count DESC
 				LIMIT 10',
-				array(
+				[
 					'no_posts' => 0,
 					'zero' => 0,
-				)
+				],
 			);
 
-			while ($row_liked_users = Db::$db->fetch_assoc($liked_users))
-			{
-				Utils::$context['stats_blocks']['liked_users'][] = array(
+			while ($row_liked_users = Db::$db->fetch_assoc($liked_users)) {
+				Utils::$context['stats_blocks']['liked_users'][] = [
 					'id' => $row_liked_users['liked_user'],
 					'num' => $row_liked_users['count'],
 					'href' => Config::$scripturl . '?action=profile;u=' . $row_liked_users['liked_user'],
 					'name' => $row_liked_users['real_name'],
 					'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_liked_users['liked_user'] . '">' . $row_liked_users['real_name'] . '</a>',
-				);
+				];
 
-				if ($max_liked_users < $row_liked_users['count'])
+				if ($max_liked_users < $row_liked_users['count']) {
 					$max_liked_users = $row_liked_users['count'];
+				}
 			}
 
 			Db::$db->free_result($liked_users);
 
-			foreach (Utils::$context['stats_blocks']['liked_users'] as $i => $liked_users)
-			{
+			foreach (Utils::$context['stats_blocks']['liked_users'] as $i => $liked_users) {
 				Utils::$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
 			}
 		}
 
 		// Activity by month.
-		$months_result = Db::$db->query('', '
-			SELECT
+		$months_result = Db::$db->query(
+			'',
+			'SELECT
 				YEAR(date) AS stats_year, MONTH(date) AS stats_month, SUM(hits) AS hits, SUM(registers) AS registers, SUM(topics) AS topics, SUM(posts) AS posts, MAX(most_on) AS most_on, COUNT(*) AS num_days
 			FROM {db_prefix}log_activity
 			GROUP BY stats_year, stats_month',
-			array()
+			[],
 		);
 
-		Utils::$context['yearly'] = array();
-		while ($row_months = Db::$db->fetch_assoc($months_result))
-		{
+		Utils::$context['yearly'] = [];
+
+		while ($row_months = Db::$db->fetch_assoc($months_result)) {
 			$ID_MONTH = $row_months['stats_year'] . sprintf('%02d', $row_months['stats_month']);
 			$expanded = !empty($_SESSION['expanded_stats'][$row_months['stats_year']]) && in_array($row_months['stats_month'], $_SESSION['expanded_stats'][$row_months['stats_year']]);
 
-			if (!isset(Utils::$context['yearly'][$row_months['stats_year']]))
-				Utils::$context['yearly'][$row_months['stats_year']] = array(
+			if (!isset(Utils::$context['yearly'][$row_months['stats_year']])) {
+				Utils::$context['yearly'][$row_months['stats_year']] = [
 					'year' => $row_months['stats_year'],
 					'new_topics' => 0,
 					'new_posts' => 0,
@@ -724,17 +742,18 @@ public function execute(): void
 					'most_members_online' => 0,
 					'hits' => 0,
 					'num_months' => 0,
-					'months' => array(),
+					'months' => [],
 					'expanded' => false,
 					'current_year' => $row_months['stats_year'] == date('Y'),
-				);
+				];
+			}
 
-			Utils::$context['yearly'][$row_months['stats_year']]['months'][(int) $row_months['stats_month']] = array(
+			Utils::$context['yearly'][$row_months['stats_year']]['months'][(int) $row_months['stats_month']] = [
 				'id' => $ID_MONTH,
-				'date' => array(
+				'date' => [
 					'month' => sprintf('%02d', $row_months['stats_month']),
-					'year' => $row_months['stats_year']
-				),
+					'year' => $row_months['stats_year'],
+				],
 				'href' => Config::$scripturl . '?action=stats;' . ($expanded ? 'collapse' : 'expand') . '=' . $ID_MONTH . '#m' . $ID_MONTH,
 				'link' => '<a href="' . Config::$scripturl . '?action=stats;' . ($expanded ? 'collapse' : 'expand') . '=' . $ID_MONTH . '#m' . $ID_MONTH . '">' . Lang::$txt['months_titles'][(int) $row_months['stats_month']] . ' ' . $row_months['stats_year'] . '</a>',
 				'month' => Lang::$txt['months_titles'][(int) $row_months['stats_month']],
@@ -745,9 +764,9 @@ public function execute(): void
 				'most_members_online' => Lang::numberFormat($row_months['most_on']),
 				'hits' => Lang::numberFormat($row_months['hits']),
 				'num_days' => $row_months['num_days'],
-				'days' => array(),
-				'expanded' => $expanded
-			);
+				'days' => [],
+				'expanded' => $expanded,
+			];
 
 			Utils::$context['yearly'][$row_months['stats_year']]['new_topics'] += $row_months['topics'];
 			Utils::$context['yearly'][$row_months['stats_year']]['new_posts'] += $row_months['posts'];
@@ -760,9 +779,9 @@ public function execute(): void
 
 		krsort(Utils::$context['yearly']);
 
-		Utils::$context['collapsed_years'] = array();
-		foreach (Utils::$context['yearly'] as $year => $data)
-		{
+		Utils::$context['collapsed_years'] = [];
+
+		foreach (Utils::$context['yearly'] as $year => $data) {
 			// This gets rid of the filesort on the query ;).
 			krsort(Utils::$context['yearly'][$year]['months']);
 
@@ -773,22 +792,23 @@ public function execute(): void
 			Utils::$context['yearly'][$year]['hits'] = Lang::numberFormat($data['hits']);
 
 			// Keep a list of collapsed years.
-			if (!$data['expanded'] && !$data['current_year'])
+			if (!$data['expanded'] && !$data['current_year']) {
 				Utils::$context['collapsed_years'][] = $year;
+			}
 		}
 
 		// Custom stats (just add a template_layer to add it to the template!)
 		IntegrationHook::call('integrate_forum_stats');
 
-		if (empty($_SESSION['expanded_stats']))
+		if (empty($_SESSION['expanded_stats'])) {
 			return;
+		}
 
-		$condition_text = array();
-		$condition_params = array();
-		foreach ($_SESSION['expanded_stats'] as $year => $months)
-		{
-			if (!empty($months))
-			{
+		$condition_text = [];
+		$condition_params = [];
+
+		foreach ($_SESSION['expanded_stats'] as $year => $months) {
+			if (!empty($months)) {
 				$condition_text[] = 'YEAR(date) = {int:year_' . $year . '} AND MONTH(date) IN ({array_int:months_' . $year . '})';
 				$condition_params['year_' . $year] = $year;
 				$condition_params['months_' . $year] = $months;
@@ -796,8 +816,9 @@ public function execute(): void
 		}
 
 		// No daily stats to even look at?
-		if (empty($condition_text))
+		if (empty($condition_text)) {
 			return;
+		}
 
 		$this->getDailyStats(implode(' OR ', $condition_text), $condition_params);
 	}
@@ -813,8 +834,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -845,19 +867,20 @@ protected function __construct()
 	 * @param string $condition_string An SQL condition string
 	 * @param array $condition_parameters Parameters for $condition_string
 	 */
-	protected function getDailyStats($condition_string, $condition_parameters = array())
+	protected function getDailyStats($condition_string, $condition_parameters = [])
 	{
 		// Activity by day.
-		$days_result = Db::$db->query('', '
-			SELECT YEAR(date) AS stats_year, MONTH(date) AS stats_month, DAYOFMONTH(date) AS stats_day, topics, posts, registers, most_on, hits
+		$days_result = Db::$db->query(
+			'',
+			'SELECT YEAR(date) AS stats_year, MONTH(date) AS stats_month, DAYOFMONTH(date) AS stats_day, topics, posts, registers, most_on, hits
 			FROM {db_prefix}log_activity
 			WHERE ' . $condition_string . '
 			ORDER BY stats_day ASC',
-			$condition_parameters
+			$condition_parameters,
 		);
-		while ($row_days = Db::$db->fetch_assoc($days_result))
-		{
-			Utils::$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
+
+		while ($row_days = Db::$db->fetch_assoc($days_result)) {
+			Utils::$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = [
 				'day' => sprintf('%02d', $row_days['stats_day']),
 				'month' => sprintf('%02d', $row_days['stats_month']),
 				'year' => $row_days['stats_year'],
@@ -865,15 +888,16 @@ protected function getDailyStats($condition_string, $condition_parameters = arra
 				'new_posts' => Lang::numberFormat($row_days['posts']),
 				'new_members' => Lang::numberFormat($row_days['registers']),
 				'most_members_online' => Lang::numberFormat($row_days['most_on']),
-				'hits' => Lang::numberFormat($row_days['hits'])
-			);
+				'hits' => Lang::numberFormat($row_days['hits']),
+			];
 		}
 		Db::$db->free_result($days_result);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Stats::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Stats::exportStatic')) {
 	Stats::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicMerge.php b/Sources/Actions/TopicMerge.php
index b575687ffe..f0d5242ecf 100644
--- a/Sources/Actions/TopicMerge.php
+++ b/Sources/Actions/TopicMerge.php
@@ -16,25 +16,23 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
-use SMF\BBCodeParser;
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Logging;
-use SMF\Msg;
 use SMF\Mail;
+use SMF\Msg;
 use SMF\PageIndex;
+use SMF\Search\SearchApi;
 use SMF\Theme;
 use SMF\Time;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * Handles merging of topics.
@@ -48,14 +46,14 @@ class TopicMerge implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'MergeTopics',
-			'initiate' => false,
+			'mergeIndex' => 'MergeIndex',
 			'mergeExecute' => 'MergeExecute',
-		),
-	);
+			'mergeDone' => 'MergeDone',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -74,7 +72,7 @@ class TopicMerge implements ActionInterface
 	 *
 	 * IDs of the topics to merge.
 	 */
-	public array $topics = array();
+	public array $topics = [];
 
 	/**************************
 	 * Public static properties
@@ -85,12 +83,12 @@ class TopicMerge implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'index' => 'index',
 		'done' => 'done',
 		'merge' => 'merge',
 		'options' => 'options',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -101,7 +99,7 @@ class TopicMerge implements ActionInterface
 	 *
 	 *
 	 */
-	protected array $topic_data = array();
+	protected array $topic_data = [];
 
 	/**
 	 * @var int
@@ -122,21 +120,21 @@ class TopicMerge implements ActionInterface
 	 *
 	 *
 	 */
-	protected array $boardTotals = array();
+	protected array $boardTotals = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	protected array $boards = array();
+	protected array $boards = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	protected array $polls = array();
+	protected array $polls = [];
 
 	/**
 	 * @var int
@@ -171,14 +169,14 @@ class TopicMerge implements ActionInterface
 	 *
 	 *
 	 */
-	protected array $can_approve_boards = array();
+	protected array $can_approve_boards = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	protected array $merge_boards = array();
+	protected array $merge_boards = [];
 
 	/****************************
 	 * Internal static properties
@@ -209,10 +207,11 @@ public function execute(): void
 		// Load the template....
 		Theme::loadTemplate('MoveTopic');
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -226,8 +225,9 @@ public function execute(): void
 	 */
 	public function index()
 	{
-		if (!isset($_GET['from']))
+		if (!isset($_GET['from'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		$_GET['from'] = (int) $_GET['from'];
 
@@ -235,26 +235,24 @@ public function index()
 		Utils::$context['target_board'] = $_REQUEST['targetboard'];
 
 		// Prepare a handy query bit for approval...
-		if (Config::$modSettings['postmod_active'])
-		{
+		if (Config::$modSettings['postmod_active']) {
 			$can_approve_boards = User::$me->boardsAllowedTo('approve_posts');
-			$onlyApproved = $can_approve_boards !== array(0) && !in_array($_REQUEST['targetboard'], $can_approve_boards);
-		}
-		else
-		{
+			$onlyApproved = $can_approve_boards !== [0] && !in_array($_REQUEST['targetboard'], $can_approve_boards);
+		} else {
 			$onlyApproved = false;
 		}
 
 		// How many topics are on this board?  (used for paging.)
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}topics AS t
 			WHERE t.id_board = {int:id_board}' . ($onlyApproved ? '
 				AND t.approved = {int:is_approved}' : ''),
-			array(
+			[
 				'id_board' => $_REQUEST['targetboard'],
 				'is_approved' => 1,
-			)
+			],
 		);
 		list($topiccount) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -263,22 +261,23 @@ public function index()
 		Utils::$context['page_index'] = new PageIndex(Config::$scripturl . '?action=mergetopics;from=' . $_GET['from'] . ';targetboard=' . $_REQUEST['targetboard'] . ';board=' . Board::$info->id . '.%1$d', $_REQUEST['start'], $topiccount, Config::$modSettings['defaultMaxTopics'], true);
 
 		// Get the topic's subject.
-		$request = Db::$db->query('', '
-			SELECT m.subject
+		$request = Db::$db->query(
+			'',
+			'SELECT m.subject
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 			WHERE t.id_topic = {int:id_topic}
 				AND t.id_board = {int:current_board}' . ($onlyApproved ? '
 				AND t.approved = {int:is_approved}' : '') . '
 			LIMIT 1',
-			array(
+			[
 				'current_board' => Board::$info->id,
 				'id_topic' => $_GET['from'],
 				'is_approved' => 1,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_board');
 		}
 		list($subject) = Db::$db->fetch_row($request);
@@ -293,30 +292,32 @@ public function index()
 		// Check which boards you have merge permissions on.
 		$this->merge_boards = User::$me->boardsAllowedTo('merge_any');
 
-		if (empty($this->merge_boards))
+		if (empty($this->merge_boards)) {
 			ErrorHandler::fatalLang('cannot_merge_any', 'user');
+		}
 
 		// No sense in loading this if you can only merge on this board
-		if (count($this->merge_boards) > 1 || in_array(0, $this->merge_boards))
-		{
+		if (count($this->merge_boards) > 1 || in_array(0, $this->merge_boards)) {
 			// Set up a couple of options for our board list
-			$options = array(
+			$options = [
 				'not_redirection' => true,
 				'selected_board' => Utils::$context['target_board'],
-			);
+			];
 
 			// Only include these boards in the list (0 means you're an admin')
-			if (!in_array(0, $this->merge_boards))
+			if (!in_array(0, $this->merge_boards)) {
 				$options['included_boards'] = $this->merge_boards;
+			}
 
 			Utils::$context['merge_categories'] = MessageIndex::getBoardList($options);
 		}
 
 		// Get some topics to merge it with.
-		Utils::$context['topics'] = array();
+		Utils::$context['topics'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT t.id_topic, m.subject, m.id_member, COALESCE(mem.real_name, m.poster_name) AS poster_name
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_topic, m.subject, m.id_member, COALESCE(mem.real_name, m.poster_name) AS poster_name
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
@@ -326,7 +327,7 @@ public function index()
 				AND t.approved = {int:is_approved}' : '') . '
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:limit}',
-			array(
+			[
 				'id_board' => $_REQUEST['targetboard'],
 				'id_topic' => $_GET['from'],
 				'sort' => 't.is_sticky DESC, t.id_last_msg DESC',
@@ -334,28 +335,27 @@ public function index()
 				'limit' => Config::$modSettings['defaultMaxTopics'],
 				'is_approved' => 1,
 				'not_redirect' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Lang::censorText($row['subject']);
 
-			Utils::$context['topics'][] = array(
+			Utils::$context['topics'][] = [
 				'id' => $row['id_topic'],
-				'poster' => array(
+				'poster' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'href' => empty($row['id_member']) ? '' : Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '" target="_blank" rel="noopener">' . $row['poster_name'] . '</a>'
-				),
+					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '" target="_blank" rel="noopener">' . $row['poster_name'] . '</a>',
+				],
 				'subject' => $row['subject'],
-				'js_subject' => addcslashes(addslashes($row['subject']), '/')
-			);
+				'js_subject' => addcslashes(addslashes($row['subject']), '/'),
+			];
 		}
 		Db::$db->free_result($request);
 
-		if (empty(Utils::$context['topics']) && count($this->merge_boards) <= 1 && !in_array(0, $this->merge_boards))
-		{
+		if (empty(Utils::$context['topics']) && count($this->merge_boards) <= 1 && !in_array(0, $this->merge_boards)) {
 			ErrorHandler::fatalLang('merge_need_more_topics');
 		}
 
@@ -374,63 +374,64 @@ public function options(): void
 	{
 		$this->initOptionsAndMerge();
 
-		if (count($this->polls) > 1)
-		{
-			$request = Db::$db->query('', '
-				SELECT t.id_topic, t.id_poll, m.subject, p.question
+		if (count($this->polls) > 1) {
+			$request = Db::$db->query(
+				'',
+				'SELECT t.id_topic, t.id_poll, m.subject, p.question
 				FROM {db_prefix}polls AS p
 					INNER JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				WHERE p.id_poll IN ({array_int:polls})
 				LIMIT {int:limit}',
-				array(
+				[
 					'polls' => $this->polls,
 					'limit' => count($this->polls),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				Utils::$context['polls'][] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				Utils::$context['polls'][] = [
 					'id' => $row['id_poll'],
-					'topic' => array(
+					'topic' => [
 						'id' => $row['id_topic'],
-						'subject' => $row['subject']
-					),
+						'subject' => $row['subject'],
+					],
 					'question' => $row['question'],
-					'selected' => $row['id_topic'] == $this->firstTopic
-				);
+					'selected' => $row['id_topic'] == $this->firstTopic,
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (count($this->boards) > 1)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_board, name
+		if (count($this->boards) > 1) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board, name
 				FROM {db_prefix}boards
 				WHERE id_board IN ({array_int:boards})
 				ORDER BY name
 				LIMIT {int:limit}',
-				array(
+				[
 					'boards' => $this->boards,
 					'limit' => count($this->boards),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				Utils::$context['boards'][] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				Utils::$context['boards'][] = [
 					'id' => $row['id_board'],
 					'name' => $row['name'],
-					'selected' => $row['id_board'] == $this->topic_data[$this->firstTopic]['board']
-				);
+					'selected' => $row['id_board'] == $this->topic_data[$this->firstTopic]['board'],
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
 		Utils::$context['topics'] = $this->topic_data;
 
-		foreach ($this->topic_data as $id => $topic)
+		foreach ($this->topic_data as $id => $topic) {
 			Utils::$context['topics'][$id]['selected'] = $topic['id'] == $this->firstTopic;
+		}
 
 		Utils::$context['page_title'] = Lang::$txt['merge'];
 		Utils::$context['sub_template'] = 'merge_extra_options';
@@ -452,38 +453,39 @@ public function merge(): void
 		// Determine target board.
 		$target_board = count($this->boards) > 1 ? (int) $_REQUEST['board'] : $this->boards[0];
 
-		if (!in_array($target_board, $this->boards))
+		if (!in_array($target_board, $this->boards)) {
 			ErrorHandler::fatalLang('no_board');
+		}
 
 		// Determine which poll will survive and which polls won't.
 		$target_poll = count($this->polls) > 1 ? (int) $_POST['poll'] : (count($this->polls) == 1 ? $this->polls[0] : 0);
 
-		if ($target_poll > 0 && !in_array($target_poll, $this->polls))
+		if ($target_poll > 0 && !in_array($target_poll, $this->polls)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
-		$deleted_polls = empty($target_poll) ? $this->polls : array_diff($this->polls, array($target_poll));
+		$deleted_polls = empty($target_poll) ? $this->polls : array_diff($this->polls, [$target_poll]);
 
 		// Determine the subject of the newly merged topic - was a custom subject specified?
-		if (empty($_POST['subject']) && isset($_POST['custom_subject']) && $_POST['custom_subject'] != '')
-		{
-			$target_subject = strtr(Utils::htmlTrim(Utils::htmlspecialchars($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
+		if (empty($_POST['subject']) && isset($_POST['custom_subject']) && $_POST['custom_subject'] != '') {
+			$target_subject = strtr(Utils::htmlTrim(Utils::htmlspecialchars($_POST['custom_subject'])), ["\r" => '', "\n" => '', "\t" => '']);
 
 			// Keep checking the length.
-			if (Utils::entityStrlen($target_subject) > 100)
+			if (Utils::entityStrlen($target_subject) > 100) {
 				$target_subject = Utils::entitySubstr($target_subject, 0, 100);
+			}
 
 			// Nothing left - odd but pick the first topics subject.
-			if ($target_subject == '')
+			if ($target_subject == '') {
 				$target_subject = $this->topic_data[$this->firstTopic]['subject'];
+			}
 		}
 		// A subject was selected from the list.
-		elseif (!empty($this->topic_data[(int) $_POST['subject']]['subject']))
-		{
+		elseif (!empty($this->topic_data[(int) $_POST['subject']]['subject'])) {
 			$target_subject = $this->topic_data[(int) $_POST['subject']]['subject'];
 		}
 		// Nothing worked? Just take the subject of the first message.
-		else
-		{
+		else {
 			$target_subject = $this->topic_data[$this->firstTopic]['subject'];
 		}
 
@@ -491,41 +493,35 @@ public function merge(): void
 		$topic_approved = 1;
 		$first_msg = 0;
 
-		$request = Db::$db->query('', '
-			SELECT approved, MIN(id_msg) AS first_msg, MAX(id_msg) AS last_msg, COUNT(*) AS message_count
+		$request = Db::$db->query(
+			'',
+			'SELECT approved, MIN(id_msg) AS first_msg, MAX(id_msg) AS last_msg, COUNT(*) AS message_count
 			FROM {db_prefix}messages
 			WHERE id_topic IN ({array_int:topics})
 			GROUP BY approved
 			ORDER BY approved DESC',
-			array(
+			[
 				'topics' => $this->topics,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// If this is approved, or is fully unapproved.
-			if ($row['approved'] || !empty($first_msg))
-			{
+			if ($row['approved'] || !empty($first_msg)) {
 				$first_msg = $row['first_msg'];
 				$last_msg = $row['last_msg'];
 
-				if ($row['approved'])
-				{
+				if ($row['approved']) {
 					$num_replies = $row['message_count'] - 1;
 					$num_unapproved = 0;
-				}
-				else
-				{
+				} else {
 					$topic_approved = 0;
 					$num_replies = 0;
 					$num_unapproved = $row['message_count'];
 				}
-			}
-			else
-			{
+			} else {
 				// If this has a lower first_msg then the first post is not approved and hence the number of replies was wrong!
-				if ($first_msg > $row['first_msg'])
-				{
+				if ($first_msg > $row['first_msg']) {
 					$first_msg = $row['first_msg'];
 					$num_replies++;
 					$topic_approved = 0;
@@ -537,14 +533,13 @@ public function merge(): void
 		Db::$db->free_result($request);
 
 		// Ensure we have a board stat for the target board.
-		if (!isset($this->boardTotals[$target_board]))
-		{
-			$this->boardTotals[$target_board] = array(
+		if (!isset($this->boardTotals[$target_board])) {
+			$this->boardTotals[$target_board] = [
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
-				'unapproved_topics' => 0
-			);
+				'unapproved_topics' => 0,
+			];
 		}
 
 		// Fix the topic count stuff depending on what the new one counts as.
@@ -555,33 +550,36 @@ public function merge(): void
 		$this->boardTotals[$target_board]['posts'] -= $topic_approved ? $num_replies + 1 : $num_replies;
 
 		// Get the member ID of the first and last message.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}messages
 			WHERE id_msg IN ({int:first_msg}, {int:last_msg})
 			ORDER BY id_msg
 			LIMIT 2',
-			array(
+			[
 				'first_msg' => $first_msg,
 				'last_msg' => $last_msg,
-			)
+			],
 		);
 		list($member_started) = Db::$db->fetch_row($request);
 		list($member_updated) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// First and last message are the same, so only row was returned.
-		if ($member_updated === null)
+		if ($member_updated === null) {
 			$member_updated = $member_started;
+		}
 
 		// Obtain all the message ids we are going to affect.
-		$request = Db::$db->query('', '
-			SELECT id_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT id_msg
 			FROM {db_prefix}messages
 			WHERE id_topic IN ({array_int:topic_list})',
-			array(
+			[
 				'topic_list' => $this->topics,
-			)
+			],
 		);
 		$affected_msgs = Db::$db->fetch_all($request);
 		Db::$db->free_result($request);
@@ -589,44 +587,42 @@ public function merge(): void
 		// Assign the first topic ID to be the merged topic.
 		$id_topic = min($this->topics);
 
-		$deleted_topics = array_diff($this->topics, array($id_topic));
-		$updated_topics = array();
+		$deleted_topics = array_diff($this->topics, [$id_topic]);
+		$updated_topics = [];
 
 		// Create stub topics out of the remaining topics.
 		// We don't want the search index data though (For non-redirect merges).
-		if (!isset($_POST['postRedirect']))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_search_subjects
+		if (!isset($_POST['postRedirect'])) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_search_subjects
 				WHERE id_topic IN ({array_int:deleted_topics})',
-				array(
+				[
 					'deleted_topics' => $deleted_topics,
-				)
+				],
 			);
 		}
 
-		$posterOptions = array(
+		$posterOptions = [
 			'id' => User::$me->id,
 			'update_post_count' => false,
-		);
+		];
 
 		// We only need to do this if we're posting redirection topics...
-		if (isset($_POST['postRedirect']))
-		{
+		if (isset($_POST['postRedirect'])) {
 			// Replace tokens with links in the reason.
-			$reason_replacements = array(
+			$reason_replacements = [
 				Lang::$txt['movetopic_auto_topic'] => '[iurl="' . Config::$scripturl . '?topic=' . $id_topic . '.0"]' . $target_subject . '[/iurl]',
-			);
+			];
 
 			// Should be in the boardwide language.
-			if (User::$me->language != Lang::$default)
-			{
+			if (User::$me->language != Lang::$default) {
 				Lang::load('index', Lang::$default);
 
 				// Make sure we catch both languages in the reason.
-				$reason_replacements += array(
+				$reason_replacements += [
 					Lang::$txt['movetopic_auto_topic'] => '[iurl="' . Config::$scripturl . '?topic=' . $id_topic . '.0"]' . $target_subject . '[/iurl]',
-				);
+				];
 			}
 
 			$_POST['reason'] = Utils::htmlspecialchars($_POST['reason'], ENT_QUOTES);
@@ -641,29 +637,27 @@ public function merge(): void
 			// Redirect to the MERGED topic from topic list?
 			$redirect_topic = isset($_POST['redirect_topic']) ? $id_topic : 0;
 
-			foreach ($deleted_topics as $this_old_topic)
-			{
+			foreach ($deleted_topics as $this_old_topic) {
 				$redirect_subject = sprintf(Lang::$txt['merged_subject'], $this->topic_data[$this_old_topic]['subject']);
 
-				$msgOptions = array(
+				$msgOptions = [
 					'icon' => 'moved',
 					'subject' => $redirect_subject,
 					'body' => $reason,
 					'approved' => 1,
-				);
+				];
 
-				$topicOptions = array(
+				$topicOptions = [
 					'id' => $this_old_topic,
 					'is_approved' => true,
 					'lock_mode' => 1,
 					'board' => $this->topic_data[$this_old_topic]['board'],
 					'mark_as_read' => true,
-				);
+				];
 
 				// So we have to make the post. We need to do *this* here so we don't foul up indexes later
 				// and we have to fix them up later once everything else has happened.
-				if (Msg::create($msgOptions, $topicOptions, $posterOptions))
-				{
+				if (Msg::create($msgOptions, $topicOptions, $posterOptions)) {
 					$updated_topics[$this_old_topic] = $msgOptions['id'];
 				}
 
@@ -672,19 +666,16 @@ public function merge(): void
 			}
 
 			// Restore language strings to normal.
-			if (User::$me->language != Lang::$default)
+			if (User::$me->language != Lang::$default) {
 				Lang::load('index');
+			}
 		}
 
 		// Grab the response prefix (like 'Re: ') in the default forum language.
-		if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix')))
-		{
-			if (Lang::$default === User::$me->language)
-			{
+		if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix'))) {
+			if (Lang::$default === User::$me->language) {
 				Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
-			}
-			else
-			{
+			} else {
 				Lang::load('index', Lang::$default, false);
 				Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
 				Lang::load('index');
@@ -694,215 +685,226 @@ public function merge(): void
 		}
 
 		// Change the topic IDs of all messages that will be merged.  Also adjust subjects if 'enforce subject' was checked.
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET
 				id_topic = {int:id_topic},
 				id_board = {int:target_board}' . (empty($_POST['enforce_subject']) ? '' : ',
 				subject = {string:subject}') . '
 			WHERE id_topic IN ({array_int:topic_list})' . (!empty($updated_topics) ? '
 				AND id_msg NOT IN ({array_int:merge_msg})' : ''),
-			array(
+			[
 				'topic_list' => $this->topics,
 				'id_topic' => $id_topic,
 				'merge_msg' => $updated_topics,
 				'target_board' => $target_board,
 				'subject' => Utils::$context['response_prefix'] . $target_subject,
-			)
+			],
 		);
 
 		// Any reported posts should reflect the new board.
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_reported
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_reported
 			SET
 				id_topic = {int:id_topic},
 				id_board = {int:target_board}
 			WHERE id_topic IN ({array_int:topics_list})',
-			array(
+			[
 				'topics_list' => $this->topics,
 				'id_topic' => $id_topic,
 				'target_board' => $target_board,
-			)
+			],
 		);
 
 		// Change the subject of the first message...
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET subject = {string:target_subject}
 			WHERE id_msg = {int:first_msg}',
-			array(
+			[
 				'first_msg' => $first_msg,
 				'target_subject' => $target_subject,
-			)
+			],
 		);
 
 		// Adjust all calendar events to point to the new topic.
-		Db::$db->query('', '
-			UPDATE {db_prefix}calendar
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}calendar
 			SET
 				id_topic = {int:id_topic},
 				id_board = {int:target_board}
 			WHERE id_topic IN ({array_int:deleted_topics})',
-			array(
+			[
 				'deleted_topics' => $deleted_topics,
 				'id_topic' => $id_topic,
 				'target_board' => $target_board,
-			)
+			],
 		);
 
 		// Merge log topic entries.
 		// The unwatch setting comes from the oldest topic
-		$request = Db::$db->query('', '
-			SELECT id_member, MIN(id_msg) AS new_id_msg, unwatched
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, MIN(id_msg) AS new_id_msg, unwatched
 			FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:topics})
 			GROUP BY id_member, unwatched',
-			array(
+			[
 				'topics' => $this->topics,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) > 0)
-		{
-			$replaceEntries = array();
 
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$replaceEntries[] = array($row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']);
+		if (Db::$db->num_rows($request) > 0) {
+			$replaceEntries = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$replaceEntries[] = [$row['id_member'], $id_topic, $row['new_id_msg'], $row['unwatched']];
 			}
 
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_topics',
-				array('id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
+				['id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'],
 				$replaceEntries,
-				array('id_member', 'id_topic')
+				['id_member', 'id_topic'],
 			);
 
 			unset($replaceEntries);
 
 			// Get rid of the old log entries.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_topics
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_topics
 				WHERE id_topic IN ({array_int:deleted_topics})',
-				array(
+				[
 					'deleted_topics' => $deleted_topics,
-				)
+				],
 			);
 		}
 		Db::$db->free_result($request);
 
 		// Merge topic notifications.
-		$notifications = isset($_POST['notifications']) && is_array($_POST['notifications']) ? array_intersect($this->topics, $_POST['notifications']) : array();
+		$notifications = isset($_POST['notifications']) && is_array($_POST['notifications']) ? array_intersect($this->topics, $_POST['notifications']) : [];
 
-		if (!empty($notifications))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member, MAX(sent) AS sent
+		if (!empty($notifications)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, MAX(sent) AS sent
 				FROM {db_prefix}log_notify
 				WHERE id_topic IN ({array_int:topics_list})
 				GROUP BY id_member',
-				array(
+				[
 					'topics_list' => $notifications,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) > 0)
-			{
-				$replaceEntries = array();
 
-				while ($row = Db::$db->fetch_assoc($request))
-					$replaceEntries[] = array($row['id_member'], $id_topic, 0, $row['sent']);
+			if (Db::$db->num_rows($request) > 0) {
+				$replaceEntries = [];
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					$replaceEntries[] = [$row['id_member'], $id_topic, 0, $row['sent']];
+				}
 
-				Db::$db->insert('replace',
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}log_notify',
-					array('id_member' => 'int', 'id_topic' => 'int', 'id_board' => 'int', 'sent' => 'int'),
+					['id_member' => 'int', 'id_topic' => 'int', 'id_board' => 'int', 'sent' => 'int'],
 					$replaceEntries,
-					array('id_member', 'id_topic', 'id_board')
+					['id_member', 'id_topic', 'id_board'],
 				);
 
 				unset($replaceEntries);
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_topics
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_topics
 					WHERE id_topic IN ({array_int:deleted_topics})',
-					array(
+					[
 						'deleted_topics' => $deleted_topics,
-					)
+					],
 				);
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Get rid of the redundant polls.
-		if (!empty($deleted_polls))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}polls
+		if (!empty($deleted_polls)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}polls
 				WHERE id_poll IN ({array_int:deleted_polls})',
-				array(
+				[
 					'deleted_polls' => $deleted_polls,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}poll_choices
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}poll_choices
 				WHERE id_poll IN ({array_int:deleted_polls})',
-				array(
+				[
 					'deleted_polls' => $deleted_polls,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_polls
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_polls
 				WHERE id_poll IN ({array_int:deleted_polls})',
-				array(
+				[
 					'deleted_polls' => $deleted_polls,
-				)
+				],
 			);
 		}
 
 		// Cycle through each board...
-		foreach ($this->boardTotals as $id_board => $stats)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		foreach ($this->boardTotals as $id_board => $stats) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET
 					num_topics = CASE WHEN {int:topics} > num_topics THEN 0 ELSE num_topics - {int:topics} END,
 					unapproved_topics = CASE WHEN {int:unapproved_topics} > unapproved_topics THEN 0 ELSE unapproved_topics - {int:unapproved_topics} END,
 					num_posts = CASE WHEN {int:posts} > num_posts THEN 0 ELSE num_posts - {int:posts} END,
 					unapproved_posts = CASE WHEN {int:unapproved_posts} > unapproved_posts THEN 0 ELSE unapproved_posts - {int:unapproved_posts} END
 				WHERE id_board = {int:id_board}',
-				array(
+				[
 					'id_board' => $id_board,
 					'topics' => $stats['topics'],
 					'unapproved_topics' => $stats['unapproved_topics'],
 					'posts' => $stats['posts'],
 					'unapproved_posts' => $stats['unapproved_posts'],
-				)
+				],
 			);
 		}
 
 		// Determine the board the final topic resides in
-		$request = Db::$db->query('', '
-			SELECT id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board
 			FROM {db_prefix}topics
 			WHERE id_topic = {int:id_topic}
 			LIMIT 1',
-			array(
+			[
 				'id_topic' => $id_topic,
-			)
+			],
 		);
 		list($id_board) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Again, only do this if we're redirecting - otherwise delete
-		if (isset($_POST['postRedirect']))
-		{
+		if (isset($_POST['postRedirect'])) {
 			// Having done all that, now make sure we fix the merge/redirect topics upp before we
 			// leave here. Specifically: that there are no replies, no unapproved stuff, that the first
 			// and last posts are the same and so on and so forth.
-			foreach ($updated_topics as $old_topic => $id_msg)
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}topics
+			foreach ($updated_topics as $old_topic => $id_msg) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}topics
 					SET id_first_msg = id_last_msg,
 						id_member_started = {int:current_user},
 						id_member_updated = {int:current_user},
@@ -913,37 +915,38 @@ public function merge(): void
 						id_redirect_topic = {int:redirect_topic},
 						redirect_expires = {int:redirect_expires}
 					WHERE id_topic = {int:old_topic}',
-					array(
+					[
 						'current_user' => User::$me->id,
 						'old_topic' => $old_topic,
 						'redirect_topic' => $redirect_topic,
-						'redirect_expires' => $redirect_expires
-					)
+						'redirect_expires' => $redirect_expires,
+					],
 				);
 			}
 		}
 
 		// Ensure we don't accidentally delete the poll we want to keep...
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_poll = 0
 			WHERE id_topic IN ({array_int:deleted_topics})',
-			array(
-				'deleted_topics' => $deleted_topics
-			)
+			[
+				'deleted_topics' => $deleted_topics,
+			],
 		);
 
 		// Delete any remaining data regarding these topics, this is done before changing the properties of the merged topic (else we get duplicate keys)...
-		if (!isset($_POST['postRedirect']))
-		{
+		if (!isset($_POST['postRedirect'])) {
 			// Remove any remaining info about these topics...
 			// We do not need to remove the counts of the deleted topics, as we already removed these.
 			Topic::remove($deleted_topics, false, true, false);
 		}
 
 		// Assign the properties of the newly merged topic.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET
 				id_board = {int:id_board},
 				id_member_started = {int:id_member_started},
@@ -957,7 +960,7 @@ public function merge(): void
 				is_sticky = {int:is_sticky},
 				approved = {int:approved}
 			WHERE id_topic = {int:id_topic}',
-			array(
+			[
 				'id_board' => $target_board,
 				'is_sticky' => $this->is_sticky,
 				'approved' => $topic_approved,
@@ -970,7 +973,7 @@ public function merge(): void
 				'num_replies' => $num_replies,
 				'unapproved_posts' => $num_unapproved,
 				'num_views' => $this->num_views,
-			)
+			],
 		);
 
 		// Update all the statistics.
@@ -978,7 +981,7 @@ public function merge(): void
 		Logging::updateStats('subject', $id_topic, $target_subject);
 		Msg::updateLastMessages($this->boards);
 
-		Logging::logAction('merge', array('topic' => $id_topic, 'board' => $id_board));
+		Logging::logAction('merge', ['topic' => $id_topic, 'board' => $id_board]);
 
 		// Notify people that these topics have been merged?
 		Mail::sendNotifications($id_topic, 'merge');
@@ -986,13 +989,12 @@ public function merge(): void
 		// If there's a search index that needs updating, update it...
 		$searchAPI = SearchApi::load();
 
-		if (is_callable(array($searchAPI, 'topicMerge')))
-		{
-			$searchAPI->topicMerge($id_topic, $this->topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : array(Utils::$context['response_prefix'], $target_subject));
+		if (is_callable([$searchAPI, 'topicMerge'])) {
+			$searchAPI->topicMerge($id_topic, $this->topics, $affected_msgs, empty($_POST['enforce_subject']) ? null : [Utils::$context['response_prefix'], $target_subject]);
 		}
 
 		// Merging is the sort of thing an external CMS might want to know about
-		$merged_topic = array(
+		$merged_topic = [
 			'id_board' => $target_board,
 			'is_sticky' => $this->is_sticky,
 			'approved' => $topic_approved,
@@ -1006,9 +1008,9 @@ public function merge(): void
 			'unapproved_posts' => $num_unapproved,
 			'num_views' => $this->num_views,
 			'subject' => $target_subject,
-		);
+		];
 
-		IntegrationHook::call('integrate_merge_topic', array($merged_topic, $updated_topics, $deleted_topics, $deleted_polls));
+		IntegrationHook::call('integrate_merge_topic', [$merged_topic, $updated_topics, $deleted_topics, $deleted_polls]);
 
 		// Send them to the all done page.
 		Utils::redirectexit('action=mergetopics;sa=done;to=' . $id_topic . ';targetboard=' . $target_board);
@@ -1020,7 +1022,7 @@ public function merge(): void
 	 * - Accessed via ?action=mergetopics;sa=done.
 	 * - Uses 'merge_done' sub template of the SplitTopics template.
 	 */
-	function done()
+	public function done()
 	{
 		// Make sure the template knows everything...
 		Utils::$context['target_board'] = (int) $_GET['targetboard'];
@@ -1041,8 +1043,9 @@ function done()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -1062,7 +1065,7 @@ public static function call(): void
 	 *
 	 * @param array $topics The IDs of the topics to merge
 	 */
-	public static function initiate($topics = array())
+	public static function initiate($topics = [])
 	{
 		self::load();
 		self::$obj->subaction = 'options';
@@ -1086,7 +1089,7 @@ public static function mergeIndex(): void
 	 *
 	 * @param array $topics The IDs of the topics to merge
 	 */
-	public function mergeExecute($topics = array())
+	public static function mergeExecute($topics = [])
 	{
 		self::load();
 		self::$obj->subaction = !empty($_GET['sa']) && $_GET['sa'] === 'merge' ? 'merge' : 'options';
@@ -1114,14 +1117,14 @@ public static function mergeDone(): void
 	protected function __construct()
 	{
 		// The 'merge' sub-action used to be called 'execute'.
-		if (!empty($_GET['sa']) && $_GET['sa'] === 'execute')
-		{
+		if (!empty($_GET['sa']) && $_GET['sa'] === 'execute') {
 			$_GET['sa'] = 'merge';
 			$_REQUEST['sa'] = 'merge';
 		}
 
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 
 	/**
@@ -1135,34 +1138,37 @@ protected function initOptionsAndMerge()
 		$this->getTopics();
 
 		// There's nothing to merge with just one topic...
-		if (empty($this->topics) || !is_array($this->topics) || count($this->topics) == 1)
+		if (empty($this->topics) || !is_array($this->topics) || count($this->topics) == 1) {
 			ErrorHandler::fatalLang('merge_need_more_topics');
+		}
 
 		// Make sure every topic is numeric, or some nasty things could be done with the DB.
 		$this->topics = array_map('intval', $this->topics);
 
 		// Joy of all joys, make sure they're not messing about with unapproved topics they can't see :P
-		if (Config::$modSettings['postmod_active'])
+		if (Config::$modSettings['postmod_active']) {
 			$this->can_approve_boards = User::$me->boardsAllowedTo('approve_posts');
+		}
 
 		$this->getTopicData();
 
 		Utils::$context['is_approved'] = &$this->approved;
 
 		// If we didn't get any topics then they've been messing with unapproved stuff.
-		if (empty($this->topic_data))
+		if (empty($this->topic_data)) {
 			ErrorHandler::fatalLang('no_topic_id');
+		}
 
-		if (isset($_POST['postRedirect']) && !empty($this->lowestTopicBoard))
+		if (isset($_POST['postRedirect']) && !empty($this->lowestTopicBoard)) {
 			$this->boardTotals[$this->lowestTopicBoard]['topics']++;
+		}
 
 		// Will this be approved?
 		$this->approved = $this->topic_data[$this->firstTopic]['approved'];
 
 		$this->boards = array_values(array_unique($this->boards));
 
-		if (!empty($this->topics))
-		{
+		if (!empty($this->topics)) {
 			User::$me->isAllowedTo('merge_any', $this->boards);
 			Theme::loadTemplate('MoveTopic');
 		}
@@ -1176,16 +1182,19 @@ protected function initOptionsAndMerge()
 	protected function getTopics()
 	{
 		// Already set.
-		if (count($this->topics) > 1)
+		if (count($this->topics) > 1) {
 			return;
+		}
 
 		// Handle URLs from MergeIndex.
-		if (!empty($_GET['from']) && !empty($_GET['to']))
-			$this->topics = array((int) $_GET['from'], (int) $_GET['to']);
+		if (!empty($_GET['from']) && !empty($_GET['to'])) {
+			$this->topics = [(int) $_GET['from'], (int) $_GET['to']];
+		}
 
 		// If we came from a form, the topic IDs came by post.
-		if (!empty($_REQUEST['topics']) && is_array($_REQUEST['topics']))
+		if (!empty($_REQUEST['topics']) && is_array($_REQUEST['topics'])) {
 			$this->topics = (array) $_REQUEST['topics'];
+		}
 	}
 
 	/**
@@ -1193,8 +1202,9 @@ protected function getTopics()
 	 */
 	protected function getTopicData()
 	{
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				t.id_topic, t.id_board, t.id_poll, t.num_views, t.is_sticky, t.approved, t.num_replies, t.unapproved_posts, t.id_redirect_topic,
 				m1.subject, m1.poster_time AS time_started, COALESCE(mem1.id_member, 0) AS id_member_started, COALESCE(mem1.real_name, m1.poster_name) AS name_started,
 				m2.poster_time AS time_updated, COALESCE(mem2.id_member, 0) AS id_member_updated, COALESCE(mem2.real_name, m2.poster_name) AS name_updated
@@ -1206,44 +1216,43 @@ protected function getTopicData()
 			WHERE t.id_topic IN ({array_int:topic_list})
 			ORDER BY t.id_first_msg
 			LIMIT {int:limit}',
-			array(
+			[
 				'topic_list' => $this->topics,
 				'limit' => count($this->topics),
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) < 2)
-		{
+
+		if (Db::$db->num_rows($request) < 2) {
 			ErrorHandler::fatalLang('no_topic_id');
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Sorry, redirection topics can't be merged
-			if (!empty($row['id_redirect_topic']))
+			if (!empty($row['id_redirect_topic'])) {
 				ErrorHandler::fatalLang('cannot_merge_redirect', false);
+			}
 
 			// Make a note for the board counts...
-			if (!isset($this->boardTotals[$row['id_board']]))
-				$this->boardTotals[$row['id_board']] = array(
+			if (!isset($this->boardTotals[$row['id_board']])) {
+				$this->boardTotals[$row['id_board']] = [
 					'posts' => 0,
 					'topics' => 0,
 					'unapproved_posts' => 0,
-					'unapproved_topics' => 0
-				);
+					'unapproved_topics' => 0,
+				];
+			}
 
 			// We can't see unapproved topics here?
-			if (Config::$modSettings['postmod_active'] && !$row['approved'] && $this->can_approve_boards != array(0) && in_array($row['id_board'], $this->can_approve_boards))
-			{
+			if (Config::$modSettings['postmod_active'] && !$row['approved'] && $this->can_approve_boards != [0] && in_array($row['id_board'], $this->can_approve_boards)) {
 				// If we can't see it, we should not merge it and not adjust counts! Instead skip it.
 				unset($this->topics[$row['id_topic']]);
 
 				continue;
 			}
-			elseif (!$row['approved'])
-			{
+
+			if (!$row['approved']) {
 				$this->boardTotals[$row['id_board']]['unapproved_topics']++;
-			}
-			else
-			{
+			} else {
 				$this->boardTotals[$row['id_board']]['topics']++;
 			}
 
@@ -1251,44 +1260,46 @@ protected function getTopicData()
 			$this->boardTotals[$row['id_board']]['posts'] += $row['num_replies'] + ($row['approved'] ? 1 : 0);
 
 			// In the case of making a redirect, the topic count goes up by one due to the redirect topic.
-			if (isset($_POST['postRedirect']))
+			if (isset($_POST['postRedirect'])) {
 				$this->boardTotals[$row['id_board']]['topics']--;
+			}
 
-			$this->topic_data[$row['id_topic']] = array(
+			$this->topic_data[$row['id_topic']] = [
 				'id' => $row['id_topic'],
 				'board' => $row['id_board'],
 				'poll' => $row['id_poll'],
 				'num_views' => $row['num_views'],
 				'subject' => $row['subject'],
-				'started' => array(
+				'started' => [
 					'time' => Time::create('@' . $row['time_started'])->format(),
 					'timestamp' => $row['time_started'],
 					'href' => empty($row['id_member_started']) ? '' : Config::$scripturl . '?action=profile;u=' . $row['id_member_started'],
-					'link' => empty($row['id_member_started']) ? $row['name_started'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_started'] . '">' . $row['name_started'] . '</a>'
-				),
-				'updated' => array(
+					'link' => empty($row['id_member_started']) ? $row['name_started'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_started'] . '">' . $row['name_started'] . '</a>',
+				],
+				'updated' => [
 					'time' => Time::create('@' . $row['time_updated'])->format(),
 					'timestamp' => $row['time_updated'],
 					'href' => empty($row['id_member_updated']) ? '' : Config::$scripturl . '?action=profile;u=' . $row['id_member_updated'],
-					'link' => empty($row['id_member_updated']) ? $row['name_updated'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_updated'] . '">' . $row['name_updated'] . '</a>'
-				),
+					'link' => empty($row['id_member_updated']) ? $row['name_updated'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member_updated'] . '">' . $row['name_updated'] . '</a>',
+				],
 				'approved' => $row['approved'],
-			);
+			];
 
 			$this->num_views += $row['num_views'];
 			$this->boards[] = $row['id_board'];
 
 			// If there's no poll, id_poll == 0...
-			if ($row['id_poll'] > 0)
+			if ($row['id_poll'] > 0) {
 				$this->polls[] = $row['id_poll'];
+			}
 
 			// Store the id_topic with the lowest id_first_msg.
-			if (empty($this->firstTopic))
+			if (empty($this->firstTopic)) {
 				$this->firstTopic = $row['id_topic'];
+			}
 
 			// Lowest topic id gets selected as surviving topic id. We need to store this board so we can adjust the topic count (This one will not have a redirect topic)
-			if ($row['id_topic'] < $this->lowestTopicId || empty($this->lowestTopicId))
-			{
+			if ($row['id_topic'] < $this->lowestTopicId || empty($this->lowestTopicId)) {
 				$this->lowestTopicId = $row['id_topic'];
 				$this->lowestTopicBoard = $row['id_board'];
 			}
@@ -1305,34 +1316,38 @@ protected function getMergeBoards()
 	{
 		$this->merge_boards = User::$me->boardsAllowedTo('merge_any');
 
-		if (empty($this->merge_boards))
+		if (empty($this->merge_boards)) {
 			ErrorHandler::fatalLang('cannot_merge_any', 'user');
+		}
 
 		// Make sure they can see all boards....
-		$request = Db::$db->query('', '
-			SELECT b.id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT b.id_board
 			FROM {db_prefix}boards AS b
 			WHERE b.id_board IN ({array_int:boards})
 				AND {query_see_board}' . (!in_array(0, $this->merge_boards) ? '
 				AND b.id_board IN ({array_int:merge_boards})' : '') . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'boards' => $this->boards,
 				'merge_boards' => $this->merge_boards,
 				'limit' => count($this->boards),
-			)
+			],
 		);
 
 		// If the number of boards that's in the output isn't exactly the same as we've put in there, you're in trouble.
-		if (Db::$db->num_rows($request) != count($this->boards))
+		if (Db::$db->num_rows($request) != count($this->boards)) {
 			ErrorHandler::fatalLang('no_board');
+		}
 
 		Db::$db->free_result($request);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicMerge::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicMerge::exportStatic')) {
 	TopicMerge::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicMove.php b/Sources/Actions/TopicMove.php
index bcdf4c66e2..e973d20e7f 100644
--- a/Sources/Actions/TopicMove.php
+++ b/Sources/Actions/TopicMove.php
@@ -14,21 +14,16 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
-use SMF\Msg;
-use SMF\Mail;
 use SMF\Security;
 use SMF\Theme;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * This action provides UI to allow topics to be moved from one board to another.
@@ -42,12 +37,11 @@ class TopicMove implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'MoveTopic',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -78,46 +72,46 @@ class TopicMove implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
-		$request = Db::$db->query('', '
-			SELECT t.id_member_started, ms.subject, t.approved
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_member_started, ms.subject, t.approved
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)
 			WHERE t.id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
-		list ($id_member_started, Utils::$context['subject'], Utils::$context['is_approved']) = Db::$db->fetch_row($request);
+		list($id_member_started, Utils::$context['subject'], Utils::$context['is_approved']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Can they see it - if not approved?
-		if (Config::$modSettings['postmod_active'] && !Utils::$context['is_approved'])
+		if (Config::$modSettings['postmod_active'] && !Utils::$context['is_approved']) {
 			User::$me->isAllowedTo('approve_posts');
+		}
 
 		// Permission check!
 		// @todo
-		if (!User::$me->allowedTo('move_any'))
-		{
-			if ($id_member_started == User::$me->id)
-			{
+		if (!User::$me->allowedTo('move_any')) {
+			if ($id_member_started == User::$me->id) {
 				User::$me->isAllowedTo('move_own');
-			}
-			else
+			} else {
 				User::$me->isAllowedTo('move_any');
+			}
 		}
 
 		Utils::$context['move_any'] = User::$me->is_admin || Config::$modSettings['topic_move_any'];
-		$boards = array();
+		$boards = [];
+
+		if (!Utils::$context['move_any']) {
+			$boards = array_diff(User::$me->boardsAllowedTo('post_new', true), [Board::$info->id]);
 
-		if (!Utils::$context['move_any'])
-		{
-			$boards = array_diff(User::$me->boardsAllowedTo('post_new', true), array(Board::$info->id));
-			if (empty($boards))
-			{
+			if (empty($boards)) {
 				// No boards? Too bad...
 				ErrorHandler::fatalLang('moveto_no_boards');
 			}
@@ -125,34 +119,35 @@ public function execute(): void
 
 		Theme::loadTemplate('MoveTopic');
 
-		$options = array(
+		$options = [
 			'not_redirection' => true,
 			'use_permissions' => Utils::$context['move_any'],
-		);
+		];
 
-		if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != Board::$info->id)
+		if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != Board::$info->id) {
 			$options['selected_board'] = $_SESSION['move_to_topic'];
+		}
 
-		if (!Utils::$context['move_any'])
+		if (!Utils::$context['move_any']) {
 			$options['included_boards'] = $boards;
+		}
 
 		Utils::$context['categories'] = MessageIndex::getBoardList($options);
 
 		Utils::$context['page_title'] = Lang::$txt['move_topic'];
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?topic=' . Topic::$topic_id . '.0',
 			'name' => Utils::$context['subject'],
-		);
+		];
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'name' => Lang::$txt['move_topic'],
-		);
+		];
 
 		Utils::$context['back_to_topic'] = isset($_REQUEST['goback']);
 
-		if (User::$me->language != Lang::$default)
-		{
+		if (User::$me->language != Lang::$default) {
 			Lang::load('index', Lang::$default);
 			$temp = Lang::$txt['movetopic_default'];
 			Lang::load('index');
@@ -166,7 +161,6 @@ public function execute(): void
 
 		// Register this form and get a sequence number in Utils::$context.
 		Security::checkSubmitOnce('register');
-
 	}
 
 	/***********************
@@ -180,8 +174,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -207,7 +202,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicMove::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicMove::exportStatic')) {
 	TopicMove::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicMove2.php b/Sources/Actions/TopicMove2.php
index a7c5a99864..625a093307 100644
--- a/Sources/Actions/TopicMove2.php
+++ b/Sources/Actions/TopicMove2.php
@@ -14,24 +14,20 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Logging;
-use SMF\MessageIndex;
-use SMF\Msg;
 use SMF\Mail;
+use SMF\Msg;
 use SMF\Security;
-use SMF\Theme;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * This action handles moving topics from one board to another board.
@@ -45,12 +41,12 @@ class TopicMove2 implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'MoveTopic2',
-		),
-	);
+			'moveTopicConcurrence' => 'moveTopicConcurrence',
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -79,12 +75,12 @@ class TopicMove2 implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// You can't choose to have a redirection topic and use an empty reason.
-		if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == ''))
-		{
+		if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == '')) {
 			ErrorHandler::fatalLang('movetopic_no_reason', false);
 		}
 
@@ -93,31 +89,29 @@ public function execute(): void
 		// Make sure this form hasn't been submitted before.
 		Security::checkSubmitOnce('check');
 
-		$request = Db::$db->query('', '
-			SELECT id_member_started, id_first_msg, approved
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member_started, id_first_msg, approved
 			FROM {db_prefix}topics
 			WHERE id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
 		list($id_member_started, $id_first_msg, Utils::$context['is_approved']) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Can they see it?
-		if (!Utils::$context['is_approved'])
+		if (!Utils::$context['is_approved']) {
 			User::$me->isAllowedTo('approve_posts');
+		}
 
 		// Can they move topics on this board?
-		if (!User::$me->allowedTo('move_any'))
-		{
-			if ($id_member_started == User::$me->id)
-			{
+		if (!User::$me->allowedTo('move_any')) {
+			if ($id_member_started == User::$me->id) {
 				User::$me->isAllowedTo('move_own');
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('move_any');
 			}
 		}
@@ -128,8 +122,9 @@ public function execute(): void
 		$_POST['toboard'] = (int) $_POST['toboard'];
 
 		// Make sure they can see the board they are trying to move to (and get whether posts count in the target board).
-		$request = Db::$db->query('', '
-			SELECT b.count_posts, b.name, m.subject
+		$request = Db::$db->query(
+			'',
+			'SELECT b.count_posts, b.name, m.subject
 			FROM {db_prefix}boards AS b
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:current_topic})
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
@@ -137,14 +132,14 @@ public function execute(): void
 				AND b.id_board = {int:to_board}
 				AND b.redirect = {string:blank_redirect}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'to_board' => $_POST['toboard'],
 				'blank_redirect' => '',
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('no_board');
 		}
 		list($pcounter, $board_name, $subject) = Db::$db->fetch_row($request);
@@ -154,28 +149,22 @@ public function execute(): void
 		$_SESSION['move_to_topic'] = $_POST['toboard'];
 
 		// Rename the topic...
-		if (isset($_POST['reset_subject'], $_POST['custom_subject']) && $_POST['custom_subject'] != '')
-		{
-			$_POST['custom_subject'] = strtr(Utils::htmlTrim(Utils::htmlspecialchars($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
+		if (isset($_POST['reset_subject'], $_POST['custom_subject']) && $_POST['custom_subject'] != '') {
+			$_POST['custom_subject'] = strtr(Utils::htmlTrim(Utils::htmlspecialchars($_POST['custom_subject'])), ["\r" => '', "\n" => '', "\t" => '']);
 
 			// Keep checking the length.
-			if (Utils::entityStrlen($_POST['custom_subject']) > 100)
+			if (Utils::entityStrlen($_POST['custom_subject']) > 100) {
 				$_POST['custom_subject'] = Utils::entitySubstr($_POST['custom_subject'], 0, 100);
+			}
 
 			// If it's still valid move onwards and upwards.
-			if ($_POST['custom_subject'] != '')
-			{
-				if (isset($_POST['enforce_subject']))
-				{
+			if ($_POST['custom_subject'] != '') {
+				if (isset($_POST['enforce_subject'])) {
 					// Get a response prefix, but in the forum's default language.
-					if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix')))
-					{
-						if (Lang::$default === User::$me->language)
-						{
+					if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix'))) {
+						if (Lang::$default === User::$me->language) {
 							Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
-						}
-						else
-						{
+						} else {
 							Lang::load('index', Lang::$default, false);
 							Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
 							Lang::load('index');
@@ -183,25 +172,27 @@ public function execute(): void
 						CacheApi::put('response_prefix', Utils::$context['response_prefix'], 600);
 					}
 
-					Db::$db->query('', '
-						UPDATE {db_prefix}messages
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}messages
 						SET subject = {string:subject}
 						WHERE id_topic = {int:current_topic}',
-						array(
+						[
 							'current_topic' => Topic::$topic_id,
 							'subject' => Utils::$context['response_prefix'] . $_POST['custom_subject'],
-						)
+						],
 					);
 				}
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}messages
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}messages
 					SET subject = {string:custom_subject}
 					WHERE id_msg = {int:id_first_msg}',
-					array(
+					[
 						'id_first_msg' => $id_first_msg,
 						'custom_subject' => $_POST['custom_subject'],
-					)
+					],
 				);
 
 				// Fix the subject cache.
@@ -211,24 +202,22 @@ public function execute(): void
 
 		// Create a link to this in the old board.
 		// @todo Does this make sense if the topic was unapproved before? I'd just about say so.
-		if (isset($_POST['postRedirect']))
-		{
+		if (isset($_POST['postRedirect'])) {
 			// Replace tokens with links in the reason.
-			$reason_replacements = array(
+			$reason_replacements = [
 				Lang::$txt['movetopic_auto_board'] => '[url="' . Config::$scripturl . '?board=' . $_POST['toboard'] . '.0"]' . $board_name . '[/url]',
 				Lang::$txt['movetopic_auto_topic'] => '[iurl]' . Config::$scripturl . '?topic=' . Topic::$topic_id . '.0[/iurl]',
-			);
+			];
 
 			// Should be in the boardwide language.
-			if (User::$me->language != Lang::$default)
-			{
+			if (User::$me->language != Lang::$default) {
 				Lang::load('index', Lang::$default);
 
 				// Make sure we catch both languages in the reason.
-				$reason_replacements += array(
+				$reason_replacements += [
 					Lang::$txt['movetopic_auto_board'] => '[url="' . Config::$scripturl . '?board=' . $_POST['toboard'] . '.0"]' . $board_name . '[/url]',
 					Lang::$txt['movetopic_auto_topic'] => '[iurl]' . Config::$scripturl . '?topic=' . Topic::$topic_id . '.0[/iurl]',
-				);
+				];
 			}
 
 			$_POST['reason'] = Utils::htmlspecialchars($_POST['reason'], ENT_QUOTES);
@@ -243,75 +232,74 @@ public function execute(): void
 			// redirect to the MOVED topic from topic list?
 			$redirect_topic = isset($_POST['redirect_topic']) ? Topic::$topic_id : 0;
 
-			$msgOptions = array(
+			$msgOptions = [
 				'subject' => Lang::$txt['moved'] . ': ' . $subject,
 				'body' => $_POST['reason'],
 				'icon' => 'moved',
 				'smileys_enabled' => 1,
-			);
+			];
 
-			$topicOptions = array(
+			$topicOptions = [
 				'board' => Board::$info->id,
 				'lock_mode' => 1,
 				'mark_as_read' => true,
 				'redirect_expires' => $redirect_expires,
 				'redirect_topic' => $redirect_topic,
-			);
+			];
 
-			$posterOptions = array(
+			$posterOptions = [
 				'id' => User::$me->id,
 				'update_post_count' => empty($pcounter),
-			);
+			];
 
 			Msg::create($msgOptions, $topicOptions, $posterOptions);
 		}
 
-		$request = Db::$db->query('', '
-			SELECT count_posts
+		$request = Db::$db->query(
+			'',
+			'SELECT count_posts
 			FROM {db_prefix}boards
 			WHERE id_board = {int:current_board}
 			LIMIT 1',
-			array(
+			[
 				'current_board' => Board::$info->id,
-			)
+			],
 		);
 		list($pcounter_from) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if ($pcounter_from != $pcounter)
-		{
-			$posters = array();
+		if ($pcounter_from != $pcounter) {
+			$posters = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:current_topic}
 					AND approved = {int:is_approved}',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'is_approved' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!isset($posters[$row['id_member']]))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!isset($posters[$row['id_member']])) {
 					$posters[$row['id_member']] = 0;
+				}
 
 				$posters[$row['id_member']]++;
 			}
 			Db::$db->free_result($request);
 
-			foreach ($posters as $id_member => $posts)
-			{
+			foreach ($posters as $id_member => $posts) {
 				// The board we're moving from counted posts, but not to.
-				if (empty($pcounter_from))
-				{
-					User::updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+				if (empty($pcounter_from)) {
+					User::updateMemberData($id_member, ['posts' => 'posts - ' . $posts]);
 				}
 				// The reverse: from didn't, to did.
-				else
-				{
-					User::updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+				else {
+					User::updateMemberData($id_member, ['posts' => 'posts + ' . $posts]);
 				}
 			}
 		}
@@ -320,9 +308,8 @@ public function execute(): void
 		Topic::move(Topic::$topic_id, $_POST['toboard']);
 
 		// Log that they moved this topic.
-		if (!User::$me->allowedTo('move_own') || $id_member_started != User::$me->id)
-		{
-			Logging::logAction('move', array('topic' => Topic::$topic_id, 'board_from' => Board::$info->id, 'board_to' => $_POST['toboard']));
+		if (!User::$me->allowedTo('move_own') || $id_member_started != User::$me->id) {
+			Logging::logAction('move', ['topic' => Topic::$topic_id, 'board_from' => Board::$info->id, 'board_to' => $_POST['toboard']]);
 		}
 
 		// Notify people that this topic has been moved?
@@ -331,12 +318,9 @@ public function execute(): void
 		IntegrationHook::call('integrate_movetopic2_end');
 
 		// Why not go back to the original board in case they want to keep moving?
-		if (!isset($_REQUEST['goback']))
-		{
+		if (!isset($_REQUEST['goback'])) {
 			Utils::redirectexit('board=' . Board::$info->id . '.0');
-		}
-		else
-		{
+		} else {
 			Utils::redirectexit('topic=' . Topic::$topic_id . '.0');
 		}
 	}
@@ -352,8 +336,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -371,38 +356,38 @@ public static function call(): void
 	 */
 	public static function moveTopicConcurrence()
 	{
-		if (isset($_GET['current_board']))
+		if (isset($_GET['current_board'])) {
 			$move_from = (int) $_GET['current_board'];
+		}
 
-		if (empty($move_from) || empty(Board::$info->id) || empty(Topic::$topic_id))
+		if (empty($move_from) || empty(Board::$info->id) || empty(Topic::$topic_id)) {
 			return true;
+		}
 
-		if ($move_from == Board::$info->id)
-		{
+		if ($move_from == Board::$info->id) {
 			return true;
 		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT m.subject, b.name
+
+		$request = Db::$db->query(
+			'',
+			'SELECT m.subject, b.name
 				FROM {db_prefix}topics as t
 					LEFT JOIN {db_prefix}boards AS b ON (t.id_board = b.id_board)
 					LEFT JOIN {db_prefix}messages AS m ON (t.id_first_msg = m.id_msg)
 				WHERE t.id_topic = {int:topic_id}
 				LIMIT 1',
-				array(
-					'topic_id' => Topic::$topic_id,
-				)
-			);
-			list($topic_subject, $board_name) = Db::$db->fetch_row($request);
-			Db::$db->free_result($request);
+			[
+				'topic_id' => Topic::$topic_id,
+			],
+		);
+		list($topic_subject, $board_name) = Db::$db->fetch_row($request);
+		Db::$db->free_result($request);
 
-			$board_link = '<a href="' . Config::$scripturl . '?board=' . Board::$info->id . '.0">' . $board_name . '</a>';
+		$board_link = '<a href="' . Config::$scripturl . '?board=' . Board::$info->id . '.0">' . $board_name . '</a>';
 
-			$topic_link = '<a href="' . Config::$scripturl . '?topic=' . Topic::$topic_id . '.0">' . $topic_subject . '</a>';
+		$topic_link = '<a href="' . Config::$scripturl . '?topic=' . Topic::$topic_id . '.0">' . $topic_subject . '</a>';
 
-			ErrorHandler::fatalLang('topic_already_moved', false, array($topic_link, $board_link));
-		}
+		ErrorHandler::fatalLang('topic_already_moved', false, [$topic_link, $board_link]);
 	}
 
 	/******************
@@ -418,7 +403,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicMove2::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicMove2::exportStatic')) {
 	TopicMove2::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicPrint.php b/Sources/Actions/TopicPrint.php
index 8c6888fd5a..d6667acd13 100644
--- a/Sources/Actions/TopicPrint.php
+++ b/Sources/Actions/TopicPrint.php
@@ -13,12 +13,12 @@
 
 namespace SMF\Actions;
 
-use SMF\BackwardCompatibility;
-
 use SMF\Attachment;
+use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Poll;
@@ -27,7 +27,6 @@
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class formats a topic to be printer friendly.
@@ -43,12 +42,11 @@ class TopicPrint implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'PrintTopic',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -77,11 +75,11 @@ class TopicPrint implements ActionInterface
 	public function execute(): void
 	{
 		// Redirect to the boardindex if no valid topic id is provided.
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			Utils::redirectexit();
+		}
 
-		if (!empty(Config::$modSettings['disable_print_topic']))
-		{
+		if (!empty(Config::$modSettings['disable_print_topic'])) {
 			unset($_REQUEST['action']);
 			Utils::$context['theme_loaded'] = false;
 			ErrorHandler::fatalLang('feature_disabled', false);
@@ -91,29 +89,31 @@ public function execute(): void
 		Utils::$context['robot_no_index'] = true;
 
 		// Get the topic starter information.
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, m.poster_time, COALESCE(mem.real_name, m.poster_name) AS poster_name, t.id_poll
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, m.poster_time, COALESCE(mem.real_name, m.poster_name) AS poster_name, t.id_poll
 			FROM {db_prefix}messages AS m
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 				LEFT JOIN {db_prefix}topics as t ON (t.id_first_msg = m.id_msg)
 			WHERE m.id_topic = {int:current_topic}
 			ORDER BY m.id_msg
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
+
 		// Redirect to the boardindex if no valid topic id is provided.
-		if (Db::$db->num_rows($request) == 0)
+		if (Db::$db->num_rows($request) == 0) {
 			Utils::redirectexit();
+		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
-		if (!empty($row['id_poll']))
-		{
+		if (!empty($row['id_poll'])) {
 			Lang::load('Post');
 			$poll = Poll::load(Topic::$topic_id, Poll::LOAD_BY_TOPIC);
-			Utils::$context['poll'] = $poll->format(array('no_buttons' => true));
+			Utils::$context['poll'] = $poll->format(['no_buttons' => true]);
 		}
 
 		// We want a separate BBCodeParser instance for this, not the reusable one
@@ -125,100 +125,102 @@ public function execute(): void
 
 		// Lets "output" all that info.
 		Theme::loadTemplate('Printpage');
-		Utils::$context['template_layers'] = array('print');
+		Utils::$context['template_layers'] = ['print'];
 		Utils::$context['board_name'] = Board::$info->name;
 		Utils::$context['category_name'] = Board::$info->cat['name'];
 		Utils::$context['poster_name'] = $row['poster_name'];
 		Utils::$context['post_time'] = Time::create('@' . $row['poster_time'])->format(null, false);
-		Utils::$context['parent_boards'] = array();
-		foreach (Board::$info->parent_boards as $parent)
+		Utils::$context['parent_boards'] = [];
+
+		foreach (Board::$info->parent_boards as $parent) {
 			Utils::$context['parent_boards'][] = $parent['name'];
+		}
 
 		// Split the topics up so we can print them.
-		$request = Db::$db->query('', '
-			SELECT subject, poster_time, body, COALESCE(mem.real_name, poster_name) AS poster_name, id_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT subject, poster_time, body, COALESCE(mem.real_name, poster_name) AS poster_name, id_msg
 			FROM {db_prefix}messages AS m
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 			WHERE m.id_topic = {int:current_topic}' . (Config::$modSettings['postmod_active'] && !User::$me->allowedTo('approve_posts') ? '
 				AND (m.approved = {int:is_approved}' . (User::$me->is_guest ? '' : ' OR m.id_member = {int:current_member}') . ')' : '') . '
 			ORDER BY m.id_msg',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'is_approved' => 1,
 				'current_member' => User::$me->id,
-			)
+			],
 		);
-		Utils::$context['posts'] = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		Utils::$context['posts'] = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Censor the subject and message.
 			Lang::censorText($row['subject']);
 			Lang::censorText($row['body']);
 
-			Utils::$context['posts'][] = array(
+			Utils::$context['posts'][] = [
 				'subject' => $row['subject'],
 				'member' => $row['poster_name'],
 				'time' => Time::create('@' . $row['poster_time'])->format(null, false),
 				'timestamp' => $row['poster_time'],
 				'body' => $bbcparser->parse($row['body']),
 				'id_msg' => $row['id_msg'],
-			);
+			];
 
-			if (!isset(Utils::$context['topic_subject']))
+			if (!isset(Utils::$context['topic_subject'])) {
 				Utils::$context['topic_subject'] = $row['subject'];
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Fetch attachments so we can print them if asked, enabled and allowed
-		if (isset($_REQUEST['images']) && !empty(Config::$modSettings['attachmentEnable']) && User::$me->allowedTo('view_attachments'))
-		{
-			$messages = array();
-			foreach (Utils::$context['posts'] as $temp)
+		if (isset($_REQUEST['images']) && !empty(Config::$modSettings['attachmentEnable']) && User::$me->allowedTo('view_attachments')) {
+			$messages = [];
+
+			foreach (Utils::$context['posts'] as $temp) {
 				$messages[] = $temp['id_msg'];
+			}
 
 			// build the request
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					a.id_attach, a.id_msg, a.approved, a.width, a.height, a.file_hash, a.filename, a.id_folder, a.mime_type
 				FROM {db_prefix}attachments AS a
 				WHERE a.id_msg IN ({array_int:message_list})
 					AND a.attachment_type = {int:attachment_type}',
-				array(
+				[
 					'message_list' => $messages,
 					'attachment_type' => 0,
 					'is_approved' => 1,
-				)
+				],
 			);
-			$temp = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$temp = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$temp[$row['id_attach']] = $row;
-				if (!isset(Utils::$context['printattach'][$row['id_msg']]))
-					Utils::$context['printattach'][$row['id_msg']] = array();
+
+				if (!isset(Utils::$context['printattach'][$row['id_msg']])) {
+					Utils::$context['printattach'][$row['id_msg']] = [];
+				}
 			}
 			Db::$db->free_result($request);
 			ksort($temp);
 
 			// load them into Utils::$context so the template can use them
-			foreach ($temp as $row)
-			{
-				if (!empty(Config::$modSettings['dont_show_attach_under_post']) && !empty(Utils::$context['show_attach_under_post'][$row['id_attach']]))
+			foreach ($temp as $row) {
+				if (!empty(Config::$modSettings['dont_show_attach_under_post']) && !empty(Utils::$context['show_attach_under_post'][$row['id_attach']])) {
 					continue;
+				}
 
-				if (!empty($row['width']) && !empty($row['height']))
-				{
-					if (!empty(Config::$modSettings['max_image_width']) && (empty(Config::$modSettings['max_image_height']) || $row['height'] * (Config::$modSettings['max_image_width'] / $row['width']) <= Config::$modSettings['max_image_height']))
-					{
-						if ($row['width'] > Config::$modSettings['max_image_width'])
-						{
+				if (!empty($row['width']) && !empty($row['height'])) {
+					if (!empty(Config::$modSettings['max_image_width']) && (empty(Config::$modSettings['max_image_height']) || $row['height'] * (Config::$modSettings['max_image_width'] / $row['width']) <= Config::$modSettings['max_image_height'])) {
+						if ($row['width'] > Config::$modSettings['max_image_width']) {
 							$row['height'] = floor($row['height'] * (Config::$modSettings['max_image_width'] / $row['width']));
 							$row['width'] = Config::$modSettings['max_image_width'];
 						}
-					}
-					elseif (!empty(Config::$modSettings['max_image_width']))
-					{
-						if ($row['height'] > Config::$modSettings['max_image_height'])
-						{
+					} elseif (!empty(Config::$modSettings['max_image_width'])) {
+						if ($row['height'] > Config::$modSettings['max_image_height']) {
 							$row['width'] = floor($row['width'] * Config::$modSettings['max_image_height'] / $row['height']);
 							$row['height'] = Config::$modSettings['max_image_height'];
 						}
@@ -247,8 +249,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -274,7 +277,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicPrint::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicPrint::exportStatic')) {
 	TopicPrint::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicRemove.php b/Sources/Actions/TopicRemove.php
index 6d1d224dd7..baf4ec45cb 100644
--- a/Sources/Actions/TopicRemove.php
+++ b/Sources/Actions/TopicRemove.php
@@ -14,16 +14,15 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Logging;
 use SMF\Mail;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This action handles the deletion of topics.
@@ -37,13 +36,13 @@ class TopicRemove implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RemoveTopic2',
+			'removeDeleteConcurrence' => 'removeDeleteConcurrence',
 			'old' => 'RemoveOldTopics2',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -71,38 +70,42 @@ public function execute(): void
 		User::$me->checkSession('get');
 
 		// Trying to fool us around, are we?
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			Utils::redirectexit();
+		}
 
 		self::removeDeleteConcurrence();
 
-		$request = Db::$db->query('', '
-			SELECT t.id_member_started, ms.subject, t.approved, t.locked
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_member_started, ms.subject, t.approved, t.locked
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)
 			WHERE t.id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-			)
+			],
 		);
-		list ($starter, $subject, $approved, $locked) = Db::$db->fetch_row($request);
+		list($starter, $subject, $approved, $locked) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if ($starter == User::$me->id && !User::$me->allowedTo('remove_any'))
+		if ($starter == User::$me->id && !User::$me->allowedTo('remove_any')) {
 			User::$me->isAllowedTo('remove_own');
-		else
+		} else {
 			User::$me->isAllowedTo('remove_any');
+		}
 
 		// Can they see the topic?
-		if (Config::$modSettings['postmod_active'] && !$approved && $starter != User::$me->id)
+		if (Config::$modSettings['postmod_active'] && !$approved && $starter != User::$me->id) {
 			User::$me->isAllowedTo('approve_posts');
+		}
 
 		// Ok, we got that far, but is it locked?
-		if ($locked)
-		{
-			if (!($locked == 1 && $starter == User::$me->id || User::$me->allowedTo('lock_any')))
+		if ($locked) {
+			if (!($locked == 1 && $starter == User::$me->id || User::$me->allowedTo('lock_any'))) {
 				ErrorHandler::fatalLang('cannot_remove_locked', 'user');
+			}
 		}
 
 		// Notify people that this topic has been removed.
@@ -111,14 +114,13 @@ public function execute(): void
 		Topic::remove(Topic::$topic_id);
 
 		// Note, only log topic ID in native form if it's not gone forever.
-		if (User::$me->allowedTo('remove_any') || (User::$me->allowedTo('remove_own') && $starter == User::$me->id))
-		{
-			Logging::logAction('remove', array(
+		if (User::$me->allowedTo('remove_any') || (User::$me->allowedTo('remove_own') && $starter == User::$me->id)) {
+			Logging::logAction('remove', [
 				(empty(Config::$modSettings['recycle_enable']) || Config::$modSettings['recycle_board'] != Board::$info->id ? 'topic' : 'old_topic_id') => Topic::$topic_id,
 				'subject' => $subject,
 				'member' => $starter,
-				'board' => Board::$info->id
-			));
+				'board' => Board::$info->id,
+			]);
 		}
 
 		Utils::redirectexit('board=' . Board::$info->id . '.0');
@@ -135,8 +137,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -157,30 +160,30 @@ public static function call(): void
 	public static function removeDeleteConcurrence()
 	{
 		// No recycle no need to go further
-		if (empty(Config::$modSettings['recycle_enable']) || empty(Config::$modSettings['recycle_board']))
+		if (empty(Config::$modSettings['recycle_enable']) || empty(Config::$modSettings['recycle_board'])) {
 			return false;
+		}
 
 		// If it's confirmed go on and delete (from recycle)
-		if (isset($_GET['confirm_delete']))
+		if (isset($_GET['confirm_delete'])) {
 			return true;
+		}
 
-		if (empty(Board::$info->id))
+		if (empty(Board::$info->id)) {
 			return false;
+		}
 
-		if (Config::$modSettings['recycle_board'] != Board::$info->id)
-		{
+		if (Config::$modSettings['recycle_board'] != Board::$info->id) {
 			return true;
 		}
-		elseif (isset($_REQUEST['msg']))
-		{
+
+		if (isset($_REQUEST['msg'])) {
 			$confirm_url = Config::$scripturl . '?action=deletemsg;confirm_delete;topic=' . Utils::$context['current_topic'] . '.0;msg=' . $_REQUEST['msg'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
-		}
-		else
-		{
+		} else {
 			$confirm_url = Config::$scripturl . '?action=removetopic2;confirm_delete;topic=' . Utils::$context['current_topic'] . '.0;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 		}
 
-		ErrorHandler::fatalLang('post_already_deleted', false, array($confirm_url));
+		ErrorHandler::fatalLang('post_already_deleted', false, [$confirm_url]);
 	}
 
 	/**
@@ -194,23 +197,23 @@ public static function old()
 		User::$me->checkSession('post', 'admin');
 
 		// No boards at all?  Forget it then :/.
-		if (empty($_POST['boards']))
+		if (empty($_POST['boards'])) {
 			Utils::redirectexit('action=admin;area=maintain;sa=topics');
+		}
 
 		// This should exist, but we can make sure.
-		$_POST['delete_type'] = isset($_POST['delete_type']) ? $_POST['delete_type'] : 'nothing';
+		$_POST['delete_type'] = $_POST['delete_type'] ?? 'nothing';
 
 		// Custom conditions.
 		$condition = '';
-		$condition_params = array(
+		$condition_params = [
 			'boards' => array_keys($_POST['boards']),
 			'poster_time' => time() - 3600 * 24 * $_POST['maxdays'],
-		);
+		];
 
 		// Just moved notice topics?
 		// Note that this ignores redirection topics unless it's a non-expiring one
-		if ($_POST['delete_type'] == 'moved')
-		{
+		if ($_POST['delete_type'] == 'moved') {
 			$condition .= '
 				AND m.icon = {string:icon}
 				AND t.locked = {int:locked}
@@ -220,8 +223,7 @@ public static function old()
 			$condition_params['not_expiring'] = 0;
 		}
 		// Otherwise, maybe locked topics only?
-		elseif ($_POST['delete_type'] == 'locked')
-		{
+		elseif ($_POST['delete_type'] == 'locked') {
 			// Exclude moved/merged notices since we have another option for those...
 			$condition .= '
 				AND t.icon != {string:icon}
@@ -231,32 +233,34 @@ public static function old()
 		}
 
 		// Exclude stickies?
-		if (isset($_POST['delete_old_not_sticky']))
-		{
+		if (isset($_POST['delete_old_not_sticky'])) {
 			$condition .= '
 				AND t.is_sticky = {int:is_sticky}';
 			$condition_params['is_sticky'] = 0;
 		}
 
 		// All we're gonna do here is grab the id_topic's and send them to Topic::remove().
-		$request = Db::$db->query('', '
-			SELECT t.id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_topic
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_last_msg)
 			WHERE
 				m.poster_time < {int:poster_time}' . $condition . '
 				AND t.id_board IN ({array_int:boards})',
-			$condition_params
+			$condition_params,
 		);
-		$topics = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$topics = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$topics[] = $row['id_topic'];
+		}
 		Db::$db->free_result($request);
 
 		Topic::remove($topics, false, true);
 
 		// Log an action into the moderation log.
-		Logging::logAction('pruned', array('days' => $_POST['maxdays']));
+		Logging::logAction('pruned', ['days' => $_POST['maxdays']]);
 
 		Utils::redirectexit('action=admin;area=maintain;sa=topics;done=purgeold');
 	}
@@ -275,11 +279,11 @@ protected function __construct()
 	/*************************
 	 * Internal static methods
 	 *************************/
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicRemove::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicRemove::exportStatic')) {
 	TopicRemove::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicRestore.php b/Sources/Actions/TopicRestore.php
index 3a32ef8653..c4941a394c 100644
--- a/Sources/Actions/TopicRestore.php
+++ b/Sources/Actions/TopicRestore.php
@@ -14,14 +14,14 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
+use SMF\ErrorHandler;
 use SMF\Logging;
 use SMF\Msg;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This action handles restoring a topic from the recycle board back to its
@@ -36,12 +36,11 @@ class TopicRestore implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'RestoreTopic',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -68,151 +67,162 @@ public function execute(): void
 		User::$me->checkSession('get');
 
 		// Is recycled board enabled?
-		if (empty(Config::$modSettings['recycle_enable']))
+		if (empty(Config::$modSettings['recycle_enable'])) {
 			ErrorHandler::fatalLang('restored_disabled', 'critical');
+		}
 
 		// Can we be in here?
 		User::$me->isAllowedTo('move_any', Config::$modSettings['recycle_board']);
 
-		$unfound_messages = array();
-		$topics_to_restore = array();
+		$unfound_messages = [];
+		$topics_to_restore = [];
 
 		// Restoring messages?
-		if (!empty($_REQUEST['msgs']))
-		{
+		if (!empty($_REQUEST['msgs'])) {
 			$msgs = explode(',', $_REQUEST['msgs']);
-			foreach ($msgs as $k => $msg)
+
+			foreach ($msgs as $k => $msg) {
 				$msgs[$k] = (int) $msg;
+			}
 
 			// Get the id_previous_board and id_previous_topic.
-			$request = Db::$db->query('', '
-				SELECT m.id_topic, m.id_msg, m.id_board, m.subject, m.id_member, t.id_previous_board, t.id_previous_topic,
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_topic, m.id_msg, m.id_board, m.subject, m.id_member, t.id_previous_board, t.id_previous_topic,
 					t.id_first_msg, b.count_posts, COALESCE(pt.id_board, 0) AS possible_prev_board
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 					INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 					LEFT JOIN {db_prefix}topics AS pt ON (pt.id_topic = t.id_previous_topic)
 				WHERE m.id_msg IN ({array_int:messages})',
-				array(
+				[
 					'messages' => $msgs,
-				)
+				],
 			);
 
-			$actioned_messages = array();
-			$previous_topics = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			$actioned_messages = [];
+			$previous_topics = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Restoring the first post means topic.
-				if ($row['id_msg'] == $row['id_first_msg'] && $row['id_previous_topic'] == $row['id_topic'])
-				{
+				if ($row['id_msg'] == $row['id_first_msg'] && $row['id_previous_topic'] == $row['id_topic']) {
 					$topics_to_restore[] = $row['id_topic'];
+
 					continue;
 				}
+
 				// Don't know where it's going?
-				if (empty($row['id_previous_topic']))
-				{
+				if (empty($row['id_previous_topic'])) {
 					$unfound_messages[$row['id_msg']] = $row['subject'];
+
 					continue;
 				}
 
 				$previous_topics[] = $row['id_previous_topic'];
-				if (empty($actioned_messages[$row['id_previous_topic']]))
-					$actioned_messages[$row['id_previous_topic']] = array(
-						'msgs' => array(),
+
+				if (empty($actioned_messages[$row['id_previous_topic']])) {
+					$actioned_messages[$row['id_previous_topic']] = [
+						'msgs' => [],
 						'count_posts' => $row['count_posts'],
 						'subject' => $row['subject'],
 						'previous_board' => $row['id_previous_board'],
 						'possible_prev_board' => $row['possible_prev_board'],
 						'current_topic' => $row['id_topic'],
 						'current_board' => $row['id_board'],
-						'members' => array(),
-					);
+						'members' => [],
+					];
+				}
 
 				$actioned_messages[$row['id_previous_topic']]['msgs'][$row['id_msg']] = $row['subject'];
-				if ($row['id_member'])
+
+				if ($row['id_member']) {
 					$actioned_messages[$row['id_previous_topic']]['members'][] = $row['id_member'];
+				}
 			}
 			Db::$db->free_result($request);
 
 			// Check for topics we are going to fully restore.
-			foreach ($actioned_messages as $topic => $data)
-				if (in_array($topic, $topics_to_restore))
+			foreach ($actioned_messages as $topic => $data) {
+				if (in_array($topic, $topics_to_restore)) {
 					unset($actioned_messages[$topic]);
+				}
+			}
 
 			// Load any previous topics to check they exist.
-			if (!empty($previous_topics))
-			{
-				$request = Db::$db->query('', '
-					SELECT t.id_topic, t.id_board, m.subject
+			if (!empty($previous_topics)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT t.id_topic, t.id_board, m.subject
 					FROM {db_prefix}topics AS t
 						INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 					WHERE t.id_topic IN ({array_int:previous_topics})',
-					array(
+					[
 						'previous_topics' => $previous_topics,
-					)
+					],
 				);
-				$previous_topics = array();
-				while ($row = Db::$db->fetch_assoc($request))
-					$previous_topics[$row['id_topic']] = array(
+				$previous_topics = [];
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					$previous_topics[$row['id_topic']] = [
 						'board' => $row['id_board'],
 						'subject' => $row['subject'],
-					);
+					];
+				}
 				Db::$db->free_result($request);
 			}
 
 			// Restore each topic.
-			$messages = array();
-			foreach ($actioned_messages as $topic => $data)
-			{
+			$messages = [];
+
+			foreach ($actioned_messages as $topic => $data) {
 				// If we have topics we are going to restore the whole lot ignore them.
-				if (in_array($topic, $topics_to_restore))
-				{
+				if (in_array($topic, $topics_to_restore)) {
 					unset($actioned_messages[$topic]);
+
 					continue;
 				}
 
 				// Move the posts back then!
-				if (isset($previous_topics[$topic]))
-				{
+				if (isset($previous_topics[$topic])) {
 					self::mergePosts(array_keys($data['msgs']), $data['current_topic'], $topic);
 					// Log em.
-					Logging::logAction('restore_posts', array('topic' => $topic, 'subject' => $previous_topics[$topic]['subject'], 'board' => empty($data['previous_board']) ? $data['possible_prev_board'] : $data['previous_board']));
+					Logging::logAction('restore_posts', ['topic' => $topic, 'subject' => $previous_topics[$topic]['subject'], 'board' => empty($data['previous_board']) ? $data['possible_prev_board'] : $data['previous_board']]);
 					$messages = array_merge(array_keys($data['msgs']), $messages);
-				}
-				else
-				{
-					foreach ($data['msgs'] as $msg)
+				} else {
+					foreach ($data['msgs'] as $msg) {
 						$unfound_messages[$msg['id']] = $msg['subject'];
+					}
 				}
 			}
 		}
 
 		// Now any topics?
-		if (!empty($_REQUEST['topics']))
-		{
+		if (!empty($_REQUEST['topics'])) {
 			$topics = explode(',', $_REQUEST['topics']);
-			foreach ($topics as $id)
+
+			foreach ($topics as $id) {
 				$topics_to_restore[] = (int) $id;
+			}
 		}
 
-		if (!empty($topics_to_restore))
-		{
+		if (!empty($topics_to_restore)) {
 			// Lets get the data for these topics.
-			$request = Db::$db->query('', '
-				SELECT t.id_topic, t.id_previous_board, t.id_board, t.id_first_msg, m.subject
+			$request = Db::$db->query(
+				'',
+				'SELECT t.id_topic, t.id_previous_board, t.id_board, t.id_first_msg, m.subject
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				WHERE t.id_topic IN ({array_int:topics})',
-				array(
+				[
 					'topics' => $topics_to_restore,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// We can only restore if the previous board is set.
-				if (empty($row['id_previous_board']))
-				{
+				if (empty($row['id_previous_board'])) {
 					$unfound_messages[$row['id_first_msg']] = $row['subject'];
+
 					continue;
 				}
 
@@ -220,47 +230,48 @@ public function execute(): void
 				Topic::move($row['id_topic'], $row['id_previous_board']);
 
 				// Lets see if the board that we are returning to has post count enabled.
-				$request2 = Db::$db->query('', '
-					SELECT count_posts
+				$request2 = Db::$db->query(
+					'',
+					'SELECT count_posts
 					FROM {db_prefix}boards
 					WHERE id_board = {int:board}',
-					array(
+					[
 						'board' => $row['id_previous_board'],
-					)
+					],
 				);
-				list ($count_posts) = Db::$db->fetch_row($request2);
+				list($count_posts) = Db::$db->fetch_row($request2);
 				Db::$db->free_result($request2);
 
-				if (empty($count_posts))
-				{
+				if (empty($count_posts)) {
 					// Lets get the members that need their post count restored.
-					$request2 = Db::$db->query('', '
-						SELECT id_member, COUNT(*) AS post_count
+					$request2 = Db::$db->query(
+						'',
+						'SELECT id_member, COUNT(*) AS post_count
 						FROM {db_prefix}messages
 						WHERE id_topic = {int:topic}
 							AND approved = {int:is_approved}
 						GROUP BY id_member',
-						array(
+						[
 							'topic' => $row['id_topic'],
 							'is_approved' => 1,
-						)
+						],
 					);
 
-					while ($member = Db::$db->fetch_assoc($request2))
-						User::updateMemberData($member['id_member'], array('posts' => 'posts + ' . $member['post_count']));
+					while ($member = Db::$db->fetch_assoc($request2)) {
+						User::updateMemberData($member['id_member'], ['posts' => 'posts + ' . $member['post_count']]);
+					}
 					Db::$db->free_result($request2);
 				}
 
 				// Log it.
-				Logging::logAction('restore_topic', array('topic' => $row['id_topic'], 'board' => $row['id_board'], 'board_to' => $row['id_previous_board']));
+				Logging::logAction('restore_topic', ['topic' => $row['id_topic'], 'board' => $row['id_board'], 'board_to' => $row['id_previous_board']]);
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Didn't find some things?
-		if (!empty($unfound_messages))
-		{
-			ErrorHandler::fatalLang('restore_not_found', false, array(implode('<br>', $unfound_messages)));
+		if (!empty($unfound_messages)) {
+			ErrorHandler::fatalLang('restore_not_found', false, [implode('<br>', $unfound_messages)]);
 		}
 
 		// Just send them to the index if they get here.
@@ -278,8 +289,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -311,223 +323,241 @@ protected function __construct()
 	 * Take a load of messages from one place and stick them in a topic
 	 *
 	 * @param array $msgs The IDs of the posts to merge
-	 * @param integer $from_topic The ID of the topic the messages were originally in
-	 * @param integer $target_topic The ID of the topic the messages are being merged into
+	 * @param int $from_topic The ID of the topic the messages were originally in
+	 * @param int $target_topic The ID of the topic the messages are being merged into
 	 */
 	protected static function mergePosts($msgs, $from_topic, $target_topic)
 	{
-		//!!! This really needs to be rewritten to take a load of messages from ANY topic, it's also inefficient.
+		// !!! This really needs to be rewritten to take a load of messages from ANY topic, it's also inefficient.
 
 		// Is it an array?
-		if (!is_array($msgs))
-			$msgs = array($msgs);
+		if (!is_array($msgs)) {
+			$msgs = [$msgs];
+		}
 
 		// Lets make sure they are int.
-		foreach ($msgs as $key => $msg)
+		foreach ($msgs as $key => $msg) {
 			$msgs[$key] = (int) $msg;
+		}
 
 		// Get the source information.
-		$request = Db::$db->query('', '
-			SELECT t.id_board, t.id_first_msg, t.num_replies, t.unapproved_posts
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_board, t.id_first_msg, t.num_replies, t.unapproved_posts
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
 			WHERE t.id_topic = {int:from_topic}',
-			array(
+			[
 				'from_topic' => $from_topic,
-			)
+			],
 		);
-		list ($from_board, $from_first_msg, $from_replies, $from_unapproved_posts) = Db::$db->fetch_row($request);
+		list($from_board, $from_first_msg, $from_replies, $from_unapproved_posts) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Get some target topic and board stats.
-		$request = Db::$db->query('', '
-			SELECT t.id_board, t.id_first_msg, t.num_replies, t.unapproved_posts, b.count_posts
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_board, t.id_first_msg, t.num_replies, t.unapproved_posts, b.count_posts
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
 			WHERE t.id_topic = {int:target_topic}',
-			array(
+			[
 				'target_topic' => $target_topic,
-			)
+			],
 		);
-		list ($target_board, $target_first_msg, $target_replies, $target_unapproved_posts, $count_posts) = Db::$db->fetch_row($request);
+		list($target_board, $target_first_msg, $target_replies, $target_unapproved_posts, $count_posts) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Lets see if the board that we are returning to has post count enabled.
-		if (empty($count_posts))
-		{
+		if (empty($count_posts)) {
 			// Lets get the members that need their post count restored.
-			$request = Db::$db->query('', '
-				SELECT id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}messages
 				WHERE id_msg IN ({array_int:messages})
 					AND approved = {int:is_approved}',
-				array(
+				[
 					'messages' => $msgs,
 					'is_approved' => 1,
-				)
+				],
 			);
 
-			while ($row = Db::$db->fetch_assoc($request))
-				User::updateMemberData($row['id_member'], array('posts' => '+'));
+			while ($row = Db::$db->fetch_assoc($request)) {
+				User::updateMemberData($row['id_member'], ['posts' => '+']);
+			}
 		}
 
 		// Time to move the messages.
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET
 				id_topic = {int:target_topic},
 				id_board = {int:target_board}
 			WHERE id_msg IN({array_int:msgs})',
-			array(
+			[
 				'target_topic' => $target_topic,
 				'target_board' => $target_board,
 				'msgs' => $msgs,
-			)
+			],
 		);
 
 		// Fix the id_first_msg and id_last_msg for the target topic.
-		$target_topic_data = array(
+		$target_topic_data = [
 			'num_replies' => 0,
 			'unapproved_posts' => 0,
 			'id_first_msg' => 9999999999,
-		);
-		$request = Db::$db->query('', '
-			SELECT MIN(id_msg) AS id_first_msg, MAX(id_msg) AS id_last_msg, COUNT(*) AS message_count, approved
+		];
+		$request = Db::$db->query(
+			'',
+			'SELECT MIN(id_msg) AS id_first_msg, MAX(id_msg) AS id_last_msg, COUNT(*) AS message_count, approved
 			FROM {db_prefix}messages
 			WHERE id_topic = {int:target_topic}
 			GROUP BY id_topic, approved
 			ORDER BY approved ASC
 			LIMIT 2',
-			array(
+			[
 				'target_topic' => $target_topic,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if ($row['id_first_msg'] < $target_topic_data['id_first_msg'])
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if ($row['id_first_msg'] < $target_topic_data['id_first_msg']) {
 				$target_topic_data['id_first_msg'] = $row['id_first_msg'];
+			}
 			$target_topic_data['id_last_msg'] = $row['id_last_msg'];
-			if (!$row['approved'])
+
+			if (!$row['approved']) {
 				$target_topic_data['unapproved_posts'] = $row['message_count'];
-			else
+			} else {
 				$target_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+			}
 		}
 		Db::$db->free_result($request);
 
 		// We have a new post count for the board.
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET
 				num_posts = num_posts + {int:diff_replies},
 				unapproved_posts = unapproved_posts + {int:diff_unapproved_posts}
 			WHERE id_board = {int:target_board}',
-			array(
+			[
 				'diff_replies' => $target_topic_data['num_replies'] - $target_replies, // Lets keep in mind that the first message in a topic counts towards num_replies in a board.
 				'diff_unapproved_posts' => $target_topic_data['unapproved_posts'] - $target_unapproved_posts,
 				'target_board' => $target_board,
-			)
+			],
 		);
 
 		// In some cases we merged the only post in a topic so the topic data is left behind in the topic table.
-		$request = Db::$db->query('', '
-			SELECT id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT id_topic
 			FROM {db_prefix}messages
 			WHERE id_topic = {int:from_topic}',
-			array(
+			[
 				'from_topic' => $from_topic,
-			)
+			],
 		);
 
 		// Remove the topic if it doesn't have any messages.
 		$topic_exists = true;
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			Topic::remove($from_topic, false, true);
 			$topic_exists = false;
 		}
 		Db::$db->free_result($request);
 
 		// Recycled topic.
-		if ($topic_exists == true)
-		{
+		if ($topic_exists == true) {
 			// Fix the id_first_msg and id_last_msg for the source topic.
-			$source_topic_data = array(
+			$source_topic_data = [
 				'num_replies' => 0,
 				'unapproved_posts' => 0,
 				'id_first_msg' => 9999999999,
-			);
-			$request = Db::$db->query('', '
-				SELECT MIN(id_msg) AS id_first_msg, MAX(id_msg) AS id_last_msg, COUNT(*) AS message_count, approved, subject
+			];
+			$request = Db::$db->query(
+				'',
+				'SELECT MIN(id_msg) AS id_first_msg, MAX(id_msg) AS id_last_msg, COUNT(*) AS message_count, approved, subject
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:from_topic}
 				GROUP BY id_topic, approved, subject
 				ORDER BY approved ASC
 				LIMIT 2',
-				array(
+				[
 					'from_topic' => $from_topic,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if ($row['id_first_msg'] < $source_topic_data['id_first_msg'])
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if ($row['id_first_msg'] < $source_topic_data['id_first_msg']) {
 					$source_topic_data['id_first_msg'] = $row['id_first_msg'];
+				}
 				$source_topic_data['id_last_msg'] = $row['id_last_msg'];
-				if (!$row['approved'])
+
+				if (!$row['approved']) {
 					$source_topic_data['unapproved_posts'] = $row['message_count'];
-				else
+				} else {
 					$source_topic_data['num_replies'] = max(0, $row['message_count'] - 1);
+				}
 			}
 			Db::$db->free_result($request);
 
 			// Update the topic details for the source topic.
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET
 					id_first_msg = {int:id_first_msg},
 					id_last_msg = {int:id_last_msg},
 					num_replies = {int:num_replies},
 					unapproved_posts = {int:unapproved_posts}
 				WHERE id_topic = {int:from_topic}',
-				array(
+				[
 					'id_first_msg' => $source_topic_data['id_first_msg'],
 					'id_last_msg' => $source_topic_data['id_last_msg'],
 					'num_replies' => $source_topic_data['num_replies'],
 					'unapproved_posts' => $source_topic_data['unapproved_posts'],
 					'from_topic' => $from_topic,
-				)
+				],
 			);
 
 			// We have a new post count for the source board.
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET
 					num_posts = num_posts + {int:diff_replies},
 					unapproved_posts = unapproved_posts + {int:diff_unapproved_posts}
 				WHERE id_board = {int:from_board}',
-				array(
+				[
 					'diff_replies' => $source_topic_data['num_replies'] - $from_replies, // Lets keep in mind that the first message in a topic counts towards num_replies in a board.
 					'diff_unapproved_posts' => $source_topic_data['unapproved_posts'] - $from_unapproved_posts,
 					'from_board' => $from_board,
-				)
+				],
 			);
 		}
 
 		// Finally get around to updating the destination topic, now all indexes etc on the source are fixed.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET
 				id_first_msg = {int:id_first_msg},
 				id_last_msg = {int:id_last_msg},
 				num_replies = {int:num_replies},
 				unapproved_posts = {int:unapproved_posts}
 			WHERE id_topic = {int:target_topic}',
-			array(
+			[
 				'id_first_msg' => $target_topic_data['id_first_msg'],
 				'id_last_msg' => $target_topic_data['id_last_msg'],
 				'num_replies' => $target_topic_data['num_replies'],
 				'unapproved_posts' => $target_topic_data['unapproved_posts'],
 				'target_topic' => $target_topic,
-			)
+			],
 		);
 
 		// Update stats.
@@ -535,34 +565,40 @@ protected static function mergePosts($msgs, $from_topic, $target_topic)
 		Logging::updateStats('message');
 
 		// Subject cache?
-		$cache_updates = array();
-		if ($target_first_msg != $target_topic_data['id_first_msg'])
+		$cache_updates = [];
+
+		if ($target_first_msg != $target_topic_data['id_first_msg']) {
 			$cache_updates[] = $target_topic_data['id_first_msg'];
-		if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg'])
+		}
+
+		if (!empty($source_topic_data['id_first_msg']) && $from_first_msg != $source_topic_data['id_first_msg']) {
 			$cache_updates[] = $source_topic_data['id_first_msg'];
+		}
 
-		if (!empty($cache_updates))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic, subject
+		if (!empty($cache_updates)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, subject
 				FROM {db_prefix}messages
 				WHERE id_msg IN ({array_int:first_messages})',
-				array(
+				[
 					'first_messages' => $cache_updates,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Logging::updateStats('subject', $row['id_topic'], $row['subject']);
+			}
 			Db::$db->free_result($request);
 		}
 
-		Msg::updateLastMessages(array($from_board, $target_board));
+		Msg::updateLastMessages([$from_board, $target_board]);
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicRestore::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicRestore::exportStatic')) {
 	TopicRestore::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TopicSplit.php b/Sources/Actions/TopicSplit.php
index 34b95f7bce..1d44cf6c9c 100644
--- a/Sources/Actions/TopicSplit.php
+++ b/Sources/Actions/TopicSplit.php
@@ -16,26 +16,23 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Logging;
-use SMF\MessageIndex;
-use SMF\Msg;
 use SMF\Mail;
+use SMF\Msg;
 use SMF\PageIndex;
+use SMF\Search\SearchApi;
 use SMF\Theme;
 use SMF\Time;
 use SMF\Topic;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * Handles splitting of topics.
@@ -49,12 +46,16 @@ class TopicSplit implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'SplitTopics',
-		),
-	);
+			'splitTopic' => 'splitTopic',
+			'splitIndex' => 'SplitIndex',
+			'splitExecute' => 'SplitExecute',
+			'splitSelectTopics' => 'SplitSelectTopics',
+			'SplitSelectionExecute' => 'SplitSelectionExecute',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -83,12 +84,12 @@ class TopicSplit implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'index' => 'index',
 		'split' => 'split',
 		'selectTopics' => 'select',
 		'splitSelection' => 'splitSelection',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -123,20 +124,23 @@ class TopicSplit implements ActionInterface
 	public function execute(): void
 	{
 		// And... which topic were you splitting, again?
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('numbers_one_to_nine', false);
+		}
 
 		// Are you allowed to split topics?
 		User::$me->isAllowedTo('split_any');
 
 		// Load up the "dependencies" - the template and getMsgMemberID().
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('SplitTopics');
+		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
@@ -152,53 +156,59 @@ public function execute(): void
 	public function index()
 	{
 		// Validate "at".
-		if (empty($_GET['at']))
+		if (empty($_GET['at'])) {
 			ErrorHandler::fatalLang('numbers_one_to_nine', false);
+		}
 
 		$_GET['at'] = (int) $_GET['at'];
 
 		// Retrieve the subject and stuff of the specific topic/message.
-		$request = Db::$db->query('', '
-			SELECT m.subject, t.num_replies, t.unapproved_posts, t.id_first_msg, t.approved
+		$request = Db::$db->query(
+			'',
+			'SELECT m.subject, t.num_replies, t.unapproved_posts, t.id_first_msg, t.approved
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:current_topic})
 			WHERE m.id_msg = {int:split_at}' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 				AND m.approved = 1') . '
 				AND m.id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'split_at' => $_GET['at'],
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('cant_find_messages');
 		}
 		list($_REQUEST['subname'], $num_replies, $unapproved_posts, $id_first_msg, $approved) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// If not approved validate they can see it.
-		if (Config::$modSettings['postmod_active'] && !$approved)
+		if (Config::$modSettings['postmod_active'] && !$approved) {
 			User::$me->isAllowedTo('approve_posts');
+		}
 
 		// If this topic has unapproved posts, we need to count them too...
-		if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('approve_posts'))
+		if (Config::$modSettings['postmod_active'] && User::$me->allowedTo('approve_posts')) {
 			$num_replies += $unapproved_posts - ($approved ? 0 : 1);
+		}
 
 		// Check if there is more than one message in the topic.  (there should be.)
-		if ($num_replies < 1)
+		if ($num_replies < 1) {
 			ErrorHandler::fatalLang('topic_one_post', false);
+		}
 
 		// Check if this is the first message in the topic (if so, the first and second option won't be available)
-		if ($id_first_msg == $_GET['at'])
-			return select();
+		if ($id_first_msg == $_GET['at']) {
+			return $this->select();
+		}
 
 		// Basic template information....
-		Utils::$context['message'] = array(
+		Utils::$context['message'] = [
 			'id' => $_GET['at'],
-			'subject' => $_REQUEST['subname']
-		);
+			'subject' => $_REQUEST['subname'],
+		];
 		Utils::$context['sub_template'] = 'ask';
 		Utils::$context['page_title'] = Lang::$txt['split'];
 	}
@@ -220,50 +230,48 @@ public function split()
 		User::$me->checkSession();
 
 		// Clean up the subject.
-		if (!isset($_POST['subname']) || $_POST['subname'] == '')
+		if (!isset($_POST['subname']) || $_POST['subname'] == '') {
 			$_POST['subname'] = Lang::$txt['new_topic'];
+		}
 
 		// Redirect to the selector if they chose selective.
-		if ($_POST['step2'] == 'selective')
-		{
-			Utils::redirectexit ('action=splittopics;sa=selectTopics;subname=' . $_POST['subname'] . ';topic=' . Topic::$topic_id . '.0;start2=0');
+		if ($_POST['step2'] == 'selective') {
+			Utils::redirectexit('action=splittopics;sa=selectTopics;subname=' . $_POST['subname'] . ';topic=' . Topic::$topic_id . '.0;start2=0');
 		}
 
 		$_POST['at'] = (int) $_POST['at'];
-		$messagesToBeSplit = array();
+		$messagesToBeSplit = [];
 
-		if ($_POST['step2'] == 'afterthis')
-		{
+		if ($_POST['step2'] == 'afterthis') {
 			// Fetch the message IDs of the topic that are at or after the message.
-			$request = Db::$db->query('', '
-				SELECT id_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:current_topic}
 					AND id_msg >= {int:split_at}',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'split_at' => $_POST['at'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$messagesToBeSplit[] = $row['id_msg'];
 			}
 			Db::$db->free_result($request);
 		}
 		// Only the selected message has to be split. That should be easy.
-		elseif ($_POST['step2'] == 'onlythis')
-		{
+		elseif ($_POST['step2'] == 'onlythis') {
 			$messagesToBeSplit[] = $_POST['at'];
 		}
 		// There's another action?!
-		else
-		{
+		else {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
 		Utils::$context['old_topic'] = Topic::$topic_id;
-		Utils::$context['new_topic'] = splitTopic(Topic::$topic_id, $messagesToBeSplit, $_POST['subname']);
+		Utils::$context['new_topic'] = $this->splitTopic(Topic::$topic_id, $messagesToBeSplit, $_POST['subname']);
 		Utils::$context['page_title'] = Lang::$txt['split'];
 	}
 
@@ -283,28 +291,29 @@ public function select()
 		Utils::$context['page_title'] = Lang::$txt['split'] . ' - ' . Lang::$txt['select_split_posts'];
 
 		// Haven't selected anything have we?
-		$_SESSION['split_selection'][Topic::$topic_id] = empty($_SESSION['split_selection'][Topic::$topic_id]) ? array() : $_SESSION['split_selection'][Topic::$topic_id];
+		$_SESSION['split_selection'][Topic::$topic_id] = empty($_SESSION['split_selection'][Topic::$topic_id]) ? [] : $_SESSION['split_selection'][Topic::$topic_id];
 
 		// This is a special case for split topics from quick-moderation checkboxes
-		if (isset($_REQUEST['subname_enc']))
+		if (isset($_REQUEST['subname_enc'])) {
 			$_REQUEST['subname'] = urldecode($_REQUEST['subname_enc']);
+		}
 
-		Utils::$context['not_selected'] = array(
+		Utils::$context['not_selected'] = [
 			'num_messages' => 0,
 			'start' => empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'],
-			'messages' => array(),
-		);
+			'messages' => [],
+		];
 
-		Utils::$context['selected'] = array(
+		Utils::$context['selected'] = [
 			'num_messages' => 0,
 			'start' => empty($_REQUEST['start2']) ? 0 : (int) $_REQUEST['start2'],
-			'messages' => array(),
-		);
+			'messages' => [],
+		];
 
-		Utils::$context['topic'] = array(
+		Utils::$context['topic'] = [
 			'id' => Topic::$topic_id,
 			'subject' => urlencode($_REQUEST['subname']),
-		);
+		];
 
 		// Some stuff for our favorite template.
 		Utils::$context['new_subject'] = $_REQUEST['subname'];
@@ -316,60 +325,60 @@ public function select()
 		Utils::$context['messages_per_page'] = empty(Config::$modSettings['disableCustomPerPage']) && !empty(Theme::$current->options['messages_per_page']) ? Theme::$current->options['messages_per_page'] : Config::$modSettings['defaultMaxMessages'];
 
 		// Get the message ID's from before the move.
-		if (isset($_REQUEST['xml']))
-		{
-			$original_msgs = array(
-				'not_selected' => array(),
-				'selected' => array(),
-			);
-
-			$request = Db::$db->query('', '
-				SELECT id_msg
+		if (isset($_REQUEST['xml'])) {
+			$original_msgs = [
+				'not_selected' => [],
+				'selected' => [],
+			];
+
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:current_topic}' . (empty($_SESSION['split_selection'][Topic::$topic_id]) ? '' : '
 					AND id_msg NOT IN ({array_int:no_split_msgs})') . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 					AND approved = {int:is_approved}') . '
 					' . (empty(Theme::$current->options['view_newest_first']) ? '' : 'ORDER BY id_msg DESC') . '
 					LIMIT {int:start}, {int:messages_per_page}',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
-					'no_split_msgs' => empty($_SESSION['split_selection'][Topic::$topic_id]) ? array() : $_SESSION['split_selection'][Topic::$topic_id],
+					'no_split_msgs' => empty($_SESSION['split_selection'][Topic::$topic_id]) ? [] : $_SESSION['split_selection'][Topic::$topic_id],
 					'is_approved' => 1,
 					'start' => Utils::$context['not_selected']['start'],
 					'messages_per_page' => Utils::$context['messages_per_page'],
-				)
+				],
 			);
+
 			// You can't split the last message off.
-			if (empty(Utils::$context['not_selected']['start']) && Db::$db->num_rows($request) <= 1 && $_REQUEST['move'] == 'down')
-			{
+			if (empty(Utils::$context['not_selected']['start']) && Db::$db->num_rows($request) <= 1 && $_REQUEST['move'] == 'down') {
 				$_REQUEST['move'] = '';
 			}
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$original_msgs['not_selected'][] = $row['id_msg'];
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($_SESSION['split_selection'][Topic::$topic_id]))
-			{
-				$request = Db::$db->query('', '
-					SELECT id_msg
+			if (!empty($_SESSION['split_selection'][Topic::$topic_id])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_msg
 					FROM {db_prefix}messages
 					WHERE id_topic = {int:current_topic}
 						AND id_msg IN ({array_int:split_msgs})' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 						AND approved = {int:is_approved}') . '
 					' . (empty(Theme::$current->options['view_newest_first']) ? '' : 'ORDER BY id_msg DESC') . '
 					LIMIT {int:start}, {int:messages_per_page}',
-					array(
+					[
 						'current_topic' => Topic::$topic_id,
 						'split_msgs' => $_SESSION['split_selection'][Topic::$topic_id],
 						'is_approved' => 1,
 						'start' => Utils::$context['selected']['start'],
 						'messages_per_page' => Utils::$context['messages_per_page'],
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$original_msgs['selected'][] = $row['id_msg'];
 				}
 				Db::$db->free_result($request);
@@ -377,83 +386,78 @@ public function select()
 		}
 
 		// (De)select a message..
-		if (!empty($_REQUEST['move']))
-		{
+		if (!empty($_REQUEST['move'])) {
 			$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
-			if ($_REQUEST['move'] == 'reset')
-			{
-				$_SESSION['split_selection'][Topic::$topic_id] = array();
-			}
-			elseif ($_REQUEST['move'] == 'up')
-			{
-				$_SESSION['split_selection'][Topic::$topic_id] = array_diff($_SESSION['split_selection'][Topic::$topic_id], array($_REQUEST['msg']));
-			}
-			else
-			{
+			if ($_REQUEST['move'] == 'reset') {
+				$_SESSION['split_selection'][Topic::$topic_id] = [];
+			} elseif ($_REQUEST['move'] == 'up') {
+				$_SESSION['split_selection'][Topic::$topic_id] = array_diff($_SESSION['split_selection'][Topic::$topic_id], [$_REQUEST['msg']]);
+			} else {
 				$_SESSION['split_selection'][Topic::$topic_id][] = $_REQUEST['msg'];
 			}
 		}
 
 		// Make sure the selection is still accurate.
-		if (!empty($_SESSION['split_selection'][Topic::$topic_id]))
-		{
+		if (!empty($_SESSION['split_selection'][Topic::$topic_id])) {
 			$split_msgs = $_SESSION['split_selection'][Topic::$topic_id];
-			$_SESSION['split_selection'][Topic::$topic_id] = array();
+			$_SESSION['split_selection'][Topic::$topic_id] = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:current_topic}
 					AND id_msg IN ({array_int:split_msgs})' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 					AND approved = {int:is_approved}'),
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'split_msgs' => $split_msgs,
 					'is_approved' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$_SESSION['split_selection'][Topic::$topic_id][] = $row['id_msg'];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Get the number of messages (not) selected to be split.
-		$request = Db::$db->query('', '
-			SELECT ' . (empty($_SESSION['split_selection'][Topic::$topic_id]) ? '0' : 'm.id_msg IN ({array_int:split_msgs})') . ' AS is_selected, COUNT(*) AS num_messages
+		$request = Db::$db->query(
+			'',
+			'SELECT ' . (empty($_SESSION['split_selection'][Topic::$topic_id]) ? '0' : 'm.id_msg IN ({array_int:split_msgs})') . ' AS is_selected, COUNT(*) AS num_messages
 			FROM {db_prefix}messages AS m
 			WHERE m.id_topic = {int:current_topic}' . (!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
 				AND approved = {int:is_approved}') . (empty($_SESSION['split_selection'][Topic::$topic_id]) ? '' : '
 			GROUP BY is_selected'),
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-				'split_msgs' => !empty($_SESSION['split_selection'][Topic::$topic_id]) ? $_SESSION['split_selection'][Topic::$topic_id] : array(),
+				'split_msgs' => !empty($_SESSION['split_selection'][Topic::$topic_id]) ? $_SESSION['split_selection'][Topic::$topic_id] : [],
 				'is_approved' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context[empty($row['is_selected']) || $row['is_selected'] == 'f' ? 'not_selected' : 'selected']['num_messages'] = $row['num_messages'];
 		}
 		Db::$db->free_result($request);
 
 		// Fix an oversized starting page (to make sure both pageindexes are properly set).
-		if (Utils::$context['selected']['start'] >= Utils::$context['selected']['num_messages'])
-		{
+		if (Utils::$context['selected']['start'] >= Utils::$context['selected']['num_messages']) {
 			Utils::$context['selected']['start'] = Utils::$context['selected']['num_messages'] <= Utils::$context['messages_per_page'] ? 0 : (Utils::$context['selected']['num_messages'] - ((Utils::$context['selected']['num_messages'] % Utils::$context['messages_per_page']) == 0 ? Utils::$context['messages_per_page'] : (Utils::$context['selected']['num_messages'] % Utils::$context['messages_per_page'])));
 		}
 
 		// Build a page list of the not-selected topics...
-		Utils::$context['not_selected']['page_index'] = new PageIndex(Config::$scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), array('%' => '%%')) . ';topic=' . Topic::$topic_id . '.%1$d;start2=' . Utils::$context['selected']['start'], Utils::$context['not_selected']['start'], Utils::$context['not_selected']['num_messages'], Utils::$context['messages_per_page'], true);
+		Utils::$context['not_selected']['page_index'] = new PageIndex(Config::$scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), ['%' => '%%']) . ';topic=' . Topic::$topic_id . '.%1$d;start2=' . Utils::$context['selected']['start'], Utils::$context['not_selected']['start'], Utils::$context['not_selected']['num_messages'], Utils::$context['messages_per_page'], true);
 
 		// ...and one of the selected topics.
-		Utils::$context['selected']['page_index'] = new PageIndex(Config::$scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), array('%' => '%%')) . ';topic=' . Topic::$topic_id . '.' . Utils::$context['not_selected']['start'] . ';start2=%1$d', Utils::$context['selected']['start'], Utils::$context['selected']['num_messages'], Utils::$context['messages_per_page'], true);
+		Utils::$context['selected']['page_index'] = new PageIndex(Config::$scripturl . '?action=splittopics;sa=selectTopics;subname=' . strtr(urlencode($_REQUEST['subname']), ['%' => '%%']) . ';topic=' . Topic::$topic_id . '.' . Utils::$context['not_selected']['start'] . ';start2=%1$d', Utils::$context['selected']['start'], Utils::$context['selected']['num_messages'], Utils::$context['messages_per_page'], true);
 
 		// Get the messages and stick them into an array.
-		$request = Db::$db->query('', '
-			SELECT m.subject, COALESCE(mem.real_name, m.poster_name) AS real_name, m.poster_time, m.body, m.id_msg, m.smileys_enabled
+		$request = Db::$db->query(
+			'',
+			'SELECT m.subject, COALESCE(mem.real_name, m.poster_name) AS real_name, m.poster_time, m.body, m.id_msg, m.smileys_enabled
 			FROM {db_prefix}messages AS m
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 			WHERE m.id_topic = {int:current_topic}' . (empty($_SESSION['split_selection'][Topic::$topic_id]) ? '' : '
@@ -461,38 +465,38 @@ public function select()
 				AND approved = {int:is_approved}') . '
 				' . (empty(Theme::$current->options['view_newest_first']) ? '' : 'ORDER BY m.id_msg DESC') . '
 				LIMIT {int:start}, {int:messages_per_page}',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
-				'no_split_msgs' => !empty($_SESSION['split_selection'][Topic::$topic_id]) ? $_SESSION['split_selection'][Topic::$topic_id] : array(),
+				'no_split_msgs' => !empty($_SESSION['split_selection'][Topic::$topic_id]) ? $_SESSION['split_selection'][Topic::$topic_id] : [],
 				'is_approved' => 1,
 				'start' => Utils::$context['not_selected']['start'],
 				'messages_per_page' => Utils::$context['messages_per_page'],
-			)
+			],
 		);
-		for ($counter = 0; $row = Db::$db->fetch_assoc($request); $counter++)
-		{
+
+		for ($counter = 0; $row = Db::$db->fetch_assoc($request); $counter++) {
 			Lang::censorText($row['subject']);
 			Lang::censorText($row['body']);
 
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-			Utils::$context['not_selected']['messages'][$row['id_msg']] = array(
+			Utils::$context['not_selected']['messages'][$row['id_msg']] = [
 				'id' => $row['id_msg'],
 				'subject' => $row['subject'],
 				'time' => Time::create('@' . $row['poster_time'])->format(),
 				'timestamp' => $row['poster_time'],
 				'body' => $row['body'],
 				'poster' => $row['real_name'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Now get the selected messages.
-		if (!empty($_SESSION['split_selection'][Topic::$topic_id]))
-		{
+		if (!empty($_SESSION['split_selection'][Topic::$topic_id])) {
 			// Get the messages and stick them into an array.
-			$request = Db::$db->query('', '
-				SELECT m.subject, COALESCE(mem.real_name, m.poster_name) AS real_name,  m.poster_time, m.body, m.id_msg, m.smileys_enabled
+			$request = Db::$db->query(
+				'',
+				'SELECT m.subject, COALESCE(mem.real_name, m.poster_name) AS real_name,  m.poster_time, m.body, m.id_msg, m.smileys_enabled
 				FROM {db_prefix}messages AS m
 					LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 				WHERE m.id_topic = {int:current_topic}
@@ -500,66 +504,62 @@ public function select()
 					AND approved = {int:is_approved}') . '
 				' . (empty(Theme::$current->options['view_newest_first']) ? '' : 'ORDER BY m.id_msg DESC') . '
 				LIMIT {int:start}, {int:messages_per_page}',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'split_msgs' => $_SESSION['split_selection'][Topic::$topic_id],
 					'is_approved' => 1,
 					'start' => Utils::$context['selected']['start'],
 					'messages_per_page' => Utils::$context['messages_per_page'],
-				)
+				],
 			);
-			for ($counter = 0; $row = Db::$db->fetch_assoc($request); $counter++)
-			{
+
+			for ($counter = 0; $row = Db::$db->fetch_assoc($request); $counter++) {
 				Lang::censorText($row['subject']);
 				Lang::censorText($row['body']);
 
 				$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-				Utils::$context['selected']['messages'][$row['id_msg']] = array(
+				Utils::$context['selected']['messages'][$row['id_msg']] = [
 					'id' => $row['id_msg'],
 					'subject' => $row['subject'],
 					'time' => Time::create('@' . $row['poster_time'])->format(),
 					'timestamp' => $row['poster_time'],
 					'body' => $row['body'],
-					'poster' => $row['real_name']
-				);
+					'poster' => $row['real_name'],
+				];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// The XMLhttp method only needs the stuff that changed, so let's compare.
-		if (isset($_REQUEST['xml']))
-		{
-			$changes = array(
-				'remove' => array(
+		if (isset($_REQUEST['xml'])) {
+			$changes = [
+				'remove' => [
 					'not_selected' => array_diff($original_msgs['not_selected'], array_keys(Utils::$context['not_selected']['messages'])),
 					'selected' => array_diff($original_msgs['selected'], array_keys(Utils::$context['selected']['messages'])),
-				),
-				'insert' => array(
+				],
+				'insert' => [
 					'not_selected' => array_diff(array_keys(Utils::$context['not_selected']['messages']), $original_msgs['not_selected']),
 					'selected' => array_diff(array_keys(Utils::$context['selected']['messages']), $original_msgs['selected']),
-				),
-			);
+				],
+			];
 
-			Utils::$context['changes'] = array();
+			Utils::$context['changes'] = [];
 
-			foreach ($changes as $change_type => $change_array)
-			{
-				foreach ($change_array as $section => $msg_array)
-				{
-					if (empty($msg_array))
+			foreach ($changes as $change_type => $change_array) {
+				foreach ($change_array as $section => $msg_array) {
+					if (empty($msg_array)) {
 						continue;
+					}
 
-					foreach ($msg_array as $id_msg)
-					{
-						Utils::$context['changes'][$change_type . $id_msg] = array(
+					foreach ($msg_array as $id_msg) {
+						Utils::$context['changes'][$change_type . $id_msg] = [
 							'id' => $id_msg,
 							'type' => $change_type,
 							'section' => $section,
-						);
+						];
 
-						if ($change_type == 'insert')
-						{
+						if ($change_type == 'insert') {
 							Utils::$context['changes']['insert' . $id_msg]['insert_value'] = Utils::$context[$section]['messages'][$id_msg];
 						}
 					}
@@ -581,15 +581,17 @@ public function splitSelection()
 		User::$me->checkSession();
 
 		// Default the subject in case it's blank.
-		if (!isset($_POST['subname']) || $_POST['subname'] == '')
+		if (!isset($_POST['subname']) || $_POST['subname'] == '') {
 			$_POST['subname'] = Lang::$txt['new_topic'];
+		}
 
 		// You must've selected some messages!  Can't split out none!
-		if (empty($_SESSION['split_selection'][Topic::$topic_id]))
+		if (empty($_SESSION['split_selection'][Topic::$topic_id])) {
 			ErrorHandler::fatalLang('no_posts_selected', false);
+		}
 
 		Utils::$context['old_topic'] = Topic::$topic_id;
-		Utils::$context['new_topic'] = splitTopic(Topic::$topic_id, $_SESSION['split_selection'][Topic::$topic_id], $_POST['subname']);
+		Utils::$context['new_topic'] = $this->splitTopic(Topic::$topic_id, $_SESSION['split_selection'][Topic::$topic_id], $_POST['subname']);
 		Utils::$context['page_title'] = Lang::$txt['split'];
 	}
 
@@ -604,8 +606,9 @@ public function splitSelection()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -637,25 +640,28 @@ public static function call(): void
 	public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject)
 	{
 		// Nothing to split?
-		if (empty($splitMessages))
+		if (empty($splitMessages)) {
 			ErrorHandler::fatalLang('no_posts_selected', false);
+		}
 
 		// Get some board info.
-		$request = Db::$db->query('', '
-			SELECT id_board, approved
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, approved
 			FROM {db_prefix}topics
 			WHERE id_topic = {int:id_topic}
 			LIMIT 1',
-			array(
+			[
 				'id_topic' => $split1_ID_TOPIC,
-			)
+			],
 		);
 		list($id_board, $split1_approved) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Find the new first and last not in the list. (old topic)
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				MIN(m.id_msg) AS myid_first_msg, MAX(m.id_msg) AS myid_last_msg, COUNT(*) AS message_count, m.approved
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = {int:id_topic})
@@ -664,42 +670,40 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 			GROUP BY m.approved
 			ORDER BY m.approved DESC
 			LIMIT 2',
-			array(
+			[
 				'id_topic' => $split1_ID_TOPIC,
 				'no_msg_list' => $splitMessages,
-			)
+			],
 		);
+
 		// You can't select ALL the messages!
-		if (Db::$db->num_rows($request) == 0)
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('selected_all_posts', false);
+		}
 
 		$split1_first_msg = null;
 		$split1_last_msg = null;
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Get the right first and last message dependent on approved state...
-			if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg)
+			if (empty($split1_first_msg) || $row['myid_first_msg'] < $split1_first_msg) {
 				$split1_first_msg = $row['myid_first_msg'];
+			}
 
-			if (empty($split1_last_msg) || $row['approved'])
+			if (empty($split1_last_msg) || $row['approved']) {
 				$split1_last_msg = $row['myid_last_msg'];
+			}
 
 			// Get the counts correct...
-			if ($row['approved'])
-			{
+			if ($row['approved']) {
 				$split1_replies = $row['message_count'] - 1;
 				$split1_unapprovedposts = 0;
-			}
-			else
-			{
-				if (!isset($split1_replies))
-				{
+			} else {
+				if (!isset($split1_replies)) {
 					$split1_replies = 0;
 				}
 				// If the topic isn't approved then num replies must go up by one... as first post wouldn't be counted.
-				elseif (!$split1_approved)
-				{
+				elseif (!$split1_approved) {
 					$split1_replies++;
 				}
 
@@ -712,48 +716,47 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 		$split1_lastMem = Board::getMsgMemberID($split1_last_msg);
 
 		// Find the first and last in the list. (new topic)
-		$request = Db::$db->query('', '
-			SELECT MIN(id_msg) AS myid_first_msg, MAX(id_msg) AS myid_last_msg, COUNT(*) AS message_count, approved
+		$request = Db::$db->query(
+			'',
+			'SELECT MIN(id_msg) AS myid_first_msg, MAX(id_msg) AS myid_last_msg, COUNT(*) AS message_count, approved
 			FROM {db_prefix}messages
 			WHERE id_msg IN ({array_int:msg_list})
 				AND id_topic = {int:id_topic}
 			GROUP BY id_topic, approved
 			ORDER BY approved DESC
 			LIMIT 2',
-			array(
+			[
 				'msg_list' => $splitMessages,
 				'id_topic' => $split1_ID_TOPIC,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// As before get the right first and last message dependent on approved state...
-			if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg)
+			if (empty($split2_first_msg) || $row['myid_first_msg'] < $split2_first_msg) {
 				$split2_first_msg = $row['myid_first_msg'];
+			}
 
-			if (empty($split2_last_msg) || $row['approved'])
+			if (empty($split2_last_msg) || $row['approved']) {
 				$split2_last_msg = $row['myid_last_msg'];
+			}
 
 			// Then do the counts again...
-			if ($row['approved'])
-			{
+			if ($row['approved']) {
 				$split2_approved = true;
 				$split2_replies = $row['message_count'] - 1;
 				$split2_unapprovedposts = 0;
-			}
-			else
-			{
+			} else {
 				// Should this one be approved??
-				if ($split2_first_msg == $row['myid_first_msg'])
+				if ($split2_first_msg == $row['myid_first_msg']) {
 					$split2_approved = false;
+				}
 
-				if (!isset($split2_replies))
-				{
+				if (!isset($split2_replies)) {
 					$split2_replies = 0;
 				}
 				// As before, fix number of replies.
-				elseif (!$split2_approved)
-				{
+				elseif (!$split2_approved) {
 					$split2_replies++;
 				}
 
@@ -766,19 +769,20 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 		$split2_lastMem = Board::getMsgMemberID($split2_last_msg);
 
 		// No database changes yet, so let's double check to see if everything makes at least a little sense.
-		if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved))
-		{
+		if ($split1_first_msg <= 0 || $split1_last_msg <= 0 || $split2_first_msg <= 0 || $split2_last_msg <= 0 || $split1_replies < 0 || $split2_replies < 0 || $split1_unapprovedposts < 0 || $split2_unapprovedposts < 0 || !isset($split1_approved) || !isset($split2_approved)) {
 			ErrorHandler::fatalLang('cant_find_messages');
 		}
 
 		// You cannot split off the first message of a topic.
-		if ($split1_first_msg > $split2_first_msg)
+		if ($split1_first_msg > $split2_first_msg) {
 			ErrorHandler::fatalLang('split_first_post', false);
+		}
 
 		// We're off to insert the new topic!  Use 0 for now to avoid UNIQUE errors.
-		$split2_ID_TOPIC = Db::$db->insert('',
+		$split2_ID_TOPIC = Db::$db->insert(
+			'',
 			'{db_prefix}topics',
-			array(
+			[
 				'id_board' => 'int',
 				'id_member_started' => 'int',
 				'id_member_updated' => 'int',
@@ -788,8 +792,8 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 				'unapproved_posts' => 'int',
 				'approved' => 'int',
 				'is_sticky' => 'int',
-			),
-			array(
+			],
+			[
 				(int) $id_board,
 				$split2_firstMem,
 				$split2_lastMem,
@@ -799,37 +803,39 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 				$split2_unapprovedposts,
 				(int) $split2_approved,
 				0,
-			),
-			array('id_topic'),
-			1
+			],
+			['id_topic'],
+			1,
 		);
 
-		if ($split2_ID_TOPIC <= 0)
+		if ($split2_ID_TOPIC <= 0) {
 			ErrorHandler::fatalLang('cant_insert_topic');
+		}
 
 		// Move the messages over to the other topic.
-		$new_subject = strtr(Utils::htmlTrim(Utils::htmlspecialchars($new_subject)), array("\r" => '', "\n" => '', "\t" => ''));
+		$new_subject = strtr(Utils::htmlTrim(Utils::htmlspecialchars($new_subject)), ["\r" => '', "\n" => '', "\t" => '']);
 
 		// Check the subject length.
-		if (Utils::entityStrlen($new_subject) > 100)
+		if (Utils::entityStrlen($new_subject) > 100) {
 			$new_subject = Utils::entitySubstr($new_subject, 0, 100);
+		}
 
 		// Valid subject?
-		if ($new_subject != '')
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+		if ($new_subject != '') {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET
 					id_topic = {int:id_topic},
 					subject = CASE WHEN id_msg = {int:split_first_msg} THEN {string:new_subject} ELSE {string:new_subject_replies} END
 				WHERE id_msg IN ({array_int:split_msgs})',
-				array(
+				[
 					'split_msgs' => $splitMessages,
 					'id_topic' => $split2_ID_TOPIC,
 					'new_subject' => $new_subject,
 					'split_first_msg' => $split2_first_msg,
 					'new_subject_replies' => Lang::$txt['response_prefix'] . $new_subject,
-				)
+				],
 			);
 
 			// Cache the new topics subject... we can do it now as all the subjects are the same!
@@ -837,19 +843,21 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 		}
 
 		// Any associated reported posts better follow...
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_reported
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_reported
 			SET id_topic = {int:id_topic}
 			WHERE id_msg IN ({array_int:split_msgs})',
-			array(
+			[
 				'split_msgs' => $splitMessages,
 				'id_topic' => $split2_ID_TOPIC,
-			)
+			],
 		);
 
 		// Mess with the old topic's first, last, and number of messages.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET
 				num_replies = {int:num_replies},
 				id_first_msg = {int:id_first_msg},
@@ -858,7 +866,7 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 				id_member_updated = {int:id_member_updated},
 				unapproved_posts = {int:unapproved_posts}
 			WHERE id_topic = {int:id_topic}',
-			array(
+			[
 				'num_replies' => $split1_replies,
 				'id_first_msg' => $split1_first_msg,
 				'id_last_msg' => $split1_last_msg,
@@ -866,75 +874,78 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 				'id_member_updated' => $split1_lastMem,
 				'unapproved_posts' => $split1_unapprovedposts,
 				'id_topic' => $split1_ID_TOPIC,
-			)
+			],
 		);
 
 		// Now, put the first/last message back to what they should be.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET
 				id_first_msg = {int:id_first_msg},
 				id_last_msg = {int:id_last_msg}
 			WHERE id_topic = {int:id_topic}',
-			array(
+			[
 				'id_first_msg' => $split2_first_msg,
 				'id_last_msg' => $split2_last_msg,
 				'id_topic' => $split2_ID_TOPIC,
-			)
+			],
 		);
 
 		// If the new topic isn't approved ensure the first message flags this just in case.
-		if (!$split2_approved)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+		if (!$split2_approved) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET approved = {int:approved}
 				WHERE id_msg = {int:id_msg}
 					AND id_topic = {int:id_topic}',
-				array(
+				[
 					'approved' => 0,
 					'id_msg' => $split2_first_msg,
 					'id_topic' => $split2_ID_TOPIC,
-				)
+				],
 			);
 		}
 
 		// The board has more topics now (Or more unapproved ones!).
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET ' . ($split2_approved ? '
 				num_topics = num_topics + 1' : '
 				unapproved_topics = unapproved_topics + 1') . '
 			WHERE id_board = {int:id_board}',
-			array(
+			[
 				'id_board' => $id_board,
-			)
+			],
 		);
 
 		// Copy log topic entries.
 		// @todo This should really be chunked.
-		$request = Db::$db->query('', '
-			SELECT id_member, id_msg, unwatched
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, id_msg, unwatched
 			FROM {db_prefix}log_topics
 			WHERE id_topic = {int:id_topic}',
-			array(
+			[
 				'id_topic' => (int) $split1_ID_TOPIC,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) > 0)
-		{
-			$replaceEntries = array();
 
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$replaceEntries[] = array($row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']);
+		if (Db::$db->num_rows($request) > 0) {
+			$replaceEntries = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$replaceEntries[] = [$row['id_member'], $split2_ID_TOPIC, $row['id_msg'], $row['unwatched']];
 			}
 
-			Db::$db->insert('ignore',
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_topics',
-				array('id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
+				['id_member' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'],
 				$replaceEntries,
-				array('id_member', 'id_topic')
+				['id_member', 'id_topic'],
 			);
 
 			unset($replaceEntries);
@@ -945,7 +956,7 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 		Logging::updateStats('topic');
 		Msg::updateLastMessages($id_board);
 
-		Logging::logAction('split', array('topic' => $split1_ID_TOPIC, 'new_topic' => $split2_ID_TOPIC, 'board' => $id_board));
+		Logging::logAction('split', ['topic' => $split1_ID_TOPIC, 'new_topic' => $split2_ID_TOPIC, 'board' => $id_board]);
 
 		// Notify people that this topic has been split?
 		Mail::sendNotifications($split1_ID_TOPIC, 'split');
@@ -953,11 +964,12 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 		// If there's a search index that needs updating, update it...
 		$searchAPI = SearchApi::load();
 
-		if (is_callable(array($searchAPI, 'topicSplit')))
+		if (is_callable([$searchAPI, 'topicSplit'])) {
 			$searchAPI->topicSplit($split2_ID_TOPIC, $splitMessages);
+		}
 
 		// Maybe we want to let an external CMS know about this split
-		$split1 = array(
+		$split1 = [
 			'num_replies' => $split1_replies,
 			'id_first_msg' => $split1_first_msg,
 			'id_last_msg' => $split1_last_msg,
@@ -965,9 +977,9 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 			'id_member_updated' => $split1_lastMem,
 			'unapproved_posts' => $split1_unapprovedposts,
 			'id_topic' => $split1_ID_TOPIC,
-		);
+		];
 
-		$split2 = array(
+		$split2 = [
 			'num_replies' => $split2_replies,
 			'id_first_msg' => $split2_first_msg,
 			'id_last_msg' => $split2_last_msg,
@@ -975,9 +987,9 @@ public static function splitTopic($split1_ID_TOPIC, $splitMessages, $new_subject
 			'id_member_updated' => $split2_lastMem,
 			'unapproved_posts' => $split2_unapprovedposts,
 			'id_topic' => $split2_ID_TOPIC,
-		);
+		];
 
-		IntegrationHook::call('integrate_split_topic', array($split1, $split2, $new_subject, $id_board));
+		IntegrationHook::call('integrate_split_topic', [$split1, $split2, $new_subject, $id_board]);
 
 		// Return the ID of the newly created topic.
 		return $split2_ID_TOPIC;
@@ -1033,19 +1045,20 @@ public static function SplitSelectionExecute(): void
 	protected function __construct()
 	{
 		// The 'split' sub-action used to be called 'execute'.
-		if (!empty($_GET['sa']) && $_GET['sa'] === 'execute')
-		{
+		if (!empty($_GET['sa']) && $_GET['sa'] === 'execute') {
 			$_GET['sa'] = 'split';
 			$_REQUEST['sa'] = 'split';
 		}
 
-		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']]))
+		if (!empty($_GET['sa']) && isset(self::$subactions[$_GET['sa']])) {
 			$this->subaction = $_GET['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TopicSplit::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TopicSplit::exportStatic')) {
 	TopicSplit::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/TrackIP.php b/Sources/Actions/TrackIP.php
index 08bee8c635..ed94e9588c 100644
--- a/Sources/Actions/TrackIP.php
+++ b/Sources/Actions/TrackIP.php
@@ -14,19 +14,18 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
-use SMF\Lang;
 use SMF\IntegrationHook;
 use SMF\IP;
 use SMF\ItemList;
+use SMF\Lang;
 use SMF\Profile;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Rename here and in the exportStatic call at the end of the file.
@@ -40,26 +39,27 @@ class TrackIP implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'call' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'list_getIPMessages' => 'list_getIPMessages',
+			'list_getIPMessageCount' => 'list_getIPMessageCount',
+			'trackIP' => 'TrackIP',
+		],
+	];
 
 	/*******************
 	 * Public properties
 	 *******************/
 
 	/**
-	 * @var int $memID
+	 * @var int
 	 *
 	 * ID of the member to track.
 	 */
 	public int $memID;
 
 	/**
-	 * @var bool $standalone
+	 * @var bool
 	 *
 	 * True if this was called via ?action=trackip.
 	 * False if this was called via ?action=profile;area=tracking;sa=ip.
@@ -90,16 +90,13 @@ public function execute(): void
 		// Can the user do this?
 		User::$me->isAllowedTo('moderate_forum');
 
-		if ($this->standalone)
-		{
+		if ($this->standalone) {
 			Theme::loadTemplate('Profile');
 			Lang::load('Profile');
 			Utils::$context['base_url'] = Config::$scripturl . '?action=trackip';
 
 			Utils::$context['ip'] = IP::ip2range(User::$me->ip);
-		}
-		else
-		{
+		} else {
 			Utils::$context['base_url'] = Config::$scripturl . '?action=profile;area=tracking;sa=ip;u=' . $this->memID;
 
 			Utils::$context['ip'] = IP::ip2range(User::$loaded[$this->memID]->ip);
@@ -108,43 +105,44 @@ public function execute(): void
 		Utils::$context['sub_template'] = 'trackIP';
 
 		// Searching?
-		if (isset($_REQUEST['searchip']))
+		if (isset($_REQUEST['searchip'])) {
 			Utils::$context['ip'] = IP::ip2range(trim($_REQUEST['searchip']));
+		}
 
-		if (count(Utils::$context['ip']) !== 2)
+		if (count(Utils::$context['ip']) !== 2) {
 			ErrorHandler::fatalLang('invalid_tracking_ip', false);
+		}
 
-		$ip_string = array('{inet:ip_address_low}', '{inet:ip_address_high}');
+		$ip_string = ['{inet:ip_address_low}', '{inet:ip_address_high}'];
 
-		$fields = array(
+		$fields = [
 			'ip_address_low' => Utils::$context['ip']['low'],
 			'ip_address_high' => Utils::$context['ip']['high'],
-		);
+		];
 
 		$ip_var = Utils::$context['ip'];
 
-		if (Utils::$context['ip']['low'] !== Utils::$context['ip']['high'])
-		{
+		if (Utils::$context['ip']['low'] !== Utils::$context['ip']['high']) {
 			Utils::$context['ip'] = Utils::$context['ip']['low'] . '-' . Utils::$context['ip']['high'];
-		}
-		else
-		{
+		} else {
 			Utils::$context['ip'] = Utils::$context['ip']['low'];
 		}
 
-		if ($this->standalone)
+		if ($this->standalone) {
 			Utils::$context['page_title'] = Lang::$txt['trackIP'] . ' - ' . Utils::$context['ip'];
+		}
 
-		Utils::$context['ips'] = array();
+		Utils::$context['ips'] = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name AS display_name, member_ip
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name AS display_name, member_ip
 			FROM {db_prefix}members
 			WHERE member_ip >= ' . $ip_string[0] . ' and member_ip <= ' . $ip_string[1],
-			$fields
+			$fields,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Utils::$context['ips'][(string) new IP($row['member_ip'])][] = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>';
 		}
 		Db::$db->free_result($request);
@@ -155,7 +153,7 @@ public function execute(): void
 		$max_per_page = empty(Config::$modSettings['disableCustomPerPage']) && !empty(Theme::$current->options['messages_per_page']) ? Theme::$current->options['messages_per_page'] : Config::$modSettings['defaultMaxMessages'];
 
 		// Start with the user messages.
-		$list_options = array(
+		$list_options = [
 			'id' => 'track_message_list',
 			'title' => Lang::$txt['messages_from_ip'] . ' ' . Utils::$context['ip'],
 			'start_var_name' => 'messageStart',
@@ -163,87 +161,87 @@ public function execute(): void
 			'no_items_label' => Lang::$txt['no_messages_from_ip'],
 			'base_href' => Utils::$context['base_url'] . ';searchip=' . Utils::$context['ip'],
 			'default_sort_col' => 'date',
-			'get_items' => array(
+			'get_items' => [
 				'function' => __CLASS__ . '::list_getIPMessages',
-				'params' => array(
+				'params' => [
 					'm.poster_ip >= ' . $ip_string[0] . ' and m.poster_ip <= ' . $ip_string[1],
 					$fields,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => __CLASS__ . '::list_getIPMessageCount',
-				'params' => array(
+				'params' => [
 					'm.poster_ip >= ' . $ip_string[0] . ' and m.poster_ip <= ' . $ip_string[1],
 					$fields,
-				),
-			),
-			'columns' => array(
-				'ip_address' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'ip_address' => [
+					'header' => [
 						'value' => Lang::$txt['ip_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Utils::$context['base_url'] . ';searchip=%1$s">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'ip' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'm.poster_ip',
 						'reverse' => 'm.poster_ip DESC',
-					),
-				),
-				'poster' => array(
-					'header' => array(
+					],
+				],
+				'poster' => [
+					'header' => [
 						'value' => Lang::$txt['poster'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'member_link',
-					),
-				),
-				'subject' => array(
-					'header' => array(
+					],
+				],
+				'subject' => [
+					'header' => [
 						'value' => Lang::$txt['subject'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Config::$scripturl . '?topic=%1$s.msg%2$s#msg%2$s" rel="nofollow">%3$s</a>',
-							'params' => array(
+							'params' => [
 								'topic' => false,
 								'id' => false,
 								'subject' => false,
-							),
-						),
-					),
-				),
-				'date' => array(
-					'header' => array(
+							],
+						],
+					],
+				],
+				'date' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'm.id_msg DESC',
 						'reverse' => 'm.id_msg',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['messages_from_ip_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the messages list.
 		new ItemList($list_options);
 
 		// Set the options for the error lists.
-		$list_options = array(
+		$list_options = [
 			'id' => 'track_user_list',
 			'title' => Lang::$txt['errors_from_ip'] . ' ' . Utils::$context['ip'],
 			'start_var_name' => 'errorStart',
@@ -251,111 +249,110 @@ public function execute(): void
 			'no_items_label' => Lang::$txt['no_errors_from_ip'],
 			'base_href' => Utils::$context['base_url'] . ';searchip=' . Utils::$context['ip'],
 			'default_sort_col' => 'date2',
-			'get_items' => array(
+			'get_items' => [
 				'function' => 'list_getUserErrors',
-				'params' => array(
+				'params' => [
 					'le.ip >= ' . $ip_string[0] . ' and le.ip <= ' . $ip_string[1],
 					$fields,
-				),
-			),
-			'get_count' => array(
+				],
+			],
+			'get_count' => [
 				'function' => 'list_getUserErrorCount',
-				'params' => array(
+				'params' => [
 					'ip >= ' . $ip_string[0] . ' and ip <= ' . $ip_string[1],
 					$fields,
-				),
-			),
-			'columns' => array(
-				'ip_address2' => array(
-					'header' => array(
+				],
+			],
+			'columns' => [
+				'ip_address2' => [
+					'header' => [
 						'value' => Lang::$txt['ip_address'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '<a href="' . Utils::$context['base_url'] . ';searchip=%1$s">%1$s</a>',
-							'params' => array(
+							'params' => [
 								'ip' => false,
-							),
-						),
-					),
-					'sort' => array(
+							],
+						],
+					],
+					'sort' => [
 						'default' => 'le.ip',
 						'reverse' => 'le.ip DESC',
-					),
-				),
-				'display_name' => array(
-					'header' => array(
+					],
+				],
+				'display_name' => [
+					'header' => [
 						'value' => Lang::$txt['display_name'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'member_link',
-					),
-				),
-				'message' => array(
-					'header' => array(
+					],
+				],
+				'message' => [
+					'header' => [
 						'value' => Lang::$txt['message'],
-					),
-					'data' => array(
-						'sprintf' => array(
+					],
+					'data' => [
+						'sprintf' => [
 							'format' => '%1$s<br><a href="%2$s">%2$s</a>',
-							'params' => array(
+							'params' => [
 								'message' => false,
 								'url' => false,
-							),
-						),
+							],
+						],
 						'class' => 'word_break',
-					),
-				),
-				'date2' => array(
-					'header' => array(
+					],
+				],
+				'date2' => [
+					'header' => [
 						'value' => Lang::$txt['date'],
-					),
-					'data' => array(
+					],
+					'data' => [
 						'db' => 'time',
-					),
-					'sort' => array(
+					],
+					'sort' => [
 						'default' => 'le.id_error DESC',
 						'reverse' => 'le.id_error',
-					),
-				),
-			),
-			'additional_rows' => array(
-				array(
+					],
+				],
+			],
+			'additional_rows' => [
+				[
 					'position' => 'after_title',
 					'value' => Lang::$txt['errors_from_ip_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
 		// Create the error list.
 		new ItemList($list_options);
 
 		// Allow 3rd party integrations to add in their own lists or whatever.
-		Utils::$context['additional_track_lists'] = array();
-		IntegrationHook::call('integrate_profile_trackip', array($ip_string, $ip_var));
+		Utils::$context['additional_track_lists'] = [];
+		IntegrationHook::call('integrate_profile_trackip', [$ip_string, $ip_var]);
 
 		Utils::$context['single_ip'] = ($ip_var['low'] === $ip_var['high']);
 
-		if (Utils::$context['single_ip'])
-		{
-			Utils::$context['whois_servers'] = array(
-				'apnic' => array(
+		if (Utils::$context['single_ip']) {
+			Utils::$context['whois_servers'] = [
+				'apnic' => [
 					'name' => Lang::$txt['whois_apnic'],
 					'url' => 'https://wq.apnic.net/apnic-bin/whois.pl?searchtext=' . Utils::$context['ip'],
-				),
-				'arin' => array(
+				],
+				'arin' => [
 					'name' => Lang::$txt['whois_arin'],
 					'url' => 'https://whois.arin.net/rest/ip/' . Utils::$context['ip'],
-				),
-				'lacnic' => array(
+				],
+				'lacnic' => [
 					'name' => Lang::$txt['whois_lacnic'],
 					'url' => 'https://lacnic.net/cgi-bin/lacnic/whois?query=' . Utils::$context['ip'],
-				),
-				'ripe' => array(
+				],
+				'ripe' => [
 					'name' => Lang::$txt['whois_ripe'],
 					'url' => 'https://apps.db.ripe.net/search/query.html?searchtext=' . Utils::$context['ip'],
-				),
-			);
+				],
+			];
 		}
 	}
 
@@ -370,8 +367,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -394,13 +392,14 @@ public static function call(): void
 	 * @param array $where_vars An array of parameters for $where
 	 * @return array An array containing information about the posts
 	 */
-	public static function list_getIPMessages(int $start, int $items_per_page, string $sort, string $where, array $where_vars = array()): array
+	public static function list_getIPMessages(int $start, int $items_per_page, string $sort, string $where, array $where_vars = []): array
 	{
-		$messages = array();
+		$messages = [];
 
 		// Get all the messages fitting this where clause.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.id_msg, m.poster_ip, COALESCE(mem.real_name, m.poster_name) AS display_name, mem.id_member,
 				m.subject, m.poster_time, m.id_topic, m.id_board
 			FROM {db_prefix}messages AS m
@@ -408,27 +407,27 @@ public static function list_getIPMessages(int $start, int $items_per_page, strin
 			WHERE {query_see_message_board} AND ' . $where . '
 			ORDER BY {raw:sort}
 			LIMIT {int:start}, {int:max}',
-			array_merge($where_vars, array(
+			array_merge($where_vars, [
 				'sort' => $sort,
 				'start' => $start,
 				'max' => $items_per_page,
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$messages[] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$messages[] = [
 				'ip' => new IP($row['poster_ip']),
 				'member_link' => empty($row['id_member']) ? $row['display_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['display_name'] . '</a>',
-				'board' => array(
+				'board' => [
 					'id' => $row['id_board'],
-					'href' => Config::$scripturl . '?board=' . $row['id_board']
-				),
+					'href' => Config::$scripturl . '?board=' . $row['id_board'],
+				],
 				'topic' => $row['id_topic'],
 				'id' => $row['id_msg'],
 				'subject' => $row['subject'],
 				'time' => Time::create('@' . $row['poster_time'])->format(),
-				'timestamp' => $row['poster_time']
-			);
+				'timestamp' => $row['poster_time'],
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -442,13 +441,14 @@ public static function list_getIPMessages(int $start, int $items_per_page, strin
 	 * @param array $where_vars The parameters for $where
 	 * @return int Count of messages matching the IP
 	 */
-	public static function list_getIPMessageCount(string $where, array $where_vars = array()): int
+	public static function list_getIPMessageCount(string $where, array $where_vars = []): int
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}messages AS m
 			WHERE {query_see_message_board} AND ' . $where,
-			$where_vars
+			$where_vars,
 		);
 		list($count) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -481,14 +481,12 @@ protected function __construct()
 		// have already been loaded. If it isn't, this was called directly.
 		$this->standalone = !class_exists(__NAMESPACE__ . '\\Profile\\Main', false);
 
-		if ($this->standalone)
-		{
+		if ($this->standalone) {
 			$this->memID = User::$me->id;
-		}
-		else
-		{
-			if (!isset(Profile::$member))
+		} else {
+			if (!isset(Profile::$member)) {
 				Profile::load();
+			}
 
 			$this->memID = Profile::$member->id;
 		}
@@ -496,7 +494,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TrackIP::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TrackIP::exportStatic')) {
 	TrackIP::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Unread.php b/Sources/Actions/Unread.php
index 232bc71641..9219fb24af 100644
--- a/Sources/Actions/Unread.php
+++ b/Sources/Actions/Unread.php
@@ -14,9 +14,9 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -24,7 +24,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Finds and retrieves information about new posts and topics.
@@ -38,12 +37,11 @@ class Unread implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'UnreadTopics',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -55,14 +53,14 @@ class Unread implements ActionInterface
 	 * Ways to sort the posts.
 	 * Keys are requestable methods, values are SQL ORDER BY statements
 	 */
-	public array $sort_methods = array(
+	public array $sort_methods = [
 		'subject' => 'ms.subject',
 		'starter' => 'COALESCE(mems.real_name, ms.poster_name)',
 		'replies' => 't.num_replies',
 		'views' => 't.num_views',
 		'first_post' => 't.id_topic',
-		'last_post' => 't.id_last_msg'
-	);
+		'last_post' => 't.id_last_msg',
+	];
 
 	/*********************
 	 * Internal properties
@@ -115,7 +113,7 @@ class Unread implements ActionInterface
 	 *
 	 * The boards to look in.
 	 */
-	protected array $boards = array();
+	protected array $boards = [];
 
 	/**
 	 * @var string
@@ -129,7 +127,7 @@ class Unread implements ActionInterface
 	 *
 	 * Parameters for the main query.
 	 */
-	protected array $query_parameters = array();
+	protected array $query_parameters = [];
 
 	/**
 	 * @var string
@@ -151,7 +149,7 @@ class Unread implements ActionInterface
 	 * Columns for the SQL SELECT clause. This part is the same for each query.
 	 * More columns will be added at runtime if avatars are shown on indices.
 	 */
-	protected array $selects = array(
+	protected array $selects = [
 		'ms.subject AS first_subject',
 		'ms.poster_time AS first_poster_time',
 		'ms.id_topic',
@@ -183,7 +181,7 @@ class Unread implements ActionInterface
 		'ml.id_msg_modified',
 		't.approved',
 		't.unapproved_posts',
-	);
+	];
 
 	/**
 	 * @var int
@@ -245,8 +243,9 @@ public function execute(): void
 		$this->setPaginationAndLinks();
 
 		// If they've read everything, we're done here.
-		if (empty($this->num_topics))
+		if (empty($this->num_topics)) {
 			return;
+		}
 
 		$this->getTopics();
 		$this->buildButtons();
@@ -268,8 +267,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -295,14 +295,14 @@ protected function __construct()
 		User::$me->kickIfGuest();
 
 		// Prefetching + lots of MySQL work = bad mojo.
-		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		{
+		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
 			ob_end_clean();
 			Utils::sendHttpStatus(403);
+
 			die;
 		}
 
-		Utils::$context['topics'] = array();
+		Utils::$context['topics'] = [];
 
 		Utils::$context['showCheckboxes'] = !empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1;
 
@@ -319,12 +319,9 @@ protected function __construct()
 		$this->linktree_name = Lang::$txt['unread_topics_visit'];
 		$this->action_url = Config::$scripturl . '?action=unread';
 
-		if (Utils::$context['showing_all_topics'])
-		{
+		if (Utils::$context['showing_all_topics']) {
 			$this->checkLoadAverageAll();
-		}
-		else
-		{
+		} else {
 			$this->checkLoadAverage();
 		}
 
@@ -333,10 +330,11 @@ protected function __construct()
 		Utils::$context['sub_template'] = $this->sub_template;
 
 		// Setup the default topic icons... for checking they exist and the like ;)
-		Utils::$context['icon_sources'] = array();
+		Utils::$context['icon_sources'] = [];
 
-		foreach (Utils::$context['stable_icons'] as $icon)
+		foreach (Utils::$context['stable_icons'] as $icon) {
 			Utils::$context['icon_sources'][$icon] = 'images_url';
+		}
 	}
 
 	/**
@@ -344,14 +342,17 @@ protected function __construct()
 	 */
 	protected function checkLoadAverage()
 	{
-		if (empty(Utils::$context['load_average']))
+		if (empty(Utils::$context['load_average'])) {
 			return;
+		}
 
-		if (empty(Config::$modSettings['loadavg_unread']))
+		if (empty(Config::$modSettings['loadavg_unread'])) {
 			return;
+		}
 
-		if (Utils::$context['load_average'] >= Config::$modSettings['loadavg_unread'])
+		if (Utils::$context['load_average'] >= Config::$modSettings['loadavg_unread']) {
 			ErrorHandler::fatalLang('loadavg_unread_disabled', false);
+		}
 	}
 
 	/**
@@ -359,14 +360,17 @@ protected function checkLoadAverage()
 	 */
 	protected function checkLoadAverageAll()
 	{
-		if (empty(Utils::$context['load_average']))
+		if (empty(Utils::$context['load_average'])) {
 			return;
+		}
 
-		if (empty(Config::$modSettings['loadavg_allunread']))
+		if (empty(Config::$modSettings['loadavg_allunread'])) {
 			return;
+		}
 
-		if (Utils::$context['load_average'] >= Config::$modSettings['loadavg_allunread'])
+		if (Utils::$context['load_average'] >= Config::$modSettings['loadavg_allunread']) {
 			ErrorHandler::fatalLang('loadavg_allunread_disabled', false);
+		}
 	}
 
 	/**
@@ -379,130 +383,133 @@ protected function checkLoadAverageAll()
 	protected function getBoards()
 	{
 		// Are we specifying any specific board?
-		if (isset($_REQUEST['children']) && (!empty(Board::$info->id) || !empty($_REQUEST['boards'])))
-		{
-			if (!empty($_REQUEST['boards']))
-			{
+		if (isset($_REQUEST['children']) && (!empty(Board::$info->id) || !empty($_REQUEST['boards']))) {
+			if (!empty($_REQUEST['boards'])) {
 				$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
 
-				foreach ($_REQUEST['boards'] as $b)
+				foreach ($_REQUEST['boards'] as $b) {
 					$this->boards[] = (int) $b;
+				}
 			}
 
-			if (!empty(Board::$info->id))
+			if (!empty(Board::$info->id)) {
 				$this->boards[] = (int) Board::$info->id;
+			}
 
 			// The easiest thing is to just get all the boards they can see, but since we've specified the top of tree we ignore some of them
-			$request = Db::$db->query('', '
-				SELECT b.id_board, b.id_parent
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board, b.id_parent
 				FROM {db_prefix}boards AS b
 				WHERE {query_wanna_see_board}
 					AND b.child_level > {int:no_child}
 					AND b.id_board NOT IN ({array_int:boards})
 				ORDER BY child_level ASC',
-				array(
+				[
 					'no_child' => 0,
 					'boards' => $this->boards,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (in_array($row['id_parent'], $this->boards))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (in_array($row['id_parent'], $this->boards)) {
 					$this->boards[] = $row['id_board'];
+				}
 			}
 			Db::$db->free_result($request);
 
-			if (empty($this->boards))
+			if (empty($this->boards)) {
 				ErrorHandler::fatalLang('error_no_boards_selected');
+			}
 
 			$this->query_this_board = 'id_board IN ({array_int:boards})';
 			$this->query_parameters['boards'] = $this->boards;
 			Utils::$context['querystring_board_limits'] = ';boards=' . implode(',', $this->boards) . ';start=%1$d';
-		}
-		elseif (!empty(Board::$info->id))
-		{
+		} elseif (!empty(Board::$info->id)) {
 			$this->query_this_board = 'id_board = {int:board}';
 			$this->query_parameters['board'] = Board::$info->id;
 			Utils::$context['querystring_board_limits'] = ';board=' . Board::$info->id . '.%1$d';
-		}
-		elseif (!empty($_REQUEST['boards']))
-		{
+		} elseif (!empty($_REQUEST['boards'])) {
 			$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
 
-			foreach ($_REQUEST['boards'] as $i => $b)
+			foreach ($_REQUEST['boards'] as $i => $b) {
 				$_REQUEST['boards'][$i] = (int) $b;
+			}
 
-			$request = Db::$db->query('', '
-				SELECT b.id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board
 				FROM {db_prefix}boards AS b
 				WHERE {query_see_board}
 					AND b.id_board IN ({array_int:board_list})',
-				array(
+				[
 					'board_list' => $_REQUEST['boards'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->boards[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($this->boards))
+			if (empty($this->boards)) {
 				ErrorHandler::fatalLang('error_no_boards_selected');
+			}
 
 			$this->query_this_board = 'id_board IN ({array_int:boards})';
 			$this->query_parameters['boards'] = $this->boards;
 			Utils::$context['querystring_board_limits'] = ';boards=' . implode(',', $this->boards) . ';start=%1$d';
-		}
-		elseif (!empty($_REQUEST['c']))
-		{
+		} elseif (!empty($_REQUEST['c'])) {
 			$_REQUEST['c'] = explode(',', $_REQUEST['c']);
 
-			foreach ($_REQUEST['c'] as $i => $c)
+			foreach ($_REQUEST['c'] as $i => $c) {
 				$_REQUEST['c'][$i] = (int) $c;
+			}
 
-			$request = Db::$db->query('', '
-				SELECT b.id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board
 				FROM {db_prefix}boards AS b
 				WHERE ' . User::$me->{$this->see_board} . '
 					AND b.id_cat IN ({array_int:id_cat})',
-				array(
+				[
 					'id_cat' => $_REQUEST['c'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->boards[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($this->boards))
+			if (empty($this->boards)) {
 				ErrorHandler::fatalLang('error_no_boards_selected');
+			}
 
 			$this->query_this_board = 'id_board IN ({array_int:boards})';
 			$this->query_parameters['boards'] = $this->boards;
 			Utils::$context['querystring_board_limits'] = ';c=' . implode(',', $_REQUEST['c']) . ';start=%1$d';
-		}
-		else
-		{
+		} else {
 			// Don't bother to show deleted posts!
-			$request = Db::$db->query('', '
-				SELECT b.id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board
 				FROM {db_prefix}boards AS b
 				WHERE ' . User::$me->{$this->see_board} . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 					AND b.id_board != {int:recycle_board}' : ''),
-				array(
+				[
 					'recycle_board' => (int) Config::$modSettings['recycle_board'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->boards[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($this->boards))
+			if (empty($this->boards)) {
 				ErrorHandler::fatalLang('error_no_boards_available', false);
+			}
 
 			$this->query_this_board = 'id_board IN ({array_int:boards})';
 			$this->query_parameters['boards'] = $this->boards;
@@ -516,16 +523,16 @@ protected function getBoards()
 	 */
 	protected function getCatName()
 	{
-		if (!empty($_REQUEST['c']) && is_array($_REQUEST['c']) && count($_REQUEST['c']) == 1)
-		{
-			$request = Db::$db->query('', '
-				SELECT name
+		if (!empty($_REQUEST['c']) && is_array($_REQUEST['c']) && count($_REQUEST['c']) == 1) {
+			$request = Db::$db->query(
+				'',
+				'SELECT name
 				FROM {db_prefix}categories
 				WHERE id_cat = {int:id_cat}
 				LIMIT 1',
-				array(
+				[
 					'id_cat' => (int) $_REQUEST['c'][0],
-				)
+				],
 			);
 			list($this->cat_name) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -538,14 +545,12 @@ protected function getCatName()
 	protected function setSortMethod()
 	{
 		// We only know these.
-		if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array_keys($this->sort_methods)))
-		{
+		if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array_keys($this->sort_methods))) {
 			$_REQUEST['sort'] = 'last_post';
 		}
 
 		// The default is the most logical: newest first.
-		if (!isset($_REQUEST['sort']) || !isset($this->sort_methods[$_REQUEST['sort']]))
-		{
+		if (!isset($_REQUEST['sort']) || !isset($this->sort_methods[$_REQUEST['sort']])) {
 			Utils::$context['sort_by'] = 'last_post';
 			$_REQUEST['sort'] = 't.id_last_msg';
 			$this->ascending = isset($_REQUEST['asc']);
@@ -553,8 +558,7 @@ protected function setSortMethod()
 			Utils::$context['querystring_sort_limits'] = $this->ascending ? ';asc' : '';
 		}
 		// But, for other methods the default sort is ascending.
-		else
-		{
+		else {
 			Utils::$context['sort_by'] = $_REQUEST['sort'];
 			$_REQUEST['sort'] = $this->sort_methods[$_REQUEST['sort']];
 			$this->ascending = !isset($_REQUEST['desc']);
@@ -566,8 +570,7 @@ protected function setSortMethod()
 
 		Lang::$txt['starter'] = Lang::$txt['started_by'];
 
-		foreach ($this->sort_methods as $key => $val)
-		{
+		foreach ($this->sort_methods as $key => $val) {
 			Utils::$context['topics_headers'][$key] = '<a href="' . $this->action_url . (Utils::$context['showing_all_topics'] ? ';all' : '') . Utils::$context['querystring_board_limits'] . ';sort=' . $key . (Utils::$context['sort_by'] == $key && Utils::$context['sort_direction'] == 'up' ? ';desc' : '') . '">' . Lang::$txt[$key] . (Utils::$context['sort_by'] == $key ? ' <span class="main_icons sort_' . Utils::$context['sort_direction'] . '"></span>' : '') . '</a>';
 		}
 	}
@@ -580,36 +583,32 @@ protected function setPaginationAndLinks()
 		$not_first_page = Utils::$context['start'] >= Utils::$context['topics_per_page'];
 		$not_last_page = Utils::$context['start'] + Utils::$context['topics_per_page'] < $this->num_topics;
 
-		$url_limits = array(
+		$url_limits = [
 			'first' => sprintf(Utils::$context['querystring_board_limits'], 0) . Utils::$context['querystring_sort_limits'],
 			'prev' => sprintf(Utils::$context['querystring_board_limits'], Utils::$context['start'] - Utils::$context['topics_per_page']) . Utils::$context['querystring_sort_limits'],
 			'next' => sprintf(Utils::$context['querystring_board_limits'], Utils::$context['start'] + Utils::$context['topics_per_page']) . Utils::$context['querystring_sort_limits'],
-			'last' => sprintf(Utils::$context['querystring_board_limits'], $this->num_topics - ($this->num_topics % Utils::$context['topics_per_page'])) . Utils::$context['querystring_sort_limits']
-		);
+			'last' => sprintf(Utils::$context['querystring_board_limits'], $this->num_topics - ($this->num_topics % Utils::$context['topics_per_page'])) . Utils::$context['querystring_sort_limits'],
+		];
 
-		if (isset($this->cat_name))
-		{
-			Utils::$context['linktree'][] = array(
+		if (isset($this->cat_name)) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '#c' . (int) $_REQUEST['c'][0],
 				'name' => $this->cat_name,
-			);
+			];
 		}
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => $this->action_url . $url_limits['first'],
 			'name' => $this->linktree_name,
-		);
+		];
 
-		if (Utils::$context['showing_all_topics'])
-		{
-			Utils::$context['linktree'][] = array(
+		if (Utils::$context['showing_all_topics']) {
+			Utils::$context['linktree'][] = [
 				'url' => $this->action_url . ';all' . $url_limits['first'],
 				'name' => Lang::$txt['unread_topics_all'],
-			);
-		}
-		else
-		{
-			Lang::$txt['unread_topics_visit_none'] = strtr(sprintf(Lang::$txt['unread_topics_visit_none'], Config::$scripturl), array('?action=unread;all' => '?action=unread;all' . $url_limits['first']));
+			];
+		} else {
+			Lang::$txt['unread_topics_visit_none'] = strtr(sprintf(Lang::$txt['unread_topics_visit_none'], Config::$scripturl), ['?action=unread;all' => '?action=unread;all' . $url_limits['first']]);
 		}
 
 		// Make sure the starting place makes sense and construct the page index.
@@ -617,18 +616,18 @@ protected function setPaginationAndLinks()
 
 		Utils::$context['current_page'] = floor(Utils::$context['start'] / Utils::$context['topics_per_page']);
 
-		Utils::$context['links'] = array(
+		Utils::$context['links'] = [
 			'first' => $not_first_page ? $this->action_url . (Utils::$context['showing_all_topics'] ? ';all' : '') . $url_limits['first'] : '',
 			'prev' => $not_first_page ? $this->action_url . (Utils::$context['showing_all_topics'] ? ';all' : '') . $url_limits['prev'] : '',
 			'next' => $not_last_page ? $this->action_url . (Utils::$context['showing_all_topics'] ? ';all' : '') . $url_limits['next'] : '',
 			'last' => $not_last_page ? $this->action_url . (Utils::$context['showing_all_topics'] ? ';all' : '') . $url_limits['last'] : '',
 			'up' => Config::$scripturl,
-		);
+		];
 
-		Utils::$context['page_info'] = array(
+		Utils::$context['page_info'] = [
 			'current_page' => Utils::$context['current_page'] + 1,
 			'num_pages' => floor(($this->num_topics - 1) / Utils::$context['topics_per_page']) + 1,
-		);
+		];
 	}
 
 	/**
@@ -637,21 +636,17 @@ protected function setPaginationAndLinks()
 	protected function setNoTopics()
 	{
 		// Is this an all topics query?
-		if (Utils::$context['showing_all_topics'])
-		{
+		if (Utils::$context['showing_all_topics']) {
 			// Since there are no unread topics, mark the boards as read!
 			Board::markBoardsRead(empty($this->boards) ? Board::$info->id : $this->boards);
 		}
 
-		Utils::$context['topics'] = array();
+		Utils::$context['topics'] = [];
 		Utils::$context['no_topic_listing'] = true;
 
-		if (Utils::$context['querystring_board_limits'] == ';start=%1$d')
-		{
+		if (Utils::$context['querystring_board_limits'] == ';start=%1$d') {
 			Utils::$context['querystring_board_limits'] = '';
-		}
-		else
-		{
+		} else {
 			Utils::$context['querystring_board_limits'] = sprintf(Utils::$context['querystring_board_limits'], Utils::$context['start']);
 		}
 	}
@@ -661,9 +656,8 @@ protected function setNoTopics()
 	 */
 	protected function finalizeSelects()
 	{
-		if (!empty(Theme::$current->settings['avatars_on_indexes']))
-		{
-			$this->selects = array_merge($this->selects, array(
+		if (!empty(Theme::$current->settings['avatars_on_indexes'])) {
+			$this->selects = array_merge($this->selects, [
 				'meml.avatar',
 				'meml.email_address',
 				'mems.avatar AS first_member_avatar',
@@ -674,7 +668,7 @@ protected function finalizeSelects()
 				'COALESCE(al.id_attach, 0) AS last_poster_id_attach',
 				'al.filename AS last_member_filename',
 				'al.attachment_type AS last_poster_attach_type',
-			));
+			]);
 		}
 	}
 
@@ -683,70 +677,66 @@ protected function finalizeSelects()
 	 */
 	protected function getEarliestMsg()
 	{
-		if (!Utils::$context['showing_all_topics'])
+		if (!Utils::$context['showing_all_topics']) {
 			return;
+		}
 
-		if (!empty(Board::$info->id))
-		{
-			$request = Db::$db->query('', '
-				SELECT MIN(id_msg)
+		if (!empty(Board::$info->id)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT MIN(id_msg)
 				FROM {db_prefix}log_mark_read
 				WHERE id_member = {int:current_member}
 					AND id_board = {int:current_board}',
-				array(
+				[
 					'current_board' => Board::$info->id,
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 			list($this->earliest_msg) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT MIN(lmr.id_msg)
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT MIN(lmr.id_msg)
 				FROM {db_prefix}boards AS b
 					LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = b.id_board AND lmr.id_member = {int:current_member})
 				WHERE {query_see_board}',
-				array(
+				[
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 			list($this->earliest_msg) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// This is needed in case of topics marked unread.
-		if (empty($this->earliest_msg))
-		{
+		if (empty($this->earliest_msg)) {
 			$this->earliest_msg = 0;
-		}
-		else
-		{
+		} else {
 			// Using caching, when possible, to ignore the below slow query.
-			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time())
-			{
+			if (isset($_SESSION['cached_log_time']) && $_SESSION['cached_log_time'][0] + 45 > time()) {
 				$earliest_msg2 = $_SESSION['cached_log_time'][1];
-			}
-			else
-			{
+			} else {
 				// This query is pretty slow, but it's needed to ensure nothing crucial is ignored.
-				$request = Db::$db->query('', '
-					SELECT MIN(id_msg)
+				$request = Db::$db->query(
+					'',
+					'SELECT MIN(id_msg)
 					FROM {db_prefix}log_topics
 					WHERE id_member = {int:current_member}',
-					array(
+					[
 						'current_member' => User::$me->id,
-					)
+					],
 				);
 				list($earliest_msg2) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
 				// In theory this could be zero, if the first ever post is unread, so fudge it ;)
-				if ($earliest_msg2 == 0)
+				if ($earliest_msg2 == 0) {
 					$earliest_msg2 = -1;
+				}
 
-				$_SESSION['cached_log_time'] = array(time(), $earliest_msg2);
+				$_SESSION['cached_log_time'] = [time(), $earliest_msg2];
 			}
 
 			$this->earliest_msg = min($earliest_msg2, $this->earliest_msg);
@@ -758,17 +748,13 @@ protected function getEarliestMsg()
 	 */
 	protected function setTopicRequest()
 	{
-		if (Config::$modSettings['totalMessages'] > 100000 && Utils::$context['showing_all_topics'])
-		{
+		if (Config::$modSettings['totalMessages'] > 100000 && Utils::$context['showing_all_topics']) {
 			$this->makeTempTable();
 		}
 
-		if ($this->have_temp_table)
-		{
+		if ($this->have_temp_table) {
 			$this->getTopicRequestWithTempTable();
-		}
-		else
-		{
+		} else {
 			$this->getTopicRequestWithoutTempTable();
 		}
 	}
@@ -778,15 +764,17 @@ protected function setTopicRequest()
 	 */
 	protected function makeTempTable()
 	{
-		Db::$db->query('', '
-			DROP TABLE IF EXISTS {db_prefix}log_topics_unread',
-			array(
-			)
+		Db::$db->query(
+			'',
+			'DROP TABLE IF EXISTS {db_prefix}log_topics_unread',
+			[
+			],
 		);
 
 		// Let's copy things out of the log_topics table, to reduce searching.
-		$this->have_temp_table = Db::$db->query('', '
-			CREATE TEMPORARY TABLE {db_prefix}log_topics_unread (
+		$this->have_temp_table = Db::$db->query(
+			'',
+			'CREATE TEMPORARY TABLE {db_prefix}log_topics_unread (
 				PRIMARY KEY (id_topic)
 			)
 			SELECT lt.id_topic, lt.id_msg, lt.unwatched
@@ -796,12 +784,12 @@ protected function makeTempTable()
 				AND t.' . $this->query_this_board . (empty($this->earliest_msg) ? '' : '
 				AND t.id_last_msg > {int:earliest_msg}') . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : ''),
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'earliest_msg' => !empty($this->earliest_msg) ? $this->earliest_msg : 0,
 				'is_approved' => 1,
 				'db_error_skip' => true,
-			))
+			]),
 		) !== false;
 	}
 
@@ -810,8 +798,9 @@ protected function makeTempTable()
 	 */
 	protected function getTopicRequestWithTempTable()
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*), MIN(t.id_last_msg)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*), MIN(t.id_last_msg)
 			FROM {db_prefix}topics AS t
 				LEFT JOIN {db_prefix}log_topics_unread AS lt ON (lt.id_topic = t.id_topic)
 				LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})
@@ -820,11 +809,11 @@ protected function getTopicRequestWithTempTable()
 				AND COALESCE(lt.id_msg, lmr.id_msg, 0) < t.id_last_msg' . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : '') . '
 				AND COALESCE(lt.unwatched, 0) != 1',
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'earliest_msg' => !empty($this->earliest_msg) ? $this->earliest_msg : 0,
 				'is_approved' => 1,
-			))
+			]),
 		);
 		list($num_topics, $min_message) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -832,14 +821,15 @@ protected function getTopicRequestWithTempTable()
 		$this->num_topics = $num_topics ?? 0;
 		$this->min_message = $min_message ?? 0;
 
-		if ($this->num_topics == 0)
-		{
+		if ($this->num_topics == 0) {
 			$this->setNoTopics();
+
 			return;
 		}
 
-		$this->topic_request = Db::$db->query('substring', '
-			SELECT ' . implode(', ', $this->selects) . '
+		$this->topic_request = Db::$db->query(
+			'substring',
+			'SELECT ' . implode(', ', $this->selects) . '
 			FROM {db_prefix}messages AS ms
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = ms.id_topic AND t.id_first_msg = ms.id_msg)
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
@@ -857,14 +847,14 @@ protected function getTopicRequestWithTempTable()
 				AND COALESCE(lt.unwatched, 0) != 1
 			ORDER BY {raw:sort}
 			LIMIT {int:offset}, {int:limit}',
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'min_message' => $this->min_message,
 				'is_approved' => 1,
 				'sort' => $_REQUEST['sort'] . ($this->ascending ? '' : ' DESC'),
 				'offset' => Utils::$context['start'],
 				'limit' => Utils::$context['topics_per_page'],
-			))
+			]),
 		);
 	}
 
@@ -873,8 +863,9 @@ protected function getTopicRequestWithTempTable()
 	 */
 	protected function getTopicRequestWithoutTempTable()
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*), MIN(t.id_last_msg)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*), MIN(t.id_last_msg)
 			FROM {db_prefix}topics AS t' . (!empty($this->have_temp_table) ? '
 				LEFT JOIN {db_prefix}log_topics_unread AS lt ON (lt.id_topic = t.id_topic)' : '
 				LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})') . '
@@ -885,12 +876,12 @@ protected function getTopicRequestWithoutTempTable()
 				AND COALESCE(lt.id_msg, lmr.id_msg, 0) < t.id_last_msg' . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : '') . '
 				AND COALESCE(lt.unwatched, 0) != 1',
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'earliest_msg' => !empty($this->earliest_msg) ? $this->earliest_msg : 0,
 				'id_msg_last_visit' => $_SESSION['id_msg_last_visit'],
 				'is_approved' => 1,
-			))
+			]),
 		);
 		list($num_topics, $min_message) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -898,14 +889,15 @@ protected function getTopicRequestWithoutTempTable()
 		$this->num_topics = $num_topics ?? 0;
 		$this->min_message = $min_message ?? 0;
 
-		if ($this->num_topics == 0)
-		{
+		if ($this->num_topics == 0) {
 			$this->setNoTopics();
+
 			return;
 		}
 
-		$this->topic_request = Db::$db->query('substring', '
-			SELECT ' . implode(', ', $this->selects) . '
+		$this->topic_request = Db::$db->query(
+			'substring',
+			'SELECT ' . implode(', ', $this->selects) . '
 			FROM {db_prefix}messages AS ms
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = ms.id_topic AND t.id_first_msg = ms.id_msg)
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
@@ -924,14 +916,14 @@ protected function getTopicRequestWithoutTempTable()
 				AND COALESCE(lt.unwatched, 0) != 1
 			ORDER BY {raw:order}
 			LIMIT {int:offset}, {int:limit}',
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'min_message' => $this->min_message,
 				'is_approved' => 1,
 				'order' => $_REQUEST['sort'] . ($this->ascending ? '' : ' DESC'),
 				'offset' => Utils::$context['start'],
 				'limit' => Utils::$context['topics_per_page'],
-			))
+			]),
 		);
 	}
 
@@ -940,12 +932,12 @@ protected function getTopicRequestWithoutTempTable()
 	 */
 	protected function getTopics()
 	{
-		$topic_ids = array();
+		$topic_ids = [];
 
-		while ($row = Db::$db->fetch_assoc($this->topic_request))
-		{
-			if ($row['id_poll'] > 0 && Config::$modSettings['pollMode'] == '0')
+		while ($row = Db::$db->fetch_assoc($this->topic_request)) {
+			if ($row['id_poll'] > 0 && Config::$modSettings['pollMode'] == '0') {
 				continue;
+			}
 
 			$topic_ids[] = $row['id_topic'];
 
@@ -955,12 +947,12 @@ protected function getTopics()
 			// ... except with a few tweaks.
 
 			// Show a link to the board.
-			Utils::$context['topics'][$row['id_topic']]['board'] = array(
+			Utils::$context['topics'][$row['id_topic']]['board'] = [
 				'id' => $row['id_board'],
 				'name' => $row['bname'],
 				'href' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['bname'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['bname'] . '</a>',
+			];
 
 			// Adjust the "new" link.
 			Utils::$context['topics'][$row['id_topic']]['new_href'] = Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['new_from'] . ';topicseen#new';
@@ -984,25 +976,26 @@ protected function getTopics()
 		}
 		Db::$db->free_result($this->topic_request);
 
-		if (!empty(Config::$modSettings['enableParticipation']) && !empty($topic_ids))
-		{
-			$result = Db::$db->query('', '
-				SELECT id_topic
+		if (!empty(Config::$modSettings['enableParticipation']) && !empty($topic_ids)) {
+			$result = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}messages
 				WHERE id_topic IN ({array_int:topic_list})
 					AND id_member = {int:current_member}
 				GROUP BY id_topic
 				LIMIT {int:limit}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'topic_list' => $topic_ids,
 					'limit' => count($topic_ids),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
-				if (empty(Utils::$context['topics'][$row['id_topic']]['is_posted_in']))
+
+			while ($row = Db::$db->fetch_assoc($result)) {
+				if (empty(Utils::$context['topics'][$row['id_topic']]['is_posted_in'])) {
 					Utils::$context['topics'][$row['id_topic']]['is_posted_in'] = true;
+				}
 			}
 			Db::$db->free_result($result);
 		}
@@ -1018,51 +1011,45 @@ protected function getTopics()
 	protected function buildButtons()
 	{
 		// Build the recent button array.
-		if ($this->is_topics)
-		{
-			Utils::$context['recent_buttons'] = array(
-				'markread' => array(
+		if ($this->is_topics) {
+			Utils::$context['recent_buttons'] = [
+				'markread' => [
 					'text' => !empty(Utils::$context['no_board_limits']) ? 'mark_as_read' : 'mark_read_short',
 					'image' => 'markread.png',
 					'custom' => 'data-confirm="' . Lang::$txt['are_sure_mark_read'] . '"',
 					'class' => 'you_sure',
 					'url' => Config::$scripturl . '?action=markasread;sa=' . (!empty(Utils::$context['no_board_limits']) ? 'all' : 'board' . Utils::$context['querystring_board_limits']) . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-				)
-			);
+				],
+			];
 
-			if (Utils::$context['showCheckboxes'])
-			{
-				Utils::$context['recent_buttons']['markselectread'] = array(
+			if (Utils::$context['showCheckboxes']) {
+				Utils::$context['recent_buttons']['markselectread'] = [
 					'text' => 'quick_mod_markread',
 					'image' => 'markselectedread.png',
 					'url' => 'javascript:document.quickModForm.submit();',
-				);
+				];
 			}
 
-			if (!empty(Utils::$context['topics']) && !Utils::$context['showing_all_topics'])
-			{
-				Utils::$context['recent_buttons']['readall'] = array('text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => Config::$scripturl . '?action=unread;all' . Utils::$context['querystring_board_limits'], 'active' => true);
+			if (!empty(Utils::$context['topics']) && !Utils::$context['showing_all_topics']) {
+				Utils::$context['recent_buttons']['readall'] = ['text' => 'unread_topics_all', 'image' => 'markreadall.png', 'url' => Config::$scripturl . '?action=unread;all' . Utils::$context['querystring_board_limits'], 'active' => true];
 			}
-		}
-		elseif (!$this->is_topics && isset(Utils::$context['topics_to_mark']))
-		{
-			Utils::$context['recent_buttons'] = array(
-				'markread' => array(
+		} elseif (!$this->is_topics && isset(Utils::$context['topics_to_mark'])) {
+			Utils::$context['recent_buttons'] = [
+				'markread' => [
 					'text' => 'mark_as_read',
 					'image' => 'markread.png',
 					'custom' => 'data-confirm="' . Lang::$txt['are_sure_mark_read'] . '"',
 					'class' => 'you_sure',
 					'url' => Config::$scripturl . '?action=markasread;sa=unreadreplies;topics=' . Utils::$context['topics_to_mark'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-				)
-			);
+				],
+			];
 
-			if (Utils::$context['showCheckboxes'])
-			{
-				Utils::$context['recent_buttons']['markselectread'] = array(
+			if (Utils::$context['showCheckboxes']) {
+				Utils::$context['recent_buttons']['markselectread'] = [
 					'text' => 'quick_mod_markread',
 					'image' => 'markselectedread.png',
 					'url' => 'javascript:document.quickModForm.submit();',
-				);
+				];
 			}
 		}
 
@@ -1072,7 +1059,8 @@ protected function buildButtons()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Unread::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Unread::exportStatic')) {
 	Unread::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/UnreadReplies.php b/Sources/Actions/UnreadReplies.php
index 939fefe2c8..17bca06ece 100644
--- a/Sources/Actions/UnreadReplies.php
+++ b/Sources/Actions/UnreadReplies.php
@@ -15,12 +15,12 @@
 
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Finds and retrieves information about replies to the user's posts.
@@ -75,8 +75,9 @@ class UnreadReplies extends Unread
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -113,14 +114,17 @@ protected function __construct()
 	 */
 	protected function checkLoadAverage()
 	{
-		if (empty(Utils::$context['load_average']))
+		if (empty(Utils::$context['load_average'])) {
 			return;
+		}
 
-		if (empty(Config::$modSettings['loadavg_unreadreplies']))
+		if (empty(Config::$modSettings['loadavg_unreadreplies'])) {
 			return;
+		}
 
-		if (Utils::$context['load_average'] >= Config::$modSettings['loadavg_unreadreplies'])
+		if (Utils::$context['load_average'] >= Config::$modSettings['loadavg_unreadreplies']) {
 			ErrorHandler::fatalLang('loadavg_unreadreplies_disabled', false);
+		}
 	}
 
 	/**
@@ -128,15 +132,13 @@ protected function checkLoadAverage()
 	 */
 	protected function setTopicRequest()
 	{
-		if (Config::$modSettings['totalMessages'] > 100000)
+		if (Config::$modSettings['totalMessages'] > 100000) {
 			$this->makeTempTable();
+		}
 
-		if ($this->have_temp_table)
-		{
+		if ($this->have_temp_table) {
 			$this->getTopicRequestWithTempTable();
-		}
-		else
-		{
+		} else {
 			$this->getTopicRequestWithoutTempTable();
 		}
 	}
@@ -146,69 +148,72 @@ protected function setTopicRequest()
 	 */
 	protected function makeTempTable()
 	{
-		Db::$db->query('', '
-			DROP TABLE IF EXISTS {db_prefix}topics_posted_in',
-			array(
-			)
+		Db::$db->query(
+			'',
+			'DROP TABLE IF EXISTS {db_prefix}topics_posted_in',
+			[
+			],
 		);
 
-		Db::$db->query('', '
-			DROP TABLE IF EXISTS {db_prefix}log_topics_posted_in',
-			array(
-			)
+		Db::$db->query(
+			'',
+			'DROP TABLE IF EXISTS {db_prefix}log_topics_posted_in',
+			[
+			],
 		);
 
-		$sortKey_joins = array(
+		$sortKey_joins = [
 			'ms.subject' => '
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)',
 			'COALESCE(mems.real_name, ms.poster_name)' => '
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)
 				LEFT JOIN {db_prefix}members AS mems ON (mems.id_member = ms.id_member)',
-		);
+		];
 
 		// The main benefit of this temporary table is not that it's faster; it's that it avoids locks later.
-		$this->have_temp_table = false !== Db::$db->query('', '
-			CREATE TEMPORARY TABLE {db_prefix}topics_posted_in (
+		$this->have_temp_table = false !== Db::$db->query(
+			'',
+			'CREATE TEMPORARY TABLE {db_prefix}topics_posted_in (
 				id_topic mediumint(8) unsigned NOT NULL default {string:string_zero},
 				id_board smallint(5) unsigned NOT NULL default {string:string_zero},
 				id_last_msg int(10) unsigned NOT NULL default {string:string_zero},
 				id_msg int(10) unsigned NOT NULL default {string:string_zero},
 				PRIMARY KEY (id_topic)
 			)
-			SELECT t.id_topic, t.id_board, t.id_last_msg, COALESCE(lmr.id_msg, 0) AS id_msg' . (!in_array($_REQUEST['sort'], array('t.id_last_msg', 't.id_topic')) ? ', ' . $_REQUEST['sort'] . ' AS sort_key' : '') . '
+			SELECT t.id_topic, t.id_board, t.id_last_msg, COALESCE(lmr.id_msg, 0) AS id_msg' . (!in_array($_REQUEST['sort'], ['t.id_last_msg', 't.id_topic']) ? ', ' . $_REQUEST['sort'] . ' AS sort_key' : '') . '
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				LEFT JOIN {db_prefix}log_topics_unread AS lt ON (lt.id_topic = t.id_topic)
-				LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})' . (isset($sortKey_joins[$_REQUEST['sort']]) ? $sortKey_joins[$_REQUEST['sort']] : '') . '
+				LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})' . ($sortKey_joins[$_REQUEST['sort']] ?? '') . '
 			WHERE m.id_member = {int:current_member}' . (!empty(Board::$info->id) ? '
 				AND t.id_board = {int:current_board}' : '') . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : '') . '
 				AND COALESCE(lt.unwatched, 0) != 1
 			GROUP BY m.id_topic',
-			array(
+			[
 				'current_board' => Board::$info->id,
 				'current_member' => User::$me->id,
 				'is_approved' => 1,
 				'string_zero' => '0',
 				'db_error_skip' => true,
-			)
+			],
 		);
 
 		// If that worked, create a sample of the log_topics table too.
-		if ($this->have_temp_table)
-		{
-			$this->have_temp_table = false !== Db::$db->query('', '
-				CREATE TEMPORARY TABLE {db_prefix}log_topics_posted_in (
+		if ($this->have_temp_table) {
+			$this->have_temp_table = false !== Db::$db->query(
+				'',
+				'CREATE TEMPORARY TABLE {db_prefix}log_topics_posted_in (
 					PRIMARY KEY (id_topic)
 				)
 				SELECT lt.id_topic, lt.id_msg
 				FROM {db_prefix}log_topics AS lt
 					INNER JOIN {db_prefix}topics_posted_in AS pi ON (pi.id_topic = lt.id_topic)
 				WHERE lt.id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'db_error_skip' => true,
-				)
+				],
 			);
 		}
 	}
@@ -218,54 +223,57 @@ protected function makeTempTable()
 	 */
 	protected function getTopicRequestWithTempTable()
 	{
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}topics_posted_in AS pi
 				LEFT JOIN {db_prefix}log_topics_posted_in AS lt ON (lt.id_topic = pi.id_topic)
 			WHERE pi.' . $this->query_this_board . '
 				AND COALESCE(lt.id_msg, pi.id_msg) < pi.id_last_msg',
-			array_merge($this->query_parameters, array(
-			))
+			array_merge($this->query_parameters, [
+			]),
 		);
 		list($this->num_topics) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if ($this->num_topics == 0)
-		{
+		if ($this->num_topics == 0) {
 			$this->setNoTopics();
+
 			return;
 		}
 
-		$topics = array();
-		$request = Db::$db->query('', '
-			SELECT t.id_topic
+		$topics = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_topic
 			FROM {db_prefix}topics_posted_in AS t
 				LEFT JOIN {db_prefix}log_topics_posted_in AS lt ON (lt.id_topic = t.id_topic)
 			WHERE t.' . $this->query_this_board . '
 				AND COALESCE(lt.id_msg, t.id_msg) < t.id_last_msg
 			ORDER BY {raw:order}
 			LIMIT {int:offset}, {int:limit}',
-			array_merge($this->query_parameters, array(
-				'order' => (in_array($_REQUEST['sort'], array('t.id_last_msg', 't.id_topic')) ? $_REQUEST['sort'] : 't.sort_key') . ($this->ascending ? '' : ' DESC'),
+			array_merge($this->query_parameters, [
+				'order' => (in_array($_REQUEST['sort'], ['t.id_last_msg', 't.id_topic']) ? $_REQUEST['sort'] : 't.sort_key') . ($this->ascending ? '' : ' DESC'),
 				'offset' => Utils::$context['start'],
 				'limit' => Utils::$context['topics_per_page'],
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$topics[] = $row['id_topic'];
 		}
 		Db::$db->free_result($request);
 
 		// Sanity... where have you gone?
-		if (empty($topics))
-		{
+		if (empty($topics)) {
 			$this->setNoTopics();
+
 			return;
 		}
 
-		$this->topic_request = Db::$db->query('substring', '
-			SELECT ' . implode(', ', $this->selects) . '
+		$this->topic_request = Db::$db->query(
+			'substring',
+			'SELECT ' . implode(', ', $this->selects) . '
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_topic = t.id_topic AND ms.id_msg = t.id_first_msg)
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
@@ -279,12 +287,12 @@ protected function getTopicRequestWithTempTable()
 			WHERE t.id_topic IN ({array_int:topic_list})
 			ORDER BY {raw:sort}' . ($this->ascending ? '' : ' DESC') . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'topic_list' => $topics,
 				'sort' => $_REQUEST['sort'],
 				'limit' => count($topics),
-			)
+			],
 		);
 	}
 
@@ -293,8 +301,9 @@ protected function getTopicRequestWithTempTable()
 	 */
 	protected function getTopicRequestWithoutTempTable()
 	{
-		$request = Db::$db->query('unread_fetch_topic_count', '
-			SELECT COUNT(DISTINCT t.id_topic), MIN(t.id_last_msg)
+		$request = Db::$db->query(
+			'unread_fetch_topic_count',
+			'SELECT COUNT(DISTINCT t.id_topic), MIN(t.id_last_msg)
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic)
 				LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})
@@ -304,10 +313,10 @@ protected function getTopicRequestWithoutTempTable()
 				AND COALESCE(lt.id_msg, lmr.id_msg, 0) < t.id_last_msg' . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : '') . '
 				AND COALESCE(lt.unwatched, 0) != 1',
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'is_approved' => 1,
-			))
+			]),
 		);
 		list($num_topics, $min_message) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -315,16 +324,17 @@ protected function getTopicRequestWithoutTempTable()
 		$this->num_topics = $num_topics ?? 0;
 		$this->min_message = $min_message ?? 0;
 
-		if ($this->num_topics == 0)
-		{
+		if ($this->num_topics == 0) {
 			$this->setNoTopics();
+
 			return;
 		}
 
-		$topics = array();
+		$topics = [];
 
-		$request = Db::$db->query('', '
-			SELECT DISTINCT t.id_topic,' . $_REQUEST['sort'] . '
+		$request = Db::$db->query(
+			'',
+			'SELECT DISTINCT t.id_topic,' . $_REQUEST['sort'] . '
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_topic = t.id_topic AND m.id_member = {int:current_member})' . (strpos($_REQUEST['sort'], 'ms.') === false ? '' : '
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)') . (strpos($_REQUEST['sort'], 'mems.') === false ? '' : '
@@ -338,7 +348,7 @@ protected function getTopicRequestWithoutTempTable()
 				AND COALESCE(lt.unwatched, 0) != 1
 			ORDER BY {raw:order}
 			LIMIT {int:offset}, {int:limit}',
-			array_merge($this->query_parameters, array(
+			array_merge($this->query_parameters, [
 				'current_member' => User::$me->id,
 				'min_message' => (int) $this->min_message,
 				'is_approved' => 1,
@@ -346,23 +356,24 @@ protected function getTopicRequestWithoutTempTable()
 				'offset' => Utils::$context['start'],
 				'limit' => Utils::$context['topics_per_page'],
 				'sort' => $_REQUEST['sort'],
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$topics[] = $row['id_topic'];
 		}
 		Db::$db->free_result($request);
 
 		// Sanity... where have you gone?
-		if (empty($topics))
-		{
+		if (empty($topics)) {
 			$this->setNoTopics();
+
 			return;
 		}
 
-		$this->topic_request = Db::$db->query('substring', '
-			SELECT ' . implode(', ', $this->selects) . '
+		$this->topic_request = Db::$db->query(
+			'substring',
+			'SELECT ' . implode(', ', $this->selects) . '
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ms ON (ms.id_topic = t.id_topic AND ms.id_msg = t.id_first_msg)
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
@@ -376,15 +387,14 @@ protected function getTopicRequestWithoutTempTable()
 			WHERE t.id_topic IN ({array_int:topic_list})
 			ORDER BY {raw:sort}' . ($this->ascending ? '' : ' DESC') . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'topic_list' => $topics,
 				'sort' => $_REQUEST['sort'],
 				'limit' => count($topics),
-			)
+			],
 		);
 	}
-
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/VerificationCode.php b/Sources/Actions/VerificationCode.php
index c8e5b8900f..a99773a91d 100644
--- a/Sources/Actions/VerificationCode.php
+++ b/Sources/Actions/VerificationCode.php
@@ -14,13 +14,12 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
+use SMF\Cache\CacheApi;
 use SMF\Config;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
 
 /**
  * Shows the verification code or let it be heard.
@@ -36,12 +35,11 @@ class VerificationCode implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'VerificationCode',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -83,52 +81,48 @@ class VerificationCode implements ActionInterface
 	public function execute(): void
 	{
 		// Somehow no code was generated or the session was lost.
-		if (empty($this->code))
-		{
+		if (empty($this->code)) {
 			header('content-type: image/gif');
+
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
+
 		// Show a window that will play the verification code.
-		elseif (isset($_REQUEST['sound']))
-		{
+		if (isset($_REQUEST['sound'])) {
 			Lang::load('Login');
 			Theme::loadTemplate('Register');
 
 			Utils::$context['verification_sound_href'] = Config::$scripturl . '?action=verificationcode;rand=' . Utils::randomBytes(16) . ($this->verification_id ? ';vid=' . $this->verification_id : '') . ';format=.wav';
 			Utils::$context['sub_template'] = 'verification_sound';
-			Utils::$context['template_layers'] = array();
+			Utils::$context['template_layers'] = [];
 
 			Utils::obExit();
 		}
 		// If we have GD, try the nice code.
-		elseif (empty($_REQUEST['format']))
-		{
-			if (extension_loaded('gd') && !$this->showCodeImage($this->code))
-			{
+		elseif (empty($_REQUEST['format'])) {
+			if (extension_loaded('gd') && !$this->showCodeImage($this->code)) {
 				Utils::sendHttpStatus(400);
 			}
 			// Otherwise just show a pre-defined letter.
-			elseif (isset($_REQUEST['letter']))
-			{
+			elseif (isset($_REQUEST['letter'])) {
 				$_REQUEST['letter'] = (int) $_REQUEST['letter'];
 
-				if ($_REQUEST['letter'] > 0 && $_REQUEST['letter'] <= strlen($this->code) && !$this->showLetterImage(strtolower($this->code[$_REQUEST['letter'] - 1])))
-				{
+				if ($_REQUEST['letter'] > 0 && $_REQUEST['letter'] <= strlen($this->code) && !$this->showLetterImage(strtolower($this->code[$_REQUEST['letter'] - 1]))) {
 					header('content-type: image/gif');
+
 					die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 				}
 			}
 			// You must be up to no good.
-			else
-			{
+			else {
 				header('content-type: image/gif');
+
 				die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 			}
-		}
-		elseif ($_REQUEST['format'] === '.wav')
-		{
-			if (!$this->createWaveFile($this->code))
+		} elseif ($_REQUEST['format'] === '.wav') {
+			if (!$this->createWaveFile($this->code)) {
 				Utils::sendHttpStatus(400);
+			}
 		}
 
 		// We all die one day...
@@ -146,8 +140,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -169,10 +164,9 @@ public static function call(): void
 	 */
 	protected function __construct()
 	{
-		$this->verification_id = isset($_GET['vid']) ? $_GET['vid'] : '';
-
-		$this->code = $this->verification_id && isset($_SESSION[$this->verification_id . '_vv']) ? $_SESSION[$this->verification_id . '_vv']['code'] : (isset($_SESSION['visual_verification_code']) ? $_SESSION['visual_verification_code'] : '');
+		$this->verification_id = $_GET['vid'] ?? '';
 
+		$this->code = $this->verification_id && isset($_SESSION[$this->verification_id . '_vv']) ? $_SESSION[$this->verification_id . '_vv']['code'] : ($_SESSION['visual_verification_code'] ?? '');
 	}
 
 	/**
@@ -187,8 +181,9 @@ protected function __construct()
 	 */
 	protected function showCodeImage($code): bool
 	{
-		if (!extension_loaded('gd'))
+		if (!extension_loaded('gd')) {
 			return false;
+		}
 
 		// Note: The higher the value of visual_verification_type the harder the verification is - from 0 as disabled through to 4 as "Very hard".
 
@@ -196,8 +191,9 @@ protected function showCodeImage($code): bool
 		$image_type = Config::$modSettings['visual_verification_type'];
 
 		// Special case to allow the admin center to show samples.
-		if (User::$me->is_admin && isset($_GET['type']))
+		if (User::$me->is_admin && isset($_GET['type'])) {
 			$image_type = (int) $_GET['type'];
+		}
 
 		// Some quick references for what we do.
 		// Do we show no, low or high noise?
@@ -243,87 +239,75 @@ protected function showCodeImage($code): bool
 		$character_spacing = 1;
 
 		// What color is the background - generally white unless we're on "hard".
-		if ($simple_bg_color)
-		{
-			$background_color = array(255, 255, 255);
-		}
-		else
-		{
-			$background_color = isset(Theme::$current->settings['verification_background']) ? Theme::$current->settings['verification_background'] : array(236, 237, 243);
+		if ($simple_bg_color) {
+			$background_color = [255, 255, 255];
+		} else {
+			$background_color = Theme::$current->settings['verification_background'] ?? [236, 237, 243];
 		}
 
 		// The color of the characters shown (red, green, blue).
-		if ($simple_fg_color)
-		{
-			$foreground_color = array(0, 0, 0);
-		}
-		else
-		{
-			$foreground_color = array(64, 101, 136);
+		if ($simple_fg_color) {
+			$foreground_color = [0, 0, 0];
+		} else {
+			$foreground_color = [64, 101, 136];
 
 			// Has the theme author requested a custom color?
-			if (isset(Theme::$current->settings['verification_foreground']))
+			if (isset(Theme::$current->settings['verification_foreground'])) {
 				$foreground_color = Theme::$current->settings['verification_foreground'];
+			}
 		}
 
-		if (!is_dir(Theme::$current->settings['default_theme_dir'] . '/fonts'))
+		if (!is_dir(Theme::$current->settings['default_theme_dir'] . '/fonts')) {
 			return false;
+		}
 
 		// Get a list of the available fonts.
-		$font_list = array();
-		$ttfont_list = array();
+		$font_list = [];
+		$ttfont_list = [];
 		$endian = unpack('v', pack('S', 0x00FF)) === 0x00FF;
 
 		$font_dir = dir(Theme::$current->settings['default_theme_dir'] . '/fonts');
 
-		while ($entry = $font_dir->read())
-		{
-			if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1)
-			{
-				if ($endian ^ (strpos($entry, '_end.gdf') === false))
+		while ($entry = $font_dir->read()) {
+			if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1) {
+				if ($endian ^ (strpos($entry, '_end.gdf') === false)) {
 					$font_list[] = $entry;
-			}
-			elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1)
-			{
+				}
+			} elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1) {
 				$ttfont_list[] = $entry;
 			}
 		}
 
-		if (empty($font_list))
+		if (empty($font_list)) {
 			return false;
+		}
 
 		// For non-hard things don't even change fonts.
-		if (!$vary_fonts)
-		{
-			$font_list = array($font_list[0]);
+		if (!$vary_fonts) {
+			$font_list = [$font_list[0]];
 
-			if (in_array('AnonymousPro.ttf', $ttfont_list))
-			{
-				$ttfont_list = array('AnonymousPro.ttf');
-			}
-			else
-			{
-				$ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]);
+			if (in_array('AnonymousPro.ttf', $ttfont_list)) {
+				$ttfont_list = ['AnonymousPro.ttf'];
+			} else {
+				$ttfont_list = empty($ttfont_list) ? [] : [$ttfont_list[0]];
 			}
 		}
 
 		// Create a list of characters to be shown.
-		$characters = array();
-		$loaded_fonts = array();
+		$characters = [];
+		$loaded_fonts = [];
 
-		for ($i = 0; $i < strlen($code); $i++)
-		{
-			$characters[$i] = array(
+		for ($i = 0; $i < strlen($code); $i++) {
+			$characters[$i] = [
 				'id' => $code[$i],
 				'font' => array_rand($font_list),
-			);
+			];
 
 			$loaded_fonts[$characters[$i]['font']] = null;
 		}
 
 		// Load all fonts and determine the maximum font height.
-		foreach ($loaded_fonts as $font_index => $dummy)
-		{
+		foreach ($loaded_fonts as $font_index => $dummy) {
 			$loaded_fonts[$font_index] = imageloadfont(Theme::$current->settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]);
 		}
 
@@ -333,8 +317,7 @@ protected function showCodeImage($code): bool
 		$total_width = $character_spacing * strlen($code) + $extra;
 		$max_height = 0;
 
-		foreach ($characters as $char_index => $character)
-		{
+		foreach ($characters as $char_index => $character) {
 			$characters[$char_index]['width'] = imagefontwidth($loaded_fonts[$character['font']]);
 			$characters[$char_index]['height'] = imagefontheight($loaded_fonts[$character['font']]);
 
@@ -350,7 +333,7 @@ protected function showCodeImage($code): bool
 			$code_image,
 			$background_color[0],
 			$background_color[1],
-			$background_color[2]
+			$background_color[2],
 		);
 
 		imagefilledrectangle(
@@ -359,12 +342,11 @@ protected function showCodeImage($code): bool
 			0,
 			$total_width - 1,
 			$max_height - 1,
-			$bg_color
+			$bg_color,
 		);
 
 		// Randomize the foreground color a little.
-		for ($i = 0; $i < 3; $i++)
-		{
+		for ($i = 0; $i < 3; $i++) {
 			$foreground_color[$i] = Utils::randomInt(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255));
 		}
 
@@ -372,18 +354,14 @@ protected function showCodeImage($code): bool
 			$code_image,
 			$foreground_color[0],
 			$foreground_color[1],
-			$foreground_color[2]
+			$foreground_color[2],
 		);
 
 		// Color for the dots.
-		for ($i = 0; $i < 3; $i++)
-		{
-			if ($background_color[$i] < $foreground_color[$i])
-			{
+		for ($i = 0; $i < 3; $i++) {
+			if ($background_color[$i] < $foreground_color[$i]) {
 				$dotbgcolor[$i] = Utils::randomInt(0, max($foreground_color[$i] - 20, 0));
-			}
-			else
-			{
+			} else {
 				$dotbgcolor[$i] = Utils::randomInt(min($foreground_color[$i] + 20, 255), 255);
 			}
 		}
@@ -392,14 +370,12 @@ protected function showCodeImage($code): bool
 			$code_image,
 			$dotbgcolor[0],
 			$dotbgcolor[1],
-			$dotbgcolor[2]
+			$dotbgcolor[2],
 		);
 
 		// Some squares/rectangles for new extreme level
-		if ($noise_type == 'extreme')
-		{
-			for ($i = 0; $i < Utils::randomInt(1, 5); $i++)
-			{
+		if ($noise_type == 'extreme') {
+			for ($i = 0; $i < Utils::randomInt(1, 5); $i++) {
 				$x1 = Utils::randomInt(0, $total_width / 4);
 				$x2 = $x1 + round(rand($total_width / 4, $total_width));
 				$y1 = Utils::randomInt(0, $max_height);
@@ -411,74 +387,65 @@ protected function showCodeImage($code): bool
 					$y1,
 					$x2,
 					$y2,
-					Utils::randomInt(0, 1) ? $fg_color : $randomness_color
+					Utils::randomInt(0, 1) ? $fg_color : $randomness_color,
 				);
 			}
 		}
 
 		// Fill in the characters.
-		if (!$disable_chars)
-		{
+		if (!$disable_chars) {
 			$cur_x = 0;
 
-			foreach ($characters as $char_index => $character)
-			{
+			foreach ($characters as $char_index => $character) {
 				// Can we use true type fonts?
 				$can_do_ttf = function_exists('imagettftext');
 
 				// How much rotation will we give?
-				if ($rotation_type == 'none')
-				{
+				if ($rotation_type == 'none') {
 					$angle = 0;
-				}
-				else
-				{
+				} else {
 					$angle = Utils::randomInt(-100, 100) / ($rotation_type == 'high' ? 6 : 10);
 				}
 
 				// What color shall we do it?
-				if ($font_color_type == 'cyclic')
-				{
+				if ($font_color_type == 'cyclic') {
 					// Here we'll pick from a set of acceptance types.
-					$colors = array(
-						array(10, 120, 95),
-						array(46, 81, 29),
-						array(4, 22, 154),
-						array(131, 9, 130),
-						array(0, 0, 0),
-						array(143, 39, 31),
-					);
-
-					if (!isset($last_index))
+					$colors = [
+						[10, 120, 95],
+						[46, 81, 29],
+						[4, 22, 154],
+						[131, 9, 130],
+						[0, 0, 0],
+						[143, 39, 31],
+					];
+
+					if (!isset($last_index)) {
 						$last_index = -1;
+					}
 
 					$new_index = $last_index;
 
-					while ($last_index == $new_index)
+					while ($last_index == $new_index) {
 						$new_index = Utils::randomInt(0, count($colors) - 1);
+					}
 
 					$char_fg_color = $colors[$new_index];
 					$last_index = $new_index;
-				}
-				elseif ($font_color_type == 'random')
-				{
-					$char_fg_color = array(
+				} elseif ($font_color_type == 'random') {
+					$char_fg_color = [
 						Utils::randomInt(max($foreground_color[0] - 2, 0), $foreground_color[0]),
 						Utils::randomInt(max($foreground_color[1] - 2, 0), $foreground_color[1]),
 						Utils::randomInt(max($foreground_color[2] - 2, 0), $foreground_color[2]),
-					);
-				}
-				else
-				{
-					$char_fg_color = array(
+					];
+				} else {
+					$char_fg_color = [
 						$foreground_color[0],
 						$foreground_color[1],
 						$foreground_color[2],
-					);
+					];
 				}
 
-				if (!empty($can_do_ttf))
-				{
+				if (!empty($can_do_ttf)) {
 					$font_size = $font_size_random ? Utils::randomInt(17, 19) : 18;
 
 					// Work out the sizes - also fix the character width cause TTF not quite so wide!
@@ -486,31 +453,27 @@ protected function showCodeImage($code): bool
 					$font_y = $max_height - ($font_vert_pos == 'vrandom' ? Utils::randomInt(2, 8) : ($font_vert_pos == 'random' ? Utils::randomInt(3, 5) : 5));
 
 					// What font face?
-					if (!empty($ttfont_list))
-					{
+					if (!empty($ttfont_list)) {
 						$fontface = Theme::$current->settings['default_theme_dir'] . '/fonts/' . $ttfont_list[Utils::randomInt(0, count($ttfont_list) - 1)];
 					}
 
 					// What color are we to do it in?
 					$is_reverse = $show_reverse_chars ? Utils::randomInt(0, 1) : false;
 
-					if (function_exists('imagecolorallocatealpha') && $font_transparent)
-					{
+					if (function_exists('imagecolorallocatealpha') && $font_transparent) {
 						$char_color = imagecolorallocatealpha(
 							$code_image,
 							$char_fg_color[0],
 							$char_fg_color[1],
 							$char_fg_color[2],
-							50
+							50,
 						);
-					}
-					else
-					{
+					} else {
 						$char_color = imagecolorallocate(
 							$code_image,
 							$char_fg_color[0],
 							$char_fg_color[1],
-							$char_fg_color[2]
+							$char_fg_color[2],
 						);
 					}
 
@@ -522,15 +485,12 @@ protected function showCodeImage($code): bool
 						$font_y,
 						$char_color,
 						$fontface,
-						$character['id']
+						$character['id'],
 					);
 
-					if (empty($fontcord))
-					{
+					if (empty($fontcord)) {
 						$can_do_ttf = false;
-					}
-					elseif ($is_reverse)
-					{
+					} elseif ($is_reverse) {
 						imagefilledpolygon($code_image, $fontcord, 4, $fg_color);
 
 						// Put the character back!
@@ -542,29 +502,28 @@ protected function showCodeImage($code): bool
 							$font_y,
 							$randomness_color,
 							$fontface,
-							$character['id']
+							$character['id'],
 						);
 					}
 
-					if ($can_do_ttf)
+					if ($can_do_ttf) {
 						$cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3);
+					}
 				}
 
-				if (!$can_do_ttf)
-				{
+				if (!$can_do_ttf) {
 					// Rotating the characters a little...
-					if (function_exists('imagerotate'))
-					{
+					if (function_exists('imagerotate')) {
 						$char_image = imagecreatetruecolor(
 							$character['width'],
-							$character['height']
+							$character['height'],
 						);
 
 						$char_bgcolor = imagecolorallocate(
 							$char_image,
 							$background_color[0],
 							$background_color[1],
-							$background_color[2]
+							$background_color[2],
 						);
 
 						imagefilledrectangle(
@@ -573,7 +532,7 @@ protected function showCodeImage($code): bool
 							0,
 							$character['width'] - 1,
 							$character['height'] - 1,
-							$char_bgcolor
+							$char_bgcolor,
 						);
 
 						imagechar(
@@ -586,14 +545,14 @@ protected function showCodeImage($code): bool
 								$char_image,
 								$char_fg_color[0],
 								$char_fg_color[1],
-								$char_fg_color[2]
-							)
+								$char_fg_color[2],
+							),
 						);
 
 						$rotated_char = imagerotate(
 							$char_image,
 							Utils::randomInt(-100, 100) / 10,
-							$char_bgcolor
+							$char_bgcolor,
 						);
 
 						imagecopy(
@@ -604,13 +563,12 @@ protected function showCodeImage($code): bool
 							0,
 							0,
 							$character['width'],
-							$character['height']
+							$character['height'],
 						);
 					}
 
 					// Sorry, no rotation available.
-					else
-					{
+					else {
 						imagechar(
 							$code_image,
 							$loaded_fonts[$character['font']],
@@ -621,8 +579,8 @@ protected function showCodeImage($code): bool
 								$code_image,
 								$char_fg_color[0],
 								$char_fg_color[1],
-								$char_fg_color[2]
-							)
+								$char_fg_color[2],
+							),
 						);
 					}
 
@@ -631,46 +589,39 @@ protected function showCodeImage($code): bool
 			}
 		}
 		// If disabled just show a cross.
-		else
-		{
+		else {
 			imageline($code_image, 0, 0, $total_width, $max_height, $fg_color);
 			imageline($code_image, 0, $max_height, $total_width, 0, $fg_color);
 		}
 
 		// Make the background color transparent on the hard image.
-		if (!$simple_bg_color)
+		if (!$simple_bg_color) {
 			imagecolortransparent($code_image, $bg_color);
+		}
 
-		if ($has_border)
+		if ($has_border) {
 			imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color);
+		}
 
 		// Add some noise to the background?
-		if ($noise_type != 'none')
-		{
-			for ($i = Utils::randomInt(0, 2); $i < $max_height; $i += Utils::randomInt(1, 2))
-			{
-				for ($j = Utils::randomInt(0, 10); $j < $total_width; $j += Utils::randomInt(1, 10))
-				{
+		if ($noise_type != 'none') {
+			for ($i = Utils::randomInt(0, 2); $i < $max_height; $i += Utils::randomInt(1, 2)) {
+				for ($j = Utils::randomInt(0, 10); $j < $total_width; $j += Utils::randomInt(1, 10)) {
 					imagesetpixel($code_image, $j, $i, Utils::randomInt(0, 1) ? $fg_color : $randomness_color);
 				}
 			}
 
 			// Put in some lines too?
-			if ($noise_type != 'extreme')
-			{
+			if ($noise_type != 'extreme') {
 				$num_lines = $noise_type == 'high' ? Utils::randomInt(3, 7) : Utils::randomInt(2, 5);
 
-				for ($i = 0; $i < $num_lines; $i++)
-				{
-					if (Utils::randomInt(0, 1))
-					{
+				for ($i = 0; $i < $num_lines; $i++) {
+					if (Utils::randomInt(0, 1)) {
 						$x1 = Utils::randomInt(0, $total_width);
 						$x2 = Utils::randomInt(0, $total_width);
 						$y1 = 0;
 						$y2 = $max_height;
-					}
-					else
-					{
+					} else {
 						$y1 = Utils::randomInt(0, $max_height);
 						$y2 = Utils::randomInt(0, $max_height);
 						$x1 = 0;
@@ -685,17 +636,14 @@ protected function showCodeImage($code): bool
 						$y1,
 						$x2,
 						$y2,
-						Utils::randomInt(0, 1) ? $fg_color : $randomness_color
+						Utils::randomInt(0, 1) ? $fg_color : $randomness_color,
 					);
 				}
-			}
-			else
-			{
+			} else {
 				// Put in some ellipse
 				$num_ellipse = $noise_type == 'extreme' ? Utils::randomInt(6, 12) : Utils::randomInt(2, 6);
 
-				for ($i = 0; $i < $num_ellipse; $i++)
-				{
+				for ($i = 0; $i < $num_ellipse; $i++) {
 					$x1 = round(rand(($total_width / 4) * -1, $total_width + ($total_width / 4)));
 					$x2 = round(rand($total_width / 2, 2 * $total_width));
 					$y1 = round(rand(($max_height / 4) * -1, $max_height + ($max_height / 4)));
@@ -707,20 +655,17 @@ protected function showCodeImage($code): bool
 						$y1,
 						$x2,
 						$y2,
-						Utils::randomInt(0, 1) ? $fg_color : $randomness_color
+						Utils::randomInt(0, 1) ? $fg_color : $randomness_color,
 					);
 				}
 			}
 		}
 
 		// Show the image.
-		if (function_exists('imagegif'))
-		{
+		if (function_exists('imagegif')) {
 			header('content-type: image/gif');
 			imagegif($code_image);
-		}
-		else
-		{
+		} else {
 			header('content-type: image/png');
 			imagepng($code_image);
 		}
@@ -740,41 +685,40 @@ protected function showCodeImage($code): bool
 	 */
 	protected function showLetterImage($letter): bool
 	{
-		if (!is_dir(Theme::$current->settings['default_theme_dir'] . '/fonts'))
+		if (!is_dir(Theme::$current->settings['default_theme_dir'] . '/fonts')) {
 			return false;
+		}
 
 		// Get a list of the available font directories.
 		$font_dir = dir(Theme::$current->settings['default_theme_dir'] . '/fonts');
-		$font_list = array();
+		$font_list = [];
 
-		while ($entry = $font_dir->read())
-		{
+		while ($entry = $font_dir->read()) {
 			if (
 				$entry[0] !== '.'
 				&& is_dir(Theme::$current->settings['default_theme_dir'] . '/fonts/' . $entry)
 				&& file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf')
-			)
-			{
+			) {
 				$font_list[] = $entry;
 			}
 		}
 
-		if (empty($font_list))
+		if (empty($font_list)) {
 			return false;
+		}
 
 		// Pick a random font.
 		$random_font = $font_list[array_rand($font_list)];
 
 		// Check if the given letter exists.
-		if (!file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . strtoupper($letter) . '.png'))
-		{
+		if (!file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . strtoupper($letter) . '.png')) {
 			return false;
 		}
 
 		// Include it!
 		header('content-type: image/png');
 
-		include(Theme::$current->settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . strtoupper($letter) . '.png');
+		include Theme::$current->settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . strtoupper($letter) . '.png';
 
 		// Nothing more to come.
 		die();
@@ -786,14 +730,14 @@ protected function showLetterImage($letter): bool
 	 * Used by VerificationCode() (Register.php).
 	 *
 	 * @param string $word
-	 * @return boolean false on failure
+	 * @return bool false on failure
 	 */
 	protected function createWaveFile($word)
 	{
 		// Allow max 2 requests per 20 seconds.
-		if (($ip = CacheApi::get('wave_file/' . User::$me->ip, 20)) > 2 || ($ip2 = CacheApi::get('wave_file/' . User::$me->ip2, 20)) > 2)
-		{
+		if (($ip = CacheApi::get('wave_file/' . User::$me->ip, 20)) > 2 || ($ip2 = CacheApi::get('wave_file/' . User::$me->ip2, 20)) > 2) {
 			Utils::sendHttpStatus(400);
+
 			die();
 		}
 
@@ -805,18 +749,15 @@ protected function createWaveFile($word)
 		mt_srand(end($tmp));
 
 		// Try to see if there's a sound font in the user's language.
-		if (file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/sound/a.' . User::$me->language . '.wav'))
-		{
+		if (file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/sound/a.' . User::$me->language . '.wav')) {
 			$sound_language = User::$me->language;
 		}
 		// English should be there.
-		elseif (file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/sound/a.english.wav'))
-		{
+		elseif (file_exists(Theme::$current->settings['default_theme_dir'] . '/fonts/sound/a.english.wav')) {
 			$sound_language = 'english';
 		}
 		// Guess not...
-		else
-		{
+		else {
 			return false;
 		}
 
@@ -827,30 +768,27 @@ protected function createWaveFile($word)
 
 		// Loop through all letters of the word $word.
 		$sound_word = '';
-		for ($i = 0; $i < count($chars); $i++)
-		{
+
+		for ($i = 0; $i < count($chars); $i++) {
 			$sound_letter = implode('', file(Theme::$current->settings['default_theme_dir'] . '/fonts/sound/' . $chars[$i] . '.' . $sound_language . '.wav'));
 
-			if (strpos($sound_letter, 'data') === false)
+			if (strpos($sound_letter, 'data') === false) {
 				return false;
+			}
 
 			$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 
-			switch ($chars[$i] === 's' ? 0 : mt_rand(0, 2))
-			{
-				case 0 :
-					for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
-					{
-						for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						{
+			switch ($chars[$i] === 's' ? 0 : mt_rand(0, 2)) {
+				case 0:
+					for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) {
+						for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++) {
 							$sound_word .= $chars[$i] === 's' ? $sound_letter[$j] : chr(mt_rand(max(ord($sound_letter[$j]) - 1, 0x00), min(ord($sound_letter[$j]) + 1, 0xFF)));
 						}
 					}
 					break;
 
 				case 1:
-					for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
-					{
+					for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2) {
 						$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j + 1] : $sound_letter[$j]) . (mt_rand(0, 3) === 0 ? $sound_letter[$j] : $sound_letter[$j + 1]) . $sound_letter[$j + 1] . (mt_rand(0, 3) == 0 ? $sound_letter[$j + 1] : '');
 					}
 					$sound_word .= str_repeat($sound_letter[$n], 2);
@@ -858,13 +796,13 @@ protected function createWaveFile($word)
 
 				case 2:
 					$shift = 0;
-					for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
-					{
-						if (mt_rand(0, 10) === 0)
+
+					for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) {
+						if (mt_rand(0, 10) === 0) {
 							$shift += mt_rand(-3, 3);
+						}
 
-						for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						{
+						for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++) {
 							$sound_word .= chr(min(max(ord($sound_letter[$j]) + $shift, 0x00), 0xFF));
 						}
 					}
@@ -891,22 +829,19 @@ protected function createWaveFile($word)
 		header('content-type: audio/x-wav');
 		header('expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 
-		if (isset($_SERVER['HTTP_RANGE']))
-		{
-			list($a, $range) = explode("=", $_SERVER['HTTP_RANGE'], 2);
-			list($range) = explode(",", $range, 2);
-			list($range, $range_end) = explode("-", $range);
+		if (isset($_SERVER['HTTP_RANGE'])) {
+			list($a, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2);
+			list($range) = explode(',', $range, 2);
+			list($range, $range_end) = explode('-', $range);
 			$range = intval($range);
 			$range_end = !$range_end ? $content_length - 1 : intval($range_end);
 			$new_length = $range_end - $range + 1;
 
 			Utils::sendHttpStatus(206);
-			header("content-length: $new_length");
-			header("content-range: bytes $range-$range_end/$content_length");
-		}
-		else
-		{
-			header("content-length: " . $content_length);
+			header("content-length: {$new_length}");
+			header("content-range: bytes {$range}-{$range_end}/{$content_length}");
+		} else {
+			header('content-length: ' . $content_length);
 		}
 
 		echo pack('nnVnnnnnnnnVVnnnnV', 0x5249, 0x4646, $file_size, 0x5741, 0x5645, 0x666D, 0x7420, 0x1000, 0x0000, 0x0100, 0x0100, $sample_rate, $sample_rate, 0x0100, 0x0800, 0x6461, 0x7461, $data_size), $sound_word;
@@ -917,7 +852,8 @@ protected function createWaveFile($word)
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\VerificationCode::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\VerificationCode::exportStatic')) {
 	VerificationCode::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/ViewQuery.php b/Sources/Actions/ViewQuery.php
index eb6ab75ad9..ce7c8cb3b9 100644
--- a/Sources/Actions/ViewQuery.php
+++ b/Sources/Actions/ViewQuery.php
@@ -14,15 +14,14 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Provides a way to view database queries. Used for debugging.
@@ -36,12 +35,11 @@ class ViewQuery implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'ViewQuery',
-		),
-	);
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -70,8 +68,7 @@ class ViewQuery implements ActionInterface
 	public function execute(): void
 	{
 		// We should have debug mode enabled, as well as something to display!
-		if (!isset(Config::$db_show_debug) || Config::$db_show_debug !== true || !isset($_SESSION['debug']))
-		{
+		if (!isset(Config::$db_show_debug) || Config::$db_show_debug !== true || !isset($_SESSION['debug'])) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
@@ -79,16 +76,12 @@ public function execute(): void
 		User::$me->isAllowedTo('admin_forum');
 
 		// If we're just hiding/showing, do it now.
-		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'hide')
-		{
+		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'hide') {
 			$_SESSION['view_queries'] = $_SESSION['view_queries'] == 1 ? 0 : 1;
 
-			if (strpos($_SESSION['old_url'], 'action=viewquery') !== false)
-			{
+			if (strpos($_SESSION['old_url'], 'action=viewquery') !== false) {
 				Utils::redirectexit();
-			}
-			else
-			{
+			} else {
 				Utils::redirectexit($_SESSION['old_url']);
 			}
 		}
@@ -120,56 +113,47 @@ public function execute(): void
 	<body id="help_popup">
 		<div class="tborder windowbg description">';
 
-		foreach ($_SESSION['debug'] as $q => $query_data)
-		{
+		foreach ($_SESSION['debug'] as $q => $query_data) {
 			// Fix the indentation....
 			$query_data['q'] = ltrim(str_replace("\r", '', $query_data['q']), "\n");
 			$query = explode("\n", $query_data['q']);
 			$min_indent = 0;
 
-			foreach ($query as $line)
-			{
+			foreach ($query as $line) {
 				preg_match('/^(\t*)/', $line, $temp);
 
-				if (strlen($temp[0]) < $min_indent || $min_indent == 0)
+				if (strlen($temp[0]) < $min_indent || $min_indent == 0) {
 					$min_indent = strlen($temp[0]);
+				}
 			}
 
-			foreach ($query as $l => $dummy)
+			foreach ($query as $l => $dummy) {
 				$query[$l] = substr($dummy, $min_indent);
+			}
 
 			$query_data['q'] = implode("\n", $query);
 
 			// Make the filenames look a bit better.
-			if (isset($query_data['f']))
-			{
+			if (isset($query_data['f'])) {
 				$query_data['f'] = preg_replace('~^' . preg_quote(Config::$boarddir, '~') . '~', '...', $query_data['f']);
 			}
 
 			$is_select_query = substr(trim($query_data['q']), 0, 6) == 'SELECT' || substr(trim($query_data['q']), 0, 4) == 'WITH';
 
-			if ($is_select_query)
-			{
+			if ($is_select_query) {
 				$select = $query_data['q'];
-			}
-			elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
-			{
+			} elseif (preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+(SELECT .+)$~s', trim($query_data['q']), $matches) != 0) {
 				$is_select_query = true;
 				$select = $matches[1];
-			}
-			elseif (preg_match('~^CREATE TEMPORARY TABLE .+?(SELECT .+)$~s', trim($query_data['q']), $matches) != 0)
-			{
+			} elseif (preg_match('~^CREATE TEMPORARY TABLE .+?(SELECT .+)$~s', trim($query_data['q']), $matches) != 0) {
 				$is_select_query = true;
 				$select = $matches[1];
 			}
 
 			// Temporary tables created in earlier queries are not explainable.
-			if ($is_select_query)
-			{
-				foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp)
-				{
-					if (strpos($select, $tmp) !== false)
-					{
+			if ($is_select_query) {
+				foreach (['log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages'] as $tmp) {
+					if (strpos($select, $tmp) !== false) {
 						$is_select_query = false;
 						break;
 					}
@@ -182,17 +166,13 @@ public function execute(): void
 				', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', Utils::htmlspecialchars($query_data['q']))), '
 			</a><br>';
 
-			if (!empty($query_data['f']) && !empty($query_data['l']))
-			{
+			if (!empty($query_data['f']) && !empty($query_data['l'])) {
 				echo sprintf(Lang::$txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
 			}
 
-			if (isset($query_data['s'], $query_data['t']) && isset(Lang::$txt['debug_query_which_took_at']))
-			{
+			if (isset($query_data['s'], $query_data['t'], Lang::$txt['debug_query_which_took_at'])) {
 				echo sprintf(Lang::$txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8));
-			}
-			else
-			{
+			} else {
 				echo sprintf(Lang::$txt['debug_query_which_took'], round($query_data['t'], 8));
 			}
 
@@ -200,20 +180,20 @@ public function execute(): void
 		</div>';
 
 			// Explain the query.
-			if ($query_id == $q && $is_select_query)
-			{
-				$result = Db::$db->query('', '
-					EXPLAIN ' . (Db::$db->title === POSTGRE_TITLE ? 'ANALYZE ' : '') . $select,
-					array(
-					)
+			if ($query_id == $q && $is_select_query) {
+				$result = Db::$db->query(
+					'',
+					'EXPLAIN ' . (Db::$db->title === POSTGRE_TITLE ? 'ANALYZE ' : '') . $select,
+					[
+					],
 				);
 
-				if ($result === false)
-				{
+				if ($result === false) {
 					echo '
 		<table>
 			<tr><td>', Db::$db->error(), '</td></tr>
 		</table>';
+
 					continue;
 				}
 
@@ -229,8 +209,8 @@ public function execute(): void
 			</tr>';
 
 				Db::$db->data_seek($result, 0);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					echo '
 			<tr>
 				<td>' . implode('</td>
@@ -263,8 +243,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -290,7 +271,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ViewQuery::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ViewQuery::exportStatic')) {
 	ViewQuery::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/Who.php b/Sources/Actions/Who.php
index f31558d6e6..8d604b3cb7 100644
--- a/Sources/Actions/Who.php
+++ b/Sources/Actions/Who.php
@@ -14,8 +14,8 @@
 namespace SMF\Actions;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\IP;
@@ -25,8 +25,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Who's online, and what are they doing?
@@ -47,12 +45,12 @@ class Who implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'Who',
-		),
-	);
+			'determineActions' => 'determineActions',
+		],
+	];
 
 	/*******************
 	 * Public static properties
@@ -63,50 +61,50 @@ class Who implements ActionInterface
 	 *
 	 * Actions that require a specific permission level.
 	 */
-	public static array $allowedActions = array(
-		'admin' => array('moderate_forum', 'manage_membergroups', 'manage_bans', 'admin_forum', 'manage_permissions', 'send_mail', 'manage_attachments', 'manage_smileys', 'manage_boards', 'edit_news'),
-		'ban' => array('manage_bans'),
-		'boardrecount' => array('admin_forum'),
-		'calendar' => array('calendar_view'),
-		'corefeatures' => array('admin_forum'),
-		'editnews' => array('edit_news'),
-		'featuresettings' => array('admin_forum'),
-		'languages' => array('admin_forum'),
-		'logs' => array('admin_forum'),
-		'mailing' => array('send_mail'),
-		'mailqueue' => array('admin_forum'),
-		'maintain' => array('admin_forum'),
-		'manageattachments' => array('manage_attachments'),
-		'manageboards' => array('manage_boards'),
-		'managecalendar' => array('admin_forum'),
-		'managesearch' => array('admin_forum'),
-		'managesmileys' => array('manage_smileys'),
-		'membergroups' => array('manage_membergroups'),
-		'mlist' => array('view_mlist'),
-		'moderate' => array('access_mod_center', 'moderate_forum', 'manage_membergroups'),
-		'modsettings' => array('admin_forum'),
-		'news' => array('edit_news', 'send_mail', 'admin_forum'),
-		'optimizetables' => array('admin_forum'),
-		'packages' => array('admin_forum'),
-		'paidsubscribe' => array('admin_forum'),
-		'permissions' => array('manage_permissions'),
-		'postsettings' => array('admin_forum'),
-		'regcenter' => array('admin_forum', 'moderate_forum'),
-		'repairboards' => array('admin_forum'),
-		'reports' => array('admin_forum'),
-		'scheduledtasks' => array('admin_forum'),
-		'search' => array('search_posts'),
-		'search2' => array('search_posts'),
-		'securitysettings' => array('admin_forum'),
-		'sengines' => array('admin_forum'),
-		'serversettings' => array('admin_forum'),
-		'setcensor' => array('moderate_forum'),
-		'setreserve' => array('moderate_forum'),
-		'stats' => array('view_stats'),
-		'theme' => array('admin_forum'),
-		'viewerrorlog' => array('admin_forum'),
-		'viewmembers' => array('moderate_forum'),
-	);
+	public static array $allowedActions = [
+		'admin' => ['moderate_forum', 'manage_membergroups', 'manage_bans', 'admin_forum', 'manage_permissions', 'send_mail', 'manage_attachments', 'manage_smileys', 'manage_boards', 'edit_news'],
+		'ban' => ['manage_bans'],
+		'boardrecount' => ['admin_forum'],
+		'calendar' => ['calendar_view'],
+		'corefeatures' => ['admin_forum'],
+		'editnews' => ['edit_news'],
+		'featuresettings' => ['admin_forum'],
+		'languages' => ['admin_forum'],
+		'logs' => ['admin_forum'],
+		'mailing' => ['send_mail'],
+		'mailqueue' => ['admin_forum'],
+		'maintain' => ['admin_forum'],
+		'manageattachments' => ['manage_attachments'],
+		'manageboards' => ['manage_boards'],
+		'managecalendar' => ['admin_forum'],
+		'managesearch' => ['admin_forum'],
+		'managesmileys' => ['manage_smileys'],
+		'membergroups' => ['manage_membergroups'],
+		'mlist' => ['view_mlist'],
+		'moderate' => ['access_mod_center', 'moderate_forum', 'manage_membergroups'],
+		'modsettings' => ['admin_forum'],
+		'news' => ['edit_news', 'send_mail', 'admin_forum'],
+		'optimizetables' => ['admin_forum'],
+		'packages' => ['admin_forum'],
+		'paidsubscribe' => ['admin_forum'],
+		'permissions' => ['manage_permissions'],
+		'postsettings' => ['admin_forum'],
+		'regcenter' => ['admin_forum', 'moderate_forum'],
+		'repairboards' => ['admin_forum'],
+		'reports' => ['admin_forum'],
+		'scheduledtasks' => ['admin_forum'],
+		'search' => ['search_posts'],
+		'search2' => ['search_posts'],
+		'securitysettings' => ['admin_forum'],
+		'sengines' => ['admin_forum'],
+		'serversettings' => ['admin_forum'],
+		'setcensor' => ['moderate_forum'],
+		'setreserve' => ['moderate_forum'],
+		'stats' => ['view_stats'],
+		'theme' => ['admin_forum'],
+		'viewerrorlog' => ['admin_forum'],
+		'viewmembers' => ['moderate_forum'],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -133,35 +131,36 @@ public function execute(): void
 		User::$me->isAllowedTo('who_view');
 
 		// You can't do anything if this is off.
-		if (empty(Config::$modSettings['who_enabled']))
+		if (empty(Config::$modSettings['who_enabled'])) {
 			ErrorHandler::fatalLang('who_off', false);
+		}
 
 		// Discourage robots from indexing this page.
 		Utils::$context['robot_no_index'] = true;
 
 		// Sort out... the column sorting.
-		$sort_methods = array(
+		$sort_methods = [
 			'user' => 'mem.real_name',
-			'time' => 'lo.log_time'
-		);
+			'time' => 'lo.log_time',
+		];
 
-		$show_methods = array(
+		$show_methods = [
 			'members' => '(lo.id_member != 0)',
 			'guests' => '(lo.id_member = 0)',
 			'all' => '1=1',
-		);
+		];
 
 		// Store the sort methods and the show types for use in the template.
-		Utils::$context['sort_methods'] = array(
+		Utils::$context['sort_methods'] = [
 			'user' => Lang::$txt['who_user'],
 			'time' => Lang::$txt['who_time'],
-		);
+		];
 
-		Utils::$context['show_methods'] = array(
+		Utils::$context['show_methods'] = [
 			'all' => Lang::$txt['who_show_all'],
 			'members' => Lang::$txt['who_show_members_only'],
 			'guests' => Lang::$txt['who_show_guests_only'],
-		);
+		];
 
 		// Can they see spiders too?
 		if (
@@ -171,76 +170,69 @@ public function execute(): void
 				|| User::$me->allowedTo('admin_forum')
 			)
 			&& !empty(Config::$modSettings['spider_name_cache'])
-		)
-		{
+		) {
 			$show_methods['spiders'] = '(lo.id_member = 0 AND lo.id_spider > 0)';
 			$show_methods['guests'] = '(lo.id_member = 0 AND lo.id_spider = 0)';
 			Utils::$context['show_methods']['spiders'] = Lang::$txt['who_show_spiders_only'];
-		}
-		elseif (
+		} elseif (
 			empty(Config::$modSettings['show_spider_online'])
 			&& isset($_SESSION['who_online_filter'])
 			&& $_SESSION['who_online_filter'] == 'spiders'
-		)
-		{
+		) {
 			unset($_SESSION['who_online_filter']);
 		}
 
 		// Does the user prefer a different sort direction?
-		if (isset($_REQUEST['sort']) && isset($sort_methods[$_REQUEST['sort']]))
-		{
+		if (isset($_REQUEST['sort'], $sort_methods[$_REQUEST['sort']])) {
 			Utils::$context['sort_by'] = $_SESSION['who_online_sort_by'] = $_REQUEST['sort'];
 			$sort_method = $sort_methods[$_REQUEST['sort']];
 		}
 		// Did we set a preferred sort order earlier in the session?
-		elseif (isset($_SESSION['who_online_sort_by']))
-		{
+		elseif (isset($_SESSION['who_online_sort_by'])) {
 			Utils::$context['sort_by'] = $_SESSION['who_online_sort_by'];
 			$sort_method = $sort_methods[$_SESSION['who_online_sort_by']];
 		}
 		// Default to last time online.
-		else
-		{
+		else {
 			Utils::$context['sort_by'] = $_SESSION['who_online_sort_by'] = 'time';
 			$sort_method = 'lo.log_time';
 		}
 
 		Utils::$context['sort_direction'] = isset($_REQUEST['asc']) || (isset($_REQUEST['sort_dir']) && $_REQUEST['sort_dir'] == 'asc') ? 'up' : 'down';
 
-		$conditions = array();
+		$conditions = [];
 
-		if (!User::$me->allowedTo('moderate_forum'))
+		if (!User::$me->allowedTo('moderate_forum')) {
 			$conditions[] = '(COALESCE(mem.show_online, 1) = 1)';
+		}
 
 		// Fallback to top filter?
-		if (isset($_REQUEST['submit_top']) && isset($_REQUEST['show_top']))
+		if (isset($_REQUEST['submit_top'], $_REQUEST['show_top'])) {
 			$_REQUEST['show'] = $_REQUEST['show_top'];
+		}
 
 		// Does the user wish to apply a filter?
-		if (isset($_REQUEST['show']) && isset($show_methods[$_REQUEST['show']]))
-		{
+		if (isset($_REQUEST['show'], $show_methods[$_REQUEST['show']])) {
 			Utils::$context['show_by'] = $_SESSION['who_online_filter'] = $_REQUEST['show'];
 		}
 		// Perhaps we saved a filter earlier in the session?
-		elseif (isset($_SESSION['who_online_filter']))
-		{
+		elseif (isset($_SESSION['who_online_filter'])) {
 			Utils::$context['show_by'] = $_SESSION['who_online_filter'];
-		}
-		else
-		{
+		} else {
 			Utils::$context['show_by'] = 'members';
 		}
 
 		$conditions[] = $show_methods[Utils::$context['show_by']];
 
 		// Get the total amount of members online.
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}log_online AS lo
 				LEFT JOIN {db_prefix}members AS mem ON (lo.id_member = mem.id_member)' . (!empty($conditions) ? '
 			WHERE ' . implode(' AND ', $conditions) : ''),
-			array(
-			)
+			[
+			],
 		);
 		list($totalMembers) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -251,12 +243,13 @@ public function execute(): void
 		Utils::$context['start'] = $_REQUEST['start'];
 
 		// Look for people online, provided they don't mind if you see they are.
-		Utils::$context['members'] = array();
-		$member_ids = array();
-		$url_data = array();
+		Utils::$context['members'] = [];
+		$member_ids = [];
+		$url_data = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				lo.log_time, lo.id_member, lo.url, lo.ip AS ip, mem.real_name,
 				lo.session, mg.online_color, COALESCE(mem.show_online, 1) AS show_online,
 				lo.id_spider
@@ -266,35 +259,36 @@ public function execute(): void
 			WHERE ' . implode(' AND ', $conditions) : '') . '
 			ORDER BY {raw:sort_method} {raw:sort_direction}
 			LIMIT {int:offset}, {int:limit}',
-			array(
+			[
 				'regular_member' => 0,
 				'sort_method' => $sort_method,
 				'sort_direction' => Utils::$context['sort_direction'] == 'up' ? 'ASC' : 'DESC',
 				'offset' => Utils::$context['start'],
 				'limit' => Config::$modSettings['defaultMaxMembers'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$actions = Utils::jsonDecode($row['url'], true);
 
-			if ($actions === array())
+			if ($actions === []) {
 				continue;
+			}
 
 			// Send the information to the template.
-			Utils::$context['members'][$row['session']] = array(
+			Utils::$context['members'][$row['session']] = [
 				'id' => $row['id_member'],
 				'ip' => User::$me->allowedTo('moderate_forum') ? new IP($row['ip']) : '',
 				// It is *going* to be today or yesterday, so why keep that information in there?
-				'time' => strtr(Time::create('@' . $row['log_time'])->format(), array(Lang::$txt['today'] => '', Lang::$txt['yesterday'] => '')),
+				'time' => strtr(Time::create('@' . $row['log_time'])->format(), [Lang::$txt['today'] => '', Lang::$txt['yesterday'] => '']),
 				'timestamp' => $row['log_time'],
 				'query' => $actions,
 				'is_hidden' => $row['show_online'] == 0,
 				'id_spider' => $row['id_spider'],
-				'color' => empty($row['online_color']) ? '' : $row['online_color']
-			);
+				'color' => empty($row['online_color']) ? '' : $row['online_color'],
+			];
 
-			$url_data[$row['session']] = array($row['url'], $row['id_member']);
+			$url_data[$row['session']] = [$row['url'], $row['id_member']];
 			$member_ids[] = $row['id_member'];
 		}
 		Db::$db->free_result($request);
@@ -303,7 +297,7 @@ public function execute(): void
 		User::load($member_ids);
 
 		// Are we showing spiders?
-		$spiderFormatted = array();
+		$spiderFormatted = [];
 
 		if (
 			!empty(Config::$modSettings['show_spider_online'])
@@ -312,16 +306,14 @@ public function execute(): void
 				Config::$modSettings['show_spider_online'] == 2
 				|| User::$me->allowedTo('admin_forum')
 			)
-		)
-		{
-			foreach (Utils::jsonDecode(Config::$modSettings['spider_name_cache'], true) as $id => $name)
-			{
-				$spiderFormatted[$id] = array(
+		) {
+			foreach (Utils::jsonDecode(Config::$modSettings['spider_name_cache'], true) as $id => $name) {
+				$spiderFormatted[$id] = [
 					'name' => $name,
 					'group' => Lang::$txt['spiders'],
 					'link' => $name,
 					'email' => $name,
-				);
+				];
 			}
 		}
 
@@ -329,14 +321,13 @@ public function execute(): void
 
 		// Setup the linktree and page title (do it down here because the language files are now loaded..)
 		Utils::$context['page_title'] = Lang::$txt['who_title'];
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=who',
-			'name' => Lang::$txt['who_title']
-		);
+			'name' => Lang::$txt['who_title'],
+		];
 
 		// Put it in the context variables.
-		foreach (Utils::$context['members'] as $i => $member)
-		{
+		foreach (Utils::$context['members'] as $i => $member) {
 			$member['id'] = isset(User::$loaded[$member['id']]) ? $member['id'] : 0;
 
 			$formatted = User::$loaded[$member['id']]->format();
@@ -344,24 +335,20 @@ public function execute(): void
 			// Keep the IP that came from the database.
 			$formatted['ip'] = $member['ip'];
 
-			if ($member['id'] == 0)
-			{
-				if (isset($spiderFormatted[$member['id_spider']]))
-				{
+			if ($member['id'] == 0) {
+				if (isset($spiderFormatted[$member['id_spider']])) {
 					$formatted = array_merge($formatted, $spiderFormatted[$member['id_spider']]);
-				}
-				else
-				{
-					$formatted = array_merge($formatted, array(
+				} else {
+					$formatted = array_merge($formatted, [
 						'link' => Lang::$txt['guest_title'],
 						'email' => Lang::$txt['guest_title'],
-					));
+					]);
 				}
 			}
 
 			Utils::$context['members'][$i] = array_merge(Utils::$context['members'][$i], $formatted);
 
-			Utils::$context['members'][$i]['action'] = isset($url_data[$i]) ? $url_data[$i] : array('label' => 'who_hidden', 'class' => 'em');
+			Utils::$context['members'][$i]['action'] = $url_data[$i] ?? ['label' => 'who_hidden', 'class' => 'em'];
 		}
 
 		// Some people can't send personal messages...
@@ -369,7 +356,7 @@ public function execute(): void
 		Utils::$context['can_send_email'] = User::$me->allowedTo('moderate_forum');
 
 		// any profile fields disabled?
-		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : array();
+		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : [];
 	}
 
 	/***********************
@@ -383,8 +370,9 @@ public function execute(): void
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -418,224 +406,181 @@ public static function call(): void
 	 */
 	public static function determineActions($urls, $preferred_prefix = false)
 	{
-		if (!User::$me->allowedTo('who_view'))
-			return array();
+		if (!User::$me->allowedTo('who_view')) {
+			return [];
+		}
 
 		Lang::load('Who');
 
-		IntegrationHook::call('who_allowed', array(&self::$allowedActions));
+		IntegrationHook::call('who_allowed', [&self::$allowedActions]);
 
-		if (!is_array($urls))
-		{
-			$url_list = array(array($urls, User::$me->id));
-		}
-		else
-		{
+		if (!is_array($urls)) {
+			$url_list = [[$urls, User::$me->id]];
+		} else {
 			$url_list = $urls;
 		}
 
 		// These are done to later query these in large chunks. (instead of one by one.)
-		$topic_ids = array();
-		$profile_ids = array();
-		$board_ids = array();
+		$topic_ids = [];
+		$profile_ids = [];
+		$board_ids = [];
 
-		$data = array();
-		foreach ($url_list as $k => $url)
-		{
+		$data = [];
+
+		foreach ($url_list as $k => $url) {
 			// Get the request parameters..
 			$actions = Utils::jsonDecode($url[0], true);
 
-			if ($actions === array())
+			if ($actions === []) {
 				continue;
+			}
 
 			// If it's the admin or moderation center, and there is an area set, use that instead.
-			if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area']))
-			{
+			if (isset($actions['action']) && ($actions['action'] == 'admin' || $actions['action'] == 'moderate') && isset($actions['area'])) {
 				$actions['action'] = $actions['area'];
 			}
 
 			// Check if there was no action or the action is display.
-			if (!isset($actions['action']) || $actions['action'] == 'display')
-			{
+			if (!isset($actions['action']) || $actions['action'] == 'display') {
 				// It's a topic!  Must be!
-				if (isset($actions['topic']))
-				{
+				if (isset($actions['topic'])) {
 					// Assume they can't view it, and queue it up for later.
-					$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
+					$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
 					$topic_ids[(int) $actions['topic']][$k] = Lang::$txt['who_topic'];
 				}
 				// It's a board!
-				elseif (isset($actions['board']))
-				{
+				elseif (isset($actions['board'])) {
 					// Hide first, show later.
-					$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
+					$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
 					$board_ids[$actions['board']][$k] = Lang::$txt['who_board'];
 				}
 				// It's the board index!!  It must be!
-				else
-				{
+				else {
 					$data[$k] = sprintf(Lang::$txt['who_index'], Config::$scripturl, Utils::$context['forum_name_html_safe']);
 				}
 			}
 			// Probably an error or some goon?
-			elseif ($actions['action'] == '')
-			{
+			elseif ($actions['action'] == '') {
 				$data[$k] = sprintf(Lang::$txt['who_index'], Config::$scripturl, Utils::$context['forum_name_html_safe']);
 			}
 			// Some other normal action...?
-			else
-			{
+			else {
 				// Viewing/editing a profile.
-				if ($actions['action'] == 'profile')
-				{
+				if ($actions['action'] == 'profile') {
 					// Whose?  Their own?
-					if (empty($actions['u']))
+					if (empty($actions['u'])) {
 						$actions['u'] = $url[1];
+					}
 
-					$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
+					$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
 					$profile_ids[(int) $actions['u']][$k] = $actions['u'] == $url[1] ? Lang::$txt['who_viewownprofile'] : Lang::$txt['who_viewprofile'];
-				}
-				elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board']))
-				{
-					$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
+				} elseif (($actions['action'] == 'post' || $actions['action'] == 'post2') && empty($actions['topic']) && isset($actions['board'])) {
+					$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
 					$board_ids[(int) $actions['board']][$k] = isset($actions['poll']) ? Lang::$txt['who_poll'] : Lang::$txt['who_post'];
 				}
 				// A subaction anyone can view... if the language string is there, show it.
-				elseif (isset($actions['sa']) && isset(Lang::$txt['whoall_' . $actions['action'] . '_' . $actions['sa']]))
-				{
+				elseif (isset($actions['sa'], Lang::$txt['whoall_' . $actions['action'] . '_' . $actions['sa']])) {
 					$data[$k] = $preferred_prefix && isset(Lang::$txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']]) ? Lang::$txt[$preferred_prefix . $actions['action'] . '_' . $actions['sa']] : sprintf(Lang::$txt['whoall_' . $actions['action'] . '_' . $actions['sa']], Config::$scripturl);
 				}
 				// An action any old fellow can look at. (if ['whoall_' . $action] exists, we know everyone can see it.)
-				elseif (isset(Lang::$txt['whoall_' . $actions['action']]))
-				{
+				elseif (isset(Lang::$txt['whoall_' . $actions['action']])) {
 					$data[$k] = $preferred_prefix && isset(Lang::$txt[$preferred_prefix . $actions['action']]) ? Lang::$txt[$preferred_prefix . $actions['action']] : sprintf(Lang::$txt['whoall_' . $actions['action']], Config::$scripturl);
 				}
 				// Viewable if and only if they can see the board...
-				elseif (isset(Lang::$txt['whotopic_' . $actions['action']]))
-				{
+				elseif (isset(Lang::$txt['whotopic_' . $actions['action']])) {
 					// Find out what topic they are accessing.
-					$topic = (int) (isset($actions['topic']) ? $actions['topic'] : (isset($actions['from']) ? $actions['from'] : 0));
+					$topic = (int) ($actions['topic'] ?? ($actions['from'] ?? 0));
 
-					$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
+					$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
 					$topic_ids[$topic][$k] = Lang::$txt['whotopic_' . $actions['action']];
-				}
-				elseif (isset(Lang::$txt['whopost_' . $actions['action']]))
-				{
+				} elseif (isset(Lang::$txt['whopost_' . $actions['action']])) {
 					// Find out what message they are accessing.
-					$msgid = (int) (isset($actions['msg']) ? $actions['msg'] : (isset($actions['quote']) ? $actions['quote'] : 0));
+					$msgid = (int) ($actions['msg'] ?? ($actions['quote'] ?? 0));
 
-					$result = Db::$db->query('', '
-						SELECT m.id_topic, m.subject
+					$result = Db::$db->query(
+						'',
+						'SELECT m.id_topic, m.subject
 						FROM {db_prefix}messages AS m
 							' . (Config::$modSettings['postmod_active'] ? 'INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic AND t.approved = {int:is_approved})' : '') . '
 						WHERE m.id_msg = {int:id_msg}
 							AND {query_see_message_board}' . (Config::$modSettings['postmod_active'] ? '
 							AND m.approved = {int:is_approved}' : '') . '
 						LIMIT 1',
-						array(
+						[
 							'is_approved' => 1,
 							'id_msg' => $msgid,
-						)
+						],
 					);
 					list($id_topic, $subject) = Db::$db->fetch_row($result);
 					Db::$db->free_result($result);
 
 					$data[$k] = sprintf(Lang::$txt['whopost_' . $actions['action']], $id_topic, $subject, Config::$scripturl);
 
-					if (empty($id_topic))
-						$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
+					if (empty($id_topic)) {
+						$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
+					}
 				}
 				// Viewable only by administrators.. (if it starts with whoadmin, it's admin only!)
-				elseif (User::$me->allowedTo('moderate_forum') && isset(Lang::$txt['whoadmin_' . $actions['action']]))
-				{
+				elseif (User::$me->allowedTo('moderate_forum') && isset(Lang::$txt['whoadmin_' . $actions['action']])) {
 					$data[$k] = sprintf(Lang::$txt['whoadmin_' . $actions['action']], Config::$scripturl);
 				}
 				// Viewable by permission level.
-				elseif (isset(self::$allowedActions[$actions['action']]))
-				{
-					if (User::$me->allowedTo(self::$allowedActions[$actions['action']]) && !empty(Lang::$txt['whoallow_' . $actions['action']]))
-					{
+				elseif (isset(self::$allowedActions[$actions['action']])) {
+					if (User::$me->allowedTo(self::$allowedActions[$actions['action']]) && !empty(Lang::$txt['whoallow_' . $actions['action']])) {
 						$data[$k] = sprintf(Lang::$txt['whoallow_' . $actions['action']], Config::$scripturl);
-					}
-					elseif (in_array('moderate_forum', self::$allowedActions[$actions['action']]))
-					{
+					} elseif (in_array('moderate_forum', self::$allowedActions[$actions['action']])) {
 						$data[$k] = Lang::$txt['who_moderate'];
-					}
-					elseif (in_array('admin_forum', self::$allowedActions[$actions['action']]))
-					{
+					} elseif (in_array('admin_forum', self::$allowedActions[$actions['action']])) {
 						$data[$k] = Lang::$txt['who_admin'];
+					} else {
+						$data[$k] = ['label' => 'who_hidden', 'class' => 'em'];
 					}
-					else
-					{
-						$data[$k] = array('label' => 'who_hidden', 'class' => 'em');
-					}
-				}
-				elseif (!empty($actions['action']))
-				{
+				} elseif (!empty($actions['action'])) {
 					$data[$k] = Lang::$txt['who_generic'] . ' ' . $actions['action'];
-				}
-				else
-				{
-					$data[$k] = array('label' => 'who_unknown', 'class' => 'em');
+				} else {
+					$data[$k] = ['label' => 'who_unknown', 'class' => 'em'];
 				}
 			}
 
-			if (isset($actions['error']))
-			{
+			if (isset($actions['error'])) {
 				Lang::load('Errors');
 
-				if (isset(Lang::$txt[$actions['error']]))
-				{
+				if (isset(Lang::$txt[$actions['error']])) {
 					$error_message = str_replace('"', '&quot;', empty($actions['error_params']) ? Lang::$txt[$actions['error']] : vsprintf(Lang::$txt[$actions['error']], (array) $actions['error_params']));
-				}
-				elseif ($actions['error'] == 'guest_login')
-				{
+				} elseif ($actions['error'] == 'guest_login') {
 					$error_message = str_replace('"', '&quot;', Lang::$txt['who_guest_login']);
-				}
-				else
-				{
+				} else {
 					$error_message = str_replace('"', '&quot;', $actions['error']);
 				}
 
-				if (!empty($error_message))
-				{
+				if (!empty($error_message)) {
 					$error_message = ' <span class="main_icons error" title="' . $error_message . '"></span>';
 
-					if (is_array($data[$k]))
-					{
+					if (is_array($data[$k])) {
 						$data[$k]['error_message'] = $error_message;
-					}
-					else
-					{
+					} else {
 						$data[$k] .= $error_message;
 					}
 				}
 			}
 
 			// Maybe the action is integrated into another system?
-			if (count($integrate_actions = IntegrationHook::call('integrate_whos_online', array($actions))) > 0)
-			{
-				foreach ($integrate_actions as $integrate_action)
-				{
-					if (!empty($integrate_action))
-					{
+			if (count($integrate_actions = IntegrationHook::call('integrate_whos_online', [$actions])) > 0) {
+				foreach ($integrate_actions as $integrate_action) {
+					if (!empty($integrate_action)) {
 						$data[$k] = $integrate_action;
 
-						if (isset($actions['topic']) && isset($topic_ids[(int) $actions['topic']][$k]))
-						{
+						if (isset($actions['topic'], $topic_ids[(int) $actions['topic']][$k])) {
 							$topic_ids[(int) $actions['topic']][$k] = $integrate_action;
 						}
 
-						if (isset($actions['board']) && isset($board_ids[(int) $actions['board']][$k]))
-						{
+						if (isset($actions['board'], $board_ids[(int) $actions['board']][$k])) {
 							$board_ids[(int) $actions['board']][$k] = $integrate_action;
 						}
 
-						if (isset($actions['u']) && isset($profile_ids[(int) $actions['u']][$k]))
-						{
+						if (isset($actions['u'], $profile_ids[(int) $actions['u']][$k])) {
 							$profile_ids[(int) $actions['u']][$k] = $integrate_action;
 						}
-
 						break;
 					}
 				}
@@ -643,27 +588,26 @@ public static function determineActions($urls, $preferred_prefix = false)
 		}
 
 		// Load topic names.
-		if (!empty($topic_ids))
-		{
-			$result = Db::$db->query('', '
-				SELECT t.id_topic, m.subject
+		if (!empty($topic_ids)) {
+			$result = Db::$db->query(
+				'',
+				'SELECT t.id_topic, m.subject
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				WHERE {query_see_topic_board}
 					AND t.id_topic IN ({array_int:topic_list})' . (Config::$modSettings['postmod_active'] ? '
 					AND t.approved = {int:is_approved}' : '') . '
 				LIMIT {int:limit}',
-				array(
+				[
 					'topic_list' => array_keys($topic_ids),
 					'is_approved' => 1,
 					'limit' => count($topic_ids),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				// Show the topic's subject for each of the actions.
-				foreach ($topic_ids[$row['id_topic']] as $k => $session_text)
-				{
+				foreach ($topic_ids[$row['id_topic']] as $k => $session_text) {
 					$data[$k] = sprintf($session_text, $row['id_topic'], Lang::censorText($row['subject']), Config::$scripturl);
 				}
 			}
@@ -671,24 +615,23 @@ public static function determineActions($urls, $preferred_prefix = false)
 		}
 
 		// Load board names.
-		if (!empty($board_ids))
-		{
-			$result = Db::$db->query('', '
-				SELECT b.id_board, b.name
+		if (!empty($board_ids)) {
+			$result = Db::$db->query(
+				'',
+				'SELECT b.id_board, b.name
 				FROM {db_prefix}boards AS b
 				WHERE {query_see_board}
 					AND b.id_board IN ({array_int:board_list})
 				LIMIT {int:limit}',
-				array(
+				[
 					'board_list' => array_keys($board_ids),
 					'limit' => count($board_ids),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				// Put the board name into the string for each member...
-				foreach ($board_ids[$row['id_board']] as $k => $session_text)
-				{
+				foreach ($board_ids[$row['id_board']] as $k => $session_text) {
 					$data[$k] = sprintf($session_text, $row['id_board'], $row['name'], Config::$scripturl);
 				}
 			}
@@ -699,42 +642,39 @@ public static function determineActions($urls, $preferred_prefix = false)
 		$allow_view_own = User::$me->allowedTo('is_not_guest');
 		$allow_view_any = User::$me->allowedTo('profile_view');
 
-		if (!empty($profile_ids) && ($allow_view_any || $allow_view_own))
-		{
-			$result = Db::$db->query('', '
-				SELECT id_member, real_name
+		if (!empty($profile_ids) && ($allow_view_any || $allow_view_own)) {
+			$result = Db::$db->query(
+				'',
+				'SELECT id_member, real_name
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:member_list})
 				LIMIT ' . count($profile_ids),
-				array(
+				[
 					'member_list' => array_keys($profile_ids),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				// If they aren't allowed to view this person's profile, skip it.
-				if (!$allow_view_any && (User::$me->id != $row['id_member']))
+				if (!$allow_view_any && (User::$me->id != $row['id_member'])) {
 					continue;
+				}
 
 				// Set their action on each - session/text to sprintf.
-				foreach ($profile_ids[$row['id_member']] as $k => $session_text)
-				{
+				foreach ($profile_ids[$row['id_member']] as $k => $session_text) {
 					$data[$k] = sprintf($session_text, $row['id_member'], $row['real_name'], Config::$scripturl);
 				}
 			}
 			Db::$db->free_result($result);
 		}
 
-		IntegrationHook::call('whos_online_after', array(&$urls, &$data));
+		IntegrationHook::call('whos_online_after', [&$urls, &$data]);
 
-		if (!is_array($urls))
-		{
-			return isset($data[0]) ? $data[0] : false;
-		}
-		else
-		{
-			return $data;
+		if (!is_array($urls)) {
+			return $data[0] ?? false;
 		}
+
+		return $data;
 	}
 
 	/******************
@@ -753,7 +693,8 @@ protected function __construct()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Who::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Who::exportStatic')) {
 	Who::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/XmlHttp.php b/Sources/Actions/XmlHttp.php
index 96fc712d19..c3775fec62 100644
--- a/Sources/Actions/XmlHttp.php
+++ b/Sources/Actions/XmlHttp.php
@@ -13,11 +13,12 @@
 
 namespace SMF\Actions;
 
+use SMF\Actions\Admin\News;
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Board;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Editor;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
@@ -27,8 +28,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Admin\News;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Handles XML-based interaction (mainly XMLhttp)
@@ -42,12 +41,14 @@ class XmlHttp implements ActionInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'XMLhttpMain',
-		),
-	);
+			'GetJumpTo' => 'GetJumpTo',
+			'ListMessageIcons' => 'ListMessageIcons',
+			'RetrievePreview' => 'RetrievePreview',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -70,11 +71,11 @@ class XmlHttp implements ActionInterface
 	 *
 	 * Available sub-actions.
 	 */
-	public static array $subactions = array(
+	public static array $subactions = [
 		'jumpto' => 'jumpTo',
 		'messageicons' => 'messageIcons',
 		'previews' => 'previews',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -97,34 +98,34 @@ class XmlHttp implements ActionInterface
 	 */
 	public function execute(): void
 	{
-		if (!isset($this->subaction))
+		if (!isset($this->subaction)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
-		$call = method_exists($this, self::$subactions[$this->subaction]) ? array($this, self::$subactions[$this->subaction]) : Utils::getCallable(self::$subactions[$this->subaction]);
+		$call = method_exists($this, self::$subactions[$this->subaction]) ? [$this, self::$subactions[$this->subaction]] : Utils::getCallable(self::$subactions[$this->subaction]);
 
-		if (!empty($call))
+		if (!empty($call)) {
 			call_user_func($call);
+		}
 	}
 
 	/**
 	 * Get a list of boards and categories used for the jumpto dropdown.
 	 */
-	function jumpTo()
+	public function jumpTo()
 	{
 		// Find the boards/categories they can see.
-		$boardListOptions = array(
+		$boardListOptions = [
 			'use_permissions' => true,
-			'selected_board' => isset(Utils::$context['current_board']) ? Utils::$context['current_board'] : 0,
-		);
+			'selected_board' => Utils::$context['current_board'] ?? 0,
+		];
 		Utils::$context['jump_to'] = MessageIndex::getBoardList($boardListOptions);
 
 		// Make the board safe for display.
-		foreach (Utils::$context['jump_to'] as $id_cat => $cat)
-		{
+		foreach (Utils::$context['jump_to'] as $id_cat => $cat) {
 			Utils::$context['jump_to'][$id_cat]['name'] = Utils::htmlspecialcharsDecode(strip_tags($cat['name']));
 
-			foreach ($cat['boards'] as $id_board => $board)
-			{
+			foreach ($cat['boards'] as $id_board => $board) {
 				Utils::$context['jump_to'][$id_cat]['boards'][$id_board]['name'] = Utils::htmlspecialcharsDecode(strip_tags($board['name']));
 			}
 		}
@@ -135,7 +136,7 @@ function jumpTo()
 	/**
 	 * Gets a list of available message icons and sends the info to the template for display
 	 */
-	function messageIcons()
+	public function messageIcons()
 	{
 		Utils::$context['icons'] = Editor::getMessageIcons(Board::$info->id);
 		Utils::$context['sub_template'] = 'message_icons';
@@ -147,73 +148,73 @@ function messageIcons()
 	 *
 	 * @return void|bool Returns false if $_POST['item'] isn't set or isn't valid
 	 */
-	function previews()
+	public function previews()
 	{
-		$items = array(
+		$items = [
 			'newspreview',
 			'newsletterpreview',
 			'sig_preview',
 			'warning_preview',
-		);
+		];
 
 		Utils::$context['sub_template'] = 'generic_xml';
 
-		if (!isset($_POST['item']) || !in_array($_POST['item'], $items))
+		if (!isset($_POST['item']) || !in_array($_POST['item'], $items)) {
 			return false;
+		}
 
-		call_user_func(array($this, $_POST['item']));
+		call_user_func([$this, $_POST['item']]);
 	}
 
 	/**
 	 * Handles previewing news items
 	 */
-	function newspreview()
+	public function newspreview()
 	{
-		$errors = array();
+		$errors = [];
 
 		$news = !isset($_POST['news']) ? '' : Utils::htmlspecialchars($_POST['news'], ENT_QUOTES);
 
-		if (empty($news))
-		{
-			$errors[] = array('value' => 'no_news');
-		}
-		else
-		{
+		if (empty($news)) {
+			$errors[] = ['value' => 'no_news'];
+		} else {
 			Msg::preparsecode($news);
 		}
 
-		Utils::$context['xml_data'] = array(
-			'news' => array(
+		Utils::$context['xml_data'] = [
+			'news' => [
 				'identifier' => 'parsedNews',
-				'children' => array(
-					array(
+				'children' => [
+					[
 						'value' => BBCodeParser::load()->parse($news),
-					),
-				),
-			),
-			'errors' => array(
+					],
+				],
+			],
+			'errors' => [
 				'identifier' => 'error',
-				'children' => $errors
-			),
-		);
+				'children' => $errors,
+			],
+		];
 	}
 
 	/**
 	 * Handles previewing newsletters
 	 */
-	function newsletterpreview()
+	public function newsletterpreview()
 	{
 		Lang::load('Errors');
 
-		Utils::$context['post_error']['messages'] = array();
+		Utils::$context['post_error']['messages'] = [];
 		Utils::$context['send_pm'] = !empty($_POST['send_pm']) ? 1 : 0;
 		Utils::$context['send_html'] = !empty($_POST['send_html']) ? 1 : 0;
 
-		if (empty($_POST['subject']))
+		if (empty($_POST['subject'])) {
 			Utils::$context['post_error']['messages'][] = Lang::$txt['error_no_subject'];
+		}
 
-		if (empty($_POST['message']))
+		if (empty($_POST['message'])) {
 			Utils::$context['post_error']['messages'][] = Lang::$txt['error_no_message'];
+		}
 
 		News::prepareMailingForPreview();
 
@@ -223,9 +224,9 @@ function newsletterpreview()
 	/**
 	 * Handles previewing signatures
 	 */
-	function sig_preview()
+	public function sig_preview()
 	{
-		require_once(Config::$sourcedir . '/Profile-Modify.php');
+		require_once Config::$sourcedir . '/Profile-Modify.php';
 
 		Lang::load('Profile');
 		Lang::load('Errors');
@@ -235,20 +236,20 @@ function sig_preview()
 
 		// @todo Temporary
 		// Borrowed from loadAttachmentContext in Display.php
-		$can_change = $is_owner ? User::$me->allowedTo(array('profile_extra_any', 'profile_extra_own')) : User::$me->allowedTo('profile_extra_any');
+		$can_change = $is_owner ? User::$me->allowedTo(['profile_extra_any', 'profile_extra_own']) : User::$me->allowedTo('profile_extra_any');
 
-		$errors = array();
+		$errors = [];
 
-		if (!empty($user) && $can_change)
-		{
-			$request = Db::$db->query('', '
-				SELECT signature
+		if (!empty($user) && $can_change) {
+			$request = Db::$db->query(
+				'',
+				'SELECT signature
 				FROM {db_prefix}members
 				WHERE id_member = {int:id_member}
 				LIMIT 1',
-				array(
+				[
 					'id_member' => $user,
-				)
+				],
 			);
 			list($current_signature) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
@@ -263,99 +264,83 @@ function sig_preview()
 
 			$validation = Profile::validateSignature($preview_signature);
 
-			if ($validation !== true && $validation !== false)
-			{
-				$errors[] = array('value' => Lang::$txt['profile_error_' . $validation], 'attributes' => array('type' => 'error'));
+			if ($validation !== true && $validation !== false) {
+				$errors[] = ['value' => Lang::$txt['profile_error_' . $validation], 'attributes' => ['type' => 'error']];
 			}
 
 			Lang::censorText($preview_signature);
 
 			$preview_signature = BBCodeParser::load()->parse($preview_signature, true, 'sig' . $user, $allowedTags);
-		}
-		elseif (!$can_change)
-		{
-			if ($is_owner)
-			{
-				$errors[] = array('value' => Lang::$txt['cannot_profile_extra_own'], 'attributes' => array('type' => 'error'));
-			}
-			else
-			{
-				$errors[] = array('value' => Lang::$txt['cannot_profile_extra_any'], 'attributes' => array('type' => 'error'));
+		} elseif (!$can_change) {
+			if ($is_owner) {
+				$errors[] = ['value' => Lang::$txt['cannot_profile_extra_own'], 'attributes' => ['type' => 'error']];
+			} else {
+				$errors[] = ['value' => Lang::$txt['cannot_profile_extra_any'], 'attributes' => ['type' => 'error']];
 			}
-		}
-		else
-		{
-			$errors[] = array('value' => Lang::$txt['no_user_selected'], 'attributes' => array('type' => 'error'));
+		} else {
+			$errors[] = ['value' => Lang::$txt['no_user_selected'], 'attributes' => ['type' => 'error']];
 		}
 
-		Utils::$context['xml_data']['signatures'] = array(
+		Utils::$context['xml_data']['signatures'] = [
 			'identifier' => 'signature',
-			'children' => array()
-		);
+			'children' => [],
+		];
 
-		if (isset($current_signature))
-		{
-			Utils::$context['xml_data']['signatures']['children'][] = array(
+		if (isset($current_signature)) {
+			Utils::$context['xml_data']['signatures']['children'][] = [
 				'value' => $current_signature,
-				'attributes' => array('type' => 'current'),
-			);
+				'attributes' => ['type' => 'current'],
+			];
 		}
 
-		if (isset($preview_signature))
-		{
-			Utils::$context['xml_data']['signatures']['children'][] = array(
+		if (isset($preview_signature)) {
+			Utils::$context['xml_data']['signatures']['children'][] = [
 				'value' => $preview_signature,
-				'attributes' => array('type' => 'preview'),
-			);
+				'attributes' => ['type' => 'preview'],
+			];
 		}
 
-		if (!empty($errors))
-		{
-			Utils::$context['xml_data']['errors'] = array(
+		if (!empty($errors)) {
+			Utils::$context['xml_data']['errors'] = [
 				'identifier' => 'error',
 				'children' => array_merge(
-					array(
-						array(
+					[
+						[
 							'value' => Lang::$txt['profile_errors_occurred'],
-							'attributes' => array('type' => 'errors_occurred'),
-						),
-					),
-					$errors
+							'attributes' => ['type' => 'errors_occurred'],
+						],
+					],
+					$errors,
 				),
-			);
+			];
 		}
 	}
 
 	/**
 	 * Handles previewing user warnings
 	 */
-	function warning_preview()
+	public function warning_preview()
 	{
 		Lang::load('Errors');
 		Lang::load('ModerationCenter');
 
-		Utils::$context['post_error']['messages'] = array();
+		Utils::$context['post_error']['messages'] = [];
 
-		if (User::$me->allowedTo('issue_warning'))
-		{
+		if (User::$me->allowedTo('issue_warning')) {
 			$warning_body = !empty($_POST['body']) ? trim(Lang::censorText($_POST['body'])) : '';
 
 			Utils::$context['preview_subject'] = !empty($_POST['title']) ? trim(Utils::htmlspecialchars($_POST['title'])) : '';
 
-			if (isset($_POST['issuing']))
-			{
-				if (empty($_POST['title']) || empty($_POST['body']))
+			if (isset($_POST['issuing'])) {
+				if (empty($_POST['title']) || empty($_POST['body'])) {
 					Utils::$context['post_error']['messages'][] = Lang::$txt['warning_notify_blank'];
-			}
-			else
-			{
-				if (empty($_POST['title']))
-				{
+				}
+			} else {
+				if (empty($_POST['title'])) {
 					Utils::$context['post_error']['messages'][] = Lang::$txt['mc_warning_template_error_no_title'];
 				}
 
-				if (empty($_POST['body']))
-				{
+				if (empty($_POST['body'])) {
 					Utils::$context['post_error']['messages'][] = Lang::$txt['mc_warning_template_error_no_body'];
 				}
 
@@ -368,35 +353,32 @@ function warning_preview()
 				 * - {SCRIPTURL} - Web address of forum.
 				 * - {REGARDS} - Standard email sign-off.
 				 */
-				$find = array(
+				$find = [
 					'{MEMBER}',
 					'{FORUMNAME}',
 					'{SCRIPTURL}',
 					'{REGARDS}',
-				);
+				];
 
-				$replace = array(
+				$replace = [
 					User::$me->name,
 					Config::$mbname,
 					Config::$scripturl,
 					sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name']),
-				);
+				];
 
 				$warning_body = str_replace($find, $replace, $warning_body);
 			}
 
-			if (!empty($_POST['body']))
-			{
+			if (!empty($_POST['body'])) {
 				Msg::preparsecode($warning_body);
 
 				$warning_body = BBCodeParser::load()->parse($warning_body);
 			}
 
 			Utils::$context['preview_message'] = $warning_body;
-		}
-		else
-		{
-			Utils::$context['post_error']['messages'][] = array('value' => Lang::$txt['cannot_issue_warning'], 'attributes' => array('type' => 'error'));
+		} else {
+			Utils::$context['post_error']['messages'][] = ['value' => Lang::$txt['cannot_issue_warning'], 'attributes' => ['type' => 'error']];
 		}
 
 		Utils::$context['sub_template'] = 'warning';
@@ -413,8 +395,9 @@ function warning_preview()
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -469,15 +452,17 @@ protected function __construct()
 		Theme::loadTemplate('Xml');
 
 		// Easy adding of sub actions.
-		IntegrationHook::call('integrate_XMLhttpMain_subActions', array(&self::$subactions));
+		IntegrationHook::call('integrate_XMLhttpMain_subActions', [&self::$subactions]);
 
-		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']]))
+		if (!empty($_REQUEST['sa']) && isset(self::$subactions[$_REQUEST['sa']])) {
 			$this->subaction = $_REQUEST['sa'];
+		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\XmlHttp::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\XmlHttp::exportStatic')) {
 	XmlHttp::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Actions/index.php b/Sources/Actions/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Sources/Actions/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Sources/Alert.php b/Sources/Alert.php
index 05a5aa1e3f..7109e25b47 100644
--- a/Sources/Alert.php
+++ b/Sources/Alert.php
@@ -20,29 +20,23 @@
  */
 class Alert implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'fetch' => 'fetch_alerts',
 			'count' => 'alert_count',
 			'mark' => 'alert_mark',
 			'delete' => 'alert_delete',
 			'purge' => 'alert_purge',
-			'create' => false,
-			'createBatch' => false,
-			'load' => false,
-			'loadForMember' => false,
-			'markAll' => false,
-			'markWhere' => false,
-			'deleteWhere' => false,
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -163,7 +157,7 @@ class Alert implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var array
@@ -176,28 +170,28 @@ class Alert implements \ArrayAccess
 	 * 'link' and 'text' are the sprintf formats that will be used when
 	 *     $this->show_links is true or false, respectively.
 	 */
-	public static $link_formats = array(
-		'msg_msg' => array(
-			'required' => array('content_subject', 'topic', 'msg'),
+	public static $link_formats = [
+		'msg_msg' => [
+			'required' => ['content_subject', 'topic', 'msg'],
 			'link' => '<a href="{scripturl}?topic=%2$d.msg%3$d#msg%3$d">%1$s</a>',
 			'text' => '<strong>%1$s</strong>',
-		),
-		'topic_msg' => array(
-			'required' => array('content_subject', 'topic', 'topic_suffix'),
+		],
+		'topic_msg' => [
+			'required' => ['content_subject', 'topic', 'topic_suffix'],
 			'link' => '<a href="{scripturl}?topic=%2$d.%3$s">%1$s</a>',
 			'text' => '<strong>%1$s</strong>',
-		),
-		'board_msg' => array(
-			'required' => array('board_name', 'board'),
+		],
+		'board_msg' => [
+			'required' => ['board_name', 'board'],
 			'link' => '<a href="{scripturl}?board=%2$d.0">%1$s</a>',
 			'text' => '<strong>%1$s</strong>',
-		),
-		'profile_msg' => array(
-			'required' => array('user_name', 'user_id'),
+		],
+		'profile_msg' => [
+			'required' => ['user_name', 'user_id'],
 			'link' => '<a href="{scripturl}?action=profile;u=%2$d">%1$s</a>',
 			'text' => '<strong>%1$s</strong>',
-		),
-	);
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -208,14 +202,14 @@ class Alert implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_alert' => 'id',
 		'alert_time' => 'timestamp',
 		'id_member' => 'member',
 		'id_member_started' => 'member_started',
 		'sender_id' => 'member_started',
 		'sender_name' => 'member_name',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -226,7 +220,7 @@ class Alert implements \ArrayAccess
 	 *
 	 * The query_see_board data to use when checking access to content.
 	 */
-	protected static array $qb = array();
+	protected static array $qb = [];
 
 	/**
 	 * @var array
@@ -245,7 +239,7 @@ class Alert implements \ArrayAccess
 	 * @param int $id The ID number of the alert.
 	 * @param array $props Properties to set for this alert.
 	 */
-	public function __construct(int $id = 0, array $props = array())
+	public function __construct(int $id = 0, array $props = [])
 	{
 		$this->set($props);
 		$this->id = $id;
@@ -254,25 +248,23 @@ public function __construct(int $id = 0, array $props = array())
 		$this->show_links = (bool) ($this->extra['show_links'] ?? false);
 		$this->initial_is_read = $this->is_read;
 
-		if ($this->id === 0)
-		{
-			while (isset(self::$loaded[$this->id]))
+		if ($this->id === 0) {
+			while (isset(self::$loaded[$this->id])) {
 				$this->id--;
+			}
 		}
 
 		self::$loaded[$this->id] = $this;
 
-		if (!isset($this->visible))
-		{
-			switch ($this->content_type)
-			{
+		if (!isset($this->visible)) {
+			switch ($this->content_type) {
 				case 'msg':
-					self::checkMsgAccess(array($this->id => $this->content_id), $this->member);
+					self::checkMsgAccess([$this->id => $this->content_id], $this->member);
 					break;
 
 				case 'topic':
 				case 'board':
-					self::checkTopicAccess(array($this->id => $this->content_id), $this->member);
+					self::checkTopicAccess([$this->id => $this->content_id], $this->member);
 					break;
 
 				default:
@@ -281,8 +273,9 @@ public function __construct(int $id = 0, array $props = array())
 			}
 
 			// If not visible, remove from our static array.
-			if (!$this->visible)
+			if (!$this->visible) {
 				unset(self::$loaded[$this->id]);
+			}
 		}
 	}
 
@@ -298,48 +291,48 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 		Utils::$context['avatar_url'] = Config::$modSettings['avatar_url'];
 		Lang::load('Alerts');
 
-		if (!$this->visible)
+		if (!$this->visible) {
 			return;
+		}
 
 		// Did a mod already take care of this one?
-		if (!empty($this->text))
+		if (!empty($this->text)) {
 			return;
+		}
 
 		self::finalizeLinkFormats();
 
 		// Are we forcing show_links to be true?
-		if ($show_links)
+		if ($show_links) {
 			$this->show_links = true;
+		}
 
 		// Make a nicely formatted version of the time.
 		$this->time = Time::create('@' . $this->timestamp)->format();
 
 		// Load the users we need.
 		User::load(
-			array_filter(array(
+			array_filter([
 				$this->member_started,
 				$this->content_type === 'profile' ? $this->content_id : null,
-			)),
+			]),
 			User::LOAD_BY_ID,
-			$with_avatar ? 'basic' : 'minimal'
+			$with_avatar ? 'basic' : 'minimal',
 		);
 
 		// The info in extra might outdated if the topic was moved, the message's subject was changed, etc.
-		if (!empty($this->content_data))
-		{
+		if (!empty($this->content_data)) {
 			$data = $this->content_data;
 
 			// Make sure msg, topic, and board info are correct.
-			$patterns = array();
-			$replacements = array();
-			foreach (array('msg', 'topic', 'board') as $item)
-			{
-				if (isset($data['id_' . $item]))
-				{
+			$patterns = [];
+			$replacements = [];
+
+			foreach (['msg', 'topic', 'board'] as $item) {
+				if (isset($data['id_' . $item])) {
 					$separator = $item == 'msg' ? '=?' : '=';
 
-					if (isset($this->extra['content_link']) && strpos($this->extra['content_link'], $item . $separator) !== false && strpos($this->extra['content_link'], $item . $separator . $data['id_' . $item]) === false)
-					{
+					if (isset($this->extra['content_link']) && strpos($this->extra['content_link'], $item . $separator) !== false && strpos($this->extra['content_link'], $item . $separator . $data['id_' . $item]) === false) {
 						$patterns[] = '/\b' . $item . $separator . '\d+/';
 						$replacements[] = $item . $separator . $data['id_' . $item];
 					}
@@ -347,80 +340,76 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 					$this->extra[$item] = $data['id_' . $item];
 				}
 			}
-			if (!empty($patterns))
+
+			if (!empty($patterns)) {
 				$this->extra['content_link'] = preg_replace($patterns, $replacements, $this->extra['content_link']);
+			}
 
 			// Make sure the subject is correct.
-			if (isset($data['subject']))
+			if (isset($data['subject'])) {
 				$this->extra['content_subject'] = $data['subject'];
+			}
 
 			// Keep track of this so we can use it below.
-			if (isset($data['board_name']))
+			if (isset($data['board_name'])) {
 				$this->extra['board_name'] = $data['board_name'];
+			}
 
 			unset($this->content_data);
 		}
 
 		// Do we want to link to the topic in general or the new messages specifically?
-		if (in_array($this->content_type, array('topic', 'board')) && in_array($this->content_action, array('reply', 'topic', 'unapproved_reply')))
-		{
+		if (in_array($this->content_type, ['topic', 'board']) && in_array($this->content_action, ['reply', 'topic', 'unapproved_reply'])) {
 			$this->extra['topic_suffix'] = 'new;topicseen#new';
-		}
-		elseif (isset($this->extra['topic']))
-		{
+		} elseif (isset($this->extra['topic'])) {
 			$this->extra['topic_suffix'] = '0';
 		}
 
 		// Make sure profile alerts have what they need.
-		if ($this->content_type === 'profile')
-		{
-			if (empty($this->extra['user_id']))
+		if ($this->content_type === 'profile') {
+			if (empty($this->extra['user_id'])) {
 				$this->extra['user_id'] = $this->content_id;
+			}
 
-			if (isset(User::$loaded[$this->extra['user_id']]))
+			if (isset(User::$loaded[$this->extra['user_id']])) {
 				$this->extra['user_name'] = User::$loaded[$this->content_id]->name;
+			}
 		}
 
 		// If we loaded the sender's profile, we may as well use it.
-		if (isset(User::$loaded[$this->member_started]))
-		{
+		if (isset(User::$loaded[$this->member_started])) {
 			$this->member_name = User::$loaded[$this->member_started]->name;
 
 			// If requested, include the sender's avatar data.
-			if ($with_avatar)
+			if ($with_avatar) {
 				$this->sender = User::$loaded[$this->member_started];
+			}
 		}
 
 		// Next, build the message strings.
-		foreach (self::$link_formats as $msg_type => $format_info)
-		{
+		foreach (self::$link_formats as $msg_type => $format_info) {
 			// Get the values to use in the formatted string, in the right order.
 			$msg_values = array_replace(
 				array_fill_keys($format_info['required'], ''),
-				array_intersect_key($this->extra, array_flip($format_info['required']))
+				array_intersect_key($this->extra, array_flip($format_info['required'])),
 			);
 
 			// Assuming all required values are present, build the message.
-			if (!in_array('', $msg_values))
-			{
+			if (!in_array('', $msg_values)) {
 				$this->extra[$msg_type] = vsprintf(self::$link_formats[$msg_type][$this->show_links ? 'link' : 'text'], $msg_values);
-			}
-			elseif (in_array($msg_type, array('msg_msg', 'topic_msg', 'board_msg')))
-			{
+			} elseif (in_array($msg_type, ['msg_msg', 'topic_msg', 'board_msg'])) {
 				$this->extra[$msg_type] = Lang::$txt[$msg_type == 'board_msg' ? 'board_na' : 'topic_na'];
-			}
-			else
-			{
+			} else {
 				$this->extra[$msg_type] = '(' . Lang::$txt['not_applicable'] . ')';
 			}
 		}
 
 		// Show the formatted time in alerts about subscriptions.
-		if ($this->content_type == 'paidsubs' && isset($this->extra['end_time']))
-		{
+		if ($this->content_type == 'paidsubs' && isset($this->extra['end_time'])) {
 			// If the subscription already expired, say so.
-			if ($this->extra['end_time'] < time())
+			if ($this->extra['end_time'] < time()) {
 				$this->content_action = 'expired';
+			}
 
 			// Present a nicely formatted date.
 			$this->extra['end_time'] = Time::create('@' . $this->extra['end_time'])->format();
@@ -430,20 +419,15 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 		$this->target_href = '';
 
 		// Priority goes to explicitly specified links.
-		if (isset($this->extra['content_link']))
-		{
+		if (isset($this->extra['content_link'])) {
 			$this->target_href = $this->extra['content_link'];
-		}
-		elseif (isset($this->extra['report_link']))
-		{
+		} elseif (isset($this->extra['report_link'])) {
 			$this->target_href = Config::$scripturl . $this->extra['report_link'];
 		}
 
 		// Next, try determining the link based on the content action.
-		if (empty($this->target_href) && in_array($this->content_action, array('register_approval', 'group_request', 'buddy_request')))
-		{
-			switch ($this->content_action)
-			{
+		if (empty($this->target_href) && in_array($this->content_action, ['register_approval', 'group_request', 'buddy_request'])) {
+			switch ($this->content_action) {
 				case 'register_approval':
 					$this->target_href = Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve';
 					break;
@@ -453,8 +437,7 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 					break;
 
 				case 'buddy_request':
-					if (!empty($this->member_started))
-					{
+					if (!empty($this->member_started)) {
 						$this->target_href = Config::$scripturl . '?action=profile;u=' . $this->member_started;
 					}
 					break;
@@ -465,27 +448,22 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 		}
 
 		// Or maybe we can determine the link based on the content type.
-		if (empty($this->target_href) && in_array($this->content_type, array('msg', 'member', 'event')))
-		{
-			switch ($this->content_type)
-			{
+		if (empty($this->target_href) && in_array($this->content_type, ['msg', 'member', 'event'])) {
+			switch ($this->content_type) {
 				case 'msg':
-					if (!empty($this->content_id))
-					{
+					if (!empty($this->content_id)) {
 						$this->target_href = Config::$scripturl . '?msg=' . $this->content_id;
 					}
 					break;
 
 				case 'member':
-					if (!empty($this->member_started))
-					{
+					if (!empty($this->member_started)) {
 						$this->target_href = Config::$scripturl . '?action=profile;u=' . $this->member_started;
 					}
 					break;
 
 				case 'event':
-					if (!empty($this->extra['event_id']))
-					{
+					if (!empty($this->extra['event_id'])) {
 						$this->target_href = Config::$scripturl . '?action=calendar;event=' . $this->extra['event_id'];
 					}
 					break;
@@ -498,17 +476,16 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 		// Finally, set this alert's text string.
 		$txt_key = 'alert_' . $this->content_type . '_' . $this->content_action;
 
-		if (isset(Lang::$txt[$txt_key]))
-		{
-			$substitutions = array(
+		if (isset(Lang::$txt[$txt_key])) {
+			$substitutions = [
 				'{scripturl}' => Config::$scripturl,
 				'{member_link}' => !empty($this->member_started) && $this->show_links ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->member_started . '">' . $this->member_name . '</a>' : '<strong>' . $this->member_name . '</strong>',
-			);
+			];
 
-			if (is_array($this->extra))
-			{
-				foreach ($this->extra as $k => $v)
+			if (is_array($this->extra)) {
+				foreach ($this->extra as $k => $v) {
 					$substitutions['{' . $k . '}'] = $v;
+				}
 			}
 
 			$this->text = strtr(Lang::$txt[$txt_key], $substitutions);
@@ -524,15 +501,16 @@ public function format(bool $with_avatar = false, bool $show_links = false): voi
 	public function save(bool $update_count = true): void
 	{
 		// Don't save it if the member can't see it.
-		if (empty($this->visible))
+		if (empty($this->visible)) {
 			return;
+		}
 
 		// Saving a new alert.
-		if ($this->id <= 0)
-		{
-			$this->id = Db::$db->insert('',
+		if ($this->id <= 0) {
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}user_alerts',
-				array(
+				[
 					'alert_time' => 'int',
 					'id_member' => 'int',
 					'id_member_started' => 'int',
@@ -542,8 +520,8 @@ public function save(bool $update_count = true): void
 					'content_action' => 'string',
 					'is_read' => 'int',
 					'extra' => 'string',
-				),
-				array(
+				],
+				[
 					$this->timestamp,
 					$this->member,
 					$this->member_started,
@@ -553,27 +531,26 @@ public function save(bool $update_count = true): void
 					$this->content_action,
 					0,
 					Utils::jsonEncode($this->extra),
-				),
-				array('id_alert'),
-				1
+				],
+				['id_alert'],
+				1,
 			);
 
 			// Update the keys in self::$loaded.
 			self::$loaded = array_combine(
-				array_map(fn($alert) => $alert->id, self::$loaded),
-				self::$loaded
+				array_map(fn ($alert) => $alert->id, self::$loaded),
+				self::$loaded,
 			);
 
-			if ($update_count)
-			{
-				User::updateMemberData($this->member, array('alerts' => '+'));
+			if ($update_count) {
+				User::updateMemberData($this->member, ['alerts' => '+']);
 			}
 		}
 		// Updating an existing alert.
-		else
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}user_alerts
+		else {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}user_alerts
 				SET
 					alert_time = {int:timestamp},
 					id_member = {int:member},
@@ -585,7 +562,7 @@ public function save(bool $update_count = true): void
 					is_read = {int:is_read},
 					extra = {string:extra}
 				WHERE id_alert = {int:id}',
-				array(
+				[
 					'id' => $this->id,
 					'timestamp' => $this->timestamp,
 					'member' => $this->member,
@@ -596,13 +573,12 @@ public function save(bool $update_count = true): void
 					'content_action' => $this->content_action,
 					'is_read' => (int) $this->is_read,
 					'extra' => Utils::jsonEncode($this->extra),
-				)
+				],
 			);
 
 			// Has the is_read value changed since we loaded this alert?
-			if ($update_count && $this->is_read !== $this->initial_is_read)
-			{
-				User::updateMemberData($this->member, array('alerts' => '+'));
+			if ($update_count && $this->is_read !== $this->initial_is_read) {
+				User::updateMemberData($this->member, ['alerts' => '+']);
 			}
 		}
 	}
@@ -615,8 +591,9 @@ public function save(bool $update_count = true): void
 	 */
 	public function __set(string $prop, $value): void
 	{
-		if ($prop === 'extra')
+		if ($prop === 'extra') {
 			$value = (array) Utils::jsonDecode($value ?? '', true);
+		}
 
 		$this->customPropertySet($prop, $value);
 	}
@@ -631,10 +608,11 @@ public function __set(string $prop, $value): void
 	 * @param array $props Properties to set for this alert.
 	 * @return object An instance of this class.
 	 */
-	public static function create(array $props = array()): object
+	public static function create(array $props = []): object
 	{
 		$alert = new self(0, $props);
 		$alert->save();
+
 		return $alert;
 	}
 
@@ -647,21 +625,19 @@ public static function create(array $props = array()): object
 	 * @param array $props_batch Multiple sets of $props.
 	 * @return array An array of instances of this class.
 	 */
-	public static function createBatch(array $props_batch = array()): array
+	public static function createBatch(array $props_batch = []): array
 	{
-		$created = array();
-		$inserts = array();
-		$members = array();
-		$possible_msgs = array();
-		$possible_topics = array();
+		$created = [];
+		$inserts = [];
+		$members = [];
+		$possible_msgs = [];
+		$possible_topics = [];
 
 		// First, weed out any alerts that wouldn't be visible.
-		foreach ($props_batch as $props)
-		{
+		foreach ($props_batch as &$props) {
 			$members[] = $props['id_member'];
 
-			switch ($props['content_type'])
-			{
+			switch ($props['content_type']) {
 				case 'msg':
 					$props['visible'] = false;
 					$props['simple_access_check'] = true;
@@ -683,34 +659,31 @@ public static function createBatch(array $props_batch = array()): array
 
 		$members = array_unique($members);
 
-		foreach ($members as $memID)
-		{
-			foreach (array('checkMsgAccess' => 'possible_msgs', 'checkTopicAccess' => 'possible_topics') as $method => $variable)
-			{
-				$visibility = self::$method(${$variable}[$memID] ?? array(), $memID, true);
+		foreach ($members as $memID) {
+			foreach (['checkMsgAccess' => 'possible_msgs', 'checkTopicAccess' => 'possible_topics'] as $method => $variable) {
+				$visibility = self::$method(${$variable}[$memID] ?? [], $memID, true);
 
-				if (!empty($visibility))
-				{
-					foreach ($props_batch as &$props)
-					{
-						if (isset($visibility[$props['id_alert']]))
+				if (!empty($visibility)) {
+					foreach ($props_batch as &$props) {
+						if (isset($visibility[$props['id_alert']])) {
 							$props['visible'] = $visibility[$props['id_alert']];
+						}
 					}
 				}
 			}
 		}
 
 		// Now create the alert objects and populate the database insert rows.
-		foreach ($props_batch as $props)
-		{
-			if (!$props['visible'])
+		foreach ($props_batch as $props) {
+			if (!$props['visible']) {
 				continue;
+			}
 
 			$alert = new self(0, $props);
 
 			$created[$alert->id] = $alert;
 
-			$inserts[$alert->id] = array(
+			$inserts[$alert->id] = [
 				$alert->timestamp,
 				$alert->member,
 				$alert->member_started,
@@ -720,13 +693,14 @@ public static function createBatch(array $props_batch = array()): array
 				$alert->content_action,
 				0,
 				Utils::jsonEncode($alert->extra),
-			);
+			];
 		}
 
 		// Insert the data into the database.
-		$ids = Db::$db->insert('',
+		$ids = Db::$db->insert(
+			'',
 			'{db_prefix}user_alerts',
-			array(
+			[
 				'alert_time' => 'int',
 				'id_member' => 'int',
 				'id_member_started' => 'int',
@@ -736,33 +710,34 @@ public static function createBatch(array $props_batch = array()): array
 				'content_action' => 'string',
 				'is_read' => 'int',
 				'extra' => 'string',
-			),
+			],
 			$inserts,
-			array('id_alert'),
-			2
+			['id_alert'],
+			2,
 		);
 
 		// Map our temp IDs to the real IDs.
 		$ids = array_combine(array_keys($inserts), $ids);
 
 		// Change the IDs in the alert objects themselves.
-		foreach ($ids as $temp => $real)
+		foreach ($ids as $temp => $real) {
 			self::$loaded[$temp]->id = $real;
+		}
 
 		// Update the keys in self::$loaded.
 		self::$loaded = array_combine(
-			array_map(fn($alert) => $alert->id, self::$loaded),
-			self::$loaded
+			array_map(fn ($alert) => $alert->id, self::$loaded),
+			self::$loaded,
 		);
 
 		// Update the keys in $created.
 		$created = array_combine(
-			array_map(fn($alert) => $alert->id, $created),
-			$created
+			array_map(fn ($alert) => $alert->id, $created),
+			$created,
 		);
 
 		// Update the alert counts for the members.
-		User::updateMemberData($members, array('alerts' => '+'));
+		User::updateMemberData($members, ['alerts' => '+']);
 
 		return $created;
 	}
@@ -777,45 +752,44 @@ public static function createBatch(array $props_batch = array()): array
 	 *    Default: false;
 	 * @return array An array of instances of this class.
 	 */
-	public static function load(int|array $ids = array(), array $query_customizations = array(), bool $simple_access_check = false): array
+	public static function load(int|array $ids = [], array $query_customizations = [], bool $simple_access_check = false): array
 	{
 		Lang::load('Alerts');
 
-		$loaded = array();
-		$possible_msgs = array();
-		$possible_topics = array();
-		$members = array();
+		$loaded = [];
+		$possible_msgs = [];
+		$possible_topics = [];
+		$members = [];
 
 		// Are we being asked for some specific alerts?
 		$ids = array_filter(array_map('intval', (array) $ids));
 
 		// Can't load anything without some sort of criteria.
-		if ($ids === array() && $query_customizations === array())
-			return array();
+		if ($ids === [] && $query_customizations === []) {
+			return [];
+		}
 
 		// Get the basic alert info.
-		$selects = $query_customizations['selects'] ?? array('a.*');
-		$joins = $query_customizations['joins'] ?? array();
-		$where = $query_customizations['where'] ?? array();
-		$order = $query_customizations['order'] ?? array('a.id_alert DESC');
+		$selects = $query_customizations['selects'] ?? ['a.*'];
+		$joins = $query_customizations['joins'] ?? [];
+		$where = $query_customizations['where'] ?? [];
+		$order = $query_customizations['order'] ?? ['a.id_alert DESC'];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? min(!empty(Config::$modSettings['alerts_per_page']) ? Config::$modSettings['alerts_per_page'] : 1000, 1000);
-		$params = $query_customizations['params'] ?? array();
+		$params = $query_customizations['params'] ?? [];
 
-		if (!empty($ids))
-		{
+		if (!empty($ids)) {
 			$where[] = 'a.id_alert IN ({array_int:ids})';
 			$params['ids'] = $ids;
 		}
 
-		foreach (self::queryData($selects, $params, $joins, $where, $order, $limit) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where, $order, $limit) as $row) {
 			$row['id_alert'] = (int) $row['id_alert'];
 
 			$members[] = (int) $row['id_member'];
 
 			// For some types, we need to check whether they can actually see the content.
-			switch ($row['content_type'])
-			{
+			switch ($row['content_type']) {
 				case 'msg':
 					$row['visible'] = false;
 					$row['simple_access_check'] = $simple_access_check;
@@ -837,10 +811,9 @@ public static function load(int|array $ids = array(), array $query_customization
 			$loaded[$row['id_alert']] = new self($row['id_alert'], $row);
 		}
 
-		foreach (array_unique($members) as $memID)
-		{
-			self::checkMsgAccess($possible_msgs[$memID] ?? array(), $memID, $simple_access_check);
-			self::checkTopicAccess($possible_topics[$memID] ?? array(), $memID, $simple_access_check);
+		foreach (array_unique($members) as $memID) {
+			self::checkMsgAccess($possible_msgs[$memID] ?? [], $memID, $simple_access_check);
+			self::checkTopicAccess($possible_topics[$memID] ?? [], $memID, $simple_access_check);
 			self::deleteInvisible($loaded, $memID);
 		}
 
@@ -861,39 +834,42 @@ public static function load(int|array $ids = array(), array $query_customization
 	 */
 	public static function loadForMember(int $memID, bool|array $to_fetch = false, int $limit = 0, int $offset = 0, bool $simple_access_check = false): array
 	{
-		if (empty($memID))
-			return array();
+		if (empty($memID)) {
+			return [];
+		}
 
-		$loaded = array();
+		$loaded = [];
 
 		// We only want alerts for this member.
-		$query_customizations = array(
-			'where' => array(
+		$query_customizations = [
+			'where' => [
 				'a.id_member = {int:id_member}',
-			),
+			],
 			'limit' => min(!empty($limit) ? $limit : (!empty(Config::$modSettings['alerts_per_page']) ? Config::$modSettings['alerts_per_page'] : 1000), 1000),
-			'params' => array(
+			'params' => [
 				'id_member' => $memID,
-			),
-		);
+			],
+		];
 
 		// False means get only the unread alerts.
-		if ($to_fetch === false)
+		if ($to_fetch === false) {
 			$query_customizations['where'][] = 'a.is_read = 0';
+		}
 
 		// Are we being asked for some specific alerts?
-		$ids = is_bool($to_fetch) ? array() : array_filter(array_map('intval', (array) $to_fetch));
+		$ids = is_bool($to_fetch) ? [] : array_filter(array_map('intval', (array) $to_fetch));
 
 		// Don't reload unnecessarily.
-		foreach (self::$loaded as $alert)
-		{
+		foreach (self::$loaded as $alert) {
 			// Ignore alerts that belong to a different member.
-			if ($alert->member !== $memID)
+			if ($alert->member !== $memID) {
 				continue;
+			}
 
 			// Reload this alert if we need to redo the access check.
-			if ((int) $simple_access_check < (int) ($alert->simple_access_check ?? 0))
+			if ((int) $simple_access_check < (int) ($alert->simple_access_check ?? 0)) {
 				continue;
+			}
 
 			// At this point, we can exclude this alert from the ones we need to load.
 			$loaded[$alert->id] = $alert;
@@ -901,8 +877,7 @@ public static function loadForMember(int $memID, bool|array $to_fetch = false, i
 
 		$ids = array_diff($ids, array_keys($loaded));
 
-		if (!empty($loaded))
-		{
+		if (!empty($loaded)) {
 			$query_customizations['where'][] = 'a.id_alert NOT IN ({array_int:already_loaded})';
 			$query_customizations['params']['already_loaded'] = array_keys($loaded);
 		}
@@ -910,8 +885,9 @@ public static function loadForMember(int $memID, bool|array $to_fetch = false, i
 		// Figure out the limit and offset.
 		$offset = !empty($ids) ? 0 : max(0, (int) $offset);
 
-		if (!empty($offset))
+		if (!empty($offset)) {
 			$query_customizations['limit'] = $offset . ', ' . $query_customizations['limit'];
+		}
 
 		// Load the alerts we need.
 		$loaded += self::load($ids, $query_customizations);
@@ -948,19 +924,20 @@ public static function fetch(int $memID, bool|array $to_fetch = false, int $limi
 
 		// Hooks might want to do something snazzy with their own content types,
 		// including enforcing permissions if appropriate.
-		IntegrationHook::call('integrate_fetch_alerts', array(&$loaded, &self::$link_formats));
+		IntegrationHook::call('integrate_fetch_alerts', [&$loaded, &self::$link_formats]);
 
 		// Did a hook remove some of the alerts we loaded?
-		if ($loaded_ids !== array_keys($loaded))
-		{
+		if ($loaded_ids !== array_keys($loaded)) {
 			// Remove those alerts from our static array as well.
-			foreach (array_diff($loaded_ids, array_keys($loaded)) as $unloaded)
+			foreach (array_diff($loaded_ids, array_keys($loaded)) as $unloaded) {
 				unset(self::$loaded[$unloaded]);
+			}
 		}
 
 		// Prepare them for the templates.
-		foreach ($loaded as $alert)
+		foreach ($loaded as $alert) {
 			$alert->format($with_avatar, $show_links);
+		}
 
 		return $loaded;
 	}
@@ -981,13 +958,14 @@ public static function count(int $memID, bool $unread = false): int
 
 		$count = 0;
 
-		foreach (self::$loaded as $alert)
-		{
-			if ($alert->member !== $memID)
+		foreach (self::$loaded as $alert) {
+			if ($alert->member !== $memID) {
 				continue;
+			}
 
-			if ($unread && $alert->is_read > 0)
+			if ($unread && $alert->is_read > 0) {
 				continue;
+			}
 
 			$count++;
 		}
@@ -1007,30 +985,32 @@ public static function mark(int|array $members, array|int $to_mark, bool $read):
 		$members = array_filter((array) $members);
 		$to_mark = array_filter((array) $to_mark);
 
-		if (empty($to_mark) || empty($members))
+		if (empty($to_mark) || empty($members)) {
 			return;
+		}
 
 		$time = $read ? time() : 0;
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}user_alerts
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}user_alerts
 			SET is_read = {int:read}
 			WHERE id_alert IN ({array_int:to_mark})',
-			array(
+			[
 				'read' => $time,
 				'to_mark' => $to_mark,
-			)
+			],
 		);
 
 		// First, make sure that all the loaded alerts have the right value.
-		foreach ($to_mark as $id)
-		{
-			if (isset(self::$loaded[$id]))
+		foreach ($to_mark as $id) {
+			if (isset(self::$loaded[$id])) {
 				self::$loaded[$id]->is_read = $time;
+			}
 		}
 
 		// Now update the members' alert counts in the database.
-		User::updateMemberData($members, array('alerts' => $read ? '-' : '+'));
+		User::updateMemberData($members, ['alerts' => $read ? '-' : '+']);
 	}
 
 	/**
@@ -1043,34 +1023,35 @@ public static function markAll(int|array $members, bool $read): void
 	{
 		$members = array_filter((array) $members);
 
-		if (empty($members))
+		if (empty($members)) {
 			return;
+		}
 
 		$time = $read ? time() : 0;
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}user_alerts
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}user_alerts
 			SET is_read = {int:read}
 			WHERE id_member IN ({array_int:members})
 				AND {raw:condition}',
-			array(
+			[
 				'read' => $time,
 				'members' => $members,
 				'condition' => $read ? 'is_read = 0' : 'is_read != 0',
-			)
+			],
 		);
 
-		if (Db::$db->affected_rows() > 0)
-		{
+		if (Db::$db->affected_rows() > 0) {
 			// First, make sure that all the loaded alerts have the right value.
-			foreach (self::$loaded as $alert)
-			{
-				if (in_array($alert->member, $members) && (!$read || empty($alert->is_read)))
+			foreach (self::$loaded as $alert) {
+				if (in_array($alert->member, $members) && (!$read || empty($alert->is_read))) {
 					$alert->is_read = $time;
+				}
 			}
 
 			// Now update the members' alert counts in the database.
-			User::updateMemberData($members, array('alerts' => $read ? 0 : '+'));
+			User::updateMemberData($members, ['alerts' => $read ? 0 : '+']);
 		}
 	}
 
@@ -1083,28 +1064,28 @@ public static function markAll(int|array $members, bool $read): void
 	 */
 	public static function markWhere(array $where, array $params, bool $read): void
 	{
-		$ids = array();
-		$members = array();
+		$ids = [];
+		$members = [];
 
-		$selects = array('a.id_alert', 'a.id_member');
+		$selects = ['a.id_alert', 'a.id_member'];
 
 		// Do we need to add the condition for is_read status?
 		$has_read_condition = false;
 
-		foreach ($where as &$condition)
-		{
+		foreach ($where as &$condition) {
 			$condition = trim($condition);
 
-			if (strpos($condition, 'is_read ') === 0)
+			if (strpos($condition, 'is_read ') === 0) {
 				$has_read_condition = true;
+			}
 		}
 
-		if (!$has_read_condition)
+		if (!$has_read_condition) {
 			$where[] = 'is_read ' . ($read ? '' : '!') . '= 0';
+		}
 
 		// Find the alerts that match the conditions.
-		foreach (self::queryData($selects, $params, array(), $where) as $row)
-		{
+		foreach (self::queryData($selects, $params, [], $where) as $row) {
 			$ids[] = (int) $row['id_alert'];
 			$members[] = (int) $row['id_member'];
 		}
@@ -1118,27 +1099,30 @@ public static function markWhere(array $where, array $params, bool $read): void
 	 * @param int|array $ids The IDs of one or more alerts.
 	 * @param int|array $members Members whose alert counts should be updated.
 	 */
-	public static function delete(int|array $ids, int|array $members = array()): void
+	public static function delete(int|array $ids, int|array $members = []): void
 	{
-		if (empty($ids))
+		if (empty($ids)) {
 			return;
+		}
 
 		$ids = (array) $ids;
 		$members = (array) $members;
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_alerts
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_alerts
 			WHERE id_alert IN ({array_int:ids})',
-			array(
+			[
 				'ids' => $ids,
-			)
+			],
 		);
 
-		foreach ($ids as $id)
+		foreach ($ids as $id) {
 			unset(self::$loaded[$id]);
+		}
 
 		// Gotta know how many unread alerts are left.
-		User::updateMemberData($members, array('alerts' => '-'));
+		User::updateMemberData($members, ['alerts' => '-']);
 	}
 
 	/**
@@ -1154,15 +1138,16 @@ public static function purge(int $memID = 0, int $before = 0): void
 		$memID = !empty($memID) ? $memID : User::$me->id;
 		$before = $before > 0 ? $before : time();
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_alerts
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_alerts
 			WHERE is_read > 0
 				AND is_read < {int:before}' . ($memID > 0 ? '
 				AND id_member = {int:memID}' : ''),
-			array(
+			[
 				'before' => $before,
 				'memID' => $memID,
-			)
+			],
 		);
 	}
 
@@ -1175,14 +1160,13 @@ public static function purge(int $memID = 0, int $before = 0): void
 	 */
 	public static function deleteWhere(array $where, array $params): void
 	{
-		$ids = array();
-		$members = array();
+		$ids = [];
+		$members = [];
 
-		$selects = array('a.id_alert', 'a.id_member');
+		$selects = ['a.id_alert', 'a.id_member'];
 
 		// Find the alerts that match the conditions.
-		foreach (self::queryData($selects, $params, array(), $where) as $row)
-		{
+		foreach (self::queryData($selects, $params, [], $where) as $row) {
 			$ids[] = (int) $row['id_alert'];
 			$members[] = (int) $row['id_member'];
 		}
@@ -1199,13 +1183,11 @@ public static function deleteWhere(array $where, array $params): void
 	 */
 	protected function setIcon(): void
 	{
-		switch ($this->content_type)
-		{
+		switch ($this->content_type) {
 			case 'topic':
 			case 'board':
 				{
-					switch ($this->content_action)
-					{
+					switch ($this->content_action) {
 						case 'reply':
 						case 'topic':
 							$class = 'main_icons posts';
@@ -1251,8 +1233,7 @@ protected function setIcon(): void
 
 			case 'msg':
 				{
-					switch ($this->content_action)
-					{
+					switch ($this->content_action) {
 						case 'like':
 							$class = 'main_icons like';
 							break;
@@ -1283,8 +1264,7 @@ protected function setIcon(): void
 
 			case 'member':
 				{
-					switch ($this->content_action)
-					{
+					switch ($this->content_action) {
 						case 'register_standard':
 						case 'register_approval':
 						case 'register_activation':
@@ -1332,20 +1312,15 @@ protected function setIcon(): void
 				break;
 		}
 
-		if (isset($class))
-		{
+		if (isset($class)) {
 			$this->icon = '<span class="alert_icon ' . $class . '"></span>';
-		}
-		elseif (isset($src))
-		{
+		} elseif (isset($src)) {
 			$this->icon = '<img class="alert_icon" src="' . $src . '">';
-		}
-		else
-		{
+		} else {
 			$this->icon = '';
 		}
 
-		IntegrationHook::call('integrate_alert_icon', array(&$this->icon, (array) $this));
+		IntegrationHook::call('integrate_alert_icon', [&$this->icon, (array) $this]);
 	}
 	/*************************
 	 * Internal static methods
@@ -1356,18 +1331,18 @@ protected function setIcon(): void
 	 */
 	protected static function finalizeLinkFormats(): void
 	{
-		if (self::$formats_finalized)
+		if (self::$formats_finalized) {
 			return;
+		}
 
 		self::$link_formats = array_map(
-			function ($format)
-			{
+			function ($format) {
 				$format['link'] = str_replace('{scripturl}', Config::$scripturl, $format['link']);
 				$format['text'] = str_replace('{scripturl}', Config::$scripturl, $format['text']);
 
 				return $format;
 			},
-			self::$link_formats
+			self::$link_formats,
 		);
 	}
 
@@ -1386,15 +1361,13 @@ protected static function resetLinkFormats(): void
 	 */
 	protected static function setQb(int $memID): void
 	{
-		if (!empty(self::$qb[$memID]))
+		if (!empty(self::$qb[$memID])) {
 			return;
+		}
 
-		if ((User::$me->id ?? NAN) != $memID || !isset(User::$me->query_see_board))
-		{
+		if ((User::$me->id ?? NAN) != $memID || !isset(User::$me->query_see_board)) {
 			self::$qb[$memID] = User::buildQueryBoard($memID);
-		}
-		else
-		{
+		} else {
 			self::$qb[$memID]['query_see_board'] = '{query_see_board}';
 			self::$qb[$memID]['query_see_topic_board'] = '{query_see_topic_board}';
 			self::$qb[$memID]['query_see_message_board'] = '{query_see_message_board}';
@@ -1413,59 +1386,59 @@ protected static function setQb(int $memID): void
 	 */
 	protected static function checkMsgAccess(array $possible_msgs, int $memID, bool $simple = false): array
 	{
-		if (empty($possible_msgs))
-			return array();
+		if (empty($possible_msgs)) {
+			return [];
+		}
 
 		self::setQb($memID);
 
-		$visibility = array();
-		$flipped_msgs = array();
-		foreach ($possible_msgs as $id_alert => $id_msg)
-		{
+		$visibility = [];
+		$flipped_msgs = [];
+
+		foreach ($possible_msgs as $id_alert => $id_msg) {
 			$visibility[$id_alert] = false;
 
-			if (!isset($flipped_msgs[$id_msg]))
-				$flipped_msgs[$id_msg] = array();
+			if (!isset($flipped_msgs[$id_msg])) {
+				$flipped_msgs[$id_msg] = [];
+			}
 
 			$flipped_msgs[$id_msg][] = $id_alert;
 		}
 
-		if ($simple)
-		{
-			$request = Db::$db->query('', '
-				SELECT m.id_msg
+		if ($simple) {
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_msg
 				FROM {db_prefix}messages AS m
 				WHERE ' . self::$qb[$memID]['query_see_message_board'] . '
 					AND m.id_msg IN ({array_int:msgs})',
-				array(
+				[
 					'msgs' => $possible_msgs,
-				)
+				],
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT m.id_msg, m.id_topic, m.subject, b.id_board, b.name AS board_name
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_msg, m.id_topic, m.subject, b.id_board, b.name AS board_name
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}boards AS b ON (m.id_board = b.id_board)
 				WHERE m.id_msg IN ({array_int:msgs})
 					AND ' . self::$qb[$memID]['query_see_board'] . '
 				ORDER BY m.id_msg',
-				array(
+				[
 					'msgs' => $possible_msgs,
-				)
+				],
 			);
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			foreach ($flipped_msgs[$row['id_msg']] as $id_alert)
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			foreach ($flipped_msgs[$row['id_msg']] as $id_alert) {
 				$visibility[$id_alert] = true;
 
-				if (isset(self::$loaded[$id_alert]))
-				{
-					if (!$simple)
+				if (isset(self::$loaded[$id_alert])) {
+					if (!$simple) {
 						self::$loaded[$id_alert]->content_data = $row;
+					}
 
 					self::$loaded[$id_alert]->visible = true;
 				}
@@ -1479,68 +1452,68 @@ protected static function checkMsgAccess(array $possible_msgs, int $memID, bool
 	/**
 	 * Checks whether a member can see the topics that some alerts refer to.
 	 *
-	 * @param array $possible_msgs Key-value pairs of alert IDs and topic IDs.
 	 * @param int $memID ID of the member.
 	 * @param bool $simple If true, do nothing beyond checking the access.
 	 *    If false, also get some info about the topic in question.
 	 *    Default: false.
+	 * @param array $possible_msgs Key-value pairs of alert IDs and topic IDs.
 	 * @return array Key-value pairs of alert IDs and visibility status.
 	 */
 	protected static function checkTopicAccess($possible_topics, int $memID, bool $simple = false): array
 	{
-		if (empty($possible_topics))
-			return array();
+		if (empty($possible_topics)) {
+			return [];
+		}
 
 		self::setQb($memID);
 
-		$visibility = array();
-		$flipped_topics = array();
-		foreach ($possible_topics as $id_alert => $id_topic)
-		{
+		$visibility = [];
+		$flipped_topics = [];
+
+		foreach ($possible_topics as $id_alert => $id_topic) {
 			$visibility[$id_alert] = false;
 
-			if (!isset($flipped_topics[$id_topic]))
-				$flipped_topics[$id_topic] = array();
+			if (!isset($flipped_topics[$id_topic])) {
+				$flipped_topics[$id_topic] = [];
+			}
 
 			$flipped_topics[$id_topic][] = $id_alert;
 		}
 
-		if ($simple)
-		{
-			$request = Db::$db->query('', '
-				SELECT t.id_topic
+		if ($simple) {
+			$request = Db::$db->query(
+				'',
+				'SELECT t.id_topic
 				FROM {db_prefix}topics AS t
 				WHERE ' . self::$qb[$memID]['query_see_topic_board'] . '
 					AND t.id_topic IN ({array_int:topics})',
-				array(
+				[
 					'topics' => $possible_topics,
-				)
+				],
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT m.id_msg, t.id_topic, m.subject, b.id_board, b.name AS board_name
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_msg, t.id_topic, m.subject, b.id_board, b.name AS board_name
 				FROM {db_prefix}topics AS t
 					INNER JOIN {db_prefix}messages AS m ON (t.id_first_msg = m.id_msg)
 					INNER JOIN {db_prefix}boards AS b ON (t.id_board = b.id_board)
 				WHERE t.id_topic IN ({array_int:topics})
 					AND ' . self::$qb[$memID]['query_see_board'],
-				array(
+				[
 					'topics' => $possible_topics,
-				)
+				],
 			);
 		}
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			foreach ($flipped_topics[$row['id_topic']] as $id_alert)
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			foreach ($flipped_topics[$row['id_topic']] as $id_alert) {
 				$visibility[$id_alert] = true;
 
-				if (isset(self::$loaded[$id_alert]))
-				{
-					if (!$simple)
+				if (isset(self::$loaded[$id_alert])) {
+					if (!$simple) {
 						self::$loaded[$id_alert]->content_data = $row;
+					}
 
 					self::$loaded[$id_alert]->visible = true;
 				}
@@ -1560,19 +1533,19 @@ protected static function checkTopicAccess($possible_topics, int $memID, bool $s
 	 */
 	protected static function deleteInvisible(array &$alerts, int $memID): void
 	{
-		$deletes = array();
+		$deletes = [];
 		$num_unread_deletes = 0;
 
-		foreach ($alerts as $id_alert => $alert)
-		{
+		foreach ($alerts as $id_alert => $alert) {
 			// Only act on the ones that belong to the given member.
-			if ($memID !== $alert->member)
+			if ($memID !== $alert->member) {
 				continue;
+			}
 
-			if (!$alert->visible)
-			{
-				if (!$alert->is_read)
+			if (!$alert->visible) {
+				if (!$alert->is_read) {
 					$num_unread_deletes++;
+				}
 
 				unset($alerts[$id_alert], self::$loaded[$id_alert]);
 				$deletes[] = $id_alert;
@@ -1582,29 +1555,29 @@ protected static function deleteInvisible(array &$alerts, int $memID): void
 		// Delete these orphaned, invisible alerts, otherwise they might hang around forever.
 		// This can happen if they are deleted or moved to a board this user cannot access.
 		// Note that unread alerts are never purged.
-		if (!empty($deletes))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}user_alerts
+		if (!empty($deletes)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}user_alerts
 				WHERE id_alert IN ({array_int:alerts})',
-				array(
+				[
 					'alerts' => $deletes,
-				)
+				],
 			);
 		}
 
 		// One last thing: tweak counter on member record.
 		// Do it directly to avoid creating a loop in User::updateMemberData().
-		if ($num_unread_deletes > 0)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+		if ($num_unread_deletes > 0) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET alerts = GREATEST({int:unread_deletes}, alerts) - {int:unread_deletes}
 				WHERE id_member = {int:member}',
-				array(
+				[
 					'unread_deletes' => $num_unread_deletes,
 					'member' => $memID,
-				)
+				],
 			);
 		}
 	}
@@ -1622,25 +1595,29 @@ protected static function deleteInvisible(array &$alerts, int $memID): void
 	 *    If this is left empty, no WHERE clause will be used.
 	 * @param array $order Zero or more conditions for the ORDER BY clause.
 	 *    If this is left empty, no ORDER BY clause will be used.
+	 * @param array $group Zero or more conditions for the GROUP BY clause.
+	 *    If this is left empty, no GROUP BY clause will be used.
 	 * @param int|string $limit Maximum number of results to retrieve.
 	 *    If this is left empty, all results will be retrieved.
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), int|string $limit = 0)
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
 	{
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $selects) . '
 			FROM {db_prefix}user_alerts AS a' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
-			WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
+			WHERE (' . implode(') AND (', $where) . ')') . (empty($group) ? '' : '
+			GROUP BY ' . implode(', ', $group)) . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . (!empty($limit) ? '
 			LIMIT ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			yield $row;
 		}
 		Db::$db->free_result($request);
@@ -1648,7 +1625,8 @@ protected static function queryData(array $selects, array $params = array(), arr
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Alert::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Alert::exportStatic')) {
 	Alert::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Attachment.php b/Sources/Attachment.php
index bbe7fc712a..ab02a559c2 100644
--- a/Sources/Attachment.php
+++ b/Sources/Attachment.php
@@ -14,7 +14,6 @@
 namespace SMF;
 
 use SMF\Actions\Admin\ACP;
-use SMF\Cache\CacheApi;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Graphics\Image;
 
@@ -26,18 +25,16 @@
  */
 class Attachment implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'loadByMsg' => false,
-			'loadByMember' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'automanageCheckDirectory' => 'automanage_attachments_check_directory',
 			'automanageCreateDirectory' => 'automanage_attachments_create_directory',
 			'automanageBySpace' => 'automanage_attachments_by_space',
@@ -45,24 +42,30 @@ class Attachment implements \ArrayAccess
 			'check' => 'attachmentChecks',
 			'create' => 'createAttachment',
 			'assign' => 'assignAttachments',
-			'prepareByMsg' => 'prepareAttachsByMsg',
 			'approve' => 'ApproveAttachments',
 			'remove' => 'removeAttachments',
-		),
-	);
+			'parseAttachBBC' => 'parseAttachBBC',
+			'getAttachMsgInfo' => 'getAttachMsgInfo',
+			'loadAttachmentContext' => 'loadAttachmentContext',
+			'prepareByMsg' => 'prepareAttachsByMsg',
+			'createHash' => 'createHash',
+			'getFilePath' => 'getFilePath',
+			'getAttachmentFilename' => 'getAttachmentFilename',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const APPROVED_ANY = -1;
-	const APPROVED_FALSE = 0;
-	const APPROVED_TRUE = 1;
+	public const APPROVED_ANY = -1;
+	public const APPROVED_FALSE = 0;
+	public const APPROVED_TRUE = 1;
 
-	const TYPE_ANY = -1;
-	const TYPE_STANDARD = 0;
-	const TYPE_AVATAR = 1;
-	const TYPE_THUMB = 3;
+	public const TYPE_ANY = -1;
+	public const TYPE_STANDARD = 0;
+	public const TYPE_AVATAR = 1;
+	public const TYPE_THUMB = 3;
 
 	/*******************
 	 * Public properties
@@ -288,21 +291,21 @@ class Attachment implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var array
 	 *
 	 * Loaded instances of this class, grouped by message.
 	 */
-	public static array $loadedByMsg = array();
+	public static array $loadedByMsg = [];
 
 	/**
 	 * @var array
 	 *
 	 * Loaded instances of this class, grouped by member.
 	 */
-	public static array $loadedByMember = array();
+	public static array $loadedByMember = [];
 
 	/*********************
 	 * Internal properties
@@ -313,7 +316,7 @@ class Attachment implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_attach' => 'id',
 		'attachID' => 'id',
 		'id_thumb' => 'thumb',
@@ -328,7 +331,7 @@ class Attachment implements \ArrayAccess
 		'filesize' => 'size',
 		'byte_size' => 'size',
 		'filePath' => 'path',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -341,26 +344,28 @@ class Attachment implements \ArrayAccess
 	 * @param array $props Properties to set for this attachment.
 	 * @return object An instance of this class.
 	 */
-	public function __construct(int $id = 0, array $props = array())
+	public function __construct(int $id = 0, array $props = [])
 	{
-		if (empty($id) && empty($props))
+		if (empty($id) && empty($props)) {
 			return;
+		}
 
 		// Given an ID but no properties, so query for the data.
-		if (!empty($id) && empty($props))
-		{
-			$request = Db::$db->query('', '
-				SELECT *
+		if (!empty($id) && empty($props)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT *
 				FROM {db_prefix}attachments
 				WHERE id_attach = {int:id}
 				LIMIT 1',
-				array(
+				[
 					'id' => $this->id,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) !== 1)
-			{
+
+			if (Db::$db->num_rows($request) !== 1) {
 				Db::$db->free_result($request);
+
 				return;
 			}
 			$props = Db::$db->fetch_assoc($request);
@@ -373,8 +378,7 @@ public function __construct(int $id = 0, array $props = array())
 		// Is this an image attachment?
 		$image = new Image($this->path);
 
-		if (!empty($image->source))
-		{
+		if (!empty($image->source)) {
 			$this->is_image = true;
 			$this->mime_type = $image->mime_type;
 			$this->width = $image->width;
@@ -385,12 +389,12 @@ public function __construct(int $id = 0, array $props = array())
 		unset($image);
 
 		// If we still don't have a MIME type, get it now.
-		if (empty($this->mime_type))
+		if (empty($this->mime_type)) {
 			$this->mime_type = Utils::getMimeType($this->path, true);
+		}
 
 		// SVGs are special.
-		if ($this->mime_type === 'image/svg+xml')
-		{
+		if ($this->mime_type === 'image/svg+xml') {
 			// SVG is its own thumbnail.
 			$this->thumb = $id;
 
@@ -399,16 +403,18 @@ public function __construct(int $id = 0, array $props = array())
 			$this->thumb_height = min($this->height, !empty(Config::$modSettings['attachmentThumbHeight']) ? Config::$modSettings['attachmentThumbHeight'] : 1000);
 
 			// Must set the thumbnail's CSS dimensions manually.
-			addInlineCss('img#thumb_' . $this->thumb . ':not(.original_size) {width: ' . $this->thumb_width . 'px; height: ' . $this->thumb_height . 'px;}');
+			Theme::addInlineCss('img#thumb_' . $this->thumb . ':not(.original_size) {width: ' . $this->thumb_width . 'px; height: ' . $this->thumb_height . 'px;}');
 		}
 
 		self::$loaded[$id] = $this;
 
-		if (!empty($this->msg))
+		if (!empty($this->msg)) {
 			self::$loadedByMsg[$this->msg][$id] = $this;
+		}
 
-		if (!empty($this->member))
+		if (!empty($this->member)) {
 			self::$loadedByMember[$this->member][$id] = $this;
+		}
 	}
 
 	/**
@@ -416,21 +422,23 @@ public function __construct(int $id = 0, array $props = array())
 	 */
 	public function setFileProperties(): void
 	{
-		if (!isset($this->path))
+		if (!isset($this->path)) {
 			$this->setPath();
+		}
 
-		if (!isset($this->path))
+		if (!isset($this->path)) {
 			return;
+		}
 
 		$this->exists = file_exists($this->path);
 
 		// Ensure variant attachment compatibility.
-		if (!$this->exists)
-		{
+		if (!$this->exists) {
 			$pathinfo = pathinfo($this->path);
 
-			if (isset($pathinfo['extension']))
+			if (isset($pathinfo['extension'])) {
 				$this->path = substr($this->path, 0, -(strlen($pathinfo['extension']) + 1));
+			}
 
 			$this->exists = file_exists($this->path);
 		}
@@ -452,17 +460,16 @@ public function __set(string $prop, $value): void
 
 		$this->href = Config::$scripturl . '?action=dlattach;attach=' . $this->id;
 
-		if (in_array($this->prop_aliases[$prop] ?? $prop, array('id', 'file_hash', 'folder')))
+		if (in_array($this->prop_aliases[$prop] ?? $prop, ['id', 'file_hash', 'folder'])) {
 			$this->setPath();
+		}
 
-		if (($this->prop_aliases[$prop] ?? $prop) === 'filename')
-		{
+		if (($this->prop_aliases[$prop] ?? $prop) === 'filename') {
 			$this->name = Utils::htmlspecialchars($value);
 			$this->link = '<a href="' . $this->href . '" class="bbc_link">' . $this->name . '</a>';
 		}
 
-		if (($this->prop_aliases[$prop] ?? $prop) === 'size')
-		{
+		if (($this->prop_aliases[$prop] ?? $prop) === 'size') {
 			Lang::load('index');
 
 			$this->formatted_size = ($this->size < 1024000) ? round($this->size / 1024, 2) . ' ' . Lang::$txt['kilobyte'] : round($this->size / 1024 / 1024, 2) . ' ' . Lang::$txt['megabyte'];
@@ -488,66 +495,60 @@ public function __set(string $prop, $value): void
 	public static function load(array|int $ids, int $approval_status = self::APPROVED_ANY, int $type = self::TYPE_ANY, bool $get_thumbs = true): array
 	{
 		// Keep track of the ones we load during this call.
-		$loaded = array();
+		$loaded = [];
 
 		$ids = array_filter(array_map('intval', (array) $ids));
-		$approval_status = !in_array($approval_status, array(self::APPROVED_TRUE, self::APPROVED_FALSE)) ? self::APPROVED_ANY : $approval_status;
+		$approval_status = !in_array($approval_status, [self::APPROVED_TRUE, self::APPROVED_FALSE]) ? self::APPROVED_ANY : $approval_status;
 
-		if (empty($ids))
+		if (empty($ids)) {
 			return $loaded;
+		}
 
 		// Don't reload unnecessarily.
-		foreach ($ids as $key => $id)
-		{
-			if (isset(self::$loaded[$id]))
-			{
+		foreach ($ids as $key => $id) {
+			if (isset(self::$loaded[$id])) {
 				$loaded[$id] = self::$loaded[$id];
 				unset($ids[$key]);
 			}
 		}
 
 		// Load whatever hasn't been loaded already.
-		if (!empty($ids))
-		{
-			$selects = array(
+		if (!empty($ids)) {
+			$selects = [
 				'a.*',
 				'COALESCE (m.id_topic, 0) AS id_topic',
 				'COALESCE (m.id_board, 0) AS id_board',
-			);
+			];
 
 			$from = '{db_prefix}attachments AS a';
-			$joins = array('LEFT JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg)');
-			$where = array('a.id_attach IN ({array_int:ids})');
-			$order = array();
+			$joins = ['LEFT JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg)'];
+			$where = ['a.id_attach IN ({array_int:ids})'];
+			$order = [];
 			$limit = 0;
-			$params = array('ids' => $ids);
+			$params = ['ids' => $ids];
 
-			if ($type !== self::TYPE_ANY)
-			{
+			if ($type !== self::TYPE_ANY) {
 				$where[] = 'a.attachment_type = {int:type}';
 				$params['type'] = $type;
 			}
 
-			if ($approval_status !== self::APPROVED_ANY)
-			{
+			if ($approval_status !== self::APPROVED_ANY) {
 				$where[] = 'a.approved = {int:approved}';
 				$params['approved'] = $approval_status;
 			}
 
-			if ($get_thumbs)
-			{
+			if ($get_thumbs) {
 				$selects[] = 'thumb.width AS thumb_width';
 				$selects[] = 'thumb.height AS thumb_height';
 				$joins[] = 'LEFT JOIN {db_prefix}attachments AS thumb ON (a.id_thumb = thumb.id_attach)';
 			}
 
-			IntegrationHook::call('integrate_attachment_load', array(&$selects, &$params, &$from, &$joins, &$where, &$order, &$limit));
+			IntegrationHook::call('integrate_attachment_load', [&$selects, &$params, &$from, &$joins, &$where, &$order, &$limit]);
 
-			foreach (self::queryData($selects, $params, $from, $joins, $where, $order, $limit) as $props)
-			{
+			foreach (self::queryData($selects, $params, $from, $joins, $where, $order, $limit) as $props) {
 				$id = (int) $props['id_attach'];
 
-				$props = array_filter($props, fn($prop) => !is_null($prop));
+				$props = array_filter($props, fn ($prop) => !is_null($prop));
 
 				$loaded[$id] = new self($id, $props);
 			}
@@ -574,61 +575,55 @@ public static function load(array|int $ids, int $approval_status = self::APPROVE
 	 */
 	public static function loadByMsg(array|int $msgs, int $approval_status = self::APPROVED_TRUE, int $type = self::TYPE_STANDARD, bool $get_thumbs = true): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$msgs = array_filter(array_map('intval', (array) $msgs));
-		$approval_status = !in_array($approval_status, array(self::APPROVED_TRUE, self::APPROVED_FALSE)) ? self::APPROVED_ANY : $approval_status;
+		$approval_status = !in_array($approval_status, [self::APPROVED_TRUE, self::APPROVED_FALSE]) ? self::APPROVED_ANY : $approval_status;
 
-		if (empty($msgs))
+		if (empty($msgs)) {
 			return $loaded;
+		}
 
-		$selects = array(
+		$selects = [
 			'a.*',
 			'm.id_topic',
-			'm.id_board'
-		);
+			'm.id_board',
+		];
 
 		$from = '{db_prefix}attachments AS a';
-		$joins = array('INNER JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg)');
-		$where = array('a.id_msg IN ({array_int:msgs})');
-		$order = array();
+		$joins = ['INNER JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg)'];
+		$where = ['a.id_msg IN ({array_int:msgs})'];
+		$order = [];
 		$limit = 0;
-		$params = array('msgs' => $msgs);
+		$params = ['msgs' => $msgs];
 
-		if ($type !== self::TYPE_ANY)
-		{
+		if ($type !== self::TYPE_ANY) {
 			$where[] = 'a.attachment_type = {int:type}';
 			$params['type'] = $type;
 		}
 
-		if ($approval_status !== self::APPROVED_ANY)
-		{
+		if ($approval_status !== self::APPROVED_ANY) {
 			$where[] = 'a.approved = {int:approved}';
 			$params['approved'] = $approval_status;
 		}
 
-		if ($get_thumbs)
-		{
+		if ($get_thumbs) {
 			$selects[] = 'thumb.width AS thumb_width';
 			$selects[] = 'thumb.height AS thumb_height';
 			$joins[] = 'LEFT JOIN {db_prefix}attachments AS thumb ON (a.id_thumb = thumb.id_attach)';
 		}
 
-		IntegrationHook::call('integrate_attachment_loadbymsg', array(&$selects, &$params, &$from, &$joins, &$where, &$order, &$limit));
+		IntegrationHook::call('integrate_attachment_loadbymsg', [&$selects, &$params, &$from, &$joins, &$where, &$order, &$limit]);
 
-		foreach (self::queryData($selects, $params, $from, $joins, $where, $order, $limit) as $props)
-		{
+		foreach (self::queryData($selects, $params, $from, $joins, $where, $order, $limit) as $props) {
 			$id = (int) $props['id_attach'];
 
-			$props = array_filter($props, fn($prop) => !is_null($prop));
+			$props = array_filter($props, fn ($prop) => !is_null($prop));
 
 			// Don't reload unnecessarily.
-			if (isset(self::$loaded[$id]))
-			{
+			if (isset(self::$loaded[$id])) {
 				$loaded[$id] = self::$loaded[$id];
-			}
-			else
-			{
+			} else {
 				$loaded[$id] = new self($id, $props);
 			}
 		}
@@ -641,59 +636,54 @@ public static function loadByMsg(array|int $msgs, int $approval_status = self::A
 	/**
 	 * Loads existing attachments by member ID.
 	 *
-	 * @param array|int $ids The ID numbers of one or more members.
 	 * @param int $approval_status One of this class's APPROVED_* constants.
 	 *     Default: self::APPROVED_TRUE.
 	 * @param bool $get_thumbs Whether to get the thumbnail image dimensions.
 	 *     Default: true.
+	 * @param array|int $ids The ID numbers of one or more members.
 	 * @return array Instances of this class for the loaded attachments.
 	 */
 	public static function loadByMember(array|int $members, int $approval_status = self::APPROVED_TRUE, bool $get_thumbs = true): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$members = array_filter(array_map('intval', (array) $members));
-		$approval_status = !in_array($approval_status, array(self::APPROVED_TRUE, self::APPROVED_FALSE)) ? self::APPROVED_ANY : $approval_status;
+		$approval_status = !in_array($approval_status, [self::APPROVED_TRUE, self::APPROVED_FALSE]) ? self::APPROVED_ANY : $approval_status;
 
-		if (empty($members))
+		if (empty($members)) {
 			return $loaded;
+		}
 
-		$selects = array('a.*');
+		$selects = ['a.*'];
 		$from = '{db_prefix}attachments AS a';
-		$joins = array();
-		$where = array('a.id_member IN ({array_int:members})');
-		$order = array();
+		$joins = [];
+		$where = ['a.id_member IN ({array_int:members})'];
+		$order = [];
 		$limit = 0;
-		$params = array('members' => $members);
+		$params = ['members' => $members];
 
-		if ($approval_status !== self::APPROVED_ANY)
-		{
+		if ($approval_status !== self::APPROVED_ANY) {
 			$where[] = 'a.approved = {int:approved}';
 			$params['approved'] = $approval_status;
 		}
 
-		if ($get_thumbs)
-		{
+		if ($get_thumbs) {
 			$selects[] = 'thumb.width AS thumb_width';
 			$selects[] = 'thumb.height AS thumb_height';
 			$joins[] = 'LEFT JOIN {db_prefix}attachments AS thumb ON (a.id_thumb = thumb.id_attach)';
 		}
 
-		IntegrationHook::call('integrate_attachment_loadbymember', array(&$selects, &$params, &$from, &$joins, &$where, &$order, &$limit));
+		IntegrationHook::call('integrate_attachment_loadbymember', [&$selects, &$params, &$from, &$joins, &$where, &$order, &$limit]);
 
-		foreach (self::queryData($selects, $params, $from, $joins, $where, $order, $limit) as $props)
-		{
+		foreach (self::queryData($selects, $params, $from, $joins, $where, $order, $limit) as $props) {
 			$id = (int) $props['id_attach'];
 
-			$props = array_filter($props, fn($prop) => !is_null($prop));
+			$props = array_filter($props, fn ($prop) => !is_null($prop));
 
 			// Don't reload unnecessarily.
-			if (isset(self::$loaded[$id]))
-			{
+			if (isset(self::$loaded[$id])) {
 				$loaded[$id] = self::$loaded[$id];
-			}
-			else
-			{
+			} else {
 				$loaded[$id] = new self($id, $props);
 			}
 		}
@@ -712,30 +702,24 @@ public static function loadByMember(array|int $members, int $approval_status = s
 	public static function automanageCheckDirectory()
 	{
 		// Not pretty, but since we don't want folders created for every post. It'll do unless a better solution can be found.
-		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		{
+		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') {
 			$doit = true;
-		}
-		elseif (empty(Config::$modSettings['automanage_attachments']) || !isset($_FILES))
-		{
+		} elseif (empty(Config::$modSettings['automanage_attachments']) || !isset($_FILES)) {
 			$doit = false;
-		}
-		elseif (isset($_FILES['attachment']))
-		{
+		} elseif (isset($_FILES['attachment'])) {
 			$doit = false;
 
-			foreach ($_FILES['attachment']['tmp_name'] as $dummy)
-			{
-				if (!empty($dummy))
-				{
+			foreach ($_FILES['attachment']['tmp_name'] as $dummy) {
+				if (!empty($dummy)) {
 					$doit = true;
 					break;
 				}
 			}
 		}
 
-		if (!$doit)
+		if (!$doit) {
 			return;
+		}
 
 		$year = date('Y');
 		$month = date('m');
@@ -744,42 +728,39 @@ public static function automanageCheckDirectory()
 		$rand1 = $rand[1];
 		$rand = $rand[0];
 
-		if (!empty(Config::$modSettings['attachment_basedirectories']) && !empty(Config::$modSettings['use_subdirectories_for_attachments']))
-		{
-			if (!is_array(Config::$modSettings['attachment_basedirectories']))
-			{
+		if (!empty(Config::$modSettings['attachment_basedirectories']) && !empty(Config::$modSettings['use_subdirectories_for_attachments'])) {
+			if (!is_array(Config::$modSettings['attachment_basedirectories'])) {
 				Config::$modSettings['attachment_basedirectories'] = Utils::jsonDecode(Config::$modSettings['attachment_basedirectories'], true);
 			}
 
 			$base_dir = array_search(Config::$modSettings['basedirectory_for_attachments'], Config::$modSettings['attachment_basedirectories']);
-		}
-		else
-		{
+		} else {
 			$base_dir = 0;
 		}
 
-		if (Config::$modSettings['automanage_attachments'] == 1)
-		{
-			if (!isset(Config::$modSettings['last_attachments_directory']))
-				Config::$modSettings['last_attachments_directory'] = array();
+		if (Config::$modSettings['automanage_attachments'] == 1) {
+			if (!isset(Config::$modSettings['last_attachments_directory'])) {
+				Config::$modSettings['last_attachments_directory'] = [];
+			}
 
-			if (!is_array(Config::$modSettings['last_attachments_directory']))
+			if (!is_array(Config::$modSettings['last_attachments_directory'])) {
 				Config::$modSettings['last_attachments_directory'] = Utils::jsonDecode(Config::$modSettings['last_attachments_directory'], true);
+			}
 
-			if (!isset(Config::$modSettings['last_attachments_directory'][$base_dir]))
+			if (!isset(Config::$modSettings['last_attachments_directory'][$base_dir])) {
 				Config::$modSettings['last_attachments_directory'][$base_dir] = 0;
+			}
 		}
 
 		$basedirectory = (!empty(Config::$modSettings['use_subdirectories_for_attachments']) ? (Config::$modSettings['basedirectory_for_attachments']) : Config::$boarddir);
 
-		//Just to be sure: I don't want directory separators at the end
-		$sep = (DIRECTORY_SEPARATOR === '\\') ? '\/' : DIRECTORY_SEPARATOR;
+		// Just to be sure: I don't want directory separators at the end
+		$sep = (DIRECTORY_SEPARATOR === '\\') ? '\\/' : DIRECTORY_SEPARATOR;
 		$basedirectory = rtrim($basedirectory, $sep);
 
-		switch (Config::$modSettings['automanage_attachments'])
-		{
+		switch (Config::$modSettings['automanage_attachments']) {
 			case 1:
-				$updir = $basedirectory . DIRECTORY_SEPARATOR . 'attachments_' . (isset(Config::$modSettings['last_attachments_directory'][$base_dir]) ? Config::$modSettings['last_attachments_directory'][$base_dir] : 0);
+				$updir = $basedirectory . DIRECTORY_SEPARATOR . 'attachments_' . (Config::$modSettings['last_attachments_directory'][$base_dir] ?? 0);
 				break;
 
 			case 2:
@@ -798,32 +779,27 @@ public static function automanageCheckDirectory()
 				$updir = $basedirectory . DIRECTORY_SEPARATOR . (empty(Config::$modSettings['use_subdirectories_for_attachments']) ? 'attachments-' : 'random_') . $rand . DIRECTORY_SEPARATOR . $rand1;
 				break;
 
-			default :
+			default:
 				$updir = '';
 		}
 
-		if (!is_array(Config::$modSettings['attachmentUploadDir']))
-		{
+		if (!is_array(Config::$modSettings['attachmentUploadDir'])) {
 			Config::$modSettings['attachmentUploadDir'] = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 		}
 
-		if (!in_array($updir, Config::$modSettings['attachmentUploadDir']) && !empty($updir))
-		{
+		if (!in_array($updir, Config::$modSettings['attachmentUploadDir']) && !empty($updir)) {
 			$outputCreation = self::automanageCreateDirectory($updir);
-		}
-		elseif (in_array($updir, Config::$modSettings['attachmentUploadDir']))
-		{
+		} elseif (in_array($updir, Config::$modSettings['attachmentUploadDir'])) {
 			$outputCreation = true;
 		}
 
-		if ($outputCreation)
-		{
+		if ($outputCreation) {
 			Config::$modSettings['currentAttachmentUploadDir'] = array_search($updir, Config::$modSettings['attachmentUploadDir']);
 			Utils::$context['attach_dir'] = Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']];
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'currentAttachmentUploadDir' => Config::$modSettings['currentAttachmentUploadDir'],
-			));
+			]);
 		}
 
 		return $outputCreation;
@@ -842,27 +818,26 @@ public static function automanageCreateDirectory($updir)
 		$count = count($tree);
 
 		$directory = self::initDir($tree, $count);
-		if ($directory === false)
-		{
+
+		if ($directory === false) {
 			// Maybe it's just the folder name
 			$tree = self::getDirectoryTreeElements(Config::$boarddir . DIRECTORY_SEPARATOR . $updir);
 			$count = count($tree);
 
 			$directory = self::initDir($tree, $count);
 
-			if ($directory === false)
+			if ($directory === false) {
 				return false;
+			}
 		}
 
 		$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
 
-		while ($count != -1)
-		{
-			if (self::isPathAllowed($directory) && !@is_dir($directory))
-			{
-				if (!@mkdir($directory, 0755))
-				{
+		while ($count != -1) {
+			if (self::isPathAllowed($directory) && !@is_dir($directory)) {
+				if (!@mkdir($directory, 0755)) {
 					Utils::$context['dir_creation_error'] = 'attachments_no_create';
+
 					return false;
 				}
 			}
@@ -872,30 +847,30 @@ public static function automanageCreateDirectory($updir)
 		}
 
 		// Check if the dir is writable.
-		if (!Utils::makeWritable($directory))
-		{
+		if (!Utils::makeWritable($directory)) {
 			Utils::$context['dir_creation_error'] = 'attachments_no_write';
+
 			return false;
 		}
 
 		// Everything seems fine...let's create the .htaccess
-		if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
+		if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) {
 			Security::secureDirectory($updir, true);
+		}
 
-		$sep = (DIRECTORY_SEPARATOR === '\\') ? '\/' : DIRECTORY_SEPARATOR;
+		$sep = (DIRECTORY_SEPARATOR === '\\') ? '\\/' : DIRECTORY_SEPARATOR;
 		$updir = rtrim($updir, $sep);
 
 		// Only update if it's a new directory
-		if (!in_array($updir, Config::$modSettings['attachmentUploadDir']))
-		{
+		if (!in_array($updir, Config::$modSettings['attachmentUploadDir'])) {
 			Config::$modSettings['currentAttachmentUploadDir'] = max(array_keys(Config::$modSettings['attachmentUploadDir'])) + 1;
 
 			Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']] = $updir;
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'attachmentUploadDir' => Utils::jsonEncode(Config::$modSettings['attachmentUploadDir']),
 				'currentAttachmentUploadDir' => Config::$modSettings['currentAttachmentUploadDir'],
-			), true);
+			], true);
 
 			Config::$modSettings['attachmentUploadDir'] = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 		}
@@ -913,31 +888,26 @@ public static function automanageCreateDirectory($updir)
 	 */
 	public static function automanageBySpace()
 	{
-		if (!isset(Config::$modSettings['automanage_attachments']) || (!empty(Config::$modSettings['automanage_attachments']) && Config::$modSettings['automanage_attachments'] != 1))
-		{
+		if (!isset(Config::$modSettings['automanage_attachments']) || (!empty(Config::$modSettings['automanage_attachments']) && Config::$modSettings['automanage_attachments'] != 1)) {
 			return;
 		}
 
 		$basedirectory = !empty(Config::$modSettings['use_subdirectories_for_attachments']) ? Config::$modSettings['basedirectory_for_attachments'] : Config::$boarddir;
 
 		// Just to be sure: I don't want directory separators at the end
-		$sep = (DIRECTORY_SEPARATOR === '\\') ? '\/' : DIRECTORY_SEPARATOR;
+		$sep = (DIRECTORY_SEPARATOR === '\\') ? '\\/' : DIRECTORY_SEPARATOR;
 		$basedirectory = rtrim($basedirectory, $sep);
 
 		// Get the current base directory
-		if (!empty(Config::$modSettings['use_subdirectories_for_attachments']) && !empty(Config::$modSettings['attachment_basedirectories']))
-		{
+		if (!empty(Config::$modSettings['use_subdirectories_for_attachments']) && !empty(Config::$modSettings['attachment_basedirectories'])) {
 			$base_dir = array_search(Config::$modSettings['basedirectory_for_attachments'], Config::$modSettings['attachment_basedirectories']);
 			$base_dir = !empty(Config::$modSettings['automanage_attachments']) ? $base_dir : 0;
-		}
-		else
-		{
+		} else {
 			$base_dir = 0;
 		}
 
 		// Get the last attachment directory for that base directory
-		if (empty(Config::$modSettings['last_attachments_directory'][$base_dir]))
-		{
+		if (empty(Config::$modSettings['last_attachments_directory'][$base_dir])) {
 			Config::$modSettings['last_attachments_directory'][$base_dir] = 0;
 		}
 
@@ -946,23 +916,20 @@ public static function automanageBySpace()
 
 		$updir = $basedirectory . DIRECTORY_SEPARATOR . 'attachments_' . Config::$modSettings['last_attachments_directory'][$base_dir];
 
-		if (self::automanageCreateDirectory($updir))
-		{
+		if (self::automanageCreateDirectory($updir)) {
 			Config::$modSettings['currentAttachmentUploadDir'] = array_search($updir, Config::$modSettings['attachmentUploadDir']);
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'last_attachments_directory' => Utils::jsonEncode(Config::$modSettings['last_attachments_directory']),
 				'currentAttachmentUploadDir' => Config::$modSettings['currentAttachmentUploadDir'],
-			));
+			]);
 
 			Config::$modSettings['last_attachments_directory'] = Utils::jsonDecode(Config::$modSettings['last_attachments_directory'], true);
 
 			return true;
 		}
-		else
-		{
-			return false;
-		}
+
+		return false;
 	}
 
 	/**
@@ -971,192 +938,178 @@ public static function automanageBySpace()
 	public static function process()
 	{
 		// Make sure we're uploading to the right place.
-		if (!empty(Config::$modSettings['automanage_attachments']))
+		if (!empty(Config::$modSettings['automanage_attachments'])) {
 			automanage_attachments_check_directory();
+		}
 
-		if (!is_array(Config::$modSettings['attachmentUploadDir']))
-		{
+		if (!is_array(Config::$modSettings['attachmentUploadDir'])) {
 			Config::$modSettings['attachmentUploadDir'] = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 		}
 
 		Utils::$context['attach_dir'] = Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']];
 
 		// Is the attachments folder actually there?
-		if (!empty(Utils::$context['dir_creation_error']))
-		{
+		if (!empty(Utils::$context['dir_creation_error'])) {
 			$initial_error = Utils::$context['dir_creation_error'];
-		}
-		elseif (!is_dir(Utils::$context['attach_dir']))
-		{
+		} elseif (!is_dir(Utils::$context['attach_dir'])) {
 			$initial_error = 'attach_folder_warning';
 			ErrorHandler::log(sprintf(Lang::$txt['attach_folder_admin_warning'], Utils::$context['attach_dir']), 'critical');
 		}
 
-		if (!isset($initial_error) && !isset(Utils::$context['attachments']))
-		{
+		if (!isset($initial_error) && !isset(Utils::$context['attachments'])) {
 			// If this isn't a new post, check the current attachments.
-			if (isset($_REQUEST['msg']))
-			{
-				$request = Db::$db->query('', '
-					SELECT COUNT(*), SUM(size)
+			if (isset($_REQUEST['msg'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(*), SUM(size)
 					FROM {db_prefix}attachments
 					WHERE id_msg = {int:id_msg}
 						AND attachment_type = {int:attachment_type}',
-					array(
+					[
 						'id_msg' => (int) $_REQUEST['msg'],
 						'attachment_type' => 0,
-					)
+					],
 				);
-				list (Utils::$context['attachments']['quantity'], Utils::$context['attachments']['total_size']) = Db::$db->fetch_row($request);
+				list(Utils::$context['attachments']['quantity'], Utils::$context['attachments']['total_size']) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
-			}
-			else
-			{
-				Utils::$context['attachments'] = array(
+			} else {
+				Utils::$context['attachments'] = [
 					'quantity' => 0,
 					'total_size' => 0,
-				);
+				];
 			}
 		}
 
 		// Hmm. There are still files in session.
 		$ignore_temp = false;
-		if (!empty($_SESSION['temp_attachments']['post']['files']) && count($_SESSION['temp_attachments']) > 1)
-		{
+
+		if (!empty($_SESSION['temp_attachments']['post']['files']) && count($_SESSION['temp_attachments']) > 1) {
 			// Let's try to keep them. But...
 			$ignore_temp = true;
 
 			// If new files are being added. We can't ignore those
-			foreach ($_FILES['attachment']['tmp_name'] as $dummy)
-			{
-				if (!empty($dummy))
-				{
+			foreach ($_FILES['attachment']['tmp_name'] as $dummy) {
+				if (!empty($dummy)) {
 					$ignore_temp = false;
 					break;
 				}
 			}
 
 			// Need to make space for the new files. So, bye bye.
-			if (!$ignore_temp)
-			{
-				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				{
-					if (strpos($attachID, 'post_tmp_' . User::$me->id) !== false)
+			if (!$ignore_temp) {
+				foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+					if (strpos($attachID, 'post_tmp_' . User::$me->id) !== false) {
 						unlink($attachment['tmp_name']);
+					}
 				}
 
 				Utils::$context['we_are_history'] = Lang::$txt['error_temp_attachments_flushed'];
-				$_SESSION['temp_attachments'] = array();
+				$_SESSION['temp_attachments'] = [];
 			}
 		}
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+			$_FILES['attachment']['tmp_name'] = [];
+		}
 
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+			$_SESSION['temp_attachments'] = [];
+		}
 
 		// Remember where we are at. If it's anywhere at all.
-		if (!$ignore_temp)
-		{
-			$_SESSION['temp_attachments']['post'] = array(
+		if (!$ignore_temp) {
+			$_SESSION['temp_attachments']['post'] = [
 				'msg' => !empty($_REQUEST['msg']) ? $_REQUEST['msg'] : 0,
 				'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 				'topic' => !empty($topic) ? $topic : 0,
 				'board' => !empty($board) ? $board : 0,
-			);
+			];
 		}
 
 		// If we have an initial error, lets just display it.
-		if (!empty($initial_error))
-		{
+		if (!empty($initial_error)) {
 			$_SESSION['temp_attachments']['initial_error'] = $initial_error;
 
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-			{
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
-			$_FILES['attachment']['tmp_name'] = array();
+			$_FILES['attachment']['tmp_name'] = [];
 		}
 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
-		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-		{
-			if ($_FILES['attachment']['name'][$n] == '')
+		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+			if ($_FILES['attachment']['name'][$n] == '') {
 				continue;
+			}
 
 			// First, let's first check for PHP upload errors.
-			$errors = array();
-			if (!empty($_FILES['attachment']['error'][$n]))
-			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-				{
-					$errors[] = array('file_too_big', array(Config::$modSettings['attachmentSizeLimit']));
-				}
-				elseif ($_FILES['attachment']['error'][$n] == 6)
-				{
+			$errors = [];
+
+			if (!empty($_FILES['attachment']['error'][$n])) {
+				if ($_FILES['attachment']['error'][$n] == 2) {
+					$errors[] = ['file_too_big', [Config::$modSettings['attachmentSizeLimit']]];
+				} elseif ($_FILES['attachment']['error'][$n] == 6) {
 					ErrorHandler::log($_FILES['attachment']['name'][$n] . ': ' . Lang::$txt['php_upload_error_6'], 'critical');
-				}
-				else
-				{
+				} else {
 					ErrorHandler::log($_FILES['attachment']['name'][$n] . ': ' . Lang::$txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
 				}
 
-				if (empty($errors))
+				if (empty($errors)) {
 					$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
 			$attachID = 'post_tmp_' . User::$me->id . '_' . md5(mt_rand());
 			$destName = Utils::$context['attach_dir'] . '/' . $attachID;
 
-			if (empty($errors))
-			{
+			if (empty($errors)) {
 				// The reported MIME type of the attachment might not be reliable.
 				$detected_mime_type = Utils::getMimeType($_FILES['attachment']['tmp_name'][$n], true);
 
-				if ($detected_mime_type !== false)
+				if ($detected_mime_type !== false) {
 					$_FILES['attachment']['type'][$n] = $detected_mime_type;
+				}
 
-				$_SESSION['temp_attachments'][$attachID] = array(
+				$_SESSION['temp_attachments'][$attachID] = [
 					'name' => Utils::htmlspecialchars(basename($_FILES['attachment']['name'][$n])),
 					'tmp_name' => $destName,
 					'size' => $_FILES['attachment']['size'][$n],
 					'type' => $_FILES['attachment']['type'][$n],
 					'id_folder' => Config::$modSettings['currentAttachmentUploadDir'],
-					'errors' => array(),
-				);
+					'errors' => [],
+				];
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				{
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
 					Utils::makeWritable($destName, 0644);
-				}
-				else
-				{
+				} else {
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
 
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
 						unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
-			}
-			else
-			{
-				$_SESSION['temp_attachments'][$attachID] = array(
+			} else {
+				$_SESSION['temp_attachments'][$attachID] = [
 					'name' => Utils::htmlspecialchars(basename($_FILES['attachment']['name'][$n])),
 					'tmp_name' => $destName,
 					'errors' => $errors,
-				);
+				];
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
+
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
 				self::check($attachID);
+			}
 		}
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
 		// Upload to the current attachment folder with the file name $attachID or 'post_tmp_' . User::$me->id . '_' . md5(mt_rand())
@@ -1168,7 +1121,7 @@ public static function process()
 		//   id_folder => Config::$modSettings['currentAttachmentUploadDir']
 		//   errors => An array of errors (use the index of the Lang::$txt variable for that error).
 		// Template changes can be done using "integrate_upload_template".
-		IntegrationHook::call('integrate_attachment_upload', array());
+		IntegrationHook::call('integrate_attachment_upload', []);
 	}
 
 	/**
@@ -1181,31 +1134,25 @@ public static function process()
 	public static function check($attachID)
 	{
 		// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
-		if (empty($_SESSION['temp_attachments'][$attachID]))
-		{
+		if (empty($_SESSION['temp_attachments'][$attachID])) {
 			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
-		}
-		elseif (empty($attachID))
-		{
+		} elseif (empty($attachID)) {
 			$error = '$attachID';
-		}
-		elseif (empty(Utils::$context['attachments']))
-		{
+		} elseif (empty(Utils::$context['attachments'])) {
 			$error = 'Utils::$context[\'attachments\']';
-		}
-		elseif (empty(Utils::$context['attach_dir']))
-		{
+		} elseif (empty(Utils::$context['attach_dir'])) {
 			$error = 'Utils::$context[\'attach_dir\']';
 		}
 
 		// Let's get their attention.
-		if (!empty($error))
-			ErrorHandler::fatalLang('attach_check_nag', 'debug', array($error));
+		if (!empty($error)) {
+			ErrorHandler::fatalLang('attach_check_nag', 'debug', [$error]);
+		}
 
 		// Just in case this slipped by the first checks, we stop it here and now
-		if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
-		{
+		if ($_SESSION['temp_attachments'][$attachID]['size'] == 0) {
 			$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_0_byte_file';
+
 			return false;
 		}
 
@@ -1213,13 +1160,12 @@ public static function check($attachID)
 		$image = new Image($_SESSION['temp_attachments'][$attachID]['tmp_name']);
 
 		// Source will be empty if this attachment is not an image.
-		if (!empty($image->source) && !$image->check(!empty(Config::$modSettings['attachment_image_paranoid'])))
-		{
+		if (!empty($image->source) && !$image->check(!empty(Config::$modSettings['attachment_image_paranoid']))) {
 			// It's bad. Last chance, maybe we can re-encode it?
-			if (empty(Config::$modSettings['attachment_image_reencode']) || !$image->reencode())
-			{
+			if (empty(Config::$modSettings['attachment_image_reencode']) || !$image->reencode()) {
 				// Nothing to do: not allowed or not successful re-encoding it.
 				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'bad_attachment';
+
 				return false;
 			}
 
@@ -1231,20 +1177,19 @@ public static function check($attachID)
 		unset($image);
 
 		// Is there room for this sucker?
-		if (!empty(Config::$modSettings['attachmentDirSizeLimit']) || !empty(Config::$modSettings['attachmentDirFileLimit']))
-		{
+		if (!empty(Config::$modSettings['attachmentDirSizeLimit']) || !empty(Config::$modSettings['attachmentDirFileLimit'])) {
 			// Check the folder size and count. If it hasn't been done already.
-			if (empty(Utils::$context['dir_size']) || empty(Utils::$context['dir_files']))
-			{
-				$request = Db::$db->query('', '
-					SELECT COUNT(*), SUM(size)
+			if (empty(Utils::$context['dir_size']) || empty(Utils::$context['dir_files'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(*), SUM(size)
 					FROM {db_prefix}attachments
 					WHERE id_folder = {int:folder_id}
 						AND attachment_type != {int:type}',
-					array(
+					[
 						'folder_id' => Config::$modSettings['currentAttachmentUploadDir'],
 						'type' => 1,
-					)
+					],
 				);
 				list(Utils::$context['dir_files'], Utils::$context['dir_size']) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
@@ -1263,10 +1208,9 @@ public static function check($attachID)
 					&& Config::$modSettings['attachmentDirFileLimit'] * .95 < Utils::$context['dir_files']
 					&& Config::$modSettings['attachmentDirFileLimit'] > 500
 				)
-			)
-			{
+			) {
 				ACP::emailAdmins('admin_attachments_full');
-				Config::updateModSettings(array('attachment_full_notified' => 1));
+				Config::updateModSettings(['attachment_full_notified' => 1]);
 			}
 
 			// // No room left.... What to do now???
@@ -1277,13 +1221,10 @@ public static function check($attachID)
 					!empty(Config::$modSettings['attachmentDirSizeLimit'])
 					&& Utils::$context['dir_size'] > Config::$modSettings['attachmentDirSizeLimit'] * 1024
 				)
-			)
-			{
-				if (!empty(Config::$modSettings['automanage_attachments']) && Config::$modSettings['automanage_attachments'] == 1)
-				{
+			) {
+				if (!empty(Config::$modSettings['automanage_attachments']) && Config::$modSettings['automanage_attachments'] == 1) {
 					// Move it to the new folder if we can.
-					if (self::automanageBySpace())
-					{
+					if (self::automanageBySpace()) {
 						rename($_SESSION['temp_attachments'][$attachID]['tmp_name'], Utils::$context['attach_dir'] . '/' . $attachID);
 						$_SESSION['temp_attachments'][$attachID]['tmp_name'] = Utils::$context['attach_dir'] . '/' . $attachID;
 						$_SESSION['temp_attachments'][$attachID]['id_folder'] = Config::$modSettings['currentAttachmentUploadDir'];
@@ -1291,20 +1232,14 @@ public static function check($attachID)
 						Utils::$context['dir_files'] = 0;
 					}
 					// Or, let the user know that it ain't gonna happen.
-					else
-					{
-						if (isset(Utils::$context['dir_creation_error']))
-						{
+					else {
+						if (isset(Utils::$context['dir_creation_error'])) {
 							$_SESSION['temp_attachments'][$attachID]['errors'][] = Utils::$context['dir_creation_error'];
-						}
-						else
-						{
+						} else {
 							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 				}
 			}
@@ -1313,54 +1248,50 @@ public static function check($attachID)
 		// Is the file too big?
 		Utils::$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
 
-		if (!empty(Config::$modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > Config::$modSettings['attachmentSizeLimit'] * 1024)
-		{
-			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(Lang::numberFormat(Config::$modSettings['attachmentSizeLimit'], 0)));
+		if (!empty(Config::$modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > Config::$modSettings['attachmentSizeLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = ['file_too_big', [Lang::numberFormat(Config::$modSettings['attachmentSizeLimit'], 0)]];
 		}
 
 		// Check the total upload size for this post...
-		if (!empty(Config::$modSettings['attachmentPostLimit']) && Utils::$context['attachments']['total_size'] > Config::$modSettings['attachmentPostLimit'] * 1024)
-		{
-			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(Lang::numberFormat(Config::$modSettings['attachmentPostLimit'], 0), Lang::numberFormat(Config::$modSettings['attachmentPostLimit'] - ((Utils::$context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+		if (!empty(Config::$modSettings['attachmentPostLimit']) && Utils::$context['attachments']['total_size'] > Config::$modSettings['attachmentPostLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = ['attach_max_total_file_size', [Lang::numberFormat(Config::$modSettings['attachmentPostLimit'], 0), Lang::numberFormat(Config::$modSettings['attachmentPostLimit'] - ((Utils::$context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)]];
 		}
 
 		// Have we reached the maximum number of files we are allowed?
 		Utils::$context['attachments']['quantity']++;
 
 		// Set a max limit if none exists
-		if (empty(Config::$modSettings['attachmentNumPerPostLimit']) && Utils::$context['attachments']['quantity'] >= 50)
-		{
+		if (empty(Config::$modSettings['attachmentNumPerPostLimit']) && Utils::$context['attachments']['quantity'] >= 50) {
 			Config::$modSettings['attachmentNumPerPostLimit'] = 50;
 		}
 
-		if (!empty(Config::$modSettings['attachmentNumPerPostLimit']) && Utils::$context['attachments']['quantity'] > Config::$modSettings['attachmentNumPerPostLimit'])
-		{
-			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array(Config::$modSettings['attachmentNumPerPostLimit']));
+		if (!empty(Config::$modSettings['attachmentNumPerPostLimit']) && Utils::$context['attachments']['quantity'] > Config::$modSettings['attachmentNumPerPostLimit']) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = ['attachments_limit_per_post', [Config::$modSettings['attachmentNumPerPostLimit']]];
 		}
 
 		// File extension check
-		if (!empty(Config::$modSettings['attachmentCheckExtensions']))
-		{
+		if (!empty(Config::$modSettings['attachmentCheckExtensions'])) {
 			$allowed = explode(',', strtolower(Config::$modSettings['attachmentExtensions']));
 
-			foreach ($allowed as $k => $dummy)
+			foreach ($allowed as $k => $dummy) {
 				$allowed[$k] = trim($dummy);
+			}
 
-			if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
-			{
-				$allowed_extensions = strtr(strtolower(Config::$modSettings['attachmentExtensions']), array(',' => ', '));
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = array('cant_upload_type', array($allowed_extensions));
+			if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed)) {
+				$allowed_extensions = strtr(strtolower(Config::$modSettings['attachmentExtensions']), [',' => ', ']);
+				$_SESSION['temp_attachments'][$attachID]['errors'][] = ['cant_upload_type', [$allowed_extensions]];
 			}
 		}
 
 		// Undo the math if there's an error
-		if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
-		{
-			if (isset(Utils::$context['dir_size']))
+		if (!empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+			if (isset(Utils::$context['dir_size'])) {
 				Utils::$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+			}
 
-			if (isset(Utils::$context['dir_files']))
+			if (isset(Utils::$context['dir_files'])) {
 				Utils::$context['dir_files']--;
+			}
 
 			Utils::$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 
@@ -1387,8 +1318,7 @@ public static function create(&$attachmentOptions)
 		$image = new Image($attachmentOptions['tmp_name']);
 
 		// Source is empty for non-images.
-		if (!empty($image->source))
-		{
+		if (!empty($image->source)) {
 			// Make sure the MIME type is correct.
 			$attachmentOptions['mime_type'] = $image->mime_type;
 
@@ -1396,8 +1326,7 @@ public static function create(&$attachmentOptions)
 			$attachmentOptions['width'] = $image->width;
 			$attachmentOptions['height'] = $image->height;
 
-			if (in_array($image->orientation, array(5, 6, 7, 8)))
-			{
+			if (in_array($image->orientation, [5, 6, 7, 8])) {
 				$attachmentOptions['width'] = $image->height;
 				$attachmentOptions['height'] = $image->width;
 			}
@@ -1406,13 +1335,10 @@ public static function create(&$attachmentOptions)
 			$attachmentOptions['fileext'] = ltrim(image_type_to_extension($image->type), '.');
 
 			// Special exception: allow both 'jpg' and 'jpeg'.
-			if ($attachmentOptions['fileext'] === 'jpeg' && strtolower(pathinfo($attachmentOptions['name'], PATHINFO_EXTENSION)) === 'jpg')
-			{
+			if ($attachmentOptions['fileext'] === 'jpeg' && strtolower(pathinfo($attachmentOptions['name'], PATHINFO_EXTENSION)) === 'jpg') {
 				$attachmentOptions['fileext'] = pathinfo($attachmentOptions['name'], PATHINFO_EXTENSION);
 			}
-		}
-		else
-		{
+		} else {
 			$attachmentOptions['width'] = 0;
 			$attachmentOptions['height'] = 0;
 		}
@@ -1422,90 +1348,86 @@ public static function create(&$attachmentOptions)
 		// Fix up the supplied file name and extension.
 		$name_info = array_filter(pathinfo($attachmentOptions['name']), 'strlen');
 
-		if (strlen($attachmentOptions['fileext'] ?? '') > 8)
+		if (strlen($attachmentOptions['fileext'] ?? '') > 8) {
 			$attachmentOptions['fileext'] = '';
+		}
 
-		if (strlen($attachmentOptions['fileext'] ?? '') === 0)
-		{
+		if (strlen($attachmentOptions['fileext'] ?? '') === 0) {
 			$attachmentOptions['fileext'] = isset($name_info['extension']) && strlen($name_info['extension']) <= 8 ? $name_info['extension'] : '';
 		}
 
 		$attachmentOptions['name'] = ($name_info['filename'] ?? bin2hex(Utils::randomBytes(4))) . (strlen($attachmentOptions['fileext']) > 0 ? '.' . $attachmentOptions['fileext'] : '');
 
 		// Get the hash if no hash has been given yet.
-		if (empty($attachmentOptions['file_hash']))
-		{
+		if (empty($attachmentOptions['file_hash'])) {
 			$attachmentOptions['file_hash'] = self::createHash($attachmentOptions['tmp_name']);
 		}
 
 		// This defines which options to use for which columns in the insert query.
 		// Mods using the hook can add columns and even change the properties of existing columns,
 		// but if they delete one of these columns, it will be reset to the default defined here.
-		$attachmentStandardInserts = $attachmentInserts = array(
+		$attachmentStandardInserts = $attachmentInserts = [
 			// Format: 'column' => array('type', 'option')
-			'id_folder' => array('int', 'id_folder'),
-			'id_msg' => array('int', 'post'),
-			'filename' => array('string-255', 'name'),
-			'file_hash' => array('string-40', 'file_hash'),
-			'fileext' => array('string-8', 'fileext'),
-			'size' => array('int', 'size'),
-			'width' => array('int', 'width'),
-			'height' => array('int', 'height'),
-			'mime_type' => array('string-20', 'mime_type'),
-			'approved' => array('int', 'approved'),
-		);
+			'id_folder' => ['int', 'id_folder'],
+			'id_msg' => ['int', 'post'],
+			'filename' => ['string-255', 'name'],
+			'file_hash' => ['string-40', 'file_hash'],
+			'fileext' => ['string-8', 'fileext'],
+			'size' => ['int', 'size'],
+			'width' => ['int', 'width'],
+			'height' => ['int', 'height'],
+			'mime_type' => ['string-20', 'mime_type'],
+			'approved' => ['int', 'approved'],
+		];
 
 		// Last chance to change stuff!
-		IntegrationHook::call('integrate_createAttachment', array(&$attachmentOptions, &$attachmentInserts));
+		IntegrationHook::call('integrate_createAttachment', [&$attachmentOptions, &$attachmentInserts]);
 
 		// Make sure the folder is valid...
 		$tmp = is_array(Config::$modSettings['attachmentUploadDir']) ? Config::$modSettings['attachmentUploadDir'] : Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 
 		$folders = array_keys($tmp);
 
-		if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders))
-		{
+		if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) {
 			$attachmentOptions['id_folder'] = Config::$modSettings['currentAttachmentUploadDir'];
 		}
 
 		// Make sure all required columns are present, in case a mod screwed up.
-		foreach ($attachmentStandardInserts as $column => $insert_info)
-		{
-			if (!isset($attachmentInserts[$column]))
+		foreach ($attachmentStandardInserts as $column => $insert_info) {
+			if (!isset($attachmentInserts[$column])) {
 				$attachmentInserts[$column] = $insert_info;
+			}
 		}
 
 		// Set up the columns and values to insert, in the correct order.
-		$attachmentColumns = array();
-		$attachmentValues = array();
-		foreach ($attachmentInserts as $column => $insert_info)
-		{
+		$attachmentColumns = [];
+		$attachmentValues = [];
+
+		foreach ($attachmentInserts as $column => $insert_info) {
 			$attachmentColumns[$column] = $insert_info[0];
 
-			if (!empty($insert_info[0]) && $insert_info[0] == 'int')
-			{
+			if (!empty($insert_info[0]) && $insert_info[0] == 'int') {
 				$attachmentValues[] = (int) $attachmentOptions[$insert_info[1]];
-			}
-			else
-			{
+			} else {
 				$attachmentValues[] = $attachmentOptions[$insert_info[1]];
 			}
 		}
 
 		// Create the attachment in the database.
-		$attachmentOptions['id'] = Db::$db->insert('',
+		$attachmentOptions['id'] = Db::$db->insert(
+			'',
 			'{db_prefix}attachments',
 			$attachmentColumns,
 			$attachmentValues,
-			array('id_attach'),
-			1
+			['id_attach'],
+			1,
 		);
 
 		// Attachment couldn't be created.
-		if (empty($attachmentOptions['id']))
-		{
+		if (empty($attachmentOptions['id'])) {
 			Lang::load('Errors');
 			ErrorHandler::log(Lang::$txt['attachment_not_created'], 'general');
+
 			return false;
 		}
 
@@ -1514,57 +1436,48 @@ public static function create(&$attachmentOptions)
 		rename($attachmentOptions['tmp_name'], $attachmentOptions['destination']);
 
 		// If it's not approved then add to the approval queue.
-		if (!$attachmentOptions['approved'])
-		{
-			Db::$db->insert('',
+		if (!$attachmentOptions['approved']) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}approval_queue',
-				array(
+				[
 					'id_attach' => 'int', 'id_msg' => 'int',
-				),
-				array(
+				],
+				[
 					$attachmentOptions['id'], (int) $attachmentOptions['post'],
-				),
-				array()
+				],
+				[],
 			);
 
 			// Queue background notification task.
 			Db::$db->insert(
 				'insert',
 				'{db_prefix}background_tasks',
-				array(
-					'task_file' => 'string',
+				[
 					'task_class' => 'string',
 					'task_data' => 'string',
-					'claimed_time' => 'int'
-				),
-				array(
-						'$sourcedir/tasks/CreateAttachment_Notify.php',
-						'SMF\Tasks\CreateAttachment_Notify',
-						Utils::jsonEncode(
-							array(
-								'id' => $attachmentOptions['id'],
-							)
-						),
-					0
-				),
-				array(
-					'id_task'
-				)
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\CreateAttachment_Notify',
+					Utils::jsonEncode(['id' => $attachmentOptions['id']]),
+					0,
+				],
+				[
+					'id_task',
+				],
 			);
 		}
 
-		if (!$this->is_image || empty(Config::$modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		{
+		if (!$this->is_image || empty(Config::$modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) {
 			return true;
 		}
 
 		// Like thumbnails, do we?
-		if (!empty(Config::$modSettings['attachmentThumbWidth']) && !empty(Config::$modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > Config::$modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > Config::$modSettings['attachmentThumbHeight']))
-		{
+		if (!empty(Config::$modSettings['attachmentThumbWidth']) && !empty(Config::$modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > Config::$modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > Config::$modSettings['attachmentThumbHeight'])) {
 			$image = new Image($attachmentOptions['destination'], true);
 
-			if (($thumb = $image->createThumbnail(Config::$modSettings['attachmentThumbWidth'], Config::$modSettings['attachmentThumbHeight'])) !== false)
-			{
+			if (($thumb = $image->createThumbnail(Config::$modSettings['attachmentThumbWidth'], Config::$modSettings['attachmentThumbHeight'])) !== false) {
 				// Propagate our special handling for JPEGs to the thumbnail's extension, too.
 				$thumb_ext = $image->type === $thumb->type ? $attachmentOptions['fileext'] : ltrim(image_type_to_extension($thumb->type), '.');
 
@@ -1574,17 +1487,14 @@ public static function create(&$attachmentOptions)
 					&& Config::$modSettings['automanage_attachments'] == 1
 					&& !empty(Config::$modSettings['attachmentDirSizeLimit'])
 					|| !empty(Config::$modSettings['attachmentDirFileLimit'])
-				)
-				{
+				) {
 					Utils::$context['dir_size'] = isset(Utils::$context['dir_size']) ? Utils::$context['dir_size'] += $thumb->filesize : Utils::$context['dir_size'] = 0;
 
 					Utils::$context['dir_files'] = isset(Utils::$context['dir_files']) ? Utils::$context['dir_files']++ : Utils::$context['dir_files'] = 0;
 
 					// If the folder is full, try to create a new one and move the thumb to it.
-					if (Utils::$context['dir_size'] > Config::$modSettings['attachmentDirSizeLimit'] * 1024 || Utils::$context['dir_files'] + 2 > Config::$modSettings['attachmentDirFileLimit'])
-					{
-						if (self::automanageBySpace())
-						{
+					if (Utils::$context['dir_size'] > Config::$modSettings['attachmentDirSizeLimit'] * 1024 || Utils::$context['dir_files'] + 2 > Config::$modSettings['attachmentDirFileLimit']) {
+						if (self::automanageBySpace()) {
 							$thumb->move(Utils::$context['attach_dir'] . '/' . $thumb->pathinfo['basename']);
 
 							Utils::$context['dir_size'] = 0;
@@ -1594,15 +1504,15 @@ public static function create(&$attachmentOptions)
 				}
 
 				// If a new folder has been already created. Gotta move this thumb there then.
-				if (Config::$modSettings['currentAttachmentUploadDir'] != $attachmentOptions['id_folder'])
-				{
+				if (Config::$modSettings['currentAttachmentUploadDir'] != $attachmentOptions['id_folder']) {
 					$thumb->move(Utils::$context['attach_dir'] . '/' . $thumb->pathinfo['basename']);
 				}
 
 				// To the database we go!
-				$attachmentOptions['thumb'] = Db::$db->insert('',
+				$attachmentOptions['thumb'] = Db::$db->insert(
+					'',
 					'{db_prefix}attachments',
-					array(
+					[
 						'id_folder' => 'int',
 						'id_msg' => 'int',
 						'attachment_type' => 'int',
@@ -1614,8 +1524,8 @@ public static function create(&$attachmentOptions)
 						'height' => 'int',
 						'mime_type' => 'string-20',
 						'approved' => 'int',
-					),
-					array(
+					],
+					[
 						Config::$modSettings['currentAttachmentUploadDir'],
 						(int) $attachmentOptions['post'],
 						3,
@@ -1627,21 +1537,21 @@ public static function create(&$attachmentOptions)
 						$thumb->height,
 						$thumb->mime_type,
 						(int) $attachmentOptions['approved'],
-					),
-					array('id_attach'),
-					1
+					],
+					['id_attach'],
+					1,
 				);
 
-				if (!empty($attachmentOptions['thumb']))
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}attachments
+				if (!empty($attachmentOptions['thumb'])) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}attachments
 						SET id_thumb = {int:id_thumb}
 						WHERE id_attach = {int:id_attach}',
-						array(
+						[
 							'id_thumb' => $attachmentOptions['thumb'],
 							'id_attach' => $attachmentOptions['id'],
-						)
+						],
 					);
 
 					$thumb->move(self::getFilePath($attachmentOptions['thumb']));
@@ -1658,30 +1568,33 @@ public static function create(&$attachmentOptions)
 	 * @param $attachIDs array of attachment IDs to assign.
 	 * @param $msgID integer the message ID.
 	 *
-	 * @return boolean false on error or missing params.
+	 * @return bool false on error or missing params.
 	 */
-	public static function assign($attachIDs = array(), $msgID = 0)
+	public static function assign($attachIDs = [], $msgID = 0)
 	{
 		// Oh, come on!
-		if (empty($attachIDs) || empty($msgID))
+		if (empty($attachIDs) || empty($msgID)) {
 			return false;
+		}
 
 		// "I see what is right and approve, but I do what is wrong."
-		IntegrationHook::call('integrate_assign_attachments', array(&$attachIDs, &$msgID));
+		IntegrationHook::call('integrate_assign_attachments', [&$attachIDs, &$msgID]);
 
 		// One last check
-		if (empty($attachIDs))
+		if (empty($attachIDs)) {
 			return false;
+		}
 
 		// Perform.
-		Db::$db->query('', '
-			UPDATE {db_prefix}attachments
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}attachments
 			SET id_msg = {int:id_msg}
 			WHERE id_attach IN ({array_int:attach_ids})',
-			array(
+			[
 				'id_msg' => $msgID,
 				'attach_ids' => $attachIDs,
-			)
+			],
 		);
 
 		return true;
@@ -1695,81 +1608,88 @@ public static function assign($attachIDs = array(), $msgID = 0)
 	 */
 	public static function approve($attachments): bool
 	{
-		if (empty($attachments))
+		if (empty($attachments)) {
 			return false;
+		}
 
 		// For safety, check for thumbnails...
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				a.id_attach, a.id_member, COALESCE(thumb.id_attach, 0) AS id_thumb
 			FROM {db_prefix}attachments AS a
 				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)
 			WHERE a.id_attach IN ({array_int:attachments})
 				AND a.attachment_type = {int:attachment_type}',
-			array(
+			[
 				'attachments' => $attachments,
 				'attachment_type' => 0,
-			)
+			],
 		);
-		$attachments = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$attachments = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Update the thumbnail too...
-			if (!empty($row['id_thumb']))
+			if (!empty($row['id_thumb'])) {
 				$attachments[] = $row['id_thumb'];
+			}
 
 			$attachments[] = $row['id_attach'];
 		}
 		Db::$db->free_result($request);
 
-		if (empty($attachments))
+		if (empty($attachments)) {
 			return false;
+		}
 
 		// Approving an attachment is not hard - it's easy.
-		Db::$db->query('', '
-			UPDATE {db_prefix}attachments
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}attachments
 			SET approved = {int:is_approved}
 			WHERE id_attach IN ({array_int:attachments})',
-			array(
+			[
 				'attachments' => $attachments,
 				'is_approved' => 1,
-			)
+			],
 		);
 
 		// In order to log the attachments, we really need their message and filename
-		$request = Db::$db->query('', '
-			SELECT m.id_msg, a.filename
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_msg, a.filename
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg)
 			WHERE a.id_attach IN ({array_int:attachments})
 				AND a.attachment_type = {int:attachment_type}',
-			array(
+			[
 				'attachments' => $attachments,
 				'attachment_type' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Logging::logAction(
 				'approve_attach',
-				array(
+				[
 					'message' => $row['id_msg'],
-					'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', Utils::htmlspecialchars($row['filename'])),
-				)
+					'filename' => preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#$1;', Utils::htmlspecialchars($row['filename'])),
+				],
 			);
 		}
 		Db::$db->free_result($request);
 
 		// Remove from the approval queue.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}approval_queue
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}approval_queue
 			WHERE id_attach IN ({array_int:attachments})',
-			array(
+			[
 				'attachments' => $attachments,
-			)
+			],
 		);
 
-		IntegrationHook::call('integrate_approve_attachments', array($attachments));
+		IntegrationHook::call('integrate_approve_attachments', [$attachments]);
 
 		return true;
 	}
@@ -1791,62 +1711,51 @@ public static function approve($attachments): bool
 	public static function remove($condition, $query_type = '', $return_affected_messages = false, $autoThumbRemoval = true)
 	{
 		// @todo This might need more work!
-		$new_condition = array();
-		$query_parameter = array(
+		$new_condition = [];
+		$query_parameter = [
 			'thumb_attachment_type' => 3,
-		);
-		$do_logging = array();
+		];
+		$do_logging = [];
 
-		if (is_array($condition))
-		{
-			foreach ($condition as $real_type => $restriction)
-			{
+		if (is_array($condition)) {
+			foreach ($condition as $real_type => $restriction) {
 				// Doing a NOT?
 				$is_not = substr($real_type, 0, 4) == 'not_';
 				$type = $is_not ? substr($real_type, 4) : $real_type;
 
-				if (in_array($type, array('id_member', 'id_attach', 'id_msg')))
-				{
+				if (in_array($type, ['id_member', 'id_attach', 'id_msg'])) {
 					$new_condition[] = 'a.' . $type . ($is_not ? ' NOT' : '') . ' IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
-				}
-				elseif ($type == 'attachment_type')
-				{
+				} elseif ($type == 'attachment_type') {
 					$new_condition[] = 'a.attachment_type = {int:' . $real_type . '}';
-				}
-				elseif ($type == 'poster_time')
-				{
+				} elseif ($type == 'poster_time') {
 					$new_condition[] = 'm.poster_time < {int:' . $real_type . '}';
-				}
-				elseif ($type == 'last_login')
-				{
+				} elseif ($type == 'last_login') {
 					$new_condition[] = 'mem.last_login < {int:' . $real_type . '}';
-				}
-				elseif ($type == 'size')
-				{
+				} elseif ($type == 'size') {
 					$new_condition[] = 'a.size > {int:' . $real_type . '}';
-				}
-				elseif ($type == 'id_topic')
-				{
+				} elseif ($type == 'id_topic') {
 					$new_condition[] = 'm.id_topic IN (' . (is_array($restriction) ? '{array_int:' . $real_type . '}' : '{int:' . $real_type . '}') . ')';
 				}
 
 				// Add the parameter!
 				$query_parameter[$real_type] = $restriction;
 
-				if ($type == 'do_logging')
+				if ($type == 'do_logging') {
 					$do_logging = $condition['id_attach'];
+				}
 			}
 			$condition = implode(' AND ', $new_condition);
 		}
 
 		// Delete it only if it exists...
-		$msgs = array();
-		$attach = array();
-		$parents = array();
+		$msgs = [];
+		$attach = [];
+		$parents = [];
 
 		// Get all the attachment names and id_msg's.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				a.id_folder, a.filename, a.file_hash, a.attachment_type, a.id_attach, a.id_member' . ($query_type == 'messages' ? ', m.id_msg' : ', a.id_msg') . ',
 				thumb.id_folder AS thumb_folder, COALESCE(thumb.id_attach, 0) AS id_thumb, thumb.filename AS thumb_filename, thumb.file_hash AS thumb_file_hash, thumb_parent.id_attach AS id_parent
 			FROM {db_prefix}attachments AS a' . ($query_type == 'members' ? '
@@ -1855,30 +1764,27 @@ public static function remove($condition, $query_type = '', $return_affected_mes
 				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)
 				LEFT JOIN {db_prefix}attachments AS thumb_parent ON (thumb.attachment_type = {int:thumb_attachment_type} AND thumb_parent.id_thumb = a.id_attach)
 			WHERE ' . $condition,
-			$query_parameter
+			$query_parameter,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Figure out the "encrypted" filename and unlink it ;).
-			if ($row['attachment_type'] == 1)
-			{
+			if ($row['attachment_type'] == 1) {
 				// if attachment_type = 1, it's... an avatar in a custom avatars directory.
 				// wasn't it obvious? :P
 				// @todo look again at this.
 				@unlink(Config::$modSettings['custom_avatar_dir'] . '/' . $row['filename']);
-			}
-			else
-			{
+			} else {
 				$filename = Attachment::getFilePath($row['id_attach']);
 				@unlink($filename);
 
 				// If this was a thumb, the parent attachment should know about it.
-				if (!empty($row['id_parent']))
+				if (!empty($row['id_parent'])) {
 					$parents[] = $row['id_parent'];
+				}
 
 				// If this attachments has a thumb, remove it as well.
-				if (!empty($row['id_thumb']) && $autoThumbRemoval)
-				{
+				if (!empty($row['id_thumb']) && $autoThumbRemoval) {
 					$thumb_filename = Attachment::getFilePath($row['id_thumb']);
 					@unlink($thumb_filename);
 					$attach[] = $row['id_thumb'];
@@ -1886,8 +1792,9 @@ public static function remove($condition, $query_type = '', $return_affected_mes
 			}
 
 			// Make a list.
-			if ($return_affected_messages && empty($row['attachment_type']))
+			if ($return_affected_messages && empty($row['attachment_type'])) {
 				$msgs[] = $row['id_msg'];
+			}
 
 			$attach[] = $row['id_attach'];
 		}
@@ -1896,61 +1803,62 @@ public static function remove($condition, $query_type = '', $return_affected_mes
 		// Removed attachments don't have to be updated anymore.
 		$parents = array_diff($parents, $attach);
 
-		if (!empty($parents))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}attachments
+		if (!empty($parents)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}attachments
 				SET id_thumb = {int:no_thumb}
 				WHERE id_attach IN ({array_int:parent_attachments})',
-				array(
+				[
 					'parent_attachments' => $parents,
 					'no_thumb' => 0,
-				)
+				],
 			);
 		}
 
-		if (!empty($do_logging))
-		{
+		if (!empty($do_logging)) {
 			// In order to log the attachments, we really need their message and filename
-			$request = Db::$db->query('', '
-				SELECT m.id_msg, a.filename
+			$request = Db::$db->query(
+				'',
+				'SELECT m.id_msg, a.filename
 				FROM {db_prefix}attachments AS a
 					INNER JOIN {db_prefix}messages AS m ON (a.id_msg = m.id_msg)
 				WHERE a.id_attach IN ({array_int:attachments})
 					AND a.attachment_type = {int:attachment_type}',
-				array(
+				[
 					'attachments' => $do_logging,
 					'attachment_type' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Logging::logAction(
 					'remove_attach',
-					array(
+					[
 						'message' => $row['id_msg'],
-						'filename' => preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', Utils::htmlspecialchars($row['filename'])),
-					)
+						'filename' => preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#$1;', Utils::htmlspecialchars($row['filename'])),
+					],
 				);
 			}
 			Db::$db->free_result($request);
 		}
 
-		if (!empty($attach))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}attachments
+		if (!empty($attach)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}attachments
 				WHERE id_attach IN ({array_int:attachment_list})',
-				array(
+				[
 					'attachment_list' => $attach,
-				)
+				],
 			);
 		}
 
-		IntegrationHook::call('integrate_remove_attachments', array($attach));
+		IntegrationHook::call('integrate_remove_attachments', [$attach]);
 
-		if ($return_affected_messages)
+		if ($return_affected_messages) {
 			return array_unique($msgs);
+		}
 	}
 
 	/**
@@ -1964,39 +1872,41 @@ public static function parseAttachBBC($attachID = 0)
 	{
 		static $view_attachment_boards;
 
-		if (!isset($view_attachment_boards))
+		if (!isset($view_attachment_boards)) {
 			$view_attachment_boards = User::$me->boardsAllowedTo('view_attachments');
+		}
 
 		// Meh...
-		if (empty($attachID))
+		if (empty($attachID)) {
 			return 'attachments_no_data_loaded';
+		}
 
 		// Make it easy.
 		$msgID = !empty($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0;
 
 		// Perhaps someone else wants to do the honors? Yes, this also includes dealing with previews ;)
-		$externalParse = IntegrationHook::call('integrate_pre_parseAttachBBC', array($attachID, $msgID));
+		$externalParse = IntegrationHook::call('integrate_pre_parseAttachBBC', [$attachID, $msgID]);
 
 		// "I am innocent of the blood of this just person: see ye to it."
-		if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse)))
+		if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) {
 			return $externalParse;
+		}
 
 		// Are attachments enabled?
-		if (empty(Config::$modSettings['attachmentEnable']))
+		if (empty(Config::$modSettings['attachmentEnable'])) {
 			return 'attachments_not_enable';
+		}
 
-		$check_board_perms = !isset($_SESSION['attachments_can_preview'][$attachID]) && $view_attachment_boards !== array(0);
+		$check_board_perms = !isset($_SESSION['attachments_can_preview'][$attachID]) && $view_attachment_boards !== [0];
 
 		// There is always the chance someone else has already done our dirty work...
 		// If so, all pertinent checks were already done. Hopefully...
-		if (!empty(Utils::$context['current_attachments']) && !empty(Utils::$context['current_attachments'][$attachID]))
-		{
+		if (!empty(Utils::$context['current_attachments']) && !empty(Utils::$context['current_attachments'][$attachID])) {
 			return Utils::$context['current_attachments'][$attachID];
 		}
 
 		// Can the user view attachments on this board?
-		if ($check_board_perms && !empty(Board::$info->id) && !in_array(Board::$info->id, $view_attachment_boards))
-		{
+		if ($check_board_perms && !empty(Board::$info->id) && !in_array(Board::$info->id, $view_attachment_boards)) {
 			return 'attachments_not_allowed_to_see';
 		}
 
@@ -2004,30 +1914,32 @@ public static function parseAttachBBC($attachID = 0)
 		$attachInfo = self::getAttachMsgInfo($attachID);
 
 		// There is always the chance this attachment no longer exists or isn't associated to a message anymore...
-		if (!isset($attachInfo['id']))
+		if (!isset($attachInfo['id'])) {
 			return 'attachments_no_data_loaded';
+		}
 
-		if (empty($attachInfo['msg']) && empty(Utils::$context['preview_message']))
+		if (empty($attachInfo['msg']) && empty(Utils::$context['preview_message'])) {
 			return 'attachments_no_msg_associated';
+		}
 
 		// Can the user view attachments on the board that holds the attachment's original post?
 		// (This matters when one post quotes another on a different board.)
-		if ($check_board_perms && !in_array($attachInfo['board'], $view_attachment_boards))
+		if ($check_board_perms && !in_array($attachInfo['board'], $view_attachment_boards)) {
 			return 'attachments_not_allowed_to_see';
+		}
 
-		if (empty(Utils::$context['loaded_attachments'][$attachInfo['msg']]))
-			self::prepareByMsg(array($attachInfo['msg']));
+		if (empty(Utils::$context['loaded_attachments'][$attachInfo['msg']])) {
+			self::prepareByMsg([$attachInfo['msg']]);
+		}
 
-		if (isset(Utils::$context['loaded_attachments'][$attachInfo['msg']][$attachID]))
+		if (isset(Utils::$context['loaded_attachments'][$attachInfo['msg']][$attachID])) {
 			$attachContext = Utils::$context['loaded_attachments'][$attachInfo['msg']][$attachID];
+		}
 
 		// In case the user manually typed the thumbnail's ID into the BBC
-		elseif (!empty(Utils::$context['loaded_attachments'][$attachInfo['msg']]))
-		{
-			foreach (Utils::$context['loaded_attachments'][$attachInfo['msg']] as $foundAttachID => $foundAttach)
-			{
-				if (array_key_exists('id_thumb', $foundAttach) && $foundAttach['id_thumb'] == $attachID)
-				{
+		elseif (!empty(Utils::$context['loaded_attachments'][$attachInfo['msg']])) {
+			foreach (Utils::$context['loaded_attachments'][$attachInfo['msg']] as $foundAttachID => $foundAttach) {
+				if (array_key_exists('id_thumb', $foundAttach) && $foundAttach['id_thumb'] == $attachID) {
 					$attachContext = Utils::$context['loaded_attachments'][$attachInfo['msg']][$foundAttachID];
 					$attachID = $foundAttachID;
 					break;
@@ -2036,48 +1948,42 @@ public static function parseAttachBBC($attachID = 0)
 		}
 
 		// Load this particular attach's context.
-		if (!empty($attachContext))
-		{
+		if (!empty($attachContext)) {
 			// Skip unapproved attachment, unless they belong to the user or the user can approve them.
 			if (
 				!Utils::$context['loaded_attachments'][$attachInfo['msg']][$attachID]['approved']
 				&& Config::$modSettings['postmod_active']
 				&& !User::$me->allowedTo('approve_posts')
 				&& Utils::$context['loaded_attachments'][$attachInfo['msg']][$attachID]['id_member'] != User::$me->id
-			)
-			{
+			) {
 				unset(Utils::$context['loaded_attachments'][$attachInfo['msg']][$attachID]);
+
 				return 'attachments_unapproved';
 			}
 
 			$attachLoaded = self::loadAttachmentContext($attachContext['id_msg'], Utils::$context['loaded_attachments']);
-		}
-		else
-		{
+		} else {
 			return 'attachments_no_data_loaded';
 		}
 
-		if (empty($attachLoaded))
-		{
+		if (empty($attachLoaded)) {
 			return 'attachments_no_data_loaded';
 		}
-		else
-		{
-			$attachContext = $attachLoaded[$attachID];
-		}
+
+		$attachContext = $attachLoaded[$attachID];
 
 		// It's theoretically possible that prepareByMsg() changed the board id, so check again.
-		if ($check_board_perms && !in_array($attachContext['board'], $view_attachment_boards))
+		if ($check_board_perms && !in_array($attachContext['board'], $view_attachment_boards)) {
 			return 'attachments_not_allowed_to_see';
+		}
 
 		// You may or may not want to show this under the post.
-		if (!empty(Config::$modSettings['dont_show_attach_under_post']) && !isset(Utils::$context['show_attach_under_post'][$attachID]))
-		{
+		if (!empty(Config::$modSettings['dont_show_attach_under_post']) && !isset(Utils::$context['show_attach_under_post'][$attachID])) {
 			Utils::$context['show_attach_under_post'][$attachID] = $attachID;
 		}
 
 		// Last minute changes?
-		IntegrationHook::call('integrate_post_parseAttachBBC', array(&$attachContext));
+		IntegrationHook::call('integrate_post_parseAttachBBC', [&$attachContext]);
 
 		// Don't do any logic with the loaded data, leave it to whoever called this function.
 		return $attachContext;
@@ -2091,15 +1997,17 @@ public static function parseAttachBBC($attachID = 0)
 	 */
 	public static function getAttachMsgInfo($attachID)
 	{
-		if (empty($attachID))
-			return array();
+		if (empty($attachID)) {
+			return [];
+		}
 
-		if (!isset(Utils::$context['loaded_attachments']))
-			Utils::$context['loaded_attachments'] = array();
+		if (!isset(Utils::$context['loaded_attachments'])) {
+			Utils::$context['loaded_attachments'] = [];
+		}
 
 		self::load($attachID);
 
-		return self::$loaded[$attachID] ?? array();
+		return self::$loaded[$attachID] ?? [];
 	}
 
 	/**
@@ -2114,18 +2022,17 @@ public static function getAttachMsgInfo($attachID)
 	 */
 	public static function loadAttachmentContext($id_msg, $attachments)
 	{
-		if (empty($attachments) || empty($attachments[$id_msg]))
-			return array();
+		if (empty($attachments) || empty($attachments[$id_msg])) {
+			return [];
+		}
 
 		// Set up the attachment info - based on code by Meriadoc.
-		$attachmentData = array();
+		$attachmentData = [];
 		$have_unapproved = false;
 
-		if (isset($attachments[$id_msg]) && !empty(Config::$modSettings['attachmentEnable']))
-		{
-			foreach ($attachments[$id_msg] as $i => $attachment)
-			{
-				$attachmentData[$i] = array(
+		if (isset($attachments[$id_msg]) && !empty(Config::$modSettings['attachmentEnable'])) {
+			foreach ($attachments[$id_msg] as $i => $attachment) {
+				$attachmentData[$i] = [
 					'id' => $attachment['id_attach'],
 					'name' => Utils::entityFix(Utils::htmlspecialchars(Utils::htmlspecialcharsDecode($attachment['filename']))),
 					'downloads' => $attachment['downloads'],
@@ -2138,14 +2045,16 @@ public static function loadAttachmentContext($id_msg, $attachments)
 					'topic' => $attachment['topic'],
 					'board' => $attachment['board'],
 					'mime_type' => $attachment['mime_type'],
-				);
+				];
 
 				// If something is unapproved we'll note it so we can sort them.
-				if (!$attachment['approved'])
+				if (!$attachment['approved']) {
 					$have_unapproved = true;
+				}
 
-				if (!$attachmentData[$i]['is_image'])
+				if (!$attachmentData[$i]['is_image']) {
 					continue;
+				}
 
 				$attachmentData[$i]['real_width'] = $attachment['width'];
 				$attachmentData[$i]['width'] = $attachment['width'];
@@ -2162,8 +2071,7 @@ public static function loadAttachmentContext($id_msg, $attachments)
 						$attachment['width'] > Config::$modSettings['attachmentThumbWidth']
 						|| $attachment['height'] > Config::$modSettings['attachmentThumbHeight']
 					)
-					&& strlen($attachment['filename']) < 249)
-				{
+					&& strlen($attachment['filename']) < 249) {
 					// A proper thumb doesn't exist yet? Create one!
 					if (
 						empty($attachment['id_thumb'])
@@ -2173,26 +2081,20 @@ public static function loadAttachmentContext($id_msg, $attachments)
 							$attachment['thumb_width'] < Config::$modSettings['attachmentThumbWidth']
 							&& $attachment['thumb_height'] < Config::$modSettings['attachmentThumbHeight']
 						)
-					)
-					{
+					) {
 						$filename = self::getFilePath($attachment['id_attach']);
 
 						$image = new Image($filename, true);
 
-						if (!empty($image->source) && ($thumb = $image->createThumbnail(Config::$modSettings['attachmentThumbWidth'], Config::$modSettings['attachmentThumbHeight'])) !== false)
-						{
+						if (!empty($image->source) && ($thumb = $image->createThumbnail(Config::$modSettings['attachmentThumbWidth'], Config::$modSettings['attachmentThumbHeight'])) !== false) {
 							// So what folder are we putting this image in?
-							if (!empty(Config::$modSettings['currentAttachmentUploadDir']))
-							{
-								if (!is_array(Config::$modSettings['attachmentUploadDir']))
-								{
+							if (!empty(Config::$modSettings['currentAttachmentUploadDir'])) {
+								if (!is_array(Config::$modSettings['attachmentUploadDir'])) {
 									Config::$modSettings['attachmentUploadDir'] = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 								}
 
 								$id_folder_thumb = Config::$modSettings['currentAttachmentUploadDir'];
-							}
-							else
-							{
+							} else {
 								$id_folder_thumb = 1;
 							}
 
@@ -2204,9 +2106,10 @@ public static function loadAttachmentContext($id_msg, $attachments)
 							$thumb_ext = $image->type === $thumb->type ? $attachment['fileext'] : ltrim(image_type_to_extension($thumb->type), '.');
 
 							// Add this beauty to the database.
-							$attachment['id_thumb'] = Db::$db->insert('',
+							$attachment['id_thumb'] = Db::$db->insert(
+								'',
 								'{db_prefix}attachments',
-								array(
+								[
 									'id_folder' => 'int',
 									'id_msg' => 'int',
 									'attachment_type' => 'int',
@@ -2217,8 +2120,8 @@ public static function loadAttachmentContext($id_msg, $attachments)
 									'height' => 'int',
 									'fileext' => 'string',
 									'mime_type' => 'string',
-								),
-								array(
+								],
+								[
 									$id_folder_thumb,
 									$id_msg,
 									3,
@@ -2229,48 +2132,45 @@ public static function loadAttachmentContext($id_msg, $attachments)
 									$thumb->height,
 									$thumb_ext,
 									$thumb->mime_type,
-								),
-								array('id_attach'),
-								1
+								],
+								['id_attach'],
+								1,
 							);
 
-							if (!empty($attachment['id_thumb']))
-							{
-								Db::$db->query('', '
-									UPDATE {db_prefix}attachments
+							if (!empty($attachment['id_thumb'])) {
+								Db::$db->query(
+									'',
+									'UPDATE {db_prefix}attachments
 									SET id_thumb = {int:id_thumb}
 									WHERE id_attach = {int:id_attach}',
-									array(
+									[
 										'id_thumb' => $attachment['id_thumb'],
 										'id_attach' => $attachment['id_attach'],
-									)
+									],
 								);
 
 								$thumb->move(self::getFilePath($attachment['id_thumb']));
 
 								// Do we need to remove an old thumbnail?
-								if (!empty($old_id_thumb))
-								{
-									self::remove(array('id_attach' => $old_id_thumb), '', false, false);
+								if (!empty($old_id_thumb)) {
+									self::remove(['id_attach' => $old_id_thumb], '', false, false);
 								}
 							}
 						}
 					}
 
 					// Only adjust dimensions on successful thumbnail creation.
-					if (!empty($attachment['thumb_width']) && !empty($attachment['thumb_height']))
-					{
+					if (!empty($attachment['thumb_width']) && !empty($attachment['thumb_height'])) {
 						$attachmentData[$i]['width'] = $attachment['thumb_width'];
 						$attachmentData[$i]['height'] = $attachment['thumb_height'];
 					}
 				}
 
-				if (!empty($attachment['id_thumb']))
-				{
-					$attachmentData[$i]['thumbnail'] = array(
+				if (!empty($attachment['id_thumb'])) {
+					$attachmentData[$i]['thumbnail'] = [
 						'id' => $attachment['id_thumb'],
 						'href' => Config::$scripturl . '?action=dlattach;attach=' . $attachment['id_thumb'] . ';image;thumb',
-					);
+					];
 				}
 
 				$attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']);
@@ -2288,27 +2188,21 @@ public static function loadAttachmentContext($id_msg, $attachments)
 							&& $attachment['height'] > Config::$modSettings['max_image_height']
 						)
 					)
-				)
-				{
+				) {
 					if (
 						!empty(Config::$modSettings['max_image_width'])
 						&& (
 							empty(Config::$modSettings['max_image_height'])
 							|| $attachment['height'] * Config::$modSettings['max_image_width'] / $attachment['width'] <= Config::$modSettings['max_image_height']
 						)
-					)
-					{
+					) {
 						$attachmentData[$i]['width'] = Config::$modSettings['max_image_width'];
 						$attachmentData[$i]['height'] = floor($attachment['height'] * Config::$modSettings['max_image_width'] / $attachment['width']);
-					}
-					elseif (!empty(Config::$modSettings['max_image_width']))
-					{
+					} elseif (!empty(Config::$modSettings['max_image_width'])) {
 						$attachmentData[$i]['width'] = floor($attachment['width'] * Config::$modSettings['max_image_height'] / $attachment['height']);
 						$attachmentData[$i]['height'] = Config::$modSettings['max_image_height'];
 					}
-				}
-				elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
-				{
+				} elseif ($attachmentData[$i]['thumbnail']['has_thumb']) {
 					// If the image is too large to show inline, make it a popup.
 					if (
 						(
@@ -2319,25 +2213,21 @@ public static function loadAttachmentContext($id_msg, $attachments)
 							!empty(Config::$modSettings['max_image_height'])
 							&& $attachmentData[$i]['real_height'] > Config::$modSettings['max_image_height']
 						)
-					)
-					{
+					) {
 						$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-					}
-					else
-					{
+					} else {
 						$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
 					}
 				}
 
-				if (!$attachmentData[$i]['thumbnail']['has_thumb'])
+				if (!$attachmentData[$i]['thumbnail']['has_thumb']) {
 					$attachmentData[$i]['downloads']++;
+				}
 
 				// Describe undefined dimensions as "unknown".
 				// This can happen if an uploaded SVG is missing some key data.
-				foreach (array('real_width', 'real_height') as $key)
-				{
-					if (!isset($attachmentData[$i][$key]) || $attachmentData[$i][$key] === INF)
-					{
+				foreach (['real_width', 'real_height'] as $key) {
+					if (!isset($attachmentData[$i][$key]) || $attachmentData[$i][$key] === INF) {
 						loadLanguage('Admin');
 						$attachmentData[$i][$key] = ' (' . $txt['unknown'] . ') ';
 					}
@@ -2346,17 +2236,16 @@ public static function loadAttachmentContext($id_msg, $attachments)
 		}
 
 		// Do we need to instigate a sort?
-		if ($have_unapproved)
-		{
+		if ($have_unapproved) {
 			uasort(
 				$attachmentData,
-				function($a, $b)
-				{
-					if ($a['is_approved'] == $b['is_approved'])
+				function ($a, $b) {
+					if ($a['is_approved'] == $b['is_approved']) {
 						return 0;
+					}
 
 					return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
-				}
+				},
 			);
 		}
 
@@ -2368,41 +2257,37 @@ function($a, $b)
 	 *
 	 * @param int array $msgIDs the message ID to load info from.
 	 *
-	 * @return void
 	 */
 	public static function prepareByMsg($msgIDs)
 	{
-		if (empty(Utils::$context['loaded_attachments']))
-		{
-			Utils::$context['loaded_attachments'] = array();
+		if (empty(Utils::$context['loaded_attachments'])) {
+			Utils::$context['loaded_attachments'] = [];
 		}
 		// Remove all $msgIDs that we already processed
-		else
-		{
-			$msgIDs = array_diff($msgIDs, array_keys(Utils::$context['loaded_attachments']), array(0));
+		else {
+			$msgIDs = array_diff($msgIDs, array_keys(Utils::$context['loaded_attachments']), [0]);
 		}
 
 		// Ensure that $msgIDs doesn't contain zero or non-integers.
 		$msgIDs = array_filter(array_map('intval', $msgIDs));
 
-		if (!empty($msgIDs) || !empty($_SESSION['attachments_can_preview']))
-		{
+		if (!empty($msgIDs) || !empty($_SESSION['attachments_can_preview'])) {
 			$get_thumbs = !empty(Config::$modSettings['attachmentShowImages']) && !empty(Config::$modSettings['attachmentThumbnails']);
 
-			if (!empty($msgIDs))
-			{
+			if (!empty($msgIDs)) {
 				$loaded = self::loadByMsg($msgIDs, self::APPROVED_TRUE, self::TYPE_STANDARD, $get_thumbs);
 
-				foreach ($loaded as $id => $attachment)
+				foreach ($loaded as $id => $attachment) {
 					Utils::$context['loaded_attachments'][$attachment->msg][$id] = $attachment;
+				}
 			}
 
-			if (!empty($_SESSION['attachments_can_preview']))
-			{
+			if (!empty($_SESSION['attachments_can_preview'])) {
 				$loaded = self::load(array_keys(array_filter($_SESSION['attachments_can_preview'])), self::APPROVED_TRUE, self::TYPE_STANDARD, $get_thumbs);
 
-				foreach ($loaded as $id => $attachment)
+				foreach ($loaded as $id => $attachment) {
 					Utils::$context['loaded_attachments'][$attachment->msg][$id] = $attachment;
+				}
 			}
 		}
 	}
@@ -2419,16 +2304,11 @@ public static function prepareByMsg($msgIDs)
 	 */
 	public static function createHash(string $input = ''): string
 	{
-		if (is_file($input))
-		{
+		if (is_file($input)) {
 			$hash = hash_hmac_file('sha1', $input, Config::$image_proxy_secret);
-		}
-		elseif (strlen($input) > 0)
-		{
+		} elseif (strlen($input) > 0) {
 			$hash = hash_hmac('sha1', $input, Config::$image_proxy_secret);
-		}
-		else
-		{
+		} else {
 			$hash = bin2hex(Utils::randomBytes(20));
 		}
 
@@ -2473,8 +2353,9 @@ public static function getFilePath(int $id): string
 	public static function getAttachmentFilename($filename, $attachment_id, $dir = null, $new = false, $file_hash = '')
 	{
 		// Just make up a nice hash...
-		if ($new || empty($attachment_id))
+		if ($new || empty($attachment_id)) {
 			return self::createHash();
+		}
 
 		return self::getFilePath($attachment_id);
 	}
@@ -2488,28 +2369,27 @@ public static function getAttachmentFilename($filename, $attachment_id, $dir = n
 	 */
 	protected function setPath(): void
 	{
-		if (empty($this->id) || empty($this->file_hash))
+		if (empty($this->id) || empty($this->file_hash)) {
 			return;
+		}
 
 		// Decode the JSON string to an array.
-		if (!is_array(Config::$modSettings['attachmentUploadDir']))
-		{
+		if (!is_array(Config::$modSettings['attachmentUploadDir'])) {
 			$temp = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 
-			if (!is_null($temp))
+			if (!is_null($temp)) {
 				Config::$modSettings['attachmentUploadDir'] = $temp;
+			}
 		}
 
 		// Are we using multiple directories?
-		if (is_array(Config::$modSettings['attachmentUploadDir']))
-		{
-			if (!isset(Config::$modSettings['attachmentUploadDir'][$this->folder]))
+		if (is_array(Config::$modSettings['attachmentUploadDir'])) {
+			if (!isset(Config::$modSettings['attachmentUploadDir'][$this->folder])) {
 				return;
+			}
 
 			$dir = Config::$modSettings['attachmentUploadDir'][$this->folder];
-		}
-		else
-		{
+		} else {
 			$dir = Config::$modSettings['attachmentUploadDir'];
 		}
 
@@ -2532,15 +2412,16 @@ protected static function isPathAllowed($path)
 	{
 		$open_basedir = ini_get('open_basedir');
 
-		if (empty($open_basedir))
+		if (empty($open_basedir)) {
 			return true;
+		}
 
 		$restricted_paths = explode(PATH_SEPARATOR, $open_basedir);
 
-		foreach ($restricted_paths as $restricted_path)
-		{
-			if (mb_strpos($path, $restricted_path) === 0)
+		foreach ($restricted_paths as $restricted_path) {
+			if (mb_strpos($path, $restricted_path) === 0) {
 				return true;
+			}
 		}
 
 		return false;
@@ -2562,17 +2443,16 @@ protected static function getDirectoryTreeElements($directory)
 				* in Windows we need to explode for both \ and /
 				* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 		*/
-		if (DIRECTORY_SEPARATOR === '\\')
-		{
+		if (DIRECTORY_SEPARATOR === '\\') {
 			$tree = preg_split('#[\\\/]#', $directory);
-		}
-		else
-		{
-			if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
+		} else {
+			if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) {
 				return false;
+			}
 
 			$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 		}
+
 		return $tree;
 	}
 
@@ -2590,22 +2470,19 @@ protected static function initDir(&$tree, &$count)
 		$directory = '';
 
 		// If on Windows servers the first part of the path is the drive (e.g. "C:")
-		if (DIRECTORY_SEPARATOR === '\\')
-		{
+		if (DIRECTORY_SEPARATOR === '\\') {
 			// Better be sure that the first part of the path is actually a drive letter...
 			// ...even if, I should check this in the admin page...isn't it?
 			// ...NHAAA Let's leave space for users' complains! :P
-			if (preg_match('/^[a-z]:$/i', $tree[0]))
-			{
+			if (preg_match('/^[a-z]:$/i', $tree[0])) {
 				$directory = array_shift($tree);
-			}
-			else
-			{
+			} else {
 				return false;
 			}
 
 			$count--;
 		}
+
 		return $directory;
 	}
 
@@ -2627,27 +2504,28 @@ protected static function initDir(&$tree, &$count)
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), string $from = '{db_prefix}attachments AS a', array $joins = array(), array $where = array(), array $order = array(), int $limit = 0)
+	protected static function queryData(array $selects, array $params = [], string $from = '{db_prefix}attachments AS a', array $joins = [], array $where = [], array $order = [], int $limit = 0)
 	{
-		$request = Db::$db->query('', '
-			SELECT ' . implode(', ', $selects) . '
-			FROM ' . implode("\n\t\t\t\t\t", array_merge(array($from), $joins)) . (empty($where) ? '' : '
+		$request = Db::$db->query(
+			'',
+			'SELECT ' . implode(', ', $selects) . '
+			FROM ' . implode("\n\t\t\t\t\t", array_merge([$from], $joins)) . (empty($where) ? '' : '
 			WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . ($limit > 0 ? '
 			LIMIT ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			yield $row;
 		}
 		Db::$db->free_result($request);
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Attachment::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Attachment::exportStatic')) {
 	Attachment::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Autoloader.php b/Sources/Autoloader.php
index d5ca77cfc9..7587143848 100644
--- a/Sources/Autoloader.php
+++ b/Sources/Autoloader.php
@@ -13,16 +13,15 @@
 
 namespace SMF;
 
-/**
+/*
  * An autoloader for certain classes.
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class)
-{
+spl_autoload_register(function ($class) {
 	static $hook_value = '';
 
-	static $class_map = array(
+	static $class_map = [
 		// Some special cases.
 		'ReCaptcha\\' => 'ReCaptcha/',
 		'MatthiasMullie\\Minify\\' => 'minify/src/',
@@ -30,37 +29,36 @@
 
 		// In general, the SMF namespace maps to $sourcedir.
 		'SMF\\' => '',
-	);
+	];
 
 	// Ensure $sourcedir is set to something valid.
-	if (class_exists('SMF\\Config', false) && isset(Config::$sourcedir))
+	if (class_exists('SMF\\Config', false) && isset(Config::$sourcedir)) {
 		$sourcedir = Config::$sourcedir;
+	}
 
-	if (empty($sourcedir) || !is_dir($sourcedir))
+	if (empty($sourcedir) || !is_dir($sourcedir)) {
 		$sourcedir = __DIR__;
+	}
 
 	// Do any third-party scripts want in on the fun?
-	if (class_exists('SMF\\Config', false) && $hook_value !== (Config::$modSettings['integrate_autoload'] ?? ''))
-	{
-		if (!class_exists('SMF\\IntegrationHook', false) && is_file($sourcedir . '/IntegrationHook.php'))
-		{
+	if (!defined('SMF_INSTALLING') && class_exists('SMF\\Config', false) && $hook_value !== (Config::$modSettings['integrate_autoload'] ?? '')) {
+		if (!class_exists('SMF\\IntegrationHook', false) && is_file($sourcedir . '/IntegrationHook.php')) {
 			require_once $sourcedir . '/IntegrationHook.php';
 		}
 
-		if (class_exists('SMF\\IntegrationHook', false))
-		{
+		if (class_exists('SMF\\IntegrationHook', false)) {
 			$hook_value = Config::$modSettings['integrate_autoload'];
-			IntegrationHook::call('integrate_autoload', array(&$class_map));
+			IntegrationHook::call('integrate_autoload', [&$class_map]);
 		}
 	}
 
-	foreach ($class_map as $prefix => $dirname)
-	{
+	foreach ($class_map as $prefix => $dirname) {
 		// Does the class use the namespace prefix?
 		$len = strlen($prefix);
 
-		if (strncmp($prefix, $class, $len) !== 0)
+		if (strncmp($prefix, $class, $len) !== 0) {
 			continue;
+		}
 
 		// Get the relative class name.
 		$relative_class = substr($class, $len);
@@ -71,13 +69,14 @@
 		$filename = $dirname . strtr($relative_class, '\\', '/') . '.php';
 
 		// Failsafe: Never load a file named index.php.
-		if (basename($filename) === 'index.php')
+		if (basename($filename) === 'index.php') {
 			return;
+		}
 
 		// If the file exists, require it.
-		if (file_exists($filename = $sourcedir . '/' . $filename))
-		{
+		if (file_exists($filename = $sourcedir . '/' . $filename)) {
 			require $filename;
+
 			return;
 		}
 	}
diff --git a/Sources/BBCodeParser.php b/Sources/BBCodeParser.php
index c8757cc974..572d82707b 100644
--- a/Sources/BBCodeParser.php
+++ b/Sources/BBCodeParser.php
@@ -58,16 +58,15 @@ class BBCodeParser
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_prefix' => 'bbcodeparser_',
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
+			'getSigTags' => 'get_signature_allowed_bbc_tags',
 			'highlightPhpCode' => 'highlight_php_code',
 			'sanitizeMSCutPaste' => 'sanitizeMSCutPaste',
 			'backcompatParseBbc' => 'parse_bbc',
 			'backcompatParseSmileys' => 'parseSmileys',
-			'getSigTags' => 'get_signature_allowed_bbc_tags',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -78,7 +77,7 @@ class BBCodeParser
 	 *
 	 * If not empty, only these BBCode tags will be parsed.
 	 */
-	public $parse_tags = array();
+	public $parse_tags = [];
 
 	/**
 	 * @var bool
@@ -99,7 +98,7 @@ class BBCodeParser
 	 *
 	 * List of disabled BBCode tags.
 	 */
-	public $disabled = array();
+	public $disabled = [];
 
 	/**
 	 * @var bool
@@ -192,7 +191,6 @@ class BBCodeParser
 	 * want to read this list. Calling the method will ensure that any BBCodes
 	 * added by modifications are included in the returned array.
 	 *
-	 *
 	 * The BBCode definitions are formatted as an array, with keys as follows:
 	 *
 	 * 	tag: The tag's name - should be lowercase!
@@ -281,125 +279,125 @@ class BBCodeParser
 	 *	parsed_tags_allowed: An array restricting what BBC can be in the
 	 *	  parsed_equals parameter, if desired.
 	 */
-	public static $codes = array(
-		array(
+	public static $codes = [
+		[
 			'tag' => 'abbr',
 			'type' => 'unparsed_equals',
 			'before' => '<abbr title="$1">',
 			'after' => '</abbr>',
 			'quoted' => 'optional',
 			'disabled_after' => ' ($1)',
-		),
+		],
 		// Legacy (and just an alias for [abbr] even when enabled)
-		array(
+		[
 			'tag' => 'acronym',
 			'type' => 'unparsed_equals',
 			'before' => '<abbr title="$1">',
 			'after' => '</abbr>',
 			'quoted' => 'optional',
 			'disabled_after' => ' ($1)',
-		),
-		array(
+		],
+		[
 			'tag' => 'anchor',
 			'type' => 'unparsed_equals',
 			'test' => '[#]?([A-Za-z][A-Za-z0-9_\-]*)\]',
 			'before' => '<span id="post_$1">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'attach',
 			'type' => 'unparsed_content',
-			'parameters' => array(
-				'id' => array('match' => '(\d+)'),
-				'alt' => array('optional' => true),
-				'width' => array('optional' => true, 'match' => '(\d+)'),
-				'height' => array('optional' => true, 'match' => '(\d+)'),
-				'display' => array('optional' => true, 'match' => '(link|embed)'),
-			),
+			'parameters' => [
+				'id' => ['match' => '(\d+)'],
+				'alt' => ['optional' => true],
+				'width' => ['optional' => true, 'match' => '(\d+)'],
+				'height' => ['optional' => true, 'match' => '(\d+)'],
+				'display' => ['optional' => true, 'match' => '(link|embed)'],
+			],
 			'content' => '$1',
 			'validate' => __CLASS__ . '::attachValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'b',
 			'before' => '<b>',
 			'after' => '</b>',
-		),
+		],
 		// Legacy (equivalent to [ltr] or [rtl])
-		array(
+		[
 			'tag' => 'bdo',
 			'type' => 'unparsed_equals',
 			'before' => '<bdo dir="$1">',
 			'after' => '</bdo>',
 			'test' => '(rtl|ltr)\]',
 			'block_level' => true,
-		),
+		],
 		// Legacy (alias of [color=black])
-		array(
+		[
 			'tag' => 'black',
 			'before' => '<span style="color: black;" class="bbc_color">',
 			'after' => '</span>',
-		),
+		],
 		// Legacy (alias of [color=blue])
-		array(
+		[
 			'tag' => 'blue',
 			'before' => '<span style="color: blue;" class="bbc_color">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'br',
 			'type' => 'closed',
 			'content' => '<br>',
-		),
-		array(
+		],
+		[
 			'tag' => 'center',
 			'before' => '<div class="centertext"><div class="inline-block">',
 			'after' => '</div></div>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'code',
 			'type' => 'unparsed_content',
 			'content' => '<div class="codeheader"><span class="code">{txt_code}</span> <a class="codeoperation smf_select_text">{txt_code_select}</a> <a class="codeoperation smf_expand_code hidden" data-shrink-txt="{txt_code_shrink}" data-expand-txt="{txt_code_expand}">{txt_code_expand}</a></div><code class="bbc_code">$1</code>',
 			'validate' => __CLASS__ . '::codeValidate',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'code',
 			'type' => 'unparsed_equals_content',
 			'content' => '<div class="codeheader"><span class="code">{txt_code}</span> ($2) <a class="codeoperation smf_select_text">{txt_code_select}</a> <a class="codeoperation smf_expand_code hidden" data-shrink-txt="{txt_code_shrink}" data-expand-txt="{txt_code_expand}">{txt_code_expand}</a></div><code class="bbc_code">$1</code>',
 			'validate' => __CLASS__ . '::codeValidate',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'color',
 			'type' => 'unparsed_equals',
 			'test' => '(#[\da-fA-F]{3}|#[\da-fA-F]{6}|[A-Za-z]{1,20}|rgb\((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s?,\s?){2}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\))\]',
 			'before' => '<span style="color: $1;" class="bbc_color">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'email',
 			'type' => 'unparsed_content',
 			'content' => '<a href="mailto:$1" class="bbc_email">$1</a>',
 			'validate' => __CLASS__ . '::emailValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'email',
 			'type' => 'unparsed_equals',
 			'before' => '<a href="mailto:$1" class="bbc_email">',
 			'after' => '</a>',
-			'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
+			'disallow_children' => ['email', 'ftp', 'url', 'iurl'],
 			'disabled_after' => ' ($1)',
-		),
+		],
 		// Legacy (and just a link even when not disabled)
-		array(
+		[
 			'tag' => 'flash',
 			'type' => 'unparsed_commas_content',
 			'test' => '\d+,\d+\]',
 			'content' => '<a href="$1" target="_blank" rel="noopener">$1</a>',
 			'validate' => __CLASS__ . '::flashValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'float',
 			'type' => 'unparsed_equals',
 			'test' => '(left|right)(\s+max=\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)?\]',
@@ -408,140 +406,140 @@ class BBCodeParser
 			'validate' => __CLASS__ . '::floatValidate',
 			'trim' => 'outside',
 			'block_level' => true,
-		),
+		],
 		// Legacy (alias of [url] with an FTP URL)
-		array(
+		[
 			'tag' => 'ftp',
 			'type' => 'unparsed_content',
 			'content' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">$1</a>',
 			'validate' => __CLASS__ . '::ftpValidate',
-		),
+		],
 		// Legacy (alias of [url] with an FTP URL)
-		array(
+		[
 			'tag' => 'ftp',
 			'type' => 'unparsed_equals',
 			'before' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">',
 			'after' => '</a>',
 			'validate' => __CLASS__ . '::ftpValidate',
-			'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
+			'disallow_children' => ['email', 'ftp', 'url', 'iurl'],
 			'disabled_after' => ' ($1)',
-		),
-		array(
+		],
+		[
 			'tag' => 'font',
 			'type' => 'unparsed_equals',
 			'test' => '[A-Za-z0-9_,\-\s]+?\]',
 			'before' => '<span style="font-family: $1;" class="bbc_font">',
 			'after' => '</span>',
-		),
+		],
 		// Legacy (one of those things that should not be done)
-		array(
+		[
 			'tag' => 'glow',
 			'type' => 'unparsed_commas',
 			'test' => '[#0-9a-zA-Z\-]{3,12},([012]\d{1,2}|\d{1,2})(,[^]]+)?\]',
 			'before' => '<span style="text-shadow: $1 1px 1px 1px">',
 			'after' => '</span>',
-		),
+		],
 		// Legacy (alias of [color=green])
-		array(
+		[
 			'tag' => 'green',
 			'before' => '<span style="color: green;" class="bbc_color">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'html',
 			'type' => 'unparsed_content',
 			'content' => '<div>$1</div>',
 			'block_level' => true,
 			'disabled_content' => '$1',
-		),
-		array(
+		],
+		[
 			'tag' => 'hr',
 			'type' => 'closed',
 			'content' => '<hr>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'i',
 			'before' => '<i>',
 			'after' => '</i>',
-		),
-		array(
+		],
+		[
 			'tag' => 'img',
 			'type' => 'unparsed_content',
-			'parameters' => array(
-				'alt' => array('optional' => true),
-				'title' => array('optional' => true),
-				'width' => array('optional' => true, 'value' => ' width="$1"', 'match' => '(\d+)'),
-				'height' => array('optional' => true, 'value' => ' height="$1"', 'match' => '(\d+)'),
-			),
+			'parameters' => [
+				'alt' => ['optional' => true],
+				'title' => ['optional' => true],
+				'width' => ['optional' => true, 'value' => ' width="$1"', 'match' => '(\d+)'],
+				'height' => ['optional' => true, 'value' => ' height="$1"', 'match' => '(\d+)'],
+			],
 			'content' => '$1',
 			'validate' => __CLASS__ . '::imgValidate',
 			'disabled_content' => '($1)',
-		),
-		array(
+		],
+		[
 			'tag' => 'iurl',
 			'type' => 'unparsed_content',
 			'content' => '<a href="$1" class="bbc_link">$1</a>',
 			'validate' => __CLASS__ . '::urlValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'iurl',
 			'type' => 'unparsed_equals',
 			'quoted' => 'optional',
 			'before' => '<a href="$1" class="bbc_link">',
 			'after' => '</a>',
 			'validate' => __CLASS__ . '::urlValidate',
-			'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
+			'disallow_children' => ['email', 'ftp', 'url', 'iurl'],
 			'disabled_after' => ' ($1)',
-		),
-		array(
+		],
+		[
 			'tag' => 'justify',
 			'before' => '<div class="justifytext">',
 			'after' => '</div>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'left',
 			'before' => '<div class="lefttext">',
 			'after' => '</div>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'li',
 			'before' => '<li>',
 			'after' => '</li>',
 			'trim' => 'outside',
-			'require_parents' => array('list'),
+			'require_parents' => ['list'],
 			'block_level' => true,
 			'disabled_before' => '',
 			'disabled_after' => '<br>',
-		),
-		array(
+		],
+		[
 			'tag' => 'list',
 			'before' => '<ul class="bbc_list">',
 			'after' => '</ul>',
 			'trim' => 'inside',
-			'require_children' => array('li', 'list'),
+			'require_children' => ['li', 'list'],
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'list',
-			'parameters' => array(
-				'type' => array('match' => '(none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|upper-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha)'),
-			),
+			'parameters' => [
+				'type' => ['match' => '(none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|upper-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha)'],
+			],
 			'before' => '<ul class="bbc_list" style="list-style-type: {type};">',
 			'after' => '</ul>',
 			'trim' => 'inside',
-			'require_children' => array('li'),
+			'require_children' => ['li'],
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'ltr',
 			'before' => '<bdo dir="ltr">',
 			'after' => '</bdo>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'me',
 			'type' => 'unparsed_equals',
 			'before' => '<div class="meaction">* $1 ',
@@ -550,57 +548,57 @@ class BBCodeParser
 			'block_level' => true,
 			'disabled_before' => '/me ',
 			'disabled_after' => '<br>',
-		),
-		array(
+		],
+		[
 			'tag' => 'member',
 			'type' => 'unparsed_equals',
 			'before' => '<a href="{scripturl}?action=profile;u=$1" class="mention" data-mention="$1">@',
 			'after' => '</a>',
-		),
+		],
 		// Legacy (horrible memories of the 1990s)
-		array(
+		[
 			'tag' => 'move',
 			'before' => '<marquee>',
 			'after' => '</marquee>',
 			'block_level' => true,
-			'disallow_children' => array('move'),
-		),
-		array(
+			'disallow_children' => ['move'],
+		],
+		[
 			'tag' => 'nobbc',
 			'type' => 'unparsed_content',
 			'content' => '$1',
-		),
-		array(
+		],
+		[
 			'tag' => 'php',
 			'type' => 'unparsed_content',
 			'content' => '<span class="phpcode">$1</span>',
 			'validate' => __CLASS__ . '::phpValidate',
 			'block_level' => false,
 			'disabled_content' => '$1',
-		),
-		array(
+		],
+		[
 			'tag' => 'pre',
 			'before' => '<pre>',
 			'after' => '</pre>',
-		),
-		array(
+		],
+		[
 			'tag' => 'quote',
 			'before' => '<blockquote><cite>{txt_quote}</cite>',
 			'after' => '</blockquote>',
 			'trim' => 'both',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'quote',
-			'parameters' => array(
-				'author' => array('match' => '(.{1,192}?)', 'quoted' => true),
-			),
+			'parameters' => [
+				'author' => ['match' => '(.{1,192}?)', 'quoted' => true],
+			],
 			'before' => '<blockquote><cite>{txt_quote_from}: {author}</cite>',
 			'after' => '</blockquote>',
 			'trim' => 'both',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'quote',
 			'type' => 'parsed_equals',
 			'before' => '<blockquote><cite>{txt_quote_from}: $1</cite>',
@@ -608,171 +606,171 @@ class BBCodeParser
 			'trim' => 'both',
 			'quoted' => 'optional',
 			// Don't allow everything to be embedded with the author name.
-			'parsed_tags_allowed' => array('url', 'iurl', 'ftp'),
+			'parsed_tags_allowed' => ['url', 'iurl', 'ftp'],
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'quote',
-			'parameters' => array(
-				'author' => array('match' => '([^<>]{1,192}?)'),
-				'link' => array('match' => '(?:board=\d+;)?((?:topic|threadid)=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?|msg=\d+?|action=profile;u=\d+)'),
-				'date' => array('match' => '(\d+)', 'validate' => 'timeformat'),
-			),
+			'parameters' => [
+				'author' => ['match' => '([^<>]{1,192}?)'],
+				'link' => ['match' => '(?:board=\d+;)?((?:topic|threadid)=[\dmsg#\./]{1,40}(?:;start=[\dmsg#\./]{1,40})?|msg=\d+?|action=profile;u=\d+)'],
+				'date' => ['match' => '(\d+)', 'validate' => 'SMF\\Time::timeformat'],
+			],
 			'before' => '<blockquote><cite><a href="{scripturl}?{link}">{txt_quote_from}: {author} {txt_search_on} {date}</a></cite>',
 			'after' => '</blockquote>',
 			'trim' => 'both',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'quote',
-			'parameters' => array(
-				'author' => array('match' => '(.{1,192}?)'),
-			),
+			'parameters' => [
+				'author' => ['match' => '(.{1,192}?)'],
+			],
 			'before' => '<blockquote><cite>{txt_quote_from}: {author}</cite>',
 			'after' => '</blockquote>',
 			'trim' => 'both',
 			'block_level' => true,
-		),
+		],
 		// Legacy (alias of [color=red])
-		array(
+		[
 			'tag' => 'red',
 			'before' => '<span style="color: red;" class="bbc_color">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'right',
 			'before' => '<div class="righttext"><div class="inline-block">',
 			'after' => '</div></div>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'rtl',
 			'before' => '<bdo dir="rtl">',
 			'after' => '</bdo>',
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 's',
 			'before' => '<s>',
 			'after' => '</s>',
-		),
+		],
 		// Legacy (never a good idea)
-		array(
+		[
 			'tag' => 'shadow',
 			'type' => 'unparsed_commas',
 			'test' => '[#0-9a-zA-Z\-]{3,12},(left|right|top|bottom|[0123]\d{0,2})\]',
 			'before' => '<span style="text-shadow: $1 $2">',
 			'after' => '</span>',
 			'validate' => __CLASS__ . '::shadowValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'size',
 			'type' => 'unparsed_equals',
 			'test' => '([1-9][\d]?p[xt]|small(?:er)?|large[r]?|x[x]?-(?:small|large)|medium|(0\.[1-9]|[1-9](\.[\d][\d]?)?)?em)\]',
 			'before' => '<span style="font-size: $1;" class="bbc_size">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'size',
 			'type' => 'unparsed_equals',
 			'test' => '[1-7]\]',
 			'before' => '<span style="font-size: $1;" class="bbc_size">',
 			'after' => '</span>',
 			'validate' => __CLASS__ . '::sizeValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'sub',
 			'before' => '<sub>',
 			'after' => '</sub>',
-		),
-		array(
+		],
+		[
 			'tag' => 'sup',
 			'before' => '<sup>',
 			'after' => '</sup>',
-		),
-		array(
+		],
+		[
 			'tag' => 'table',
 			'before' => '<table class="bbc_table">',
 			'after' => '</table>',
 			'trim' => 'inside',
-			'require_children' => array('tr'),
+			'require_children' => ['tr'],
 			'block_level' => true,
-		),
-		array(
+		],
+		[
 			'tag' => 'td',
 			'before' => '<td>',
 			'after' => '</td>',
-			'require_parents' => array('tr'),
+			'require_parents' => ['tr'],
 			'trim' => 'outside',
 			'block_level' => true,
 			'disabled_before' => '',
 			'disabled_after' => '',
-		),
-		array(
+		],
+		[
 			'tag' => 'time',
 			'type' => 'unparsed_content',
 			'content' => '$1',
 			'validate' => __CLASS__ . '::timeValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'tr',
 			'before' => '<tr>',
 			'after' => '</tr>',
-			'require_parents' => array('table'),
-			'require_children' => array('td'),
+			'require_parents' => ['table'],
+			'require_children' => ['td'],
 			'trim' => 'both',
 			'block_level' => true,
 			'disabled_before' => '',
 			'disabled_after' => '',
-		),
+		],
 		// Legacy (the <tt> element is dead)
-		array(
+		[
 			'tag' => 'tt',
 			'before' => '<span class="monospace">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'u',
 			'before' => '<u>',
 			'after' => '</u>',
-		),
-		array(
+		],
+		[
 			'tag' => 'url',
 			'type' => 'unparsed_content',
 			'content' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">$1</a>',
 			'validate' => __CLASS__ . '::urlValidate',
-		),
-		array(
+		],
+		[
 			'tag' => 'url',
 			'type' => 'unparsed_equals',
 			'quoted' => 'optional',
 			'before' => '<a href="$1" class="bbc_link" target="_blank" rel="noopener">',
 			'after' => '</a>',
 			'validate' => __CLASS__ . '::urlValidate',
-			'disallow_children' => array('email', 'ftp', 'url', 'iurl'),
+			'disallow_children' => ['email', 'ftp', 'url', 'iurl'],
 			'disabled_after' => ' ($1)',
-		),
+		],
 		// Legacy (alias of [color=white])
-		array(
+		[
 			'tag' => 'white',
 			'before' => '<span style="color: white;" class="bbc_color">',
 			'after' => '</span>',
-		),
-		array(
+		],
+		[
 			'tag' => 'youtube',
 			'type' => 'unparsed_content',
 			'content' => '<div class="videocontainer"><div><iframe frameborder="0" src="https://www.youtube.com/embed/$1?origin={hosturl}&wmode=opaque" data-youtube-id="$1" allowfullscreen loading="lazy"></iframe></div></div>',
 			'disabled_content' => '<a href="https://www.youtube.com/watch?v=$1" target="_blank" rel="noopener">https://www.youtube.com/watch?v=$1</a>',
 			'block_level' => true,
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Itemcodes are an alternative syntax for creating lists.
 	 */
-	public static $itemcodes = array(
+	public static $itemcodes = [
 		'*' => 'disc',
 		'@' => 'disc',
 		'+' => 'square',
@@ -781,14 +779,14 @@ class BBCodeParser
 		'o' => 'circle',
 		'O' => 'circle',
 		'0' => 'circle',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * BBCodes whose content should be skipped when autolinking URLs.
 	 */
-	public static $no_autolink_tags = array(
+	public static $no_autolink_tags = [
 		'url',
 		'iurl',
 		'email',
@@ -801,7 +799,7 @@ class BBCodeParser
 		'code',
 		'php',
 		'nobbc',
-	);
+	];
 
 	/**
 	 * @var string
@@ -829,10 +827,10 @@ class BBCodeParser
 	 *
 	 * URI schemes that require some sort of special handling.
 	 */
-	public static $schemes = array(
+	public static $schemes = [
 		// Schemes whose URI definitions require a domain name in the
 		// authority (or whatever the next part of the URI is).
-		'need_domain' => array(
+		'need_domain' => [
 			'aaa', 'aaas', 'acap', 'acct', 'afp', 'cap', 'cid', 'coap',
 			'coap+tcp', 'coap+ws', 'coaps', 'coaps+tcp', 'coaps+ws', 'crid',
 			'cvs', 'dict', 'dns', 'feed', 'fish', 'ftp', 'git', 'go', 'gopher',
@@ -844,32 +842,32 @@ class BBCodeParser
 			'turn', 'turns', 'tv', 'udp', 'vemmi', 'vnc', 'webcal', 'ws', 'wss',
 			'xmlrpc.beep', 'xmlrpc.beeps', 'xmpp', 'z39.50', 'z39.50r',
 			'z39.50s',
-		),
+		],
 
 		// Schemes that allow an empty authority ("://" followed by "/")
-		'empty_authority' => array(
+		'empty_authority' => [
 			'file', 'ni', 'nih',
-		),
+		],
 
 		// Schemes that do not use an authority but still have a reasonable
 		// chance of working as clickable links.
-		'no_authority' => array(
+		'no_authority' => [
 			'about', 'callto', 'geo', 'gg', 'leaptofrogans', 'magnet', 'mailto',
 			'maps', 'news', 'ni', 'nih', 'service', 'skype', 'sms', 'tel', 'tv',
-		),
+		],
 
 		// Schemes that should never be autolinked.
-		'forbidden' => array(
+		'forbidden' => [
 			'javascript', 'data',
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * The 2012 list of top level domains.
 	 */
-	public static $basic_tlds = array(
+	public static $basic_tlds = [
 		'com', 'net', 'org', 'edu', 'gov', 'mil', 'aero', 'asia', 'biz', 'cat',
 		'coop', 'info', 'int', 'jobs', 'mobi', 'museum', 'name', 'post', 'pro',
 		'tel', 'travel', 'xxx', 'ac', 'ad', 'ae', 'af', 'ag', 'ai', 'al', 'am',
@@ -893,7 +891,7 @@ class BBCodeParser
 		'td', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tr', 'tt',
 		'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'us', 'uy', 'uz', 'va', 'vc', 've',
 		'vg', 'vi', 'vn', 'vu', 'wf', 'ws', 'ye', 'yt', 'za', 'zm', 'zw',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -939,7 +937,7 @@ class BBCodeParser
 	 *
 	 * Replacement values for smileys.
 	 */
-	protected $smiley_preg_replacements = array();
+	protected $smiley_preg_replacements = [];
 
 	/**
 	 * @var array
@@ -954,21 +952,21 @@ class BBCodeParser
 	 * you need to add information to this variable in order to distinguish the
 	 * guest version vs. the member version of the output.
 	 */
-	private $cache_key_extras = array();
+	private $cache_key_extras = [];
 
 	/**
 	 * @var array
 	 *
 	 * Version of self::$codes used for interal processing.
 	 */
-	private $bbc_codes = array();
+	private $bbc_codes = [];
 
 	/**
 	 * @var array
 	 *
 	 * Copies of $this->bbc_codes for different locales.
 	 */
-	private $bbc_lang_locales = array();
+	private $bbc_lang_locales = [];
 
 	/**
 	 * @var string
@@ -990,7 +988,7 @@ class BBCodeParser
 	 * BBCode tags that are currently open at any given step of processing
 	 * $this->message.
 	 */
-	private $open_tags = array();
+	private $open_tags = [];
 
 	/**
 	 * @var string
@@ -1025,7 +1023,7 @@ class BBCodeParser
 	 *
 	 * Placeholders used to protect certain strings from processing.
 	 */
-	private $placeholders = array();
+	private $placeholders = [];
 
 	/**
 	 * @var int
@@ -1047,7 +1045,7 @@ class BBCodeParser
 	 *
 	 * Holds parsed messages.
 	 */
-	private $results = array();
+	private $results = [];
 
 	/**
 	 * @var bool
@@ -1077,20 +1075,18 @@ public function __construct()
 		/**********************
 		 * Set up localization.
 		 **********************/
-		if (!empty(Utils::$context['utf8']))
-		{
+		if (!empty(Utils::$context['utf8'])) {
 			$this->utf8 = true;
 			$this->encoding = 'UTF-8';
-		}
-		else
-		{
+		} else {
 			$this->encoding = !empty(Config::$modSettings['global_character_set']) ? Config::$modSettings['global_character_set'] : (!empty(Lang::$txt['lang_character_set']) ? Lang::$txt['lang_character_set'] : $this->encoding);
 
 			$this->utf8 = $this->encoding === 'UTF-8';
 		}
 
-		if (!empty(Lang::$txt['lang_locale']))
+		if (!empty(Lang::$txt['lang_locale'])) {
 			$this->locale = Lang::$txt['lang_locale'];
+		}
 
 		$this->time_offset = User::$me->time_offset;
 		$this->time_format = User::$me->time_format;
@@ -1106,10 +1102,9 @@ public function __construct()
 
 		usort(
 			self::$codes,
-			function($a, $b)
-			{
+			function ($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
-			}
+			},
 		);
 
 		/********************
@@ -1117,11 +1112,12 @@ function($a, $b)
 		 ********************/
 		$this->autolink_enabled = !empty(Config::$modSettings['autoLinkUrls']);
 
-		if (!$this->utf8)
+		if (!$this->utf8) {
 			self::$domain_label_chars = '0-9A-Za-z\-';
+		}
 
 		// In case a mod wants to control behaviour for a special URI scheme.
-		IntegrationHook::call('integrate_autolinker_schemes', array(&self::$schemes));
+		IntegrationHook::call('integrate_autolinker_schemes', [&self::$schemes]);
 
 		/*************************
 		 * Set up smileys parsing.
@@ -1132,9 +1128,8 @@ function($a, $b)
 
 		// Maybe a mod wants to implement an alternative method for smileys
 		// (e.g. emojis instead of images)
-		if ($this->smiley_set !== 'none')
-		{
-			IntegrationHook::call('integrate_smileys', array(&$this->smiley_preg_search, &$this->smiley_preg_replacements));
+		if ($this->smiley_set !== 'none') {
+			IntegrationHook::call('integrate_smileys', [&$this->smiley_preg_search, &$this->smiley_preg_replacements]);
 		}
 
 		/************************
@@ -1156,11 +1151,12 @@ function($a, $b)
 	 * @param array $parse_tags If set, only parses these tags rather than all of them.
 	 * @return string The parsed string.
 	 */
-	public function parse(string $message, bool $smileys = true, string $cache_id = '', array $parse_tags = array()): string
+	public function parse(string $message, bool $smileys = true, string $cache_id = '', array $parse_tags = []): string
 	{
 		// Don't waste cycles
-		if (strval($message) === '')
+		if (strval($message) === '') {
 			return '';
+		}
 
 		// Ensure we start with a clean slate.
 		$this->resetRuntimeProperties();
@@ -1176,25 +1172,26 @@ public function parse(string $message, bool $smileys = true, string $cache_id =
 		$this->message = self::sanitizeMSCutPaste($this->message);
 
 		// If the load average is too high, don't parse the BBC.
-		if ($this->highLoadAverage())
+		if ($this->highLoadAverage()) {
 			return $this->message;
+		}
 
-		if (!$this->enable_bbc)
-		{
-			if ($this->smileys === true)
+		if (!$this->enable_bbc) {
+			if ($this->smileys === true) {
 				$this->message = $this->parseSmileys($this->message);
+			}
 
 			return $this->message;
 		}
 
 		// Allow mods access before entering $this->parseMessage.
-		IntegrationHook::call('integrate_pre_parsebbc', array(&$this->message, &$this->smileys, &$cache_id, &$this->parse_tags, &$this->cache_key_extras));
+		IntegrationHook::call('integrate_pre_parsebbc', [&$this->message, &$this->smileys, &$cache_id, &$this->parse_tags, &$this->cache_key_extras]);
 
 		// If no cache id was given, make a generic one.
 		$cache_id = strval($cache_id) !== '' ? $cache_id : 'str' . substr(md5($this->message), 0, 7);
 
 		// Use a unique identifier key for this combination of string and settings.
-		$cache_key = 'parse:' . $cache_id . '-' . md5(json_encode(array(
+		$cache_key = 'parse:' . $cache_id . '-' . md5(json_encode([
 			$this->message,
 			// Localization settings.
 			$this->encoding,
@@ -1218,15 +1215,17 @@ public function parse(string $message, bool $smileys = true, string $cache_id =
 			$this->smiley_preg_replacements,
 			// Additional stuff that might affect output.
 			$this->cache_key_extras,
-		)));
+		]));
 
 		// Have we already parsed this string?
-		if (isset($this->results[$cache_key]))
+		if (isset($this->results[$cache_key])) {
 			return $this->results[$cache_key];
+		}
 
 		// Or maybe we cached the results recently?
-		if (($this->results[$cache_key] = CacheApi::get($cache_key, 240)) != null)
+		if (($this->results[$cache_key] = CacheApi::get($cache_key, 240)) != null) {
 			return $this->results[$cache_key];
+		}
 
 		// Keep track of how long this takes.
 		$cache_t = microtime(true);
@@ -1235,11 +1234,12 @@ public function parse(string $message, bool $smileys = true, string $cache_id =
 		$this->parseMessage();
 
 		// Allow mods access to what $this->parseMessage created.
-		IntegrationHook::call('integrate_post_parsebbc', array(&$this->message, &$this->smileys, &$cache_id, &$this->parse_tags));
+		IntegrationHook::call('integrate_post_parsebbc', [&$this->message, &$this->smileys, &$cache_id, &$this->parse_tags]);
 
 		// Cache the output if it took some time...
-		if (!empty(CacheApi::$enable) && microtime(true) - $cache_t > pow(50, -CacheApi::$enable))
+		if (!empty(CacheApi::$enable) && microtime(true) - $cache_t > pow(50, -CacheApi::$enable)) {
 			CacheApi::put($cache_key, $this->message, 240);
+		}
 
 		// Remember for later.
 		$this->results[$cache_key] = $this->message;
@@ -1260,46 +1260,44 @@ public function parse(string $message, bool $smileys = true, string $cache_id =
 	 */
 	public function parseSmileys(string $message): string
 	{
-		if ($this->smiley_set == 'none' || trim($message) == '')
+		if ($this->smiley_set == 'none' || trim($message) == '') {
 			return $message;
+		}
 
 		// If smileyPregSearch hasn't been set, do it now.
-		if (empty($this->smiley_preg_search))
-		{
+		if (empty($this->smiley_preg_search)) {
 			// Cache for longer when customized smiley codes aren't enabled
 			$cache_time = !$this->custom_smileys_enabled ? 7200 : 480;
 
 			// Load the smileys in reverse order by length so they don't get parsed incorrectly.
-			if (($temp = CacheApi::get('parsing_smileys_' . $this->smiley_set, $cache_time)) == null)
-			{
-				$smileysfrom = array();
-				$smileysto = array();
-				$smileysdescs = array();
-
-				$result = Db::$db->query('', '
-					SELECT s.code, f.filename, s.description
+			if (($temp = CacheApi::get('parsing_smileys_' . $this->smiley_set, $cache_time)) == null) {
+				$smileysfrom = [];
+				$smileysto = [];
+				$smileysdescs = [];
+
+				$result = Db::$db->query(
+					'',
+					'SELECT s.code, f.filename, s.description
 					FROM {db_prefix}smileys AS s
 						JOIN {db_prefix}smiley_files AS f ON (s.id_smiley = f.id_smiley)
 					WHERE f.smiley_set = {string:smiley_set}' . (!$this->custom_smileys_enabled ? '
 						AND s.code IN ({array_string:default_codes})' : '') . '
 					ORDER BY LENGTH(s.code) DESC',
-					array(
-						'default_codes' => array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', 'O:-)'),
+					[
+						'default_codes' => ['>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', 'O:-)'],
 						'smiley_set' => $this->smiley_set,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($result))
-				{
+
+				while ($row = Db::$db->fetch_assoc($result)) {
 					$smileysfrom[] = $row['code'];
 					$smileysto[] = Utils::htmlspecialchars($row['filename']);
 					$smileysdescs[] = !empty(Lang::$txt['icon_' . strtolower($row['description'])]) ? Lang::$txt['icon_' . strtolower($row['description'])] : $row['description'];
 				}
 				Db::$db->free_result($result);
 
-				CacheApi::put('parsing_smileys_' . $this->smiley_set, array($smileysfrom, $smileysto, $smileysdescs), $cache_time);
-			}
-			else
-			{
+				CacheApi::put('parsing_smileys_' . $this->smiley_set, [$smileysfrom, $smileysto, $smileysdescs], $cache_time);
+			} else {
 				list($smileysfrom, $smileysto, $smileysdescs) = $temp;
 			}
 
@@ -1307,28 +1305,27 @@ public function parseSmileys(string $message): string
 			$non_breaking_space = $this->utf8 ? '\x{A0}' : '\xA0';
 
 			// This smiley regex makes sure it doesn't parse smileys within code tags (so [url=mailto:David@bla.com] doesn't parse the :D smiley)
-			$this->smiley_preg_replacements = array();
-			$search_parts = array();
+			$this->smiley_preg_replacements = [];
+			$search_parts = [];
 			$smileys_path = Utils::htmlspecialchars($this->smileys_url . '/' . rawurlencode($this->smiley_set) . '/');
 
-			for ($i = 0, $n = count($smileysfrom); $i < $n; $i++)
-			{
+			for ($i = 0, $n = count($smileysfrom); $i < $n; $i++) {
 				$special_chars = Utils::htmlspecialchars($smileysfrom[$i], ENT_QUOTES);
 
-				$smiley_code = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($special_chars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" title="' . strtr(Utils::htmlspecialchars($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
+				$smiley_code = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($special_chars, [':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;']) . '" title="' . strtr(Utils::htmlspecialchars($smileysdescs[$i]), [':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;']) . '" class="smiley">';
 
 				$this->smiley_preg_replacements[$smileysfrom[$i]] = $smiley_code;
 
 				$search_parts[] = $smileysfrom[$i];
-				if ($smileysfrom[$i] != $special_chars)
-				{
+
+				if ($smileysfrom[$i] != $special_chars) {
 					$this->smiley_preg_replacements[$special_chars] = $smiley_code;
 					$search_parts[] = $special_chars;
 
 					// Some 2.0 hex htmlchars are in there as 3 digits; allow for finding leading 0 or not
 					$special_chars2 = preg_replace('/&#(\d{2});/', '&#0$1;', $special_chars);
-					if ($special_chars2 != $special_chars)
-					{
+
+					if ($special_chars2 != $special_chars) {
 						$this->smiley_preg_replacements[$special_chars2] = $smiley_code;
 						$search_parts[] = $special_chars2;
 					}
@@ -1339,17 +1336,17 @@ public function parseSmileys(string $message): string
 		}
 
 		// If there are no smileys defined, no need to replace anything
-		if (empty($this->smiley_preg_replacements))
+		if (empty($this->smiley_preg_replacements)) {
 			return $message;
+		}
 
 		// Replace away!
 		return preg_replace_callback(
 			$this->smiley_preg_search,
-			function($matches)
-			{
+			function ($matches) {
 				return $this->smiley_preg_replacements[$matches[1]];
 			},
-			$message
+			$message,
 		);
 	}
 
@@ -1364,36 +1361,34 @@ function($matches)
 	public function unparse(string $string): string
 	{
 		// Replace newlines with spaces, as that's how browsers usually interpret them.
-		$string = preg_replace("~\s*[\r\n]+\s*~", ' ', $string);
+		$string = preg_replace('~\s*[\r\n]+\s*~', ' ', $string);
 
 		// Though some of us love paragraphs, the parser will do better with breaks.
 		$string = preg_replace('~</p>\s*?<p~i', '</p><br><p', $string);
 		$string = preg_replace('~</p>\s*(?!<)~i', '</p><br>', $string);
 
 		// Safari/webkit wraps lines in Wysiwyg in <div>'s.
-		if (BrowserDetector::isBrowser('webkit'))
-		{
-			$string = preg_replace(array('~<div(?:\s(?:[^<>]*?))?' . '>~i', '</div>'), array('<br>', ''), $string);
+		if (BrowserDetector::isBrowser('webkit')) {
+			$string = preg_replace(['~<div(?:\s(?:[^<>]*?))?' . '>~i', '</div>'], ['<br>', ''], $string);
 		}
 
 		// If there's a trailing break get rid of it - Firefox tends to add one.
 		$string = preg_replace('~<br\s?/?' . '>$~i', '', $string);
 
 		// Remove any formatting within code tags.
-		if (strpos($string, '[code') !== false)
-		{
+		if (strpos($string, '[code') !== false) {
 			$string = preg_replace('~<br\s?/?' . '>~i', '#smf_br_spec_grudge_cool!#', $string);
 			$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
 
 			// Only mess with stuff outside [code] tags.
-			for ($i = 0, $n = count($parts); $i < $n; $i++)
-			{
+			for ($i = 0, $n = count($parts); $i < $n; $i++) {
 				// Value of 2 means we're inside the tag.
-				if ($i % 4 == 2)
+				if ($i % 4 == 2) {
 					$parts[$i] = strip_tags($parts[$i]);
+				}
 			}
 
-			$string = strtr(implode('', $parts), array('#smf_br_spec_grudge_cool!#' => '<br>'));
+			$string = strtr(implode('', $parts), ['#smf_br_spec_grudge_cool!#' => '<br>']);
 		}
 
 		// Remove scripts, style and comment blocks.
@@ -1405,28 +1400,24 @@ public function unparse(string $string): string
 		// Do the smileys ultra first!
 		preg_match_all('~<img\b[^>]+alt="([^"]+)"[^>]+class="smiley"[^>]*>(?:\s)?~i', $string, $matches);
 
-		if (!empty($matches[0]))
-		{
+		if (!empty($matches[0])) {
 			// Get all our smiley codes
-			$request = Db::$db->query('', '
-				SELECT code
+			$request = Db::$db->query(
+				'',
+				'SELECT code
 				FROM {db_prefix}smileys
 				ORDER BY LENGTH(code) DESC',
-				array()
+				[],
 			);
 			$smiley_codes = Db::$db->fetch_all($request);
 			Db::$db->free_result($request);
 
-			foreach ($matches[1] as $k => $possible_code)
-			{
+			foreach ($matches[1] as $k => $possible_code) {
 				$possible_code = Utils::htmlspecialcharsDecode($possible_code);
 
-				if (in_array($possible_code, $smiley_codes))
-				{
+				if (in_array($possible_code, $smiley_codes)) {
 					$matches[1][$k] = '-[]-smf_smily_start#|#' . $possible_code . '-[]-smf_smily_end#|#';
-				}
-				else
-				{
+				} else {
 					$matches[1][$k] = $matches[0][$k];
 				}
 			}
@@ -1435,92 +1426,81 @@ public function unparse(string $string): string
 			$string = str_replace($matches[0], $matches[1], $string);
 
 			// Now sort out spaces
-			$string = str_replace(array('-[]-smf_smily_end#|#-[]-smf_smily_start#|#', '-[]-smf_smily_end#|#', '-[]-smf_smily_start#|#'), ' ', $string);
+			$string = str_replace(['-[]-smf_smily_end#|#-[]-smf_smily_start#|#', '-[]-smf_smily_end#|#', '-[]-smf_smily_start#|#'], ' ', $string);
 		}
 
 		// Only try to buy more time if the client didn't quit.
-		if (connection_aborted() && Utils::$context['server']['is_apache'])
+		if (connection_aborted() && Utils::$context['server']['is_apache']) {
 			@apache_reset_timeout();
+		}
 
 		$parts = preg_split('~(<[A-Za-z]+\s*[^<>]*?style="?[^<>"]+"?[^<>]*?(?:/?)>|</[A-Za-z]+>)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
 		$replacement = '';
-		$stack = array();
+		$stack = [];
 
-		foreach ($parts as $part)
-		{
+		foreach ($parts as $part) {
 			// Opening tag.
-			if (preg_match('~(<([A-Za-z]+)\s*[^<>]*?)style="?([^<>"]+)"?([^<>]*?(/?)>)~', $part, $matches) === 1)
-			{
+			if (preg_match('~(<([A-Za-z]+)\s*[^<>]*?)style="?([^<>"]+)"?([^<>]*?(/?)>)~', $part, $matches) === 1) {
 				// If it's being closed instantly, we can't deal with it...yet.
-				if ($matches[5] === '/')
+				if ($matches[5] === '/') {
 					continue;
+				}
 
 				// Get an array of styles that apply to this element. (The strtr is there to combat HTML generated by Word.)
-				$styles = explode(';', strtr($matches[3], array('&quot;' => '')));
+				$styles = explode(';', strtr($matches[3], ['&quot;' => '']));
 				$curElement = $matches[2];
 				$precedingStyle = $matches[1];
 				$afterStyle = $matches[4];
 				$curCloseTags = '';
 				$extra_attr = '';
 
-				foreach ($styles as $type_value_pair)
-				{
+				foreach ($styles as $type_value_pair) {
 					// Remove spaces and convert uppercase letters.
 					$clean_type_value_pair = strtolower(strtr(trim($type_value_pair), '=', ':'));
 
 					// Something like 'font-weight: bold' is expected here.
-					if (strpos($clean_type_value_pair, ':') === false)
+					if (strpos($clean_type_value_pair, ':') === false) {
 						continue;
+					}
 
 					// Capture the elements of a single style item (e.g. 'font-weight' and 'bold').
-					list ($style_type, $style_value) = explode(':', $type_value_pair);
+					list($style_type, $style_value) = explode(':', $type_value_pair);
 
 					$style_value = trim($style_value);
 
-					switch (trim($style_type))
-					{
+					switch (trim($style_type)) {
 						case 'font-weight':
-							if ($style_value === 'bold')
-							{
+							if ($style_value === 'bold') {
 								$curCloseTags .= '[/b]';
 								$replacement .= '[b]';
 							}
 							break;
 
 						case 'text-decoration':
-							if ($style_value == 'underline')
-							{
+							if ($style_value == 'underline') {
 								$curCloseTags .= '[/u]';
 								$replacement .= '[u]';
-							}
-							elseif ($style_value == 'line-through')
-							{
+							} elseif ($style_value == 'line-through') {
 								$curCloseTags .= '[/s]';
 								$replacement .= '[s]';
 							}
 							break;
 
 						case 'text-align':
-							if ($style_value == 'left')
-							{
+							if ($style_value == 'left') {
 								$curCloseTags .= '[/left]';
 								$replacement .= '[left]';
-							}
-							elseif ($style_value == 'center')
-							{
+							} elseif ($style_value == 'center') {
 								$curCloseTags .= '[/center]';
 								$replacement .= '[center]';
-							}
-							elseif ($style_value == 'right')
-							{
+							} elseif ($style_value == 'right') {
 								$curCloseTags .= '[/right]';
 								$replacement .= '[right]';
 							}
 							break;
 
 						case 'font-style':
-							if ($style_value == 'italic')
-							{
+							if ($style_value == 'italic') {
 								$curCloseTags .= '[/i]';
 								$replacement .= '[i]';
 							}
@@ -1533,8 +1513,7 @@ public function unparse(string $string): string
 
 						case 'font-size':
 							// Sometimes people put decimals where decimals should not be.
-							if (preg_match('~(\d)+\.\d+(p[xt])~i', $style_value, $dec_matches) === 1)
-							{
+							if (preg_match('~(\d)+\.\d+(p[xt])~i', $style_value, $dec_matches) === 1) {
 								$style_value = $dec_matches[1] . $dec_matches[2];
 							}
 
@@ -1544,66 +1523,63 @@ public function unparse(string $string): string
 
 						case 'font-family':
 							// Only get the first freaking font if there's a list!
-							if (strpos($style_value, ',') !== false)
+							if (strpos($style_value, ',') !== false) {
 								$style_value = substr($style_value, 0, strpos($style_value, ','));
+							}
 
 							$curCloseTags .= '[/font]';
-							$replacement .= '[font=' . strtr($style_value, array("'" => '')) . ']';
+							$replacement .= '[font=' . strtr($style_value, ["'" => '']) . ']';
 							break;
 
 						// This is a hack for images with dimensions embedded.
 						case 'width':
 						case 'height':
-							if (preg_match('~[1-9]\d*~i', $style_value, $dimension) === 1)
+							if (preg_match('~[1-9]\d*~i', $style_value, $dimension) === 1) {
 								$extra_attr .= ' ' . $style_type . '="' . $dimension[0] . '"';
+							}
 							break;
 
 						case 'list-style-type':
-							if (preg_match('~none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha~i', $style_value, $listType) === 1)
+							if (preg_match('~none|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-alpha|upper-alpha|lower-greek|lower-latin|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha~i', $style_value, $listType) === 1) {
 								$extra_attr .= ' listtype="' . $listType[0] . '"';
+							}
 							break;
 					}
 				}
 
 				// Preserve some tags stripping the styling.
-				if (in_array($matches[2], array('a', 'font', 'td')))
-				{
+				if (in_array($matches[2], ['a', 'font', 'td'])) {
 					$replacement .= $precedingStyle . $afterStyle;
 					$curCloseTags = '</' . $matches[2] . '>' . $curCloseTags;
 				}
 
 				// If there's something that still needs closing, push it to the stack.
-				if (!empty($curCloseTags))
-				{
-					array_push($stack, array(
+				if (!empty($curCloseTags)) {
+					array_push(
+						$stack,
+						[
 							'element' => strtolower($curElement),
-							'closeTags' => $curCloseTags
-						)
+							'closeTags' => $curCloseTags,
+						],
 					);
-				}
-				elseif (!empty($extra_attr))
-				{
+				} elseif (!empty($extra_attr)) {
 					$replacement .= $precedingStyle . $extra_attr . $afterStyle;
 				}
 			}
 			// Closing tag.
-			elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
-			{
+			elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1) {
 				// Is this the element that we've been waiting for to be closed?
-				if (!empty($stack) && strtolower($matches[1]) === $stack[count($stack) - 1]['element'])
-				{
+				if (!empty($stack) && strtolower($matches[1]) === $stack[count($stack) - 1]['element']) {
 					$byebyeTag = array_pop($stack);
 					$replacement .= $byebyeTag['closeTags'];
 				}
 				// Must've been something else.
-				else
-				{
+				else {
 					$replacement .= $part;
 				}
 			}
 			// In all other cases, just add the part to the replacement.
-			else
-			{
+			else {
 				$replacement .= $part;
 			}
 		}
@@ -1612,21 +1588,21 @@ public function unparse(string $string): string
 		$string = $replacement;
 
 		// We are not finished yet, request more time.
-		if (connection_aborted() && Utils::$context['server']['is_apache'])
+		if (connection_aborted() && Utils::$context['server']['is_apache']) {
 			@apache_reset_timeout();
+		}
 
 		// Let's pull out any legacy alignments.
-		while (preg_match('~<([A-Za-z]+)\s+[^<>]*?(align="*(left|center|right)"*)[^<>]*?(/?)>~i', $string, $matches) === 1)
-		{
+		while (preg_match('~<([A-Za-z]+)\s+[^<>]*?(align="*(left|center|right)"*)[^<>]*?(/?)>~i', $string, $matches) === 1) {
 			// Find the position in the text of this tag over again.
 			$start_pos = strpos($string, $matches[0]);
 
-			if ($start_pos === false)
+			if ($start_pos === false) {
 				break;
+			}
 
 			// End tag?
-			if ($matches[4] != '/' && strpos($string, '</' . $matches[1] . '>', $start_pos) !== false)
-			{
+			if ($matches[4] != '/' && strpos($string, '</' . $matches[1] . '>', $start_pos) !== false) {
 				$end_pos = strpos($string, '</' . $matches[1] . '>', $start_pos);
 
 				// Remove the align from that tag so it's never checked again.
@@ -1636,23 +1612,21 @@ public function unparse(string $string): string
 
 				// Put the tags back into the body.
 				$string = substr($string, 0, $start_pos) . $tag . '[' . $matches[3] . ']' . $content . '[/' . $matches[3] . ']' . substr($string, $end_pos);
-			}
-			else
-			{
+			} else {
 				// Just get rid of this evil tag.
 				$string = substr($string, 0, $start_pos) . substr($string, $start_pos + strlen($matches[0]));
 			}
 		}
 
 		// Let's do some special stuff for fonts - cause we all love fonts.
-		while (preg_match('~<font\s+([^<>]*)>~i', $string, $matches) === 1)
-		{
+		while (preg_match('~<font\s+([^<>]*)>~i', $string, $matches) === 1) {
 			// Find the position of this again.
 			$start_pos = strpos($string, $matches[0]);
 			$end_pos = false;
 
-			if ($start_pos === false)
+			if ($start_pos === false) {
 				break;
+			}
 
 			// This must have an end tag - and we must find the right one.
 			$lower_text = strtolower($string);
@@ -1661,68 +1635,59 @@ public function unparse(string $string): string
 			$start_pos_test = $start_pos + 4;
 			$start_font_tag_stack = 0;
 
-			while ($start_pos_test < strlen($string))
-			{
+			while ($start_pos_test < strlen($string)) {
 				// Where is the next starting font?
 				$next_start_pos = strpos($lower_text, '<font', $start_pos_test);
 				$next_end_pos = strpos($lower_text, '</font>', $start_pos_test);
 
 				// Did we past another starting tag before an end one?
-				if ($next_start_pos !== false && $next_start_pos < $next_end_pos)
-				{
+				if ($next_start_pos !== false && $next_start_pos < $next_end_pos) {
 					$start_font_tag_stack++;
 					$start_pos_test = $next_start_pos + 4;
 				}
 				// Otherwise we have an end tag but not the right one?
-				elseif ($start_font_tag_stack)
-				{
+				elseif ($start_font_tag_stack) {
 					$start_font_tag_stack--;
 					$start_pos_test = $next_end_pos + 4;
 				}
 				// Otherwise we're there!
-				else
-				{
+				else {
 					$end_pos = $next_end_pos;
 					break;
 				}
 			}
 
-			if ($end_pos === false)
+			if ($end_pos === false) {
 				break;
+			}
 
 			// Now work out what the attributes are.
 			$attribs = self::fetchTagAttributes($matches[1]);
-			$tags = array();
-			$sizes_equivalence = array(1 => '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
+			$tags = [];
+			$sizes_equivalence = [1 => '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt'];
 
-			foreach ($attribs as $s => $v)
-			{
-				if ($s == 'size')
-				{
+			foreach ($attribs as $s => $v) {
+				if ($s == 'size') {
 					// Cast before empty check because casting a string results in a 0 and we don't have zeros in the array! ;)
 					$v = (int) trim($v);
 					$v = empty($v) ? 1 : $v;
-					$tags[] = array('[size=' . $sizes_equivalence[$v] . ']', '[/size]');
-				}
-				elseif ($s == 'face')
-				{
-					$tags[] = array('[font=' . trim(strtolower($v)) . ']', '[/font]');
-				}
-				elseif ($s == 'color')
-				{
-					$tags[] = array('[color=' . trim(strtolower($v)) . ']', '[/color]');
+					$tags[] = ['[size=' . $sizes_equivalence[$v] . ']', '[/size]'];
+				} elseif ($s == 'face') {
+					$tags[] = ['[font=' . trim(strtolower($v)) . ']', '[/font]'];
+				} elseif ($s == 'color') {
+					$tags[] = ['[color=' . trim(strtolower($v)) . ']', '[/color]'];
 				}
 			}
 
 			// As before add in our tags.
 			$before = $after = '';
 
-			foreach ($tags as $tag)
-			{
+			foreach ($tags as $tag) {
 				$before .= $tag[0];
 
-				if (isset($tag[1]))
+				if (isset($tag[1])) {
 					$after = $tag[1] . $after;
+				}
 			}
 
 			// Remove the tag so it's never checked again.
@@ -1733,11 +1698,11 @@ public function unparse(string $string): string
 		}
 
 		// Almost there, just a little more time.
-		if (connection_aborted() && Utils::$context['server']['is_apache'])
+		if (connection_aborted() && Utils::$context['server']['is_apache']) {
 			@apache_reset_timeout();
+		}
 
-		if (count($parts = preg_split('~<(/?)(li|ol|ul)([^>]*)>~i', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) > 1)
-		{
+		if (count($parts = preg_split('~<(/?)(li|ol|ul)([^>]*)>~i', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) > 1) {
 			// A toggle that determines whether we're directly under a <ol> or <ul>.
 			$inList = false;
 
@@ -1745,7 +1710,7 @@ public function unparse(string $string): string
 			$listDepth = 0;
 
 			// Map what we can expect from the HTML to what is supported by SMF.
-			$listTypeMapping = array(
+			$listTypeMapping = [
 				'1' => 'decimal',
 				'A' => 'upper-alpha',
 				'a' => 'lower-alpha',
@@ -1754,30 +1719,26 @@ public function unparse(string $string): string
 				'disc' => 'disc',
 				'square' => 'square',
 				'circle' => 'circle',
-			);
+			];
 
 			// $i: text, $i + 1: '/', $i + 2: tag, $i + 3: tail.
-			for ($i = 0, $numParts = count($parts) - 1; $i < $numParts; $i += 4)
-			{
+			for ($i = 0, $numParts = count($parts) - 1; $i < $numParts; $i += 4) {
 				$tag = strtolower($parts[$i + 2]);
 				$is_opening_tag = $parts[$i + 1] === '';
 
-				if ($is_opening_tag)
-				{
-					switch ($tag)
-					{
+				if ($is_opening_tag) {
+					switch ($tag) {
 						case 'ol':
 						case 'ul':
 							// We have a problem, we're already in a list.
-							if ($inList)
-							{
+							if ($inList) {
 								// Inject a list opener, we'll deal with the ol/ul next loop.
-								array_splice($parts, $i, 0, array(
+								array_splice($parts, $i, 0, [
 									'',
 									'',
 									str_repeat("\t", $listDepth) . '[li]',
 									'',
-								));
+								]);
 								$numParts = count($parts) - 1;
 
 								// The inlist status changes a bit.
@@ -1785,20 +1746,14 @@ public function unparse(string $string): string
 							}
 
 							// Just starting a new list.
-							else
-							{
+							else {
 								$inList = true;
 
-								if ($tag === 'ol')
-								{
+								if ($tag === 'ol') {
 									$listType = 'decimal';
-								}
-								elseif (preg_match('~type="?(' . implode('|', array_keys($listTypeMapping)) . ')"?~', $parts[$i + 3], $match) === 1)
-								{
+								} elseif (preg_match('~type="?(' . implode('|', array_keys($listTypeMapping)) . ')"?~', $parts[$i + 3], $match) === 1) {
 									$listType = $listTypeMapping[$match[1]];
-								}
-								else
-								{
+								} else {
 									$listType = null;
 								}
 
@@ -1811,8 +1766,7 @@ public function unparse(string $string): string
 
 						case 'li':
 							// This is how it should be: a list item inside the list.
-							if ($inList)
-							{
+							if ($inList) {
 								$parts[$i + 2] = str_repeat("\t", $listDepth) . '[li]';
 								$parts[$i + 3] = '';
 
@@ -1821,18 +1775,15 @@ public function unparse(string $string): string
 							}
 
 							// The li is no direct child of a list.
-							else
-							{
+							else {
 								// We are apparently in a list item.
-								if ($listDepth > 0)
-								{
+								if ($listDepth > 0) {
 									$parts[$i + 2] = '[/li]' . "\n" . str_repeat("\t", $listDepth) . '[li]';
 									$parts[$i + 3] = '';
 								}
 
 								// We're not even near a list.
-								else
-								{
+								else {
 									// Quickly create a list with an item.
 									$listDepth++;
 
@@ -1845,15 +1796,12 @@ public function unparse(string $string): string
 				}
 
 				// Handle all the closing tags.
-				else
-				{
-					switch ($tag)
-					{
+				else {
+					switch ($tag) {
 						case 'ol':
 						case 'ul':
 							// As we expected it, closing the list while we're in it.
-							if ($inList)
-							{
+							if ($inList) {
 								$inList = false;
 
 								$listDepth--;
@@ -1861,28 +1809,24 @@ public function unparse(string $string): string
 								$parts[$i + 1] = '';
 								$parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]';
 								$parts[$i + 3] = '';
-							}
-							else
-							{
+							} else {
 								// We're in a list item.
-								if ($listDepth > 0)
-								{
+								if ($listDepth > 0) {
 									// Inject closure for this list item first.
 									// The content of $parts[$i] is left as is!
-									array_splice($parts, $i + 1, 0, array(
+									array_splice($parts, $i + 1, 0, [
 										'', // $i + 1
 										'[/li]' . "\n", // $i + 2
 										'', // $i + 3
 										'', // $i + 4
-									));
+									]);
 									$numParts = count($parts) - 1;
 
 									// Now that we've closed the li, we're in list space.
 									$inList = true;
 								}
 								// We're not even in a list, ignore
-								else
-								{
+								else {
 									$parts[$i + 1] = '';
 									$parts[$i + 2] = '';
 									$parts[$i + 3] = '';
@@ -1891,15 +1835,12 @@ public function unparse(string $string): string
 							break;
 
 						case 'li':
-							if ($inList)
-							{
+							if ($inList) {
 								// There's no use for a </li> after <ol> or <ul>, ignore.
 								$parts[$i + 1] = '';
 								$parts[$i + 2] = '';
 								$parts[$i + 3] = '';
-							}
-							else
-							{
+							} else {
 								// Remove the trailing breaks from the list item.
 								$parts[$i] = preg_replace('~\s*<br\s*' . '/?' . '>\s*$~', '', $parts[$i]);
 								$parts[$i + 1] = '';
@@ -1914,15 +1855,14 @@ public function unparse(string $string): string
 				}
 
 				// If we're in the [list] space, no content is allowed.
-				if ($inList && trim(preg_replace('~\s*<br\s*' . '/?' . '>\s*~', '', $parts[$i + 4])) !== '')
-				{
+				if ($inList && trim(preg_replace('~\s*<br\s*' . '/?' . '>\s*~', '', $parts[$i + 4])) !== '') {
 					// Fix it by injecting an extra list item.
-					array_splice($parts, $i + 4, 0, array(
+					array_splice($parts, $i + 4, 0, [
 						'', // No content.
 						'', // Opening tag.
 						'li', // It's a <li>.
 						'', // No tail.
-					));
+					]);
 
 					$numParts = count($parts) - 1;
 				}
@@ -1930,24 +1870,24 @@ public function unparse(string $string): string
 
 			$string = implode('', $parts);
 
-			if ($inList)
-			{
+			if ($inList) {
 				$listDepth--;
 				$string .= str_repeat("\t", $listDepth) . '[/list]';
 			}
 
-			for ($i = $listDepth; $i > 0; $i--)
+			for ($i = $listDepth; $i > 0; $i--) {
 				$string .= '[/li]' . "\n" . str_repeat("\t", $i - 1) . '[/list]';
+			}
 		}
 
 		// I love my own image...
-		while (preg_match('~<img\s+([^<>]*)/*>~i', $string, $matches) === 1)
-		{
+		while (preg_match('~<img\s+([^<>]*)/*>~i', $string, $matches) === 1) {
 			// Find the position of the image.
 			$start_pos = strpos($string, $matches[0]);
 
-			if ($start_pos === false)
+			if ($start_pos === false) {
 				break;
+			}
 
 			$end_pos = $start_pos + strlen($matches[0]);
 
@@ -1956,40 +1896,29 @@ public function unparse(string $string): string
 
 			$attrs = self::fetchTagAttributes($matches[1]);
 
-			foreach ($attrs as $attrib => $value)
-			{
-				if (in_array($attrib, array('width', 'height')))
-				{
+			foreach ($attrs as $attrib => $value) {
+				if (in_array($attrib, ['width', 'height'])) {
 					$params .= ' ' . $attrib . '=' . (int) $value;
-				}
-				elseif ($attrib == 'alt' && trim($value) != '')
-				{
+				} elseif ($attrib == 'alt' && trim($value) != '') {
 					$params .= ' alt=' . trim($value);
-				}
-				elseif ($attrib == 'src')
-				{
+				} elseif ($attrib == 'src') {
 					$src = trim($value);
 				}
 			}
 
 			$tag = '';
 
-			if (!empty($src))
-			{
+			if (!empty($src)) {
 				$src = new Url($src);
 
 				// Attempt to fix the path in case it's not present.
-				if (in_array($src->scheme, array('http', 'https')) && isset($src->host))
-				{
-					$base_url = (isset($src->scheme) ? $src->scheme : 'http') . '://' . $src->host . (empty($src->port) ? '' : ':' . $src->port);
+				if (in_array($src->scheme, ['http', 'https']) && isset($src->host)) {
+					$base_url = ($src->scheme ?? 'http') . '://' . $src->host . (empty($src->port) ? '' : ':' . $src->port);
 
-					if (substr($src, 0, 1) === '/')
-					{
+					if (substr($src, 0, 1) === '/') {
 						$src = $base_url . $src;
-					}
-					else
-					{
-						$src = $base_url . (empty($src->path) ? '/' : preg_replace('~/(?:index\\.php)?$~', '', $src->path)) . '/' . $src;
+					} else {
+						$src = $base_url . (empty($src->path) ? '/' : preg_replace('~/(?:index\.php)?$~', '', $src->path)) . '/' . $src;
 					}
 				}
 
@@ -2001,188 +1930,149 @@ public function unparse(string $string): string
 		}
 
 		// The final bits are the easy ones - tags which map to tags which map to tags - etc etc.
-		$tags = array(
-			'~<b(\s(.)*?)*?' . '>~i' => function()
-			{
+		$tags = [
+			'~<b(\s(.)*?)*?' . '>~i' => function () {
 				return '[b]';
 			},
-			'~</b>~i' => function()
-			{
+			'~</b>~i' => function () {
 				return '[/b]';
 			},
-			'~<i(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<i(\s(.)*?)*?' . '>~i' => function () {
 				return '[i]';
 			},
-			'~</i>~i' => function()
-			{
+			'~</i>~i' => function () {
 				return '[/i]';
 			},
-			'~<u(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<u(\s(.)*?)*?' . '>~i' => function () {
 				return '[u]';
 			},
-			'~</u>~i' => function()
-			{
+			'~</u>~i' => function () {
 				return '[/u]';
 			},
-			'~<strong(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<strong(\s(.)*?)*?' . '>~i' => function () {
 				return '[b]';
 			},
-			'~</strong>~i' => function()
-			{
+			'~</strong>~i' => function () {
 				return '[/b]';
 			},
-			'~<em(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<em(\s(.)*?)*?' . '>~i' => function () {
 				return '[i]';
 			},
-			'~</em>~i' => function()
-			{
+			'~</em>~i' => function () {
 				return '[i]';
 			},
-			'~<s(\s(.)*?)*?' . '>~i' => function()
-			{
-				return "[s]";
+			'~<s(\s(.)*?)*?' . '>~i' => function () {
+				return '[s]';
 			},
-			'~</s>~i' => function()
-			{
-				return "[/s]";
+			'~</s>~i' => function () {
+				return '[/s]';
 			},
-			'~<strike(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<strike(\s(.)*?)*?' . '>~i' => function () {
 				return '[s]';
 			},
-			'~</strike>~i' => function()
-			{
+			'~</strike>~i' => function () {
 				return '[/s]';
 			},
-			'~<del(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<del(\s(.)*?)*?' . '>~i' => function () {
 				return '[s]';
 			},
-			'~</del>~i' => function()
-			{
+			'~</del>~i' => function () {
 				return '[/s]';
 			},
-			'~<center(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<center(\s(.)*?)*?' . '>~i' => function () {
 				return '[center]';
 			},
-			'~</center>~i' => function()
-			{
+			'~</center>~i' => function () {
 				return '[/center]';
 			},
-			'~<pre(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<pre(\s(.)*?)*?' . '>~i' => function () {
 				return '[pre]';
 			},
-			'~</pre>~i' => function()
-			{
+			'~</pre>~i' => function () {
 				return '[/pre]';
 			},
-			'~<sub(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<sub(\s(.)*?)*?' . '>~i' => function () {
 				return '[sub]';
 			},
-			'~</sub>~i' => function()
-			{
+			'~</sub>~i' => function () {
 				return '[/sub]';
 			},
-			'~<sup(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<sup(\s(.)*?)*?' . '>~i' => function () {
 				return '[sup]';
 			},
-			'~</sup>~i' => function()
-			{
+			'~</sup>~i' => function () {
 				return '[/sup]';
 			},
-			'~<tt(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<tt(\s(.)*?)*?' . '>~i' => function () {
 				return '[tt]';
 			},
-			'~</tt>~i' => function()
-			{
+			'~</tt>~i' => function () {
 				return '[/tt]';
 			},
-			'~<table(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<table(\s(.)*?)*?' . '>~i' => function () {
 				return '[table]';
 			},
-			'~</table>~i' => function()
-			{
+			'~</table>~i' => function () {
 				return '[/table]';
 			},
-			'~<tr(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<tr(\s(.)*?)*?' . '>~i' => function () {
 				return '[tr]';
 			},
-			'~</tr>~i' => function()
-			{
+			'~</tr>~i' => function () {
 				return '[/tr]';
 			},
-			'~<(td|th)\s[^<>]*?colspan="?(\d{1,2})"?.*?' . '>~i' => function($matches)
-			{
+			'~<(td|th)\s[^<>]*?colspan="?(\d{1,2})"?.*?' . '>~i' => function ($matches) {
 				return str_repeat('[td][/td]', $matches[2] - 1) . '[td]';
 			},
-			'~<(td|th)(\s(.)*?)*?' . '>~i' => function()
-			{
+			'~<(td|th)(\s(.)*?)*?' . '>~i' => function () {
 				return '[td]';
 			},
-			'~</(td|th)>~i' => function()
-			{
+			'~</(td|th)>~i' => function () {
 				return '[/td]';
 			},
-			'~<br(?:\s[^<>]*?)?' . '>~i' => function()
-			{
+			'~<br(?:\s[^<>]*?)?' . '>~i' => function () {
 				return "\n";
 			},
-			'~<hr[^<>]*>(\n)?~i' => function($matches)
-			{
+			'~<hr[^<>]*>(\n)?~i' => function ($matches) {
 				return "[hr]\n" . $matches[0];
 			},
-			'~(\n)?\\[hr\\]~i' => function()
-			{
+			'~(\n)?\[hr\]~i' => function () {
 				return "\n[hr]";
 			},
-			'~^\n\\[hr\\]~i' => function()
-			{
-				return "[hr]";
+			'~^\n\[hr\]~i' => function () {
+				return '[hr]';
 			},
-			'~<blockquote(\s(.)*?)*?' . '>~i' => function()
-			{
-				return "&lt;blockquote&gt;";
+			'~<blockquote(\s(.)*?)*?' . '>~i' => function () {
+				return '&lt;blockquote&gt;';
 			},
-			'~</blockquote>~i' => function()
-			{
-				return "&lt;/blockquote&gt;";
+			'~</blockquote>~i' => function () {
+				return '&lt;/blockquote&gt;';
 			},
-			'~<ins(\s(.)*?)*?' . '>~i' => function()
-			{
-				return "&lt;ins&gt;";
+			'~<ins(\s(.)*?)*?' . '>~i' => function () {
+				return '&lt;ins&gt;';
 			},
-			'~</ins>~i' => function()
-			{
-				return "&lt;/ins&gt;";
+			'~</ins>~i' => function () {
+				return '&lt;/ins&gt;';
 			},
-		);
+		];
 
-		foreach ($tags as $tag => $replace)
+		foreach ($tags as $tag => $replace) {
 			$string = preg_replace_callback($tag, $replace, $string);
+		}
 
 		// Please give us just a little more time.
-		if (connection_aborted() && Utils::$context['server']['is_apache'])
+		if (connection_aborted() && Utils::$context['server']['is_apache']) {
 			@apache_reset_timeout();
+		}
 
 		// What about URL's - the pain in the ass of the tag world.
-		while (preg_match('~<a\s+([^<>]*)>([^<>]*)</a>~i', $string, $matches) === 1)
-		{
+		while (preg_match('~<a\s+([^<>]*)>([^<>]*)</a>~i', $string, $matches) === 1) {
 			// Find the position of the URL.
 			$start_pos = strpos($string, $matches[0]);
 
-			if ($start_pos === false)
+			if ($start_pos === false) {
 				break;
+			}
 
 			$end_pos = $start_pos + strlen($matches[0]);
 
@@ -2191,58 +2081,46 @@ public function unparse(string $string): string
 
 			$attrs = self::fetchTagAttributes($matches[1]);
 
-			foreach ($attrs as $attrib => $value)
-			{
-				if ($attrib == 'href')
-				{
+			foreach ($attrs as $attrib => $value) {
+				if ($attrib == 'href') {
 					$href = new Url(trim($value));
 					$our_url = new Url(Config::$boardurl);
 
 					// Are we dealing with an FTP link?
-					if (in_array($href->scheme, array('ftp', 'ftps')))
-					{
+					if (in_array($href->scheme, ['ftp', 'ftps'])) {
 						$tag_type = 'ftp';
 					}
 					// Or is this a link to an email address?
-					elseif ($href->scheme == 'mailto')
-					{
+					elseif ($href->scheme == 'mailto') {
 						$tag_type = 'email';
 						$href = $href->path;
 					}
 					// No http(s), so attempt to fix this potential relative URL.
-					elseif (!in_array($href->scheme, array('http', 'https')) && isset($our_url->host))
-					{
+					elseif (!in_array($href->scheme, ['http', 'https']) && isset($our_url->host)) {
 						$base_url = ($our_url->scheme ?? 'http') . '://' . $our_url->host . (empty($our_url->port) ? '' : ':' . $our_url->port);
 
-						if (substr($href, 0, 1) === '/')
-						{
+						if (substr($href, 0, 1) === '/') {
 							$href = $base_url . $href;
-						}
-						else
-						{
+						} else {
 							$href = $base_url . '/' . trim($our_url->path, '/') . '/' . $href;
 						}
 					}
 				}
 
 				// External URL?
-				if ($attrib == 'target' && $tag_type == 'url')
-				{
-					if (trim($value) == '_blank')
+				if ($attrib == 'target' && $tag_type == 'url') {
+					if (trim($value) == '_blank') {
 						$tag_type == 'iurl';
+					}
 				}
 			}
 
 			$tag = '';
 
-			if ($href != '')
-			{
-				if ($matches[2] == $href)
-				{
+			if ($href != '') {
+				if ($matches[2] == $href) {
 					$tag = '[' . $tag_type . ']' . $href . '[/' . $tag_type . ']';
-				}
-				else
-				{
+				} else {
 					$tag = '[' . $tag_type . '=' . $href . ']' . $matches[2] . '[/' . $tag_type . ']';
 				}
 			}
@@ -2279,8 +2157,9 @@ public function unparse(string $string): string
 	 */
 	public static function load(bool $init = false): object
 	{
-		if (!isset(self::$parser) || !empty($init))
+		if (!isset(self::$parser) || !empty($init)) {
 			self::$parser = new self();
+		}
 
 		return self::$parser;
 	}
@@ -2306,25 +2185,28 @@ public static function getSigTags(): array
 	{
 		list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 
-		if (empty($sig_bbc))
-			return array();
+		if (empty($sig_bbc)) {
+			return [];
+		}
 
 		$disabled_tags = explode(',', $sig_bbc);
 
 		// Get all available bbc tags
 		$temp = self::getCodes();
-		$allowed_tags = array();
+		$allowed_tags = [];
 
-		foreach ($temp as $tag)
-		{
-			if (!in_array($tag['tag'], $disabled_tags))
+		foreach ($temp as $tag) {
+			if (!in_array($tag['tag'], $disabled_tags)) {
 				$allowed_tags[] = $tag['tag'];
+			}
 		}
 
 		$allowed_tags = array_unique($allowed_tags);
-		if (empty($allowed_tags))
+
+		if (empty($allowed_tags)) {
 			// An empty array means that all bbc tags are allowed. So if all tags are disabled we need to add a dummy tag.
 			$allowed_tags[] = 'nonexisting';
+		}
 
 		return $allowed_tags;
 	}
@@ -2342,18 +2224,18 @@ public static function getSigTags(): array
 	public static function highlightPhpCode(string $code): string
 	{
 		// Remove special characters.
-		$code = Utils::htmlspecialcharsDecode(strtr($code, array('<br />' => "\n", '<br>' => "\n", "\t" => 'SMF_TAB();', '&#91;' => '[')));
+		$code = Utils::htmlspecialcharsDecode(strtr($code, ['<br />' => "\n", '<br>' => "\n", "\t" => 'SMF_TAB();', '&#91;' => '[']));
 
 		$oldlevel = error_reporting(0);
 
-		$buffer = str_replace(array("\n", "\r"), '', @highlight_string($code, true));
+		$buffer = str_replace(["\n", "\r"], '', @highlight_string($code, true));
 
 		error_reporting($oldlevel);
 
 		// Yes, I know this is kludging it, but this is the best way to preserve tabs from PHP :P.
-		$buffer = preg_replace('~SMF_TAB(?:</(?:font|span)><(?:font color|span style)="[^"]*?">)?\\(\\);~', '<pre style="display: inline;">' . "\t" . '</pre>', $buffer);
+		$buffer = preg_replace('~SMF_TAB(?:</(?:font|span)><(?:font color|span style)="[^"]*?">)?\(\);~', '<pre style="display: inline;">' . "\t" . '</pre>', $buffer);
 
-		return strtr($buffer, array('\'' => '&#039;', '<code>' => '', '</code>' => ''));
+		return strtr($buffer, ['\'' => '&#039;', '<code>' => '', '</code>' => '']);
 	}
 
 	/**
@@ -2367,13 +2249,14 @@ public static function highlightPhpCode(string $code): string
 	 */
 	public static function sanitizeMSCutPaste(string $string): string
 	{
-		if (empty($string))
+		if (empty($string)) {
 			return $string;
+		}
 
 		self::load();
 
 		// UTF-8 occurrences of MS special characters.
-		$findchars_utf8 = array(
+		$findchars_utf8 = [
 			"\xe2\x80\x9a",	// single low-9 quotation mark
 			"\xe2\x80\x9e",	// double low-9 quotation mark
 			"\xe2\x80\xa6",	// horizontal ellipsis
@@ -2381,10 +2264,10 @@ public static function sanitizeMSCutPaste(string $string): string
 			"\xe2\x80\x99",	// right single curly quote
 			"\xe2\x80\x9c",	// left double curly quote
 			"\xe2\x80\x9d",	// right double curly quote
-		);
+		];
 
 		// windows 1252 / iso equivalents
-		$findchars_iso = array(
+		$findchars_iso = [
 			chr(130),
 			chr(132),
 			chr(133),
@@ -2392,10 +2275,10 @@ public static function sanitizeMSCutPaste(string $string): string
 			chr(146),
 			chr(147),
 			chr(148),
-		);
+		];
 
 		// safe replacements
-		$replacechars = array(
+		$replacechars = [
 			',',	// &sbquo;
 			',,',	// &bdquo;
 			'...',	// &hellip;
@@ -2403,7 +2286,7 @@ public static function sanitizeMSCutPaste(string $string): string
 			"'",	// &rsquo;
 			'"',	// &ldquo;
 			'"',	// &rdquo;
-		);
+		];
 
 		$string = str_replace(Utils::$context['utf8'] ? $findchars_utf8 : $findchars_iso, $replacechars, $string);
 
@@ -2422,10 +2305,11 @@ public static function sanitizeMSCutPaste(string $string): string
 	 * @param array $parse_tags If set, only parses these tags rather than all of them.
 	 * @return string|array The parsed message or the list of BBCodes.
 	 */
-	public static function backcompatParseBbc($message, $smileys = true, $cache_id = '', $parse_tags = array()): string|array
+	public static function backcompatParseBbc($message, $smileys = true, $cache_id = '', $parse_tags = []): string|array
 	{
-		if ($message === false)
+		if ($message === false) {
 			return self::getCodes();
+		}
 
 		self::load();
 
@@ -2480,8 +2364,9 @@ public static function attachValidate(&$tag, &$data, $disabled, $params): void
 		$return_context = '';
 
 		// BBC or the entire attachments feature is disabled
-		if (empty(Config::$modSettings['attachmentEnable']) || !empty($disabled['attach']))
+		if (empty(Config::$modSettings['attachmentEnable']) || !empty($disabled['attach'])) {
 			return;
+		}
 
 		// Save the attach ID.
 		$attach_id = $params['{id}'];
@@ -2489,70 +2374,58 @@ public static function attachValidate(&$tag, &$data, $disabled, $params): void
 		$current_attachment = Attachment::parseAttachBBC($attach_id);
 
 		// parseAttachBBC will return a string (Lang::$txt key) rather than dying with a fatal_error. Up to you to decide what to do.
-		if (is_string($current_attachment))
-		{
-			$data = '<span style="display:inline-block" class="errorbox">' . (!empty(Lang::$txt[$current_attachment]) ? Lang::$txt[$current_attachment] : $current_attachment)  . '</span>';
+		if (is_string($current_attachment)) {
+			$data = '<span style="display:inline-block" class="errorbox">' . (!empty(Lang::$txt[$current_attachment]) ? Lang::$txt[$current_attachment] : $current_attachment) . '</span>';
 
 			return;
 		}
 
 		// We need a display mode.
-		if (empty($params['{display}']))
-		{
+		if (empty($params['{display}'])) {
 			// Images, video, and audio are embedded by default.
-			if (!empty($current_attachment['is_image']) || strpos($current_attachment['mime_type'], 'video/') === 0 || strpos($current_attachment['mime_type'], 'audio/') === 0)
-			{
+			if (!empty($current_attachment['is_image']) || strpos($current_attachment['mime_type'], 'video/') === 0 || strpos($current_attachment['mime_type'], 'audio/') === 0) {
 				$params['{display}'] = 'embed';
 			}
 			// Anything else shows a link by default.
-			else
-			{
+			else {
 				$params['{display}'] = 'link';
 			}
 		}
 
 		// Embedded file.
-		if ($params['{display}'] == 'embed')
-		{
+		if ($params['{display}'] == 'embed') {
 			$alt = ' alt="' . (!empty($params['{alt}']) ? $params['{alt}'] : $current_attachment['name']) . '"';
 			$title = !empty($data) ? ' title="' . Utils::htmlspecialchars($data) . '"' : '';
 
 			// Image.
-			if (!empty($current_attachment['is_image']))
-			{
+			if (!empty($current_attachment['is_image'])) {
 				// Just viewing the page shouldn't increase the download count for embedded images.
 				$current_attachment['href'] .= ';preview';
 
-				if (empty($params['{width}']) && empty($params['{height}']))
-				{
+				if (empty($params['{width}']) && empty($params['{height}'])) {
 					$return_context .= '<img src="' . $current_attachment['href'] . '"' . $alt . $title . ' class="bbc_img">';
-				}
-				else
-				{
-					$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"': '';
+				} else {
+					$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
 					$height = !empty($params['{height}']) ? 'height="' . $params['{height}'] . '"' : '';
 					$return_context .= '<img src="' . $current_attachment['href'] . ';image"' . $alt . $title . $width . $height . ' class="bbc_img resized"/>';
 				}
 			}
 			// Video.
-			elseif (strpos($current_attachment['mime_type'], 'video/') === 0)
-			{
+			elseif (strpos($current_attachment['mime_type'], 'video/') === 0) {
 				$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
 				$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
 
-				$return_context .= '<div class="videocontainer"><video controls preload="metadata" src="'. $current_attachment['href'] . '" playsinline' . $width . $height . '><a href="' . $current_attachment['href'] . '" class="bbc_link">' . Utils::htmlspecialchars(!empty($data) ? $data : $current_attachment['name']) . '</a></video></div>' . (!empty($data) && $data != $current_attachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
+				$return_context .= '<div class="videocontainer"><video controls preload="metadata" src="' . $current_attachment['href'] . '" playsinline' . $width . $height . '><a href="' . $current_attachment['href'] . '" class="bbc_link">' . Utils::htmlspecialchars(!empty($data) ? $data : $current_attachment['name']) . '</a></video></div>' . (!empty($data) && $data != $current_attachment['name'] ? '<div class="smalltext">' . $data . '</div>' : '');
 			}
 			// Audio.
-			elseif (strpos($current_attachment['mime_type'], 'audio/') === 0)
-			{
+			elseif (strpos($current_attachment['mime_type'], 'audio/') === 0) {
 				$width = 'max-width:100%; width: ' . (!empty($params['{width}']) ? $params['{width}'] : '400') . 'px;';
 				$height = !empty($params['{height}']) ? 'height: ' . $params['{height}'] . 'px;' : '';
 
-				$return_context .= (!empty($data) && $data != $current_attachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="'. $current_attachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $current_attachment['href'] . '" class="bbc_link">' . Utils::htmlspecialchars(!empty($data) ? $data : $current_attachment['name']) . '</a></audio>';
+				$return_context .= (!empty($data) && $data != $current_attachment['name'] ? $data . ' ' : '') . '<audio controls preload="none" src="' . $current_attachment['href'] . '" class="bbc_audio" style="vertical-align:middle;' . $width . $height . '"><a href="' . $current_attachment['href'] . '" class="bbc_link">' . Utils::htmlspecialchars(!empty($data) ? $data : $current_attachment['name']) . '</a></audio>';
 			}
 			// Anything else.
-			else
-			{
+			else {
 				$width = !empty($params['{width}']) ? ' width="' . $params['{width}'] . '"' : '';
 				$height = !empty($params['{height}']) ? ' height="' . $params['{height}'] . '"' : '';
 
@@ -2560,8 +2433,7 @@ public static function attachValidate(&$tag, &$data, $disabled, $params): void
 			}
 		}
 		// No image. Show a link.
-		else
-		{
+		else {
 			$return_context .= '<a href="' . $current_attachment['href'] . '" class="bbc_link">' . Utils::htmlspecialchars(!empty($data) ? $data : $current_attachment['name']) . '</a>';
 		}
 
@@ -2569,7 +2441,7 @@ public static function attachValidate(&$tag, &$data, $disabled, $params): void
 		// If you want to work with the attachment data itself, use one of these:
 		// - integrate_pre_parseAttachBBC
 		// - integrate_post_parseAttachBBC
-		IntegrationHook::call('integrate_attach_bbc_validate', array(&$return_context, $current_attachment, $tag, $data, $disabled, $params));
+		IntegrationHook::call('integrate_attach_bbc_validate', [&$return_context, $current_attachment, $tag, $data, $disabled, $params]);
 
 		// Gotta append what we just did.
 		$data = $return_context;
@@ -2585,22 +2457,20 @@ public static function attachValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function codeValidate(&$tag, &$data, $disabled, $params): void
 	{
-		if (!isset($disabled['code']))
-		{
+		if (!isset($disabled['code'])) {
 			$code = is_array($data) ? $data[0] : $data;
 
 			$php_parts = preg_split('~(&lt;\?php|\?&gt;)~', $code, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-			for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++)
-			{
+			for ($php_i = 0, $php_n = count($php_parts); $php_i < $php_n; $php_i++) {
 				// Do PHP code coloring?
-				if ($php_parts[$php_i] != '&lt;?php')
+				if ($php_parts[$php_i] != '&lt;?php') {
 					continue;
+				}
 
 				$php_string = '';
 
-				while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;')
-				{
+				while ($php_i + 1 < count($php_parts) && $php_parts[$php_i] != '?&gt;') {
 					$php_string .= $php_parts[$php_i];
 					$php_parts[$php_i++] = '';
 				}
@@ -2613,12 +2483,9 @@ public static function codeValidate(&$tag, &$data, $disabled, $params): void
 
 			$code = str_replace("\t", "<span style=\"white-space: pre;\">\t</span>", $code);
 
-			if (is_array($data))
-			{
+			if (is_array($data)) {
 				$data[0] = $code;
-			}
-			else
-			{
+			} else {
 				$data = $code;
 			}
 		}
@@ -2635,7 +2502,7 @@ public static function codeValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function emailValidate(&$tag, &$data, $disabled, $params): void
 	{
-		$data = strtr($data, array('<br>' => ''));
+		$data = strtr($data, ['<br>' => '']);
 	}
 
 	/**
@@ -2648,15 +2515,17 @@ public static function emailValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function flashValidate(&$tag, &$data, $disabled, $params): void
 	{
-		$data[0] = new Url(strtr(trim($data[0]), array('<br>' => '', ' ' => '%20')), true);
+		$data[0] = new Url(strtr(trim($data[0]), ['<br>' => '', ' ' => '%20']), true);
 
-		if (empty($data[0]->scheme))
+		if (empty($data[0]->scheme)) {
 			$data[0] = new Url('//' . ltrim($data[0], ':/'));
+		}
 
 		$ascii_url = (clone $data[0])->toAscii();
 
-		if ((string) $ascii_url !== (string) $data[0])
+		if ((string) $ascii_url !== (string) $data[0]) {
 			$tag['content'] = str_replace('href="$1"', 'href="' . $ascii_url . '"', $tag['content']);
+		}
 	}
 
 	/**
@@ -2671,12 +2540,9 @@ public static function floatValidate(&$tag, &$data, $disabled, $params): void
 	{
 		$class = 'class="bbc_float float' . (strpos($data, 'left') === 0 ? 'left' : 'right') . '"';
 
-		if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches))
-		{
+		if (preg_match('~\bmax=(\d+(?:%|px|em|rem|ex|pt|pc|ch|vw|vh|vmin|vmax|cm|mm|in)?)~', $data, $matches)) {
 			$css = ' style="max-width:' . $matches[1] . (is_numeric($matches[1]) ? 'px' : '') . '"';
-		}
-		else
-		{
+		} else {
 			$css = '';
 		}
 
@@ -2693,20 +2559,19 @@ public static function floatValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function ftpValidate(&$tag, &$data, $disabled, $params): void
 	{
-		$data = new Url(strtr(trim($data), array('<br>' => '', ' ' => '%20')), true);
+		$data = new Url(strtr(trim($data), ['<br>' => '', ' ' => '%20']), true);
 
-		if (empty($data->scheme))
+		if (empty($data->scheme)) {
 			$data = new Url('ftp://' . ltrim($data, ':/'));
+		}
 
-		if (isset($tag['content']))
-		{
+		if (isset($tag['content'])) {
 			$ascii_url = (clone $data)->toAscii();
 
-			if ((string) $ascii_url !== (string) $data)
+			if ((string) $ascii_url !== (string) $data) {
 				$tag['content'] = str_replace('href="$1"', 'href="' . $ascii_url . '"', $tag['content']);
-		}
-		else
-		{
+			}
+		} else {
 			$data->toAscii();
 		}
 	}
@@ -2721,20 +2586,17 @@ public static function ftpValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function imgValidate(&$tag, &$data, $disabled, $params): void
 	{
-		$url = new Url(strtr(trim($data), array('<br>' => '', ' ' => '%20')), true);
+		$url = new Url(strtr(trim($data), ['<br>' => '', ' ' => '%20']), true);
 		$url->toAscii();
 
-		if (!isset($url->scheme))
-		{
+		if (!isset($url->scheme)) {
 			$url = new Url('//' . ltrim($url, ':/'));
-		}
-		else
-		{
+		} else {
 			$url = $url->proxied();
 		}
 
-		$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}']. '"' : ' alt=""';
-		$title = !empty($params['{title}']) ? ' title="' . $params['{title}']. '"' : '';
+		$alt = !empty($params['{alt}']) ? ' alt="' . $params['{alt}'] . '"' : ' alt=""';
+		$title = !empty($params['{title}']) ? ' title="' . $params['{title}'] . '"' : '';
 
 		$data = isset($disabled[$tag['tag']]) ? $url : '<img src="' . $url . '"' . $alt . $title . $params['{width}'] . $params['{height}'] . ' class="bbc_img' . (!empty($params['{width}']) || !empty($params['{height}']) ? ' resized' : '') . '" loading="lazy">';
 	}
@@ -2749,31 +2611,28 @@ public static function imgValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function urlValidate(&$tag, &$data, $disabled, $params): void
 	{
-		if ($tag['type'] === 'unparsed_content')
-		{
-			$data = new Url(strtr(trim($data), array('<br>' => '', ' ' => '%20')), true);
+		if ($tag['type'] === 'unparsed_content') {
+			$data = new Url(strtr(trim($data), ['<br>' => '', ' ' => '%20']), true);
 
-			if (empty($data->scheme))
+			if (empty($data->scheme)) {
 				$data = new Url('//' . ltrim($data, ':/'));
+			}
 
 			$ascii_url = (clone $data)->toAscii();
 
-			if ((string) $ascii_url !== (string) $data)
+			if ((string) $ascii_url !== (string) $data) {
 				$tag['content'] = str_replace('href="$1"', 'href="' . $ascii_url . '"', $tag['content']);
-		}
-		else
-		{
-			if (substr($data, 0, 1) == '#')
-			{
-				$data = '#post_' . substr($data, 1);
 			}
-			else
-			{
-				$data = new Url(strtr(trim($data), array('<br>' => '', ' ' => '%20')), true);
+		} else {
+			if (substr($data, 0, 1) == '#') {
+				$data = '#post_' . substr($data, 1);
+			} else {
+				$data = new Url(strtr(trim($data), ['<br>' => '', ' ' => '%20']), true);
 				$data->toAscii();
 
-				if (empty($data->scheme))
+				if (empty($data->scheme)) {
 					$data = '//' . ltrim($data, ':/');
+				}
 			}
 		}
 	}
@@ -2788,15 +2647,13 @@ public static function urlValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function phpValidate(&$tag, &$data, $disabled, $params): void
 	{
-		if (!isset($disabled['php']))
-		{
+		if (!isset($disabled['php'])) {
 			$add_begin = substr(trim($data), 0, 5) != '&lt;?';
 
 			$data = self::highlightPhpCode($add_begin ? '&lt;?php ' . $data . '?&gt;' : $data);
 
-			if ($add_begin)
-			{
-				$data = preg_replace(array('~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'), '$1', $data, 2);
+			if ($add_begin) {
+				$data = preg_replace(['~^(.+?)&lt;\?.{0,40}?php(?:&nbsp;|\s)~', '~\?&gt;((?:</(font|span)>)*)$~'], '$1', $data, 2);
 			}
 		}
 	}
@@ -2811,24 +2668,15 @@ public static function phpValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function shadowValidate(&$tag, &$data, $disabled, $params): void
 	{
-		if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50))
-		{
+		if ($data[1] == 'top' || (is_numeric($data[1]) && $data[1] < 50)) {
 			$data[1] = '0 -2px 1px';
-		}
-		elseif ($data[1] == 'right' || (is_numeric($data[1]) && $data[1] < 100))
-		{
+		} elseif ($data[1] == 'right' || (is_numeric($data[1]) && $data[1] < 100)) {
 			$data[1] = '2px 0 1px';
-		}
-		elseif ($data[1] == 'bottom' || (is_numeric($data[1]) && $data[1] < 190))
-		{
+		} elseif ($data[1] == 'bottom' || (is_numeric($data[1]) && $data[1] < 190)) {
 			$data[1] = '0 2px 1px';
-		}
-		elseif ($data[1] == 'left' || (is_numeric($data[1]) && $data[1] < 280))
-		{
+		} elseif ($data[1] == 'left' || (is_numeric($data[1]) && $data[1] < 280)) {
 			$data[1] = '-2px 0 1px';
-		}
-		else
-		{
+		} else {
 			$data[1] = '1px 1px 1px';
 		}
 	}
@@ -2843,7 +2691,7 @@ public static function shadowValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function sizeValidate(&$tag, &$data, $disabled, $params): void
 	{
-		$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
+		$sizes = [1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95];
 		$data = $sizes[$data] . 'em';
 	}
 
@@ -2857,8 +2705,9 @@ public static function sizeValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	public static function timeValidate(&$tag, &$data, $disabled, $params): void
 	{
-		if (is_numeric($data))
+		if (is_numeric($data)) {
 			$data = Time::create('@' . $data)->format();
+		}
 
 		$tag['content'] = '<span class="bbc_time">$1</span>';
 	}
@@ -2872,26 +2721,25 @@ public static function timeValidate(&$tag, &$data, $disabled, $params): void
 	 */
 	protected function parseMessage(): void
 	{
-		$this->open_tags = array();
-		$this->message = strtr($this->message, array("\n" => '<br>'));
+		$this->open_tags = [];
+		$this->message = strtr($this->message, ["\n" => '<br>']);
 
 		$this->setAllTagsRegex();
 
-		while ($this->pos !== false)
-		{
+		while ($this->pos !== false) {
 			$this->last_pos = isset($this->last_pos) ? max($this->pos, $this->last_pos) : $this->pos;
 
 			preg_match('~\[/?(?=' . $this->alltags_regex . ')~i', $this->message, $matches, PREG_OFFSET_CAPTURE, $this->pos + 1);
 
-			$this->pos = isset($matches[0][1]) ? $matches[0][1] : false;
+			$this->pos = $matches[0][1] ?? false;
 
 			// Failsafe.
-			if ($this->pos === false || $this->last_pos > $this->pos)
+			if ($this->pos === false || $this->last_pos > $this->pos) {
 				$this->pos = strlen($this->message) + 1;
+			}
 
 			// Can't have a one letter smiley, URL, or email! (Sorry.)
-			if ($this->last_pos < $this->pos - 1)
-			{
+			if ($this->last_pos < $this->pos - 1) {
 				// Make sure the $this->last_pos is not negative.
 				$this->last_pos = max($this->last_pos, 0);
 
@@ -2905,11 +2753,10 @@ protected function parseMessage(): void
 				// Restore any placeholders
 				$data = strtr($data, $this->placeholders);
 
-				$data = strtr($data, array("\t" => '&nbsp;&nbsp;&nbsp;'));
+				$data = strtr($data, ["\t" => '&nbsp;&nbsp;&nbsp;']);
 
 				// If it wasn't changed, no copying or other boring stuff has to happen!
-				if ($data != substr($this->message, $this->last_pos, $this->pos - $this->last_pos))
-				{
+				if ($data != substr($this->message, $this->last_pos, $this->pos - $this->last_pos)) {
 					$this->message = substr($this->message, 0, $this->last_pos) . $data . substr($this->message, $this->pos);
 
 					// Since we changed it, look again in case we added or removed a tag.  But we don't want to skip any.
@@ -2920,36 +2767,35 @@ protected function parseMessage(): void
 			}
 
 			// Are we there yet?  Are we there yet?
-			if ($this->pos >= strlen($this->message) - 1)
+			if ($this->pos >= strlen($this->message) - 1) {
 				break;
+			}
 
 			$tag_character = strtolower($this->message[$this->pos + 1]);
 
-			if ($tag_character == '/' && !empty($this->open_tags))
-			{
+			if ($tag_character == '/' && !empty($this->open_tags)) {
 				$this->closeTags();
+
 				continue;
 			}
 
 			// No tags for this character, so just keep going (fastest possible course.)
-			if (!isset($this->bbc_codes[$tag_character]))
+			if (!isset($this->bbc_codes[$tag_character])) {
 				continue;
+			}
 
 			$this->inside = empty($this->open_tags) ? null : $this->open_tags[count($this->open_tags) - 1];
 
 			// What tag do we have?
 			list($tag, $params) = $this->detectTag($tag_character);
 
-			if ($tag === null)
-			{
+			if ($tag === null) {
 				// Item codes are complicated buggers... they are implicit [li]s and can make [list]s!
-				if (isset(self::$itemcodes[$this->message[$this->pos + 1]], $this->message[$this->pos + 2]) && $this->message[$this->pos + 2] == ']' && !isset($this->disabled['list']) && !isset($this->disabled['li']))
-				{
+				if (isset(self::$itemcodes[$this->message[$this->pos + 1]], $this->message[$this->pos + 2]) && $this->message[$this->pos + 2] == ']' && !isset($this->disabled['list']) && !isset($this->disabled['li'])) {
 					$this->parseItemCode();
 				}
 				// Implicitly close lists and tables if something other than what's required is in them.  This is needed for itemcode.
-				elseif ($this->inside !== null && !empty($this->inside['require_children']))
-				{
+				elseif ($this->inside !== null && !empty($this->inside['require_children'])) {
 					array_pop($this->open_tags);
 
 					$this->message = substr($this->message, 0, $this->pos) . "\n" . $this->inside['after'] . "\n" . substr($this->message, $this->pos);
@@ -2960,18 +2806,17 @@ protected function parseMessage(): void
 			}
 
 			// Propagate the list to the child (so wrapping the disallowed tag won't work either.)
-			if (isset($this->inside['disallow_children']))
-			{
+			if (isset($this->inside['disallow_children'])) {
 				$tag['disallow_children'] = isset($tag['disallow_children']) ? array_unique(array_merge($tag['disallow_children'], $this->inside['disallow_children'])) : $this->inside['disallow_children'];
 			}
 
 			// Is this tag disabled?
-			if (isset($this->disabled[$tag['tag']]))
+			if (isset($this->disabled[$tag['tag']])) {
 				$tag = $this->useDisabledTag($tag);
+			}
 
 			// The only special case is 'html', which doesn't need to close things.
-			if (!empty($tag['block_level']) && $tag['tag'] != 'html' && empty($this->inside['block_level']))
-			{
+			if (!empty($tag['block_level']) && $tag['tag'] != 'html' && empty($this->inside['block_level'])) {
 				$this->closeInlineTags();
 			}
 
@@ -2982,30 +2827,31 @@ protected function parseMessage(): void
 		}
 
 		// Close any remaining tags.
-		while ($tag = array_pop($this->open_tags))
+		while ($tag = array_pop($this->open_tags)) {
 			$this->message .= "\n" . $tag['after'] . "\n";
+		}
 
 		// Parse the smileys within the parts where it can be done safely.
-		if ($this->smileys === true)
-		{
+		if ($this->smileys === true) {
 			$message_parts = explode("\n", $this->message);
 
-			for ($i = 0, $n = count($message_parts); $i < $n; $i += 2)
+			for ($i = 0, $n = count($message_parts); $i < $n; $i += 2) {
 				$message_parts[$i] = $this->parseSmileys($message_parts[$i]);
+			}
 
 			$this->message = implode('', $message_parts);
 		}
 		// No smileys, just get rid of the markers.
-		else
-		{
-			$this->message = strtr($this->message, array("\n" => ''));
+		else {
+			$this->message = strtr($this->message, ["\n" => '']);
 		}
 
-		if ($this->message !== '' && $this->message[0] === ' ')
+		if ($this->message !== '' && $this->message[0] === ' ') {
 			$this->message = '&nbsp;' . substr($this->message, 1);
+		}
 
 		// Cleanup whitespace.
-		$this->message = strtr($this->message, array('  ' => ' &nbsp;', "\r" => '', "\n" => '<br>', '<br> ' => '<br>&nbsp;', '&#13;' => "\n"));
+		$this->message = strtr($this->message, ['  ' => ' &nbsp;', "\r" => '', "\n" => '<br>', '<br> ' => '<br>&nbsp;', '&#13;' => "\n"]);
 	}
 
 	/**
@@ -3016,78 +2862,70 @@ protected function parseMessage(): void
 	 */
 	protected function autoLink(string $data): string
 	{
-		if (empty($this->autolink_enabled))
+		if (empty($this->autolink_enabled)) {
 			return $data;
+		}
 
 		// Are we inside tags that should be auto linked?
 		$no_autolink_area = false;
 
-		if (!empty($this->open_tags))
-		{
-			foreach ($this->open_tags as $open_tag)
-			{
-				if (in_array($open_tag['tag'], self::$no_autolink_tags))
+		if (!empty($this->open_tags)) {
+			foreach ($this->open_tags as $open_tag) {
+				if (in_array($open_tag['tag'], self::$no_autolink_tags)) {
 					$no_autolink_area = true;
+				}
 			}
 		}
 
-		if (!$no_autolink_area)
-		{
+		if (!$no_autolink_area) {
 			// An &nbsp; right after a URL can break the autolinker
-			if (strpos($data, '&nbsp;') !== false)
-			{
+			if (strpos($data, '&nbsp;') !== false) {
 				$this->placeholders[html_entity_decode('&nbsp;', 0, $this->encoding)] = '&nbsp;';
-				$data = strtr($data, array('&nbsp;' => html_entity_decode('&nbsp;', 0, $this->encoding)));
+				$data = strtr($data, ['&nbsp;' => html_entity_decode('&nbsp;', 0, $this->encoding)]);
 			}
 
 			// Parse any URLs
-			if (!isset($this->disabled['url']) && strpos($data, '[url') === false)
-			{
+			if (!isset($this->disabled['url']) && strpos($data, '[url') === false) {
 				$this->setUrlRegex();
 
 				$tmp_data = preg_replace_callback(
 					'~' . $this->url_regex . '~i' . ($this->utf8 ? 'u' : ''),
-					function($matches)
-					{
+					function ($matches) {
 						$url = array_shift($matches);
 
 						// If this isn't a clean URL, bail out
-						if ($url !== (string) Url::create($url)->sanitize())
+						if ($url !== (string) Url::create($url)->sanitize()) {
 							return $url;
+						}
 
 						// Ensure the host name is in its canonical form.
 						$url = new Url($url, true);
 
-						if (!isset($url->scheme))
+						if (!isset($url->scheme)) {
 							$url->scheme = '';
+						}
 
-						if ($url->scheme == 'mailto')
-						{
-							if (isset($this->disabled['email']))
+						if ($url->scheme == 'mailto') {
+							if (isset($this->disabled['email'])) {
 								return $url;
+							}
 
 							// Is this version of PHP capable of validating this email address?
 							$can_validate = defined('FILTER_FLAG_EMAIL_UNICODE') || strlen($url->path) == strspn(strtolower($url->path), 'abcdefghijklmnopqrstuvwxyz0123456789!#$%&\'*+-/=?^_`{|}~.@');
 
 							$flags = defined('FILTER_FLAG_EMAIL_UNICODE') ? FILTER_FLAG_EMAIL_UNICODE : null;
 
-							if (!$can_validate || filter_var($url->path, FILTER_VALIDATE_EMAIL, $flags) !== false)
-							{
+							if (!$can_validate || filter_var($url->path, FILTER_VALIDATE_EMAIL, $flags) !== false) {
 								return '[email=' . $url->path . ']' . $url . '[/email]';
 							}
-							else
-							{
-								return $url;
-							}
+
+							return $url;
 						}
 
 						// Are we linking a schemeless URL or naked domain name (e.g. "example.com")?
-						if (empty($url->scheme))
-						{
+						if (empty($url->scheme)) {
 							$full_url = new Url('//' . ltrim($url, ':/'));
-						}
-						else
-						{
+						} else {
 							$full_url = clone $url;
 						}
 
@@ -3098,33 +2936,34 @@ function($matches)
 								!in_array($url->scheme, self::$schemes['no_authority'])
 								&& !$full_url->isValid()
 							)
-						)
-						{
+						) {
 							return $url;
 						}
 
-						return '[url=&quot;' . str_replace(array('[', ']'), array('&#91;', '&#93;'), $full_url->toAscii()) . '&quot;]' . $url . '[/url]';
+						return '[url=&quot;' . str_replace(['[', ']'], ['&#91;', '&#93;'], $full_url->toAscii()) . '&quot;]' . $url . '[/url]';
 					},
-					$data
+					$data,
 				);
 
-				if (!is_null($tmp_data))
+				if (!is_null($tmp_data)) {
 					$data = $tmp_data;
+				}
 			}
 
 			// Next, emails...  Must be careful not to step on enablePostHTML logic above...
-			if (!isset($this->disabled['email']) && strpos($data, '@') !== false && strpos($data, '[email') === false && stripos($data, 'mailto:') === false)
-			{
+			if (!isset($this->disabled['email']) && strpos($data, '@') !== false && strpos($data, '[email') === false && stripos($data, 'mailto:') === false) {
 				$this->setEmailRegex();
 
 				$tmp_data = preg_replace('~' . $this->email_regex . '~i' . ($this->utf8 ? 'u' : ''), '[email]$0[/email]', $data);
 
-				if (!is_null($tmp_data))
+				if (!is_null($tmp_data)) {
 					$data = $tmp_data;
+				}
 			}
 
-			if (isset($_REQUEST['preview']))
-				file_put_contents('/tmp/derp.txt', "data = " . $data . "\n", FILE_APPEND);
+			if (isset($_REQUEST['preview'])) {
+				file_put_contents('/tmp/derp.txt', 'data = ' . $data . "\n", FILE_APPEND);
+			}
 		}
 
 		return $data;
@@ -3145,44 +2984,44 @@ protected function highLoadAverage(): bool
 	 */
 	protected function setDisabled(): void
 	{
-		$this->disabled = array();
+		$this->disabled = [];
 
-		if (!empty(Config::$modSettings['disabledBBC']))
-		{
+		if (!empty(Config::$modSettings['disabledBBC'])) {
 			$temp = explode(',', strtolower(Config::$modSettings['disabledBBC']));
 
-			foreach ($temp as $tag)
+			foreach ($temp as $tag) {
 				$this->disabled[trim($tag)] = true;
+			}
 
-			if (in_array('color', $this->disabled))
-			{
+			if (in_array('color', $this->disabled)) {
 				$this->disabled = array_merge(
 					$this->disabled,
-					array(
+					[
 						'black' => true,
 						'white' => true,
 						'red' => true,
 						'green' => true,
 						'blue' => true,
-					)
+					],
 				);
 			}
 		}
 
-		if (!empty($this->parse_tags))
-		{
-			if (!in_array('email', $this->parse_tags))
+		if (!empty($this->parse_tags)) {
+			if (!in_array('email', $this->parse_tags)) {
 				$this->disabled['email'] = true;
+			}
 
-			if (!in_array('url', $this->parse_tags))
+			if (!in_array('url', $this->parse_tags)) {
 				$this->disabled['url'] = true;
+			}
 
-			if (!in_array('iurl', $this->parse_tags))
+			if (!in_array('iurl', $this->parse_tags)) {
 				$this->disabled['iurl'] = true;
+			}
 		}
 
-		if ($this->for_print)
-		{
+		if ($this->for_print) {
 			// [glow], [shadow], and [move] can't really be printed.
 			$this->disabled['glow'] = true;
 			$this->disabled['shadow'] = true;
@@ -3208,14 +3047,13 @@ protected function setDisabled(): void
 			$this->disabled['flash'] = true;
 
 			// @todo Change maybe?
-			if (!isset($_GET['images']))
-			{
+			if (!isset($_GET['images'])) {
 				$this->disabled['img'] = true;
 				$this->disabled['attach'] = true;
 			}
 
 			// Maybe some custom BBC need to be disabled for printing.
-			IntegrationHook::call('integrate_bbc_print', array(&$this->disabled));
+			IntegrationHook::call('integrate_bbc_print', [&$this->disabled]);
 		}
 	}
 
@@ -3227,63 +3065,61 @@ protected function setBbcCodes(): void
 		// If we already have a version of the BBCodes for the current language, use that.
 		$locale_key = $this->locale . '|' . implode(',', $this->disabled);
 
-		if (!empty($this->bbc_lang_locales[$locale_key]))
+		if (!empty($this->bbc_lang_locales[$locale_key])) {
 			$this->bbc_codes = $this->bbc_lang_locales[$locale_key];
+		}
 
 		// If we are not doing every tag then we don't cache this run.
-		if (!empty($this->parse_tags))
-			$this->bbc_codes = array();
+		if (!empty($this->parse_tags)) {
+			$this->bbc_codes = [];
+		}
 
 		// Avoid unnecessary repetition.
-		if (!empty($this->bbc_codes))
+		if (!empty($this->bbc_codes)) {
 			return;
+		}
 
 		// Add itemcodes to the array.
-		if (!isset($this->disabled['li']) && !isset($this->disabled['list']))
-		{
-			foreach (self::$itemcodes as $c => $dummy)
-				$this->bbc_codes[$c] = array();
+		if (!isset($this->disabled['li']) && !isset($this->disabled['list'])) {
+			foreach (self::$itemcodes as $c => $dummy) {
+				$this->bbc_codes[$c] = [];
+			}
 		}
 
 		$codes = self::$codes;
 
 		// Shhhh!
-		if (!isset($this->disabled['color']))
-		{
-			$codes[] = array(
+		if (!isset($this->disabled['color'])) {
+			$codes[] = [
 				'tag' => 'chrissy',
 				'before' => '<span style="color: #cc0099;">',
 				'after' => ' :-*</span>',
-			);
-			$codes[] = array(
+			];
+			$codes[] = [
 				'tag' => 'kissy',
 				'before' => '<span style="color: #cc0099;">',
 				'after' => ' :-*</span>',
-			);
+			];
 		}
-		$codes[] = array(
+		$codes[] = [
 			'tag' => 'cowsay',
-			'parameters' => array(
-				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes)
-					{
-						return Utils::entitySubstr($eyes . 'oo', 0, 2);
-					},
-				),
-				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue)
-					{
-						return Utils::entitySubstr($tongue . '  ', 0, 2);
-					},
-				),
-			),
+			'parameters' => [
+				'e' => ['optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) {
+					return Utils::entitySubstr($eyes . 'oo', 0, 2);
+				},
+				],
+				't' => ['optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) {
+					return Utils::entitySubstr($tongue . '  ', 0, 2);
+				},
+				],
+			],
 			'before' => '<pre data-e="{e}" data-t="{t}"><div>',
 			'after' => '</div></pre>',
 			'block_level' => true,
-			'validate' => function(&$tag, &$data, $disabled, $params)
-			{
+			'validate' => function (&$tag, &$data, $disabled, $params) {
 				static $moo = true;
 
-				if ($moo)
-				{
+				if ($moo) {
 					Theme::addInlineJavaScript("\n\t" . base64_decode(
 						'aWYoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJvdmluZV9vcmFjbGU
 						iKT09PW51bGwpe2xldCBzdHlsZU5vZGU9ZG9jdW1lbnQuY3JlYXRlRWx
@@ -3303,27 +3139,29 @@ protected function setBbcCodes(): void
 						BIFwnXCcgXCdcJyBcJ1wnIFwnXCcgXCdcJyBcJ1wnIFwnXCcgfHwgXCd
 						cJyBcJ1wnIFwnXCcgXCdcJyB8fFwnO30nO2RvY3VtZW50LmdldEVsZW1
 						lbnRzQnlUYWdOYW1lKCJoZWFkIilbMF0uYXBwZW5kQ2hpbGQoc3R5bGV
-						Ob2RlKTt9'
+						Ob2RlKTt9',
 					), true);
 
 					$moo = false;
 				}
-			}
-		);
+			},
+		];
 
-		foreach ($codes as $code)
-		{
+		foreach ($codes as $code) {
 			// Make it easier to process parameters later
-			if (!empty($code['parameters']))
+			if (!empty($code['parameters'])) {
 				ksort($code['parameters'], SORT_STRING);
+			}
 
 			// If we are not doing every tag only do ones we are interested in.
-			if (empty($this->parse_tags) || in_array($code['tag'], $this->parse_tags))
+			if (empty($this->parse_tags) || in_array($code['tag'], $this->parse_tags)) {
 				$this->bbc_codes[substr($code['tag'], 0, 1)][] = $code;
+			}
 		}
 
-		if (empty($this->parse_tags))
+		if (empty($this->parse_tags)) {
 			$this->bbc_lang_locales[$locale_key] = $this->bbc_codes;
+		}
 	}
 
 	/**
@@ -3332,13 +3170,14 @@ protected function setBbcCodes(): void
 	protected function setUrlRegex(): void
 	{
 		// Don't repeat this unnecessarily.
-		if (!empty($this->url_regex))
+		if (!empty($this->url_regex)) {
 			return;
+		}
 
 		$this->setTldRegex();
 
 		// PCRE subroutines for efficiency.
-		$pcre_subroutines = array(
+		$pcre_subroutines = [
 			'tlds' => $this->tld_regex,
 			'pct' => '%[0-9A-Fa-f]{2}',
 			'space_lookahead' => '(?=$|\s|<br>)',
@@ -3346,16 +3185,16 @@ protected function setUrlRegex(): void
 			'domain_label_char' => '[' . self::$domain_label_chars . ']',
 			'not_domain_label_char' => '[^' . self::$domain_label_chars . ']',
 			'domain' => '(?:(?P>domain_label_char)+\.)+(?P>tlds)(?!\.(?P>domain_label_char))',
-			'no_domain' => '(?:(?P>domain_label_char)|[._\~!$&\'()*+,;=:@]|(?P>pct))+',
+			'no_domain' => '(?:(?P>domain_label_char)|[._\\~!$&\'()*+,;=:@]|(?P>pct))+',
 			'scheme_need_domain' => Utils::buildRegex(self::$schemes['need_domain'], '~'),
 			'scheme_empty_authority' => Utils::buildRegex(self::$schemes['empty_authority'], '~'),
 			'scheme_no_authority' => Utils::buildRegex(self::$schemes['no_authority'], '~'),
 			'scheme_any' => '[A-Za-z][0-9A-Za-z+\-.]*',
-			'user_info' => '(?:(?P>domain_label_char)|[._\~!$&\'()*+,;=:]|(?P>pct))+',
+			'user_info' => '(?:(?P>domain_label_char)|[._\\~!$&\'()*+,;=:]|(?P>pct))+',
 			'dec_octet' => '(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)',
 			'h16' => '[0-9A-Fa-f]{1,4}',
 			'ipv4' => '(?:\b(?:(?P>dec_octet)\.){3}(?P>dec_octet)\b)',
-			'ipv6' => '\[(?:' . implode('|', array(
+			'ipv6' => '\[(?:' . implode('|', [
 				'(?:(?P>h16):){7}(?P>h16)',
 				'(?:(?P>h16):){1,7}:',
 				'(?:(?P>h16):){1,6}(?::(?P>h16))',
@@ -3368,22 +3207,22 @@ protected function setUrlRegex(): void
 				'fe80:(?::(?P>h16)){0,4}%[0-9A-Za-z]+',
 				'::(ffff(:0{1,4})?:)?(?P>ipv4)',
 				'(?:(?P>h16):){1,4}:(?P>ipv4)',
-			)) . ')\]',
-			'host' => '(?:' . implode('|', array(
+			]) . ')\]',
+			'host' => '(?:' . implode('|', [
 				'localhost',
 				'(?P>domain)',
 				'(?P>ipv4)',
 				'(?P>ipv6)',
-			)) . ')',
+			]) . ')',
 			'authority' => '(?:(?P>user_info)@)?(?P>host)(?::\d+)?',
-		);
+		];
 
 		// Brackets and quotation marks are problematic at the end of an IRI.
 		// E.g.: `http://foo.com/baz(qux)` vs. `(http://foo.com/baz_qux)`
 		// In the first case, the user probably intended the `)` as part of the
 		// IRI, but not in the second case. To account for this, we test for
 		// balanced pairs within the IRI.
-		$balanced_pairs = array(
+		$balanced_pairs = [
 			// Brackets and parentheses
 			'(' => ')', // '&#x28;' => '&#x29;',
 			'[' => ']', // '&#x5B;' => '&#x5D;',
@@ -3402,38 +3241,35 @@ protected function setUrlRegex(): void
 			'‚' => '’', // '&#x201A;' => '&#x2019;',
 			'‛' => '’', // '&#x201B;' => '&#x2019;',
 			'‹' => '›', // '&#x2039;' => '&#x203A;',
-		);
+		];
 
-		foreach ($balanced_pairs as $pair_opener => $pair_closer)
+		foreach ($balanced_pairs as $pair_opener => $pair_closer) {
 			$balanced_pairs[htmlspecialchars($pair_opener)] = htmlspecialchars($pair_closer);
+		}
 
 		$bracket_quote_chars = '';
-		$bracket_quote_entities = array();
-		foreach ($balanced_pairs as $pair_opener => $pair_closer)
-		{
-			if ($pair_opener == $pair_closer)
+		$bracket_quote_entities = [];
+
+		foreach ($balanced_pairs as $pair_opener => $pair_closer) {
+			if ($pair_opener == $pair_closer) {
 				$pair_closer = '';
+			}
 
-			foreach (array($pair_opener, $pair_closer) as $bracket_quote)
-			{
-				if (strpos($bracket_quote, '&') === false)
-				{
+			foreach ([$pair_opener, $pair_closer] as $bracket_quote) {
+				if (strpos($bracket_quote, '&') === false) {
 					$bracket_quote_chars .= $bracket_quote;
-				}
-				else
-				{
+				} else {
 					$bracket_quote_entities[] = substr($bracket_quote, 1);
 				}
 			}
 		}
-		$bracket_quote_chars = str_replace(array('[', ']'), array('\[', '\]'), $bracket_quote_chars);
+		$bracket_quote_chars = str_replace(['[', ']'], ['\[', '\]'], $bracket_quote_chars);
 
 		$pcre_subroutines['bracket_quote'] = '[' . $bracket_quote_chars . ']|&' . Utils::buildRegex($bracket_quote_entities, '~');
-		$pcre_subroutines['allowed_entities'] = '&(?!' . Utils::buildRegex(array_merge($bracket_quote_entities, array('lt;', 'gt;')), '~') . ')';
+		$pcre_subroutines['allowed_entities'] = '&(?!' . Utils::buildRegex(array_merge($bracket_quote_entities, ['lt;', 'gt;']), '~') . ')';
 		$pcre_subroutines['excluded_lookahead'] = '(?![' . self::$excluded_trailing_chars . ']*(?P>space_lookahead))';
 
-		foreach (array('path', 'query', 'fragment') as $part)
-		{
+		foreach (['path', 'query', 'fragment'] as $part) {
 			switch ($part) {
 				case 'path':
 					$part_disallowed_chars = '\s<>' . $bracket_quote_chars . self::$excluded_trailing_chars . '/#&';
@@ -3452,10 +3288,9 @@ protected function setUrlRegex(): void
 			}
 			$pcre_subroutines[$part . '_allowed'] = '[^' . $part_disallowed_chars . ']|(?P>allowed_entities)|[' . $part_excluded_trailing_chars . '](?P>excluded_lookahead)';
 
-			$balanced_construct_regex = array();
+			$balanced_construct_regex = [];
 
-			foreach ($balanced_pairs as $pair_opener => $pair_closer)
-			{
+			foreach ($balanced_pairs as $pair_opener => $pair_closer) {
 				$balanced_construct_regex[] = preg_quote($pair_opener) . '(?P>' . $part . '_recursive)*+' . preg_quote($pair_closer);
 			}
 
@@ -3639,8 +3474,9 @@ protected function setUrlRegex(): void
 		// Finally, define the PCRE subroutines in the regex.
 		$this->url_regex .= '(?(DEFINE)';
 
-		foreach ($pcre_subroutines as $name => $subroutine)
+		foreach ($pcre_subroutines as $name => $subroutine) {
 			$this->url_regex .= '(?<' . $name . '>' . $subroutine . ')';
+		}
 
 		$this->url_regex .= ')';
 	}
@@ -3650,8 +3486,9 @@ protected function setUrlRegex(): void
 	 */
 	protected function setEmailRegex(): void
 	{
-		if (!empty($this->email_regex))
+		if (!empty($this->email_regex)) {
 			return;
+		}
 
 		$this->setTldRegex();
 
@@ -3673,12 +3510,12 @@ protected function setEmailRegex(): void
 	 */
 	protected function setAllTagsRegex(): void
 	{
-		$alltags = array();
+		$alltags = [];
 
-		foreach ($this->bbc_codes as $section)
-		{
-			foreach ($section as $code)
+		foreach ($this->bbc_codes as $section) {
+			foreach ($section as $code) {
 				$alltags[] = $code['tag'];
+			}
 		}
 
 		$this->alltags_regex = '(?' . '>\b' . Utils::buildRegex(array_unique($alltags)) . '\b|' . Utils::buildRegex(array_keys(self::$itemcodes)) . ')';
@@ -3689,8 +3526,7 @@ protected function setAllTagsRegex(): void
 	 */
 	protected function setTldRegex(): void
 	{
-		if (!isset($this->tld_regex))
-		{
+		if (!isset($this->tld_regex)) {
 			Url::setTldRegex();
 			$this->tld_regex = Config::$modSettings['tld_regex'];
 		}
@@ -3706,32 +3542,27 @@ protected function insertTxt(string $string): string
 	{
 		return preg_replace_callback(
 			'/{(.*?)}/',
-			function ($matches)
-			{
-				if ($matches[0] === '{scripturl}')
-				{
+			function ($matches) {
+				if ($matches[0] === '{scripturl}') {
 					return Config::$scripturl;
 				}
-				elseif ($matches[0] === '{hosturl}')
-				{
-					if (!isset($this->hosturl))
-					{
+
+				if ($matches[0] === '{hosturl}') {
+					if (!isset($this->hosturl)) {
 						$our_url = new Url(Config::$scripturl);
 						$this->hosturl = $our_url->scheme . '://' . $our_url->host;
 					}
 
 					return $this->hosturl;
 				}
-				elseif (strpos($matches[1], 'txt_') === 0 && isset(Lang::$txt[substr($matches[1], 4)]))
-				{
+
+				if (strpos($matches[1], 'txt_') === 0 && isset(Lang::$txt[substr($matches[1], 4)])) {
 					return Lang::$txt[substr($matches[1], 4)];
 				}
-				else
-				{
-					return $matches[0];
-				}
+
+				return $matches[0];
 			},
-			$string
+			$string,
 		);
 	}
 
@@ -3743,40 +3574,39 @@ function ($matches)
 	 */
 	protected function fixHtml(string $data): string
 	{
-		if (empty($this->enable_post_html) || strpos($data, '&lt;') === false)
+		if (empty($this->enable_post_html) || strpos($data, '&lt;') === false) {
 			return $data;
+		}
 
-		$data = preg_replace('~&lt;a\s+href=((?:&quot;)?)((?:https?://|ftps?://|mailto:|tel:)\S+?)\\1&gt;(.*?)&lt;/a&gt;~i', '[url=&quot;$2&quot;]$3[/url]', $data);
+		$data = preg_replace('~&lt;a\s+href=((?:&quot;)?)((?:https?://|ftps?://|mailto:|tel:)\S+?)\1&gt;(.*?)&lt;/a&gt;~i', '[url=&quot;$2&quot;]$3[/url]', $data);
 
 		// <br> should be empty.
-		$empty_tags = array('br', 'hr');
+		$empty_tags = ['br', 'hr'];
 
-		foreach ($empty_tags as $tag)
-		{
-			$data = str_replace(array('&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'), '<' . $tag . '>', $data);
+		foreach ($empty_tags as $tag) {
+			$data = str_replace(['&lt;' . $tag . '&gt;', '&lt;' . $tag . '/&gt;', '&lt;' . $tag . ' /&gt;'], '<' . $tag . '>', $data);
 		}
 
 		// b, u, i, s, pre... basic tags.
-		$closable_tags = array('b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote', 'strong');
+		$closable_tags = ['b', 'u', 'i', 's', 'em', 'ins', 'del', 'pre', 'blockquote', 'strong'];
 
-		foreach ($closable_tags as $tag)
-		{
+		foreach ($closable_tags as $tag) {
 			$diff = substr_count($data, '&lt;' . $tag . '&gt;') - substr_count($data, '&lt;/' . $tag . '&gt;');
 
-			$data = strtr($data, array('&lt;' . $tag . '&gt;' => '<' . $tag . '>', '&lt;/' . $tag . '&gt;' => '</' . $tag . '>'));
+			$data = strtr($data, ['&lt;' . $tag . '&gt;' => '<' . $tag . '>', '&lt;/' . $tag . '&gt;' => '</' . $tag . '>']);
 
-			if ($diff > 0)
+			if ($diff > 0) {
 				$data = substr($data, 0, -1) . str_repeat('</' . $tag . '>', $diff) . substr($data, -1);
+			}
 		}
 
 		// Do <img ...> - with security... action= -> action-.
-		preg_match_all('~&lt;img\s+src=((?:&quot;)?)((?:https?://|ftps?://)\S+?)\\1(?:\s+alt=(&quot;.*?&quot;|\S*?))?(?:\s?/)?&gt;~i', $data, $matches, PREG_PATTERN_ORDER);
+		preg_match_all('~&lt;img\s+src=((?:&quot;)?)((?:https?://|ftps?://)\S+?)\1(?:\s+alt=(&quot;.*?&quot;|\S*?))?(?:\s?/)?&gt;~i', $data, $matches, PREG_PATTERN_ORDER);
 
-		if (!empty($matches[0]))
-		{
-			$replaces = array();
-			foreach ($matches[2] as $match => $imgtag)
-			{
+		if (!empty($matches[0])) {
+			$replaces = [];
+
+			foreach ($matches[2] as $match => $imgtag) {
 				$alt = empty($matches[3][$match]) ? '' : ' alt=' . preg_replace('~^&quot;|&quot;$~', '', $matches[3][$match]);
 
 				// Remove action= from the URL - no funny business, now.
@@ -3803,49 +3633,45 @@ protected function closeTags(): void
 	{
 		$pos2 = strpos($this->message, ']', $this->pos + 1);
 
-		if ($pos2 == $this->pos + 2)
+		if ($pos2 == $this->pos + 2) {
 			return;
+		}
 
 		$look_for = strtolower(substr($this->message, $this->pos + 2, $pos2 - $this->pos - 2));
 
 		// A closing tag that doesn't match any open tags? Skip it.
-		if (!in_array($look_for, array_map(function($tag) { return $tag['tag']; }, $this->open_tags)))
+		if (!in_array($look_for, array_map(function ($tag) { return $tag['tag']; }, $this->open_tags))) {
 			return;
+		}
 
-		$to_close = array();
+		$to_close = [];
 		$block_level = null;
 
-		do
-		{
+		do {
 			$tag = array_pop($this->open_tags);
 
-			if (!$tag)
+			if (!$tag) {
 				break;
+			}
 
-			if (!empty($tag['block_level']))
-			{
+			if (!empty($tag['block_level'])) {
 				// Only find out if we need to.
-				if ($block_level === false)
-				{
+				if ($block_level === false) {
 					array_push($this->open_tags, $tag);
 					break;
 				}
 
 				// The idea is, if we are LOOKING for a block level tag, we can close them on the way.
-				if (strlen($look_for) > 0 && isset($this->bbc_codes[$look_for[0]]))
-				{
-					foreach ($this->bbc_codes[$look_for[0]] as $temp)
-					{
-						if ($temp['tag'] == $look_for)
-						{
+				if (strlen($look_for) > 0 && isset($this->bbc_codes[$look_for[0]])) {
+					foreach ($this->bbc_codes[$look_for[0]] as $temp) {
+						if ($temp['tag'] == $look_for) {
 							$block_level = !empty($temp['block_level']);
 							break;
 						}
 					}
 				}
 
-				if ($block_level !== true)
-				{
+				if ($block_level !== true) {
 					$block_level = false;
 					array_push($this->open_tags, $tag);
 					break;
@@ -3853,23 +3679,19 @@ protected function closeTags(): void
 			}
 
 			$to_close[] = $tag;
-		}
-		while ($tag['tag'] != $look_for);
+		} while ($tag['tag'] != $look_for);
 
 		// Did we just eat through everything and not find it?
-		if ((empty($this->open_tags) && (empty($tag) || $tag['tag'] != $look_for)))
-		{
+		if ((empty($this->open_tags) && (empty($tag) || $tag['tag'] != $look_for))) {
 			$this->open_tags = $to_close;
+
 			return;
 		}
-		elseif (!empty($to_close) && $tag['tag'] != $look_for)
-		{
-			if ($block_level === null && isset($look_for[0], $this->bbc_codes[$look_for[0]]))
-			{
-				foreach ($this->bbc_codes[$look_for[0]] as $temp)
-				{
-					if ($temp['tag'] == $look_for)
-					{
+
+		if (!empty($to_close) && $tag['tag'] != $look_for) {
+			if ($block_level === null && isset($look_for[0], $this->bbc_codes[$look_for[0]])) {
+				foreach ($this->bbc_codes[$look_for[0]] as $temp) {
+					if ($temp['tag'] == $look_for) {
 						$block_level = !empty($temp['block_level']);
 						break;
 					}
@@ -3877,17 +3699,16 @@ protected function closeTags(): void
 			}
 
 			// We're not looking for a block level tag (or maybe even a tag that exists...)
-			if (!$block_level)
-			{
-				foreach ($to_close as $tag)
+			if (!$block_level) {
+				foreach ($to_close as $tag) {
 					array_push($this->open_tags, $tag);
+				}
 
 				return;
 			}
 		}
 
-		foreach ($to_close as $tag)
-		{
+		foreach ($to_close as $tag) {
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $tag['after'] . "\n" . substr($this->message, $pos2 + 1);
 			$this->pos += strlen($tag['after']) + 2;
 			$pos2 = $this->pos - 1;
@@ -3895,24 +3716,22 @@ protected function closeTags(): void
 			// See the comment at the end of the big loop - just eating whitespace ;).
 			$whitespace_regex = '';
 
-			if (!empty($tag['block_level']))
+			if (!empty($tag['block_level'])) {
 				$whitespace_regex .= '(&nbsp;|\s)*(<br\s*/?' . '>)?';
+			}
 
 			// Trim one line of whitespace after unnested tags, but all of it after nested ones
-			if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-			{
+			if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
 				$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
 			}
 
-			if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($this->message, $this->pos), $matches) != 0)
-			{
+			if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($this->message, $this->pos), $matches) != 0) {
 				$this->message = substr($this->message, 0, $this->pos) . substr($this->message, $this->pos + strlen($matches[0]));
 			}
 		}
 
-		if (!empty($to_close))
-		{
-			$to_close = array();
+		if (!empty($to_close)) {
+			$to_close = [];
 			$this->pos--;
 		}
 	}
@@ -3926,121 +3745,108 @@ protected function closeTags(): void
 	protected function detectTag(string $tag_character): array
 	{
 		$tag = null;
-		$params = array();
+		$params = [];
 
-		foreach ($this->bbc_codes[$tag_character] as $possible)
-		{
+		foreach ($this->bbc_codes[$tag_character] as $possible) {
 			$pt_strlen = strlen($possible['tag']);
 
 			// Not a match?
-			if (strtolower(substr($this->message, $this->pos + 1, $pt_strlen)) != $possible['tag'])
+			if (strtolower(substr($this->message, $this->pos + 1, $pt_strlen)) != $possible['tag']) {
 				continue;
+			}
 
-			$next_c = isset($this->message[$this->pos + 1 + $pt_strlen]) ? $this->message[$this->pos + 1 + $pt_strlen] : '';
+			$next_c = $this->message[$this->pos + 1 + $pt_strlen] ?? '';
 
 			// A tag is the last char maybe
-			if ($next_c == '')
+			if ($next_c == '') {
 				break;
+			}
 
 			// A test validation?
-			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($this->message, $this->pos + 1 + $pt_strlen + 1)) === 0)
-			{
+			if (isset($possible['test']) && preg_match('~^' . $possible['test'] . '~', substr($this->message, $this->pos + 1 + $pt_strlen + 1)) === 0) {
 				continue;
 			}
+
 			// Do we want parameters?
-			elseif (!empty($possible['parameters']))
-			{
+			if (!empty($possible['parameters'])) {
 				// Are all the parameters optional?
 				$param_required = false;
 
-				foreach ($possible['parameters'] as $param)
-				{
-					if (empty($param['optional']))
-					{
+				foreach ($possible['parameters'] as $param) {
+					if (empty($param['optional'])) {
 						$param_required = true;
 						break;
 					}
 				}
 
-				if ($param_required && $next_c != ' ')
+				if ($param_required && $next_c != ' ') {
 					continue;
+				}
 			}
 			// No parameters, so does the next character match what we expect?
-			elseif (isset($possible['type']))
-			{
+			elseif (isset($possible['type'])) {
 				// Do we need an equal sign?
-				if (in_array($possible['type'], array('unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals')) && $next_c != '=')
-				{
+				if (in_array($possible['type'], ['unparsed_equals', 'unparsed_commas', 'unparsed_commas_content', 'unparsed_equals_content', 'parsed_equals']) && $next_c != '=') {
 					continue;
 				}
 
 				// Maybe we just want a /...
-				if ($possible['type'] == 'closed' && $next_c != ']' && substr($this->message, $this->pos + 1 + $pt_strlen, 2) != '/]' && substr($this->message, $this->pos + 1 + $pt_strlen, 3) != ' /]')
-				{
+				if ($possible['type'] == 'closed' && $next_c != ']' && substr($this->message, $this->pos + 1 + $pt_strlen, 2) != '/]' && substr($this->message, $this->pos + 1 + $pt_strlen, 3) != ' /]') {
 					continue;
 				}
 
 				// An immediate ]?
-				if ($possible['type'] == 'unparsed_content' && $next_c != ']')
-				{
+				if ($possible['type'] == 'unparsed_content' && $next_c != ']') {
 					continue;
 				}
 			}
 			// No type means 'parsed_content', which demands an immediate ] without parameters!
-			elseif ($next_c != ']')
-			{
+			elseif ($next_c != ']') {
 				continue;
 			}
 
 			// Check allowed tree?
-			if (isset($possible['require_parents']) && ($this->inside === null || !in_array($this->inside['tag'], $possible['require_parents'])))
-			{
+			if (isset($possible['require_parents']) && ($this->inside === null || !in_array($this->inside['tag'], $possible['require_parents']))) {
 				continue;
 			}
 
-			if (isset($this->inside['require_children']) && !in_array($possible['tag'], $this->inside['require_children']))
-			{
+			if (isset($this->inside['require_children']) && !in_array($possible['tag'], $this->inside['require_children'])) {
 				continue;
 			}
 
 			// If this is in the list of disallowed child tags, don't parse it.
-			if (isset($this->inside['disallow_children']) && in_array($possible['tag'], $this->inside['disallow_children']))
-			{
+			if (isset($this->inside['disallow_children']) && in_array($possible['tag'], $this->inside['disallow_children'])) {
 				continue;
 			}
 
 			$this->pos1 = $this->pos + 1 + $pt_strlen + 1;
 
 			// Quotes can have alternate styling, we do this php-side due to all the permutations of quotes.
-			if ($possible['tag'] == 'quote')
-			{
+			if ($possible['tag'] == 'quote') {
 				// Start with standard
 				$quote_alt = false;
 
-				foreach ($this->open_tags as $open_quote)
-				{
+				foreach ($this->open_tags as $open_quote) {
 					// Every parent quote this quote has flips the styling
-					if ($open_quote['tag'] == 'quote')
+					if ($open_quote['tag'] == 'quote') {
 						$quote_alt = !$quote_alt;
+					}
 				}
 
 				// Add a class to the quote to style alternating blockquotes
-				$possible['before'] = strtr($possible['before'], array('<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">'));
+				$possible['before'] = strtr($possible['before'], ['<blockquote>' => '<blockquote class="bbc_' . ($quote_alt ? 'alternate' : 'standard') . '_quote">']);
 			}
 
 			// This is long, but it makes things much easier and cleaner.
-			if (!empty($possible['parameters']))
-			{
+			if (!empty($possible['parameters'])) {
 				// Build a regular expression for each parameter for the current tag.
 				$regex_key = json_encode($possible['parameters']);
 
-				if (!isset($params_regexes[$regex_key]))
-				{
+				if (!isset($params_regexes[$regex_key])) {
 					$params_regexes[$regex_key] = '';
 
-					foreach ($possible['parameters'] as $p => $info)
-					{
-						$params_regexes[$regex_key] .= '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . (isset($info['match']) ? $info['match'] : '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
+					foreach ($possible['parameters'] as $p => $info) {
+						$params_regexes[$regex_key] .= '(\s+' . $p . '=' . (empty($info['quoted']) ? '' : '&quot;') . ($info['match'] ?? '(.+?)') . (empty($info['quoted']) ? '' : '&quot;') . '\s*)' . (empty($info['optional']) ? '' : '?');
 					}
 				}
 
@@ -4052,8 +3858,8 @@ protected function detectTag(string $tag_character): array
 
 				// Progressively append more blobs until we find our parameters or run out of blobs
 				$blob_counter = 1;
-				while ($blob_counter <= count($blobs))
-				{
+
+				while ($blob_counter <= count($blobs)) {
 					$given_param_string = implode(']', array_slice($blobs, 0, $blob_counter++));
 
 					$given_params = preg_split('~\s(?=(' . $splitters . '))~i', $given_param_string);
@@ -4061,57 +3867,46 @@ protected function detectTag(string $tag_character): array
 
 					$match = preg_match('~^' . $params_regexes[$regex_key] . '$~i', implode(' ', $given_params), $matches) !== 0;
 
-					if ($match)
+					if ($match) {
 						break;
+					}
 				}
 
 				// Didn't match our parameter list, try the next possible.
-				if (!$match)
+				if (!$match) {
 					continue;
+				}
 
-				$params = array();
-				for ($i = 1, $n = count($matches); $i < $n; $i += 2)
-				{
+				$params = [];
+
+				for ($i = 1, $n = count($matches); $i < $n; $i += 2) {
 					$key = strtok(ltrim($matches[$i]), '=');
 
-					if ($key === false)
+					if ($key === false) {
 						continue;
-
-					if (isset($possible['parameters'][$key]['value']))
-					{
-						$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], array('$1' => $matches[$i + 1]));
 					}
-					elseif (isset($possible['parameters'][$key]['validate']))
-					{
+
+					if (isset($possible['parameters'][$key]['value'])) {
+						$params['{' . $key . '}'] = strtr($possible['parameters'][$key]['value'], ['$1' => $matches[$i + 1]]);
+					} elseif (isset($possible['parameters'][$key]['validate'])) {
 						$params['{' . $key . '}'] = $possible['parameters'][$key]['validate']($matches[$i + 1]);
-					}
-					else
-					{
+					} else {
 						$params['{' . $key . '}'] = $matches[$i + 1];
 					}
 
 					// Just to make sure: replace any $ or { so they can't interpolate wrongly.
-					$params['{' . $key . '}'] = strtr($params['{' . $key . '}'], array('$' => '&#036;', '{' => '&#123;'));
+					$params['{' . $key . '}'] = strtr($params['{' . $key . '}'], ['$' => '&#036;', '{' => '&#123;']);
 				}
 
-				foreach ($possible['parameters'] as $p => $info)
-				{
-					if (!isset($params['{' . $p . '}']))
-					{
-						if (!isset($info['default']))
-						{
+				foreach ($possible['parameters'] as $p => $info) {
+					if (!isset($params['{' . $p . '}'])) {
+						if (!isset($info['default'])) {
 							$params['{' . $p . '}'] = '';
-						}
-						elseif (isset($possible['parameters'][$p]['value']))
-						{
-							$params['{' . $p . '}'] = strtr($possible['parameters'][$p]['value'], array('$1' => $info['default']));
-						}
-						elseif (isset($possible['parameters'][$p]['validate']))
-						{
+						} elseif (isset($possible['parameters'][$p]['value'])) {
+							$params['{' . $p . '}'] = strtr($possible['parameters'][$p]['value'], ['$1' => $info['default']]);
+						} elseif (isset($possible['parameters'][$p]['validate'])) {
 							$params['{' . $p . '}'] = $possible['parameters'][$p]['validate']($info['default']);
-						}
-						else
-						{
+						} else {
 							$params['{' . $p . '}'] = $info['default'];
 						}
 					}
@@ -4120,27 +3915,27 @@ protected function detectTag(string $tag_character): array
 				$tag = $possible;
 
 				// Put the parameters into the string.
-				if (isset($tag['before']))
+				if (isset($tag['before'])) {
 					$tag['before'] = strtr($tag['before'], $params);
+				}
 
-				if (isset($tag['after']))
+				if (isset($tag['after'])) {
 					$tag['after'] = strtr($tag['after'], $params);
+				}
 
-				if (isset($tag['content']))
+				if (isset($tag['content'])) {
 					$tag['content'] = strtr($tag['content'], $params);
+				}
 
 				$this->pos1 += strlen($given_param_string);
-			}
-			else
-			{
+			} else {
 				$tag = $possible;
-				$params = array();
+				$params = [];
 			}
-
 			break;
 		}
 
-		return array($tag, $params);
+		return [$tag, $params];
 	}
 
 	/**
@@ -4149,43 +3944,40 @@ protected function detectTag(string $tag_character): array
 	 */
 	protected function parseItemCode(): void
 	{
-		if ($this->message[$this->pos + 1] == '0' && !in_array($this->message[$this->pos - 1], array(';', ' ', "\t", "\n", '>')))
+		if ($this->message[$this->pos + 1] == '0' && !in_array($this->message[$this->pos - 1], [';', ' ', "\t", "\n", '>'])) {
 			return;
+		}
 
 		$type = self::$itemcodes[$this->message[$this->pos + 1]];
 
 		// First let's set up the tree: it needs to be in a list, or after an li.
-		if ($this->inside === null || ($this->inside['tag'] != 'list' && $this->inside['tag'] != 'li'))
-		{
-			$this->open_tags[] = array(
+		if ($this->inside === null || ($this->inside['tag'] != 'list' && $this->inside['tag'] != 'li')) {
+			$this->open_tags[] = [
 				'tag' => 'list',
 				'after' => '</ul>',
 				'block_level' => true,
-				'require_children' => array('li'),
-				'disallow_children' => isset($this->inside['disallow_children']) ? $this->inside['disallow_children'] : null,
-			);
+				'require_children' => ['li'],
+				'disallow_children' => $this->inside['disallow_children'] ?? null,
+			];
 
 			$html = '<ul class="bbc_list">';
 		}
 		// We're in a list item already: another itemcode?  Close it first.
-		elseif ($this->inside['tag'] == 'li')
-		{
+		elseif ($this->inside['tag'] == 'li') {
 			array_pop($this->open_tags);
 			$html = '</li>';
-		}
-		else
-		{
+		} else {
 			$html = '';
 		}
 
 		// Now we open a new tag.
-		$this->open_tags[] = array(
+		$this->open_tags[] = [
 			'tag' => 'li',
 			'after' => '</li>',
 			'trim' => 'outside',
 			'block_level' => true,
-			'disallow_children' => isset($this->inside['disallow_children']) ? $this->inside['disallow_children'] : null,
-		);
+			'disallow_children' => $this->inside['disallow_children'] ?? null,
+		];
 
 		// First, open the tag...
 		$html .= '<li' . ($type == '' ? '' : ' type="' . $type . '"') . '>';
@@ -4198,8 +3990,7 @@ protected function parseItemCode(): void
 		$pos2 = strpos($this->message, '<br>', $this->pos);
 		$pos3 = strpos($this->message, '[/', $this->pos);
 
-		if ($pos2 !== false && ($pos2 <= $pos3 || $pos3 === false))
-		{
+		if ($pos2 !== false && ($pos2 <= $pos3 || $pos3 === false)) {
 			preg_match('~^(<br>|&nbsp;|\s|\[)+~', substr($this->message, $pos2 + 4), $matches);
 
 			$this->message = substr($this->message, 0, $pos2) . (!empty($matches[0]) && substr($matches[0], -1) == '[' ? '[/li]' : '[/li][/list]') . substr($this->message, $pos2);
@@ -4207,8 +3998,7 @@ protected function parseItemCode(): void
 			$this->open_tags[count($this->open_tags) - 2]['after'] = '</ul>';
 		}
 		// Tell the [list] that it needs to close specially.
-		else
-		{
+		else {
 			// Move the li over, because we're not sure what we'll hit.
 			$this->open_tags[count($this->open_tags) - 1]['after'] = '';
 			$this->open_tags[count($this->open_tags) - 2]['after'] = '</li></ul>';
@@ -4223,19 +4013,14 @@ protected function parseItemCode(): void
 	 */
 	protected function useDisabledTag(array $tag): array
 	{
-		if (!isset($tag['disabled_before']) && !isset($tag['disabled_after']) && !isset($tag['disabled_content']))
-		{
+		if (!isset($tag['disabled_before']) && !isset($tag['disabled_after']) && !isset($tag['disabled_content'])) {
 			$tag['before'] = !empty($tag['block_level']) ? '<div>' : '';
 			$tag['after'] = !empty($tag['block_level']) ? '</div>' : '';
 			$tag['content'] = isset($tag['type']) && $tag['type'] == 'closed' ? '' : (!empty($tag['block_level']) ? '<div>$1</div>' : '$1');
-		}
-		elseif (isset($tag['disabled_before']) || isset($tag['disabled_after']))
-		{
-			$tag['before'] = isset($tag['disabled_before']) ? $tag['disabled_before'] : (!empty($tag['block_level']) ? '<div>' : '');
-			$tag['after'] = isset($tag['disabled_after']) ? $tag['disabled_after'] : (!empty($tag['block_level']) ? '</div>' : '');
-		}
-		else
-		{
+		} elseif (isset($tag['disabled_before']) || isset($tag['disabled_after'])) {
+			$tag['before'] = $tag['disabled_before'] ?? (!empty($tag['block_level']) ? '<div>' : '');
+			$tag['after'] = $tag['disabled_after'] ?? (!empty($tag['block_level']) ? '</div>' : '');
+		} else {
 			$tag['content'] = $tag['disabled_content'];
 		}
 
@@ -4250,12 +4035,12 @@ protected function closeInlineTags(): void
 	{
 		$n = count($this->open_tags) - 1;
 
-		while (empty($this->open_tags[$n]['block_level']) && $n >= 0)
+		while (empty($this->open_tags[$n]['block_level']) && $n >= 0) {
 			$n--;
+		}
 
 		// Close all the non block level tags so this tag isn't surrounded by them.
-		for ($i = count($this->open_tags) - 1; $i > $n; $i--)
-		{
+		for ($i = count($this->open_tags) - 1; $i > $n; $i--) {
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $this->open_tags[$i]['after'] . "\n" . substr($this->message, $this->pos);
 
 			$ot_strlen = strlen($this->open_tags[$i]['after']);
@@ -4265,16 +4050,15 @@ protected function closeInlineTags(): void
 			// Trim or eat trailing stuff...
 			$whitespace_regex = '';
 
-			if (!empty($tag['block_level']))
+			if (!empty($tag['block_level'])) {
 				$whitespace_regex .= '(&nbsp;|\s)*(<br>)?';
+			}
 
-			if (!empty($tag['trim']) && $tag['trim'] != 'inside')
-			{
+			if (!empty($tag['trim']) && $tag['trim'] != 'inside') {
 				$whitespace_regex .= empty($tag['require_parents']) ? '(&nbsp;|\s)*' : '(<br>|&nbsp;|\s)*';
 			}
 
-			if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($this->message, $this->pos), $matches) != 0)
-			{
+			if (!empty($whitespace_regex) && preg_match('~' . $whitespace_regex . '~', substr($this->message, $this->pos), $matches) != 0) {
 				$this->message = substr($this->message, 0, $this->pos) . substr($this->message, $this->pos + strlen($matches[0]));
 			}
 
@@ -4292,54 +4076,58 @@ protected function closeInlineTags(): void
 	protected function transformToHtml(array $tag, array $params): void
 	{
 		// Insert Lang::$txt strings into the HTML output.
-		foreach (array('content', 'before', 'after') as $key)
-		{
-			if (isset($tag[$key]))
+		foreach (['content', 'before', 'after'] as $key) {
+			if (isset($tag[$key])) {
 				$tag[$key] = $this->insertTxt($tag[$key]);
+			}
 
-			if (isset($tag['disabled_' . $key]))
+			if (isset($tag['disabled_' . $key])) {
 				$tag['disabled_' . $key] = $this->insertTxt($tag['disabled_' . $key]);
+			}
 		}
 
 		// We use this a lot.
 		$tag_strlen = strlen($tag['tag']);
 
 		// Set the validation method to something we can call.
-		if (isset($tag['validate']) && is_string($tag['validate']))
+		if (isset($tag['validate']) && is_string($tag['validate'])) {
 			$tag['validate'] = Utils::getCallable($tag['validate']);
+		}
 
 		// No type means 'parsed_content'.
-		if (!isset($tag['type']))
-		{
+		if (!isset($tag['type'])) {
 			$this->open_tags[] = $tag;
 
 			// There's no data to change, but maybe do something based on params?
 			$data = null;
 
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $tag['before'] . "\n" . substr($this->message, $this->pos1);
 
 			$this->pos += strlen($tag['before']) - 1 + 2;
 		}
 		// Don't parse the content, just skip it.
-		elseif ($tag['type'] == 'unparsed_content')
-		{
+		elseif ($tag['type'] == 'unparsed_content') {
 			$pos2 = stripos($this->message, '[/' . substr($this->message, $this->pos + 1, $tag_strlen) . ']', $this->pos1);
 
-			if ($pos2 === false)
+			if ($pos2 === false) {
 				return;
+			}
 
 			$data = substr($this->message, $this->pos1, $pos2 - $this->pos1);
 
-			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>')
+			if (!empty($tag['block_level']) && substr($data, 0, 4) == '<br>') {
 				$data = substr($data, 4);
+			}
 
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
-			$html = strtr($tag['content'], array('$1' => $data));
+			$html = strtr($tag['content'], ['$1' => $data]);
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $html . "\n" . substr($this->message, $pos2 + 3 + $tag_strlen);
 
@@ -4347,179 +4135,185 @@ protected function transformToHtml(array $tag, array $params): void
 			$this->last_pos = $this->pos + 1;
 		}
 		// Don't parse the content, just skip it.
-		elseif ($tag['type'] == 'unparsed_equals_content')
-		{
+		elseif ($tag['type'] == 'unparsed_equals_content') {
 			// The value may be quoted for some tags - check.
-			if (isset($tag['quoted']))
-			{
+			if (isset($tag['quoted'])) {
 				$quoted = substr($this->message, $this->pos1, 6) == '&quot;';
 
-				if ($tag['quoted'] != 'optional' && !$quoted)
+				if ($tag['quoted'] != 'optional' && !$quoted) {
 					return;
+				}
 
-				if ($quoted)
+				if ($quoted) {
 					$this->pos1 += 6;
-			}
-			else
-			{
+				}
+			} else {
 				$quoted = false;
 			}
 
 			$pos2 = strpos($this->message, $quoted == false ? ']' : '&quot;]', $this->pos1);
 
-			if ($pos2 === false)
+			if ($pos2 === false) {
 				return;
+			}
 
 			$pos3 = stripos($this->message, '[/' . substr($this->message, $this->pos + 1, $tag_strlen) . ']', $pos2);
 
-			if ($pos3 === false)
+			if ($pos3 === false) {
 				return;
+			}
 
-			$data = array(
+			$data = [
 				substr($this->message, $pos2 + ($quoted == false ? 1 : 7), $pos3 - ($pos2 + ($quoted == false ? 1 : 7))),
-				substr($this->message, $this->pos1, $pos2 - $this->pos1)
-			);
+				substr($this->message, $this->pos1, $pos2 - $this->pos1),
+			];
 
-			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>')
+			if (!empty($tag['block_level']) && substr($data[0], 0, 4) == '<br>') {
 				$data[0] = substr($data[0], 4);
+			}
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
-			$html = strtr($tag['content'], array('$1' => $data[0], '$2' => $data[1]));
+			$html = strtr($tag['content'], ['$1' => $data[0], '$2' => $data[1]]);
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $html . "\n" . substr($this->message, $pos3 + 3 + $tag_strlen);
 
 			$this->pos += strlen($html) - 1 + 2;
 		}
 		// A closed tag, with no content or value.
-		elseif ($tag['type'] == 'closed')
-		{
+		elseif ($tag['type'] == 'closed') {
 			$pos2 = strpos($this->message, ']', $this->pos);
 
 			// Maybe a custom BBC wants to do something special?
 			$data = null;
 
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $tag['content'] . "\n" . substr($this->message, $pos2 + 1);
 
 			$this->pos += strlen($tag['content']) - 1 + 2;
 		}
 		// This one is sorta ugly... :/.  Unfortunately, it's needed for flash.
-		elseif ($tag['type'] == 'unparsed_commas_content')
-		{
+		elseif ($tag['type'] == 'unparsed_commas_content') {
 			$pos2 = strpos($this->message, ']', $this->pos1);
 
-			if ($pos2 === false)
+			if ($pos2 === false) {
 				return;
+			}
 
 			$pos3 = stripos($this->message, '[/' . substr($this->message, $this->pos + 1, $tag_strlen) . ']', $pos2);
 
-			if ($pos3 === false)
+			if ($pos3 === false) {
 				return;
+			}
 
 			// We want $1 to be the content, and the rest to be csv.
 			$data = explode(',', ',' . substr($this->message, $this->pos1, $pos2 - $this->pos1));
 			$data[0] = substr($this->message, $pos2 + 1, $pos3 - $pos2 - 1);
 
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
 			$html = $tag['content'];
 
-			foreach ($data as $k => $d)
-				$html = strtr($html, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+				$html = strtr($html, ['$' . ($k + 1) => trim($d)]);
+			}
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $html . "\n" . substr($this->message, $pos3 + 3 + $tag_strlen);
 
 			$this->pos += strlen($html) - 1 + 2;
 		}
 		// This has parsed content, and a csv value which is unparsed.
-		elseif ($tag['type'] == 'unparsed_commas')
-		{
+		elseif ($tag['type'] == 'unparsed_commas') {
 			$pos2 = strpos($this->message, ']', $this->pos1);
 
-			if ($pos2 === false)
+			if ($pos2 === false) {
 				return;
+			}
 
 			$data = explode(',', substr($this->message, $this->pos1, $pos2 - $this->pos1));
 
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
 			// Fix after, for disabled code mainly.
-			foreach ($data as $k => $d)
-				$tag['after'] = strtr($tag['after'], array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+				$tag['after'] = strtr($tag['after'], ['$' . ($k + 1) => trim($d)]);
+			}
 
 			$this->open_tags[] = $tag;
 
 			// Replace them out, $1, $2, $3, $4, etc.
 			$html = $tag['before'];
 
-			foreach ($data as $k => $d)
-				$html = strtr($html, array('$' . ($k + 1) => trim($d)));
+			foreach ($data as $k => $d) {
+				$html = strtr($html, ['$' . ($k + 1) => trim($d)]);
+			}
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $html . "\n" . substr($this->message, $pos2 + 1);
 
 			$this->pos += strlen($html) - 1 + 2;
 		}
 		// A tag set to a value, parsed or not.
-		elseif ($tag['type'] == 'unparsed_equals' || $tag['type'] == 'parsed_equals')
-		{
+		elseif ($tag['type'] == 'unparsed_equals' || $tag['type'] == 'parsed_equals') {
 			// The value may be quoted for some tags - check.
-			if (isset($tag['quoted']))
-			{
+			if (isset($tag['quoted'])) {
 				$quoted = substr($this->message, $this->pos1, 6) == '&quot;';
 
-				if ($tag['quoted'] != 'optional' && !$quoted)
+				if ($tag['quoted'] != 'optional' && !$quoted) {
 					return;
+				}
 
-				if ($quoted)
+				if ($quoted) {
 					$this->pos1 += 6;
-			}
-			else
-			{
+				}
+			} else {
 				$quoted = false;
 			}
 
-			if ($quoted)
-			{
+			if ($quoted) {
 				$end_of_value = strpos($this->message, '&quot;]', $this->pos1);
 				$nested_tag = strpos($this->message, '=&quot;', $this->pos1);
 
 				// Check so this is not just an quoted url ending with a =
-				if ($nested_tag && substr($this->message, $nested_tag, 8) == '=&quot;]')
+				if ($nested_tag && substr($this->message, $nested_tag, 8) == '=&quot;]') {
 					$nested_tag = false;
+				}
 
-				if ($nested_tag && $nested_tag < $end_of_value)
-				{
+				if ($nested_tag && $nested_tag < $end_of_value) {
 					// Nested tag with quoted value detected, use next end tag
 					$nested_tag_pos = strpos($this->message, $quoted == false ? ']' : '&quot;]', $this->pos1) + 6;
 				}
 			}
 
-			$pos2 = strpos($this->message, $quoted == false ? ']' : '&quot;]', isset($nested_tag_pos) ? $nested_tag_pos : $this->pos1);
+			$pos2 = strpos($this->message, $quoted == false ? ']' : '&quot;]', $nested_tag_pos ?? $this->pos1);
 
-			if ($pos2 === false)
+			if ($pos2 === false) {
 				return;
+			}
 
 			$data = substr($this->message, $this->pos1, $pos2 - $this->pos1);
 
 			// Validation for my parking, please!
-			if (isset($tag['validate']))
-				call_user_func_array($tag['validate'], array(&$tag, &$data, $this->disabled, $params));
+			if (isset($tag['validate'])) {
+				call_user_func_array($tag['validate'], [&$tag, &$data, $this->disabled, $params]);
+			}
 
 			// For parsed content, we must recurse to avoid security problems.
-			if ($tag['type'] != 'unparsed_equals')
-			{
+			if ($tag['type'] != 'unparsed_equals') {
 				$smileys = $this->smileys;
 				$parse_tags = $this->parse_tags;
 
 				$this->smileys = empty($tag['parsed_tags_allowed']);
-				$this->parse_tags = !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : array();
+				$this->parse_tags = !empty($tag['parsed_tags_allowed']) ? $tag['parsed_tags_allowed'] : [];
 
 				$data = $this->parse($data);
 
@@ -4527,11 +4321,11 @@ protected function transformToHtml(array $tag, array $params): void
 				$this->parse_tags = $parse_tags;
 			}
 
-			$tag['after'] = strtr($tag['after'], array('$1' => $data));
+			$tag['after'] = strtr($tag['after'], ['$1' => $data]);
 
 			$this->open_tags[] = $tag;
 
-			$html = strtr($tag['before'], array('$1' => $data));
+			$html = strtr($tag['before'], ['$1' => $data]);
 
 			$this->message = substr($this->message, 0, $this->pos) . "\n" . $html . "\n" . substr($this->message, $pos2 + ($quoted == false ? 1 : 7));
 
@@ -4539,14 +4333,12 @@ protected function transformToHtml(array $tag, array $params): void
 		}
 
 		// If this is block level, eat any breaks after it.
-		if (!empty($tag['block_level']) && substr($this->message, $this->pos + 1, 4) == '<br>')
-		{
+		if (!empty($tag['block_level']) && substr($this->message, $this->pos + 1, 4) == '<br>') {
 			$this->message = substr($this->message, 0, $this->pos + 1) . substr($this->message, $this->pos + 5);
 		}
 
 		// Are we trimming outside this tag?
-		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($this->message, $this->pos + 1), $matches) != 0)
-		{
+		if (!empty($tag['trim']) && $tag['trim'] != 'outside' && preg_match('~(<br>|&nbsp;|\s)*~', substr($this->message, $this->pos + 1), $matches) != 0) {
 			$this->message = substr($this->message, 0, $this->pos + 1) . substr($this->message, $this->pos + 1 + strlen($matches[0]));
 		}
 	}
@@ -4561,68 +4353,52 @@ protected function transformToHtml(array $tag, array $params): void
 	 */
 	protected function fetchTagAttributes($string)
 	{
-		$attribs = array();
+		$attribs = [];
 		$key = $value = '';
 		$tag_state = 0; // 0 = key, 1 = attribute with no string, 2 = attribute with string
 
-		for ($i = 0; $i < strlen($string); $i++)
-		{
+		for ($i = 0; $i < strlen($string); $i++) {
 			// We're either moving from the key to the attribute or we're in a string and this is fine.
-			if ($string[$i] == '=')
-			{
-				if ($tag_state == 0)
-				{
+			if ($string[$i] == '=') {
+				if ($tag_state == 0) {
 					$tag_state = 1;
-				}
-				elseif ($tag_state == 2)
-				{
+				} elseif ($tag_state == 2) {
 					$value .= '=';
 				}
 			}
 			// A space is either moving from an attribute back to a potential key or in a string is fine.
-			elseif ($string[$i] == ' ')
-			{
-				if ($tag_state == 2)
-				{
+			elseif ($string[$i] == ' ') {
+				if ($tag_state == 2) {
 					$value .= ' ';
-				}
-				elseif ($tag_state == 1)
-				{
+				} elseif ($tag_state == 1) {
 					$attribs[$key] = $value;
 					$key = $value = '';
 					$tag_state = 0;
 				}
 			}
 			// A quote?
-			elseif ($string[$i] == '"')
-			{
+			elseif ($string[$i] == '"') {
 				// Must be either going into or out of a string.
-				if ($tag_state == 1)
-				{
+				if ($tag_state == 1) {
 					$tag_state = 2;
-				}
-				else
-				{
+				} else {
 					$tag_state = 1;
 				}
 			}
 			// Otherwise it's fine.
-			else
-			{
-				if ($tag_state == 0)
-				{
+			else {
+				if ($tag_state == 0) {
 					$key .= $string[$i];
-				}
-				else
-				{
+				} else {
 					$value .= $string[$i];
 				}
 			}
 		}
 
 		// Anything left?
-		if ($key != '' && $value != '')
+		if ($key != '' && $value != '') {
 			$attribs[$key] = $value;
+		}
 
 		return $attribs;
 	}
@@ -4639,62 +4415,58 @@ protected function fetchTagAttributes($string)
 	protected function legalise($string)
 	{
 		// Don't care about the texts that are too short.
-		if (strlen($string) < 3)
+		if (strlen($string) < 3) {
 			return $string;
+		}
 
 		// A list of tags that's disabled by the admin.
-		$disabled = empty(Config::$modSettings['disabledBBC']) ? array() : array_flip(explode(',', strtolower(Config::$modSettings['disabledBBC'])));
+		$disabled = empty(Config::$modSettings['disabledBBC']) ? [] : array_flip(explode(',', strtolower(Config::$modSettings['disabledBBC'])));
 
 		// Get a list of all the tags that are not disabled.
 		$all_tags = self::getCodes();
-		$valid_tags = array();
-		$self_closing_tags = array();
+		$valid_tags = [];
+		$self_closing_tags = [];
 
-		foreach ($all_tags as $tag)
-		{
-			if (!isset($disabled[$tag['tag']]))
+		foreach ($all_tags as $tag) {
+			if (!isset($disabled[$tag['tag']])) {
 				$valid_tags[$tag['tag']] = !empty($tag['block_level']);
+			}
 
-			if (isset($tag['type']) && $tag['type'] == 'closed')
+			if (isset($tag['type']) && $tag['type'] == 'closed') {
 				$self_closing_tags[] = $tag['tag'];
+			}
 		}
 
 		// Right - we're going to start by going through the whole lot to make sure we don't have align stuff crossed as this happens load and is stupid!
-		$align_tags = array('left', 'center', 'right', 'pre');
+		$align_tags = ['left', 'center', 'right', 'pre'];
 
 		// Remove those align tags that are not valid.
 		$align_tags = array_intersect($align_tags, array_keys($valid_tags));
 
 		// These keep track of where we are!
-		if (!empty($align_tags) && count($matches = preg_split('~(\\[/?(?:' . implode('|', $align_tags) . ')\\])~', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) > 1)
-		{
+		if (!empty($align_tags) && count($matches = preg_split('~(\[/?(?:' . implode('|', $align_tags) . ')\])~', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) > 1) {
 			// The first one is never a tag.
 			$is_tag = false;
 
 			// By default we're not inside a tag too.
 			$inside_tag = null;
 
-			foreach ($matches as $i => $match)
-			{
+			foreach ($matches as $i => $match) {
 				// We're only interested in tags, not text.
-				if ($is_tag)
-				{
+				if ($is_tag) {
 					$is_closing_tag = substr($match, 1, 1) === '/';
 					$tag_name = substr($match, $is_closing_tag ? 2 : 1, -1);
 
 					// We're closing the exact same tag that we opened.
-					if ($is_closing_tag && $inside_tag === $tag_name)
-					{
+					if ($is_closing_tag && $inside_tag === $tag_name) {
 						$inside_tag = null;
 					}
 					// We're opening a tag and we're not yet inside one either
-					elseif (!$is_closing_tag && $inside_tag === null)
-					{
+					elseif (!$is_closing_tag && $inside_tag === null) {
 						$inside_tag = $tag_name;
 					}
 					// In all other cases, this tag must be invalid
-					else
-					{
+					else {
 						unset($matches[$i]);
 					}
 				}
@@ -4704,55 +4476,54 @@ protected function legalise($string)
 			}
 
 			// We're still inside a tag and had no chance for closure?
-			if ($inside_tag !== null)
+			if ($inside_tag !== null) {
 				$matches[] = '[/' . $inside_tag . ']';
+			}
 
 			// And a complete text string again.
 			$string = implode('', $matches);
 		}
 
 		// Quickly remove any tags which are back to back.
-		$back_to_back_pattern = '~\\[(' . implode('|', array_diff(array_keys($valid_tags), array('td', 'anchor'))) . ')[^<>\\[\\]]*\\]\s*\\[/\\1\\]~';
+		$back_to_back_pattern = '~\[(' . implode('|', array_diff(array_keys($valid_tags), ['td', 'anchor'])) . ')[^<>\[\]]*\]\s*\[/\1\]~';
 
 		$lastlen = 0;
 
-		while (strlen($string) !== $lastlen)
+		while (strlen($string) !== $lastlen) {
 			$lastlen = strlen($string = preg_replace($back_to_back_pattern, '', $string));
+		}
 
 		// Need to sort the tags by name length.
 		uksort(
 			$valid_tags,
-			function($a, $b)
-			{
+			function ($a, $b) {
 				return strlen($a) < strlen($b) ? 1 : -1;
-			}
+			},
 		);
 
 		// These inline tags can compete with each other regarding style.
-		$competing_tags = array(
+		$competing_tags = [
 			'color',
 			'size',
-		);
+		];
 
 		// These keep track of where we are!
-		if (count($parts = preg_split(sprintf('~(\\[)(/?)(%1$s)((?:[\\s=][^\\]\\[]*)?\\])~', implode('|', array_keys($valid_tags))), $string, -1, PREG_SPLIT_DELIM_CAPTURE)) > 1)
-		{
+		if (count($parts = preg_split(sprintf('~(\[)(/?)(%1$s)((?:[\s=][^\]\[]*)?\])~', implode('|', array_keys($valid_tags))), $string, -1, PREG_SPLIT_DELIM_CAPTURE)) > 1) {
 			// Start outside [nobbc] or [code] blocks.
 			$in_code = false;
 			$in_nobbc = false;
 
 			// A buffer containing all opened inline elements.
-			$inline_elements = array();
+			$inline_elements = [];
 
 			// A buffer containing all opened block elements.
-			$block_elements = array();
+			$block_elements = [];
 
 			// A buffer containing the opened inline elements that might compete.
-			$competing_elements = array();
+			$competing_elements = [];
 
 			// $i: text, $i + 1: '[', $i + 2: '/', $i + 3: tag, $i + 4: tag tail.
-			for ($i = 0, $n = count($parts) - 1; $i < $n; $i += 5)
-			{
+			for ($i = 0, $n = count($parts) - 1; $i < $n; $i += 5) {
 				$tag = $parts[$i + 3];
 				$is_opening_tag = $parts[$i + 2] === '';
 				$is_closing_tag = $parts[$i + 2] === '/';
@@ -4760,30 +4531,25 @@ function($a, $b)
 				$is_competing_tag = in_array($tag, $competing_tags);
 
 				// Check if this might be one of those cleaned out tags.
-				if ($tag === '')
-				{
+				if ($tag === '') {
 					continue;
 				}
+
 				// Special case: inside [code] blocks any code is left untouched.
-				elseif ($tag === 'code')
-				{
+				if ($tag === 'code') {
 					// We're inside a code block and closing it.
-					if ($in_code && $is_closing_tag)
-					{
+					if ($in_code && $is_closing_tag) {
 						$in_code = false;
 
 						// Reopen tags that were closed before the code block.
-						if (!empty($inline_elements))
-						{
+						if (!empty($inline_elements)) {
 							$parts[$i + 4] .= '[' . implode('][', array_keys($inline_elements)) . ']';
 						}
 					}
 					// We're outside a coding and nobbc block and opening it.
-					elseif (!$in_code && !$in_nobbc && $is_opening_tag)
-					{
+					elseif (!$in_code && !$in_nobbc && $is_opening_tag) {
 						// If there are still inline elements left open, close them now.
-						if (!empty($inline_elements))
-						{
+						if (!empty($inline_elements)) {
 							$parts[$i] .= '[/' . implode('][/', array_reverse($inline_elements)) . ']';
 						}
 
@@ -4793,26 +4559,22 @@ function($a, $b)
 					// Nothing further to do.
 					continue;
 				}
+
 				// Special case: inside [nobbc] blocks any BBC is left untouched.
-				elseif ($tag === 'nobbc')
-				{
+				if ($tag === 'nobbc') {
 					// We're inside a nobbc block and closing it.
-					if ($in_nobbc && $is_closing_tag)
-					{
+					if ($in_nobbc && $is_closing_tag) {
 						$in_nobbc = false;
 
 						// Some inline elements might've been closed that need reopening.
-						if (!empty($inline_elements))
-						{
+						if (!empty($inline_elements)) {
 							$parts[$i + 4] .= '[' . implode('][', array_keys($inline_elements)) . ']';
 						}
 					}
 					// We're outside a nobbc and coding block and opening it.
-					elseif (!$in_nobbc && !$in_code && $is_opening_tag)
-					{
+					elseif (!$in_nobbc && !$in_code && $is_opening_tag) {
 						// Can't have inline elements still opened.
-						if (!empty($inline_elements))
-						{
+						if (!empty($inline_elements)) {
 							$parts[$i] .= '[/' . implode('][/', array_reverse($inline_elements)) . ']';
 						}
 
@@ -4821,24 +4583,21 @@ function($a, $b)
 
 					continue;
 				}
+
 				// So, we're inside one of the special blocks: ignore any tag.
-				elseif ($in_code || $in_nobbc)
-				{
+				if ($in_code || $in_nobbc) {
 					continue;
 				}
 
 				// We're dealing with an opening tag.
-				if ($is_opening_tag)
-				{
+				if ($is_opening_tag) {
 					// Everything inside the square brackets of the opening tag.
 					$element_content = $parts[$i + 3] . substr($parts[$i + 4], 0, -1);
 
 					// A block level opening tag.
-					if ($is_block_level_tag)
-					{
+					if ($is_block_level_tag) {
 						// Are there inline elements still open?
-						if (!empty($inline_elements))
-						{
+						if (!empty($inline_elements)) {
 							// Close all the inline tags, a block tag is coming...
 							$parts[$i] .= '[/' . implode('][/', array_reverse($inline_elements)) . ']';
 
@@ -4849,37 +4608,29 @@ function($a, $b)
 						$block_elements[] = $tag;
 					}
 					// Inline opening tag.
-					elseif (!in_array($tag, $self_closing_tags))
-					{
+					elseif (!in_array($tag, $self_closing_tags)) {
 						// Can't have two opening elements with the same contents!
-						if (isset($inline_elements[$element_content]))
-						{
+						if (isset($inline_elements[$element_content])) {
 							// Get rid of this tag.
 							$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
 
 							// Now try to find the corresponding closing tag.
 							$cur_level = 1;
 
-							for ($j = $i + 5, $m = count($parts) - 1; $j < $m; $j += 5)
-							{
+							for ($j = $i + 5, $m = count($parts) - 1; $j < $m; $j += 5) {
 								// Find the tags with the same tagname
-								if ($parts[$j + 3] === $tag)
-								{
+								if ($parts[$j + 3] === $tag) {
 									// If it's an opening tag, increase the level.
-									if ($parts[$j + 2] === '')
-									{
+									if ($parts[$j + 2] === '') {
 										$cur_level++;
 									}
 									// A closing tag, decrease the level.
-									else
-									{
+									else {
 										$cur_level--;
 
 										// Gotcha! Clean out this closing tag gone rogue.
-										if ($cur_level === 0)
-										{
+										if ($cur_level === 0) {
 											$parts[$j + 1] = $parts[$j + 2] = $parts[$j + 3] = $parts[$j + 4] = '';
-
 											break;
 										}
 									}
@@ -4887,17 +4638,17 @@ function($a, $b)
 							}
 						}
 						// Otherwise, add this one to the list.
-						else
-						{
-							if ($is_competing_tag)
-							{
-								if (!isset($competing_elements[$tag]))
-									$competing_elements[$tag] = array();
+						else {
+							if ($is_competing_tag) {
+								if (!isset($competing_elements[$tag])) {
+									$competing_elements[$tag] = [];
+								}
 
 								$competing_elements[$tag][] = $parts[$i + 4];
 
-								if (count($competing_elements[$tag]) > 1)
+								if (count($competing_elements[$tag]) > 1) {
 									$parts[$i] .= '[/' . $tag . ']';
+								}
 							}
 
 							$inline_elements[$element_content] = $tag;
@@ -4905,49 +4656,43 @@ function($a, $b)
 					}
 				}
 				// Closing tag.
-				else
-				{
+				else {
 					// Closing the block tag.
-					if ($is_block_level_tag)
-					{
+					if ($is_block_level_tag) {
 						// Close the elements that should've been closed by closing this tag.
-						if (!empty($block_elements))
-						{
-							$add_closing_tags = array();
+						if (!empty($block_elements)) {
+							$add_closing_tags = [];
 
-							while ($element = array_pop($block_elements))
-							{
-								if ($element === $tag)
+							while ($element = array_pop($block_elements)) {
+								if ($element === $tag) {
 									break;
+								}
 
 								// Still a block tag was open not equal to this tag.
 								$add_closing_tags[] = $element['type'];
 							}
 
-							if (!empty($add_closing_tags))
-							{
+							if (!empty($add_closing_tags)) {
 								$parts[$i + 1] = '[/' . implode('][/', array_reverse($add_closing_tags)) . ']' . $parts[$i + 1];
 							}
 
 							// Apparently the closing tag was not found on the stack.
-							if (!is_string($element) || $element !== $tag)
-							{
+							if (!is_string($element) || $element !== $tag) {
 								// Get rid of this particular closing tag, it was never opened.
 								$parts[$i + 1] = substr($parts[$i + 1], 0, -1);
 								$parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
+
 								continue;
 							}
-						}
-						else
-						{
+						} else {
 							// Get rid of this closing tag!
 							$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
+
 							continue;
 						}
 
 						// Inline elements are still left opened?
-						if (!empty($inline_elements))
-						{
+						if (!empty($inline_elements)) {
 							// Close them first..
 							$parts[$i] .= '[/' . implode('][/', array_reverse($inline_elements)) . ']';
 
@@ -4956,37 +4701,32 @@ function($a, $b)
 						}
 					}
 					// Inline tag.
-					else
-					{
+					else {
 						// Are we expecting this tag to end?
-						if (in_array($tag, $inline_elements))
-						{
-							foreach (array_reverse($inline_elements, true) as $tag_content_to_be_closed => $tag_to_be_closed)
-							{
+						if (in_array($tag, $inline_elements)) {
+							foreach (array_reverse($inline_elements, true) as $tag_content_to_be_closed => $tag_to_be_closed) {
 								// Closing it one way or the other.
 								unset($inline_elements[$tag_content_to_be_closed]);
 
 								// Was this the tag we were looking for?
-								if ($tag_to_be_closed === $tag)
+								if ($tag_to_be_closed === $tag) {
 									break;
+								}
 
 								// Nope, close it and look further!
 								$parts[$i] .= '[/' . $tag_to_be_closed . ']';
 							}
 
-							if ($is_competing_tag && !empty($competing_elements[$tag]))
-							{
+							if ($is_competing_tag && !empty($competing_elements[$tag])) {
 								array_pop($competing_elements[$tag]);
 
-								if (count($competing_elements[$tag]) > 0)
-								{
+								if (count($competing_elements[$tag]) > 0) {
 									$parts[$i + 5] = '[' . $tag . $competing_elements[$tag][count($competing_elements[$tag]) - 1] . $parts[$i + 5];
 								}
 							}
 						}
 						// Unexpected closing tag, ex-ter-mi-nate.
-						else
-						{
+						else {
 							$parts[$i + 1] = $parts[$i + 2] = $parts[$i + 3] = $parts[$i + 4] = '';
 						}
 					}
@@ -4994,24 +4734,22 @@ function($a, $b)
 			}
 
 			// Close the code tags.
-			if ($in_code)
-			{
+			if ($in_code) {
 				$parts[$i] .= '[/code]';
 			}
 			// The same for nobbc tags.
-			elseif ($in_nobbc)
-			{
+			elseif ($in_nobbc) {
 				$parts[$i] .= '[/nobbc]';
 			}
 			// Still inline tags left unclosed? Close them now, better late than never.
-			elseif (!empty($inline_elements))
-			{
+			elseif (!empty($inline_elements)) {
 				$parts[$i] .= '[/' . implode('][/', array_reverse($inline_elements)) . ']';
 			}
 
 			// Now close the block elements.
-			if (!empty($block_elements))
+			if (!empty($block_elements)) {
 				$parts[$i] .= '[/' . implode('][/', array_reverse($block_elements)) . ']';
+			}
 
 			$string = implode('', $parts);
 		}
@@ -5019,8 +4757,9 @@ function($a, $b)
 		// Final clean up of back-to-back tags.
 		$lastlen = 0;
 
-		while (strlen($string) !== $lastlen)
+		while (strlen($string) !== $lastlen) {
 			$lastlen = strlen($string = preg_replace($back_to_back_pattern, '', $string));
+		}
 
 		return $string;
 	}
@@ -5031,7 +4770,7 @@ function($a, $b)
 	protected function resetRuntimeProperties(): void
 	{
 		// Reset these properties.
-		$to_reset = array(
+		$to_reset = [
 			'message',
 			'smileys',
 			'parse_tags',
@@ -5042,12 +4781,13 @@ protected function resetRuntimeProperties(): void
 			'placeholders',
 			'placeholders_counter',
 			'cache_key_extras',
-		);
+		];
 
 		$class_vars = get_class_vars(__CLASS__);
 
-		foreach ($to_reset as $var)
+		foreach ($to_reset as $var) {
 			$this->{$var} = $class_vars[$var];
+		}
 	}
 
 	/*************************
@@ -5061,16 +4801,14 @@ protected function resetRuntimeProperties(): void
 	protected static function integrateBBC(): void
 	{
 		// Only do this once.
-		if (self::$integrate_bbc_codes_done !== true)
-		{
-			IntegrationHook::call('integrate_bbc_codes', array(&self::$codes, &self::$no_autolink_tags));
+		if (self::$integrate_bbc_codes_done !== true) {
+			IntegrationHook::call('integrate_bbc_codes', [&self::$codes, &self::$no_autolink_tags]);
 
 			// Prevent duplicates.
-			$temp = array();
+			$temp = [];
 
 			// Reverse order because mods typically append to the array.
-			for ($i = count(self::$codes) - 1; $i >= 0; $i--)
-			{
+			for ($i = count(self::$codes) - 1; $i >= 0; $i--) {
 				$value = self::$codes[$i];
 
 				// Since validation functions may be closures, and
@@ -5079,12 +4817,9 @@ protected static function integrateBBC(): void
 
 				$serialized = serialize($value);
 
-				if (!in_array($serialized, $temp))
-				{
+				if (!in_array($serialized, $temp)) {
 					$temp[] = $serialized;
-				}
-				else
-				{
+				} else {
 					unset(self::$codes[$i]);
 				}
 			}
@@ -5095,7 +4830,8 @@ protected static function integrateBBC(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\BBCodeParser::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\BBCodeParser::exportStatic')) {
 	BBCodeParser::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/BackwardCompatibility.php b/Sources/BackwardCompatibility.php
index 09382f9b2a..c7a117a4a3 100644
--- a/Sources/BackwardCompatibility.php
+++ b/Sources/BackwardCompatibility.php
@@ -36,10 +36,9 @@ trait BackwardCompatibility
 	 * Regarding the $backcompat items:
 	 *
 	 * A class's static properties are not exported to global variables unless
-	 * explicitly included in $backcompat['prop_names']. In contrast, a class's
-	 * static methods are automatically exported as global functions unless
-	 * explicitly excluded by setting their entry in $backcompat['func_names']
-	 * to false.
+	 * explicitly included in $backcompat['prop_names']. Likewise, a class's
+	 * static methods are not exported as global functions unless explicitly
+	 * included in $backcompat['func_names'].
 	 *
 	 * $backcompat['prop_names'] is a simple array where the keys are the names
 	 * of one or more of a class's static properties, and the values are the
@@ -47,184 +46,51 @@ trait BackwardCompatibility
 	 * to a reference to the static property. Static properties that are not
 	 * named in this array will not be exported.
 	 *
-	 * $backcompat['func_names'] allows you to manually specify the global
-	 * function names that any given methods should be mapped to. These
-	 * manually specified function names will ignore and override the effects
-	 * of $backcompat['func_underscores'] and $backcompat['func_prefix'].
-	 * If you want to prevent a static method from being exported to global
-	 * namespace at all, set its $backcompat['func_names'] entry to false.
+	 * $backcompat['func_names'] is a simple array where the keys are the names
+	 * of one or more of a class's static methods, and the values are the names
+	 * that should be used for global functions that will encapsulate those
+	 * methods. Methods that are not named in this array will not be exported.
 	 *
-	 * For convenience, two additional $backcompat options are available:
-	 * $backcompat['func_underscores'] and $backcompat['func_prefix'].
-	 *
-	 * If $backcompat['func_underscores'] is true, method names in camelCase will
-	 * have underscores inserted into them (e.g.: 'parseIri' --> 'parse_iri').
-	 * This should usually only be set to true if the majority of the methods in
-	 * a class were converted from functions that used underscores in their
-	 * names. If you need to map method names to function names in a mixture of
-	 * both styles, choose one style for the default and then deal with the
-	 * exceptions manually via $backcompat['func_names'].
-	 *
-	 * If $backcompat['func_prefix'] is set to a string, that string will be
-	 * prepended to the function name. If $backcompat['func_underscores'] is
-	 * true, the prefix will be joined to the rest of the function name by an
-	 * underscore, but the prefix itself will always be used as-is.
-	 *
-	 * If instead $backcompat['func_prefix'] is set to true, a prefix derived
-	 * from the fully qualified class name will be prepended to the func name.
-	 * This prefix will respect the value of $backcompat['func_underscores'].
-	 * In most cases, at least for SMF's code, $backcompat['func_underscores']
-	 * should be true when $backcompat['func_prefix'] is true.
-	 *
-	 * $backcompat['func_underscores'] and $backcompat['func_prefix'] don't apply
-	 * to functions that are manually named in $backcompat['func_names'].
+	 * Adding non-static properties or methods to the $backcompat arrays will
+	 * produce runtime errors. It is the responsibility of the developer to make
+	 * sure not to do this.
 	 */
 	public static function exportStatic(): void
 	{
 		// Do nothing if backward compatibility has been turned off.
-		if (empty(\SMF\Config::$backward_compatibility))
+		if (empty(\SMF\Config::$backward_compatibility)) {
 			return;
+		}
 
-		$reflector = new \ReflectionClass(__CLASS__);
+		if (!isset(self::$backcompat)) {
+			return;
+		}
 
 		// Get any backward compatibility settings.
-		$backcompat = $reflector->getStaticPropertyValue('backcompat', array());
-
-		$backcompat['func_underscores'] = !empty($backcompat['func_underscores']);
-		$backcompat['func_prefix'] = $backcompat['func_prefix'] ?? '';
-		$backcompat['func_names'] = $backcompat['func_names'] ?? array();
-		$backcompat['prop_names'] = $backcompat['prop_names'] ?? array();
+		self::$backcompat['func_names'] = self::$backcompat['func_names'] ?? [];
+		self::$backcompat['prop_names'] = self::$backcompat['prop_names'] ?? [];
 
 		// The property names are simple enough to deal with...
-		foreach ($backcompat['prop_names'] as $static => $global)
+		foreach (self::$backcompat['prop_names'] as $static => $global) {
 			$GLOBALS[$global] = &self::${$static};
-
-		// Get the public static functions.
-		$static_methods = array_intersect($reflector->getMethods(\ReflectionMethod::IS_STATIC), $reflector->getMethods(\ReflectionMethod::IS_PUBLIC));
-
-		// Filter out the parent class's public static functions.
-		if (is_object($parent_reflector = $reflector->getParentClass()))
-		{
-			$static_methods = array_map('json_decode', array_diff(array_map(__CLASS__ . '::methodAsJson', $static_methods), array_map(__CLASS__ . '::methodAsJson', array_intersect($parent_reflector->getMethods(\ReflectionMethod::IS_STATIC), $parent_reflector->getMethods(\ReflectionMethod::IS_PUBLIC)))));
 		}
 
-		foreach ($static_methods as $method)
-		{
-			$method = (array) $method;
-
-			// Skip the static methods supplied by this trait.
-			if (method_exists(__TRAIT__, $method['name']))
-				continue;
-
+		// The method names are slightly more complicated...
+		foreach (self::$backcompat['func_names'] as $method => $func) {
 			// If the name is manually set to false (or anything invalid), skip this method.
-			if (isset($backcompat['func_names'][$method['name']]) && !is_string($backcompat['func_names'][$method['name']]))
-			{
+			if (!is_string($func)) {
 				continue;
 			}
 
-			// What global function name shall we use for this method?
-			$func = $backcompat['func_underscores'] ? self::toUnderscores($method['name']) : $method['name'];
-
-			// Allow overriding the function name.
-			if (isset($backcompat['func_names'][$method['name']]))
-			{
-				$func = $backcompat['func_names'][$method['name']];
-			}
-			// Allow manually specified prefixes.
-			elseif ($backcompat['func_prefix'] !== true)
-			{
-				if ($backcompat['func_underscores'] && substr($backcompat['func_prefix'], -1) !== '_')
-				{
-					$backcompat['func_prefix'] .= '_';
-				}
-
-				$func = strtolower($backcompat['func_prefix'] . $func);
-			}
-			// Avoid name conflicts with existing functions.
-			else
-			{
-				if ($backcompat['func_underscores'])
-				{
-					$full_prefix = strtolower(strtr($method['class'], '\\', '_')) . '_';
-				}
-				else
-				{
-					$full_prefix = str_replace(' ', '', ucwords(strtr($method['class'], '\\', ' ')));
-				}
-
-				$i = 0;
-				$prefix = '';
-				$class_parts = explode('\\', $method['class']);
-				while ($backcompat['func_prefix'] === true || function_exists($prefix . $func))
-				{
-					$prefix = array_slice($class_parts, $i--);
-
-					if ($backcompat['func_underscores'])
-					{
-						$prefix = strtolower(implode('_', $prefix)) . '_';
-					}
-					else
-					{
-						$prefix = str_replace(' ', '', ucwords(implode(' ', $prefix)));
-					}
-
-					if ($prefix === $full_prefix || $i < -count($class_parts))
-						break;
-				}
-
-				$func = strtolower($prefix . $func);
-			}
-
 			// If function already exists, die violently.
-			if (function_exists($func))
-				throw new \Exception("Function $func already exists", 1);
+			if (function_exists($func)) {
+				throw new \Exception("Function {$func} already exists", 1);
+			}
 
 			// Here's where the magic happens.
-			eval('function ' . $func . '(...$args) { return ' . $method['class'] . '::' . $method['name'] . '(...$args); }');
+			eval('function ' . $func . '(...$args) { return ' . __CLASS__ . '::' . $method . '(...$args); }');
 		}
 	}
-
-	/**
-	 * Converts a camelCase string to an underscore separated string.
-	 * For example, this converts "fooBarBaz" to "foo_bar_baz".
-	 *
-	 * @param string $string A (possibly) camelCase string.
-	 * @return string An underscore separated string.
-	 */
-	public static function toUnderscores(string $string): string
-	{
-		return strtolower(preg_replace('/(?<=\P{Lu})\p{Lu}/', '_$0', $string));
-	}
-
-	/**
-	 * Converts an underscore separated string to a camelCase string.
-	 * For example, this converts "foo_bar_baz" to "fooBarBaz".
-	 *
-	 * @param string $string A (possibly) underscore separated string.
-	 * @return string A camelCase string.
-	 */
-	public static function toCamelCase(string $string): string
-	{
-		return preg_replace_callback(
-			'/_(\p{L})/',
-			function ($matches)
-			{
-				return strtoupper($matches[1]);
-			},
-			strtolower($string)
-		);
-	}
-
-	/**
-	 * Small callback function used by exportStatic(). Pay this no mind.
-	 *
-	 * @param object $method A \ReflectorMethod object.
-	 * @return string A JSON string.
-	 */
-	private static function methodAsJson(object $method): string
-	{
-		return json_encode((array) $method);
-	}
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Board.php b/Sources/Board.php
index 41c23f02ad..de88872c60 100644
--- a/Sources/Board.php
+++ b/Sources/Board.php
@@ -29,34 +29,37 @@
  */
 class Board implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'loadBoard',
-			'init' => false,
-			'sort' => 'sortBoards',
+			'markRead' => 'MarkRead',
+			'markBoardsRead' => 'markBoardsRead',
+			'getMsgMemberID' => 'getMsgMemberID',
 			'modify' => 'modifyBoard',
 			'create' => 'createBoard',
 			'delete' => 'deleteBoards',
 			'reorder' => 'reorderBoards',
-			'getParents' => 'getBoardParents',
+			'fixChildren' => 'fixChildren',
+			'sort' => 'sortBoards',
 			'getModerators' => 'getBoardModerators',
 			'getModeratorGroups' => 'getBoardModeratorGroups',
-			'setParsedDescriptions' => 'setBoardParsedDescription',
-			'getParsedDescriptions' => 'getBoardsParsedDescription',
-		),
-		'prop_names' => array(
+			'isChildOf' => 'isChildOf',
+			'getParents' => 'getBoardParents',
+		],
+		'prop_names' => [
 			'board_id' => 'board',
 			'info' => 'board_info',
 			'loaded' => 'boards',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -96,28 +99,28 @@ class Board implements \ArrayAccess
 	 *
 	 * Info about individual members allowed to moderate this board.
 	 */
-	public array $moderators = array();
+	public array $moderators = [];
 
 	/**
 	 * @var array
 	 *
 	 * Info about member groups allowed to moderate this board.
 	 */
-	public array $moderator_groups = array();
+	public array $moderator_groups = [];
 
 	/**
 	 * @var array
 	 *
 	 * Info about member groups allowed to access this board.
 	 */
-	public array $member_groups = array();
+	public array $member_groups = [];
 
 	/**
 	 * @var array
 	 *
 	 * Info about member groups forbidden from accessing this board.
 	 */
-	public array $deny_groups = array();
+	public array $deny_groups = [];
 
 	/**
 	 * @var int
@@ -160,7 +163,7 @@ class Board implements \ArrayAccess
 	 *
 	 * All of this board's ancestor boards.
 	 */
-	public array $parent_boards = array();
+	public array $parent_boards = [];
 
 	/**
 	 * @var int
@@ -195,7 +198,7 @@ class Board implements \ArrayAccess
 	 *
 	 * Boards that are children of this board.
 	 */
-	public array $children = array();
+	public array $children = [];
 
 	/**
 	 * @var int
@@ -272,21 +275,21 @@ class Board implements \ArrayAccess
 	 *
 	 * HTML anchor links for this board's children.
 	 */
-	public array $link_children = array();
+	public array $link_children = [];
 
 	/**
 	 * @var array
 	 *
 	 * HTML anchor links for this board's moderators.
 	 */
-	public array $link_moderators = array();
+	public array $link_moderators = [];
 
 	/**
 	 * @var array
 	 *
 	 * HTML anchor links for this board's moderator groups.
 	 */
-	public array $link_moderator_groups = array();
+	public array $link_moderator_groups = [];
 
 	/**
 	 * @var int
@@ -308,7 +311,7 @@ class Board implements \ArrayAccess
 	 *
 	 * Info about the latest post in this board.
 	 */
-	public array $last_post = array();
+	public array $last_post = [];
 
 	/**
 	 * @var bool
@@ -351,7 +354,7 @@ class Board implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -365,7 +368,7 @@ class Board implements \ArrayAccess
 	 * means any groups that have the manage_boards permission that aren't
 	 * in the board's list of allowed groups.
 	 */
-	protected array $overridden_access_groups = array();
+	protected array $overridden_access_groups = [];
 
 	/**
 	 * @var array
@@ -375,14 +378,14 @@ class Board implements \ArrayAccess
 	 * groups that have the manage_boards permission that are in the board's
 	 * list of denied groups.
 	 */
-	protected array $overridden_deny_groups = array();
+	protected array $overridden_deny_groups = [];
 
 	/**
 	 * @var array
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_board' => 'id',
 		'board_name' => 'name',
 		'board_description' => 'description',
@@ -408,7 +411,7 @@ class Board implements \ArrayAccess
 
 		// Initial exclamation mark means inverse of the property.
 		'is_read' => '!new',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -419,9 +422,9 @@ class Board implements \ArrayAccess
 	 *
 	 * Properties that should be cached in different situations.
 	 */
-	protected static array $cache_props = array(
+	protected static array $cache_props = [
 		// When caching Board::$info
-		'info' => array(
+		'info' => [
 			'id',
 			'cat',
 			'name',
@@ -447,15 +450,15 @@ class Board implements \ArrayAccess
 			'count_posts',
 			'cur_topic_approved',
 			'cur_topic_starter',
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Holds parsed versions of board descriptions.
 	 */
-	protected static array $parsed_descriptions = array();
+	protected static array $parsed_descriptions = [];
 
 	/****************
 	 * Public methods
@@ -469,39 +472,35 @@ class Board implements \ArrayAccess
 	 */
 	public function __set(string $prop, $value): void
 	{
-		if (in_array($this->prop_aliases[$prop] ?? $prop, array('member_groups', 'deny_groups')))
-		{
-			if (!is_array($value))
+		if (in_array($this->prop_aliases[$prop] ?? $prop, ['member_groups', 'deny_groups'])) {
+			if (!is_array($value)) {
 				$value = explode(',', $value);
+			}
 
 			$value = array_map('intval', array_filter($value, 'strlen'));
 
 			// Special handling for access for board manager groups.
-			if (!empty(Config::$modSettings['board_manager_groups']) && in_array($this->prop_aliases[$prop] ?? $prop, array('member_groups', 'deny_groups')) && is_array($value))
-			{
+			if (!empty(Config::$modSettings['board_manager_groups']) && in_array($this->prop_aliases[$prop] ?? $prop, ['member_groups', 'deny_groups']) && is_array($value)) {
 				$board_manager_groups = array_map('intval', array_filter(explode(',', Config::$modSettings['board_manager_groups']), 'strlen'));
 
-				if (($this->prop_aliases[$prop] ?? $prop) === 'deny_groups')
-				{
+				if (($this->prop_aliases[$prop] ?? $prop) === 'deny_groups') {
 					$this->overridden_deny_groups = array_intersect($board_manager_groups, $value);
 					$value = array_diff($value, $board_manager_groups);
-				}
-				else
-				{
+				} else {
 					$this->overridden_access_groups = array_diff($board_manager_groups, $value);
 					$value = array_merge($board_manager_groups, $value);
 				}
 			}
 
-			$value = array_unique(array_diff($value, array(1)));
+			$value = array_unique(array_diff($value, [1]));
 
 			sort($value);
 		}
 
 		// Special handling for the category.
-		if (($this->prop_aliases[$prop] ?? null) === 'cat[id]')
-		{
+		if (($this->prop_aliases[$prop] ?? null) === 'cat[id]') {
 			$this->cat = Category::init($value);
+
 			return;
 		}
 
@@ -513,21 +512,20 @@ public function __set(string $prop, $value): void
 	 *
 	 * @param array $boardOptions An array of options related to the board.
 	 */
-	public function save(array $boardOptions = array()): void
+	public function save(array $boardOptions = []): void
 	{
 		User::$me->isAllowedTo('manage_boards');
 
 		// Undo any overrides of the group access values.
-		$access_groups = array_unique(array_diff($this->member_groups, $this->overridden_access_groups, array(1)));
-		$deny_groups = array_unique(array_diff(array_merge($this->deny_groups, $this->overridden_deny_groups), array(1)));
+		$access_groups = array_unique(array_diff($this->member_groups, $this->overridden_access_groups, [1]));
+		$deny_groups = array_unique(array_diff(array_merge($this->deny_groups, $this->overridden_deny_groups), [1]));
 
 		sort($access_groups);
 		sort($deny_groups);
 
 		// Saving a new board.
-		if (empty($this->id))
-		{
-			$columns = array(
+		if (empty($this->id)) {
+			$columns = [
 				'id_cat' => 'int',
 				'child_level' => 'int',
 				'id_parent' => 'int',
@@ -547,9 +545,9 @@ public function save(array $boardOptions = array()): void
 				'unapproved_topics' => 'int',
 				'redirect' => 'string-255',
 				'deny_member_groups' => 'string-255',
-			);
+			];
 
-			$params = array(
+			$params = [
 				$this->cat['id'],
 				$this->child_level,
 				$this->parent,
@@ -569,22 +567,22 @@ public function save(array $boardOptions = array()): void
 				$this->unapproved_topics,
 				$this->redirect,
 				implode(',', $deny_groups),
-			);
+			];
 
-			$this->id = Db::$db->insert('',
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}boards',
 				$columns,
 				$params,
-				array('id_board'),
-				1
+				['id_board'],
+				1,
 			);
 
 			self::$loaded[$this->id] = $this;
 		}
 		// Updating an existing board.
-		else
-		{
-			$set = array(
+		else {
+			$set = [
 				'id_cat = {int:id_cat}',
 				'child_level = {int:child_level}',
 				'id_parent = {int:id_parent}',
@@ -604,9 +602,9 @@ public function save(array $boardOptions = array()): void
 				'unapproved_topics = {int:unapproved_topics}',
 				'redirect = {string:redirect}',
 				'deny_member_groups = {string:deny_groups}',
-			);
+			];
 
-			$params = array(
+			$params = [
 				'id' => $this->id,
 				'id_cat' => $this->cat['id'],
 				'child_level' => $this->child_level,
@@ -627,90 +625,97 @@ public function save(array $boardOptions = array()): void
 				'unapproved_topics' => $this->unapproved_topics,
 				'redirect' => $this->redirect,
 				'deny_groups' => implode(',', $deny_groups),
-			);
+			];
 
 			// Do any hooks want to add or adjust anything?
-			IntegrationHook::call('integrate_modify_board', array($this->id, $boardOptions, &$set, &$params));
+			IntegrationHook::call('integrate_modify_board', [$this->id, $boardOptions, &$set, &$params]);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET ' . (implode(', ', $set)) . '
 				WHERE id_board = {int:id}',
-				$params
+				$params,
 			);
 		}
 
 		// Before we add new access_groups or deny_groups, remove all of the old entries.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}board_permissions_view
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}board_permissions_view
 			WHERE id_board = {int:this_board}',
-			array(
+			[
 				'this_board' => $this->id,
-			)
+			],
 		);
 
-		$inserts = array();
+		$inserts = [];
 
-		foreach ($access_groups as $id_group)
-			$inserts[] = array($id_group, $this->id, 0);
+		foreach ($access_groups as $id_group) {
+			$inserts[] = [$id_group, $this->id, 0];
+		}
 
-		foreach ($deny_groups as $id_group)
-			$inserts[] = array($id_group, $this->id, 1);
+		foreach ($deny_groups as $id_group) {
+			$inserts[] = [$id_group, $this->id, 1];
+		}
 
-		if ($inserts != array())
-		{
-			Db::$db->insert('insert',
+		if ($inserts != []) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}board_permissions_view',
-				array('id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'),
+				['id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'],
 				$inserts,
-				array('id_group', 'id_board', 'deny')
+				['id_group', 'id_board', 'deny'],
 			);
 		}
 
 		// Reset current moderators for this board - if there are any!
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}moderators
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}moderators
 			WHERE id_board = {int:this_board}',
-			array(
+			[
 				'this_board' => $this->id,
-			)
+			],
 		);
 
-		if (!empty($this->moderators))
-		{
-			Db::$db->insert('insert',
+		if (!empty($this->moderators)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}moderators',
-				array('id_board' => 'int', 'id_member' => 'int'),
-				array_map(fn($mod) => array($this->id, $mod['id']), $this->moderators),
-				array('id_board', 'id_member')
+				['id_board' => 'int', 'id_member' => 'int'],
+				array_map(fn ($mod) => [$this->id, $mod['id']], $this->moderators),
+				['id_board', 'id_member'],
 			);
 		}
 
 		// Reset current moderator groups for this board - if there are any!
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}moderator_groups
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}moderator_groups
 			WHERE id_board = {int:this_board}',
-			array(
+			[
 				'this_board' => $this->id,
-			)
+			],
 		);
 
-		if (!empty($this->moderator_groups))
-		{
-			Db::$db->insert('insert',
+		if (!empty($this->moderator_groups)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}moderator_groups',
-				array('id_board' => 'int', 'id_group' => 'int'),
-				array_map(fn($mod) => array($this->id, $mod['id']), $this->moderator_groups),
-				array('id_board', 'id_group')
+				['id_board' => 'int', 'id_group' => 'int'],
+				array_map(fn ($mod) => [$this->id, $mod['id']], $this->moderator_groups),
+				['id_board', 'id_group'],
 			);
 		}
 
 		// If we were moving boards, ensure that the order is correct.
-		if (isset($boardOptions['move_to']))
+		if (isset($boardOptions['move_to'])) {
 			self::reorder();
+		}
 
 		// The caches might now be wrong.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 		CacheApi::clean('data');
 	}
 
@@ -736,24 +741,20 @@ public function move(
 		?int $target_category = null,
 		?int $target_board = null,
 		bool $first_child = false,
-		bool $save = true
-	): array
-	{
+		bool $save = true,
+	): array {
 		// Do we have what we need?
-		switch ($move_to)
-		{
+		switch ($move_to) {
 			case 'top':
 			case 'bottom':
-				if (!isset($target_category))
-				{
+				if (!isset($target_category)) {
 					Lang::load('Errors');
 					trigger_error(sprintf(Lang::$txt['modify_board_incorrect_move_to'], $move_to), E_USER_ERROR);
 				}
 				break;
 
 			default:
-				if (!isset($target_board))
-				{
+				if (!isset($target_board)) {
 					Lang::load('Errors');
 					trigger_error(sprintf(Lang::$txt['modify_board_incorrect_move_to'], $move_to), E_USER_ERROR);
 				}
@@ -761,17 +762,15 @@ public function move(
 		}
 
 		// IDs of all boards that were affected by this move.
-		$affected_boards = array($this->id);
+		$affected_boards = [$this->id];
 
 		// Ensure everything is loaded.
-		if ((isset($target_category) && !isset(Category::$loaded[$target_category])) || (isset($target_board) && !isset(self::$loaded[$target_board])))
-		{
+		if ((isset($target_category) && !isset(Category::$loaded[$target_category])) || (isset($target_board) && !isset(self::$loaded[$target_board]))) {
 			Category::getTree();
 		}
 
 		// Where are we moving this board to?
-		switch ($move_to)
-		{
+		switch ($move_to) {
 			case 'top':
 				$id_cat = $target_category;
 				$child_level = 0;
@@ -785,8 +784,9 @@ public function move(
 				$id_parent = 0;
 				$after = 0;
 
-				foreach (Category::$loaded[$id_cat]->children as $id_board => $dummy)
+				foreach (Category::$loaded[$id_cat]->children as $id_board => $dummy) {
 					$after = max($after, self::$loaded[$id_board]->order);
+				}
 
 				break;
 
@@ -796,22 +796,19 @@ public function move(
 				$id_parent = $target_board;
 
 				// People can be creative, in many ways...
-				if (self::isChildOf($id_parent, $this->id))
-				{
+				if (self::isChildOf($id_parent, $this->id)) {
 					ErrorHandler::fatalLang('mboards_parent_own_child_error', false);
-				}
-				elseif ($id_parent == $this->id)
-				{
+				} elseif ($id_parent == $this->id) {
 					ErrorHandler::fatalLang('mboards_board_own_child_error', false);
 				}
 
 				$after = self::$loaded[$target_board]->order;
 
 				// Check if there are already children and (if so) get the max board order.
-				if (!empty(self::$loaded[$id_parent]->children) && empty($first_child))
-				{
-					foreach (self::$loaded[$id_parent]->children as $childBoard_id => $dummy)
+				if (!empty(self::$loaded[$id_parent]->children) && empty($first_child)) {
+					foreach (self::$loaded[$id_parent]->children as $childBoard_id => $dummy) {
 						$after = max($after, self::$loaded[$childBoard_id]->order);
+					}
 				}
 
 				break;
@@ -831,32 +828,30 @@ public function move(
 		}
 
 		// Get a list of children of this board.
-		$child_list = array();
+		$child_list = [];
 		Category::recursiveBoards($child_list, $this);
 
 		// See if there are changes that affect children.
-		foreach ($child_list as $child_id)
-		{
-			if ($child_level != $this->child_level)
-			{
+		foreach ($child_list as $child_id) {
+			if ($child_level != $this->child_level) {
 				self::$loaded[$child_id]->child_level += ($child_level - $this->child_level);
 				$affected_boards[] = $child_id;
 			}
 
-			if ($id_cat != self::$loaded[$child_id]->category)
-			{
+			if ($id_cat != self::$loaded[$child_id]->category) {
 				self::$loaded[$child_id]->category = $id_cat;
 				$affected_boards[] = $child_id;
 			}
 		}
 
-		foreach (self::$loaded as $board)
-		{
-			if ($board->order <= $after)
+		foreach (self::$loaded as $board) {
+			if ($board->order <= $after) {
 				continue;
+			}
 
-			if ($board->id === $this->id)
+			if ($board->id === $this->id) {
 				continue;
+			}
 
 			$board->order += (1 + count($child_list));
 			$affected_boards[] = $board->id;
@@ -869,10 +864,10 @@ public function move(
 		$this->order = $after + 1;
 
 		// Are we saving the changes?
-		if ($save)
-		{
-			foreach ($affected_boards as $board_id)
+		if ($save) {
+			foreach ($affected_boards as $board_id) {
 				self::$loaded[$board_id]->save();
+			}
 		}
 
 		return $affected_boards;
@@ -883,29 +878,28 @@ public function move(
 	 */
 	public function parseDescription(): void
 	{
-		if (empty($this->description))
+		if (empty($this->description)) {
 			return;
+		}
 
 		// Save the unparsed description in case we need it later.
-		if (!isset($this->custom['unparsed_description']))
+		if (!isset($this->custom['unparsed_description'])) {
 			$this->custom['unparsed_description'] = $this->description;
+		}
 
-		if (!empty(CacheApi::$enable))
-		{
-			if (empty(self::$parsed_descriptions))
-				self::$parsed_descriptions = CacheApi::get('parsed_boards_descriptions', 864000) ?? array();
+		if (!empty(CacheApi::$enable)) {
+			if (empty(self::$parsed_descriptions)) {
+				self::$parsed_descriptions = CacheApi::get('parsed_boards_descriptions', 864000) ?? [];
+			}
 
-			if (!isset(self::$parsed_descriptions[$this->id]))
-			{
+			if (!isset(self::$parsed_descriptions[$this->id])) {
 				self::$parsed_descriptions[$this->id] = BBCodeParser::load()->parse($this->description, false, '', Utils::$context['description_allowed_tags']);
 
 				CacheApi::put('parsed_boards_descriptions', self::$parsed_descriptions, 864000);
 			}
 
 			$this->description = self::$parsed_descriptions[$this->id];
-		}
-		else
-		{
+		} else {
 			$this->description = BBCodeParser::load()->parse($this->description, false, '', Utils::$context['description_allowed_tags']);
 		}
 	}
@@ -915,8 +909,9 @@ public function parseDescription(): void
 	 */
 	public function unparseDescription(): void
 	{
-		if (isset($this->custom['unparsed_description']))
+		if (isset($this->custom['unparsed_description'])) {
 			$this->description = $this->custom['unparsed_description'];
+		}
 	}
 
 	/***********************
@@ -932,52 +927,44 @@ public function unparseDescription(): void
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return array Instances of this class for the loaded boards.
 	 */
-	public static function load(array|int $ids = array(), array $query_customizations = array()): array
+	public static function load(array|int $ids = [], array $query_customizations = []): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$ids = array_unique(array_map('intval', (array) $ids));
 
-		if (empty($query_customizations))
-		{
-			if (empty($ids))
-			{
+		if (empty($query_customizations)) {
+			if (empty($ids)) {
 				$loaded[] = self::init();
-			}
-			else
-			{
-				foreach ($ids as $id)
+			} else {
+				foreach ($ids as $id) {
 					$loaded[] = self::init($id);
+				}
 			}
 
 			return $loaded;
 		}
 
-		$selects = $query_customizations['selects'] ?? array('b.*');
-		$joins = $query_customizations['joins'] ?? array();
-		$where = $query_customizations['where'] ?? array();
-		$order = $query_customizations['order'] ?? array();
-		$group = $query_customizations['group'] ?? array();
+		$selects = $query_customizations['selects'] ?? ['b.*'];
+		$joins = $query_customizations['joins'] ?? [];
+		$where = $query_customizations['where'] ?? [];
+		$order = $query_customizations['order'] ?? [];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? 0;
-		$params = $query_customizations['params'] ?? array();
+		$params = $query_customizations['params'] ?? [];
 
-		if ($ids !== array())
-		{
+		if ($ids !== []) {
 			$where[] = 'b.id_board IN ({array_int:ids})';
 			$params['ids'] = $ids;
 		}
 
-		foreach (self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			$row['id_board'] = (int) $row['id_board'];
 
-			if (isset(self::$loaded[$row['id_board']]))
-			{
+			if (isset(self::$loaded[$row['id_board']])) {
 				self::$loaded[$row['id_board']]->set($row);
 				$loaded[] = self::$loaded[$row['id_board']];
-			}
-			else
-			{
+			} else {
 				$loaded[] = self::init($row['id_board'], $row);
 			}
 		}
@@ -1008,18 +995,16 @@ public static function load(array|int $ids = array(), array $query_customization
 	 *    is not null.
 	 * @return object|null An instance of this class, or null on error.
 	 */
-	public static function init(?int $id = null, array $props = array()): object|null
+	public static function init(?int $id = null, array $props = []): ?object
 	{
 		// This should already have been set, but just in case...
-		if (!isset(self::$board_id))
+		if (!isset(self::$board_id)) {
 			self::$board_id = (int) ($_REQUEST['board'] ?? 0);
+		}
 
-		if (!isset(self::$loaded[$id]))
-		{
+		if (!isset(self::$loaded[$id])) {
 			new self($id, $props);
-		}
-		else
-		{
+		} else {
 			self::$loaded[$id]->set($props);
 		}
 
@@ -1036,146 +1021,142 @@ public static function markRead(): void
 
 		User::$me->checkSession('get');
 
-		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'all')
-		{
+		if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'all') {
 			// Find all the boards this user can see.
-			$boards = array();
+			$boards = [];
 
-			$result = Db::$db->query('', '
-				SELECT b.id_board
+			$result = Db::$db->query(
+				'',
+				'SELECT b.id_board
 				FROM {db_prefix}boards AS b
 				WHERE {query_see_board}',
-				array(
-				)
+				[
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$boards[] = $row['id_board'];
 			}
 			Db::$db->free_result($result);
 
-			if (!empty($boards))
+			if (!empty($boards)) {
 				self::markBoardsRead($boards, isset($_REQUEST['unread']));
+			}
 
 			$_SESSION['id_msg_last_visit'] = Config::$modSettings['maxMsgID'];
 
-			if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false)
-			{
+			if (!empty($_SESSION['old_url']) && strpos($_SESSION['old_url'], 'action=unread') !== false) {
 				Utils::redirectexit('action=unread');
 			}
 
-			if (isset($_SESSION['topicseen_cache']))
-				$_SESSION['topicseen_cache'] = array();
+			if (isset($_SESSION['topicseen_cache'])) {
+				$_SESSION['topicseen_cache'] = [];
+			}
 
 			Utils::redirectexit();
-		}
-		elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies')
-		{
+		} elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'unreadreplies') {
 			// Make sure all the topics are integers!
 			$topics = array_map('intval', explode('-', $_REQUEST['topics']));
 
-			$logged_topics = array();
+			$logged_topics = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_topic, unwatched
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, unwatched
 				FROM {db_prefix}log_topics
 				WHERE id_topic IN ({array_int:selected_topics})
 					AND id_member = {int:current_user}',
-				array(
+				[
 					'selected_topics' => $topics,
 					'current_user' => User::$me->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$logged_topics[$row['id_topic']] = $row['unwatched'];
 			}
 			Db::$db->free_result($request);
 
-			$markRead = array();
+			$markRead = [];
 
-			foreach ($topics as $id_topic)
-			{
-				$markRead[] = array(Config::$modSettings['maxMsgID'], User::$me->id, $id_topic, (isset($logged_topics[Topic::$topic_id]) ? $logged_topics[Topic::$topic_id] : 0));
+			foreach ($topics as $id_topic) {
+				$markRead[] = [Config::$modSettings['maxMsgID'], User::$me->id, $id_topic, ($logged_topics[Topic::$topic_id] ?? 0)];
 			}
 
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_topics',
-				array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'),
+				['id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'],
 				$markRead,
-				array('id_member', 'id_topic')
+				['id_member', 'id_topic'],
 			);
 
-			if (isset($_SESSION['topicseen_cache']))
-				$_SESSION['topicseen_cache'] = array();
+			if (isset($_SESSION['topicseen_cache'])) {
+				$_SESSION['topicseen_cache'] = [];
+			}
 
 			Utils::redirectexit('action=unreadreplies');
 		}
 		// Special case: mark a topic unread!
-		elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'topic')
-		{
+		elseif (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'topic') {
 			// First, let's figure out what the latest message is.
-			$result = Db::$db->query('', '
-				SELECT t.id_first_msg, t.id_last_msg, COALESCE(lt.unwatched, 0) as unwatched
+			$result = Db::$db->query(
+				'',
+				'SELECT t.id_first_msg, t.id_last_msg, COALESCE(lt.unwatched, 0) as unwatched
 				FROM {db_prefix}topics as t
 					LEFT JOIN {db_prefix}log_topics as lt ON (lt.id_topic = t.id_topic AND lt.id_member = {int:current_member})
 				WHERE t.id_topic = {int:current_topic}',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 			$topicinfo = Db::$db->fetch_assoc($result);
 			Db::$db->free_result($result);
 
-			if (!empty($_GET['t']))
-			{
+			if (!empty($_GET['t'])) {
 				// If they read the whole topic, go back to the beginning.
-				if ($_GET['t'] >= $topicinfo['id_last_msg'])
-				{
+				if ($_GET['t'] >= $topicinfo['id_last_msg']) {
 					$earlyMsg = 0;
 				}
 				// If they want to mark the whole thing read, same.
-				elseif ($_GET['t'] <= $topicinfo['id_first_msg'])
-				{
+				elseif ($_GET['t'] <= $topicinfo['id_first_msg']) {
 					$earlyMsg = 0;
 				}
 				// Otherwise, get the latest message before the named one.
-				else
-				{
-					$result = Db::$db->query('', '
-						SELECT MAX(id_msg)
+				else {
+					$result = Db::$db->query(
+						'',
+						'SELECT MAX(id_msg)
 						FROM {db_prefix}messages
 						WHERE id_topic = {int:current_topic}
 							AND id_msg >= {int:id_first_msg}
 							AND id_msg < {int:topic_msg_id}',
-						array(
+						[
 							'current_topic' => Topic::$topic_id,
 							'topic_msg_id' => (int) $_GET['t'],
 							'id_first_msg' => $topicinfo['id_first_msg'],
-						)
+						],
 					);
 					list($earlyMsg) = Db::$db->fetch_row($result);
 					Db::$db->free_result($result);
 				}
 			}
 			// Marking read from first page?  That's the whole topic.
-			elseif ($_REQUEST['start'] == 0)
-			{
+			elseif ($_REQUEST['start'] == 0) {
 				$earlyMsg = 0;
-			}
-			else
-			{
-				$result = Db::$db->query('', '
-					SELECT id_msg
+			} else {
+				$result = Db::$db->query(
+					'',
+					'SELECT id_msg
 					FROM {db_prefix}messages
 					WHERE id_topic = {int:current_topic}
 					ORDER BY id_msg
 					LIMIT {int:start}, 1',
-					array(
+					[
 						'current_topic' => Topic::$topic_id,
 						'start' => (int) $_REQUEST['start'],
-					)
+					],
 				);
 				list($earlyMsg) = Db::$db->fetch_row($result);
 				Db::$db->free_result($result);
@@ -1184,155 +1165,149 @@ public static function markRead(): void
 			}
 
 			// Blam, unread!
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_topics',
-				array('id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'),
-				array($earlyMsg, User::$me->id, Topic::$topic_id, $topicinfo['unwatched']),
-				array('id_member', 'id_topic')
+				['id_msg' => 'int', 'id_member' => 'int', 'id_topic' => 'int', 'unwatched' => 'int'],
+				[$earlyMsg, User::$me->id, Topic::$topic_id, $topicinfo['unwatched']],
+				['id_member', 'id_topic'],
 			);
 
 			Utils::redirectexit('board=' . self::$info->id . '.0');
-		}
-		else
-		{
-			$categories = array();
-			$boards = array();
+		} else {
+			$categories = [];
+			$boards = [];
 
-			if (isset($_REQUEST['c']))
-			{
+			if (isset($_REQUEST['c'])) {
 				$_REQUEST['c'] = explode(',', $_REQUEST['c']);
 
-				foreach ($_REQUEST['c'] as $c)
+				foreach ($_REQUEST['c'] as $c) {
 					$categories[] = (int) $c;
+				}
 			}
 
-			if (isset($_REQUEST['boards']))
-			{
+			if (isset($_REQUEST['boards'])) {
 				$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
 
-				foreach ($_REQUEST['boards'] as $b)
+				foreach ($_REQUEST['boards'] as $b) {
 					$boards[] = (int) $b;
+				}
 			}
 
-			if (!empty(self::$info->id))
+			if (!empty(self::$info->id)) {
 				$boards[] = (int) self::$info->id;
+			}
 
-			if (isset($_REQUEST['children']) && !empty($boards))
-			{
+			if (isset($_REQUEST['children']) && !empty($boards)) {
 				// They want to mark the entire tree starting with the boards specified
 				// The easiest thing is to just get all the boards they can see, but since we've specified the top of tree we ignore some of them
-				$request = Db::$db->query('', '
-					SELECT b.id_board, b.id_parent
+				$request = Db::$db->query(
+					'',
+					'SELECT b.id_board, b.id_parent
 					FROM {db_prefix}boards AS b
 					WHERE {query_see_board}
 						AND b.child_level > {int:no_parents}
 						AND b.id_board NOT IN ({array_int:board_list})
 					ORDER BY child_level ASC',
-					array(
+					[
 						'no_parents' => 0,
 						'board_list' => $boards,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if (in_array($row['id_parent'], $boards))
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if (in_array($row['id_parent'], $boards)) {
 						$boards[] = $row['id_board'];
+					}
 				}
 				Db::$db->free_result($request);
 			}
 
-			$clauses = array();
-			$clauseParameters = array();
+			$clauses = [];
+			$clauseParameters = [];
 
-			if (!empty($categories))
-			{
+			if (!empty($categories)) {
 				$clauses[] = 'id_cat IN ({array_int:category_list})';
 				$clauseParameters['category_list'] = $categories;
 			}
 
-			if (!empty($boards))
-			{
+			if (!empty($boards)) {
 				$clauses[] = 'id_board IN ({array_int:board_list})';
 				$clauseParameters['board_list'] = $boards;
 			}
 
-			if (empty($clauses))
+			if (empty($clauses)) {
 				Utils::redirectexit();
+			}
 
-			$boards = array();
+			$boards = [];
 
-			$request = Db::$db->query('', '
-				SELECT b.id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board
 				FROM {db_prefix}boards AS b
 				WHERE {query_see_board}
 					AND b.' . implode(' OR b.', $clauses),
-				array_merge($clauseParameters, array(
-				))
+				array_merge($clauseParameters, [
+				]),
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($boards))
+			if (empty($boards)) {
 				Utils::redirectexit();
+			}
 
 			self::markBoardsRead($boards, isset($_REQUEST['unread']));
 
-			foreach ($boards as $b)
-			{
-				if (isset($_SESSION['topicseen_cache'][$b]))
-					$_SESSION['topicseen_cache'][$b] = array();
+			foreach ($boards as $b) {
+				if (isset($_SESSION['topicseen_cache'][$b])) {
+					$_SESSION['topicseen_cache'][$b] = [];
+				}
 			}
 
-			if (!isset($_REQUEST['unread']))
-			{
+			if (!isset($_REQUEST['unread'])) {
 				// Find all the boards this user can see.
-				$result = Db::$db->query('', '
-					SELECT b.id_board
+				$result = Db::$db->query(
+					'',
+					'SELECT b.id_board
 					FROM {db_prefix}boards AS b
 					WHERE b.id_parent IN ({array_int:parent_list})
 						AND {query_see_board}',
-					array(
+					[
 						'parent_list' => $boards,
-					)
+					],
 				);
-				if (Db::$db->num_rows($result) > 0)
-				{
-					$logBoardInserts = array();
 
-					while ($row = Db::$db->fetch_assoc($result))
-					{
-						$logBoardInserts[] = array(Config::$modSettings['maxMsgID'], User::$me->id, $row['id_board']);
+				if (Db::$db->num_rows($result) > 0) {
+					$logBoardInserts = [];
+
+					while ($row = Db::$db->fetch_assoc($result)) {
+						$logBoardInserts[] = [Config::$modSettings['maxMsgID'], User::$me->id, $row['id_board']];
 					}
 
-					Db::$db->insert('replace',
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}log_boards',
-						array('id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'),
+						['id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'],
 						$logBoardInserts,
-						array('id_member', 'id_board')
+						['id_member', 'id_board'],
 					);
 				}
 				Db::$db->free_result($result);
 
-				if (empty(self::$info->id))
-				{
+				if (empty(self::$info->id)) {
 					Utils::redirectexit();
-				}
-				else
-				{
+				} else {
 					Utils::redirectexit('board=' . self::$info->id . '.0');
 				}
-			}
-			else
-			{
-				if (empty(self::$info->parent))
-				{
+			} else {
+				if (empty(self::$info->parent)) {
 					Utils::redirectexit();
-				}
-				else
-				{
+				} else {
 					Utils::redirectexit('board=' . self::$info->parent . '.0');
 				}
 			}
@@ -1348,67 +1323,66 @@ public static function markRead(): void
 	public static function markBoardsRead(int|array $boards, bool $unread = false): void
 	{
 		// Force $boards to be an array.
-		if (!is_array($boards))
-		{
-			$boards = array($boards);
-		}
-		else
-		{
+		if (!is_array($boards)) {
+			$boards = [$boards];
+		} else {
 			$boards = array_unique($boards);
 		}
 
 		// No boards, nothing to mark as read.
-		if (empty($boards))
+		if (empty($boards)) {
 			return;
+		}
 
 		// Allow the user to mark a board as unread.
-		if ($unread)
-		{
+		if ($unread) {
 			// Clear out all the places where this lovely info is stored.
 			// @todo Maybe not log_mark_read?
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_mark_read
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_mark_read
 				WHERE id_board IN ({array_int:board_list})
 					AND id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'board_list' => $boards,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_boards
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_boards
 				WHERE id_board IN ({array_int:board_list})
 					AND id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'board_list' => $boards,
-				)
+				],
 			);
 		}
 		// Otherwise mark the board as read.
-		else
-		{
-			$markRead = array();
+		else {
+			$markRead = [];
 
-			foreach ($boards as $board)
-			{
-				$markRead[] = array(Config::$modSettings['maxMsgID'], User::$me->id, $board);
+			foreach ($boards as $board) {
+				$markRead[] = [Config::$modSettings['maxMsgID'], User::$me->id, $board];
 			}
 
 			// Update log_mark_read and log_boards.
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_mark_read',
-				array('id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'),
+				['id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'],
 				$markRead,
-				array('id_board', 'id_member')
+				['id_board', 'id_member'],
 			);
 
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_boards',
-				array('id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'),
+				['id_msg' => 'int', 'id_member' => 'int', 'id_board' => 'int'],
 				$markRead,
-				array('id_board', 'id_member')
+				['id_board', 'id_member'],
 			);
 		}
 
@@ -1416,52 +1390,55 @@ public static function markBoardsRead(int|array $boards, bool $unread = false):
 		// @todo look at this...
 		// The call to markBoardsRead() in Display() used to be simply
 		// marking log_boards (the previous query only)
-		$result = Db::$db->query('', '
-			SELECT MIN(id_topic)
+		$result = Db::$db->query(
+			'',
+			'SELECT MIN(id_topic)
 			FROM {db_prefix}log_topics
 			WHERE id_member = {int:current_member}',
-			array(
+			[
 				'current_member' => User::$me->id,
-			)
+			],
 		);
 		list($lowest_topic) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
-		if (empty($lowest_topic))
+		if (empty($lowest_topic)) {
 			return;
+		}
 
 		// @todo SLOW This query seems to eat it sometimes.
-		$topics = array();
-		$result = Db::$db->query('', '
-			SELECT lt.id_topic
+		$topics = [];
+		$result = Db::$db->query(
+			'',
+			'SELECT lt.id_topic
 			FROM {db_prefix}log_topics AS lt
 				INNER JOIN {db_prefix}topics AS t /*!40000 USE INDEX (PRIMARY) */ ON (t.id_topic = lt.id_topic
 					AND t.id_board IN ({array_int:board_list}))
 			WHERE lt.id_member = {int:current_member}
 				AND lt.id_topic >= {int:lowest_topic}
 				AND lt.unwatched != 1',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'board_list' => $boards,
 				'lowest_topic' => $lowest_topic,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			$topics[] = $row['id_topic'];
 		}
 		Db::$db->free_result($result);
 
-		if (!empty($topics))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_topics
+		if (!empty($topics)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_topics
 				WHERE id_member = {int:current_member}
 					AND id_topic IN ({array_int:topic_list})',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'topic_list' => $topics,
-				)
+				],
 			);
 		}
 	}
@@ -1477,23 +1454,23 @@ public static function markBoardsRead(int|array $boards, bool $unread = false):
 	public static function getMsgMemberID(int $messageID): int
 	{
 		// Find the topic and make sure the member still exists.
-		$result = Db::$db->query('', '
-			SELECT COALESCE(mem.id_member, 0)
+		$result = Db::$db->query(
+			'',
+			'SELECT COALESCE(mem.id_member, 0)
 			FROM {db_prefix}messages AS m
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 			WHERE m.id_msg = {int:selected_message}
 			LIMIT 1',
-			array(
+			[
 				'selected_message' => (int) $messageID,
-			)
+			],
 		);
-		if (Db::$db->num_rows($result) > 0)
-		{
+
+		if (Db::$db->num_rows($result) > 0) {
 			list($memberID) = Db::$db->fetch_row($result);
 		}
 		// The message doesn't even exist.
-		else
-		{
+		else {
 			$memberID = 0;
 		}
 		Db::$db->free_result($result);
@@ -1522,98 +1499,96 @@ public static function modify(int $board_id, array &$boardOptions): void
 			)
 			|| (
 				isset($boardOptions['target_category'])
-				&& !isset(Category::$loaded[$boardOptions['target_category']]))
-		)
-		{
+				&& !isset(Category::$loaded[$boardOptions['target_category']])
+			)
+		) {
 			ErrorHandler::fatalLang('no_board');
 		}
 
-		IntegrationHook::call('integrate_pre_modify_board', array($board_id, &$boardOptions));
+		IntegrationHook::call('integrate_pre_modify_board', [$board_id, &$boardOptions]);
 
 		$board = self::$loaded[$board_id];
 
 		// In case the board has to be moved.
-		if (isset($boardOptions['move_to']))
-		{
+		if (isset($boardOptions['move_to'])) {
 			$moved_boards = $board->move($boardOptions['move_to'], $boardOptions['target_category'] ?? null, $boardOptions['target_board'] ?? null, !empty($boardOptions['move_first_child']), false);
 		}
 
 		// Set moderators of this board.
-		if (isset($boardOptions['moderators']) || isset($boardOptions['moderator_string']) || isset($boardOptions['moderator_groups']) || isset($boardOptions['moderator_group_string']))
-		{
+		if (isset($boardOptions['moderators']) || isset($boardOptions['moderator_string']) || isset($boardOptions['moderator_groups']) || isset($boardOptions['moderator_group_string'])) {
 			// Validate and get the IDs of the new moderators.
 			// $boardOptions['moderator_string'] is only set if the admin has JavaScript disabled.
-			if (isset($boardOptions['moderator_string']) && trim($boardOptions['moderator_string']) != '')
-			{
-				if (empty($boardOptions['moderators']))
-					$boardOptions['moderators'] = array();
+			if (isset($boardOptions['moderator_string']) && trim($boardOptions['moderator_string']) != '') {
+				if (empty($boardOptions['moderators'])) {
+					$boardOptions['moderators'] = [];
+				}
 
 				// Divvy out the usernames, remove extra space.
-				$moderator_string = strtr(Utils::htmlspecialchars($boardOptions['moderator_string'], ENT_QUOTES), array('&quot;' => '"'));
+				$moderator_string = strtr(Utils::htmlspecialchars($boardOptions['moderator_string'], ENT_QUOTES), ['&quot;' => '"']);
 
 				preg_match_all('~"([^"]+)"~', $moderator_string, $matches);
 
 				$moderators = array_filter(array_map('trim', array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $moderator_string)))), 'strlen');
 
 				// Find all the id_member's for the member_name's in the list.
-				if (!empty($moderators))
-				{
-					foreach (User::load($moderators, User::LOAD_BY_NAME, 'minimal') as $moderator)
+				if (!empty($moderators)) {
+					foreach (User::load($moderators, User::LOAD_BY_NAME, 'minimal') as $moderator) {
 						$boardOptions['moderators'][] = $moderator->id;
+					}
 				}
 			}
 
 			// Validate and get the IDs of the new moderator groups.
 			// $boardOptions['moderator_group_string'] is only set if the admin has JavaScript disabled.
-			if (isset($boardOptions['moderator_group_string']) && trim($boardOptions['moderator_group_string']) != '')
-			{
-				if (empty($boardOptions['moderator_groups']))
-					$boardOptions['moderator_groups'] = array();
+			if (isset($boardOptions['moderator_group_string']) && trim($boardOptions['moderator_group_string']) != '') {
+				if (empty($boardOptions['moderator_groups'])) {
+					$boardOptions['moderator_groups'] = [];
+				}
 
 				// Divvy out the group names, remove extra space.
-				$moderator_group_string = strtr(Utils::htmlspecialchars($boardOptions['moderator_group_string'], ENT_QUOTES), array('&quot;' => '"'));
+				$moderator_group_string = strtr(Utils::htmlspecialchars($boardOptions['moderator_group_string'], ENT_QUOTES), ['&quot;' => '"']);
 
 				preg_match_all('~"([^"]+)"~', $moderator_group_string, $matches);
 
 				$moderator_groups = array_filter(array_map('trim', array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $moderator_group_string)))), 'strlen');
 
-			 	// Find all the id_group's for all the group names in the list
+				// Find all the id_group's for all the group names in the list
 				// But skip any invalid ones (invisible/post groups/Administrator/Moderator)
-				if (!empty($moderator_groups))
-				{
-					$query_customizations = array(
-						'where' => array(
+				if (!empty($moderator_groups)) {
+					$query_customizations = [
+						'where' => [
 							'group_name IN ({array_string:moderator_group_list})',
 							'hidden = {int:visible}',
 							'min_posts = {int:negative_one}',
 							'id_group NOT IN ({array_int:invalid_groups})',
-						),
-						'params' => array(
+						],
+						'params' => [
 							'visible' => Group::VISIBLE,
 							'negative_one' => -1,
-							'invalid_groups' => array(Group::ADMIN, Group::MOD),
+							'invalid_groups' => [Group::ADMIN, Group::MOD],
 							'moderator_group_list' => $moderator_groups,
-						),
+						],
 						'limit' => count($moderator_groups),
-					);
+					];
 
-					foreach (Group::load(array(), $query_customizations) as $group)
+					foreach (Group::load([], $query_customizations) as $group) {
 						$boardOptions['moderator_groups'][] = $group->id;
+					}
 				}
 			}
 
-			if (isset($boardOptions['moderators']))
-			{
-				if (!is_array($boardOptions['moderators']))
+			if (isset($boardOptions['moderators'])) {
+				if (!is_array($boardOptions['moderators'])) {
 					$boardOptions['moderators'] = array_filter(explode(',', $boardOptions['moderators']), 'strlen');
+				}
 
 				$boardOptions['moderators'] = array_unique(array_map('intval', $boardOptions['moderators']));
 			}
 
-			if (isset($boardOptions['moderator_groups']))
-			{
-				if (!is_array($boardOptions['moderator_groups']))
+			if (isset($boardOptions['moderator_groups'])) {
+				if (!is_array($boardOptions['moderator_groups'])) {
 					$boardOptions['moderator_groups'] = array_filter(explode(',', $boardOptions['moderator_groups']), 'strlen');
+				}
 
 				$boardOptions['moderator_groups'] = array_unique(array_map('intval', $boardOptions['moderator_groups']));
 			}
@@ -1643,15 +1618,16 @@ public static function modify(int $board_id, array &$boardOptions): void
 		$board->save($boardOptions);
 
 		// If we moved any boards, save their changes too.
-		if (!empty($moved_boards))
-		{
-			foreach (array_diff($moved_boards, array($board->id)) as $moved)
+		if (!empty($moved_boards)) {
+			foreach (array_diff($moved_boards, [$board->id]) as $moved) {
 				self::$loaded[$moved]->save();
+			}
 		}
 
 		// Log the changes unless told otherwise.
-		if (empty($boardOptions['dont_log']))
-			Logging::logAction('edit_board', array('board' => $this->id), 'admin');
+		if (empty($boardOptions['dont_log'])) {
+			Logging::logAction('edit_board', ['board' => $board->id], 'admin');
+		}
 	}
 
 	/**
@@ -1667,65 +1643,63 @@ public static function modify(int $board_id, array &$boardOptions): void
 	public static function create(array $boardOptions): int
 	{
 		// Trigger an error if one of the required values is not set.
-		if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category']))
-		{
+		if (!isset($boardOptions['board_name']) || trim($boardOptions['board_name']) == '' || !isset($boardOptions['move_to']) || !isset($boardOptions['target_category'])) {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['create_board_missing_options'], E_USER_ERROR);
 		}
 
-		if (in_array($boardOptions['move_to'], array('child', 'before', 'after')) && !isset($boardOptions['target_board']))
-		{
+		if (in_array($boardOptions['move_to'], ['child', 'before', 'after']) && !isset($boardOptions['target_board'])) {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['move_board_no_target'], E_USER_ERROR);
 		}
 
 		// Set every optional value to its default value.
-		$boardOptions += array(
+		$boardOptions += [
 			'posts_count' => true,
 			'override_theme' => false,
 			'board_theme' => 0,
-			'access_groups' => array(),
+			'access_groups' => [],
 			'board_description' => '',
 			'profile' => 1,
 			'moderators' => '',
 			'inherit_permissions' => true,
 			'dont_log' => true,
-		);
+		];
 
 		// This used to be done via a direct query, which is why these look like
 		// arrays that would be passed to our database API. We keep them this
 		// way now merely in order to maintain the signature of the hook.
-		$board_columns = array(
+		$board_columns = [
 			'id_cat' => 'int',
 			'name' => 'string-255',
 			'description' => 'string',
 			'board_order' => 'int',
 			'member_groups' => 'string',
 			'redirect' => 'string',
-		);
+		];
 
-		$board_parameters = array(
+		$board_parameters = [
 			$boardOptions['target_category'],
 			$boardOptions['board_name'],
 			'',
 			0,
 			'',
 			'',
-		);
+		];
 
-		IntegrationHook::call('integrate_create_board', array(&$boardOptions, &$board_columns, &$board_parameters));
+		IntegrationHook::call('integrate_create_board', [&$boardOptions, &$board_columns, &$board_parameters]);
 
 		// Make a new instance and save it.
 		$board = new self(0, array_combine(array_keys($board_columns), $board_parameters));
 		$board->save();
 
 		// Uh-oh...
-		if (empty($board->id))
+		if (empty($board->id)) {
 			return 0;
+		}
 
 		// Do we want the parent permissions to be inherited?
-		if ($boardOptions['inherit_permissions'] && !empty($board->parent))
-		{
+		if ($boardOptions['inherit_permissions'] && !empty($board->parent)) {
 			self::load($board->parent);
 			$boardOptions['profile'] = self::$loaded[$board->parent]->profile;
 			unset($boardOptions['inherit_permissions']);
@@ -1735,7 +1709,7 @@ public static function create(array $boardOptions): int
 		self::modify($board->id, $boardOptions);
 
 		// Created it.
-		Logging::logAction('add_board', array('board' => $board->id), 'admin');
+		Logging::logAction('add_board', ['board' => $board->id], 'admin');
 
 		// Here you are, a new board, ready to be spammed.
 		return $board->id;
@@ -1753,63 +1727,57 @@ public static function create(array $boardOptions): int
 	 * @param array $boards_to_remove The boards to remove
 	 * @param int $moveChildrenTo The ID of the board to move the child boards to (null to remove the child boards, 0 to make them a top-level board)
 	 */
-	public static function delete(array $boards_to_remove, int $moveChildrenTo = null): void
+	public static function delete(array $boards_to_remove, ?int $moveChildrenTo = null): void
 	{
 		// No boards to delete? Return!
-		if (empty($boards_to_remove))
+		if (empty($boards_to_remove)) {
 			return;
+		}
 
 		Category::getTree();
 
-		IntegrationHook::call('integrate_delete_board', array($boards_to_remove, &$moveChildrenTo));
+		IntegrationHook::call('integrate_delete_board', [$boards_to_remove, &$moveChildrenTo]);
 
 		// If $moveChildrenTo is set to null, include the children in the removal.
-		if ($moveChildrenTo === null)
-		{
+		if ($moveChildrenTo === null) {
 			// Get a list of the child boards that will also be removed.
-			$child_boards_to_remove = array();
+			$child_boards_to_remove = [];
 
-			foreach ($boards_to_remove as $board_to_remove)
-			{
+			foreach ($boards_to_remove as $board_to_remove) {
 				Category::recursiveBoards($child_boards_to_remove, self::$loaded[$board_to_remove]);
 			}
 
 			// Merge the children with their parents.
-			if (!empty($child_boards_to_remove))
-			{
+			if (!empty($child_boards_to_remove)) {
 				$boards_to_remove = array_unique(array_merge($boards_to_remove, $child_boards_to_remove));
 			}
 		}
 		// Move the children to a safe home.
-		else
-		{
-			foreach ($boards_to_remove as $id_board)
-			{
+		else {
+			foreach ($boards_to_remove as $id_board) {
 				// @todo Separate category?
-				if ($moveChildrenTo === 0)
-				{
+				if ($moveChildrenTo === 0) {
 					self::fixChildren($id_board, 0, 0);
-				}
-				else
-				{
+				} else {
 					self::fixChildren($id_board, self::$loaded[$moveChildrenTo]->child_level + 1, $moveChildrenTo);
 				}
 			}
 		}
 
 		// Delete ALL topics in the selected boards (done first so topics can't be marooned.)
-		$topics = array();
+		$topics = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT id_topic
 			FROM {db_prefix}topics
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$topics[] = $row['id_topic'];
 		}
 		Db::$db->free_result($request);
@@ -1817,101 +1785,109 @@ public static function delete(array $boards_to_remove, int $moveChildrenTo = nul
 		Topic::remove($topics, false);
 
 		// Delete the board's logs.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_mark_read
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_mark_read
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_boards
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_boards
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_notify
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_notify
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Delete this board's moderators.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}moderators
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}moderators
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Delete this board's moderator groups.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}moderator_groups
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}moderator_groups
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Delete any extra events in the calendar.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}calendar
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}calendar
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Delete any message icons that only appear on these boards.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}message_icons
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}message_icons
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Delete the boards.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}boards
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}boards
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Delete permissions
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}board_permissions_view
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}board_permissions_view
 			WHERE id_board IN ({array_int:boards_to_remove})',
-			array(
+			[
 				'boards_to_remove' => $boards_to_remove,
-			)
+			],
 		);
 
 		// Latest message/topic might not be there anymore.
 		Logging::updateStats('message');
 		Logging::updateStats('topic');
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 
 		// Plus reset the cache to stop people getting odd results.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
 		// Clean the cache as well.
 		CacheApi::clean('data');
 
 		// Let's do some serious logging.
-		foreach ($boards_to_remove as $id_board)
-		{
-			Logging::logAction('delete_board', array('boardname' => self::$loaded[$id_board]->name), 'admin');
+		foreach ($boards_to_remove as $id_board) {
+			Logging::logAction('delete_board', ['boardname' => self::$loaded[$id_board]->name], 'admin');
 		}
 
 		self::reorder();
@@ -1928,20 +1904,18 @@ public static function reorder(): void
 		// Set the board order for each category.
 		$board_order = 0;
 
-		foreach (Category::$loaded as $cat_id => $dummy)
-		{
-			foreach (Category::$boardList[$cat_id] as $board_id)
-			{
-				if (self::$loaded[$board_id]->order != ++$board_order)
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}boards
+		foreach (Category::$loaded as $cat_id => $dummy) {
+			foreach (Category::$boardList[$cat_id] as $board_id) {
+				if (self::$loaded[$board_id]->order != ++$board_order) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}boards
 						SET board_order = {int:new_order}
 						WHERE id_board = {int:selected_board}',
-						array(
+						[
 							'new_order' => $board_order,
 							'selected_board' => $board_id,
-						)
+						],
 					);
 				}
 			}
@@ -1962,37 +1936,40 @@ public static function reorder(): void
 	public static function fixChildren(int $parent, int $newLevel, int $newParent): void
 	{
 		// Grab all children of $parent...
-		$children = array();
+		$children = [];
 
-		$result = Db::$db->query('', '
-			SELECT id_board
+		$result = Db::$db->query(
+			'',
+			'SELECT id_board
 			FROM {db_prefix}boards
 			WHERE id_parent = {int:parent_board}',
-			array(
+			[
 				'parent_board' => $parent,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($result))
-		{
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			$children[] = $row['id_board'];
 		}
 		Db::$db->free_result($result);
 
 		// ...and set it to a new parent and child_level.
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET id_parent = {int:new_parent}, child_level = {int:new_child_level}
 			WHERE id_parent = {int:parent_board}',
-			array(
+			[
 				'new_parent' => $newParent,
 				'new_child_level' => $newLevel,
 				'parent_board' => $parent,
-			)
+			],
 		);
 
 		// Recursively fix the children of the children.
-		foreach ($children as $child)
+		foreach ($children as $child) {
 			self::fixChildren($child, $newLevel + 1, $child);
+		}
 	}
 
 	/**
@@ -2004,18 +1981,17 @@ public static function sort(array &$boards): void
 	{
 		$tree = Category::getTreeOrder();
 
-		$ordered = array();
+		$ordered = [];
 
-		foreach ($tree['boards'] as $board)
-		{
-			if (!empty($boards[$board]))
-			{
+		foreach ($tree['boards'] as $board) {
+			if (!empty($boards[$board])) {
 				$ordered[$board] = $boards[$board];
 
-				if (is_array($ordered[$board]) && !empty($ordered[$board]['children']))
+				if (is_array($ordered[$board]) && !empty($ordered[$board]['children'])) {
 					self::sort($ordered[$board]['children']);
-				elseif (is_object($ordered[$board]) && !empty($ordered[$board]->children))
+				} elseif (is_object($ordered[$board]) && !empty($ordered[$board]->children)) {
 					Board::sort($ordered[$board]->children);
+				}
 			}
 		}
 
@@ -2030,42 +2006,45 @@ public static function sort(array &$boards): void
 	 */
 	public static function getModerators(array $boards): array
 	{
-		if (empty($boards))
-			return array();
+		if (empty($boards)) {
+			return [];
+		}
 
-		$moderators = array();
+		$moderators = [];
 
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, mem.real_name, mo.id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, mem.real_name, mo.id_board
 			FROM {db_prefix}moderators AS mo
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = mo.id_member)
 			WHERE mo.id_board IN ({array_int:boards})',
-			array(
+			[
 				'boards' => $boards,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['id_board'] = (int) $row['id_board'];
 			$row['id_member'] = (int) $row['id_member'];
 
-			if (empty($moderators[$row['id_board']]))
-				$moderators[$row['id_board']] = array();
+			if (empty($moderators[$row['id_board']])) {
+				$moderators[$row['id_board']] = [];
+			}
 
-			$moderators[$row['id_board']][$row['id_member']] = array(
+			$moderators[$row['id_board']][$row['id_member']] = [
 				'id' => $row['id_member'],
 				'name' => $row['real_name'],
 				'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
 				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// We might as well update the data in any loaded boards.
-		foreach (self::$loaded as $board)
-		{
-			if (isset($moderators[$board->id]))
+		foreach (self::$loaded as $board) {
+			if (isset($moderators[$board->id])) {
 				$board->moderators = $moderators[$board->id];
+			}
 		}
 
 		return $moderators;
@@ -2079,41 +2058,44 @@ public static function getModerators(array $boards): array
 	 */
 	public static function getModeratorGroups(array $boards): array
 	{
-		if (empty($boards))
-			return array();
+		if (empty($boards)) {
+			return [];
+		}
 
-		$groups = array();
+		$groups = [];
 
-		$request = Db::$db->query('', '
-			SELECT mg.id_group, mg.group_name, bg.id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT mg.id_group, mg.group_name, bg.id_board
 			FROM {db_prefix}moderator_groups AS bg
 				INNER JOIN {db_prefix}membergroups AS mg ON (mg.id_group = bg.id_group)
 			WHERE bg.id_board IN ({array_int:boards})',
-			array(
+			[
 				'boards' => $boards,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['id_board'] = (int) $row['id_board'];
 			$row['id_group'] = (int) $row['id_group'];
 
-			if (empty($groups[$row['id_board']]))
-				$groups[$row['id_board']] = array();
+			if (empty($groups[$row['id_board']])) {
+				$groups[$row['id_board']] = [];
+			}
 
-			$groups[$row['id_board']][$row['id_group']] = array(
+			$groups[$row['id_board']][$row['id_group']] = [
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'href' => Config::$scripturl . '?action=groups;sa=members;group=' . $row['id_group'],
 				'link' => '<a href="' . Config::$scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '">' . $row['group_name'] . '</a>',
-			);
+			];
 		}
 
 		// We might as well update the data in any loaded boards.
-		foreach (self::$loaded as $board)
-		{
-			if (isset($groups[$board->id]))
+		foreach (self::$loaded as $board) {
+			if (isset($groups[$board->id])) {
 				$board->moderator_groups = $groups[$board->id];
+			}
 		}
 
 		return $groups;
@@ -2129,11 +2111,13 @@ public static function getModeratorGroups(array $boards): array
 	 */
 	public static function isChildOf($child, $parent): bool
 	{
-		if (empty(self::$loaded[$child]->parent))
+		if (empty(self::$loaded[$child]->parent)) {
 			return false;
+		}
 
-		if (self::$loaded[$child]->parent == $parent)
+		if (self::$loaded[$child]->parent == $parent) {
 			return true;
+		}
 
 		return self::isChildOf(self::$loaded[$child]->parent, $parent);
 	}
@@ -2149,36 +2133,32 @@ public static function isChildOf($child, $parent): bool
 	public static function getParents(int $id_parent): array
 	{
 		// First check if we have this cached already.
-		if (($boards = CacheApi::get('board_parents-' . $id_parent, 480)) === null)
-		{
-			$boards = array();
+		if (($boards = CacheApi::get('board_parents-' . $id_parent, 480)) === null) {
+			$boards = [];
 			$original_parent = $id_parent;
 
 			// Loop while the parent is non-zero.
-			while ($id_parent != 0)
-			{
-				$selects = array(
+			while ($id_parent != 0) {
+				$selects = [
 					'b.id_parent', 'b.name', 'b.id_board', 'b.child_level',
 					'b.member_groups', 'b.deny_member_groups',
-				);
-				$params = array('board_parent' => $id_parent);
-				$joins = array();
-				$where = array('b.id_board = {int:board_parent}');
-				$order = array();
-
-				foreach (self::queryData($selects, $params, $joins, $where, $order) as $row)
-				{
-					if (!isset($boards[$row['id_board']]))
-					{
+				];
+				$params = ['board_parent' => $id_parent];
+				$joins = [];
+				$where = ['b.id_board = {int:board_parent}'];
+				$order = [];
+
+				foreach (self::queryData($selects, $params, $joins, $where, $order) as $row) {
+					if (!isset($boards[$row['id_board']])) {
 						$id_parent = $row['id_parent'];
-						$boards[$row['id_board']] = array(
+						$boards[$row['id_board']] = [
 							'url' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
 							'name' => $row['name'],
 							'child_level' => $row['child_level'],
 							'parent' => $row['id_parent'],
 							'groups' => explode(',', $row['member_groups']),
 							'deny_groups' => explode(',', $row['deny_member_groups']),
-						);
+						];
 					}
 				}
 			}
@@ -2186,10 +2166,11 @@ public static function getParents(int $id_parent): array
 			CacheApi::put('board_parents-' . $original_parent, $boards, 480);
 		}
 
-		$loaded_boards = array();
+		$loaded_boards = [];
 
-		foreach ($boards as $id => $props)
+		foreach ($boards as $id => $props) {
 			$loaded_boards[] = self::init($id, $props);
+		}
 
 		return $loaded_boards;
 	}
@@ -2207,22 +2188,23 @@ public static function getParents(int $id_parent): array
 	 *    If this is left empty, no WHERE clause will be used.
 	 * @param array $order Zero or more conditions for the ORDER BY clause.
 	 *    If this is left empty, no ORDER BY clause will be used.
+	 * @param array $group Zero or more conditions for the GROUP BY clause.
+	 *    If this is left empty, no GROUP BY clause will be used.
 	 * @param int $limit Maximum number of results to retrieve.
 	 *    If this is left empty, all results will be retrieved.
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	public static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), int $limit = 0)
+	public static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int $limit = 0)
 	{
 		// If we only want some child boards, use a CTE query for improved performance.
-		if (!empty($params['id_parent']) && in_array('b.id_parent != 0', $where) && Db::$db->cte_support())
-		{
+		if (!empty($params['id_parent']) && in_array('b.id_parent != 0', $where) && Db::$db->cte_support()) {
 			// Ensure we include all the necessary fields for the CTE query.
 			preg_match_all('/\bb\.(\w+)/', implode(', ', $selects), $matches);
 
 			$cte_fields = array_unique(array_merge(
 				$matches[1],
-				array(
+				[
 					'child_level',
 					'id_board',
 					'name',
@@ -2237,35 +2219,33 @@ public static function queryData(array $selects, array $params = array(), array
 					'id_cat',
 					'id_last_msg',
 					'board_order',
-				)
+				],
 			));
 
 			$cte_selects = array_map(
-				function ($field)
-				{
+				function ($field) {
 					return 'b.' . $field;
 				},
-				$cte_fields
+				$cte_fields,
 			);
 
-			$cte_where1 = array('b.id_board = {int:id_parent}');
-			$cte_where2 = array();
+			$cte_where1 = ['b.id_board = {int:id_parent}'];
+			$cte_where2 = [];
 
-			if (in_array('{query_see_board}', $where))
-			{
+			if (in_array('{query_see_board}', $where)) {
 				array_unshift($cte_where1, '{query_see_board}');
 				$cte_where2[] = '{query_see_board}';
-				$where = array_diff($where, array('{query_see_board}'));
+				$where = array_diff($where, ['{query_see_board}']);
 			}
 
-			if (in_array('b.child_level BETWEEN {int:child_level} AND {int:max_child_level}', $where))
-			{
+			if (in_array('b.child_level BETWEEN {int:child_level} AND {int:max_child_level}', $where)) {
 				$cte_where2[] = 'b.child_level BETWEEN {int:child_level} AND {int:max_child_level}';
-				$where = array_diff($where, array('b.child_level BETWEEN {int:child_level} AND {int:max_child_level}'));
+				$where = array_diff($where, ['b.child_level BETWEEN {int:child_level} AND {int:max_child_level}']);
 			}
 
-			$request = Db::$db->query('', '
-				WITH RECURSIVE
+			$request = Db::$db->query(
+				'',
+				'WITH RECURSIVE
 					boards_cte (' . implode(', ', $cte_fields) . ')
 				AS
 				(
@@ -2285,26 +2265,23 @@ function ($field)
 				WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
 				ORDER BY ' . implode(', ', $order)) . ($limit > 0 ? '
 				LIMIT ' . $limit : ''),
-				$params
+				$params,
 			);
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					' . implode(', ', $selects) . '
 				FROM {db_prefix}boards AS b' . (empty($joins) ? '' : '
 					' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
 				WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
 				ORDER BY ' . implode(', ', $order)) . ($limit > 0 ? '
 				LIMIT ' . $limit : ''),
-				$params
+				$params,
 			);
-
 		}
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			yield $row;
 		}
 		Db::$db->free_result($request);
@@ -2338,50 +2315,51 @@ function ($field)
 	 * @param array $props Properties to set for this board. Only used when $id
 	 *    is not null.
 	 */
-	protected function __construct(?int $id = null, array $props = array())
+	protected function __construct(?int $id = null, array $props = [])
 	{
 		// This should already have been set, but just in case...
-		if (!isset(self::$board_id))
+		if (!isset(self::$board_id)) {
 			self::$board_id = (int) ($_REQUEST['board'] ?? 0);
+		}
 
 		// No ID given, so load current board.
-		if (!isset($id) || (!empty($id) && $id === self::$board_id))
-		{
+		if (!isset($id) || (!empty($id) && $id === self::$board_id)) {
 			// Only do this once.
-			if (!isset(self::$info))
-			{
+			if (!isset(self::$info)) {
 				// Assume they are not a moderator.
-				if (isset(User::$me))
+				if (isset(User::$me)) {
 					User::$me->is_mod = false;
+				}
 
 				// Start the linktree off empty..
-				Utils::$context['linktree'] = array();
+				Utils::$context['linktree'] = [];
 
 				// Have they by chance specified a message id but nothing else?
-				if (empty($_REQUEST['action']) && empty(Topic::$topic_id) && empty(self::$board_id) && !empty($_REQUEST['msg']))
-				{
+				if (empty($_REQUEST['action']) && empty(Topic::$topic_id) && empty(self::$board_id) && !empty($_REQUEST['msg'])) {
 					$this->redirectFromMsg();
 				}
 
 				// Load this board only if it is specified.
-				if (empty(self::$board_id) && empty(Topic::$topic_id))
+				if (empty(self::$board_id) && empty(Topic::$topic_id)) {
 					return;
+				}
 
 				// Load this board's info into the object properties.
 				$this->loadBoardInfo();
 
-				if (empty($this->id))
+				if (empty($this->id)) {
 					return;
+				}
 
 				// At this point, we know that self::$board_id won't change.
 				self::$loaded[self::$board_id] = $this;
 				self::$info = $this;
 
-				if (!empty(Topic::$topic_id))
+				if (!empty(Topic::$topic_id)) {
 					$_GET['board'] = (int) self::$board_id;
+				}
 
-				if (!empty(self::$board_id))
-				{
+				if (!empty(self::$board_id)) {
 					User::setModerators();
 					$this->checkAccess();
 					$this->buildLinkTree();
@@ -2392,27 +2370,24 @@ protected function __construct(?int $id = null, array $props = array())
 				Utils::$context['current_board'] = self::$board_id;
 
 				// No posting in redirection boards!
-				if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($this->redirect))
-				{
+				if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($this->redirect)) {
 					$this->error = 'post_in_redirect';
 				}
 
 				$this->blockOnError();
 			}
-		}
-		else
-		{
+		} else {
 			// No props provided, so get the standard ones.
-			if ($id > 0 && empty($props))
-			{
-				$request = Db::$db->query('', '
-					SELECT *
+			if ($id > 0 && empty($props)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT *
 					FROM {db_prefix}boards
 					WHERE id_board = {int:id}
 					LIMIT 1',
-					array(
+					[
 						'id' => $id,
-					)
+					],
 				);
 				$props = Db::$db->fetch_all($request);
 				Db::$db->free_result($request);
@@ -2424,14 +2399,12 @@ protected function __construct(?int $id = null, array $props = array())
 		}
 
 		// Add this board as a child of its parent.
-		if (!empty($this->parent))
-		{
+		if (!empty($this->parent)) {
 			self::init($this->parent)->children[$this->id] = $this;
 		}
 
 		// Plug this board into its category.
-		if (!empty($this->cat) && $this->child_level == 0)
-		{
+		if (!empty($this->cat) && $this->child_level == 0) {
 			$this->cat->children[$this->id] = $this;
 		}
 	}
@@ -2447,21 +2420,20 @@ protected function redirectFromMsg(): void
 		$_REQUEST['msg'] = (int) $_REQUEST['msg'];
 
 		// Looking through the message table can be slow, so try using the cache first.
-		if ((Topic::$topic_id = CacheApi::get('msg_topic-' . $_REQUEST['msg'], 120)) === null)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic
+		if ((Topic::$topic_id = CacheApi::get('msg_topic-' . $_REQUEST['msg'], 120)) === null) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}messages
 				WHERE id_msg = {int:id_msg}
 				LIMIT 1',
-				array(
+				[
 					'id_msg' => $_REQUEST['msg'],
-				)
+				],
 			);
 
 			// So did it find anything?
-			if (Db::$db->num_rows($request))
-			{
+			if (Db::$db->num_rows($request)) {
 				list(Topic::$topic_id) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
@@ -2471,19 +2443,17 @@ protected function redirectFromMsg(): void
 		}
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
-		if (!empty(Topic::$topic_id))
-		{
+		if (!empty(Topic::$topic_id)) {
 			$redirect_url = 'topic=' . Topic::$topic_id . '.msg' . $_REQUEST['msg'];
 
-			if (($other_get_params = array_diff(array_keys($_GET), array('msg'))) !== array())
+			if (($other_get_params = array_diff(array_keys($_GET), ['msg'])) !== []) {
 				$redirect_url .= ';' . implode(';', $other_get_params);
+			}
 
 			$redirect_url .= '#msg' . $_REQUEST['msg'];
 
 			Utils::redirectexit($redirect_url);
-		}
-		else
-		{
+		} else {
 			User::$me->loadPermissions();
 			Theme::load();
 			ErrorHandler::fatalLang('topic_gone', false);
@@ -2498,31 +2468,30 @@ protected function redirectFromMsg(): void
 	protected function loadBoardInfo(): void
 	{
 		// First, try the cache.
-		if (!empty(CacheApi::$enable) && (empty(Topic::$topic_id) || CacheApi::$enable >= 3))
-		{
-			if (!empty(Topic::$topic_id))
-			{
+		if (!empty(CacheApi::$enable) && (empty(Topic::$topic_id) || CacheApi::$enable >= 3)) {
+			if (!empty(Topic::$topic_id)) {
 				$temp = CacheApi::get('topic_board-' . Topic::$topic_id, 120);
-			}
-			else
-			{
+			} else {
 				$temp = CacheApi::get('board-' . self::$board_id, 120);
 			}
 
-			if (!empty($temp))
-			{
-				foreach ($temp as $key => $value)
-					$this->{$key} = $value;
+			if (!empty($temp)) {
+				foreach ($temp as $key => $value) {
+					if ($key === 'cat') {
+						$this->{$key} = Category::init($value['id'], $value);
+					} else {
+						$this->{$key} = $value;
+					}
+				}
 
 				self::$board_id = $this->id;
 			}
 		}
 
 		// Cache gave us nothing, so query the database.
-		if (empty($this->id))
-		{
+		if (empty($this->id)) {
 			// Set up all the query components.
-			$selects = array(
+			$selects = [
 				'b.id_board', 'b.id_cat', 'b.name', 'b.description',
 				'b.child_level', 'b.id_parent', 'b.board_order', 'b.redirect',
 				'b.member_groups', 'b.deny_member_groups', 'b.id_profile',
@@ -2531,25 +2500,24 @@ protected function loadBoardInfo(): void
 				'b.unapproved_posts', 'b.unapproved_topics', 'c.name AS cat_name',
 				'COALESCE(mg.id_group, 0) AS id_moderator_group', 'mg.group_name',
 				'COALESCE(mem.id_member, 0) AS id_moderator', 'mem.real_name',
-			);
+			];
 
-			$params = array(
+			$params = [
 				'board_link' => self::$board_id,
-			);
+			];
 
-			$joins = array(
+			$joins = [
 				'LEFT JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)',
 				'LEFT JOIN {db_prefix}moderator_groups AS modgs ON (modgs.id_board = {raw:board_link})',
 				'LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = modgs.id_group)',
 				'LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_board = {raw:board_link})',
 				'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = mods.id_member)',
-			);
+			];
 
-			$where = array('b.id_board = {raw:board_link}');
-			$order = array();
+			$where = ['b.id_board = {raw:board_link}'];
+			$order = [];
 
-			if (!empty(Topic::$topic_id))
-			{
+			if (!empty(Topic::$topic_id)) {
 				$selects[] = 't.approved';
 				$selects[] = 't.id_member_started';
 
@@ -2560,7 +2528,7 @@ protected function loadBoardInfo(): void
 			}
 
 			// Do any mods want to add some custom stuff to the query?
-			IntegrationHook::call('integrate_load_board', array(&$selects, &$params, &$joins, &$where, &$order));
+			IntegrationHook::call('integrate_load_board', [&$selects, &$params, &$joins, &$where, &$order]);
 
 			$selects = array_unique($selects);
 			$params = array_unique($params);
@@ -2569,24 +2537,23 @@ protected function loadBoardInfo(): void
 			$order = array_unique($order);
 
 			// Run the query and iterate over the returned rows.
-			foreach (self::queryData($selects, $params, $joins, $where, $order) as $row)
-			{
+			foreach (self::queryData($selects, $params, $joins, $where, $order) as $row) {
 				$row['id_board'] = (int) $row['id_board'];
 
 				// The query as currently constructed will return multiple rows if
 				// there are multiple moderators and/or moderator groups. To avoid
 				// redundancy, we only set the rest of the data the first time.
-				if (!isset($this->id))
-				{
+				if (!isset($this->id)) {
 					// Set the current board.
-					if (!empty($row['id_board']))
+					if (!empty($row['id_board'])) {
 						self::$board_id = $row['id_board'];
+					}
 
-					$props = array(
+					$props = [
 						'id' => $row['id_board'],
-						'moderators' => array(),
-						'moderator_groups' => array(),
-						'cat' => Category::init($row['id_cat'], array('name' => $row['cat_name'])),
+						'moderators' => [],
+						'moderator_groups' => [],
+						'cat' => Category::init($row['id_cat'], ['name' => $row['cat_name']]),
 						'name' => $row['name'],
 						'description' => $row['description'],
 						'num_topics' => (int) $row['num_topics'],
@@ -2606,59 +2573,56 @@ protected function loadBoardInfo(): void
 						'cur_topic_starter' => empty(Topic::$topic_id) ? 0 : $row['id_member_started'],
 
 						// Load the membergroups allowed, and check permissions.
-						'member_groups' => $row['member_groups'] == '' ? array() : array_filter(explode(',', $row['member_groups']), 'strlen'),
-						'deny_groups' => $row['deny_member_groups'] == '' ? array() : array_filter(explode(',', $row['deny_member_groups']), 'strlen'),
-					);
+						'member_groups' => $row['member_groups'] == '' ? [] : array_filter(explode(',', $row['member_groups']), 'strlen'),
+						'deny_groups' => $row['deny_member_groups'] == '' ? [] : array_filter(explode(',', $row['deny_member_groups']), 'strlen'),
+					];
 
-					IntegrationHook::call('integrate_board_info', array(&$props, $row));
+					IntegrationHook::call('integrate_board_info', [&$props, $row]);
 				}
 
 				// This row included an individual moderator.
-				if (!empty($row['id_moderator']))
-				{
+				if (!empty($row['id_moderator'])) {
 					$row['id_moderator'] = (int) $row['id_moderator'];
 
-					$props['moderators'][$row['id_moderator']] = array(
+					$props['moderators'][$row['id_moderator']] = [
 						'id' => $row['id_moderator'],
 						'name' => $row['real_name'],
 						'href' => Config::$scripturl . '?action=profile;u=' . $row['id_moderator'],
-						'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
-					);
+						'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>',
+					];
 				}
 
 				// This row included a moderator group.
-				if (!empty($row['id_moderator_group']))
-				{
+				if (!empty($row['id_moderator_group'])) {
 					$row['id_moderator_group'] = (int) $row['id_moderator_group'];
 
-					$props['moderator_groups'][$row['id_moderator_group']] = array(
+					$props['moderator_groups'][$row['id_moderator_group']] = [
 						'id' => $row['id_moderator_group'],
 						'name' => $row['group_name'],
 						'href' => Config::$scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
-						'link' => '<a href="' . Config::$scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
-					);
+						'link' => '<a href="' . Config::$scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>',
+					];
 				}
 
 				// Set the properties.
 				$this->set($props);
 			}
 
-			if (!empty($this->id) && !empty(CacheApi::$enable) && (empty(Topic::$topic_id) || CacheApi::$enable >= 3))
-			{
+			if (!empty($this->id) && !empty(CacheApi::$enable) && (empty(Topic::$topic_id) || CacheApi::$enable >= 3)) {
 				$to_cache = array_intersect_key((array) $this, array_flip(self::$cache_props['info']));
 
-				if (!empty(Topic::$topic_id))
+				if (!empty(Topic::$topic_id)) {
 					CacheApi::put('topic_board-' . Topic::$topic_id, $to_cache, 120);
+				}
 
 				CacheApi::put('board-' . self::$board_id, $to_cache, 120);
 			}
 		}
 
 		// No board? Then the topic is invalid, there are no moderators, etc.
-		if (empty($this->id))
-		{
-			$this->moderators = array();
-			$this->moderator_groups = array();
+		if (empty($this->id)) {
+			$this->moderators = [];
+			$this->moderator_groups = [];
 			$this->error = 'exist';
 			Topic::$topic_id = null;
 			self::$board_id = 0;
@@ -2674,19 +2638,19 @@ protected function loadBoardInfo(): void
 			&& $this->unapproved_topics > 0
 			&& Config::$modSettings['postmod_active']
 			&& !User::$me->allowedTo('approve_posts')
-		)
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+		) {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}topics
 				WHERE id_member_started = {int:id_member}
 					AND approved = {int:unapproved}
 					AND id_board = {int:board}',
-				array(
+				[
 					'id_member' => User::$me->id,
 					'unapproved' => 0,
 					'board' => self::$board_id,
-				)
+				],
 			);
 
 			list($this->unapproved_user_topics) = Db::$db->fetch_row($request);
@@ -2698,15 +2662,13 @@ protected function loadBoardInfo(): void
 	 */
 	protected function checkAccess(): void
 	{
-		if (User::$me->is_admin)
+		if (User::$me->is_admin) {
 			return;
+		}
 
-		if (count(array_intersect(User::$me->groups, $this->member_groups)) == 0)
-		{
+		if (count(array_intersect(User::$me->groups, $this->member_groups)) == 0) {
 			$this->error = 'access';
-		}
-		elseif (!empty(Config::$modSettings['deny_boards_access']) && count(array_intersect(User::$me->groups, $this->deny_groups)) != 0)
-		{
+		} elseif (!empty(Config::$modSettings['deny_boards_access']) && count(array_intersect(User::$me->groups, $this->deny_groups)) != 0) {
 			$this->error = 'access';
 		}
 	}
@@ -2719,15 +2681,15 @@ protected function buildLinkTree(): void
 		// Build up the linktree.
 		Utils::$context['linktree'] = array_merge(
 			Utils::$context['linktree'],
-			array(array(
+			[[
 				'url' => Config::$scripturl . '#c' . $this->cat['id'],
-				'name' => $this->cat['name']
-			)),
+				'name' => $this->cat['name'],
+			]],
 			array_reverse($this->parent_boards),
-			array(array(
+			[[
 				'url' => Config::$scripturl . '?board=' . $this->id . '.0',
-				'name' => $this->name
-			))
+				'name' => $this->name,
+			]],
 		);
 	}
 
@@ -2737,8 +2699,7 @@ protected function buildLinkTree(): void
 	protected function blockOnError(): void
 	{
 		// Hacker... you can't see this topic, I'll tell you that. (but moderators can!)
-		if (!empty($this->error) && (!empty(Config::$modSettings['deny_boards_access']) || $this->error != 'access' || !User::$me->is_mod))
-		{
+		if (!empty($this->error) && (!empty(Config::$modSettings['deny_boards_access']) || $this->error != 'access' || !User::$me->is_mod)) {
 			// The permissions and theme need loading, just to make sure everything goes smoothly.
 			User::$me->loadPermissions();
 			Theme::load();
@@ -2747,32 +2708,28 @@ protected function blockOnError(): void
 			$_GET['topic'] = '';
 
 			// The linktree should not give the game away mate!
-			Utils::$context['linktree'] = array(
-				array(
+			Utils::$context['linktree'] = [
+				[
 					'url' => Config::$scripturl,
-					'name' => Utils::$context['forum_name_html_safe']
-				)
-			);
+					'name' => Utils::$context['forum_name_html_safe'],
+				],
+			];
 
 			// If it's a prefetching agent or we're requesting an attachment.
-			if ((isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') || (!empty($_REQUEST['action']) && $_REQUEST['action'] === 'dlattach'))
-			{
+			if ((isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') || (!empty($_REQUEST['action']) && $_REQUEST['action'] === 'dlattach')) {
 				ob_end_clean();
 				Utils::sendHttpStatus(403);
+
 				die;
 			}
-			elseif ($this->error == 'post_in_redirect')
-			{
+
+			if ($this->error == 'post_in_redirect') {
 				// Slightly different error message here...
 				ErrorHandler::fatalLang('cannot_post_redirect', false);
-			}
-			elseif (User::$me->is_guest)
-			{
+			} elseif (User::$me->is_guest) {
 				Lang::load('Errors');
 				User::$me->kickIfGuest(Lang::$txt['topic_gone']);
-			}
-			else
-			{
+			} else {
 				ErrorHandler::fatalLang('topic_gone', false);
 			}
 		}
@@ -2780,7 +2737,8 @@ protected function blockOnError(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Board::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Board::exportStatic')) {
 	Board::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/BrowserDetector.php b/Sources/BrowserDetector.php
index aceb7c9462..003a31e846 100644
--- a/Sources/BrowserDetector.php
+++ b/Sources/BrowserDetector.php
@@ -35,11 +35,12 @@ class BrowserDetector
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'detectBrowser',
-		),
-	);
+			'isBrowser' => 'isBrowser',
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -51,7 +52,7 @@ class BrowserDetector
 	 * Holds all the browser information.
 	 * Its contents will be placed into Utils::$context['browser']
 	 */
-	private array $_browsers = array();
+	private array $_browsers = [];
 
 	/**
 	 * @var bool
@@ -74,8 +75,9 @@ class BrowserDetector
 	 */
 	public static function call()
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		self::$obj->detectBrowser();
 	}
@@ -89,8 +91,9 @@ public static function call()
 	public static function isBrowser($browser)
 	{
 		// Don't know any browser!
-		if (!isset(self::$obj) || empty(self::$obj->_browsers))
+		if (!isset(self::$obj) || empty(self::$obj->_browsers)) {
 			self::call();
+		}
 
 		return !empty(self::$obj->_browsers[$browser]) || !empty(self::$obj->_browsers['is_' . $browser]);
 	}
@@ -109,20 +112,25 @@ public function detectBrowser()
 		$this->_browsers['needs_size_fix'] = false;
 
 		// One at a time, one at a time, and in this order too
-		if ($this->isOpera())
+		if ($this->isOpera()) {
 			$this->setupOpera();
+		}
 		// Meh...
-		elseif ($this->isEdge())
+		elseif ($this->isEdge()) {
 			$this->setupEdge();
+		}
 		// Them webkits need to be set up too
-		elseif ($this->isWebkit())
+		elseif ($this->isWebkit()) {
 			$this->setupWebkit();
+		}
 		// We may have work to do on Firefox...
-		elseif ($this->isFirefox())
+		elseif ($this->isFirefox()) {
 			$this->setupFirefox();
+		}
 		// Old friend, old frenemy
-		elseif ($this->isIe())
+		elseif ($this->isIe()) {
 			$this->setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -132,17 +140,17 @@ public function detectBrowser()
 		$this->isIe11();
 
 		// Be you robot or human?
-		if (User::$me->possibly_robot)
-		{
+		if (User::$me->possibly_robot) {
 			// This isn't meant to be reliable, it's just meant to catch most bots to prevent PHPSESSID from showing up.
 			$this->_browsers['possibly_robot'] = !empty(User::$me->possibly_robot);
 
 			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !User::$me->is_guest)
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], ['login', 'login2', 'register', 'signup'])) || !User::$me->is_guest) {
 				$this->_browsers['possibly_robot'] = false;
-		}
-		else
+			}
+		} else {
 			$this->_browsers['possibly_robot'] = false;
+		}
 
 		// Fill out the historical array as needed to support old mods that don't use isBrowser
 		$this->fillInformation();
@@ -160,139 +168,165 @@ public function detectBrowser()
 	/**
 	 * Determine if the browser is Opera or not
 	 *
-	 * @return boolean Whether or not this is Opera
+	 * @return bool Whether or not this is Opera
 	 */
 	public function isOpera()
 	{
-		if (!isset($this->_browsers['is_opera']))
+		if (!isset($this->_browsers['is_opera'])) {
 			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		}
+
 		return $this->_browsers['is_opera'];
 	}
 
 	/**
 	 * Determine if the browser is IE or not
 	 *
-	 * @return boolean true Whether or not the browser is IE
+	 * @return bool true Whether or not the browser is IE
 	 */
 	public function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-		if (!isset($this->_browsers['is_ie']))
+		if (!isset($this->_browsers['is_ie'])) {
 			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		}
+
 		return $this->_browsers['is_ie'];
 	}
 
 	/**
 	 * Determine if the browser is IE11 or not
 	 *
-	 * @return boolean Whether or not the browser is IE11
+	 * @return bool Whether or not the browser is IE11
 	 */
 	public function isIe11()
 	{
 		// IE11 is a bit different than earlier versions
 		// The isGecko() part is to ensure we get this right...
-		if (!isset($this->_browsers['is_ie11']))
+		if (!isset($this->_browsers['is_ie11'])) {
 			$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		}
+
 		return $this->_browsers['is_ie11'];
 	}
 
 	/**
 	 * Determine if the browser is Edge or not
 	 *
-	 * @return boolean Whether or not the browser is Edge
+	 * @return bool Whether or not the browser is Edge
 	 */
 	public function isEdge()
 	{
-		if (!isset($this->_browsers['is_edge']))
+		if (!isset($this->_browsers['is_edge'])) {
 			$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		}
+
 		return $this->_browsers['is_edge'];
 	}
 
 	/**
 	 * Determine if the browser is a Webkit based one or not
 	 *
-	 * @return boolean Whether or not this is a Webkit-based browser
+	 * @return bool Whether or not this is a Webkit-based browser
 	 */
 	public function isWebkit()
 	{
-		if (!isset($this->_browsers['is_webkit']))
+		if (!isset($this->_browsers['is_webkit'])) {
 			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		}
+
 		return $this->_browsers['is_webkit'];
 	}
 
 	/**
 	 * Determine if the browser is Firefox or one of its variants
 	 *
-	 * @return boolean Whether or not this is Firefox (or one of its variants)
+	 * @return bool Whether or not this is Firefox (or one of its variants)
 	 */
 	public function isFirefox()
 	{
-		if (!isset($this->_browsers['is_firefox']))
+		if (!isset($this->_browsers['is_firefox'])) {
 			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		}
+
 		return $this->_browsers['is_firefox'];
 	}
 
 	/**
 	 * Determine if the browser is WebTv or not
 	 *
-	 * @return boolean Whether or not this is WebTV
+	 * @return bool Whether or not this is WebTV
 	 */
 	public function isWebTv()
 	{
-		if (!isset($this->_browsers['is_web_tv']))
+		if (!isset($this->_browsers['is_web_tv'])) {
 			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		}
+
 		return $this->_browsers['is_web_tv'];
 	}
 
 	/**
 	 * Determine if the browser is konqueror or not
 	 *
-	 * @return boolean Whether or not this is Konqueror
+	 * @return bool Whether or not this is Konqueror
 	 */
 	public function isKonqueror()
 	{
-		if (!isset($this->_browsers['is_konqueror']))
+		if (!isset($this->_browsers['is_konqueror'])) {
 			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		}
+
 		return $this->_browsers['is_konqueror'];
 	}
 
 	/**
 	 * Determine if the browser is Gecko or not
 	 *
-	 * @return boolean Whether or not this is a Gecko-based browser
+	 * @return bool Whether or not this is a Gecko-based browser
 	 */
 	public function isGecko()
 	{
-		if (!isset($this->_browsers['is_gecko']))
+		if (!isset($this->_browsers['is_gecko'])) {
 			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		}
+
 		return $this->_browsers['is_gecko'];
 	}
 
 	/**
 	 * Determine if the browser is Opera Mini or not
 	 *
-	 * @return boolean Whether or not this is Opera Mini
+	 * @return bool Whether or not this is Opera Mini
 	 */
 	public function isOperaMini()
 	{
-		if (!isset($this->_browsers['is_opera_mini']))
+		if (!isset($this->_browsers['is_opera_mini'])) {
 			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
-		if ($this->_browsers['is_opera_mini'])
+		}
+
+		if ($this->_browsers['is_opera_mini']) {
 			$this->_is_mobile = true;
+		}
+
 		return $this->_browsers['is_opera_mini'];
 	}
 
 	/**
 	 * Determine if the browser is Opera Mobile or not
 	 *
-	 * @return boolean Whether or not this is Opera Mobile
+	 * @return bool Whether or not this is Opera Mobile
 	 */
 	public function isOperaMobi()
 	{
-		if (!isset($this->_browsers['is_opera_mobi']))
+		if (!isset($this->_browsers['is_opera_mobi'])) {
 			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
-		if ($this->_browsers['is_opera_mobi'])
+		}
+
+		if ($this->_browsers['is_opera_mobi']) {
 			$this->_is_mobile = true;
+		}
+
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -307,34 +341,35 @@ public function isOperaMobi()
 	 */
 	private function setupWebkit()
 	{
-		$this->_browsers += array(
+		$this->_browsers += [
 			'is_chrome' => strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== false,
 			'is_iphone' => (strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'iPod') !== false) && strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') === false,
 			'is_blackberry' => stripos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'PlayBook') !== false,
 			'is_android' => strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false,
 			'is_nokia' => strpos($_SERVER['HTTP_USER_AGENT'], 'SymbianOS') !== false,
-		);
+		];
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
-		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia']) {
 			$this->_is_mobile = true;
+		}
 
 		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
 		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
 		$this->_browsers['is_ipad'] = strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false;
 
 		// if Chrome, get the major version
-		if ($this->_browsers['is_chrome'])
-		{
-			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+		if ($this->_browsers['is_chrome']) {
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
 				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 
 		// or if Safari get its major version
-		if ($this->_browsers['is_safari'])
-		{
-			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+		if ($this->_browsers['is_safari']) {
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
 				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 	}
 
@@ -350,21 +385,20 @@ private function setupIe()
 		$this->_browsers['is_ie_compat_view'] = false;
 
 		// get the version of the browser from the msie tag
-		if (preg_match('~MSIE\s?([0-9][0-9]?.[0-9])~i', $_SERVER['HTTP_USER_AGENT'], $msie_match) === 1)
-		{
+		if (preg_match('~MSIE\s?([0-9][0-9]?.[0-9])~i', $_SERVER['HTTP_USER_AGENT'], $msie_match) === 1) {
 			$msie_match[1] = trim($msie_match[1]);
 			$msie_match[1] = (($msie_match[1] - (int) $msie_match[1]) == 0) ? (int) $msie_match[1] : $msie_match[1];
 			$this->_browsers['is_ie' . $msie_match[1]] = true;
 		}
 
 		// "modern" ie uses trident 4=ie8, 5=ie9, 6=ie10, 7=ie11 even in compatibility view
-		if (preg_match('~Trident/([0-9.])~i', $_SERVER['HTTP_USER_AGENT'], $trident_match) === 1)
-		{
+		if (preg_match('~Trident/([0-9.])~i', $_SERVER['HTTP_USER_AGENT'], $trident_match) === 1) {
 			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
-			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4)) {
 				$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// Detect true IE6 and IE7 and not IE in compat mode.
@@ -372,17 +406,16 @@ private function setupIe()
 		$this->_browsers['is_ie6'] = !empty($this->_browsers['is_ie6']) && ($this->_browsers['is_ie_compat_view'] === false);
 
 		// IE mobile 7 or 9, ... shucks why not
-		if ((!empty($this->_browsers['is_ie7']) && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/7') !== false) || (!empty($this->_browsers['is_ie9']) && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/9') !== false))
-		{
+		if ((!empty($this->_browsers['is_ie7']) && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/7') !== false) || (!empty($this->_browsers['is_ie9']) && strpos($_SERVER['HTTP_USER_AGENT'], 'IEMobile/9') !== false)) {
 			$this->_browsers['is_ie_mobi'] = true;
 			$this->_is_mobile = true;
 		}
 
 		// And some throwbacks to a bygone era, deposited here like cholesterol in your arteries
-		$this->_browsers += array(
+		$this->_browsers += [
 			'is_ie4' => !empty($this->_browsers['is_ie4']) && !$this->_browsers['is_web_tv'],
-			'is_mac_ie' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 5.') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false
-		);
+			'is_mac_ie' => strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 5.') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false,
+		];
 
 		// Before IE8 we need to fix IE... lots!
 		$this->_browsers['ie_standards_fix'] = (($this->_browsers['is_ie6'] === true) || ($this->_browsers['is_ie7'] === true)) ? true : false;
@@ -398,8 +431,9 @@ private function setupIe()
 	 */
 	private function setupFirefox()
 	{
-		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
 			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -410,11 +444,13 @@ private function setupFirefox()
 	private function setupOpera()
 	{
 		// Opera 10+ uses the version tag at the end of the string
-		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match)) {
 			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
-		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match)) {
 			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 
 		// Needs size fix?
 		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
@@ -425,8 +461,9 @@ private function setupOpera()
 	 */
 	private function setupEdge()
 	{
-		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
+		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
 			$this->_browsers['is_edge' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -437,12 +474,11 @@ private function setupEdge()
 	 */
 	private function setupBrowserPriority()
 	{
-		if ($this->_is_mobile)
+		if ($this->_is_mobile) {
 			Utils::$context['browser_body_id'] = 'mobile';
-		else
-		{
+		} else {
 			// add in any specific detection conversions here if you want a special body id e.g. 'is_opera9' => 'opera9'
-			$browser_priority = array(
+			$browser_priority = [
 				'is_ie6' => 'ie6',
 				'is_ie7' => 'ie7',
 				'is_ie8' => 'ie8',
@@ -459,14 +495,13 @@ private function setupBrowserPriority()
 				'is_opera12' => 'opera12',
 				'is_opera' => 'opera',
 				'is_konqueror' => 'konqueror',
-			);
+			];
 
 			Utils::$context['browser_body_id'] = 'smf';
 			$active = array_reverse(array_keys($this->_browsers, true));
-			foreach ($active as $browser)
-			{
-				if (array_key_exists($browser, $browser_priority))
-				{
+
+			foreach ($active as $browser) {
+				if (array_key_exists($browser, $browser_priority)) {
 					Utils::$context['browser_body_id'] = $browser_priority[$browser];
 					break;
 				}
@@ -480,7 +515,7 @@ private function setupBrowserPriority()
 	 */
 	private function fillInformation()
 	{
-		$this->_browsers += array(
+		$this->_browsers += [
 			'is_opera' => false,
 			'is_opera6' => false,
 			'is_opera7' => false,
@@ -511,12 +546,13 @@ private function fillInformation()
 			'ie_standards_fix' => false,
 			'needs_size_fix' => false,
 			'possibly_robot' => false,
-		);
+		];
 	}
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\BrowserDetector::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\BrowserDetector::exportStatic')) {
 	BrowserDetector::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Cache/APIs/Apcu.php b/Sources/Cache/APIs/Apcu.php
index c1e5471a9f..74642146fd 100644
--- a/Sources/Cache/APIs/Apcu.php
+++ b/Sources/Cache/APIs/Apcu.php
@@ -16,8 +16,9 @@
 use SMF\Cache\CacheApi;
 use SMF\Cache\CacheApiInterface;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Our Cache API class
@@ -33,8 +34,9 @@ public function isSupported($test = false)
 	{
 		$supported = function_exists('apcu_fetch') && function_exists('apcu_store');
 
-		if ($test)
+		if ($test) {
 			return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
@@ -67,11 +69,11 @@ public function putData($key, $value, $ttl = null)
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// An extended key is needed to counteract a bug in APC.
-		if ($value === null)
+		if ($value === null) {
 			return apcu_delete($key . 'smf');
+		}
 
-		else
-			return apcu_store($key . 'smf', $value, $ttl !== null ? $ttl : $this->ttl);
+		return apcu_store($key . 'smf', $value, $ttl !== null ? $ttl : $this->ttl);
 	}
 
 	/**
diff --git a/Sources/Cache/APIs/FileBased.php b/Sources/Cache/APIs/FileBased.php
index 0c7653c0e3..e5c06f23e9 100644
--- a/Sources/Cache/APIs/FileBased.php
+++ b/Sources/Cache/APIs/FileBased.php
@@ -13,16 +13,17 @@
 
 namespace SMF\Cache\APIs;
 
-use GlobIterator;
 use FilesystemIterator;
+use GlobIterator;
+use SMF\Cache\CacheApi;
+use SMF\Cache\CacheApiInterface;
 use SMF\Config;
 use SMF\Lang;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Cache\CacheApiInterface;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Our Cache API class
@@ -32,7 +33,7 @@
 class FileBased extends CacheApi implements CacheApiInterface
 {
 	/**
-	 * @var string The path to the current $cachedir directory.
+	 * @var string The path to the current directory.
 	 */
 	private $cachedir = null;
 
@@ -54,24 +55,26 @@ public function isSupported($test = false)
 	{
 		$supported = is_writable($this->cachedir);
 
-		if ($test)
+		if ($test) {
 			return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
 
 	private function readFile($file)
 	{
-		if (($fp = @fopen($file, 'rb')) !== false)
-		{
-			if (!flock($fp, LOCK_SH))
-			{
+		if (($fp = @fopen($file, 'rb')) !== false) {
+			if (!flock($fp, LOCK_SH)) {
 				fclose($fp);
+
 				return false;
 			}
 			$string = '';
-			while (!feof($fp))
+
+			while (!feof($fp)) {
 				$string .= fread($fp, 8192);
+			}
 
 			flock($fp, LOCK_UN);
 			fclose($fp);
@@ -84,22 +87,22 @@ private function readFile($file)
 
 	private function writeFile($file, $string)
 	{
-		if (($fp = fopen($file, 'cb')) !== false)
-		{
-			if (!flock($fp, LOCK_EX))
-			{
+		if (($fp = fopen($file, 'cb')) !== false) {
+			if (!flock($fp, LOCK_EX)) {
 				fclose($fp);
+
 				return false;
 			}
 			ftruncate($fp, 0);
 			$bytes = 0;
 			$pieces = str_split($string, 8192);
-			foreach ($pieces as $piece)
-			{
-				if (($val = fwrite($fp, $piece, 8192)) !== false)
+
+			foreach ($pieces as $piece) {
+				if (($val = fwrite($fp, $piece, 8192)) !== false) {
 					$bytes += $val;
-				else
+				} else {
 					return false;
+				}
 			}
 			fflush($fp);
 			flock($fp, LOCK_UN);
@@ -124,21 +127,20 @@ public function connect()
 	 */
 	public function getData($key, $ttl = null)
 	{
-		$file = sprintf('%s/data_%s.cache',
+		$file = sprintf(
+			'%s/data_%s.cache',
 			$this->cachedir,
-			$this->prefix . strtr($key, ':/', '-_')
+			$this->prefix . strtr($key, ':/', '-_'),
 		);
 
 		// SMF Data returns $value and $expired.  $expired has a unix timestamp of when this expires.
-		if (file_exists($file) && ($raw = $this->readFile($file)) !== false)
-		{
-			if (($value = Utils::jsonDecode($raw, true, false)) !== array() && isset($value['expiration']) && $value['expiration'] >= time())
+		if (file_exists($file) && ($raw = $this->readFile($file)) !== false) {
+			if (($value = Utils::jsonDecode($raw, true, false)) !== [] && isset($value['expiration']) && $value['expiration'] >= time()) {
 				return $value['value'];
-			else
-				@unlink($file);
-		}
+			}
 
-		return null;
+			@unlink($file);
+		}
 	}
 
 	/**
@@ -146,33 +148,33 @@ public function getData($key, $ttl = null)
 	 */
 	public function putData($key, $value, $ttl = null)
 	{
-		$file = sprintf('%s/data_%s.cache',
+		$file = sprintf(
+			'%s/data_%s.cache',
 			$this->cachedir,
-			$this->prefix . strtr($key, ':/', '-_')
+			$this->prefix . strtr($key, ':/', '-_'),
 		);
 		$ttl = $ttl !== null ? $ttl : $this->ttl;
 
-		if ($value === null)
+		if ($value === null) {
 			@unlink($file);
-		else
-		{
+		} else {
 			$cache_data = json_encode(
-				array(
+				[
 					'expiration' => time() + $ttl,
-					'value' => $value
-				),
-				JSON_NUMERIC_CHECK
+					'value' => $value,
+				],
+				JSON_NUMERIC_CHECK,
 			);
 
 			// Write out the cache file, check that the cache write was successful; all the data must be written
 			// If it fails due to low diskspace, or other, remove the cache file
-			if ($this->writeFile($file, $cache_data) !== strlen($cache_data))
-			{
+			if ($this->writeFile($file, $cache_data) !== strlen($cache_data)) {
 				@unlink($file);
+
 				return false;
 			}
-			else
-				return true;
+
+			return true;
 		}
 	}
 
@@ -182,14 +184,16 @@ public function putData($key, $value, $ttl = null)
 	public function cleanCache($type = '')
 	{
 		// No directory = no game.
-		if (!is_dir($this->cachedir))
+		if (!is_dir($this->cachedir)) {
 			return;
+		}
 
 		// Remove the files in SMF's own disk cache, if any
 		$files = new GlobIterator($this->cachedir . '/' . $type . '*.cache', FilesystemIterator::NEW_CURRENT_AND_KEY);
 
-		foreach ($files as $file => $info)
+		foreach ($files as $file => $info) {
 			unlink($this->cachedir . '/' . $file);
+		}
 
 		// Make this invalid.
 		$this->invalidateCache();
@@ -219,41 +223,41 @@ public function cacheSettings(array &$config_vars)
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = Lang::$txt['cache_'. $class_name_txt_key .'_settings'];
-		$config_vars[] = array('cachedir', Lang::$txt['cachedir'], 'file', 'text', 36, 'cache_cachedir');
+		$config_vars[] = Lang::$txt['cache_' . $class_name_txt_key . '_settings'];
+		$config_vars[] = ['cachedir', Lang::$txt['cachedir'], 'file', 'text', 36, 'cache_cachedir'];
 
-		if (!isset(Utils::$context['settings_post_javascript']))
+		if (!isset(Utils::$context['settings_post_javascript'])) {
 			Utils::$context['settings_post_javascript'] = '';
+		}
 
-		if (empty(Utils::$context['settings_not_writable']))
+		if (empty(Utils::$context['settings_not_writable'])) {
 			Utils::$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir").prop("disabled", cache_type != "' . $class_name . '");
 			});';
+		}
 	}
 
 	/**
 	 * Sets the $cachedir or uses the SMF default $cachedir..
 	 *
-	 * @access public
 	 * @param string $dir A valid path
-	 * @return boolean If this was successful or not.
+	 * @return bool If this was successful or not.
 	 */
 	public function setCachedir($dir = null)
 	{
 		// If its invalid, use SMF's.
-		if (is_null($dir) || !is_writable($dir))
+		if (is_null($dir) || !is_writable($dir)) {
 			$this->cachedir = Config::$cachedir;
-
-		else
+		} else {
 			$this->cachedir = $dir;
+		}
 	}
 
 	/**
 	 * Gets the current $cachedir.
 	 *
-	 * @access public
 	 * @return string the value of $ttl.
 	 */
 	public function getCachedir()
diff --git a/Sources/Cache/APIs/MemcacheImplementation.php b/Sources/Cache/APIs/MemcacheImplementation.php
index 23496f2af4..d50efce3cb 100644
--- a/Sources/Cache/APIs/MemcacheImplementation.php
+++ b/Sources/Cache/APIs/MemcacheImplementation.php
@@ -14,13 +14,15 @@
 namespace SMF\Cache\APIs;
 
 use Memcache;
-use SMF\Config;
-use SMF\Lang;
 use SMF\Cache\CacheApi;
 use SMF\Cache\CacheApiInterface;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Our Cache API class
@@ -29,7 +31,7 @@
  */
 class MemcacheImplementation extends CacheApi implements CacheApiInterface
 {
-	const CLASS_KEY = 'cache_memcached';
+	public const CLASS_KEY = 'cache_memcached';
 
 	/**
 	 * @var object
@@ -51,19 +53,17 @@ class MemcacheImplementation extends CacheApi implements CacheApiInterface
 	public function __construct()
 	{
 		$this->servers = array_map(
-			function($server)
-			{
+			function ($server) {
 				// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-				if (strpos($server, '/') !== false)
-					return array($server, 0);
-
-				else
-				{
-					$server = explode(':', $server);
-					return array($server[0], isset($server[1]) ? (int) $server[1] : 11211);
+				if (strpos($server, '/') !== false) {
+					return [$server, 0];
 				}
+
+				$server = explode(':', $server);
+
+				return [$server[0], isset($server[1]) ? (int) $server[1] : 11211];
 			},
-			array_map('trim', explode(',', Config::$cache_memcached))
+			array_map('trim', explode(',', Config::$cache_memcached)),
 		);
 
 		parent::__construct();
@@ -76,8 +76,9 @@ public function isSupported($test = false)
 	{
 		$supported = class_exists('Memcache');
 
-		if ($test)
+		if ($test) {
 			return $supported;
+		}
 
 		return parent::isSupported() && $supported && !empty($this->servers);
 	}
@@ -94,25 +95,25 @@ public function connect()
 		$level = 0;
 
 		// We should keep trying if a server times out, but only for the amount of servers we have.
-		while (!$connected && $level < count($this->servers))
-		{
+		while (!$connected && $level < count($this->servers)) {
 			++$level;
 
 			$server = $this->servers[array_rand($this->servers)];
 
 			// No server, can't connect to this.
-			if (empty($server[0]))
+			if (empty($server[0])) {
 				continue;
+			}
 
 			$host = $server[0];
 			$port = $server[1];
 
 			// Don't wait too long: yes, we want the server, but we might be able to run the query faster!
-			if (empty(Config::$db_persist))
+			if (empty(Config::$db_persist)) {
 				$connected = $this->memcache->connect($host, $port);
-
-			else
+			} else {
 				$connected = $this->memcache->pconnect($host, $port);
+			}
 		}
 
 		return $connected;
@@ -128,8 +129,9 @@ public function getData($key, $ttl = null)
 		$value = $this->memcache->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+			return;
+		}
 
 		return $value;
 	}
@@ -167,27 +169,28 @@ public function cleanCache($type = '')
 	 */
 	public function cacheSettings(array &$config_vars)
 	{
-		if (!in_array(Lang::$txt[self::CLASS_KEY .'_settings'], $config_vars))
-		{
-			$config_vars[] = Lang::$txt[self::CLASS_KEY .'_settings'];
-			$config_vars[] = array(
+		if (!in_array(Lang::$txt[self::CLASS_KEY . '_settings'], $config_vars)) {
+			$config_vars[] = Lang::$txt[self::CLASS_KEY . '_settings'];
+			$config_vars[] = [
 				self::CLASS_KEY,
-				Lang::$txt[self::CLASS_KEY .'_servers'],
+				Lang::$txt[self::CLASS_KEY . '_servers'],
 				'file',
 				'text',
 				0,
-				'subtext' => Lang::$txt[self::CLASS_KEY .'_servers_subtext']);
+				'subtext' => Lang::$txt[self::CLASS_KEY . '_servers_subtext']];
 		}
 
-		if (!isset(Utils::$context['settings_post_javascript']))
+		if (!isset(Utils::$context['settings_post_javascript'])) {
 			Utils::$context['settings_post_javascript'] = '';
+		}
 
-		if (empty(Utils::$context['settings_not_writable']))
+		if (empty(Utils::$context['settings_not_writable'])) {
 			Utils::$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
+				$("#' . self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
 			});';
+		}
 	}
 
 	/**
@@ -195,14 +198,16 @@ public function cacheSettings(array &$config_vars)
 	 */
 	public function getVersion()
 	{
-		if (!is_object($this->memcache))
+		if (!is_object($this->memcache)) {
 			return false;
+		}
 
 		// This gets called in Subs-Admin getServerVersions when loading up support information.  If we can't get a connection, return nothing.
 		$result = $this->memcache->getVersion();
 
-		if (!empty($result))
+		if (!empty($result)) {
 			return $result;
+		}
 
 		return false;
 	}
diff --git a/Sources/Cache/APIs/MemcachedImplementation.php b/Sources/Cache/APIs/MemcachedImplementation.php
index 32c7ceb0ba..23552147ee 100644
--- a/Sources/Cache/APIs/MemcachedImplementation.php
+++ b/Sources/Cache/APIs/MemcachedImplementation.php
@@ -14,13 +14,15 @@
 namespace SMF\Cache\APIs;
 
 use Memcached;
-use SMF\Config;
-use SMF\Lang;
 use SMF\Cache\CacheApi;
 use SMF\Cache\CacheApiInterface;
+use SMF\Config;
+use SMF\Lang;
+use SMF\Utils;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Our Cache API class
@@ -29,7 +31,7 @@
  */
 class MemcachedImplementation extends CacheApi implements CacheApiInterface
 {
-	const CLASS_KEY = 'cache_memcached';
+	public const CLASS_KEY = 'cache_memcached';
 
 	/**
 	 * @var object
@@ -51,19 +53,17 @@ class MemcachedImplementation extends CacheApi implements CacheApiInterface
 	public function __construct()
 	{
 		$this->servers = array_map(
-			function($server)
-			{
+			function ($server) {
 				// Normal host names do not contain slashes, while e.g. unix sockets do. Assume alternative transport pipe with port 0.
-				if (strpos($server, '/') !== false)
-					return array($server, 0);
-
-				else
-				{
-					$server = explode(':', $server);
-					return array($server[0], isset($server[1]) ? (int) $server[1] : 11211);
+				if (strpos($server, '/') !== false) {
+					return [$server, 0];
 				}
+
+				$server = explode(':', $server);
+
+				return [$server[0], isset($server[1]) ? (int) $server[1] : 11211];
 			},
-			explode(',', Config::$cache_memcached)
+			explode(',', Config::$cache_memcached),
 		);
 
 		parent::__construct();
@@ -76,8 +76,9 @@ public function isSupported($test = false)
 	{
 		$supported = class_exists('Memcached');
 
-		if ($test)
+		if ($test) {
 			return $supported;
+		}
 
 		return parent::isSupported() && $supported && !empty($this->servers);
 	}
@@ -87,7 +88,7 @@ public function isSupported($test = false)
 	 */
 	public function connect()
 	{
-		$this->memcached = new Memcached;
+		$this->memcached = new Memcached();
 
 		return $this->addServers();
 	}
@@ -103,22 +104,22 @@ protected function addServers()
 	{
 		$currentServers = $this->memcached->getServerList();
 		$retVal = !empty($currentServers);
-		foreach ($this->servers as $server)
-		{
+
+		foreach ($this->servers as $server) {
 			// Figure out if we have this server or not
 			$foundServer = false;
-			foreach ($currentServers as $currentServer)
-			{
-				if ($server[0] == $currentServer['host'] && $server[1] == $currentServer['port'])
-				{
+
+			foreach ($currentServers as $currentServer) {
+				if ($server[0] == $currentServer['host'] && $server[1] == $currentServer['port']) {
 					$foundServer = true;
 					break;
 				}
 			}
 
 			// Found it?
-			if (empty($foundServer))
+			if (empty($foundServer)) {
 				$retVal |= $this->memcached->addServer($server[0], $server[1]);
+			}
 		}
 
 		return $retVal;
@@ -134,8 +135,9 @@ public function getData($key, $ttl = null)
 		$value = $this->memcached->get($key);
 
 		// $value should return either data or false (from failure, key not found or empty array).
-		if ($value === false)
-			return null;
+		if ($value === false) {
+			return;
+		}
 
 		return $value;
 	}
@@ -174,27 +176,28 @@ public function quit()
 	 */
 	public function cacheSettings(array &$config_vars)
 	{
-		if (!in_array(Lang::$txt[self::CLASS_KEY .'_settings'], $config_vars))
-		{
-			$config_vars[] = Lang::$txt[self::CLASS_KEY .'_settings'];
-			$config_vars[] = array(
+		if (!in_array(Lang::$txt[self::CLASS_KEY . '_settings'], $config_vars)) {
+			$config_vars[] = Lang::$txt[self::CLASS_KEY . '_settings'];
+			$config_vars[] = [
 				self::CLASS_KEY,
-				Lang::$txt[self::CLASS_KEY .'_servers'],
+				Lang::$txt[self::CLASS_KEY . '_servers'],
 				'file',
 				'text',
 				0,
-				'subtext' => Lang::$txt[self::CLASS_KEY .'_servers_subtext']);
+				'subtext' => Lang::$txt[self::CLASS_KEY . '_servers_subtext']];
 		}
 
-		if (!isset(Utils::$context['settings_post_javascript']))
+		if (!isset(Utils::$context['settings_post_javascript'])) {
 			Utils::$context['settings_post_javascript'] = '';
+		}
 
-		if (empty(Utils::$context['settings_not_writable']))
+		if (empty(Utils::$context['settings_not_writable'])) {
 			Utils::$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
+				$("#' . self::CLASS_KEY . '").prop("disabled", cache_type != "MemcacheImplementation" && cache_type != "MemcachedImplementation");
 			});';
+		}
 	}
 
 	/**
@@ -202,14 +205,16 @@ public function cacheSettings(array &$config_vars)
 	 */
 	public function getVersion()
 	{
-		if (!is_object($this->memcached))
+		if (!is_object($this->memcached)) {
 			return false;
+		}
 
 		// This gets called in Subs-Admin getServerVersions when loading up support information.  If we can't get a connection, return nothing.
 		$result = $this->memcached->getVersion();
 
-		if (!empty($result))
+		if (!empty($result)) {
 			return current($result);
+		}
 
 		return false;
 	}
diff --git a/Sources/Cache/APIs/Postgres.php b/Sources/Cache/APIs/Postgres.php
index de2bb7c3a7..27a1296079 100644
--- a/Sources/Cache/APIs/Postgres.php
+++ b/Sources/Cache/APIs/Postgres.php
@@ -13,13 +13,14 @@
 
 namespace SMF\Cache\APIs;
 
-use SMF\Config;
-use SMF\Db\DatabaseApi as Db;
 use SMF\Cache\CacheApi;
 use SMF\Cache\CacheApiInterface;
+use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * PostgreSQL Cache API class
@@ -28,10 +29,14 @@
  */
 class Postgres extends CacheApi implements CacheApiInterface
 {
-	/** @var string */
+	/**
+	 * @var string
+	 */
 	private $db_prefix;
 
-	/** @var resource result of pg_connect. */
+	/**
+	 * @var resource result of pg_connect.
+	 */
 	private $db_connection;
 
 	public function __construct()
@@ -47,31 +52,34 @@ public function __construct()
 	 */
 	public function connect()
 	{
-		$result = pg_query_params($this->db_connection, 'SELECT 1
+		$result = pg_query_params(
+			$this->db_connection,
+			'SELECT 1
 			FROM   pg_tables
 			WHERE  schemaname = $1
 			AND    tablename = $2',
-			array(
+			[
 				'public',
 				$this->db_prefix . 'cache',
-			)
+			],
 		);
 
-		if (pg_affected_rows($result) === 0)
+		if (pg_affected_rows($result) === 0) {
 			pg_query($this->db_connection, 'CREATE UNLOGGED TABLE ' . $this->db_prefix . 'cache (key text, value text, ttl bigint, PRIMARY KEY (key))');
+		}
 
 		$this->prepareQueries(
-			array(
+			[
 				'smf_cache_get_data',
 				'smf_cache_put_data',
 				'smf_cache_delete_data',
-			),
-			array(
+			],
+			[
 				'SELECT value FROM ' . $this->db_prefix . 'cache WHERE key = $1 AND ttl >= $2 LIMIT 1',
 				'INSERT INTO ' . $this->db_prefix . 'cache(key,value,ttl) VALUES($1,$2,$3)
 				ON CONFLICT(key) DO UPDATE SET value = $2, ttl = $3',
 				'DELETE FROM ' . $this->db_prefix . 'cache WHERE key = $1',
-			)
+			],
 		);
 
 		return true;
@@ -88,19 +96,21 @@ private function prepareQueries(array $stmtnames, array $queries)
 		$result = pg_query_params(
 			$this->db_connection,
 			'SELECT name FROM pg_prepared_statements WHERE name = ANY ($1)',
-			array('{' . implode(', ', $stmtnames) . '}')
+			['{' . implode(', ', $stmtnames) . '}'],
 		);
 
-		$arr = pg_num_rows($result) == 0 ? array() : array_map(
-			function($el)
-			{
+		$arr = pg_num_rows($result) == 0 ? [] : array_map(
+			function ($el) {
 				return $el['name'];
 			},
-			pg_fetch_all($result)
+			pg_fetch_all($result),
 		);
-		foreach ($stmtnames as $idx => $stmtname)
-			if (!in_array($stmtname, $arr))
+
+		foreach ($stmtnames as $idx => $stmtname) {
+			if (!in_array($stmtname, $arr)) {
 				pg_prepare($this->db_connection, $stmtname, $queries[$idx]);
+			}
+		}
 	}
 
 	/**
@@ -108,14 +118,16 @@ function($el)
 	 */
 	public function isSupported($test = false)
 	{
-		if (Db::$db->title !== POSTGRE_TITLE)
+		if (Db::$db->title !== POSTGRE_TITLE) {
 			return false;
+		}
 
 		$result = pg_query($this->db_connection, 'SHOW server_version_num');
 		$res = pg_fetch_assoc($result);
 
-		if ($res['server_version_num'] < 90500)
+		if ($res['server_version_num'] < 90500) {
 			return false;
+		}
 
 		return $test ? true : parent::isSupported();
 	}
@@ -125,10 +137,11 @@ public function isSupported($test = false)
 	 */
 	public function getData($key, $ttl = null)
 	{
-		$result = pg_execute($this->db_connection, 'smf_cache_get_data', array($key, time()));
+		$result = pg_execute($this->db_connection, 'smf_cache_get_data', [$key, time()]);
 
-		if (pg_affected_rows($result) === 0)
-			return null;
+		if (pg_affected_rows($result) === 0) {
+			return;
+		}
 
 		$res = pg_fetch_assoc($result);
 
@@ -142,10 +155,11 @@ public function putData($key, $value, $ttl = null)
 	{
 		$ttl = time() + (int) ($ttl !== null ? $ttl : $this->ttl);
 
-		if ($value === null)
-			$result = pg_execute($this->db_connection, 'smf_cache_delete_data', array($key));
-		else
-			$result = pg_execute($this->db_connection, 'smf_cache_put_data', array($key, $value, $ttl));
+		if ($value === null) {
+			$result = pg_execute($this->db_connection, 'smf_cache_delete_data', [$key]);
+		} else {
+			$result = pg_execute($this->db_connection, 'smf_cache_put_data', [$key, $value, $ttl]);
+		}
 
 		return pg_affected_rows($result) > 0;
 	}
@@ -155,10 +169,11 @@ public function putData($key, $value, $ttl = null)
 	 */
 	public function cleanCache($type = '')
 	{
-		if ($type == 'expired')
+		if ($type == 'expired') {
 			pg_query($this->db_connection, 'DELETE FROM ' . $this->db_prefix . 'cache WHERE ttl < ' . time() . ';');
-		else
+		} else {
 			pg_query($this->db_connection, 'TRUNCATE ' . $this->db_prefix . 'cache');
+		}
 
 		$this->invalidateCache();
 
@@ -187,7 +202,6 @@ public function housekeeping()
 	/**
 	 * Create the temp table of valid data.
 	 *
-	 * @return void
 	 */
 	private function createTempTable()
 	{
@@ -197,7 +211,6 @@ private function createTempTable()
 	/**
 	 * Delete the temp table.
 	 *
-	 * @return void
 	 */
 	private function deleteTempTable()
 	{
@@ -207,7 +220,6 @@ private function deleteTempTable()
 	/**
 	 * Retrieve the valid data from temp table.
 	 *
-	 * @return void
 	 */
 	private function retrieveData()
 	{
diff --git a/Sources/Cache/APIs/Sqlite.php b/Sources/Cache/APIs/Sqlite.php
index bef28c2dee..6a70cce0ac 100755
--- a/Sources/Cache/APIs/Sqlite.php
+++ b/Sources/Cache/APIs/Sqlite.php
@@ -13,15 +13,16 @@
 
 namespace SMF\Cache\APIs;
 
+use SMF\Cache\CacheApi;
+use SMF\Cache\CacheApiInterface;
 use SMF\Config;
 use SMF\Lang;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Cache\CacheApiInterface;
 use SQLite3;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * SQLite Cache API class
@@ -31,7 +32,7 @@
 class Sqlite extends CacheApi implements CacheApiInterface
 {
 	/**
-	 * @var string The path to the current $cachedir directory.
+	 * @var string The path to the current directory.
 	 */
 	private $cachedir = null;
 
@@ -56,8 +57,8 @@ public function connect()
 		$database = $this->cachedir . '/' . 'SQLite3Cache.db3';
 		$this->cacheDB = new SQLite3($database);
 		$this->cacheDB->busyTimeout(1000);
-		if (filesize($database) == 0)
-		{
+
+		if (filesize($database) == 0) {
 			$this->cacheDB->exec('CREATE TABLE cache (key text unique, value blob, ttl int);');
 			$this->cacheDB->exec('CREATE INDEX ttls ON cache(ttl);');
 		}
@@ -68,10 +69,11 @@ public function connect()
 	 */
 	public function isSupported($test = false)
 	{
-		$supported = class_exists("SQLite3") && is_writable($this->cachedir);
+		$supported = class_exists('SQLite3') && is_writable($this->cachedir);
 
-		if ($test)
+		if ($test) {
 			return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
@@ -85,8 +87,10 @@ public function getData($key, $ttl = null)
 		$result = $this->cacheDB->query($query);
 
 		$value = null;
-		while ($res = $result->fetchArray(SQLITE3_ASSOC))
+
+		while ($res = $result->fetchArray(SQLITE3_ASSOC)) {
 			$value = $res['value'];
+		}
 
 		return !empty($value) ? $value : null;
 	}
@@ -97,10 +101,12 @@ public function getData($key, $ttl = null)
 	public function putData($key, $value, $ttl = null)
 	{
 		$ttl = time() + (int) ($ttl !== null ? $ttl : $this->ttl);
-		if ($value === null)
+
+		if ($value === null) {
 			$query = 'DELETE FROM cache WHERE key = \'' . $this->cacheDB->escapeString($key) . '\';';
-		else
+		} else {
 			$query = 'REPLACE INTO cache VALUES (\'' . $this->cacheDB->escapeString($key) . '\', \'' . $this->cacheDB->escapeString($value) . '\', ' . $ttl . ');';
+		}
 		$result = $this->cacheDB->exec($query);
 
 		return $result;
@@ -111,10 +117,11 @@ public function putData($key, $value, $ttl = null)
 	 */
 	public function cleanCache($type = '')
 	{
-		if ($type == 'expired')
+		if ($type == 'expired') {
 			$query = 'DELETE FROM cache WHERE ttl < ' . time() . ';';
-		else
+		} else {
 			$query = 'DELETE FROM cache;';
+		}
 
 		$result = $this->cacheDB->exec($query);
 
@@ -134,52 +141,50 @@ public function cacheSettings(array &$config_vars)
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = Lang::$txt['cache_'. $class_name_txt_key .'_settings'];
-		$config_vars[] = array(
-			'cachedir_'. $class_name_txt_key,
-			Lang::$txt['cachedir_'. $class_name_txt_key],
+		$config_vars[] = Lang::$txt['cache_' . $class_name_txt_key . '_settings'];
+		$config_vars[] = [
+			'cachedir_' . $class_name_txt_key,
+			Lang::$txt['cachedir_' . $class_name_txt_key],
 			'file',
 			'text',
 			36,
-			'cache_'. $class_name_txt_key .'_cachedir',
-		);
+			'cache_' . $class_name_txt_key . '_cachedir',
+		];
 
-		if (!isset(Utils::$context['settings_post_javascript']))
+		if (!isset(Utils::$context['settings_post_javascript'])) {
 			Utils::$context['settings_post_javascript'] = '';
+		}
 
-		if (empty(Utils::$context['settings_not_writable']))
+		if (empty(Utils::$context['settings_not_writable'])) {
 			Utils::$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir_'. $class_name_txt_key .'").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir_' . $class_name_txt_key . '").prop("disabled", cache_type != "' . $class_name . '");
 			});';
+		}
 	}
 
 	/**
 	 * Sets the $cachedir or uses the SMF default $cachedir..
 	 *
-	 * @access public
-	 *
 	 * @param string $dir A valid path
 	 *
-	 * @return boolean If this was successful or not.
+	 * @return bool If this was successful or not.
 	 */
 	public function setCachedir($dir = null)
 	{
 		// If its invalid, use SMF's.
-		if (!isset($dir) || !is_writable($dir))
-		{
-			if (!isset(Config::$cachedir_sqlite) || !is_writable(Config::$cachedir_sqlite))
-			{
+		if (!isset($dir) || !is_writable($dir)) {
+			if (!isset(Config::$cachedir_sqlite) || !is_writable(Config::$cachedir_sqlite)) {
 				Config::$cachedir_sqlite = Config::$cachedir;
 
-				Config::updateSettingsFile(array('cachedir_sqlite' => Config::$cachedir_sqlite));
+				Config::updateSettingsFile(['cachedir_sqlite' => Config::$cachedir_sqlite]);
 			}
 
 			$this->cachedir = Config::$cachedir_sqlite;
-		}
-		else
+		} else {
 			$this->cachedir = $dir;
+		}
 	}
 
 	/**
@@ -187,8 +192,9 @@ public function setCachedir($dir = null)
 	 */
 	public function getVersion()
 	{
-		if (null == $this->cacheDB)
+		if (null == $this->cacheDB) {
 			$this->connect();
+		}
 
 		return $this->cacheDB->version()['versionString'];
 	}
diff --git a/Sources/Cache/APIs/Zend.php b/Sources/Cache/APIs/Zend.php
index c409162022..88e8af7911 100644
--- a/Sources/Cache/APIs/Zend.php
+++ b/Sources/Cache/APIs/Zend.php
@@ -16,8 +16,9 @@
 use SMF\Cache\CacheApi;
 use SMF\Cache\CacheApiInterface;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Our Cache API class
@@ -33,8 +34,9 @@ public function isSupported($test = false)
 	{
 		$supported = function_exists('zend_shm_cache_fetch') || function_exists('output_cache_get');
 
-		if ($test)
+		if ($test) {
 			return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
@@ -52,11 +54,13 @@ public function getData($key, $ttl = null)
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
 		// Zend's pricey stuff.
-		if (function_exists('zend_shm_cache_fetch'))
+		if (function_exists('zend_shm_cache_fetch')) {
 			return zend_shm_cache_fetch('SMF::' . $key);
+		}
 
-		elseif (function_exists('output_cache_get'))
+		if (function_exists('output_cache_get')) {
 			return output_cache_get($key, $ttl);
+		}
 	}
 
 	/**
@@ -66,11 +70,13 @@ public function putData($key, $value, $ttl = null)
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if (function_exists('zend_shm_cache_store'))
+		if (function_exists('zend_shm_cache_store')) {
 			return zend_shm_cache_store('SMF::' . $key, $value, $ttl);
+		}
 
-		elseif (function_exists('output_cache_put'))
+		if (function_exists('output_cache_put')) {
 			return output_cache_put($key, $value);
+		}
 	}
 
 	/**
diff --git a/Sources/Cache/APIs/index.php b/Sources/Cache/APIs/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Cache/APIs/index.php
+++ b/Sources/Cache/APIs/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Cache/CacheApi.php b/Sources/Cache/CacheApi.php
index d3ce966f52..efee95372f 100644
--- a/Sources/Cache/CacheApi.php
+++ b/Sources/Cache/CacheApi.php
@@ -14,7 +14,6 @@
 namespace SMF\Cache;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
 use SMF\IntegrationHook;
 use SMF\Utils;
@@ -23,32 +22,32 @@ abstract class CacheApi
 {
 	use BackwardCompatibility;
 
-	const APIS_FOLDER = __DIR__ . '/APIs';
-	const APIS_NAMESPACE = __NAMESPACE__ . '\\APIs\\';
-	const APIS_DEFAULT = 'FileBased';
+	public const APIS_FOLDER = __DIR__ . '/APIs';
+	public const APIS_NAMESPACE = __NAMESPACE__ . '\\APIs\\';
+	public const APIS_DEFAULT = 'FileBased';
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'loadCacheAccelerator',
 			'detect' => 'loadCacheAPIs',
 			'clean' => 'clean_cache',
 			'quickGet' => 'cache_quick_get',
 			'put' => 'cache_put_data',
 			'get' => 'cache_get_data',
-		),
-		'prop_names' => array(
+		],
+		'prop_names' => [
 			'loadedApi' => 'cacheAPI',
 			'hits' => 'cache_hits',
 			'count_hits' => 'cache_count',
 			'misses' => 'cache_misses',
 			'count_misses' => 'cache_count_misses',
-		),
-	);
+		],
+	];
 
 	/**************************
 	 * Public static properties
@@ -88,7 +87,7 @@ abstract class CacheApi
 	 *
 	 * For backward compatibilty, also referenced as global $cache_hits.
 	 */
-	public static array $hits = array();
+	public static array $hits = [];
 
 	/**
 	 * @var int
@@ -106,7 +105,7 @@ abstract class CacheApi
 	 *
 	 * For backward compatibilty, also referenced as global $cache_misses.
 	 */
-	public static array $misses = array();
+	public static array $misses = [];
 
 	/**
 	 * @var int
@@ -148,7 +147,6 @@ abstract class CacheApi
 	/**
 	 * Does basic setup of a cache method when we create the object but before we call connect.
 	 *
-	 * @access public
 	 */
 	public function __construct()
 	{
@@ -158,14 +156,14 @@ public function __construct()
 	/**
 	 * Checks whether we can use the cache method performed by this API.
 	 *
-	 * @access public
 	 * @param bool $test Test if this is supported or enabled.
 	 * @return bool Whether or not the cache is supported
 	 */
 	public function isSupported($test = false)
 	{
-		if ($test)
+		if ($test) {
 			return true;
+		}
 
 		return !empty(self::$enable);
 	}
@@ -173,37 +171,33 @@ public function isSupported($test = false)
 	/**
 	 * Sets the cache prefix.
 	 *
-	 * @access public
 	 * @param string $prefix The prefix to use.
 	 *     If empty, the prefix will be generated automatically.
 	 * @return bool If this was successful or not.
 	 */
 	public function setPrefix($prefix = '')
 	{
-		if (!is_string($prefix))
+		if (!is_string($prefix)) {
 			$prefix = '';
+		}
 
 		// Use the supplied prefix, if there is one.
-		if (!empty($prefix))
-		{
+		if (!empty($prefix)) {
 			$this->prefix = $prefix;
 
 			return true;
 		}
 
 		// Ideally the prefix should reflect the last time the cache was reset.
-		if (!empty(Config::$cachedir) && file_exists(Config::$cachedir . '/index.php'))
-		{
+		if (!empty(Config::$cachedir) && file_exists(Config::$cachedir . '/index.php')) {
 			$mtime = filemtime(Config::$cachedir . '/index.php');
 		}
 		// Fall back to the last time that Settings.php was updated.
-		elseif (!empty(Config::$boarddir) && file_exists(SMF_SETTINGS_FILE))
-		{
+		elseif (!empty(Config::$boarddir) && file_exists(SMF_SETTINGS_FILE)) {
 			$mtime = filemtime(SMF_SETTINGS_FILE);
 		}
 		// This should never happen, but just in case...
-		else
-		{
+		else {
 			$mtime = filemtime(realpath($_SERVER['SCRIPT_FILENAME']));
 		}
 
@@ -215,7 +209,6 @@ public function setPrefix($prefix = '')
 	/**
 	 * Gets the prefix as defined from set or the default.
 	 *
-	 * @access public
 	 * @return string the value of $key.
 	 */
 	public function getPrefix()
@@ -226,7 +219,6 @@ public function getPrefix()
 	/**
 	 * Sets a default Time To Live, if this isn't specified we let the class define it.
 	 *
-	 * @access public
 	 * @param int $ttl The default TTL
 	 * @return bool If this was successful or not.
 	 */
@@ -240,7 +232,6 @@ public function setDefaultTTL($ttl = 120)
 	/**
 	 * Gets the TTL as defined from set or the default.
 	 *
-	 * @access public
 	 * @return int the value of $ttl.
 	 */
 	public function getDefaultTTL()
@@ -257,8 +248,9 @@ public function invalidateCache()
 	{
 		// Invalidate cache, to be sure!
 		// ... as long as index.php can be modified, anyway.
-		if (is_writable(Config::$cachedir . '/' . 'index.php'))
+		if (is_writable(Config::$cachedir . '/' . 'index.php')) {
 			@touch(Config::$cachedir . '/' . 'index.php');
+		}
 
 		return true;
 	}
@@ -266,7 +258,6 @@ public function invalidateCache()
 	/**
 	 * Closes connections to the cache method.
 	 *
-	 * @access public
 	 * @return bool Whether the connections were closed.
 	 */
 	public function quit()
@@ -277,7 +268,6 @@ public function quit()
 	/**
 	 * Specify custom settings that the cache API supports.
 	 *
-	 * @access public
 	 * @param array $config_vars Additional config_vars, see ManageSettings.php for usage.
 	 */
 	public function cacheSettings(array &$config_vars)
@@ -287,7 +277,6 @@ public function cacheSettings(array &$config_vars)
 	/**
 	 * Gets the latest version of SMF this is compatible with.
 	 *
-	 * @access public
 	 * @return string the value of $key.
 	 */
 	public function getCompatibleVersion()
@@ -298,7 +287,6 @@ public function getCompatibleVersion()
 	/**
 	 * Gets the min version that we support.
 	 *
-	 * @access public
 	 * @return string the value of $key.
 	 */
 	public function getMinimumVersion()
@@ -309,7 +297,6 @@ public function getMinimumVersion()
 	/**
 	 * Gets the Version of the Caching API.
 	 *
-	 * @access public
 	 * @return string the value of $key.
 	 */
 	public function getVersion()
@@ -321,8 +308,6 @@ public function getVersion()
 	 * Run housekeeping of this cache
 	 * exp. clean up old data or do optimization
 	 *
-	 * @access public
-	 * @return void
 	 */
 	public function housekeeping()
 	{
@@ -331,18 +316,17 @@ public function housekeeping()
 	/**
 	 * Gets the class identifier of the current caching API implementation.
 	 *
-	 * @access public
 	 * @return string the unique identifier for the current class implementation.
 	 */
 	public function getImplementationClassKeyName()
 	{
 		$class_name = get_class($this);
 
-		if ($position = strrpos($class_name, '\\'))
+		if ($position = strrpos($class_name, '\\')) {
 			return substr($class_name, $position + 1);
+		}
 
-		else
-			return get_class($this);
+		return get_class($this);
 	}
 
 	/***********************
@@ -361,22 +345,27 @@ public function getImplementationClassKeyName()
 	 */
 	final public static function load($overrideCache = '', $fallbackSMF = true)
 	{
-		if (!isset(self::$enable))
+		if (!isset(self::$enable)) {
 			self::$enable = min(max((int) Config::$cache_enable, 0), 3);
+		}
 
-		if (!isset(self::$accelerator))
+		if (!isset(self::$accelerator)) {
 			self::$accelerator = Config::$cache_accelerator;
+		}
 
 		// Is caching enabled?
-		if (empty(self::$enable) && empty($overrideCache))
+		if (empty(self::$enable) && empty($overrideCache)) {
 			return false;
+		}
 
 		// Not overriding this and we have a cacheAPI, send it back.
-		if (empty($overrideCache) && is_object(self::$loadedApi))
+		if (empty($overrideCache) && is_object(self::$loadedApi)) {
 			return self::$loadedApi;
+		}
 
-		elseif (is_null(self::$loadedApi))
+		if (is_null(self::$loadedApi)) {
 			self::$loadedApi = false;
+		}
 
 		// What accelerator we are going to try.
 		$cache_class_name = !empty(self::$accelerator) ? self::$accelerator : self::APIS_DEFAULT;
@@ -385,35 +374,39 @@ final public static function load($overrideCache = '', $fallbackSMF = true)
 
 		// Do some basic tests.
 		$cache_api = false;
-		if (class_exists($fully_qualified_class_name))
-		{
+
+		if (class_exists($fully_qualified_class_name)) {
 			$cache_api = new $fully_qualified_class_name();
 
 			// There are rules you know...
-			if (!($cache_api instanceof CacheApiInterface) || !($cache_api instanceof CacheApi))
+			if (!($cache_api instanceof CacheApiInterface) || !($cache_api instanceof CacheApi)) {
 				$cache_api = false;
+			}
 
 			// No Support?  NEXT!
-			if ($cache_api && !$cache_api->isSupported())
-			{
+			if ($cache_api && !$cache_api->isSupported()) {
 				// Can we save ourselves?
-				if (!empty($fallbackSMF) && $overrideCache == '' && $cache_class_name !== self::APIS_DEFAULT)
+				if (!empty($fallbackSMF) && $overrideCache == '' && $cache_class_name !== self::APIS_DEFAULT) {
 					return self::load(self::APIS_NAMESPACE . self::APIS_DEFAULT, false);
+				}
 
 				$cache_api = false;
 			}
 
 			// Connect up to the accelerator.
-			if ($cache_api && $cache_api->connect() === false)
+			if ($cache_api && $cache_api->connect() === false) {
 				$cache_api = false;
+			}
 
 			// Don't set this if we are overriding the cache.
-			if ($cache_api && empty($overrideCache))
+			if ($cache_api && empty($overrideCache)) {
 				self::$loadedApi = $cache_api;
+			}
 		}
 
-		if (!$cache_api && !empty($fallbackSMF) && $overrideCache == '' && $cache_class_name !== self::APIS_DEFAULT)
+		if (!$cache_api && !empty($fallbackSMF) && $overrideCache == '' && $cache_class_name !== self::APIS_DEFAULT) {
 			$cache_api = self::load(self::APIS_NAMESPACE . self::APIS_DEFAULT, false);
+		}
 
 		return $cache_api;
 	}
@@ -423,33 +416,35 @@ final public static function load($overrideCache = '', $fallbackSMF = true)
 	 */
 	final public static function detect()
 	{
-		$loadedApis = array();
+		$loadedApis = [];
 
 		$api_classes = new \GlobIterator(self::APIS_FOLDER . '/*.php', \FilesystemIterator::NEW_CURRENT_AND_KEY);
 
-		foreach ($api_classes as $file_path => $file_info)
-		{
+		foreach ($api_classes as $file_path => $file_info) {
 			$class_name = $file_info->getBasename('.php');
 			$fully_qualified_class_name = self::APIS_NAMESPACE . $class_name;
 
-			if (!class_exists($fully_qualified_class_name))
+			if (!class_exists($fully_qualified_class_name)) {
 				continue;
+			}
 
 			/* @var CacheApiInterface $cache_api */
 			$cache_api = new $fully_qualified_class_name();
 
 			// Deal with it!
-			if (!($cache_api instanceof CacheApiInterface) || !($cache_api instanceof CacheApi))
+			if (!($cache_api instanceof CacheApiInterface) || !($cache_api instanceof CacheApi)) {
 				continue;
+			}
 
 			// No Support?  NEXT!
-			if (!$cache_api->isSupported(true))
+			if (!$cache_api->isSupported(true)) {
 				continue;
+			}
 
 			$loadedApis[$class_name] = $cache_api;
 		}
 
-		IntegrationHook::call('integrate_load_cache_apis', array(&$loadedApis));
+		IntegrationHook::call('integrate_load_cache_apis', [&$loadedApis]);
 
 		return $loadedApis;
 	}
@@ -469,8 +464,9 @@ final public static function detect()
 	final public static function clean($type = '')
 	{
 		// If we can't get to the API, can't do this.
-		if (empty(self::$loadedApi))
+		if (empty(self::$loadedApi)) {
 			return;
+		}
 
 		// Ask the API to do the heavy lifting. cleanCache also calls invalidateCache to be sure.
 		self::$loadedApi->cleanCache($type);
@@ -492,8 +488,9 @@ final public static function clean($type = '')
 	 */
 	final public static function quickGet($key, $file, $function, $params, $level = 1)
 	{
-		if (class_exists('SMF\\IntegrationHook', false))
-			IntegrationHook::call('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+		if (class_exists('SMF\\IntegrationHook', false)) {
+			IntegrationHook::call('pre_cache_quick_get', [&$key, &$file, &$function, &$params, &$level]);
+		}
 
 		/* Refresh the cache if either:
 			1. Caching is disabled.
@@ -502,23 +499,26 @@ final public static function quickGet($key, $file, $function, $params, $level =
 			4. The cached item has a custom expiration condition evaluating to true.
 			5. The expire time set in the cache item has passed (needed for Zend).
 		*/
-		if (empty(self::$enable) || self::$enable < $level || !is_array($cache_block = self::get($key, 3600)) || (!empty($cache_block['refresh_eval']) && eval($cache_block['refresh_eval'])) || (!empty($cache_block['expires']) && $cache_block['expires'] < time()))
-		{
-			if (!empty($file) && is_file(Config::$sourcedir . '/' . $file))
-				require_once(Config::$sourcedir . '/' . $file);
+		if (empty(self::$enable) || self::$enable < $level || !is_array($cache_block = self::get($key, 3600)) || (!empty($cache_block['refresh_eval']) && eval($cache_block['refresh_eval'])) || (!empty($cache_block['expires']) && $cache_block['expires'] < time())) {
+			if (!empty($file) && is_file(Config::$sourcedir . '/' . $file)) {
+				require_once Config::$sourcedir . '/' . $file;
+			}
 
 			$cache_block = call_user_func_array($function, $params);
 
-			if (!empty(self::$enable) && self::$enable >= $level)
+			if (!empty(self::$enable) && self::$enable >= $level) {
 				self::put($key, $cache_block, $cache_block['expires'] - time());
+			}
 		}
 
 		// Some cached data may need a freshening up after retrieval.
-		if (!empty($cache_block['post_retri_eval']))
+		if (!empty($cache_block['post_retri_eval'])) {
 			eval($cache_block['post_retri_eval']);
+		}
 
-		if (class_exists('SMF\\IntegrationHook', false))
-			IntegrationHook::call('post_cache_quick_get', array(&$cache_block));
+		if (class_exists('SMF\\IntegrationHook', false)) {
+			IntegrationHook::call('post_cache_quick_get', [&$cache_block]);
+		}
 
 		return $cache_block['data'];
 	}
@@ -540,13 +540,14 @@ final public static function quickGet($key, $file, $function, $params, $level =
 	 */
 	final public static function put($key, $value, $ttl = 120)
 	{
-		if (empty(self::$enable) || empty(self::$loadedApi))
+		if (empty(self::$enable) || empty(self::$loadedApi)) {
 			return;
+		}
 
 		self::$count_hits++;
-		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true)
-		{
-			self::$hits[self::$count_hits] = array('k' => $key, 'd' => 'put', 's' => $value === null ? 0 : strlen(Utils::jsonEncode($value)));
+
+		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true) {
+			self::$hits[self::$count_hits] = ['k' => $key, 'd' => 'put', 's' => $value === null ? 0 : strlen(Utils::jsonEncode($value))];
 			$st = microtime(true);
 		}
 
@@ -554,11 +555,13 @@ final public static function put($key, $value, $ttl = 120)
 		$value = $value === null ? null : Utils::jsonEncode($value);
 		self::$loadedApi->putData($key, $value, $ttl);
 
-		if (class_exists('SMF\\IntegrationHook', false))
-			IntegrationHook::call('cache_put_data', array(&$key, &$value, &$ttl));
+		if (class_exists('SMF\\IntegrationHook', false)) {
+			IntegrationHook::call('cache_put_data', [&$key, &$value, &$ttl]);
+		}
 
-		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true)
+		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true) {
 			self::$hits[self::$count_hits]['t'] = microtime(true) - $st;
+		}
 	}
 
 	/**
@@ -572,13 +575,14 @@ final public static function put($key, $value, $ttl = 120)
 	 */
 	final public static function get($key, $ttl = 120)
 	{
-		if (empty(self::$enable) || empty(self::$loadedApi))
-			return null;
+		if (empty(self::$enable) || empty(self::$loadedApi)) {
+			return;
+		}
 
 		self::$count_hits++;
-		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true)
-		{
-			self::$hits[self::$count_hits] = array('k' => $key, 'd' => 'get');
+
+		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true) {
+			self::$hits[self::$count_hits] = ['k' => $key, 'd' => 'get'];
 			$st = microtime(true);
 			$original_key = $key;
 		}
@@ -586,27 +590,27 @@ final public static function get($key, $ttl = 120)
 		// Ask the API to get the data.
 		$value = self::$loadedApi->getData($key, $ttl);
 
-		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true)
-		{
+		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true) {
 			self::$hits[self::$count_hits]['t'] = microtime(true) - $st;
 			self::$hits[self::$count_hits]['s'] = isset($value) ? strlen($value) : 0;
 
-			if (empty($value))
-			{
+			if (empty($value)) {
 				self::$count_misses++;
-				self::$misses[self::$count_misses] = array('k' => $original_key, 'd' => 'get');
+				self::$misses[self::$count_misses] = ['k' => $original_key, 'd' => 'get'];
 			}
 		}
 
-		if (class_exists('SMF\\IntegrationHook', false) && isset($value))
-			IntegrationHook::call('cache_get_data', array(&$key, &$ttl, &$value));
+		if (class_exists('SMF\\IntegrationHook', false) && isset($value)) {
+			IntegrationHook::call('cache_get_data', [&$key, &$ttl, &$value]);
+		}
 
 		return empty($value) ? null : Utils::jsonDecode($value, true);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\CacheApi::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\CacheApi::exportStatic')) {
 	CacheApi::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Cache/CacheApiInterface.php b/Sources/Cache/CacheApiInterface.php
index c806278353..99d89d6a29 100644
--- a/Sources/Cache/CacheApiInterface.php
+++ b/Sources/Cache/CacheApiInterface.php
@@ -13,16 +13,15 @@
 
 namespace SMF\Cache;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
-
+}
 
 interface CacheApiInterface
 {
 	/**
 	 * Checks whether we can use the cache method performed by this API.
 	 *
-	 * @access public
 	 * @param bool $test Test if this is supported or enabled.
 	 * @return bool Whether or not the cache is supported
 	 */
@@ -31,7 +30,6 @@ public function isSupported($test = false);
 	/**
 	 * Connects to the cache method. This defines our $key. If this fails, we return false, otherwise we return true.
 	 *
-	 * @access public
 	 * @return bool Whether or not the cache method was connected to.
 	 */
 	public function connect();
@@ -39,7 +37,6 @@ public function connect();
 	/**
 	 * Retrieves an item from the cache.
 	 *
-	 * @access public
 	 * @param string $key The key to use, the prefix is applied to the key name.
 	 * @param int    $ttl Overrides the default TTL. Not really used anymore,
 	 *                    but is kept for backwards compatibility.
@@ -52,7 +49,6 @@ public function getData($key, $ttl = null);
 	 * Stores a value, regardless of whether or not the key already exists (in
 	 * which case it will overwrite the existing value for that key).
 	 *
-	 * @access public
 	 * @param string $key   The key to use, the prefix is applied to the key name.
 	 * @param mixed  $value The data we wish to save. Use null to delete.
 	 * @param int    $ttl   How long (in seconds) the data should be cached for.
@@ -73,7 +69,6 @@ public function cleanCache($type = '');
 	/**
 	 * Gets the class identifier of the current caching API implementation.
 	 *
-	 * @access public
 	 * @return string the unique identifier for the current class implementation.
 	 */
 	public function getImplementationClassKeyName();
diff --git a/Sources/Cache/index.php b/Sources/Cache/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Cache/index.php
+++ b/Sources/Cache/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Category.php b/Sources/Category.php
index 69a6462fb6..3715d076ea 100644
--- a/Sources/Category.php
+++ b/Sources/Category.php
@@ -28,30 +28,29 @@
  */
 class Category implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'init' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'modify' => 'modifyCategory',
 			'create' => 'createCategory',
 			'delete' => 'deleteCategories',
 			'sort' => 'sortCategories',
+			'getTreeOrder' => 'getTreeOrder',
 			'getTree' => 'getBoardTree',
-			'setParsedDescriptions' => 'setCategoryParsedDescription',
-			'getParsedDescriptions' => 'getCategoriesParsedDescription',
-		),
-		'prop_names' => array(
+			'recursiveBoards' => 'recursiveBoards',
+		],
+		'prop_names' => [
 			'loaded' => 'cat_tree',
 			'boardList' => 'boardList',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -111,7 +110,7 @@ class Category implements \ArrayAccess
 	 *
 	 * Boards that are children of this category.
 	 */
-	public array $children = array();
+	public array $children = [];
 
 	/**
 	 * @var string
@@ -165,14 +164,14 @@ class Category implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var array
 	 *
 	 * A list of boards grouped by category ID.
 	 */
-	public static array $boardList = array();
+	public static array $boardList = [];
 
 	/*********************
 	 * Internal properties
@@ -183,12 +182,12 @@ class Category implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_cat' => 'id',
 		'cat_order' => 'order',
 		'href' => 'url',
 		'boards' => 'children',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -199,17 +198,17 @@ class Category implements \ArrayAccess
 	 *
 	 * Holds results of Category::getTreeOrder().
 	 */
-	protected static array $tree_order = array(
-		'cats' => array(),
-		'boards' => array(),
-	);
+	protected static array $tree_order = [
+		'cats' => [],
+		'boards' => [],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Holds parsed versions of category descriptions.
 	 */
-	protected static array $parsed_descriptions = array();
+	protected static array $parsed_descriptions = [];
 
 	/****************
 	 * Public methods
@@ -220,29 +219,28 @@ class Category implements \ArrayAccess
 	 */
 	public function parseDescription(): void
 	{
-		if (empty($this->description))
+		if (empty($this->description)) {
 			return;
+		}
 
 		// Save the unparsed description in case we need it later.
-		if (!isset($this->custom['unparsed_description']))
+		if (!isset($this->custom['unparsed_description'])) {
 			$this->custom['unparsed_description'] = $this->description;
+		}
 
-		if (!empty(CacheApi::$enable))
-		{
-			if (empty(self::$parsed_descriptions))
-				self::$parsed_descriptions = CacheApi::get('parsed_category_descriptions', 864000) ?? array();
+		if (!empty(CacheApi::$enable)) {
+			if (empty(self::$parsed_descriptions)) {
+				self::$parsed_descriptions = CacheApi::get('parsed_category_descriptions', 864000) ?? [];
+			}
 
-			if (!isset(self::$parsed_descriptions[$this->id]))
-			{
+			if (!isset(self::$parsed_descriptions[$this->id])) {
 				self::$parsed_descriptions[$this->id] = BBCodeParser::load()->parse($this->description, false, '', Utils::$context['description_allowed_tags']);
 
 				CacheApi::put('parsed_category_descriptions', self::$parsed_descriptions, 864000);
 			}
 
 			$this->description = self::$parsed_descriptions[$this->id];
-		}
-		else
-		{
+		} else {
 			$this->description = BBCodeParser::load()->parse($this->description, false, '', Utils::$context['description_allowed_tags']);
 		}
 	}
@@ -252,8 +250,9 @@ public function parseDescription(): void
 	 */
 	public function unparseDescription(): void
 	{
-		if (isset($this->custom['unparsed_description']))
+		if (isset($this->custom['unparsed_description'])) {
 			$this->description = $this->custom['unparsed_description'];
+		}
 	}
 
 	/***********************
@@ -263,46 +262,38 @@ public function unparseDescription(): void
 	/**
 	 * Loads categories by ID number and/or by custom query.
 	 *
-	 * If both arguments are empty, loads nothing.
+	 * If both arguments are empty, loads all categories.
 	 *
-	 * @param array|int $ids The ID numbers of zero or more boards.
+	 * @param array|int $ids The ID numbers of zero or more categories.
 	 * @param array $query_customizations Customizations to the SQL query.
-	 * @return array Instances of this class for the loaded boards.
+	 * @return array Instances of this class for the loaded categories.
 	 */
-	public static function load(array|int $ids = array(), array $query_customizations = array()): array
+	public static function load(array|int $ids = [], array $query_customizations = []): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$ids = array_unique(array_map('intval', (array) $ids));
 
-		if (empty($query_customizations) && empty($ids))
-			return $loaded;
-
-		$selects = $query_customizations['selects'] ?? array('c.*');
-		$joins = $query_customizations['joins'] ?? array();
-		$where = $query_customizations['where'] ?? array();
-		$order = $query_customizations['order'] ?? array();
-		$group = $query_customizations['group'] ?? array();
+		$selects = $query_customizations['selects'] ?? ['c.*'];
+		$joins = $query_customizations['joins'] ?? [];
+		$where = $query_customizations['where'] ?? [];
+		$order = $query_customizations['order'] ?? ['c.cat_order'];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? 0;
-		$params = $query_customizations['params'] ?? array();
+		$params = $query_customizations['params'] ?? [];
 
-		if ($ids !== array())
-		{
+		if ($ids !== []) {
 			$where[] = 'c.id_cat IN ({array_int:ids})';
 			$params['ids'] = $ids;
 		}
 
-		foreach (Board::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			$row['id_cat'] = (int) $row['id_cat'];
 
-			if (isset(self::$loaded[$row['id_cat']]))
-			{
+			if (isset(self::$loaded[$row['id_cat']])) {
 				self::$loaded[$row['id_cat']]->set($row);
 				$loaded[] = self::$loaded[$row['id_cat']];
-			}
-			else
-			{
+			} else {
 				$loaded[] = self::init($row['id_cat'], $row);
 			}
 		}
@@ -328,14 +319,11 @@ public static function load(array|int $ids = array(), array $query_customization
 	 * @param array $props Array of properties to set.
 	 * @return object An instance of this class.
 	 */
-	public static function init(int $id, array $props = array()): object
+	public static function init(int $id, array $props = []): object
 	{
-		if (!isset(self::$loaded[$id]))
-		{
+		if (!isset(self::$loaded[$id])) {
 			new self($id, $props);
-		}
-		else
-		{
+		} else {
 			self::$loaded[$id]->set($props);
 		}
 
@@ -352,56 +340,58 @@ public static function init(int $id, array $props = array()): object
 	 */
 	public static function modify(int $category_id, array $catOptions): void
 	{
-		$catUpdates = array();
-		$catParameters = array();
+		$catUpdates = [];
+		$catParameters = [];
 
 		$cat_id = $category_id;
-		IntegrationHook::call('integrate_pre_modify_category', array($cat_id, &$catOptions));
+		IntegrationHook::call('integrate_pre_modify_category', [$cat_id, &$catOptions]);
 
 		// Wanna change the categories position?
-		if (isset($catOptions['move_after']))
-		{
+		if (isset($catOptions['move_after'])) {
 			// Store all categories in the proper order.
-			$cats = array();
-			$cat_order = array();
+			$cats = [];
+			$cat_order = [];
 
 			// Setting 'move_after' to '0' moves the category to the top.
-			if ($catOptions['move_after'] == 0)
+			if ($catOptions['move_after'] == 0) {
 				$cats[] = $category_id;
+			}
 
 			// Grab the categories sorted by cat_order.
-			$request = Db::$db->query('', '
-				SELECT id_cat, cat_order
+			$request = Db::$db->query(
+				'',
+				'SELECT id_cat, cat_order
 				FROM {db_prefix}categories
 				ORDER BY cat_order',
-				array(
-				)
+				[
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if ($row['id_cat'] != $category_id)
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if ($row['id_cat'] != $category_id) {
 					$cats[] = $row['id_cat'];
+				}
 
-				if ($row['id_cat'] == $catOptions['move_after'])
+				if ($row['id_cat'] == $catOptions['move_after']) {
 					$cats[] = $category_id;
+				}
 
 				$cat_order[$row['id_cat']] = $row['cat_order'];
 			}
 			Db::$db->free_result($request);
 
 			// Set the new order for the categories.
-			foreach ($cats as $index => $cat)
-			{
-				if ($index != $cat_order[$cat])
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}categories
+			foreach ($cats as $index => $cat) {
+				if ($index != $cat_order[$cat]) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}categories
 						SET cat_order = {int:new_order}
 						WHERE id_cat = {int:current_category}',
-						array(
+						[
 							'new_order' => $index,
 							'current_category' => $cat,
-						)
+						],
 					);
 				}
 			}
@@ -410,48 +400,45 @@ public static function modify(int $category_id, array $catOptions): void
 			Board::reorder();
 		}
 
-		if (isset($catOptions['cat_name']))
-		{
+		if (isset($catOptions['cat_name'])) {
 			$catUpdates[] = 'name = {string:cat_name}';
 			$catParameters['cat_name'] = $catOptions['cat_name'];
 		}
 
-		if (isset($catOptions['cat_desc']))
-		{
+		if (isset($catOptions['cat_desc'])) {
 			$catUpdates[] = 'description = {string:cat_desc}';
 			$catParameters['cat_desc'] = $catOptions['cat_desc'];
 
-			if (!empty(CacheApi::$enable))
+			if (!empty(CacheApi::$enable)) {
 				CacheApi::put('parsed_category_descriptions', null);
+			}
 		}
 
 		// Can a user collapse this category or is it too important?
-		if (isset($catOptions['is_collapsible']))
-		{
+		if (isset($catOptions['is_collapsible'])) {
 			$catUpdates[] = 'can_collapse = {int:is_collapsible}';
 			$catParameters['is_collapsible'] = $catOptions['is_collapsible'] ? 1 : 0;
 		}
 
 		$cat_id = $category_id;
-		IntegrationHook::call('integrate_modify_category', array($cat_id, &$catUpdates, &$catParameters));
+		IntegrationHook::call('integrate_modify_category', [$cat_id, &$catUpdates, &$catParameters]);
 
 		// Do the updates (if any).
-		if (!empty($catUpdates))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}categories
+		if (!empty($catUpdates)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}categories
 				SET
 					' . implode(',
 					', $catUpdates) . '
 				WHERE id_cat = {int:current_category}',
-				array_merge($catParameters, array(
+				array_merge($catParameters, [
 					'current_category' => $category_id,
-				))
+				]),
 			);
 
-			if (empty($catOptions['dont_log']))
-			{
-				Logging::logAction('edit_cat', array('catname' => isset($catOptions['cat_name']) ? $catOptions['cat_name'] : $category_id), 'admin');
+			if (empty($catOptions['dont_log'])) {
+				Logging::logAction('edit_cat', ['catname' => $catOptions['cat_name'] ?? $category_id], 'admin');
 			}
 		}
 	}
@@ -470,49 +457,52 @@ public static function modify(int $category_id, array $catOptions): void
 	public static function create(array $catOptions): int
 	{
 		// Check required values.
-		if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '')
-		{
+		if (!isset($catOptions['cat_name']) || trim($catOptions['cat_name']) == '') {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['create_category_no_name'], E_USER_ERROR);
 		}
 
 		// Set default values.
-		if (!isset($catOptions['cat_desc']))
+		if (!isset($catOptions['cat_desc'])) {
 			$catOptions['cat_desc'] = '';
+		}
 
-		if (!isset($catOptions['move_after']))
+		if (!isset($catOptions['move_after'])) {
 			$catOptions['move_after'] = 0;
+		}
 
-		if (!isset($catOptions['is_collapsible']))
+		if (!isset($catOptions['is_collapsible'])) {
 			$catOptions['is_collapsible'] = true;
+		}
 
 		// Don't log an edit right after.
 		$catOptions['dont_log'] = true;
 
-		$cat_columns = array(
+		$cat_columns = [
 			'name' => 'string-48',
 			'description' => 'string',
-		);
-		$cat_parameters = array(
+		];
+		$cat_parameters = [
 			$catOptions['cat_name'],
 			$catOptions['cat_desc'],
-		);
+		];
 
-		IntegrationHook::call('integrate_create_category', array(&$catOptions, &$cat_columns, &$cat_parameters));
+		IntegrationHook::call('integrate_create_category', [&$catOptions, &$cat_columns, &$cat_parameters]);
 
 		// Add the category to the database.
-		$category_id = Db::$db->insert('',
+		$category_id = Db::$db->insert(
+			'',
 			'{db_prefix}categories',
 			$cat_columns,
 			$cat_parameters,
-			array('id_cat'),
-			1
+			['id_cat'],
+			1,
 		);
 
 		// Set the given properties to the newly created category.
 		self::modify($category_id, $catOptions);
 
-		Logging::logAction('add_cat', array('catname' => $catOptions['cat_name']), 'admin');
+		Logging::logAction('add_cat', ['catname' => $catOptions['cat_name']], 'admin');
 
 		// Return the database ID of the category.
 		return $category_id;
@@ -529,67 +519,67 @@ public static function create(array $catOptions): int
 	 * @param array $categories The IDs of the categories to delete
 	 * @param int $moveBoardsTo The ID of the category to move any boards to or null to delete the boards
 	 */
-	public static function delete(array $categories, int $moveBoardsTo = null): void
+	public static function delete(array $categories, ?int $moveBoardsTo = null): void
 	{
 		self::getTree();
 
-		IntegrationHook::call('integrate_delete_category', array($categories, &$moveBoardsTo));
+		IntegrationHook::call('integrate_delete_category', [$categories, &$moveBoardsTo]);
 
 		// With no category set to move the boards to, delete them all.
-		if ($moveBoardsTo === null)
-		{
-			$boards_inside = array();
+		if ($moveBoardsTo === null) {
+			$boards_inside = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board
 				FROM {db_prefix}boards
 				WHERE id_cat IN ({array_int:category_list})',
-				array(
+				[
 					'category_list' => $categories,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards_inside[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($boards_inside))
+			if (!empty($boards_inside)) {
 				Board::delete($boards_inside, null);
+			}
 		}
 		// Make sure the safe category is really safe.
-		elseif (in_array($moveBoardsTo, $categories))
-		{
+		elseif (in_array($moveBoardsTo, $categories)) {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['cannot_move_to_deleted_category'], E_USER_ERROR);
 		}
 		// Move the boards inside the categories to a safe category.
-		else
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		else {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET id_cat = {int:new_parent_cat}
 				WHERE id_cat IN ({array_int:category_list})',
-				array(
+				[
 					'category_list' => $categories,
 					'new_parent_cat' => $moveBoardsTo,
-				)
+				],
 			);
 		}
 
 		// Do the deletion of the category itself
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}categories
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}categories
 			WHERE id_cat IN ({array_int:category_list})',
-			array(
+			[
 				'category_list' => $categories,
-			)
+			],
 		);
 
 		// Log what we've done.
-		foreach ($categories as $category)
-		{
-			Logging::logAction('delete_cat', array('catname' => self::$loaded[$category]['node']['name']), 'admin');
+		foreach ($categories as $category) {
+			Logging::logAction('delete_cat', ['catname' => self::$loaded[$category]['node']['name']], 'admin');
 		}
 
 		// Get all boards back into the right order.
@@ -605,20 +595,15 @@ public static function sort(array &$categories): void
 	{
 		$tree = self::getTreeOrder();
 
-		$ordered = array();
+		$ordered = [];
 
-		foreach ($tree['cats'] as $cat)
-		{
-			if (!empty($categories[$cat]))
-			{
+		foreach ($tree['cats'] as $cat) {
+			if (!empty($categories[$cat])) {
 				$ordered[$cat] = $categories[$cat];
 
-				if (is_array($ordered[$cat]) && !empty($ordered[$cat]['boards']))
-				{
+				if (is_array($ordered[$cat]) && !empty($ordered[$cat]['boards'])) {
 					Board::sort($ordered[$cat]['boards']);
-				}
-				elseif (is_object($ordered[$cat]) && !empty($ordered[$cat]->children))
-				{
+				} elseif (is_object($ordered[$cat]) && !empty($ordered[$cat]->children)) {
 					Board::sort($ordered[$cat]->children);
 				}
 			}
@@ -635,25 +620,28 @@ public static function sort(array &$categories): void
 	 */
 	public static function getTreeOrder(): array
 	{
-		if (!empty(self::$tree_order['boards']))
+		if (!empty(self::$tree_order['boards'])) {
 			return self::$tree_order;
+		}
 
-		if (($cached = CacheApi::get('board_order', 86400)) !== null)
-		{
+		if (($cached = CacheApi::get('board_order', 86400)) !== null) {
 			self::$tree_order = $cached;
+
 			return $cached;
 		}
 
-		$request = Db::$db->query('', '
-			SELECT b.id_board, b.id_cat
+		$request = Db::$db->query(
+			'',
+			'SELECT b.id_board, b.id_cat
 			FROM {db_prefix}categories AS c
 				JOIN {db_prefix}boards AS b ON (b.id_cat = c.id_cat)
-			ORDER BY c.cat_order, b.board_order'
+			ORDER BY c.cat_order, b.board_order',
 		);
-		foreach (Db::$db->fetch_all($request) as $row)
-		{
-			if (!in_array($row['id_cat'], self::$tree_order['cats']))
+
+		foreach (Db::$db->fetch_all($request) as $row) {
+			if (!in_array($row['id_cat'], self::$tree_order['cats'])) {
 				self::$tree_order['cats'][] = $row['id_cat'];
+			}
 
 			self::$tree_order['boards'][] = $row['id_board'];
 		}
@@ -673,21 +661,21 @@ public static function getTreeOrder(): array
 	 */
 	public static function getTree(): void
 	{
-		$selects = array(
+		$selects = [
 			'COALESCE(b.id_board, 0) AS id_board', 'b.name', 'b.description',
 			'b.id_parent', 'b.child_level', 'b.board_order', 'b.redirect',
 			'b.member_groups', 'b.deny_member_groups', 'b.id_profile',
 			'b.id_theme', 'b.override_theme', 'b.count_posts', 'b.num_posts',
 			'b.num_topics', 'c.id_cat', 'c.cat_order', 'c.can_collapse',
 			'c.name AS cat_name', 'c.description AS cat_desc',
-		);
-		$params = array();
-		$joins = array('LEFT JOIN {db_prefix}categories AS c ON (b.id_cat = c.id_cat)');
-		$where = array('{query_see_board}');
-		$order = array('c.cat_order', 'b.child_level', 'b.board_order');
+		];
+		$params = [];
+		$joins = ['LEFT JOIN {db_prefix}boards AS b ON (b.id_cat = c.id_cat)'];
+		$where = ['{query_see_board}'];
+		$order = ['c.cat_order', 'b.child_level', 'b.board_order'];
 
 		// Let mods add extra columns, parameters, etc., to the SELECT query
-		IntegrationHook::call('integrate_pre_boardtree', array(&$selects, &$params, &$joins, &$where, &$order));
+		IntegrationHook::call('integrate_pre_boardtree', [&$selects, &$params, &$joins, &$where, &$order]);
 
 		$selects = array_unique($selects);
 		$params = array_unique($params);
@@ -696,20 +684,20 @@ public static function getTree(): void
 		$order = array_unique($order);
 
 		// Getting all the board and category information you'd ever wanted.
-		self::$loaded = array();
+		self::$loaded = [];
 		$last_board_order = 0;
+		$prevBoard = 0;
+		$curLevel = 0;
 
-		foreach (Board::queryData($selects, $params, $joins, $where, $order) as $row)
-		{
-			if (!isset(self::$loaded[$row['id_cat']]))
-			{
-				self::init($row['id_cat'], array(
+		foreach (self::queryData($selects, $params, $joins, $where, $order) as $row) {
+			if (!isset(self::$loaded[$row['id_cat']])) {
+				self::init($row['id_cat'], [
 					'name' => $row['cat_name'],
 					'description' => $row['cat_desc'],
 					'order' => $row['cat_order'],
 					'can_collapse' => $row['can_collapse'],
 					'last_board_order' => $last_board_order,
-				));
+				]);
 				$prevBoard = 0;
 				$curLevel = 0;
 			}
@@ -718,10 +706,10 @@ public static function getTree(): void
 
 			unset($row['id_cat'], $row['cat_name'], $row['cat_desc'], $row['cat_order'], $row['can_collapse']);
 
-			if (!empty($row['id_board']))
-			{
-				if ($row['child_level'] != $curLevel)
+			if (!empty($row['id_board'])) {
+				if ($row['child_level'] != $curLevel) {
 					$prevBoard = 0;
+				}
 
 				$row['member_groups'] = explode(',', $row['member_groups']);
 				$row['deny_member_groups'] = explode(',', $row['deny_member_groups']);
@@ -732,29 +720,27 @@ public static function getTree(): void
 				$prevBoard = $row['id_board'];
 				$last_board_order = $row['board_order'];
 
-				if (empty($row['child_level']))
-				{
+				if (empty($row['child_level'])) {
 					Board::$loaded[$row['id_board']]->is_first = empty(self::$loaded[$row['cat']->id]['children']);
 
 					self::$loaded[$row['cat']->id]->children[$row['id_board']] = Board::$loaded[$row['id_board']];
-				}
-				else
-				{
+				} else {
 					// Parent doesn't exist!
-					if (!isset(Board::$loaded[$row['id_parent']]))
-						ErrorHandler::fatalLang('no_valid_parent', false, array($row['name']));
+					if (!isset(Board::$loaded[$row['id_parent']])) {
+						ErrorHandler::fatalLang('no_valid_parent', false, [$row['name']]);
+					}
 
 					// Wrong childlevel...we can silently fix this...
-					if (Board::$loaded[$row['id_parent']]->child_level != $row['child_level'] - 1)
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}boards
+					if (Board::$loaded[$row['id_parent']]->child_level != $row['child_level'] - 1) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}boards
 							SET child_level = {int:new_child_level}
 							WHERE id_board = {int:selected_board}',
-							array(
+							[
 								'new_child_level' => Board::$loaded[$row['id_parent']]->child_level + 1,
 								'selected_board' => $row['id_board'],
-							)
+							],
 						);
 
 						Board::$loaded[$row['id_board']]->child_level = Board::$loaded[$row['id_parent']]->child_level + 1;
@@ -766,15 +752,14 @@ public static function getTree(): void
 			}
 
 			// If mods want to do anything with this board before we move on, now's the time
-			IntegrationHook::call('integrate_boardtree_board', array($row));
+			IntegrationHook::call('integrate_boardtree_board', [$row]);
 		}
 
 		// Get a list of all the boards in each category (using recursion).
-		self::$boardList = array();
+		self::$boardList = [];
 
-		foreach (self::$loaded as $id => $node)
-		{
-			self::$boardList[$id] = array();
+		foreach (self::$loaded as $id => $node) {
+			self::$boardList[$id] = [];
 			self::recursiveBoards(self::$boardList[$id], $node);
 		}
 	}
@@ -789,11 +774,11 @@ public static function getTree(): void
 	 */
 	public static function recursiveBoards(&$list, &$tree): void
 	{
-		if (empty($tree->children))
+		if (empty($tree->children)) {
 			return;
+		}
 
-		foreach ($tree->children as $child)
-		{
+		foreach ($tree->children as $child) {
 			$list[] = $child->id;
 			self::recursiveBoards($list, $child);
 		}
@@ -816,22 +801,22 @@ public static function recursiveBoards(&$list, &$tree): void
 	 * @param int $id The ID number of the category.
 	 * @param array $props Array of properties to set.
 	 */
-	protected function __construct(int $id, array $props = array())
+	protected function __construct(int $id, array $props = [])
 	{
 		// No props provided, so get the standard ones.
-		if (empty($props))
-		{
-			$request = Db::$db->query('', '
-				SELECT *
+		if (empty($props)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT *
 				FROM {db_prefix}categories
 				WHERE id_cat = {int:id}
 				LIMIT 1',
-				array(
+				[
 					'id' => $id,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) > 0)
-			{
+
+			if (Db::$db->num_rows($request) > 0) {
 				$props = Db::$db->fetch_all($request);
 			}
 			Db::$db->free_result($request);
@@ -841,30 +826,74 @@ protected function __construct(int $id, array $props = array())
 		$this->set($props);
 		self::$loaded[$this->id] = $this;
 
-		if (count(self::$loaded) > 1)
-		{
+		if (count(self::$loaded) > 1) {
 			uasort(
 				self::$loaded,
-				function ($a, $b)
-				{
+				function ($a, $b) {
 					return ($a->order ?? 0) <=> ($b->order ?? 0);
-				}
+				},
 			);
 
-			foreach (self::$loaded as $id => $info)
+			foreach (self::$loaded as $id => $info) {
 				self::$loaded[$id]->is_first = false;
+			}
 
 			self::$loaded[array_key_first(self::$loaded)]->is_first = true;
-		}
-		else
-		{
+		} else {
 			$this->is_first = true;
 		}
 	}
+
+	/*************************
+	 * Internal static methods
+	 *************************/
+
+	/**
+	 * Generator that runs queries about category data and yields the result rows.
+	 *
+	 * @param array $selects Table columns to select.
+	 * @param array $params Parameters to substitute into query text.
+	 * @param array $joins Zero or more *complete* JOIN clauses.
+	 *    E.g.: 'LEFT JOIN {db_prefix}boards AS b ON (c.id_cat = b.id_cat)'
+	 *    Note: 'FROM {db_prefix}categories AS c' is always part of the query.
+	 * @param array $where Zero or more conditions for the WHERE clause.
+	 *    Conditions will be placed in parentheses and concatenated with AND.
+	 *    If this is left empty, no WHERE clause will be used.
+	 * @param array $order Zero or more conditions for the ORDER BY clause.
+	 *    If this is left empty, no ORDER BY clause will be used.
+	 * @param array $group Zero or more conditions for the GROUP BY clause.
+	 *    If this is left empty, no GROUP BY clause will be used.
+	 * @param int|string $limit Maximum number of results to retrieve.
+	 *    If this is left empty, all results will be retrieved.
+	 *
+	 * @return Generator<array> Iterating over the result gives database rows.
+	 */
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
+	{
+		$request = Db::$db->query(
+			'',
+			'SELECT
+				' . implode(', ', $selects) . '
+			FROM {db_prefix}categories AS c' . (empty($joins) ? '' : '
+				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
+			WHERE (' . implode(') AND (', $where) . ')') . (empty($group) ? '' : '
+			GROUP BY ' . implode(', ', $group)) . (empty($order) ? '' : '
+			ORDER BY ' . implode(', ', $order)) . (!empty($limit) ? '
+			LIMIT ' . $limit : ''),
+			$params,
+		);
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			yield $row;
+		}
+
+		Db::$db->free_result($request);
+	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Category::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Category::exportStatic')) {
 	Category::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Class-BrowserDetect.php b/Sources/Class-BrowserDetect.php
index c13aa2df8b..4395fc95cc 100644
--- a/Sources/Class-BrowserDetect.php
+++ b/Sources/Class-BrowserDetect.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\BrowserDetector', '\\browser_detector');
 
diff --git a/Sources/Class-CurlFetchWeb.php b/Sources/Class-CurlFetchWeb.php
index f0998a136b..0baf341d8a 100644
--- a/Sources/Class-CurlFetchWeb.php
+++ b/Sources/Class-CurlFetchWeb.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\WebFetch\\APIs\\CurlFetcher', '\\curl_fetch_web_data');
 
diff --git a/Sources/Class-Graphics.php b/Sources/Class-Graphics.php
index b31a905fa5..6159808d0a 100644
--- a/Sources/Class-Graphics.php
+++ b/Sources/Class-Graphics.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\Graphics\\Gif\\ColorTable', '\\gif_color_table');
 class_alias('SMF\\Graphics\\Gif\\File', '\\gif_file');
diff --git a/Sources/Class-Package.php b/Sources/Class-Package.php
index 62d7b0add8..49b3792b6d 100644
--- a/Sources/Class-Package.php
+++ b/Sources/Class-Package.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\PackageManager\\XmlArray', '\\xmlArray');
 class_alias('SMF\\PackageManager\\FtpConnection', '\\ftp_connection');
diff --git a/Sources/Class-Punycode.php b/Sources/Class-Punycode.php
index a1a229b8a7..134d2a9a16 100644
--- a/Sources/Class-Punycode.php
+++ b/Sources/Class-Punycode.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\Punycode', '\\Punycode');
 
diff --git a/Sources/Class-SearchAPI.php b/Sources/Class-SearchAPI.php
index 71a67efbe1..793d8cbf1f 100644
--- a/Sources/Class-SearchAPI.php
+++ b/Sources/Class-SearchAPI.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\Search\\SearchApiInterface', '\\search_api_interface');
 class_alias('SMF\\Search\\SearchApi', '\\search_api');
diff --git a/Sources/Class-TOTP.php b/Sources/Class-TOTP.php
index c2c40f5767..8e3b0dbfc4 100644
--- a/Sources/Class-TOTP.php
+++ b/Sources/Class-TOTP.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\TOTP\\Auth', '\\TOTP\\Auth');
 
diff --git a/Sources/Config.php b/Sources/Config.php
index c7b2010156..28a4c441ca 100644
--- a/Sources/Config.php
+++ b/Sources/Config.php
@@ -30,7 +30,7 @@ class Config
 	 */
 	public static bool $backward_compatibility = true;
 
-	########## Maintenance ##########
+	# ######### Maintenance ##########
 	/**
 	 * @var int 0, 1, 2
 	 *
@@ -53,7 +53,7 @@ class Config
 	 */
 	public static $mmessage;
 
-	########## Forum info ##########
+	# ######### Forum info ##########
 	/**
 	 * @var string
 	 *
@@ -85,7 +85,7 @@ class Config
 	 */
 	public static $cookiename;
 
-	########## Database info ##########
+	# ######### Database info ##########
 	/**
 	 * @var string
 	 *
@@ -163,7 +163,7 @@ class Config
 	 */
 	public static $db_mb4;
 
-	########## Cache info ##########
+	# ######### Cache info ##########
 	/**
 	 * @var string
 	 *
@@ -199,7 +199,7 @@ class Config
 	 */
 	public static $cachedir_sqlite;
 
-	########## Image proxy ##########
+	# ######### Image proxy ##########
 	/**
 	 * @var bool
 	 *
@@ -219,7 +219,7 @@ class Config
 	 */
 	public static $image_proxy_maxsize;
 
-	########## Directories/Files ##########
+	# ######### Directories/Files ##########
 	# Note: These directories do not have to be changed unless you move things.
 	/**
 	 * @var string
@@ -246,7 +246,7 @@ class Config
 	 */
 	public static $tasksdir;
 
-	######### Legacy settings #########
+	# ######## Legacy settings #########
 	/**
 	 * @var string
 	 *
@@ -254,7 +254,7 @@ class Config
 	 */
 	public static $db_character_set;
 
-	######### Developer settings #########
+	# ######## Developer settings #########
 	/**
 	 * @var bool
 	 *
@@ -269,21 +269,21 @@ class Config
 	 */
 	public static $db_last_error;
 
-	######### Custom settings #########
+	# ######## Custom settings #########
 	/**
 	 * @var array
 	 *
 	 * Holds any custom settings found in Settings.php.
 	 */
-	public static $custom = array();
+	public static $custom = [];
 
-	######### Runtime configuration values #########
+	# ######## Runtime configuration values #########
 	/**
 	 * @var array
 	 *
 	 * Holds settings loaded from the settings table in the database.
 	 */
-	public static $modSettings = array();
+	public static $modSettings = [];
 
 	/**
 	 * @var string
@@ -344,8 +344,8 @@ class Config
 	 *   expression to decide where the replacement entry should be inserted.
 	 *   Note: 'replace_pattern' should be avoided unless ABSOLUTELY necessary.
 	 */
-	protected static $settings_defs = array(
-		array(
+	protected static $settings_defs = [
+		[
 			'text' =>
 				"\n" .
 				'/**' . "\n" .
@@ -362,8 +362,8 @@ class Config
 				' */' . "\n" .
 				'',
 			'search_pattern' => '~/\*\*.*?@package\h+SMF\b.*?\*/\n{0,2}~s',
-		),
-		'maintenance' => array(
+		],
+		'maintenance' => [
 			'text' => <<<'END'
 
 				########## Maintenance ##########
@@ -378,8 +378,8 @@ class Config
 				END,
 			'default' => 0,
 			'type' => 'integer',
-		),
-		'mtitle' => array(
+		],
+		'mtitle' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -389,8 +389,8 @@ class Config
 				END,
 			'default' => 'Maintenance Mode',
 			'type' => 'string',
-		),
-		'mmessage' => array(
+		],
+		'mmessage' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -400,8 +400,8 @@ class Config
 				END,
 			'default' => 'Okay faithful users...we\'re attempting to restore an older backup of the database...news will be posted once we\'re back!',
 			'type' => 'string',
-		),
-		'mbname' => array(
+		],
+		'mbname' => [
 			'text' => <<<'END'
 
 				########## Forum Info ##########
@@ -413,8 +413,8 @@ class Config
 				END,
 			'default' => 'My Community',
 			'type' => 'string',
-		),
-		'language' => array(
+		],
+		'language' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -424,8 +424,8 @@ class Config
 				END,
 			'default' => 'english',
 			'type' => 'string',
-		),
-		'boardurl' => array(
+		],
+		'boardurl' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -435,8 +435,8 @@ class Config
 				END,
 			'default' => 'http://127.0.0.1/smf',
 			'type' => 'string',
-		),
-		'webmaster_email' => array(
+		],
+		'webmaster_email' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -446,8 +446,8 @@ class Config
 				END,
 			'default' => 'noreply@myserver.com',
 			'type' => 'string',
-		),
-		'cookiename' => array(
+		],
+		'cookiename' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -457,8 +457,8 @@ class Config
 				END,
 			'default' => 'SMFCookie11',
 			'type' => 'string',
-		),
-		'auth_secret' => array(
+		],
+		'auth_secret' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -474,8 +474,8 @@ class Config
 			'default' => null,
 			'auto_delete' => 1,
 			'type' => 'string',
-		),
-		'db_type' => array(
+		],
+		'db_type' => [
 			'text' => <<<'END'
 
 				########## Database Info ##########
@@ -488,8 +488,8 @@ class Config
 				END,
 			'default' => 'mysql',
 			'type' => 'string',
-		),
-		'db_port' => array(
+		],
+		'db_port' => [
 			'text' => <<<'END'
 				/**
 				 * @var int
@@ -500,8 +500,8 @@ class Config
 				END,
 			'default' => 0,
 			'type' => 'integer',
-		),
-		'db_server' => array(
+		],
+		'db_server' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -512,8 +512,8 @@ class Config
 			'default' => 'localhost',
 			'required' => true,
 			'type' => 'string',
-		),
-		'db_name' => array(
+		],
+		'db_name' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -524,8 +524,8 @@ class Config
 			'default' => 'smf',
 			'required' => true,
 			'type' => 'string',
-		),
-		'db_user' => array(
+		],
+		'db_user' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -536,8 +536,8 @@ class Config
 			'default' => 'root',
 			'required' => true,
 			'type' => 'string',
-		),
-		'db_passwd' => array(
+		],
+		'db_passwd' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -549,8 +549,8 @@ class Config
 			'required' => true,
 			'type' => 'string',
 			'is_password' => true,
-		),
-		'ssi_db_user' => array(
+		],
+		'ssi_db_user' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -560,8 +560,8 @@ class Config
 				END,
 			'default' => '',
 			'type' => 'string',
-		),
-		'ssi_db_passwd' => array(
+		],
+		'ssi_db_passwd' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -572,8 +572,8 @@ class Config
 			'default' => '',
 			'type' => 'string',
 			'is_password' => true,
-		),
-		'db_prefix' => array(
+		],
+		'db_prefix' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -585,8 +585,8 @@ class Config
 			'default' => 'smf_',
 			'required' => true,
 			'type' => 'string',
-		),
-		'db_persist' => array(
+		],
+		'db_persist' => [
 			'text' => <<<'END'
 				/**
 				 * @var bool
@@ -596,8 +596,8 @@ class Config
 				END,
 			'default' => false,
 			'type' => 'boolean',
-		),
-		'db_error_send' => array(
+		],
+		'db_error_send' => [
 			'text' => <<<'END'
 				/**
 				 * @var bool
@@ -607,8 +607,8 @@ class Config
 				END,
 			'default' => false,
 			'type' => 'boolean',
-		),
-		'db_mb4' => array(
+		],
+		'db_mb4' => [
 			'text' => <<<'END'
 				/**
 				 * @var null|bool
@@ -618,9 +618,9 @@ class Config
 				 */
 				END,
 			'default' => null,
-			'type' => array('NULL', 'boolean'),
-		),
-		'cache_accelerator' => array(
+			'type' => ['NULL', 'boolean'],
+		],
+		'cache_accelerator' => [
 			'text' => <<<'END'
 
 				########## Cache Info ##########
@@ -633,8 +633,8 @@ class Config
 				END,
 			'default' => '',
 			'type' => 'string',
-		),
-		'cache_enable' => array(
+		],
+		'cache_enable' => [
 			'text' => <<<'END'
 				/**
 				 * @var int
@@ -645,8 +645,8 @@ class Config
 				END,
 			'default' => 0,
 			'type' => 'integer',
-		),
-		'cache_memcached' => array(
+		],
+		'cache_memcached' => [
 			'text' => <<<'END'
 				/**
 				 * @var array
@@ -657,8 +657,8 @@ class Config
 				END,
 			'default' => '',
 			'type' => 'string',
-		),
-		'cachedir' => array(
+		],
+		'cachedir' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -669,8 +669,8 @@ class Config
 			'default' => 'dirname(__FILE__) . \'/cache\'',
 			'raw_default' => true,
 			'type' => 'string',
-		),
-		'cachedir_sqlite' => array(
+		],
+		'cachedir_sqlite' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -682,8 +682,8 @@ class Config
 			'default' => '',
 			'auto_delete' => 2,
 			'type' => 'string',
-		),
-		'image_proxy_enabled' => array(
+		],
+		'image_proxy_enabled' => [
 			'text' => <<<'END'
 
 				########## Image Proxy ##########
@@ -695,8 +695,8 @@ class Config
 				END,
 			'default' => true,
 			'type' => 'boolean',
-		),
-		'image_proxy_secret' => array(
+		],
+		'image_proxy_secret' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -706,8 +706,8 @@ class Config
 				END,
 			'default' => 'smfisawesome',
 			'type' => 'string',
-		),
-		'image_proxy_maxsize' => array(
+		],
+		'image_proxy_maxsize' => [
 			'text' => <<<'END'
 				/**
 				 * @var int
@@ -717,8 +717,8 @@ class Config
 				END,
 			'default' => 5192,
 			'type' => 'integer',
-		),
-		'boarddir' => array(
+		],
+		'boarddir' => [
 			'text' => <<<'END'
 
 				########## Directories/Files ##########
@@ -732,8 +732,8 @@ class Config
 			'default' => 'dirname(__FILE__)',
 			'raw_default' => true,
 			'type' => 'string',
-		),
-		'sourcedir' => array(
+		],
+		'sourcedir' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -744,8 +744,8 @@ class Config
 			'default' => 'dirname(__FILE__) . \'/Sources\'',
 			'raw_default' => true,
 			'type' => 'string',
-		),
-		'packagesdir' => array(
+		],
+		'packagesdir' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -756,8 +756,8 @@ class Config
 			'default' => 'dirname(__FILE__) . \'/Packages\'',
 			'raw_default' => true,
 			'type' => 'string',
-		),
-		'tasksdir' => array(
+		],
+		'tasksdir' => [
 			'text' => <<<'END'
 				/**
 				 * @var string
@@ -765,11 +765,11 @@ class Config
 				 * Path to the tasks directory.
 				 */
 				END,
-			'default' => '$sourcedir . \'/tasks\'',
+			'default' => '$sourcedir . \'/Tasks\'',
 			'raw_default' => true,
 			'type' => 'string',
-		),
-		array(
+		],
+		[
 			'text' => <<<'END'
 
 				# Make sure the paths are correct... at least try to fix them.
@@ -777,16 +777,16 @@ class Config
 					$boarddir = dirname(__FILE__);
 				if (!is_dir(realpath($sourcedir)) && is_dir($boarddir . '/Sources'))
 					$sourcedir = $boarddir . '/Sources';
-				if (!is_dir(realpath($tasksdir)) && is_dir($sourcedir . '/tasks'))
-					$tasksdir = $sourcedir . '/tasks';
+				if (!is_dir(realpath($tasksdir)) && is_dir($sourcedir . '/Tasks'))
+					$tasksdir = $sourcedir . '/Tasks';
 				if (!is_dir(realpath($packagesdir)) && is_dir($boarddir . '/Packages'))
 					$packagesdir = $boarddir . '/Packages';
 				if (!is_dir(realpath($cachedir)) && is_dir($boarddir . '/cache'))
 					$cachedir = $boarddir . '/cache';
 				END,
-			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?'.'>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
-		),
-		'db_character_set' => array(
+			'search_pattern' => '~\n?(#[^\n]+)?(?:\n\h*if\s*\((?:\!file_exists\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)|\!is_dir\(realpath\(\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)\)\))[^;]+\n\h*\$(?' . '>boarddir|sourcedir|tasksdir|packagesdir|cachedir)[^\n]+;)+~sm',
+		],
+		'db_character_set' => [
 			'text' => <<<'END'
 
 				######### Legacy Settings #########
@@ -798,8 +798,8 @@ class Config
 				END,
 			'default' => 'utf8',
 			'type' => 'string',
-		),
-		'db_show_debug' => array(
+		],
+		'db_show_debug' => [
 			'text' => <<<'END'
 
 				######### Developer Settings #########
@@ -812,8 +812,8 @@ class Config
 			'default' => false,
 			'auto_delete' => 2,
 			'type' => 'boolean',
-		),
-		array(
+		],
+		[
 			'text' => <<<'END'
 
 				########## Error-Catching ##########
@@ -830,20 +830,20 @@ class Config
 				END,
 			// Designed to match both 2.0 and 2.1 versions of this code.
 			'search_pattern' => '~\n?#+ Error.Catching #+\n[^\n]*?settings\.\n(?:\$db_last_error = \d{1,11};|if \(file_exists.*?\$db_last_error = 0;(?' . '>\s*}))(?=\n|\?' . '>|$)~s',
-		),
+		],
 		// Temporary variable used during the upgrade process.
-		'upgradeData' => array(
+		'upgradeData' => [
 			'default' => '',
 			'auto_delete' => 1,
 			'type' => 'string',
-		),
+		],
 		// This should be removed if found.
-		'db_last_error' => array(
+		'db_last_error' => [
 			'default' => 0,
 			'auto_delete' => 1,
 			'type' => 'integer',
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var string
@@ -878,14 +878,12 @@ class Config
 	public static function load(): void
 	{
 		// Load Settings.php.
-		if (!in_array(SMF_SETTINGS_FILE, get_included_files()))
-		{
-			require(SMF_SETTINGS_FILE);
+		if (!in_array(SMF_SETTINGS_FILE, get_included_files())) {
+			require SMF_SETTINGS_FILE;
 		}
 		// If it has already been included, make sure to avoid possible problems
 		// with already defined constants, etc.
-		else
-		{
+		else {
 			extract((array) self::getCurrentSettings(filemtime(SMF_SETTINGS_FILE), SMF_SETTINGS_FILE));
 		}
 
@@ -900,31 +898,27 @@ public static function load(): void
 	 */
 	public static function set(array $settings): void
 	{
-		foreach ($settings as $var => $val)
-		{
-			if (property_exists(__CLASS__, $var))
+		foreach ($settings as $var => $val) {
+			if (property_exists(__CLASS__, $var)) {
 				self::${$var} = $val;
-			else
+			} else {
 				self::$custom[$var] = $val;
+			}
 		}
 
 		// Anything missing?
 		$class_vars = get_class_vars(__CLASS__);
-		foreach ($class_vars['settings_defs'] as $var => $def)
-		{
-			if (is_string($var) && property_exists(__CLASS__, $var) && !isset(self::${$var}))
-			{
-				if (!empty($def['raw_default']))
-				{
-					$default = strtr($def['default'], array(
+
+		foreach ($class_vars['settings_defs'] as $var => $def) {
+			if (is_string($var) && property_exists(__CLASS__, $var) && !isset(self::${$var})) {
+				if (!empty($def['raw_default'])) {
+					$default = strtr($def['default'], [
 						'__FILE__' => var_export(SMF_SETTINGS_FILE, true),
 						'__DIR__' => var_export(dirname(SMF_SETTINGS_FILE), true),
-					));
+					]);
 
 					self::${$var} = eval($default);
-				}
-				else
-				{
+				} else {
 					self::${$var} = $def['default'];
 				}
 
@@ -934,42 +928,33 @@ public static function set(array $settings): void
 		}
 
 		// Ensure there are no trailing slashes in these settings.
-		foreach (array('boardurl', 'boarddir', 'sourcedir', 'packagesdir', 'tasksdir', 'cachedir') as $var)
-		{
-			self::${$var} = rtrim(self::${$var}, "\\/");
+		foreach (['boardurl', 'boarddir', 'sourcedir', 'packagesdir', 'tasksdir', 'cachedir'] as $var) {
+			self::${$var} = rtrim(self::${$var}, '\\/');
 		}
 
 		// Make sure the paths are correct... at least try to fix them.
 		// @todo Remove similar path correction code from Settings.php.
-		if (empty(self::$boarddir) || !is_dir(realpath(self::$boarddir)))
-		{
+		if (empty(self::$boarddir) || !is_dir(realpath(self::$boarddir))) {
 			self::$boarddir = !empty($_SERVER['SCRIPT_FILENAME']) ? dirname(realpath($_SERVER['SCRIPT_FILENAME'])) : dirname(__DIR__);
 		}
 
-		if ((empty(self::$sourcedir) || !is_dir(realpath(self::$sourcedir))) && is_dir(self::$boarddir . '/Sources'))
-		{
+		if ((empty(self::$sourcedir) || !is_dir(realpath(self::$sourcedir))) && is_dir(self::$boarddir . '/Sources')) {
 			self::$sourcedir = self::$boarddir . '/Sources';
 		}
 
-		if ((empty(self::$tasksdir) || !is_dir(realpath(self::$tasksdir))) && is_dir(self::$sourcedir . '/tasks'))
-		{
-			self::$tasksdir = self::$sourcedir . '/tasks';
+		if ((empty(self::$tasksdir) || !is_dir(realpath(self::$tasksdir))) && is_dir(self::$sourcedir . '/Tasks')) {
+			self::$tasksdir = self::$sourcedir . '/Tasks';
 		}
 
-		if ((empty(self::$packagesdir) || !is_dir(realpath(self::$packagesdir))) && is_dir(self::$boarddir . '/Packages'))
-		{
+		if ((empty(self::$packagesdir) || !is_dir(realpath(self::$packagesdir))) && is_dir(self::$boarddir . '/Packages')) {
 			self::$packagesdir = self::$boarddir . '/Packages';
 		}
 
 		// Make absolutely sure the cache directory is defined and writable.
-		if (empty(self::$cachedir) || !is_dir(self::$cachedir) || !is_writable(self::$cachedir))
-		{
-			if (is_dir(self::$boarddir . '/cache') && is_writable(self::$boarddir . '/cache'))
-			{
+		if (empty(self::$cachedir) || !is_dir(self::$cachedir) || !is_writable(self::$cachedir)) {
+			if (is_dir(self::$boarddir . '/cache') && is_writable(self::$boarddir . '/cache')) {
 				self::$cachedir = self::$boarddir . '/cache';
-			}
-			else
-			{
+			} else {
 				self::$cachedir = self::getTempDir() . '/smf_cache_' . md5(self::$boarddir);
 				@mkdir(self::$cachedir, 0750);
 			}
@@ -980,16 +965,11 @@ public static function set(array $settings): void
 
 		// For backward compatibility, make settings available as global variables.
 		// Must do this manually because SMF\BackwardCompatibility is not loaded yet.
-		if (self::$backward_compatibility && !self::$exported)
-		{
-			foreach ($settings as $var => $val)
-			{
-				if (property_exists(__CLASS__, $var))
-				{
+		if (self::$backward_compatibility && !self::$exported) {
+			foreach ($settings as $var => $val) {
+				if (property_exists(__CLASS__, $var)) {
 					$GLOBALS[$var] = &self::${$var};
-				}
-				else
-				{
+				} else {
 					$GLOBALS[$var] = &self::$custom[$var];
 				}
 			}
@@ -998,7 +978,7 @@ public static function set(array $settings): void
 			$GLOBALS['scripturl'] = &self::$scripturl;
 
 			eval('function reloadSettings() { return ' . __CLASS__ . '::reloadModSettings(); }');
-			eval('function updateSettings() { return ' . __CLASS__ . '::updateModSettings(); }');
+			eval('function updateSettings(...$args) { return ' . __CLASS__ . '::updateModSettings(...$args); }');
 			eval('function get_auth_secret() { return ' . __CLASS__ . '::getAuthSecret(); }');
 			eval('function get_settings_defs() { return ' . __CLASS__ . '::getSettingsDefs(); }');
 			eval('function updateSettingsFile(...$args) { return ' . __CLASS__ . '::updateSettingsFile(...$args); }');
@@ -1024,56 +1004,52 @@ public static function reloadModSettings(): void
 		Cache\CacheApi::load();
 
 		// Try to load it from the cache first; it'll never get cached if the setting is off.
-		if ((self::$modSettings = Cache\CacheApi::get('modSettings', 90)) == null)
-		{
-			self::$modSettings = array();
+		if ((self::$modSettings = Cache\CacheApi::get('modSettings', 90)) == null) {
+			self::$modSettings = [];
 
-			$request = Db\DatabaseApi::$db->query('', '
-				SELECT variable, value
+			$request = Db\DatabaseApi::$db->query(
+				'',
+				'SELECT variable, value
 				FROM {db_prefix}settings',
-				array(
-				)
+				[
+				],
 			);
-			if (!$request)
-			{
+
+			if (!$request) {
 				ErrorHandler::displayDbError();
 			}
-			foreach (Db\DatabaseApi::$db->fetch_all($request) as $row)
-			{
+
+			foreach (Db\DatabaseApi::$db->fetch_all($request) as $row) {
 				self::$modSettings[$row['variable']] = $row['value'];
 			}
 			Db\DatabaseApi::$db->free_result($request);
 
 			// Do a few things to protect against missing settings or settings with invalid values...
-			if (empty(self::$modSettings['defaultMaxTopics']) || self::$modSettings['defaultMaxTopics'] <= 0 || self::$modSettings['defaultMaxTopics'] > 999)
-			{
+			if (empty(self::$modSettings['defaultMaxTopics']) || self::$modSettings['defaultMaxTopics'] <= 0 || self::$modSettings['defaultMaxTopics'] > 999) {
 				self::$modSettings['defaultMaxTopics'] = 20;
 			}
 
-			if (empty(self::$modSettings['defaultMaxMessages']) || self::$modSettings['defaultMaxMessages'] <= 0 || self::$modSettings['defaultMaxMessages'] > 999)
-			{
+			if (empty(self::$modSettings['defaultMaxMessages']) || self::$modSettings['defaultMaxMessages'] <= 0 || self::$modSettings['defaultMaxMessages'] > 999) {
 				self::$modSettings['defaultMaxMessages'] = 15;
 			}
 
-			if (empty(self::$modSettings['defaultMaxMembers']) || self::$modSettings['defaultMaxMembers'] <= 0 || self::$modSettings['defaultMaxMembers'] > 999)
-			{
+			if (empty(self::$modSettings['defaultMaxMembers']) || self::$modSettings['defaultMaxMembers'] <= 0 || self::$modSettings['defaultMaxMembers'] > 999) {
 				self::$modSettings['defaultMaxMembers'] = 30;
 			}
 
-			if (empty(self::$modSettings['defaultMaxListItems']) || self::$modSettings['defaultMaxListItems'] <= 0 || self::$modSettings['defaultMaxListItems'] > 999)
-			{
+			if (empty(self::$modSettings['defaultMaxListItems']) || self::$modSettings['defaultMaxListItems'] <= 0 || self::$modSettings['defaultMaxListItems'] > 999) {
 				self::$modSettings['defaultMaxListItems'] = 15;
 			}
 
-			if (!is_array(self::$modSettings['attachmentUploadDir']))
-			{
+			if (!is_array(self::$modSettings['attachmentUploadDir'])) {
 				$attachmentUploadDir = Utils::jsonDecode(self::$modSettings['attachmentUploadDir'], true, false);
 
 				self::$modSettings['attachmentUploadDir'] = !empty($attachmentUploadDir) ? $attachmentUploadDir : self::$modSettings['attachmentUploadDir'];
 			}
 
-			if (!empty(Cache\CacheApi::$enable))
+			if (!empty(Cache\CacheApi::$enable)) {
 				Cache\CacheApi::put('modSettings', self::$modSettings, 90);
+			}
 		}
 
 		// Going anything further when the files don't match the database can make nasty messes (unless we're actively installing or upgrading)
@@ -1087,18 +1063,18 @@ public static function reloadModSettings(): void
 			)
 			&& !empty(self::$modSettings['smfVersion'])
 			&& version_compare(
-				strtolower(strtr(self::$modSettings['smfVersion'], array(' ' => '.'))),
-				strtolower(strtr(SMF_VERSION, array(' ' => '.'))),
-				'!='
+				strtolower(strtr(self::$modSettings['smfVersion'], [' ' => '.'])),
+				strtolower(strtr(SMF_VERSION, [' ' => '.'])),
+				'!=',
 			)
-		)
-		{
+		) {
 			// Wipe the cached self::$modSettings values so they don't interfere with anything later.
 			Cache\CacheApi::put('modSettings', null);
 
 			// Redirect to the upgrader if we can.
-			if (file_exists(self::$boarddir . '/upgrade.php'))
+			if (file_exists(self::$boarddir . '/upgrade.php')) {
 				header('location: ' . self::$boardurl . '/upgrade.php');
+			}
 
 			die('SMF file version (' . SMF_VERSION . ') does not match SMF database version (' . self::$modSettings['smfVersion'] . ').<br>Run the SMF upgrader to fix this.<br><a href="https://wiki.simplemachines.org/smf/Upgrading">More information</a>.');
 		}
@@ -1109,77 +1085,64 @@ public static function reloadModSettings(): void
 		self::$modSettings['browser_cache'] = !empty(self::$modSettings['browser_cache']) ? (int) self::$modSettings['browser_cache'] : 0;
 
 		// Disable image proxy if we don't have SSL enabled
-		if (empty(self::$modSettings['force_ssl']))
+		if (empty(self::$modSettings['force_ssl'])) {
 			self::$image_proxy_enabled = false;
+		}
 
 		// Setting the timezone is a requirement for some functions.
-		if (isset(self::$modSettings['default_timezone']) && in_array(self::$modSettings['default_timezone'], timezone_identifiers_list()))
-		{
+		if (isset(self::$modSettings['default_timezone']) && in_array(self::$modSettings['default_timezone'], timezone_identifiers_list())) {
 			date_default_timezone_set(self::$modSettings['default_timezone']);
-		}
-		else
-		{
+		} else {
 			// Get PHP's default timezone, if set
 			$ini_tz = ini_get('date.timezone');
 
 			self::$modSettings['default_timezone'] = !empty($ini_tz) ? $ini_tz : '';
 
 			// If date.timezone is unset, invalid, or just plain weird, make a best guess
-			if (!in_array(self::$modSettings['default_timezone'], timezone_identifiers_list()))
-			{
+			if (!in_array(self::$modSettings['default_timezone'], timezone_identifiers_list())) {
 				$server_offset = @mktime(0, 0, 0, 1, 1, 1970) * -1;
 				self::$modSettings['default_timezone'] = timezone_name_from_abbr('', $server_offset, 0);
 
-				if (empty(self::$modSettings['default_timezone']))
+				if (empty(self::$modSettings['default_timezone'])) {
 					self::$modSettings['default_timezone'] = 'UTC';
+				}
 			}
 
 			date_default_timezone_set(self::$modSettings['default_timezone']);
 		}
 
 		// Check the load averages?
-		if (!empty(self::$modSettings['loadavg_enable']))
-		{
-			if ((self::$modSettings['load_average'] = Cache\CacheApi::get('loadavg', 90)) == null)
-			{
+		if (!empty(self::$modSettings['loadavg_enable'])) {
+			if ((self::$modSettings['load_average'] = Cache\CacheApi::get('loadavg', 90)) == null) {
 				self::$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
 
-				if (!empty(self::$modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', self::$modSettings['load_average'], $matches) != 0)
-				{
+				if (!empty(self::$modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', self::$modSettings['load_average'], $matches) != 0) {
 					self::$modSettings['load_average'] = (float) $matches[1];
-				}
-				elseif ((self::$modSettings['load_average'] = @shell_exec('uptime')) != null && preg_match('~load averages?: (\d+\.\d+)~i', self::$modSettings['load_average'], $matches) != 0)
-				{
+				} elseif ((self::$modSettings['load_average'] = @shell_exec('uptime')) != null && preg_match('~load averages?: (\d+\.\d+)~i', self::$modSettings['load_average'], $matches) != 0) {
 					self::$modSettings['load_average'] = (float) $matches[1];
-				}
-				else
-				{
+				} else {
 					unset(self::$modSettings['load_average']);
 				}
 
-				if (!empty(self::$modSettings['load_average']) || self::$modSettings['load_average'] === 0.0)
-				{
+				if (!empty(self::$modSettings['load_average']) || self::$modSettings['load_average'] === 0.0) {
 					Cache\CacheApi::put('loadavg', self::$modSettings['load_average'], 90);
 				}
 			}
 
-			if (!empty(self::$modSettings['load_average']) || self::$modSettings['load_average'] === 0.0)
-			{
-				IntegrationHook::call('integrate_load_average', array(self::$modSettings['load_average']));
+			if (!empty(self::$modSettings['load_average']) || self::$modSettings['load_average'] === 0.0) {
+				IntegrationHook::call('integrate_load_average', [self::$modSettings['load_average']]);
 			}
 
-			if (!empty(self::$modSettings['loadavg_forum']) && !empty(self::$modSettings['load_average']) && self::$modSettings['load_average'] >= self::$modSettings['loadavg_forum'])
-			{
+			if (!empty(self::$modSettings['loadavg_forum']) && !empty(self::$modSettings['load_average']) && self::$modSettings['load_average'] >= self::$modSettings['loadavg_forum']) {
 				ErrorHandler::displayLoadAvgError();
 			}
 		}
 
 		// Ensure we know who can manage boards.
-		if (!isset(self::$modSettings['board_manager_groups']))
-		{
+		if (!isset(self::$modSettings['board_manager_groups'])) {
 			$board_managers = User::groupsAllowedTo('manage_boards', null);
 			$board_managers = implode(',', $board_managers['allowed']);
-			Config::updateModSettings(array('board_manager_groups' => $board_managers));
+			Config::updateModSettings(['board_manager_groups' => $board_managers]);
 		}
 
 		// Is post moderation alive and well? Everywhere else assumes this has been defined, so let's make sure it is.
@@ -1188,12 +1151,11 @@ public static function reloadModSettings(): void
 		// Here to justify the name of this function. :P
 		// It should be added to the install and upgrade scripts.
 		// But since the converters need to be updated also. This is easier.
-		if (empty(self::$modSettings['currentAttachmentUploadDir']))
-		{
-			Config::updateModSettings(array(
-				'attachmentUploadDir' => Utils::jsonEncode(array(1 => self::$modSettings['attachmentUploadDir'])),
+		if (empty(self::$modSettings['currentAttachmentUploadDir'])) {
+			Config::updateModSettings([
+				'attachmentUploadDir' => Utils::jsonEncode([1 => self::$modSettings['attachmentUploadDir']]),
 				'currentAttachmentUploadDir' => 1,
-			));
+			]);
 		}
 
 		// Respect PHP's limits.
@@ -1204,25 +1166,24 @@ public static function reloadModSettings(): void
 		self::$modSettings['attachmentNumPerPostLimit'] = !isset(self::$modSettings['attachmentNumPerPostLimit']) ? 4 : self::$modSettings['attachmentNumPerPostLimit'];
 
 		// Integration is cool.
-		if (defined('SMF_INTEGRATION_SETTINGS'))
-		{
+		if (defined('SMF_INTEGRATION_SETTINGS')) {
 			$integration_settings = Utils::jsonDecode(SMF_INTEGRATION_SETTINGS, true);
 
-			foreach ($integration_settings as $hook => $function)
+			foreach ($integration_settings as $hook => $function) {
 				IntegrationHook::add($hook, $function, false);
+			}
 		}
 
 		// Any files to pre include?
-		if (!empty(self::$modSettings['integrate_pre_include']))
-		{
+		if (!empty(self::$modSettings['integrate_pre_include'])) {
 			$pre_includes = explode(',', self::$modSettings['integrate_pre_include']);
 
-			foreach ($pre_includes as $include)
-			{
-				$include = strtr(trim($include), array('$boarddir' => self::$boarddir, '$sourcedir' => self::$sourcedir));
+			foreach ($pre_includes as $include) {
+				$include = strtr(trim($include), ['$boarddir' => self::$boarddir, '$sourcedir' => self::$sourcedir]);
 
-				if (file_exists($include))
-					require_once($include);
+				if (file_exists($include)) {
+					require_once $include;
+				}
 			}
 		}
 
@@ -1252,16 +1213,15 @@ public static function reloadModSettings(): void
 	 */
 	public static function updateModSettings(array $change_array, bool $update = false): void
 	{
-		if (empty($change_array) || !is_array($change_array))
+		if (empty($change_array) || !is_array($change_array)) {
 			return;
+		}
 
-		$to_remove = array();
+		$to_remove = [];
 
 		// Go check if there is any setting to be removed.
-		foreach ($change_array as $k => $v)
-		{
-			if ($v === null)
-			{
+		foreach ($change_array as $k => $v) {
+			if ($v === null) {
 				// Found some, remove them from the original array and add them to ours.
 				unset($change_array[$k]);
 				$to_remove[] = $k;
@@ -1269,30 +1229,29 @@ public static function updateModSettings(array $change_array, bool $update = fal
 		}
 
 		// Proceed with the deletion.
-		if (!empty($to_remove))
-		{
-			Db\DatabaseApi::$db->query('', '
-				DELETE FROM {db_prefix}settings
+		if (!empty($to_remove)) {
+			Db\DatabaseApi::$db->query(
+				'',
+				'DELETE FROM {db_prefix}settings
 				WHERE variable IN ({array_string:remove})',
-				array(
+				[
 					'remove' => $to_remove,
-				)
+				],
 			);
 		}
 
 		// In some cases, this may be better and faster, but for large sets we don't want so many UPDATEs.
-		if ($update)
-		{
-			foreach ($change_array as $variable => $value)
-			{
-				Db\DatabaseApi::$db->query('', '
-					UPDATE {db_prefix}settings
+		if ($update) {
+			foreach ($change_array as $variable => $value) {
+				Db\DatabaseApi::$db->query(
+					'',
+					'UPDATE {db_prefix}settings
 					SET value = {' . ($value === false || $value === true ? 'raw' : 'string') . ':value}
 					WHERE variable = {string:variable}',
-					array(
+					[
 						'value' => $value === true ? 'value + 1' : ($value === false ? 'value - 1' : $value),
 						'variable' => $variable,
-					)
+					],
 				);
 
 				self::$modSettings[$variable] = $value === true ? self::$modSettings[$variable] + 1 : ($value === false ? self::$modSettings[$variable] - 1 : $value);
@@ -1304,30 +1263,34 @@ public static function updateModSettings(array $change_array, bool $update = fal
 			return;
 		}
 
-		$replace_array = array();
-		foreach ($change_array as $variable => $value)
-		{
+		$replace_array = [];
+
+		foreach ($change_array as $variable => $value) {
 			// Don't bother if it's already like that ;).
-			if ((self::$modSettings[$variable] ?? null) == $value)
+			if ((self::$modSettings[$variable] ?? null) == $value) {
 				continue;
+			}
 
 			// If the variable isn't set, but would only be set to nothingness, then don't bother setting it.
-			if (!isset(self::$modSettings[$variable]) && empty($value))
+			if (!isset(self::$modSettings[$variable]) && empty($value)) {
 				continue;
+			}
 
-			$replace_array[] = array($variable, $value);
+			$replace_array[] = [$variable, $value];
 
 			self::$modSettings[$variable] = $value;
 		}
 
-		if (empty($replace_array))
+		if (empty($replace_array)) {
 			return;
+		}
 
-		Db\DatabaseApi::$db->insert('replace',
+		Db\DatabaseApi::$db->insert(
+			'replace',
 			'{db_prefix}settings',
-			array('variable' => 'string-255', 'value' => 'string-65534'),
+			['variable' => 'string-255', 'value' => 'string-65534'],
 			$replace_array,
-			array('variable')
+			['variable'],
 		);
 
 		// Kill the cache - it needs redoing now, but we won't bother ourselves with that here.
@@ -1342,25 +1305,24 @@ public static function updateModSettings(array $change_array, bool $update = fal
 	 */
 	public static function getAuthSecret(): string
 	{
-		if (empty(self::$auth_secret))
-		{
-			if (!is_callable('random_bytes'))
-				require_once(self::$sourcedir . '/random_compat/random.php');
+		if (empty(self::$auth_secret)) {
+			if (!is_callable('random_bytes')) {
+				require_once self::$sourcedir . '/random_compat/random.php';
+			}
 
 			self::$auth_secret = bin2hex(random_bytes(32));
 
 			// It is important to store this in Settings.php, not the database.
 			// If saving fails, we should alert, log, and set a static value.
-			if (!self::updateSettingsFile(array('auth_secret' => self::$auth_secret)))
-			{
-				if (class_exists('SMF\\Utils', false))
+			if (!self::updateSettingsFile(['auth_secret' => self::$auth_secret])) {
+				if (class_exists('SMF\\Utils', false)) {
 					Utils::$context['auth_secret_missing'] = true;
+				}
 
 				self::$auth_secret = hash_file('sha256', SMF_SETTINGS_FILE);
 
 				// Set the last error to now, but only every 15 minutes. Don't need to flood the logs.
-				if (empty(self::$db_last_error) || (self::$db_last_error + 60*15) <= time())
-				{
+				if (empty(self::$db_last_error) || (self::$db_last_error + 60 * 15) <= time()) {
 					self::updateDbLastError(time());
 					Lang::load('Errors');
 					ErrorHandler::log(Lang::$txt['auth_secret_missing'], 'critical');
@@ -1385,8 +1347,9 @@ public static function getSettingsDefs(): array
 
 		// Allow mods the option to define comments, defaults, etc., for their settings.
 		// Check if IntegrationHook exists, in case we are calling from installer or upgrader.
-		if (class_exists('SMF\\IntegrationHook', false))
-			IntegrationHook::call('integrate_update_settings_file', array(&self::$settings_defs));
+		if (class_exists('SMF\\IntegrationHook', false)) {
+			IntegrationHook::call('integrate_update_settings_file', [&self::$settings_defs]);
+		}
 
 		// Return the setting definitions, including any added by mods.
 		return self::$settings_defs;
@@ -1425,37 +1388,35 @@ public static function getSettingsDefs(): array
 	 *     Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public static function updateSettingsFile(array $config_vars, bool|null $keep_quotes = null, bool $rebuild = false): bool
+	public static function updateSettingsFile(array $config_vars, ?bool $keep_quotes = null, bool $rebuild = false): bool
 	{
 		static $mtime;
 
 		// Should we try to unescape the strings?
-		if (empty($keep_quotes))
-		{
-			foreach ($config_vars as $var => $val)
-			{
-				if (is_string($val) && ($keep_quotes === false || strpos($val, '\'') === 0 && strrpos($val, '\'') === strlen($val) - 1))
-				{
+		if (empty($keep_quotes)) {
+			foreach ($config_vars as $var => $val) {
+				if (is_string($val) && ($keep_quotes === false || strpos($val, '\'') === 0 && strrpos($val, '\'') === strlen($val) - 1)) {
 					$config_vars[$var] = trim(stripcslashes($val), '\'');
 				}
 			}
 		}
 
 		// Updating the db_last_error, then don't mess around with Settings.php
-		if (isset($config_vars['db_last_error']))
-		{
+		if (isset($config_vars['db_last_error'])) {
 			self::updateDbLastError($config_vars['db_last_error']);
 
-			if (count($config_vars) === 1 && empty($rebuild))
+			if (count($config_vars) === 1 && empty($rebuild)) {
 				return true;
+			}
 
 			// Make sure we delete this from Settings.php, if present.
 			$config_vars['db_last_error'] = 0;
 		}
 
 		// Rebuilding should not be undertaken lightly, so we're picky about the parameter.
-		if (!is_bool($rebuild))
+		if (!is_bool($rebuild)) {
 			$rebuild = false;
+		}
 
 		$mtime = isset($mtime) ? (int) $mtime : (defined('TIME_START') ? TIME_START : $_SERVER['REQUEST_TIME']);
 
@@ -1464,23 +1425,19 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		 *****************/
 
 		// Is Settings.php where we expect it to be, or do we need to find it?
-		if (defined('SMF_SETTINGS_FILE') && is_file(SMF_SETTINGS_FILE))
-		{
+		if (defined('SMF_SETTINGS_FILE') && is_file(SMF_SETTINGS_FILE)) {
 			$settingsFile = SMF_SETTINGS_FILE;
 
 			$backupFile = defined('SMF_SETTINGS_BACKUP_FILE') ? SMF_SETTINGS_BACKUP_FILE : dirname(SMF_SETTINGS_FILE) . DIRECTORY_SEPARATOR . pathinfo(SMF_SETTINGS_FILE, PATHINFO_FILENAME) . '_bak.php';
-		}
-		else
-		{
-			foreach (get_included_files() as $settingsFile)
-			{
-				if (basename($settingsFile) === 'Settings.php')
+		} else {
+			foreach (get_included_files() as $settingsFile) {
+				if (basename($settingsFile) === 'Settings.php') {
 					break;
+				}
 			}
 
 			// Fallback in case Settings.php isn't loaded (e.g. while installing)
-			if (basename($settingsFile) !== 'Settings.php')
-			{
+			if (basename($settingsFile) !== 'Settings.php') {
 				$settingsFile = (!empty(self::$boarddir) && @realpath(self::$boarddir) ? self::$boarddir : (!empty($_SERVER['SCRIPT_FILENAME']) ? dirname($_SERVER['SCRIPT_FILENAME']) : dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'Settings.php';
 			}
 
@@ -1488,8 +1445,9 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		}
 
 		// File not found? Attempt an emergency on-the-fly fix!
-		if (!file_exists($settingsFile))
+		if (!file_exists($settingsFile)) {
 			@touch($settingsFile);
+		}
 
 		// When was Settings.php last changed?
 		$last_settings_change = filemtime($settingsFile);
@@ -1498,12 +1456,14 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		$settings_vars = self::getCurrentSettings($mtime, $settingsFile);
 
 		// If Settings.php is empty for some reason, see if we can use the backup.
-		if (empty($settings_vars) && file_exists($backupFile))
+		if (empty($settings_vars) && file_exists($backupFile)) {
 			$settings_vars = self::getCurrentSettings($mtime, $backupFile);
+		}
 
 		// False means there was a problem with the file and we can't safely continue.
-		if ($settings_vars === false)
+		if ($settings_vars === false) {
 			return false;
+		}
 
 		// It works best to set everything afresh.
 		$new_settings_vars = array_merge($settings_vars, $config_vars);
@@ -1515,24 +1475,22 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		$settings_defs = self::getSettingsDefs();
 
 		// If Settings.php is empty or invalid, try to recover using whatever we have now.
-		if ($settings_vars === array())
-		{
-			foreach ($settings_defs as $var => $setting_def)
-			{
-				if (isset(self::${$var}) || isset(self::$custom[$var]))
+		if ($settings_vars === []) {
+			foreach ($settings_defs as $var => $setting_def) {
+				if (isset(self::${$var}) || isset(self::$custom[$var])) {
 					$settings_vars[$var] = self::${$var} ?? self::$custom[$var];
+				}
 			}
 
 			$new_settings_vars = array_merge($settings_vars, $config_vars);
 		}
 
 		// During install/upgrade, don't set anything until we're ready for it.
-		if (defined('SMF_INSTALLING') && empty($rebuild))
-		{
-			foreach ($settings_defs as $var => $setting_def)
-			{
-				if (!in_array($var, array_keys($new_settings_vars)) && !is_int($var))
+		if (defined('SMF_INSTALLING') && empty($rebuild)) {
+			foreach ($settings_defs as $var => $setting_def) {
+				if (!in_array($var, array_keys($new_settings_vars)) && !is_int($var)) {
 					unset($settings_defs[$var]);
+				}
 			}
 		}
 
@@ -1540,7 +1498,7 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		 * PART 2: Build substitutions *
 		 *******************************/
 
-		$type_regex = array(
+		$type_regex = [
 			'string' =>
 				'(?:' .
 					// match the opening quotation mark...
@@ -1559,9 +1517,9 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 			'boolean' =>  '(?i:TRUE|FALSE|(["\']?)[01]\b\\1)',
 			'NULL' =>  '(?i:NULL)',
 			// These use a PCRE subroutine to match nested arrays.
-			'array' =>  'array\s*(\((?'.'>[^()]|(?1))*\))',
-			'object' =>  '\w+::__set_state\(array\s*(\((?'.'>[^()]|(?1))*\))\)',
-		);
+			'array' =>  'array\s*(\((?' . '>[^()]|(?1))*\))',
+			'object' =>  '\w+::__set_state\(array\s*(\((?' . '>[^()]|(?1))*\))\)',
+		];
 
 		/*
 		 * The substitutions take place in one of two ways:
@@ -1579,68 +1537,60 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		 */
 		$prefix = mt_rand() . '-';
 		$neg_index = -1;
-		$substitutions = array(
-			$neg_index-- => array(
+		$substitutions = [
+			$neg_index-- => [
 				'search_pattern' => '~^\s*<\?(php\b)?\n?~',
 				'placeholder' => '',
 				'replace_pattern' => '~^~',
 				'replacement' => '<' . "?php\n",
-			),
-			$neg_index-- => array(
+			],
+			$neg_index-- => [
 				'search_pattern' => '~\S\K\s*(\?' . '>)?\s*$~',
 				'placeholder' => "\n" . md5($prefix . '?' . '>'),
 				'replacement' => "\n\n?" . '>',
-			),
+			],
 			// Remove the code that redirects to the installer.
-			$neg_index-- => array(
-				'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?'.'>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
+			$neg_index-- => [
+				'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?' . '>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
 				'placeholder' => '',
-			),
-		);
+			],
+		];
 
-		if (defined('SMF_INSTALLING'))
-		{
-			$substitutions[$neg_index--] = array(
+		if (defined('SMF_INSTALLING')) {
+			$substitutions[$neg_index--] = [
 				'search_pattern' => '~/\*.*?SMF\s+1\.\d.*?\*/~s',
 				'placeholder' => '',
-			);
+			];
 		}
 
-		foreach ($settings_defs as $var => $setting_def)
-		{
+		foreach ($settings_defs as $var => $setting_def) {
 			$placeholder = md5($prefix . $var);
 			$replacement = '';
 
-			if (!empty($setting_def['text']))
-			{
+			if (!empty($setting_def['text'])) {
 				// Special handling for the license block: always at the beginning.
-				if (strpos($setting_def['text'], "* @package SMF\n") !== false)
-				{
+				if (strpos($setting_def['text'], "* @package SMF\n") !== false) {
 					$substitutions[$var]['search_pattern'] = $setting_def['search_pattern'];
 					$substitutions[$var]['placeholder'] = '';
 					$substitutions[-1]['replacement'] .= $setting_def['text'] . "\n";
 				}
 				// Special handling for the Error-Catching block: always at the end.
-				elseif (strpos($setting_def['text'], 'Error-Catching') !== false)
-				{
+				elseif (strpos($setting_def['text'], 'Error-Catching') !== false) {
 					$errcatch_var = $var;
 					$substitutions[$var]['search_pattern'] = $setting_def['search_pattern'];
 					$substitutions[$var]['placeholder'] = '';
 					$substitutions[-2]['replacement'] = "\n" . $setting_def['text'] . $substitutions[-2]['replacement'];
 				}
 				// The text is the whole thing (code blocks, etc.)
-				elseif (is_int($var))
-				{
+				elseif (is_int($var)) {
 					// Remember the path correcting code for later.
-					if (strpos($setting_def['text'], '# Make sure the paths are correct') !== false)
+					if (strpos($setting_def['text'], '# Make sure the paths are correct') !== false) {
 						$pathcode_var = $var;
+					}
 
-					if (!empty($setting_def['search_pattern']))
-					{
+					if (!empty($setting_def['search_pattern'])) {
 						$substitutions[$var]['search_pattern'] = $setting_def['search_pattern'];
-					}
-					else
-					{
+					} else {
 						$substitutions[$var]['search_pattern'] = '~' . preg_quote($setting_def['text'], '~') . '~';
 					}
 
@@ -1649,67 +1599,52 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 					$replacement .= $setting_def['text'] . "\n";
 				}
 				// We only include comments when rebuilding.
-				elseif (!empty($rebuild))
-				{
+				elseif (!empty($rebuild)) {
 					$replacement .= $setting_def['text'] . "\n";
 				}
 			}
 
-			if (is_string($var))
-			{
+			if (is_string($var)) {
 				// Ensure the value is good.
-				if (in_array($var, array_keys($new_settings_vars)))
-				{
+				if (in_array($var, array_keys($new_settings_vars))) {
 					// Objects without a __set_state method need a fallback.
-					if (is_object($new_settings_vars[$var]) && !method_exists($new_settings_vars[$var], '__set_state'))
-					{
-						if (method_exists($new_settings_vars[$var], '__toString'))
-						{
+					if (is_object($new_settings_vars[$var]) && !method_exists($new_settings_vars[$var], '__set_state')) {
+						if (method_exists($new_settings_vars[$var], '__toString')) {
 							$new_settings_vars[$var] = (string) $new_settings_vars[$var];
-						}
-						else
-						{
+						} else {
 							$new_settings_vars[$var] = (array) $new_settings_vars[$var];
 						}
 					}
 
 					// Normalize the type if necessary.
-					if (isset($setting_def['type']))
-					{
+					if (isset($setting_def['type'])) {
 						$expected_types = (array) $setting_def['type'];
 						$var_type = gettype($new_settings_vars[$var]);
 
 						// Variable is not of an expected type.
-						if (!in_array($var_type, $expected_types))
-						{
+						if (!in_array($var_type, $expected_types)) {
 							// Passed in an unexpected array.
-							if ($var_type == 'array')
-							{
+							if ($var_type == 'array') {
 								$temp = reset($new_settings_vars[$var]);
 
 								// Use the first element if there's only one and it is a scalar.
-								if (count($new_settings_vars[$var]) === 1 && is_scalar($temp))
-								{
+								if (count($new_settings_vars[$var]) === 1 && is_scalar($temp)) {
 									$new_settings_vars[$var] = $temp;
 								}
 								// Or keep the old value, if that is good.
-								elseif (isset($settings_vars[$var]) && in_array(gettype($settings_vars[$var]), $expected_types))
-								{
+								elseif (isset($settings_vars[$var]) && in_array(gettype($settings_vars[$var]), $expected_types)) {
 									$new_settings_vars[$var] = $settings_vars[$var];
 								}
 								// Fall back to the default
-								else
-								{
+								else {
 									$new_settings_vars[$var] = $setting_def['default'];
 								}
 							}
 
 							// Cast it to whatever type was expected.
 							// Note: the order of the types in this loop matters.
-							foreach (array('boolean', 'integer', 'double', 'string', 'array') as $to_type)
-							{
-								if (in_array($to_type, $expected_types))
-								{
+							foreach (['boolean', 'integer', 'double', 'string', 'array'] as $to_type) {
+								if (in_array($to_type, $expected_types)) {
 									settype($new_settings_vars[$var], $to_type);
 									break;
 								}
@@ -1718,57 +1653,46 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 					}
 				}
 				// Abort if a required one is undefined (unless we're installing).
-				elseif (!empty($setting_def['required']) && !defined('SMF_INSTALLING'))
-				{
+				elseif (!empty($setting_def['required']) && !defined('SMF_INSTALLING')) {
 					return false;
 				}
 
 				// Create the search pattern.
-				if (!empty($setting_def['search_pattern']))
-				{
+				if (!empty($setting_def['search_pattern'])) {
 					$substitutions[$var]['search_pattern'] = $setting_def['search_pattern'];
-				}
-				else
-				{
-					$var_pattern = array();
+				} else {
+					$var_pattern = [];
 
-					if (isset($setting_def['type']))
-					{
-						foreach ((array) $setting_def['type'] as $type)
+					if (isset($setting_def['type'])) {
+						foreach ((array) $setting_def['type'] as $type) {
 							$var_pattern[] = $type_regex[$type];
+						}
 					}
 
-					if (in_array($var, array_keys($config_vars)))
-					{
+					if (in_array($var, array_keys($config_vars))) {
 						$var_pattern[] = @$type_regex[gettype($config_vars[$var])];
 
-						if (is_string($config_vars[$var]) && strpos($config_vars[$var], dirname($settingsFile)) === 0)
-						{
+						if (is_string($config_vars[$var]) && strpos($config_vars[$var], dirname($settingsFile)) === 0) {
 							$var_pattern[] = '(?:__DIR__|dirname\(__FILE__\)) . \'' . (preg_quote(str_replace(dirname($settingsFile), '', $config_vars[$var]), '~')) . '\'';
 						}
 					}
 
-					if (in_array($var, array_keys($settings_vars)))
-					{
+					if (in_array($var, array_keys($settings_vars))) {
 						$var_pattern[] = @$type_regex[gettype($settings_vars[$var])];
 
-						if (is_string($settings_vars[$var]) && strpos($settings_vars[$var], dirname($settingsFile)) === 0)
-						{
+						if (is_string($settings_vars[$var]) && strpos($settings_vars[$var], dirname($settingsFile)) === 0) {
 							$var_pattern[] = '(?:__DIR__|dirname\(__FILE__\)) . \'' . (preg_quote(str_replace(dirname($settingsFile), '', $settings_vars[$var]), '~')) . '\'';
 						}
 					}
 
-					if (!empty($setting_def['raw_default']) && $setting_def['default'] !== '')
-					{
+					if (!empty($setting_def['raw_default']) && $setting_def['default'] !== '') {
 						$var_pattern[] = preg_replace('/\s+/', '\s+', preg_quote($setting_def['default'], '~'));
 
-						if (strpos($setting_def['default'], 'dirname(__FILE__)') !== false)
-						{
+						if (strpos($setting_def['default'], 'dirname(__FILE__)') !== false) {
 							$var_pattern[] = preg_replace('/\s+/', '\s+', preg_quote(str_replace('dirname(__FILE__)', '__DIR__', $setting_def['default']), '~'));
 						}
 
-						if (strpos($setting_def['default'], '__DIR__') !== false)
-						{
+						if (strpos($setting_def['default'], '__DIR__') !== false) {
 							$var_pattern[] = preg_replace('/\s+/', '\s+', preg_quote(str_replace('__DIR__', 'dirname(__FILE__)', $setting_def['default']), '~'));
 						}
 					}
@@ -1781,25 +1705,18 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 				}
 
 				// Next create the placeholder or replace_pattern.
-				if (!empty($setting_def['replace_pattern']))
-				{
+				if (!empty($setting_def['replace_pattern'])) {
 					$substitutions[$var]['replace_pattern'] = $setting_def['replace_pattern'];
-				}
-				else
-				{
+				} else {
 					$substitutions[$var]['placeholder'] = $placeholder;
 				}
 
 				// Now create the replacement.
 				// A setting to delete.
-				if (!empty($setting_def['auto_delete']) && empty($new_settings_vars[$var]))
-				{
-					if ($setting_def['auto_delete'] === 2 && empty($rebuild) && in_array($var, array_keys($new_settings_vars)))
-					{
-						$replacement .= '$' . $var . ' = ' . ($new_settings_vars[$var] === $setting_def['default'] && !empty($setting_def['raw_default']) ? sprintf($new_settings_vars[$var]) : self::varExport($new_settings_vars[$var], true)) . ";";
-					}
-					else
-					{
+				if (!empty($setting_def['auto_delete']) && empty($new_settings_vars[$var])) {
+					if ($setting_def['auto_delete'] === 2 && empty($rebuild) && in_array($var, array_keys($new_settings_vars))) {
+						$replacement .= '$' . $var . ' = ' . ($new_settings_vars[$var] === $setting_def['default'] && !empty($setting_def['raw_default']) ? sprintf($new_settings_vars[$var]) : self::varExport($new_settings_vars[$var], true)) . ';';
+					} else {
 						$replacement = '';
 						$substitutions[$var]['placeholder'] = '';
 
@@ -1808,18 +1725,15 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 					}
 				}
 				// Add this setting's value.
-				elseif (in_array($var, array_keys($new_settings_vars)))
-				{
-					$replacement .= '$' . $var . ' = ' . ($new_settings_vars[$var] === $setting_def['default'] && !empty($setting_def['raw_default']) ? sprintf($new_settings_vars[$var]) : self::varExport($new_settings_vars[$var], true)) . ";";
+				elseif (in_array($var, array_keys($new_settings_vars))) {
+					$replacement .= '$' . $var . ' = ' . ($new_settings_vars[$var] === $setting_def['default'] && !empty($setting_def['raw_default']) ? sprintf($new_settings_vars[$var]) : self::varExport($new_settings_vars[$var], true)) . ';';
 				}
 				// Fall back to the default value.
-				elseif (isset($setting_def['default']))
-				{
+				elseif (isset($setting_def['default'])) {
 					$replacement .= '$' . $var . ' = ' . (!empty($setting_def['raw_default']) ? sprintf($setting_def['default']) : self::varExport($setting_def['default'], true)) . ';';
 				}
 				// This shouldn't happen, but we've got nothing.
-				else
-				{
+				else {
 					$replacement .= '$' . $var . ' = null;';
 				}
 			}
@@ -1831,15 +1745,16 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		}
 
 		// Any leftovers to deal with?
-		foreach ($new_settings_vars as $var => $val)
-		{
-			$var_pattern = array();
+		foreach ($new_settings_vars as $var => $val) {
+			$var_pattern = [];
 
-			if (in_array($var, array_keys($config_vars)))
+			if (in_array($var, array_keys($config_vars))) {
 				$var_pattern[] = $type_regex[gettype($config_vars[$var])];
+			}
 
-			if (in_array($var, array_keys($settings_vars)))
+			if (in_array($var, array_keys($settings_vars))) {
 				$var_pattern[] = $type_regex[gettype($settings_vars[$var])];
+			}
 
 			$var_pattern = array_unique($var_pattern);
 
@@ -1849,20 +1764,17 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 
 			$substitutions[$var]['search_pattern'] = '~(?<=^|\s)\h*\$' . preg_quote($var, '~') . '\s*=\s*' . $var_pattern . ';~' . (!empty($utf8) ? 'u' : '');
 			$substitutions[$var]['placeholder'] = $placeholder;
-			$substitutions[$var]['replacement'] = '$' . $var . ' = ' . self::varExport($val, true) . ";";
+			$substitutions[$var]['replacement'] = '$' . $var . ' = ' . self::varExport($val, true) . ';';
 		}
 
 		// During an upgrade, some of the path variables may not have been declared yet.
-		if (defined('SMF_INSTALLING') && empty($rebuild))
-		{
+		if (defined('SMF_INSTALLING') && empty($rebuild)) {
 			preg_match_all('~^\h*\$(\w+)\s*=\s*~m', $substitutions[$pathcode_var]['replacement'], $matches);
 
 			$missing_pathvars = array_diff($matches[1], array_keys($substitutions));
 
-			if (!empty($missing_pathvars))
-			{
-				foreach ($missing_pathvars as $var)
-				{
+			if (!empty($missing_pathvars)) {
+				foreach ($missing_pathvars as $var) {
 					$substitutions[$pathcode_var]['replacement'] = preg_replace('~\nif[^\n]+\$' . $var . '[^\n]+\n\h*\$' . $var . ' = [^\n]+~', '', $substitutions[$pathcode_var]['replacement']);
 				}
 			}
@@ -1871,24 +1783,21 @@ public static function updateSettingsFile(array $config_vars, bool|null $keep_qu
 		// It's important to do the numbered ones before the named ones, or messes happen.
 		uksort(
 			$substitutions,
-			function($a, $b) {
-				if (is_int($a) && is_int($b))
-				{
+			function ($a, $b) {
+				if (is_int($a) && is_int($b)) {
 					return $a > $b ? 1 : ($a < $b ? -1 : 0);
 				}
-				elseif (is_int($a))
-				{
+
+				if (is_int($a)) {
 					return -1;
 				}
-				elseif (is_int($b))
-				{
+
+				if (is_int($b)) {
 					return 1;
 				}
-				else
-				{
-					return strcasecmp($b, $a);
-				}
-			}
+
+				return strcasecmp($b, $a);
+			},
 		);
 
 		/******************************
@@ -1898,26 +1807,21 @@ function($a, $b) {
 		/* 3.a: Get the content of Settings.php and make sure it is good. */
 
 		// Retrieve the contents of Settings.php and normalize the line endings.
-		$settingsText = trim(strtr(file_get_contents($settingsFile), array("\r\n" => "\n", "\r" => "\n")));
+		$settingsText = trim(strtr(file_get_contents($settingsFile), ["\r\n" => "\n", "\r" => "\n"]));
 
 		// If Settings.php is empty or corrupt for some reason, see if we can recover.
-		if ($settingsText == '' || substr($settingsText, 0, 5) !== '<' . '?php')
-		{
+		if ($settingsText == '' || substr($settingsText, 0, 5) !== '<' . '?php') {
 			// Try restoring from the backup.
-			if (file_exists($backupFile))
-			{
-				$settingsText = strtr(file_get_contents($backupFile), array("\r\n" => "\n", "\r" => "\n"));
+			if (file_exists($backupFile)) {
+				$settingsText = strtr(file_get_contents($backupFile), ["\r\n" => "\n", "\r" => "\n"]);
 			}
 
 			// Backup is bad too? Our only option is to create one from scratch.
-			if ($settingsText == '' || substr($settingsText, 0, 5) !== '<' . '?php' || substr($settingsText, -2) !== '?' . '>')
-			{
+			if ($settingsText == '' || substr($settingsText, 0, 5) !== '<' . '?php' || substr($settingsText, -2) !== '?' . '>') {
 				$settingsText = '<' . "?php\n";
 
-				foreach ($settings_defs as $var => $setting_def)
-				{
-					if (is_string($var) && !empty($setting_def['text']) && strpos($substitutions[$var]['replacement'], $setting_def['text']) === false)
-					{
+				foreach ($settings_defs as $var => $setting_def) {
+					if (is_string($var) && !empty($setting_def['text']) && strpos($substitutions[$var]['replacement'], $setting_def['text']) === false) {
 						$substitutions[$var]['replacement'] = $setting_def['text'] . "\n" . $substitutions[$var]['replacement'];
 					}
 
@@ -1930,17 +1834,12 @@ function($a, $b) {
 		}
 
 		// Settings.php is unlikely to contain any heredocs, but just in case...
-		if (preg_match_all('/<<<([\'"]?)(\w+)\1\R(.*?)\R\h*\2;$/ms', $settingsText, $matches))
-		{
-			foreach ($matches[0] as $mkey => $heredoc)
-			{
-				if (!empty($matches[1][$mkey]) && $matches[1][$mkey] === '\'')
-				{
+		if (preg_match_all('/<<<([\'"]?)(\w+)\1\R(.*?)\R\h*\2;$/ms', $settingsText, $matches)) {
+			foreach ($matches[0] as $mkey => $heredoc) {
+				if (!empty($matches[1][$mkey]) && $matches[1][$mkey] === '\'') {
 					$heredoc_replacements[$heredoc] = var_export($matches[3][$mkey], true) . ';';
-				}
-				else
-				{
-					$heredoc_replacements[$heredoc] = '"' . strtr(substr(var_export($matches[3][$mkey], true), 1, -1), array("\\'" => "'", '"' => '\"')) . '";';
+				} else {
+					$heredoc_replacements[$heredoc] = '"' . strtr(substr(var_export($matches[3][$mkey], true), 1, -1), ["\\'" => "'", '"' => '\\"']) . '";';
 				}
 			}
 
@@ -1951,58 +1850,53 @@ function($a, $b) {
 
 		$last_var = null;
 		$bare_settingsText = $settingsText;
-		$force_before_pathcode = array();
-		foreach ($substitutions as $var => $substitution)
-		{
+		$force_before_pathcode = [];
+
+		foreach ($substitutions as $var => $substitution) {
 			$placeholders[$var] = $substitution['placeholder'];
 
-			if (!empty($substitution['placeholder']))
-			{
+			if (!empty($substitution['placeholder'])) {
 				$simple_replacements[$substitution['placeholder']] = $substitution['replacement'];
-			}
-			elseif (!empty($substitution['replace_pattern']))
-			{
+			} elseif (!empty($substitution['replace_pattern'])) {
 				$replace_patterns[$var] = $substitution['replace_pattern'];
 				$replace_strings[$var] = $substitution['replacement'];
 			}
 
-			if (strpos($substitutions[$pathcode_var]['replacement'], '$' . $var . ' = ') !== false)
+			if (strpos($substitutions[$pathcode_var]['replacement'], '$' . $var . ' = ') !== false) {
 				$force_before_pathcode[] = $var;
+			}
 
 			// Look before you leap.
 			preg_match_all($substitution['search_pattern'], $bare_settingsText, $matches);
 
-			if ((is_string($var) || $var === $pathcode_var) && count($matches[0]) !== 1 && $substitution['replacement'] !== '')
-			{
+			if ((is_string($var) || $var === $pathcode_var) && count($matches[0]) !== 1 && $substitution['replacement'] !== '') {
 				// More than one instance of the variable = not good.
-				if (count($matches[0]) > 1)
-				{
-					if (is_string($var))
-					{
+				if (count($matches[0]) > 1) {
+					if (is_string($var)) {
 						// Maybe we can try something more interesting?
 						$sp = substr($substitution['search_pattern'], 1);
 
-						if (strpos($sp, '(?<=^|\s)') === 0)
+						if (strpos($sp, '(?<=^|\s)') === 0) {
 							$sp = substr($sp, 9);
+						}
 
-						if (strpos($sp, '^') === 0 || strpos($sp, '(?<') === 0)
+						if (strpos($sp, '^') === 0 || strpos($sp, '(?<') === 0) {
 							return false;
+						}
 
 						// See if we can exclude `if` blocks, etc., to narrow down the matches.
 						// @todo Multiple layers of nested brackets might confuse this.
 						$sp = '~(?:^|//[^\n]+c\n|\*/|[;}]|' . implode('|', array_filter($placeholders)) . ')\s*' . (strpos($sp, '\K') === false ? '\K' : '') . $sp;
 
 						preg_match_all($sp, $settingsText, $matches);
-					}
-					else
+					} else {
 						$sp = $substitution['search_pattern'];
+					}
 
 					// Found at least some that are simple assignment statements.
-					if (count($matches[0]) > 0)
-					{
+					if (count($matches[0]) > 0) {
 						// Remove any duplicates.
-						if (count($matches[0]) > 1)
-						{
+						if (count($matches[0]) > 1) {
 							$settingsText = preg_replace($sp, '', $settingsText, count($matches[0]) - 1);
 						}
 
@@ -2011,8 +1905,7 @@ function($a, $b) {
 					}
 
 					// All instances are inside more complex code structures.
-					else
-					{
+					else {
 						// Only safe option at this point is to skip it.
 						unset($substitutions[$var], $new_settings_vars[$var], $settings_defs[$var], $simple_replacements[$substitution['placeholder']], $replace_patterns[$var], $replace_strings[$var]);
 
@@ -2020,25 +1913,21 @@ function($a, $b) {
 					}
 				}
 				// No matches found.
-				elseif (count($matches[0]) === 0)
-				{
+				elseif (count($matches[0]) === 0) {
 					$found = false;
 					$in_c = in_array($var, array_keys($config_vars));
 					$in_s = in_array($var, array_keys($settings_vars));
 
 					// Is it in there at all?
-					if (!preg_match('~(^|\s)\$' . preg_quote($var, '~') . '\s*=\s*~', $bare_settingsText))
-					{
+					if (!preg_match('~(^|\s)\$' . preg_quote($var, '~') . '\s*=\s*~', $bare_settingsText)) {
 						// It's defined by Settings.php, but not by code in the file.
 						// Probably done via an include or something. Skip it.
-						if ($in_s)
-						{
+						if ($in_s) {
 							unset($substitutions[$var], $settings_defs[$var]);
 						}
 						// Admin is explicitly trying to set this one, so we'll handle
 						// it as if it were a new custom setting being added.
-						elseif ($in_c)
-						{
+						elseif ($in_c) {
 							$new_settings_vars[$var] = $config_vars[$var];
 						}
 
@@ -2046,29 +1935,25 @@ function($a, $b) {
 					}
 
 					// It's in there somewhere, so check if the value changed type.
-					foreach (array('scalar', 'object', 'array') as $type)
-					{
+					foreach (['scalar', 'object', 'array'] as $type) {
 						// Try all the other scalar types first.
-						if ($type == 'scalar')
-						{
-							$sp = '(?:' . (implode('|', array_diff_key($type_regex, array($in_c ? gettype($config_vars[$var]) : ($in_s ? gettype($settings_vars[$var]) : PHP_INT_MAX) => '', 'array' => '', 'object' => '')))) . ')';
+						if ($type == 'scalar') {
+							$sp = '(?:' . (implode('|', array_diff_key($type_regex, [$in_c ? gettype($config_vars[$var]) : ($in_s ? gettype($settings_vars[$var]) : PHP_INT_MAX) => '', 'array' => '', 'object' => '']))) . ')';
 						}
 						// Maybe it's an object? (Probably not, but we should check.)
-						elseif ($type == 'object')
-						{
-							if (strpos($settingsText, '__set_state') === false)
+						elseif ($type == 'object') {
+							if (strpos($settingsText, '__set_state') === false) {
 								continue;
+							}
 
 							$sp = $type_regex['object'];
 						}
 						// Maybe it's an array?
-						else
-						{
+						else {
 							$sp = $type_regex['array'];
 						}
 
-						if (preg_match('~(^|\s)\$' . preg_quote($var, '~') . '\s*=\s*' . $sp . '~', $bare_settingsText, $derp))
-						{
+						if (preg_match('~(^|\s)\$' . preg_quote($var, '~') . '\s*=\s*' . $sp . '~', $bare_settingsText, $derp)) {
 							$settingsText = preg_replace('~(^|\s)\$' . preg_quote($var, '~') . '\s*=\s*' . $sp . '~', $substitution['placeholder'], $settingsText);
 
 							$found = true;
@@ -2078,8 +1963,7 @@ function($a, $b) {
 					}
 
 					// Something weird is going on. Better just leave it alone.
-					if (!$found)
-					{
+					if (!$found) {
 						// $var? What $var? Never heard of it.
 						unset($substitutions[$var], $new_settings_vars[$var], $settings_defs[$var], $simple_replacements[$substitution['placeholder']], $replace_patterns[$var], $replace_strings[$var]);
 
@@ -2088,30 +1972,27 @@ function($a, $b) {
 				}
 			}
 			// Good to go, so insert our placeholder.
-			else
-			{
+			else {
 				$settingsText = preg_replace($substitution['search_pattern'], $substitution['placeholder'], $settingsText);
 			}
 
 			// Once the code blocks are done, we want to compare to a version without comments.
-			if (is_int($last_var) && is_string($var))
+			if (is_int($last_var) && is_string($var)) {
 				$bare_settingsText = self::stripPhpComments($settingsText);
+			}
 
 			$last_var = $var;
 		}
 
 		// Rebuilding requires more work.
-		if (!empty($rebuild))
-		{
+		if (!empty($rebuild)) {
 			// Strip out the leading and trailing placeholders to prevent duplication.
-			$settingsText = str_replace(array($substitutions[-1]['placeholder'], $substitutions[-2]['placeholder']), '', $settingsText);
+			$settingsText = str_replace([$substitutions[-1]['placeholder'], $substitutions[-2]['placeholder']], '', $settingsText);
 
 			// Strip out all our standard comments.
-			foreach ($settings_defs as $var => $setting_def)
-			{
-				if (isset($setting_def['text']))
-				{
-					$settingsText = strtr($settingsText, array($setting_def['text'] . "\n" => '', $setting_def['text'] => '',));
+			foreach ($settings_defs as $var => $setting_def) {
+				if (isset($setting_def['text'])) {
+					$settingsText = strtr($settingsText, [$setting_def['text'] . "\n" => '', $setting_def['text'] => '']);
 				}
 			}
 
@@ -2119,9 +2000,8 @@ function($a, $b) {
 			$bare_settingsText = self::stripPhpComments($settingsText);
 
 			// Fix up whitespace to make comparison easier.
-			foreach ($placeholders as $placeholder)
-			{
-				$bare_settingsText = str_replace(array($placeholder . "\n\n", $placeholder), $placeholder . "\n", $bare_settingsText);
+			foreach ($placeholders as $placeholder) {
+				$bare_settingsText = str_replace([$placeholder . "\n\n", $placeholder], $placeholder . "\n", $bare_settingsText);
 			}
 
 			$bare_settingsText = preg_replace('/\h+$/m', '', rtrim($bare_settingsText));
@@ -2133,121 +2013,118 @@ function($a, $b) {
 			 * each section, however, we'll reorganize the content to match the
 			 * default layout as closely as we can.
 			 */
-			$sections = array(array());
+			$sections = [[]];
 			$section_num = 0;
 			$trimmed_placeholders = array_filter(array_map('trim', $placeholders));
-			$newsection_placeholders = array();
+			$newsection_placeholders = [];
 			$all_custom_content = '';
 
-			foreach ($substitutions as $var => $substitution)
-			{
-				if (is_int($var) && ($var === -2 || $var > 0) && isset($trimmed_placeholders[$var]) && strpos($bare_settingsText, $trimmed_placeholders[$var]) !== false)
-				{
+			foreach ($substitutions as $var => $substitution) {
+				if (is_int($var) && ($var === -2 || $var > 0) && isset($trimmed_placeholders[$var]) && strpos($bare_settingsText, $trimmed_placeholders[$var]) !== false) {
 					$newsection_placeholders[$var] = $trimmed_placeholders[$var];
 				}
 			}
 
-			foreach (preg_split('~(?<=' . implode('|', $trimmed_placeholders) . ')|(?=' . implode('|', $trimmed_placeholders) . ')~', $bare_settingsText) as $part)
-			{
+			foreach (preg_split('~(?<=' . implode('|', $trimmed_placeholders) . ')|(?=' . implode('|', $trimmed_placeholders) . ')~', $bare_settingsText) as $part) {
 				$part = trim($part);
 
-				if (empty($part))
+				if (empty($part)) {
 					continue;
+				}
 
 				// Build a list of placeholders for this section.
-				if (in_array($part, $trimmed_placeholders) && !in_array($part, $newsection_placeholders))
-				{
+				if (in_array($part, $trimmed_placeholders) && !in_array($part, $newsection_placeholders)) {
 					$sections[$section_num][] = $part;
 				}
 				// Custom content and newsection_placeholders get their own sections.
-				else
-				{
-					if (!empty($sections[$section_num]))
+				else {
+					if (!empty($sections[$section_num])) {
 						++$section_num;
+					}
 
 					$sections[$section_num][] = $part;
 
 					++$section_num;
 
-					if (!in_array($part, $trimmed_placeholders))
+					if (!in_array($part, $trimmed_placeholders)) {
 						$all_custom_content .= "\n" . $part;
+					}
 				}
 			}
 
 			// And now, rebuild the content!
 			$new_settingsText = '';
-			$done_defs = array();
+			$done_defs = [];
 			$sectionkeys = array_keys($sections);
 
-			foreach ($sections as $sectionkey => $section)
-			{
+			foreach ($sections as $sectionkey => $section) {
 				// Custom content needs to be preserved.
-				if (count($section) === 1 && !in_array($section[0], $trimmed_placeholders))
-				{
+				if (count($section) === 1 && !in_array($section[0], $trimmed_placeholders)) {
 					$prev_section_end = $sectionkey < 1 ? 0 : strpos($settingsText, end($sections[$sectionkey - 1])) + strlen(end($sections[$sectionkey - 1]));
 					$next_section_start = $sectionkey == end($sectionkeys) ? strlen($settingsText) : strpos($settingsText, $sections[$sectionkey + 1][0]);
 
 					$new_settingsText .= "\n" . substr($settingsText, $prev_section_end, $next_section_start - $prev_section_end) . "\n";
 				}
 				// Put the placeholders in this section into canonical order.
-				else
-				{
+				else {
 					$section_parts = array_flip($section);
 					$pathcode_reached = false;
-					foreach ($settings_defs as $var => $setting_def)
-					{
-						if ($var === $pathcode_var)
+
+					foreach ($settings_defs as $var => $setting_def) {
+						if ($var === $pathcode_var) {
 							$pathcode_reached = true;
+						}
 
 						// Already did this setting, so move on to the next.
-						if (in_array($var, $done_defs))
+						if (in_array($var, $done_defs)) {
 							continue;
+						}
 
 						// Stop when we hit a setting definition that will start a later section.
-						if (isset($newsection_placeholders[$var]) && count($section) !== 1)
+						if (isset($newsection_placeholders[$var]) && count($section) !== 1) {
 							break;
+						}
 
 						// Stop when everything in this section is done, unless it's the last.
 						// This helps maintain the relative position of any custom content.
-						if (empty($section_parts) && $sectionkey < (count($sections) - 1))
+						if (empty($section_parts) && $sectionkey < (count($sections) - 1)) {
 							break;
+						}
 
 						$p = trim($substitutions[$var]['placeholder']);
 
 						// Can't do anything with an empty placeholder.
-						if ($p === '')
+						if ($p === '') {
 							continue;
+						}
 
 						// Does this need to be inserted before the path correction code?
-						if (strpos($new_settingsText, trim($substitutions[$pathcode_var]['placeholder'])) !== false && in_array($var, $force_before_pathcode))
-						{
-							$new_settingsText = strtr($new_settingsText, array($substitutions[$pathcode_var]['placeholder'] => $p . "\n" . $substitutions[$pathcode_var]['placeholder']));
+						if (strpos($new_settingsText, trim($substitutions[$pathcode_var]['placeholder'])) !== false && in_array($var, $force_before_pathcode)) {
+							$new_settingsText = strtr($new_settingsText, [$substitutions[$pathcode_var]['placeholder'] => $p . "\n" . $substitutions[$pathcode_var]['placeholder']]);
 
 							$bare_settingsText .= "\n" . $substitutions[$var]['placeholder'];
 							$done_defs[] = $var;
 							unset($section_parts[trim($substitutions[$var]['placeholder'])]);
 						}
 						// If it's in this section, add it to the new text now.
-						elseif (in_array($p, $section))
-						{
+						elseif (in_array($p, $section)) {
 							$new_settingsText .= "\n" . $substitutions[$var]['placeholder'];
 							$done_defs[] = $var;
 							unset($section_parts[trim($substitutions[$var]['placeholder'])]);
 						}
 						// Perhaps it is safe to reposition it anyway.
-						elseif (is_string($var) && strpos($new_settingsText, $p) === false && strpos($all_custom_content, '$' . $var) === false)
-						{
+						elseif (is_string($var) && strpos($new_settingsText, $p) === false && strpos($all_custom_content, '$' . $var) === false) {
 							$new_settingsText .= "\n" . $substitutions[$var]['placeholder'];
 							$done_defs[] = $var;
 							unset($section_parts[trim($substitutions[$var]['placeholder'])]);
 						}
 						// If this setting is missing entirely, fix it.
-						elseif (strpos($bare_settingsText, $p) === false)
-						{
+						elseif (strpos($bare_settingsText, $p) === false) {
 							// Special case if the path code is missing. Put it near the end,
 							// and also anything else that is missing that normally follows it.
-							if (!isset($newsection_placeholders[$pathcode_var]) && $pathcode_reached === true && $sectionkey < (count($sections) - 1))
+							if (!isset($newsection_placeholders[$pathcode_var]) && $pathcode_reached === true && $sectionkey < (count($sections) - 1)) {
 								break;
+							}
 
 							$new_settingsText .= "\n" . $substitutions[$var]['placeholder'];
 							$bare_settingsText .= "\n" . $substitutions[$var]['placeholder'];
@@ -2260,8 +2137,7 @@ function($a, $b) {
 			$settingsText = $new_settingsText;
 
 			// Restore the leading and trailing placeholders as necessary.
-			foreach (array(-1, -2) as $var)
-			{
+			foreach ([-1, -2] as $var) {
 				if (!empty($substitutions[$var]['placeholder']) && strpos($settingsText, $substitutions[$var]['placeholder']) === false);
 				{
 					$settingsText = ($var == -1 ? $substitutions[$var]['placeholder'] : '') . $settingsText . ($var == -2 ? $substitutions[$var]['placeholder'] : '');
@@ -2269,20 +2145,16 @@ function($a, $b) {
 			}
 		}
 		// Even if not rebuilding, there are a few variables that may need to be moved around.
-		else
-		{
+		else {
 			$pathcode_pos = strpos($settingsText, $substitutions[$pathcode_var]['placeholder']);
 
-			if ($pathcode_pos !== false)
-			{
-				foreach ($force_before_pathcode as $var)
-				{
-					if (!empty($substitutions[$var]['placeholder']) && strpos($settingsText, $substitutions[$var]['placeholder']) > $pathcode_pos)
-					{
-						$settingsText = strtr($settingsText, array(
+			if ($pathcode_pos !== false) {
+				foreach ($force_before_pathcode as $var) {
+					if (!empty($substitutions[$var]['placeholder']) && strpos($settingsText, $substitutions[$var]['placeholder']) > $pathcode_pos) {
+						$settingsText = strtr($settingsText, [
 							$substitutions[$var]['placeholder'] => '',
 							$substitutions[$pathcode_var]['placeholder'] => $substitutions[$var]['placeholder'] . "\n" . $substitutions[$pathcode_var]['placeholder'],
-						));
+						]);
 					}
 				}
 			}
@@ -2294,30 +2166,26 @@ function($a, $b) {
 		$settingsText = strtr($settingsText, $simple_replacements);
 
 		// Deal with any complicated ones.
-		if (!empty($replace_patterns))
-		{
+		if (!empty($replace_patterns)) {
 			$settingsText = preg_replace($replace_patterns, $replace_strings, $settingsText);
 		}
 
 		// Make absolutely sure that the path correction code is included.
-		if (strpos($settingsText, $substitutions[$pathcode_var]['replacement']) === false)
-		{
+		if (strpos($settingsText, $substitutions[$pathcode_var]['replacement']) === false) {
 			$settingsText = preg_replace('~(?=\n#+ Error.Catching #+)~', "\n" . $substitutions[$pathcode_var]['replacement'] . "\n", $settingsText);
 		}
 
 		// If we did not rebuild, do just enough to make sure the thing is viable.
-		if (empty($rebuild))
-		{
+		if (empty($rebuild)) {
 			// We need to refresh $bare_settingsText again, and remove the code blocks from it.
 			$bare_settingsText = $settingsText;
 
-			foreach ($substitutions as $var => $substitution)
-			{
-				if (!is_int($var))
+			foreach ($substitutions as $var => $substitution) {
+				if (!is_int($var)) {
 					break;
+				}
 
-				if (isset($substitution['replacement']))
-				{
+				if (isset($substitution['replacement'])) {
 					$bare_settingsText = str_replace($substitution['replacement'], '', $bare_settingsText);
 				}
 			}
@@ -2327,41 +2195,37 @@ function($a, $b) {
 			// Now insert any defined settings that are missing.
 			$pathcode_reached = false;
 
-			foreach ($settings_defs as $var => $setting_def)
-			{
-				if ($var === $pathcode_var)
+			foreach ($settings_defs as $var => $setting_def) {
+				if ($var === $pathcode_var) {
 					$pathcode_reached = true;
+				}
 
-				if (is_int($var))
+				if (is_int($var)) {
 					continue;
+				}
 
 				// Do nothing if it is already in there.
-				if (preg_match($substitutions[$var]['search_pattern'], $bare_settingsText))
+				if (preg_match($substitutions[$var]['search_pattern'], $bare_settingsText)) {
 					continue;
+				}
 
 				// Insert it either before or after the path correction code, whichever is appropriate.
-				if (!$pathcode_reached || in_array($var, $force_before_pathcode))
-				{
+				if (!$pathcode_reached || in_array($var, $force_before_pathcode)) {
 					$settingsText = preg_replace($substitutions[$pathcode_var]['search_pattern'], $substitutions[$var]['replacement'] . "\n\n$0", $settingsText);
-				}
-				else
-				{
+				} else {
 					$settingsText = preg_replace($substitutions[$pathcode_var]['search_pattern'], "$0\n\n" . $substitutions[$var]['replacement'], $settingsText);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			// If the comments for some variables have changed since the last
 			// time we rebuilt, we could have orphan copies of the old comments
 			// still laying around.
 			$prev_var = null;
 
-			foreach ($settings_defs as $var => $setting_def)
-			{
-				if (!isset($setting_def['text']))
-				{
+			foreach ($settings_defs as $var => $setting_def) {
+				if (!isset($setting_def['text'])) {
 					$prev_var = $var;
+
 					continue;
 				}
 
@@ -2376,12 +2240,9 @@ function($a, $b) {
 		}
 
 		// If we have any brand new settings to add, do so.
-		foreach ($new_settings_vars as $var => $val)
-		{
-			if (isset($substitutions[$var]) && !preg_match($substitutions[$var]['search_pattern'], $settingsText))
-			{
-				if (!isset($settings_defs[$var]) && strpos($settingsText, '# Custom Settings #') === false)
-				{
+		foreach ($new_settings_vars as $var => $val) {
+			if (isset($substitutions[$var]) && !preg_match($substitutions[$var]['search_pattern'], $settingsText)) {
+				if (!isset($settings_defs[$var]) && strpos($settingsText, '# Custom Settings #') === false) {
 					$settingsText = preg_replace('~(?=\n#+ Error.Catching #+)~', "\n\n######### Custom Settings #########\n", $settingsText);
 				}
 
@@ -2404,8 +2265,7 @@ function($a, $b) {
 		unlink($temp_sfile);
 
 		// If the syntax is borked, try rebuilding to see if that fixes it.
-		if ($result === false)
-		{
+		if ($result === false) {
 			return empty($rebuild) ? self::updateSettingsFile($config_vars, $keep_quotes, true) : false;
 		}
 
@@ -2435,74 +2295,74 @@ function($a, $b) {
 	 * @return array|bool An array of name/value pairs for all settings in the
 	 *    file, or false on error.
 	 */
-	public static function getCurrentSettings(int|float $mtime = null, string $settingsFile = SMF_SETTINGS_FILE): array|bool
+	public static function getCurrentSettings(int|float|null $mtime = null, string $settingsFile = SMF_SETTINGS_FILE): array|bool
 	{
 		$mtime = is_null($mtime) ? (defined('TIME_START') ? TIME_START : $_SERVER['REQUEST_TIME']) : (int) $mtime;
 
-		if (!is_file($settingsFile))
-		{
-			if ($settingsFile !== SMF_SETTINGS_FILE && is_file(SMF_SETTINGS_FILE))
-			{
+		if (!is_file($settingsFile)) {
+			if ($settingsFile !== SMF_SETTINGS_FILE && is_file(SMF_SETTINGS_FILE)) {
 				$settingsFile = SMF_SETTINGS_FILE;
-			}
-			else
-			{
-				foreach (get_included_files() as $settingsFile)
-				{
-					if (basename($settingsFile) === basename(SMF_SETTINGS_FILE))
+			} else {
+				foreach (get_included_files() as $settingsFile) {
+					if (basename($settingsFile) === basename(SMF_SETTINGS_FILE)) {
 						break;
+					}
 				}
 
-				if (basename($settingsFile) !== basename(SMF_SETTINGS_FILE))
+				if (basename($settingsFile) !== basename(SMF_SETTINGS_FILE)) {
 					return false;
+				}
 			}
 		}
 
 		// If the file has been changed since the last known good configuration, bail out.
 		clearstatcache();
 
-		if (filemtime($settingsFile) > $mtime)
+		if (filemtime($settingsFile) > $mtime) {
 			return false;
+		}
 
 		// Strip out opening and closing PHP tags.
 		$settingsText = trim(file_get_contents($settingsFile));
 
-		if (substr($settingsText, 0, 5) == '<' . '?php')
+		if (substr($settingsText, 0, 5) == '<' . '?php') {
 			$settingsText = substr($settingsText, 5);
+		}
 
-		if (substr($settingsText, -2) == '?' . '>')
+		if (substr($settingsText, -2) == '?' . '>') {
 			$settingsText = substr($settingsText, 0, -2);
+		}
 
 		// Since we're using eval, we need to manually replace these with strings.
-		$settingsText = strtr($settingsText, array(
+		$settingsText = strtr($settingsText, [
 			'__FILE__' => var_export($settingsFile, true),
 			'__DIR__' => var_export(dirname($settingsFile), true),
-		));
+		]);
 
 		// Prevents warnings about constants that are already defined.
 		$settingsText = preg_replace_callback(
 			'~\bdefine\s*\(\s*(["\'])(\w+)\1~',
-			function ($matches)
-			{
+			function ($matches) {
 				return 'define(\'' . md5(mt_rand()) . '\'';
 			},
-			$settingsText
+			$settingsText,
 		);
 
 		// Handle eval errors gracefully in all PHP versions.
-		try
-		{
-			if ($settingsText !== '' && @eval($settingsText) === false)
+		try {
+			if ($settingsText !== '' && @eval($settingsText) === false) {
 				throw new ErrorException('eval error');
+			}
 
 			unset($mtime, $settingsFile, $settingsText);
 			$defined_vars = get_defined_vars();
+		} catch (Throwable $e) {
+		} catch (ErrorException $e) {
 		}
-		catch (Throwable $e) {}
-		catch (ErrorException $e) {}
 
-		if (isset($e))
+		if (isset($e)) {
 			return false;
+		}
 
 		return $defined_vars;
 	}
@@ -2523,69 +2383,68 @@ function ($matches)
 	 *    overwriting the existing content of the file. Default false.
 	 * @return bool Whether the write operation succeeded or not.
 	 */
-	public static function safeFileWrite(string $file, string $data, string|null $backup_file = null, int|null $mtime = null, bool $append = false): bool
+	public static function safeFileWrite(string $file, string $data, ?string $backup_file = null, ?int $mtime = null, bool $append = false): bool
 	{
 		// Sanity checks.
-		if (!file_exists($file) && !is_dir(dirname($file)))
+		if (!file_exists($file) && !is_dir(dirname($file))) {
 			return false;
+		}
 
-		if (!is_int($mtime))
+		if (!is_int($mtime)) {
 			$mtime = defined('TIME_START') ? (int) TIME_START : $_SERVER['REQUEST_TIME'];
+		}
 
-		if (!isset(self::$temp_dir))
+		if (!isset(self::$temp_dir)) {
 			self::getTempDir();
+		}
 
 		// Our temp files.
 		$temp_sfile = tempnam(self::$temp_dir . DIRECTORY_SEPARATOR, pathinfo($file, PATHINFO_FILENAME) . '.');
 
-		if (!empty($backup_file))
-		{
+		if (!empty($backup_file)) {
 			$temp_bfile = tempnam(self::$temp_dir, pathinfo($backup_file, PATHINFO_FILENAME) . '.');
 		}
 
 		// We need write permissions.
 		$failed = false;
 
-		foreach (array($file, $backup_file) as $sf)
-		{
-			if (empty($sf))
+		foreach ([$file, $backup_file] as $sf) {
+			if (empty($sf)) {
 				continue;
+			}
 
-			if (!file_exists($sf))
-			{
+			if (!file_exists($sf)) {
 				touch($sf);
-			}
-			elseif (!is_file($sf))
-			{
+			} elseif (!is_file($sf)) {
 				$failed = true;
 			}
 
-			if (!$failed)
+			if (!$failed) {
 				$failed = !is_writable($sf);
+			}
 		}
 
 		// Now let's see if writing to a temp file succeeds.
-		if (!$failed && file_put_contents($temp_sfile, $data, LOCK_EX) !== strlen($data))
+		if (!$failed && file_put_contents($temp_sfile, $data, LOCK_EX) !== strlen($data)) {
 			$failed = true;
+		}
 
 		// Tests passed, so it's time to do the job.
-		if (!$failed)
-		{
+		if (!$failed) {
 			// Back up the backup, just in case.
-			if (!empty($backup_file) && file_exists($backup_file))
+			if (!empty($backup_file) && file_exists($backup_file)) {
 				$temp_bfile_saved = @copy($backup_file, $temp_bfile);
+			}
 
 			// Make sure no one changed the file while we weren't looking.
 			clearstatcache();
 
-			if ((int) filemtime($file) <= $mtime)
-			{
+			if ((int) filemtime($file) <= $mtime) {
 				// Attempt to open the file.
 				$sfhandle = @fopen($file, 'c');
 
 				// Let's do this thing!
-				if ($sfhandle !== false)
-				{
+				if ($sfhandle !== false) {
 					// Immediately get a lock.
 					flock($sfhandle, LOCK_EX);
 
@@ -2593,33 +2452,29 @@ public static function safeFileWrite(string $file, string $data, string|null $ba
 					$temp_sfile_saved = @copy($file, $temp_sfile);
 
 					// Now write our data to the file.
-					if ($temp_sfile_saved)
-					{
-						if (empty($append))
-						{
+					if ($temp_sfile_saved) {
+						if (empty($append)) {
 							ftruncate($sfhandle, 0);
 							rewind($sfhandle);
 						}
 
 						$failed = fwrite($sfhandle, $data) !== strlen($data);
-					}
-					else
-					{
+					} else {
 						$failed = true;
 					}
 
 					// If writing failed, put everything back the way it was.
-					if ($failed)
-					{
-						if (!empty($temp_sfile_saved))
+					if ($failed) {
+						if (!empty($temp_sfile_saved)) {
 							@rename($temp_sfile, $file);
+						}
 
-						if (!empty($temp_bfile_saved))
+						if (!empty($temp_bfile_saved)) {
 							@rename($temp_bfile, $backup_file);
+						}
 					}
 					// It worked, so make our temp backup the new permanent backup.
-					elseif (!empty($backup_file))
-					{
+					elseif (!empty($backup_file)) {
 						@rename($temp_sfile, $backup_file);
 					}
 
@@ -2633,17 +2488,20 @@ public static function safeFileWrite(string $file, string $data, string|null $ba
 		// We're done with these.
 		@unlink($temp_sfile);
 
-		if (!empty($temp_bfile))
+		if (!empty($temp_bfile)) {
 			@unlink($temp_bfile);
+		}
 
-		if ($failed)
+		if ($failed) {
 			return false;
+		}
 
 		// Even though on normal installations the filemtime should invalidate
 		// any cached version, it seems that there are times it might not.
 		// So let's MAKE it dump the cache.
-		if (function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate')) {
 			opcache_invalidate($file, true);
+		}
 
 		return true;
 	}
@@ -2663,38 +2521,35 @@ public static function varExport($var): string
 		 * Even though technically we can now, we'll keep arrays on one line for
 		 * the sake of backwards compatibility.
 		 */
-		if (is_array($var))
-		{
-			$return = array();
+		if (is_array($var)) {
+			$return = [];
 
-			foreach ($var as $key => $value)
+			foreach ($var as $key => $value) {
 				$return[] = var_export($key, true) . ' => ' . self::varExport($value);
+			}
 
 			return 'array(' . implode(', ', $return) . ')';
 		}
+
 		// For the same reason, replace literal returns and newlines with "\r" and "\n"
-		elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false))
-		{
+		if (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false)) {
 			return strtr(
 				preg_replace_callback(
 					'/[\r\n]+/',
-					function($m)
-					{
-						return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \'';
+					function ($m) {
+						return '\' . "' . strtr($m[0], ["\r" => '\r', "\n" => '\n']) . '" . \'';
 					},
-					var_export($var, true)
+					var_export($var, true),
 				),
-				array("'' . " => '', " . ''" => '')
+				["'' . " => '', " . ''" => ''],
 			);
 		}
 		// We typically use lowercase true/false/null.
-		elseif (in_array(gettype($var), array('boolean', 'NULL')))
-		{
+		elseif (in_array(gettype($var), ['boolean', 'NULL'])) {
 			return strtolower(var_export($var, true));
 		}
 		// Nothing special.
-		else
-		{
+		else {
 			return var_export($var, true);
 		}
 	}
@@ -2708,24 +2563,18 @@ function($m)
 	public static function stripPhpComments(string $code_str): string
 	{
 		// This is the faster, better way.
-		if (is_callable('token_get_all'))
-		{
+		if (is_callable('token_get_all')) {
 			$tokens = token_get_all($code_str);
 
-			$parts = array();
+			$parts = [];
 
-			foreach ($tokens as $token)
-			{
-				if (is_string($token))
-				{
+			foreach ($tokens as $token) {
+				if (is_string($token)) {
 					$parts[] = $token;
-				}
-				else
-				{
+				} else {
 					list($id, $text) = $token;
 
-					switch ($id)
-					{
+					switch ($id) {
 						case T_COMMENT:
 						case T_DOC_COMMENT:
 							end($parts);
@@ -2737,14 +2586,10 @@ public static function stripPhpComments(string $code_str): string
 
 							// For 'C' style comments, also trim one preceding
 							// line break, if present.
-							if (strpos($text, '/*') === 0)
-							{
-								if (substr($parts[$prev_part], -2) === "\r\n")
-								{
+							if (strpos($text, '/*') === 0) {
+								if (substr($parts[$prev_part], -2) === "\r\n") {
 									$parts[$prev_part] = substr($parts[$prev_part], 0, -2);
-								}
-								elseif (in_array(substr($parts[$prev_part], -1), array("\r", "\n")))
-								{
+								} elseif (in_array(substr($parts[$prev_part], -1), ["\r", "\n"])) {
 									$parts[$prev_part] = substr($parts[$prev_part], 0, -1);
 								}
 							}
@@ -2766,12 +2611,10 @@ public static function stripPhpComments(string $code_str): string
 		// If the tokenizer extension has been disabled, do the job manually.
 
 		// Leave any heredocs alone.
-		if (preg_match_all('/<<<([\'"]?)(\w+)\1?\R(.*?)\R\h*\2;$/ms', $code_str, $matches))
-		{
-			$heredoc_replacements = array();
+		if (preg_match_all('/<<<([\'"]?)(\w+)\1?\R(.*?)\R\h*\2;$/ms', $code_str, $matches)) {
+			$heredoc_replacements = [];
 
-			foreach ($matches[0] as $mkey => $heredoc)
-			{
+			foreach ($matches[0] as $mkey => $heredoc) {
 				$heredoc_replacements[$heredoc] = var_export(md5($matches[3][$mkey]), true) . ';';
 			}
 
@@ -2783,8 +2626,8 @@ public static function stripPhpComments(string $code_str): string
 
 		$in_string = 0;
 		$in_comment = 0;
-		foreach ($parts as $partkey => $part)
-		{
+
+		foreach ($parts as $partkey => $part) {
 			$one_char = substr($part, 0, 1);
 			$two_char = substr($part, 0, 2);
 			$to_remove = 0;
@@ -2795,25 +2638,16 @@ public static function stripPhpComments(string $code_str): string
 			 *	1: in a single quote string
 			 *	2: in a double quote string
 			 */
-			if ($one_char == "'")
-			{
-				if (!empty($in_comment))
-				{
+			if ($one_char == "'") {
+				if (!empty($in_comment)) {
 					$in_string = 0;
-				}
-				elseif (in_array($in_string, array(0, 1)))
-				{
+				} elseif (in_array($in_string, [0, 1])) {
 					$in_string = ($in_string ^ 1);
 				}
-			}
-			elseif ($one_char == '"')
-			{
-				if (!empty($in_comment))
-				{
+			} elseif ($one_char == '"') {
+				if (!empty($in_comment)) {
 					$in_string = 0;
-				}
-				elseif (in_array($in_string, array(0, 2)))
-				{
+				} elseif (in_array($in_string, [0, 2])) {
 					$in_string = ($in_string ^ 2);
 				}
 			}
@@ -2824,51 +2658,36 @@ public static function stripPhpComments(string $code_str): string
 			 *	1: in a single line comment
 			 *	2: in a multi-line comment
 			 */
-			elseif ($one_char == '#' || $two_char == '//')
-			{
+			elseif ($one_char == '#' || $two_char == '//') {
 				$in_comment = !empty($in_string) ? 0 : (empty($in_comment) ? 1 : $in_comment);
 
-				if ($in_comment == 1)
-				{
+				if ($in_comment == 1) {
 					$parts[$partkey - 1] = rtrim($parts[$partkey - 1], "\t ");
 
-					if (substr($parts[$partkey - 1], -2) === "\r\n")
-					{
+					if (substr($parts[$partkey - 1], -2) === "\r\n") {
 						$parts[$partkey - 1] = substr($parts[$partkey - 1], 0, -2);
-					}
-					elseif (in_array(substr($parts[$partkey - 1], -1), array("\r", "\n")))
-					{
+					} elseif (in_array(substr($parts[$partkey - 1], -1), ["\r", "\n"])) {
 						$parts[$partkey - 1] = substr($parts[$partkey - 1], 0, -1);
 					}
 				}
-			}
-			elseif ($two_char === "\r\n" || $one_char === "\r" || $one_char === "\n")
-			{
-				if ($in_comment == 1)
+			} elseif ($two_char === "\r\n" || $one_char === "\r" || $one_char === "\n") {
+				if ($in_comment == 1) {
 					$in_comment = 0;
-			}
-			elseif ($two_char == '/*')
-			{
+				}
+			} elseif ($two_char == '/*') {
 				$in_comment = !empty($in_string) ? 0 : (empty($in_comment) ? 2 : $in_comment);
 
-				if ($in_comment == 2)
-				{
+				if ($in_comment == 2) {
 					$parts[$partkey - 1] = rtrim($parts[$partkey - 1], "\t ");
 
-					if (substr($parts[$partkey - 1], -2) === "\r\n")
-					{
+					if (substr($parts[$partkey - 1], -2) === "\r\n") {
 						$parts[$partkey - 1] = substr($parts[$partkey - 1], 0, -2);
-					}
-					elseif (in_array(substr($parts[$partkey - 1], -1), array("\r", "\n")))
-					{
+					} elseif (in_array(substr($parts[$partkey - 1], -1), ["\r", "\n"])) {
 						$parts[$partkey - 1] = substr($parts[$partkey - 1], 0, -1);
 					}
 				}
-			}
-			elseif ($two_char == '*/')
-			{
-				if ($in_comment == 2)
-				{
+			} elseif ($two_char == '*/') {
+				if ($in_comment == 2) {
 					$in_comment = 0;
 
 					// Delete the comment closing.
@@ -2876,20 +2695,18 @@ public static function stripPhpComments(string $code_str): string
 				}
 			}
 
-			if (empty($in_comment))
-			{
+			if (empty($in_comment)) {
 				$parts[$partkey] = strlen($part) > $to_remove ? substr($part, $to_remove) : '';
-			}
-			else
-			{
+			} else {
 				$parts[$partkey] = '';
 			}
 		}
 
 		$code_str = implode('', $parts);
 
-		if (!empty($heredoc_replacements))
+		if (!empty($heredoc_replacements)) {
 			$code_str = strtr($code_str, array_flip($heredoc_replacements));
+		}
 
 		return $code_str;
 	}
@@ -2909,16 +2726,11 @@ public static function stripPhpComments(string $code_str): string
 	public static function updateDbLastError(int $time, bool $update = true): bool
 	{
 		// Write out the db_last_error file with the error timestamp
-		if (!empty(self::$cachedir) && is_writable(self::$cachedir))
-		{
+		if (!empty(self::$cachedir) && is_writable(self::$cachedir)) {
 			$errorfile = self::$cachedir . '/db_last_error.php';
-		}
-		elseif (file_exists(dirname(__DIR__) . '/cache'))
-		{
+		} elseif (file_exists(dirname(__DIR__) . '/cache')) {
 			$errorfile = dirname(__DIR__) . '/cache/db_last_error.php';
-		}
-		else
-		{
+		} else {
 			$errorfile = dirname(__DIR__) . '/db_last_error.php';
 		}
 
@@ -2927,8 +2739,9 @@ public static function updateDbLastError(int $time, bool $update = true): bool
 		@touch(SMF_SETTINGS_FILE);
 
 		// Unless requested, we should update self::$db_last_error as well.
-		if ($update)
+		if ($update) {
 			self::$db_last_error = $time;
+		}
 
 		// We  do a loose match here rather than strict (!==) as 0 is also false.
 		return $result != false;
@@ -2956,21 +2769,21 @@ public static function updateDbLastError(int $time, bool $update = true): bool
 	public static function getTempDir(): string
 	{
 		// Already did this.
-		if (!empty(self::$temp_dir))
+		if (!empty(self::$temp_dir)) {
 			return self::$temp_dir;
+		}
 
 		// Temp Directory options order.
-		$temp_dir_options = array(
+		$temp_dir_options = [
 			0 => 'sys_get_temp_dir',
 			1 => 'upload_tmp_dir',
 			2 => 'session.save_path',
 			3 => 'cachedir',
-		);
+		];
 
 		// Is self::$cachedir a valid option?
-		if (empty(self::$cachedir) || !is_dir(self::$cachedir) || !is_writable(self::$cachedir))
-		{
-			$temp_dir_options = array_diff($temp_dir_options, array('cachedir'));
+		if (empty(self::$cachedir) || !is_dir(self::$cachedir) || !is_writable(self::$cachedir)) {
+			$temp_dir_options = array_diff($temp_dir_options, ['cachedir']);
 		}
 
 		// Determine if we should detect a restriction and what restrictions that may be.
@@ -2981,10 +2794,8 @@ public static function getTempDir(): string
 		$old_error_reporting = error_reporting(0);
 
 		// Search for a working temp directory.
-		foreach ($temp_dir_options as $id_temp => $temp_option)
-		{
-			switch ($temp_option)
-			{
+		foreach ($temp_dir_options as $id_temp => $temp_option) {
+			switch ($temp_option) {
 				case 'cachedir':
 					$possible_temp = rtrim(self::$cachedir, '\\/');
 					break;
@@ -3003,28 +2814,25 @@ public static function getTempDir(): string
 			}
 
 			// Check if we have a restriction preventing this from working.
-			if ($restriction)
-			{
-				foreach ($restriction as $dir)
-				{
-					if (strpos($possible_temp, $dir) !== false && is_writable($possible_temp))
-					{
+			if ($restriction) {
+				foreach ($restriction as $dir) {
+					if (strpos($possible_temp, $dir) !== false && is_writable($possible_temp)) {
 						self::$temp_dir = $possible_temp;
 						break;
 					}
 				}
 			}
 			// No restrictions, but need to check for writable status.
-			elseif (is_writable($possible_temp))
-			{
+			elseif (is_writable($possible_temp)) {
 				self::$temp_dir = $possible_temp;
 				break;
 			}
 		}
 
 		// Fall back to sys_get_temp_dir even though it won't work, so we have something.
-		if (empty(self::$temp_dir))
+		if (empty(self::$temp_dir)) {
 			self::$temp_dir = sys_get_temp_dir();
+		}
 
 		// Put things back.
 		error_reporting($old_error_reporting);
@@ -3050,12 +2858,12 @@ public static function setMemoryLimit(string $needed, bool $in_use = false): boo
 		$memory_needed = self::memoryReturnBytes($needed);
 
 		// Should we account for how much is currently being used?
-		if ($in_use)
+		if ($in_use) {
 			$memory_needed += memory_get_usage();
+		}
 
 		// If more is needed, request it.
-		if ($memory_current < $memory_needed)
-		{
+		if ($memory_current < $memory_needed) {
 			@ini_set('memory_limit', ceil($memory_needed / 1048576) . 'M');
 			$memory_current = self::memoryReturnBytes(ini_get('memory_limit'));
 		}
@@ -3070,12 +2878,13 @@ public static function setMemoryLimit(string $needed, bool $in_use = false): boo
 	 * Helper function to convert memory string settings to bytes
 	 *
 	 * @param string $val The byte string, like '256M' or '1G'.
-	 * @return integer The string converted to a proper integer in bytes.
+	 * @return int The string converted to a proper integer in bytes.
 	 */
 	public static function memoryReturnBytes(string $val): int
 	{
-		if (is_integer($val))
+		if (is_integer($val)) {
 			return $val;
+		}
 
 		// Separate the number from the designator.
 		$val = trim($val);
@@ -3083,12 +2892,15 @@ public static function memoryReturnBytes(string $val): int
 		$last = strtolower(substr($val, -1));
 
 		// Convert to bytes.
-		switch ($last)
-		{
+		switch ($last) {
 			case 'g':
 				$num *= 1024;
+				// no break
+
 			case 'm':
 				$num *= 1024;
+				// no break
+
 			case 'k':
 				$num *= 1024;
 		}
@@ -3116,7 +2928,7 @@ public static function httpsOn(): bool
 	 */
 	public static function generateSeed(): void
 	{
-		self::updateModSettings(array('rand_seed' => Utils::randomInt(0, 2**31 - 1)));
+		self::updateModSettings(['rand_seed' => Utils::randomInt(0, 2 ** 31 - 1)]);
 	}
 
 	/**
@@ -3128,35 +2940,31 @@ public static function generateSeed(): void
 	 */
 	public static function checkCron()
 	{
-		if (!empty(self::$modSettings['cron_is_real_cron']) && time() - @intval(self::$modSettings['cron_last_checked']) > 84600)
-		{
-			$request = Db\DatabaseApi::$db->query('', '
-				SELECT COUNT(*)
+		if (!empty(self::$modSettings['cron_is_real_cron']) && time() - @intval(self::$modSettings['cron_last_checked']) > 86400) {
+			$request = Db\DatabaseApi::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}scheduled_tasks
 				WHERE disabled = {int:not_disabled}
 					AND next_time < {int:yesterday}',
-				array(
+				[
 					'not_disabled' => 0,
-					'yesterday' => time() - 84600,
-				)
+					'yesterday' => time() - 86400,
+				],
 			);
 			list($overdue) = Db\DatabaseApi::$db->fetch_row($request);
 			Db\DatabaseApi::$db->free_result($request);
 
 			// If we have tasks more than a day overdue, cron isn't doing its job.
-			if (!empty($overdue))
-			{
+			if (!empty($overdue)) {
 				Lang::load('ManageScheduledTasks');
 				ErrorHandler::log(Lang::$txt['cron_not_working']);
-				self::updateModSettings(array('cron_is_real_cron' => 0));
-			}
-			else
-			{
-				self::updateModSettings(array('cron_last_checked' => time()));
+				self::updateModSettings(['cron_is_real_cron' => 0]);
+			} else {
+				self::updateModSettings(['cron_last_checked' => time()]);
 			}
 		}
 	}
-
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Cookie.php b/Sources/Cookie.php
index c73936b22f..421da2d70f 100644
--- a/Sources/Cookie.php
+++ b/Sources/Cookie.php
@@ -25,15 +25,15 @@ class Cookie
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'getCookie' => false,
+	private static $backcompat = [
+		'func_names' => [
+			'setLoginCookie' => 'setLoginCookie',
+			'setTFACookie' => 'setTFACookie',
 			'urlParts' => 'url_parts',
 			'encrypt' => 'hash_salt',
-			'setDefaults' => false,
 			'setcookie' => 'smf_setcookie',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -41,7 +41,7 @@ class Cookie
 
 	/**
 	 * @var string
-	 * 
+	 *
 	 * The name of the cookie.
 	 */
 	public string $name;
@@ -57,7 +57,7 @@ class Cookie
 
 	/**
 	 * @var int
-	 * 
+	 *
 	 * The member this cookie is for.
 	 *
 	 * Only normally used for login and TFA cookies.
@@ -77,14 +77,14 @@ class Cookie
 
 	/**
 	 * @var int
-	 * 
+	 *
 	 * UNIX timestamp of the expiry date of the cookie.
 	 */
 	public int $expires;
 
 	/**
 	 * @var string
-	 * 
+	 *
 	 * The domain of the site where the cookie is used.
 	 * This is normally the domain name of the forum's site.
 	 */
@@ -92,7 +92,7 @@ class Cookie
 
 	/**
 	 * @var string
-	 * 
+	 *
 	 * The path to the part of the site where the cookie is used.
 	 * This is normally the URL path to the forum.
 	 */
@@ -145,7 +145,7 @@ class Cookie
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param string $name Name of the cookie.
 	 * @param mixed $custom_data Data to include in the cookie.
 	 * @param int $expires When the cookie expires.
@@ -162,25 +162,23 @@ class Cookie
 	 *    If not set, determined by Config::$modSettings['samesiteCookies'].
 	 */
 	public function __construct(
-		string $name = null,
+		?string $name = null,
 		mixed $custom_data = null,
 		?int $expires = null,
 		?string $domain = null,
 		?string $path = null,
 		?bool $secure = null,
 		?bool $httponly = null,
-		?string $samesite = null
-	)
-	{
+		?string $samesite = null,
+	) {
 		self::setDefaults();
 
 		$this->name = $name ?? Config::$cookiename;
 
-		$this->custom_data = $custom_data ?? array();
+		$this->custom_data = $custom_data ?? [];
 
 		// Special case for the login and TFA cookies.
-		if (in_array($this->name, array(Config::$cookiename, Config::$cookiename . '_tfa')))
-		{
+		if (in_array($this->name, [Config::$cookiename, Config::$cookiename . '_tfa'])) {
 			$this->member = $this->custom_data[0] ?? User::$me->id;
 			$this->hash = $this->custom_data[1] ?? self::encrypt(User::$me->passwd, User::$me->password_salt);
 
@@ -188,27 +186,28 @@ public function __construct(
 			$domain = $domain ?? $this->custom_data[3] ?? null;
 			$path = $path ?? $this->custom_data[4] ?? null;
 
-			for ($i = 0; $i <= 4; $i++)
+			for ($i = 0; $i <= 4; $i++) {
 				unset($this->custom_data[$i]);
+			}
 		}
 
 		$this->expires = $expires ?? time() + 60 * Config::$modSettings['cookieTime'];
 		$this->domain = $domain ?? self::$default_domain;
 		$this->path = $path ?? self::$default_path;
 		$this->secure = $secure ?? !empty(Config::$modSettings['secureCookies']);
-		$this->httponly = $httponly ?? !empty(Config::$modSettings['httponlyCookies']);;
+		$this->httponly = $httponly ?? !empty(Config::$modSettings['httponlyCookies']);
 		$this->samesite = $samesite ?? !empty(Config::$modSettings['samesiteCookies']) ? Config::$modSettings['samesiteCookies'] : 'lax';
 
 		// Allow mods to add custom info to the cookie
-		$data = $this->name !== Config::$cookiename ? array() : array(
+		$data = $this->name !== Config::$cookiename ? [] : [
 			$this->member,
 			$this->hash,
 			$this->expires,
 			$this->domain,
 			$this->path,
-		);
+		];
 
-		IntegrationHook::call('integrate_cookie_data', array($data, &$this->custom_data));
+		IntegrationHook::call('integrate_cookie_data', [$data, &$this->custom_data]);
 	}
 
 	/**
@@ -216,41 +215,36 @@ public function __construct(
 	 */
 	public function set()
 	{
-		if (in_array($this->name, array(Config::$cookiename, Config::$cookiename . '_tfa')))
-		{
-			$data = array(
+		if (in_array($this->name, [Config::$cookiename, Config::$cookiename . '_tfa'])) {
+			$data = [
 				$this->member,
 				$this->hash,
 				$this->expires,
 				$this->domain,
 				$this->path,
-			);
+			];
 
 			$data = array_merge($data, (array) $this->custom_data);
 
 			$value = Utils::jsonEncode($data, JSON_FORCE_OBJECT);
-		}
-		elseif (!is_scalar($this->custom_data))
-		{
+		} elseif (!is_scalar($this->custom_data)) {
 			$value = Utils::jsonEncode($this->custom_data, JSON_FORCE_OBJECT);
-		}
-		else
-		{
+		} else {
 			$value = $this->custom_data;
 		}
 
 		// MOD AUTHORS: This hook just informs you about the cookie. If you want
 		// to change the cookie data, use integrate_cookie_data instead.
-		IntegrationHook::call('integrate_cookie', array($this->name, $value, $this->expires, $this->path, $this->domain, $this->secure, $this->httponly, $this->samesite));
+		IntegrationHook::call('integrate_cookie', [$this->name, $value, $this->expires, $this->path, $this->domain, $this->secure, $this->httponly, $this->samesite]);
 
-		return setcookie($this->name, $value, array(
+		return setcookie($this->name, $value, [
 			'expires' 	=> $this->expires,
 			'path'		=> $this->path,
 			'domain' 	=> $this->domain,
 			'secure'	=> $this->secure,
 			'httponly'	=> $this->httponly,
 			'samesite'	=> $this->samesite,
-		));
+		]);
 	}
 
 	/***********************
@@ -265,41 +259,37 @@ public function set()
 	 * @return object|null An instance of this class for the cookie, or null
 	 *    if no cookie with that name was sent by the client.
 	 */
-	public static function getCookie(string $name): object|null
+	public static function getCookie(string $name): ?object
 	{
-		if (!isset($_COOKIE[$name]))
+		if (!isset($_COOKIE[$name])) {
 			return null;
+		}
 
 		// Special case for the login cookie.
-		if ($name === Config::$cookiename)
-		{
+		if ($name === Config::$cookiename) {
 			// First check for JSON-format cookie
-			if (preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+,"3":"[^"]+","4":"[^"]+"~', $_COOKIE[$name]))
-			{
+			if (preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+,"3":"[^"]+","4":"[^"]+"~', $_COOKIE[$name])) {
 				$data = Utils::jsonDecode($_COOKIE[$name], true);
 			}
 			// Legacy format (for recent upgrades from SMF 2.0.x)
-			elseif (preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|40):"([a-fA-F0-9]{40})?";i:2;[id]:\d+;(i:3;i:\d;)?~', $_COOKIE[$name]))
-			{
+			elseif (preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|40):"([a-fA-F0-9]{40})?";i:2;[id]:\d+;(i:3;i:\d;)?~', $_COOKIE[$name])) {
 				$data = Utils::safeUnserialize($_COOKIE[$name]);
 
-				list(,,, $state) = $data;
+				list(, , , $state) = $data;
 
 				$cookie_state = (empty(Config::$modSettings['localCookies']) ? 0 : 1) | (empty(Config::$modSettings['globalCookies']) ? 0 : 2);
 
 				// Maybe we need to temporarily pretend to be using local cookies
-				if ($cookie_state == 0 && $state == 1)
-				{
+				if ($cookie_state == 0 && $state == 1) {
 					list($data[3], $data[4]) = self::urlParts(true, false);
-				}
-				else
-				{
+				} else {
 					list($data[3], $data[4]) = self::urlParts($state & 1 > 0, $state & 2 > 0);
 				}
 			}
 
-			if (!isset($data))
+			if (!isset($data)) {
 				return null;
+			}
 
 			$member = (int) ($data[0] ?? 0);
 			$hash = (string) ($data[1] ?? '');
@@ -307,15 +297,16 @@ public static function getCookie(string $name): object|null
 			$domain = $data[3] ?? null;
 			$path = $data[4] ?? null;
 
-			return new self($name, array($member, $hash), $expires, $domain, $path);
+			return new self($name, [$member, $hash], $expires, $domain, $path);
 		}
+
 		// Special case for the TFA cookie.
-		elseif ($name === Config::$cookiename . '_tfa')
-		{
+		if ($name === Config::$cookiename . '_tfa') {
 			$data = Utils::jsonDecode($_COOKIE[$name], true);
 
-			if (json_last_error() !== JSON_ERROR_NONE)
+			if (json_last_error() !== JSON_ERROR_NONE) {
 				return null;
+			}
 
 			$member = (int) ($data[0] ?? 0);
 			$hash = (string) ($data[1] ?? '');
@@ -323,18 +314,17 @@ public static function getCookie(string $name): object|null
 			$domain = (string) ($data[3] ?? '');
 			$path = (string) ($data[4] ?? '');
 
-			return new self($name, array($member, $hash), $expires, $domain, $path);
+			return new self($name, [$member, $hash], $expires, $domain, $path);
 		}
-		// Other cookies.
-		else
-		{
-			$data = Utils::jsonDecode($_COOKIE[$name], true, false);
 
-			if (json_last_error() !== JSON_ERROR_NONE)
-				$data = $_COOKIE[$name];
+		// Other cookies.
+		$data = Utils::jsonDecode($_COOKIE[$name], true, false);
 
-			return new self($name, $data);
+		if (json_last_error() !== JSON_ERROR_NONE) {
+			$data = $_COOKIE[$name];
 		}
+
+		return new self($name, $data);
 	}
 
 	/**
@@ -366,44 +356,41 @@ public static function setLoginCookie($cookie_length, $id, $password = '')
 		$old_cookie = self::getCookie(Config::$cookiename);
 
 		// Out with the old, in with the new!
-		if (($old_cookie->domain ?? self::$default_domain) != self::$default_domain || ($old_cookie->path ?? self::$default_path) != self::$default_path)
-		{
+		if (($old_cookie->domain ?? self::$default_domain) != self::$default_domain || ($old_cookie->path ?? self::$default_path) != self::$default_path) {
 			$old_domain = $old_cookie->domain;
 			$old_path = $old_cookie->path;
 
-			$cookie = new self(Config::$cookiename, array(0, ''), 0, $old_domain, $old_path);
+			$cookie = new self(Config::$cookiename, [0, ''], 0, $old_domain, $old_path);
 			$cookie->set();
 		}
 
 		// Set the cookie, $_COOKIE, and session variable.
-		$cookie = new self(Config::$cookiename, array($id, $password), $expires);
+		$cookie = new self(Config::$cookiename, [$id, $password], $expires);
 		$cookie->set();
 
 		// If subdomain-independent cookies are on, unset the subdomain-dependent cookie too.
-		if (empty($id) && !empty(Config::$modSettings['globalCookies']))
-		{
+		if (empty($id) && !empty(Config::$modSettings['globalCookies'])) {
 			$cookie->domain = '';
 			$cookie->set();
 			$cookie->domain = self::$default_domain;
 		}
 
 		// Any alias URLs?  This is mainly for use with frames, etc.
-		if (!empty(Config::$modSettings['forum_alias_urls']))
-		{
+		if (!empty(Config::$modSettings['forum_alias_urls'])) {
 			$aliases = explode(',', Config::$modSettings['forum_alias_urls']);
 
 			$temp = Config::$boardurl;
 
-			foreach ($aliases as $alias)
-			{
+			foreach ($aliases as $alias) {
 				// Fake the Config::$boardurl so we can set a different cookie.
-				$alias = strtr(trim($alias), array('http://' => '', 'https://' => ''));
+				$alias = strtr(trim($alias), ['http://' => '', 'https://' => '']);
 				Config::$boardurl = 'http://' . $alias;
 
 				list($domain, $path) = self::urlParts(!empty(Config::$modSettings['localCookies']), !empty(Config::$modSettings['globalCookies']));
 
-				if ($domain == '')
+				if ($domain == '') {
 					$domain = strtok($alias, '/');
+				}
 
 				$alias_cookie = clone $cookie;
 				$alias_cookie->data[3] = $alias_cookie->domain = $domain;
@@ -415,22 +402,21 @@ public static function setLoginCookie($cookie_length, $id, $password = '')
 		}
 
 		$_COOKIE[Config::$cookiename] = Utils::jsonEncode(
-			array(
+			[
 				$cookie->member,
 				$cookie->hash,
 				$cookie->expires,
 				$cookie->domain,
 				$cookie->path,
-			),
-			JSON_FORCE_OBJECT
+			],
+			JSON_FORCE_OBJECT,
 		);
 
 		// Make sure the user logs in with a new session ID.
-		if (($_SESSION['login_' . Config::$cookiename] ?? null) !== $_COOKIE[Config::$cookiename])
-		{
+		if (($_SESSION['login_' . Config::$cookiename] ?? null) !== $_COOKIE[Config::$cookiename]) {
 			// Backup and remove the old session.
 			$oldSessionData = $_SESSION;
-			$_SESSION = array();
+			$_SESSION = [];
 			session_destroy();
 
 			// Recreate and restore the new session.
@@ -459,26 +445,25 @@ public static function setTFACookie($cookie_length, $id, $secret)
 		$expires = ($cookie_length >= 0 ? time() + $cookie_length : 1);
 
 		// Set the cookie, $_COOKIE, and session variable.
-		$cookie = new self(Config::$cookiename . '_tfa', array($id, $secret), $expires);
+		$cookie = new self(Config::$cookiename . '_tfa', [$id, $secret], $expires);
 		$cookie->set();
 
 		// If subdomain-independent cookies are on, unset the subdomain-dependent cookie too.
-		if (empty($id) && !empty(Config::$modSettings['globalCookies']))
-		{
+		if (empty($id) && !empty(Config::$modSettings['globalCookies'])) {
 			$cookie->domain = '';
 			$cookie->set();
 			$cookie->domain = self::$default_domain;
 		}
 
 		$_COOKIE[Config::$cookiename . '_tfa'] = Utils::jsonEncode(
-			array(
+			[
 				$cookie->member,
 				$cookie->hash,
 				$cookie->expires,
 				$cookie->domain,
 				$cookie->path,
-			),
-			JSON_FORCE_OBJECT
+			],
+			JSON_FORCE_OBJECT,
 		);
 	}
 
@@ -506,27 +491,23 @@ public static function urlParts($local, $global)
 
 		// Manually specified the global domain.
 		// @todo Why doesn't this check whether $global is true?
-		if (!empty(Config::$modSettings['globalCookiesDomain']) && strpos(Config::$boardurl, Config::$modSettings['globalCookiesDomain']) !== false)
-		{
+		if (!empty(Config::$modSettings['globalCookiesDomain']) && strpos(Config::$boardurl, Config::$modSettings['globalCookiesDomain']) !== false) {
 			$host = Config::$modSettings['globalCookiesDomain'];
 		}
 		// Globalize cookies across domains? (filter out IP-addresses)
-		elseif ($global && preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $host) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $host, $parts) == 1)
-		{
+		elseif ($global && preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $host) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $host, $parts) == 1) {
 			$host = '.' . $parts[1];
 		}
 		// We shouldn't use a host at all if both options are off.
-		elseif (!$local && !$global)
-		{
+		elseif (!$local && !$global) {
 			$host = '';
 		}
 		// The host also shouldn't be set if there aren't any dots in it.
-		elseif (!isset($host) || strpos($host, '.') === false)
-		{
+		elseif (!isset($host) || strpos($host, '.') === false) {
 			$host = '';
 		}
 
-		return array($host, $path . '/');
+		return [$host, $path . '/'];
 	}
 
 	/**
@@ -552,8 +533,9 @@ public static function encrypt($password, $salt)
 	 */
 	public static function setDefaults(): void
 	{
-		if (isset(self::$default_domain, self::$default_path))
+		if (isset(self::$default_domain, self::$default_path)) {
 			return;
+		}
 
 		list(self::$default_domain, self::$default_path) = self::urlParts(!empty(Config::$modSettings['localCookies']), !empty(Config::$modSettings['globalCookies']));
 	}
@@ -561,7 +543,7 @@ public static function setDefaults(): void
 	/**
 	 * Backward compatibility wrapper for the set() method.
 	 */
-	public static function setcookie(string $name, string $value = '', int $expires = 0, string $path = '', string $domain = '', bool $secure = null, bool $httponly = true, string $samesite = null): void
+	public static function setcookie(string $name, string $value = '', int $expires = 0, string $path = '', string $domain = '', ?bool $secure = null, bool $httponly = true, ?string $samesite = null): void
 	{
 		$data = Utils::jsonDecode($value);
 
@@ -572,7 +554,8 @@ public static function setcookie(string $name, string $value = '', int $expires
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Cookie::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Cookie::exportStatic')) {
 	Cookie::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Db/APIs/MySQL.php b/Sources/Db/APIs/MySQL.php
index ef5e5a961f..d3f7d473a0 100644
--- a/Sources/Db/APIs/MySQL.php
+++ b/Sources/Db/APIs/MySQL.php
@@ -14,13 +14,13 @@
 namespace SMF\Db\APIs;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi;
+use SMF\Db\DatabaseApiInterface;
 use SMF\ErrorHandler;
 use SMF\IP;
 use SMF\Lang;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi;
-use SMF\Db\DatabaseApiInterface;
 
 /**
  * Interacts with MySQL databases.
@@ -102,7 +102,7 @@ class MySQL extends DatabaseApi implements DatabaseApiInterface
 	 *
 	 * Available MySQL engines.
 	 */
-	protected $engines = array();
+	protected $engines = [];
 
 	/**
 	 * @var bool
@@ -118,21 +118,21 @@ class MySQL extends DatabaseApi implements DatabaseApiInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function query($identifier, $db_string, $db_values = array(), $connection = null)
+	public function query($identifier, $db_string, $db_values = [], $connection = null)
 	{
 		// Comments that are allowed in a query are preg_removed.
-		$allowed_comments_from = array(
+		$allowed_comments_from = [
 			'~\s+~s',
 			'~/\*!40001 SQL_NO_CACHE \*/~',
 			'~/\*!40000 USE INDEX \([A-Za-z\_]+?\) \*/~',
 			'~/\*!40100 ON DUPLICATE KEY UPDATE id_msg = \d+ \*/~',
-		);
-		$allowed_comments_to = array(
+		];
+		$allowed_comments_to = [
 			' ',
 			'',
 			'',
 			'',
-		);
+		];
 
 		// Decide which connection to use.
 		$connection = $connection ?? $this->connection;
@@ -140,54 +140,56 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 		// One more query....
 		self::$count++;
 
-		if (!$this->disableQueryCheck && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
+		if (!$this->disableQueryCheck && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
 			$this->error_backtrace('No direct access...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+		}
 
 		// Use "ORDER BY null" to prevent Mysql doing filesorts for Group By clauses without an Order By
-		if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string))
-		{
+		if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string)) {
 			// Add before LIMIT
-			if ($pos = strpos($db_string, 'LIMIT '))
+			if ($pos = strpos($db_string, 'LIMIT ')) {
 				$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
-			else
+			} else {
 				// Append it.
 				$db_string .= "\n\t\t\tORDER BY null";
+			}
 		}
 
-		if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
-		{
+		if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false)) {
 			$this->temp_values = $db_values;
 			$this->temp_connection = $connection;
 
 			// Inject the values passed to this function.
-			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', array($this, 'replacement__callback'), $db_string);
+			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', [$this, 'replacement__callback'], $db_string);
 
 			unset($this->temp_values, $this->temp_connection);
 		}
 
 		// First, we clean strings out of the query, reduce whitespace, lowercase, and trim - so we can check it over.
-		if (!$this->disableQueryCheck)
-		{
+		if (!$this->disableQueryCheck) {
 			$clean = '';
 			$old_pos = 0;
 			$pos = -1;
 			// Remove the string escape for better runtime
 			$db_string_1 = str_replace('\\\'', '', $db_string);
-			while (true)
-			{
+
+			while (true) {
 				$pos = strpos($db_string_1, '\'', $pos + 1);
-				if ($pos === false)
+
+				if ($pos === false) {
 					break;
+				}
 				$clean .= substr($db_string_1, $old_pos, $pos - $old_pos);
 
-				while (true)
-				{
+				while (true) {
 					$pos1 = strpos($db_string_1, '\'', $pos + 1);
 					$pos2 = strpos($db_string_1, '\\', $pos + 1);
-					if ($pos1 === false)
+
+					if ($pos1 === false) {
 						break;
-					elseif ($pos2 === false || $pos2 > $pos1)
-					{
+					}
+
+					if ($pos2 === false || $pos2 > $pos1) {
 						$pos = $pos1;
 						break;
 					}
@@ -202,29 +204,30 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 			$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 			// Comments?  We don't use comments in our queries, we leave 'em outside!
-			if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
+			if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
 				$fail = true;
+			}
 			// Trying to change passwords, slow us down, or something?
-			elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
+			elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
 				$fail = true;
-			elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
+			} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
 				$fail = true;
+			}
 
-			if (!empty($fail) && function_exists('log_error'))
+			if (!empty($fail) && function_exists('log_error')) {
 				$this->error_backtrace('No direct access...', 'No direct access...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+			}
 		}
 
 		// Debugging.
-		if ($this->show_debug)
-		{
+		if ($this->show_debug) {
 			// Get the file and line number this function was called.
-			list ($file, $line) = $this->error_backtrace('', '', 'return', __FILE__, __LINE__);
+			list($file, $line) = $this->error_backtrace('', '', 'return', __FILE__, __LINE__);
 
-			if (!empty($_SESSION['debug_redirect']))
-			{
+			if (!empty($_SESSION['debug_redirect'])) {
 				self::$cache = array_merge($_SESSION['debug_redirect'], self::$cache);
 				self::$count = count(self::$cache) + 1;
-				$_SESSION['debug_redirect'] = array();
+				$_SESSION['debug_redirect'] = [];
 			}
 
 			// Don't overload it.
@@ -236,12 +239,14 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 
 		$ret = @mysqli_query($connection, $db_string, self::$unbuffered ? MYSQLI_USE_RESULT : MYSQLI_STORE_RESULT);
 
-		if ($ret === false && empty($db_values['db_error_skip']))
+		if ($ret === false && empty($db_values['db_error_skip'])) {
 			$ret = $this->error($db_string, $connection);
+		}
 
 		// Debugging.
-		if ($this->show_debug)
+		if ($this->show_debug) {
 			self::$cache[self::$count]['t'] = microtime(true) - $st;
+		}
 
 		return $ret;
 	}
@@ -252,14 +257,13 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 	public function quote($db_string, $db_values, $connection = null)
 	{
 		// Only bother if there's something to replace.
-		if (strpos($db_string, '{') !== false)
-		{
+		if (strpos($db_string, '{') !== false) {
 			// This is needed by the callback function.
 			$this->temp_values = $db_values;
 			$this->temp_connection = $connection ?? $this->connection;
 
 			// Do the quoting and escaping
-			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', array($this, 'replacement__callback'), $db_string);
+			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', [$this, 'replacement__callback'], $db_string);
 
 			unset($this->temp_values, $this->temp_connection);
 		}
@@ -288,15 +292,17 @@ public function fetch_assoc($result)
 	 */
 	public function fetch_all($request)
 	{
-		if (function_exists('mysqli_fetch_all'))
+		if (function_exists('mysqli_fetch_all')) {
 			$return = mysqli_fetch_all($request, MYSQLI_ASSOC);
-		else
-		{
-			$return = array();
-			while ($row = mysqli_fetch_assoc($request))
+		} else {
+			$return = [];
+
+			while ($row = mysqli_fetch_assoc($request)) {
 				$return[] = $row;
+			}
 		}
-		return !empty($return) ? $return : array();
+
+		return !empty($return) ? $return : [];
 	}
 
 	/**
@@ -317,8 +323,9 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 		$return_var = null;
 
 		// With nothing to insert, simply return.
-		if (empty($table) || empty($data))
+		if (empty($table) || empty($data)) {
 			return;
+		}
 
 		// Force method to lower case
 		$method = strtolower($method);
@@ -328,27 +335,29 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 
 		$with_returning = false;
 
-		if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
-		{
+		if (!empty($keys) && (count($keys) > 0) && $returnmode > 0) {
 			$with_returning = true;
 
-			if ($returnmode == 2)
-				$return_var = array();
+			if ($returnmode == 2) {
+				$return_var = [];
+			}
 		}
 
 		// Inserting data as a single row can be done as a single array.
-		if (!is_array($data[array_rand($data)]))
-			$data = array($data);
+		if (!is_array($data[array_rand($data)])) {
+			$data = [$data];
+		}
 
 		// Create the mold for a single row insert.
 		$insertData = '(';
-		foreach ($columns as $columnName => $type)
-		{
+
+		foreach ($columns as $columnName => $type) {
 			// Are we restricting the length?
-			if (strpos($type, 'string-') !== false)
+			if (strpos($type, 'string-') !== false) {
 				$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-			else
+			} else {
 				$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+			}
 		}
 		$insertData = substr($insertData, 0, -2) . ')';
 
@@ -356,38 +365,35 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 		$indexed_columns = array_keys($columns);
 
 		// Here's where the variables are injected to the query.
-		$insertRows = array();
-		foreach ($data as $dataRow)
-		{
+		$insertRows = [];
+
+		foreach ($data as $dataRow) {
 			$insertRows[] = $this->quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
 		}
 
 		// Determine the method of insertion.
-		switch ($method)
-		{
+		switch ($method) {
 			case 'replace':
 				$queryTitle = 'REPLACE';
 
 				// Sanity check for replace is key part of the columns array
-				if (empty($keys))
-				{
+				if (empty($keys)) {
 					$this->error_backtrace(
 						'When using the replace mode, the key column is a required entry.',
 						'Change the method of db insert to insert or add the pk field to the key array',
 						E_USER_ERROR,
 						__FILE__,
-						__LINE__
+						__LINE__,
 					);
 				}
 
-				if (count(array_intersect_key($columns, array_flip($keys))) !== count($keys))
-				{
+				if (count(array_intersect_key($columns, array_flip($keys))) !== count($keys)) {
 					$this->error_backtrace(
 						'Primary Key field missing in insert call',
 						'Change the method of db insert to insert or add the pk field to the columns array',
 						E_USER_ERROR,
 						__FILE__,
-						__LINE__
+						__LINE__,
 					);
 				}
 
@@ -402,79 +408,76 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 				break;
 		}
 
-		if (!$with_returning || $method != 'ignore')
-		{
+		if (!$with_returning || $method != 'ignore') {
 			// Do the insert.
-			$this->query('', '
-				' . $queryTitle . ' INTO ' . $table . '(`' . implode('`, `', $indexed_columns) . '`)
+			$this->query(
+				'',
+				$queryTitle . ' INTO ' . $table . '(`' . implode('`, `', $indexed_columns) . '`)
 				VALUES
 					' . implode(',
 					', $insertRows),
-				array(
+				[
 					'security_override' => true,
 					'db_error_skip' => $table === $this->prefix . 'log_errors',
-				),
-				$connection
+				],
+				$connection,
 			);
 		}
 		// Special way for ignore method with returning
-		else
-		{
+		else {
 			$count = count($insertRows);
 			$ai = 0;
-			for ($i = 0; $i < $count; $i++)
-			{
+
+			for ($i = 0; $i < $count; $i++) {
 				$old_id = $this->insert_id($table);
 
-				$this->query('', '
-					' . $queryTitle . ' INTO ' . $table . '(`' . implode('`, `', $indexed_columns) . '`)
+				$this->query(
+					'',
+					$queryTitle . ' INTO ' . $table . '(`' . implode('`, `', $indexed_columns) . '`)
 					VALUES
 						' . $insertRows[$i],
-					array(
+					[
 						'security_override' => true,
 						'db_error_skip' => $table === $this->prefix . 'log_errors',
-					),
-					$connection
+					],
+					$connection,
 				);
 				$new_id = $this->insert_id($table);
 
 				// the inserted value was new
-				if ($old_id != $new_id)
-				{
+				if ($old_id != $new_id) {
 					$ai = $new_id;
 				}
 				// the inserted value already exists we need to find the pk
-				else
-				{
+				else {
 					$where_string = '';
 
 					$count2 = count($keys);
 
-					for ($x = 0; $x < $count2; $x++)
-					{
+					for ($x = 0; $x < $count2; $x++) {
 						$keyPos = array_search($keys[$x], array_keys($columns));
 
 						$where_string .= $keys[$x] . ' = ' . $data[$i][$keyPos];
 
-						if (($x + 1) < $count2)
+						if (($x + 1) < $count2) {
 							$where_string .= ' AND ';
+						}
 					}
 
-					$request = $this->query('', '
-						SELECT `' . $keys[0] . '` FROM ' . $table . '
+					$request = $this->query(
+						'',
+						'SELECT `' . $keys[0] . '` FROM ' . $table . '
 						WHERE ' . $where_string . ' LIMIT 1',
-						array()
+						[],
 					);
 
-					if ($request !== false && $this->num_rows($request) == 1)
-					{
+					if ($request !== false && $this->num_rows($request) == 1) {
 						$row = $this->fetch_assoc($request);
 						$ai = $row[$keys[0]];
 					}
 				}
 
-				switch ($returnmode)
-				{
+				switch ($returnmode) {
 					case 2:
 						$return_var[] = $ai;
 						break;
@@ -486,22 +489,19 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 			}
 		}
 
-		if ($with_returning)
-		{
-			if ($returnmode == 1 && empty($return_var))
-			{
+		if ($with_returning) {
+			if ($returnmode == 1 && empty($return_var)) {
 				$return_var = $this->insert_id($table, $keys[0]) + count($insertRows) - 1;
-			}
-			elseif ($returnmode == 2 && empty($return_var))
-			{
-				$return_var = array();
+			} elseif ($returnmode == 2 && empty($return_var)) {
+				$return_var = [];
 
 				$count = count($insertRows);
 
 				$start = $this->insert_id($table, $keys[0]);
 
-				for ($i = 0; $i < $count; $i++)
+				for ($i = 0; $i < $count; $i++) {
 					$return_var[] = $start + $i;
+				}
 			}
 
 			return $return_var;
@@ -580,8 +580,9 @@ public function transaction($type = 'commit', $connection = null)
 	{
 		$type = strtoupper($type);
 
-		if (in_array($type, array('BEGIN', 'ROLLBACK', 'COMMIT')))
+		if (in_array($type, ['BEGIN', 'ROLLBACK', 'COMMIT'])) {
 			return @mysqli_query($connection ?? $this->connection, $type);
+		}
 
 		return false;
 	}
@@ -591,11 +592,13 @@ public function transaction($type = 'commit', $connection = null)
 	 */
 	public function error($connection)
 	{
-		if ($connection === null && $this->connection === null)
+		if ($connection === null && $this->connection === null) {
 			return '';
+		}
 
-		if (!(($connection ?? $this->connection) instanceof mysqli))
+		if (!(($connection ?? $this->connection) instanceof mysqli)) {
 			return '';
+		}
 
 		return mysqli_error($connection ?? $this->connection);
 	}
@@ -613,16 +616,17 @@ public function select($database, $connection = null)
 	 */
 	public function escape_wildcard_string($string, $translate_human_wildcards = false)
 	{
-		$replacements = array(
+		$replacements = [
 			'%' => '\%',
 			'_' => '\_',
 			'\\' => '\\\\',
-		);
+		];
 
-		if ($translate_human_wildcards)
-			$replacements += array(
+		if ($translate_human_wildcards) {
+			$replacements += [
 				'*' => '%',
-			);
+			];
+		}
 
 		return strtr($string, $replacements);
 	}
@@ -649,27 +653,29 @@ public function ping($connection = null)
 	public function error_insert($error_array)
 	{
 		// Without a database we can't do anything.
-		if (empty($this->connection))
+		if (empty($this->connection)) {
 			return;
+		}
 
 		// String keys are easier to work with.
-		if (!isset($error_array['ip']))
-			$error_array = array_combine(array('id_member', 'log_time', 'ip', 'url', 'message', 'session', 'error_type', 'file', 'line', 'backtrace'), $error_array);
+		if (!isset($error_array['ip'])) {
+			$error_array = array_combine(['id_member', 'log_time', 'ip', 'url', 'message', 'session', 'error_type', 'file', 'line', 'backtrace'], $error_array);
+		}
 
-		if (empty($this->error_data_prep))
-		{
+		if (empty($this->error_data_prep)) {
 			$this->error_data_prep = mysqli_prepare(
 				$this->connection,
 				'INSERT INTO ' . $this->prefix . 'log_errors
 					(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
-				VALUES( ?, ?, unhex(?), ?, ?, ?, ?, ?, ?, ?)'
+				VALUES( ?, ?, unhex(?), ?, ?, ?, ?, ?, ?, ?)',
 			);
 		}
 
-		if (filter_var($error_array['ip'], FILTER_VALIDATE_IP) !== false)
+		if (filter_var($error_array['ip'], FILTER_VALIDATE_IP) !== false) {
 			$error_array['ip'] = bin2hex(inet_pton($error_array['ip']));
-		else
+		} else {
 			$error_array['ip'] = null;
+		}
 
 		mysqli_stmt_bind_param(
 			$this->error_data_prep,
@@ -683,7 +689,7 @@ public function error_insert($error_array)
 			$error_array['error_type'],
 			$error_array['file'],
 			$error_array['line'],
-			$error_array['backtrace']
+			$error_array['backtrace'],
 		);
 
 		mysqli_stmt_execute($this->error_data_prep);
@@ -698,8 +704,9 @@ public function custom_order($field, $array_values, $desc = false)
 		$count = count($array_values);
 		$then = ($desc ? ' THEN -' : ' THEN ');
 
-		for ($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $count; $i++) {
 			$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+		}
 
 		$return .= 'END';
 
@@ -719,8 +726,9 @@ public function native_replace()
 	 */
 	public function cte_support()
 	{
-		if (isset($this->supports_cte))
+		if (isset($this->supports_cte)) {
 			return $this->supports_cte;
+		}
 
 		$this->get_version();
 
@@ -759,47 +767,52 @@ public function backup_table($table, $backup_table)
 		$table = str_replace('{db_prefix}', $this->prefix, $table);
 
 		// First, get rid of the old table.
-		$this->query('', '
-			DROP TABLE IF EXISTS {raw:backup_table}',
-			array(
+		$this->query(
+			'',
+			'DROP TABLE IF EXISTS {raw:backup_table}',
+			[
 				'backup_table' => $backup_table,
-			)
+			],
 		);
 
 		// Can we do this the quick way?
-		$result = $this->query('', '
-			CREATE TABLE {raw:backup_table} LIKE {raw:table}',
-			array(
+		$result = $this->query(
+			'',
+			'CREATE TABLE {raw:backup_table} LIKE {raw:table}',
+			[
 				'backup_table' => $backup_table,
-				'table' => $table
-			)
+				'table' => $table,
+			],
 		);
+
 		// If this failed, we go old school.
-		if ($result)
-		{
-			$request = $this->query('', '
-				INSERT INTO {raw:backup_table}
+		if ($result) {
+			$request = $this->query(
+				'',
+				'INSERT INTO {raw:backup_table}
 				SELECT *
 				FROM {raw:table}',
-				array(
+				[
 					'backup_table' => $backup_table,
-					'table' => $table
-				)
+					'table' => $table,
+				],
 			);
 
 			// Old school or no school?
-			if ($request)
+			if ($request) {
 				return $request;
+			}
 		}
 
 		// At this point, the quick method failed.
-		$result = $this->query('', '
-			SHOW CREATE TABLE {raw:table}',
-			array(
+		$result = $this->query(
+			'',
+			'SHOW CREATE TABLE {raw:table}',
+			[
 				'table' => $table,
-			)
+			],
 		);
-		list (, $create) = $this->fetch_row($result);
+		list(, $create) = $this->fetch_row($result);
 		$this->free_result($result);
 
 		$create = preg_split('/[\n\r]/', $create);
@@ -810,71 +823,78 @@ public function backup_table($table, $backup_table)
 		$charset = '';
 		$collate = '';
 
-		foreach ($create as $k => $l)
-		{
+		foreach ($create as $k => $l) {
 			// Get the name of the auto_increment column.
-			if (strpos($l, 'auto_increment'))
+			if (strpos($l, 'auto_increment')) {
 				$auto_inc = trim($l);
+			}
 
 			// For the engine type, see if we can work out what it is.
-			if (strpos($l, 'ENGINE') !== false || strpos($l, 'TYPE') !== false)
-			{
+			if (strpos($l, 'ENGINE') !== false || strpos($l, 'TYPE') !== false) {
 				// Extract the engine type.
 				preg_match('~(ENGINE|TYPE)=(\w+)(\sDEFAULT)?(\sCHARSET=(\w+))?(\sCOLLATE=(\w+))?~', $l, $match);
 
-				if (!empty($match[1]))
+				if (!empty($match[1])) {
 					$engine = $match[1];
+				}
 
-				if (!empty($match[2]))
+				if (!empty($match[2])) {
 					$engine = $match[2];
+				}
 
-				if (!empty($match[5]))
+				if (!empty($match[5])) {
 					$charset = $match[5];
+				}
 
-				if (!empty($match[7]))
+				if (!empty($match[7])) {
 					$collate = $match[7];
+				}
 			}
 
 			// Skip everything but keys...
-			if (strpos($l, 'KEY') === false)
+			if (strpos($l, 'KEY') === false) {
 				unset($create[$k]);
+			}
 		}
 
-		if (!empty($create))
+		if (!empty($create)) {
 			$create = '(
 				' . implode('
 				', $create) . ')';
-		else
+		} else {
 			$create = '';
+		}
 
-		$request = $this->query('', '
-			CREATE TABLE {raw:backup_table} {raw:create}
+		$request = $this->query(
+			'',
+			'CREATE TABLE {raw:backup_table} {raw:create}
 			ENGINE={raw:engine}' . (empty($charset) ? '' : ' CHARACTER SET {raw:charset}' . (empty($collate) ? '' : ' COLLATE {raw:collate}')) . '
 			SELECT *
 			FROM {raw:table}',
-			array(
+			[
 				'backup_table' => $backup_table,
 				'table' => $table,
 				'create' => $create,
 				'engine' => $engine,
 				'charset' => empty($charset) ? '' : $charset,
 				'collate' => empty($collate) ? '' : $collate,
-			)
+			],
 		);
 
-		if ($auto_inc != '')
-		{
-			if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',')
+		if ($auto_inc != '') {
+			if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',') {
 				$auto_inc = substr($auto_inc, 0, -1);
+			}
 
-			$this->query('', '
-				ALTER TABLE {raw:backup_table}
+			$this->query(
+				'',
+				'ALTER TABLE {raw:backup_table}
 				CHANGE COLUMN {raw:column_detail} {raw:auto_inc}',
-				array(
+				[
 					'backup_table' => $backup_table,
 					'column_detail' => $match[1],
 					'auto_inc' => $auto_inc,
-				)
+				],
 			);
 		}
 
@@ -889,31 +909,36 @@ public function optimize_table($table)
 		$table = str_replace('{db_prefix}', $this->prefix, $table);
 
 		// Get how much overhead there is.
-		$request = $this->query('', '
-			SHOW TABLE STATUS LIKE {string:table_name}',
-			array(
-				'table_name' => str_replace('_', '\_', $table),
-			)
+		$request = $this->query(
+			'',
+			'SHOW TABLE STATUS LIKE {string:table_name}',
+			[
+				'table_name' => str_replace('_', '\\_', $table),
+			],
 		);
 		$row = $this->fetch_assoc($request);
 		$this->free_result($request);
 
-		$data_before = isset($row['Data_free']) ? $row['Data_free'] : 0;
-		$request = $this->query('', '
-			OPTIMIZE TABLE `{raw:table}`',
-			array(
+		$data_before = $row['Data_free'] ?? 0;
+		$request = $this->query(
+			'',
+			'OPTIMIZE TABLE `{raw:table}`',
+			[
 				'table' => $table,
-			)
+			],
 		);
-		if (!$request)
+
+		if (!$request) {
 			return -1;
+		}
 
 		// How much left?
-		$request = $this->query('', '
-			SHOW TABLE STATUS LIKE {string:table}',
-			array(
-				'table' => str_replace('_', '\_', $table),
-			)
+		$request = $this->query(
+			'',
+			'SHOW TABLE STATUS LIKE {string:table}',
+			[
+				'table' => str_replace('_', '\\_', $table),
+			],
 		);
 		$row = $this->fetch_assoc($request);
 		$this->free_result($request);
@@ -940,27 +965,27 @@ public function table_sql($tableName)
 		$schema_create .= 'CREATE TABLE ' . '`' . $tableName . '` (' . $crlf;
 
 		// Find all the fields.
-		$result = $this->query('', '
-			SHOW FIELDS
+		$result = $this->query(
+			'',
+			'SHOW FIELDS
 			FROM `{raw:table}`',
-			array(
+			[
 				'table' => $tableName,
-			)
+			],
 		);
-		while ($row = $this->fetch_assoc($result))
-		{
+
+		while ($row = $this->fetch_assoc($result)) {
 			// Make the CREATE for this column.
 			$schema_create .= ' `' . $row['Field'] . '` ' . $row['Type'] . ($row['Null'] != 'YES' ? ' NOT NULL' : '');
 
 			// Add a default...?
-			if (!empty($row['Default']) || $row['Null'] !== 'YES')
-			{
+			if (!empty($row['Default']) || $row['Null'] !== 'YES') {
 				// Make a special case of auto-timestamp.
-				if ($row['Default'] == 'CURRENT_TIMESTAMP')
+				if ($row['Default'] == 'CURRENT_TIMESTAMP') {
 					$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+				}
 				// Text shouldn't have a default.
-				elseif ($row['Default'] !== null)
-				{
+				elseif ($row['Default'] !== null) {
 					// If this field is numeric the default needs no escaping.
 					$type = strtolower($row['Type']);
 					$isNumericColumn = strpos($type, 'int') !== false || strpos($type, 'bool') !== false || strpos($type, 'bit') !== false || strpos($type, 'float') !== false || strpos($type, 'double') !== false || strpos($type, 'decimal') !== false;
@@ -978,34 +1003,36 @@ public function table_sql($tableName)
 		$schema_create = substr($schema_create, 0, -strlen($crlf) - 1);
 
 		// Find the keys.
-		$result = $this->query('', '
-			SHOW KEYS
+		$result = $this->query(
+			'',
+			'SHOW KEYS
 			FROM `{raw:table}`',
-			array(
+			[
 				'table' => $tableName,
-			)
+			],
 		);
-		$indexes = array();
-		while ($row = $this->fetch_assoc($result))
-		{
+		$indexes = [];
+
+		while ($row = $this->fetch_assoc($result)) {
 			// IS this a primary key, unique index, or regular index?
 			$row['Key_name'] = $row['Key_name'] == 'PRIMARY' ? 'PRIMARY KEY' : (empty($row['Non_unique']) ? 'UNIQUE ' : ($row['Comment'] == 'FULLTEXT' || (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') ? 'FULLTEXT ' : 'KEY ')) . '`' . $row['Key_name'] . '`';
 
 			// Is this the first column in the index?
-			if (empty($indexes[$row['Key_name']]))
-				$indexes[$row['Key_name']] = array();
+			if (empty($indexes[$row['Key_name']])) {
+				$indexes[$row['Key_name']] = [];
+			}
 
 			// A sub part, like only indexing 15 characters of a varchar.
-			if (!empty($row['Sub_part']))
+			if (!empty($row['Sub_part'])) {
 				$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`(' . $row['Sub_part'] . ')';
-			else
+			} else {
 				$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+			}
 		}
 		$this->free_result($result);
 
 		// Build the CREATEs for the keys.
-		foreach ($indexes as $keyname => $columns)
-		{
+		foreach ($indexes as $keyname => $columns) {
 			// Ensure the columns are in proper order.
 			ksort($columns);
 
@@ -1013,12 +1040,13 @@ public function table_sql($tableName)
 		}
 
 		// Now just get the comment and engine... (MyISAM, etc.)
-		$result = $this->query('', '
-			SHOW TABLE STATUS
+		$result = $this->query(
+			'',
+			'SHOW TABLE STATUS
 			LIKE {string:table}',
-			array(
-				'table' => strtr($tableName, array('_' => '\\_', '%' => '\\%')),
-			)
+			[
+				'table' => strtr($tableName, ['_' => '\\_', '%' => '\\%']),
+			],
 		);
 		$row = $this->fetch_assoc($result);
 		$this->free_result($result);
@@ -1038,18 +1066,21 @@ public function list_tables($db = false, $filter = false)
 		$db = trim($db);
 		$filter = $filter == false ? '' : ' LIKE \'' . $filter . '\'';
 
-		$request = $this->query('', '
-			SHOW TABLES
+		$request = $this->query(
+			'',
+			'SHOW TABLES
 			FROM `{raw:db}`
 			{raw:filter}',
-			array(
-				'db' => $db[0] == '`' ? strtr($db, array('`' => '')) : $db,
+			[
+				'db' => $db[0] == '`' ? strtr($db, ['`' => '']) : $db,
 				'filter' => $filter,
-			)
+			],
 		);
-		$tables = array();
-		while ($row = $this->fetch_row($request))
+		$tables = [];
+
+		while ($row = $this->fetch_row($request)) {
 			$tables[] = $row[0];
+		}
 		$this->free_result($request);
 
 		return $tables;
@@ -1060,15 +1091,17 @@ public function list_tables($db = false, $filter = false)
 	 */
 	public function get_version()
 	{
-		if (!empty($this->version))
+		if (!empty($this->version)) {
 			return $this->version;
+		}
 
-		$request = $this->query('', '
-			SELECT VERSION()',
-			array(
-			)
+		$request = $this->query(
+			'',
+			'SELECT VERSION()',
+			[
+			],
 		);
-		list ($this->version) = $this->fetch_row($request);
+		list($this->version) = $this->fetch_row($request);
 		$this->free_result($request);
 
 		return $this->version;
@@ -1079,26 +1112,26 @@ public function get_version()
 	 */
 	public function get_vendor()
 	{
-		if (!empty($this->vendor))
+		if (!empty($this->vendor)) {
 			return $this->vendor;
+		}
 
 		$request = $this->query('', 'SELECT @@version_comment');
-		list ($comment) = $this->fetch_row($request);
+		list($comment) = $this->fetch_row($request);
 		$this->free_result($request);
 
 		// Skip these if we don't have a comment.
-		if (!empty($comment))
-		{
-			if (stripos($comment, 'percona') !== false)
+		if (!empty($comment)) {
+			if (stripos($comment, 'percona') !== false) {
 				$this->vendor = 'Percona';
-			elseif (stripos($comment, 'mariadb') !== false)
+			} elseif (stripos($comment, 'mariadb') !== false) {
 				$this->vendor = 'MariaDB';
-			else
+			} else {
 				$this->vendor = 'MySQL';
-		}
-		else
-		{
+			}
+		} else {
 			Lang::load('Admin');
+
 			return Lang::$txt['unknown'];
 		}
 
@@ -1111,10 +1144,8 @@ public function get_vendor()
 	public function allow_persistent()
 	{
 		$value = ini_get('mysqli.allow_persistent');
-		if (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1')
-			return true;
-		else
-			return false;
+
+		return (bool) (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1');
 	}
 
 	/*****************************************
@@ -1124,7 +1155,7 @@ public function allow_persistent()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function search_query($identifier, $db_string, $db_values = array(), $connection = null)
+	public function search_query($identifier, $db_string, $db_values = [], $connection = null)
 	{
 		return $this->query($identifier, $db_string, $db_values, $connection);
 	}
@@ -1134,7 +1165,7 @@ public function search_query($identifier, $db_string, $db_values = array(), $con
 	 */
 	public function search_support($search_type)
 	{
-		$supported_types = array('fulltext');
+		$supported_types = ['fulltext'];
 
 		return in_array($search_type, $supported_types);
 	}
@@ -1144,23 +1175,25 @@ public function search_support($search_type)
 	 */
 	public function create_word_search($size)
 	{
-		if ($size == 'small')
+		if ($size == 'small') {
 			$size = 'smallint(5)';
-		elseif ($size == 'medium')
+		} elseif ($size == 'medium') {
 			$size = 'mediumint(8)';
-		else
+		} else {
 			$size = 'int(10)';
+		}
 
-		$this->query('', '
-			CREATE TABLE {db_prefix}log_search_words (
+		$this->query(
+			'',
+			'CREATE TABLE {db_prefix}log_search_words (
 				id_word {raw:size} unsigned NOT NULL default {string:string_zero},
 				id_msg int(10) unsigned NOT NULL default {string:string_zero},
 				PRIMARY KEY (id_word, id_msg)
 			) ENGINE=InnoDB',
-			array(
+			[
 				'string_zero' => '0',
 				'size' => $size,
-			)
+			],
 		);
 	}
 
@@ -1169,7 +1202,6 @@ public function create_word_search($size)
 	 */
 	public function search_language()
 	{
-		return null;
 	}
 
 	/*******************************************
@@ -1179,25 +1211,25 @@ public function search_language()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function add_column($table_name, $column_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
+	public function add_column($table_name, $column_info, $parameters = [], $if_exists = 'update', $error = 'fatal')
 	{
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$column_info = array_change_key_case($column_info);
 
 		// Log that we will want to uninstall this!
-		self::$package_log[] = array('remove_column', $short_table_name, $column_info['name']);
+		self::$package_log[] = ['remove_column', $short_table_name, $column_info['name']];
 
 		// Does it exist - if so don't add it again!
 		$columns = $this->list_columns($table_name, false);
-		foreach ($columns as $column)
-		{
-			if ($column == $column_info['name'])
-			{
+
+		foreach ($columns as $column) {
+			if ($column == $column_info['name']) {
 				// If we're going to overwrite then use change column.
-				if ($if_exists == 'update')
+				if ($if_exists == 'update') {
 					return $this->change_column($table_name, $column_info['name'], $column_info);
-				else
-					return false;
+				}
+
+				return false;
 			}
 		}
 
@@ -1205,12 +1237,13 @@ public function add_column($table_name, $column_info, $parameters = array(), $if
 		$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
 
 		// Now add the thing!
-		$this->query('', '
-			ALTER TABLE ' . $short_table_name . '
+		$this->query(
+			'',
+			'ALTER TABLE ' . $short_table_name . '
 			ADD ' . $this->create_query_column($column_info) . (empty($column_info['auto']) ? '' : ' primary key'),
-			array(
+			[
 				'security_override' => true,
-			)
+			],
 		);
 
 		return true;
@@ -1219,32 +1252,32 @@ public function add_column($table_name, $column_info, $parameters = array(), $if
 	/**
 	 * {@inheritDoc}
 	 */
-	public function add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
+	public function add_index($table_name, $index_info, $parameters = [], $if_exists = 'update', $error = 'fatal')
 	{
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// No columns = no index.
-		if (empty($index_info['columns']))
+		if (empty($index_info['columns'])) {
 			return false;
+		}
 
 		// MySQL If its a text column, we need to add a size.
 		$cols = $this->list_columns($table_name, true);
-		foreach ($index_info['columns'] as &$c)
-		{
+
+		foreach ($index_info['columns'] as &$c) {
 			$c = trim($c);
 			$cols[$c]['size'] = isset($cols[$c]['size']) && is_numeric($cols[$c]['size']) ? $cols[$c]['size'] : null;
-			list ($type, $size) = $this->calculate_type($cols[$c]['type'], $cols[$c]['size']);
+			list($type, $size) = $this->calculate_type($cols[$c]['type'], $cols[$c]['size']);
 
 			// If a size was already specified, we won't be able to match it anyways.
 			if (
 				!isset($cols[$c])
-				|| !in_array($cols[$c]['type'], array('text', 'mediumntext', 'largetext', 'varchar', 'char'))
+				|| !in_array($cols[$c]['type'], ['text', 'mediumntext', 'largetext', 'varchar', 'char'])
 				|| (
 					isset($size)
 					&& $size <= 191
 				)
-			)
-			{
+			) {
 				continue;
 			}
 
@@ -1254,52 +1287,51 @@ public function add_index($table_name, $index_info, $parameters = array(), $if_e
 		$columns = implode(',', $index_info['columns']);
 
 		// No name - make it up!
-		if (empty($index_info['name']))
-		{
+		if (empty($index_info['name'])) {
 			// No need for primary.
-			if (isset($index_info['type']) && $index_info['type'] == 'primary')
+			if (isset($index_info['type']) && $index_info['type'] == 'primary') {
 				$index_info['name'] = '';
-			else
+			} else {
 				$index_info['name'] = trim(implode('_', preg_replace('~(\(\d+\))~', '', $index_info['columns'])));
+			}
 		}
 
 		// Log that we are going to want to remove this!
-		self::$package_log[] = array('remove_index', $short_table_name, $index_info['name']);
+		self::$package_log[] = ['remove_index', $short_table_name, $index_info['name']];
 
 		// Let's get all our indexes.
 		$indexes = $this->list_indexes($table_name, true);
+
 		// Do we already have it?
-		foreach ($indexes as $index)
-		{
-			if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
-			{
+		foreach ($indexes as $index) {
+			if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary')) {
 				// If we want to overwrite simply remove the current one then continue.
-				if ($if_exists != 'update' || $index['type'] == 'primary')
+				if ($if_exists != 'update' || $index['type'] == 'primary') {
 					return false;
-				else
-					$this->remove_index($table_name, $index_info['name']);
+				}
+
+				$this->remove_index($table_name, $index_info['name']);
 			}
 		}
 
 		// If we're here we know we don't have the index - so just add it.
-		if (!empty($index_info['type']) && $index_info['type'] == 'primary')
-		{
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+		if (!empty($index_info['type']) && $index_info['type'] == 'primary') {
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				ADD PRIMARY KEY (' . $columns . ')',
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
-		}
-		else
-		{
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+		} else {
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				ADD ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : 'INDEX') . ' ' . $index_info['name'] . ' (' . $columns . ')',
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 		}
 	}
@@ -1312,42 +1344,36 @@ public function calculate_type($type_name, $type_size = null, $reverse = false)
 		// MySQL is actually the generic baseline.
 
 		$type_name = strtolower($type_name);
+
 		// Generic => Specific.
-		if (!$reverse)
-		{
-			$types = array(
+		if (!$reverse) {
+			$types = [
 				'inet' => 'varbinary',
-			);
-		}
-		else
-		{
-			$types = array(
+			];
+		} else {
+			$types = [
 				'varbinary' => 'inet',
-			);
+			];
 		}
 
 		// Got it? Change it!
-		if (isset($types[$type_name]))
-		{
-			if ($type_name == 'inet' && !$reverse)
-			{
+		if (isset($types[$type_name])) {
+			if ($type_name == 'inet' && !$reverse) {
 				$type_size = 16;
 				$type_name = 'varbinary';
-			}
-			elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
-			{
+			} elseif ($type_name == 'varbinary' && $reverse && $type_size == 16) {
 				$type_name = 'inet';
 				$type_size = null;
-			}
-			elseif ($type_name == 'varbinary')
+			} elseif ($type_name == 'varbinary') {
 				$type_name = 'varbinary';
-			else
+			} else {
 				$type_name = $types[$type_name];
-		}
-		elseif ($type_name == 'boolean')
+			}
+		} elseif ($type_name == 'boolean') {
 			$type_size = null;
+		}
 
-		return array($type_name, $type_size);
+		return [$type_name, $type_size];
 	}
 
 	/**
@@ -1361,94 +1387,116 @@ public function change_column($table_name, $old_column, $column_info)
 		// Check it does exist!
 		$columns = $this->list_columns($table_name, true);
 		$old_info = null;
-		foreach ($columns as $column)
-		{
-			if ($column['name'] == $old_column)
+
+		foreach ($columns as $column) {
+			if ($column['name'] == $old_column) {
 				$old_info = $column;
+			}
 		}
 
 		// Nothing?
-		if ($old_info == null)
+		if ($old_info == null) {
 			return false;
+		}
 
 		// backward compatibility
-		if (isset($column_info['null']) && !isset($column_info['not_null']))
+		if (isset($column_info['null']) && !isset($column_info['not_null'])) {
 			$column_info['not_null'] = !$column_info['null'];
+		}
 
 		// Get the right bits.
-		if (isset($column_info['drop_default']) && !empty($column_info['drop_default']))
+		if (isset($column_info['drop_default']) && !empty($column_info['drop_default'])) {
 			$column_info['drop_default'] = true;
-		else
+		} else {
 			$column_info['drop_default'] = false;
-		if (!isset($column_info['name']))
+		}
+
+		if (!isset($column_info['name'])) {
 			$column_info['name'] = $old_column;
-		if (!array_key_exists('default', $column_info) && array_key_exists('default', $old_info) && empty($column_info['drop_default']))
+		}
+
+		if (!array_key_exists('default', $column_info) && array_key_exists('default', $old_info) && empty($column_info['drop_default'])) {
 			$column_info['default'] = $old_info['default'];
-		if (!isset($column_info['not_null']))
+		}
+
+		if (!isset($column_info['not_null'])) {
 			$column_info['not_null'] = $old_info['not_null'];
-		if (!isset($column_info['auto']))
+		}
+
+		if (!isset($column_info['auto'])) {
 			$column_info['auto'] = $old_info['auto'];
-		if (!isset($column_info['type']))
+		}
+
+		if (!isset($column_info['type'])) {
 			$column_info['type'] = $old_info['type'];
-		if (!isset($column_info['size']) || !is_numeric($column_info['size']))
+		}
+
+		if (!isset($column_info['size']) || !is_numeric($column_info['size'])) {
 			$column_info['size'] = $old_info['size'];
-		if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
+		}
+
+		if (!isset($column_info['unsigned']) || !in_array($column_info['type'], ['int', 'tinyint', 'smallint', 'mediumint', 'bigint'])) {
 			$column_info['unsigned'] = '';
+		}
 
 		// If truly unspecified, make that clear, otherwise, might be confused with NULL...
 		// (Unspecified = no default whatsoever = column is not nullable with a value of null...)
-		if (($column_info['not_null'] === true) && !$column_info['drop_default'] && array_key_exists('default', $column_info) && is_null($column_info['default']))
+		if (($column_info['not_null'] === true) && !$column_info['drop_default'] && array_key_exists('default', $column_info) && is_null($column_info['default'])) {
 			unset($column_info['default']);
+		}
 
-		list ($type, $size) = $this->calculate_type($column_info['type'], $column_info['size']);
+		list($type, $size) = $this->calculate_type($column_info['type'], $column_info['size']);
 
 		// Allow for unsigned integers (mysql only)
-		$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
+		$unsigned = in_array($type, ['int', 'tinyint', 'smallint', 'mediumint', 'bigint']) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
 		// If you need to drop the default, that needs it's own thing...
 		// Must be done first, in case the default type is inconsistent with the other changes.
-		if ($column_info['drop_default'])
-		{
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+		if ($column_info['drop_default']) {
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				ALTER COLUMN `' . $old_column . '` DROP DEFAULT',
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 		}
 
 		// Set the default clause.
 		$default_clause = '';
-		if (!$column_info['drop_default'] && array_key_exists('default', $column_info))
-		{
-			if (is_null($column_info['default']))
+
+		if (!$column_info['drop_default'] && array_key_exists('default', $column_info)) {
+			if (is_null($column_info['default'])) {
 				$default_clause = 'DEFAULT NULL';
-			elseif (is_numeric($column_info['default']))
+			} elseif (is_numeric($column_info['default'])) {
 				$default_clause = 'DEFAULT ' . (strpos($column_info['default'], '.') ? floatval($column_info['default']) : intval($column_info['default']));
-			elseif (is_string($column_info['default']))
+			} elseif (is_string($column_info['default'])) {
 				$default_clause = 'DEFAULT \'' . $this->escape_string($column_info['default']) . '\'';
+			}
 		}
 
-		if ($size !== null)
+		if ($size !== null) {
 			$type = $type . '(' . $size . ')';
+		}
 
-		$this->query('', '
-			ALTER TABLE ' . $short_table_name . '
+		$this->query(
+			'',
+			'ALTER TABLE ' . $short_table_name . '
 			CHANGE COLUMN `' . $old_column . '` `' . $column_info['name'] . '` ' . $type . ' ' .
 				(!empty($unsigned) ? $unsigned : '') . (!empty($column_info['not_null']) ? 'NOT NULL' : '') . ' ' .
 				$default_clause . ' ' .
 				(empty($column_info['auto']) ? '' : 'auto_increment') . ' ',
-			array(
+			[
 				'security_override' => true,
-			)
+			],
 		);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function create_table($table_name, $columns, $indexes = array(), $parameters = array(), $if_exists = 'ignore', $error = 'fatal')
+	public function create_table($table_name, $columns, $indexes = [], $parameters = [], $if_exists = 'ignore', $error = 'fatal')
 	{
 		$old_table_exists = false;
 
@@ -1462,64 +1510,66 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// First - no way do we touch SMF tables.
-		if (in_array(strtolower($short_table_name), $this->reservedTables))
+		if (in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
+		}
 
 		// Log that we'll want to remove this on uninstall.
-		self::$package_log[] = array('remove_table', $short_table_name);
+		self::$package_log[] = ['remove_table', $short_table_name];
 
 		// Slightly easier on MySQL than the others...
 		$tables = $this->list_tables($database);
 
-		if (in_array($full_table_name, $tables))
-		{
+		if (in_array($full_table_name, $tables)) {
 			// This is a sad day... drop the table? If not, return false (error) by default.
-			if ($if_exists == 'overwrite')
+			if ($if_exists == 'overwrite') {
 				$this->drop_table($table_name);
-			elseif ($if_exists == 'update')
-			{
+			} elseif ($if_exists == 'update') {
 				$this->transaction('begin');
 				$db_trans = true;
 				$this->drop_table($short_table_name . '_old');
-				$this->query('', '
-					RENAME TABLE ' . $short_table_name . ' TO ' . $short_table_name . '_old',
-					array(
+				$this->query(
+					'',
+					'RENAME TABLE ' . $short_table_name . ' TO ' . $short_table_name . '_old',
+					[
 						'security_override' => true,
-					)
+					],
 				);
 				$old_table_exists = true;
-			}
-			else
+			} else {
 				return $if_exists == 'ignore';
+			}
 		}
 
 		// Righty - let's do the damn thing!
 		$table_query = 'CREATE TABLE ' . $short_table_name . "\n" . '(';
-		foreach ($columns as $column)
+
+		foreach ($columns as $column) {
 			$table_query .= "\n\t" . $this->create_query_column($column) . ',';
+		}
 
 		// Loop through the indexes next...
-		foreach ($indexes as $index)
-		{
+		foreach ($indexes as $index) {
 			// MySQL If its a text column, we need to add a size.
-			foreach ($index['columns'] as &$c)
-			{
+			foreach ($index['columns'] as &$c) {
 				$c = trim($c);
 
 				// If a size was already specified, we won't be able to match it anyways.
 				$key = array_search($c, array_column($columns, 'name'));
 				$columns[$key]['size'] = isset($columns[$key]['size']) && is_numeric($columns[$key]['size']) ? $columns[$key]['size'] : null;
-				list ($type, $size) = $this->calculate_type($columns[$key]['type'], $columns[$key]['size']);
+				list($type, $size) = $this->calculate_type($columns[$key]['type'], $columns[$key]['size']);
+
 				if (
 					$key === false
 					|| !isset($columns[$key])
-					|| !in_array($columns[$key]['type'], array('text', 'mediumntext', 'largetext', 'varchar', 'char'))
+					|| !in_array($columns[$key]['type'], ['text', 'mediumntext', 'largetext', 'varchar', 'char'])
 					|| (
 						isset($size)
 						&& $size <= 191
 					)
-				)
+				) {
 					continue;
+				}
 
 				$c .= '(191)';
 			}
@@ -1527,31 +1577,31 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 			$idx_columns = implode(',', $index['columns']);
 
 			// Is it the primary?
-			if (isset($index['type']) && $index['type'] == 'primary')
+			if (isset($index['type']) && $index['type'] == 'primary') {
 				$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-			else
-			{
-				if (empty($index['name']))
+			} else {
+				if (empty($index['name'])) {
 					$index['name'] = trim(implode('_', preg_replace('~(\(\d+\))~', '', $index['columns'])));
+				}
 
 				$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $idx_columns . '),';
 			}
 		}
 
 		// No trailing commas!
-		if (substr($table_query, -1) == ',')
+		if (substr($table_query, -1) == ',') {
 			$table_query = substr($table_query, 0, -1);
+		}
 
 		// Which engine do we want here?
-		if (empty($this->engines))
-		{
+		if (empty($this->engines)) {
 			// Figure out which engines we have
-			$get_engines = $this->query('', 'SHOW ENGINES', array());
+			$get_engines = $this->query('', 'SHOW ENGINES', []);
 
-			while ($row = $this->fetch_assoc($get_engines))
-			{
-				if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
+			while ($row = $this->fetch_assoc($get_engines)) {
+				if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
 					$this->engines[] = $row['Engine'];
+				}
 			}
 
 			$this->free_result($get_engines);
@@ -1559,52 +1609,55 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 
 		// If we don't have this engine, or didn't specify one, default to InnoDB or MyISAM
 		// depending on which one is available
-		if (!isset($parameters['engine']) || !in_array($parameters['engine'], $this->engines))
-		{
+		if (!isset($parameters['engine']) || !in_array($parameters['engine'], $this->engines)) {
 			$parameters['engine'] = in_array('InnoDB', $this->engines) ? 'InnoDB' : 'MyISAM';
 		}
 
 		$table_query .= ') ENGINE=' . $parameters['engine'];
-		if (!empty($this->character_set) && $this->character_set == 'utf8')
+
+		if (!empty($this->character_set) && $this->character_set == 'utf8') {
 			$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+		}
 
 		// Create the table!
-		$this->query('', $table_query,
-			array(
+		$this->query(
+			'',
+			$table_query,
+			[
 				'security_override' => true,
-			)
+			],
 		);
 
 		// Fill the old data
-		if ($old_table_exists)
-		{
-			$same_col = array();
+		if ($old_table_exists) {
+			$same_col = [];
 
-			$request = $this->query('', '
-				SELECT count(*), column_name
+			$request = $this->query(
+				'',
+				'SELECT count(*), column_name
 				FROM information_schema.columns
 				WHERE table_name in ({string:table1},{string:table2}) AND table_schema = {string:schema}
 				GROUP BY column_name
 				HAVING count(*) > 1',
-				array(
+				[
 					'table1' => $short_table_name,
 					'table2' => $short_table_name . '_old',
 					'schema' => $this->name,
-				)
+				],
 			);
 
-			while ($row = $this->fetch_assoc($request))
-			{
+			while ($row = $this->fetch_assoc($request)) {
 				$same_col[] = $row['column_name'];
 			}
 
-			$this->query('', '
-				INSERT INTO ' . $short_table_name . '('
+			$this->query(
+				'',
+				'INSERT INTO ' . $short_table_name . '('
 				. implode(',', $same_col) .
 				')
 				SELECT ' . implode(',', $same_col) . '
 				FROM ' . $short_table_name . '_old',
-				array()
+				[],
 			);
 
 			$this->drop_table($short_table_name . '_old');
@@ -1616,7 +1669,7 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 	/**
 	 * {@inheritDoc}
 	 */
-	public function drop_table($table_name, $parameters = array(), $error = 'fatal')
+	public function drop_table($table_name, $parameters = [], $error = 'fatal')
 	{
 		// After stripping away the database name, this is what's left.
 		$real_prefix = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $this->prefix, $match) === 1 ? $match[3] : $this->prefix;
@@ -1628,19 +1681,21 @@ public function drop_table($table_name, $parameters = array(), $error = 'fatal')
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// God no - dropping one of these = bad.
-		if (in_array(strtolower($short_table_name), $this->reservedTables))
+		if (in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
+		}
 
 		// Does it exist?
 		$tables = $this->list_tables($database);
-		if (in_array($full_table_name, $tables))
-		{
+
+		if (in_array($full_table_name, $tables)) {
 			$query = 'DROP TABLE ' . $short_table_name;
-			$this->query('',
+			$this->query(
+				'',
 				$query,
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 
 			return true;
@@ -1660,14 +1715,15 @@ public function table_structure($table_name)
 		$database = !empty($match[2]) ? $match[2] : $this->name;
 
 		// Find the table engine and add that to the info as well
-		$table_status = $this->query('', '
-			SHOW TABLE STATUS
+		$table_status = $this->query(
+			'',
+			'SHOW TABLE STATUS
 			IN {raw:db}
 			LIKE {string:table}',
-			array(
+			[
 				'db' => $database,
-				'table' => $real_table_name
-			)
+				'table' => $real_table_name,
+			],
 		);
 
 		// Only one row, so no need for a loop...
@@ -1675,72 +1731,68 @@ public function table_structure($table_name)
 
 		$this->free_result($table_status);
 
-		return array(
+		return [
 			'name' => $parsed_table_name,
 			'columns' => $this->list_columns($table_name, true),
 			'indexes' => $this->list_indexes($table_name, true),
 			'engine' => $row['Engine'],
-		);
+		];
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function list_columns($table_name, $detail = false, $parameters = array())
+	public function list_columns($table_name, $detail = false, $parameters = [])
 	{
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
 		$database = !empty($match[2]) ? $match[2] : $this->name;
 
-		$result = $this->query('', '
-			SELECT column_name "Field", COLUMN_TYPE "Type", is_nullable "Null", COLUMN_KEY "Key" , column_default "Default", extra "Extra"
+		$result = $this->query(
+			'',
+			'SELECT column_name "Field", COLUMN_TYPE "Type", is_nullable "Null", COLUMN_KEY "Key" , column_default "Default", extra "Extra"
 			FROM information_schema.columns
 			WHERE table_name = {string:table_name}
 				AND table_schema = {string:db_name}
 			ORDER BY ordinal_position',
-			array(
+			[
 				'table_name' => $real_table_name,
 				'db_name' => $this->name,
-			)
+			],
 		);
-		$columns = array();
-		while ($row = $this->fetch_assoc($result))
-		{
-			if (!$detail)
-			{
+		$columns = [];
+
+		while ($row = $this->fetch_assoc($result)) {
+			if (!$detail) {
 				$columns[] = $row['Field'];
-			}
-			else
-			{
+			} else {
 				// Is there an auto_increment?
 				$auto = strpos($row['Extra'], 'auto_increment') !== false ? true : false;
 
 				// Can we split out the size?
-				if (preg_match('~(.+?)\s*\((\d+)\)(?:(?:\s*)?(unsigned))?~i', $row['Type'], $matches) === 1)
-				{
+				if (preg_match('~(.+?)\s*\((\d+)\)(?:(?:\s*)?(unsigned))?~i', $row['Type'], $matches) === 1) {
 					$type = $matches[1];
 					$size = $matches[2];
-					if (!empty($matches[3]) && $matches[3] == 'unsigned')
+
+					if (!empty($matches[3]) && $matches[3] == 'unsigned') {
 						$unsigned = true;
-				}
-				else
-				{
+					}
+				} else {
 					$type = $row['Type'];
 					$size = null;
 				}
 
-				$columns[$row['Field']] = array(
+				$columns[$row['Field']] = [
 					'name' => $row['Field'],
 					'not_null' => $row['Null'] != 'YES',
 					'null' => $row['Null'] == 'YES',
-					'default' => isset($row['Default']) ? $row['Default'] : null,
+					'default' => $row['Default'] ?? null,
 					'type' => $type,
 					'size' => $size,
 					'auto' => $auto,
-				);
+				];
 
-				if (isset($unsigned))
-				{
+				if (isset($unsigned)) {
 					$columns[$row['Field']]['unsigned'] = $unsigned;
 					unset($unsigned);
 				}
@@ -1754,53 +1806,54 @@ public function list_columns($table_name, $detail = false, $parameters = array()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function list_indexes($table_name, $detail = false, $parameters = array())
+	public function list_indexes($table_name, $detail = false, $parameters = [])
 	{
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
 		$database = !empty($match[2]) ? $match[2] : $this->name;
 
-		$result = $this->query('', '
-			SHOW KEYS
+		$result = $this->query(
+			'',
+			'SHOW KEYS
 			FROM {raw:table_name}
 			IN {raw:db}',
-			array(
+			[
 				'db' => $database,
 				'table_name' => $real_table_name,
-			)
+			],
 		);
-		$indexes = array();
-		while ($row = $this->fetch_assoc($result))
-		{
-			if (!$detail)
+		$indexes = [];
+
+		while ($row = $this->fetch_assoc($result)) {
+			if (!$detail) {
 				$indexes[] = $row['Key_name'];
-			else
-			{
+			} else {
 				// What is the type?
-				if ($row['Key_name'] == 'PRIMARY')
+				if ($row['Key_name'] == 'PRIMARY') {
 					$type = 'primary';
-				elseif (empty($row['Non_unique']))
+				} elseif (empty($row['Non_unique'])) {
 					$type = 'unique';
-				elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT')
+				} elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') {
 					$type = 'fulltext';
-				else
+				} else {
 					$type = 'index';
+				}
 
 				// This is the first column we've seen?
-				if (empty($indexes[$row['Key_name']]))
-				{
-					$indexes[$row['Key_name']] = array(
+				if (empty($indexes[$row['Key_name']])) {
+					$indexes[$row['Key_name']] = [
 						'name' => $row['Key_name'],
 						'type' => $type,
-						'columns' => array(),
-					);
+						'columns' => [],
+					];
 				}
 
 				// Is it a partial index?
-				if (!empty($row['Sub_part']))
+				if (!empty($row['Sub_part'])) {
 					$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
-				else
+				} else {
 					$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+				}
 			}
 		}
 		$this->free_result($result);
@@ -1811,26 +1864,27 @@ public function list_indexes($table_name, $detail = false, $parameters = array()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function remove_column($table_name, $column_name, $parameters = array(), $error = 'fatal')
+	public function remove_column($table_name, $column_name, $parameters = [], $error = 'fatal')
 	{
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// Does it exist?
 		$columns = $this->list_columns($table_name, true);
 
-		foreach ($columns as $column)
-			if ($column['name'] == $column_name)
-			{
-				$this->query('', '
-					ALTER TABLE ' . $short_table_name . '
+		foreach ($columns as $column) {
+			if ($column['name'] == $column_name) {
+				$this->query(
+					'',
+					'ALTER TABLE ' . $short_table_name . '
 					DROP COLUMN ' . $column_name,
-					array(
+					[
 						'security_override' => true,
-					)
+					],
 				);
 
 				return true;
 			}
+		}
 
 		// If here we didn't have to work - joy!
 		return false;
@@ -1839,38 +1893,38 @@ public function remove_column($table_name, $column_name, $parameters = array(),
 	/**
 	 * {@inheritDoc}
 	 */
-	public function remove_index($table_name, $index_name, $parameters = array(), $error = 'fatal')
+	public function remove_index($table_name, $index_name, $parameters = [], $error = 'fatal')
 	{
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// Better exist!
 		$indexes = $this->list_indexes($table_name, true);
 
-		foreach ($indexes as $index)
-		{
+		foreach ($indexes as $index) {
 			// If the name is primary we want the primary key!
-			if ($index['type'] == 'primary' && $index_name == 'primary')
-			{
+			if ($index['type'] == 'primary' && $index_name == 'primary') {
 				// Dropping primary key?
-				$this->query('', '
-					ALTER TABLE ' . $short_table_name . '
+				$this->query(
+					'',
+					'ALTER TABLE ' . $short_table_name . '
 					DROP PRIMARY KEY',
-					array(
+					[
 						'security_override' => true,
-					)
+					],
 				);
 
 				return true;
 			}
-			if ($index['name'] == $index_name)
-			{
+
+			if ($index['name'] == $index_name) {
 				// Drop the bugger...
-				$this->query('', '
-					ALTER TABLE ' . $short_table_name . '
+				$this->query(
+					'',
+					'ALTER TABLE ' . $short_table_name . '
 					DROP INDEX ' . $index_name,
-					array(
+					[
 						'security_override' => true,
-					)
+					],
 				);
 
 				return true;
@@ -1892,7 +1946,7 @@ public function remove_index($table_name, $index_name, $parameters = array(), $e
 	 *
 	 * @param array $options An array of database options.
 	 */
-	protected function __construct(array $options = array())
+	protected function __construct(array $options = [])
 	{
 		parent::__construct();
 
@@ -1900,49 +1954,56 @@ protected function __construct(array $options = array())
 		$non_fatal = !empty($options['non_fatal']);
 
 		// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
-		if (SMF == 'SSI' && !empty(Config::$ssi_db_user) && !empty(Config::$ssi_db_passwd))
-		{
-			if (empty($options))
-				$options = array('non_fatal' => true, 'dont_select_db' => true);
+		if (SMF == 'SSI' && !empty(Config::$ssi_db_user) && !empty(Config::$ssi_db_passwd)) {
+			if (empty($options)) {
+				$options = ['non_fatal' => true, 'dont_select_db' => true];
+			}
 
 			$this->initiate(Config::$ssi_db_user, Config::$ssi_db_passwd, $options);
 		}
 
 		// Either we aren't in SSI mode, or it failed.
-		if (empty($this->connection))
-		{
-			if (empty($options))
-				$options = array('dont_select_db' => SMF == 'SSI');
+		if (empty($this->connection)) {
+			if (empty($options)) {
+				$options = ['dont_select_db' => SMF == 'SSI'];
+			}
 
 			$this->initiate(Config::$db_user, Config::$db_passwd, $options);
 		}
 
 		// Safe guard here, if there isn't a valid connection let's put a stop to it.
-		if (empty($this->connection) && !$non_fatal)
+		if (empty($this->connection) && !$non_fatal) {
 			ErrorHandler::displayDbError();
+		}
 
 		// If in SSI mode, fix up the prefix so it doesn't require the database to be selected.
-		if (SMF == 'SSI')
-		{
+		if (SMF == 'SSI') {
 			$this->prefix = is_numeric(substr($this->prefix, 0, 1)) ? $this->name . '.' . $this->prefix : '`' . $this->name . '`.' . $this->prefix;
 
 			// Redo the reserved table name prefixes.
 			$this->prefixReservedTables();
 		}
 
-		$this->get_version();
-		$this->supports_pcre = version_compare($this->version, strpos($this->version, 'MariaDB') !== false ? '10.0.5' : '8.0.4', '>=');
+		// At this point, if we don't have a connection, nothing else can be done.
+		if (empty($this->connection)) {
+			return;
+		}
 
 		// For backward compatibility.
-		if (!is_object(self::$db_connection))
+		if (!is_object(self::$db_connection)) {
 			self::$db_connection = $this->connection;
+		}
+
+		$this->get_version();
+		$this->supports_pcre = version_compare($this->version, strpos($this->version, 'MariaDB') !== false ? '10.0.5' : '8.0.4', '>=');
 
 		// Ensure database has UTF-8 as its default input charset.
-		$this->query('', '
-			SET NAMES {string:db_character_set}',
-			array(
+		$this->query(
+			'',
+			'SET NAMES {string:db_character_set}',
+			[
 				'db_character_set' => $this->character_set,
-			)
+			],
 		);
 	}
 
@@ -1955,21 +2016,21 @@ protected function __construct(array $options = array())
 	 * @param string $passwd The database password
 	 * @param array $options An array of database options
 	 */
-	protected function initiate($user, $passwd, $options = array())
+	protected function initiate($user, $passwd, $options = [])
 	{
 		$server = ($this->persist ? 'p:' : '') . $this->server;
 
 		// We are not going to make it very far without these.
-		if (!function_exists('mysqli_init') || !function_exists('mysqli_real_connect'))
+		if (!function_exists('mysqli_init') || !function_exists('mysqli_real_connect')) {
 			ErrorHandler::displayDbError();
+		}
 
 		// This was the default prior to PHP 8.1, and all our code assumes it.
 		mysqli_report(MYSQLI_REPORT_OFF);
 
 		$success = false;
 
-		if (($this->connection = mysqli_init()))
-		{
+		if (($this->connection = mysqli_init())) {
 			$success = @mysqli_real_connect(
 				$this->connection,
 				$server,
@@ -1978,27 +2039,27 @@ protected function initiate($user, $passwd, $options = array())
 				null,
 				$this->port,
 				null,
-				MYSQLI_CLIENT_FOUND_ROWS
+				MYSQLI_CLIENT_FOUND_ROWS,
 			);
 		}
 
 		// Something's wrong, show an error if its fatal (which we assume it is)
-		if ($success === false)
-		{
-			if (!empty($options['non_fatal']))
-			{
+		if ($success === false) {
+			if (!empty($options['non_fatal'])) {
 				$this->connection = null;
+
 				return;
 			}
-			else
-				ErrorHandler::displayDbError();
+
+			ErrorHandler::displayDbError();
 		}
 
 		// Select the database, unless told not to
-		if (empty($options['dont_select_db']) && !@mysqli_select_db($this->connection, $this->name) && empty($options['non_fatal']))
+		if (empty($options['dont_select_db']) && !@mysqli_select_db($this->connection, $this->name) && empty($options['non_fatal'])) {
 			ErrorHandler::displayDbError();
+		}
 
-		$sql_mode = array(
+		$sql_mode = [
 			'ONLY_FULL_GROUP_BY',
 			'STRICT_TRANS_TABLES',
 			'NO_ZERO_IN_DATE',
@@ -2006,11 +2067,11 @@ protected function initiate($user, $passwd, $options = array())
 			'ERROR_FOR_DIVISION_BY_ZERO',
 			'NO_ENGINE_SUBSTITUTION',
 			'PIPES_AS_CONCAT',
-		);
+		];
 
 		mysqli_query(
 			$this->connection,
-			'SET SESSION sql_mode = \'' . implode(',', $sql_mode) . '\''
+			'SET SESSION sql_mode = \'' . implode(',', $sql_mode) . '\'',
 		);
 	}
 
@@ -2028,124 +2089,137 @@ protected function initiate($user, $passwd, $options = array())
 	 */
 	protected function replacement__callback($matches)
 	{
-		if (!is_object($this->temp_connection))
+		if (!is_object($this->temp_connection)) {
 			ErrorHandler::displayDbError();
+		}
 
-		if ($matches[1] === 'db_prefix')
+		if ($matches[1] === 'db_prefix') {
 			return $this->prefix;
+		}
 
-		if (isset(User::$me->{$matches[1]}) && strpos($matches[1], 'query_') !== false)
+		if (isset(User::$me->{$matches[1]}) && strpos($matches[1], 'query_') !== false) {
 			return User::$me->{$matches[1]};
+		}
 
-		if ($matches[1] === 'empty')
+		if ($matches[1] === 'empty') {
 			return '\'\'';
+		}
 
-		if (!isset($matches[2]))
+		if (!isset($matches[2])) {
 			$this->error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 
-		if ($matches[1] === 'literal')
+		if ($matches[1] === 'literal') {
 			return '\'' . mysqli_real_escape_string($this->temp_connection, $matches[2]) . '\'';
+		}
 
-		if (!isset($this->temp_values[$matches[2]]))
+		if (!isset($this->temp_values[$matches[2]])) {
 			$this->error_backtrace('The database value you\'re trying to insert does not exist: ' . Utils::htmlspecialchars($matches[2]), '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 
 		$replacement = $this->temp_values[$matches[2]];
 
-		switch ($matches[1])
-		{
+		switch ($matches[1]) {
 			case 'int':
-				if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
+				if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
 					$this->error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
 				return (string) (int) $replacement;
-				break;
 
 			case 'string':
 			case 'text':
 				return sprintf('\'%1$s\'', mysqli_real_escape_string($this->temp_connection, $replacement));
-				break;
 
 			case 'array_int':
-				if (is_array($replacement))
-				{
-					if (empty($replacement))
+				if (is_array($replacement)) {
+					if (empty($replacement)) {
 						$this->error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
-					foreach ($replacement as $key => $value)
-					{
-						if (!is_numeric($value) || (string) $value !== (string) (int) $value)
+					foreach ($replacement as $key => $value) {
+						if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
 							$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+						}
 
 						$replacement[$key] = (string) (int) $value;
 					}
 
 					return implode(', ', $replacement);
 				}
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
+				$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 				break;
 
 			case 'array_string':
-				if (is_array($replacement))
-				{
-					if (empty($replacement))
+				if (is_array($replacement)) {
+					if (empty($replacement)) {
 						$this->error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
-					foreach ($replacement as $key => $value)
+					foreach ($replacement as $key => $value) {
 						$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($this->temp_connection, $value));
+					}
 
 					return implode(', ', $replacement);
 				}
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
+				$this->error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'date':
-				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
+				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
 					return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'time':
-				if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
+				if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
 					return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'datetime':
-				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
+				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
 					return 'str_to_date(' .
 						sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 						',\'%Y-%m-%d %h:%i:%s\')';
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'float':
-				if (!is_numeric($replacement))
+				if (!is_numeric($replacement)) {
 					$this->error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
 				return (string) (float) $replacement;
-				break;
 
 			case 'identifier':
 				// Backticks inside identifiers are supported as of MySQL 4.1. We don't need them for SMF.
-				return '`' . implode('`.`', array_filter(explode('.', strtr($replacement, array('`' => ''))), 'strlen')) . '`';
-				break;
+				return '`' . implode('`.`', array_filter(explode('.', strtr($replacement, ['`' => ''])), 'strlen')) . '`';
 
 			case 'raw':
 				return $replacement;
-				break;
 
 			case 'inet':
-				if ($replacement == 'null' || $replacement == '')
+				if ($replacement == 'null' || $replacement == '') {
 					return 'null';
+				}
 
 				$ip = new IP($replacement);
 
-				if (!$ip->isValid())
-				{
+				if (!$ip->isValid()) {
 					$this->error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 				}
 
@@ -2153,22 +2227,19 @@ protected function replacement__callback($matches)
 				return sprintf('unhex(\'%1$s\')', $ip->toHex());
 
 			case 'array_inet':
-				if (is_array($replacement))
-				{
-					if (empty($replacement))
-					{
+				if (is_array($replacement)) {
+					if (empty($replacement)) {
 						$this->error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 					}
 
-					foreach ($replacement as $key => $value)
-					{
-						if ($value == 'null' || $value == '')
+					foreach ($replacement as $key => $value) {
+						if ($value == 'null' || $value == '') {
 							$replacement[$key] = 'null';
+						}
 
 						$ip = new IP($value);
 
-						if (!$ip->isValid())
-						{
+						if (!$ip->isValid()) {
 							$this->error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 						}
 
@@ -2177,10 +2248,9 @@ protected function replacement__callback($matches)
 
 					return implode(', ', $replacement);
 				}
-				else
-				{
-					$this->error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
-				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			default:
@@ -2201,44 +2271,45 @@ protected function replacement__callback($matches)
 	 */
 	protected function error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 	{
-		if (empty($log_message))
+		if (empty($log_message)) {
 			$log_message = $error_message;
+		}
 
-		foreach (debug_backtrace() as $step)
-		{
+		foreach (debug_backtrace() as $step) {
 			// Found it?
-			if (strpos($step['function'], 'query') === false && !in_array(substr($step['function'], 0, 7), array('smf_db_', 'preg_re', 'db_erro', 'call_us')) && strpos($step['function'], '__') !== 0 && (empty($step['class']) || $step['class'] != $this::class))
-			{
+			if (strpos($step['function'], 'query') === false && !in_array(substr($step['function'], 0, 7), ['smf_db_', 'preg_re', 'db_erro', 'call_us']) && strpos($step['function'], '__') !== 0 && (empty($step['class']) || $step['class'] != $this::class)) {
 				$log_message .= '<br>Function: ' . $step['function'];
 				break;
 			}
 
-			if (isset($step['line']))
-			{
+			if (isset($step['line'])) {
 				$file = $step['file'];
 				$line = $step['line'];
 			}
 		}
 
 		// A special case - we want the file and line numbers for debugging.
-		if ($error_type == 'return')
-			return array($file, $line);
+		if ($error_type == 'return') {
+			return [$file, $line];
+		}
 
 		// Is always a critical error.
-		if (function_exists('log_error'))
+		if (function_exists('log_error')) {
 			ErrorHandler::log($log_message, 'critical', $file, $line);
+		}
 
-		if (function_exists('fatal_error'))
-		{
+		if (function_exists('fatal_error')) {
 			ErrorHandler::fatal($error_message, false);
 
 			// Cannot continue...
 			exit;
 		}
-		elseif ($error_type)
+
+		if ($error_type) {
 			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-		else
+		} else {
 			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+		}
 	}
 
 	/**
@@ -2252,33 +2323,39 @@ protected function create_query_column($column)
 		$column = array_change_key_case($column);
 
 		// Auto increment is easy here!
-		if (!empty($column['auto']))
+		if (!empty($column['auto'])) {
 			$default = 'auto_increment';
+		}
 		// Make it null.
-		elseif (array_key_exists('default', $column) && is_null($column['default']))
+		elseif (array_key_exists('default', $column) && is_null($column['default'])) {
 			$default = 'DEFAULT NULL';
+		}
 		// Numbers don't need quotes.
-		elseif (isset($column['default']) && is_numeric($column['default']))
+		elseif (isset($column['default']) && is_numeric($column['default'])) {
 			$default = 'DEFAULT ' . (strpos($column['default'], '.') ? floatval($column['default']) : intval($column['default']));
+		}
 		// Non empty string.
-		elseif (isset($column['default']))
+		elseif (isset($column['default'])) {
 			$default = 'DEFAULT \'' . $this->escape_string($column['default']) . '\'';
-		else
+		} else {
 			$default = '';
+		}
 
 		// Backwards compatible with the nullable column.
-		if (isset($column['null']) && !isset($column['not_null']))
+		if (isset($column['null']) && !isset($column['not_null'])) {
 			$column['not_null'] = !$column['null'];
+		}
 
 		// Sort out the size... and stuff...
 		$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
-		list ($type, $size) = $this->calculate_type($column['type'], $column['size']);
+		list($type, $size) = $this->calculate_type($column['type'], $column['size']);
 
 		// Allow unsigned integers (mysql only)
-		$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column['unsigned']) ? 'unsigned ' : '';
+		$unsigned = in_array($type, ['int', 'tinyint', 'smallint', 'mediumint', 'bigint']) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
-		if ($size !== null)
+		if ($size !== null) {
 			$type = $type . '(' . $size . ')';
+		}
 
 		// Now just put it together!
 		return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['not_null']) ? 'NOT NULL' : '') . ' ' . $default;
diff --git a/Sources/Db/APIs/PostgreSQL.php b/Sources/Db/APIs/PostgreSQL.php
index 0d6d0cd75b..c668f5d4fa 100644
--- a/Sources/Db/APIs/PostgreSQL.php
+++ b/Sources/Db/APIs/PostgreSQL.php
@@ -14,13 +14,13 @@
 namespace SMF\Db\APIs;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi;
+use SMF\Db\DatabaseApiInterface;
 use SMF\ErrorHandler;
 use SMF\IP;
 use SMF\Lang;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi;
-use SMF\Db\DatabaseApiInterface;
 
 /**
  * Interacts with PostgreSQL databases.
@@ -138,104 +138,108 @@ class PostgreSQL extends DatabaseApi implements DatabaseApiInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function query($identifier, $db_string, $db_values = array(), $connection = null)
+	public function query($identifier, $db_string, $db_values = [], $connection = null)
 	{
 		// Decide which connection to use.
 		$connection = $connection ?? $this->connection;
 
 		// Special queries that need processing.
-		$replacements = array(
-			'profile_board_stats' => array(
+		$replacements = [
+			'profile_board_stats' => [
 				'~COUNT\(\*\) \/ MAX\(b.num_posts\)~' => 'CAST(COUNT(*) AS DECIMAL) / CAST(b.num_posts AS DECIMAL)',
-			),
-		);
+			],
+		];
 
 		// Special optimizer Hints
-		$query_opt = array(
-			'load_board_info' => array(
+		$query_opt = [
+			'load_board_info' => [
 				'join_collapse_limit' => 1,
-			),
-			'calendar_get_events' => array(
+			],
+			'calendar_get_events' => [
 				'enable_seqscan' => 'off',
-			),
-		);
+			],
+		];
 
-		if (isset($replacements[$identifier]))
+		if (isset($replacements[$identifier])) {
 			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+		}
 
 		// Limits need to be a little different.
 		$db_string = preg_replace('~\sLIMIT\s(\d+|{int:.+}),\s*(\d+|{int:.+})\s*$~i', 'LIMIT $2 OFFSET $1', $db_string);
 
-		if (trim($db_string) == '')
+		if (trim($db_string) == '') {
 			return false;
+		}
 
 		// Comments that are allowed in a query are preg_removed.
-		$allowed_comments_from = array(
+		$allowed_comments_from = [
 			'~\s+~s',
 			'~/\*!40001 SQL_NO_CACHE \*/~',
 			'~/\*!40000 USE INDEX \([A-Za-z\_]+?\) \*/~',
 			'~/\*!40100 ON DUPLICATE KEY UPDATE id_msg = \d+ \*/~',
-		);
-		$allowed_comments_to = array(
+		];
+		$allowed_comments_to = [
 			' ',
 			'',
 			'',
 			'',
-		);
+		];
 
 		// One more query....
 		self::$count++;
 
 		$this->replace_result = 0;
 
-		if (!$this->disableQueryCheck && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
+		if (!$this->disableQueryCheck && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
 			$this->error_backtrace('No direct access...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+		}
 
 		// Use "ORDER BY null" to prevent Mysql doing filesorts for Group By clauses without an Order By
-		if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string))
-		{
+		if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string)) {
 			// Add before LIMIT
-			if ($pos = strpos($db_string, 'LIMIT '))
+			if ($pos = strpos($db_string, 'LIMIT ')) {
 				$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
-			else
+			} else {
 				// Append it.
 				$db_string .= "\n\t\t\tORDER BY null";
+			}
 		}
 
-		if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
-		{
+		if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false)) {
 			$this->temp_values = $db_values;
 			$this->temp_connection = $connection;
 
 			// Inject the values passed to this function.
-			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', array($this, 'replacement__callback'), $db_string);
+			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', [$this, 'replacement__callback'], $db_string);
 
 			unset($this->temp_values, $this->temp_connection);
 		}
 
 		// First, we clean strings out of the query, reduce whitespace, lowercase, and trim - so we can check it over.
-		if (!$this->disableQueryCheck)
-		{
+		if (!$this->disableQueryCheck) {
 			$clean = '';
 			$old_pos = 0;
 			$pos = -1;
 			// Remove the string escape for better runtime
 			$db_string_1 = str_replace('\'\'', '', $db_string);
-			while (true)
-			{
+
+			while (true) {
 				$pos = strpos($db_string_1, '\'', $pos + 1);
-				if ($pos === false)
+
+				if ($pos === false) {
 					break;
+				}
 				$clean .= substr($db_string_1, $old_pos, $pos - $old_pos);
 
-				while (true)
-				{
+				while (true) {
 					$pos1 = strpos($db_string_1, '\'', $pos + 1);
 					$pos2 = strpos($db_string_1, '\\', $pos + 1);
-					if ($pos1 === false)
+
+					if ($pos1 === false) {
 						break;
-					elseif ($pos2 === false || $pos2 > $pos1)
-					{
+					}
+
+					if ($pos2 === false || $pos2 > $pos1) {
 						$pos = $pos1;
 						break;
 					}
@@ -250,29 +254,31 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 			$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 			// Comments?  We don't use comments in our queries, we leave 'em outside!
-			if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
+			if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
 				$fail = true;
+			}
 			// Trying to change passwords, slow us down, or something?
-			elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
+			elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
 				$fail = true;
-			elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
+			} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
 				$fail = true;
+			}
 
-			if (!empty($fail) && function_exists('log_error'))
+			if (!empty($fail) && function_exists('log_error')) {
 				$this->error_backtrace('No direct access...', 'No direct access...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+			}
 		}
 
 		// Set optimize stuff
-		if (isset($query_opt[$identifier]))
-		{
+		if (isset($query_opt[$identifier])) {
 			$query_hints = $query_opt[$identifier];
 			$query_hints_set = '';
-			if (isset($query_hints['join_collapse_limit']))
-			{
+
+			if (isset($query_hints['join_collapse_limit'])) {
 				$query_hints_set .= 'SET LOCAL join_collapse_limit = ' . $query_hints['join_collapse_limit'] . ';';
 			}
-			if (isset($query_hints['enable_seqscan']))
-			{
+
+			if (isset($query_hints['enable_seqscan'])) {
 				$query_hints_set .= 'SET LOCAL enable_seqscan = ' . $query_hints['enable_seqscan'] . ';';
 			}
 
@@ -280,16 +286,14 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 		}
 
 		// Debugging.
-		if ($this->show_debug)
-		{
+		if ($this->show_debug) {
 			// Get the file and line number this function was called.
-			list ($file, $line) = $this->error_backtrace('', '', 'return', __FILE__, __LINE__);
+			list($file, $line) = $this->error_backtrace('', '', 'return', __FILE__, __LINE__);
 
-			if (!empty($_SESSION['debug_redirect']))
-			{
+			if (!empty($_SESSION['debug_redirect'])) {
 				self::$cache = array_merge($_SESSION['debug_redirect'], self::$cache);
 				self::$count = count(self::$cache) + 1;
-				$_SESSION['debug_redirect'] = array();
+				$_SESSION['debug_redirect'] = [];
 			}
 
 			// Don't overload it.
@@ -301,12 +305,14 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 
 		$this->last_result = @pg_query($connection, $db_string);
 
-		if ($this->last_result === false && empty($db_values['db_error_skip']))
+		if ($this->last_result === false && empty($db_values['db_error_skip'])) {
 			$this->last_result = $this->error($db_string, $connection);
+		}
 
 		// Debugging.
-		if ($this->show_debug)
+		if ($this->show_debug) {
 			self::$cache[self::$count]['t'] = microtime(true) - $st;
+		}
 
 		return $this->last_result;
 	}
@@ -317,14 +323,13 @@ public function query($identifier, $db_string, $db_values = array(), $connection
 	public function quote($db_string, $db_values, $connection = null)
 	{
 		// Only bother if there's something to replace.
-		if (strpos($db_string, '{') !== false)
-		{
+		if (strpos($db_string, '{') !== false) {
 			// This is needed by the callback function.
 			$this->temp_values = $db_values;
 			$this->temp_connection = $connection ?? $this->connection;
 
 			// Do the quoting and escaping
-			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', array($this, 'replacement__callback'), $db_string);
+			$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', [$this, 'replacement__callback'], $db_string);
 
 			unset($this->temp_values, $this->temp_connection);
 		}
@@ -354,7 +359,8 @@ public function fetch_assoc($result)
 	public function fetch_all($request)
 	{
 		$return = @pg_fetch_all($request);
-		return !empty($return) ? $return : array();
+
+		return !empty($return) ? $return : [];
 	}
 
 	/**
@@ -375,84 +381,94 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 		$replace = '';
 
 		// With nothing to insert, simply return.
-		if (empty($table) || empty($data))
+		if (empty($table) || empty($data)) {
 			return;
+		}
 
 		// Force method to lower case
 		$method = strtolower($method);
 
-		if (!is_array($data[array_rand($data)]))
-			$data = array($data);
+		if (!is_array($data[array_rand($data)])) {
+			$data = [$data];
+		}
 
 		// Replace the prefix holder with the actual prefix.
 		$table = str_replace('{db_prefix}', $this->prefix, $table);
 
 		// Sanity check for replace is key part of the columns array
-		if ($method == 'replace')
-		{
-			if (empty($keys))
-				$this->error_backtrace('When using the replace mode, the key column is a required entry.',
-					'Change the method of db insert to insert or add the pk field to the key array', E_USER_ERROR, __FILE__, __LINE__);
-			if (count(array_intersect_key($columns, array_flip($keys))) !== count($keys))
-				$this->error_backtrace('Primary Key field missing in insert call',
-					'Change the method of db insert to insert or add the pk field to the columns array', E_USER_ERROR, __FILE__, __LINE__);
+		if ($method == 'replace') {
+			if (empty($keys)) {
+				$this->error_backtrace(
+					'When using the replace mode, the key column is a required entry.',
+					'Change the method of db insert to insert or add the pk field to the key array',
+					E_USER_ERROR,
+					__FILE__,
+					__LINE__,
+				);
+			}
+
+			if (count(array_intersect_key($columns, array_flip($keys))) !== count($keys)) {
+				$this->error_backtrace(
+					'Primary Key field missing in insert call',
+					'Change the method of db insert to insert or add the pk field to the columns array',
+					E_USER_ERROR,
+					__FILE__,
+					__LINE__,
+				);
+			}
 		}
 
 		// PostgreSQL doesn't support replace: we implement a MySQL-compatible behavior instead
-		if ($method == 'replace' || $method == 'ignore')
-		{
+		if ($method == 'replace' || $method == 'ignore') {
 			$key_str = '';
 			$col_str = '';
 
 			$count = 0;
 			$count_pk = 0;
 
-			foreach ($columns as $columnName => $type)
-			{
+			foreach ($columns as $columnName => $type) {
 				// Check pk field.
-				if (in_array($columnName, $keys))
-				{
+				if (in_array($columnName, $keys)) {
 					$key_str .= ($count_pk > 0 ? ',' : '');
 					$key_str .= $columnName;
 					$count_pk++;
 				}
 				// Normal field.
-				elseif ($method == 'replace')
-				{
+				elseif ($method == 'replace') {
 					$col_str .= ($count > 0 ? ',' : '');
 					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
 					$count++;
 				}
 			}
 
-			if ($method == 'replace')
+			if ($method == 'replace') {
 				$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
-			else
+			} else {
 				$replace = ' ON CONFLICT (' . $key_str . ') DO NOTHING';
+			}
 		}
 
 		$returning = '';
 		$with_returning = false;
 
 		// Let's build the returning string. (MySQL allows this only in normal mode)
-		if (!empty($keys) && (count($keys) > 0) && $returnmode > 0)
-		{
+		if (!empty($keys) && (count($keys) > 0) && $returnmode > 0) {
 			// We only take the first key.
 			$returning = ' RETURNING ' . $keys[0];
 			$with_returning = true;
 		}
 
-		if (!empty($data))
-		{
+		if (!empty($data)) {
 			// Create the mold for a single row insert.
 			$insertData = '(';
-			foreach ($columns as $columnName => $type)
-			{
+
+			foreach ($columns as $columnName => $type) {
 				// Are we restricting the length?
-				if (strpos($type, 'string-') !== false)
+				if (strpos($type, 'string-') !== false) {
 					$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-				else
+				} else {
 					$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+				}
 			}
 			$insertData = substr($insertData, 0, -2) . ')';
 
@@ -460,34 +476,34 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 			$indexed_columns = array_keys($columns);
 
 			// Here's where the variables are injected to the query.
-			$insertRows = array();
-			foreach ($data as $dataRow)
+			$insertRows = [];
+
+			foreach ($data as $dataRow) {
 				$insertRows[] = $this->quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+			}
 
 			// Do the insert.
-			$request = $this->query('', '
-				INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
+			$request = $this->query(
+				'',
+				'INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 				VALUES
 					' . implode(',
 					', $insertRows) . $replace . $returning,
-				array(
+				[
 					'security_override' => true,
 					'db_error_skip' => $method == 'ignore' || $table === $this->prefix . 'log_errors',
-				),
-				$connection
+				],
+				$connection,
 			);
 
-			if ($with_returning && $request !== false)
-			{
-				if ($returnmode === 2)
-					$return_var = array();
-
-				while (($row = $this->fetch_row($request)) && $with_returning)
-				{
-					if (is_numeric($row[0])) // try to emulate mysql limitation
-					{
-						switch ($returnmode)
-						{
+			if ($with_returning && $request !== false) {
+				if ($returnmode === 2) {
+					$return_var = [];
+				}
+
+				while (($row = $this->fetch_row($request)) && $with_returning) {
+					if (is_numeric($row[0])) { // try to emulate mysql limitation
+						switch ($returnmode) {
 							case 2:
 								$return_var[] = $row[0];
 								break;
@@ -496,9 +512,7 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 								$return_var = $row[0];
 								break;
 						}
-					}
-					else
-					{
+					} else {
 						$with_returning = false;
 						Lang::load('Errors');
 						trigger_error(Lang::$txt['postgres_id_not_int'], E_USER_ERROR);
@@ -507,8 +521,9 @@ public function insert($method, $table, $columns, $data, $keys, $returnmode = 0,
 			}
 		}
 
-		if ($with_returning && !empty($return_var))
+		if ($with_returning && !empty($return_var)) {
 			return $return_var;
+		}
 	}
 
 	/**
@@ -519,13 +534,16 @@ public function insert_id($table, $field = null, $connection = null)
 		$table = str_replace('{db_prefix}', $this->prefix, $table);
 
 		// Try get the last ID for the auto increment field.
-		$request = $this->query('', '
-			SELECT CURRVAL(\'' . $table . '_seq\') AS insertID',
-			array()
+		$request = $this->query(
+			'',
+			'SELECT CURRVAL(\'' . $table . '_seq\') AS insertID',
+			[],
 		);
-		if (!$request)
+
+		if (!$request) {
 			return false;
-		list ($lastID) = $this->fetch_row($request);
+		}
+		list($lastID) = $this->fetch_row($request);
 		$this->free_result($request);
 
 		return $lastID;
@@ -586,12 +604,11 @@ public function server_info($connection = null)
 	 */
 	public function affected_rows($connection = null)
 	{
-		if ($this->replace_result)
-		{
+		if ($this->replace_result) {
 			return $this->replace_result;
 		}
-		elseif ($connection === null && !$this->last_result)
-		{
+
+		if ($connection === null && !$this->last_result) {
 			return 0;
 		}
 
@@ -605,8 +622,7 @@ public function transaction($type = 'commit', $connection = null)
 	{
 		$type = strtoupper($type);
 
-		if (in_array($type, array('BEGIN', 'ROLLBACK', 'COMMIT')))
-		{
+		if (in_array($type, ['BEGIN', 'ROLLBACK', 'COMMIT'])) {
 			$this->inTransaction = $type === 'BEGIN';
 
 			return @pg_query($connection ?? $this->connection, $type);
@@ -620,11 +636,13 @@ public function transaction($type = 'commit', $connection = null)
 	 */
 	public function error($connection)
 	{
-		if ($connection === null && $this->connection === null)
+		if ($connection === null && $this->connection === null) {
 			return '';
+		}
 
-		if (!(($connection ?? $this->connection) instanceof \PgSql\Connection))
+		if (!(($connection ?? $this->connection) instanceof \PgSql\Connection)) {
 			return '';
+		}
 
 		return pg_last_error($connection ?? $this->connection);
 	}
@@ -642,16 +660,17 @@ public function select($database, $connection = null)
 	 */
 	public function escape_wildcard_string($string, $translate_human_wildcards = false)
 	{
-		$replacements = array(
+		$replacements = [
 			'%' => '\%',
 			'_' => '\_',
 			'\\' => '\\\\',
-		);
+		];
 
-		if ($translate_human_wildcards)
-			$replacements += array(
+		if ($translate_human_wildcards) {
+			$replacements += [
 				'*' => '%',
-			);
+			];
+		}
 
 		return strtr($string, $replacements);
 	}
@@ -678,39 +697,46 @@ public function ping($connection = null)
 	public function error_insert($error_array)
 	{
 		// Without a database we can't do anything.
-		if (empty($this->connection))
+		if (empty($this->connection)) {
 			return;
+		}
 
 		// String keys are easier to work with.
-		if (!isset($error_array['ip']))
-			$error_array = array_combine(array('id_member', 'log_time', 'ip', 'url', 'message', 'session', 'error_type', 'file', 'line', 'backtrace'), $error_array);
+		if (!isset($error_array['ip'])) {
+			$error_array = array_combine(['id_member', 'log_time', 'ip', 'url', 'message', 'session', 'error_type', 'file', 'line', 'backtrace'], $error_array);
+		}
 
-		if (filter_var($error_array['ip'], FILTER_VALIDATE_IP) === false)
+		if (filter_var($error_array['ip'], FILTER_VALIDATE_IP) === false) {
 			$error_array['ip'] = null;
+		}
 
 		// If we are in a transaction, abort.
-		if (!empty($inTransaction))
+		if (!empty($inTransaction)) {
 			$this->transaction('rollback');
+		}
 
 		// Without pooling.
-		if (empty($this->persist))
-		{
-			if (empty($this->error_data_prep))
-				$this->error_data_prep = pg_prepare($this->connection, 'smf_log_errors',
+		if (empty($this->persist)) {
+			if (empty($this->error_data_prep)) {
+				$this->error_data_prep = pg_prepare(
+					$this->connection,
+					'smf_log_errors',
 					'INSERT INTO ' . $this->prefix . 'log_errors
 						(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
-					VALUES( $1, $2, $3, $4, $5, $6, $7, $8,	$9, $10)'
+					VALUES( $1, $2, $3, $4, $5, $6, $7, $8,	$9, $10)',
 				);
+			}
 
 			pg_execute($this->connection, 'smf_log_errors', $error_array);
 		}
 		// With pooling.
-		else
-		{
-			$this->error_data_prep = pg_prepare($this->connection, '',
+		else {
+			$this->error_data_prep = pg_prepare(
+				$this->connection,
+				'',
 				'INSERT INTO ' . $this->prefix . 'log_errors
 					(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)
-				VALUES( $1, $2, $3, $4, $5, $6, $7, $8,	$9, $10)'
+				VALUES( $1, $2, $3, $4, $5, $6, $7, $8,	$9, $10)',
 			);
 
 			pg_execute($this->connection, '', $error_array);
@@ -726,8 +752,9 @@ public function custom_order($field, $array_values, $desc = false)
 		$count = count($array_values);
 		$then = ($desc ? ' THEN -' : ' THEN ');
 
-		for ($i = 0; $i < $count; $i++)
+		for ($i = 0; $i < $count; $i++) {
 			$return .= 'WHEN ' . (int) $array_values[$i] . $then . $i . ' ';
+		}
 
 		$return .= 'END';
 
@@ -755,8 +782,9 @@ public function cte_support()
 	 */
 	public function connect_error()
 	{
-		if (empty($this->connect_error))
+		if (empty($this->connect_error)) {
 			$this->connect_error = '';
+		}
 
 		return $this->connect_error;
 	}
@@ -766,8 +794,9 @@ public function connect_error()
 	 */
 	public function connect_errno()
 	{
-		if (empty($this->connect_errno))
+		if (empty($this->connect_errno)) {
 			$this->connect_errno = '';
+		}
 
 		return $this->connect_errno;
 	}
@@ -786,38 +815,40 @@ public function backup_table($table, $backup_table)
 		// Do we need to drop it first?
 		$tables = $this->list_tables(false, $backup_table);
 
-		if (!empty($tables))
-		{
-			$this->query('', '
-				DROP TABLE {raw:backup_table}',
-				array(
+		if (!empty($tables)) {
+			$this->query(
+				'',
+				'DROP TABLE {raw:backup_table}',
+				[
 					'backup_table' => $backup_table,
-				)
+				],
 			);
 		}
 
 		/**
 		 * @todo Should we create backups of sequences as well?
 		 */
-		$this->query('', '
-			CREATE TABLE {raw:backup_table}
+		$this->query(
+			'',
+			'CREATE TABLE {raw:backup_table}
 			(
 				LIKE {raw:table}
 				INCLUDING DEFAULTS
 			)',
-			array(
+			[
 				'backup_table' => $backup_table,
 				'table' => $table,
-			)
+			],
 		);
 
-		$this->query('', '
-			INSERT INTO {raw:backup_table}
+		$this->query(
+			'',
+			'INSERT INTO {raw:backup_table}
 			SELECT * FROM {raw:table}',
-			array(
+			[
 				'backup_table' => $backup_table,
 				'table' => $table,
-			)
+			],
 		);
 	}
 
@@ -828,18 +859,19 @@ public function optimize_table($table)
 	{
 		$table = str_replace('{db_prefix}', $this->prefix, $table);
 
-		$pg_tables = array('pg_catalog', 'information_schema');
+		$pg_tables = ['pg_catalog', 'information_schema'];
 
-		$request = $this->query('', '
-			SELECT pg_relation_size(C.oid) AS "size"
+		$request = $this->query(
+			'',
+			'SELECT pg_relation_size(C.oid) AS "size"
 			FROM pg_class C
 				LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace)
 			WHERE nspname NOT IN ({array_string:pg_tables})
 				AND relname = {string:table}',
-			array(
+			[
 				'table' => $table,
 				'pg_tables' => $pg_tables,
-			)
+			],
 		);
 
 		$row = $this->fetch_assoc($request);
@@ -847,35 +879,39 @@ public function optimize_table($table)
 
 		$old_size = $row['size'];
 
-		$request = $this->query('', '
-			VACUUM FULL ANALYZE {raw:table}',
-			array(
+		$request = $this->query(
+			'',
+			'VACUUM FULL ANALYZE {raw:table}',
+			[
 				'table' => $table,
-			)
+			],
 		);
 
-		if (!$request)
+		if (!$request) {
 			return -1;
+		}
 
-		$request = $this->query('', '
-			SELECT pg_relation_size(C.oid) AS "size"
+		$request = $this->query(
+			'',
+			'SELECT pg_relation_size(C.oid) AS "size"
 			FROM pg_class C
 				LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace)
 			WHERE nspname NOT IN ({array_string:pg_tables})
 				AND relname = {string:table}',
-			array(
+			[
 				'table' => $table,
 				'pg_tables' => $pg_tables,
-			)
+			],
 		);
 
 		$row = $this->fetch_assoc($request);
 		$this->free_result($request);
 
-		if (isset($row['size']))
+		if (isset($row['size'])) {
 			return ($old_size - $row['size']) / 1024;
-		else
-			return 0;
+		}
+
+		return 0;
 	}
 
 	/**
@@ -897,46 +933,48 @@ public function table_sql($tableName)
 		$seq_create = '';
 
 		// Find all the fields.
-		$result = $this->query('', '
-			SELECT column_name, column_default, is_nullable, data_type, character_maximum_length
+		$result = $this->query(
+			'',
+			'SELECT column_name, column_default, is_nullable, data_type, character_maximum_length
 			FROM information_schema.columns
 			WHERE table_name = {string:table}
 			ORDER BY ordinal_position',
-			array(
+			[
 				'table' => $tableName,
-			)
+			],
 		);
-		while ($row = $this->fetch_assoc($result))
-		{
-			if ($row['data_type'] == 'character varying')
+
+		while ($row = $this->fetch_assoc($result)) {
+			if ($row['data_type'] == 'character varying') {
 				$row['data_type'] = 'varchar';
-			elseif ($row['data_type'] == 'character')
+			} elseif ($row['data_type'] == 'character') {
 				$row['data_type'] = 'char';
+			}
 
-			if ($row['character_maximum_length'])
+			if ($row['character_maximum_length']) {
 				$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+			}
 
 			// Make the CREATE for this column.
 			$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
 
 			// Add a default...?
-			if (trim($row['column_default']) != '')
-			{
+			if (trim($row['column_default']) != '') {
 				$schema_create .= ' default ' . $row['column_default'] . '';
 
 				// Auto increment?
-				if (preg_match('~nextval\(\'(.+?)\'(.+?)*\)~i', $row['column_default'], $matches) != 0)
-				{
+				if (preg_match('~nextval\(\'(.+?)\'(.+?)*\)~i', $row['column_default'], $matches) != 0) {
 					// Get to find the next variable first!
-					$count_req = $this->query('', '
-						SELECT MAX("{raw:column}")
+					$count_req = $this->query(
+						'',
+						'SELECT MAX("{raw:column}")
 						FROM {raw:table}',
-						array(
+						[
 							'column' => $row['column_name'],
 							'table' => $tableName,
-						)
+						],
 					);
-					list ($max_ind) = $this->fetch_row($count_req);
+					list($max_ind) = $this->fetch_row($count_req);
 					$this->free_result($count_req);
 					// Get the right bloody start!
 					$seq_create .= 'CREATE SEQUENCE ' . $matches[1] . ' START WITH ' . ($max_ind + 1) . ';' . $crlf . $crlf;
@@ -950,35 +988,37 @@ public function table_sql($tableName)
 		// Take off the last comma.
 		$schema_create = substr($schema_create, 0, -strlen($crlf) - 1);
 
-		$result = $this->query('', '
-			SELECT pg_get_indexdef(i.indexrelid) AS inddef
+		$result = $this->query(
+			'',
+			'SELECT pg_get_indexdef(i.indexrelid) AS inddef
 			FROM pg_class AS c
 				INNER JOIN pg_index AS i ON (i.indrelid = c.oid)
 				INNER JOIN pg_class AS c2 ON (c2.oid = i.indexrelid)
 			WHERE c.relname = {string:table} AND i.indisprimary is {raw:pk}',
-			array(
+			[
 				'table' => $tableName,
 				'pk'	=> 'false',
-			)
+			],
 		);
-		while ($row = $this->fetch_assoc($result))
-		{
+
+		while ($row = $this->fetch_assoc($result)) {
 			$index_create .= $crlf . $row['inddef'] . ';';
 		}
 		$this->free_result($result);
 
-		$result = $this->query('', '
-			SELECT pg_get_constraintdef(c.oid) as pkdef
+		$result = $this->query(
+			'',
+			'SELECT pg_get_constraintdef(c.oid) as pkdef
 			FROM pg_constraint as c
 			WHERE c.conrelid::regclass::text = {string:table} AND
 				c.contype = {string:constraintType}',
-			array(
+			[
 				'table' 			=> $tableName,
 				'constraintType'	=> 'p',
-			)
+			],
 		);
-		while ($row = $this->fetch_assoc($result))
-		{
+
+		while ($row = $this->fetch_assoc($result)) {
 			$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD ' . $row['pkdef'] . ';';
 		}
 		$this->free_result($result);
@@ -994,21 +1034,22 @@ public function table_sql($tableName)
 	 */
 	public function list_tables($db = false, $filter = false)
 	{
-		$tables = array();
+		$tables = [];
 
-		$request = $this->query('', '
-			SELECT tablename
+		$request = $this->query(
+			'',
+			'SELECT tablename
 			FROM pg_tables
 			WHERE schemaname = {string:schema_public}' . ($filter == false ? '' : '
 				AND tablename LIKE {string:filter}') . '
 			ORDER BY tablename',
-			array(
+			[
 				'schema_public' => 'public',
 				'filter' => $filter,
-			)
+			],
 		);
-		while ($row = $this->fetch_row($request))
-		{
+
+		while ($row = $this->fetch_row($request)) {
 			$tables[] = $row[0];
 		}
 		$this->free_result($request);
@@ -1040,10 +1081,8 @@ public function get_vendor()
 	public function allow_persistent()
 	{
 		$value = ini_get('pgsql.allow_persistent');
-		if (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1')
-			return true;
-		else
-			return false;
+
+		return (bool) (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1');
 	}
 
 	/*****************************************
@@ -1053,68 +1092,67 @@ public function allow_persistent()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function search_query($identifier, $db_string, $db_values = array(), $connection = null)
+	public function search_query($identifier, $db_string, $db_values = [], $connection = null)
 	{
-		$replacements = array(
-			'create_tmp_log_search_topics' => array(
+		$replacements = [
+			'create_tmp_log_search_topics' => [
 				'~ENGINE=MEMORY~i' => '',
-			),
-			'create_tmp_log_search_messages' => array(
+			],
+			'create_tmp_log_search_messages' => [
 				'~ENGINE=MEMORY~i' => '',
-			),
-			'insert_into_log_messages_fulltext' => array(
+			],
+			'insert_into_log_messages_fulltext' => [
 				'/NOT\sLIKE/' => 'NOT ILIKE',
 				'/\bLIKE\b/' => 'ILIKE',
 				'/NOT RLIKE/' => '!~*',
 				'/RLIKE/' => '~*',
-			),
-			'insert_log_search_results_subject' => array(
+			],
+			'insert_log_search_results_subject' => [
 				'/NOT\sLIKE/' => 'NOT ILIKE',
 				'/\bLIKE\b/' => 'ILIKE',
 				'/NOT RLIKE/' => '!~*',
 				'/RLIKE/' => '~*',
-			),
-			'insert_log_search_topics' => array(
+			],
+			'insert_log_search_topics' => [
 				'/NOT\sLIKE/' => 'NOT ILIKE',
 				'/\bLIKE\b/' => 'ILIKE',
 				'/NOT RLIKE/' => '!~*',
 				'/RLIKE/' => '~*',
-			),
-			'insert_log_search_results_no_index' => array(
+			],
+			'insert_log_search_results_no_index' => [
 				'/NOT\sLIKE/' => 'NOT ILIKE',
 				'/\bLIKE\b/' => 'ILIKE',
 				'/NOT RLIKE/' => '!~*',
 				'/RLIKE/' => '~*',
-			),
-		);
+			],
+		];
 
-		if (isset($replacements[$identifier]))
-		{
+		if (isset($replacements[$identifier])) {
 			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
 		}
 
-		if (preg_match('~^\s*INSERT\s+IGNORE\b~i', $db_string) != 0)
-		{
+		if (preg_match('~^\s*INSERT\s+IGNORE\b~i', $db_string) != 0) {
 			$db_string = preg_replace('~^\s*INSERT\s+IGNORE\b~i', 'INSERT', $db_string);
 
-			if ($this->support_ignore)
-			{
+			if ($this->support_ignore) {
 				// pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
 				$db_string = $db_string . ' ON CONFLICT DO NOTHING';
-			}
-			else
-			{
+			} else {
 				// Don't error on multi-insert.
 				$db_values['db_error_skip'] = true;
 			}
 		}
 
 		// Fix double quotes.
-		if ($identifier == 'insert_into_log_messages_fulltext')
+		if ($identifier == 'insert_into_log_messages_fulltext') {
 			$db_string = str_replace('"', "'", $db_string);
+		}
 
-		$return = $this->query('', $db_string,
-			$db_values, $this->connection
+		$return = $this->query(
+			'',
+			$db_string,
+			$db_values,
+			$this->connection,
 		);
 
 		return $return;
@@ -1125,7 +1163,7 @@ public function search_query($identifier, $db_string, $db_values = array(), $con
 	 */
 	public function search_support($search_type)
 	{
-		$supported_types = array('custom', 'fulltext');
+		$supported_types = ['custom', 'fulltext'];
 
 		return in_array($search_type, $supported_types);
 	}
@@ -1137,16 +1175,17 @@ public function create_word_search($size)
 	{
 		$size = 'int';
 
-		$this->query('', '
-			CREATE TABLE {db_prefix}log_search_words (
+		$this->query(
+			'',
+			'CREATE TABLE {db_prefix}log_search_words (
 				id_word {raw:size} NOT NULL default {string:string_zero},
 				id_msg int NOT NULL default {string:string_zero},
 				PRIMARY KEY (id_word, id_msg)
 			)',
-			array(
+			[
 				'size' => $size,
 				'string_zero' => '0',
-			)
+			],
 		);
 	}
 
@@ -1155,34 +1194,36 @@ public function create_word_search($size)
 	 */
 	public function search_language()
 	{
-		if (!empty(Config::$modSettings['search_language']))
+		if (!empty(Config::$modSettings['search_language'])) {
 			$this->language_ftx = Config::$modSettings['search_language'];
+		}
 
-		if (empty($this->language_ftx))
-		{
-			$request = $this->query('', '
-				SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',
-				array(
-					'default_language' => 'default_text_search_config'
-				)
+		if (empty($this->language_ftx)) {
+			$request = $this->query(
+				'',
+				'SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',
+				[
+					'default_language' => 'default_text_search_config',
+				],
 			);
 
-			if ($request !== false && $this->num_rows($request) == 1)
-			{
+			if ($request !== false && $this->num_rows($request) == 1) {
 				$row = $this->fetch_assoc($request);
 				$this->language_ftx = $row['cfgname'];
 
-				$this->insert('replace',
+				$this->insert(
+					'replace',
 					'{db_prefix}settings',
-					array('variable' => 'string', 'value' => 'string'),
-					array('search_language', $this->language_ftx),
-					array('variable')
+					['variable' => 'string', 'value' => 'string'],
+					['search_language', $this->language_ftx],
+					['variable'],
 				);
 			}
 		}
 
-		if (empty($this->language_ftx))
+		if (empty($this->language_ftx)) {
 			$this->language_ftx = 'english';
+		}
 
 		return $this->language_ftx;
 	}
@@ -1194,25 +1235,25 @@ public function search_language()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function add_column($table_name, $column_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
+	public function add_column($table_name, $column_info, $parameters = [], $if_exists = 'update', $error = 'fatal')
 	{
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$column_info = array_change_key_case($column_info);
 
 		// Log that we will want to uninstall this!
-		self::$package_log[] = array('remove_column', $short_table_name, $column_info['name']);
+		self::$package_log[] = ['remove_column', $short_table_name, $column_info['name']];
 
 		// Does it exist - if so don't add it again!
 		$columns = $this->list_columns($table_name, false);
-		foreach ($columns as $column)
-		{
-			if ($column == $column_info['name'])
-			{
+
+		foreach ($columns as $column) {
+			if ($column == $column_info['name']) {
 				// If we're going to overwrite then use change column.
-				if ($if_exists == 'update')
+				if ($if_exists == 'update') {
 					return $this->change_column($table_name, $column_info['name'], $column_info);
-				else
-					return false;
+				}
+
+				return false;
 			}
 		}
 
@@ -1221,93 +1262,97 @@ public function add_column($table_name, $column_info, $parameters = array(), $if
 
 		list($type, $size) = $this->calculate_type($column_info['type'], $column_info['size']);
 
-		if ($size !== null)
+		if ($size !== null) {
 			$type = $type . '(' . $size . ')';
+		}
 
 		// Now add the thing!
-		$this->query('', '
-			ALTER TABLE ' . $short_table_name . '
+		$this->query(
+			'',
+			'ALTER TABLE ' . $short_table_name . '
 			ADD COLUMN ' . $column_info['name'] . ' ' . $type,
-			array(
+			[
 				'security_override' => true,
-			)
+			],
 		);
 
-
 		// If there's more attributes they need to be done via a change on PostgreSQL.
 		unset($column_info['type'], $column_info['size']);
 
-		if (count($column_info) != 1)
+		if (count($column_info) != 1) {
 			return $this->change_column($table_name, $column_info['name'], $column_info);
-		else
-			return true;
+		}
+
+		return true;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal')
+	public function add_index($table_name, $index_info, $parameters = [], $if_exists = 'update', $error = 'fatal')
 	{
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
 
 		// No columns = no index.
-		if (empty($index_info['columns']))
+		if (empty($index_info['columns'])) {
 			return false;
+		}
 
 		// MySQL you can do a "column_name (length)", postgresql does not allow this.  Strip it.
 		$cols = $this->list_columns($table_name, true);
-		foreach ($index_info['columns'] as &$c)
+
+		foreach ($index_info['columns'] as &$c) {
 			$c = preg_replace('~\s+(\(\d+\))~', '', $c);
+		}
 
 		$columns = implode(',', $index_info['columns']);
 
 		// No name - make it up!
-		if (empty($index_info['name']))
-		{
+		if (empty($index_info['name'])) {
 			// No need for primary.
-			if (isset($index_info['type']) && $index_info['type'] == 'primary')
+			if (isset($index_info['type']) && $index_info['type'] == 'primary') {
 				$index_info['name'] = '';
-			else
+			} else {
 				$index_info['name'] = trim(implode('_', preg_replace('~(\(\d+\))~', '', $index_info['columns'])));
+			}
 		}
 
 		// Log that we are going to want to remove this!
-		self::$package_log[] = array('remove_index', $parsed_table_name, $index_info['name']);
+		self::$package_log[] = ['remove_index', $parsed_table_name, $index_info['name']];
 
 		// Let's get all our indexes.
 		$indexes = $this->list_indexes($table_name, true);
+
 		// Do we already have it?
-		foreach ($indexes as $index)
-		{
-			if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
-			{
+		foreach ($indexes as $index) {
+			if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary')) {
 				// If we want to overwrite simply remove the current one then continue.
-				if ($if_exists != 'update' || $index['type'] == 'primary')
+				if ($if_exists != 'update' || $index['type'] == 'primary') {
 					return false;
-				else
-					$this->remove_index($table_name, $index_info['name']);
+				}
+
+				$this->remove_index($table_name, $index_info['name']);
 			}
 		}
 
 		// If we're here we know we don't have the index - so just add it.
-		if (!empty($index_info['type']) && $index_info['type'] == 'primary')
-		{
-			$this->query('', '
-				ALTER TABLE ' . $real_table_name . '
+		if (!empty($index_info['type']) && $index_info['type'] == 'primary') {
+			$this->query(
+				'',
+				'ALTER TABLE ' . $real_table_name . '
 				ADD PRIMARY KEY (' . $columns . ')',
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
-		}
-		else
-		{
-			$this->query('', '
-				CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $real_table_name . '_' . $index_info['name'] . ' ON ' . $real_table_name . ' (' . $columns . ')',
-				array(
+		} else {
+			$this->query(
+				'',
+				'CREATE ' . (isset($index_info['type']) && $index_info['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $real_table_name . '_' . $index_info['name'] . ' ON ' . $real_table_name . ' (' . $columns . ')',
+				[
 					'security_override' => true,
-				)
+				],
 			);
 		}
 	}
@@ -1319,10 +1364,10 @@ public function calculate_type($type_name, $type_size = null, $reverse = false)
 	{
 		// Let's be sure it's lowercase MySQL likes both, others no.
 		$type_name = strtolower($type_name);
+
 		// Generic => Specific.
-		if (!$reverse)
-		{
-			$types = array(
+		if (!$reverse) {
+			$types = [
 				'varchar' => 'character varying',
 				'char' => 'character',
 				'mediumint' => 'int',
@@ -1334,11 +1379,9 @@ public function calculate_type($type_name, $type_size = null, $reverse = false)
 				'time' => 'time without time zone',
 				'datetime' => 'timestamp without time zone',
 				'timestamp' => 'timestamp without time zone',
-			);
-		}
-		else
-		{
-			$types = array(
+			];
+		} else {
+			$types = [
 				'character varying' => 'varchar',
 				'character' => 'char',
 				'integer' => 'int',
@@ -1346,22 +1389,23 @@ public function calculate_type($type_name, $type_size = null, $reverse = false)
 				'time without time zone' => 'time',
 				'timestamp without time zone' => 'datetime',
 				'numeric' => 'decimal',
-			);
+			];
 		}
 
 		// Got it? Change it!
-		if (isset($types[$type_name]))
-		{
-			if ($type_name == 'tinytext')
+		if (isset($types[$type_name])) {
+			if ($type_name == 'tinytext') {
 				$type_size = 255;
+			}
 			$type_name = $types[$type_name];
 		}
 
 		// Only char fields got size
-		if (strpos($type_name, 'char') === false)
+		if (strpos($type_name, 'char') === false) {
 			$type_size = null;
+		}
 
-		return array($type_name, $type_size);
+		return [$type_name, $type_size];
 	}
 
 	/**
@@ -1375,146 +1419,175 @@ public function change_column($table_name, $old_column, $column_info)
 		// Check it does exist!
 		$columns = $this->list_columns($table_name, true);
 		$old_info = null;
-		foreach ($columns as $column)
-		{
-			if ($column['name'] == $old_column)
+
+		foreach ($columns as $column) {
+			if ($column['name'] == $old_column) {
 				$old_info = $column;
+			}
 		}
 
 		// Nothing?
-		if ($old_info == null)
+		if ($old_info == null) {
 			return false;
+		}
 
 		// backward compatibility
-		if (isset($column_info['null']) && !isset($column_info['not_null']))
+		if (isset($column_info['null']) && !isset($column_info['not_null'])) {
 			$column_info['not_null'] = !$column_info['null'];
+		}
 
 		// Get the right bits.
-		if (isset($column_info['drop_default']) && !empty($column_info['drop_default']))
+		if (isset($column_info['drop_default']) && !empty($column_info['drop_default'])) {
 			$column_info['drop_default'] = true;
-		else
+		} else {
 			$column_info['drop_default'] = false;
-		if (!isset($column_info['name']))
+		}
+
+		if (!isset($column_info['name'])) {
 			$column_info['name'] = $old_column;
-		if (!array_key_exists('default', $column_info) && array_key_exists('default', $old_info) && empty($column_info['drop_default']))
+		}
+
+		if (!array_key_exists('default', $column_info) && array_key_exists('default', $old_info) && empty($column_info['drop_default'])) {
 			$column_info['default'] = $old_info['default'];
-		if (!isset($column_info['not_null']))
+		}
+
+		if (!isset($column_info['not_null'])) {
 			$column_info['not_null'] = $old_info['not_null'];
-		if (!isset($column_info['auto']))
+		}
+
+		if (!isset($column_info['auto'])) {
 			$column_info['auto'] = $old_info['auto'];
-		if (!isset($column_info['type']))
+		}
+
+		if (!isset($column_info['type'])) {
 			$column_info['type'] = $old_info['type'];
-		if (!isset($column_info['size']) || !is_numeric($column_info['size']))
+		}
+
+		if (!isset($column_info['size']) || !is_numeric($column_info['size'])) {
 			$column_info['size'] = $old_info['size'];
-		if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
+		}
+
+		if (!isset($column_info['unsigned']) || !in_array($column_info['type'], ['int', 'tinyint', 'smallint', 'mediumint', 'bigint'])) {
 			$column_info['unsigned'] = '';
+		}
 
 		// If truly unspecified, make that clear, otherwise, might be confused with NULL...
 		// (Unspecified = no default whatsoever = column is not nullable with a value of null...)
-		if (($column_info['not_null'] === true) && !$column_info['drop_default'] && array_key_exists('default', $column_info) && is_null($column_info['default']))
+		if (($column_info['not_null'] === true) && !$column_info['drop_default'] && array_key_exists('default', $column_info) && is_null($column_info['default'])) {
 			unset($column_info['default']);
+		}
 
 		// If you need to drop the default, that needs it's own thing...
 		// Must be done first, in case the default type is inconsistent with the other changes.
-		if ($column_info['drop_default'])
-		{
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+		if ($column_info['drop_default']) {
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				ALTER COLUMN ' . $old_column . ' DROP DEFAULT',
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 		}
+
 		// Now we check each bit individually and ALTER as required.
-		if (isset($column_info['name']) && $column_info['name'] != $old_column)
-		{
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+		if (isset($column_info['name']) && $column_info['name'] != $old_column) {
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				RENAME COLUMN ' . $old_column . ' TO ' . $column_info['name'],
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 		}
 
 		// What about a change in type?
-		if (isset($column_info['type']) && ($column_info['type'] != $old_info['type'] || (isset($column_info['size']) && $column_info['size'] != $old_info['size'])))
-		{
+		if (isset($column_info['type']) && ($column_info['type'] != $old_info['type'] || (isset($column_info['size']) && $column_info['size'] != $old_info['size']))) {
 			$column_info['size'] = isset($column_info['size']) && is_numeric($column_info['size']) ? $column_info['size'] : null;
-			list ($type, $size) = $this->calculate_type($column_info['type'], $column_info['size']);
-			if ($size !== null)
+			list($type, $size) = $this->calculate_type($column_info['type'], $column_info['size']);
+
+			if ($size !== null) {
 				$type = $type . '(' . $size . ')';
+			}
 
 			// The alter is a pain.
 			$this->transaction('begin');
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				ADD COLUMN ' . $column_info['name'] . '_tempxx ' . $type,
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
-			$this->query('', '
-				UPDATE ' . $short_table_name . '
+			$this->query(
+				'',
+				'UPDATE ' . $short_table_name . '
 				SET ' . $column_info['name'] . '_tempxx = CAST(' . $column_info['name'] . ' AS ' . $type . ')',
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				DROP COLUMN ' . $column_info['name'],
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				RENAME COLUMN ' . $column_info['name'] . '_tempxx TO ' . $column_info['name'],
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 			$this->transaction('commit');
 		}
 
 		// Different default?
 		// Just go ahead & honor the setting.  Type changes above introduce defaults that we might need to override here...
-		if (!$column_info['drop_default'] && array_key_exists('default', $column_info))
-		{
+		if (!$column_info['drop_default'] && array_key_exists('default', $column_info)) {
 			// Fix the default.
 			$default = '';
-			if (is_null($column_info['default']))
+
+			if (is_null($column_info['default'])) {
 				$default = 'NULL';
-			elseif (isset($column_info['default']) && is_numeric($column_info['default']))
+			} elseif (isset($column_info['default']) && is_numeric($column_info['default'])) {
 				$default = strpos($column_info['default'], '.') ? floatval($column_info['default']) : intval($column_info['default']);
-			else
+			} else {
 				$default = '\'' . $this->escape_string($column_info['default']) . '\'';
+			}
 
 			$action = 'SET DEFAULT ' . $default;
-			$this->query('', '
-				ALTER TABLE ' . $short_table_name . '
+			$this->query(
+				'',
+				'ALTER TABLE ' . $short_table_name . '
 				ALTER COLUMN ' . $column_info['name'] . ' ' . $action,
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 		}
 
 		// Is it null - or otherwise?
 		// Just go ahead & honor the setting.  Type changes above introduce defaults that we might need to override here...
-		if ($column_info['not_null'])
+		if ($column_info['not_null']) {
 			$action = 'SET NOT NULL';
-		else
+		} else {
 			$action = 'DROP NOT NULL';
+		}
 
-		$this->query('', '
-			ALTER TABLE ' . $short_table_name . '
+		$this->query(
+			'',
+			'ALTER TABLE ' . $short_table_name . '
 			ALTER COLUMN ' . $column_info['name'] . ' ' . $action,
-			array(
+			[
 				'security_override' => true,
-			)
+			],
 		);
 
 		return true;
@@ -1523,7 +1596,7 @@ public function change_column($table_name, $old_column, $column_info)
 	/**
 	 * {@inheritDoc}
 	 */
-	public function create_table($table_name, $columns, $indexes = array(), $parameters = array(), $if_exists = 'ignore', $error = 'fatal')
+	public function create_table($table_name, $columns, $indexes = [], $parameters = [], $if_exists = 'ignore', $error = 'fatal')
 	{
 		$db_trans = false;
 		$old_table_exists = false;
@@ -1537,166 +1610,180 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// First - no way do we touch SMF tables.
-		if (in_array(strtolower($short_table_name), $this->reservedTables))
+		if (in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
+		}
 
 		// Log that we'll want to remove this on uninstall.
-		self::$package_log[] = array('remove_table', $short_table_name);
+		self::$package_log[] = ['remove_table', $short_table_name];
 
 		// This... my friends... is a function in a half - let's start by checking if the table exists!
 		$tables = $this->list_tables($database);
 
-		if (in_array($full_table_name, $tables))
-		{
+		if (in_array($full_table_name, $tables)) {
 			// This is a sad day... drop the table? If not, return false (error) by default.
-			if ($if_exists == 'overwrite')
+			if ($if_exists == 'overwrite') {
 				$this->drop_table($table_name);
-			elseif ($if_exists == 'update')
-			{
+			} elseif ($if_exists == 'update') {
 				$this->drop_table($table_name . '_old');
 				$this->transaction('begin');
 				$db_trans = true;
-				$this->query('', '
-					ALTER TABLE ' . $short_table_name . ' RENAME TO ' . $short_table_name . '_old',
-					array(
+				$this->query(
+					'',
+					'ALTER TABLE ' . $short_table_name . ' RENAME TO ' . $short_table_name . '_old',
+					[
 						'security_override' => true,
-					)
+					],
 				);
 				$old_table_exists = true;
-			}
-			else
+			} else {
 				return $if_exists == 'ignore';
+			}
 		}
 
 		// If we've got this far - good news - no table exists. We can build our own!
-		if (!$db_trans)
+		if (!$db_trans) {
 			$this->transaction('begin');
+		}
 		$table_query = 'CREATE TABLE ' . $short_table_name . "\n" . '(';
-		foreach ($columns as $column)
-		{
+
+		foreach ($columns as $column) {
 			$column = array_change_key_case($column);
 
 			// If we have an auto increment do it!
-			if (!empty($column['auto']))
-			{
-				if (!$old_table_exists)
-					$this->query('', '
-						DROP SEQUENCE IF EXISTS ' . $short_table_name . '_seq',
-						array(
+			if (!empty($column['auto'])) {
+				if (!$old_table_exists) {
+					$this->query(
+						'',
+						'DROP SEQUENCE IF EXISTS ' . $short_table_name . '_seq',
+						[
 							'security_override' => true,
-						)
+						],
 					);
+				}
 
-				if (!$old_table_exists)
-					$this->query('', '
-						CREATE SEQUENCE ' . $short_table_name . '_seq',
-						array(
+				if (!$old_table_exists) {
+					$this->query(
+						'',
+						'CREATE SEQUENCE ' . $short_table_name . '_seq',
+						[
 							'security_override' => true,
-						)
+						],
 					);
+				}
 				$default = 'default nextval(\'' . $short_table_name . '_seq\')';
-			}
-			elseif (isset($column['default']) && $column['default'] !== null)
+			} elseif (isset($column['default']) && $column['default'] !== null) {
 				$default = 'default \'' . $this->escape_string($column['default']) . '\'';
-			else
+			} else {
 				$default = '';
+			}
 
 			// Sort out the size...
 			$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
-			list ($type, $size) = $this->calculate_type($column['type'], $column['size']);
-			if ($size !== null)
+			list($type, $size) = $this->calculate_type($column['type'], $column['size']);
+
+			if ($size !== null) {
 				$type = $type . '(' . $size . ')';
+			}
 
 			// backward compatibility
-			if (isset($column['null']) && !isset($column['not_null']))
+			if (isset($column['null']) && !isset($column['not_null'])) {
 				$column['not_null'] = !$column['null'];
+			}
 
 			// Now just put it together!
 			$table_query .= "\n\t\"" . $column['name'] . '" ' . $type . ' ' . (!empty($column['not_null']) ? 'NOT NULL' : '') . ' ' . $default . ',';
 		}
 
 		// Loop through the indexes next...
-		$index_queries = array();
-		foreach ($indexes as $index)
-		{
+		$index_queries = [];
+
+		foreach ($indexes as $index) {
 			// MySQL you can do a "column_name (length)", postgresql does not allow this.  Strip it.
-			foreach ($index['columns'] as &$c)
+			foreach ($index['columns'] as &$c) {
 				$c = preg_replace('~\s+(\(\d+\))~', '', $c);
+			}
 
 			$idx_columns = implode(',', $index['columns']);
 
 			// Is it the primary?
-			if (isset($index['type']) && $index['type'] == 'primary')
+			if (isset($index['type']) && $index['type'] == 'primary') {
 				$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-			else
-			{
-				if (empty($index['name']))
+			} else {
+				if (empty($index['name'])) {
 					$index['name'] = trim(implode('_', preg_replace('~(\(\d+\))~', '', $index['columns'])));
+				}
 
 				$index_queries[] = 'CREATE ' . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : '') . ' INDEX ' . $short_table_name . '_' . $index['name'] . ' ON ' . $short_table_name . ' (' . $idx_columns . ')';
 			}
 		}
 
 		// No trailing commas!
-		if (substr($table_query, -1) == ',')
+		if (substr($table_query, -1) == ',') {
 			$table_query = substr($table_query, 0, -1);
+		}
 
 		$table_query .= ')';
 
 		// Create the table!
-		$this->query('', $table_query,
-			array(
+		$this->query(
+			'',
+			$table_query,
+			[
 				'security_override' => true,
-			)
+			],
 		);
 
 		// Fill the old data
-		if ($old_table_exists)
-		{
-			$same_col = array();
+		if ($old_table_exists) {
+			$same_col = [];
 
-			$request = $this->query('', '
-				SELECT count(*), column_name
+			$request = $this->query(
+				'',
+				'SELECT count(*), column_name
 				FROM information_schema.columns
 				WHERE table_name in ({string:table1},{string:table2}) AND table_schema = {string:schema}
 				GROUP BY column_name
 				HAVING count(*) > 1',
-				array(
+				[
 					'table1' => $short_table_name,
 					'table2' => $short_table_name . '_old',
 					'schema' => 'public',
-				)
+				],
 			);
 
-			while ($row = $this->fetch_assoc($request))
-			{
+			while ($row = $this->fetch_assoc($request)) {
 				$same_col[] = $row['column_name'];
 			}
 
-			$this->query('', '
-				INSERT INTO ' . $short_table_name . '('
+			$this->query(
+				'',
+				'INSERT INTO ' . $short_table_name . '('
 				. implode(',', $same_col) .
 				')
 				SELECT ' . implode(',', $same_col) . '
 				FROM ' . $short_table_name . '_old',
-				array()
+				[],
 			);
 		}
 
-
 		// And the indexes...
-		foreach ($index_queries as $query)
-			$this->query('', $query,
-				array(
+		foreach ($index_queries as $query) {
+			$this->query(
+				'',
+				$query,
+				[
 					'security_override' => true,
-				)
+				],
 			);
+		}
 
 		// Go, go power rangers!
 		$this->transaction('commit');
 
-		if ($old_table_exists)
+		if ($old_table_exists) {
 			$this->drop_table($table_name . '_old');
+		}
 
 		return true;
 	}
@@ -1704,7 +1791,7 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 	/**
 	 * {@inheritDoc}
 	 */
-	public function drop_table($table_name, $parameters = array(), $error = 'fatal')
+	public function drop_table($table_name, $parameters = [], $error = 'fatal')
 	{
 		// After stripping away the database name, this is what's left.
 		$real_prefix = preg_match('~^("?)(.+?)\\1\\.(.*?)$~', $this->prefix, $match) === 1 ? $match[3] : $this->prefix;
@@ -1715,13 +1802,14 @@ public function drop_table($table_name, $parameters = array(), $error = 'fatal')
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// God no - dropping one of these = bad.
-		if (in_array(strtolower($table_name), $this->reservedTables))
+		if (in_array(strtolower($table_name), $this->reservedTables)) {
 			return false;
+		}
 
 		// Does it exist?
 		$tables = $this->list_tables($database);
-		if (in_array($full_table_name, $tables))
-		{
+
+		if (in_array($full_table_name, $tables)) {
 			// We can then drop the table.
 			$this->transaction('begin');
 
@@ -1732,17 +1820,19 @@ public function drop_table($table_name, $parameters = array(), $error = 'fatal')
 			$sequence_query = 'DROP SEQUENCE IF EXISTS ' . $short_table_name . '_seq';
 
 			// drop them
-			$this->query('',
+			$this->query(
+				'',
 				$table_query,
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
-			$this->query('',
+			$this->query(
+				'',
 				$sequence_query,
-				array(
+				[
 					'security_override' => true,
-				)
+				],
 			);
 
 			$this->transaction('commit');
@@ -1762,60 +1852,57 @@ public function table_structure($table_name)
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
 
-		return array(
+		return [
 			'name' => $real_table_name,
 			'columns' => $this->list_columns($table_name, true),
 			'indexes' => $this->list_indexes($table_name, true),
-		);
+		];
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function list_columns($table_name, $detail = false, $parameters = array())
+	public function list_columns($table_name, $detail = false, $parameters = [])
 	{
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
 		$database = !empty($match[2]) ? $match[2] : $this->name;
 
-		$result = $this->query('', '
-			SELECT column_name, column_default, is_nullable, data_type, character_maximum_length
+		$result = $this->query(
+			'',
+			'SELECT column_name, column_default, is_nullable, data_type, character_maximum_length
 			FROM information_schema.columns
 			WHERE table_schema = {string:schema_public}
 				AND table_name = {string:table_name}
 			ORDER BY ordinal_position',
-			array(
+			[
 				'schema_public' => 'public',
 				'table_name' => $real_table_name,
-			)
+			],
 		);
-		$columns = array();
-		while ($row = $this->fetch_assoc($result))
-		{
-			if (!$detail)
-			{
+		$columns = [];
+
+		while ($row = $this->fetch_assoc($result)) {
+			if (!$detail) {
 				$columns[] = $row['column_name'];
-			}
-			else
-			{
+			} else {
 				$auto = false;
 				$default = null;
+
 				// What is the default?
-				if ($row['column_default'] !== null)
-				{
-					if (preg_match('~nextval\(\'(.+?)\'(.+?)*\)~i', $row['column_default'], $matches) != 0)
+				if ($row['column_default'] !== null) {
+					if (preg_match('~nextval\(\'(.+?)\'(.+?)*\)~i', $row['column_default'], $matches) != 0) {
 						$auto = true;
-					elseif (substr($row['column_default'], 0, 4) != 'NULL' && trim($row['column_default']) != '')
-					{
+					} elseif (substr($row['column_default'], 0, 4) != 'NULL' && trim($row['column_default']) != '') {
 						$pos = strpos($row['column_default'], '::');
 						$default = trim($pos === false ? $row['column_default'] : substr($row['column_default'], 0, $pos), '\'');
 					}
 				}
 
 				// Make the type generic.
-				list ($type, $size) = $this->calculate_type($row['data_type'], $row['character_maximum_length'], true);
+				list($type, $size) = $this->calculate_type($row['data_type'], $row['character_maximum_length'], true);
 
-				$columns[$row['column_name']] = array(
+				$columns[$row['column_name']] = [
 					'name' => $row['column_name'],
 					'not_null' => $row['is_nullable'] != 'YES',
 					'null' => $row['is_nullable'] == 'YES',
@@ -1823,7 +1910,7 @@ public function list_columns($table_name, $detail = false, $parameters = array()
 					'type' => $type,
 					'size' => $size,
 					'auto' => $auto,
-				);
+				];
 			}
 		}
 		$this->free_result($result);
@@ -1834,14 +1921,15 @@ public function list_columns($table_name, $detail = false, $parameters = array()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function list_indexes($table_name, $detail = false, $parameters = array())
+	public function list_indexes($table_name, $detail = false, $parameters = [])
 	{
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
 		$database = !empty($match[2]) ? $match[2] : $this->name;
 
-		$result = $this->query('', '
-			SELECT CASE WHEN i.indisprimary THEN 1 ELSE 0 END AS is_primary,
+		$result = $this->query(
+			'',
+			'SELECT CASE WHEN i.indisprimary THEN 1 ELSE 0 END AS is_primary,
 				CASE WHEN i.indisunique THEN 1 ELSE 0 END AS is_unique,
 				c2.relname AS name,
 				pg_get_indexdef(i.indexrelid) AS inddef
@@ -1849,40 +1937,43 @@ public function list_indexes($table_name, $detail = false, $parameters = array()
 			WHERE c.relname = {string:table_name}
 				AND c.oid = i.indrelid
 				AND i.indexrelid = c2.oid',
-			array(
+			[
 				'table_name' => $real_table_name,
-			)
+			],
 		);
-		$indexes = array();
-		while ($row = $this->fetch_assoc($result))
-		{
+		$indexes = [];
+
+		while ($row = $this->fetch_assoc($result)) {
 			// Try get the columns that make it up.
-			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
+			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
 				continue;
+			}
 
 			$columns = explode(',', $matches[1]);
 
-			if (empty($columns))
+			if (empty($columns)) {
 				continue;
+			}
 
-			foreach ($columns as $k => $v)
+			foreach ($columns as $k => $v) {
 				$columns[$k] = trim($v);
+			}
 
 			// Fix up the name to be consistent cross databases
-			if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1)
+			if (substr($row['name'], -5) == '_pkey' && $row['is_primary'] == 1) {
 				$row['name'] = 'PRIMARY';
-			else
+			} else {
 				$row['name'] = str_replace($real_table_name . '_', '', $row['name']);
+			}
 
-			if (!$detail)
+			if (!$detail) {
 				$indexes[] = $row['name'];
-			else
-			{
-				$indexes[$row['name']] = array(
+			} else {
+				$indexes[$row['name']] = [
 					'name' => $row['name'],
 					'type' => $row['is_primary'] ? 'primary' : ($row['is_unique'] ? 'unique' : 'index'),
 					'columns' => $columns,
-				);
+				];
 			}
 		}
 		$this->free_result($result);
@@ -1893,35 +1984,38 @@ public function list_indexes($table_name, $detail = false, $parameters = array()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function remove_column($table_name, $column_name, $parameters = array(), $error = 'fatal')
+	public function remove_column($table_name, $column_name, $parameters = [], $error = 'fatal')
 	{
 		$short_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 
 		// Does it exist?
 		$columns = $this->list_columns($table_name, true);
 
-		foreach ($columns as $column)
-			if (strtolower($column['name']) == strtolower($column_name))
-			{
+		foreach ($columns as $column) {
+			if (strtolower($column['name']) == strtolower($column_name)) {
 				// If there is an auto we need remove it!
-				if ($column['auto'])
-					$this->query('', '
-						DROP SEQUENCE IF EXISTS ' . $short_table_name . '_seq',
-						array(
+				if ($column['auto']) {
+					$this->query(
+						'',
+						'DROP SEQUENCE IF EXISTS ' . $short_table_name . '_seq',
+						[
 							'security_override' => true,
-						)
+						],
 					);
+				}
 
-				$this->query('', '
-					ALTER TABLE ' . $short_table_name . '
+				$this->query(
+					'',
+					'ALTER TABLE ' . $short_table_name . '
 					DROP COLUMN ' . $column_name,
-					array(
+					[
 						'security_override' => true,
-					)
+					],
 				);
 
 				return true;
 			}
+		}
 
 		// If here we didn't have to work - joy!
 		return false;
@@ -1930,7 +2024,7 @@ public function remove_column($table_name, $column_name, $parameters = array(),
 	/**
 	 * {@inheritDoc}
 	 */
-	public function remove_index($table_name, $index_name, $parameters = array(), $error = 'fatal')
+	public function remove_index($table_name, $index_name, $parameters = [], $error = 'fatal')
 	{
 		$parsed_table_name = str_replace('{db_prefix}', $this->prefix, $table_name);
 		$real_table_name = preg_match('~^(`?)(.+?)\\1\\.(.*?)$~', $parsed_table_name, $match) === 1 ? $match[3] : $parsed_table_name;
@@ -1939,33 +2033,34 @@ public function remove_index($table_name, $index_name, $parameters = array(), $e
 		$indexes = $this->list_indexes($table_name, true);
 
 		// Do not add the table name to the index if it is arleady there.
-		if ($index_name != 'primary' && strpos($index_name, $real_table_name) !== false)
+		if ($index_name != 'primary' && strpos($index_name, $real_table_name) !== false) {
 			$index_name = str_replace($real_table_name . '_', '', $index_name);
+		}
 
-		foreach ($indexes as $index)
-		{
+		foreach ($indexes as $index) {
 			// If the name is primary we want the primary key!
-			if ($index['type'] == 'primary' && $index_name == 'primary')
-			{
+			if ($index['type'] == 'primary' && $index_name == 'primary') {
 				// Dropping primary key?
-				$this->query('', '
-					ALTER TABLE ' . $real_table_name . '
+				$this->query(
+					'',
+					'ALTER TABLE ' . $real_table_name . '
 					DROP CONSTRAINT ' . $index['name'],
-					array(
+					[
 						'security_override' => true,
-					)
+					],
 				);
 
 				return true;
 			}
-			if ($index['name'] == $index_name)
-			{
+
+			if ($index['name'] == $index_name) {
 				// Drop the bugger...
-				$this->query('', '
-					DROP INDEX ' . $real_table_name . '_' . $index_name,
-					array(
+				$this->query(
+					'',
+					'DROP INDEX ' . $real_table_name . '_' . $index_name,
+					[
 						'security_override' => true,
-					)
+					],
 				);
 
 				return true;
@@ -1987,7 +2082,7 @@ public function remove_index($table_name, $index_name, $parameters = array(), $e
 	 *
 	 * @param array $options An array of database options.
 	 */
-	protected function __construct(array $options = array())
+	protected function __construct(array $options = [])
 	{
 		parent::__construct();
 
@@ -1995,37 +2090,45 @@ protected function __construct(array $options = array())
 		$non_fatal = !empty($options['non_fatal']);
 
 		// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
-		if (SMF == 'SSI' && !empty(Config::$ssi_db_user) && !empty(Config::$ssi_db_passwd))
-		{
-			if (empty($options))
-				$options = array('non_fatal' => true, 'dont_select_db' => true);
+		if (SMF == 'SSI' && !empty(Config::$ssi_db_user) && !empty(Config::$ssi_db_passwd)) {
+			if (empty($options)) {
+				$options = ['non_fatal' => true, 'dont_select_db' => true];
+			}
 
 			$this->initiate(Config::$ssi_db_user, Config::$ssi_db_passwd, $options);
 		}
 
 		// Either we aren't in SSI mode, or it failed.
-		if (empty($this->connection))
-		{
-			if (empty($options))
-				$options = array('dont_select_db' => SMF == 'SSI');
+		if (empty($this->connection)) {
+			if (empty($options)) {
+				$options = ['dont_select_db' => SMF == 'SSI'];
+			}
 
 			$this->initiate(Config::$db_user, Config::$db_passwd, $options);
 		}
 
 		// Safe guard here, if there isn't a valid connection let's put a stop to it.
-		if (empty($this->connection) && !$non_fatal)
+		if (empty($this->connection) && !$non_fatal) {
 			ErrorHandler::displayDbError();
+		}
+
+		// At this point, if we don't have a connection, nothing else can be done.
+		if (empty($this->connection)) {
+			return;
+		}
 
 		// For backward compatibility.
-		if (!is_object(self::$db_connection))
+		if (!is_object(self::$db_connection)) {
 			self::$db_connection = $this->connection;
+		}
 
 		// Ensure database has UTF-8 as its default input charset.
-		$this->query('', '
-			SET NAMES {string:db_character_set}',
-			array(
+		$this->query(
+			'',
+			'SET NAMES {string:db_character_set}',
+			[
 				'db_character_set' => $this->character_set,
-			)
+			],
 		);
 	}
 
@@ -2038,33 +2141,32 @@ protected function __construct(array $options = array())
 	 * @param string $passwd The database password
 	 * @param array $options An array of database options
 	 */
-	protected function initiate($user, $passwd, $options = array())
+	protected function initiate($user, $passwd, $options = [])
 	{
 		// We are not going to make it very far without this.
-		if (!function_exists('pg_pconnect'))
+		if (!function_exists('pg_pconnect')) {
 			ErrorHandler::displayDbError();
+		}
 
 		// We need to escape ' and \
-		$passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $passwd);
+		$passwd = str_replace(['\\', '\''], ['\\\\', '\\\''], $passwd);
 
 		// Since pg_connect doesn't feed error info to pg_last_error, we have to catch issues with a try/catch.
 		set_error_handler(
-			function($errno, $errstr)
-			{
+			function ($errno, $errstr) {
 				throw new ErrorException($errstr, $errno);
-			}
+			},
 		);
-		try
-		{
+
+		try {
 			$connection_string = (empty($this->server) ? '' : 'host=' . $this->server . ' ') . 'dbname=' . $this->name . ' user=\'' . $user . '\' password=\'' . $passwd . '\'' . (empty($options['port']) ? '' : ' port=\'' . $options['port'] . '\'');
 
-			if (!empty($options['persist']))
+			if (!empty($options['persist'])) {
 				$this->connection = @pg_pconnect($connection_string);
-			else
+			} else {
 				$this->connection = @pg_connect($connection_string);
-		}
-		catch (Exception $e)
-		{
+			}
+		} catch (Exception $e) {
 			// Make error info available to calling processes
 			$this->connect_error = $e->getMessage();
 			$this->connect_errno = $e->getCode();
@@ -2073,8 +2175,9 @@ function($errno, $errstr)
 		restore_error_handler();
 
 		// Something's wrong, show an error if its fatal (which we assume it is)
-		if (empty($this->connection) && empty($options['non_fatal']))
+		if (empty($this->connection) && empty($options['non_fatal'])) {
 			ErrorHandler::displayDbError();
+		}
 	}
 
 	/**
@@ -2091,145 +2194,155 @@ function($errno, $errstr)
 	 */
 	protected function replacement__callback($matches)
 	{
-		if (!is_object($this->temp_connection))
+		if (!is_object($this->temp_connection)) {
 			ErrorHandler::displayDbError();
+		}
 
-		if ($matches[1] === 'db_prefix')
+		if ($matches[1] === 'db_prefix') {
 			return $this->prefix;
+		}
 
-		if (isset(User::$me->{$matches[1]}) && strpos($matches[1], 'query_') !== false)
+		if (isset(User::$me->{$matches[1]}) && strpos($matches[1], 'query_') !== false) {
 			return User::$me->{$matches[1]};
+		}
 
-		if ($matches[1] === 'empty')
+		if ($matches[1] === 'empty') {
 			return '\'\'';
+		}
 
-		if (!isset($matches[2]))
+		if (!isset($matches[2])) {
 			$this->error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 
-		if ($matches[1] === 'literal')
+		if ($matches[1] === 'literal') {
 			return '\'' . pg_escape_string($this->connection, $matches[2]) . '\'';
+		}
 
-		if (!isset($this->temp_values[$matches[2]]))
+		if (!isset($this->temp_values[$matches[2]])) {
 			$this->error_backtrace('The database value you\'re trying to insert does not exist: ' . Utils::htmlspecialchars($matches[2]), '', E_USER_ERROR, __FILE__, __LINE__);
+		}
 
 		$replacement = $this->temp_values[$matches[2]];
 
-		switch ($matches[1])
-		{
+		switch ($matches[1]) {
 			case 'int':
-				if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
+				if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
 					$this->error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
 				return (string) (int) $replacement;
-				break;
 
 			case 'string':
 			case 'text':
 				return sprintf('\'%1$s\'', pg_escape_string($this->connection, $replacement));
-				break;
 
 			case 'array_int':
-				if (is_array($replacement))
-				{
-					if (empty($replacement))
+				if (is_array($replacement)) {
+					if (empty($replacement)) {
 						$this->error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
-					foreach ($replacement as $key => $value)
-					{
-						if (!is_numeric($value) || (string) $value !== (string) (int) $value)
+					foreach ($replacement as $key => $value) {
+						if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
 							$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+						}
 
 						$replacement[$key] = (string) (int) $value;
 					}
 
 					return implode(', ', $replacement);
 				}
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
+				$this->error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 				break;
 
 			case 'array_string':
-				if (is_array($replacement))
-				{
-					if (empty($replacement))
+				if (is_array($replacement)) {
+					if (empty($replacement)) {
 						$this->error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
-					foreach ($replacement as $key => $value)
+					foreach ($replacement as $key => $value) {
 						$replacement[$key] = sprintf('\'%1$s\'', pg_escape_string($this->connection, $value));
+					}
 
 					return implode(', ', $replacement);
 				}
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
+				$this->error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'date':
-				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
+				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
 					return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]) . '::date';
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'time':
-				if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
+				if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
 					return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]) . '::time';
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'datetime':
-				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
+				if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
 					return 'to_timestamp(' .
 						sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5], $datetime_matches[6]) .
 						',\'YYYY-MM-DD HH24:MI:SS\')';
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
+				$this->error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			case 'float':
-				if (!is_numeric($replacement))
+				if (!is_numeric($replacement)) {
 					$this->error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
+
 				return (string) (float) $replacement;
-				break;
 
 			case 'identifier':
-				return '"' . implode('"."', array_filter(explode('.', strtr($replacement, array('`' => ''))), 'strlen')) . '"';
-				break;
+				return '"' . implode('"."', array_filter(explode('.', strtr($replacement, ['`' => ''])), 'strlen')) . '"';
 
 			case 'raw':
 				return $replacement;
-				break;
 
 			case 'inet':
-				if ($replacement == 'null' || $replacement == '')
+				if ($replacement == 'null' || $replacement == '') {
 					return 'null';
+				}
 
 				$ip = new IP($replacement);
 
-				if (!$ip->isValid())
-				{
+				if (!$ip->isValid()) {
 					$this->error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 				}
 
 				return sprintf('\'%1$s\'::inet', pg_escape_string($this->connection, $ip));
 
 			case 'array_inet':
-				if (is_array($replacement))
-				{
-					if (empty($replacement))
-					{
+				if (is_array($replacement)) {
+					if (empty($replacement)) {
 						$this->error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 					}
 
-					foreach ($replacement as $key => $value)
-					{
-						if ($value == 'null' || $value == '')
+					foreach ($replacement as $key => $value) {
+						if ($value == 'null' || $value == '') {
 							$replacement[$key] = 'null';
+						}
 
 						$ip = new IP($value);
 
-						if (!$ip->isValid())
-						{
+						if (!$ip->isValid()) {
 							$this->error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 						}
 
@@ -2238,8 +2351,9 @@ protected function replacement__callback($matches)
 
 					return implode(', ', $replacement);
 				}
-				else
-					$this->error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
+				$this->error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+
 				break;
 
 			default:
@@ -2260,44 +2374,45 @@ protected function replacement__callback($matches)
 	 */
 	protected function error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 	{
-		if (empty($log_message))
+		if (empty($log_message)) {
 			$log_message = $error_message;
+		}
 
-		foreach (debug_backtrace() as $step)
-		{
+		foreach (debug_backtrace() as $step) {
 			// Found it?
-			if (strpos($step['function'], 'query') === false && !in_array(substr($step['function'], 0, 7), array('smf_db_', 'preg_re', 'db_erro', 'call_us')) && strpos($step['function'], '__') !== 0 && (empty($step['class']) || $step['class'] != $this::class))
-			{
+			if (strpos($step['function'], 'query') === false && !in_array(substr($step['function'], 0, 7), ['smf_db_', 'preg_re', 'db_erro', 'call_us']) && strpos($step['function'], '__') !== 0 && (empty($step['class']) || $step['class'] != $this::class)) {
 				$log_message .= '<br>Function: ' . $step['function'];
 				break;
 			}
 
-			if (isset($step['line']))
-			{
+			if (isset($step['line'])) {
 				$file = $step['file'];
 				$line = $step['line'];
 			}
 		}
 
 		// A special case - we want the file and line numbers for debugging.
-		if ($error_type == 'return')
-			return array($file, $line);
+		if ($error_type == 'return') {
+			return [$file, $line];
+		}
 
 		// Is always a critical error.
-		if (function_exists('log_error'))
+		if (function_exists('log_error')) {
 			ErrorHandler::log($log_message, 'critical', $file, $line);
+		}
 
-		if (function_exists('fatal_error'))
-		{
+		if (function_exists('fatal_error')) {
 			ErrorHandler::fatal($error_message, $error_type);
 
 			// Cannot continue...
 			exit;
 		}
-		elseif ($error_type)
+
+		if ($error_type) {
 			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-		else
+		} else {
 			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+		}
 	}
 }
 
diff --git a/Sources/Db/APIs/index.php b/Sources/Db/APIs/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Db/APIs/index.php
+++ b/Sources/Db/APIs/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Db/DatabaseApi.php b/Sources/Db/DatabaseApi.php
index d19f77dc04..752f69f63a 100644
--- a/Sources/Db/DatabaseApi.php
+++ b/Sources/Db/DatabaseApi.php
@@ -30,18 +30,18 @@ abstract class DatabaseApi
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'loadDatabase',
 			'extend' => 'db_extend',
-		),
-		'prop_names' => array(
+		],
+		'prop_names' => [
 			'count' => 'db_count',
 			'cache' => 'db_cache',
 			'package_log' => 'db_package_log',
 			'db_connection' => 'db_connection',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -190,7 +190,7 @@ abstract class DatabaseApi
 	 *
 	 * For backward compatibilty, also referenced as global $db_cache.
 	 */
-	public static array $cache = array();
+	public static array $cache = [];
 
 	/**
 	 * @var array
@@ -199,7 +199,7 @@ abstract class DatabaseApi
 	 *
 	 * For backward compatibilty, also referenced as global $db_package_log.
 	 */
-	public static array $package_log = array();
+	public static array $package_log = [];
 
 	/**
 	 * @var object
@@ -231,7 +231,7 @@ abstract class DatabaseApi
 	 *
 	 * SMF tables that can't be auto-removed - in case a mod writer cocks it up!
 	 */
-	protected array $reservedTables = array(
+	protected array $reservedTables = [
 		'admin_info_files',
 		'approval_queue',
 		'attachments',
@@ -305,7 +305,7 @@ abstract class DatabaseApi
 		'user_alerts_prefs',
 		'user_drafts',
 		'user_likes',
-	);
+	];
 
 	/***********************
 	 * Public static methods
@@ -319,14 +319,34 @@ abstract class DatabaseApi
 	 * @param array $options An array of database options.
 	 * @return object An instance of a child class of this class.
 	 */
-	final public static function load(array $options = array())
+	final public static function load(array $options = [])
 	{
-		if (isset(self::$db))
+		if (isset(self::$db)) {
 			return self::$db;
+		}
 
 		// Figure out what type of database we are using.
-		switch (!empty(Config::$db_type) ? strtolower(Config::$db_type) : 'mysql')
-		{
+		$class = self::getClass(!empty(Config::$db_type) ? strtolower(Config::$db_type) : 'mysql');
+
+		if (!class_exists(__NAMESPACE__ . '\\APIs\\' . $class)) {
+			ErrorHandler::displayDbError();
+		}
+
+		$class = __NAMESPACE__ . '\\APIs\\' . $class;
+		self::$db = new $class($options);
+
+		// Double check that we found what we expected.
+		if (!(self::$db instanceof DatabaseApi)) {
+			unset(self::$db);
+			ErrorHandler::displayDbError();
+		}
+
+		return self::$db;
+	}
+
+	public static function getClass($db_type)
+	{
+		switch (strtolower($db_type)) {
 			// PostgreSQL is known by many names.
 			case 'postgresql':
 			case 'postgres':
@@ -347,26 +367,14 @@ final public static function load(array $options = array())
 				$class = ucwords(Config::$db_type);
 
 				// If the necessary class doesn't exist, fall back to MySQL.
-				if (!class_exists(__NAMESPACE__ . '\\APIs\\' . $class))
+				if (!class_exists(__NAMESPACE__ . '\\APIs\\' . $class)) {
 					$class = MYSQL_TITLE;
+				}
 
 				break;
 		}
 
-		if (!class_exists(__NAMESPACE__ . '\\APIs\\' . $class))
-			ErrorHandler::displayDbError();
-
-		$class = __NAMESPACE__ . '\\APIs\\' . $class;
-		self::$db = new $class($options);
-
-		// Double check that we found what we expected.
-		if (!(self::$db instanceof DatabaseApi))
-		{
-			unset($self::$db);
-			ErrorHandler::displayDbError();
-		}
-
-		return self::$db;
+		return $class;
 	}
 
 	/**
@@ -385,32 +393,41 @@ public static function extend()
 	 */
 	protected function __construct()
 	{
-		if (!isset($this->server))
+		if (!isset($this->server)) {
 			$this->server = (string) Config::$db_server;
+		}
 
-		if (!isset($this->name))
+		if (!isset($this->name)) {
 			$this->name = (string) Config::$db_name;
+		}
 
-		if (!isset($this->prefix))
+		if (!isset($this->prefix)) {
 			$this->prefix = (string) Config::$db_prefix;
+		}
 
-		if (!isset($this->port))
+		if (!isset($this->port)) {
 			$this->port = !empty(Config::$db_port) ? (int) Config::$db_port : 0;
+		}
 
-		if (!isset($this->persist))
+		if (!isset($this->persist)) {
 			$this->persist = !empty(Config::$db_persist);
+		}
 
-		if (!isset($this->mb4))
+		if (!isset($this->mb4)) {
 			$this->mb4 = !empty(Config::$db_mb4);
+		}
 
-		if (!isset($this->character_set))
+		if (!isset($this->character_set)) {
 			$this->character_set = (string) Config::$db_character_set;
+		}
 
-		if (!isset($this->show_debug))
+		if (!isset($this->show_debug)) {
 			$this->show_debug = !empty(Config::$db_show_debug);
+		}
 
-		if (!isset($this->disableQueryCheck))
+		if (!isset($this->disableQueryCheck)) {
 			$this->disableQueryCheck = !empty(Config::$modSettings['disableQueryCheck']);
+		}
 
 		$this->prefixReservedTables();
 
@@ -428,8 +445,9 @@ protected function prefixReservedTables()
 		$this->reservedTables = $class_vars['reservedTables'];
 
 		// Prepend the prefix.
-		foreach ($this->reservedTables as $k => $table_name)
+		foreach ($this->reservedTables as $k => $table_name) {
 			$this->reservedTables[$k] = strtolower($this->prefix . $table_name);
+		}
 	}
 
 	/**
@@ -439,21 +457,22 @@ protected function prefixReservedTables()
 	protected function mapToSmcFunc()
 	{
 		// Only do this once.
-		if (isset(Utils::$smcFunc['db_fetch_assoc']))
+		if (isset(Utils::$smcFunc['db_fetch_assoc'])) {
 			return;
+		}
 
 		// Scalar values to export.
-		Utils::$smcFunc += array(
+		Utils::$smcFunc += [
 			'db_title' => &$this->title,
 			'db_sybase' => &$this->sybase,
 			'db_case_sensitive' => &$this->case_sensitive,
 			'db_mb4' => &$this->mb4,
 			'db_support_ignore' => &$this->support_ignore,
 			'db_supports_pcre' => &$this->supports_pcre,
-		);
+		];
 
 		// Methods to export.
-		$methods = array(
+		$methods = [
 			// Basic
 			'db_affected_rows' => 'affected_rows',
 			'db_connect_errno' => 'connect_errno',
@@ -510,13 +529,11 @@ protected function mapToSmcFunc()
 			'db_search_language' => 'search_language',
 			'db_search_query' => 'query',
 			'db_search_support' => 'search_support',
-		);
+		];
 
 		// Wrap each method in a closure that calls it.
-		foreach ($methods as $key => $method)
-		{
-			Utils::$smcFunc[$key] = function(...$args) use ($method)
-			{
+		foreach ($methods as $key => $method) {
+			Utils::$smcFunc[$key] = function (...$args) use ($method) {
 				return $this->$method(...$args);
 			};
 		}
@@ -524,7 +541,8 @@ protected function mapToSmcFunc()
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\DatabaseApi::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\DatabaseApi::exportStatic')) {
 	DatabaseApi::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Db/DatabaseApiInterface.php b/Sources/Db/DatabaseApiInterface.php
index 08165be40b..2d70f4da6a 100644
--- a/Sources/Db/DatabaseApiInterface.php
+++ b/Sources/Db/DatabaseApiInterface.php
@@ -27,7 +27,7 @@ interface DatabaseApiInterface
 	 * @param resource $connection = null The connection to use (null to use $db_connection)
 	 * @return resource|bool Returns a query result resource (for SELECT queries), true (for UPDATE queries) or false if the query failed.
 	 */
-	public function query($identifier, $db_string, $db_values = array(), $connection = null);
+	public function query($identifier, $db_string, $db_values = [], $connection = null);
 
 	/**
 	 * Prepares a query string for execution, but does not perform the query.
@@ -72,8 +72,8 @@ public function free_result($result);
 	 * Gets the ID of the most recently inserted row.
 	 *
 	 * @param string $table The table (only used for Postgres).
-	 * @param string $field = null The specific field (not used here).
 	 * @param resource $connection = null The connection (if null, $db_connection is used).
+	 * @param string $field = null The specific field (not used here).
 	 * @return int The ID of the most recently inserted row.
 	 */
 	public function insert($method, $table, $columns, $data, $keys, $returnmode = 0, $connection = null);
@@ -99,8 +99,8 @@ public function num_rows($result);
 	/**
 	 * Adjusts the result pointer to an arbitrary row in a query result.
 	 *
-	 * @param resource $request A query result resource.
 	 * @param int $offset The row offset.
+	 * @param resource $request A query result resource.
 	 * @return bool True on success, or false on failuer.
 	 */
 	public function data_seek($result, int $offset);
@@ -117,8 +117,8 @@ public function num_fields($result);
 	 * Escapes special characters in a string for use in an SQL statement,
 	 * taking into account the current character set of the connection.
 	 *
-	 * @param string The unescaped string.
 	 * @param resource $connection = null The connection to use (null to use $db_connection).
+	 * @param string The unescaped string.
 	 * @return string The escaped string.
 	 */
 	public function escape_string(string $string, $connection = null);
@@ -210,7 +210,6 @@ public function ping($connection = null);
 	 * id_member, log_time, ip, url, message, session, error_type, file, line, backtrace
 	 *
 	 * @param array Information about the error.
-	 * @return void
 	 */
 	public function error_insert($error_array);
 
@@ -220,7 +219,7 @@ public function error_insert($error_array);
 	 *
 	 * @param string $field name
 	 * @param array $array_values Field values sequenced in array via order priority. Must cast to int.
-	 * @param boolean $desc default false
+	 * @param bool $desc default false
 	 * @return string case field when ... then ... end
 	 */
 	public function custom_order($field, $array_values, $desc = false);
@@ -228,14 +227,14 @@ public function custom_order($field, $array_values, $desc = false);
 	/**
 	 * Function which return the information if the database supports native replace inserts
 	 *
-	 * @return boolean true or false
+	 * @return bool true or false
 	 */
 	public function native_replace();
 
 	/**
 	 * Function which return the information if the database supports cte with recursive
 	 *
-	 * @return boolean true or false
+	 * @return bool true or false
 	 */
 	public function cte_support();
 
@@ -287,8 +286,8 @@ public function table_sql($tableName);
 	 * This function lists all tables in the database.
 	 * The listing could be filtered according to $filter.
 	 *
-	 * @param string|boolean $db string The database name or false to use the current DB
-	 * @param string|boolean $filter String to filter by or false to list all tables
+	 * @param string|bool $db string The database name or false to use the current DB
+	 * @param string|bool $filter String to filter by or false to list all tables
 	 * @return array An array of table names
 	 */
 	public function list_tables($db = false, $filter = false);
@@ -310,7 +309,7 @@ public function get_vendor();
 	/**
 	 * Figures out if persistent connection is allowed
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	public function allow_persistent();
 
@@ -327,13 +326,13 @@ public function allow_persistent();
 	 * @param resource $connection The current DB connection resource
 	 * @return resource The query result resource from $this->query()
 	 */
-	public function search_query($identifier, $db_string, $db_values = array(), $connection = null);
+	public function search_query($identifier, $db_string, $db_values = [], $connection = null);
 
 	/**
 	 * This function will tell you whether this database type supports this search type.
 	 *
 	 * @param string $search_type The search type.
-	 * @return boolean Whether or not the specified search type is supported by this db system
+	 * @return bool Whether or not the specified search type is supported by this db system
 	 */
 	public function search_support($search_type);
 
@@ -363,9 +362,9 @@ public function search_language();
 	 * @param array $parameters Not used?
 	 * @param string $if_exists What to do if the column exists. If 'update', column is updated.
 	 * @param string $error
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
-	public function add_column($table_name, $column_info, $parameters = array(), $if_exists = 'update', $error = 'fatal');
+	public function add_column($table_name, $column_info, $parameters = [], $if_exists = 'update', $error = 'fatal');
 
 	/**
 	 * Add an index.
@@ -375,16 +374,16 @@ public function add_column($table_name, $column_info, $parameters = array(), $if
 	 * @param array $parameters Not used?
 	 * @param string $if_exists What to do if the index exists. If 'update', the definition will be updated.
 	 * @param string $error
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
-	public function add_index($table_name, $index_info, $parameters = array(), $if_exists = 'update', $error = 'fatal');
+	public function add_index($table_name, $index_info, $parameters = [], $if_exists = 'update', $error = 'fatal');
 
 	/**
 	 * Get the schema formatted name for a type.
 	 *
 	 * @param string $type_name The data type (int, varchar, smallint, etc.)
 	 * @param int $type_size The size (8, 255, etc.)
-	 * @param boolean $reverse
+	 * @param bool $reverse
 	 * @return array An array containing the appropriate type and size for this DB type
 	 */
 	public function calculate_type($type_name, $type_size = null, $reverse = false);
@@ -432,9 +431,9 @@ public function change_column($table_name, $old_column, $column_info);
 	 * @param array $parameters Extra parameters. Currently only 'engine', the desired MySQL storage engine, is used.
 	 * @param string $if_exists What to do if the table exists.
 	 * @param string $error
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
-	public function create_table($table_name, $columns, $indexes = array(), $parameters = array(), $if_exists = 'ignore', $error = 'fatal');
+	public function create_table($table_name, $columns, $indexes = [], $parameters = [], $if_exists = 'ignore', $error = 'fatal');
 
 	/**
 	 * Drop a table.
@@ -442,9 +441,9 @@ public function create_table($table_name, $columns, $indexes = array(), $paramet
 	 * @param string $table_name The name of the table to drop
 	 * @param array $parameters Not used at the moment
 	 * @param string $error
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
-	public function drop_table($table_name, $parameters = array(), $error = 'fatal');
+	public function drop_table($table_name, $parameters = [], $error = 'fatal');
 
 	/**
 	 * Get table structure.
@@ -462,7 +461,7 @@ public function table_structure($table_name);
 	 * @param array $parameters Not used?
 	 * @return array An array of column names or detailed column info, depending on $detail
 	 */
-	public function list_columns($table_name, $detail = false, $parameters = array());
+	public function list_columns($table_name, $detail = false, $parameters = []);
 
 	/**
 	 * Get index information.
@@ -472,7 +471,7 @@ public function list_columns($table_name, $detail = false, $parameters = array()
 	 * @param array $parameters Not used?
 	 * @return array An array of index names or a detailed array of index info, depending on $detail
 	 */
-	public function list_indexes($table_name, $detail = false, $parameters = array());
+	public function list_indexes($table_name, $detail = false, $parameters = []);
 
 	/**
 	 * Removes a column.
@@ -481,9 +480,9 @@ public function list_indexes($table_name, $detail = false, $parameters = array()
 	 * @param string $column_name The name of the column to drop
 	 * @param array $parameters Not used?
 	 * @param string $error
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
-	public function remove_column($table_name, $column_name, $parameters = array(), $error = 'fatal');
+	public function remove_column($table_name, $column_name, $parameters = [], $error = 'fatal');
 
 	/**
 	 * Remove an index.
@@ -492,9 +491,9 @@ public function remove_column($table_name, $column_name, $parameters = array(),
 	 * @param string $index_name The name of the index to remove
 	 * @param array $parameters Not used?
 	 * @param string $error
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
-	public function remove_index($table_name, $index_name, $parameters = array(), $error = 'fatal');
+	public function remove_index($table_name, $index_name, $parameters = [], $error = 'fatal');
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Db/index.php b/Sources/Db/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Db/index.php
+++ b/Sources/Db/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Draft.php b/Sources/Draft.php
index 1d2db5edb1..086ded7397 100644
--- a/Sources/Draft.php
+++ b/Sources/Draft.php
@@ -30,14 +30,13 @@ class Draft
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'save' => 'SaveDraft',
+	private static $backcompat = [
+		'func_names' => [
 			'delete' => 'DeleteDraft',
 			'showInEditor' => 'ShowDrafts',
 			'showInProfile' => 'showProfileDrafts',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -147,10 +146,10 @@ class Draft
 	 * Intended recipients for this draft.
 	 * Only applies to personal message drafts.
 	 */
-	public array $recipients = array(
-		'to' => array(),
-		'bcc' => array(),
-	);
+	public array $recipients = [
+		'to' => [],
+		'bcc' => [],
+	];
 
 	/*********************
 	 * Internal properties
@@ -181,27 +180,21 @@ class Draft
 	 * @param bool $check Validate that this draft belongs to the current user.
 	 * @param array $recipientList Only used by the DraftPM class.
 	 */
-	public function __construct(int $id_draft = 0, bool $check = true, array $recipientList = array())
+	public function __construct(int $id_draft = 0, bool $check = true, array $recipientList = [])
 	{
 		$this->id = $id_draft;
 
 		// Load any existing data for this draft.
-		if (!empty($this->id))
-		{
+		if (!empty($this->id)) {
 			$draft_info = self::read($check);
 
 			// Requested a draft that doesn't exist or belongs to someone else.
-			if (empty($draft_info['id_draft']))
-			{
+			if (empty($draft_info['id_draft'])) {
 				$this->id = 0;
-			}
-			else
-			{
+			} else {
 				// Set the properties according to the existing data.
-				foreach ($draft_info as $key => $value)
-				{
-					switch ($key)
-					{
+				foreach ($draft_info as $key => $value) {
+					switch ($key) {
 						case 'id_draft':
 							$this->id = $value;
 							break;
@@ -219,8 +212,8 @@ public function __construct(int $id_draft = 0, bool $check = true, array $recipi
 
 						case 'to_list':
 							$recipientsList = Utils::jsonDecode($draft_info['to_list'], true);
-							$this->recipients['to'] = $recipientsList['to'] ?? array();
-							$this->recipients['bcc'] = $recipientsList['bcc'] ?? array();
+							$this->recipients['to'] = $recipientsList['to'] ?? [];
+							$this->recipients['bcc'] = $recipientsList['bcc'] ?? [];
 							break;
 
 						default:
@@ -232,15 +225,12 @@ public function __construct(int $id_draft = 0, bool $check = true, array $recipi
 		}
 
 		// Determine who this is being sent to.
-		if (isset($_REQUEST['xml']))
-		{
-			$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : array();
-			$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : array();
-		}
-		elseif (!empty($recipientList))
-		{
-			$recipientList['to'] = $recipientList['to'] ?? array();
-			$recipientList['bcc'] = $recipientList['bcc'] ?? array();
+		if (isset($_REQUEST['xml'])) {
+			$recipientList['to'] = isset($_POST['recipient_to']) ? explode(',', $_POST['recipient_to']) : [];
+			$recipientList['bcc'] = isset($_POST['recipient_bcc']) ? explode(',', $_POST['recipient_bcc']) : [];
+		} elseif (!empty($recipientList)) {
+			$recipientList['to'] = $recipientList['to'] ?? [];
+			$recipientList['bcc'] = $recipientList['bcc'] ?? [];
 		}
 
 		$this->setProperties($recipientList);
@@ -249,7 +239,6 @@ public function __construct(int $id_draft = 0, bool $check = true, array $recipi
 	/**
 	 * Prepares the draft data for use in the editor.
 	 *
-	 * @return void
 	 */
 	public function prepare(): void
 	{
@@ -279,20 +268,22 @@ public function prepare(): void
 	public function save(&$post_errors): bool
 	{
 		// can you be, should you be ... here?
-		if (empty(Config::$modSettings[$this->enabled_setting]) || !User::$me->allowedTo($this->permission) || !isset($_POST['save_draft']))
+		if (empty(Config::$modSettings[$this->enabled_setting]) || !User::$me->allowedTo($this->permission) || !isset($_POST['save_draft'])) {
 			return false;
+		}
 
-		if (in_array('session_timeout', $post_errors))
+		if (in_array('session_timeout', $post_errors)) {
 			return false;
+		}
 
 		// A draft has been saved less than 5 seconds ago, let's not do the autosave again.
-		if (isset($_REQUEST['xml']) && !empty($this->poster_time) && time() < $this->poster_time + 5)
-		{
+		if (isset($_REQUEST['xml']) && !empty($this->poster_time) && time() < $this->poster_time + 5) {
 			Utils::$context['draft_saved_on'] = $this->poster_time;
 
 			// Since we were called from the autosave function, send something back.
-			if (!empty($this->id))
+			if (!empty($this->id)) {
 				self::xml($this->id);
+			}
 
 			return true;
 		}
@@ -300,12 +291,12 @@ public function save(&$post_errors): bool
 		// Update the database entry.
 		$saved = $this->saveToDatabase();
 
-		if (!$saved)
+		if (!$saved) {
 			$post_errors[] = 'draft_not_saved';
+		}
 
 		// If we were called from the autosave function, send something back.
-		if (!empty($this->id) && isset($_REQUEST['xml']))
-		{
+		if (!empty($this->id) && isset($_REQUEST['xml'])) {
 			Utils::$context['draft_saved_on'] = time();
 			self::xml($this->id);
 		}
@@ -330,17 +321,19 @@ public static function delete(int|array $drafts, bool $check = true): bool
 	{
 		$drafts = (array) $drafts;
 
-		if (empty($drafts) || ($check && empty(User::$me->id)))
+		if (empty($drafts) || ($check && empty(User::$me->id))) {
 			return false;
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_drafts
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_drafts
 			WHERE id_draft IN ({array_int:drafts})' . ($check ? '
 				AND id_member = {int:id_member}' : ''),
-			array(
+			[
 				'drafts' => $drafts,
 				'id_member' => empty(User::$me->id) ? -1 : User::$me->id,
-			)
+			],
 		);
 
 		return true;
@@ -358,43 +351,45 @@ public static function delete(int|array $drafts, bool $check = true): bool
 	public static function showInEditor(int $member_id, int $topic = 0): bool
 	{
 		// Permissions
-		if (empty(Utils::$context['drafts_save']) || empty($member_id))
+		if (empty(Utils::$context['drafts_save']) || empty($member_id)) {
 			return false;
+		}
 
 		Lang::load('Drafts');
 
-		Utils::$context['drafts'] = array();
+		Utils::$context['drafts'] = [];
 
 		// Load the drafts this user has available.
-		$request = Db::$db->query('', '
-			SELECT subject, poster_time, id_board, id_topic, id_draft
+		$request = Db::$db->query(
+			'',
+			'SELECT subject, poster_time, id_board, id_topic, id_draft
 			FROM {db_prefix}user_drafts
 			WHERE id_member = {int:id_member}' . (!empty($topic) ? '
 				AND id_topic = {int:id_topic}' : '') . '
 				AND type = {int:draft_type}' . (!empty(Config::$modSettings['drafts_keep_days']) ? '
 				AND poster_time > {int:time}' : '') . '
 			ORDER BY poster_time DESC',
-			array(
+			[
 				'id_member' => $member_id,
 				'id_topic' => $topic,
 				'draft_type' => 0,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
-			)
+			],
 		);
 
 		// Add them to the drafts array for display.
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (empty($row['subject']))
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (empty($row['subject'])) {
 				$row['subject'] = Lang::$txt['no_subject'];
+			}
 
 			$tmp_subject = Utils::shorten(stripslashes($row['subject']), 24);
 
-			Utils::$context['drafts'][] = array(
+			Utils::$context['drafts'][] = [
 				'subject' => Lang::censorText($tmp_subject),
 				'poster_time' => Time::create('@' . $row['poster_time'])->format(),
 				'link' => '<a href="' . Config::$scripturl . '?action=post;board=' . $row['id_board'] . ';' . (!empty($row['id_topic']) ? 'topic=' . $row['id_topic'] . '.0;' : '') . 'id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -408,7 +403,6 @@ public static function showInEditor(int $member_id, int $topic = 0): bool
 	 * The UI allows for deleting and loading/editing of drafts.
 	 *
 	 * @param int $memID ID of the user whose drafts should be loaded.
-	 * @return void
 	 */
 	public static function showInProfile(int $memID): void
 	{
@@ -419,46 +413,48 @@ public static function showInProfile(int $memID): void
 		Utils::$context['current_member'] = $memID;
 
 		// If just deleting a draft, do it and then redirect back.
-		if (!empty($_REQUEST['delete']))
-		{
+		if (!empty($_REQUEST['delete'])) {
 			User::$me->checkSession('get');
 			$id_delete = (int) $_REQUEST['delete'];
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}user_drafts
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}user_drafts
 				WHERE id_draft = {int:id_draft}
 					AND id_member = {int:id_member}
 					AND type = {int:draft_type}',
-				array(
+				[
 					'id_draft' => $id_delete,
 					'id_member' => $memID,
 					'draft_type' => 0,
-				)
+				],
 			);
 
 			Utils::redirectexit('action=profile;u=' . $memID . ';area=showdrafts;start=' . Utils::$context['start']);
 		}
 
 		// Default to 10.
-		if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
+		if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
 			$_REQUEST['viewscount'] = 10;
+		}
 
 		// Get the count of applicable drafts on the boards they can (still) see ...
 		// @todo .. should we just let them see their drafts even if they have lost board access ?
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}user_drafts AS ud
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = ud.id_board AND {query_see_board})
 			WHERE id_member = {int:id_member}
 				AND type={int:draft_type}' . (!empty(Config::$modSettings['drafts_keep_days']) ? '
 				AND poster_time > {int:time}' : ''),
-			array(
+			[
 				'id_member' => $memID,
 				'draft_type' => 0,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
-			)
+			],
 		);
-		list ($msgCount) = Db::$db->fetch_row($request);
+		list($msgCount) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		$maxPerPage = empty(Config::$modSettings['disableCustomPerPage']) && !empty(Theme::$current->options['messages_per_page']) ? Theme::$current->options['messages_per_page'] : Config::$modSettings['defaultMaxMessages'];
@@ -471,8 +467,8 @@ public static function showInProfile(int $memID): void
 		// Reverse the query if we're past 50% of the pages for better performance.
 		$start = Utils::$context['start'];
 		$reverse = $_REQUEST['start'] > $msgCount / 2;
-		if ($reverse)
-		{
+
+		if ($reverse) {
 			$maxIndex = $msgCount < Utils::$context['start'] + $maxPerPage + 1 && $msgCount > Utils::$context['start'] ? $msgCount - Utils::$context['start'] : $maxPerPage;
 			$start = $msgCount < Utils::$context['start'] + $maxPerPage + 1 || $msgCount < Utils::$context['start'] + $maxPerPage ? 0 : $msgCount - Utils::$context['start'] - $maxPerPage;
 		}
@@ -480,8 +476,9 @@ public static function showInProfile(int $memID): void
 		// Find this user's drafts for the boards they can access
 		// @todo ... do we want to do this?  If they were able to create a draft, do we remove their access to said draft if they loose
 		//           access to the board or if the topic moves to a board they can not see?
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				b.id_board, b.name AS bname,
 				ud.id_member, ud.id_draft, ud.body, ud.smileys_enabled, ud.subject, ud.poster_time, ud.icon, ud.id_topic, ud.locked, ud.is_sticky
 			FROM {db_prefix}user_drafts AS ud
@@ -491,27 +488,30 @@ public static function showInProfile(int $memID): void
 				AND poster_time > {int:time}' : '') . '
 			ORDER BY ud.id_draft ' . ($reverse ? 'ASC' : 'DESC') . '
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'current_member' => $memID,
 				'draft_type' => 0,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
 				'start' => $start,
 				'max' => $maxIndex,
-			)
+			],
 		);
 
 		// Start counting at the number of the first message displayed.
 		$counter = $reverse ? Utils::$context['start'] + $maxIndex + 1 : Utils::$context['start'];
-		Utils::$context['posts'] = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		Utils::$context['posts'] = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Censor....
-			if (empty($row['body']))
+			if (empty($row['body'])) {
 				$row['body'] = '';
+			}
 
 			$row['subject'] = Utils::htmlTrim($row['subject']);
-			if (empty($row['subject']))
+
+			if (empty($row['subject'])) {
 				$row['subject'] = Lang::$txt['no_subject'];
+			}
 
 			Lang::censorText($row['body']);
 			Lang::censorText($row['subject']);
@@ -520,17 +520,17 @@ public static function showInProfile(int $memID): void
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], 'draft' . $row['id_draft']);
 
 			// And the array...
-			Utils::$context['drafts'][$counter += $reverse ? -1 : 1] = array(
+			Utils::$context['drafts'][$counter += $reverse ? -1 : 1] = [
 				'body' => $row['body'],
 				'counter' => $counter,
-				'board' => array(
+				'board' => [
 					'name' => $row['bname'],
-					'id' => $row['id_board']
-				),
-				'topic' => array(
+					'id' => $row['id_board'],
+				],
+				'topic' => [
 					'id' => $row['id_topic'],
 					'link' => empty($row['id']) ? $row['subject'] : '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>',
-				),
+				],
 				'subject' => $row['subject'],
 				'time' => Time::create('@' . $row['poster_time'])->format(),
 				'timestamp' => $row['poster_time'],
@@ -538,34 +538,35 @@ public static function showInProfile(int $memID): void
 				'id_draft' => $row['id_draft'],
 				'locked' => $row['locked'],
 				'sticky' => $row['is_sticky'],
-				'quickbuttons' => array(
-					'edit' => array(
+				'quickbuttons' => [
+					'edit' => [
 						'label' => Lang::$txt['draft_edit'],
-						'href' => Config::$scripturl.'?action=post;'.(empty($row['id_topic']) ? 'board='.$row['id_board'] : 'topic='.$row['id_topic']).'.0;id_draft='.$row['id_draft'],
-						'icon' => 'modify_button'
-					),
-					'delete' => array(
+						'href' => Config::$scripturl . '?action=post;' . (empty($row['id_topic']) ? 'board=' . $row['id_board'] : 'topic=' . $row['id_topic']) . '.0;id_draft=' . $row['id_draft'],
+						'icon' => 'modify_button',
+					],
+					'delete' => [
 						'label' => Lang::$txt['draft_delete'],
-						'href' => Config::$scripturl.'?action=profile;u='.Utils::$context['member']['id'].';area=showdrafts;delete='.$row['id_draft'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'],
-						'javascript' => 'data-confirm="'.Lang::$txt['draft_remove'].'"',
+						'href' => Config::$scripturl . '?action=profile;u=' . Utils::$context['member']['id'] . ';area=showdrafts;delete=' . $row['id_draft'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
+						'javascript' => 'data-confirm="' . Lang::$txt['draft_remove'] . '"',
 						'class' => 'you_sure',
-						'icon' => 'remove_button'
-					),
-				),
-			);
+						'icon' => 'remove_button',
+					],
+				],
+			];
 		}
 		Db::$db->free_result($request);
 
 		// If the drafts were retrieved in reverse order, get them right again.
-		if ($reverse)
+		if ($reverse) {
 			Utils::$context['drafts'] = array_reverse(Utils::$context['drafts'], true);
+		}
 
 		// Menu tab
-		Menu::$loaded['profile']->tab_data = array(
+		Menu::$loaded['profile']->tab_data = [
 			'title' => Lang::$txt['drafts_show'],
 			'description' => Lang::$txt['drafts_show_desc'],
-			'icon_class' => 'main_icons drafts'
-		);
+			'icon_class' => 'main_icons drafts',
+		];
 		Utils::$context['sub_template'] = 'showDrafts';
 	}
 
@@ -578,41 +579,41 @@ public static function showInProfile(int $memID): void
 	 *
 	 * Optionally validates that this draft belongs to the current user.
 	 *
-	 * @param boolean $check Validate that this draft belongs to this user.
+	 * @param bool $check Validate that this draft belongs to this user.
 	 *     Default: true.
 	 * @return array Data about the draft. Empty if draft was not found.
 	 */
 	protected function read($check = true): array
 	{
 		// Nothing to read, nothing to do.
-		if (empty($this->id))
-			return array();
+		if (empty($this->id)) {
+			return [];
+		}
 
 		// Fetch this draft's info from the database.
-		$request = Db::$db->query('', '
-			SELECT *
+		$request = Db::$db->query(
+			'',
+			'SELECT *
 			FROM {db_prefix}user_drafts
 			WHERE id_draft = {int:id_draft}' . ($check ? '
 				AND id_member = {int:id_member}' : '') . '
 				AND type = {int:type}' . (!empty(Config::$modSettings['drafts_keep_days']) ? '
 				AND poster_time > {int:time}' : '') . '
 			LIMIT 1',
-			array(
+			[
 				'id_member' => User::$me->id,
 				'id_draft' => $this->id,
 				'type' => $this->type,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
-			)
+			],
 		);
 
 		// No results?
-		if (empty(Db::$db->num_rows($request)))
-		{
-			$draft_info = array();
+		if (empty(Db::$db->num_rows($request))) {
+			$draft_info = [];
 		}
 		// Retrieve the data.
-		else
-		{
+		else {
 			$draft_info = Db::$db->fetch_assoc($request);
 		}
 
@@ -626,54 +627,65 @@ protected function read($check = true): array
 	 *
 	 * @param array $recipientList ID numbers of members the PM will be sent to,
 	 *     grouped into 'to' and 'bcc' sub-arrays. Only applies to PM drafts.
-	 * @return void
 	 */
-	protected function setProperties(array $recipientList = array()): void
+	protected function setProperties(array $recipientList = []): void
 	{
-		if (!isset($_POST['message']) && isset($_POST['quickReply']))
+		if (!isset($_POST['message']) && isset($_POST['quickReply'])) {
 			$_POST['message'] = $_POST['quickReply'];
+		}
 
-		if (isset($_POST['message']))
-		{
+		if (isset($_POST['message'])) {
 			$body = Utils::htmlspecialchars($_POST['message'], ENT_QUOTES);
 			Msg::preparsecode($body);
 		}
 
-		if (isset($body))
+		if (isset($body)) {
 			$this->body = $body;
+		}
 
-		if (isset($_POST['subject']))
+		if (isset($_POST['subject'])) {
 			$this->subject = Utils::entitySubstr(trim(preg_replace('/(\pZ|&nbsp;)+/u', ' ', Utils::htmlspecialchars($_POST['subject']))), 0, 100);
+		}
 
-		if (empty($this->member))
+		if (empty($this->member)) {
 			$this->member = User::$me->id;
+		}
 
-		if (isset($_POST['ns']))
+		if (isset($_POST['ns'])) {
 			$this->smileys_enabled = !empty($_POST['ns']);
+		}
 
-		if (isset($_POST['sticky']))
+		if (isset($_POST['sticky'])) {
 			$this->sticky = !empty($_POST['sticky']);
+		}
 
-		if (isset($_POST['lock']))
+		if (isset($_POST['lock'])) {
 			$this->locked = !empty($_POST['lock']);
+		}
 
-		if (!empty($_POST['icon']) && preg_match('/^\w+$/', $_POST['icon']))
+		if (!empty($_POST['icon']) && preg_match('/^\w+$/', $_POST['icon'])) {
 			$this->icon = $_POST['icon'];
+		}
 
-		if (!empty($_REQUEST['topic']))
+		if (!empty($_REQUEST['topic'])) {
 			$this->topic = (int) $_REQUEST['topic'];
+		}
 
-		if (empty($this->board))
+		if (empty($this->board)) {
 			$this->board = Board::$info->id ?? 0;
+		}
 
-		if (!empty($_POST['replied_to']))
+		if (!empty($_POST['replied_to'])) {
 			$this->reply_to = (int) $_POST['replied_to'];
+		}
 
-		if (!empty($recipientList['to']))
+		if (!empty($recipientList['to'])) {
 			$this->recipients['to'] = (array) $recipientList['to'];
+		}
 
-		if (!empty($recipientList['bcc']))
+		if (!empty($recipientList['bcc'])) {
 			$this->recipients['bcc'] = (array) $recipientList['bcc'];
+		}
 
 		// These arrays should contain only integers.
 		$this->recipients['to'] = array_map('intval', $this->recipients['to']);
@@ -688,10 +700,10 @@ protected function setProperties(array $recipientList = array()): void
 	protected function saveToDatabase(): bool
 	{
 		// Updating an existing draft.
-		if (!empty($this->id))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}user_drafts
+		if (!empty($this->id)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}user_drafts
 				SET
 					id_topic = {int:id_topic},
 					id_board = {int:id_board},
@@ -706,7 +718,7 @@ protected function saveToDatabase(): bool
 					is_sticky = {int:sticky},
 					to_list = {string:to_list}
 				WHERE id_draft = {int:id_draft}',
-				array(
+				[
 					'id_draft' => $this->id,
 					'id_topic' => $this->topic,
 					'id_board' => $this->board,
@@ -720,7 +732,7 @@ protected function saveToDatabase(): bool
 					'locked' => (int) $this->locked,
 					'sticky' => (int) $this->sticky,
 					'to_list' => Utils::jsonEncode($this->recipients),
-				)
+				],
 			);
 
 			$this->poster_time = time();
@@ -730,11 +742,11 @@ protected function saveToDatabase(): bool
 			Utils::$context['id' . ($this->type === 1 ? '_pm' : '') . '_draft'] = $this->id;
 		}
 		// Otherwise, creating a new draft.
-		else
-		{
-			$this->id = Db::$db->insert('',
+		else {
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}user_drafts',
-				array(
+				[
 					'id_topic' => 'int',
 					'id_board' => 'int',
 					'id_reply' => 'int',
@@ -748,8 +760,8 @@ protected function saveToDatabase(): bool
 					'locked' => 'int',
 					'is_sticky' => 'int',
 					'to_list' => 'string-255',
-				),
-				array(
+				],
+				[
 					$this->topic,
 					$this->board,
 					$this->reply_to,
@@ -763,22 +775,21 @@ protected function saveToDatabase(): bool
 					(int) $this->locked,
 					(int) $this->sticky,
 					Utils::jsonEncode($this->recipients),
-				),
-				array(
-					'id_draft'
-				),
-				1
+				],
+				[
+					'id_draft',
+				],
+				1,
 			);
 
 			// Did everything go as expected?
-			if (!empty($this->id))
-			{
+			if (!empty($this->id)) {
 				$this->poster_time = time();
 				Utils::$context['draft_saved'] = true;
 				Utils::$context['id' . ($this->type === 1 ? '_pm' : '') . '_draft'] = $this->id;
-			}
-			else
+			} else {
 				Utils::$context['draft_saved'] = false;
+			}
 		}
 
 		// Cleanup
@@ -793,7 +804,6 @@ protected function saveToDatabase(): bool
 	 * Provides the ID of the draft saved and the time it was saved.
 	 *
 	 * @param int $id_draft
-	 * @return void
 	 */
 	protected static function xml(int $id_draft): void
 	{
@@ -811,7 +821,8 @@ protected static function xml(int $id_draft): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Draft::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Draft::exportStatic')) {
 	Draft::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/DynamicPropertyHelper.php b/Sources/DynamicPropertyHelper.php
index 80789e7ce4..0246202d20 100644
--- a/Sources/DynamicPropertyHelper.php
+++ b/Sources/DynamicPropertyHelper.php
@@ -88,7 +88,7 @@ trait DynamicPropertyHelper
 	 *
 	 * Arbitrary custom data about this object.
 	 */
-	protected array $custom = array();
+	protected array $custom = [];
 
 	/****************
 	 * Public methods
@@ -99,11 +99,12 @@ trait DynamicPropertyHelper
 	 *
 	 * @param array $props Array of properties to set.
 	 */
-	public function set(array $props = array()): void
+	public function set(array $props = []): void
 	{
 		// The magic method already has robust logic for this job, so use that.
-		foreach ($props as $prop => $value)
+		foreach ($props as $prop => $value) {
 			$this->__set($prop, $value);
+		}
 	}
 
 	/**
@@ -159,48 +160,38 @@ public function __unset(string $prop): void
 	 */
 	protected function customPropertySet(mixed $prop, mixed $value): void
 	{
-		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases))
-		{
+		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases)) {
 			// Can't unset a virtual property.
-			if (is_null($value))
+			if (is_null($value)) {
 				return;
+			}
 
 			$real_prop = $this->prop_aliases[$prop];
 
 			// Callable properties can't be set.
-			if (is_callable($real_prop))
+			if (is_callable($real_prop)) {
 				return;
+			}
 
-			if (strpos($real_prop, '!') === 0)
-			{
+			if (strpos($real_prop, '!') === 0) {
 				$real_prop = ltrim($real_prop, '!');
 				$value = !$value;
 			}
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
-				if (is_object($this->{$real_prop[0]}))
-				{
+				if (is_object($this->{$real_prop[0]})) {
 					$this->{$real_prop[0]}->{$real_prop[1]} = $value;
-				}
-				else
-				{
+				} else {
 					$this->{$real_prop[0]}[$real_prop[1]] = $value;
 				}
-			}
-			else
-			{
+			} else {
 				$this->{$real_prop} = $value;
 			}
-		}
-		elseif (property_exists($this, $prop))
-		{
+		} elseif (property_exists($this, $prop)) {
 			$this->{$prop} = $value;
-		}
-		else
-		{
+		} else {
 			$this->custom[$prop] = $value;
 		}
 	}
@@ -212,45 +203,38 @@ protected function customPropertySet(mixed $prop, mixed $value): void
 	 */
 	protected function customPropertyGet(mixed $prop): mixed
 	{
-		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases))
-		{
+		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases)) {
 			$real_prop = $this->prop_aliases[$prop];
 
 			// Callable properties are calculated dynamically.
-			if (is_callable($real_prop))
+			if (is_callable($real_prop)) {
 				return call_user_func($real_prop, $this);
+			}
 
-			if (($not = strpos($real_prop, '!') === 0))
+			if (($not = strpos($real_prop, '!') === 0)) {
 				$real_prop = ltrim($real_prop, '!');
+			}
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
-				if (is_object($this->{$real_prop[0]}))
-				{
+				if (is_object($this->{$real_prop[0]})) {
 					$value = $this->{$real_prop[0]}->{$real_prop[1]};
-				}
-				else
-				{
+				} else {
 					$value = $this->{$real_prop[0]}[$real_prop[1]];
 				}
-			}
-			else
-			{
+			} else {
 				$value = $this->{$real_prop};
 			}
 
 			return $not ? !$value : $value;
 		}
-		elseif (property_exists($this, $prop))
-		{
+
+		if (property_exists($this, $prop)) {
 			return $this->{$prop} ?? null;
 		}
-		else
-		{
-			return $this->custom[$prop] ?? null;
-		}
+
+		return $this->custom[$prop] ?? null;
 	}
 
 	/**
@@ -260,40 +244,32 @@ protected function customPropertyGet(mixed $prop): mixed
 	 */
 	protected function customPropertyIsset(mixed $prop): bool
 	{
-		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases))
-		{
+		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases)) {
 			$real_prop = ltrim($this->prop_aliases[$prop], '!');
 
 			// A callable property is set if it returns a non-null value.
-			if (is_callable($real_prop))
+			if (is_callable($real_prop)) {
 				return call_user_func($real_prop, $this) !== null;
+			}
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
-				if (is_object($this->{$real_prop[0]}))
-				{
+				if (is_object($this->{$real_prop[0]})) {
 					return isset($this->{$real_prop[0]}->{$real_prop[1]});
 				}
-				else
-				{
-					return isset($this->{$real_prop[0]}[$real_prop[1]]);
-				}
-			}
-			else
-			{
-				return isset($this->{$real_prop});
+
+				return isset($this->{$real_prop[0]}[$real_prop[1]]);
 			}
+
+			return isset($this->{$real_prop});
 		}
-		elseif (property_exists($this, $prop))
-		{
+
+		if (property_exists($this, $prop)) {
 			return isset($this->{$prop});
 		}
-		else
-		{
-			return isset($this->custom[$prop]);
-		}
+
+		return isset($this->custom[$prop]);
 	}
 
 	/**
@@ -303,17 +279,14 @@ protected function customPropertyIsset(mixed $prop): bool
 	 */
 	protected function customPropertyUnset(mixed $prop): void
 	{
-		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases))
-		{
+		if (!empty($this->prop_aliases) && array_key_exists($prop, $this->prop_aliases)) {
 			// Can't unset a virtual property.
 			return;
 		}
-		elseif (property_exists($this, $prop))
-		{
+
+		if (property_exists($this, $prop)) {
 			unset($this->{$prop});
-		}
-		else
-		{
+		} else {
 			unset($this->custom[$prop]);
 		}
 	}
diff --git a/Sources/Editor.php b/Sources/Editor.php
index 576f6b7518..c79597ac95 100644
--- a/Sources/Editor.php
+++ b/Sources/Editor.php
@@ -21,25 +21,27 @@
  */
 class Editor implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'create_control_richedit',
-		),
-	);
+			'getMessageIcons' => 'getMessageIcons',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const PREVIEW_HTML = 1;
-	const PREVIEW_XML = 2;
+	public const PREVIEW_HTML = 1;
+	public const PREVIEW_XML = 2;
 
 	/*******************
 	 * Public properties
@@ -143,7 +145,7 @@ class Editor implements \ArrayAccess
 	 *
 	 * Options to pass to SCEditor.
 	 */
-	public array $sce_options = array();
+	public array $sce_options = [];
 
 	/**************************
 	 * Public static properties
@@ -154,28 +156,28 @@ class Editor implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	public static array $bbc_tags = array();
+	public static array $bbc_tags = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	public static array $disabled_tags = array();
+	public static array $disabled_tags = [];
 
 	/**
 	 * @var array
 	 *
 	 *
 	 */
-	public static array $bbc_toolbar = array();
+	public static array $bbc_toolbar = [];
 
 	/**
 	 * @var string
@@ -189,10 +191,10 @@ class Editor implements \ArrayAccess
 	 *
 	 *
 	 */
-	public static array $smileys_toolbar = array(
-		'postform' => array(),
-		'popup' => array(),
-	);
+	public static array $smileys_toolbar = [
+		'postform' => [],
+		'popup' => [],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -203,9 +205,9 @@ class Editor implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'rich_value' => 'value',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -224,13 +226,13 @@ public function __construct(array $options)
 		// Every control must have a ID!
 		$this->id = (string) ($options['id'] ?? 'message');
 
-		$this->value = strtr((string) ($options['value'] ?? ''), array(
+		$this->value = strtr((string) ($options['value'] ?? ''), [
 			// Tabs are not shown in SCEditor; replace with spaces.
 			"\t" => '    ',
 			// The [#] item code for creating list items causes issues with
 			// SCEditor, but [+] is a safe equivalent.
 			'[#]' => '[+]',
-		));
+		]);
 
 		$this->disable_smiley_box = !empty($options['disable_smiley_box']);
 		$this->columns = (int) ($options['columns'] ?? 60);
@@ -239,7 +241,7 @@ public function __construct(array $options)
 		$this->height = (string) ($options['height'] ?? '175px');
 		$this->form = (string) ($options['form'] ?? 'postmodify');
 		$this->preview_type = (int) ($options['preview_type'] ?? self::PREVIEW_HTML);
-		$this->labels = (array) ($options['labels'] ?? array());
+		$this->labels = (array) ($options['labels'] ?? []);
 		$this->required = !empty($options['required']);
 
 		$this->locale = !empty(Lang::$txt['lang_dictionary']) && Lang::$txt['lang_dictionary'] != 'en' ? Lang::$txt['lang_dictionary'] : '';
@@ -286,59 +288,56 @@ public static function load(array $options): object
 	 */
 	public static function getMessageIcons(int $board_id): array
 	{
-		if (empty(Config::$modSettings['messageIcons_enable']))
-		{
+		if (empty(Config::$modSettings['messageIcons_enable'])) {
 			Lang::load('Post');
 
-			$icons = array(
-				array('value' => 'xx', 'name' => Lang::$txt['standard']),
-				array('value' => 'thumbup', 'name' => Lang::$txt['thumbs_up']),
-				array('value' => 'thumbdown', 'name' => Lang::$txt['thumbs_down']),
-				array('value' => 'exclamation', 'name' => Lang::$txt['exclamation_point']),
-				array('value' => 'question', 'name' => Lang::$txt['question_mark']),
-				array('value' => 'lamp', 'name' => Lang::$txt['lamp']),
-				array('value' => 'smiley', 'name' => Lang::$txt['icon_smiley']),
-				array('value' => 'angry', 'name' => Lang::$txt['icon_angry']),
-				array('value' => 'cheesy', 'name' => Lang::$txt['icon_cheesy']),
-				array('value' => 'grin', 'name' => Lang::$txt['icon_grin']),
-				array('value' => 'sad', 'name' => Lang::$txt['icon_sad']),
-				array('value' => 'wink', 'name' => Lang::$txt['icon_wink']),
-				array('value' => 'poll', 'name' => Lang::$txt['icon_poll']),
-			);
-
-			foreach ($icons as $k => $dummy)
-			{
+			$icons = [
+				['value' => 'xx', 'name' => Lang::$txt['standard']],
+				['value' => 'thumbup', 'name' => Lang::$txt['thumbs_up']],
+				['value' => 'thumbdown', 'name' => Lang::$txt['thumbs_down']],
+				['value' => 'exclamation', 'name' => Lang::$txt['exclamation_point']],
+				['value' => 'question', 'name' => Lang::$txt['question_mark']],
+				['value' => 'lamp', 'name' => Lang::$txt['lamp']],
+				['value' => 'smiley', 'name' => Lang::$txt['icon_smiley']],
+				['value' => 'angry', 'name' => Lang::$txt['icon_angry']],
+				['value' => 'cheesy', 'name' => Lang::$txt['icon_cheesy']],
+				['value' => 'grin', 'name' => Lang::$txt['icon_grin']],
+				['value' => 'sad', 'name' => Lang::$txt['icon_sad']],
+				['value' => 'wink', 'name' => Lang::$txt['icon_wink']],
+				['value' => 'poll', 'name' => Lang::$txt['icon_poll']],
+			];
+
+			foreach ($icons as $k => $dummy) {
 				$icons[$k]['url'] = Theme::$current->settings['images_url'] . '/post/' . $dummy['value'] . '.png';
 
 				$icons[$k]['is_last'] = false;
 			}
 		}
 		// Otherwise load the icons, and check we give the right image too...
-		else
-		{
+		else {
 			$icons = CacheApi::get('posting_icons-' . $board_id, 480);
 
-			if ($icons == null)
-			{
-				$icons = array();
+			if ($icons == null) {
+				$icons = [];
 
-				$request = Db::$db->query('', '
-					SELECT title, filename
+				$request = Db::$db->query(
+					'',
+					'SELECT title, filename
 					FROM {db_prefix}message_icons
 					WHERE id_board IN (0, {int:board_id})
 					ORDER BY icon_order',
-					array(
+					[
 						'board_id' => $board_id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					$icons[$row['filename']] = array(
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					$icons[$row['filename']] = [
 						'value' => $row['filename'],
 						'name' => $row['title'],
 						'url' => Theme::$current->settings[file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $row['filename'] . '.png') ? 'images_url' : 'default_images_url'] . '/post/' . $row['filename'] . '.png',
 						'is_last' => false,
-					);
+					];
 				}
 				Db::$db->free_result($request);
 
@@ -346,7 +345,7 @@ public static function getMessageIcons(int $board_id): array
 			}
 		}
 
-		IntegrationHook::call('integrate_load_message_icons', array(&$icons));
+		IntegrationHook::call('integrate_load_message_icons', [&$icons]);
 
 		return array_values($icons);
 	}
@@ -363,8 +362,9 @@ public static function getMessageIcons(int $board_id): array
 	protected function init(): void
 	{
 		// Don't do this twice.
-		if (!empty(self::$loaded))
+		if (!empty(self::$loaded)) {
 			return;
+		}
 
 		Lang::load('Post');
 		Lang::load('Editor');
@@ -373,27 +373,26 @@ protected function init(): void
 		// Some general stuff.
 		Theme::$current->settings['smileys_url'] = Config::$modSettings['smileys_url'] . '/' . User::$me->smiley_set;
 
-		if (!empty(Utils::$context['drafts_autosave']))
-		{
+		if (!empty(Utils::$context['drafts_autosave'])) {
 			Utils::$context['drafts_autosave_frequency'] = empty(Config::$modSettings['drafts_autosave_frequency']) ? 60000 : Config::$modSettings['drafts_autosave_frequency'] * 1000;
 		}
 
 		// This really has some WYSIWYG stuff.
-		Theme::loadCSSFile('jquery.sceditor.css', array('default_theme' => true, 'validate' => true), 'smf_jquery_sceditor');
+		Theme::loadCSSFile('jquery.sceditor.css', ['default_theme' => true, 'validate' => true], 'smf_jquery_sceditor');
 
 		Theme::loadTemplate('GenericControls');
 
 		/*
 			THEME AUTHORS:
- 			If you want to change or tweak the CSS for the editor,
+			If you want to change or tweak the CSS for the editor,
 			include a file named 'jquery.sceditor.theme.css' in your theme.
 		 */
-		Theme::loadCSSFile('jquery.sceditor.theme.css', array('force_current' => true, 'validate' => true,), 'smf_jquery_sceditor_theme');
+		Theme::loadCSSFile('jquery.sceditor.theme.css', ['force_current' => true, 'validate' => true], 'smf_jquery_sceditor_theme');
 
 		// JS makes the editor go round
-		Theme::loadJavaScriptFile('editor.js', array('minimize' => true), 'smf_editor');
-		Theme::loadJavaScriptFile('jquery.sceditor.bbcode.min.js', array(), 'smf_sceditor_bbcode');
-		Theme::loadJavaScriptFile('jquery.sceditor.smf.js', array('minimize' => true), 'smf_sceditor_smf');
+		Theme::loadJavaScriptFile('editor.js', ['minimize' => true], 'smf_editor');
+		Theme::loadJavaScriptFile('jquery.sceditor.bbcode.min.js', [], 'smf_sceditor_bbcode');
+		Theme::loadJavaScriptFile('jquery.sceditor.smf.js', ['minimize' => true], 'smf_sceditor_smf');
 
 		$scExtraLangs = '
 		$.sceditor.locale["' . Lang::$txt['lang_dictionary'] . '"] = {
@@ -421,13 +420,11 @@ protected function init(): void
 
 		Utils::$context['shortcuts_text'] = Lang::$txt['shortcuts' . (!empty(Utils::$context['drafts_save']) ? '_drafts' : '') . (stripos($_SERVER['HTTP_USER_AGENT'], 'Macintosh') !== false ? '_mac' : (BrowserDetector::isBrowser('is_firefox') ? '_firefox' : ''))];
 
-		if (Utils::$context['show_spellchecking'])
-		{
-			Theme::loadJavaScriptFile('spellcheck.js', array('minimize' => true), 'smf_spellcheck');
+		if (Utils::$context['show_spellchecking']) {
+			Theme::loadJavaScriptFile('spellcheck.js', ['minimize' => true], 'smf_spellcheck');
 
 			// Some hidden information is needed in order to make the spell checking work.
-			if (!isset($_REQUEST['xml']))
-			{
+			if (!isset($_REQUEST['xml'])) {
 				Utils::$context['insert_after_template'] .= '
 				<form name="spell_form" id="spell_form" method="post" accept-charset="' . Utils::$context['character_set'] . '" target="spellWindow" action="' . Config::$scripturl . '?action=spellcheck">
 					<input type="hidden" name="spellstring" value="">
@@ -444,30 +441,30 @@ protected function init(): void
 	 */
 	protected function buildButtons(): void
 	{
-		Utils::$context['richedit_buttons'] = array(
-			'save_draft' => array(
+		Utils::$context['richedit_buttons'] = [
+			'save_draft' => [
 				'type' => 'submit',
 				'value' => Lang::$txt['draft_save'],
 				'onclick' => !empty(Utils::$context['drafts_save']) ? 'submitThisOnce(this);' : (!empty(Utils::$context['drafts_save']) ? 'return confirm(' . Utils::JavaScriptEscape(Lang::$txt['draft_save_note']) . ') && submitThisOnce(this);' : ''),
 				'accessKey' => 'd',
-				'show' => !empty(Utils::$context['drafts_save'])
-			),
-			'id_draft' => array(
+				'show' => !empty(Utils::$context['drafts_save']),
+			],
+			'id_draft' => [
 				'type' => 'hidden',
 				'value' => empty(Utils::$context['id_draft']) ? 0 : Utils::$context['id_draft'],
-				'show' => !empty(Utils::$context['drafts_save'])
-			),
-			'spell_check' => array(
+				'show' => !empty(Utils::$context['drafts_save']),
+			],
+			'spell_check' => [
 				'type' => 'submit',
 				'value' => Lang::$txt['spell_check'],
-				'show' => !empty(Utils::$context['show_spellchecking'])
-			),
-			'preview' => array(
+				'show' => !empty(Utils::$context['show_spellchecking']),
+			],
+			'preview' => [
 				'type' => 'submit',
 				'value' => Lang::$txt['preview'],
-				'accessKey' => 'p'
-			)
-		);
+				'accessKey' => 'p',
+			],
+		];
 	}
 
 	/**
@@ -475,8 +472,9 @@ protected function buildButtons(): void
 	 */
 	protected function buildBbcToolbar(): void
 	{
-		if (!empty(self::$bbc_tags))
+		if (!empty(self::$bbc_tags)) {
 			return;
+		}
 
 		Utils::$context['bbc_tags'] = &self::$bbc_tags;
 		Utils::$context['disabled_tags'] = &self::$disabled_tags;
@@ -494,143 +492,141 @@ protected function buildBbcToolbar(): void
 				'after' => '[/b]', // Deprecated
 			),
 		*/
-		self::$bbc_tags[] = array(
-			array(
+		self::$bbc_tags[] = [
+			[
 				'code' => 'bold',
 				'description' => Lang::$editortxt['bold'],
-			),
-			array(
+			],
+			[
 				'code' => 'italic',
 				'description' => Lang::$editortxt['italic'],
-			),
-			array(
+			],
+			[
 				'code' => 'underline',
-				'description' => Lang::$editortxt['underline']
-			),
-			array(
+				'description' => Lang::$editortxt['underline'],
+			],
+			[
 				'code' => 'strike',
-				'description' => Lang::$editortxt['strikethrough']
-			),
-			array(
+				'description' => Lang::$editortxt['strikethrough'],
+			],
+			[
 				'code' => 'superscript',
-				'description' => Lang::$editortxt['superscript']
-			),
-			array(
+				'description' => Lang::$editortxt['superscript'],
+			],
+			[
 				'code' => 'subscript',
-				'description' => Lang::$editortxt['subscript']
-			),
-			array(),
-			array(
+				'description' => Lang::$editortxt['subscript'],
+			],
+			[],
+			[
 				'code' => 'pre',
-				'description' => Lang::$editortxt['preformatted_text']
-			),
-			array(
+				'description' => Lang::$editortxt['preformatted_text'],
+			],
+			[
 				'code' => 'left',
-				'description' => Lang::$editortxt['align_left']
-			),
-			array(
+				'description' => Lang::$editortxt['align_left'],
+			],
+			[
 				'code' => 'center',
-				'description' => Lang::$editortxt['center']
-			),
-			array(
+				'description' => Lang::$editortxt['center'],
+			],
+			[
 				'code' => 'right',
-				'description' => Lang::$editortxt['align_right']
-			),
-			array(
+				'description' => Lang::$editortxt['align_right'],
+			],
+			[
 				'code' => 'justify',
-				'description' => Lang::$editortxt['justify']
-			),
-			array(),
-			array(
+				'description' => Lang::$editortxt['justify'],
+			],
+			[],
+			[
 				'code' => 'font',
-				'description' => Lang::$editortxt['font_name']
-			),
-			array(
+				'description' => Lang::$editortxt['font_name'],
+			],
+			[
 				'code' => 'size',
-				'description' => Lang::$editortxt['font_size']
-			),
-			array(
+				'description' => Lang::$editortxt['font_size'],
+			],
+			[
 				'code' => 'color',
-				'description' => Lang::$editortxt['font_color']
-			),
-		);
+				'description' => Lang::$editortxt['font_color'],
+			],
+		];
 
-		if (empty(Config::$modSettings['disable_wysiwyg']))
-		{
-			self::$bbc_tags[count(self::$bbc_tags) - 1][] = array(
+		if (empty(Config::$modSettings['disable_wysiwyg'])) {
+			self::$bbc_tags[count(self::$bbc_tags) - 1][] = [
 				'code' => 'removeformat',
 				'description' => Lang::$editortxt['remove_formatting'],
-			);
+			];
 		}
 
-		self::$bbc_tags[] = array(
-			array(
+		self::$bbc_tags[] = [
+			[
 				'code' => 'floatleft',
-				'description' => Lang::$editortxt['float_left']
-			),
-			array(
+				'description' => Lang::$editortxt['float_left'],
+			],
+			[
 				'code' => 'floatright',
-				'description' => Lang::$editortxt['float_right']
-			),
-			array(),
-			array(
+				'description' => Lang::$editortxt['float_right'],
+			],
+			[],
+			[
 				'code' => 'youtube',
-				'description' => Lang::$editortxt['insert_youtube_video']
-			),
-			array(
+				'description' => Lang::$editortxt['insert_youtube_video'],
+			],
+			[
 				'code' => 'image',
-				'description' => Lang::$editortxt['insert_image']
-			),
-			array(
+				'description' => Lang::$editortxt['insert_image'],
+			],
+			[
 				'code' => 'link',
-				'description' => Lang::$editortxt['insert_link']
-			),
-			array(
+				'description' => Lang::$editortxt['insert_link'],
+			],
+			[
 				'code' => 'email',
-				'description' => Lang::$editortxt['insert_email']
-			),
-			array(),
-			array(
+				'description' => Lang::$editortxt['insert_email'],
+			],
+			[],
+			[
 				'code' => 'table',
-				'description' => Lang::$editortxt['insert_table']
-			),
-			array(
+				'description' => Lang::$editortxt['insert_table'],
+			],
+			[
 				'code' => 'code',
-				'description' => Lang::$editortxt['code']
-			),
-			array(
+				'description' => Lang::$editortxt['code'],
+			],
+			[
 				'code' => 'quote',
-				'description' => Lang::$editortxt['insert_quote']
-			),
-			array(),
-			array(
+				'description' => Lang::$editortxt['insert_quote'],
+			],
+			[],
+			[
 				'code' => 'bulletlist',
-				'description' => Lang::$editortxt['bullet_list']
-			),
-			array(
+				'description' => Lang::$editortxt['bullet_list'],
+			],
+			[
 				'code' => 'orderedlist',
-				'description' => Lang::$editortxt['numbered_list']
-			),
-			array(
+				'description' => Lang::$editortxt['numbered_list'],
+			],
+			[
 				'code' => 'horizontalrule',
-				'description' => Lang::$editortxt['insert_horizontal_rule']
-			),
-			array(),
-			array(
+				'description' => Lang::$editortxt['insert_horizontal_rule'],
+			],
+			[],
+			[
 				'code' => 'maximize',
-				'description' => Lang::$editortxt['maximize']
-			),
-		);
+				'description' => Lang::$editortxt['maximize'],
+			],
+		];
 
-		if (empty(Config::$modSettings['disable_wysiwyg']))
-		{
-			self::$bbc_tags[count(self::$bbc_tags) - 1][] = array(
+		if (empty(Config::$modSettings['disable_wysiwyg'])) {
+			self::$bbc_tags[count(self::$bbc_tags) - 1][] = [
 				'code' => 'source',
 				'description' => Lang::$editortxt['view_source'],
-			);
+			];
 		}
 
-		$editor_tag_map = array(
+		$editor_tag_map = [
 			'b' => 'bold',
 			'i' => 'italic',
 			'u' => 'underline',
@@ -640,34 +636,31 @@ protected function buildBbcToolbar(): void
 			'sup' => 'superscript',
 			'sub' => 'subscript',
 			'hr' => 'horizontalrule',
-		);
+		];
 
 		// Allow mods to modify BBC buttons.
-		IntegrationHook::call('integrate_bbc_buttons', array(&self::$bbc_tags, &$editor_tag_map, &self::$disabled_tags));
+		IntegrationHook::call('integrate_bbc_buttons', [&self::$bbc_tags, &$editor_tag_map, &self::$disabled_tags]);
 
 		// Generate a list of buttons that shouldn't be shown - this should be the fastest way to do this.
-		$disabled_bbc = !empty(Config::$modSettings['disabledBBC']) ? explode(',', Config::$modSettings['disabledBBC']) : array();
+		$disabled_bbc = !empty(Config::$modSettings['disabledBBC']) ? explode(',', Config::$modSettings['disabledBBC']) : [];
 
-		foreach ($disabled_bbc as $tag)
-		{
+		foreach ($disabled_bbc as $tag) {
 			$tag = trim($tag);
 
-			if ($tag === 'list')
-			{
+			if ($tag === 'list') {
 				self::$disabled_tags['bulletlist'] = true;
 				self::$disabled_tags['orderedlist'] = true;
 			}
 
-			if ($tag === 'float')
-			{
+			if ($tag === 'float') {
 				self::$disabled_tags['floatleft'] = true;
 				self::$disabled_tags['floatright'] = true;
 			}
 
-			foreach ($editor_tag_map as $tag_name => $tag_alias)
-			{
-				if ($tag === $tag_name)
+			foreach ($editor_tag_map as $tag_name => $tag_alias) {
+				if ($tag === $tag_name) {
 					self::$disabled_tags[$tag_alias] = true;
+				}
 			}
 
 			self::$disabled_tags[$tag] = true;
@@ -675,27 +668,22 @@ protected function buildBbcToolbar(): void
 
 		$bbcodes_styles = '';
 
-		foreach (self::$bbc_tags as $row => $tag_row)
-		{
-			if (!isset(self::$bbc_toolbar[$row]))
-				self::$bbc_toolbar[$row] = array();
+		foreach (self::$bbc_tags as $row => $tag_row) {
+			if (!isset(self::$bbc_toolbar[$row])) {
+				self::$bbc_toolbar[$row] = [];
+			}
 
-			$tags_row = array();
+			$tags_row = [];
 
-			foreach ($tag_row as $tag)
-			{
-				if (empty($tag['code']))
-				{
+			foreach ($tag_row as $tag) {
+				if (empty($tag['code'])) {
 					self::$bbc_toolbar[$row][] = implode(',', $tags_row);
-					$tags_row = array();
-				}
-				elseif (empty(self::$disabled_tags[$tag['code']]))
-				{
+					$tags_row = [];
+				} elseif (empty(self::$disabled_tags[$tag['code']])) {
 					$tags_row[] = $tag['code'];
 
 					// If we have a custom button image, set it now.
-					if (isset($tag['image']))
-					{
+					if (isset($tag['image'])) {
 						$bbcodes_styles .= '
 						.sceditor-button-' . $tag['code'] . ' div {
 							background: url(\'' . Theme::$current->settings['default_theme_url'] . '/images/bbc/' . $tag['image'] . '.png\');
@@ -705,11 +693,10 @@ protected function buildBbcToolbar(): void
 					// Set the tooltip and possibly the command info
 					self::$bbc_handlers .= '
 						sceditor.command.set(' . Utils::JavaScriptEscape($tag['code']) . ', {
-							tooltip: ' . Utils::JavaScriptEscape(isset($tag['description']) ? $tag['description'] : $tag['code']);
+							tooltip: ' . Utils::JavaScriptEscape($tag['description'] ?? $tag['code']);
 
 					// Legacy support for 2.0 BBC mods
-					if (isset($tag['before']))
-					{
+					if (isset($tag['before'])) {
 						self::$bbc_handlers .= ',
 							exec: function () {
 								this.insertText(' . Utils::JavaScriptEscape($tag['before']) . (isset($tag['after']) ? ', ' . Utils::JavaScriptEscape($tag['after']) : '') . ');
@@ -722,12 +709,14 @@ protected function buildBbcToolbar(): void
 				}
 			}
 
-			if (!empty($tags_row))
+			if (!empty($tags_row)) {
 				self::$bbc_toolbar[$row][] = implode(',', $tags_row);
+			}
 		}
 
-		if (!empty($bbcodes_styles))
+		if (!empty($bbcodes_styles)) {
 			Theme::addInlineCss($bbcodes_styles);
+		}
 	}
 
 	/**
@@ -735,58 +724,51 @@ protected function buildBbcToolbar(): void
 	 */
 	protected function buildSmileysToolbar(): void
 	{
-		if ($this->disable_smiley_box || !empty(self::$smileys_toolbar['postform']) || !empty(self::$smileys_toolbar['popup']))
-		{
+		if ($this->disable_smiley_box || !empty(self::$smileys_toolbar['postform']) || !empty(self::$smileys_toolbar['popup'])) {
 			return;
 		}
 
 		Utils::$context['smileys'] = self::$smileys_toolbar;
 
-		if (User::$me->smiley_set != 'none')
-		{
+		if (User::$me->smiley_set != 'none') {
 			// Cache for longer when customized smiley codes aren't enabled
 			$cache_time = empty(Config::$modSettings['smiley_enable']) ? 7200 : 480;
 
-			if (($temp = CacheApi::get('posting_smileys_' . User::$me->smiley_set, $cache_time)) == null)
-			{
-				$request = Db::$db->query('', '
-					SELECT s.code, f.filename, s.description, s.smiley_row, s.hidden
+			if (($temp = CacheApi::get('posting_smileys_' . User::$me->smiley_set, $cache_time)) == null) {
+				$request = Db::$db->query(
+					'',
+					'SELECT s.code, f.filename, s.description, s.smiley_row, s.hidden
 					FROM {db_prefix}smileys AS s
 						JOIN {db_prefix}smiley_files AS f ON (s.id_smiley = f.id_smiley)
 					WHERE s.hidden IN (0, 2)
 						AND f.smiley_set = {string:smiley_set}' . (empty(Config::$modSettings['smiley_enable']) ? '
 						AND s.code IN ({array_string:default_codes})' : '') . '
 					ORDER BY s.smiley_row, s.smiley_order',
-					array(
-						'default_codes' => array('>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', 'O:-)'),
+					[
+						'default_codes' => ['>:D', ':D', '::)', '>:(', ':))', ':)', ';)', ';D', ':(', ':o', '8)', ':P', '???', ':-[', ':-X', ':-*', ':\'(', ':-\\', '^-^', 'O0', 'C:-)', 'O:-)'],
 						'smiley_set' => User::$me->smiley_set,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$row['description'] = !empty(Lang::$txt['icon_' . strtolower($row['description'])]) ? Utils::htmlspecialchars(Lang::$txt['icon_' . strtolower($row['description'])]) : Utils::htmlspecialchars($row['description']);
 
 					self::$smileys_toolbar[empty($row['hidden']) ? 'postform' : 'popup'][$row['smiley_row']]['smileys'][] = $row;
 				}
 				Db::$db->free_result($request);
 
-				foreach (self::$smileys_toolbar as $section => $smiley_rows)
-				{
-					foreach ($smiley_rows as $rowIndex => $smileys)
-					{
+				foreach (self::$smileys_toolbar as $section => $smiley_rows) {
+					foreach ($smiley_rows as $rowIndex => $smileys) {
 						self::$smileys_toolbar[$section][$rowIndex]['smileys'][count($smileys['smileys']) - 1]['isLast'] = true;
 					}
 
-					if (!empty($smiley_rows))
-					{
+					if (!empty($smiley_rows)) {
 						self::$smileys_toolbar[$section][count($smiley_rows) - 1]['isLast'] = true;
 					}
 				}
 
 				CacheApi::put('posting_smileys_' . User::$me->smiley_set, self::$smileys_toolbar, $cache_time);
-			}
-			else
-			{
+			} else {
 				self::$smileys_toolbar = $temp;
 			}
 		}
@@ -798,7 +780,7 @@ protected function buildSmileysToolbar(): void
 	protected function setSCEditorOptions()
 	{
 		// Set up the SCEditor options
-		$this->sce_options = array(
+		$this->sce_options = [
 			'width' => $this->width ?? '100%',
 			'height' => $this->height ?? '175px',
 			'style' => Theme::$current->settings[file_exists(Theme::$current->settings['theme_dir'] . '/css/jquery.sceditor.default.css') ? 'theme_url' : 'default_theme_url'] . '/css/jquery.sceditor.default.css' . Utils::$context['browser_cache'],
@@ -807,41 +789,39 @@ protected function setSCEditorOptions()
 			'format' => 'bbcode',
 			'plugins' => '',
 			'bbcodeTrim' => false,
-		);
+		];
 
-		if (!empty($this->locale))
+		if (!empty($this->locale)) {
 			$this->sce_options['locale'] = $this->locale;
+		}
 
-		if (!empty(Utils::$context['right_to_left']))
+		if (!empty(Utils::$context['right_to_left'])) {
 			$this->sce_options['rtl'] = true;
+		}
 
-		if ($this->id != 'quickReply')
+		if ($this->id != 'quickReply') {
 			$this->sce_options['autofocus'] = true;
+		}
 
-		$this->sce_options['emoticons'] = array();
-		$this->sce_options['emoticonsDescriptions'] = array();
+		$this->sce_options['emoticons'] = [];
+		$this->sce_options['emoticonsDescriptions'] = [];
 		$this->sce_options['emoticonsEnabled'] = false;
 
-		if ((!empty(self::$smileys_toolbar['postform']) || !empty(self::$smileys_toolbar['popup'])) && !$this->disable_smiley_box)
-		{
+		if ((!empty(self::$smileys_toolbar['postform']) || !empty(self::$smileys_toolbar['popup'])) && !$this->disable_smiley_box) {
 			$this->sce_options['emoticonsEnabled'] = true;
-			$this->sce_options['emoticons']['dropdown'] = array();
-			$this->sce_options['emoticons']['popup'] = array();
+			$this->sce_options['emoticons']['dropdown'] = [];
+			$this->sce_options['emoticons']['popup'] = [];
 
 			$count_locations = count(self::$smileys_toolbar);
 
-			foreach (self::$smileys_toolbar as $location => $smiley_rows)
-			{
+			foreach (self::$smileys_toolbar as $location => $smiley_rows) {
 				$count_locations--;
 
 				unset($smiley_location);
 
-				if ($location == 'postform')
-				{
+				if ($location == 'postform') {
 					$smiley_location = &$this->sce_options['emoticons']['dropdown'];
-				}
-				elseif ($location == 'popup')
-				{
+				} elseif ($location == 'popup') {
 					$smiley_location = &$this->sce_options['emoticons']['popup'];
 				}
 
@@ -850,49 +830,49 @@ protected function setSCEditorOptions()
 				// This is needed because otherwise the editor will remove all the duplicate (empty) keys and leave only 1 additional line
 				$empty_placeholder = 0;
 
-				foreach ($smiley_rows as $smiley_row)
-				{
-					foreach ($smiley_row['smileys'] as $smiley)
-					{
+				foreach ($smiley_rows as $smiley_row) {
+					foreach ($smiley_row['smileys'] as $smiley) {
 						$smiley_location[$smiley['code']] = Theme::$current->settings['smileys_url'] . '/' . $smiley['filename'];
 
 						$this->sce_options['emoticonsDescriptions'][$smiley['code']] = $smiley['description'];
 					}
 
-					if (empty($smiley_row['isLast']) && $num_rows != 1)
+					if (empty($smiley_row['isLast']) && $num_rows != 1) {
 						$smiley_location['-' . $empty_placeholder++] = '';
+					}
 				}
 			}
 		}
 
-		$this->sce_options['parserOptions']['txtVars'] = array(
-			'code' => Lang::$txt['code']
-		);
+		$this->sce_options['parserOptions']['txtVars'] = [
+			'code' => Lang::$txt['code'],
+		];
 
 		$this->sce_options['toolbar'] = '';
-		if (!empty(Config::$modSettings['enableBBC']))
-		{
+
+		if (!empty(Config::$modSettings['enableBBC'])) {
 			$count_tags = count(self::$bbc_tags);
 
-			foreach (self::$bbc_toolbar as $i => $buttonRow)
-			{
+			foreach (self::$bbc_toolbar as $i => $buttonRow) {
 				$this->sce_options['toolbar'] .= implode('|', $buttonRow);
 
 				$count_tags--;
 
-				if (!empty($count_tags))
+				if (!empty($count_tags)) {
 					$this->sce_options['toolbar'] .= '||';
+				}
 			}
 		}
 
 		// Allow mods to change $this->sce_options.
 		// Usful if, e.g., a mod wants to add an SCEditor plugin.
-		IntegrationHook::call('integrate_sceditor_options', array(&$this->sce_options));
+		IntegrationHook::call('integrate_sceditor_options', [&$this->sce_options]);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Editor::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Editor::exportStatic')) {
 	Editor::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/ErrorHandler.php b/Sources/ErrorHandler.php
index b2d9a07460..25d3494844 100644
--- a/Sources/ErrorHandler.php
+++ b/Sources/ErrorHandler.php
@@ -17,9 +17,9 @@
 
 namespace SMF;
 
-use SMF\ServerSideIncludes as SSI;
 use SMF\Cache\CacheApi;
 use SMF\Db\DatabaseApi as Db;
+use SMF\ServerSideIncludes as SSI;
 
 /**
  * SMF's error handler.
@@ -35,8 +35,8 @@ class ErrorHandler
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'smf_error_handler',
 			'log' => 'log_error',
 			'fatal' => 'fatal_error',
@@ -44,8 +44,8 @@ class ErrorHandler
 			'displayMaintenanceMessage' => 'display_maintenance_message',
 			'displayDbError' => 'display_db_error',
 			'displayLoadAvgError' => 'display_loadavg_error',
-		),
-	);
+		],
+	];
 
 	/****************
 	 * Public methods
@@ -62,53 +62,49 @@ class ErrorHandler
 	public function __construct(int $error_level, string $error_string, string $file, int $line)
 	{
 		// Error was suppressed with the @-operator.
-		if (error_reporting() == 0 || error_reporting() == (E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR))
-		{
+		if (error_reporting() == 0 || error_reporting() == (E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR)) {
 			return true;
 		}
 
 		// Ignore errors that should should not be logged.
 		$error_match = error_reporting() & $error_level;
 
-		if (empty($error_match) || empty(Config::$modSettings['enableErrorLogging']))
+		if (empty($error_match) || empty(Config::$modSettings['enableErrorLogging'])) {
 			return false;
+		}
 
-		if (strpos($file, 'eval()') !== false && !empty(Theme::$current->settings['current_include_filename']))
-		{
+		if (strpos($file, 'eval()') !== false && !empty(Theme::$current->settings['current_include_filename'])) {
 			$array = debug_backtrace();
 			$count = count($array);
 
-			for ($i = 0; $i < $count; $i++)
-			{
-				if ($array[$i]['function'] != 'SMF\\Theme::loadSubTemplate')
+			for ($i = 0; $i < $count; $i++) {
+				if ($array[$i]['function'] != 'SMF\\Theme::loadSubTemplate') {
 					continue;
+				}
 
 				// This is a bug in PHP, with eval, it seems!
-				if (empty($array[$i]['args']))
+				if (empty($array[$i]['args'])) {
 					$i++;
+				}
 
 				break;
 			}
 
-			if (isset($array[$i]) && !empty($array[$i]['args']))
-			{
+			if (isset($array[$i]) && !empty($array[$i]['args'])) {
 				$file = realpath(Theme::$current->settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
-			}
-			else
-			{
+			} else {
 				$file = realpath(Theme::$current->settings['current_include_filename']) . ' (eval?)';
 			}
 		}
 
-		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true)
-		{
+		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true) {
 			// Commonly, undefined indexes will occur inside attributes; try to show them anyway!
-			if ($error_level % 255 != E_ERROR)
-			{
+			if ($error_level % 255 != E_ERROR) {
 				$temporary = ob_get_contents();
 
-				if (substr($temporary, -2) == '="')
+				if (substr($temporary, -2) == '="') {
 					echo '"';
+				}
 			}
 
 			// Debugging!  This should look like a PHP error message.
@@ -120,29 +116,29 @@ public function __construct(int $error_level, string $error_string, string $file
 		$message = self::log($error_level . ': ' . $error_string, $error_type, $file, $line);
 
 		// Let's give integrations a chance to output a bit differently
-		IntegrationHook::call('integrate_output_error', array($message, $error_type, $error_level, $file, $line));
+		IntegrationHook::call('integrate_output_error', [$message, $error_type, $error_level, $file, $line]);
 
 		// Dying on these errors only causes MORE problems (blank pages!)
-		if ($file == 'Unknown')
+		if ($file == 'Unknown') {
 			return;
+		}
 
 		// If this is an E_ERROR or E_USER_ERROR.... die. Violently so.
-		if ($error_level % 255 == E_ERROR)
-		{
+		if ($error_level % 255 == E_ERROR) {
 			Utils::obExit(false);
-		}
-		else
-		{
+		} else {
 			return;
 		}
 
 		// If this is an E_ERROR, E_USER_ERROR, E_WARNING, or E_USER_WARNING.... die. Violently so.
-		if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING)
+		if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING) {
 			self::fatal(User::$me->allowedTo('admin_forum') ? $message : $error_string, false);
+		}
 
 		// We should NEVER get to this point.  Any fatal error MUST quit, or very bad things can happen.
-		if ($error_level % 255 == E_ERROR)
+		if ($error_level % 255 == E_ERROR) {
 			die('No direct access...');
+		}
 	}
 
 	/***********************
@@ -185,31 +181,29 @@ public static function log(string $error_message, string|bool $error_type = 'gen
 		$error_call++;
 
 		// Collect a backtrace
-		if (!isset(Config::$db_show_debug) || Config::$db_show_debug === false)
-		{
+		if (!isset(Config::$db_show_debug) || Config::$db_show_debug === false) {
 			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		}
-		else
-		{
+		} else {
 			// This is how to keep the args but skip the objects.
 			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS & DEBUG_BACKTRACE_PROVIDE_OBJECT);
 		}
 
 		// Are we in a loop?
-		if ($error_call > 2)
-		{
+		if ($error_call > 2) {
 			var_dump($backtrace);
+
 			die('Error loop.');
 		}
 
 		// Check if error logging is actually on.
-		if (empty(Config::$modSettings['enableErrorLogging']))
+		if (empty(Config::$modSettings['enableErrorLogging'])) {
 			return $error_message;
+		}
 
 		// Basically, htmlspecialchars it minus &. (for entities!)
-		$error_message = strtr($error_message, array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
+		$error_message = strtr($error_message, ['<' => '&lt;', '>' => '&gt;', '"' => '&quot;']);
 
-		$error_message = strtr($error_message, array('&lt;br /&gt;' => '<br>', '&lt;br&gt;' => '<br>', '&lt;b&gt;' => '<strong>', '&lt;/b&gt;' => '</strong>', "\n" => '<br>'));
+		$error_message = strtr($error_message, ['&lt;br /&gt;' => '<br>', '&lt;br&gt;' => '<br>', '&lt;b&gt;' => '<strong>', '&lt;/b&gt;' => '</strong>', "\n" => '<br>']);
 
 		// Add a file and line to the error message?
 		// Don't use the actual txt entries for file and line.
@@ -221,14 +215,15 @@ public static function log(string $error_message, string|bool $error_type = 'gen
 		$query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace(Config::$scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING'];
 
 		// Don't log the session hash in the url twice, it's a waste.
-		$query_string = Utils::htmlspecialchars((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
+		$query_string = Utils::htmlspecialchars((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(['~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'], [';sesc', ''], $query_string));
 
 		// Just so we know what board error messages are from.
-		if (isset($_POST['board']) && !isset($_GET['board']))
+		if (isset($_POST['board']) && !isset($_GET['board'])) {
 			$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+		}
 
 		// What types of categories do we have?
-		$known_error_types = array(
+		$known_error_types = [
 			'general',
 			'critical',
 			'database',
@@ -241,16 +236,16 @@ public static function log(string $error_message, string|bool $error_type = 'gen
 			'paidsubs',
 			'backup',
 			'login',
-		);
+		];
 
 		// This prevents us from infinite looping if the hook or call produces an error.
-		$other_error_types = array();
-		if (empty($tried_hook))
-		{
+		$other_error_types = [];
+
+		if (empty($tried_hook)) {
 			$tried_hook = true;
 
 			// Allow the hook to change the error_type and know about the error.
-			IntegrationHook::call('integrate_error_types', array(&$other_error_types, &$error_type, $error_message, $file, $line));
+			IntegrationHook::call('integrate_error_types', [&$other_error_types, &$error_type, $error_message, $file, $line]);
 
 			$known_error_types = array_merge($known_error_types, $other_error_types);
 		}
@@ -263,27 +258,24 @@ public static function log(string $error_message, string|bool $error_type = 'gen
 		$backtrace = Utils::jsonEncode($backtrace);
 
 		// Don't log the same error countless times, as we can get in a cycle of depression...
-		$error_info = array(User::$me->id ?? User::$my_id ?? 0, time(), User::$me->ip ?? $_SERVER['REMOTE_ADDR'] ?? '', $query_string, $error_message, (string) (User::$sc ?? ''), $error_type, $file, $line, $backtrace);
+		$error_info = [User::$me->id ?? User::$my_id ?? 0, time(), User::$me->ip ?? $_SERVER['REMOTE_ADDR'] ?? '', $query_string, $error_message, (string) (User::$sc ?? ''), $error_type, $file, $line, $backtrace];
 
-		if (empty($last_error) || $last_error != $error_info)
-		{
+		if (empty($last_error) || $last_error != $error_info) {
 			// Insert the error into the database.
 			Db::$db->error_insert($error_info);
 			$last_error = $error_info;
 
 			// Get an error count, if necessary
-			if (!isset(Utils::$context['num_errors']))
-			{
-				$query = Db::$db->query('', '
-					SELECT COUNT(*)
+			if (!isset(Utils::$context['num_errors'])) {
+				$query = Db::$db->query(
+					'',
+					'SELECT COUNT(*)
 					FROM {db_prefix}log_errors',
-					array()
+					[],
 				);
 				list(Utils::$context['num_errors']) = Db::$db->fetch_row($query);
 				Db::$db->free_result($query);
-			}
-			else
-			{
+			} else {
 				Utils::$context['num_errors']++;
 			}
 		}
@@ -308,12 +300,14 @@ public static function log(string $error_message, string|bool $error_type = 'gen
 	public static function fatal(string $error, string|bool $log = 'general', int $status = 500): void
 	{
 		// Send the appropriate HTTP status header - set this to 0 or false if you don't want to send one at all
-		if (!empty($status))
+		if (!empty($status)) {
 			Utils::sendHttpStatus($status);
+		}
 
 		// We don't have Lang::$txt yet, but that's okay...
-		if (empty(Lang::$txt))
+		if (empty(Lang::$txt)) {
 			die($error);
+		}
 
 		self::logOnline($error);
 		self::setupFatalContext($log ? self::log($error, $log) : $error);
@@ -334,17 +328,17 @@ public static function fatal(string $error, string|bool $log = 'general', int $s
 	 * @param array $sprintf An array of data to be sprintf()'d into the specified message.
 	 * @param int $status The HTTP status code associated with this error. Default: 403.
 	 */
-	public static function fatalLang(string $error, string|bool $log = 'general', array $sprintf = array(), int $status = 403)
+	public static function fatalLang(string $error, string|bool $log = 'general', array $sprintf = [], int $status = 403)
 	{
 		static $fatal_error_called = false;
 
 		// Send the status header - set this to 0 or false if you don't want to send one at all.
-		if (!empty($status))
+		if (!empty($status)) {
 			Utils::sendHttpStatus($status);
+		}
 
 		// Try to load a theme if we don't have one.
-		if (empty(Utils::$context['theme_loaded']) && empty($fatal_error_called))
-		{
+		if (empty(Utils::$context['theme_loaded']) && empty($fatal_error_called)) {
 			$fatal_error_called = true;
 			Theme::load();
 		}
@@ -352,38 +346,33 @@ public static function fatalLang(string $error, string|bool $log = 'general', ar
 		// Attempt to load the text string.
 		Lang::load('Errors');
 
-		if (empty(Lang::$txt[$error]))
-		{
+		if (empty(Lang::$txt[$error])) {
 			$error_message = $error;
-		}
-		else
-		{
+		} else {
 			$error_message = empty($sprintf) ? Lang::$txt[$error] : vsprintf(Lang::$txt[$error], $sprintf);
 		}
 
 		// Send a custom header if we have a custom message.
-		if (isset($_REQUEST['js']) || isset($_REQUEST['xml']) || isset($_RQEUEST['ajax']))
-			header('X-SMF-errormsg: ' .  $error_message);
+		if (isset($_REQUEST['js']) || isset($_REQUEST['xml']) || isset($_RQEUEST['ajax'])) {
+			header('X-SMF-errormsg: ' . $error_message);
+		}
 
 		// If we have no theme stuff we can't have the language file...
-		if (empty(Utils::$context['theme_loaded']))
+		if (empty(Utils::$context['theme_loaded'])) {
 			die($error);
+		}
 
 		$reload_lang_file = true;
 
 		// Log the error in the forum's language, but don't waste the time if we aren't logging
-		if ($log)
-		{
+		if ($log) {
 			Lang::load('Errors', Lang::$default);
 
 			$reload_lang_file = Lang::$default != User::$me->language;
 
-			if (empty(Lang::$txt[$error]))
-			{
+			if (empty(Lang::$txt[$error])) {
 				$error_message = $error;
-			}
-			else
-			{
+			} else {
 				$error_message = empty($sprintf) ? Lang::$txt[$error] : vsprintf(Lang::$txt[$error], $sprintf);
 			}
 
@@ -391,8 +380,7 @@ public static function fatalLang(string $error, string|bool $log = 'general', ar
 		}
 
 		// Load the language file, only if it needs to be reloaded
-		if ($reload_lang_file && !empty($txt[$error]))
-		{
+		if ($reload_lang_file && !empty($txt[$error])) {
 			Lang::load('Errors');
 
 			$error_message = empty($sprintf) ? Lang::$txt[$error] : vsprintf(Lang::$txt[$error], $sprintf);
@@ -413,24 +401,23 @@ public static function displayMaintenanceMessage(): void
 	{
 		self::setFatalHeaders();
 
-		if (!empty(Config::$maintenance))
-		{
+		if (!empty(Config::$maintenance)) {
 			$mtitle = Config::$mtitle;
 			$mmessage = Config::$mmessage;
 
 			echo <<<END
-			<!DOCTYPE html>
-			<html>
-				<head>
-					<meta name="robots" content="noindex">
-					<title>{$mtitle}</title>
-				</head>
-				<body>
-					<h3>{$mtitle}</h3>
-					{$mmessage}
-				</body>
-			</html>
-			END;
+				<!DOCTYPE html>
+				<html>
+					<head>
+						<meta name="robots" content="noindex">
+						<title>{$mtitle}</title>
+					</head>
+					<body>
+						<h3>{$mtitle}</h3>
+						{$mmessage}
+					</body>
+				</html>
+				END;
 		}
 
 		die();
@@ -450,16 +437,17 @@ public static function displayDbError(): void
 		// For our purposes, we're gonna want this on if at all possible.
 		CacheApi::$enable = 1;
 
-		if (($temp = CacheApi::get('db_last_error', 600)) !== null)
+		if (($temp = CacheApi::get('db_last_error', 600)) !== null) {
 			Config::$db_last_error = max(Config::$db_last_error, $temp);
+		}
 
-		if (Config::$db_last_error < time() - 3600 * 24 * 3 && empty(Config::$maintenance) && !empty(Config::$db_error_send))
-		{
+		if (Config::$db_last_error < time() - 3600 * 24 * 3 && empty(Config::$maintenance) && !empty(Config::$db_error_send)) {
 			// Avoid writing to the Settings.php file if at all possible; use shared memory instead.
 			CacheApi::put('db_last_error', time(), 600);
 
-			if (($temp = CacheApi::get('db_last_error', 600)) === null)
+			if (($temp = CacheApi::get('db_last_error', 600)) === null) {
 				self::logLastDatabaseError();
+			}
 
 			$db_error = isset(Db::$db) ? @Db::$db->error() : '';
 
@@ -469,18 +457,18 @@ public static function displayDbError(): void
 
 		// What to do?  Language files haven't and can't be loaded yet...
 		echo <<<END
-		<!DOCTYPE html>
-		<html>
-			<head>
-				<meta name="robots" content="noindex">
-				<title>Connection Problems</title>
-			</head>
-			<body>
-				<h3>Connection Problems</h3>
-				Sorry, SMF was unable to connect to the database. This may be caused by the server being busy. Please try again later.
-			</body>
-		</html>
-		END;
+			<!DOCTYPE html>
+			<html>
+				<head>
+					<meta name="robots" content="noindex">
+					<title>Connection Problems</title>
+				</head>
+				<body>
+					<h3>Connection Problems</h3>
+					Sorry, SMF was unable to connect to the database. This may be caused by the server being busy. Please try again later.
+				</body>
+			</html>
+			END;
 
 		die();
 	}
@@ -499,18 +487,18 @@ public static function displayLoadAvgError(): void
 		self::setFatalHeaders();
 
 		echo <<<END
-		<!DOCTYPE html>
-		<html>
-			<head>
-				<meta name="robots" content="noindex">
-				<title>Temporarily Unavailable</title>
-			</head>
-			<body>
-				<h3>Temporarily Unavailable</h3>
-				Due to high stress on the server the forum is temporarily unavailable.  Please try again later.
-			</body>
-		</html>
-		END;
+			<!DOCTYPE html>
+			<html>
+				<head>
+					<meta name="robots" content="noindex">
+					<title>Temporarily Unavailable</title>
+				</head>
+				<body>
+					<h3>Temporarily Unavailable</h3>
+					Due to high stress on the server the forum is temporarily unavailable.  Please try again later.
+				</body>
+			</html>
+			END;
 
 		die();
 	}
@@ -526,49 +514,55 @@ public static function displayLoadAvgError(): void
 	 * @param string $error The error
 	 * @param array $sprintf An array of data to be sprintf()'d into the specified message
 	 */
-	protected static function logOnline(string $error, array $sprintf = array())
+	protected static function logOnline(string $error, array $sprintf = [])
 	{
 		// Don't bother if Who's Online is disabled.
-		if (empty(Config::$modSettings['who_enabled']))
+		if (empty(Config::$modSettings['who_enabled'])) {
 			return;
+		}
 
 		// Maybe they came from SSI or similar where sessions are not recorded?
-		if (SMF == 'SSI' || SMF == 'BACKGROUND')
+		if (SMF == 'SSI' || SMF == 'BACKGROUND') {
 			return;
+		}
 
 		$session_id = !empty(User::$me->is_guest) ? 'ip' . User::$me->ip : session_id();
 
 		// First, we have to get the online log, because we need to break apart the serialized string.
-		$request = Db::$db->query('', '
-			SELECT url
+		$request = Db::$db->query(
+			'',
+			'SELECT url
 			FROM {db_prefix}log_online
 			WHERE session = {string:session}',
-			array(
+			[
 				'session' => $session_id,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) != 0)
-		{
+
+		if (Db::$db->num_rows($request) != 0) {
 			list($url) = Db::$db->fetch_row($request);
 
 			$url = Utils::jsonDecode($url, true);
 			$url['error'] = $error;
 
 			// Url field got a max length of 1024 in db
-			if (strlen($url['error']) > 500)
+			if (strlen($url['error']) > 500) {
 				$url['error'] = substr($url['error'], 0, 500);
+			}
 
-			if (!empty($sprintf))
+			if (!empty($sprintf)) {
 				$url['error_params'] = $sprintf;
+			}
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_online
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_online
 				SET url = {string:url}
 				WHERE session = {string:session}',
-				array(
+				[
 					'url' => Utils::jsonEncode($url),
 					'session' => $session_id,
-				)
+				],
 			);
 		}
 		Db::$db->free_result($request);
@@ -582,8 +576,9 @@ protected static function logOnline(string $error, array $sprintf = array())
 	 */
 	protected static function setFatalHeaders(): void
 	{
-		if (headers_sent())
+		if (headers_sent()) {
 			return;
+		}
 
 		// Don't cache this page!
 		header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -604,62 +599,59 @@ protected static function setFatalHeaders(): void
 	 * @param string $error_message The error message
 	 * @param string $error_code An error code
 	 */
-	protected static function setupFatalContext(string $error_message, string $error_code = null): void
+	protected static function setupFatalContext(string $error_message, ?string $error_code = null): void
 	{
 		static $level = 0;
 
 		// Attempt to prevent a recursive loop.
-		if (++$level > 1)
+		if (++$level > 1) {
 			die($error_message);
+		}
 
 		// Maybe they came from dlattach or similar?
-		if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty(Utils::$context['theme_loaded']))
+		if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty(Utils::$context['theme_loaded'])) {
 			Theme::load();
+		}
 
 		// Don't bother indexing errors mate...
 		Utils::$context['robot_no_index'] = true;
 
-		if (!isset(Utils::$context['error_title']))
+		if (!isset(Utils::$context['error_title'])) {
 			Utils::$context['error_title'] = Lang::$txt['error_occured'];
+		}
 
-		Utils::$context['error_message'] = isset(Utils::$context['error_message']) ? Utils::$context['error_message'] : $error_message;
+		Utils::$context['error_message'] = Utils::$context['error_message'] ?? $error_message;
 
 		Utils::$context['error_code'] = isset($error_code) ? 'id="' . $error_code . '" ' : '';
 
-		Utils::$context['error_link'] = isset(Utils::$context['error_link']) ? Utils::$context['error_link'] : 'javascript:document.location=document.referrer';
+		Utils::$context['error_link'] = Utils::$context['error_link'] ?? 'javascript:document.location=document.referrer';
 
-		if (empty(Utils::$context['page_title']))
+		if (empty(Utils::$context['page_title'])) {
 			Utils::$context['page_title'] = Utils::$context['error_title'];
+		}
 
 		Theme::loadTemplate('Errors');
 		Utils::$context['sub_template'] = 'fatal_error';
 
 		// If this is SSI, what do they want us to do?
-		if (SMF == 'SSI')
-		{
-			if (!empty(SSI::$on_error_method) && SSI::$on_error_method !== true && is_callable(SSI::$on_error_method))
-			{
+		if (SMF == 'SSI') {
+			if (!empty(SSI::$on_error_method) && SSI::$on_error_method !== true && is_callable(SSI::$on_error_method)) {
 				call_user_func(SSI::$on_error_method);
-			}
-			elseif (empty(SSI::$on_error_method) || SSI::$on_error_method !== true)
-			{
+			} elseif (empty(SSI::$on_error_method) || SSI::$on_error_method !== true) {
 				Theme::loadSubTemplate('fatal_error');
 			}
 
 			// No layers?
-			if (empty(SSI::$on_error_method) || SSI::$on_error_method !== true)
+			if (empty(SSI::$on_error_method) || SSI::$on_error_method !== true) {
 				exit;
+			}
 		}
 		// Alternatively from the cron call?
-		elseif (SMF == 'BACKGROUND')
-		{
+		elseif (SMF == 'BACKGROUND') {
 			// We can't rely on even having language files available.
-			if (defined('FROM_CLI') && FROM_CLI)
-			{
+			if (defined('FROM_CLI') && FROM_CLI) {
 				echo 'cron error: ', Utils::$context['error_message'];
-			}
-			else
-			{
+			} else {
 				echo 'An error occurred. More information may be available in your logs.';
 			}
 
@@ -694,22 +686,20 @@ protected static function logLastDatabaseError()
 		$dberror_backup_fail = !$dberror_backup_fail ? (!file_exists(Config::$cachedir . '/db_last_error_bak.php') || filesize(Config::$cachedir . '/db_last_error_bak.php') === 0) : $dberror_backup_fail;
 
 		clearstatcache();
-		if (filemtime(Config::$cachedir . '/db_last_error.php') === $last_db_error_change)
-		{
+
+		if (filemtime(Config::$cachedir . '/db_last_error.php') === $last_db_error_change) {
 			// Write the change
 			$write_db_change = '<' . '?' . "php\n" . '$db_last_error = ' . time() . ';' . "\n" . '?' . '>';
 			$written_bytes = file_put_contents(Config::$cachedir . '/db_last_error.php', $write_db_change, LOCK_EX);
 
 			// survey says ...
-			if ($written_bytes !== strlen($write_db_change) && !$dberror_backup_fail)
-			{
+			if ($written_bytes !== strlen($write_db_change) && !$dberror_backup_fail) {
 				// Oops. maybe we have no more disk space left, or some other troubles, troubles...
 				// Copy the file back and run for your life!
 				@copy(Config::$cachedir . '/db_last_error_bak.php', Config::$cachedir . '/db_last_error.php');
-			}
-			else
-			{
+			} else {
 				@touch(SMF_SETTINGS_FILE);
+
 				return true;
 			}
 		}
@@ -719,7 +709,8 @@ protected static function logLastDatabaseError()
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ErrorHandler::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ErrorHandler::exportStatic')) {
 	ErrorHandler::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Event.php b/Sources/Event.php
index cc361fcd00..cf2baa123a 100644
--- a/Sources/Event.php
+++ b/Sources/Event.php
@@ -25,34 +25,30 @@
  */
 class Event implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'loadRange' => false,
-			'get' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'create' => 'insertEvent',
 			'modify' => 'modifyEvent',
 			'remove' => 'removeEvent',
-			'getDateFormat' => false,
-			'getTimeFormat' => false,
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const TYPE_EVENT_SIMPLE = 0;
-	const TYPE_EVENT_RECURRING = 1; // Not yet implemented.
-	const TYPE_BIRTHDAY = 2; // Not yet implemented.
-	const TYPE_HOLIDAY = 4; // Not yet implemented.
+	public const TYPE_EVENT_SIMPLE = 0;
+	public const TYPE_EVENT_RECURRING = 1; // Not yet implemented.
+	public const TYPE_BIRTHDAY = 2; // Not yet implemented.
+	public const TYPE_HOLIDAY = 4; // Not yet implemented.
 
 	/*******************
 	 * Public properties
@@ -155,7 +151,7 @@ class Event implements \ArrayAccess
 	 *
 	 * IDs of member groups that can view this event.
 	 */
-	public array $groups = array();
+	public array $groups = [];
 
 	/**************************
 	 * Public static properties
@@ -166,7 +162,7 @@ class Event implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -184,7 +180,7 @@ class Event implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_event' => 'id',
 		'eventid' => 'id',
 		'id_board' => 'board',
@@ -199,7 +195,7 @@ class Event implements \ArrayAccess
 		'allowed_groups' => 'groups',
 		'start_object' => 'start',
 		'end_object' => 'end',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -224,11 +220,10 @@ class Event implements \ArrayAccess
 	 * @param array $props Properties to set for this event.
 	 * @return object An instance of this class.
 	 */
-	public function __construct(int $id = 0, array $props = array())
+	public function __construct(int $id = 0, array $props = [])
 	{
 		// Preparing default data to show in the calendar posting form.
-		if ($id < 0)
-		{
+		if ($id < 0) {
 			$this->id = $id;
 			$props['start_timestamp'] = time();
 			$props['end_timestamp'] = time() + 3600;
@@ -237,14 +232,12 @@ public function __construct(int $id = 0, array $props = array())
 			$props['name'] = User::$me->name;
 		}
 		// Creating a new event.
-		elseif ($id == 0)
-		{
+		elseif ($id == 0) {
 			$props['member'] = $props['member'] ?? User::$me->id;
 			$props['name'] = $props['name'] ?? User::$me->name;
 		}
 		// Loading an existing event.
-		else
-		{
+		else {
 			$this->id = $id;
 			self::$loaded[$this->id] = $this;
 		}
@@ -252,8 +245,7 @@ public function __construct(int $id = 0, array $props = array())
 		$this->set($props);
 
 		// This shouldn't happen, but just in case...
-		if (!isset($this->start))
-		{
+		if (!isset($this->start)) {
 			$this->start = new Time('today');
 			$this->end = new Time('today');
 			$this->allday = true;
@@ -268,9 +260,8 @@ public function save(): void
 		$is_edit = !empty($this->id);
 
 		// Saving a new event.
-		if (empty($this->id))
-		{
-			$columns = array(
+		if (empty($this->id)) {
+			$columns = [
 				'start_date' => 'date',
 				'end_date' => 'date',
 				'id_board' => 'int',
@@ -278,9 +269,9 @@ public function save(): void
 				'title' => 'string-60',
 				'id_member' => 'int',
 				'location' => 'string-255',
-			);
+			];
 
-			$params = array(
+			$params = [
 				$this->start->format('Y-m-d'),
 				$this->end->format('Y-m-d'),
 				$this->board,
@@ -288,10 +279,9 @@ public function save(): void
 				$this->title,
 				$this->member,
 				$this->location,
-			);
+			];
 
-			if (!$this->allday)
-			{
+			if (!$this->allday) {
 				$columns['start_time'] = 'time';
 				$params[] = $this->start->format('H:i:s');
 
@@ -302,31 +292,31 @@ public function save(): void
 				$params[] = $this->start->format('e');
 			}
 
-			IntegrationHook::call('integrate_create_event', array((array) $this, &$columns, &$params));
+			IntegrationHook::call('integrate_create_event', [(array) $this, &$columns, &$params]);
 
-			$this->id = Db::$db->insert('',
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}calendar',
 				$columns,
 				$params,
-				array('id_event'),
-				1
+				['id_event'],
+				1,
 			);
 
 			self::$loaded[$this->id] = $this;
 		}
 		// Updating an existing event.
-		else
-		{
-			$set = array(
+		else {
+			$set = [
 				'start_date = {date:start_date}',
 				'end_date = {date:end_date}',
 				'title = SUBSTRING({string:title}, 1, 60)',
 				'id_board = {int:id_board}',
 				'id_topic = {int:id_topic}',
 				'location = SUBSTRING({string:location}, 1, 255)',
-			);
+			];
 
-			$params = array(
+			$params = [
 				'id' => $this->id,
 				'start_date' => $this->start->format('Y-m-d'),
 				'end_date' => $this->end->format('Y-m-d'),
@@ -334,16 +324,13 @@ public function save(): void
 				'location' => $this->location,
 				'id_board' => $this->board,
 				'id_topic' => $this->topic,
-			);
+			];
 
-			if ($this->allday)
-			{
+			if ($this->allday) {
 				$set[] = 'start_time = NULL';
 				$set[] = 'end_time = NULL';
 				$set[] = 'timezone = NULL';
-			}
-			else
-			{
+			} else {
 				$set[] = 'start_time = {time:start_time}';
 				$params['start_time'] = $this->start->format('H:i:s');
 
@@ -355,19 +342,20 @@ public function save(): void
 			}
 
 			// Why pass `$this->id` if we're also passing `$this`, you ask? For historical reasons.
-			IntegrationHook::call('integrate_modify_event', array($this->id, $this, &$set, &$params));
+			IntegrationHook::call('integrate_modify_event', [$this->id, $this, &$set, &$params]);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}calendar
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}calendar
 				SET ' . (implode(', ', $set)) . '
 				WHERE id_event = {int:id}',
-				$params
+				$params,
 			);
 		}
 
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 	}
 
 	/**
@@ -377,34 +365,36 @@ public function getVEvent(): string
 	{
 		// Check the title isn't too long - iCal requires some formatting if so.
 		$title = str_split($this->title, 30);
-		foreach ($title as $id => $line)
-		{
-			if ($id != 0)
+
+		foreach ($title as $id => $line) {
+			if ($id != 0) {
 				$title[$id] = ' ' . $title[$id];
+			}
 		}
 
 		// This is what we will be sending later.
-		$filecontents = array();
+		$filecontents = [];
 		$filecontents[] = 'BEGIN:VEVENT';
 		$filecontents[] = 'ORGANIZER;CN="' . $this->name . '":MAILTO:' . Config::$webmaster_email;
-		$filecontents[] = 'DTSTAMP:' . date('Ymd\THis\Z', time());
-		$filecontents[] = 'DTSTART' . (!$this->allday ? ';TZID=' . $this->tz : ';VALUE=DATE') . ':' . $this->start->format('Ymd' . ($this->allday ? '' : '\THis'));
+		$filecontents[] = 'DTSTAMP:' . date('Ymd\\THis\\Z', time());
+		$filecontents[] = 'DTSTART' . (!$this->allday ? ';TZID=' . $this->tz : ';VALUE=DATE') . ':' . $this->start->format('Ymd' . ($this->allday ? '' : '\\THis'));
 
 		// Event has a duration/
 		if (
 			(!$this->allday && $this->start_iso_gmdate != $this->end_iso_gmdate)
 			|| ($this->allday && $this->start_date != $this->end_date)
-		)
-		{
-			$filecontents[] = 'DTEND' . (!$this->allday ? ';TZID=' . $this->tz : ';VALUE=DATE') . ':' . $this->end->format('Ymd' . ($this->allday ? '' : '\THis'));
+		) {
+			$filecontents[] = 'DTEND' . (!$this->allday ? ';TZID=' . $this->tz : ';VALUE=DATE') . ':' . $this->end->format('Ymd' . ($this->allday ? '' : '\\THis'));
 		}
 
 		// Event has changed? Advance the sequence for this UID.
-		if ($this->sequence > 0)
+		if ($this->sequence > 0) {
 			$filecontents[] = 'SEQUENCE:' . $this->sequence;
+		}
 
-		if (!empty($this->location))
-			$filecontents[] = 'LOCATION:' . str_replace(',', '\,', $this->location);
+		if (!empty($this->location)) {
+			$filecontents[] = 'LOCATION:' . str_replace(',', '\\,', $this->location);
+		}
 
 		$filecontents[] = 'SUMMARY:' . implode('', $title);
 		$filecontents[] = 'UID:' . $this->id . '@' . str_replace(' ', '-', Config::$mbname);
@@ -420,22 +410,21 @@ public function fixTimezone(): void
 	{
 		$all_timezones = Utils::$context['all_timezones'] ?? TimeZone::list($this->start_date);
 
-		if (!isset($all_timezones[$this->timezone]))
-		{
+		if (!isset($all_timezones[$this->timezone])) {
 			$later = strtotime('@' . $this->start_timestamp . ' + 1 year');
 			$tzinfo = timezone_transitions_get(timezone_open($this->timezone), $this->start_timestamp, $later);
 
 			$found = false;
-			foreach ($all_timezones as $possible_tzid => $dummy)
-			{
+
+			foreach ($all_timezones as $possible_tzid => $dummy) {
 				// Ignore the "-----" option
-				if (empty($possible_tzid))
+				if (empty($possible_tzid)) {
 					continue;
+				}
 
 				$possible_tzinfo = timezone_transitions_get(timezone_open($possible_tzid), $this->start_timestamp, $later);
 
-				if ($tzinfo === $possible_tzinfo)
-				{
+				if ($tzinfo === $possible_tzinfo) {
 					$this->timezone = $possible_tzid;
 					$found = true;
 					break;
@@ -443,9 +432,8 @@ public function fixTimezone(): void
 			}
 
 			// Hm. That's weird. Well, just prepend it to the list and let the user deal with it.
-			if (!$found)
-			{
-				$all_timezones = array($this->timezone => '[UTC' . $this->start->format($d, 'P') . '] - ' . $this->timezone) + $all_timezones;
+			if (!$found) {
+				$all_timezones = [$this->timezone => '[UTC' . $this->start->format($d, 'P') . '] - ' . $this->timezone] + $all_timezones;
 			}
 		}
 	}
@@ -458,49 +446,43 @@ public function fixTimezone(): void
 	 */
 	public function __set(string $prop, $value): void
 	{
-		if (property_exists($this, $prop))
-		{
+		if (property_exists($this, $prop)) {
 			$this->{$prop} = $value;
-		}
-		elseif (array_key_exists($prop, $this->prop_aliases))
-		{
+		} elseif (array_key_exists($prop, $this->prop_aliases)) {
 			// Can't unset a virtual property.
-			if (is_null($value))
+			if (is_null($value)) {
 				return;
+			}
 
 			$real_prop = $this->prop_aliases[$prop];
 
-			if (strpos($real_prop, '!') === 0)
-			{
+			if (strpos($real_prop, '!') === 0) {
 				$real_prop = ltrim($real_prop, '!');
 				$value = !$value;
 			}
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
 				$this->{$real_prop[0]}[$real_prop[1]] = $value;
-			}
-			else
-			{
+			} else {
 				$this->{$real_prop} = $value;
 			}
-		}
-		else
-		{
+		} else {
 			// For simplicity's sake...
-			if (in_array($prop, array('year', 'month', 'day', 'hour', 'minute', 'second')))
+			if (in_array($prop, ['year', 'month', 'day', 'hour', 'minute', 'second'])) {
 				$prop = 'start_' . $prop;
+			}
 
-			if (($start_end = substr($prop, 0, (int) strpos($prop, '_'))) !== 'end')
+			if (($start_end = substr($prop, 0, (int) strpos($prop, '_'))) !== 'end') {
 				$start_end = 'start';
+			}
 
-			if (!isset($this->{$start_end}))
+			if (!isset($this->{$start_end})) {
 				$this->{$start_end} = new Time();
+			}
 
-			switch ($prop)
-			{
+			switch ($prop) {
 				case 'start_datetime':
 				case 'end_datetime':
 					$this->{$start_end}->datetime = $value;
@@ -564,6 +546,7 @@ public function __set(string $prop, $value): void
 				case 'start_second':
 				case 'end_second':
 					$this->{$start_end}->second = $value;
+					// no break
 
 				case 'start_timestamp':
 				case 'end_timestamp':
@@ -578,16 +561,14 @@ public function __set(string $prop, $value): void
 				case 'tz':
 				case 'tzid':
 				case 'timezone':
-					if ($value instanceof \DateTimeZone)
-					{
+					if ($value instanceof \DateTimeZone) {
 						$this->start->setTimezone($value);
 						$this->end->setTimezone($value);
-					}
-					else
-					{
+					} else {
 						$this->start->timezone = $value;
 						$this->end->timezone = $value;
 					}
+
 					break;
 
 				case 'span':
@@ -614,8 +595,9 @@ public function __set(string $prop, $value): void
 		}
 
 		// Ensure that the dates still make sense with each other.
-		if (isset($this->start, $this->end))
+		if (isset($this->start, $this->end)) {
 			self::fixEndDate($this->start, $this->end);
+		}
 	}
 
 	/**
@@ -625,169 +607,165 @@ public function __set(string $prop, $value): void
 	 */
 	public function __get(string $prop): mixed
 	{
-		if (property_exists($this, $prop))
-		{
+		if (property_exists($this, $prop)) {
 			return $this->{$prop} ?? null;
 		}
-		elseif (array_key_exists($prop, $this->prop_aliases))
-		{
+
+		if (array_key_exists($prop, $this->prop_aliases)) {
 			$real_prop = $this->prop_aliases[$prop];
 
-			if (($not = strpos($real_prop, '!') === 0))
+			if (($not = strpos($real_prop, '!') === 0)) {
 				$real_prop = ltrim($real_prop, '!');
+			}
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
 				$value = $this->{$real_prop[0]}[$real_prop[1]];
-			}
-			else
-			{
+			} else {
 				$value = $this->{$real_prop};
 			}
 
 			return $not ? !$value : $value;
 		}
-		else
-		{
-			if (in_array($prop, array('year', 'month', 'day', 'hour', 'minute', 'second')))
-				$prop = 'start_' . $prop;
-
-			if (($start_end = substr($prop, 0, (int) strpos($prop, '_'))) !== 'end')
-				$start_end = 'start';
-
-			switch ($prop)
-			{
-				case 'start_datetime':
-				case 'end_datetime':
-					$value = $this->{$start_end}->datetime;
-					break;
-
-				case 'start_date':
-				case 'end_date':
-					$value = $this->{$start_end}->date;
-					break;
-
-				case 'start_date_local':
-				case 'end_date_local':
-					$value = $this->{$start_end}->date_local;
-					break;
-
-				case 'start_date_orig':
-				case 'end_date_orig':
-					$value = $this->{$start_end}->date_orig;
-					break;
-
-				case 'start_time':
-				case 'end_time':
-					$value = $this->{$start_end}->time;
-					break;
-
-				case 'start_time_local':
-				case 'end_time_local':
-					$value = $this->{$start_end}->time_local;
-					break;
-
-				case 'start_time_orig':
-				case 'end_time_orig':
-					$value = $this->{$start_end}->time_orig;
-					break;
-
-				case 'start_year':
-				case 'end_year':
-					$value = $this->{$start_end}->format('Y');
-					break;
-
-				case 'start_month':
-				case 'end_month':
-					$value = $this->{$start_end}->format('m');
-					break;
-
-				case 'start_day':
-				case 'end_day':
-					$value = $this->{$start_end}->format('d');
-					break;
-
-				case 'start_hour':
-				case 'end_hour':
-					$value = $this->{$start_end}->format('H');
-					break;
-
-				case 'start_minute':
-				case 'end_minute':
-					$value = $this->{$start_end}->format('i');
-					break;
-
-				case 'start_second':
-				case 'end_second':
-					$value = $this->{$start_end}->format('s');
-					break;
-
-				case 'start_timestamp':
-				case 'end_timestamp':
-					$value = $this->{$start_end}->getTimestamp() - ($this->allday ? $this->{$start_end}->getTimestamp() % 86400 : 0);
-					break;
-
-				case 'start_iso_gmdate':
-				case 'end_iso_gmdate':
-					$value = $this->allday ? preg_replace('/T\d\d:\d\d:\d\d/', 'T00:00:00', $this->{$start_end}->iso_gmdate) : $this->{$start_end}->iso_gmdate;
-					break;
-
-				case 'tz':
-				case 'tzid':
-				case 'timezone':
-					$value = $this->start->timezone;
-					break;
-
-				case 'tz_abbrev':
-					$value = $this->start->tz_abbrev;
-					break;
-
-				case 'span':
-				case 'num_days':
-					$value = $this->getNumDays();
-					break;
-
-				case 'new':
-					$value = !isset($this->id) || $this->id < 1;
-					break;
-
-				case 'is_selected':
-					$value = !empty(Utils::$context['selected_event']) && Utils::$context['selected_event'] == $this->id;
-					break;
-
-				case 'href':
-					$value = empty($this->topic) ? '' : Config::$scripturl . '?topic=' . $this->topic . '.0';
-					break;
-
-				case 'link':
-					$value = empty($this->topic) ? $this->title : '<a href="' . Config::$scripturl . '?topic=' . $this->topic . '.0">' . $this->title . '</a>';
-					break;
-
-				case 'can_edit':
-					$value = $this->use_permissions ? User::$me->allowedTo('calendar_edit_any') || ($this->member == User::$me->id && User::$me->allowedTo('calendar_edit_own')) : false;
-					break;
 
-				case 'modify_href':
-					$value = Config::$scripturl . '?action=' . ($this->board == 0 ? 'calendar;sa=post;' : 'post;msg=' . $this->msg . ';topic=' .$this->topic . '.0;calendar;') . 'eventid=' . $this->id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
-					break;
-
-				case 'can_export':
-					$value = !empty(Config::$modSettings['cal_export']);
-					break;
-
-				case 'export_href':
-					$value = Config::$scripturl . '?action=calendar;sa=ical;eventid=' . $this->id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
-					break;
+		if (in_array($prop, ['year', 'month', 'day', 'hour', 'minute', 'second'])) {
+			$prop = 'start_' . $prop;
+		}
 
-				default:
-					$value = $this->custom[$prop] ?? null;
-					break;
-			}
+		if (($start_end = substr($prop, 0, (int) strpos($prop, '_'))) !== 'end') {
+			$start_end = 'start';
+		}
 
-			return $value;
+		switch ($prop) {
+			case 'start_datetime':
+			case 'end_datetime':
+				$value = $this->{$start_end}->datetime;
+				break;
+
+			case 'start_date':
+			case 'end_date':
+				$value = $this->{$start_end}->date;
+				break;
+
+			case 'start_date_local':
+			case 'end_date_local':
+				$value = $this->{$start_end}->date_local;
+				break;
+
+			case 'start_date_orig':
+			case 'end_date_orig':
+				$value = $this->{$start_end}->date_orig;
+				break;
+
+			case 'start_time':
+			case 'end_time':
+				$value = $this->{$start_end}->time;
+				break;
+
+			case 'start_time_local':
+			case 'end_time_local':
+				$value = $this->{$start_end}->time_local;
+				break;
+
+			case 'start_time_orig':
+			case 'end_time_orig':
+				$value = $this->{$start_end}->time_orig;
+				break;
+
+			case 'start_year':
+			case 'end_year':
+				$value = $this->{$start_end}->format('Y');
+				break;
+
+			case 'start_month':
+			case 'end_month':
+				$value = $this->{$start_end}->format('m');
+				break;
+
+			case 'start_day':
+			case 'end_day':
+				$value = $this->{$start_end}->format('d');
+				break;
+
+			case 'start_hour':
+			case 'end_hour':
+				$value = $this->{$start_end}->format('H');
+				break;
+
+			case 'start_minute':
+			case 'end_minute':
+				$value = $this->{$start_end}->format('i');
+				break;
+
+			case 'start_second':
+			case 'end_second':
+				$value = $this->{$start_end}->format('s');
+				break;
+
+			case 'start_timestamp':
+			case 'end_timestamp':
+				$value = $this->{$start_end}->getTimestamp() - ($this->allday ? $this->{$start_end}->getTimestamp() % 86400 : 0);
+				break;
+
+			case 'start_iso_gmdate':
+			case 'end_iso_gmdate':
+				$value = $this->allday ? preg_replace('/T\d\d:\d\d:\d\d/', 'T00:00:00', $this->{$start_end}->iso_gmdate) : $this->{$start_end}->iso_gmdate;
+				break;
+
+			case 'tz':
+			case 'tzid':
+			case 'timezone':
+				$value = $this->start->timezone;
+				break;
+
+			case 'tz_abbrev':
+				$value = $this->start->tz_abbrev;
+				break;
+
+			case 'span':
+			case 'num_days':
+				$value = $this->getNumDays();
+				break;
+
+			case 'new':
+				$value = !isset($this->id) || $this->id < 1;
+				break;
+
+			case 'is_selected':
+				$value = !empty(Utils::$context['selected_event']) && Utils::$context['selected_event'] == $this->id;
+				break;
+
+			case 'href':
+				$value = empty($this->topic) ? '' : Config::$scripturl . '?topic=' . $this->topic . '.0';
+				break;
+
+			case 'link':
+				$value = empty($this->topic) ? $this->title : '<a href="' . Config::$scripturl . '?topic=' . $this->topic . '.0">' . $this->title . '</a>';
+				break;
+
+			case 'can_edit':
+				$value = $this->use_permissions ? User::$me->allowedTo('calendar_edit_any') || ($this->member == User::$me->id && User::$me->allowedTo('calendar_edit_own')) : false;
+				break;
+
+			case 'modify_href':
+				$value = Config::$scripturl . '?action=' . ($this->board == 0 ? 'calendar;sa=post;' : 'post;msg=' . $this->msg . ';topic=' . $this->topic . '.0;calendar;') . 'eventid=' . $this->id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
+				break;
+
+			case 'can_export':
+				$value = !empty(Config::$modSettings['cal_export']);
+				break;
+
+			case 'export_href':
+				$value = Config::$scripturl . '?action=calendar;sa=ical;eventid=' . $this->id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
+				break;
+
+			default:
+				$value = $this->custom[$prop] ?? null;
+				break;
 		}
+
+		return $value;
 	}
 
 	/**
@@ -797,87 +775,81 @@ public function __get(string $prop): mixed
 	 */
 	public function __isset(string $prop): bool
 	{
-		if (property_exists($this, $prop))
-		{
+		if (property_exists($this, $prop)) {
 			return isset($this->{$prop});
 		}
-		elseif (array_key_exists($prop, $this->prop_aliases))
-		{
+
+		if (array_key_exists($prop, $this->prop_aliases)) {
 			$real_prop = ltrim($this->prop_aliases[$prop], '!');
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
 				return isset($this->{$real_prop[0]}[$real_prop[1]]);
 			}
-			else
-			{
-				return isset($this->{$real_prop});
-			}
-		}
-		else
-		{
-			if (in_array($prop, array('year', 'month', 'day', 'hour', 'minute', 'second')))
-				$prop = 'start_' . $prop;
-
-			switch ($prop)
-			{
-				case 'start_datetime':
-				case 'start_date':
-				case 'start_time':
-				case 'start_year':
-				case 'start_month':
-				case 'start_day':
-				case 'start_hour':
-				case 'start_minute':
-				case 'start_second':
-				case 'start_date_local':
-				case 'start_date_orig':
-				case 'start_time_local':
-				case 'start_time_orig':
-				case 'start_timestamp':
-				case 'start_iso_gmdate':
-				case 'tz':
-				case 'tzid':
-				case 'timezone':
-				case 'tz_abbrev':
-					return property_exists($this, 'start');
-
-				case 'end_datetime':
-				case 'end_date':
-				case 'end_time':
-				case 'end_year':
-				case 'end_month':
-				case 'end_day':
-				case 'end_hour':
-				case 'end_minute':
-				case 'end_second':
-				case 'end_date_local':
-				case 'end_date_orig':
-				case 'end_time_local':
-				case 'end_time_orig':
-				case 'end_timestamp':
-				case 'end_iso_gmdate':
-					return property_exists($this, 'end');
 
-				case 'span':
-				case 'num_days':
-					return property_exists($this, 'start') && property_exists($this, 'end');
+			return isset($this->{$real_prop});
+		}
 
-				case 'new':
-				case 'is_selected':
-				case 'href':
-				case 'link':
-				case 'can_edit':
-				case 'modify_href':
-				case 'can_export':
-				case 'export_href':
-					return true;
+		if (in_array($prop, ['year', 'month', 'day', 'hour', 'minute', 'second'])) {
+			$prop = 'start_' . $prop;
+		}
 
-				default:
-					return isset($this->custom[$prop]);
-			}
+		switch ($prop) {
+			case 'start_datetime':
+			case 'start_date':
+			case 'start_time':
+			case 'start_year':
+			case 'start_month':
+			case 'start_day':
+			case 'start_hour':
+			case 'start_minute':
+			case 'start_second':
+			case 'start_date_local':
+			case 'start_date_orig':
+			case 'start_time_local':
+			case 'start_time_orig':
+			case 'start_timestamp':
+			case 'start_iso_gmdate':
+			case 'tz':
+			case 'tzid':
+			case 'timezone':
+			case 'tz_abbrev':
+				return property_exists($this, 'start');
+
+			case 'end_datetime':
+			case 'end_date':
+			case 'end_time':
+			case 'end_year':
+			case 'end_month':
+			case 'end_day':
+			case 'end_hour':
+			case 'end_minute':
+			case 'end_second':
+			case 'end_date_local':
+			case 'end_date_orig':
+			case 'end_time_local':
+			case 'end_time_orig':
+			case 'end_timestamp':
+			case 'end_iso_gmdate':
+				return property_exists($this, 'end');
+
+			case 'span':
+			case 'num_days':
+				return property_exists($this, 'start') && property_exists($this, 'end');
+
+			case 'new':
+			case 'is_selected':
+			case 'href':
+			case 'link':
+			case 'can_edit':
+			case 'modify_href':
+			case 'can_export':
+			case 'export_href':
+				return true;
+
+			default:
+				return isset($this->custom[$prop]);
 		}
 	}
 
@@ -895,10 +867,11 @@ public function __isset(string $prop): bool
 	 */
 	public static function load(int $id, bool $is_topic = false, bool $use_permissions = true): array
 	{
-		if ($id <= 0)
+		if ($id <= 0) {
 			return $is_topic ? false : new self($id);
+		}
 
-		$loaded = array();
+		$loaded = [];
 
 		self::$keep_all = true;
 
@@ -906,15 +879,15 @@ public static function load(int $id, bool $is_topic = false, bool $use_permissio
 		$query_customizations['limit'] = 1;
 		$query_customizations['params']['id'] = $id;
 
-		if ($use_permissions)
-		{
+		if ($use_permissions) {
 			$query_customizations['where'][] = '(cal.id_board = {int:no_board_link} OR {query_wanna_see_board})';
 
 			$query_customizations['params']['no_board_link'] = 0;
 		}
 
-		foreach (self::get('', '', $use_permissions, $query_customizations) as $event)
+		foreach (self::get('', '', $use_permissions, $query_customizations) as $event) {
 			$loaded[] = $event;
+		}
 
 		self::$keep_all = false;
 
@@ -930,14 +903,15 @@ public static function load(int $id, bool $is_topic = false, bool $use_permissio
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return array Instances of this class for the loaded events.
 	 */
-	public static function loadRange(string $low_date, string $high_date, bool $use_permissions = true, array $query_customizations = array()): array
+	public static function loadRange(string $low_date, string $high_date, bool $use_permissions = true, array $query_customizations = []): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		self::$keep_all = true;
 
-		foreach (self::get($low_date, $high_date, $use_permissions, $query_customizations) as $event)
+		foreach (self::get($low_date, $high_date, $use_permissions, $query_customizations) as $event) {
 			$loaded[$event->id] = $event;
+		}
 
 		self::$keep_all = false;
 
@@ -959,9 +933,9 @@ public static function loadRange(string $low_date, string $high_date, bool $use_
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return Generator<object> Iterating over result gives Event instances.
 	 */
-	public static function get(string $low_date, string $high_date, bool $use_permissions = true, array $query_customizations = array())
+	public static function get(string $low_date, string $high_date, bool $use_permissions = true, array $query_customizations = [])
 	{
-		$selects = $query_customizations['selects'] ?? array(
+		$selects = $query_customizations['selects'] ?? [
 			'cal.*',
 			'b.id_board',
 			'b.member_groups',
@@ -969,35 +943,37 @@ public static function get(string $low_date, string $high_date, bool $use_permis
 			't.approved',
 			'm.modified_time',
 			'mem.real_name',
-		);
-		$joins = $query_customizations['joins'] ?? array(
+		];
+		$joins = $query_customizations['joins'] ?? [
 			'LEFT JOIN {db_prefix}boards AS b ON (b.id_board = cal.id_board)',
 			'LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = cal.id_topic)',
 			'LEFT JOIN {db_prefix}messages AS m ON (m.id_msg  = t.id_first_msg)',
 			'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = cal.id_member)',
-		);
-		$where = $query_customizations['where'] ?? array(
+		];
+		$where = $query_customizations['where'] ?? [
 			'cal.start_date <= {date:high_date}',
 			'cal.end_date >= {date:low_date}',
-		);
-		$order = $query_customizations['order'] ?? array();
+		];
+		$order = $query_customizations['order'] ?? [];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? 0;
-		$params = $query_customizations['params'] ?? array(
+		$params = $query_customizations['params'] ?? [
 			'high_date' => $high_date,
 			'low_date' => $low_date,
 			'no_board_link' => 0,
-		);
+		];
 
-		if ($use_permissions)
+		if ($use_permissions) {
 			$where[] = '(cal.id_board = {int:no_board_link} OR {query_wanna_see_board})';
+		}
 
-		IntegrationHook::call('integrate_query_event', array(&$selects, &$params, &$joins, &$where, &$order, &$limit));
+		IntegrationHook::call('integrate_query_event', [&$selects, &$params, &$joins, &$where, &$order, &$group, &$limit]);
 
-		foreach(self::queryData($selects, $params, $joins, $where, $order, $limit) as $row)
-		{
+		foreach(self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			// If the attached topic is not approved then for the moment pretend it doesn't exist.
-			if (!empty($row['id_first_msg']) && Config::$modSettings['postmod_active'] && !$row['approved'])
+			if (!empty($row['id_first_msg']) && Config::$modSettings['postmod_active'] && !$row['approved']) {
 				continue;
+			}
 
 			unset($row['approved']);
 
@@ -1006,8 +982,9 @@ public static function get(string $low_date, string $high_date, bool $use_permis
 
 			yield (new self($id, $row));
 
-			if (!self::$keep_all)
+			if (!self::$keep_all) {
 				unset(self::$loaded[$id]);
+			}
 		}
 	}
 
@@ -1021,8 +998,9 @@ public static function get(string $low_date, string $high_date, bool $use_permis
 	public static function create(array $eventOptions): void
 	{
 		// Sanitize the title and location.
-		foreach (array('title', 'location') as $key)
+		foreach (['title', 'location'] as $key) {
 			$eventOptions[$key] = Utils::htmlspecialchars($eventOptions[$key] ?? '', ENT_QUOTES);
+		}
 
 		// Set the start and end dates.
 		self::setStartEnd($eventOptions);
@@ -1031,29 +1009,27 @@ public static function create(array $eventOptions): void
 		$event->save();
 
 		// If this isn't tied to a topic, we need to notify people about it.
-		if (empty($event->topic))
-		{
-			Db::$db->insert('insert',
+		if (empty($event->topic)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}background_tasks',
-				array(
-					'task_file' => 'string',
+				[
 					'task_class' => 'string',
 					'task_data' => 'string',
 					'claimed_time' => 'int',
-				),
-				array(
-					'$sourcedir/tasks/EventNew_Notify.php',
-					'SMF\Tasks\EventNew_Notify',
-					Utils::jsonEncode(array(
+				],
+				[
+					'SMF\\Tasks\\EventNew_Notify',
+					Utils::jsonEncode([
 						'event_title' => $event->title,
 						'event_id' => $event->id,
 						'sender_id' => $event->member,
 						'sender_name' => $event->member == User::$me->id ? User::$me->name : '',
 						'time' => time(),
-					)),
+					]),
 					0,
-				),
-				array('id_task')
+				],
+				['id_task'],
 			);
 		}
 	}
@@ -1069,8 +1045,9 @@ public static function create(array $eventOptions): void
 	public static function modify(int $id, array &$eventOptions): void
 	{
 		// Sanitize the title and location.
-		foreach (array('title', 'location') as $key)
+		foreach (['title', 'location'] as $key) {
 			$eventOptions[$key] = Utils::htmlspecialchars($eventOptions[$key] ?? '', ENT_QUOTES);
+		}
 
 		// Set the new start and end dates.
 		self::setStartEnd($eventOptions);
@@ -1089,19 +1066,20 @@ public static function modify(int $id, array &$eventOptions): void
 	 */
 	public static function remove(int $id): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}calendar
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}calendar
 			WHERE id_event = {int:id_event}',
-			array(
+			[
 				'id_event' => $id,
-			)
+			],
 		);
 
-		IntegrationHook::call('integrate_remove_event', array($id));
+		IntegrationHook::call('integrate_remove_event', [$id]);
 
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 
 		unset(self::$loaded[$id]);
 	}
@@ -1120,8 +1098,9 @@ public static function remove(int $id): void
 	 */
 	protected function getNumDays(): int
 	{
-		if (!($this->start instanceof \DateTimeInterface) || !($this->end instanceof \DateTimeInterface) || $this->end->getTimestamp() < $this->start->getTimestamp())
+		if (!($this->start instanceof \DateTimeInterface) || !($this->end instanceof \DateTimeInterface) || $this->end->getTimestamp() < $this->start->getTimestamp()) {
 			return 0;
+		}
 
 		return date_interval_format(date_diff($this->start, $this->end), '%a') + ($end->format('H') < $start->format('H') ? 2 : 1);
 	}
@@ -1138,13 +1117,15 @@ protected function getNumDays(): int
 	 */
 	protected function setNumDays(int $num_days): void
 	{
-		if (!($this->start instanceof \DateTimeInterface) || !($this->end instanceof \DateTimeInterface) || $num_days < 1)
+		if (!($this->start instanceof \DateTimeInterface) || !($this->end instanceof \DateTimeInterface) || $num_days < 1) {
 			return;
+		}
 
 		$current_span = $this->getNumDays();
 
-		if ($current_span == $num_days)
+		if ($current_span == $num_days) {
 			return;
+		}
 
 		$this->end->modify($current_span < $num_days ? '+' : '-' . ($num_days - $current_span) . ' days');
 	}
@@ -1155,16 +1136,17 @@ protected function setNumDays(int $num_days): void
 	protected function fixEndDate(): void
 	{
 		// Must always use the same time zone for both dates.
-		if ($this->end->format('e') !== $this->start->format('e'))
+		if ($this->end->format('e') !== $this->start->format('e')) {
 			$this->end->setTimezone($this->start->getTimezone());
+		}
 
 		// End date can't be before the start date.
-		if ($this->end->getTimestamp() < $this->start->getTimestamp())
+		if ($this->end->getTimestamp() < $this->start->getTimestamp()) {
 			$this->end->setTimestamp($this->start->getTimestamp());
+		}
 
 		// If the event is too long, cap it at the max.
-		if (!empty(Config::$modSettings['cal_maxspan']) && $this->getNumDays() > Config::$modSettings['cal_maxspan'])
-		{
+		if (!empty(Config::$modSettings['cal_maxspan']) && $this->getNumDays() > Config::$modSettings['cal_maxspan']) {
 			$this->setNumDays(Config::$modSettings['cal_maxspan']);
 		}
 	}
@@ -1186,25 +1168,29 @@ protected function fixEndDate(): void
 	 *    If this is left empty, no WHERE clause will be used.
 	 * @param array $order Zero or more conditions for the ORDER BY clause.
 	 *    If this is left empty, no ORDER BY clause will be used.
+	 * @param array $group Zero or more conditions for the GROUP BY clause.
+	 *    If this is left empty, no GROUP BY clause will be used.
 	 * @param int|string $limit Maximum number of results to retrieve.
 	 *    If this is left empty, all results will be retrieved.
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), int|string $limit = 0)
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
 	{
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $selects) . '
 			FROM {db_prefix}calendar AS cal' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
-			WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
+			WHERE (' . implode(') AND (', $where) . ')') . (empty($group) ? '' : '
+			GROUP BY ' . implode(', ', $group)) . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . (!empty($limit) ? '
 			LIMIT ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// First, clear out any null values.
 			$row = array_diff($row, array_filter($row, 'is_null'));
 
@@ -1219,7 +1205,7 @@ protected static function queryData(array $selects, array $params = array(), arr
 			unset($row['start_date'], $row['start_time'], $row['end_date'], $row['end_time'], $row['timezone']);
 
 			// The groups should be an array.
-			$row['member_groups'] = isset($row['member_groups']) ? explode(',', $row['member_groups']) : array();
+			$row['member_groups'] = isset($row['member_groups']) ? explode(',', $row['member_groups']) : [];
 
 			yield $row;
 		}
@@ -1241,12 +1227,9 @@ protected static function queryData(array $selects, array $params = array(), arr
 	protected static function setStartEnd(array &$eventOptions): void
 	{
 		// Convert unprefixed time unit parameters to start_* parameters.
-		foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $key)
-		{
-			foreach (array($eventOptions, $_POST) as &$array)
-			{
-				if (isset($array[$key]))
-				{
+		foreach (['year', 'month', 'day', 'hour', 'minute', 'second'] as $key) {
+			foreach ([$eventOptions, $_POST] as &$array) {
+				if (isset($array[$key])) {
 					$array['start_' . $key] = $array[$key];
 					unset($array[$key]);
 				}
@@ -1254,33 +1237,34 @@ protected static function setStartEnd(array &$eventOptions): void
 		}
 
 		// Try to fill missing values in $eventOptions with values from $_POST.
-		foreach (array('year', 'month', 'day', 'hour', 'minute', 'second', 'date', 'time', 'datetime') as $key)
-		{
+		foreach (['year', 'month', 'day', 'hour', 'minute', 'second', 'date', 'time', 'datetime'] as $key) {
 			$eventOptions['start_' . $key] = $eventOptions['start_' . $key] ?? ($_POST['start_' . $key] ?? null);
 
 			$eventOptions['end_' . $key] = $eventOptions['end_' . $key] ?? ($_POST['end_' . $key] ?? null);
 		}
 
-		foreach (array('allday', 'timezone') as $key)
+		foreach (['allday', 'timezone'] as $key) {
 			$eventOptions[$key] = $eventOptions[$key] ?? ($_POST[$key] ?? null);
+		}
 
 		// Standardize the input.
 		$eventOptions = self::standardizeEventOptions($eventOptions);
 
 		// Create our two Time objects.
-		$eventOptions['start'] = new Time(implode(' ', array($eventOptions['start_date'], $eventOptions['start_time'], $eventOptions['timezone'])));
+		$eventOptions['start'] = new Time(implode(' ', [$eventOptions['start_date'], $eventOptions['start_time'], $eventOptions['timezone']]));
 
-		$eventOptions['end'] = new Time(implode(' ', array($eventOptions['end_date'], $eventOptions['end_time'], $eventOptions['timezone'])));
+		$eventOptions['end'] = new Time(implode(' ', [$eventOptions['end_date'], $eventOptions['end_time'], $eventOptions['timezone']]));
 
 		// Make sure the two dates have a sane relationship.
-		if ($eventOptions['end']->getTimestamp() < $eventOptions['start']->getTimestamp())
+		if ($eventOptions['end']->getTimestamp() < $eventOptions['start']->getTimestamp()) {
 			$eventOptions['end']->setTimestamp($eventOptions['start']->getTimestamp());
+		}
 
 		// Ensure 'allday' is a boolean.
 		$eventOptions['allday'] = !empty($eventOptions['allday']);
 
 		// Unset all null values and all scalar date/time parameters.
-		$scalars = array(
+		$scalars = [
 			'year',
 			'month',
 			'day',
@@ -1321,12 +1305,12 @@ protected static function setStartEnd(array &$eventOptions): void
 			'tz',
 			'tzid',
 			'tz_abbrev',
-		);
+		];
 
-		foreach($eventOptions as $key => $value)
-		{
-			if (is_null($value) || in_array($key, $scalars))
+		foreach($eventOptions as $key => $value) {
+			if (is_null($value) || in_array($key, $scalars)) {
 				unset($eventOptions[$key]);
+			}
 		}
 	}
 
@@ -1350,10 +1334,8 @@ protected static function setStartEnd(array &$eventOptions): void
 	 */
 	protected static function standardizeEventOptions($input): array
 	{
-		foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $key)
-		{
-			if (isset($input[$key]))
-			{
+		foreach (['year', 'month', 'day', 'hour', 'minute', 'second'] as $key) {
+			if (isset($input[$key])) {
 				$input['start_' . $key] = $input[$key];
 				unset($input[$key]);
 			}
@@ -1361,13 +1343,13 @@ protected static function standardizeEventOptions($input): array
 
 		$input['allday'] = !empty($input['allday']);
 
-		if (!isset($input['timezone']) || ($tz = @timezone_open($input['timezone'])) === false)
+		if (!isset($input['timezone']) || ($tz = @timezone_open($input['timezone'])) === false) {
 			$tz = timezone_open(User::getTimezone());
+		}
 
 		$input['timezone'] = $tz->getName();
 
-		foreach (array('start', 'end') as $var)
-		{
+		foreach (['start', 'end'] as $var) {
 			// Input might come as individual parameters...
 			$year = $input[$var . '_year'] ?? null;
 			$month = $input[$var . '_month'] ?? null;
@@ -1384,85 +1366,83 @@ protected static function standardizeEventOptions($input): array
 			$time_string = $input[$var . '_time'] ?? null;
 
 			// If the date and time were given in individual parameters, combine them.
-			if (empty($time_string) && isset($hour, $minute, $second))
-				$time_string = implode(':', array((int) $hour, (int) $minute, (int) $second));
+			if (empty($time_string) && isset($hour, $minute, $second)) {
+				$time_string = implode(':', [(int) $hour, (int) $minute, (int) $second]);
+			}
 
-			if (empty($date_string) && isset($year, $month, $day))
-				$date_string = implode('-', array((int) $year, (int) $month, (int) $day));
+			if (empty($date_string) && isset($year, $month, $day)) {
+				$date_string = implode('-', [(int) $year, (int) $month, (int) $day]);
+			}
 
 			// If the date and time were given in separate strings, combine them.
-			if (empty($datetime_string) && isset($date_string))
+			if (empty($datetime_string) && isset($date_string)) {
 				$datetime_string = $date_string . (isset($time_string) ? ' ' . $time_string : '');
+			}
 
 			// If string input was given, override individually defined options with it.
-			if (isset($datetime_string))
-			{
+			if (isset($datetime_string)) {
 				$datetime_string_parsed = date_parse(str_replace(',', '', Calendar::convertDateToEnglish($datetime_string)));
 
-				if (empty($datetime_string_parsed['error_count']) && empty($datetime_string_parsed['warning_count']))
-				{
+				if (empty($datetime_string_parsed['error_count']) && empty($datetime_string_parsed['warning_count'])) {
 					$datetime_string_parsed = array_filter(
 						$datetime_string_parsed,
-						function($key)
-						{
-							return in_array($key, array('year', 'month', 'day', 'hour', 'minute', 'second'));
+						function ($key) {
+							return in_array($key, ['year', 'month', 'day', 'hour', 'minute', 'second']);
 						},
-						ARRAY_FILTER_USE_KEY
+						ARRAY_FILTER_USE_KEY,
 					);
 
 					$datetime_string_parsed = array_filter($datetime_string_parsed, 'is_int');
 
 					extract($datetime_string_parsed);
-				}
-				else
-				{
+				} else {
 					unset($year, $month, $day, $hour, $minute, $second);
 				}
 			}
 			// Individually defined options only, so ensure they are all integers.
-			else
-			{
-				foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $var)
-				{
-					if (isset($$var))
+			else {
+				foreach (['year', 'month', 'day', 'hour', 'minute', 'second'] as $var) {
+					if (isset($$var)) {
 						$$var = (int) $$var;
+					}
 				}
 			}
 
 			// Validate input.
-			$date_is_valid = isset($month, $day, $year) && (implode('-', array($month, $day, $year)) === implode('-', array_map('intval', array($month, $day, $year)))) && checkdate($month, $day, $year);
+			$date_is_valid = isset($month, $day, $year) && (implode('-', [$month, $day, $year]) === implode('-', array_map('intval', [$month, $day, $year]))) && checkdate($month, $day, $year);
 
 			$time_is_valid = isset($hour, $minute, $second) && $hour >= 0 && $hour < 25 && $minute >= 0 && $minute < 60 && $second >= 0 && $second < 60;
 
 			// Replace whatever was supplied with our validated strings.
-			foreach (array('year', 'month', 'day', 'hour', 'minute', 'second', 'date', 'time', 'datetime') as $key)
-			{
+			foreach (['year', 'month', 'day', 'hour', 'minute', 'second', 'date', 'time', 'datetime'] as $key) {
 				unset($input[$var . '_' . $key]);
 			}
 
-			if ($date_is_valid)
+			if ($date_is_valid) {
 				$input[$var . '_date'] = sprintf('%04d-%02d-%02d', $year, $month, $day);
+			}
 
-			if ($time_is_valid && !$input['allday'])
+			if ($time_is_valid && !$input['allday']) {
 				$input[$var . '_time'] = sprintf('%02d:%02d:%02d', $hour, $minute, $second);
+			}
 		}
 
 		// Uh-oh...
-		if (!isset($input['start_date']))
+		if (!isset($input['start_date'])) {
 			ErrorHandler::fatalLang('invalid_date', false);
+		}
 
 		// Make sure we use valid values for everything
-		if (!isset($input['end_date']))
+		if (!isset($input['end_date'])) {
 			$input['end_date'] = $input['start_date'];
+		}
 
-		if ($input['allday'] || !isset($input['start_time']))
-		{
+		if ($input['allday'] || !isset($input['start_time'])) {
 			$input['allday'] = true;
 			$input['start_time'] = '00:00:00';
 		}
 
-		if ($input['allday'] || !isset($input['end_time']))
-		{
+		if ($input['allday'] || !isset($input['end_time'])) {
 			$input['allday'] = true;
 			$input['end_time'] = $input['start_time'];
 		}
@@ -1472,7 +1452,8 @@ function($key)
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Event::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Event::exportStatic')) {
 	Event::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Forum.php b/Sources/Forum.php
index 9820d9ba8a..6cff8f27d8 100644
--- a/Sources/Forum.php
+++ b/Sources/Forum.php
@@ -44,85 +44,85 @@ class Forum
 	 *
 	 * Mod authors can add new actions to this via the integrate_actions hook.
 	 */
-	public static $actions = array(
-		'agreement' => array('', 'SMF\\Actions\\Agreement::call'),
-		'acceptagreement' => array('', 'SMF\\Actions\\AgreementAccept::call'),
-		'activate' => array('', 'SMF\\Actions\\Activate::call'),
-		'admin' => array('', 'SMF\\Actions\\Admin\\ACP::call'),
-		'announce' => array('', 'SMF\\Actions\\Announce::call'),
-		'attachapprove' => array('', 'SMF\\Actions\\AttachmentApprove::call'),
-		'buddy' => array('', 'SMF\\Actions\\BuddyListToggle::call'),
-		'calendar' => array('', 'SMF\\Actions\\Calendar::call'),
-		'clock' => array('', 'SMF\\Actions\\Calendar::call'), // Deprecated; is now a sub-action
-		'coppa' => array('', 'SMF\\Actions\\CoppaForm::call'),
-		'credits' => array('', 'SMF\\Actions\\Credits::call'),
-		'deletemsg' => array('', 'SMF\\Actions\\MsgDelete::call'),
-		'dlattach' => array('', 'SMF\\Actions\\AttachmentDownload::call'),
-		'editpoll' => array('', 'SMF\\Poll::edit'),
-		'editpoll2' => array('', 'SMF\\Poll::edit2'),
-		'findmember' => array('', 'SMF\\Actions\\FindMember::call'),
-		'groups' => array('', 'SMF\\Actions\\Groups::call'),
-		'help' => array('', 'SMF\\Actions\\Help::call'),
-		'helpadmin' => array('', 'SMF\\Actions\\HelpAdmin::call'),
-		'jsmodify' => array('', 'SMF\\Actions\\JavaScriptModify::call'),
-		'jsoption' => array('', 'SMF\\Theme::setJavaScript'),
-		'likes' => array('', 'SMF\\Actions\\Like::call'),
-		'lock' => array('', 'SMF\\Topic::lock'),
-		'lockvoting' => array('', 'SMF\\Poll::lock'),
-		'login' => array('', 'SMF\\Actions\\Login::call'),
-		'login2' => array('', 'SMF\\Actions\\Login2::call'),
-		'logintfa' => array('', 'SMF\\Actions\\LoginTFA::call'),
-		'logout' => array('', 'SMF\\Actions\\Logout::call'),
-		'markasread' => array('', 'SMF\\Board::MarkRead'),
-		'mergetopics' => array('', 'SMF\\Actions\\TopicMerge::call'),
-		'mlist' => array('', 'SMF\\Actions\\Memberlist::call'),
-		'moderate' => array('', 'SMF\\Actions\\Moderation\\Main::call'),
-		'modifycat' => array('', 'SMF\\Actions\\Admin\\Boards::modifyCat'),
-		'movetopic' => array('', 'SMF\\Actions\\TopicMove::call'),
-		'movetopic2' => array('', 'SMF\\Actions\\TopicMove2::call'),
-		'notifyannouncements' => array('', 'SMF\\Actions\\NotifyAnnouncements::call'),
-		'notifyboard' => array('', 'SMF\\Actions\\NotifyBoard::call'),
-		'notifytopic' => array('', 'SMF\\Actions\\NotifyTopic::call'),
-		'pm' => array('', 'SMF\\Actions\\PersonalMessage::call'),
-		'post' => array('', 'SMF\\Actions\\Post::call'),
-		'post2' => array('', 'SMF\\Actions\\Post2::call'),
-		'printpage' => array('', 'SMF\\Actions\\TopicPrint::call'),
-		'profile' => array('', 'SMF\\Actions\\Profile\\Main::call'),
-		'quotefast' => array('', 'SMF\\Actions\\QuoteFast::call'),
-		'quickmod' => array('', 'SMF\\Actions\\QuickModeration::call'),
-		'quickmod2' => array('', 'SMF\\Actions\\QuickModerationInTopic::call'),
-		'recent' => array('', 'SMF\\Actions\\Recent::call'),
-		'reminder' => array('', 'SMF\\Actions\\Reminder::call'),
-		'removepoll' => array('', 'SMF\\Poll::remove'),
-		'removetopic2' => array('', 'SMF\\Actions\\TopicRemove::call'),
-		'reporttm' => array('', 'SMF\\Actions\\ReportToMod::call'),
-		'requestmembers' => array('', 'SMF\\Actions\\RequestMembers::call'),
-		'restoretopic' => array('', 'SMF\\Actions\\TopicRestore::call'),
-		'search' => array('', 'SMF\\Actions\\Search::call'),
-		'search2' => array('', 'SMF\\Actions\\Search2::call'),
-		'sendactivation' => array('', 'SMF\\Actions\\SendActivation::call'),
-		'signup' => array('', 'SMF\\Actions\\Register::call'),
-		'signup2' => array('', 'SMF\\Actions\\Register2::call'),
-		'smstats' => array('', 'SMF\\Actions\\SmStats::call'),
-		'suggest' => array('', 'SMF\\Actions\\AutoSuggest::call'),
-		'splittopics' => array('', 'SMF\\Actions\\TopicSplit::call'),
-		'stats' => array('', 'SMF\\Actions\\Stats::call'),
-		'sticky' => array('', 'SMF\\Topic::sticky'),
-		'theme' => array('', 'SMF\\Theme::dispatch'),
-		'trackip' => array('', 'SMF\\Actions\\TrackIP::call'),
-		'about:unknown' => array('', 'SMF\\Actions\\Like::BookOfUnknown'),
-		'unread' => array('', 'SMF\\Actions\\Unread::call'),
-		'unreadreplies' => array('', 'SMF\\Actions\\UnreadReplies::call'),
-		'uploadAttach' => array('', 'SMF\\Actions\\AttachmentUpload::call'),
-		'verificationcode' => array('', 'SMF\\Actions\\VerificationCode::call'),
-		'viewprofile' => array('', 'SMF\\Actions\\Profile\\Main::call'),
-		'vote' => array('', 'SMF\\Poll::vote'),
-		'viewquery' => array('', 'SMF\\Actions\\ViewQuery::call'),
-		'viewsmfile' => array('', 'SMF\\Actions\\DisplayAdminFile::call'),
-		'who' => array('', 'SMF\\Actions\\Who::call'),
-		'.xml' => array('', 'SMF\\Actions\\Feed::call'),
-		'xmlhttp' => array('', 'SMF\\Actions\\XmlHttp::call'),
-	);
+	public static $actions = [
+		'agreement' => ['', 'SMF\\Actions\\Agreement::call'],
+		'acceptagreement' => ['', 'SMF\\Actions\\AgreementAccept::call'],
+		'activate' => ['', 'SMF\\Actions\\Activate::call'],
+		'admin' => ['', 'SMF\\Actions\\Admin\\ACP::call'],
+		'announce' => ['', 'SMF\\Actions\\Announce::call'],
+		'attachapprove' => ['', 'SMF\\Actions\\AttachmentApprove::call'],
+		'buddy' => ['', 'SMF\\Actions\\BuddyListToggle::call'],
+		'calendar' => ['', 'SMF\\Actions\\Calendar::call'],
+		'clock' => ['', 'SMF\\Actions\\Calendar::call'], // Deprecated; is now a sub-action
+		'coppa' => ['', 'SMF\\Actions\\CoppaForm::call'],
+		'credits' => ['', 'SMF\\Actions\\Credits::call'],
+		'deletemsg' => ['', 'SMF\\Actions\\MsgDelete::call'],
+		'dlattach' => ['', 'SMF\\Actions\\AttachmentDownload::call'],
+		'editpoll' => ['', 'SMF\\Poll::edit'],
+		'editpoll2' => ['', 'SMF\\Poll::edit2'],
+		'findmember' => ['', 'SMF\\Actions\\FindMember::call'],
+		'groups' => ['', 'SMF\\Actions\\Groups::call'],
+		'help' => ['', 'SMF\\Actions\\Help::call'],
+		'helpadmin' => ['', 'SMF\\Actions\\HelpAdmin::call'],
+		'jsmodify' => ['', 'SMF\\Actions\\JavaScriptModify::call'],
+		'jsoption' => ['', 'SMF\\Theme::setJavaScript'],
+		'likes' => ['', 'SMF\\Actions\\Like::call'],
+		'lock' => ['', 'SMF\\Topic::lock'],
+		'lockvoting' => ['', 'SMF\\Poll::lock'],
+		'login' => ['', 'SMF\\Actions\\Login::call'],
+		'login2' => ['', 'SMF\\Actions\\Login2::call'],
+		'logintfa' => ['', 'SMF\\Actions\\LoginTFA::call'],
+		'logout' => ['', 'SMF\\Actions\\Logout::call'],
+		'markasread' => ['', 'SMF\\Board::MarkRead'],
+		'mergetopics' => ['', 'SMF\\Actions\\TopicMerge::call'],
+		'mlist' => ['', 'SMF\\Actions\\Memberlist::call'],
+		'moderate' => ['', 'SMF\\Actions\\Moderation\\Main::call'],
+		'modifycat' => ['', 'SMF\\Actions\\Admin\\Boards::modifyCat'],
+		'movetopic' => ['', 'SMF\\Actions\\TopicMove::call'],
+		'movetopic2' => ['', 'SMF\\Actions\\TopicMove2::call'],
+		'notifyannouncements' => ['', 'SMF\\Actions\\NotifyAnnouncements::call'],
+		'notifyboard' => ['', 'SMF\\Actions\\NotifyBoard::call'],
+		'notifytopic' => ['', 'SMF\\Actions\\NotifyTopic::call'],
+		'pm' => ['', 'SMF\\Actions\\PersonalMessage::call'],
+		'post' => ['', 'SMF\\Actions\\Post::call'],
+		'post2' => ['', 'SMF\\Actions\\Post2::call'],
+		'printpage' => ['', 'SMF\\Actions\\TopicPrint::call'],
+		'profile' => ['', 'SMF\\Actions\\Profile\\Main::call'],
+		'quotefast' => ['', 'SMF\\Actions\\QuoteFast::call'],
+		'quickmod' => ['', 'SMF\\Actions\\QuickModeration::call'],
+		'quickmod2' => ['', 'SMF\\Actions\\QuickModerationInTopic::call'],
+		'recent' => ['', 'SMF\\Actions\\Recent::call'],
+		'reminder' => ['', 'SMF\\Actions\\Reminder::call'],
+		'removepoll' => ['', 'SMF\\Poll::remove'],
+		'removetopic2' => ['', 'SMF\\Actions\\TopicRemove::call'],
+		'reporttm' => ['', 'SMF\\Actions\\ReportToMod::call'],
+		'requestmembers' => ['', 'SMF\\Actions\\RequestMembers::call'],
+		'restoretopic' => ['', 'SMF\\Actions\\TopicRestore::call'],
+		'search' => ['', 'SMF\\Actions\\Search::call'],
+		'search2' => ['', 'SMF\\Actions\\Search2::call'],
+		'sendactivation' => ['', 'SMF\\Actions\\SendActivation::call'],
+		'signup' => ['', 'SMF\\Actions\\Register::call'],
+		'signup2' => ['', 'SMF\\Actions\\Register2::call'],
+		'smstats' => ['', 'SMF\\Actions\\SmStats::call'],
+		'suggest' => ['', 'SMF\\Actions\\AutoSuggest::call'],
+		'splittopics' => ['', 'SMF\\Actions\\TopicSplit::call'],
+		'stats' => ['', 'SMF\\Actions\\Stats::call'],
+		'sticky' => ['', 'SMF\\Topic::sticky'],
+		'theme' => ['', 'SMF\\Theme::dispatch'],
+		'trackip' => ['', 'SMF\\Actions\\TrackIP::call'],
+		'about:unknown' => ['', 'SMF\\Actions\\Like::BookOfUnknown'],
+		'unread' => ['', 'SMF\\Actions\\Unread::call'],
+		'unreadreplies' => ['', 'SMF\\Actions\\UnreadReplies::call'],
+		'uploadAttach' => ['', 'SMF\\Actions\\AttachmentUpload::call'],
+		'verificationcode' => ['', 'SMF\\Actions\\VerificationCode::call'],
+		'viewprofile' => ['', 'SMF\\Actions\\Profile\\Main::call'],
+		'vote' => ['', 'SMF\\Poll::vote'],
+		'viewquery' => ['', 'SMF\\Actions\\ViewQuery::call'],
+		'viewsmfile' => ['', 'SMF\\Actions\\DisplayAdminFile::call'],
+		'who' => ['', 'SMF\\Actions\\Who::call'],
+		'.xml' => ['', 'SMF\\Actions\\Feed::call'],
+		'xmlhttp' => ['', 'SMF\\Actions\\XmlHttp::call'],
+	];
 
 	/**
 	 * @var array
@@ -142,7 +142,7 @@ class Forum
 	 *    log visits to index.php?action=pm;sa=popup, but other sub-actions
 	 *    like index.php?action=pm;sa=send will be logged.
 	 */
-	public static $unlogged_actions = array(
+	public static $unlogged_actions = [
 		'about:unknown' => true,
 		'clock' => true,
 		'dlattach' => true,
@@ -151,8 +151,8 @@ class Forum
 		'jsoption' => true,
 		'likes' => true,
 		'modifycat' => true,
-		'pm' => array('sa' => array('popup')),
-		'profile' => array('area' => array('popup', 'alerts_popup', 'download', 'dlattach')),
+		'pm' => ['sa' => ['popup']],
+		'profile' => ['area' => ['popup', 'alerts_popup', 'download', 'dlattach']],
 		'requestmembers' => true,
 		'smstats' => true,
 		'suggest' => true,
@@ -161,7 +161,7 @@ class Forum
 		'viewsmfile' => true,
 		'xmlhttp' => true,
 		'.xml' => true,
-	);
+	];
 
 	/**
 	 * @var array
@@ -169,7 +169,7 @@ class Forum
 	 * Actions that guests are always allowed to do.
 	 * This allows users to log in when guest access is disabled.
 	 */
-	public static $guest_access_actions = array(
+	public static $guest_access_actions = [
 		'coppa',
 		'login',
 		'login2',
@@ -182,7 +182,7 @@ class Forum
 		'verificationcode',
 		'signup',
 		'signup2',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -194,8 +194,7 @@ class Forum
 	public function __construct()
 	{
 		// If Config::$maintenance is set specifically to 2, then we're upgrading or something.
-		if (!empty(Config::$maintenance) &&  2 === Config::$maintenance)
-		{
+		if (!empty(Config::$maintenance) &&  2 === Config::$maintenance) {
 			ErrorHandler::displayMaintenanceMessage();
 		}
 
@@ -209,25 +208,23 @@ public function __construct()
 		QueryString::cleanRequest();
 
 		// Seed the random generator.
-		if (empty(Config::$modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+		if (empty(Config::$modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 			Config::generateSeed();
+		}
 
 		// If a Preflight is occurring, lets stop now.
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'OPTIONS')
-		{
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
 			Utils::sendHttpStatus(204);
+
 			die;
 		}
 
 		// Check if compressed output is enabled, supported, and not already being done.
-		if (!empty(Config::$modSettings['enableCompressedOutput']) && !headers_sent())
-		{
+		if (!empty(Config::$modSettings['enableCompressedOutput']) && !headers_sent()) {
 			// If zlib is being used, turn off output compression.
-			if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler')
+			if (ini_get('zlib.output_compression') >= 1 || ini_get('output_handler') == 'ob_gzhandler') {
 				Config::$modSettings['enableCompressedOutput'] = '0';
-
-			else
-			{
+			} else {
 				ob_end_clean();
 				ob_start('ob_gzhandler');
 			}
@@ -241,13 +238,13 @@ public function __construct()
 
 		// Why three different hooks? For historical reasons.
 		// Allow modifying $actions easily.
-		IntegrationHook::call('integrate_actions', array(&self::$actions));
+		IntegrationHook::call('integrate_actions', [&self::$actions]);
 
 		// Allow modifying $unlogged_actions easily.
-		IntegrationHook::call('integrate_pre_log_stats', array(&self::$unlogged_actions));
+		IntegrationHook::call('integrate_pre_log_stats', [&self::$unlogged_actions]);
 
 		// Allow modifying $guest_access_actions easily.
-		IntegrationHook::call('integrate_guest_actions', array(&self::$guest_access_actions));
+		IntegrationHook::call('integrate_guest_actions', [&self::$guest_access_actions]);
 	}
 
 	/**
@@ -304,9 +301,9 @@ public static function inMaintenance()
 	protected function main()
 	{
 		// Special case: session keep-alive, output a transparent pixel.
-		if (isset($_GET['action']) && $_GET['action'] == 'keepalive')
-		{
+		if (isset($_GET['action']) && $_GET['action'] == 'keepalive') {
 			header('content-type: image/gif');
+
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
 
@@ -326,13 +323,11 @@ protected function main()
 		User::$me->loadPermissions();
 
 		// Attachments don't require the entire theme to be loaded.
-		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach' && empty(Config::$maintenance))
-		{
+		if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach' && empty(Config::$maintenance)) {
 			BrowserDetector::call();
 		}
 		// Load the current theme.  (note that ?theme=1 will also work, may be used for guest theming.)
-		else
-		{
+		else {
 			Theme::load();
 		}
 
@@ -340,51 +335,42 @@ protected function main()
 		User::$me->kickIfBanned();
 
 		// If we are in a topic and don't have permission to approve it then duck out now.
-		if (!empty(Topic::$topic_id) && empty(Board::$info->cur_topic_approved) && !User::$me->allowedTo('approve_posts') && (User::$me->id != Board::$info->cur_topic_starter || User::$me->is_guest))
-		{
+		if (!empty(Topic::$topic_id) && empty(Board::$info->cur_topic_approved) && !User::$me->allowedTo('approve_posts') && (User::$me->id != Board::$info->cur_topic_starter || User::$me->is_guest)) {
 			ErrorHandler::fatalLang('not_a_topic', false);
 		}
 
 		// Don't log if this is an attachment, avatar, toggle of editor buttons, theme option, XML feed, popup, etc.
-		if (!QueryString::isFilteredRequest(self::$unlogged_actions, 'action'))
-		{
+		if (!QueryString::isFilteredRequest(self::$unlogged_actions, 'action')) {
 			// Log this user as online.
 			User::$me->logOnline();
 
 			// Track forum statistics and hits...?
-			if (!empty(Config::$modSettings['hitStats']))
-				Logging::trackStats(array('hits' => '+'));
+			if (!empty(Config::$modSettings['hitStats'])) {
+				Logging::trackStats(['hits' => '+']);
+			}
 		}
 
 		// Make sure that our scheduled tasks have been running as intended
 		Config::checkCron();
 
 		// Is the forum in maintenance mode? (doesn't apply to administrators.)
-		if (!empty(Config::$maintenance) && !User::$me->allowedTo('admin_forum'))
-		{
+		if (!empty(Config::$maintenance) && !User::$me->allowedTo('admin_forum')) {
 			// You can only login.... otherwise, you're getting the "maintenance mode" display.
-			if (isset($_REQUEST['action']) && (in_array($_REQUEST['action'], array('login2', 'logintfa', 'logout'))))
-			{
+			if (isset($_REQUEST['action']) && (in_array($_REQUEST['action'], ['login2', 'logintfa', 'logout']))) {
 				return self::$actions[$_REQUEST['action']][1];
 			}
+
 			// Don't even try it, sonny.
-			else
-			{
-				return __CLASS__ . '::inMaintenance';
-			}
+			return __CLASS__ . '::inMaintenance';
 		}
+
 		// If guest access is off, a guest can only do one of the very few following actions.
-		elseif (empty(Config::$modSettings['allow_guestAccess']) && User::$me->is_guest && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], self::$guest_access_actions)))
-		{
+		if (empty(Config::$modSettings['allow_guestAccess']) && User::$me->is_guest && (!isset($_REQUEST['action']) || !in_array($_REQUEST['action'], self::$guest_access_actions))) {
 			User::$me->kickIfGuest(null, false);
-		}
-		elseif (empty($_REQUEST['action']))
-		{
+		} elseif (empty($_REQUEST['action'])) {
 			// Action and board are both empty... BoardIndex! Unless someone else wants to do something different.
-			if (empty(Board::$info->id) && empty(Topic::$topic_id))
-			{
-				if (!empty(Config::$modSettings['integrate_default_action']))
-				{
+			if (empty(Board::$info->id) && empty(Topic::$topic_id)) {
+				if (!empty(Config::$modSettings['integrate_default_action'])) {
 					$defaultAction = explode(',', Config::$modSettings['integrate_default_action']);
 
 					// Sorry, only one default action is needed.
@@ -392,41 +378,36 @@ protected function main()
 
 					$call = Utils::getCallable($defaultAction);
 
-					if (!empty($call))
+					if (!empty($call)) {
 						return $call;
+					}
 				}
 
 				// No default action huh? then go to our good old BoardIndex.
-				else
-				{
+				else {
 					return 'SMF\\Actions\\BoardIndex::call';
 				}
 			}
 
 			// Topic is empty, and action is empty.... MessageIndex!
-			elseif (empty(Topic::$topic_id))
-			{
+			elseif (empty(Topic::$topic_id)) {
 				return 'SMF\\Actions\\MessageIndex::call';
 			}
 
 			// Board is not empty... topic is not empty... action is empty.. Display!
-			else
-			{
+			else {
 				return 'SMF\\Actions\\Display::call';
 			}
 		}
 
 		// Get the function and file to include - if it's not there, do the board index.
-		if (!isset($_REQUEST['action']) || !isset(self::$actions[$_REQUEST['action']]))
-		{
+		if (!isset($_REQUEST['action']) || !isset(self::$actions[$_REQUEST['action']])) {
 			// Catch the action with the theme?
-			if (!empty(Theme::$current->settings['catch_action']))
-			{
+			if (!empty(Theme::$current->settings['catch_action'])) {
 				return 'SMF\\Theme::wrapAction';
 			}
 
-			if (!empty(Config::$modSettings['integrate_fallback_action']))
-			{
+			if (!empty(Config::$modSettings['integrate_fallback_action'])) {
 				$fallbackAction = explode(',', Config::$modSettings['integrate_fallback_action']);
 
 				// Sorry, only one fallback action is needed.
@@ -434,20 +415,21 @@ protected function main()
 
 				$call = Utils::getCallable($fallbackAction);
 
-				if (!empty($call))
+				if (!empty($call)) {
 					return $call;
+				}
 			}
 
 			// No fallback action, huh?
-			else
-			{
-				ErrorHandler::fatalLang('not_found', false, array(), 404);
+			else {
+				ErrorHandler::fatalLang('not_found', false, [], 404);
 			}
 		}
 
 		// Otherwise, it was set - so let's go to that action.
-		if (!empty(self::$actions[$_REQUEST['action']][0]))
-			require_once(Config::$sourcedir . '/' . self::$actions[$_REQUEST['action']][0]);
+		if (!empty(self::$actions[$_REQUEST['action']][0])) {
+			require_once Config::$sourcedir . '/' . self::$actions[$_REQUEST['action']][0];
+		}
 
 		// Do the right thing.
 		return Utils::getCallable(self::$actions[$_REQUEST['action']][1]);
diff --git a/Sources/Graphics/Gif/ColorTable.php b/Sources/Graphics/Gif/ColorTable.php
index d1b5e8c411..d6e9dfeea0 100644
--- a/Sources/Graphics/Gif/ColorTable.php
+++ b/Sources/Graphics/Gif/ColorTable.php
@@ -34,13 +34,14 @@ public function __construct()
 	public function load($lpData, $num)
 	{
 		$this->m_nColors = 0;
-		$this->m_arColors = array();
+		$this->m_arColors = [];
 
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$rgb = substr($lpData, $i * 3, 3);
-			if (strlen($rgb) < 3)
+
+			if (strlen($rgb) < 3) {
 				return false;
+			}
 
 			$this->m_arColors[] = (ord($rgb[2]) << 16) + (ord($rgb[1]) << 8) + ord($rgb[0]);
 			$this->m_nColors++;
@@ -53,8 +54,7 @@ public function toString()
 	{
 		$ret = '';
 
-		for ($i = 0; $i < $this->m_nColors; $i++)
-		{
+		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$ret .=
 				chr(($this->m_arColors[$i] & 0x000000FF)) . // R
 				chr(($this->m_arColors[$i] & 0x0000FF00) >> 8) . // G
@@ -73,15 +73,13 @@ public function colorIndex($rgb)
 		$b1 = ($rgb & 0xFF0000) >> 16;
 		$idx = -1;
 
-		for ($i = 0; $i < $this->m_nColors; $i++)
-		{
+		for ($i = 0; $i < $this->m_nColors; $i++) {
 			$r2 = ($this->m_arColors[$i] & 0x000000FF);
 			$g2 = ($this->m_arColors[$i] & 0x0000FF00) >> 8;
 			$b2 = ($this->m_arColors[$i] & 0x00FF0000) >> 16;
 			$d = abs($r2 - $r1) + abs($g2 - $g1) + abs($b2 - $b1);
 
-			if (($idx == -1) || ($d < $dif))
-			{
+			if (($idx == -1) || ($d < $dif)) {
 				$idx = $i;
 				$dif = $d;
 			}
diff --git a/Sources/Graphics/Gif/File.php b/Sources/Graphics/Gif/File.php
index 2ee41dde6f..be3ccf963f 100644
--- a/Sources/Graphics/Gif/File.php
+++ b/Sources/Graphics/Gif/File.php
@@ -25,7 +25,10 @@
 
 class File
 {
-	public $header, $image, $data, $loaded;
+	public $header;
+	public $image;
+	public $data;
+	public $loaded;
 
 	public function __construct()
 	{
@@ -37,64 +40,70 @@ public function __construct()
 
 	public function loadFile($filename, $iIndex)
 	{
-		if ($iIndex < 0)
+		if ($iIndex < 0) {
 			return false;
+		}
 
 		$this->data = @file_get_contents($filename);
-		if ($this->data === false)
+
+		if ($this->data === false) {
 			return false;
+		}
 
 		// Tell the header to load up....
 		$len = 0;
-		if (!$this->header->load($this->data, $len))
+
+		if (!$this->header->load($this->data, $len)) {
 			return false;
+		}
 
 		$this->data = substr($this->data, $len);
 
 		// Keep reading (at least once) so we get to the actual image we're looking for.
-		for ($j = 0; $j <= $iIndex; $j++)
-		{
+		for ($j = 0; $j <= $iIndex; $j++) {
 			$imgLen = 0;
-			if (!$this->image->load($this->data, $imgLen))
+
+			if (!$this->image->load($this->data, $imgLen)) {
 				return false;
+			}
 
 			$this->data = substr($this->data, $imgLen);
 		}
 
 		$this->loaded = true;
+
 		return true;
 	}
 
 	public function get_png_data($background_color)
 	{
-		if (!$this->loaded)
+		if (!$this->loaded) {
 			return false;
+		}
 
 		// Prepare the color table.
-		if ($this->image->m_gih->m_bLocalClr)
-		{
+		if ($this->image->m_gih->m_bLocalClr) {
 			$colors = $this->image->m_gih->m_nTableSize;
 			$pal = $this->image->m_gih->m_colorTable->toString();
 
-			if ($background_color != -1)
+			if ($background_color != -1) {
 				$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
-		}
-		elseif ($this->header->m_bGlobalClr)
-		{
+			}
+		} elseif ($this->header->m_bGlobalClr) {
 			$colors = $this->header->m_nTableSize;
 			$pal = $this->header->m_colorTable->toString();
 
-			if ($background_color != -1)
+			if ($background_color != -1) {
 				$background_color = $this->header->m_colorTable->colorIndex($background_color);
-		}
-		else
-		{
+			}
+		} else {
 			$colors = 0;
 			$background_color = -1;
 		}
 
-		if ($background_color == -1)
+		if ($background_color == -1) {
 			$background_color = $this->header->m_nBgColor;
+		}
 
 		$data = &$this->image->m_data;
 		$header = &$this->image->m_gih;
@@ -103,18 +112,18 @@ public function get_png_data($background_color)
 		$bmp = '';
 
 		// Prepare the bitmap itself.
-		for ($y = 0; $y < $this->header->m_nHeight; $y++)
-		{
+		for ($y = 0; $y < $this->header->m_nHeight; $y++) {
 			$bmp .= "\x00";
 
-			for ($x = 0; $x < $this->header->m_nWidth; $x++, $i++)
-			{
+			for ($x = 0; $x < $this->header->m_nWidth; $x++, $i++) {
 				// Is this in the proper range?  If so, get the specific pixel data...
-				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight))
+				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight)) {
 					$bmp .= $data[$i];
+				}
 				// Otherwise, this is background...
-				else
+				else {
 					$bmp .= chr($background_color);
+				}
 			}
 		}
 
@@ -129,22 +138,21 @@ public function get_png_data($background_color)
 		$out .= $tmp . pack('N', smf_crc32($tmp));
 
 		// The palette, assuming we have one to speak of...
-		if ($colors > 0)
-		{
+		if ($colors > 0) {
 			$out .= pack('N', (int) $colors * 3);
 			$tmp = 'PLTE' . $pal;
 			$out .= $tmp . pack('N', smf_crc32($tmp));
 		}
 
 		// Do we have any transparency we want to make available?
-		if ($this->image->m_bTrans && $colors > 0)
-		{
+		if ($this->image->m_bTrans && $colors > 0) {
 			$out .= pack('N', (int) $colors);
 			$tmp = 'tRNS';
 
 			// Stick each color on - full transparency or none.
-			for ($i = 0; $i < $colors; $i++)
+			for ($i = 0; $i < $colors; $i++) {
 				$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			}
 
 			$out .= $tmp . pack('N', smf_crc32($tmp));
 		}
@@ -162,8 +170,7 @@ public function get_png_data($background_color)
 }
 
 // 64-bit only functions?
-if (!function_exists('smf_crc32'))
-{
+if (!function_exists('smf_crc32')) {
 	require_once Config::$sourcedir . '/Subs-Compat.php';
 }
 
diff --git a/Sources/Graphics/Gif/FileHeader.php b/Sources/Graphics/Gif/FileHeader.php
index 0ff0aac22b..28d971423b 100644
--- a/Sources/Graphics/Gif/FileHeader.php
+++ b/Sources/Graphics/Gif/FileHeader.php
@@ -23,14 +23,20 @@
 
 class FileHeader
 {
-	public $m_lpVer, $m_nWidth, $m_nHeight, $m_bGlobalClr, $m_nColorRes;
-	public $m_bSorted, $m_nTableSize, $m_nBgColor, $m_nPixelRatio;
+	public $m_lpVer;
+	public $m_nWidth;
+	public $m_nHeight;
+	public $m_bGlobalClr;
+	public $m_nColorRes;
+	public $m_bSorted;
+	public $m_nTableSize;
+	public $m_nBgColor;
+	public $m_nPixelRatio;
 	public $m_colorTable;
 
 	public function __construct()
 	{
-		unset($this->m_lpVer, $this->m_nWidth, $this->m_nHeight, $this->m_bGlobalClr, $this->m_nColorRes);
-		unset($this->m_bSorted, $this->m_nTableSize, $this->m_nBgColor, $this->m_nPixelRatio, $this->m_colorTable);
+		unset($this->m_lpVer, $this->m_nWidth, $this->m_nHeight, $this->m_bGlobalClr, $this->m_nColorRes, $this->m_bSorted, $this->m_nTableSize, $this->m_nBgColor, $this->m_nPixelRatio, $this->m_colorTable);
 	}
 
 	public function load($lpData, &$hdrLen)
@@ -38,13 +44,16 @@ public function load($lpData, &$hdrLen)
 		$hdrLen = 0;
 
 		$this->m_lpVer = substr($lpData, 0, 6);
-		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a'))
+
+		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a')) {
 			return false;
+		}
 
-		list ($this->m_nWidth, $this->m_nHeight) = array_values(unpack('v2', substr($lpData, 6, 4)));
+		list($this->m_nWidth, $this->m_nHeight) = array_values(unpack('v2', substr($lpData, 6, 4)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
+		if (!$this->m_nWidth || !$this->m_nHeight) {
 			return false;
+		}
 
 		$b = ord(substr($lpData, 10, 1));
 		$this->m_bGlobalClr = ($b & 0x80) ? true : false;
@@ -55,11 +64,12 @@ public function load($lpData, &$hdrLen)
 		$this->m_nPixelRatio = ord(substr($lpData, 12, 1));
 		$hdrLen = 13;
 
-		if ($this->m_bGlobalClr)
-		{
+		if ($this->m_bGlobalClr) {
 			$this->m_colorTable = new ColorTable();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
+
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
 				return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
diff --git a/Sources/Graphics/Gif/Image.php b/Sources/Graphics/Gif/Image.php
index 3d2384fb4f..6f2a323289 100644
--- a/Sources/Graphics/Gif/Image.php
+++ b/Sources/Graphics/Gif/Image.php
@@ -23,8 +23,15 @@
 
 class Image
 {
-	public $m_disp, $m_bUser, $m_bTrans, $m_nDelay, $m_nTrans, $m_lpComm;
-	public $m_gih, $m_data, $m_lzw;
+	public $m_disp;
+	public $m_bUser;
+	public $m_bTrans;
+	public $m_nDelay;
+	public $m_nTrans;
+	public $m_lpComm;
+	public $m_gih;
+	public $m_data;
+	public $m_lzw;
 
 	public function __construct()
 	{
@@ -37,42 +44,48 @@ public function load($data, &$datLen)
 	{
 		$datLen = 0;
 
-		while (true)
-		{
+		while (true) {
 			$b = ord($data[0]);
 			$data = substr($data, 1);
 			$datLen++;
 
-			switch ($b)
-			{
+			switch ($b) {
 				// Extension...
 				case 0x21:
 					$len = 0;
-					if (!$this->skipExt($data, $len))
+
+					if (!$this->skipExt($data, $len)) {
 						return false;
+					}
 
 					$datLen += $len;
+
 					break;
 
 				// Image...
 				case 0x2C:
 					// Load the header and color table.
 					$len = 0;
-					if (!$this->m_gih->load($data, $len))
+
+					if (!$this->m_gih->load($data, $len)) {
 						return false;
+					}
 
 					$data = substr($data, $len);
 					$datLen += $len;
 
 					// Decompress the data, and ride on home ;).
 					$len = 0;
-					if (!($this->m_data = $this->m_lzw->decompress($data, $len)))
+
+					if (!($this->m_data = $this->m_lzw->decompress($data, $len))) {
 						return false;
+					}
 
 					$datLen += $len;
 
-					if ($this->m_gih->m_bInterlace)
+					if ($this->m_gih->m_bInterlace) {
 						$this->deInterlace();
+					}
 
 					return true;
 
@@ -81,6 +94,7 @@ public function load($data, &$datLen)
 					return false;
 			}
 		}
+
 		return false;
 	}
 
@@ -92,15 +106,14 @@ public function skipExt(&$data, &$extLen)
 		$data = substr($data, 1);
 		$extLen++;
 
-		switch ($b)
-		{
+		switch ($b) {
 			// Graphic Control...
 			case 0xF9:
 				$b = ord($data[1]);
 				$this->m_disp = ($b & 0x1C) >> 2;
 				$this->m_bUser = ($b & 0x02) ? true : false;
 				$this->m_bTrans = ($b & 0x01) ? true : false;
-				list ($this->m_nDelay) = array_values(unpack('v', substr($data, 2, 2)));
+				list($this->m_nDelay) = array_values(unpack('v', substr($data, 2, 2)));
 				$this->m_nTrans = ord($data[4]);
 				break;
 
@@ -122,14 +135,15 @@ public function skipExt(&$data, &$extLen)
 		$b = ord($data[0]);
 		$data = substr($data, 1);
 		$extLen++;
-		while ($b > 0)
-		{
+
+		while ($b > 0) {
 			$data = substr($data, $b);
 			$extLen += $b;
 			$b = ord($data[0]);
 			$data = substr($data, 1);
 			$extLen++;
 		}
+
 		return true;
 	}
 
@@ -137,10 +151,8 @@ public function deInterlace()
 	{
 		$data = $this->m_data;
 
-		for ($i = 0; $i < 4; $i++)
-		{
-			switch ($i)
-			{
+		for ($i = 0; $i < 4; $i++) {
+			switch ($i) {
 				case 0:
 					$s = 8;
 					$y = 0;
@@ -162,8 +174,7 @@ public function deInterlace()
 					break;
 			}
 
-			for (; $y < $this->m_gih->m_nHeight; $y += $s)
-			{
+			for (; $y < $this->m_gih->m_nHeight; $y += $s) {
 				$lne = substr($this->m_data, 0, $this->m_gih->m_nWidth);
 				$this->m_data = substr($this->m_data, $this->m_gih->m_nWidth);
 
diff --git a/Sources/Graphics/Gif/ImageHeader.php b/Sources/Graphics/Gif/ImageHeader.php
index 35f97d1fd5..6cfdd9c650 100644
--- a/Sources/Graphics/Gif/ImageHeader.php
+++ b/Sources/Graphics/Gif/ImageHeader.php
@@ -23,13 +23,19 @@
 
 class ImageHeader
 {
-	public $m_nLeft, $m_nTop, $m_nWidth, $m_nHeight, $m_bLocalClr;
-	public $m_bInterlace, $m_bSorted, $m_nTableSize, $m_colorTable;
+	public $m_nLeft;
+	public $m_nTop;
+	public $m_nWidth;
+	public $m_nHeight;
+	public $m_bLocalClr;
+	public $m_bInterlace;
+	public $m_bSorted;
+	public $m_nTableSize;
+	public $m_colorTable;
 
 	public function __construct()
 	{
-		unset($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight, $this->m_bLocalClr);
-		unset($this->m_bInterlace, $this->m_bSorted, $this->m_nTableSize, $this->m_colorTable);
+		unset($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight, $this->m_bLocalClr, $this->m_bInterlace, $this->m_bSorted, $this->m_nTableSize, $this->m_colorTable);
 	}
 
 	public function load($lpData, &$hdrLen)
@@ -37,10 +43,11 @@ public function load($lpData, &$hdrLen)
 		$hdrLen = 0;
 
 		// Get the width/height/etc. from the header.
-		list ($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight) = array_values(unpack('v4', substr($lpData, 0, 8)));
+		list($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight) = array_values(unpack('v4', substr($lpData, 0, 8)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
+		if (!$this->m_nWidth || !$this->m_nHeight) {
 			return false;
+		}
 
 		$b = ord($lpData[8]);
 		$this->m_bLocalClr = ($b & 0x80) ? true : false;
@@ -49,11 +56,12 @@ public function load($lpData, &$hdrLen)
 		$this->m_nTableSize = 2 << ($b & 0x07);
 		$hdrLen = 9;
 
-		if ($this->m_bLocalClr)
-		{
+		if ($this->m_bLocalClr) {
 			$this->m_colorTable = new ColorTable();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
+
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
 				return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
diff --git a/Sources/Graphics/Gif/LzwCompression.php b/Sources/Graphics/Gif/LzwCompression.php
index 96eaa7e54e..c37d5ddeca 100644
--- a/Sources/Graphics/Gif/LzwCompression.php
+++ b/Sources/Graphics/Gif/LzwCompression.php
@@ -29,8 +29,24 @@
 class LzwCompression
 {
 	public $MAX_LZW_BITS;
-	public $Fresh, $CodeSize, $SetCodeSize, $MaxCode, $MaxCodeSize, $FirstCode, $OldCode;
-	public $ClearCode, $EndCode, $Next, $Vals, $Stack, $sp, $Buf, $CurBit, $LastBit, $Done, $LastByte;
+	public $Fresh;
+	public $CodeSize;
+	public $SetCodeSize;
+	public $MaxCode;
+	public $MaxCodeSize;
+	public $FirstCode;
+	public $OldCode;
+	public $ClearCode;
+	public $EndCode;
+	public $Next;
+	public $Vals;
+	public $Stack;
+	public $sp;
+	public $Buf;
+	public $CurBit;
+	public $LastBit;
+	public $Done;
+	public $LastByte;
 
 	public function __construct()
 	{
@@ -51,21 +67,22 @@ public function decompress($data, &$datLen)
 
 		$this->LZWCommand($data, true);
 
-		while (($iIndex = $this->LZWCommand($data, false)) >= 0)
+		while (($iIndex = $this->LZWCommand($data, false)) >= 0) {
 			$ret .= chr($iIndex);
+		}
 
 		$datLen = $stLen - strlen($data);
 
-		if ($iIndex != -2)
+		if ($iIndex != -2) {
 			return false;
+		}
 
 		return $ret;
 	}
 
 	public function LZWCommand(&$data, $bInit)
 	{
-		if ($bInit)
-		{
+		if ($bInit) {
 			$this->SetCodeSize = ord($data[0]);
 			$data = substr($data, 1);
 
@@ -78,53 +95,47 @@ public function LZWCommand(&$data, $bInit)
 			$this->GetCode($data, $bInit);
 
 			$this->Fresh = 1;
-			for ($i = 0; $i < $this->ClearCode; $i++)
-			{
+
+			for ($i = 0; $i < $this->ClearCode; $i++) {
 				$this->Next[$i] = 0;
 				$this->Vals[$i] = $i;
 			}
 
-			for (; $i < (1 << $this->MAX_LZW_BITS); $i++)
-			{
+			for (; $i < (1 << $this->MAX_LZW_BITS); $i++) {
 				$this->Next[$i] = 0;
 				$this->Vals[$i] = 0;
 			}
 
 			$this->sp = 0;
+
 			return 1;
 		}
 
-		if ($this->Fresh)
-		{
+		if ($this->Fresh) {
 			$this->Fresh = 0;
-			do
-			{
+
+			do {
 				$this->FirstCode = $this->GetCode($data, $bInit);
 				$this->OldCode = $this->FirstCode;
-			}
-			while ($this->FirstCode == $this->ClearCode);
+			} while ($this->FirstCode == $this->ClearCode);
 
 			return $this->FirstCode;
 		}
 
-		if ($this->sp > 0)
-		{
+		if ($this->sp > 0) {
 			$this->sp--;
+
 			return $this->Stack[$this->sp];
 		}
 
-		while (($Code = $this->GetCode($data, $bInit)) >= 0)
-		{
-			if ($Code == $this->ClearCode)
-			{
-				for ($i = 0; $i < $this->ClearCode; $i++)
-				{
+		while (($Code = $this->GetCode($data, $bInit)) >= 0) {
+			if ($Code == $this->ClearCode) {
+				for ($i = 0; $i < $this->ClearCode; $i++) {
 					$this->Next[$i] = 0;
 					$this->Vals[$i] = $i;
 				}
 
-				for (; $i < (1 << $this->MAX_LZW_BITS); $i++)
-				{
+				for (; $i < (1 << $this->MAX_LZW_BITS); $i++) {
 					$this->Next[$i] = 0;
 					$this->Vals[$i] = 0;
 				}
@@ -139,24 +150,25 @@ public function LZWCommand(&$data, $bInit)
 				return $this->FirstCode;
 			}
 
-			if ($Code == $this->EndCode)
+			if ($Code == $this->EndCode) {
 				return -2;
+			}
 
 			$InCode = $Code;
-			if ($Code >= $this->MaxCode)
-			{
+
+			if ($Code >= $this->MaxCode) {
 				$this->Stack[$this->sp] = $this->FirstCode;
 				$this->sp++;
 				$Code = $this->OldCode;
 			}
 
-			while ($Code >= $this->ClearCode)
-			{
+			while ($Code >= $this->ClearCode) {
 				$this->Stack[$this->sp] = $this->Vals[$Code];
 				$this->sp++;
 
-				if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
+				if ($Code == $this->Next[$Code]) { // Circular table entry, big GIF Error!
 					return -1;
+				}
 
 				$Code = $this->Next[$Code];
 			}
@@ -165,23 +177,22 @@ public function LZWCommand(&$data, $bInit)
 			$this->Stack[$this->sp] = $this->FirstCode;
 			$this->sp++;
 
-			if (($Code = $this->MaxCode) < (1 << $this->MAX_LZW_BITS))
-			{
+			if (($Code = $this->MaxCode) < (1 << $this->MAX_LZW_BITS)) {
 				$this->Next[$Code] = $this->OldCode;
 				$this->Vals[$Code] = $this->FirstCode;
 				$this->MaxCode++;
 
-				if (($this->MaxCode >= $this->MaxCodeSize) && ($this->MaxCodeSize < (1 << $this->MAX_LZW_BITS)))
-				{
+				if (($this->MaxCode >= $this->MaxCodeSize) && ($this->MaxCodeSize < (1 << $this->MAX_LZW_BITS))) {
 					$this->MaxCodeSize *= 2;
 					$this->CodeSize++;
 				}
 			}
 
 			$this->OldCode = $InCode;
-			if ($this->sp > 0)
-			{
+
+			if ($this->sp > 0) {
 				$this->sp--;
+
 				return $this->Stack[$this->sp];
 			}
 		}
@@ -191,8 +202,7 @@ public function LZWCommand(&$data, $bInit)
 
 	public function GetCode(&$data, $bInit)
 	{
-		if ($bInit)
-		{
+		if ($bInit) {
 			$this->CurBit = 0;
 			$this->LastBit = 0;
 			$this->Done = 0;
@@ -201,13 +211,12 @@ public function GetCode(&$data, $bInit)
 			return 1;
 		}
 
-		if (($this->CurBit + $this->CodeSize) >= $this->LastBit)
-		{
-			if ($this->Done)
-			{
+		if (($this->CurBit + $this->CodeSize) >= $this->LastBit) {
+			if ($this->Done) {
 				// Ran off the end of my bits...
-				if ($this->CurBit >= $this->LastBit)
+				if ($this->CurBit >= $this->LastBit) {
 					return 0;
+				}
 
 				return -1;
 			}
@@ -218,15 +227,15 @@ public function GetCode(&$data, $bInit)
 			$count = ord($data[0]);
 			$data = substr($data, 1);
 
-			if ($count)
-			{
-				for ($i = 0; $i < $count; $i++)
+			if ($count) {
+				for ($i = 0; $i < $count; $i++) {
 					$this->Buf[2 + $i] = ord($data[$i]);
+				}
 
 				$data = substr($data, $count);
-			}
-			else
+			} else {
 				$this->Done = 1;
+			}
 
 			$this->LastByte = 2 + $count;
 			$this->CurBit = ($this->CurBit - $this->LastBit) + 16;
@@ -234,10 +243,13 @@ public function GetCode(&$data, $bInit)
 		}
 
 		$iRet = 0;
-		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++)
+
+		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
 			$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		}
 
 		$this->CurBit += $this->CodeSize;
+
 		return $iRet;
 	}
 }
diff --git a/Sources/Graphics/Gif/index.php b/Sources/Graphics/Gif/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Graphics/Gif/index.php
+++ b/Sources/Graphics/Gif/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Graphics/Image.php b/Sources/Graphics/Image.php
index c73761d511..d0c0f31a2f 100644
--- a/Sources/Graphics/Image.php
+++ b/Sources/Graphics/Image.php
@@ -14,20 +14,17 @@
 namespace SMF\Graphics;
 
 use SMF\BackwardCompatibility;
-
-use SMF\Attachment;
+use SMF\Cache\CacheApi;
 use SMF\Config;
 use SMF\ErrorHandler;
-use SMF\Theme;
 use SMF\Url;
-use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 use SMF\WebFetch\WebFetchApi;
 
 // IMAGETYPE_AVIF was added in PHP 8.1
-if (!defined('IMAGETYPE_AVIF'))
+if (!defined('IMAGETYPE_AVIF')) {
 	define('IMAGETYPE_AVIF', 19);
+}
 
 /**
  * Represents an image and allows low-level graphics operations to be performed,
@@ -42,24 +39,32 @@ class Image
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
+			'getImageTypes' => 'getImageTypes',
+			'getSupportedFormats' => 'getSupportedFormats',
 			'checkMemory' => 'imageMemoryCheck',
-			'makeThumbnail' => 'createThumbnail',
 			'getSizeExternal' => 'url_image_size',
 			'gifOutputAsPng' => 'gif_outputAsPng',
-		),
-	);
+			'getSvgSize' => 'getSvgSize',
+			'makeThumbnail' => 'createThumbnail',
+			'reencodeImage' => 'reencodeImage',
+			'checkImageContents' => 'checkImageContents',
+			'checkSvgContents' => 'checkSvgContents',
+			'resizeImageFile' => 'resizeImageFile',
+			'resizeImage' => 'resizeImage',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
 	// Default IMAGETYPE_*
-	const DEFAULT_IMAGETYPE = IMAGETYPE_JPEG;
+	public const DEFAULT_IMAGETYPE = IMAGETYPE_JPEG;
 
 	// Maps certain IMAGETYPE_* constants to ImageMagick formats.
-	const IMAGETYPE_TO_IMAGICK = array(
+	public const IMAGETYPE_TO_IMAGICK = [
 		IMAGETYPE_BMP => 'bmp',
 		IMAGETYPE_GIF => 'gif',
 		IMAGETYPE_ICO => 'ico',
@@ -74,7 +79,7 @@ class Image
 		IMAGETYPE_WEBP => 'webp',
 		IMAGETYPE_XBM => 'xbm',
 		IMAGETYPE_AVIF => 'avif',
-	);
+	];
 
 	/*******************
 	 * Public properties
@@ -223,23 +228,20 @@ class Image
 	 */
 	public function __construct(string $source, bool $strict = false)
 	{
-		if (is_file($source))
-		{
+		if (is_file($source)) {
 			$this->source = realpath($source);
 			$this->original = $this->source;
 			$this->is_temp = false;
-		}
-		else
-		{
+		} else {
 			// External file.
-			if (Url::create($source)->isValid())
-			{
+			if (Url::create($source)->isValid()) {
 				// Remember the URL as the original source.
 				$this->original = $source;
 
 				// Fetch the raw image data from the URL. On failure, bail out.
-				if (!is_string($source = WebFetchApi::fetch($source)))
+				if (!is_string($source = WebFetchApi::fetch($source))) {
 					return;
+				}
 			}
 
 			// At this point, $source contains raw image data. Save to a temp file.
@@ -248,23 +250,25 @@ public function __construct(string $source, bool $strict = false)
 
 			$this->is_temp = true;
 
-			if (!isset($this->original))
+			if (!isset($this->original)) {
 				$this->original = $this->source;
+			}
 		}
 
 		// Get the MIME type of the source file.
 		$mime_type = Utils::getMimeType($this->source, true);
 
 		// Not an image? Error and bail out.
-		if (!is_string($mime_type) || strpos($mime_type, 'image/') !== 0)
-		{
-			if ($this->is_temp)
+		if (!is_string($mime_type) || strpos($mime_type, 'image/') !== 0) {
+			if ($this->is_temp) {
 				@unlink($this->source);
+			}
 
 			unset($this->source);
 
-			if ($strict)
+			if ($strict) {
 				ErrorHandler::fatalLang('smileys_upload_error_illegal', false);
+			}
 
 			return;
 		}
@@ -301,11 +305,13 @@ public function check(bool $extensive = false): bool
 	public function shouldResize(int $max_width, int $max_height): bool
 	{
 		// Always false for SVGs.
-		if ($this->mime_type === 'image/svg+xml')
+		if ($this->mime_type === 'image/svg+xml') {
 			return false;
+		}
 
-		if ($this->force_resize)
+		if ($this->force_resize) {
 			return true;
+		}
 
 		$max_width = empty($max_width) ? INF : round($max_width);
 		$max_height = empty($max_height) ? INF : round($max_height);
@@ -324,12 +330,14 @@ public function shouldResize(int $max_width, int $max_height): bool
 	public function createThumbnail(int $max_width, int $max_height): object|bool
 	{
 		// This is inapplicable to SVGs.
-		if ($this->mime_type === 'image/svg+xml')
+		if ($this->mime_type === 'image/svg+xml') {
 			return false;
+		}
 
 		// We don't need to create a thumbnail if one is already embedded.
-		if (function_exists('exif_thumbnail') && exif_thumbnail($this->source) !== false)
+		if (function_exists('exif_thumbnail') && exif_thumbnail($this->source) !== false) {
 			return false;
+		}
 
 		$dst_name = $this->source . '_thumb.tmp';
 
@@ -341,10 +349,12 @@ public function createThumbnail(int $max_width, int $max_height): object|bool
 		// Okay, we're done with the temporary stuff.
 		$dst_name = substr($dst_name, 0, -4);
 
-		if ($success && @rename($dst_name . '.tmp', $dst_name))
+		if ($success && @rename($dst_name . '.tmp', $dst_name)) {
 			return new self($dst_name);
+		}
 
 		@unlink($dst_name . '.tmp');
+
 		return false;
 	}
 
@@ -361,11 +371,13 @@ public function createThumbnail(int $max_width, int $max_height): object|bool
 	public function reencode(int $preferred_type = 0): bool
 	{
 		// This is inapplicable to SVGs.
-		if ($this->mime_type === 'image/svg+xml')
+		if ($this->mime_type === 'image/svg+xml') {
 			return false;
+		}
 
-		if ($preferred_type === 0)
+		if ($preferred_type === 0) {
 			$preferred_type = $this->type ?? self::DEFAULT_IMAGETYPE;
+		}
 
 		$source = is_file($this->original) ? $this->original : $this->source;
 
@@ -373,10 +385,10 @@ public function reencode(int $preferred_type = 0): bool
 		$success = $this->resize($source . '.tmp', 0, 0, $preferred_type);
 		$this->force_resize = false;
 
-		if (!$success)
-		{
-			if (file_exists($source . '.tmp'))
+		if (!$success) {
+			if (file_exists($source . '.tmp')) {
 				unlink($source . '.tmp');
+			}
 
 			return false;
 		}
@@ -385,12 +397,14 @@ public function reencode(int $preferred_type = 0): bool
 		// Otherwise, update the file extension.
 		$destination = empty($this->pathinfo['extension']) ? $source : substr($source, 0, -(strlen($this->pathinfo['extension']) + 1)) . image_type_to_extension($preferred_type);
 
-		if (!@rename($source . '.tmp', $destination))
+		if (!@rename($source . '.tmp', $destination)) {
 			return false;
+		}
 
 		// Now get rid of the original.
-		if ($destination !== $source && !@unlink($source))
+		if ($destination !== $source && !@unlink($source)) {
 			return false;
+		}
 
 		// Update properties to refer to the new image.
 		$this->source = realpath($destination);
@@ -422,18 +436,18 @@ public function reencode(int $preferred_type = 0): bool
 	public function resize(string $destination, int $max_width, int $max_height, int &$preferred_type = 0): bool
 	{
 		// Check whether the destination directory exists.
-		if (!is_dir(dirname($destination)))
+		if (!is_dir(dirname($destination))) {
 			return false;
+		}
 
 		// Ensure the destination is writable.
-		if (!Utils::makeWritable(file_exists($destination) ? $destination : dirname($destination)))
+		if (!Utils::makeWritable(file_exists($destination) ? $destination : dirname($destination))) {
 			return false;
+		}
 
 		// If it doesn't need to be resized, just copy it to the destination.
-		if (!$this->shouldResize($max_width, $max_height))
-		{
-			if ($this->source !== $destination)
-			{
+		if (!$this->shouldResize($max_width, $max_height)) {
+			if ($this->source !== $destination) {
 				copy($this->source, $destination);
 				$this->source = $destination;
 			}
@@ -442,28 +456,29 @@ public function resize(string $destination, int $max_width, int $max_height, int
 		}
 
 		// Nothing to do without GD or Imagick.
-		if (!extension_loaded('gd') && !extension_loaded('imagick'))
+		if (!extension_loaded('gd') && !extension_loaded('imagick')) {
 			return false;
+		}
 
 		// Is this image currently in a supported format?
-		if (!in_array($this->type, self::getSupportedFormats()))
+		if (!in_array($this->type, self::getSupportedFormats())) {
 			return false;
+		}
 
 		// What destination format do we want?
-		if ($preferred_type === 0 || !in_array($preferred_type, self::$supported))
+		if ($preferred_type === 0 || !in_array($preferred_type, self::$supported)) {
 			$preferred_type = $this->type ?? self::DEFAULT_IMAGETYPE;
+		}
 
 		$max_width = round($max_width);
 		$max_height = round($max_height);
 
 		// Do the job using ImageMagick.
-		if (extension_loaded('imagick') && isset(self::IMAGETYPE_TO_IMAGICK[$preferred_type]))
-		{
+		if (extension_loaded('imagick') && isset(self::IMAGETYPE_TO_IMAGICK[$preferred_type])) {
 			$success = $this->resizeUsingImagick($destination, $max_width, $max_height, $preferred_type);
 		}
 		// Do the job using GD.
-		elseif (extension_loaded('gd'))
-		{
+		elseif (extension_loaded('gd')) {
 			$success = $this->resizeUsingGD($destination, $max_width, $max_height, $preferred_type);
 		}
 
@@ -487,17 +502,19 @@ public function resize(string $destination, int $max_width, int $max_height, int
 	 */
 	public function move(string $destination): bool
 	{
-		if ($destination === $this->source)
+		if ($destination === $this->source) {
 			return true;
+		}
 
-		if (!rename($this->source, $destination))
+		if (!rename($this->source, $destination)) {
 			return false;
+		}
 
 		$this->source = realpath($destination);
 		$this->pathinfo = pathinfo($this->source);
 
 		// Attempt to chmod it.
-		@Utils::makeWritable($image->source);
+		@Utils::makeWritable($this->source);
 
 		return true;
 	}
@@ -513,21 +530,17 @@ public function move(string $destination): bool
 	 */
 	public static function getImageTypes(): array
 	{
-		if (!isset(self::$image_types))
-		{
+		if (!isset(self::$image_types)) {
 			self::$image_types = array_filter(
 				get_defined_constants(),
-				function($constant_name)
-				{
-					if (strpos($constant_name, 'IMAGETYPE_') !== 0)
+				function ($constant_name) {
+					if (strpos($constant_name, 'IMAGETYPE_') !== 0) {
 						return false;
+					}
 
-					if ($constant_name === 'IMAGETYPE_UNKNOWN' || $constant_name === 'IMAGETYPE_COUNT')
-						return false;
-
-					return true;
+					return !($constant_name === 'IMAGETYPE_UNKNOWN' || $constant_name === 'IMAGETYPE_COUNT');
 				},
-				ARRAY_FILTER_USE_KEY
+				ARRAY_FILTER_USE_KEY,
 			);
 		}
 
@@ -541,24 +554,20 @@ function($constant_name)
 	 */
 	public static function getSupportedFormats(): array
 	{
-		if (!isset(self::$supported))
-		{
-			self::$supported = array();
-
-			if (extension_loaded('imagick'))
-			{
-				foreach (self::getImageTypes() as $name => $int)
-				{
-					if (isset(self::IMAGETYPE_TO_IMAGICK[$int]))
+		if (!isset(self::$supported)) {
+			self::$supported = [];
+
+			if (extension_loaded('imagick')) {
+				foreach (self::getImageTypes() as $name => $int) {
+					if (isset(self::IMAGETYPE_TO_IMAGICK[$int])) {
 						self::$supported[$name] = $int;
+					}
 				}
-			}
-			elseif (extension_loaded('gd'))
-			{
-				foreach (self::getImageTypes() as $name => $int)
-				{
-					if (imagetypes() & $int)
+			} elseif (extension_loaded('gd')) {
+				foreach (self::getImageTypes() as $name => $int) {
+					if (imagetypes() & $int) {
 						self::$supported[$name] = $int;
+					}
 				}
 			}
 		}
@@ -575,9 +584,9 @@ public static function getSupportedFormats(): array
 	public static function checkMemory($sizes)
 	{
 		// doing the old 'set it and hope' way?
-		if (empty(Config::$modSettings['attachment_thumb_memory']))
-		{
+		if (empty(Config::$modSettings['attachment_thumb_memory'])) {
 			Config::setMemoryLimit('128M');
+
 			return true;
 		}
 
@@ -604,19 +613,22 @@ public static function getSizeExternal(string $url): array|false
 		$url = str_replace(' ', '%20', $url);
 
 		// Can we pull this from the cache... please please?
-		if (($temp = CacheApi::get('url_image_size-' . md5($url), 240)) !== null)
+		if (($temp = CacheApi::get('url_image_size-' . md5($url), 240)) !== null) {
 			return $temp;
+		}
 
 		$image = new self($url);
 
-		if (!isset($image->width) || !isset($image->width))
+		if (!isset($image->width) || !isset($image->width)) {
 			return false;
+		}
 
 		// If this took a long time, we may never have to do it again, but then again we might...
-		if (microtime(true) - $t > 0.8)
-			CacheApi::put('url_image_size-' . md5($url), array($image->width, $image->height), 240);
+		if (microtime(true) - $t > 0.8) {
+			CacheApi::put('url_image_size-' . md5($url), [$image->width, $image->height], 240);
+		}
 
-		return array($image->width, $image->height);
+		return [$image->width, $image->height];
 	}
 
 	/**
@@ -632,14 +644,17 @@ public static function getSizeExternal(string $url): array|false
 	 */
 	public static function gifOutputAsPng($gif, $lpszFileName, $background_color = -1)
 	{
-		if (!is_a($gif, Gif\File::class) || $lpszFileName == '')
+		if (!is_a($gif, Gif\File::class) || $lpszFileName == '') {
 			return false;
+		}
 
-		if (($fd = $gif->get_png_data($background_color)) === false)
+		if (($fd = $gif->get_png_data($background_color)) === false) {
 			return false;
+		}
 
-		if (($fh = @fopen($lpszFileName, 'wb')) === false)
+		if (($fh = @fopen($lpszFileName, 'wb')) === false) {
 			return false;
+		}
 
 		@fwrite($fh, $fd, strlen($fd));
 		@fflush($fh);
@@ -667,10 +682,11 @@ public static function getSvgSize(string $filepath): array
 	{
 		$image = new self($filepath);
 
-		if ($image->mime_type !== 'image/svg+xml')
-			return array('width' => null, 'height' => null);
+		if ($image->mime_type !== 'image/svg+xml') {
+			return ['width' => null, 'height' => null];
+		}
 
-		return array('width' => $image->width, 'height' => $image->height);
+		return ['width' => $image->width, 'height' => $image->height];
 	}
 
 	/**
@@ -684,6 +700,7 @@ public static function getSvgSize(string $filepath): array
 	public static function makeThumbnail(string $source, int $max_width, int $max_height): bool
 	{
 		$img = new self($source);
+
 		return ($img->createThumbnail() !== false);
 	}
 
@@ -697,6 +714,7 @@ public static function makeThumbnail(string $source, int $max_width, int $max_he
 	public static function reencodeImage(string $source, int $preferred_type = 0): bool
 	{
 		$img = new self($source);
+
 		return $img->reencode($preferred_type);
 	}
 
@@ -710,6 +728,7 @@ public static function reencodeImage(string $source, int $preferred_type = 0): b
 	public static function checkImageContents(string $source, bool $extensive = false): bool
 	{
 		$img = new self($source);
+
 		return $img->check($extensive);
 	}
 
@@ -722,6 +741,7 @@ public static function checkImageContents(string $source, bool $extensive = fals
 	public static function checkSvgContents(string $source): bool
 	{
 		$img = new self($source);
+
 		return $img->check();
 	}
 
@@ -738,6 +758,7 @@ public static function checkSvgContents(string $source): bool
 	public static function resizeImageFile(string $source, string $destination, int $max_width, int $max_height, int $preferred_type = 0): bool
 	{
 		$img = new self($source);
+
 		return $image->resize($destination, $max_width, $max_height, $preferred_type);
 	}
 
@@ -756,6 +777,7 @@ public static function resizeImageFile(string $source, string $destination, int
 	public static function resizeImage(string $source, string $destination, int $src_width, int $src_height, int $max_width, int $max_height, int $preferred_type = 0): bool
 	{
 		$img = new self($source);
+
 		return $image->resize($destination, $max_width, $max_height, $preferred_type);
 	}
 
@@ -769,40 +791,41 @@ public static function resizeImage(string $source, string $destination, int $src
 	protected function getImageType(): void
 	{
 		// Avoid unnecessary repetition.
-		if (isset($this->type))
+		if (isset($this->type)) {
 			return;
+		}
 
 		// SVGs don't have an IMAGETYPE_*.
-		if ($this->mime_type === 'image/svg+xml')
+		if ($this->mime_type === 'image/svg+xml') {
 			return;
+		}
 
 		// First try exif_imagetype().
-		if (function_exists('exif_imagetype') && ($type = exif_imagetype($this->source)) !== false)
-		{
+		if (function_exists('exif_imagetype') && ($type = exif_imagetype($this->source)) !== false) {
 			$this->type = $type;
+
 			return;
 		}
 
 		// Next try getimagesize().
-		if (function_exists('getimagesize') && ($sizes = @getimagesize($this->source)) !== false)
-		{
+		if (function_exists('getimagesize') && ($sizes = @getimagesize($this->source)) !== false) {
 			list($this->width, $this->height, $this->type) = $sizes;
+
 			return;
 		}
 
 		// If all else fails, see if we can guess from the MIME type.
-		if (strpos($mime_type, 'image/') === 0)
-		{
+		if (strpos($mime_type, 'image/') === 0) {
 			// Unfortunately, 'image/tiff' could be two different things,
 			// and if we got here, we have no way to guess which one.
-			if ($mime_type === 'image/tiff')
+			if ($mime_type === 'image/tiff') {
 				return;
+			}
 
-			foreach (self::getImageTypes() as $type)
-			{
-				if (image_type_to_mime_type($type) === $mime_type)
-				{
+			foreach (self::getImageTypes() as $type) {
+				if (image_type_to_mime_type($type) === $mime_type) {
 					$this->type = $type;
+
 					return;
 				}
 			}
@@ -824,49 +847,48 @@ protected function checkForEmbeddedThumb(): void
 	protected function getDimensionsAndOrientation(): void
 	{
 		// SVGs are special.
-		if ($this->mime_type === 'image/svg+xml')
-		{
+		if ($this->mime_type === 'image/svg+xml') {
 			$this->getSvgDimensions();
+
 			return;
 		}
 
 		// First try exif_read_data().
-		if (function_exists('exif_read_data') && ($exif_data = @exif_read_data($this->source)) !== false)
-		{
-			if (isset($exif_data['Orientation']))
+		if (function_exists('exif_read_data') && ($exif_data = @exif_read_data($this->source)) !== false) {
+			if (isset($exif_data['Orientation'])) {
 				$this->orientation = $exif_data['Orientation'];
+			}
 
-			if (isset($exif_data['COMPUTED']['Width']) && isset($exif_data['COMPUTED']['Height']))
-			{
+			if (isset($exif_data['COMPUTED']['Width'], $exif_data['COMPUTED']['Height'])) {
 				$this->width = $exif_data['COMPUTED']['Width'];
 				$this->height = $exif_data['COMPUTED']['Height'];
+
 				return;
 			}
 		}
 
 		// Next try ImageMagick.
-		if (extension_loaded('imagick'))
-		{
+		if (extension_loaded('imagick')) {
 			$imagick = new \Imagick($this->source);
 
-			try
-			{
+			try {
 				$this->orientation = $imagick->getImageOrientation();
+			} catch (Throwable $e) {
 			}
-			catch (Throwable $e) {}
 
-			try
-			{
+			try {
 				$this->width = $imagick->getImageWidth();
 				$this->height = $imagick->getImageHeight();
+
 				return;
+			} catch (Throwable $e) {
 			}
-			catch (Throwable $e) {}
 		}
 
 		// Finally, try getimagesize(). This can't tell us orientation.
-		if (function_exists('getimagesize') && ($sizes = @getimagesize($this->source)) !== false)
+		if (function_exists('getimagesize') && ($sizes = @getimagesize($this->source)) !== false) {
 			list($this->width, $this->height, $this->type) = $sizes;
+		}
 	}
 
 	/**
@@ -878,30 +900,26 @@ protected function getSvgDimensions(): void
 	{
 		preg_match('/<svg\b[^>]*>/', file_get_contents($this->source, false, null, 0, 480), $matches);
 
-		if (!isset($matches[0]))
+		if (!isset($matches[0])) {
 			return;
+		}
 
 		$svg = $matches[0];
 
 		// If the SVG has width and height attributes, use those.
 		// If attribute is missing, SVG spec says the default is '100%'.
 		// If no unit is supplied, spec says unit defaults to px.
-		foreach (array('width', 'height') as $dimension)
-		{
-			if (preg_match("/\b$dimension\s*=\s*([\"'])\s*([\d.]+)([\D\S]*)\s*\\1/", $svg, $matches))
-			{
+		foreach (['width', 'height'] as $dimension) {
+			if (preg_match("/\b{$dimension}\s*=\s*([\"'])\s*([\d.]+)([\D\S]*)\s*\1/", $svg, $matches)) {
 				$$dimension = $matches[2];
 				$unit = !empty($matches[3]) ? $matches[3] : 'px';
-			}
-			else
-			{
+			} else {
 				$$dimension = 100;
 				$unit = '%';
 			}
 
 			// Resolve unit.
-			switch ($unit)
-			{
+			switch ($unit) {
 				// Already pixels, so do nothing.
 				case 'px':
 					break;
@@ -958,32 +976,27 @@ protected function getSvgDimensions(): void
 		}
 
 		// Width and/or height is missing or a percentage, so try the viewBox attribute.
-		if ((!isset($width) || !isset($height)) && preg_match('/\bviewBox\s*=\s*(["\'])\s*[\d.]+[,\s]+[\d.]+[,\s]+([\d.]+)[,\s]+([\d.]+)\s*\\1/', $svg, $matches))
-		{
+		if ((!isset($width) || !isset($height)) && preg_match('/\bviewBox\s*=\s*(["\'])\s*[\d.]+[,\s]+[\d.]+[,\s]+([\d.]+)[,\s]+([\d.]+)\s*\1/', $svg, $matches)) {
 			$vb_width = $matches[2];
 			$vb_height = $matches[3];
 
 			// No dimensions given, so use viewBox dimensions.
-			if (!isset($width) && !isset($height))
-			{
+			if (!isset($width) && !isset($height)) {
 				$width = $vb_width;
 				$height = $vb_height;
 			}
 			// Width but no height, so calculate height.
-			elseif (isset($width))
-			{
+			elseif (isset($width)) {
 				$height = $width * $vb_height / $vb_width;
 			}
 			// Height but no width, so calculate width.
-			elseif (isset($height))
-			{
+			elseif (isset($height)) {
 				$width = $height * $vb_width / $vb_height;
 			}
 		}
 
 		// Viewport undefined, so call it infinite.
-		if (!isset($width) && !isset($height))
-		{
+		if (!isset($width) && !isset($height)) {
 			$width = INF;
 			$height = INF;
 		}
@@ -1003,33 +1016,30 @@ protected function checkRaster(bool $extensive = false): bool
 	{
 		$fp = fopen($this->source, 'rb');
 
-		if (!$fp)
+		if (!$fp) {
 			ErrorHandler::fatalLang('attach_timeout');
+		}
 
 		$prev_chunk = '';
 
-		while (!feof($fp))
-		{
+		while (!feof($fp)) {
 			$cur_chunk = fread($fp, 8192);
 
 			// Though not exhaustive lists, better safe than sorry.
-			if (!empty($extensive))
-			{
+			if (!empty($extensive)) {
 				// Paranoid check.
 				// Will result in MANY false positives, and is not suitable for photography sites.
-				if (preg_match('~(iframe|\\<\\?|\\<%|html|eval|body|script\W|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk . $cur_chunk) === 1)
-				{
+				if (preg_match('~(iframe|\\<\\?|\\<%|html|eval|body|script\W|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk . $cur_chunk) === 1) {
 					fclose($fp);
+
 					return false;
 				}
-			}
-			else
-			{
+			} else {
 				// Check for potential infection - focus on clues for inline PHP & flash.
 				// Will result in significantly fewer false positives than the paranoid check.
-				if (preg_match('~(\\<\\?php\s|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk . $cur_chunk) === 1)
-				{
+				if (preg_match('~(\\<\\?php\s|(?-i)[CFZ]WS[\x01-\x0E])~i', $prev_chunk . $cur_chunk) === 1) {
 					fclose($fp);
+
 					return false;
 				}
 			}
@@ -1052,17 +1062,18 @@ protected function checkSvg(): bool
 	{
 		$fp = fopen($this->source, 'rb');
 
-		if (!$fp)
+		if (!$fp) {
 			ErrorHandler::fatalLang('attach_timeout');
+		}
 
-		$patterns = array(
+		$patterns = [
 			// No external or embedded scripts allowed.
 			'/<(\S*:)?script\b/i',
 			'/\b(\S:)?href\s*=\s*["\']\s*javascript:/i',
 
 			// No SVG event attributes allowed, since they execute scripts.
 			'/\bon\w+\s*=\s*["\']/',
-			'/<(\S*:)?set\b[^>]*\battributeName\s*=\s*(["\'])\s*on\w+\\1/i',
+			'/<(\S*:)?set\b[^>]*\battributeName\s*=\s*(["\'])\s*on\w+\1/i',
 
 			// No XML Events allowed, since they execute scripts.
 			'~\bhttp://www\.w3\.org/2001/xml-events\b~i',
@@ -1084,18 +1095,17 @@ protected function checkSvg(): bool
 			// Harmless if the SVG is just the src of an img element, but very
 			// bad if the SVG is embedded inline into the HTML document.
 			'/<(php)?[?]|[?]>/i',
-		);
+		];
 
 		$prev_chunk = '';
-		while (!feof($fp))
-		{
+
+		while (!feof($fp)) {
 			$cur_chunk = fread($fp, 8192);
 
-			foreach ($patterns as $pattern)
-			{
-				if (preg_match($pattern, $prev_chunk . $cur_chunk))
-				{
+			foreach ($patterns as $pattern) {
+				if (preg_match($pattern, $prev_chunk . $cur_chunk)) {
 					fclose($fp);
+
 					return false;
 				}
 			}
@@ -1120,10 +1130,10 @@ protected function resizeUsingGD(string $destination, int $max_width, int $max_h
 	{
 		// If the image is already small enough and in the desired format,
 		// just write to the destination and return.
-		if (!$this->shouldResize($max_width, $max_height) && $preferred_type === $this->type)
-		{
-			if ($this->source !== $destination)
+		if (!$this->shouldResize($max_width, $max_height) && $preferred_type === $this->type) {
+			if ($this->source !== $destination) {
 				copy($this->source, $destination);
+			}
 
 			return true;
 		}
@@ -1134,47 +1144,44 @@ protected function resizeUsingGD(string $destination, int $max_width, int $max_h
 		$imagesave = 'image' . strtolower(substr(array_search($preferred_type, self::$supported), 10));
 
 		// Do the functions exist?
-		if (!function_exists($imagecreatefrom) || !function_exists($imagesave))
+		if (!function_exists($imagecreatefrom) || !function_exists($imagesave)) {
 			return false;
+		}
 
 		// See if we have or can get the needed memory for this operation.
-		if (!self::checkMemory(array($this->width, $this->height)))
+		if (!self::checkMemory([$this->width, $this->height])) {
 			return false;
+		}
 
-		if (($src_img = @$imagecreatefrom($this->source)) === false)
+		if (($src_img = @$imagecreatefrom($this->source)) === false) {
 			return false;
+		}
 
 		$success = false;
 
 		// Determine whether to resize to max width or to max height (depending on the limits.)
-		if (!empty($max_width) && (empty($max_height) || round($this->height * $max_width / $this->width) <= $max_height))
-		{
+		if (!empty($max_width) && (empty($max_height) || round($this->height * $max_width / $this->width) <= $max_height)) {
 			$dst_width = $max_width;
 			$dst_height = round($this->height * $max_width / $this->width);
-		}
-		elseif (!empty($max_height))
-		{
+		} elseif (!empty($max_height)) {
 			$dst_width = round($this->width * $max_height / $this->height);
 			$dst_height = $max_height;
 		}
 
 		// Don't bother resizing if it's already smaller...
-		if (!$this->shouldResize($dst_width, $dst_height) && $preferred_type === $this->type)
-		{
+		if (!$this->shouldResize($dst_width, $dst_height) && $preferred_type === $this->type) {
 			$dst_img = $src_img;
-		}
-		else
-		{
+		} else {
 			// (make a true color image, because it just looks better for resizing.)
 			$dst_img = imagecreatetruecolor($dst_width, $dst_height);
 
 			// Deal nicely with a PNG - because we can.
-			if ($preferred_type == IMAGETYPE_PNG)
-			{
+			if ($preferred_type == IMAGETYPE_PNG) {
 				imagealphablending($dst_img, false);
 
-				if (function_exists('imagesavealpha'))
+				if (function_exists('imagesavealpha')) {
 					imagesavealpha($dst_img, true);
+				}
 			}
 
 			// Resize it!
@@ -1182,10 +1189,8 @@ protected function resizeUsingGD(string $destination, int $max_width, int $max_h
 		}
 
 		// Should we adjust the orientation of the resized image?
-		if ($this->orientation > 1)
-		{
-			switch ($this->orientation)
-			{
+		if ($this->orientation > 1) {
+			switch ($this->orientation) {
 				case 3:
 				case 4:
 					$dst_img = imagerotate($dst_img, 180, 0);
@@ -1202,19 +1207,17 @@ protected function resizeUsingGD(string $destination, int $max_width, int $max_h
 					break;
 			}
 
-			if (in_array($this->orientation, [2, 4, 5, 7]))
+			if (in_array($this->orientation, [2, 4, 5, 7])) {
 				imageflip($dst_img, IMG_FLIP_HORIZONTAL);
+			}
 		}
 
 		// Save the image as...
-		if ($preferred_type == IMAGETYPE_JPEG)
-		{
+		if ($preferred_type == IMAGETYPE_JPEG) {
 			return imagejpeg($dst_img, $destination, !empty(Config::$modSettings['avatar_jpeg_quality']) ? Config::$modSettings['avatar_jpeg_quality'] : 82);
 		}
-		else
-		{
-			return $imagesave($dst_img, $destination);
-		}
+
+		return $imagesave($dst_img, $destination);
 	}
 
 	/**
@@ -1235,13 +1238,11 @@ protected function resizeUsingImagick(string $destination, int $max_width, int $
 
 		// If the image is already small enough and in the desired format,
 		// just write to the destination and return.
-		if (!$this->shouldResize($dst_width, $dst_height) && $preferred_type === $this->type)
-		{
+		if (!$this->shouldResize($dst_width, $dst_height) && $preferred_type === $this->type) {
 			return $imagick->writeImage($destination);
 		}
 
-		if (self::IMAGETYPE_TO_IMAGICK[$preferred_type] == 'jpeg')
-		{
+		if (self::IMAGETYPE_TO_IMAGICK[$preferred_type] == 'jpeg') {
 			$imagick->setCompressionQuality(!empty(Config::$modSettings['avatar_jpeg_quality']) ? Config::$modSettings['avatar_jpeg_quality'] : 82);
 		}
 
@@ -1249,10 +1250,8 @@ protected function resizeUsingImagick(string $destination, int $max_width, int $
 		$imagick->resizeImage($dst_width, $dst_height, \Imagick::FILTER_LANCZOS, 1, true);
 
 		// Should we adjust the orientation of the resized image?
-		if ($this->orientation > 1)
-		{
-			switch ($this->orientation)
-			{
+		if ($this->orientation > 1) {
+			switch ($this->orientation) {
 				case 3:
 				case 4:
 					$imagick->rotateImage('#00000000', 180);
@@ -1269,8 +1268,9 @@ protected function resizeUsingImagick(string $destination, int $max_width, int $
 					break;
 			}
 
-			if (in_array($this->orientation, array(2, 4, 5, 7)))
+			if (in_array($this->orientation, [2, 4, 5, 7])) {
 				$imagick->flopImage();
+			}
 		}
 
 		return $imagick->writeImage($destination);
@@ -1290,17 +1290,19 @@ protected function resizeUsingImagick(string $destination, int $max_width, int $
 	protected static function mimeTypeToImageType(string $mime_type): int
 	{
 		// We can't do anything useful with 'application/octet-stream', etc.
-		if (strpos($mime_type, 'image/') !== 0)
+		if (strpos($mime_type, 'image/') !== 0) {
 			return 0;
+		}
 
 		// Unfortunately, 'image/tiff' could be two different things.
-		if ($mime_type === 'image/tiff')
+		if ($mime_type === 'image/tiff') {
 			return 0;
+		}
 
-		foreach (self::getImageTypes() as $type)
-		{
-			if (image_type_to_mime_type($type) === $mime_type)
+		foreach (self::getImageTypes() as $type) {
+			if (image_type_to_mime_type($type) === $mime_type) {
 				return $type;
+			}
 		}
 
 		return 0;
@@ -1308,7 +1310,8 @@ protected static function mimeTypeToImageType(string $mime_type): int
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Image::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Image::exportStatic')) {
 	Image::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Graphics/index.php b/Sources/Graphics/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Graphics/index.php
+++ b/Sources/Graphics/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Group.php b/Sources/Group.php
index 8bfcaff383..35b394e749 100644
--- a/Sources/Group.php
+++ b/Sources/Group.php
@@ -21,50 +21,54 @@
  */
 class Group implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'loadModeratorsBatch' => false,
-			'countMembersBatch' => false,
-			'getCachedList' => 'cache_getMembergroupList'
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'loadSimple' => 'loadSimple',
+			'loadAssignable' => 'loadAssignable',
+			'loadPermissionsBatch' => 'loadPermissionsBatch',
+			'countPermissionsBatch' => 'countPermissionsBatch',
+			'getPostGroups' => 'getPostGroups',
+			'getUnassignable' => 'getUnassignable',
+			'getCachedList' => 'cache_getMembergroupList',
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
 	// Reserved group IDs.
-	const NONE = -2;
-	const GUEST = -1;
-	const REGULAR = 0;
-	const ADMIN = 1;
-	const GLOBAL_MOD = 2;
-	const MOD = 3;
-	const NEWBIE = 4;
+	public const NONE = -2;
+	public const GUEST = -1;
+	public const REGULAR = 0;
+	public const ADMIN = 1;
+	public const GLOBAL_MOD = 2;
+	public const MOD = 3;
+	public const NEWBIE = 4;
 
 	// Group types.
-	const TYPE_PRIVATE = 0;
-	const TYPE_PROTECTED = 1;
-	const TYPE_REQUESTABLE = 2;
-	const TYPE_FREE = 3;
+	public const TYPE_PRIVATE = 0;
+	public const TYPE_PROTECTED = 1;
+	public const TYPE_REQUESTABLE = 2;
+	public const TYPE_FREE = 3;
 
 	// Group visibility levels.
-	const VISIBLE = 0;
-	const NO_GROUP_KEY = 1;
-	const INVISIBLE = 2;
+	public const VISIBLE = 0;
+	public const NO_GROUP_KEY = 1;
+	public const INVISIBLE = 2;
 
 	// Load types for the loadSimple() method.
-	const LOAD_NORMAL = 1;
-	const LOAD_POST = 2;
-	const LOAD_BOTH = 3;
+	public const LOAD_NORMAL = 1;
+	public const LOAD_POST = 2;
+	public const LOAD_BOTH = 3;
 
 	/*******************
 	 * Public properties
@@ -211,7 +215,7 @@ class Group implements \ArrayAccess
 	 * Members who can moderate this group, formatted for display.
 	 * Items in this array take different forms in different cases.
 	 */
-	public array $moderators = array();
+	public array $moderators = [];
 
 	/**
 	 * @var array
@@ -251,10 +255,10 @@ class Group implements \ArrayAccess
 	 * As in the database table itself, 0 means denied and 1 means allowed.
 	 * A permission that is not listed at all is neither granted nor denied.
 	 */
-	public array $permissions = array(
-		'general' => array(),
-		'board_profiles' => array(),
-	);
+	public array $permissions = [
+		'general' => [],
+		'board_profiles' => [],
+	];
 
 	/**
 	 * @var array
@@ -265,10 +269,10 @@ class Group implements \ArrayAccess
 	 *
 	 * This is typically only used by SMF\Actions\Admin\Permissions.
 	 */
-	public array $num_permissions = array(
+	public array $num_permissions = [
 		'allowed' => 0,
 		'denied' => 0,
-	);
+	];
 
 	/**************************
 	 * Public static properties
@@ -279,7 +283,7 @@ class Group implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -290,7 +294,7 @@ class Group implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_group' => 'id',
 		'group_name' => 'name',
 		'editable_name' => 'name',
@@ -307,24 +311,24 @@ class Group implements \ArrayAccess
 		'is_moderator_group' => __CLASS__ . '::isModeratorGroup',
 		'assignable' => __CLASS__ . '::isAssignable',
 		'is_assignable' => __CLASS__ . '::isAssignable',
-		'allow_post_group' => __CLASS__ .  '::canBePostGroup',
-		'allow_protected' => __CLASS__ .  '::canBeProtected',
-		'allow_delete' => __CLASS__ .  '::canDelete',
-		'allow_modify' => __CLASS__ .  '::canChangePermissions',
-		'can_be_post_group' => __CLASS__ .  '::canBePostGroup',
-		'can_be_protected' => __CLASS__ .  '::canBeProtected',
+		'allow_post_group' => __CLASS__ . '::canBePostGroup',
+		'allow_protected' => __CLASS__ . '::canBeProtected',
+		'allow_delete' => __CLASS__ . '::canDelete',
+		'allow_modify' => __CLASS__ . '::canChangePermissions',
+		'can_be_post_group' => __CLASS__ . '::canBePostGroup',
+		'can_be_protected' => __CLASS__ . '::canBeProtected',
 		'can_be_additional' => __CLASS__ . '::canBeAdditional',
 		'can_be_primary' => __CLASS__ . '::canBePrimary',
-		'can_change_type' => __CLASS__ .  '::canChangePermissions',
-		'can_change_permissions' => __CLASS__ .  '::canChangePermissions',
-		'can_delete' => __CLASS__ .  '::canDelete',
-		'can_search' => __CLASS__ .  '::canSearch',
+		'can_change_type' => __CLASS__ . '::canChangePermissions',
+		'can_change_permissions' => __CLASS__ . '::canChangePermissions',
+		'can_delete' => __CLASS__ . '::canDelete',
+		'can_search' => __CLASS__ . '::canSearch',
 		'can_leave' => __CLASS__ . '::canLeave',
 		'icons' => __CLASS__ . '::formatIcons',
 		'help' => __CLASS__ . '::getHelpTxt',
 		'href' => __CLASS__ . '::getHref',
 		'link' => __CLASS__ . '::getLink',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -355,18 +359,18 @@ class Group implements \ArrayAccess
 	 * @param array $props Properties to set for this group. If empty, will be
 	 *    loaded from the database automatically.
 	 */
-	public function __construct(int $id, array $props = array())
+	public function __construct(int $id, array $props = [])
 	{
-		if ($id > self::REGULAR && empty($props))
-		{
-			$request = Db::$db->query('', '
-				SELECT *
+		if ($id > self::REGULAR && empty($props)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT *
 				FROM {db_prefix}membergroups
 				WHERE id_group = {int:id}
 				LIMIT 1',
-				array(
+				[
 					'id' => $id,
-				)
+				],
 			);
 			$props = Db::$db->fetch_all($request);
 			Db::$db->free_result($request);
@@ -377,26 +381,25 @@ public function __construct(int $id, array $props = array())
 		self::$loaded[$this->id] = $this;
 
 		// Some special cases.
-		if (in_array($this->id, array(self::GUEST, self::REGULAR)))
-		{
-			if (empty($this->name))
-			{
-				if ($this->id === self::GUEST || !isset(Lang::$txt['announce_regular_members']))
+		if (in_array($this->id, [self::GUEST, self::REGULAR])) {
+			if (empty($this->name)) {
+				if ($this->id === self::GUEST || !isset(Lang::$txt['announce_regular_members'])) {
 					Lang::load('Admin');
+				}
 
 				$this->name = $this->id === self::GUEST ? Lang::$txt['membergroups_guests'] : (Lang::$txt['announce_regular_members'] ?? Lang::$txt['membergroups_members']);
 			}
 
-			if ($this->id === self::REGULAR && !isset($this->description))
-			{
+			if ($this->id === self::REGULAR && !isset($this->description)) {
 				Lang::load('Profile');
 
 				$this->description = Lang::$txt['regular_members_desc'];
 			}
 		}
 
-		if (!isset($this->min_posts) && ($this->id < self::NEWBIE || !empty($this->type)))
+		if (!isset($this->min_posts) && ($this->id < self::NEWBIE || !empty($this->type))) {
 			$this->min_posts = -1;
+		}
 
 		// Set initial value for $this->can_moderate.
 		// This might change when $this->loadModerators() is called.
@@ -412,16 +415,12 @@ public function __construct(int $id, array $props = array())
 	public function __set(string $prop, mixed $value): void
 	{
 		// Special handling for the icons.
-		if ($prop === 'icons' && is_string($value))
-		{
+		if ($prop === 'icons' && is_string($value)) {
 			$prop = 'raw_icons';
 
-			if (preg_match('/^\d+#/', $value))
-			{
+			if (preg_match('/^\d+#/', $value)) {
 				list($this->icon_count, $this->icon_image) = explode('#', $value);
-			}
-			else
-			{
+			} else {
 				$this->icon_count = 0;
 				$this->icon_image = '';
 				$value = '';
@@ -441,11 +440,10 @@ public function save(): void
 		SecurityToken::validate('admin-mmg');
 
 		// Saving a new group.
-		if (empty($this->id))
-		{
-			IntegrationHook::call('integrate_pre_add_membergroup', array());
+		if (empty($this->id)) {
+			IntegrationHook::call('integrate_pre_add_membergroup', []);
 
-			$columns = array(
+			$columns = [
 				'group_name' => 'string-80',
 				'description' => 'string',
 				'online_color' => 'string',
@@ -456,9 +454,9 @@ public function save(): void
 				'hidden' => 'int',
 				'id_parent' => 'int',
 				'tfa_required' => 'int',
-			);
+			];
 
-			$params = array(
+			$params = [
 				$this->name ?? '',
 				$this->description ?? '',
 				$this->online_color ?? '',
@@ -469,24 +467,24 @@ public function save(): void
 				$this->hidden ?? self::VISIBLE,
 				$this->parent ?? self::NONE,
 				(int) ($this->tfa_required ?? 0),
-			);
+			];
 
-			$this->id = Db::$db->insert('',
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}membergroups',
 				$columns,
 				$params,
-				array('id_group'),
-				1
+				['id_group'],
+				1,
 			);
 
 			self::$loaded[$this->id] = $this;
 
-			IntegrationHook::call('integrate_add_membergroup', array($this->id, $this->min_posts > -1));
+			IntegrationHook::call('integrate_add_membergroup', [$this->id, $this->min_posts > -1]);
 		}
 		// Updating an existing group.
-		else
-		{
-			$set = array(
+		else {
+			$set = [
 				'group_name = {string:name}',
 				'description = {string:description}',
 				'online_color = {string:online_color}',
@@ -497,9 +495,9 @@ public function save(): void
 				'hidden = {int:hidden}',
 				'id_parent = {int:parent}',
 				'tfa_required = {int:tfa_required}',
-			);
+			];
 
-			$params = array(
+			$params = [
 				'id' => $this->id,
 				'name' => $this->name ?? '',
 				'description' => $this->description ?? '',
@@ -511,61 +509,66 @@ public function save(): void
 				'hidden' => $this->hidden ?? self::VISIBLE,
 				'parent' => $this->parent ?? self::NONE,
 				'tfa_required' => (int) ($this->tfa_required ?? 0),
-			);
+			];
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}membergroups
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}membergroups
 				SET ' . (implode(', ', $set)) . '
 				WHERE id_group = {int:id}',
-				$params
+				$params,
 			);
 
-			IntegrationHook::call('integrate_save_membergroup', array($this->id));
+			IntegrationHook::call('integrate_save_membergroup', [$this->id]);
 		}
 
 		// Update membership for post groups, hidden groups, and the moderator group.
 		$this->fixMembership();
 
 		// Update the list of group moderators (i.e. people who can moderate this group)
-		if (isset($this->moderator_ids))
-		{
+		if (isset($this->moderator_ids)) {
 			$this->moderator_ids = array_unique($this->moderator_ids);
 			sort($this->moderator_ids);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}group_moderators
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}group_moderators
 				WHERE id_group = {int:current_group}',
-				array(
+				[
 					'current_group' => $this->id,
-				)
+				],
 			);
 
-			foreach ($this->moderator_ids as $mod_id)
-				$inserts[] = array($this->id, $mod_id);
+			foreach ($this->moderator_ids as $mod_id) {
+				$inserts[] = [$this->id, $mod_id];
+			}
 
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}group_moderators',
-				array('id_group' => 'int', 'id_member' => 'int'),
+				['id_group' => 'int', 'id_member' => 'int'],
 				$inserts,
-				array('id_group', 'id_member')
+				['id_group', 'id_member'],
 			);
 		}
 
 		// Update permissions of any groups that inherit from this group.
-		if ($this->parent === self::NONE)
+		if ($this->parent === self::NONE) {
 			Permissions::updateChildPermissions($this->id);
+		}
 
 		// Did we make some post group changes?
-		if ($this->min_posts > -1)
+		if ($this->min_posts > -1) {
 			Logging::updateStats('postgroups');
+		}
 
 		// Rebuild the group cache.
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'settings_updated' => time(),
-		));
+		]);
 
 		// Log the edit.
-		Logging::logAction('edited_group', array('group' => $this->name), 'admin');
+		Logging::logAction('edited_group', ['group' => $this->name], 'admin');
 
 		SecurityToken::create('admin-mmg');
 	}
@@ -582,30 +585,31 @@ public function delete(): bool|string
 		SecurityToken::validate('admin-mmg');
 
 		// Don't delete protected groups.
-		if (!$this->can_delete)
+		if (!$this->can_delete) {
 			return 'no_group_found';
+		}
 
 		// Make sure they don't try to delete a group attached to a paid subscription.
-		$subscriptions = array();
+		$subscriptions = [];
 
-		$request = Db::$db->query('', '
-			SELECT name
+		$request = Db::$db->query(
+			'',
+			'SELECT name
 			FROM {db_prefix}subscriptions
 			WHERE id_group = {int:this_group}
 				OR FIND_IN_SET({int:this_group}, additional_groups) != 0
 			ORDER BY name',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$subscriptions[] = $row['name'];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($subscriptions))
-		{
+		if (!empty($subscriptions)) {
 			// Uh oh. But before we return, we need to update a language string because we want the names of the groups.
 			Lang::load('ManageMembers');
 			Lang::$txt['membergroups_cannot_delete_paid'] = sprintf(Lang::$txt['membergroups_cannot_delete_paid'], sentence_list($subscriptions));
@@ -614,143 +618,152 @@ public function delete(): bool|string
 		}
 
 		// Log the deletion.
-		Logging::logAction('delete_group', array('group' => $this->name), 'admin');
+		Logging::logAction('delete_group', ['group' => $this->name], 'admin');
 
 		// Remove the group itself.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}membergroups
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}membergroups
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
 		// Remove the permissions of the groups.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}permissions
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}board_permissions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}board_permissions
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}group_moderators
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}group_moderators
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}moderator_groups
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}moderator_groups
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
 		// Delete any outstanding requests.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_group_requests
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_group_requests
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
 		// Update the primary groups of members.
-		Db::$db->query('', '
-			UPDATE {db_prefix}members
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}members
 			SET id_group = {int:regular_group}
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
 				'regular_group' => self::REGULAR,
-			)
+			],
 		);
 
 		// Update any inherited groups (Lose inheritance).
-		Db::$db->query('', '
-			UPDATE {db_prefix}membergroups
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}membergroups
 			SET id_parent = {int:uninherited}
 			WHERE id_parent = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
 				'uninherited' => self::NONE,
-			)
+			],
 		);
 
 		// Update the additional groups of members.
-		$updates = array();
+		$updates = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, additional_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, additional_groups
 			FROM {db_prefix}members
 			WHERE FIND_IN_SET({int:this_group}, additional_groups) != 0',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$updates[$row['additional_groups']][] = $row['id_member'];
 		}
 		Db::$db->free_result($request);
 
-		foreach ($updates as $additional_groups => $member_array)
-		{
-			User::updateMemberData($member_array, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array($this->id)))));
+		foreach ($updates as $additional_groups => $member_array) {
+			User::updateMemberData($member_array, ['additional_groups' => implode(',', array_diff(explode(',', $additional_groups), [$this->id]))]);
 		}
 
 		// No boards can provide access to these groups anymore.
-		$updates = array();
+		$updates = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_board, member_groups
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, member_groups
 			FROM {db_prefix}boards
 			WHERE FIND_IN_SET({int:this_group}, member_groups) != 0',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$updates[$row['member_groups']][] = $row['id_board'];
 		}
 		Db::$db->free_result($request);
 
-		foreach ($updates as $member_groups => $board_array)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		foreach ($updates as $member_groups => $board_array) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET member_groups = {string:member_groups}
 				WHERE id_board IN ({array_int:board_lists})',
-				array(
+				[
 					'board_lists' => $board_array,
-					'member_groups' => implode(',', array_diff(explode(',', $member_groups), array($this->id))),
-				)
+					'member_groups' => implode(',', array_diff(explode(',', $member_groups), [$this->id])),
+				],
 			);
 		}
 
 		// Recalculate the post groups if this was one.
-		if ($this->min_posts > -1)
+		if ($this->min_posts > -1) {
 			Logging::updateStats('postgroups');
+		}
 
 		// Make a note of the fact that the cache may be wrong.
-		$settings_update = array('settings_updated' => time());
+		$settings_update = ['settings_updated' => time()];
 
 		// Have we deleted the spider group?
-		if (isset(Config::$modSettings['spider_group']) && Config::$modSettings['spider_group'] == $this->id)
-		{
+		if (isset(Config::$modSettings['spider_group']) && Config::$modSettings['spider_group'] == $this->id) {
 			$settings_update['spider_group'] = 0;
 		}
 
@@ -771,16 +784,18 @@ public function delete(): bool|string
 	 */
 	public function getBoardsCanModerate(): array
 	{
-		if (isset($this->boards_can_moderate))
+		if (isset($this->boards_can_moderate)) {
 			return $this->boards_can_moderate;
+		}
 
-		$request = Db::$db->query('', '
-			SELECT id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board
 			FROM {db_prefix}moderator_groups
 			WHERE id_group = {int:current_group}',
-			array(
+			[
 				'current_group' => $this->id,
-			)
+			],
 		);
 		$this->boards_can_moderate = array_values(Db::$db->fetch_all($request));
 		Db::$db->free_result($request);
@@ -798,7 +813,7 @@ public function getBoardsCanModerate(): array
 	 */
 	public function loadModerators(bool $ignore_protected = false): void
 	{
-		self::loadModeratorsBatch(array($this->id), $ignore_protected);
+		self::loadModeratorsBatch([$this->id], $ignore_protected);
 	}
 
 	/**
@@ -811,7 +826,8 @@ public function loadModerators(bool $ignore_protected = false): void
 	 */
 	public function countMembers(bool $recount = false): int
 	{
-		self::countMembersBatch(array($this->id), $recount);
+		self::countMembersBatch([$this->id], $recount);
+
 		return $this->num_members;
 	}
 
@@ -824,89 +840,86 @@ public function countMembers(bool $recount = false): int
 	 */
 	public function loadMembers(): array
 	{
-		if (isset($this->members))
+		if (isset($this->members)) {
 			return $this->members;
+		}
 
-		$this->members = array();
+		$this->members = [];
 
 		// Special case for the moderator group.
-		if ($this->id === self::MOD)
-		{
+		if ($this->id === self::MOD) {
 			// If we're in a board, only get the moderators for that board.
-			if (isset(Board::$info))
-			{
+			if (isset(Board::$info)) {
 				self::$loaded[self::MOD]->members = array_keys(Board::$info->moderators);
 			}
 			// Outside a board, get the moderators for all boards.
-			else
-			{
-				$request = Db::$db->query('', '
-					SELECT DISTINCT id_member
+			else {
+				$request = Db::$db->query(
+					'',
+					'SELECT DISTINCT id_member
 					FROM {db_prefix}moderators',
-					array()
+					[],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					self::$loaded[self::MOD]->members[] = (int) $row['id_member'];
 				}
 				Db::$db->free_result($request);
 			}
 		}
 		// Post-count based groups.
-		elseif ($this->min_posts > -1)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_member
+		elseif ($this->min_posts > -1) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member
 				FROM {db_prefix}members
 				WHERE id_post_group = {int:group}',
-				array(
+				[
 					'group' => $this->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->members[] = (int) $row['id_member'];
 			}
 			Db::$db->free_result($request);
 		}
 		// Regular groups.
-		else
-		{
+		else {
 			$this->loadModerators();
 
-			if ($this->can_moderate)
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member
+			if ($this->can_moderate) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE id_group = {int:group}
 						OR (
 							additional_groups != {string:blank_string}
 							AND FIND_IN_SET({int:group}, additional_groups) != 0
 					)',
-					array(
+					[
 						'group' => $this->id,
 						'blank_string' => '',
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$this->members[] = (int) $row['id_member'];
 				}
 				Db::$db->free_result($request);
-			}
-			else
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member
+			} else {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE id_group = {int:group}',
-					array(
+					[
 						'group' => $this->id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$this->members[] = (int) $row['id_member'];
 				}
 				Db::$db->free_result($request);
@@ -951,18 +964,15 @@ public function loadMembers(): array
 	public function addMembers(int|array $members, string $type = 'auto', bool $perms_checked = false, bool $ignore_protected = false): bool
 	{
 		// Show your licence, but only if it hasn't been done yet.
-		if (!$perms_checked)
-		{
+		if (!$perms_checked) {
 			$this->loadModerators($ignore_protected);
 
-			if (!$this->can_moderate)
-			{
+			if (!$this->can_moderate) {
 				User::$me->isAllowedTo(User::$me->allowedTo('manage_membergroups') ? 'admin_forum' : 'manage_membergroups');
 			}
 		}
 
-		if (!in_array($type, array('auto', 'only_additional', 'only_primary', 'force_primary')))
-		{
+		if (!in_array($type, ['auto', 'only_additional', 'only_primary', 'force_primary'])) {
 			Lang::load('Errors');
 			trigger_error(sprintf(Lang::$txt['add_members_to_group_invalid_type'], $type), E_USER_WARNING);
 		}
@@ -971,162 +981,161 @@ public function addMembers(int|array $members, string $type = 'auto', bool $perm
 		$type = !$this->can_be_primary ? 'only_additional' : $type;
 
 		// Requested only_additional, but the group can't be additional?
-		if ($type == 'only_additional' && !$this->can_be_additional)
+		if ($type == 'only_additional' && !$this->can_be_additional) {
 			return false;
+		}
 
 		// Some groups just don't like explicitly having members.
-		if (in_array($this->id, array(self::GUEST, self::REGULAR, self::MOD)))
+		if (in_array($this->id, [self::GUEST, self::REGULAR, self::MOD])) {
 			return false;
+		}
 
 		// Can't join a post-count based group.
-		if ($this->min_posts != -1)
+		if ($this->min_posts != -1) {
 			return false;
+		}
 
 		// Only admins can add admins...
-		if ($this->id == self::ADMIN && !User::$me->allowedTo('admin_forum'))
+		if ($this->id == self::ADMIN && !User::$me->allowedTo('admin_forum')) {
 			return false;
+		}
 
 		// ... or assign protected groups!
-		if (!$ignore_protected && $this->type == self::TYPE_PROTECTED && !User::$me->allowedTo('admin_forum'))
+		if (!$ignore_protected && $this->type == self::TYPE_PROTECTED && !User::$me->allowedTo('admin_forum')) {
 			return false;
+		}
 
 		// Demand an admin password before adding new admins -- every time, no matter what.
-		if ($this->id == self::ADMIN)
+		if ($this->id == self::ADMIN) {
 			User::$me->validateSession('admin', true);
+		}
 
 		// Make sure all members are integers.
 		$members = array_unique(array_map('intval', (array) $members));
 
 		// There's nobody to add.
-		if (empty($members))
+		if (empty($members)) {
 			return false;
+		}
 
 		// Load the user info for the new members.
 		$members = User::load($members, User::LOAD_BY_ID, 'minimal');
 
-		if (empty($members))
+		if (empty($members)) {
 			return false;
+		}
 
 		// Filter out members that are already in the group and figure out which
 		// members get this as their new primary group and which get it as an
 		// new additional group.
-		$set_primary = array();
-		$set_additional = array();
+		$set_primary = [];
+		$set_additional = [];
 
-		foreach ($members as $key => $member)
-		{
+		foreach ($members as $key => $member) {
 			// Forcing primary.
-			if ($type === 'force_primary')
-			{
-				if (User::$loaded[$member]->group_id !== $this->id)
+			if ($type === 'force_primary') {
+				if (User::$loaded[$member]->group_id !== $this->id) {
 					$set_primary[] = $member;
+				}
 			}
 			// They're already in this group.
-			elseif (in_array($this->id, User::$loaded[$member]->groups))
-			{
+			elseif (in_array($this->id, User::$loaded[$member]->groups)) {
 				continue;
 			}
 			// They have a different primary group.
-			elseif (User::$loaded[$member]->group_id !== self::REGULAR)
-			{
+			elseif (User::$loaded[$member]->group_id !== self::REGULAR) {
 				// Skip if we only want to set their primary group.
-				if ($type === 'only_primary')
+				if ($type === 'only_primary') {
 					continue;
+				}
 
 				// Skip if the group can't be additional.
-				if (!$this->can_be_additional)
+				if (!$this->can_be_additional) {
 					continue;
+				}
 
 				// Set this as an additional group.
 				$set_additional[] = $member;
 			}
 			// This can only be an additional group.
-			elseif ($type === 'only_additional')
-			{
+			elseif ($type === 'only_additional') {
 				$set_additional[] = $member;
 			}
 			// They have no primary group, so let's give them one.
-			else
-			{
+			else {
 				$set_primary[] = $member;
 			}
 		}
 
 		// We need some special handling if we are forcing the primary.
-		if ($type === 'force_primary')
-		{
-			if (empty($set_primary))
+		if ($type === 'force_primary') {
+			if (empty($set_primary)) {
 				return false;
+			}
 
-			Config::updateModSettings(array('settings_updated' => time()));
+			Config::updateModSettings(['settings_updated' => time()]);
 
-			$to_set = array();
+			$to_set = [];
 
-			foreach ($set_primary as $member)
-			{
-				$new_additional_groups = array_diff(User::$loaded[$member]->groups, array($this->id, User::$loaded[$member]->post_group_id));
+			foreach ($set_primary as $member) {
+				$new_additional_groups = array_diff(User::$loaded[$member]->groups, [$this->id, User::$loaded[$member]->post_group_id]);
 				sort($new_additional_groups);
 
 				$to_set[implode(',', $new_additional_groups)][] = $member->id;
 			}
 
-			foreach ($to_set as $new_additional_groups => $member_ids)
-			{
-				User::updateMemberData($member_ids, array(
+			foreach ($to_set as $new_additional_groups => $member_ids) {
+				User::updateMemberData($member_ids, [
 					'id_group' => $this->id,
 					'additional_groups' => $new_additional_groups,
-				));
+				]);
 			}
 
 			return true;
 		}
 
-		if (empty($set_primary) && empty($set_additional))
+		if (empty($set_primary) && empty($set_additional)) {
 			return false;
+		}
 
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
-		if (!empty($set_primary))
-		{
-			User::updateMemberData($set_primary, array('id_group' => $this->id));
+		if (!empty($set_primary)) {
+			User::updateMemberData($set_primary, ['id_group' => $this->id]);
 		}
 
-		if (!empty($set_additional))
-		{
-			$to_set = array();
+		if (!empty($set_additional)) {
+			$to_set = [];
 
-			foreach ($set_additional as $member)
-			{
-				$new_additional_groups = array_unique(array_merge(User::$loaded[$member]->additional_groups, array($this->id)));
+			foreach ($set_additional as $member) {
+				$new_additional_groups = array_unique(array_merge(User::$loaded[$member]->additional_groups, [$this->id]));
 				sort($new_additional_groups);
 
 				$to_set[implode(',', $new_additional_groups)][] = $member->id;
 			}
 
-			foreach ($to_set as $new_additional_groups => $member_ids)
-			{
-				User::updateMemberData($member_ids, array('additional_groups' => $new_additional_groups));
+			foreach ($to_set as $new_additional_groups => $member_ids) {
+				User::updateMemberData($member_ids, ['additional_groups' => $new_additional_groups]);
 			}
 		}
 
 		// For historical reasons, the hook expects an array rather than just the name string.
-		$group_names = array($this->id => $this->name);
+		$group_names = [$this->id => $this->name];
 
-		IntegrationHook::call('integrate_add_members_to_group', array($members, $this->id, &$group_names));
+		IntegrationHook::call('integrate_add_members_to_group', [$members, $this->id, &$group_names]);
 
 		// Update their postgroup statistics.
 		Logging::updateStats('postgroups', $members);
 
 		// Log the data.
-		foreach ($members as $member)
-		{
+		foreach ($members as $member) {
 			Logging::logAction(
 				'added_to_group',
-				array(
+				[
 					'group' => $this->name,
 					'member' => $member,
-				),
-				'admin'
+				],
+				'admin',
 			);
 		}
 
@@ -1141,119 +1150,126 @@ public function addMembers(int|array $members, string $type = 'auto', bool $perm
 	 * Non-admins are not able to remove members from the admin group.
 	 *
 	 * @param int|array $members The ID of a member or an array of member IDs.
-	 * @param mixed The groups to remove the member(s) from. If null, the
-	 *    specified members are stripped from all their membergroups.
 	 * @param bool $perms_checked Whether we've already checked permissions.
 	 * @param bool $ignore_protected Whether to ignore the protected status of
 	 *    protected groups.
+	 * @param mixed The groups to remove the member(s) from. If null, the
+	 *    specified members are stripped from all their membergroups.
 	 * @return bool Whether the operation was successful.
 	 */
 	public function removeMembers(int|array $members, bool $perms_checked = false, bool $ignore_protected = false): bool
 	{
 		// You're getting nowhere without this permission, unless of course you are the group's moderator.
-		if (!$perms_checked)
-		{
+		if (!$perms_checked) {
 			$this->loadModerators($ignore_protected);
 
-			if (!$this->can_moderate)
-			{
+			if (!$this->can_moderate) {
 				User::$me->isAllowedTo(User::$me->allowedTo('manage_membergroups') ? 'admin_forum' : 'manage_membergroups');
 			}
 		}
 
-		if (in_array($this->id, array(self::GUEST, self::REGULAR, self::MOD)))
+		if (in_array($this->id, [self::GUEST, self::REGULAR, self::MOD])) {
 			return false;
+		}
 
-		if ($this->min_posts != -1)
+		if ($this->min_posts != -1) {
 			return false;
+		}
 
-		if ($this->id == self::ADMIN && !User::$me->allowedTo('admin_forum'))
+		if ($this->id == self::ADMIN && !User::$me->allowedTo('admin_forum')) {
 			return false;
+		}
 
-		if ($this->type == self::TYPE_PROTECTED && !User::$me->allowedTo('admin_forum') && !$ignore_protected)
+		if ($this->type == self::TYPE_PROTECTED && !User::$me->allowedTo('admin_forum') && !$ignore_protected) {
 			return false;
+		}
 
 		// Only proven admins can remove admins.
-		if ($this->id == self::ADMIN)
+		if ($this->id == self::ADMIN) {
 			User::$me->validateSession('admin', true);
+		}
 
 		// Cleaning the input.
 		$members = array_unique(array_map('intval', (array) $members));
 
-		if (empty($members))
+		if (empty($members)) {
 			return false;
+		}
 
 		// Load the IDs of the current members of this group.
 		$this->loadMembers();
 
 		// Before we get started, let's check we won't leave the admin group empty!
-		if ($this->id === self::ADMIN && array_diff($this->members, $members) === array())
+		if ($this->id === self::ADMIN && array_diff($this->members, $members) === []) {
 			return false;
+		}
 
 		// Load the user info for the members being removed.
 		$members = User::load($members, User::LOAD_BY_ID, 'minimal');
 
 		// Figure out which members should have their primary group changed and
 		// which should have their additional groups changed.
-		$remove_primary = array();
-		$remove_additional = array();
+		$remove_primary = [];
+		$remove_additional = [];
 
-		foreach ($members as $member)
-		{
-			if (User::$loaded[$member]->group_id === $this->id)
+		foreach ($members as $member) {
+			if (User::$loaded[$member]->group_id === $this->id) {
 				$remove_primary[] = $member;
+			}
 
-			if (in_array($this->id, User::$loaded[$member]->additional_groups))
+			if (in_array($this->id, User::$loaded[$member]->additional_groups)) {
 				$remove_additional[] = $member;
+			}
 		}
 
-		if (empty($remove_primary) && empty($remove_additional))
+		if (empty($remove_primary) && empty($remove_additional)) {
 			return false;
+		}
 
 		$members = array_unique(array_merge($remove_primary, $remove_additional));
 
 		// First, reset those who have this as their primary group. This is the easy one.
-		if (!empty($remove_primary))
-		{
+		if (!empty($remove_primary)) {
 			// Remove in database.
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET id_group = {int:regular_member}
 				WHERE id_group = {int:group}
 					AND id_member IN ({array_int:member_list})',
-				array(
+				[
 					'group' => $this->id,
 					'member_list' => $remove_primary,
 					'regular_member' => self::REGULAR,
-				)
+				],
 			);
 
 			// Remove from current object.
 			$this->members = array_diff($this->members, $remove_primary);
 
 			// Log the change.
-			foreach ($remove_primary as $member)
-				$log_inserts[] = array('group' => $this->name, 'member' => $member);
+			foreach ($remove_primary as $member) {
+				$log_inserts[] = ['group' => $this->name, 'member' => $member];
+			}
 		}
 
 		// Now remove this group from the additional groups.
-		if (!empty($remove_additional))
-		{
-			foreach ($remove_additional as $member)
-			{
+		if (!empty($remove_additional)) {
+			foreach ($remove_additional as $member) {
 				// Remove in database.
-				Db::$db->query('', '
-					UPDATE {db_prefix}members
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}members
 					SET additional_groups = {string:additional_groups}
 					WHERE id_member = {int:member}',
-					array(
+					[
 						'member' => $this->id,
-						'additional_groups' => implode(',', array_diff(User::$loaded[$member]->additional_groups, array($this->id))),
-					)
+						'additional_groups' => implode(',', array_diff(User::$loaded[$member]->additional_groups, [$this->id])),
+					],
 				);
 
 				// Log the change.
-				$log_inserts[] = array('group' => $this->name, 'member' => $member);
+				$log_inserts[] = ['group' => $this->name, 'member' => $member];
 			}
 
 			// Remove from current object.
@@ -1261,16 +1277,16 @@ public function removeMembers(int|array $members, bool $perms_checked = false, b
 		}
 
 		// Settings have been updated.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
 		// Their post groups may have changed now...
 		Logging::updateStats('postgroups', $members);
 
 		// Do the log.
-		if (!empty($log_inserts) && !empty(Config::$modSettings['modlog_enabled']))
-		{
-			foreach ($log_inserts as $extra)
+		if (!empty($log_inserts) && !empty(Config::$modSettings['modlog_enabled'])) {
+			foreach ($log_inserts as $extra) {
 				Logging::logAction('removed_from_group', $extra, 'admin');
+			}
 		}
 
 		// Mission successful.
@@ -1285,94 +1301,96 @@ public function removeMembers(int|array $members, bool $perms_checked = false, b
 	public function fixMembership(): void
 	{
 		// Fix post-count based groups and moderator group.
-		if ($this->min_posts > -1 || $this->id === self::MOD)
-		{
+		if ($this->min_posts > -1 || $this->id === self::MOD) {
 			// Can't be primary groups.
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET id_group = {int:regular_member}
 				WHERE id_group = {int:current_group}',
-				array(
+				[
 					'regular_member' => 0,
 					'current_group' => $this->id,
-				)
+				],
 			);
 
 			// Can't be additional groups.
-			$updates = array();
+			$updates = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_member, additional_groups
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, additional_groups
 				FROM {db_prefix}members
 				WHERE FIND_IN_SET({string:current_group}, additional_groups) != 0',
-				array(
+				[
 					'current_group' => $this->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$updates[$row['additional_groups']][] = $row['id_member'];
 			}
 			Db::$db->free_result($request);
 
-			foreach ($updates as $additional_groups => $memberArray)
-			{
-				User::updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array($this->id)))));
+			foreach ($updates as $additional_groups => $memberArray) {
+				User::updateMemberData($memberArray, ['additional_groups' => implode(',', array_diff(explode(',', $additional_groups), [$this->id]))]);
 			}
 
 			// Post-count based groups can't be moderator groups, and the main moderator group already is one.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}moderator_groups
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}moderator_groups
 				WHERE id_group = {int:current_group}',
-				array(
+				[
 					'current_group' => $this->id,
-				)
+				],
 			);
 		}
 		// A hidden group?.
-		elseif ($this->hidden == self::INVISIBLE)
-		{
-			$updates = array();
+		elseif ($this->hidden == self::INVISIBLE) {
+			$updates = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_member, additional_groups
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, additional_groups
 				FROM {db_prefix}members
 				WHERE id_group = {int:current_group}
 					AND FIND_IN_SET({int:current_group}, additional_groups) = 0',
-				array(
+				[
 					'current_group' => $this->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$updates[$row['additional_groups']][] = $row['id_member'];
 			}
 			Db::$db->free_result($request);
 
-			foreach ($updates as $additional_groups => $memberArray)
-			{
+			foreach ($updates as $additional_groups => $memberArray) {
 				$new_groups = (!empty($additional_groups) ? $additional_groups . ',' : '') . $this->id;
 
-				User::updateMemberData($memberArray, array('additional_groups' => $new_groups));
+				User::updateMemberData($memberArray, ['additional_groups' => $new_groups]);
 			}
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET id_group = {int:regular_member}
 				WHERE id_group = {int:current_group}',
-				array(
+				[
 					'regular_member' => 0,
 					'current_group' => $this->id,
-				)
+				],
 			);
 
 			// Hidden groups can't moderate boards
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}moderator_groups
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}moderator_groups
 				WHERE id_group = {int:current_group}',
-				array(
+				[
 					'current_group' => $this->id,
-				)
+				],
 			);
 		}
 	}
@@ -1387,26 +1405,28 @@ public function fixMembership(): void
 	 */
 	public function getChildren(): array
 	{
-		if (isset($this->children))
+		if (isset($this->children)) {
 			return $this->children;
+		}
 
-		$this->children = array();
+		$this->children = [];
 
-		$selects = array('mg.id_group');
-		$where = array('mg.id_parent = {int:this_group}');
-		$order = array('mg.id_group');
-		$params = array('this_group' => $this->id);
+		$selects = ['mg.id_group'];
+		$where = ['mg.id_parent = {int:this_group}'];
+		$order = ['mg.id_group'];
+		$params = ['this_group' => $this->id];
 
-		$request = Db::$db->query('', '
-			SELECT id_group, group_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, group_name
 			FROM {db_prefix}membergroups
 			WHERE id_parent = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$this->children[(int) $row['id_group']] = $row['group_name'];
 		}
 		Db::$db->free_result($request);
@@ -1426,23 +1446,22 @@ public function getChildren(): array
 	 * @param bool $reload If true, force a reload from the database.
 	 * @return array A copy of $this->permissions.
 	 */
-	public function loadPermissions(int $profile = null, bool $reload = false): array
+	public function loadPermissions(?int $profile = null, bool $reload = false): array
 	{
 		// General permissions.
-		if (empty($profile))
-		{
-			if (empty($this->permissions['general']) || $reload)
-			{
-				$request = Db::$db->query('', '
-					SELECT permission, add_deny
+		if (empty($profile)) {
+			if (empty($this->permissions['general']) || $reload) {
+				$request = Db::$db->query(
+					'',
+					'SELECT permission, add_deny
 					FROM {db_prefix}permissions
 					WHERE id_group = {int:this_group}',
-					array(
+					[
 						'this_group' => $this->id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$this->permissions['general'][$row['permission']] = (int) $row['add_deny'];
 				}
 				Db::$db->free_result($request);
@@ -1450,32 +1469,36 @@ public function loadPermissions(int $profile = null, bool $reload = false): arra
 		}
 
 		// If profile is zero, we only wanted general permissions.
-		if (isset($profile) && $profile === 0)
+		if (isset($profile) && $profile === 0) {
 			return $this->permissions;
+		}
 
 		// Don't reload unnecessarily.
-		if (isset($profile) && isset($this->permissions['board_profiles'][$profile]) && !$reload)
+		if (isset($profile, $this->permissions['board_profiles'][$profile])   && !$reload) {
 			return $this->permissions;
+		}
 
 		// Have we already loaded some board permissions?
-		if (!$reload && !empty($this->permissions['board_profiles']))
+		if (!$reload && !empty($this->permissions['board_profiles'])) {
 			$excluded_profiles = array_keys($this->permissions['board_profiles']);
+		}
 
 		// Get board permissions.
-		$request = Db::$db->query('', '
-			SELECT id_profile, permission, add_deny
+		$request = Db::$db->query(
+			'',
+			'SELECT id_profile, permission, add_deny
 			FROM {db_prefix}board_permissions
 			WHERE id_group = {int:this_group}' . (isset($profile) ? '
 				AND id_profile = {int:profile}' : '') . (isset($excluded_profiles) ? '
 				AND id_profile NOT IN ({array_int:excluded_profiles})' : ''),
-			array(
+			[
 				'this_group' => $this->id,
 				'profile' => $profile ?? 0,
-				'excluded_profiles' => $excluded_profiles ?? array(0),
-			)
+				'excluded_profiles' => $excluded_profiles ?? [0],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$this->permissions['board_profiles'][(int) $row['id_profile']][$row['permission']] = (int) $row['add_deny'];
 		}
 		Db::$db->free_result($request);
@@ -1494,9 +1517,10 @@ public function loadPermissions(int $profile = null, bool $reload = false): arra
 	 *    If null, get all permissions.
 	 * @return array A copy of $this->num_permissions.
 	 */
-	public function countPermissions(int $profile = null): array
+	public function countPermissions(?int $profile = null): array
 	{
-		self::countPermissionsBatch(array($this->id), $profile);
+		self::countPermissionsBatch([$this->id], $profile);
+
 		return $this->num_permissions;
 	}
 
@@ -1508,24 +1532,26 @@ public function countPermissions(int $profile = null): array
 	public function updateBoardAccess(array $board_access): void
 	{
 		// This doesn't apply to administrators or moderators.
-		if ($this->id === self::ADMIN || $this->id === self::MOD)
+		if ($this->id === self::ADMIN || $this->id === self::MOD) {
 			return;
+		}
 
 		// Nothing to change?
-		if (empty($board_access))
+		if (empty($board_access)) {
 			return;
+		}
 
 		// Reorganize the new access permissions for easier processing.
-		$changed_boards = array(
-			'allow' => array(),
-			'deny' => array(),
-		);
+		$changed_boards = [
+			'allow' => [],
+			'deny' => [],
+		];
 
-		foreach ($board_access as $board_id => $access)
-		{
+		foreach ($board_access as $board_id => $access) {
 			// The only supported access types are 'allow' and 'deny'.
-			if (!isset($changed_boards[$access]))
+			if (!isset($changed_boards[$access])) {
 				continue;
+			}
 
 			$changed_boards[$access][] = (int) $board_id;
 		}
@@ -1534,50 +1560,47 @@ public function updateBoardAccess(array $board_access): void
 		$changed_boards['allow'] = array_diff($changed_boards['allow'], $changed_boards['deny']);
 
 		// Reset the group's existing access permssions.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}board_permissions_view
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}board_permissions_view
 			WHERE id_group = {int:this_group}',
-			array(
+			[
 				'this_group' => $this->id,
-			)
+			],
 		);
 
 		// This will hold the inserts for the group's new access permissions.
-		$new_perms = array();
+		$new_perms = [];
 
 		// We're going to need all the boards, one way or another.
 		Category::getTree();
 
 		// Now loop through our changes and apply them.
-		foreach ($changed_boards as $access => $board_ids)
-		{
+		foreach ($changed_boards as $access => $board_ids) {
 			$prop = $access == 'allow' ? 'member_groups' : 'deny_groups';
 
-			foreach (Board::$loaded as $board)
-			{
-				if (in_array($board->id, $board_ids))
-				{
-					$board->{$prop} = array_unique(array_merge($board->{$prop}, array($this->id)));
-				}
-				else
-				{
-					$board->{$prop} = array_diff($board->{$prop}, array($this->id));
+			foreach (Board::$loaded as $board) {
+				if (in_array($board->id, $board_ids)) {
+					$board->{$prop} = array_unique(array_merge($board->{$prop}, [$this->id]));
+				} else {
+					$board->{$prop} = array_diff($board->{$prop}, [$this->id]);
 				}
 
 				$board->save();
 			}
 
-			foreach ($board_ids as $board_id)
-				$new_perms[] = array($this->id, (int) $board_id, $access == 'allow' ? 0 : 1);
+			foreach ($board_ids as $board_id) {
+				$new_perms[] = [$this->id, (int) $board_id, $access == 'allow' ? 0 : 1];
+			}
 		}
 
-		if (!empty($new_perms))
-		{
-			Db::$db->insert('insert',
+		if (!empty($new_perms)) {
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}board_permissions_view',
-				array('id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'),
+				['id_group' => 'int', 'id_board' => 'int', 'deny' => 'int'],
 				$new_perms,
-				array('id_group', 'id_board', 'deny')
+				['id_group', 'id_board', 'deny'],
 			);
 		}
 	}
@@ -1593,55 +1616,51 @@ public function updateBoardAccess(array $board_access): void
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return array Instances of this class for the loaded groups.
 	 */
-	public static function load(array|int $ids = array(), array $query_customizations = array()): array
+	public static function load(array|int $ids = [], array $query_customizations = []): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$ids = array_unique(array_map('intval', (array) $ids));
 
 		// The guest and regular member groups require special handling.
-		$guest_and_reg = array_intersect(array(-1, 0), $ids);
+		$guest_and_reg = array_intersect([-1, 0], $ids);
 
-		if (!empty($guest_and_reg))
-		{
-			foreach ($guest_and_reg as $id)
+		if (!empty($guest_and_reg)) {
+			foreach ($guest_and_reg as $id) {
 				$loaded[$id] = new self($id);
+			}
 
 			$ids = array_diff($ids, $guest_and_reg);
 
-			if ($ids === array())
+			if ($ids === []) {
 				return $loaded;
+			}
 		}
 
-		$selects = $query_customizations['selects'] ?? array('mg.*');
-		$joins = $query_customizations['joins'] ?? array();
-		$where = $query_customizations['where'] ?? array();
-		$order = $query_customizations['order'] ?? array(
+		$selects = $query_customizations['selects'] ?? ['mg.*'];
+		$joins = $query_customizations['joins'] ?? [];
+		$where = $query_customizations['where'] ?? [];
+		$order = $query_customizations['order'] ?? [
 			'min_posts',
 			'CASE WHEN id_group < 4 THEN id_group ELSE 4 END',
 			'group_name',
-		);
-		$group = $query_customizations['group'] ?? array();
+		];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? 0;
-		$params = $query_customizations['params'] ?? array();
+		$params = $query_customizations['params'] ?? [];
 
-		if ($ids !== array())
-		{
+		if ($ids !== []) {
 			$where[] = 'mg.id_group IN ({array_int:ids})';
 			$params['ids'] = $ids;
 		}
 
-		foreach (self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			$row['id_group'] = (int) $row['id_group'];
 
-			if (isset(self::$loaded[$row['id_group']]))
-			{
+			if (isset(self::$loaded[$row['id_group']])) {
 				self::$loaded[$row['id_group']]->set($row);
 				$loaded[] = self::$loaded[$row['id_group']];
-			}
-			else
-			{
+			} else {
 				$loaded[] = new self($row['id_group'], $row);
 			}
 		}
@@ -1661,57 +1680,59 @@ public static function load(array|int $ids = array(), array $query_customization
 	 * @param array $exclude IDs of groups to exclude.
 	 * @return array Instances of this class for the loaded groups.
 	 */
-	public static function loadSimple(int $include = self::LOAD_NORMAL, array $exclude = array(self::GUEST, self::REGULAR, self::MOD)): array
+	public static function loadSimple(int $include = self::LOAD_NORMAL, array $exclude = [self::GUEST, self::REGULAR, self::MOD]): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		// This is the typical sort order.
-		$query_customizations = array(
-			'order' => array(
+		$query_customizations = [
+			'order' => [
 				'min_posts',
 				'CASE WHEN id_group < 4 THEN id_group ELSE 4 END',
 				'group_name',
-			),
-		);
+			],
+		];
 
 		// Are we excluding post-count based groups?
-		if (!($include & self::LOAD_POST))
+		if (!($include & self::LOAD_POST)) {
 			$query_customizations['where'][] = 'min_posts = -1';
+		}
 
 		// Are we excluding normal groups?
-		if (!($include & self::LOAD_NORMAL))
+		if (!($include & self::LOAD_NORMAL)) {
 			$query_customizations['where'][] = 'min_posts > -1';
+		}
 
 		// If we are including normal groups, do we want guests and regular members?
-		if ($include & self::LOAD_NORMAL)
-		{
+		if ($include & self::LOAD_NORMAL) {
 			// Do we want the guest group?
-			if (!in_array(self::GUEST, $exclude))
+			if (!in_array(self::GUEST, $exclude)) {
 				$loaded = array_merge($loaded, self::load(-1));
+			}
 
 			// Do we want the regular members group?
-			if (!in_array(self::REGULAR, $exclude))
+			if (!in_array(self::REGULAR, $exclude)) {
 				$loaded = array_merge($loaded, self::load(0));
+			}
 		}
 
 		// Finally, exclude any groups we don't want.
-		foreach ($exclude as $id)
-		{
-			if (!is_int($id) || $id <= 0)
+		foreach ($exclude as $id) {
+			if (!is_int($id) || $id <= 0) {
 				continue;
+			}
 
 			$query_customizations['where'][] = 'id_group != ' . $id;
 		}
 
-		$loaded = array_merge($loaded, self::load(array(), $query_customizations));
+		$loaded = array_merge($loaded, self::load([], $query_customizations));
 
 		// If we loaded all the groups, populate the $children properties now for efficiency.
-		if ($include == self::LOAD_BOTH && ($exclude == array() || $exclude == array(self::MOD)))
-		{
-			foreach (self::$loaded as $group)
-			{
-				if (!isset(self::$loaded[$group->parent]))
+		if ($include == self::LOAD_BOTH && ($exclude == [] || $exclude == [self::MOD])) {
+			foreach (self::$loaded as $group) {
+				if (!isset(self::$loaded[$group->parent])) {
 					continue;
+				}
 
 				self::$loaded[$group->parent]->children[$group->id] = $group->name;
 				ksort(self::$loaded[$group->parent]->children);
@@ -1729,27 +1750,27 @@ public static function loadSimple(int $include = self::LOAD_NORMAL, array $exclu
 	 */
 	public static function loadAssignable(): array
 	{
-		$loaded = array(
+		$loaded = [
 			new self(0),
-		);
+		];
 
-		$query_customizations = array(
-			'where' => array(
+		$query_customizations = [
+			'where' => [
 				'id_group != 3',
 				'min_posts = -1',
-				'id_group NOT IN ({array_int:unassignable})'
-			),
-			'order' => array(
+				'id_group NOT IN ({array_int:unassignable})',
+			],
+			'order' => [
 				'min_posts',
 				'CASE WHEN id_group < 4 THEN id_group ELSE 4 END',
 				'group_name',
-			),
-			'params' => array(
+			],
+			'params' => [
 				'unassignable' => self::getUnassignable(),
-			),
-		);
+			],
+		];
 
-		$loaded = array_merge($loaded, self::load(array(), $query_customizations));
+		$loaded = array_merge($loaded, self::load([], $query_customizations));
 
 		// Return the instances we just loaded.
 		return $loaded;
@@ -1770,21 +1791,21 @@ public static function loadAssignable(): array
 	public static function loadModeratorsBatch(array $group_ids, bool $ignore_protected = false): void
 	{
 		$group_ids = array_intersect(array_filter(array_unique(array_map('intval', $group_ids))), array_keys(self::$loaded));
-		$mod_ids = array();
+		$mod_ids = [];
 
-		foreach ($group_ids as $key => $group_id)
-		{
+		foreach ($group_ids as $key => $group_id) {
 			// Avoid unnecessary repetition.
-			if (isset(self::$loaded[$group_id]->moderator_ids))
+			if (isset(self::$loaded[$group_id]->moderator_ids)) {
 				unset($group_ids[$key]);
+			}
 		}
 
-		if (empty($group_ids))
+		if (empty($group_ids)) {
 			return;
+		}
 
-		foreach ($group_ids as $group_id)
-		{
-			self::$loaded[$group_id]->moderator_ids = array();
+		foreach ($group_ids as $group_id) {
+			self::$loaded[$group_id]->moderator_ids = [];
 
 			// We'll check below whether the current user is explicitly designated
 			// as a moderator for this group. But even if not, the current user
@@ -1797,16 +1818,17 @@ public static function loadModeratorsBatch(array $group_ids, bool $ignore_protec
 			self::$loaded[$group_id]->can_moderate = User::$me->allowedTo('manage_membergroups') && ((self::$loaded[$group_id]->type ?? self::TYPE_PRIVATE) != self::TYPE_PROTECTED || $ignore_protected || User::$me->allowedTo('admin_forum'));
 		}
 
-		$request = Db::$db->query('', '
-			SELECT id_group, id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, id_member
 			FROM {db_prefix}group_moderators
 			WHERE id_group IN ({array_int:groups})',
-			array(
+			[
 				'groups' => $group_ids,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row = array_map('intval', $row);
 
 			$group = self::$loaded[$row['id_group']];
@@ -1834,66 +1856,59 @@ public static function loadModeratorsBatch(array $group_ids, bool $ignore_protec
 	 */
 	public static function countMembersBatch(array $group_ids, bool $recount = false): array
 	{
-		$counts = array();
+		$counts = [];
 
-		$post_groups = array();
-		$regular_groups = array();
+		$post_groups = [];
+		$regular_groups = [];
 		$moderator_group = null;
 
 		$group_ids = array_intersect(array_unique(array_map('intval', $group_ids)), array_keys(self::$loaded));
 
-		foreach ($group_ids as $key => $group_id)
-		{
+		foreach ($group_ids as $key => $group_id) {
 			// Can't count guests.
-			if ($group_id <= self::GUEST)
-			{
+			if ($group_id <= self::GUEST) {
 				unset($group_ids[$key]);
+
 				continue;
 			}
 
 			// Avoid unnecessary repetition.
-			if (!$recount && isset(self::$loaded[$group_id]->num_members))
-			{
+			if (!$recount && isset(self::$loaded[$group_id]->num_members)) {
 				$counts[$group_id] = self::$loaded[$group_id]->num_members;
 				unset($group_ids[$key]);
+
 				continue;
 			}
 
 			self::$loaded[$group_id]->num_members = 0;
 
-			if ($group_id === self::MOD)
-			{
+			if ($group_id === self::MOD) {
 				$moderator_group = $group_id;
-			}
-			elseif (self::$loaded[$group_id]->min_posts > -1)
-			{
+			} elseif (self::$loaded[$group_id]->min_posts > -1) {
 				$post_groups[] = $group_id;
-			}
-			else
-			{
+			} else {
 				$regular_groups[] = $group_id;
 			}
 		}
 
-		if (empty($post_groups) && empty($regular_groups) && empty($moderator_group))
+		if (empty($post_groups) && empty($regular_groups) && empty($moderator_group)) {
 			return $counts;
+		}
 
 		// Counting moderators is tricky.
-		if (!empty($moderator_group))
-		{
+		if (!empty($moderator_group)) {
 			// If we're in a board, only count the moderators for that board.
-			if (isset(Board::$info))
-			{
+			if (isset(Board::$info)) {
 				self::$loaded[self::MOD]->num_members = count(Board::$info->moderators);
 			}
 			// Outside a board, count the moderators for all boards.
-			else
-			{
-				$request = Db::$db->query('', '
-					SELECT COUNT(DISTINCT id_member)
+			else {
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(DISTINCT id_member)
 					FROM {db_prefix}moderators
 					LIMIT 1',
-					array()
+					[],
 				);
 				list(self::$loaded[self::MOD]->num_members) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
@@ -1901,38 +1916,38 @@ public static function countMembersBatch(array $group_ids, bool $recount = false
 		}
 
 		// Post-count based groups.
-		if (!empty($post_groups))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_post_group, COUNT(*) AS num_members
+		if (!empty($post_groups)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_post_group, COUNT(*) AS num_members
 				FROM {db_prefix}members
 				WHERE id_post_group IN ({array_int:group_list})
 				GROUP BY id_post_group',
-				array(
+				[
 					'group_list' => $post_groups,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				self::$loaded[(int) $row['id_post_group']]->num_members += (int) $row['num_members'];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Regular groups.
-		if (!empty($regular_groups))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_group, COUNT(*) AS num_members
+		if (!empty($regular_groups)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group, COUNT(*) AS num_members
 				FROM {db_prefix}members
 				WHERE id_group IN ({array_int:group_list})
 				GROUP BY id_group',
-				array(
+				[
 					'group_list' => $regular_groups,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				self::$loaded[(int) $row['id_group']]->num_members += (int) $row['num_members'];
 			}
 			Db::$db->free_result($request);
@@ -1940,18 +1955,18 @@ public static function countMembersBatch(array $group_ids, bool $recount = false
 			// Count in additional groups if current user can moderate the group.
 			self::loadModeratorsBatch($regular_groups);
 
-			$groups_can_moderate = array();
+			$groups_can_moderate = [];
 
-			foreach ($regular_groups as $group_id)
-			{
-				if (self::$loaded[$group_id]->can_moderate)
+			foreach ($regular_groups as $group_id) {
+				if (self::$loaded[$group_id]->can_moderate) {
 					$groups_can_moderate[] = $group_id;
+				}
 			}
 
-			if (!empty($groups_can_moderate))
-			{
-				$request = Db::$db->query('', '
-					SELECT mg.id_group, COUNT(*) AS num_members
+			if (!empty($groups_can_moderate)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT mg.id_group, COUNT(*) AS num_members
 					FROM {db_prefix}membergroups AS mg
 						INNER JOIN {db_prefix}members AS mem ON (
 							mem.additional_groups != {string:blank_string}
@@ -1960,27 +1975,28 @@ public static function countMembersBatch(array $group_ids, bool $recount = false
 						)
 					WHERE mg.id_group IN ({array_int:group_list})
 					GROUP BY mg.id_group',
-					array(
+					[
 						'group_list' => $groups_can_moderate,
 						'blank_string' => '',
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					self::$loaded[(int) $row['id_group']]->num_members += (int) $row['num_members'];
 				}
 				Db::$db->free_result($request);
 			}
 			// If user can't moderate the group, but has it as an additional group, add 1.
-			else
-			{
-				foreach (array_intersect($regular_groups, User::$me->additional_groups) as $id)
+			else {
+				foreach (array_intersect($regular_groups, User::$me->additional_groups) as $id) {
 					self::$loaded[$id]->num_members++;
+				}
 			}
 		}
 
-		foreach ($group_ids as $group_id)
+		foreach ($group_ids as $group_id) {
 			$counts[$group_id] = self::$loaded[$group_id]->num_members;
+		}
 
 		return $counts;
 	}
@@ -2001,70 +2017,66 @@ public static function countMembersBatch(array $group_ids, bool $recount = false
 	 * @param bool $reload If true, force a reload from the database.
 	 * @return array Copies of $this->permissions for all the groups.
 	 */
-	public static function loadPermissionsBatch(array $group_ids, int $profile = null, bool $reload = false): array
+	public static function loadPermissionsBatch(array $group_ids, ?int $profile = null, bool $reload = false): array
 	{
-		$get_general = array();
-		$get_board = array();
+		$get_general = [];
+		$get_board = [];
 
 		$group_ids = array_intersect(array_unique(array_map('intval', $group_ids)), array_keys(self::$loaded));
 
 		// Figure out which groups we need to get info for.
-		foreach ($group_ids as $key => $group_id)
-		{
+		foreach ($group_ids as $key => $group_id) {
 			// Profile is 0 or null and general perms haven't been loaded or should be reloaded.
-			if (empty($profile) && (empty(self::$loaded[$group_id]->permissions['general']) || $reload))
-			{
+			if (empty($profile) && (empty(self::$loaded[$group_id]->permissions['general']) || $reload)) {
 				$get_general[] = $group_id;
 			}
 
 			// Profile is null, or it's not 0 and either hasn't been loaded or should be reloaded.
-			if (!isset($profile) || (!empty($profile) && (!isset(self::$loaded[$group_id]->permissions['board_profiles'][$profile]) || $reload)))
-			{
+			if (!isset($profile) || (!empty($profile) && (!isset(self::$loaded[$group_id]->permissions['board_profiles'][$profile]) || $reload))) {
 				$get_board[] = $group_id;
 			}
 		}
 
 		// General permissions.
-		if (!empty($get_general))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_group, permission, add_deny
+		if (!empty($get_general)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group, permission, add_deny
 				FROM {db_prefix}permissions
 				WHERE id_group IN ({array_int:groups})',
-				array(
+				[
 					'groups' => $get_general,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				self::$loaded[(int) $row['id_group']]->permissions['general'][$row['permission']] = (int) $row['add_deny'];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Board permissions.
-		if (!empty($get_board))
-		{
+		if (!empty($get_board)) {
 			// Get board permissions.
-			$request = Db::$db->query('', '
-				SELECT id_profile, id_group, permission, add_deny
+			$request = Db::$db->query(
+				'',
+				'SELECT id_profile, id_group, permission, add_deny
 				FROM {db_prefix}board_permissions
 				WHERE id_group IN ({array_int:groups})' . (isset($profile) ? '
 					AND id_profile = {int:profile}' : ''),
-				array(
+				[
 					'groups' => $get_board,
 					'profile' => $profile ?? 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$row['id_profile'] = (int) $row['id_profile'];
 				$row['id_group'] = (int) $row['id_group'];
 				$row['add_deny'] = (int) $row['add_deny'];
 
 				// If we're loading all profiles, but not reloading, don't overwrite existing data.
-				if (!isset($profile) && !$reload && isset(self::$loaded[$row['id_group']]->permissions['board_profiles'][$row['id_profile']]))
-				{
+				if (!isset($profile) && !$reload && isset(self::$loaded[$row['id_group']]->permissions['board_profiles'][$row['id_profile']])) {
 					continue;
 				}
 
@@ -2073,10 +2085,11 @@ public static function loadPermissionsBatch(array $group_ids, int $profile = nul
 			Db::$db->free_result($request);
 		}
 
-		$all_loaded_permissions = array();
+		$all_loaded_permissions = [];
 
-		foreach ($group_ids as $group_id)
+		foreach ($group_ids as $group_id) {
 			$all_loaded_permissions[$group_id] = self::$loaded[$group_id]->permissions;
+		}
 
 		return $all_loaded_permissions;
 	}
@@ -2097,32 +2110,33 @@ public static function loadPermissionsBatch(array $group_ids, int $profile = nul
 	 *    If null, count general permissions and the default profile.
 	 * @return array Copies of $this->num_permissions for all the groups.
 	 */
-	public static function countPermissionsBatch(array $group_ids, int $profile = null): array
+	public static function countPermissionsBatch(array $group_ids, ?int $profile = null): array
 	{
-		if (!isset(Permissions::$hidden))
+		if (!isset(Permissions::$hidden)) {
 			Permissions::buildHidden();
+		}
 
 		// If null or 0, we want general permissions.
-		if (empty($profile))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_group, COUNT(*) AS num_permissions, add_deny
+		if (empty($profile)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group, COUNT(*) AS num_permissions, add_deny
 				FROM {db_prefix}permissions
 				' . (empty(Permissions::$hidden) ? '' : ' WHERE permission NOT IN ({array_string:hidden_permissions})') . '
 				GROUP BY id_group, add_deny',
-				array(
+				[
 					'hidden_permissions' => Permissions::$hidden,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$row['id_group'] = (int) $row['id_group'];
 
-				if (!isset(self::$loaded[$row['id_group']]))
+				if (!isset(self::$loaded[$row['id_group']])) {
 					continue;
+				}
 
-				if (!empty($row['add_deny']) || $row['id_group'] != self::GUEST)
-				{
+				if (!empty($row['add_deny']) || $row['id_group'] != self::GUEST) {
 					self::$loaded[$row['id_group']]->num_permissions[empty($row['add_deny']) ? 'denied' : 'allowed'] = $row['num_permissions'];
 				}
 			}
@@ -2130,29 +2144,30 @@ public static function countPermissionsBatch(array $group_ids, int $profile = nu
 		}
 
 		// For board permissions, null means the same as default.
-		if ($profile === null)
+		if ($profile === null) {
 			$profile = Permissions::PROFILE_DEFAULT;
+		}
 
-		if (!empty($profile))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_profile, id_group, COUNT(*) AS num_permissions, add_deny
+		if (!empty($profile)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_profile, id_group, COUNT(*) AS num_permissions, add_deny
 				FROM {db_prefix}board_permissions
 				WHERE id_profile = {int:current_profile}
 				GROUP BY id_profile, id_group, add_deny',
-				array(
+				[
 					'current_profile' => $profile,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$row['id_group'] = (int) $row['id_group'];
 
-				if (!isset(self::$loaded[$row['id_group']]))
+				if (!isset(self::$loaded[$row['id_group']])) {
 					continue;
+				}
 
-				if (!empty($row['add_deny']) || $row['id_group'] != self::GUEST)
-				{
+				if (!empty($row['add_deny']) || $row['id_group'] != self::GUEST) {
 					self::$loaded[$row['id_group']]->num_permissions[empty($row['add_deny']) ? 'denied' : 'allowed'] += $row['num_permissions'];
 				}
 			}
@@ -2160,21 +2175,20 @@ public static function countPermissionsBatch(array $group_ids, int $profile = nu
 		}
 
 		// A few overrides.
-		if (isset(self::$loaded[self::GUEST]))
-		{
+		if (isset(self::$loaded[self::GUEST])) {
 			self::$loaded[self::GUEST]->num_permissions['denied'] = '(' . Lang::$txt['permissions_none'] . ')';
 		}
 
-		if (isset(self::$loaded[self::ADMIN]))
-		{
+		if (isset(self::$loaded[self::ADMIN])) {
 			self::$loaded[self::ADMIN]->num_permissions['allowed'] = '(' . Lang::$txt['permissions_all'] . ')';
 			self::$loaded[self::ADMIN]->num_permissions['denied'] = '(' . Lang::$txt['permissions_none'] . ')';
 		}
 
-		$all_counted_permissions = array();
+		$all_counted_permissions = [];
 
-		foreach ($group_ids as $group_id)
+		foreach ($group_ids as $group_id) {
 			$all_counted_permissions[$group_id] = self::$loaded[$group_id]->num_permissions;
+		}
 
 		return $all_counted_permissions;
 	}
@@ -2186,31 +2200,33 @@ public static function countPermissionsBatch(array $group_ids, int $profile = nu
 	 */
 	public static function getPostGroups(): array
 	{
-		if (isset(self::$post_groups))
+		if (isset(self::$post_groups)) {
 			return self::$post_groups;
+		}
 
-		self::$post_groups = array();
+		self::$post_groups = [];
 
 		// First, check any groups we have already loaded.
-		foreach (self::$loaded as $group)
-		{
-			if ($group->min_posts !== -1)
+		foreach (self::$loaded as $group) {
+			if ($group->min_posts !== -1) {
 				self::$post_groups[$group->id] = $group->min_posts;
+			}
 		}
 
 		// Now query the database to find any that haven't been loaded.
-		$request = Db::$db->query('', '
-			SELECT id_group, min_posts
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group, min_posts
 			FROM {db_prefix}membergroups
 			WHERE id_group NOT IN ({array_int:known_post_groups})
 				AND min_posts != {int:min_posts}',
-			array(
+			[
 				'min_posts' => -1,
-				'known_post_groups' => !empty(self::$post_groups) ? self::$post_groups : array(self::NONE),
-			)
+				'known_post_groups' => !empty(self::$post_groups) ? self::$post_groups : [self::NONE],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$post_groups[(int) $row['id_group']] = (int) $row['min_posts'];
 		}
 		Db::$db->free_result($request);
@@ -2229,22 +2245,23 @@ public static function getPostGroups(): array
 	public static function getUnassignable(): array
 	{
 		// No need to do this twice.
-		if (isset(self::$unassignable))
+		if (isset(self::$unassignable)) {
 			return self::$unassignable;
+		}
 
 		// Admins can assign any group they like, except the guest group and post-count based groups.
-		if (User::$me->allowedTo('admin_forum'))
-		{
-			self::$unassignable = array(self::GUEST);
+		if (User::$me->allowedTo('admin_forum')) {
+			self::$unassignable = [self::GUEST];
 
-			$request = Db::$db->query('', '
-				SELECT id_group
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group
 				FROM {db_prefix}membergroups
 				WHERE min_posts > -1',
-				array()
+				[],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				self::$unassignable[] = (int) $row['id_group'];
 			}
 			Db::$db->free_result($request);
@@ -2253,44 +2270,47 @@ public static function getUnassignable(): array
 		}
 
 		// No one can assign the guest group, and only admins can assign the admin group.
-		self::$unassignable = array(self::GUEST, self::ADMIN);
+		self::$unassignable = [self::GUEST, self::ADMIN];
 
 		// Find any other groups that are designated as protected.
-		$request = Db::$db->query('', '
-			SELECT id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group
 			FROM {db_prefix}membergroups
 			WHERE group_type IN ({array_int:is_protected})
 				OR min_posts > -1',
-			array(
-				'is_protected' => !User::$me->allowedTo('manage_membergroups') ? array(self::REGULAR, self::ADMIN) : array(self::ADMIN),
-			)
+			[
+				'is_protected' => !User::$me->allowedTo('manage_membergroups') ? [self::REGULAR, self::ADMIN] : [self::ADMIN],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$unassignable[] = (int) $row['id_group'];
 		}
 		Db::$db->free_result($request);
 
 		// Prevent privilege escalation.
-		$protected_permissions = array();
-		foreach (array('admin_forum', 'manage_membergroups', 'manage_permissions') as $permission)
-		{
-			if (!User::$me->allowedTo($permission))
+		$protected_permissions = [];
+
+		foreach (['admin_forum', 'manage_membergroups', 'manage_permissions'] as $permission) {
+			if (!User::$me->allowedTo($permission)) {
 				$protected_permissions[] = $permission;
+			}
 		}
 
-		$request = Db::$db->query('', '
-			SELECT id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group
 			FROM {db_prefix}permissions
 			WHERE permission IN ({array_string:protected})
 				AND add_deny = {int:add}',
-			array(
+			[
 				'protected' => $protected_permissions,
 				'add' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$unassignable[] = (int) $row['id_group'];
 		}
 		Db::$db->free_result($request);
@@ -2307,36 +2327,35 @@ public static function getUnassignable(): array
 	 */
 	public static function getCachedList()
 	{
-		$groupCache = array();
-		$group = array();
+		$groupCache = [];
+		$group = [];
 
-		$selects = array('mg.*');
-		$joins = array();
-		$where = array(
+		$selects = ['mg.*'];
+		$joins = [];
+		$where = [
 			'min_posts = {int:min_posts}',
 			'hidden = {int:not_hidden}',
 			'id_group != {int:mod_group}',
-		);
-		$params = array(
+		];
+		$params = [
 			'min_posts' => -1,
 			'not_hidden' => self::VISIBLE,
 			'mod_group' => self::MOD,
-		);
+		];
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$group[$row['id_group']] = $row;
 
 			$groupCache[$row['id_group']] = '<a href="' . Config::$scripturl . '?action=groups;sa=members;group=' . $row['id_group'] . '" ' . ($row['online_color'] ? 'style="color: ' . $row['online_color'] . '"' : '') . '>' . $row['group_name'] . '</a>';
 		}
 
-		IntegrationHook::call('integrate_getMembergroupList', array(&$groupCache, $group));
+		IntegrationHook::call('integrate_getMembergroupList', [&$groupCache, $group]);
 
-		return array(
+		return [
 			'data' => $groupCache,
 			'expires' => time() + 3600,
-			'refresh_eval' => 'return \SMF\Config::$modSettings[\'settings_updated\'] > ' . time() . ';',
-		);
+			'refresh_eval' => 'return \\SMF\\Config::$modSettings[\'settings_updated\'] > ' . time() . ';',
+		];
 	}
 
 	/*************************
@@ -2442,8 +2461,9 @@ protected static function canBeAdditional(object $group): bool
 	 */
 	protected static function canDelete(object $group): bool
 	{
-		if ($group->type === self::TYPE_PROTECTED && !User::$me->allowedTo('admin_forum'))
+		if ($group->type === self::TYPE_PROTECTED && !User::$me->allowedTo('admin_forum')) {
 			return false;
+		}
 
 		return $group->id == self::GLOBAL_MOD || $group->id > self::NEWBIE;
 	}
@@ -2515,8 +2535,7 @@ protected static function formatIcons(object $group): string
 	 */
 	protected static function getHelpTxt(object $group): bool
 	{
-		switch ($group->id)
-		{
+		switch ($group->id) {
 			case self::GUEST:
 				$help = 'membergroup_guests';
 				break;
@@ -2549,12 +2568,9 @@ protected static function getHelpTxt(object $group): bool
 	 */
 	protected static function getHref(object $group): string
 	{
-		if (User::$me->allowedTo('access_mod_center') && User::$me->allowedTo('manage_membergroups'))
-		{
+		if (User::$me->allowedTo('access_mod_center') && User::$me->allowedTo('manage_membergroups')) {
 			$action_url = '?action=moderate;area=viewgroups';
-		}
-		elseif (User::$me->allowedTo('view_mlist'))
-		{
+		} elseif (User::$me->allowedTo('view_mlist')) {
 			$action_url = '?action=groups';
 		}
 
@@ -2571,11 +2587,13 @@ protected static function getLink(object $group): string
 	{
 		$href = $this->getHref();
 
-		if ($href === '')
+		if ($href === '') {
 			return '';
+		}
 
-		if (!isset($this->num_members))
+		if (!isset($this->num_members)) {
 			$this->countMembers();
+		}
 
 		return '<a href="' . $href . '">' . $this->num_members . '</a>';
 	}
@@ -2593,15 +2611,18 @@ protected static function getLink(object $group): string
 	 *    If this is left empty, no WHERE clause will be used.
 	 * @param array $order Zero or more conditions for the ORDER BY clause.
 	 *    If this is left empty, no ORDER BY clause will be used.
+	 * @param array $group Zero or more conditions for the GROUP BY clause.
+	 *    If this is left empty, no GROUP BY clause will be used.
 	 * @param int|string $limit Maximum number of results to retrieve.
 	 *    If this is left empty, all results will be retrieved.
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), array $group = array(), int|string $limit = 0)
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
 	{
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $selects) . '
 			FROM {db_prefix}membergroups AS mg' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
@@ -2609,10 +2630,10 @@ protected static function queryData(array $selects, array $params = array(), arr
 			GROUP BY ' . implode(', ', $group)) . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . (!empty($limit) ? '
 			LIMIT ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			yield $row;
 		}
 		Db::$db->free_result($request);
@@ -2620,7 +2641,8 @@ protected static function queryData(array $selects, array $params = array(), arr
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Group::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Group::exportStatic')) {
 	Group::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/IP.php b/Sources/IP.php
index 6147c4a309..708ac539b2 100644
--- a/Sources/IP.php
+++ b/Sources/IP.php
@@ -27,13 +27,18 @@ class IP implements \Stringable
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_underscores' => true,
-		'func_names' => array(
-			'create' => false,
-			'hostFromIp'=> 'host_from_ip',
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'ip2range' => 'ip2range',
+			'range2ip' => 'range2ip',
+			'isValidIP' => 'isValidIP',
+			'isValidIPv6' => 'isValidIPv6',
+			'hostFromIp' => 'host_from_ip',
+			'inet_ptod' => 'inet_ptod',
+			'inet_dtop' => 'inet_dtop',
+			'expandIPv6' => 'expandIPv6',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -42,7 +47,7 @@ class IP implements \Stringable
 	/**
 	 * IP addresses of some well known public DNS servers.
 	 */
-	const DNS_SERVERS = array(
+	public const DNS_SERVERS = [
 		// Google
 		'8.8.8.8',
 		'8.8.4.4',
@@ -52,7 +57,7 @@ class IP implements \Stringable
 		// CloudFare
 		'1.1.1.1',
 		'1.0.0.1',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -80,25 +85,22 @@ class IP implements \Stringable
 	 * Constructor.
 	 *
 	 * If the passed string is not a valid IP address, it will be set to ''.
-	 * 
+	 *
 	 * @param ?string $ip The IP address in either string or binary form.
 	 */
 	public function __construct(?string $ip)
 	{
 		// Is it in a valid IPv4 string?
-		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false)
-		{
+		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false) {
 			$this->ip = $ip;
 		}
 		// Is it in a valid IPv6 string?
-		elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false)
-		{
+		elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false) {
 			// Pack and unpack to ensure it is in standard form.
 			$this->ip = inet_ntop(inet_pton($ip));
 		}
 		// It's either in binary form or it's invalid.
-		else
-		{
+		else {
 			$this->ip = (string) @inet_ntop($ip);
 		}
 	}
@@ -138,8 +140,9 @@ public function toHex(): string
 	public function expand(): string
 	{
 		// IPv6.
-		if ($this->isValid(FILTER_FLAG_IPV6))
+		if ($this->isValid(FILTER_FLAG_IPV6)) {
 			return implode(':', str_split($this->toHex(), 4));
+		}
 
 		// IPv4.
 		return $this->ip;
@@ -166,17 +169,19 @@ public function isValid(int $flags = 0): bool
 	public function getHost(int $timeout = 1000): string
 	{
 		// Can't get a host for an invalid address.
-		if (!$this->isValid())
+		if (!$this->isValid()) {
 			return $this->ip;
+		}
 
 		// Avoid unnecessary repetition.
-		if (isset($this->host))
+		if (isset($this->host)) {
 			return $this->host;
+		}
 
 		// Is it cached?
-		if (($host = CacheApi::get('hostlookup-' . $this->ip, 600)) !== null)
-		{
+		if (($host = CacheApi::get('hostlookup-' . $this->ip, 600)) !== null) {
 			$this->host = $host;
+
 			return $this->host;
 		}
 
@@ -184,20 +189,24 @@ public function getHost(int $timeout = 1000): string
 		$timeout = max(0, $timeout);
 
 		// If we don't need to set a timeout, use PHP's native function.
-		if (empty($timeout))
+		if (empty($timeout)) {
 			$host = \gethostbyaddr($this->ip);
+		}
 
 		// Try asking the operating system to look it up for us.
-		if (empty($host))
+		if (empty($host)) {
 			$host = $this->hostLookup($timeout);
+		}
 
 		// Try looking it up ourselves.
-		if (empty($host))
+		if (empty($host)) {
 			$host = $this->getHostByAddr($timeout);
+		}
 
 		// If all attempts failed, use the IP address.
-		if (empty($host))
+		if (empty($host)) {
 			$host = $this->ip;
+		}
 
 		// Set it.
 		$this->host = $host;
@@ -275,8 +284,9 @@ public static function create(string $ip): object
 	public static function ip2range($addr): array
 	{
 		// Pretend that 'unknown' is 255.255.255.255, since that can't be an IP anyway.
-		if ($addr == 'unknown')
+		if ($addr == 'unknown') {
 			$addr = '255.255.255.255';
+		}
 
 		$mode = (preg_match('/:/', $addr) ? ':' : '.');
 		$max = ($mode == ':' ? 'ffff' : '255');
@@ -284,92 +294,85 @@ public static function ip2range($addr): array
 
 		$max_parts = ($mode === ':' ? 8 : 4);
 
-		$range = array(array(), array());
+		$range = [[], []];
 
 		// No range.
-		if (strpos($addr, '-') === false)
-		{
+		if (strpos($addr, '-') === false) {
 			$range[0] = $range[1] = explode($mode, $addr);
 
-			foreach ($range[0] as &$octet)
-				$octet = strtr($octet, array('*' => $min));
+			foreach ($range[0] as &$octet) {
+				$octet = strtr($octet, ['*' => $min]);
+			}
 
-			foreach ($range[1] as &$octet)
-				$octet = strtr($octet, array('*' => $max));
+			foreach ($range[1] as &$octet) {
+				$octet = strtr($octet, ['*' => $max]);
+			}
 		}
 		// A range.
-		else
-		{
+		else {
 			// It works best to split on the range marker and then figure out the parts.
 			list($range[0], $range[1]) = explode('-', $addr);
 
-			$valid_low = filter_var(strtr($range[0], array('*' => $min)), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
-			$valid_high = filter_var(strtr($range[1], array('*' => $max)), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
+			$valid_low = filter_var(strtr($range[0], ['*' => $min]), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
+			$valid_high = filter_var(strtr($range[1], ['*' => $max]), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
 
 			// Range marker is between two valid IP addresses.
-			if ($valid_low && $valid_high)
-			{
-				$range[0] = explode($mode, strtr($range[0], array('*' => $min)));
-				$range[1] = explode($mode, strtr($range[1], array('*' => $max)));
+			if ($valid_low && $valid_high) {
+				$range[0] = explode($mode, strtr($range[0], ['*' => $min]));
+				$range[1] = explode($mode, strtr($range[1], ['*' => $max]));
 			}
 			// One or the other is a fragment.
-			else
-			{
-				$range = array(
-					$valid_low ? explode($mode, strtr($range[0], array('*' => $min))) : array(),
-					$valid_high ? explode($mode, strtr($range[1], array('*' => $max))) : array(),
-				);
+			else {
+				$range = [
+					$valid_low ? explode($mode, strtr($range[0], ['*' => $min])) : [],
+					$valid_high ? explode($mode, strtr($range[1], ['*' => $max])) : [],
+				];
 
 				$octets = explode($mode, $addr);
 
-				foreach ($octets as $key => $octet)
-				{
-					if (strpos($octet, '-') === false)
-					{
-						if (!$valid_low)
+				foreach ($octets as $key => $octet) {
+					if (strpos($octet, '-') === false) {
+						if (!$valid_low) {
 							$range[0][] = $octet;
+						}
 
-						if (!$valid_high)
+						if (!$valid_high) {
 							$range[1][] = $octet;
-					}
-					else
-					{
+						}
+					} else {
 						$ranged = explode('-', $octet);
 
 						// Special handling for '1.2.3.*-5.6.7.8'
-						if ($ranged[0] === '*')
-						{
+						if ($ranged[0] === '*') {
 							$ranged[0] = $min;
 							$range[0][] = $min;
 
-							if (!$valid_high)
-								$range[1] = array($ranged[1]);
+							if (!$valid_high) {
+								$range[1] = [$ranged[1]];
+							}
 
-							while (filter_var(implode($mode, $range[0]), FILTER_VALIDATE_IP) === false && count($range[0]) < count($octets))
-							{
+							while (filter_var(implode($mode, $range[0]), FILTER_VALIDATE_IP) === false && count($range[0]) < count($octets)) {
 								$range[0][] = $min;
 							}
 
 							$valid_low = true;
-						}
-						else
-						{
-							if (!$valid_low)
+						} else {
+							if (!$valid_low) {
 								$range[0][] = $ranged[0];
+							}
 						}
 
 						// Special handling for '1.2.3.4-*.6.7.8'
-						if ($ranged[1] === '*')
-						{
+						if ($ranged[1] === '*') {
 							$ranged[1] = $max;
 
-							if (!$valid_high)
+							if (!$valid_high) {
 								$range[1][] = $max;
-						}
-						else
-						{
-							if (!$valid_high)
+							}
+						} else {
+							if (!$valid_high) {
 								$range[1][] = $ranged[1];
+							}
 						}
 					}
 				}
@@ -377,41 +380,38 @@ public static function ip2range($addr): array
 		}
 
 		// Finalize the strings.
-		foreach (array(0, 1) as $key)
-		{
+		foreach ([0, 1] as $key) {
 			// If it's too long, shorten it.
-			if (count($range[$key]) > $max_parts)
+			if (count($range[$key]) > $max_parts) {
 				$range[$key] = array_slice($range[$key], 0, $max_parts);
+			}
 
 			// If they're still too short, pad them out.
-			while (filter_var(implode($mode, $range[$key]), FILTER_VALIDATE_IP) === false && count($range[$key]) < $max_parts)
-			{
-				if (in_array('*', $range[$key]))
-				{
+			while (filter_var(implode($mode, $range[$key]), FILTER_VALIDATE_IP) === false && count($range[$key]) < $max_parts) {
+				if (in_array('*', $range[$key])) {
 					$range[$key] = explode($mode, preg_replace('/\*(?!' . preg_quote($mode . '*') . ')/', '*' . $mode . '*', implode($mode, $range[$key])));
-				}
-				else
-				{
+				} else {
 					$range[$key][] = '*';
 				}
 			}
 
 			// Convert to string and replace the wildcards.
-			$range[$key] = strtr(implode($mode, $range[$key]), array('*' => $key === 0 ? $min : $max));
+			$range[$key] = strtr(implode($mode, $range[$key]), ['*' => $key === 0 ? $min : $max]);
 		}
 
 		// Make sure the low one really is lower than the high one.
-		usort($range, fn($a, $b) => inet_pton($a) <=> inet_pton($b));
+		usort($range, fn ($a, $b) => inet_pton($a) <=> inet_pton($b));
 
 		// Return instances of this class, not just plain strings.
 		$low = new self($range[0]);
 		$high = new self($range[1]);
 
 		// Final validity check, just in case.
-		if (!$low->isValid() || !$high->isValid())
-			return array('low' => new self('255.255.255.255'), 'high' => new self('255.255.255.255'));
+		if (!$low->isValid() || !$high->isValid()) {
+			return ['low' => new self('255.255.255.255'), 'high' => new self('255.255.255.255')];
+		}
 
-		return array('low' => $low, 'high' => $high);
+		return ['low' => $low, 'high' => $high];
 	}
 
 	/**
@@ -427,11 +427,13 @@ public static function range2ip($low, $high): string
 		$low = new IP($low);
 		$high = new IP($high);
 
-		if ($low == '255.255.255.255')
+		if ($low == '255.255.255.255') {
 			return 'unknown';
+		}
 
-		if ($low == $high)
+		if ($low == $high) {
 			return $low;
+		}
 
 		return $low . '-' . $high;
 	}
@@ -445,6 +447,7 @@ public static function range2ip($low, $high): string
 	public static function isValidIP(string $ip): string
 	{
 		$ip = new self($ip);
+
 		return $ip->isValid();
 	}
 
@@ -459,6 +462,7 @@ public static function isValidIP(string $ip): string
 	public static function isValidIPv6(string $ip): string
 	{
 		$ip = new self($ip);
+
 		return $ip->isValid(FILTER_FLAG_IPV6);
 	}
 
@@ -471,6 +475,7 @@ public static function isValidIPv6(string $ip): string
 	public static function hostFromIp(string $ip): string
 	{
 		$ip = new self($ip);
+
 		return $ip->getHost(0);
 	}
 
@@ -483,6 +488,7 @@ public static function hostFromIp(string $ip): string
 	public static function inet_ptod(string $ip): string
 	{
 		$ip = new self($ip);
+
 		return $ip->toBinary();
 	}
 
@@ -510,8 +516,9 @@ public static function expandIPv6(string $ip, bool $return_bool_if_invalid = tru
 	{
 		$ip = new self($ip);
 
-		if ($return_bool_if_invalid && !$ip->isValid(FILTER_FLAG_IPV6))
+		if ($return_bool_if_invalid && !$ip->isValid(FILTER_FLAG_IPV6)) {
 			return false;
+		}
 
 		return $ip->expand();
 	}
@@ -530,58 +537,48 @@ public static function expandIPv6(string $ip, bool $return_bool_if_invalid = tru
 	 */
 	protected function hostLookup(int $timeout = 1000): string
 	{
-		if (!function_exists('shell_exec'))
+		if (!function_exists('shell_exec')) {
 			return '';
+		}
 
 		// Macs can use dscacheutil, host, or nslookup, but this is the recommended one.
-		if (Utils::$context['server']['is_mac'])
-		{
+		if (Utils::$context['server']['is_mac']) {
 			$test = (string) @shell_exec('dscacheutil -q host -a ' . ($this->isValid(FILTER_FLAG_IPV6) ? 'ipv6_address' : 'ip_address') . ' ' . @escapeshellarg($this->ip));
 
-			if (preg_match('~name:\s+([^\s]+)~i', $test, $match))
+			if (preg_match('~name:\s+([^\s]+)~i', $test, $match)) {
 				$host = $match[1];
+			}
 		}
 
 		// Try the Unix/Linux host command, perhaps?
-		if (!isset($host) && !Utils::$context['server']['is_windows'])
-		{
-			if (!isset(Config::$modSettings['host_to_dis']))
-			{
+		if (!isset($host) && !Utils::$context['server']['is_windows']) {
+			if (!isset(Config::$modSettings['host_to_dis'])) {
 				$test = (string) @shell_exec('host -W ' . max(1, floor($timeout / 1000)) . ' ' . @escapeshellarg($this->ip));
-			}
-			else
-			{
+			} else {
 				$test = (string) @shell_exec('host ' . @escapeshellarg($this->ip));
 			}
 
 			// Did host say it didn't find anything?
-			if (strpos($test, 'not found') !== false)
-			{
+			if (strpos($test, 'not found') !== false) {
 				$host = '';
 			}
 			// Invalid server option?
-			elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset(Config::$modSettings['host_to_dis']))
-			{
-				Config::updateModSettings(array('host_to_dis' => 1));
+			elseif ((strpos($test, 'invalid option') || strpos($test, 'Invalid query name 1')) && !isset(Config::$modSettings['host_to_dis'])) {
+				Config::updateModSettings(['host_to_dis' => 1]);
 			}
 			// Maybe it found something, after all?
-			elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match))
-			{
+			elseif (preg_match('~\s([^\s]+?)\.\s~', $test, $match)) {
 				$host = $match[1];
 			}
 		}
 
 		// This is nslookup; available on Windows and Macs.
-		if (!isset($host) && (Utils::$context['server']['is_windows'] || Utils::$context['server']['is_mac']))
-		{
+		if (!isset($host) && (Utils::$context['server']['is_windows'] || Utils::$context['server']['is_mac'])) {
 			$test = (string) @shell_exec('nslookup -timeout=' . max(1, floor($timeout / 1000)) . ' ' . @escapeshellarg($ip));
 
-			if (strpos($test, 'Non-existent domain') !== false)
-			{
+			if (strpos($test, 'Non-existent domain') !== false) {
 				$host = '';
-			}
-			elseif (preg_match('~Name\s*(?:=|:)\s+([^\s]+)~i', $test, $match))
-			{
+			} elseif (preg_match('~Name\s*(?:=|:)\s+([^\s]+)~i', $test, $match)) {
 				$host = $match[1];
 			}
 		}
@@ -607,8 +604,7 @@ protected function getHostByAddr(int $timeout = 1000)
 
 		// Submit the query to an external DNS server.
 		// If it fails, try another server.
-		do
-		{
+		do {
 			$handle = @fsockopen('udp://' . self::DNS_SERVERS[$attempt], 53);
 
 			$sent = @fwrite($handle, $query);
@@ -618,15 +614,15 @@ protected function getHostByAddr(int $timeout = 1000)
 			$type = $response == '' ? false : @unpack('s', substr($response, $sent + 2));
 
 			@fclose($handle);
-		}
-		while (($type == false || $type[1] != 0x0C00) && isset(self::DNS_SERVERS[++$attempt]));
+		} while (($type == false || $type[1] != 0x0C00) && isset(self::DNS_SERVERS[++$attempt]));
 
 		// All attempts failed.
-		if ($type == false || $type[1] != 0x0C00)
+		if ($type == false || $type[1] != 0x0C00) {
 			return $this->ip;
+		}
 
 		// Set up our variables.
-		$host = array();
+		$host = [];
 		$len = 0;
 
 		// Set our pointer at the beginning of the host name.
@@ -634,22 +630,21 @@ protected function getHostByAddr(int $timeout = 1000)
 		$position = $sent + 12;
 
 		// Reconstruct host name.
-		do
-		{
+		do {
 			// Get segment size.
 			$len = unpack('c', substr($response, $position));
 
 			// This is a null terminated string, so length 0 = finished.
-			if ($len[1] == 0)
+			if ($len[1] == 0) {
 				return implode('.', $host);
+			}
 
 			// Add segment to our host.
 			$host[] = substr($response, $position + 1, $len[1]);
 
 			// Move pointer on to the next segment.
 			$position += $len[1] + 1;
-		}
-		while ($len != 0);
+		} while ($len != 0);
 
 		// If we get here, something went wrong.
 		return $this->ip;
@@ -663,13 +658,10 @@ protected function getHostByAddr(int $timeout = 1000)
 	protected function getReverseDnsQuery(): string
 	{
 		// Is this an IPv6 address?
-		if ($this->isValid(FILTER_FLAG_IPV6))
-		{
-			$parts = array_merge(str_split(strrev($this->toHex())), array('ip6', 'arpa'));
-		}
-		else
-		{
-			$parts = array_merge(array_reverse(explode('.', $this->ip)), array('in-addr', 'arpa'));
+		if ($this->isValid(FILTER_FLAG_IPV6)) {
+			$parts = array_merge(str_split(strrev($this->toHex())), ['ip6', 'arpa']);
+		} else {
+			$parts = array_merge(array_reverse(explode('.', $this->ip)), ['in-addr', 'arpa']);
 		}
 
 		// Random transaction number (for routers, etc., to get the reply back)
@@ -679,8 +671,9 @@ protected function getReverseDnsQuery(): string
 		$query .= "\1\0\0\1\0\0\0\0\0\0";
 
 		// The interesting stuff.
-		foreach ($parts as $part)
+		foreach ($parts as $part) {
 			$query .= chr(strlen($part)) . $part;
+		}
 
 		// And the final bit of the request.
 		$query .= "\0\0\x0C\0\1";
@@ -690,7 +683,8 @@ protected function getReverseDnsQuery(): string
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\IP::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\IP::exportStatic')) {
 	IP::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/IntegrationHook.php b/Sources/IntegrationHook.php
index d10c3ab9f3..04dba8d28c 100644
--- a/Sources/IntegrationHook.php
+++ b/Sources/IntegrationHook.php
@@ -27,14 +27,13 @@ class IntegrationHook
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'call' => 'call_integration_hook',
 			'add' => 'add_integration_function',
 			'remove' => 'remove_integration_function',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -59,7 +58,7 @@ class IntegrationHook
 	 *
 	 * The results from executing this hook.
 	 */
-	public array $results = array();
+	public array $results = [];
 
 	/*********************
 	 * Internal properties
@@ -70,7 +69,7 @@ class IntegrationHook
 	 *
 	 * The callables to execute for this hook.
 	 */
-	private array $callables = array();
+	private array $callables = [];
 
 	/****************
 	 * Public methods
@@ -83,27 +82,30 @@ class IntegrationHook
 	 * @param bool $ignore_errors If true, silently skip hooked functions that
 	 *    are not callable. Defaults to Utils::$context['ignore_hook_errors'].
 	 */
-	public function __construct(string $name, bool $ignore_errors = null)
+	public function __construct(string $name, ?bool $ignore_errors = null)
 	{
-		if (!class_exists('SMF\\Config', false) || !class_exists('SMF\\Utils', false))
+		if (!class_exists('SMF\\Config', false) || !class_exists('SMF\\Utils', false)) {
 			return;
+		}
 
 		$this->ignore_errors = $ignore_errors ?? !empty(Utils::$context['ignore_hook_errors']);
 
-		if (Config::$db_show_debug === true)
+		if (Config::$db_show_debug === true) {
 			Utils::$context['debug']['hooks'][] = $name;
+		}
 
-		if (empty(Config::$modSettings[$name]))
+		if (empty(Config::$modSettings[$name])) {
 			return;
+		}
 
 		$func_strings = explode(',', Config::$modSettings[$name]);
 
 		// Loop through each one to get the callable for it.
-		foreach ($func_strings as $func_string)
-		{
+		foreach ($func_strings as $func_string) {
 			// Hook has been marked as disabled. Skip it!
-			if (strpos($func_string, '!') !== false)
+			if (strpos($func_string, '!') !== false) {
 				continue;
+			}
 
 			$this->callables[$func_string] = Utils::getCallable($func_string);
 		}
@@ -116,52 +118,46 @@ public function __construct(string $name, bool $ignore_errors = null)
 	 * @param array $parameters Parameters to pass to the hooked callables.
 	 * @return array The results returned by all the hooked callables.
 	 */
-	public function execute(array $parameters = array()): array
+	public function execute(array $parameters = []): array
 	{
-		if (empty($this->callables))
+		if (empty($this->callables)) {
 			return $this->results;
+		}
 
 		// Loop through each callable.
-		foreach ($this->callables as $func_string => $callable)
-		{
+		foreach ($this->callables as $func_string => $callable) {
 			// Is it valid?
-			if (is_callable($callable))
-			{
+			if (is_callable($callable)) {
 				$this->results[$func_string] = call_user_func_array($callable, $parameters);
 			}
 			// This failed, but we want to do so silently.
-			elseif ($this->ignore_errors)
-			{
+			elseif ($this->ignore_errors) {
 				// return $this->results;
 				continue;
 			}
 			// Whatever it was supposed to call, it failed :(
-			else
-			{
+			else {
 				Lang::load('Errors');
 
 				// Get a full path to show on error.
-				if (strpos($func_string, '|') !== false)
-				{
+				if (strpos($func_string, '|') !== false) {
 					list($file, $func) = explode('|', $func_string);
 
-					$path = strtr($file, array(
+					$path = strtr($file, [
 						'$boarddir' => Config::$boarddir,
 						'$sourcedir' => Config::$sourcedir,
-					));
+					]);
 
-					if (strpos($path, '$themedir') !== false && class_exists('SMF\\Theme', false) && !empty(Theme::$current->settings['theme_dir']))
-					{
-						$path = strtr($path, array(
+					if (strpos($path, '$themedir') !== false && class_exists('SMF\\Theme', false) && !empty(Theme::$current->settings['theme_dir'])) {
+						$path = strtr($path, [
 							'$themedir' => Theme::$current->settings['theme_dir'],
-						));
+						]);
 					}
 
 					ErrorHandler::log(sprintf(Lang::$txt['hook_fail_call_to'], $func, $path), 'general');
 				}
 				// Assume the file resides on Config::$boarddir somewhere...
-				else
-				{
+				else {
 					ErrorHandler::log(sprintf(Lang::$txt['hook_fail_call_to'], $func_string, Config::$boarddir), 'general');
 				}
 			}
@@ -181,9 +177,10 @@ public function execute(array $parameters = array()): array
 	 * @param array $parameters Parameters to pass to the hooked callables.
 	 * @return array The results returned by all the hooked callables.
 	 */
-	public static function call($name, $parameters = array()): array
+	public static function call($name, $parameters = []): array
 	{
 		$hook = new self($name);
+
 		return $hook->execute($parameters);
 	}
 
@@ -206,12 +203,14 @@ public static function call($name, $parameters = array()): array
 	public static function add(string $name, string $function, bool $permanent = true, string $file = '', bool $object = false): void
 	{
 		// Any objects?
-		if ($object)
+		if ($object) {
 			$function = $function . '#';
+		}
 
 		// Any files  to load?
-		if (!empty($file) && is_string($file))
+		if (!empty($file) && is_string($file)) {
 			$function = $file . (!empty($function) ? '|' . $function : '');
+		}
 
 		// Get the correct string.
 		$integration_call = $function;
@@ -219,50 +218,47 @@ public static function add(string $name, string $function, bool $permanent = tru
 		$disabled_call = $enabled_call . '!';
 
 		// Is it going to be permanent?
-		if ($permanent)
-		{
-			$request = Db::$db->query('', '
-				SELECT value
+		if ($permanent) {
+			$request = Db::$db->query(
+				'',
+				'SELECT value
 				FROM {db_prefix}settings
 				WHERE variable = {string:variable}',
-				array(
+				[
 					'variable' => $name,
-				)
+				],
 			);
 			list($current_functions) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			if (!empty($current_functions))
-			{
+			if (!empty($current_functions)) {
 				$current_functions = explode(',', $current_functions);
 
 				// Cleanup enabled/disabled variants before taking action.
-				$current_functions = array_diff($current_functions, array($enabled_call, $disabled_call));
+				$current_functions = array_diff($current_functions, [$enabled_call, $disabled_call]);
 
-				$permanent_functions = array_unique(array_merge($current_functions, array($integration_call)));
-			}
-			else
-			{
-				$permanent_functions = array($integration_call);
+				$permanent_functions = array_unique(array_merge($current_functions, [$integration_call]));
+			} else {
+				$permanent_functions = [$integration_call];
 			}
 
-			Config::updateModSettings(array($name => implode(',', $permanent_functions)));
+			Config::updateModSettings([$name => implode(',', $permanent_functions)]);
 		}
 
 		// Make current function list usable.
-		$functions = empty(Config::$modSettings[$name]) ? array() : explode(',', Config::$modSettings[$name]);
+		$functions = empty(Config::$modSettings[$name]) ? [] : explode(',', Config::$modSettings[$name]);
 
 		// Cleanup enabled/disabled variants before taking action.
-		$functions = array_diff($functions, array($enabled_call, $disabled_call));
-		$functions = array_unique(array_merge($functions, array($integration_call)));
+		$functions = array_diff($functions, [$enabled_call, $disabled_call]);
+		$functions = array_unique(array_merge($functions, [$integration_call]));
 
 		Config::$modSettings[$name] = implode(',', $functions);
 
 		// It is handy to be able to know which hooks are temporary...
-		if ($permanent !== true)
-		{
-			if (!isset(Utils::$context['integration_hooks_temporary']))
-				Utils::$context['integration_hooks_temporary'] = array();
+		if ($permanent !== true) {
+			if (!isset(Utils::$context['integration_hooks_temporary'])) {
+				Utils::$context['integration_hooks_temporary'] = [];
+			}
 
 			Utils::$context['integration_hooks_temporary'][$name][$function] = true;
 		}
@@ -291,12 +287,14 @@ public static function add(string $name, string $function, bool $permanent = tru
 	public static function remove(string $name, string $function, bool $permanent = true, string $file = '', bool $object = false): void
 	{
 		// Any objects?
-		if ($object)
+		if ($object) {
 			$function = $function . '#';
+		}
 
 		// Any files  to load?
-		if (!empty($file) && is_string($file))
+		if (!empty($file) && is_string($file)) {
 			$function = $file . '|' . $function;
+		}
 
 		// Get the correct string.
 		$integration_call = $function;
@@ -304,39 +302,40 @@ public static function remove(string $name, string $function, bool $permanent =
 		$disabled_call = $enabled_call . '!';
 
 		// Get the permanent functions.
-		$request = Db::$db->query('', '
-			SELECT value
+		$request = Db::$db->query(
+			'',
+			'SELECT value
 			FROM {db_prefix}settings
 			WHERE variable = {string:variable}',
-			array(
+			[
 				'variable' => $name,
-			)
+			],
 		);
 		list($current_functions) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if (!empty($current_functions))
-		{
+		if (!empty($current_functions)) {
 			$current_functions = explode(',', $current_functions);
 
 			// Cleanup enabled and disabled variants.
-			$current_functions = array_unique(array_diff($current_functions, array($enabled_call, $disabled_call)));
+			$current_functions = array_unique(array_diff($current_functions, [$enabled_call, $disabled_call]));
 
-			Config::updateModSettings(array($name => implode(',', $current_functions)));
+			Config::updateModSettings([$name => implode(',', $current_functions)]);
 		}
 
 		// Turn the function list into something usable.
-		$functions = empty(Config::$modSettings[$name]) ? array() : explode(',', Config::$modSettings[$name]);
+		$functions = empty(Config::$modSettings[$name]) ? [] : explode(',', Config::$modSettings[$name]);
 
 		// Cleanup enabled and disabled variants.
-		$functions = array_unique(array_diff($functions, array($enabled_call, $disabled_call)));
+		$functions = array_unique(array_diff($functions, [$enabled_call, $disabled_call]));
 
 		Config::$modSettings[$name] = implode(',', $functions);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\IntegrationHook::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\IntegrationHook::exportStatic')) {
 	IntegrationHook::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/ItemList.php b/Sources/ItemList.php
index 653d784a07..ae7acabf16 100644
--- a/Sources/ItemList.php
+++ b/Sources/ItemList.php
@@ -18,18 +18,19 @@
  */
 class ItemList implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'createList',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -90,21 +91,21 @@ class ItemList implements \ArrayAccess
 	 *
 	 * Table headers.
 	 */
-	public array $headers = array();
+	public array $headers = [];
 
 	/**
 	 * @var array
 	 *
 	 * Table rows for the items in the list.
 	 */
-	public array $rows = array();
+	public array $rows = [];
 
 	/**
 	 * @var array
 	 *
 	 * Additional rows to wrap around this lis.
 	 */
-	public array $additional_rows = array();
+	public array $additional_rows = [];
 
 	/**
 	 * @var string
@@ -125,7 +126,7 @@ class ItemList implements \ArrayAccess
 	 *
 	 * Info about how this list is sorted.
 	 */
-	public array $sort = array();
+	public array $sort = [];
 
 	/**
 	 * @var int
@@ -164,7 +165,7 @@ class ItemList implements \ArrayAccess
 	 *
 	 * The list options passed to the constructor.
 	 */
-	protected array $options = array();
+	protected array $options = [];
 
 	/**
 	 * @var string
@@ -178,7 +179,7 @@ class ItemList implements \ArrayAccess
 	 *
 	 * The items retrieved from the database.
 	 */
-	protected array $items = array();
+	protected array $items = [];
 
 	/****************
 	 * Public methods
@@ -192,14 +193,16 @@ class ItemList implements \ArrayAccess
 	public function __construct(array $options)
 	{
 		// Make sure that we have everything we need.
-		if (!$this->checkOptions($options))
+		if (!$this->checkOptions($options)) {
 			return;
+		}
 
-		IntegrationHook::call('integrate_' . $options['id'], array(&$options));
+		IntegrationHook::call('integrate_' . $options['id'], [&$options]);
 
 		// Check again just in case a mod screwed up.
-		if (!$this->checkOptions($options))
+		if (!$this->checkOptions($options)) {
 			return;
+		}
 
 		$this->id = $options['id'];
 		$this->options = $options;
@@ -254,8 +257,9 @@ protected function checkOptions(array $options): bool
 		$have_what_we_need &= empty($options['default_sort_col']) || isset($options['columns'][$options['default_sort_col']]);
 		$have_what_we_need &= !isset($options['form']) || isset($options['form']['href']);
 
-		if (!isset($options['get_count']['value']))
+		if (!isset($options['get_count']['value'])) {
 			$have_what_we_need &= empty($options['items_per_page']) || (isset($options['get_count']['function'], $options['base_href']) && is_numeric($options['items_per_page']));
+		}
 
 		return $have_what_we_need;
 	}
@@ -265,29 +269,32 @@ protected function checkOptions(array $options): bool
 	 */
 	protected function setBasics(): void
 	{
-		if (!empty($this->options['start_var_name']))
+		if (!empty($this->options['start_var_name'])) {
 			$this->start_var_name = $this->options['start_var_name'];
+		}
 
 		// We know the amount of columns, might be useful for the template.
 		$this->num_columns = count($this->options['columns']);
 
-		if (!empty($this->options['width']))
+		if (!empty($this->options['width'])) {
 			$this->width = $this->options['width'];
+		}
 
 		// The title is currently optional.
-		if (isset($this->options['title']))
+		if (isset($this->options['title'])) {
 			$this->title = $this->options['title'];
+		}
 
 		// Wanna say something nice in case there are no items?
-		if (isset($this->options['no_items_label']))
-		{
+		if (isset($this->options['no_items_label'])) {
 			$this->no_items_label = $this->options['no_items_label'];
 			$this->no_items_align = $this->options['no_items_align'] ?? '';
 		}
 
 		// Add an option for inline JavaScript.
-		if (isset($this->options['javascript']))
+		if (isset($this->options['javascript'])) {
 			$this->javascript = $this->options['javascript'];
+		}
 	}
 
 	/**
@@ -295,25 +302,23 @@ protected function setBasics(): void
 	 */
 	protected function setSort(): void
 	{
-		if (empty($this->options['default_sort_col']))
+		if (empty($this->options['default_sort_col'])) {
 			return;
+		}
 
 		$this->options['request_vars']['sort'] = $this->options['request_vars']['sort'] ?? 'sort';
 		$this->options['request_vars']['desc'] = $this->options['request_vars']['desc'] ?? 'desc';
 
-		if (isset($_REQUEST[$this->options['request_vars']['sort']], $this->options['columns'][$_REQUEST[$this->options['request_vars']['sort']]], $this->options['columns'][$_REQUEST[$this->options['request_vars']['sort']]]['sort']))
-		{
-			$this->sort = array(
+		if (isset($_REQUEST[$this->options['request_vars']['sort']], $this->options['columns'][$_REQUEST[$this->options['request_vars']['sort']]], $this->options['columns'][$_REQUEST[$this->options['request_vars']['sort']]]['sort'])) {
+			$this->sort = [
 				'id' => $_REQUEST[$this->options['request_vars']['sort']],
 				'desc' => isset($_REQUEST[$this->options['request_vars']['desc']]) && isset($this->options['columns'][$_REQUEST[$this->options['request_vars']['sort']]]['sort']['reverse']),
-			);
-		}
-		else
-		{
-			$this->sort = array(
+			];
+		} else {
+			$this->sort = [
 				'id' => $this->options['default_sort_col'],
 				'desc' => (!empty($this->options['default_sort_dir']) && $this->options['default_sort_dir'] == 'desc') || (!empty($this->options['columns'][$this->options['default_sort_col']]['sort']['default']) && substr($this->options['columns'][$this->options['default_sort_col']]['sort']['default'], -4, 4) == 'desc') ? true : false,
-			);
+			];
 		}
 
 		// Set the database column sort.
@@ -327,22 +332,21 @@ protected function setSort(): void
 	protected function setStartAndItemsPerPage(): void
 	{
 		// In some cases the full list must be shown, regardless of the amount of items.
-		if (empty($this->options['items_per_page']))
+		if (empty($this->options['items_per_page'])) {
 			return;
+		}
 
 		// First get an impression of how many items to expect.
-		if (isset($this->options['get_count']['value']) && (is_int($this->options['get_count']['value']) || ctype_digit($this->options['get_count']['value'])))
-		{
+		if (isset($this->options['get_count']['value']) && (is_int($this->options['get_count']['value']) || ctype_digit($this->options['get_count']['value']))) {
 			$this->total_num_items = $this->options['get_count']['value'];
-		}
-		else
-		{
-			if (isset($this->options['get_count']['file']))
-				require_once($this->options['get_count']['file']);
+		} else {
+			if (isset($this->options['get_count']['file'])) {
+				require_once $this->options['get_count']['file'];
+			}
 
 			$call = Utils::getCallable($this->options['get_count']['function']);
 
-			$params = $this->options['get_count']['params'] ?? array();
+			$params = $this->options['get_count']['params'] ?? [];
 
 			$this->total_num_items = call_user_func_array($call, array_values($params));
 		}
@@ -357,8 +361,9 @@ protected function setStartAndItemsPerPage(): void
 	 */
 	protected function buildPageIndex(): void
 	{
-		if (empty($this->total_num_items) || $this->total_num_items <= $this->items_per_page)
+		if (empty($this->total_num_items) || $this->total_num_items <= $this->items_per_page) {
 			return;
+		}
 
 		$this->page_index = new PageIndex($this->options['base_href'] . (empty($this->sort) ? '' : ';' . $this->options['request_vars']['sort'] . '=' . $this->sort['id'] . ($this->sort['desc'] ? ';' . $this->options['request_vars']['desc'] : '')) . ($this->start_var_name != 'start' ? ';' . $this->start_var_name . '=%1$d' : ''), $this->start, $this->total_num_items, $this->items_per_page, $this->start_var_name != 'start');
 	}
@@ -369,17 +374,16 @@ protected function buildPageIndex(): void
 	protected function buildHeaders(): void
 	{
 		// Prepare the headers of the table.
-		foreach ($this->options['columns'] as $column_id => $column)
-		{
-			$this->headers[] = array(
+		foreach ($this->options['columns'] as $column_id => $column) {
+			$this->headers[] = [
 				'id' => $column_id,
-				'label' => isset($column['header']['eval']) ? eval($column['header']['eval']) : (isset($column['header']['value']) ? $column['header']['value'] : ''),
+				'label' => isset($column['header']['eval']) ? eval($column['header']['eval']) : ($column['header']['value'] ?? ''),
 				'href' => empty($this->options['default_sort_col']) || empty($column['sort']) ? '' : $this->options['base_href'] . ';' . $this->options['request_vars']['sort'] . '=' . $column_id . ($column_id === $this->sort['id'] && !$this->sort['desc'] && isset($column['sort']['reverse']) ? ';' . $this->options['request_vars']['desc'] : '') . (empty($this->start) ? '' : ';' . $this->start_var_name . '=' . $this->start),
 				'sort_image' => empty($this->options['default_sort_col']) || empty($column['sort']) || $column_id !== $this->sort['id'] ? null : ($this->sort['desc'] ? 'down' : 'up'),
-				'class' => isset($column['header']['class']) ? $column['header']['class'] : '',
-				'style' => isset($column['header']['style']) ? $column['header']['style'] : '',
-				'colspan' => isset($column['header']['colspan']) ? $column['header']['colspan'] : '',
-			);
+				'class' => $column['header']['class'] ?? '',
+				'style' => $column['header']['style'] ?? '',
+				'colspan' => $column['header']['colspan'] ?? '',
+			];
 		}
 	}
 
@@ -389,84 +393,77 @@ protected function buildHeaders(): void
 	protected function buildRows(): void
 	{
 		// Loop through the list items to be shown and construct the data values.
-		foreach ($this->items as $item_id => $list_item)
-		{
-			$cur_row = array();
-			foreach ($this->options['columns'] as $column_id => $column)
-			{
-				$cur_data = array();
+		foreach ($this->items as $item_id => $list_item) {
+			$cur_row = [];
+
+			foreach ($this->options['columns'] as $column_id => $column) {
+				$cur_data = [];
 
 				// A value straight from the database?
-				if (isset($column['data']['db']))
-				{
+				if (isset($column['data']['db'])) {
 					$cur_data['value'] = $list_item[$column['data']['db']];
 				}
 				// Take the value from the database and make it HTML safe.
-				elseif (isset($column['data']['db_htmlsafe']))
-				{
+				elseif (isset($column['data']['db_htmlsafe'])) {
 					$cur_data['value'] = Utils::htmlspecialchars($list_item[$column['data']['db_htmlsafe']]);
 				}
 				// Using sprintf is probably the most readable way of injecting data.
-				elseif (isset($column['data']['sprintf']))
-				{
-					$params = array();
+				elseif (isset($column['data']['sprintf'])) {
+					$params = [];
 
-					foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe)
-					{
+					foreach ($column['data']['sprintf']['params'] as $sprintf_param => $htmlsafe) {
 						$params[] = $htmlsafe ? Utils::htmlspecialchars($list_item[$sprintf_param]) : $list_item[$sprintf_param];
 					}
 
 					$cur_data['value'] = vsprintf($column['data']['sprintf']['format'], $params);
 				}
 				// The most flexible way probably is applying a custom function.
-				elseif (isset($column['data']['function']))
-				{
-					$cur_data['value'] = call_user_func_array($column['data']['function'], array($list_item));
+				elseif (isset($column['data']['function'])) {
+					$cur_data['value'] = call_user_func_array($column['data']['function'], [$list_item]);
 				}
 				// A modified value (inject the database values).
-				elseif (isset($column['data']['eval']))
-				{
+				elseif (isset($column['data']['eval'])) {
 					$cur_data['value'] = eval(preg_replace('~%([a-zA-Z0-9\-_]+)%~', '$list_item[\'$1\']', $column['data']['eval']));
 				}
 				// A literal value.
-				elseif (isset($column['data']['value']))
-				{
+				elseif (isset($column['data']['value'])) {
 					$cur_data['value'] = $column['data']['value'];
 				}
 				// Empty value.
-				else
+				else {
 					$cur_data['value'] = '';
+				}
 
 				// Allow for basic formatting.
-				if (!empty($column['data']['comma_format']))
-				{
+				if (!empty($column['data']['comma_format'])) {
 					$cur_data['value'] = Lang::numberFormat($cur_data['value']);
-				}
-				elseif (!empty($column['data']['timeformat']))
-				{
+				} elseif (!empty($column['data']['timeformat'])) {
 					$cur_data['value'] = Time::create('@' . $cur_data['value'])->format();
 				}
 
 				// Set a style class for this column?
-				if (isset($column['data']['class']))
+				if (isset($column['data']['class'])) {
 					$cur_data['class'] = $column['data']['class'];
+				}
 
 				// Fully customized styling for the cells in this column only.
-				if (isset($column['data']['style']))
+				if (isset($column['data']['style'])) {
 					$cur_data['style'] = $column['data']['style'];
+				}
 
 				// Add the data cell properties to the current row.
 				$cur_row[$column_id] = $cur_data;
 			}
 
 			// Maybe we wat set a custom class for the row based on the data in the row itself
-			if (isset($this->options['data_check']))
-			{
-				if (isset($this->options['data_check']['class']))
+			if (isset($this->options['data_check'])) {
+				if (isset($this->options['data_check']['class'])) {
 					$this->rows[$item_id]['class'] = $this->options['data_check']['class']($list_item);
+				}
 
-				if (isset($this->options['data_check']['style']))
+				if (isset($this->options['data_check']['style'])) {
 					$this->rows[$item_id]['style'] = $this->options['data_check']['style']($list_item);
+				}
 			}
 
 			// Insert the row into the list.
@@ -479,21 +476,19 @@ protected function buildRows(): void
 	 */
 	protected function getItems(): void
 	{
-		if (!empty($this->options['get_items']['value']) && is_array($this->options['get_items']['value']))
-		{
+		if (!empty($this->options['get_items']['value']) && is_array($this->options['get_items']['value'])) {
 			$this->items = $this->options['get_items']['value'];
-		}
-		else
-		{
+		} else {
 			// Get the file with the function for the item list.
-			if (isset($this->options['get_items']['file']))
-				require_once($this->options['get_items']['file']);
+			if (isset($this->options['get_items']['file'])) {
+				require_once $this->options['get_items']['file'];
+			}
 
 			$call = Utils::getCallable($this->options['get_items']['function']);
 
-			$items = call_user_func_array($call, array_merge(array($this->start, $this->items_per_page, $this->db_sort), empty($this->options['get_items']['params']) ? array() : $this->options['get_items']['params']));
+			$items = call_user_func_array($call, array_merge([$this->start, $this->items_per_page, $this->db_sort], empty($this->options['get_items']['params']) ? [] : $this->options['get_items']['params']));
 
-			$this->items = empty($items) ? array() : $items;
+			$this->items = empty($items) ? [] : $items;
 		}
 	}
 
@@ -502,32 +497,36 @@ protected function getItems(): void
 	 */
 	protected function buildForm(): void
 	{
-		if (!isset($this->options['form']))
+		if (!isset($this->options['form'])) {
 			return;
+		}
 
 		$this->form = $this->options['form'];
 
-		if (!isset($this->form['hidden_fields']))
-			$this->form['hidden_fields'] = array();
+		if (!isset($this->form['hidden_fields'])) {
+			$this->form['hidden_fields'] = [];
+		}
 
 		// Always add a session check field.
 		$this->form['hidden_fields'][Utils::$context['session_var']] = Utils::$context['session_id'];
 
 		// Will this do a token check?
-		if (isset($this->options['form']['token']))
+		if (isset($this->options['form']['token'])) {
 			$this->form['hidden_fields'][Utils::$context[$this->options['form']['token'] . '_token_var']] = Utils::$context[$this->options['form']['token'] . '_token'];
+		}
 
 		// Include the starting page as hidden field?
-		if (!empty($this->form['include_start']) && !empty($this->start))
+		if (!empty($this->form['include_start']) && !empty($this->start)) {
 			$this->form['hidden_fields'][$this->start_var_name] = $this->start;
+		}
 
 		// If sorting needs to be the same after submitting, add the parameter.
-		if (!empty($this->form['include_sort']) && !empty($this->sort))
-		{
+		if (!empty($this->form['include_sort']) && !empty($this->sort)) {
 			$this->form['hidden_fields']['sort'] = $this->sort['id'];
 
-			if ($this->sort['desc'])
+			if ($this->sort['desc']) {
 				$this->form['hidden_fields']['desc'] = 1;
+			}
 		}
 	}
 
@@ -536,18 +535,20 @@ protected function buildForm(): void
 	 */
 	protected function buildAdditionalRows(): void
 	{
-		if (!isset($this->options['additional_rows']))
+		if (!isset($this->options['additional_rows'])) {
 			return;
+		}
 
-		foreach ($this->options['additional_rows'] as $row)
-		{
-			if (empty($row))
+		foreach ($this->options['additional_rows'] as $row) {
+			if (empty($row)) {
 				continue;
+			}
 
 			// Supported row positions: top_of_list, after_title,
 			// above_column_headers, below_table_data, bottom_of_list.
-			if (!isset($this->additional_rows[$row['position']]))
-				$this->additional_rows[$row['position']] = array();
+			if (!isset($this->additional_rows[$row['position']])) {
+				$this->additional_rows[$row['position']] = [];
+			}
 
 			$this->additional_rows[$row['position']][] = $row;
 		}
@@ -555,7 +556,8 @@ protected function buildAdditionalRows(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ItemList::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ItemList::exportStatic')) {
 	ItemList::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Lang.php b/Sources/Lang.php
index cec1ad957c..4cf5df40b9 100644
--- a/Sources/Lang.php
+++ b/Sources/Lang.php
@@ -27,23 +27,24 @@ class Lang
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'loadLanguage',
-			'addDirs' => false,
 			'get' => 'getLanguages',
+			'censorText' => 'censorText',
+			'tokenTxtReplace' => 'tokenTxtReplace',
 			'sentenceList' => 'sentence_list',
 			'numberFormat' => 'comma_format',
-		),
-		'prop_names' => array(
+		],
+		'prop_names' => [
 			'txt' => 'txt',
 			'tztxt' => 'tztxt',
 			'editortxt' => 'editortxt',
 			'helptxt' => 'helptxt',
 			'txtBirthdayEmails' => 'txtBirthdayEmails',
 			'forum_copyright' => 'forum_copyright',
-		),
-	);
+		],
+	];
 
 	/**************************
 	 * Public static properties
@@ -69,42 +70,42 @@ class Lang
 	 *
 	 * Array of localized strings for the UI.
 	 */
-	public static array $txt = array();
+	public static array $txt = [];
 
 	/**
 	 * @var array
 	 *
 	 * Array of localized strings for birthday emails.
 	 */
-	public static array $txtBirthdayEmails = array();
+	public static array $txtBirthdayEmails = [];
 
 	/**
 	 * @var array
 	 *
 	 * Array of localized strings for time zone "meta-zones".
 	 */
-	public static array $tztxt = array();
+	public static array $tztxt = [];
 
 	/**
 	 * @var array
 	 *
 	 * Array of localized strings for the editor UI.
 	 */
-	public static array $editortxt = array();
+	public static array $editortxt = [];
 
 	/**
 	 * @var array
 	 *
 	 * Array of localized strings for the admin help popup.
 	 */
-	public static array $helptxt = array();
+	public static array $helptxt = [];
 
 	/**
 	 * @var array
 	 *
 	 * Language file directories.
 	 */
-	public static array $dirs = array();
+	public static array $dirs = [];
 
 	/**
 	 * @var int
@@ -136,14 +137,14 @@ class Lang
 	 *
 	 * Tracks which langauge files we have loaded.
 	 */
-	private static $already_loaded = array();
+	private static $already_loaded = [];
 
 	/**
 	 * @var array
 	 *
 	 * Tracks the value of $forum_copyright for different languages.
 	 */
-	private static $localized_copyright = array();
+	private static $localized_copyright = [];
 
 	/***********************
 	 * Public static methods
@@ -162,55 +163,56 @@ class Lang
 	 */
 	public static function load(string $template_name, string $lang = '', bool $fatal = true, bool $force_reload = false)
 	{
-		if (!isset(self::$default))
+		if (!isset(self::$default)) {
 			self::$default = &Config::$language;
+		}
 
 		// Default to the user's language.
-		if ($lang == '')
-			$lang = isset(User::$me->language) ? User::$me->language : self::$default;
+		if ($lang == '') {
+			$lang = User::$me->language ?? self::$default;
+		}
 
 		// Don't repeat this unnecessarily.
-		if (!$force_reload && isset(self::$already_loaded[$template_name]) && self::$already_loaded[$template_name] == $lang)
+		if (!$force_reload && isset(self::$already_loaded[$template_name]) && self::$already_loaded[$template_name] == $lang) {
 			return $lang;
+		}
 
-		if (empty(self::$dirs))
+		if (empty(self::$dirs)) {
 			self::addDirs();
+		}
 
 		// For each file open it up and write it out!
-		foreach (explode('+', $template_name) as $template)
-		{
-			$attempts = array();
-
-			foreach (self::$dirs as $dir)
-			{
-				$attempts[] = array($dir, $template, $lang);
-				$attempts[] = array($dir, $template, self::$default);
+		foreach (explode('+', $template_name) as $template) {
+			$attempts = [];
+
+			foreach (self::$dirs as $dir) {
+				$attempts[] = [$dir, $template, $lang];
+				$attempts[] = [$dir, $template, self::$default];
 			}
 
 			// Fall back to English if none of the preferred languages can be found.
-			if (empty(Config::$modSettings['disable_language_fallback']) && !in_array('english', array($lang, self::$default)))
-			{
-				foreach (self::$dirs as $dir)
-					$attempts[] = array($dir, $template, 'english');
+			if (empty(Config::$modSettings['disable_language_fallback']) && !in_array('english', [$lang, self::$default])) {
+				foreach (self::$dirs as $dir) {
+					$attempts[] = [$dir, $template, 'english'];
+				}
 			}
 
 			// Try to find the language file.
 			$found = false;
-			foreach ($attempts as $k => $file)
-			{
-				if (file_exists($file[0] . '/' . $file[1] . '.' . $file[2] . '.php'))
-				{
+
+			foreach ($attempts as $k => $file) {
+				if (file_exists($file[0] . '/' . $file[1] . '.' . $file[2] . '.php')) {
 					// Include it!
-					require($file[0] . '/' . $file[1] . '.' . $file[2] . '.php');
+					require $file[0] . '/' . $file[1] . '.' . $file[2] . '.php';
 
 					// Note that we found it.
 					$found = true;
 
 					// Load the strings into our properties.
-					foreach (array('txt', 'txtBirthdayEmails', 'tztxt', 'editortxt', 'helptxt') as $var)
-					{
-						if (!isset(${$var}))
+					foreach (['txt', 'txtBirthdayEmails', 'tztxt', 'editortxt', 'helptxt'] as $var) {
+						if (!isset(${$var})) {
 							continue;
+						}
 
 						self::${$var} = array_merge(self::${$var}, ${$var});
 
@@ -218,8 +220,7 @@ public static function load(string $template_name, string $lang = '', bool $fata
 					}
 
 					// Did this file define the $forum_copyright?
-					if (isset($forum_copyright))
-					{
+					if (isset($forum_copyright)) {
 						self::$localized_copyright[$file[2]] = $forum_copyright;
 
 						self::$forum_copyright = self::$localized_copyright[$lang] ?? (self::$localized_copyright[self::$default] ?? (self::$localized_copyright['english'] ?? ''));
@@ -228,16 +229,16 @@ public static function load(string $template_name, string $lang = '', bool $fata
 					}
 
 					// setlocale is required for basename() & pathinfo() to work properly on the selected language
-					if (!empty(self::$txt['lang_locale']))
-					{
-						if (strpos(self::$txt['lang_locale'], '.') !== false)
+					if (!empty(self::$txt['lang_locale'])) {
+						if (strpos(self::$txt['lang_locale'], '.') !== false) {
 							$locale_variants = self::$txt['lang_locale'];
-						else
+						} else {
 							$locale_variants = array_unique(array_merge(
-								!empty(Config::$modSettings['global_character_set']) ? array(self::$txt['lang_locale'] . '.' . Config::$modSettings['global_character_set']) : array(),
-								!empty(Utils::$context['utf8']) ? array(self::$txt['lang_locale'] . '.UTF-8', self::$txt['lang_locale'] . '.UTF8', self::$txt['lang_locale'] . '.utf-8', self::$txt['lang_locale'] . '.utf8') : array(),
-								array(self::$txt['lang_locale'])
+								!empty(Config::$modSettings['global_character_set']) ? [self::$txt['lang_locale'] . '.' . Config::$modSettings['global_character_set']] : [],
+								!empty(Utils::$context['utf8']) ? [self::$txt['lang_locale'] . '.UTF-8', self::$txt['lang_locale'] . '.UTF8', self::$txt['lang_locale'] . '.utf-8', self::$txt['lang_locale'] . '.utf8'] : [],
+								[self::$txt['lang_locale']],
 							));
+						}
 
 						setlocale(LC_CTYPE, $locale_variants);
 					}
@@ -247,49 +248,44 @@ public static function load(string $template_name, string $lang = '', bool $fata
 			}
 
 			// That couldn't be found!  Log the error, but *try* to continue normally.
-			if (!$found && $fatal)
-			{
+			if (!$found && $fatal) {
 				ErrorHandler::log(sprintf(self::$txt['theme_language_error'] ?? 'Unable to load the \'%1$s\' language file.', $template_name . '.' . $lang, 'template'));
-
 				break;
 			}
 
 			// Copyright can't be empty.
-			if (empty(self::$forum_copyright))
-			{
+			if (empty(self::$forum_copyright)) {
 				$class_vars = get_class_vars(__CLASS__);
 				self::$forum_copyright = $class_vars['forum_copyright'];
 			}
 
 			// For the sake of backward compatibility
-			if (!empty(self::$txt['emails']))
-			{
-				foreach (self::$txt['emails'] as $key => $value)
-				{
+			if (!empty(self::$txt['emails'])) {
+				foreach (self::$txt['emails'] as $key => $value) {
 					self::$txt[$key . '_subject'] = $value['subject'];
 					self::$txt[$key . '_body'] = $value['body'];
 				}
-				self::$txt['emails'] = array();
+				self::$txt['emails'] = [];
 			}
+
 			// For sake of backward compatibility: $birthdayEmails is supposed to be
 			// empty in a normal install. If it isn't it means the forum is using
 			// something "old" (it may be the translation, it may be a mod) and this
 			// code (like the piece above) takes care of converting it to the new format
-			if (!empty($birthdayEmails))
-			{
-				foreach ($birthdayEmails as $key => $value)
-				{
+			if (!empty($birthdayEmails)) {
+				foreach ($birthdayEmails as $key => $value) {
 					self::$txtBirthdayEmails[$key . '_subject'] = $value['subject'];
 					self::$txtBirthdayEmails[$key . '_body'] = $value['body'];
 					self::$txtBirthdayEmails[$key . '_author'] = $value['author'];
 				}
-				$birthdayEmails = array();
+				$birthdayEmails = [];
 			}
 		}
 
 		// Keep track of what we're up to, soldier.
-		if (!empty(Config::$db_show_debug))
+		if (!empty(Config::$db_show_debug)) {
 			Utils::$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . basename(Theme::$current->settings['theme_url'] ?? 'unknown') . ')';
+		}
 
 		// Remember what we have loaded, and in which language.
 		self::$already_loaded[$template_name] = $lang;
@@ -310,26 +306,25 @@ public static function load(string $template_name, string $lang = '', bool $fata
 	 *
 	 * @param array|string $custom_dirs Optional custom directories to include.
 	 */
-	public static function addDirs($custom_dirs = array())
+	public static function addDirs($custom_dirs = [])
 	{
 		// We only accept real directories.
-		if (!empty($custom_dirs))
+		if (!empty($custom_dirs)) {
 			$custom_dirs = array_filter(array_map('realpath', (array) $custom_dirs), 'is_dir');
+		}
 
-		if (!empty($custom_dirs))
-		{
+		if (!empty($custom_dirs)) {
 			self::$dirs = array_merge($custom_dirs, self::$dirs);
-		}
-		else
-		{
+		} else {
 			// Make sure we have Theme::$current->settings - if not we're in trouble and need to find it!
-			if (empty(Theme::$current->settings['default_theme_dir']))
+			if (empty(Theme::$current->settings['default_theme_dir'])) {
 				Theme::loadEssential();
+			}
 
-			foreach (array('theme_dir', 'base_theme_dir', 'default_theme_dir') as $var)
-			{
-				if (isset(Theme::$current->settings[$var]))
+			foreach (['theme_dir', 'base_theme_dir', 'default_theme_dir'] as $var) {
+				if (isset(Theme::$current->settings[$var])) {
 					self::$dirs[] = Theme::$current->settings[$var] . '/languages';
+				}
 			}
 
 			// Don't count this as loading the theme.
@@ -349,65 +344,70 @@ public static function addDirs($custom_dirs = array())
 	public static function get($use_cache = true)
 	{
 		// Either we don't use the cache, or its expired.
-		if (!$use_cache || (Utils::$context['languages'] = CacheApi::get('known_languages', !empty(CacheApi::$enable) && CacheApi::$enable < 1 ? 86400 : 3600)) == null)
-		{
+		if (!$use_cache || (Utils::$context['languages'] = CacheApi::get('known_languages', !empty(CacheApi::$enable) && CacheApi::$enable < 1 ? 86400 : 3600)) == null) {
 			// If we don't have our theme information yet, let's get it.
-			if (empty(Theme::$current->settings['default_theme_dir']))
+			if (empty(Theme::$current->settings['default_theme_dir'])) {
 				Theme::load(0, false);
+			}
 
 			// Default language directories to try.
-			$language_directories = array(
+			$language_directories = [
 				Theme::$current->settings['default_theme_dir'] . '/languages',
-			);
-			if (!empty(Theme::$current->settings['actual_theme_dir']) && Theme::$current->settings['actual_theme_dir'] != Theme::$current->settings['default_theme_dir'])
+			];
+
+			if (!empty(Theme::$current->settings['actual_theme_dir']) && Theme::$current->settings['actual_theme_dir'] != Theme::$current->settings['default_theme_dir']) {
 				$language_directories[] = Theme::$current->settings['actual_theme_dir'] . '/languages';
+			}
 
 			// We possibly have a base theme directory.
-			if (!empty(Theme::$current->settings['base_theme_dir']))
+			if (!empty(Theme::$current->settings['base_theme_dir'])) {
 				$language_directories[] = Theme::$current->settings['base_theme_dir'] . '/languages';
+			}
 
 			// Remove any duplicates.
 			$language_directories = array_unique($language_directories);
 
-			foreach ($language_directories as $language_dir)
-			{
+			foreach ($language_directories as $language_dir) {
 				// Can't look in here... doesn't exist!
-				if (!file_exists($language_dir))
+				if (!file_exists($language_dir)) {
 					continue;
+				}
 
 				$dir = dir($language_dir);
-				while ($entry = $dir->read())
-				{
+
+				while ($entry = $dir->read()) {
 					// Look for the index language file... For good measure skip any "index.language-utf8.php" files
-					if (!preg_match('~^index\.((?:.(?!-utf8))+)\.php$~', $entry, $matches))
+					if (!preg_match('~^index\.((?:.(?!-utf8))+)\.php$~', $entry, $matches)) {
 						continue;
+					}
 
-					$langName = Utils::ucwords(strtr($matches[1], array('_' => ' ')));
+					$langName = Utils::ucwords(strtr($matches[1], ['_' => ' ']));
 
-					if (($spos = strpos($langName, ' ')) !== false)
+					if (($spos = strpos($langName, ' ')) !== false) {
 						$langName = substr($langName, 0, ++$spos) . '(' . substr($langName, $spos) . ')';
+					}
 
 					// Get the line we need.
 					$fp = @fopen($language_dir . '/' . $entry, 'r');
 
 					// Yay!
-					if ($fp)
-					{
-						while (($line = fgets($fp)) !== false)
-						{
-							if (strpos($line, '$txt[\'native_name\']') === false)
+					if ($fp) {
+						while (($line = fgets($fp)) !== false) {
+							if (strpos($line, '$txt[\'native_name\']') === false) {
 								continue;
+							}
 
 							preg_match('~\$txt\[\'native_name\'\]\s*=\s*\'([^\']+)\';~', $line, $matchNative);
 
 							// Set the language's name.
-							if (!empty($matchNative) && !empty($matchNative[1]))
-							{
+							if (!empty($matchNative) && !empty($matchNative[1])) {
 								// Don't mislabel the language if the translator missed this one.
-								if ($langName !== 'English' && $matchNative[1] === 'English')
+								if ($langName !== 'English' && $matchNative[1] === 'English') {
 									break;
+								}
 
 								$langName = Utils::htmlspecialcharsDecode($matchNative[1]);
+
 								break;
 							}
 						}
@@ -416,24 +416,26 @@ public static function get($use_cache = true)
 					}
 
 					// Build this language entry.
-					Utils::$context['languages'][$matches[1]] = array(
+					Utils::$context['languages'][$matches[1]] = [
 						'name' => $langName,
 						'selected' => false,
 						'filename' => $matches[1],
 						'location' => $language_dir . '/index.' . $matches[1] . '.php',
-					);
+					];
 				}
 				$dir->close();
 			}
 
 			// Avoid confusion when we have more than one English variant installed.
 			// Honestly, our default English version should always have been called "English (US)"
-			if (substr_count(implode(' ', array_keys(Utils::$context['languages'])), 'english') > 1 && Utils::$context['languages']['english']['name'] === 'English')
+			if (substr_count(implode(' ', array_keys(Utils::$context['languages'])), 'english') > 1 && Utils::$context['languages']['english']['name'] === 'English') {
 				Utils::$context['languages']['english']['name'] = 'English (US)';
+			}
 
 			// Let's cash in on this deal.
-			if (!empty(CacheApi::$enable))
+			if (!empty(CacheApi::$enable)) {
 				CacheApi::put('known_languages', Utils::$context['languages'], !empty(CacheApi::$enable) && CacheApi::$enable < 1 ? 86400 : 3600);
+			}
 		}
 
 		return Utils::$context['languages'];
@@ -455,25 +457,23 @@ public static function censorText(&$text, $force = false)
 	{
 		static $censor_vulgar = null, $censor_proper;
 
-		if ((!empty(Theme::$current->options['show_no_censored']) && !empty(Config::$modSettings['allow_no_censored']) && !$force) || empty(Config::$modSettings['censor_vulgar']) || !is_string($text) || trim($text) === '')
+		if ((!empty(Theme::$current->options['show_no_censored']) && !empty(Config::$modSettings['allow_no_censored']) && !$force) || empty(Config::$modSettings['censor_vulgar']) || !is_string($text) || trim($text) === '') {
 			return $text;
+		}
 
-		IntegrationHook::call('integrate_word_censor', array(&$text));
+		IntegrationHook::call('integrate_word_censor', [&$text]);
 
 		// If they haven't yet been loaded, load them.
-		if ($censor_vulgar == null)
-		{
+		if ($censor_vulgar == null) {
 			$censor_vulgar = explode("\n", Config::$modSettings['censor_vulgar']);
 			$censor_proper = explode("\n", Config::$modSettings['censor_proper']);
 
 			// Quote them for use in regular expressions.
-			if (!empty(Config::$modSettings['censorWholeWord']))
-			{
+			if (!empty(Config::$modSettings['censorWholeWord'])) {
 				$charset = empty(Config::$modSettings['global_character_set']) ? self::$txt['lang_character_set'] : Config::$modSettings['global_character_set'];
 
-				for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++)
-				{
-					$censor_vulgar[$i] = str_replace(array('\\\\\\*', '\\*', '&', '\''), array('[*]', '[^\s]*?', '&amp;', '&#039;'), preg_quote($censor_vulgar[$i], '/'));
+				for ($i = 0, $n = count($censor_vulgar); $i < $n; $i++) {
+					$censor_vulgar[$i] = str_replace(['\\\\\\*', '\\*', '&', '\''], ['[*]', '[^\\s]*?', '&amp;', '&#039;'], preg_quote($censor_vulgar[$i], '/'));
 
 					// Use the faster \b if we can, or something more complex if we can't
 					$boundary_before = preg_match('/^\w/', $censor_vulgar[$i]) ? '\b' : ($charset === 'UTF-8' ? '(?<![\p{L}\p{M}\p{N}_])' : '(?<!\w)');
@@ -485,13 +485,12 @@ public static function censorText(&$text, $force = false)
 		}
 
 		// Censoring isn't so very complicated :P.
-		if (empty(Config::$modSettings['censorWholeWord']))
-		{
+		if (empty(Config::$modSettings['censorWholeWord'])) {
 			$func = !empty(Config::$modSettings['censorIgnoreCase']) ? 'str_ireplace' : 'str_replace';
 			$text = $func($censor_vulgar, $censor_proper, $text);
-		}
-		else
+		} else {
 			$text = preg_replace($censor_vulgar, $censor_proper, $text);
+		}
 
 		return $text;
 	}
@@ -507,19 +506,18 @@ public static function censorText(&$text, $force = false)
 	 */
 	public static function tokenTxtReplace(string $string = ''): string
 	{
-		if (empty($string))
+		if (empty($string)) {
 			return '';
+		}
 
-		$translatable_tokens = preg_match_all('/{(.*?)}/' , $string, $matches);
-		$toFind = array();
-		$replaceWith = array();
+		$translatable_tokens = preg_match_all('/{(.*?)}/', $string, $matches);
+		$toFind = [];
+		$replaceWith = [];
 
-		if (!empty($matches[1]))
-		{
-			foreach ($matches[1] as $token)
-			{
+		if (!empty($matches[1])) {
+			foreach ($matches[1] as $token) {
 				$toFind[] = '{' . $token . '}';
-				$replaceWith[] = isset(self::$txt[$token]) ? self::$txt[$token] : $token;
+				$replaceWith[] = self::$txt[$token] ?? $token;
 			}
 		}
 
@@ -539,41 +537,47 @@ public static function tokenTxtReplace(string $string = ''): string
 	public static function sentenceList(array $list): string
 	{
 		// Make sure the bare necessities are defined.
-		if (empty(Lang::$txt['sentence_list_format']['n']))
+		if (empty(Lang::$txt['sentence_list_format']['n'])) {
 			Lang::$txt['sentence_list_format']['n'] = '{series}';
+		}
 
-		if (!isset(Lang::$txt['sentence_list_separator']))
+		if (!isset(Lang::$txt['sentence_list_separator'])) {
 			Lang::$txt['sentence_list_separator'] = ', ';
+		}
 
-		if (!isset(Lang::$txt['sentence_list_separator_alt']))
+		if (!isset(Lang::$txt['sentence_list_separator_alt'])) {
 			Lang::$txt['sentence_list_separator_alt'] = '; ';
+		}
 
 		// Which format should we use?
 		$format = Lang::$txt['sentence_list_format'][count($list)] ?? Lang::$txt['sentence_list_format']['n'];
 
 		// Do we want the normal separator or the alternate?
 		$separator = Lang::$txt['sentence_list_separator'];
-		foreach ($list as $item)
-		{
-			if (strpos($item, $separator) !== false)
-			{
+
+		foreach ($list as $item) {
+			if (strpos($item, $separator) !== false) {
 				$separator = Lang::$txt['sentence_list_separator_alt'];
 				$format = strtr($format, trim(Lang::$txt['sentence_list_separator']), trim($separator));
 				break;
 			}
 		}
 
-		$replacements = array();
+		$replacements = [];
 
 		// Special handling for the last items on the list.
 		$i = 0;
-		while (strpos($format, '{' . --$i . '}') !== false)
+
+		while (strpos($format, '{' . --$i . '}') !== false) {
 			$replacements['{' . $i . '}'] = array_pop($list);
+		}
 
 		// Special handling for the first items on the list.
 		$i = 0;
-		while (strpos($format, '{' . ++$i . '}') !== false)
+
+		while (strpos($format, '{' . ++$i . '}') !== false) {
 			$replacements['{' . $i . '}'] = array_shift($list);
+		}
 
 		// Whatever is left.
 		$replacements['{series}'] = implode($separator, $list);
@@ -591,14 +595,12 @@ public static function sentenceList(array $list): string
 	 *    places. Otherwise it's automatically determined.
 	 * @return string A formatted number
 	 */
-	public static function numberFormat(int|float $number, int $decimals = null): string
+	public static function numberFormat(int|float $number, ?int $decimals = null): string
 	{
 		// Cache these values...
-		if (!isset(self::$decimal_separator))
-		{
+		if (!isset(self::$decimal_separator)) {
 			// Not set for whatever reason?
-			if (empty(Lang::$txt['number_format']) || preg_match('~^1(\D*)234(\D*)(0*)$~', Lang::$txt['number_format'], $matches) != 1)
-			{
+			if (empty(Lang::$txt['number_format']) || preg_match('~^1(\D*)234(\D*)(0*)$~', Lang::$txt['number_format'], $matches) != 1) {
 				return (string) $number;
 			}
 
@@ -613,14 +615,14 @@ public static function numberFormat(int|float $number, int $decimals = null): st
 			$number,
 			(float) $number === $number ? ($decimals ?? self::$decimals) : 0,
 			self::$decimal_separator,
-			self::$thousands_separator
+			self::$thousands_separator,
 		);
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Lang::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Lang::exportStatic')) {
 	Lang::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Logging.php b/Sources/Logging.php
index 09f321ba4e..24540ba514 100644
--- a/Sources/Logging.php
+++ b/Sources/Logging.php
@@ -27,6 +27,24 @@ class Logging
 {
 	use BackwardCompatibility;
 
+	/**
+	 * @var array
+	 *
+	 * BackwardCompatibility settings for this class.
+	 */
+	private static $backcompat = [
+		'func_names' => [
+			'writeLog' => 'writeLog',
+			'logAction' => 'logAction',
+			'logActions' => 'logActions',
+			'updateStats' => 'updateStats',
+			'trackStats' => 'trackStats',
+			'trackStatsUsersOnline' => 'trackStatsUsersOnline',
+			'getMembersOnlineStats' => 'getMembersOnlineStats',
+			'displayDebug' => 'displayDebug',
+		],
+	];
+
 	/***********************
 	 * Public static methods
 	 ***********************/
@@ -36,8 +54,9 @@ class Logging
 	 */
 	public static function writeLog(bool $force = false): void
 	{
-		if (!isset(User::$me))
+		if (!isset(User::$me)) {
 			return;
+		}
 
 		User::$me->logOnline($force);
 	}
@@ -56,13 +75,13 @@ public static function writeLog(bool $force = false): void
 	 *
 	 * @return int The ID of the row containing the logged data
 	 */
-	public static function logAction($action, array $extra = array(), $log_type = 'moderate'): int
+	public static function logAction($action, array $extra = [], $log_type = 'moderate'): int
 	{
-		return logActions(array(array(
+		return logActions([[
 			'action' => $action,
 			'log_type' => $log_type,
 			'extra' => $extra,
-		)));
+		]]);
 	}
 
 	/**
@@ -82,136 +101,128 @@ public static function logAction($action, array $extra = array(), $log_type = 'm
 	 */
 	public static function logActions(array $logs): int
 	{
-		$inserts = array();
-		$log_types = array(
+		$inserts = [];
+		$log_types = [
 			'moderate' => 1,
 			'user' => 2,
 			'admin' => 3,
-		);
-		$always_log = array('agreement_accepted', 'policy_accepted', 'agreement_updated', 'policy_updated');
+		];
+		$always_log = ['agreement_accepted', 'policy_accepted', 'agreement_updated', 'policy_updated'];
 
-		IntegrationHook::call('integrate_log_types', array(&$log_types, &$always_log));
+		IntegrationHook::call('integrate_log_types', [&$log_types, &$always_log]);
 
-		foreach ($logs as $log)
-		{
-			if (!isset($log_types[$log['log_type']]) && (empty(Config::$modSettings[$log['log_type'] . 'log_enabled']) || !in_array($log['action'], $always_log)))
+		foreach ($logs as $log) {
+			if (!isset($log_types[$log['log_type']]) && (empty(Config::$modSettings[$log['log_type'] . 'log_enabled']) || !in_array($log['action'], $always_log))) {
 				continue;
+			}
 
-			if (!is_array($log['extra']))
-			{
+			if (!is_array($log['extra'])) {
 				Lang::load('Errors');
 				trigger_error(sprintf(Lang::$txt['logActions_not_array'], $log['action']), E_USER_NOTICE);
 			}
 
 			// Pull out the parts we want to store separately, but also make sure that the data is proper
-			if (isset($log['extra']['topic']))
-			{
-				if (!is_numeric($log['extra']['topic']))
-				{
+			if (isset($log['extra']['topic'])) {
+				if (!is_numeric($log['extra']['topic'])) {
 					Lang::load('Errors');
 					trigger_error(Lang::$txt['logActions_topic_not_numeric'], E_USER_NOTICE);
 				}
 				$topic_id = empty($log['extra']['topic']) ? 0 : (int) $log['extra']['topic'];
 				unset($log['extra']['topic']);
-			}
-			else
+			} else {
 				$topic_id = 0;
+			}
 
-			if (isset($log['extra']['message']))
-			{
-				if (!is_numeric($log['extra']['message']))
-				{
+			if (isset($log['extra']['message'])) {
+				if (!is_numeric($log['extra']['message'])) {
 					Lang::load('Errors');
 					trigger_error(Lang::$txt['logActions_message_not_numeric'], E_USER_NOTICE);
 				}
 				$msg_id = empty($log['extra']['message']) ? 0 : (int) $log['extra']['message'];
 				unset($log['extra']['message']);
-			}
-			else
+			} else {
 				$msg_id = 0;
+			}
 
 			// @todo cache this?
 			// Is there an associated report on this?
-			if (in_array($log['action'], array('move', 'remove', 'split', 'merge')))
-			{
-				$request = Db::$db->query('', '
-					SELECT id_report
+			if (in_array($log['action'], ['move', 'remove', 'split', 'merge'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_report
 					FROM {db_prefix}log_reported
 					WHERE {raw:column_name} = {int:reported}
 					LIMIT 1',
-					array(
+					[
 						'column_name' => !empty($msg_id) ? 'id_msg' : 'id_topic',
 						'reported' => !empty($msg_id) ? $msg_id : $topic_id,
-					)
+					],
 				);
 
 				// Alright, if we get any result back, update open reports.
-				if (Db::$db->num_rows($request) > 0)
-				{
-					Config::updateModSettings(array('last_mod_report_action' => time()));
+				if (Db::$db->num_rows($request) > 0) {
+					Config::updateModSettings(['last_mod_report_action' => time()]);
 					ReportedContent::recountOpenReports('posts');
 				}
 				Db::$db->free_result($request);
 			}
 
-			if (isset($log['extra']['member']) && !is_numeric($log['extra']['member']))
-			{
+			if (isset($log['extra']['member']) && !is_numeric($log['extra']['member'])) {
 				Lang::load('Errors');
 				trigger_error(Lang::$txt['logActions_member_not_numeric'], E_USER_NOTICE);
 			}
 
-			if (isset($log['extra']['board']))
-			{
-				if (!is_numeric($log['extra']['board']))
-				{
+			if (isset($log['extra']['board'])) {
+				if (!is_numeric($log['extra']['board'])) {
 					Lang::load('Errors');
 					trigger_error(Lang::$txt['logActions_board_not_numeric'], E_USER_NOTICE);
 				}
 				$board_id = empty($log['extra']['board']) ? 0 : (int) $log['extra']['board'];
 				unset($log['extra']['board']);
-			}
-			else
+			} else {
 				$board_id = 0;
+			}
 
-			if (isset($log['extra']['board_to']))
-			{
-				if (!is_numeric($log['extra']['board_to']))
-				{
+			if (isset($log['extra']['board_to'])) {
+				if (!is_numeric($log['extra']['board_to'])) {
 					Lang::load('Errors');
 					trigger_error(Lang::$txt['logActions_board_to_not_numeric'], E_USER_NOTICE);
 				}
-				if (empty($board_id))
-				{
+
+				if (empty($board_id)) {
 					$board_id = empty($log['extra']['board_to']) ? 0 : (int) $log['extra']['board_to'];
 					unset($log['extra']['board_to']);
 				}
 			}
 
-			if (isset($log['extra']['member_affected']))
+			if (isset($log['extra']['member_affected'])) {
 				$memID = $log['extra']['member_affected'];
-			else
+			} else {
 				$memID = User::$me->id ?? $log['extra']['member'] ?? 0;
+			}
 
-			if (isset(User::$me->ip))
+			if (isset(User::$me->ip)) {
 				$memIP = User::$me->ip;
-			else
+			} else {
 				$memIP = 'null';
+			}
 
-			$inserts[] = array(
+			$inserts[] = [
 				time(), $log_types[$log['log_type']], $memID, $memIP, $log['action'],
 				$board_id, $topic_id, $msg_id, Utils::jsonEncode($log['extra']),
-			);
+			];
 		}
 
-		$id_action = Db::$db->insert('',
+		$id_action = Db::$db->insert(
+			'',
 			'{db_prefix}log_actions',
-			array(
+			[
 				'log_time' => 'int', 'id_log' => 'int', 'id_member' => 'int', 'ip' => 'inet', 'action' => 'string',
 				'id_board' => 'int', 'id_topic' => 'int', 'id_msg' => 'int', 'extra' => 'string-65534',
-			),
+			],
 			$inserts,
-			array('id_action'),
-			1
+			['id_action'],
+			1,
 		);
 
 		return $id_action;
@@ -244,159 +255,160 @@ public static function logActions(array $logs): int
 	 */
 	public static function updateStats(string $type, mixed $parameter1 = null, mixed $parameter2 = null): void
 	{
-		switch ($type)
-		{
+		switch ($type) {
 			case 'member':
-				$changes = array(
+				$changes = [
 					'memberlist_updated' => time(),
-				);
+				];
 
 				// #1 latest member ID, #2 the real name for a new registration.
-				if (is_numeric($parameter1))
-				{
+				if (is_numeric($parameter1)) {
 					$changes['latestMember'] = $parameter1;
 					$changes['latestRealName'] = $parameter2;
 
-					Config::updateModSettings(array('totalMembers' => true), true);
+					Config::updateModSettings(['totalMembers' => true], true);
 				}
 				// We need to calculate the totals.
-				else
-				{
+				else {
 					// Update the latest activated member (highest id_member) and count.
-					$result = Db::$db->query('', '
-						SELECT COUNT(*), MAX(id_member)
+					$result = Db::$db->query(
+						'',
+						'SELECT COUNT(*), MAX(id_member)
 						FROM {db_prefix}members
 						WHERE is_activated = {int:is_activated}',
-						array(
+						[
 							'is_activated' => 1,
-						)
+						],
 					);
 					list($changes['totalMembers'], $changes['latestMember']) = Db::$db->fetch_row($result);
 					Db::$db->free_result($result);
 
 					// Get the latest activated member's display name.
-					$result = Db::$db->query('', '
-						SELECT real_name
+					$result = Db::$db->query(
+						'',
+						'SELECT real_name
 						FROM {db_prefix}members
 						WHERE id_member = {int:id_member}
 						LIMIT 1',
-						array(
+						[
 							'id_member' => (int) $changes['latestMember'],
-						)
+						],
 					);
 					list($changes['latestRealName']) = Db::$db->fetch_row($result);
 					Db::$db->free_result($result);
 
 					// Update the amount of members awaiting approval
-					$result = Db::$db->query('', '
-						SELECT COUNT(*)
+					$result = Db::$db->query(
+						'',
+						'SELECT COUNT(*)
 						FROM {db_prefix}members
 						WHERE is_activated IN ({array_int:activation_status})',
-						array(
-							'activation_status' => array(3, 4, 5),
-						)
+						[
+							'activation_status' => [3, 4, 5],
+						],
 					);
 
 					list($changes['unapprovedMembers']) = Db::$db->fetch_row($result);
 					Db::$db->free_result($result);
 				}
 				Config::updateModSettings($changes);
+
 				break;
 
 			case 'message':
-				if ($parameter1 === true && $parameter2 !== null)
-				{
-					Config::updateModSettings(array('totalMessages' => true, 'maxMsgID' => $parameter2), true);
-				}
-				else
-				{
+				if ($parameter1 === true && $parameter2 !== null) {
+					Config::updateModSettings(['totalMessages' => true, 'maxMsgID' => $parameter2], true);
+				} else {
 					// SUM and MAX on a smaller table is better for InnoDB tables.
-					$result = Db::$db->query('', '
-						SELECT SUM(num_posts + unapproved_posts) AS total_messages, MAX(id_last_msg) AS max_msg_id
+					$result = Db::$db->query(
+						'',
+						'SELECT SUM(num_posts + unapproved_posts) AS total_messages, MAX(id_last_msg) AS max_msg_id
 						FROM {db_prefix}boards
 						WHERE redirect = {string:blank_redirect}' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 							AND id_board != {int:recycle_board}' : ''),
-						array(
-							'recycle_board' => isset(Config::$modSettings['recycle_board']) ? Config::$modSettings['recycle_board'] : 0,
+						[
+							'recycle_board' => Config::$modSettings['recycle_board'] ?? 0,
 							'blank_redirect' => '',
-						)
+						],
 					);
 					$row = Db::$db->fetch_assoc($result);
 					Db::$db->free_result($result);
 
-					Config::updateModSettings(array(
+					Config::updateModSettings([
 						'totalMessages' => $row['total_messages'] === null ? 0 : $row['total_messages'],
-						'maxMsgID' => $row['max_msg_id'] === null ? 0 : $row['max_msg_id']
-					));
+						'maxMsgID' => $row['max_msg_id'] === null ? 0 : $row['max_msg_id'],
+					]);
 				}
+
 				break;
 
 			case 'subject':
 				// Remove the previous subject (if any).
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_search_subjects
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_search_subjects
 					WHERE id_topic = {int:id_topic}',
-					array(
+					[
 						'id_topic' => (int) $parameter1,
-					)
+					],
 				);
 
 				// Insert the new subject.
-				if ($parameter2 !== null)
-				{
+				if ($parameter2 !== null) {
 					$parameter1 = (int) $parameter1;
 					$parameter2 = Utils::text2words($parameter2);
 
-					$inserts = array();
+					$inserts = [];
 
-					foreach ($parameter2 as $word)
-						$inserts[] = array($word, $parameter1);
+					foreach ($parameter2 as $word) {
+						$inserts[] = [$word, $parameter1];
+					}
 
-					if (!empty($inserts))
-					{
-						Db::$db->insert('ignore',
+					if (!empty($inserts)) {
+						Db::$db->insert(
+							'ignore',
 							'{db_prefix}log_search_subjects',
-							array('word' => 'string', 'id_topic' => 'int'),
+							['word' => 'string', 'id_topic' => 'int'],
 							$inserts,
-							array('word', 'id_topic')
+							['word', 'id_topic'],
 						);
 					}
 				}
+
 				break;
 
 			case 'topic':
-				if ($parameter1 === true)
-				{
-					Config::updateModSettings(array('totalTopics' => true), true);
-				}
-				else
-				{
+				if ($parameter1 === true) {
+					Config::updateModSettings(['totalTopics' => true], true);
+				} else {
 					// Get the number of topics - a SUM is better for InnoDB tables.
 					// We also ignore the recycle bin here because there will probably be a bunch of one-post topics there.
-					$result = Db::$db->query('', '
-						SELECT SUM(num_topics + unapproved_topics) AS total_topics
+					$result = Db::$db->query(
+						'',
+						'SELECT SUM(num_topics + unapproved_topics) AS total_topics
 						FROM {db_prefix}boards' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 						WHERE id_board != {int:recycle_board}' : ''),
-						array(
+						[
 							'recycle_board' => !empty(Config::$modSettings['recycle_board']) ? Config::$modSettings['recycle_board'] : 0,
-						)
+						],
 					);
 					$row = Db::$db->fetch_assoc($result);
 					Db::$db->free_result($result);
 
-					Config::updateModSettings(array('totalTopics' => $row['total_topics'] === null ? 0 : $row['total_topics']));
+					Config::updateModSettings(['totalTopics' => $row['total_topics'] === null ? 0 : $row['total_topics']]);
 				}
+
 				break;
 
 			case 'postgroups':
 				// Parameter two is the updated columns: we should check to see if we base groups off any of these.
-				if ($parameter2 !== null && !in_array('posts', $parameter2))
+				if ($parameter2 !== null && !in_array('posts', $parameter2)) {
 					return;
+				}
 
 				$postgroups = CacheApi::get('updateStats:postgroups', 360);
 
-				if ($postgroups == null || $parameter1 == null)
-				{
+				if ($postgroups == null || $parameter1 == null) {
 					// Fetch the postgroups!
 					$postgroups = Group::getPostGroups();
 
@@ -404,22 +416,23 @@ public static function updateStats(string $type, mixed $parameter1 = null, mixed
 				}
 
 				// Oh great, they've screwed their post groups.
-				if (empty($postgroups))
+				if (empty($postgroups)) {
 					return;
+				}
 
 				// Set all membergroups from most posts to least posts.
 				$conditions = '';
 				$last_min = 0;
 
-				foreach ($postgroups as $id => $min_posts)
-				{
-					foreach (User::$loaded as $member)
-					{
-						if ($member->posts < $min_posts)
+				foreach ($postgroups as $id => $min_posts) {
+					foreach (User::$loaded as $member) {
+						if ($member->posts < $min_posts) {
 							continue;
+						}
 
-						if (empty($last_min) || $member->posts <= $last_min)
+						if (empty($last_min) || $member->posts <= $last_min) {
 							$member->post_group_id = $id;
+						}
 					}
 
 					$conditions .= '
@@ -429,16 +442,18 @@ public static function updateStats(string $type, mixed $parameter1 = null, mixed
 				}
 
 				// A big fat CASE WHEN... END is faster than a zillion UPDATE's ;).
-				Db::$db->query('', '
-					UPDATE {db_prefix}members
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}members
 					SET id_post_group = CASE ' . $conditions . '
 					ELSE 0
 					END' . ($parameter1 != null ? '
 					WHERE ' . (is_array($parameter1) ? 'id_member IN ({array_int:members})' : 'id_member = {int:members}') : ''),
-					array(
+					[
 						'members' => $parameter1,
-					)
+					],
 				);
+
 				break;
 
 			default:
@@ -458,65 +473,64 @@ public static function updateStats(string $type, mixed $parameter1 = null, mixed
 	 * @param array $stats An array of data
 	 * @return bool Whether or not the info was updated successfully
 	 */
-	public static function trackStats($stats = array()): bool
+	public static function trackStats($stats = []): bool
 	{
-		static $cache_stats = array();
+		static $cache_stats = [];
 
-		if (empty(Config::$modSettings['trackStats']))
+		if (empty(Config::$modSettings['trackStats'])) {
 			return false;
+		}
 
-		if (!empty($stats))
-		{
+		if (!empty($stats)) {
 			$cache_stats = array_merge($cache_stats, $stats);
+
 			return true;
 		}
 
-		if (empty($cache_stats))
+		if (empty($cache_stats)) {
 			return false;
+		}
 
 		$setStringUpdate = '';
-		$insert_keys = array();
+		$insert_keys = [];
 		$date = Time::strftime('%Y-%m-%d', time());
-		$update_parameters = array(
+		$update_parameters = [
 			'current_date' => $date,
-		);
+		];
 
-		foreach ($cache_stats as $field => $change)
-		{
+		foreach ($cache_stats as $field => $change) {
 			$setStringUpdate .= '
 				' . $field . ' = ' . ($change === '+' ? $field . ' + 1' : '{int:' . $field . '}') . ',';
 
-			if ($change === '+')
-			{
+			if ($change === '+') {
 				$cache_stats[$field] = 1;
-			}
-			else
-			{
+			} else {
 				$update_parameters[$field] = $change;
 			}
 
 			$insert_keys[$field] = 'int';
 		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_activity
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_activity
 			SET' . substr($setStringUpdate, 0, -1) . '
 			WHERE date = {date:current_date}',
-			$update_parameters
+			$update_parameters,
 		);
 
-		if (Db::$db->affected_rows() == 0)
-		{
-			Db::$db->insert('ignore',
+		if (Db::$db->affected_rows() == 0) {
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_activity',
-				array_merge($insert_keys, array('date' => 'date')),
-				array_merge($cache_stats, array($date)),
-				array('date')
+				array_merge($insert_keys, ['date' => 'date']),
+				array_merge($cache_stats, [$date]),
+				['date'],
 			);
 		}
 
 		// Don't do this again.
-		$cache_stats = array();
+		$cache_stats = [];
 
 		return true;
 	}
@@ -528,49 +542,48 @@ public static function trackStats($stats = array()): bool
 	 */
 	public static function trackStatsUsersOnline($total_users_online)
 	{
-		$settingsToUpdate = array();
+		$settingsToUpdate = [];
 
 		// More members on now than ever were?  Update it!
-		if (!isset(Config::$modSettings['mostOnline']) || $total_users_online >= Config::$modSettings['mostOnline'])
-		{
-			$settingsToUpdate = array(
+		if (!isset(Config::$modSettings['mostOnline']) || $total_users_online >= Config::$modSettings['mostOnline']) {
+			$settingsToUpdate = [
 				'mostOnline' => $total_users_online,
 				'mostDate' => time(),
-			);
+			];
 		}
 
 		$date = (new \DateTime('now', new \DateTimeZone(Config::$modSettings['default_timezone'])))->format('Y-m-d');
 
 		// No entry exists for today yet?
-		if (!isset(Config::$modSettings['mostOnlineUpdated']) || Config::$modSettings['mostOnlineUpdated'] != $date)
-		{
-			$request = Db::$db->query('', '
-				SELECT most_on
+		if (!isset(Config::$modSettings['mostOnlineUpdated']) || Config::$modSettings['mostOnlineUpdated'] != $date) {
+			$request = Db::$db->query(
+				'',
+				'SELECT most_on
 				FROM {db_prefix}log_activity
 				WHERE date = {date:date}
 				LIMIT 1',
-				array(
+				[
 					'date' => $date,
-				)
+				],
 			);
 
 			// The log_activity hasn't got an entry for today?
-			if (Db::$db->num_rows($request) === 0)
-			{
-				Db::$db->insert('ignore',
+			if (Db::$db->num_rows($request) === 0) {
+				Db::$db->insert(
+					'ignore',
 					'{db_prefix}log_activity',
-					array('date' => 'date', 'most_on' => 'int'),
-					array($date, $total_users_online),
-					array('date')
+					['date' => 'date', 'most_on' => 'int'],
+					[$date, $total_users_online],
+					['date'],
 				);
 			}
 			// There's an entry in log_activity on today...
-			else
-			{
+			else {
 				list(Config::$modSettings['mostOnlineToday']) = Db::$db->fetch_row($request);
 
-				if ($total_users_online > Config::$modSettings['mostOnlineToday'])
-					self::trackStats(array('most_on' => $total_users_online));
+				if ($total_users_online > Config::$modSettings['mostOnlineToday']) {
+					self::trackStats(['most_on' => $total_users_online]);
+				}
 
 				$total_users_online = max($total_users_online, Config::$modSettings['mostOnlineToday']);
 			}
@@ -580,14 +593,14 @@ public static function trackStatsUsersOnline($total_users_online)
 			$settingsToUpdate['mostOnlineToday'] = $total_users_online;
 		}
 		// Highest number of users online today?
-		elseif ($total_users_online > Config::$modSettings['mostOnlineToday'])
-		{
-			self::trackStats(array('most_on' => $total_users_online));
+		elseif ($total_users_online > Config::$modSettings['mostOnlineToday']) {
+			self::trackStats(['most_on' => $total_users_online]);
 			$settingsToUpdate['mostOnlineToday'] = $total_users_online;
 		}
 
-		if (!empty($settingsToUpdate))
+		if (!empty($settingsToUpdate)) {
 			Config::updateModSettings($settingsToUpdate);
+		}
 	}
 
 	/**
@@ -602,43 +615,42 @@ public static function trackStatsUsersOnline($total_users_online)
 	public static function getMembersOnlineStats($membersOnlineOptions)
 	{
 		// The list can be sorted in several ways.
-		$allowed_sort_options = array(
+		$allowed_sort_options = [
 			'', // No sorting.
 			'log_time',
 			'real_name',
 			'show_online',
 			'online_color',
 			'group_name',
-		);
+		];
+
 		// Default the sorting method to 'most recent online members first'.
-		if (!isset($membersOnlineOptions['sort']))
-		{
+		if (!isset($membersOnlineOptions['sort'])) {
 			$membersOnlineOptions['sort'] = 'log_time';
 			$membersOnlineOptions['reverse_sort'] = true;
 		}
 
 		// Not allowed sort method? Bang! Error!
-		elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options))
-		{
+		elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options)) {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['get_members_online_stats_invalid_sort'], E_USER_NOTICE);
 		}
 
 		// Initialize the array that'll be returned later on.
-		$membersOnlineStats = array(
-			'users_online' => array(),
-			'list_users_online' => array(),
-			'online_groups' => array(),
+		$membersOnlineStats = [
+			'users_online' => [],
+			'list_users_online' => [],
+			'online_groups' => [],
 			'num_guests' => 0,
 			'num_spiders' => 0,
 			'num_buddies' => 0,
 			'num_users_hidden' => 0,
 			'num_users_online' => 0,
-		);
+		];
 
 		// Get any spiders if enabled.
-		$spiders = array();
-		$spider_finds = array();
+		$spiders = [];
+		$spider_finds = [];
 
 		if (
 			!empty(Config::$modSettings['show_spider_online'])
@@ -647,30 +659,28 @@ public static function getMembersOnlineStats($membersOnlineOptions)
 				Config::$modSettings['show_spider_online'] < 3
 				|| User::$me->allowedTo('admin_forum')
 			)
-		)
-		{
+		) {
 			$spiders = Utils::jsonDecode(Config::$modSettings['spider_name_cache'], true);
 		}
 
 		// Load the users online right now.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				lo.id_member, lo.log_time, lo.id_spider, mem.real_name, mem.member_name, mem.show_online,
 				mg.online_color, mg.id_group, mg.group_name, mg.hidden, mg.group_type, mg.id_parent
 			FROM {db_prefix}log_online AS lo
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = lo.id_member)
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = CASE WHEN mem.id_group = {int:reg_mem_group} THEN mem.id_post_group ELSE mem.id_group END)',
-			array(
+			[
 				'reg_mem_group' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (empty($row['real_name']))
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (empty($row['real_name'])) {
 				// Do we think it's a spider?
-				if ($row['id_spider'] && isset($spiders[$row['id_spider']]))
-				{
+				if ($row['id_spider'] && isset($spiders[$row['id_spider']])) {
 					$spider_finds[$row['id_spider']] = isset($spider_finds[$row['id_spider']]) ? $spider_finds[$row['id_spider']] + 1 : 1;
 
 					$membersOnlineStats['num_spiders']++;
@@ -681,34 +691,31 @@ public static function getMembersOnlineStats($membersOnlineOptions)
 
 				continue;
 			}
-			elseif (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden']))
-			{
+
+			if (empty($row['show_online']) && empty($membersOnlineOptions['show_hidden'])) {
 				// Just increase the stats and don't add this hidden user to any list.
 				$membersOnlineStats['num_users_hidden']++;
+
 				continue;
 			}
 
 			// Some basic color coding...
-			if (!empty($row['online_color']))
-			{
+			if (!empty($row['online_color'])) {
 				$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			}
-			else
-			{
+			} else {
 				$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 			}
 
 			// Buddies get counted and highlighted.
 			$is_buddy = in_array($row['id_member'], User::$me->buddies);
 
-			if ($is_buddy)
-			{
+			if ($is_buddy) {
 				$membersOnlineStats['num_buddies']++;
 				$link = '<strong>' . $link . '</strong>';
 			}
 
 			// A lot of useful information for each member.
-			$membersOnlineStats['users_online'][$row[$membersOnlineOptions['sort']] . '_' . $row['member_name']] = array(
+			$membersOnlineStats['users_online'][$row[$membersOnlineOptions['sort']] . '_' . $row['member_name']] = [
 				'id' => $row['id_member'],
 				'username' => $row['member_name'],
 				'name' => $row['real_name'],
@@ -718,36 +725,33 @@ public static function getMembersOnlineStats($membersOnlineOptions)
 				'is_buddy' => $is_buddy,
 				'hidden' => empty($row['show_online']),
 				'is_last' => false,
-			);
+			];
 
 			// This is the compact version, simply implode it to show.
 			$membersOnlineStats['list_users_online'][$row[$membersOnlineOptions['sort']] . '_' . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
 
 			// Store all distinct (primary) membergroups that are shown.
-			if (!isset($membersOnlineStats['online_groups'][$row['id_group']]))
-			{
-				$membersOnlineStats['online_groups'][$row['id_group']] = array(
+			if (!isset($membersOnlineStats['online_groups'][$row['id_group']])) {
+				$membersOnlineStats['online_groups'][$row['id_group']] = [
 					'id' => $row['id_group'],
 					'name' => $row['group_name'],
 					'color' => $row['online_color'],
 					'hidden' => $row['hidden'],
 					'type' => $row['group_type'],
 					'parent' => $row['id_parent'],
-				);
+				];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// If there are spiders only and we're showing the detail, add them to the online list - at the bottom.
-		if (!empty($spider_finds) && Config::$modSettings['show_spider_online'] > 1)
-		{
+		if (!empty($spider_finds) && Config::$modSettings['show_spider_online'] > 1) {
 			$sort = $membersOnlineOptions['sort'] === 'log_time' && $membersOnlineOptions['reverse_sort'] ? 0 : 'zzz_';
 
-			foreach ($spider_finds as $id => $count)
-			{
+			foreach ($spider_finds as $id => $count) {
 				$link = $spiders[$id] . ($count > 1 ? ' (' . $count . ')' : '');
 
-				$membersOnlineStats['users_online'][$sort . '_' . $spiders[$id]] = array(
+				$membersOnlineStats['users_online'][$sort . '_' . $spiders[$id]] = [
 					'id' => 0,
 					'username' => $spiders[$id],
 					'name' => $link,
@@ -757,15 +761,14 @@ public static function getMembersOnlineStats($membersOnlineOptions)
 					'is_buddy' => false,
 					'hidden' => false,
 					'is_last' => false,
-				);
+				];
 
 				$membersOnlineStats['list_users_online'][$sort . '_' . $spiders[$id]] = $link;
 			}
 		}
 
 		// Time to sort the list a bit.
-		if (!empty($membersOnlineStats['users_online']))
-		{
+		if (!empty($membersOnlineStats['users_online'])) {
 			// Determine the sort direction.
 			$sortFunction = empty($membersOnlineOptions['reverse_sort']) ? 'ksort' : 'krsort';
 
@@ -784,7 +787,7 @@ public static function getMembersOnlineStats($membersOnlineOptions)
 		// Hidden and non-hidden members make up all online members.
 		$membersOnlineStats['num_users_online'] = count($membersOnlineStats['users_online']) + $membersOnlineStats['num_users_hidden'] - (isset(Config::$modSettings['show_spider_online']) && Config::$modSettings['show_spider_online'] > 1 ? count($spider_finds) : 0);
 
-		IntegrationHook::call('integrate_online_stats', array(&$membersOnlineStats));
+		IntegrationHook::call('integrate_online_stats', [&$membersOnlineStats]);
 
 		return $membersOnlineStats;
 	}
@@ -795,39 +798,40 @@ public static function getMembersOnlineStats($membersOnlineOptions)
 	public static function displayDebug(): void
 	{
 		// Add to Settings.php if you want to show the debugging information.
-		if (!isset(Config::$db_show_debug) || Config::$db_show_debug !== true || (isset($_GET['action']) && $_GET['action'] == 'viewquery'))
-		{
+		if (!isset(Config::$db_show_debug) || Config::$db_show_debug !== true || (isset($_GET['action']) && $_GET['action'] == 'viewquery')) {
 			return;
 		}
 
-		if (empty($_SESSION['view_queries']))
+		if (empty($_SESSION['view_queries'])) {
 			$_SESSION['view_queries'] = 0;
+		}
 
-		if (empty(Utils::$context['debug']['language_files']))
-			Utils::$context['debug']['language_files'] = array();
+		if (empty(Utils::$context['debug']['language_files'])) {
+			Utils::$context['debug']['language_files'] = [];
+		}
 
-		if (empty(Utils::$context['debug']['sheets']))
-			Utils::$context['debug']['sheets'] = array();
+		if (empty(Utils::$context['debug']['sheets'])) {
+			Utils::$context['debug']['sheets'] = [];
+		}
 
 		$files = get_included_files();
 		$total_size = 0;
 
-		for ($i = 0, $n = count($files); $i < $n; $i++)
-		{
-			if (file_exists($files[$i]))
+		for ($i = 0, $n = count($files); $i < $n; $i++) {
+			if (file_exists($files[$i])) {
 				$total_size += filesize($files[$i]);
+			}
 
-			$files[$i] = strtr($files[$i], array(Config::$boarddir => '.', Config::$sourcedir => '(Sources)', Config::$cachedir => '(Cache)', Theme::$current->settings['actual_theme_dir'] => '(Current Theme)'));
+			$files[$i] = strtr($files[$i], [Config::$boarddir => '.', Config::$sourcedir => '(Sources)', Config::$cachedir => '(Cache)', Theme::$current->settings['actual_theme_dir'] => '(Current Theme)']);
 		}
 
 		$warnings = 0;
 
-		if (!empty(Db::$cache))
-		{
-			foreach (Db::$cache as $q => $query_data)
-			{
-				if (!empty($query_data['w']))
+		if (!empty(Db::$cache)) {
+			foreach (Db::$cache as $q => $query_data) {
+				if (!empty($query_data['w'])) {
 					$warnings += count($query_data['w']);
+				}
 			}
 
 			$_SESSION['debug'] = &Db::$cache;
@@ -848,36 +852,34 @@ public static function displayDebug(): void
 		', (isset(Utils::$context['debug']['instances']) ? (Lang::$txt['debug_instances'] . (empty(Utils::$context['debug']['instances']) ? 0 : count(Utils::$context['debug']['instances'])) . ' (<a href="javascript:void(0);" onclick="document.getElementById(\'debug_instances\').style.display = \'inline\'; this.style.display = \'none\'; return false;">' . Lang::$txt['debug_show'] . '</a><span id="debug_instances" style="display: none;"><em>' . implode('</em>, <em>', array_keys(Utils::$context['debug']['instances'])) . '</em></span>)' . '<br>') : ''), '
 		', Lang::$txt['debug_files_included'], count($files), ' - ', round($total_size / 1024), Lang::$txt['debug_kb'], ' (<a href="javascript:void(0);" onclick="document.getElementById(\'debug_include_info\').style.display = \'inline\'; this.style.display = \'none\'; return false;">', Lang::$txt['debug_show'], '</a><span id="debug_include_info" style="display: none;"><em>', implode('</em>, <em>', $files), '</em></span>)<br>';
 
-		if (function_exists('memory_get_peak_usage'))
-		{
+		if (function_exists('memory_get_peak_usage')) {
 			echo Lang::$txt['debug_memory_use'], ceil(memory_get_peak_usage() / 1024), Lang::$txt['debug_kb'], '<br>';
 		}
 
 		// What tokens are active?
-		if (isset($_SESSION['token']))
-		{
+		if (isset($_SESSION['token'])) {
 			echo Lang::$txt['debug_tokens'] . '<em>' . implode(',</em> <em>', array_keys($_SESSION['token'])), '</em>.<br>';
 		}
 
-		if (!empty(CacheApi::$enable) && !empty(CacheApi::$hits))
-		{
-			$missed_entries = array();
-			$entries = array();
+		if (!empty(CacheApi::$enable) && !empty(CacheApi::$hits)) {
+			$missed_entries = [];
+			$entries = [];
 			$total_t = 0;
 			$total_s = 0;
 
-			foreach (CacheApi::$hits as $cache_hit)
-			{
+			foreach (CacheApi::$hits as $cache_hit) {
 				$entries[] = $cache_hit['d'] . ' ' . $cache_hit['k'] . ': ' . sprintf(Lang::$txt['debug_cache_seconds_bytes'], Lang::numberFormat($cache_hit['t'], 5), $cache_hit['s']);
 				$total_t += $cache_hit['t'];
 				$total_s += $cache_hit['s'];
 			}
 
-			if (!isset(CacheApi::$misses))
-				CacheApi::$misses = array();
+			if (!isset(CacheApi::$misses)) {
+				CacheApi::$misses = [];
+			}
 
-			foreach (CacheApi::$misses as $missed)
+			foreach (CacheApi::$misses as $missed) {
 				$missed_entries[] = $missed['d'] . ' ' . $missed['k'];
+			}
 
 			echo '
 		', Lang::$txt['debug_cache_hits'], CacheApi::$count_hits, ': ', sprintf(Lang::$txt['debug_cache_seconds_bytes_total'], Lang::numberFormat($total_t, 5), Lang::numberFormat($total_s)), ' (<a href="javascript:void(0);" onclick="document.getElementById(\'debug_cache_info\').style.display = \'inline\'; this.style.display = \'none\'; return false;">', Lang::$txt['debug_show'], '</a><span id="debug_cache_info" style="display: none;"><em>', implode('</em>, <em>', $entries), '</em></span>)<br>
@@ -888,33 +890,26 @@ public static function displayDebug(): void
 		<a href="', Config::$scripturl, '?action=viewquery" target="_blank" rel="noopener">', $warnings == 0 ? sprintf(Lang::$txt['debug_queries_used'], (int) Db::$count) : sprintf(Lang::$txt['debug_queries_used_and_warnings'], (int) Db::$count, $warnings), '</a><br>
 		<br>';
 
-		if ($_SESSION['view_queries'] == 1 && !empty(Db::$cache))
-		{
-			foreach (Db::$cache as $q => $query_data)
-			{
+		if ($_SESSION['view_queries'] == 1 && !empty(Db::$cache)) {
+			foreach (Db::$cache as $q => $query_data) {
 				$is_select = strpos(trim($query_data['q']), 'SELECT') === 0 || preg_match('~^INSERT(?: IGNORE)? INTO \w+(?:\s+\([^)]+\))?\s+SELECT .+$~s', trim($query_data['q'])) != 0 || strpos(trim($query_data['q']), 'WITH') === 0;
 
 				// Temporary tables created in earlier queries are not explainable.
-				if ($is_select)
-				{
-					foreach (array('log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages') as $tmp)
-					{
-						if (strpos(trim($query_data['q']), $tmp) !== false)
-						{
+				if ($is_select) {
+					foreach (['log_topics_unread', 'topics_posted_in', 'tmp_log_search_topics', 'tmp_log_search_messages'] as $tmp) {
+						if (strpos(trim($query_data['q']), $tmp) !== false) {
 							$is_select = false;
 							break;
 						}
 					}
 				}
 				// But actual creation of the temporary tables are.
-				elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($query_data['q'])) != 0)
-				{
+				elseif (preg_match('~^CREATE TEMPORARY TABLE .+?SELECT .+$~s', trim($query_data['q'])) != 0) {
 					$is_select = true;
 				}
 
 				// Make the filenames look a bit better.
-				if (isset($query_data['f']))
-				{
+				if (isset($query_data['f'])) {
 					$query_data['f'] = preg_replace('~^' . preg_quote(Config::$boarddir, '~') . '~', '...', $query_data['f']);
 				}
 
@@ -922,17 +917,13 @@ public static function displayDebug(): void
 		<strong>', $is_select ? '<a href="' . Config::$scripturl . '?action=viewquery;qq=' . ($q + 1) . '#qq' . $q . '" target="_blank" rel="noopener" style="text-decoration: none;">' : '', nl2br(str_replace("\t", '&nbsp;&nbsp;&nbsp;', Utils::htmlspecialchars(ltrim($query_data['q'], "\n\r")))) . ($is_select ? '</a></strong>' : '</strong>') . '<br>
 		&nbsp;&nbsp;&nbsp;';
 
-				if (!empty($query_data['f']) && !empty($query_data['l']))
-				{
+				if (!empty($query_data['f']) && !empty($query_data['l'])) {
 					echo sprintf(Lang::$txt['debug_query_in_line'], $query_data['f'], $query_data['l']);
 				}
 
-				if (isset($query_data['s'], $query_data['t']) && isset(Lang::$txt['debug_query_which_took_at']))
-				{
+				if (isset($query_data['s'], $query_data['t'], Lang::$txt['debug_query_which_took_at'])) {
 					echo sprintf(Lang::$txt['debug_query_which_took_at'], round($query_data['t'], 8), round($query_data['s'], 8)) . '<br>';
-				}
-				elseif (isset($query_data['t']))
-				{
+				} elseif (isset($query_data['t'])) {
 					echo sprintf(Lang::$txt['debug_query_which_took'], round($query_data['t'], 8)) . '<br>';
 				}
 
@@ -948,7 +939,8 @@ public static function displayDebug(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Logging::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Logging::exportStatic')) {
 	Logging::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Mail.php b/Sources/Mail.php
index 53df88b51d..84161390f3 100644
--- a/Sources/Mail.php
+++ b/Sources/Mail.php
@@ -14,7 +14,6 @@
 namespace SMF;
 
 use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * Class for preparing and handling email messages.
@@ -28,13 +27,19 @@ class Mail
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'send' => 'sendmail',
-			'sendSmtp' => 'smtp_mail',
 			'addToQueue' => 'AddMailQueue',
-		),
-	);
+			'reduceQueue' => 'reduceQueue',
+			'mimespecialchars' => 'mimespecialchars',
+			'sendSmtp' => 'smtp_mail',
+			'serverParse' => 'serverParse',
+			'sendNotifications' => 'sendNotifications',
+			'adminNotify' => 'adminNotify',
+			'loadEmailTemplate' => 'loadEmailTemplate',
+		],
+	];
 
 	/***********************
 	 * Public static methods
@@ -53,7 +58,7 @@ class Mail
 	 * @param int $priority The priority of the message
 	 * @param bool $hotmail_fix Whether to apply the "hotmail fix"
 	 * @param bool $is_private Whether this is private
-	 * @return boolean Whether ot not the email was sent properly.
+	 * @return bool Whether ot not the email was sent properly.
 	 */
 	public static function send($to, $subject, $message, $from = null, $message_id = null, $send_html = false, $priority = 3, $hotmail_fix = null, $is_private = false)
 	{
@@ -68,63 +73,61 @@ public static function send($to, $subject, $message, $from = null, $message_id =
 		$mail_result = true;
 
 		// If the recipient list isn't an array, make it one.
-		$to_array = is_array($to) ? $to : array($to);
+		$to_array = is_array($to) ? $to : [$to];
 
 		// Make sure we actually have email addresses to send this to
-		foreach ($to_array as $k => $v)
-		{
+		foreach ($to_array as $k => $v) {
 			// This should never happen, but better safe than sorry
-			if (trim($v) == '')
-			{
+			if (trim($v) == '') {
 				unset($to_array[$k]);
 			}
 		}
 
 		// Nothing left? Nothing else to do
-		if (empty($to_array))
+		if (empty($to_array)) {
 			return true;
+		}
 
 		// Once upon a time, Hotmail could not interpret non-ASCII mails.
 		// In honour of those days, it's still called the 'hotmail fix'.
-		if ($hotmail_fix === null)
-		{
-			$hotmail_to = array();
-			foreach ($to_array as $i => $to_address)
-			{
-				if (preg_match('~@(att|comcast|bellsouth)\.[a-zA-Z\.]{2,6}$~i', $to_address) === 1)
-				{
+		if ($hotmail_fix === null) {
+			$hotmail_to = [];
+
+			foreach ($to_array as $i => $to_address) {
+				if (preg_match('~@(att|comcast|bellsouth)\.[a-zA-Z\.]{2,6}$~i', $to_address) === 1) {
 					$hotmail_to[] = $to_address;
-					$to_array = array_diff($to_array, array($to_address));
+					$to_array = array_diff($to_array, [$to_address]);
 				}
 			}
 
 			// Call this function recursively for the hotmail addresses.
-			if (!empty($hotmail_to))
+			if (!empty($hotmail_to)) {
 				$mail_result = self::send($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+			}
 
 			// The remaining addresses no longer need the fix.
 			$hotmail_fix = false;
 
 			// No other addresses left? Return instantly.
-			if (empty($to_array))
+			if (empty($to_array)) {
 				return $mail_result;
+			}
 		}
 
 		// Get rid of entities.
 		$subject = Utils::htmlspecialcharsDecode($subject);
 		// Make the message use the proper line breaks.
-		$message = str_replace(array("\r", "\n"), array('', $line_break), $message);
+		$message = str_replace(["\r", "\n"], ['', $line_break], $message);
 
 		// Make sure hotmail mails are sent as HTML so that HTML entities work.
-		if ($hotmail_fix && !$send_html)
-		{
+		if ($hotmail_fix && !$send_html) {
 			$send_html = true;
-			$message = strtr($message, array($line_break => '<br>' . $line_break));
+			$message = strtr($message, [$line_break => '<br>' . $line_break]);
 			$message = preg_replace('~(' . preg_quote(Config::$scripturl, '~') . '(?:[?/][\w\-_%\.,\?&;=#]+)?)~', '<a href="$1">$1</a>', $message);
 		}
 
-		list (, $from_name) = self::mimespecialchars(addcslashes($from !== null ? $from : Utils::$context['forum_name'], '<>()\'\\"'), true, $hotmail_fix, $line_break);
-		list (, $subject) = self::mimespecialchars($subject, true, $hotmail_fix, $line_break);
+		list(, $from_name) = self::mimespecialchars(addcslashes($from !== null ? $from : Utils::$context['forum_name'], '<>()\'\\"'), true, $hotmail_fix, $line_break);
+		list(, $subject) = self::mimespecialchars($subject, true, $hotmail_fix, $line_break);
 
 		// Construct the mail headers...
 		$headers = 'From: "' . $from_name . '" <' . (empty(Config::$modSettings['mail_from']) ? Config::$webmaster_email : Config::$modSettings['mail_from']) . '>' . $line_break;
@@ -132,13 +135,15 @@ public static function send($to, $subject, $message, $from = null, $message_id =
 		$headers .= 'Return-Path: ' . (empty(Config::$modSettings['mail_from']) ? Config::$webmaster_email : Config::$modSettings['mail_from']) . $line_break;
 		$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 
-		if ($message_id !== null && empty(Config::$modSettings['mail_no_message_id']))
+		if ($message_id !== null && empty(Config::$modSettings['mail_no_message_id'])) {
 			$headers .= 'Message-ID: <' . md5(Config::$scripturl . microtime()) . '-' . $message_id . strstr(empty(Config::$modSettings['mail_from']) ? Config::$webmaster_email : Config::$modSettings['mail_from'], '@') . '>' . $line_break;
+		}
 		$headers .= 'X-Mailer: SMF' . $line_break;
 
 		// Pass this to the integration before we start modifying the output -- it'll make it easier later.
-		if (in_array(false, IntegrationHook::call('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true))
+		if (in_array(false, IntegrationHook::call('integrate_outgoing_email', [&$subject, &$message, &$headers, &$to_array]), true)) {
 			return false;
+		}
 
 		// Save the original message...
 		$orig_message = $message;
@@ -152,9 +157,8 @@ public static function send($to, $subject, $message, $from = null, $message_id =
 		$headers .= 'content-transfer-encoding: 7bit' . $line_break;
 
 		// Sending HTML?  Let's plop in some basic stuff, then.
-		if ($send_html)
-		{
-			$no_html_message = Utils::htmlspecialcharsDecode(strip_tags(strtr($orig_message, array('</title>' => $line_break))));
+		if ($send_html) {
+			$no_html_message = Utils::htmlspecialcharsDecode(strip_tags(strtr($orig_message, ['</title>' => $line_break])));
 
 			// But, then, dump it and use a plain one for dinosaur clients.
 			list(, $plain_message) = self::mimespecialchars($no_html_message, false, true, $line_break);
@@ -173,67 +177,63 @@ public static function send($to, $subject, $message, $from = null, $message_id =
 			$message .= $html_message . $line_break . '--' . $mime_boundary . '--';
 		}
 		// Text is good too.
-		else
-		{
+		else {
 			// Send a plain message first, for the older web clients.
 			list(, $plain_message) = self::mimespecialchars($orig_message, false, true, $line_break);
 			$message = $plain_message . $line_break . '--' . $mime_boundary . $line_break;
 
 			// Now add an encoded message using the forum's character set.
-			list ($charset, $encoded_message, $encoding) = self::mimespecialchars($orig_message, false, false, $line_break);
+			list($charset, $encoded_message, $encoding) = self::mimespecialchars($orig_message, false, false, $line_break);
 			$message .= 'content-type: text/plain; charset=' . $charset . $line_break;
 			$message .= 'content-transfer-encoding: ' . $encoding . $line_break . $line_break;
 			$message .= $encoded_message . $line_break . '--' . $mime_boundary . '--';
 		}
 
 		// Are we using the mail queue, if so this is where we butt in...
-		if ($priority != 0)
+		if ($priority != 0) {
 			return self::addToQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+		}
 
 		// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
-		elseif (!empty(Config::$modSettings['mail_limit']))
-		{
-			list ($last_mail_time, $mails_this_minute) = @explode('|', Config::$modSettings['mail_recent']);
-			if (empty($mails_this_minute) || time() > $last_mail_time + 60)
+		if (!empty(Config::$modSettings['mail_limit'])) {
+			list($last_mail_time, $mails_this_minute) = @explode('|', Config::$modSettings['mail_recent']);
+
+			if (empty($mails_this_minute) || time() > $last_mail_time + 60) {
 				$new_queue_stat = time() . '|' . 1;
-			else
+			} else {
 				$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+			}
 
-			Config::updateModSettings(array('mail_recent' => $new_queue_stat));
+			Config::updateModSettings(['mail_recent' => $new_queue_stat]);
 		}
 
 		// SMTP or sendmail?
-		if ($use_sendmail)
-		{
-			$subject = strtr($subject, array("\r" => '', "\n" => ''));
-			if (!empty(Config::$modSettings['mail_strip_carriage']))
-			{
-				$message = strtr($message, array("\r" => ''));
-				$headers = strtr($headers, array("\r" => ''));
+		if ($use_sendmail) {
+			$subject = strtr($subject, ["\r" => '', "\n" => '']);
+
+			if (!empty(Config::$modSettings['mail_strip_carriage'])) {
+				$message = strtr($message, ["\r" => '']);
+				$headers = strtr($headers, ["\r" => '']);
 			}
 
-			foreach ($to_array as $to)
-			{
+			foreach ($to_array as $to) {
 				set_error_handler(
-					function($errno, $errstr, $errfile, $errline)
-					{
+					function ($errno, $errstr, $errfile, $errline) {
 						// error was suppressed with the @-operator
-						if (0 === error_reporting())
+						if (0 === error_reporting()) {
 							return false;
+						}
 
 						throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-					}
+					},
 				);
-				try
-				{
-					if (!mail(strtr($to, array("\r" => '', "\n" => '')), $subject, $message, $headers))
-					{
+
+				try {
+					if (!mail(strtr($to, ["\r" => '', "\n" => '']), $subject, $message, $headers)) {
 						ErrorHandler::log(sprintf(Lang::$txt['mail_send_unable'], $to));
 						$mail_result = false;
 					}
-				}
-				catch (ErrorException $e)
-				{
+				} catch (ErrorException $e) {
 					ErrorHandler::log($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 					ErrorHandler::log(sprintf(Lang::$txt['mail_send_unable'], $to));
 					$mail_result = false;
@@ -242,12 +242,14 @@ function($errno, $errstr, $errfile, $errline)
 
 				// Wait, wait, I'm still sending here!
 				@set_time_limit(300);
-				if (function_exists('apache_reset_timeout'))
+
+				if (function_exists('apache_reset_timeout')) {
 					@apache_reset_timeout();
+				}
 			}
-		}
-		else
+		} else {
 			$mail_result = $mail_result && self::sendSmtp($to_array, $subject, $message, $headers);
+		}
 
 		// Everything go smoothly?
 		return $mail_result;
@@ -264,51 +266,52 @@ function($errno, $errstr, $errfile, $errline)
 	 * @param bool $send_html Whether to send in HTML format
 	 * @param int $priority The priority
 	 * @param bool $is_private Whether this is private
-	 * @return boolean Whether the message was added
+	 * @return bool Whether the message was added
 	 */
-	public static function addToQueue($flush = false, $to_array = array(), $subject = '', $message = '', $headers = '', $send_html = false, $priority = 3, $is_private = false)
+	public static function addToQueue($flush = false, $to_array = [], $subject = '', $message = '', $headers = '', $send_html = false, $priority = 3, $is_private = false)
 	{
-		static $cur_insert = array();
+		static $cur_insert = [];
 		static $cur_insert_len = 0;
 
-		if ($cur_insert_len == 0)
-			$cur_insert = array();
+		if ($cur_insert_len == 0) {
+			$cur_insert = [];
+		}
 
 		// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
-		if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
-		{
+		if (($flush || $cur_insert_len > 800000) && !empty($cur_insert)) {
 			// Only do these once.
 			$cur_insert_len = 0;
 
 			// Dump the data...
-			Db::$db->insert('',
+			Db::$db->insert(
+				'',
 				'{db_prefix}mail_queue',
-				array(
+				[
 					'time_sent' => 'int', 'recipient' => 'string-255', 'body' => 'string', 'subject' => 'string-255',
 					'headers' => 'string-65534', 'send_html' => 'int', 'priority' => 'int', 'private' => 'int',
-				),
+				],
 				$cur_insert,
-				array('id_mail')
+				['id_mail'],
 			);
 
-			$cur_insert = array();
+			$cur_insert = [];
 			Utils::$context['flush_mail'] = false;
 		}
 
 		// If we're flushing we're done.
-		if ($flush)
-		{
+		if ($flush) {
 			$nextSendTime = time() + 10;
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}settings
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}settings
 				SET value = {string:nextSendTime}
 				WHERE variable = {literal:mail_next_send}
 					AND value = {string:no_outstanding}',
-				array(
+				[
 					'nextSendTime' => $nextSendTime,
 					'no_outstanding' => '0',
-				)
+				],
 			);
 
 			return true;
@@ -317,38 +320,38 @@ public static function addToQueue($flush = false, $to_array = array(), $subject
 		// Ensure we tell obExit to flush.
 		Utils::$context['flush_mail'] = true;
 
-		foreach ($to_array as $to)
-		{
+		foreach ($to_array as $to) {
 			// Will this insert go over MySQL's limit?
 			$this_insert_len = strlen($to) + strlen($message) + strlen($headers) + 700;
 
 			// Insert limit of 1M (just under the safety) is reached?
-			if ($this_insert_len + $cur_insert_len > 1000000)
-			{
+			if ($this_insert_len + $cur_insert_len > 1000000) {
 				// Flush out what we have so far.
-				Db::$db->insert('',
+				Db::$db->insert(
+					'',
 					'{db_prefix}mail_queue',
-					array(
+					[
 						'time_sent' => 'int', 'recipient' => 'string-255', 'body' => 'string', 'subject' => 'string-255',
 						'headers' => 'string-65534', 'send_html' => 'int', 'priority' => 'int', 'private' => 'int',
-					),
+					],
 					$cur_insert,
-					array('id_mail')
+					['id_mail'],
 				);
 
 				// Clear this out.
-				$cur_insert = array();
+				$cur_insert = [];
 				$cur_insert_len = 0;
 			}
 
 			// Now add the current insert to the array...
-			$cur_insert[] = array(time(), (string) $to, (string) $message, (string) $subject, (string) $headers, ($send_html ? 1 : 0), $priority, (int) $is_private);
+			$cur_insert[] = [time(), (string) $to, (string) $message, (string) $subject, (string) $headers, ($send_html ? 1 : 0), $priority, (int) $is_private];
 			$cur_insert_len += $this_insert_len;
 		}
 
 		// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
-		if (SMF === 'SSI' || SMF === 'BACKGROUND')
+		if (SMF === 'SSI' || SMF === 'BACKGROUND') {
 			return self::addToQueue(true);
+		}
 
 		return true;
 	}
@@ -364,96 +367,92 @@ public static function addToQueue($flush = false, $to_array = array(), $subject
 	public static function reduceQueue($number = false, $override_limit = false, $force_send = false)
 	{
 		// Are we intending another script to be sending out the queue?
-		if (!empty(Config::$modSettings['mail_queue_use_cron']) && empty($force_send))
+		if (!empty(Config::$modSettings['mail_queue_use_cron']) && empty($force_send)) {
 			return false;
+		}
 
 		// Just in case we run into a problem.
-		if (empty(Lang::$txt))
-		{
+		if (empty(Lang::$txt)) {
 			Theme::loadEssential();
 			Lang::load('Errors', Lang::$default, false);
 			Lang::load('index', Lang::$default, false);
 		}
 
 		// By default send 5 at once.
-		if (!$number)
-		{
+		if (!$number) {
 			$number = empty(Config::$modSettings['mail_quantity']) ? 5 : Config::$modSettings['mail_quantity'];
 		}
 
 		// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
-		if (isset($_GET['ts']) && $_GET['ts'] != Config::$modSettings['mail_next_send'] && empty($force_send))
-		{
+		if (isset($_GET['ts']) && $_GET['ts'] != Config::$modSettings['mail_next_send'] && empty($force_send)) {
 			return false;
 		}
 
 		// By default move the next sending on by 10 seconds, and require an affected row.
-		if (!$override_limit)
-		{
+		if (!$override_limit) {
 			$delay = max(TaskRunner::MAX_CRON_TIME, (int) (Config::$modSettings['mail_queue_delay'] ?? 10));
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}settings
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}settings
 				SET value = {string:next_mail_send}
 				WHERE variable = {literal:mail_next_send}
 					AND value = {string:last_send}',
-				array(
+				[
 					'next_mail_send' => time() + $delay,
 					'last_send' => Config::$modSettings['mail_next_send'],
-				)
+				],
 			);
 
-			if (Db::$db->affected_rows() == 0)
+			if (Db::$db->affected_rows() == 0) {
 				return false;
+			}
 
 			Config::$modSettings['mail_next_send'] = time() + $delay;
 		}
 
 		// If we're not overriding how many are we allow to send?
-		if (!$override_limit && !empty(Config::$modSettings['mail_limit']))
-		{
+		if (!$override_limit && !empty(Config::$modSettings['mail_limit'])) {
 			list($mt, $mn) = explode('|', Config::$modSettings['mail_recent'] ?? '');
 
 			// Nothing worth noting...
-			if (empty($mn) || $mt < time() - 60)
-			{
+			if (empty($mn) || $mt < time() - 60) {
 				$mt = time();
 				$mn = $number;
 			}
 			// Otherwise we have a few more we can spend?
-			elseif ($mn < Config::$modSettings['mail_limit'])
-			{
+			elseif ($mn < Config::$modSettings['mail_limit']) {
 				$mn += $number;
 			}
 			// No more I'm afraid, return!
-			else
-			{
+			else {
 				return false;
 			}
 
 			// Reflect that we're about to send some, do it now to be safe.
-			Config::updateModSettings(array('mail_recent' => $mt . '|' . $mn));
+			Config::updateModSettings(['mail_recent' => $mt . '|' . $mn]);
 		}
 
 		// Now we know how many we're sending, let's send them.
-		$ids = array();
-		$emails = array();
+		$ids = [];
+		$emails = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_mail, recipient, body, subject, headers, send_html, time_sent, private, priority
+		$request = Db::$db->query(
+			'',
+			'SELECT id_mail, recipient, body, subject, headers, send_html, time_sent, private, priority
 			FROM {db_prefix}mail_queue
 			ORDER BY priority ASC, id_mail ASC
 			LIMIT {int:limit}',
-			array(
+			[
 				'limit' => $number,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// We want to delete these from the database ASAP, so just get the data and go.
 			$ids[] = $row['id_mail'];
 
-			$emails[] = array(
+			$emails[] = [
 				'to' => $row['recipient'],
 				'body' => $row['body'],
 				'subject' => $row['subject'],
@@ -462,53 +461,52 @@ public static function reduceQueue($number = false, $override_limit = false, $fo
 				'time_sent' => $row['time_sent'],
 				'private' => $row['private'],
 				'priority' => $row['priority'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Delete, delete, delete!!!
-		if (!empty($ids))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}mail_queue
+		if (!empty($ids)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}mail_queue
 				WHERE id_mail IN ({array_int:mail_list})',
-				array(
+				[
 					'mail_list' => $ids,
-				)
+				],
 			);
 		}
 
 		// Don't believe we have any left?
-		if (count($ids) < $number)
-		{
+		if (count($ids) < $number) {
 			// Only update the setting if no-one else has beaten us to it.
-			Db::$db->query('', '
-				UPDATE {db_prefix}settings
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}settings
 				SET value = {string:no_send}
 				WHERE variable = {literal:mail_next_send}
 					AND value = {string:last_mail_send}',
-				array(
+				[
 					'no_send' => '0',
 					'last_mail_send' => Config::$modSettings['mail_next_send'],
-				)
+				],
 			);
 		}
 
-		if (empty($ids))
+		if (empty($ids)) {
 			return false;
+		}
 
 		// Send each email, yea!
-		$failed_emails = array();
+		$failed_emails = [];
 		$max_priority = 127;
 		$smtp_expire = 259200;
 		$priority_offset = 4;
 
-		foreach ($emails as $email)
-		{
+		foreach ($emails as $email) {
 			// This seems odd, but check the priority if we should try again so soon. Do this so we don't DOS some poor mail server.
-			if ($email['priority'] > $priority_offset && (time() - $email['time_sent']) % $priority_offset != rand(0, $priority_offset))
-			{
-				$failed_emails[] = array(
+			if ($email['priority'] > $priority_offset && (time() - $email['time_sent']) % $priority_offset != rand(0, $priority_offset)) {
+				$failed_emails[] = [
 					$email['to'],
 					$email['body'],
 					$email['subject'],
@@ -517,80 +515,77 @@ public static function reduceQueue($number = false, $override_limit = false, $fo
 					$email['time_sent'],
 					$email['private'],
 					$email['priority'],
-				);
+				];
 
 				continue;
 			}
 
-			if (empty(Config::$modSettings['mail_type']) || Config::$modSettings['smtp_host'] == '')
-			{
-				$email['subject'] = strtr($email['subject'], array("\r" => '', "\n" => ''));
+			if (empty(Config::$modSettings['mail_type']) || Config::$modSettings['smtp_host'] == '') {
+				$email['subject'] = strtr($email['subject'], ["\r" => '', "\n" => '']);
 
-				if (!empty(Config::$modSettings['mail_strip_carriage']))
-				{
-					$email['body'] = strtr($email['body'], array("\r" => ''));
-					$email['headers'] = strtr($email['headers'], array("\r" => ''));
+				if (!empty(Config::$modSettings['mail_strip_carriage'])) {
+					$email['body'] = strtr($email['body'], ["\r" => '']);
+					$email['headers'] = strtr($email['headers'], ["\r" => '']);
 				}
 
 				// No point logging a specific error here, as we have no language. PHP error is helpful anyway...
-				$result = mail(strtr($email['to'], array("\r" => '', "\n" => '')), $email['subject'], $email['body'], $email['headers']);
+				$result = mail(strtr($email['to'], ["\r" => '', "\n" => '']), $email['subject'], $email['body'], $email['headers']);
 
 				// Try to stop a timeout, this would be bad...
 				@set_time_limit(300);
 
-				if (function_exists('apache_reset_timeout'))
+				if (function_exists('apache_reset_timeout')) {
 					@apache_reset_timeout();
-			}
-			else
-			{
-				$result = self::sendSmtp(array($email['to']), $email['subject'], $email['body'], $email['headers']);
+				}
+			} else {
+				$result = self::sendSmtp([$email['to']], $email['subject'], $email['body'], $email['headers']);
 			}
 
 			// Old emails should expire
-			if (!$result && $email['priority'] >= $max_priority)
+			if (!$result && $email['priority'] >= $max_priority) {
 				$result = true;
+			}
 
 			// Hopefully it sent?
-			if (!$result)
-			{
+			if (!$result) {
 				// Determine the "priority" as a way to keep track of SMTP failures.
 				$email['priority'] = max($priority_offset, $email['priority'], min(ceil((time() - $email['time_sent']) / $smtp_expire * ($max_priority - $priority_offset)) + $priority_offset, $max_priority));
 
-				$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private'], $email['priority']);
+				$failed_emails[] = [$email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private'], $email['priority']];
 			}
 		}
 
-
 		// Any emails that didn't send?
-		if (!empty($failed_emails))
-		{
+		if (!empty($failed_emails)) {
 			// Update the failed attempts check.
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}settings',
-				array('variable' => 'string', 'value' => 'string'),
-				array('mail_failed_attempts', empty(Config::$modSettings['mail_failed_attempts']) ? 1 : ++Config::$modSettings['mail_failed_attempts']),
-				array('variable')
+				['variable' => 'string', 'value' => 'string'],
+				['mail_failed_attempts', empty(Config::$modSettings['mail_failed_attempts']) ? 1 : ++Config::$modSettings['mail_failed_attempts']],
+				['variable'],
 			);
 
 			// If we have failed to many times, tell mail to wait a bit and try again.
-			if (Config::$modSettings['mail_failed_attempts'] > 5)
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}settings
+			if (Config::$modSettings['mail_failed_attempts'] > 5) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}settings
 					SET value = {string:next_mail_send}
 					WHERE variable = {literal:mail_next_send}
 						AND value = {string:last_send}',
-					array(
+					[
 						'next_mail_send' => time() + 60,
 						'last_send' => Config::$modSettings['mail_next_send'],
-					)
+					],
 				);
 			}
 
 			// Add our email back to the queue, manually.
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}mail_queue',
-				array(
+				[
 					'recipient' => 'string',
 					'body' => 'string',
 					'subject' => 'string',
@@ -599,24 +594,25 @@ public static function reduceQueue($number = false, $override_limit = false, $fo
 					'time_sent' => 'string',
 					'private' => 'int',
 					'priority' => 'int',
-				),
+				],
 				$failed_emails,
-				array('id_mail')
+				['id_mail'],
 			);
 
 			return false;
 		}
+
 		// We where unable to send the email, clear our failed attempts.
-		elseif (!empty(Config::$modSettings['mail_failed_attempts']))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}settings
+		if (!empty(Config::$modSettings['mail_failed_attempts'])) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}settings
 				SET value = {string:zero}
 				WHERE variable = {string:mail_failed_attempts}',
-				array(
+				[
 					'zero' => '0',
 					'mail_failed_attempts' => 'mail_failed_attempts',
-				)
+				],
 			);
 		}
 
@@ -642,33 +638,33 @@ public static function mimespecialchars($string, $with_charset = true, $hotmail_
 		$charset = $custom_charset !== null ? $custom_charset : Utils::$context['character_set'];
 
 		// This is the fun part....
-		if (preg_match_all('~&#(\d{3,8});~', $string, $matches) !== 0 && !$hotmail_fix)
-		{
+		if (preg_match_all('~&#(\d{3,8});~', $string, $matches) !== 0 && !$hotmail_fix) {
 			// Let's, for now, assume there are only &#021;'ish characters.
 			$simple = true;
 
-			foreach ($matches[1] as $entity)
-				if ($entity > 128)
+			foreach ($matches[1] as $entity) {
+				if ($entity > 128) {
 					$simple = false;
+				}
+			}
 			unset($matches);
 
-			if ($simple)
+			if ($simple) {
 				$string = preg_replace_callback(
 					'~&#(\d{3,8});~',
-					function($m)
-					{
-						return chr("$m[1]");
+					function ($m) {
+						return chr("{$m[1]}");
 					},
-					$string
+					$string,
 				);
-			else
-			{
+			} else {
 				// Try to convert the string to UTF-8.
-				if (!Utils::$context['utf8'] && function_exists('iconv'))
-				{
+				if (!Utils::$context['utf8'] && function_exists('iconv')) {
 					$newstring = @iconv(Utils::$context['character_set'], 'UTF-8', $string);
-					if ($newstring)
+
+					if ($newstring) {
 						$string = $newstring;
+					}
 				}
 
 				$string = Utils::entityDecode($string, true);
@@ -679,53 +675,60 @@ function($m)
 		}
 
 		// Convert all special characters to HTML entities...just for Hotmail :-\
-		if ($hotmail_fix && (Utils::$context['utf8'] || function_exists('iconv') || Utils::$context['character_set'] === 'ISO-8859-1'))
-		{
-			if (!Utils::$context['utf8'] && function_exists('iconv'))
-			{
+		if ($hotmail_fix && (Utils::$context['utf8'] || function_exists('iconv') || Utils::$context['character_set'] === 'ISO-8859-1')) {
+			if (!Utils::$context['utf8'] && function_exists('iconv')) {
 				$newstring = @iconv(Utils::$context['character_set'], 'UTF-8', $string);
-				if ($newstring)
+
+				if ($newstring) {
 					$string = $newstring;
+				}
 			}
 
-			$entityConvert = function($m)
-			{
+			$entityConvert = function ($m) {
 				$c = $m[1];
-				if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
+
+				if (strlen($c) === 1 && ord($c[0]) <= 0x7F) {
 					return $c;
-				elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF)
-					return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
-				elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF)
-					return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
-				elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7)
-					return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
-				else
-					return "";
+				}
+
+				if (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF) {
+					return '&#' . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ';';
+				}
+
+				if (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF) {
+					return '&#' . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ';';
+				}
+
+				if (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7) {
+					return '&#' . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ';';
+				}
+
+				return '';
 			};
 
 			// Convert all 'special' characters to HTML entities.
-			return array($charset, preg_replace_callback('~([\x80-\x{10FFFF}])~u', $entityConvert, $string), '7bit');
+			return [$charset, preg_replace_callback('~([\x80-\x{10FFFF}])~u', $entityConvert, $string), '7bit'];
 		}
 
 		// We don't need to mess with the subject line if no special characters were in it..
-		elseif (!$hotmail_fix && preg_match('~([^\x09\x0A\x0D\x20-\x7F])~', $string) === 1)
-		{
+		if (!$hotmail_fix && preg_match('~([^\x09\x0A\x0D\x20-\x7F])~', $string) === 1) {
 			// Base64 encode.
 			$string = base64_encode($string);
 
 			// Show the characterset and the transfer-encoding for header strings.
-			if ($with_charset)
+			if ($with_charset) {
 				$string = '=?' . $charset . '?B?' . $string . '?=';
+			}
 
 			// Break it up in lines (mail body).
-			else
+			else {
 				$string = chunk_split($string, 76, $line_break);
+			}
 
-			return array($charset, $string, 'base64');
+			return [$charset, $string, 'base64'];
 		}
 
-		else
-			return array($charset, $string, '7bit');
+		return [$charset, $string, '7bit'];
 	}
 
 	/**
@@ -738,7 +741,7 @@ function($m)
 	 * @param string $subject Email subject
 	 * @param string $message Email message
 	 * @param string $headers Email headers
-	 * @return boolean Whether it sent or not.
+	 * @return bool Whether it sent or not.
 	 */
 	public static function sendSmtp($mail_to_array, $subject, $message, $headers)
 	{
@@ -748,14 +751,14 @@ public static function sendSmtp($mail_to_array, $subject, $message, $headers)
 
 		// Try POP3 before SMTP?
 		// @todo There's no interface for this yet.
-		if (Config::$modSettings['mail_type'] == 3 && Config::$modSettings['smtp_username'] != '' && Config::$modSettings['smtp_password'] != '')
-		{
+		if (Config::$modSettings['mail_type'] == 3 && Config::$modSettings['smtp_username'] != '' && Config::$modSettings['smtp_password'] != '') {
 			$socket = fsockopen(Config::$modSettings['smtp_host'], 110, $errno, $errstr, 2);
-			if (!$socket && (substr(Config::$modSettings['smtp_host'], 0, 5) == 'smtp.' || substr(Config::$modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-				$socket = fsockopen(strtr(Config::$modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
 
-			if ($socket)
-			{
+			if (!$socket && (substr(Config::$modSettings['smtp_host'], 0, 5) == 'smtp.' || substr(Config::$modSettings['smtp_host'], 0, 11) == 'ssl://smtp.')) {
+				$socket = fsockopen(strtr(Config::$modSettings['smtp_host'], ['smtp.' => 'pop.']), 110, $errno, $errstr, 2);
+			}
+
+			if ($socket) {
 				fgets($socket, 256);
 				fputs($socket, 'USER ' . Config::$modSettings['smtp_username'] . "\r\n");
 				fgets($socket, 256);
@@ -768,40 +771,41 @@ public static function sendSmtp($mail_to_array, $subject, $message, $headers)
 		}
 
 		// Try to connect to the SMTP server... if it doesn't exist, only wait three seconds.
-		if (!$socket = fsockopen(Config::$modSettings['smtp_host'], empty(Config::$modSettings['smtp_port']) ? 25 : Config::$modSettings['smtp_port'], $errno, $errstr, 3))
-		{
+		if (!$socket = fsockopen(Config::$modSettings['smtp_host'], empty(Config::$modSettings['smtp_port']) ? 25 : Config::$modSettings['smtp_port'], $errno, $errstr, 3)) {
 			// Maybe we can still save this?  The port might be wrong.
-			if (substr(Config::$modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty(Config::$modSettings['smtp_port']) || Config::$modSettings['smtp_port'] == 25))
-			{
+			if (substr(Config::$modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty(Config::$modSettings['smtp_port']) || Config::$modSettings['smtp_port'] == 25)) {
 				// ssl:hostname can cause fsocketopen to fail with a lookup failure, ensure it exists for this test.
-				if (substr(Config::$modSettings['smtp_host'], 0, 6) != 'ssl://')
+				if (substr(Config::$modSettings['smtp_host'], 0, 6) != 'ssl://') {
 					Config::$modSettings['smtp_host'] = str_replace('ssl:', 'ss://', Config::$modSettings['smtp_host']);
+				}
 
-				if ($socket = fsockopen(Config::$modSettings['smtp_host'], 465, $errno, $errstr, 3))
+				if ($socket = fsockopen(Config::$modSettings['smtp_host'], 465, $errno, $errstr, 3)) {
 					ErrorHandler::log(Lang::$txt['smtp_port_ssl']);
+				}
 			}
 
 			// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
-			if (!$socket)
-			{
+			if (!$socket) {
 				ErrorHandler::log(Lang::$txt['smtp_no_connect'] . ': ' . $errno . ' : ' . $errstr);
+
 				return false;
 			}
 		}
 
 		// Wait for a response of 220, without "-" continuer.
-		if (!self::serverParse(null, $socket, '220'))
+		if (!self::serverParse(null, $socket, '220')) {
 			return false;
+		}
 
 		// Try to determine the server's fully qualified domain name
 		// Can't rely on $_SERVER['SERVER_NAME'] because it can be spoofed on Apache
-		if (empty($helo))
-		{
+		if (empty($helo)) {
 			// See if we can get the domain name from the host itself
-			if (function_exists('gethostname'))
+			if (function_exists('gethostname')) {
 				$helo = gethostname();
-			elseif (function_exists('php_uname'))
+			} elseif (function_exists('php_uname')) {
 				$helo = php_uname('n');
+			}
 
 			// If the hostname isn't a fully qualified domain name, we can use the host name from Config::$boardurl instead
 			if (
@@ -812,105 +816,120 @@ public static function sendSmtp($mail_to_array, $subject, $message, $headers)
 					!empty(Config::$modSettings['tld_regex'])
 					&& !preg_match('/\.' . Config::$modSettings['tld_regex'] . '$/u', $helo)
 				)
-			)
-			{
+			) {
 				$url = new Url(Config::$boardurl);
 				$helo = $url->host;
 			}
 
 			// This is one of those situations where 'www.' is undesirable
-			if (strpos($helo, 'www.') === 0)
+			if (strpos($helo, 'www.') === 0) {
 				$helo = substr($helo, 4);
+			}
 
-			if (!function_exists('idn_to_ascii'))
-				require_once(Config::$sourcedir . '/Subs-Compat.php');
+			if (!function_exists('idn_to_ascii')) {
+				require_once Config::$sourcedir . '/Subs-Compat.php';
+			}
 
 			$helo = idn_to_ascii($helo, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
 		}
 
 		// SMTP = 1, SMTP - STARTTLS = 2
-		if (in_array(Config::$modSettings['mail_type'], array(1, 2)) && Config::$modSettings['smtp_username'] != '' && Config::$modSettings['smtp_password'] != '')
-		{
+		if (in_array(Config::$modSettings['mail_type'], [1, 2]) && Config::$modSettings['smtp_username'] != '' && Config::$modSettings['smtp_password'] != '') {
 			// EHLO could be understood to mean encrypted hello...
-			if (self::serverParse('EHLO ' . $helo, $socket, null, $response) == '250')
-			{
+			if (self::serverParse('EHLO ' . $helo, $socket, null, $response) == '250') {
 				// Are we using STARTTLS and does the server support STARTTLS?
-				if (Config::$modSettings['mail_type'] == 2 && preg_match("~250( |-)STARTTLS~mi", $response))
-				{
+				if (Config::$modSettings['mail_type'] == 2 && preg_match('~250( |-)STARTTLS~mi', $response)) {
 					// Send STARTTLS to enable encryption
-					if (!self::serverParse('STARTTLS', $socket, '220'))
+					if (!self::serverParse('STARTTLS', $socket, '220')) {
 						return false;
+					}
 					// Enable the encryption
 					// php 5.6+ fix
 					$crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
 
-					if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT'))
-					{
+					if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
 						$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
 						$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
 					}
 
-					if (!@stream_socket_enable_crypto($socket, true, $crypto_method))
+					if (!@stream_socket_enable_crypto($socket, true, $crypto_method)) {
 						return false;
+					}
+
 					// Send the EHLO command again
-					if (!self::serverParse('EHLO ' . $helo, $socket, null) == '250')
+					if (!self::serverParse('EHLO ' . $helo, $socket, null) == '250') {
 						return false;
+					}
 				}
 
-				if (!self::serverParse('AUTH LOGIN', $socket, '334'))
+				if (!self::serverParse('AUTH LOGIN', $socket, '334')) {
 					return false;
+				}
+
 				// Send the username and password, encoded.
-				if (!self::serverParse(base64_encode(Config::$modSettings['smtp_username']), $socket, '334'))
+				if (!self::serverParse(base64_encode(Config::$modSettings['smtp_username']), $socket, '334')) {
 					return false;
+				}
+
 				// The password is already encoded ;)
-				if (!self::serverParse(Config::$modSettings['smtp_password'], $socket, '235'))
+				if (!self::serverParse(Config::$modSettings['smtp_password'], $socket, '235')) {
 					return false;
-			}
-			elseif (!self::serverParse('HELO ' . $helo, $socket, '250'))
+				}
+			} elseif (!self::serverParse('HELO ' . $helo, $socket, '250')) {
 				return false;
-		}
-		else
-		{
+			}
+		} else {
 			// Just say "helo".
-			if (!self::serverParse('HELO ' . $helo, $socket, '250'))
+			if (!self::serverParse('HELO ' . $helo, $socket, '250')) {
 				return false;
+			}
 		}
 
 		// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
-		$message = strtr($message, array("\r\n" . '.' => "\r\n" . '..'));
+		$message = strtr($message, ["\r\n" . '.' => "\r\n" . '..']);
 
 		// !! Theoretically, we should be able to just loop the RCPT TO.
 		$mail_to_array = array_values($mail_to_array);
-		foreach ($mail_to_array as $i => $mail_to)
-		{
+
+		foreach ($mail_to_array as $i => $mail_to) {
 			// Reset the connection to send another email.
-			if ($i != 0)
-			{
-				if (!self::serverParse('RSET', $socket, '250'))
+			if ($i != 0) {
+				if (!self::serverParse('RSET', $socket, '250')) {
 					return false;
+				}
 			}
 
 			// From, to, and then start the data...
-			if (!self::serverParse('MAIL FROM: <' . (empty(Config::$modSettings['mail_from']) ? Config::$webmaster_email : Config::$modSettings['mail_from']) . '>', $socket, '250'))
+			if (!self::serverParse('MAIL FROM: <' . (empty(Config::$modSettings['mail_from']) ? Config::$webmaster_email : Config::$modSettings['mail_from']) . '>', $socket, '250')) {
 				return false;
-			if (!self::serverParse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
+			}
+
+			if (!self::serverParse('RCPT TO: <' . $mail_to . '>', $socket, '250')) {
 				return false;
-			if (!self::serverParse('DATA', $socket, '354'))
+			}
+
+			if (!self::serverParse('DATA', $socket, '354')) {
 				return false;
+			}
 			fputs($socket, 'Subject: ' . $subject . "\r\n");
-			if (strlen($mail_to) > 0)
+
+			if (strlen($mail_to) > 0) {
 				fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+			}
 			fputs($socket, $headers . "\r\n\r\n");
 			fputs($socket, $message . "\r\n");
 
 			// Send a ., or in other words "end of data".
-			if (!self::serverParse('.', $socket, '250'))
+			if (!self::serverParse('.', $socket, '250')) {
 				return false;
+			}
 
 			// Almost done, almost done... don't stop me just yet!
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
+
+			if (function_exists('apache_reset_timeout')) {
 				@apache_reset_timeout();
+			}
 		}
 		fputs($socket, 'QUIT' . "\r\n");
 		fclose($socket);
@@ -933,39 +952,40 @@ public static function sendSmtp($mail_to_array, $subject, $message, $headers)
 	 */
 	public static function serverParse($message, $socket, $code, &$response = null)
 	{
-		if ($message !== null)
+		if ($message !== null) {
 			fputs($socket, $message . "\r\n");
+		}
 
 		// No response yet.
 		$server_response = '';
 
-		while (substr($server_response, 3, 1) != ' ')
-		{
-			if (!($server_response = fgets($socket, 256)))
-			{
+		while (substr($server_response, 3, 1) != ' ') {
+			if (!($server_response = fgets($socket, 256))) {
 				// @todo Change this message to reflect that it may mean bad user/password/server issues/etc.
 				ErrorHandler::log(Lang::$txt['smtp_bad_response']);
+
 				return false;
 			}
 
 			$response .= $server_response;
 		}
 
-		if ($code === null)
+		if ($code === null) {
 			return substr($server_response, 0, 3);
+		}
 
 		$response_code = (int) substr($server_response, 0, 3);
 
-		if ($response_code != $code)
-		{
+		if ($response_code != $code) {
 			// Ignoreable errors that we can't fix should not be logged.
 			/*
 			 * 550 - cPanel rejected sending due to DNS issues
 			 * 450 - DNS Routing issues
 			 * 451 - cPanel "Temporary local problem - please try later"
 			 */
-			if ($response_code < 500 && !in_array($response_code, array(450, 451)))
+			if ($response_code < 500 && !in_array($response_code, [450, 451])) {
 				ErrorHandler::log(Lang::$txt['smtp_error'] . $server_response);
+			}
 
 			return false;
 		}
@@ -986,18 +1006,22 @@ public static function serverParse($message, $socket, $code, &$response = null)
 	 * @param array $exclude Members in the exclude array will not be processed for the topic with the same key.
 	 * @param array $members_only Are the only ones that will be sent the notification if they have it on.
 	 */
-	public static function sendNotifications($topics, $type, $exclude = array(), $members_only = array())
+	public static function sendNotifications($topics, $type, $exclude = [], $members_only = [])
 	{
 		// Can't do it if there's no topics.
-		if (empty($topics))
+		if (empty($topics)) {
 			return;
+		}
+
 		// It must be an array - it must!
-		if (!is_array($topics))
-			$topics = array($topics);
+		if (!is_array($topics)) {
+			$topics = [$topics];
+		}
 
 		// Get the subject and body...
-		$result = Db::$db->query('', '
-			SELECT mf.subject, ml.body, ml.id_member, t.id_last_msg, t.id_topic, t.id_board,
+		$result = Db::$db->query(
+			'',
+			'SELECT mf.subject, ml.body, ml.id_member, t.id_last_msg, t.id_topic, t.id_board,
 				COALESCE(mem.real_name, ml.poster_name) AS poster_name, mf.id_msg
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)
@@ -1005,43 +1029,51 @@ public static function sendNotifications($topics, $type, $exclude = array(), $me
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = ml.id_member)
 			WHERE t.id_topic IN ({array_int:topic_list})
 			LIMIT 1',
-			array(
+			[
 				'topic_list' => $topics,
-			)
+			],
 		);
-		$task_rows = array();
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			$task_rows[] = array(
-				'$sourcedir/tasks/CreatePost_Notify.php', 'SMF\Tasks\CreatePost_Notify', Utils::jsonEncode(array(
-					'msgOptions' => array(
+		$task_rows = [];
+
+		while ($row = Db::$db->fetch_assoc($result)) {
+			$task_rows[] = [
+				'SMF\\Tasks\\CreatePost_Notify',
+				Utils::jsonEncode([
+					'msgOptions' => [
 						'id' => $row['id_msg'],
 						'subject' => $row['subject'],
 						'body' => $row['body'],
-					),
-					'topicOptions' => array(
+					],
+					'topicOptions' => [
 						'id' => $row['id_topic'],
 						'board' => $row['id_board'],
-					),
+					],
 					// Kinda cheeky, but for any action the originator is usually the current user
-					'posterOptions' => array(
+					'posterOptions' => [
 						'id' => User::$me->id,
 						'name' => User::$me->name,
-					),
+					],
 					'type' => $type,
 					'members_only' => $members_only,
-				)), 0
-			);
+				]),
+				0,
+			];
 		}
 		Db::$db->free_result($result);
 
-		if (!empty($task_rows))
-			Db::$db->insert('',
+		if (!empty($task_rows)) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
 				$task_rows,
-				array('id_task')
+				['id_task'],
 			);
+		}
 	}
 
 	/**
@@ -1058,33 +1090,42 @@ public static function sendNotifications($topics, $type, $exclude = array(), $me
 	 */
 	public static function adminNotify($type, $memberID, $member_name = null)
 	{
-		if ($member_name == null)
-		{
+		if ($member_name == null) {
 			// Get the new user's name....
-			$request = Db::$db->query('', '
-				SELECT real_name
+			$request = Db::$db->query(
+				'',
+				'SELECT real_name
 				FROM {db_prefix}members
 				WHERE id_member = {int:id_member}
 				LIMIT 1',
-				array(
+				[
 					'id_member' => $memberID,
-				)
+				],
 			);
-			list ($member_name) = Db::$db->fetch_row($request);
+			list($member_name) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// This is really just a wrapper for making a new background task to deal with all the fun.
-		Db::$db->insert('insert',
+		Db::$db->insert(
+			'insert',
 			'{db_prefix}background_tasks',
-			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-			array('$sourcedir/tasks/Register_Notify.php', 'SMF\Tasks\Register_Notify', Utils::jsonEncode(array(
-				'new_member_id' => $memberID,
-				'new_member_name' => $member_name,
-				'notify_type' => $type,
-				'time' => time(),
-			)), 0),
-			array('id_task')
+			[
+				'task_class' => 'string',
+				'task_data' => 'string',
+				'claimed_time' => 'int',
+			],
+			[
+				'SMF\\Tasks\\Register_Notify',
+				Utils::jsonEncode([
+					'new_member_id' => $memberID,
+					'new_member_name' => $member_name,
+					'notify_type' => $type,
+					'time' => time(),
+				]),
+				0,
+			],
+			['id_task'],
 		);
 	}
 
@@ -1097,37 +1138,38 @@ public static function adminNotify($type, $memberID, $member_name = null)
 	 * @param bool $loadLang Whether to load the language file first
 	 * @return array An array containing the subject and body of the email template, with replacements made
 	 */
-	public static function loadEmailTemplate($template, $replacements = array(), $lang = '', $loadLang = true)
+	public static function loadEmailTemplate($template, $replacements = [], $lang = '', $loadLang = true)
 	{
 		// First things first, load up the email templates language file, if we need to.
-		if ($loadLang)
+		if ($loadLang) {
 			Lang::load('EmailTemplates', $lang);
+		}
 
-		if (!isset(Lang::$txt[$template . '_subject']) || !isset(Lang::$txt[$template . '_body']))
-			ErrorHandler::fatalLang('email_no_template', 'template', array($template));
+		if (!isset(Lang::$txt[$template . '_subject']) || !isset(Lang::$txt[$template . '_body'])) {
+			ErrorHandler::fatalLang('email_no_template', 'template', [$template]);
+		}
 
-		$ret = array(
+		$ret = [
 			'subject' => Lang::$txt[$template . '_subject'],
 			'body' => Lang::$txt[$template . '_body'],
 			'is_html' => !empty(Lang::$txt[$template . '_html']),
-		);
+		];
 
 		// Add in the default replacements.
-		$replacements += array(
+		$replacements += [
 			'FORUMNAME' => Config::$mbname,
 			'SCRIPTURL' => Config::$scripturl,
 			'THEMEURL' => Theme::$current->settings['theme_url'],
 			'IMAGESURL' => Theme::$current->settings['images_url'],
 			'DEFAULT_THEMEURL' => Theme::$current->settings['default_theme_url'],
 			'REGARDS' => sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name']),
-		);
+		];
 
 		// Split the replacements up into two arrays, for use with str_replace
-		$find = array();
-		$replace = array();
+		$find = [];
+		$replace = [];
 
-		foreach ($replacements as $f => $r)
-		{
+		foreach ($replacements as $f => $r) {
 			$find[] = '{' . $f . '}';
 			$replace[] = $r;
 		}
@@ -1157,17 +1199,16 @@ public static function loadEmailTemplate($template, $replacements = array(), $la
 	 */
 	protected static function userInfoCallback($matches)
 	{
-		if (empty($matches[1]))
+		if (empty($matches[1])) {
 			return '';
+		}
 
 		$use_ref = true;
 
-		foreach (explode('.', $matches[1]) as $index)
-		{
-			if ($use_ref && isset(User::$me->{$index}))
+		foreach (explode('.', $matches[1]) as $index) {
+			if ($use_ref && isset(User::$me->{$index})) {
 				$ref = &User::$me->{$index};
-			else
-			{
+			} else {
 				$use_ref = false;
 				break;
 			}
@@ -1178,7 +1219,8 @@ protected static function userInfoCallback($matches)
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Mail::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Mail::exportStatic')) {
 	Mail::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Mentions.php b/Sources/Mentions.php
index 4f704860fb..fb83764588 100644
--- a/Sources/Mentions.php
+++ b/Sources/Mentions.php
@@ -36,16 +36,16 @@ class Mentions
 	 * Returns mentions for a specific content
 	 *
 	 * @static
-	 * @access public
 	 * @param string $content_type The content type
 	 * @param int $content_id The ID of the desired content
 	 * @param array $members Whether to limit to a specific set of members
 	 * @return array An array of arrays containing info about each member mentioned
 	 */
-	public static function getMentionsByContent($content_type, $content_id, array $members = array())
+	public static function getMentionsByContent($content_type, $content_id, array $members = [])
 	{
-		$request = Db::$db->query('', '
-			SELECT mem.id_member, mem.real_name, mem.email_address, mem.id_group, mem.id_post_group, mem.additional_groups,
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member, mem.real_name, mem.email_address, mem.id_group, mem.id_post_group, mem.additional_groups,
 				mem.lngfile, ment.id_member AS id_mentioned_by, ment.real_name AS mentioned_by_name
 			FROM {db_prefix}mentions AS m
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_mentioned)
@@ -53,25 +53,27 @@ public static function getMentionsByContent($content_type, $content_id, array $m
 			WHERE content_type = {string:type}
 				AND content_id = {int:id}' . (!empty($members) ? '
 				AND mem.id_member IN ({array_int:members})' : ''),
-			array(
+			[
 				'type' => $content_type,
 				'id' => $content_id,
 				'members' => (array) $members,
-			)
+			],
 		);
-		$members = array();
-		while ($row = Db::$db->fetch_assoc($request))
-			$members[$row['id_member']] = array(
+		$members = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$members[$row['id_member']] = [
 				'id' => $row['id_member'],
 				'real_name' => $row['real_name'],
 				'email_address' => $row['email_address'],
-				'groups' => array_unique(array_merge(array($row['id_group'], $row['id_post_group']), explode(',', $row['additional_groups']))),
-				'mentioned_by' => array(
+				'groups' => array_unique(array_merge([$row['id_group'], $row['id_post_group']], explode(',', $row['additional_groups']))),
+				'mentioned_by' => [
 					'id' => $row['id_mentioned_by'],
 					'name' => $row['mentioned_by_name'],
-				),
+				],
 				'lngfile' => $row['lngfile'],
-			);
+			];
+		}
 		Db::$db->free_result($request);
 
 		return $members;
@@ -81,7 +83,6 @@ public static function getMentionsByContent($content_type, $content_id, array $m
 	 * Inserts mentioned members
 	 *
 	 * @static
-	 * @access public
 	 * @param string $content_type The content type
 	 * @param int $content_id The ID of the specified content
 	 * @param array $members An array of members who have been mentioned
@@ -89,15 +90,15 @@ public static function getMentionsByContent($content_type, $content_id, array $m
 	 */
 	public static function insertMentions($content_type, $content_id, array $members, $id_member)
 	{
-		IntegrationHook::call('mention_insert_' . $content_type, array($content_id, &$members));
+		IntegrationHook::call('mention_insert_' . $content_type, [$content_id, &$members]);
 
-		foreach ($members as $member)
-		{
-			Db::$db->insert('ignore',
+		foreach ($members as $member) {
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}mentions',
-				array('content_id' => 'int', 'content_type' => 'string', 'id_member' => 'int', 'id_mentioned' => 'int', 'time' => 'int'),
-				array((int) $content_id, $content_type, $id_member, $member['id'], time()),
-				array('content_id', 'content_type', 'id_mentioned')
+				['content_id' => 'int', 'content_type' => 'string', 'id_member' => 'int', 'id_mentioned' => 'int', 'time' => 'int'],
+				[(int) $content_id, $content_type, $id_member, $member['id'], time()],
+				['content_id', 'content_type', 'id_mentioned'],
 			);
 		}
 	}
@@ -108,7 +109,6 @@ public static function insertMentions($content_type, $content_id, array $members
 	 * Intended for use when a post is modified.
 	 *
 	 * @static
-	 * @access public
 	 * @param string $content_type The content type
 	 * @param int $content_id The ID of the specified content
 	 * @param array $members An array of members who have been mentioned
@@ -124,46 +124,50 @@ public static function modifyMentions($content_type, $content_id, array $members
 		$members_unchanged = array_diff_key($existing_members, $members_to_remove, $members_to_insert);
 
 		// Delete mentions from the table that have been deleted in the content.
-		if (!empty($members_to_remove))
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}mentions
+		if (!empty($members_to_remove)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}mentions
 				WHERE content_type = {string:type}
 					AND content_id = {int:id}
 					AND id_mentioned IN ({array_int:members})',
-				array(
+				[
 					'type' => $content_type,
 					'id' => $content_id,
 					'members' => array_keys($members_to_remove),
-				)
+				],
 			);
+		}
 
 		// Insert any new mentions.
-		if (!empty($members_to_insert))
+		if (!empty($members_to_insert)) {
 			self::insertMentions($content_type, $content_id, $members_to_insert, $id_member);
+		}
 
-		return array(
+		return [
 			'unchanged' => $members_unchanged,
 			'removed' => $members_to_remove,
 			'added' => $members_to_insert,
-		);
+		];
 	}
 
 	/**
 	 * Gets appropriate mentions replaced in the body
 	 *
 	 * @static
-	 * @access public
 	 * @param string $body The text to look for mentions in
 	 * @param array $members An array of arrays containing info about members (each should have 'id' and 'member')
 	 * @return string The body with mentions replaced
 	 */
 	public static function getBody($body, array $members)
 	{
-		if (empty($body))
+		if (empty($body)) {
 			return $body;
+		}
 
-		foreach ($members as $member)
+		foreach ($members as $member) {
 			$body = str_ireplace(static::$char . $member['real_name'], '[member=' . $member['id'] . ']' . $member['real_name'] . '[/member]', $body);
+		}
 
 		return $body;
 	}
@@ -172,50 +176,56 @@ public static function getBody($body, array $members)
 	 * Takes a piece of text and finds all the mentioned members in it
 	 *
 	 * @static
-	 * @access public
 	 * @param string $body The body to get mentions from
 	 * @return array An array of arrays containing members who were mentioned (each has 'id_member' and 'real_name')
 	 */
 	public static function getMentionedMembers($body)
 	{
-		if (empty($body))
-			return array();
+		if (empty($body)) {
+			return [];
+		}
 
 		$possible_names = self::getPossibleMentions($body);
 		$existing_mentions = self::getExistingMentions($body);
 
-		if ((empty($possible_names) && empty($existing_mentions)) || !User::$me->allowedTo('mention'))
-			return array();
+		if ((empty($possible_names) && empty($existing_mentions)) || !User::$me->allowedTo('mention')) {
+			return [];
+		}
 
 		// Make sure we don't pass empty arrays to the query.
-		if (empty($existing_mentions))
-			$existing_mentions = array(0 => '');
-		if (empty($possible_names))
+		if (empty($existing_mentions)) {
+			$existing_mentions = [0 => ''];
+		}
+
+		if (empty($possible_names)) {
 			$possible_names = $existing_mentions;
+		}
 
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:ids})
 				OR real_name IN ({array_string:names})
 			ORDER BY LENGTH(real_name) DESC
 			LIMIT {int:count}',
-			array(
+			[
 				'ids' => array_keys($existing_mentions),
 				'names' => $possible_names,
 				'count' => count($possible_names),
-			)
+			],
 		);
-		$members = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset($existing_mentions[$row['id_member']]) && stripos($body, static::$char . $row['real_name']) === false)
+		$members = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset($existing_mentions[$row['id_member']]) && stripos($body, static::$char . $row['real_name']) === false) {
 				continue;
+			}
 
-			$members[$row['id_member']] = array(
+			$members[$row['id_member']] = [
 				'id' => $row['id_member'],
 				'real_name' => $row['real_name'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -242,63 +252,64 @@ public static function getMentionedMembers($body)
 	 * This makes the @ symbol to not be required to be escaped
 	 *
 	 * @static
-	 * @access protected
 	 * @param string $body The text to look for mentions in
 	 * @return array An array of names of members who have been mentioned
 	 */
 	protected static function getPossibleMentions($body)
 	{
-		if (empty($body))
-			return array();
+		if (empty($body)) {
+			return [];
+		}
 
 		// preparse code does a few things which might mess with our parsing
-		$body = htmlspecialchars_decode(preg_replace('~<br\s*/?'.'>~', "\n", str_replace('&nbsp;', ' ', $body)), ENT_QUOTES);
+		$body = htmlspecialchars_decode(preg_replace('~<br\s*/?' . '>~', "\n", str_replace('&nbsp;', ' ', $body)), ENT_QUOTES);
 
-		if (empty(self::$excluded_bbc_regex))
+		if (empty(self::$excluded_bbc_regex)) {
 			self::setExcludedBbcRegex();
+		}
 
 		// Exclude the content of various BBCodes.
 		$body = preg_replace('~\[(' . self::$excluded_bbc_regex . ')[^\]]*\](?' . '>(?' . '>[^\[]|\[(?!/?\1[^\]]*\]))|(?0))*\[/\1\]~', '', $body);
 
-		$matches = array();
+		$matches = [];
 		// Split before every Unicode character.
 		$string = preg_split('/(?=\X)/u', $body, -1, PREG_SPLIT_NO_EMPTY);
 		$depth = 0;
-		foreach ($string as $k => $char)
-		{
-			if ($char == static::$char && ($k == 0 || trim($string[$k - 1]) == ''))
-			{
+
+		foreach ($string as $k => $char) {
+			if ($char == static::$char && ($k == 0 || trim($string[$k - 1]) == '')) {
 				$depth++;
-				$matches[] = array();
-			}
-			elseif ($char == "\n")
+				$matches[] = [];
+			} elseif ($char == "\n") {
 				$depth = 0;
+			}
 
-			for ($i = $depth; $i > 0; $i--)
-			{
-				if (count($matches[count($matches) - $i]) > 60)
-				{
+			for ($i = $depth; $i > 0; $i--) {
+				if (count($matches[count($matches) - $i]) > 60) {
 					$depth--;
+
 					continue;
 				}
 				$matches[count($matches) - $i][] = $char;
 			}
 		}
 
-		foreach ($matches as $k => $match)
+		foreach ($matches as $k => $match) {
 			$matches[$k] = substr(implode('', $match), 1);
+		}
 
 		// Names can have spaces, other breaks, or they can't...we try to match every possible
 		// combination.
-		$names = array();
-		foreach ($matches as $match)
-		{
+		$names = [];
+
+		foreach ($matches as $match) {
 			// '[^\p{L}\p{M}\p{N}_]' is the Unicode equivalent of '[^\w]'
 			$match = preg_split('/([^\p{L}\p{M}\p{N}_])/u', $match, -1, PREG_SPLIT_DELIM_CAPTURE);
 			$count = count($match);
 
-			for ($i = 1; $i <= $count; $i++)
+			for ($i = 1; $i <= $count; $i++) {
 				$names[] = Utils::htmlspecialchars(Utils::htmlTrim(implode('', array_slice($match, 0, $i))));
+			}
 		}
 
 		$names = array_unique($names);
@@ -310,25 +321,26 @@ protected static function getPossibleMentions($body)
 	 * Like getPossibleMentions(), but for `[member=1]name[/member]` format.
 	 *
 	 * @static
-	 * @access public
 	 * @param string $body The text to look for mentions in.
 	 * @param array $members An array of arrays containing info about members (each should have 'id' and 'member').
 	 * @return array An array of arrays containing info about members that are in fact mentioned in the body.
 	 */
 	public static function getExistingMentions($body)
 	{
-		if (empty(self::$excluded_bbc_regex))
+		if (empty(self::$excluded_bbc_regex)) {
 			self::setExcludedBbcRegex();
+		}
 
 		// Don't include mentions inside quotations, etc.
 		$body = preg_replace('~\[(' . self::$excluded_bbc_regex . ')[^\]]*\](?' . '>(?' . '>[^\[]|\[(?!/?\1[^\]]*\]))|(?0))*\[/\1\]~', '', $body);
 
-		$existing_mentions = array();
+		$existing_mentions = [];
 
 		preg_match_all('~\[member=([0-9]+)\]([^\[]*)\[/member\]~', $body, $matches, PREG_SET_ORDER);
 
-		foreach ($matches as $match_set)
+		foreach ($matches as $match_set) {
 			$existing_mentions[$match_set[1]] = trim($match_set[2]);
+		}
 
 		return $existing_mentions;
 	}
@@ -340,26 +352,27 @@ public static function getExistingMentions($body)
 	 * the Mentions::getBody() function.
 	 *
 	 * @static
-	 * @access public
 	 * @param string $body The text to look for mentions in.
 	 * @param array $members An array of arrays containing info about members (each should have 'id' and 'member').
 	 * @return array An array of arrays containing info about members that are in fact mentioned in the body.
 	 */
 	public static function verifyMentionedMembers($body, array $members)
 	{
-		if (empty($body))
-			return array();
+		if (empty($body)) {
+			return [];
+		}
 
-		if (empty(self::$excluded_bbc_regex))
+		if (empty(self::$excluded_bbc_regex)) {
 			self::setExcludedBbcRegex();
+		}
 
 		// Don't include mentions inside quotations, etc.
 		$body = preg_replace('~\[(' . self::$excluded_bbc_regex . ')[^\]]*\](?' . '>(?' . '>[^\[]|\[(?!/?\1[^\]]*\]))|(?0))*\[/\1\]~', '', $body);
 
-		foreach ($members as $member)
-		{
-			if (strpos($body, '[member=' . $member['id'] . ']' . $member['real_name'] . '[/member]') === false)
+		foreach ($members as $member) {
+			if (strpos($body, '[member=' . $member['id'] . ']' . $member['real_name'] . '[/member]') === false) {
 				unset($members[$member['id']]);
+			}
 		}
 
 		return $members;
@@ -369,70 +382,73 @@ public static function verifyMentionedMembers($body, array $members)
 	 * Retrieves info about the authors of posts quoted in a block of text.
 	 *
 	 * @static
-	 * @access public
 	 * @param string $body A block of text, such as the body of a post.
 	 * @param int $poster_id The member ID of the author of the text.
 	 * @return array Info about any members who were quoted.
 	 */
 	public static function getQuotedMembers($body, $poster_id)
 	{
-		if (empty($body))
-			return array();
+		if (empty($body)) {
+			return [];
+		}
 
 		$blocks = preg_split('/(\[quote.*?\]|\[\/quote\])/i', $body, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
 		$quote_level = 0;
 		$message = '';
 
-		foreach ($blocks as $block)
-		{
-			if (preg_match('/\[quote(.*)?\]/i', $block, $matches))
-			{
-				if ($quote_level == 0)
+		foreach ($blocks as $block) {
+			if (preg_match('/\[quote(.*)?\]/i', $block, $matches)) {
+				if ($quote_level == 0) {
 					$message .= '[quote' . $matches[1] . ']';
+				}
 				$quote_level++;
-			}
-			elseif (preg_match('/\[\/quote\]/i', $block))
-			{
-				if ($quote_level <= 1)
+			} elseif (preg_match('/\[\/quote\]/i', $block)) {
+				if ($quote_level <= 1) {
 					$message .= '[/quote]';
-				if ($quote_level >= 1)
-				{
+				}
+
+				if ($quote_level >= 1) {
 					$quote_level--;
 					$message .= "\n";
 				}
-			}
-			elseif ($quote_level <= 1)
+			} elseif ($quote_level <= 1) {
 				$message .= $block;
+			}
 		}
 
 		preg_match_all('/\[quote.*?link=msg=([0-9]+).*?\]/i', $message, $matches);
 
 		$id_msgs = $matches[1];
-		foreach ($id_msgs as $k => $id_msg)
+
+		foreach ($id_msgs as $k => $id_msg) {
 			$id_msgs[$k] = (int) $id_msg;
+		}
 
-		if (empty($id_msgs))
-			return array();
+		if (empty($id_msgs)) {
+			return [];
+		}
 
 		// Get the messages
-		$request = Db::$db->query('', '
-			SELECT m.id_member AS id, mem.email_address, mem.lngfile, mem.real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_member AS id, mem.email_address, mem.lngfile, mem.real_name
 			FROM {db_prefix}messages AS m
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 			WHERE id_msg IN ({array_int:msgs})
 			LIMIT {int:count}',
-			array(
+			[
 				'msgs' => array_unique($id_msgs),
 				'count' => count(array_unique($id_msgs)),
-			)
+			],
 		);
 
-		$members = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if ($poster_id == $row['id'])
+		$members = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if ($poster_id == $row['id']) {
 				continue;
+			}
 
 			$members[$row['id']] = $row;
 		}
@@ -444,20 +460,18 @@ public static function getQuotedMembers($body, $poster_id)
 	 * Builds a regular expression matching BBC that can't contain mentions.
 	 *
 	 * @static
-	 * @access protected
 	 */
 	protected static function setExcludedBbcRegex()
 	{
-		if (empty(self::$excluded_bbc_regex))
-		{
+		if (empty(self::$excluded_bbc_regex)) {
 			// Exclude quotes. We don't want to get double mentions.
-			$excluded_bbc = array('quote');
+			$excluded_bbc = ['quote'];
 
 			// Exclude everything with unparsed content.
-			foreach (BBCodeParser::getCodes() as $code)
-			{
-				if (!empty($code['type']) && in_array($code['type'], array('unparsed_content', 'unparsed_commas_content', 'unparsed_equals_content')))
+			foreach (BBCodeParser::getCodes() as $code) {
+				if (!empty($code['type']) && in_array($code['type'], ['unparsed_content', 'unparsed_commas_content', 'unparsed_equals_content'])) {
 					$excluded_bbc[] = $code['tag'];
+				}
 			}
 
 			self::$excluded_bbc_regex = Utils::buildRegex($excluded_bbc, '~');
diff --git a/Sources/Menu.php b/Sources/Menu.php
index aa7014e0e2..814e36b8d5 100644
--- a/Sources/Menu.php
+++ b/Sources/Menu.php
@@ -96,19 +96,20 @@
  */
 class Menu implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'create' => 'createMenu',
 			'destroy' => 'destroyMenu',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -202,7 +203,7 @@ class Menu implements \ArrayAccess
 	 *
 	 * The constructed hierarchical menu data.
 	 */
-	public array $sections = array();
+	public array $sections = [];
 
 	/**
 	 * @var array
@@ -210,7 +211,7 @@ class Menu implements \ArrayAccess
 	 * Data about files to include, functions to call, etc., in order to make
 	 * the current area work.
 	 */
-	public array $include_data = array();
+	public array $include_data = [];
 
 	/**
 	 * @var array
@@ -221,7 +222,7 @@ class Menu implements \ArrayAccess
 	 * The tab buttons typically (but not always) correspond to the menu items
 	 * in the current subsection.
 	 */
-	public array $tab_data = array();
+	public array $tab_data = [];
 
 	/**************************
 	 * Public static properties
@@ -240,7 +241,7 @@ class Menu implements \ArrayAccess
 	 * All loaded instances of this class.
 	 * Keys are action names.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -251,14 +252,14 @@ class Menu implements \ArrayAccess
 	 *
 	 * Holds the $data parameter passed to the constructor.
 	 */
-	protected array $data = array();
+	protected array $data = [];
 
 	/**
 	 * @var array
 	 *
 	 * Holds the $options parameter passed to the constructor.
 	 */
-	protected array $options = array();
+	protected array $options = [];
 
 	/**
 	 * @var bool
@@ -286,7 +287,7 @@ class Menu implements \ArrayAccess
 	 * @param array $data An array of menu data.
 	 * @param array $options An array of menu options.
 	 */
-	public function __construct(array $data, array $options = array())
+	public function __construct(array $data, array $options = [])
 	{
 		// Let other methods access the passed data and options.
 		$this->data = $data;
@@ -310,51 +311,50 @@ public function __construct(array $data, array $options = array())
 		 *		integrate_moderate_areas
 		 *		integrate_pm_areas
 		 */
-		if (!empty($this->current_action) && empty($this->options['disable_hook_call']))
-		{
-			IntegrationHook::call('integrate_' . $this->current_action . '_areas', array(&$this->data));
+		if (!empty($this->current_action) && empty($this->options['disable_hook_call'])) {
+			IntegrationHook::call('integrate_' . $this->current_action . '_areas', [&$this->data]);
 		}
 
 		// Should we use a custom base url, or use the default?
-		$this->base_url = isset($this->options['base_url']) ? $this->options['base_url'] : Config::$scripturl . '?action=' . $this->current_action;
+		$this->base_url = $this->options['base_url'] ?? Config::$scripturl . '?action=' . $this->current_action;
 
 		// What is the current area selected?
-		if (isset($this->options['current_area']) || isset($_GET['area']))
+		if (isset($this->options['current_area']) || isset($_GET['area'])) {
 			$this->current_area = $this->options['current_area'] ?? $_GET['area'];
+		}
 
 		$this->buildExtraParameters();
 
 		// Now setup the context correctly.
-		foreach ($this->data as $section_id => $section)
-		{
+		foreach ($this->data as $section_id => $section) {
 			$this->section_id = $section_id;
 			$this->buildSection($section);
 		}
 
 		// If still no data then return - nothing to show!
-		if (empty($this->sections))
-		{
+		if (empty($this->sections)) {
 			// Never happened!
-			if (--self::$max_id == 0)
-				unset(Utils::$context['max_menu_id']);
+			if (--self::$max_id == 0) {
+				unset(Utils::$context['max_menu_id'], $this->data, $this->options);
+			}
 
-			unset($this->data, $this->options);
-			$this->include_data = array();
+			$this->include_data = [];
 
 			return;
 		}
 
 		// If we didn't find the area we were looking for go to a default one.
-		if (isset($this->backup_area) && empty($this->found_section))
+		if (isset($this->backup_area) && empty($this->found_section)) {
 			$this->current_area = $this->backup_area;
+		}
 
 		$this->setSelected();
 		$this->checkBaseUrl();
 
 		// Almost there - load the template and add to the template layers.
-		Theme::loadTemplate(isset($this->options['template_name']) ? $this->options['template_name'] : 'GenericMenu');
+		Theme::loadTemplate($this->options['template_name'] ?? 'GenericMenu');
 
-		$this->layer_name = (isset($this->options['layer_name']) ? $this->options['layer_name'] : 'generic_menu') . '_dropdown';
+		$this->layer_name = ($this->options['layer_name'] ?? 'generic_menu') . '_dropdown';
 
 		Utils::$context['template_layers'][] = $this->layer_name;
 
@@ -362,16 +362,17 @@ public function __construct(array $data, array $options = array())
 		unset($this->data, $this->options);
 
 		// Check we had something - for sanity sake.
-		if (empty($this->include_data))
+		if (empty($this->include_data)) {
 			return;
+		}
 
 		// Finally - return information on the selected item.
-		$this->include_data += array(
+		$this->include_data += [
 			'current_action' => $this->current_action,
 			'current_section' => $this->current_section,
 			'current_area' => $this->current_area,
 			'current_subsection' => $this->current_subsection,
-		);
+		];
 
 		// Backward compatibility...
 		Utils::$context['max_menu_id'] = &self::$max_id;
@@ -389,7 +390,7 @@ public function __construct(array $data, array $options = array())
 	 * @param array $options An array of menu options.
 	 * @return array|false Info about the selected menu item, or false if nothing to show.
 	 */
-	public static function create(array $data, array $options = array()): array|false
+	public static function create(array $data, array $options = []): array|false
 	{
 		$menu = new self($data, $options);
 
@@ -403,28 +404,26 @@ public static function create(array $data, array $options = array()): array|fals
 	 */
 	public static function destroy(int|string $id = 'last'): void
 	{
-		if ($id === 'last')
+		if ($id === 'last') {
 			$id = self::$max_id;
+		}
 
-		if (!is_int($id))
-		{
+		if (!is_int($id)) {
 			$to_delete = $id;
-		}
-		else
-		{
-			foreach (self::$loaded as $action => $menu)
-			{
-				if ($menu->id == $id)
+		} else {
+			foreach (self::$loaded as $action => $menu) {
+				if ($menu->id == $id) {
 					$to_delete = $action;
+				}
 			}
 		}
 
-		if (!isset(self::$loaded[$to_delete]))
+		if (!isset(self::$loaded[$to_delete])) {
 			return;
+		}
 
-		if (isset(self::$loaded[$to_delete]->layer_name))
-		{
-			Utils::$context['template_layers'] = array_diff(Utils::$context['template_layers'], array(self::$loaded[$to_delete]->layer_name));
+		if (isset(self::$loaded[$to_delete]->layer_name)) {
+			Utils::$context['template_layers'] = array_diff(Utils::$context['template_layers'], [self::$loaded[$to_delete]->layer_name]);
 		}
 
 		unset(Utils::$context[self::$loaded[$to_delete]->name], self::$loaded[$to_delete]);
@@ -439,15 +438,14 @@ public static function destroy(int|string $id = 'last'): void
 	 */
 	protected function buildExtraParameters(): void
 	{
-		if (!empty($this->options['extra_url_parameters']))
-		{
-			foreach ($this->options['extra_url_parameters'] as $key => $value)
+		if (!empty($this->options['extra_url_parameters'])) {
+			foreach ($this->options['extra_url_parameters'] as $key => $value) {
 				$this->extra_parameters .= ';' . $key . '=' . $value;
+			}
 		}
 
 		// Only include the session ID in the URL if it's strictly necessary.
-		if (empty($this->options['disable_url_session_check']))
-		{
+		if (empty($this->options['disable_url_session_check'])) {
 			$this->extra_parameters .= ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 		}
 	}
@@ -458,13 +456,11 @@ protected function buildExtraParameters(): void
 	 */
 	protected function enabledAndAllowed($menu_item): bool
 	{
-		if (isset($menu_item['enabled']) && $menu_item['enabled'] == false)
-			return false;
-
-		if (isset($menu_item['permission']) && !User::$me->allowedTo($menu_item['permission']))
+		if (isset($menu_item['enabled']) && $menu_item['enabled'] == false) {
 			return false;
+		}
 
-		return true;
+		return !(isset($menu_item['permission']) && !User::$me->allowedTo($menu_item['permission']));
 	}
 
 	/**
@@ -473,27 +469,28 @@ protected function enabledAndAllowed($menu_item): bool
 	protected function buildSection($section): void
 	{
 		// Is this enabled - or has as permission check - which fails?
-		if (!$this->enabledAndAllowed($section))
+		if (!$this->enabledAndAllowed($section)) {
 			return;
+		}
 
-		$this->sections[$this->section_id] = array(
+		$this->sections[$this->section_id] = [
 			'id' => $this->section_id,
 			'title' => $section['title'],
 			'amt' => $section['amt'] ?? null,
-			'areas' => array(),
+			'areas' => [],
 			'selected' => false,
-		);
+		];
 
 		// Now we cycle through the sections to pick the right area.
-		foreach ($section['areas'] as $area_id => $area)
-		{
+		foreach ($section['areas'] as $area_id => $area) {
 			$this->area_id = $area_id;
 			$this->buildArea($area);
 		}
 
 		// Delete the section if it contains no visible areas.
-		if (empty($this->sections[$this->section_id]['areas']))
+		if (empty($this->sections[$this->section_id]['areas'])) {
 			unset($this->sections[$this->section_id]);
+		}
 	}
 
 	/**
@@ -502,39 +499,41 @@ protected function buildSection($section): void
 	protected function buildArea($area): void
 	{
 		// Can we do this?
-		if (!$this->enabledAndAllowed($area))
+		if (!$this->enabledAndAllowed($area)) {
 			return;
+		}
 
-		if (!isset($area['label']) && (!isset(Lang::$txt[$this->area_id]) || isset($area['select'])))
-		{
+		if (!isset($area['label']) && (!isset(Lang::$txt[$this->area_id]) || isset($area['select']))) {
 			$this->setCurrentSectionAndArea();
+
 			return;
 		}
 
 		// If we haven't got an area then the first valid one is our choice.
-		if (empty($this->current_area))
+		if (empty($this->current_area)) {
 			$this->current_area = $this->area_id;
+		}
 
 		// If this is hidden from view don't do the rest.
-		if (!empty($area['hidden']))
-		{
+		if (!empty($area['hidden'])) {
 			$this->setCurrentSectionAndArea();
+
 			return;
 		}
 
 		// Define the new area.
-		$this->sections[$this->section_id]['areas'][$this->area_id] = array(
+		$this->sections[$this->section_id]['areas'][$this->area_id] = [
 			'id' => $this->area_id,
 			'label' => $area['label'] ?? (Lang::$txt[$this->area_id] ?? $this->area_id),
 			'url' => $area['custom_url'] ?? $this->base_url . ';area=' . $this->area_id,
 			'amt' => $area['amt'] ?? null,
-			'subsections' => array(),
+			'subsections' => [],
 			'selected' => false,
 			// Some areas may be listed but not active, which we show as greyed out.
 			'inactive' => !empty($area['inactive']),
 			// This will usually change when we build the subsections.
 			'hide_subsections' => true,
-		);
+		];
 
 		// A reference to keep things legible.
 		$this_area = &$this->sections[$this->section_id]['areas'][$this->area_id];
@@ -543,32 +542,29 @@ protected function buildArea($area): void
 		$this->setAreaIcon($area);
 
 		// Did it have subsections?
-		if (!empty($area['subsections']))
-		{
-			foreach ($area['subsections'] as $sa => $subsection)
-			{
+		if (!empty($area['subsections'])) {
+			foreach ($area['subsections'] as $sa => $subsection) {
 				$this->subsection_id = $sa;
 				$this->buildSubsection($subsection);
 			}
 
 			// If permissions removed/disabled for all submenu items, remove the menu item
-			if (empty($this_area['subsections']))
-			{
+			if (empty($this_area['subsections'])) {
 				unset($this_area, $this->sections[$this->section_id]['areas'][$this->area_id]);
+
 				return;
 			}
+
 			// Set which one is first, last, and selected in the group.
-			else
-			{
-				$first_sa = array_key_first($this_area['subsections']);
-				$last_sa = array_key_last($this_area['subsections']);
+			$first_sa = array_key_first($this_area['subsections']);
+			$last_sa = array_key_last($this_area['subsections']);
 
-				$this_area['subsections'][Utils::$context['right_to_left'] ? $last_sa : $first_sa]['is_first'] = true;
+			$this_area['subsections'][Utils::$context['right_to_left'] ? $last_sa : $first_sa]['is_first'] = true;
 
-				$this_area['subsections'][Utils::$context['right_to_left'] ? $first_sa : $last_sa]['is_last'] = true;
+			$this_area['subsections'][Utils::$context['right_to_left'] ? $first_sa : $last_sa]['is_last'] = true;
 
-				if ($this->current_area == $this->area_id && empty($this->current_subsection))
-					$this->current_subsection = $first_sa;
+			if ($this->current_area == $this->area_id && empty($this->current_subsection)) {
+				$this->current_subsection = $first_sa;
 			}
 		}
 
@@ -583,45 +579,45 @@ protected function buildSubsection($subsection): void
 		$this_area = &$this->sections[$this->section_id]['areas'][$this->area_id];
 
 		// In SMF 2.x, the subsection label and permission keys were just 0 and 1.
-		if (!isset($subsection['label']) && !empty($subsection[0]))
+		if (!isset($subsection['label']) && !empty($subsection[0])) {
 			$subsection['label'] = $subsection[0];
+		}
 
-		if (!isset($subsection['permission']) && !empty($subsection[1]))
+		if (!isset($subsection['permission']) && !empty($subsection[1])) {
 			$subsection['permission'] = $subsection[1];
+		}
 
-		if (!isset($subsection['is_default']) && !empty($subsection[2]))
+		if (!isset($subsection['is_default']) && !empty($subsection[2])) {
 			$subsection['is_default'] = $subsection[2];
+		}
 
 		// Define the new subsection.
-		$this_area['subsections'][$this->subsection_id] = array(
+		$this_area['subsections'][$this->subsection_id] = [
 			'id' => $this->subsection_id,
 			'label' => $subsection['label'],
 			'url' => $subsection['url'] ?? $this->base_url . ';area=' . $this->area_id . ';sa=' . $this->subsection_id,
 			'amt' => $subsection['amt'] ?? null,
 			'selected' => false,
-		);
+		];
 
 		// Another reference to keep things legible.
 		$this_subsection = &$this_area['subsections'][$this->subsection_id];
 
 		// If not enabled, mark it as disabled...
-		if (!$this->enabledAndAllowed($subsection))
-		{
+		if (!$this->enabledAndAllowed($subsection)) {
 			$this_subsection['disabled'] = true;
+
 			return;
 		}
 
 		// A bit complicated - but is this set?
-		if ($this->current_area == $this->area_id)
-		{
+		if ($this->current_area == $this->area_id) {
 			// Is this the current subsection?
-			if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $this->subsection_id)
-			{
+			if (isset($_REQUEST['sa']) && $_REQUEST['sa'] == $this->subsection_id) {
 				$this->current_subsection = $this->subsection_id;
 			}
 			// Otherwise is it the default?
-			elseif (empty($this->current_subsection) && !empty($subsection['is_default']))
-			{
+			elseif (empty($this->current_subsection) && !empty($subsection['is_default'])) {
 				$this->current_subsection = $this->subsection_id;
 			}
 		}
@@ -638,32 +634,28 @@ protected function setCurrentSectionAndArea(): void
 		$area = $this->data[$this->section_id]['areas'][$this->area_id];
 
 		// Is this the current section?
-		if (!empty($this->current_area) && $this->current_area == $this->area_id && empty($this->found_section))
-		{
+		if (!empty($this->current_area) && $this->current_area == $this->area_id && empty($this->found_section)) {
 			// Only do this once?
 			$this->found_section = true;
 
 			// Update the context if required - as we can have areas pretending to be others. ;)
 			$this->current_section = $this->section_id;
-			$this->current_area = isset($area['select']) ? $area['select'] : $this->area_id;
+			$this->current_area = $area['select'] ?? $this->area_id;
 
 			// This will be the data we return.
 			$this->include_data = $area;
 
-			if (isset($this->sections[$this->section_id]['areas'][$this->area_id]['subsections']))
-			{
+			if (isset($this->sections[$this->section_id]['areas'][$this->area_id]['subsections'])) {
 				$this->include_data['subsections'] = $this->sections[$this->section_id]['areas'][$this->area_id]['subsections'];
 			}
 		}
 		// Make sure we have something in case it's an invalid area.
-		elseif (empty($this->found_section) && empty($this->include_data))
-		{
+		elseif (empty($this->found_section) && empty($this->include_data)) {
 			$this->current_section = $this->section_id;
-			$this->backup_area = isset($area['select']) ? $area['select'] : $this->area_id;
+			$this->backup_area = $area['select'] ?? $this->area_id;
 			$this->include_data = $area;
 
-			if (isset($this->sections[$this->section_id]['areas'][$this->area_id]['subsections']))
-			{
+			if (isset($this->sections[$this->section_id]['areas'][$this->area_id]['subsections'])) {
 				$this->include_data['subsections'] = $this->sections[$this->section_id]['areas'][$this->area_id]['subsections'];
 			}
 		}
@@ -674,12 +666,13 @@ protected function setCurrentSectionAndArea(): void
 	 */
 	protected function setAreaIcon($area): void
 	{
-		$dirs = array('theme_dir' => 'images_url', 'default_theme_dir' => 'default_images_url');
-		$icon_paths = array('icon' => 'admin');
+		$dirs = ['theme_dir' => 'images_url', 'default_theme_dir' => 'default_images_url'];
+		$icon_paths = ['icon' => 'admin'];
 
 		// Big icons are for the admin home page.
-		if (!empty($this->options['do_big_icons']))
+		if (!empty($this->options['do_big_icons'])) {
 			$icon_paths['icon_file'] = 'admin/big';
+		}
 
 		// For convenience.
 		$this_area = &$this->sections[$this->section_id]['areas'][$this->area_id];
@@ -688,32 +681,28 @@ protected function setAreaIcon($area): void
 		$area['icon'] = $area['icon'] ?? $this->area_id;
 
 		// Icon is a file name.
-		if (($ext = pathinfo($area['icon'], PATHINFO_EXTENSION)) !== '')
-		{
+		if (($ext = pathinfo($area['icon'], PATHINFO_EXTENSION)) !== '') {
 			$no_ext = str_replace('.' . $ext, '', $area['icon']);
 
 			// The icon_class never uses the extension.
 			$this_area['icon_class'] = $this->current_action . '_menu_icon ' . $no_ext;
 
 			// Try to find the files.
-			foreach ($dirs as $dir => $url)
-			{
-				foreach ($icon_paths as $key => $path)
-				{
-					if (file_exists(Theme::$current->settings[$dir] . '/images/' . $path . '/' . $area['icon']))
-					{
+			foreach ($dirs as $dir => $url) {
+				foreach ($icon_paths as $key => $path) {
+					if (file_exists(Theme::$current->settings[$dir] . '/images/' . $path . '/' . $area['icon'])) {
 						$this_area[$key] = '<img src="' . Theme::$current->settings[$url] . '/' . $path . '/' . $area['icon'] . '" alt="">';
 					}
 				}
 			}
 
 			// File not found, so fall back to a class name.
-			if (!isset($this_area['icon']))
+			if (!isset($this_area['icon'])) {
 				$this_area['icon'] = '<span class="main_icons ' . $no_ext . '"></span>';
+			}
 		}
 		// Icon is a class name.
-		else
-		{
+		else {
 			$this_area['icon'] = '<span class="main_icons ' . $area['icon'] . '"></span>';
 			$this_area['icon_class'] = $this->current_action . '_menu_icon ' . $area['icon'];
 		}
@@ -727,18 +716,15 @@ protected function setAreaIcon($area): void
 	 */
 	protected function setSelected(): void
 	{
-		if (!empty($this->current_section) && isset($this->sections[$this->current_section]))
-		{
+		if (!empty($this->current_section) && isset($this->sections[$this->current_section])) {
 			$this->sections[$this->current_section]['selected'] = true;
 		}
 
-		if (!empty($this->current_area) && isset($this->sections[$this->current_section]['areas'][$this->current_area]))
-		{
+		if (!empty($this->current_area) && isset($this->sections[$this->current_section]['areas'][$this->current_area])) {
 			$this->sections[$this->current_section]['areas'][$this->current_area]['selected'] = true;
 		}
 
-		if (!empty($this->current_subsection) && isset($this->sections[$this->current_section]['areas'][$this->current_area]['subsections'][$this->current_subsection]))
-		{
+		if (!empty($this->current_subsection) && isset($this->sections[$this->current_section]['areas'][$this->current_area]['subsections'][$this->current_subsection])) {
 			$this->sections[$this->current_section]['areas'][$this->current_area]['subsections'][$this->current_subsection]['selected'] = true;
 		}
 	}
@@ -748,21 +734,21 @@ protected function setSelected(): void
 	 */
 	protected function checkBaseUrl(): void
 	{
-		foreach ($this->sections as $section_id => $section)
-		{
-			if (isset($section['url']))
+		foreach ($this->sections as $section_id => $section) {
+			if (isset($section['url'])) {
 				continue;
+			}
 
 			$first_area = reset($section['areas']);
 
-			$this->sections[$section_id]['url'] = isset($first_area['url']) ? $first_area['url'] : $this->base_url . ';area=' . array_key_first($section['areas']);
+			$this->sections[$section_id]['url'] = $first_area['url'] ?? $this->base_url . ';area=' . array_key_first($section['areas']);
 		}
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Menu::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Menu::exportStatic')) {
 	Menu::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Msg.php b/Sources/Msg.php
index 1c4fdd00c2..9b3272020f 100644
--- a/Sources/Msg.php
+++ b/Sources/Msg.php
@@ -13,8 +13,8 @@
 
 namespace SMF;
 
-use SMF\Actions\Notify;
 use SMF\Actions\Moderation\ReportedContent;
+use SMF\Actions\Notify;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Search\SearchApi;
 
@@ -27,23 +27,32 @@
  */
 class Msg implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'get' => false,
+	private static $backcompat = [
+		'func_names' => [
+			'preparsecode' => 'preparsecode',
+			'un_preparsecode' => 'un_preparsecode',
+			'fixTags' => 'fixTags',
+			'fixTag' => 'fixTag',
+			'spellCheck' => 'SpellCheck',
 			'create' => 'createPost',
 			'modify' => 'modifyPost',
 			'approve' => 'approvePosts',
+			'clearApprovalAlerts' => 'clearApprovalAlerts',
+			'updateLastMessages' => 'updateLastMessages',
 			'remove' => 'removeMessage',
-		),
-	);
+			'spell_init' => 'spell_init',
+			'spell_check' => 'spell_check',
+			'spell_suggest' => 'spell_suggest',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -191,7 +200,7 @@ class Msg implements \ArrayAccess
 	 *
 	 * Formatted versions of this message's properties, suitable for display.
 	 */
-	public array $formatted = array();
+	public array $formatted = [];
 
 	/**************************
 	 * Public static properties
@@ -202,7 +211,7 @@ class Msg implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var object|array
@@ -221,13 +230,13 @@ class Msg implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_msg' => 'id',
 		'timestamp' => 'poster_time',
 
 		// Initial exclamation mark means inverse of the property.
 		'new' => '!is_read',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -266,7 +275,7 @@ class Msg implements \ArrayAccess
 	 * @param int $id The ID number of the message.
 	 * @param array $props Properties to set for this message.
 	 */
-	public function __construct(int $id, array $props = array())
+	public function __construct(int $id, array $props = [])
 	{
 		$this->id = $id;
 		$this->set($props);
@@ -280,7 +289,7 @@ public function __construct(int $id, array $props = array())
 	 * @param array $format_options Options to control output.
 	 * @return array A copy of $this->formatted.
 	 */
-	public function format(int $counter = 0, array $format_options = array()): array
+	public function format(int $counter = 0, array $format_options = []): array
 	{
 		// These options are enabled by default.
 		$format_options['do_permissions'] = $format_options['do_permissions'] ?? true;
@@ -291,11 +300,11 @@ public function format(int $counter = 0, array $format_options = array()): array
 		$format_options['load_board'] = !empty($format_options['load_board']);
 		$format_options['make_preview'] = !empty($format_options['make_preview']);
 		$format_options['shorten_subject'] = empty($format_options['shorten_subject']) ? 0 : (!is_numeric($format_options['shorten_subject']) ? 24 : (int) $format_options['shorten_subject']);
-		$format_options['url_params'] = isset($format_options['url_params']) ? (array) $format_options['url_params'] : array();
+		$format_options['url_params'] = isset($format_options['url_params']) ? (array) $format_options['url_params'] : [];
 
 		// Compose the memory eat- I mean message array.
-		$this->formatted += array(
-			'attachment' => !empty(Utils::$context['loaded_attachments']) ? Attachment::loadAttachmentContext($this->id, Utils::$context['loaded_attachments']) : array(),
+		$this->formatted += [
+			'attachment' => !empty(Utils::$context['loaded_attachments']) ? Attachment::loadAttachmentContext($this->id, Utils::$context['loaded_attachments']) : [],
 			'id' => $this->id,
 			'topic' => $this->id_topic,
 			'board' => $format_options['load_board'] ? Board::init($this->id_board) : $this->id_board,
@@ -305,41 +314,36 @@ public function format(int $counter = 0, array $format_options = array()): array
 			'timestamp' => $this->poster_time,
 			'raw_timestamp' => $this->poster_time,
 			'counter' => $counter,
-			'modified' => array(
+			'modified' => [
 				'time' => Time::create('@' . $this->modified_time)->format(),
 				'timestamp' => $this->modified_time,
 				'name' => $this->modified_name,
 				'reason' => $this->modified_reason,
-			),
+			],
 			'body' => $this->body ?? '',
 			'new' => empty($this->is_read),
 			'first_new' => isset(Utils::$context['start_from']) && Utils::$context['start_from'] == $counter,
 			'is_ignored' => !empty(Config::$modSettings['enable_buddylist']) && !empty(Theme::$current->options['posts_apply_ignore_list']) && in_array($this->id_member, User::$me->ignoreusers),
-		);
+		];
 
 		// Are we showing the icon?
-		if (!empty($format_options['do_icon']))
-		{
+		if (!empty($format_options['do_icon'])) {
 			// Utils::$context['icon_sources'] says where each icon should come from - here we set up the ones which will always exist!
-			if (empty(Utils::$context['icon_sources']))
-			{
-				Utils::$context['icon_sources'] = array();
+			if (empty(Utils::$context['icon_sources'])) {
+				Utils::$context['icon_sources'] = [];
 
-				foreach (Utils::$context['stable_icons'] as $icon)
+				foreach (Utils::$context['stable_icons'] as $icon) {
 					Utils::$context['icon_sources'][$icon] = 'images_url';
+				}
 			}
 
 			// Message Icon Management... check the images exist.
-			if (!empty(Config::$modSettings['messageIconChecks_enable']))
-			{
+			if (!empty(Config::$modSettings['messageIconChecks_enable'])) {
 				// If the current icon isn't known, then we need to do something...
-				if (!isset(Utils::$context['icon_sources'][$this->icon]))
-				{
+				if (!isset(Utils::$context['icon_sources'][$this->icon])) {
 					Utils::$context['icon_sources'][$this->icon] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $this->icon . '.png') ? 'images_url' : 'default_images_url';
 				}
-			}
-			elseif (!isset(Utils::$context['icon_sources'][$this->icon]))
-			{
+			} elseif (!isset(Utils::$context['icon_sources'][$this->icon])) {
 				Utils::$context['icon_sources'][$this->icon] = 'images_url';
 			}
 
@@ -347,22 +351,21 @@ public function format(int $counter = 0, array $format_options = array()): array
 			$this->formatted['icon'] = $this->icon;
 
 			// If it's in the recycle bin we need to override the icon.
-			if (!empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) && Config::$modSettings['recycle_board'] == $this->id_board)
-			{
+			if (!empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) && Config::$modSettings['recycle_board'] == $this->id_board) {
 				$this->formatted['icon'] = 'recycled';
 			}
 
 			// Does this message have any attachments? If so, change the icon.
-			if (!empty($this->formatted['attachment']))
+			if (!empty($this->formatted['attachment'])) {
 				$this->formatted['icon'] = 'clip';
+			}
 
 			// Set the full URL of the icon image.
 			$this->formatted['icon_url'] = Theme::$current->settings[Utils::$context['icon_sources'][$this->formatted['icon']]] . '/post/' . $this->formatted['icon'] . '.png';
 		}
 
 		// What is the user allowed to do with this message?
-		if (!empty($format_options['do_permissions']))
-		{
+		if (!empty($format_options['do_permissions'])) {
 			$topic = Topic::load($this->id_topic);
 			$topic->doPermissions();
 
@@ -370,12 +373,11 @@ public function format(int $counter = 0, array $format_options = array()): array
 			$topic->permissions['can_remove_post'] |= User::$me->allowedTo('delete_own') && (empty(Config::$modSettings['edit_disable_time']) || $this->poster_time + Config::$modSettings['edit_disable_time'] * 60 >= time()) && $this->id_member == User::$me->id;
 
 			// If the topic is locked, you might not be able to delete the post...
-			if ($topic->is_locked)
-			{
+			if ($topic->is_locked) {
 				$topic->permissions['can_remove_post'] &= (User::$me->started && $topic->is_locked == 1) || User::$me->allowedTo('lock_any');
 			}
 
-			$this->formatted += array(
+			$this->formatted += [
 				'approved' => $this->approved,
 				'can_approve' => !$this->approved && $topic->permissions['can_approve'],
 				'can_unapprove' => !empty(Config::$modSettings['postmod_active']) && $topic->permissions['can_approve'] && $this->approved,
@@ -383,27 +385,24 @@ public function format(int $counter = 0, array $format_options = array()): array
 				'can_remove' => User::$me->allowedTo('delete_any') || (User::$me->allowedTo('delete_replies') && User::$me->started) || (User::$me->allowedTo('delete_own') && $this->id_member == User::$me->id && (empty(Config::$modSettings['edit_disable_time']) || $this->poster_time + Config::$modSettings['edit_disable_time'] * 60 > time())),
 				'can_see_ip' => User::$me->allowedTo('moderate_forum') || ($this->id_member == User::$me->id && !empty(User::$me->id)),
 				'css_class' => $this->approved ? 'windowbg' : 'approvebg',
-			);
-		}
-		else
-		{
+			];
+		} else {
 			$this->formatted['css_class'] = 'windowbg';
 		}
 
 		// Load the author's info from the database.
-		if (!empty($format_options['load_author']))
-		{
+		if (!empty($format_options['load_author'])) {
 			// Is this user the message author?
 			$this->formatted['is_message_author'] = $this->id_member == User::$me->id && !User::$me->is_guest;
 
 			// Load the author's data, if not already loaded.
-			if (!empty($this->id_member) && !isset(User::$loaded[$this->id_member]))
+			if (!empty($this->id_member) && !isset(User::$loaded[$this->id_member])) {
 				User::load($this->id_member);
+			}
 
 			// If it couldn't load, or the user was a guest.... someday may be done with a guest table.
-			if (empty($this->id_member) || !isset(User::$loaded[$this->id_member]))
-			{
-				$this->formatted['member'] = array(
+			if (empty($this->id_member) || !isset(User::$loaded[$this->id_member])) {
+				$this->formatted['member'] = [
 					'name' => $this->poster_name,
 					'username' => $this->poster_name,
 					'id' => 0,
@@ -412,10 +411,8 @@ public function format(int $counter = 0, array $format_options = array()): array
 					'email' => $this->poster_email,
 					'show_email' => User::$me->allowedTo('moderate_forum'),
 					'is_guest' => true,
-				);
-			}
-			else
-			{
+				];
+			} else {
 				$this->formatted['member'] = User::$loaded[$this->id_member]->format(true);
 
 				// Define this here to make things a bit more readable
@@ -423,8 +420,7 @@ public function format(int $counter = 0, array $format_options = array()): array
 
 				$this->formatted['member']['can_view_profile'] = User::$me->allowedTo('profile_view') || ($this->id_member == User::$me->id && !User::$me->is_guest);
 
-				if (isset(Utils::$context['topic_starter_id']))
-				{
+				if (isset(Utils::$context['topic_starter_id'])) {
 					$this->formatted['member']['is_topic_starter'] = $this->id_member == Utils::$context['topic_starter_id'];
 				}
 
@@ -438,24 +434,21 @@ public function format(int $counter = 0, array $format_options = array()): array
 			$this->formatted['member']['show_profile_buttons'] = !empty(Config::$modSettings['show_profile_buttons']) && (!empty($this->formatted['member']['can_view_profile']) || (!empty($this->formatted['member']['website']['url']) && !isset(Utils::$context['disabled_fields']['website'])) || $this->formatted['member']['show_email'] || $topic->permissions['can_send_pm']);
 
 			// Any custom profile fields?
-			if (!empty($this->formatted['member']['custom_fields']))
-			{
-				foreach ($this->formatted['member']['custom_fields'] as $custom)
-				{
+			if (!empty($this->formatted['member']['custom_fields'])) {
+				foreach ($this->formatted['member']['custom_fields'] as $custom) {
 					$this->formatted['custom_fields'][Utils::$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
 				}
 			}
 		}
 		// Didn't ask for the full author info, so do the bare minimum.
-		else
-		{
-			$this->formatted['member'] = array(
+		else {
+			$this->formatted['member'] = [
 				'id' => $this->id_member,
 				'name' => $this->poster_name,
 				'username' => $this->poster_name,
 				'href' => empty($this->id_member) ? '' : Config::$scripturl . '?action=profile;u=' . $this->id_member,
 				'link' => empty($this->id_member) ? $this->poster_name : '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id_member . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $this->poster_name) . '">' . $this->poster_name . '</a>',
-			);
+			];
 		}
 
 		// Make 'poster' an alias of 'member'.
@@ -471,49 +464,42 @@ public function format(int $counter = 0, array $format_options = array()): array
 		$this->formatted['link'] = '<a href="' . $this->formatted['href'] . '" rel="nofollow">' . $this->formatted['subject'] . '</a>';
 
 		// Make a preview?
-		if (!empty($format_options['make_preview']))
-		{
-			$this->formatted['preview'] = strip_tags(strtr($this->formatted['body'], array('<br>' => '&#10;')));
+		if (!empty($format_options['make_preview'])) {
+			$this->formatted['preview'] = strip_tags(strtr($this->formatted['body'], ['<br>' => '&#10;']));
 
-			if (Utils::entityStrlen($this->formatted['preview']) > 128)
-			{
+			if (Utils::entityStrlen($this->formatted['preview']) > 128) {
 				$this->formatted['preview'] = Utils::entitySubstr($this->formatted['preview'], 0, 128) . (!empty(Utils::$context['utf8']) ? '…' : '...');
 			}
 		}
 
 		// Make a short version of the subject?
-		if (!empty($format_options['shorten_subject']))
-		{
+		if (!empty($format_options['shorten_subject'])) {
 			$this->formatted['short_subject'] = Utils::shorten($this->formatted['subject'], $format_options['shorten_subject']);
 		}
 
 		// Are likes enabled?
-		if (!empty(Config::$modSettings['enable_likes']))
-		{
-			$this->formatted['likes'] = array(
+		if (!empty(Config::$modSettings['enable_likes'])) {
+			$this->formatted['likes'] = [
 				'count' => $this->likes,
-				'you' => in_array($this->id, Utils::$context['my_likes'] ?? array()),
-			);
+				'you' => in_array($this->id, Utils::$context['my_likes'] ?? []),
+			];
 
-			if ($format_options['do_permissions'])
-			{
+			if ($format_options['do_permissions']) {
 				$this->formatted['likes']['can_like'] = !User::$me->is_guest && $this->id_member != User::$me->id && !empty($topic->permissions['can_like']);
 			}
 		}
 
 		// Info about last modification to this message.
-		if (!empty($this->formatted['modified']['name']))
-		{
+		if (!empty($this->formatted['modified']['name'])) {
 			$this->formatted['modified']['last_edit_text'] = sprintf(Lang::$txt['last_edit_by'], $this->formatted['modified']['time'], $this->formatted['modified']['name']);
 
 			// Did they give a reason for editing?
-			if (!empty($this->formatted['modified']['reason']))
-			{
+			if (!empty($this->formatted['modified']['reason'])) {
 				$this->formatted['modified']['last_edit_text'] .= '&nbsp;' . sprintf(Lang::$txt['last_edit_reason'], $this->formatted['modified']['reason']);
 			}
 		}
 
-		IntegrationHook::call('integrate_format_msg', array(&$this->formatted, $this->id));
+		IntegrationHook::call('integrate_format_msg', [&$this->formatted, $this->id]);
 
 		return $this->formatted;
 	}
@@ -526,8 +512,9 @@ public function format(int $counter = 0, array $format_options = array()): array
 	 */
 	public function __set(string $prop, $value): void
 	{
-		if ($prop === 'poster_ip')
+		if ($prop === 'poster_ip') {
 			$value = new IP($value);
+		}
 
 		$this->customPropertySet($prop, $value);
 	}
@@ -546,16 +533,17 @@ public function __set(string $prop, $value): void
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return array Instances of this class for the loaded messages.
 	 */
-	public static function load($ids, array $query_customizations = array()): array
+	public static function load($ids, array $query_customizations = []): array
 	{
 		// Loading is similar to getting, except that we keep all instances and
 		// then return them all at once.
-		$loaded = array();
+		$loaded = [];
 
 		self::$keep_all = true;
 
-		foreach (self::get($ids, $query_customizations) as $msg)
+		foreach (self::get($ids, $query_customizations) as $msg) {
 			$loaded[$msg->id] = $msg;
+		}
 
 		self::$keep_all = false;
 
@@ -574,46 +562,46 @@ public static function load($ids, array $query_customizations = array()): array
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return Generator<array> Iterating over result gives Msg instances.
 	 */
-	public static function get($ids, array $query_customizations = array())
+	public static function get($ids, array $query_customizations = [])
 	{
-		$selects = $query_customizations['selects'] ?? array(
+		$selects = $query_customizations['selects'] ?? [
 			'm.*',
 			'm.id_msg_modified < {int:new_from} AS is_read',
-		);
-		$joins = $query_customizations['joins'] ?? array();
-		$where = $query_customizations['where'] ?? array(
+		];
+		$joins = $query_customizations['joins'] ?? [];
+		$where = $query_customizations['where'] ?? [
 			'm.id_msg IN ({array_int:message_list})',
-		);
-		$order = $query_customizations['order'] ?? array(
+		];
+		$order = $query_customizations['order'] ?? [
 			'm.id_msg' . (empty(Theme::$current->options['view_newest_first']) ? '' : ' DESC'),
-		);
+		];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? 0;
-		$params = $query_customizations['params'] ?? array(
+		$params = $query_customizations['params'] ?? [
 			'new_from' => Topic::$info->new_from ?? Config::$modSettings['maxMsgID'] + 1,
-		);
+		];
 
-		if (!empty($ids))
-		{
+		if (!empty($ids)) {
 			$params['message_list'] = self::$messages_to_get = array_filter(array_unique(array_map('intval', (array) $ids)));
 		}
 
 		// Just FYI, for historical reasons the order in which the arguments are
 		// passed to this hook is different than the order in which they are
 		// passed to the queryData() method.
-		IntegrationHook::call('integrate_query_message', array(&$selects, &$joins, &$params, &$where, &$order, &$limit));
+		IntegrationHook::call('integrate_query_message', [&$selects, &$joins, &$params, &$where, &$order, &$group, &$limit]);
 
-		foreach(self::queryData($selects, $params, $joins, $where, $order, $limit) as $row)
-		{
+		foreach(self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			$id = (int) $row['id_msg'];
 
 			yield (new self($id, $row));
 
-			if (!self::$keep_all)
+			if (!self::$keep_all) {
 				unset(self::$loaded[$id]);
+			}
 		}
 
 		// Reset this when done.
-		self::$messages_to_get = array();
+		self::$messages_to_get = [];
 	}
 
 	/**
@@ -629,7 +617,7 @@ public static function preparsecode(&$message, $previewing = false): void
 		static $tags_regex, $disallowed_tags_regex;
 
 		// Convert control characters (except \t, \r, and \n) to harmless Unicode symbols
-		$control_replacements = array(
+		$control_replacements = [
 			"\x00" => '&#x2400;', "\x01" => '&#x2401;', "\x02" => '&#x2402;', "\x03" => '&#x2403;',
 			"\x04" => '&#x2404;', "\x05" => '&#x2405;', "\x06" => '&#x2406;', "\x07" => '&#x2407;',
 			"\x08" => '&#x2408;', "\x0b" => '&#x240b;', "\x0c" => '&#x240c;', "\x0e" => '&#x240e;',
@@ -638,17 +626,15 @@ public static function preparsecode(&$message, $previewing = false): void
 			"\x17" => '&#x2417;', "\x18" => '&#x2418;', "\x19" => '&#x2419;', "\x1a" => '&#x241a;',
 			"\x1b" => '&#x241b;', "\x1c" => '&#x241c;', "\x1d" => '&#x241d;', "\x1e" => '&#x241e;',
 			"\x1f" => '&#x241f;',
-		);
+		];
 		$message = strtr($message, $control_replacements);
 
 		// This line makes all languages *theoretically* work even with the wrong charset ;).
-		if (empty(Utils::$context['utf8']))
-		{
+		if (empty(Utils::$context['utf8'])) {
 			$message = preg_replace('~&amp;#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
 		}
 		// Normalize Unicode characters for storage efficiency, better searching, etc.
-		else
-		{
+		else {
 			$message = Utils::normalize($message);
 		}
 
@@ -658,75 +644,76 @@ public static function preparsecode(&$message, $previewing = false): void
 		// Clean up after nobbc ;).
 		$message = preg_replace_callback(
 			'~\[nobbc\](.+?)\[/nobbc\]~is',
-			function($a)
-			{
-				return '[nobbc]' . strtr($a[1], array('[' => '&#91;', ']' => '&#93;', ':' => '&#58;', '@' => '&#64;')) . '[/nobbc]';
+			function ($a) {
+				return '[nobbc]' . strtr($a[1], ['[' => '&#91;', ']' => '&#93;', ':' => '&#58;', '@' => '&#64;']) . '[/nobbc]';
 			},
-			$message
+			$message,
 		);
 
 		// Remove \r's... they're evil!
-		$message = strtr($message, array("\r\n" => "\n", "\r" => "\n"));
+		$message = strtr($message, ["\r\n" => "\n", "\r" => "\n"]);
 
 		// You won't believe this - but too many periods upsets apache it seems!
 		$message = preg_replace('~\.{100,}~', '...', $message);
 
 		// Trim off trailing quotes - these often happen by accident.
-		while (substr($message, -7) == '[quote]')
+		while (substr($message, -7) == '[quote]') {
 			$message = substr($message, 0, -7);
+		}
 
-		while (substr($message, 0, 8) == '[/quote]')
+		while (substr($message, 0, 8) == '[/quote]') {
 			$message = substr($message, 8);
+		}
 
-		if (strpos($message, '[cowsay') !== false && !User::$me->allowedTo('bbc_cowsay'))
+		if (strpos($message, '[cowsay') !== false && !User::$me->allowedTo('bbc_cowsay')) {
 			$message = preg_replace('~\[(/?)cowsay[^\]]*\]~iu', '[$1pre]', $message);
+		}
 
 		// Find all code blocks, work out whether we'd be parsing them, then ensure they are all closed.
 		$in_tag = false;
 		$had_tag = false;
 		$codeopen = 0;
-		if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches))
-		{
-			foreach ($matches[0] as $index => $dummy)
-			{
+
+		if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches)) {
+			foreach ($matches[0] as $index => $dummy) {
 				// Closing?
-				if (!empty($matches[2][$index]))
-				{
+				if (!empty($matches[2][$index])) {
 					// If it's closing and we're not in a tag we need to open it...
-					if (!$in_tag)
+					if (!$in_tag) {
 						$codeopen = true;
+					}
 
 					// Either way we ain't in one any more.
 					$in_tag = false;
 				}
 				// Opening tag...
-				else
-				{
+				else {
 					$had_tag = true;
 
 					// If we're in a tag don't do nought!
-					if (!$in_tag)
+					if (!$in_tag) {
 						$in_tag = true;
+					}
 				}
 			}
 		}
 
 		// If we have an open tag, close it.
-		if ($in_tag)
+		if ($in_tag) {
 			$message .= '[/code]';
+		}
 
 		// Open any ones that need to be open, only if we've never had a tag.
-		if ($codeopen && !$had_tag)
+		if ($codeopen && !$had_tag) {
 			$message = '[code]' . $message;
+		}
 
 		// Replace code BBC with placeholders. We'll restore them at the end.
 		$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-		for ($i = 0, $n = count($parts); $i < $n; $i++)
-		{
+		for ($i = 0, $n = count($parts); $i < $n; $i++) {
 			// It goes 0 = outside, 1 = begin tag, 2 = inside, 3 = close tag, repeat.
-			if ($i % 4 == 2)
-			{
+			if ($i % 4 == 2) {
 				$code_tag = $parts[$i - 1] . $parts[$i] . $parts[$i + 1];
 				$substitute = $parts[$i - 1] . $i . $parts[$i + 1];
 				$code_tags[$substitute] = $code_tag;
@@ -740,47 +727,40 @@ function($a)
 		$non_breaking_space = Utils::$context['utf8'] ? '\x{A0}' : '\xA0';
 
 		// Now that we've fixed all the code tags, let's fix the img and url tags...
-		fixTags($message);
+		self::fixTags($message);
 
 		// Replace /me.+?\n with [me=name]dsf[/me]\n.
-		if (strpos(User::$me->name, '[') !== false || strpos(User::$me->name, ']') !== false || strpos(User::$me->name, '\'') !== false || strpos(User::$me->name, '"') !== false)
-		{
+		if (strpos(User::$me->name, '[') !== false || strpos(User::$me->name, ']') !== false || strpos(User::$me->name, '\'') !== false || strpos(User::$me->name, '"') !== false) {
 			$message = preg_replace('~(\A|\n)/me(?: |&nbsp;)([^\n]*)(?:\z)?~i', '$1[me=&quot;' . User::$me->name . '&quot;]$2[/me]', $message);
-		}
-		else
-		{
+		} else {
 			$message = preg_replace('~(\A|\n)/me(?: |&nbsp;)([^\n]*)(?:\z)?~i', '$1[me=' . User::$me->name . ']$2[/me]', $message);
 		}
 
-		if (!$previewing && strpos($message, '[html]') !== false)
-		{
-			if (User::$me->allowedTo('bbc_html'))
-			{
+		if (!$previewing && strpos($message, '[html]') !== false) {
+			if (User::$me->allowedTo('bbc_html')) {
 				$message = preg_replace_callback(
 					'~\[html\](.+?)\[/html\]~is',
-					function($m)
-					{
-						return '[html]' . strtr(Utils::htmlspecialcharsDecode($m[1]), array("\n" => '&#13;', '  ' => ' &#32;', '[' => '&#91;', ']' => '&#93;')) . '[/html]';
+					function ($m) {
+						return '[html]' . strtr(Utils::htmlspecialcharsDecode($m[1]), ["\n" => '&#13;', '  ' => ' &#32;', '[' => '&#91;', ']' => '&#93;']) . '[/html]';
 					},
-					$message
+					$message,
 				);
 			}
 			// We should edit them out, or else if an admin edits the message they will get shown...
-			else
-			{
-				while (strpos($message, '[html]') !== false)
+			else {
+				while (strpos($message, '[html]') !== false) {
 					$message = preg_replace('~\[[/]?html\]~i', '', $message);
+				}
 			}
 		}
 
 		// Let's look at the time tags...
 		$message = preg_replace_callback(
 			'~\[time(?:=(absolute))*\](.+?)\[/time\]~i',
-			function($m)
-			{
-				return "[time]" . (is_numeric("$m[2]") || @strtotime("$m[2]") == 0 ? "$m[2]" : strtotime("$m[2]") - ("$m[1]" == "absolute" ? 0 : ((Config::$modSettings['time_offset'] + User::$me->time_offset) * 3600))) . "[/time]";
+			function ($m) {
+				return '[time]' . (is_numeric("{$m[2]}") || @strtotime("{$m[2]}") == 0 ? "{$m[2]}" : strtotime("{$m[2]}") - ("{$m[1]}" == 'absolute' ? 0 : ((Config::$modSettings['time_offset'] + User::$me->time_offset) * 3600))) . '[/time]';
 			},
-			$message
+			$message,
 		);
 
 		// Change the color specific tags to [color=the color].
@@ -791,50 +771,51 @@ function($m)
 		$message = preg_replace('~\[/(black|blue|green|red|white)\]~', '[/color]', $message);
 
 		// Neutralize any BBC tags this member isn't permitted to use.
-		if (empty($disallowed_tags_regex))
-		{
+		if (empty($disallowed_tags_regex)) {
 			// Legacy BBC are only retained for historical reasons.
 			// They're not for use in new posts.
 			$disallowed_bbc = Utils::$context['legacy_bbc'];
 
 			// Some BBC require permissions.
-			foreach (Utils::$context['restricted_bbc'] as $bbc)
-			{
+			foreach (Utils::$context['restricted_bbc'] as $bbc) {
 				// Skip html, since we handled it separately above.
-				if ($bbc === 'html')
+				if ($bbc === 'html') {
 					continue;
+				}
 
-				if (!User::$me->allowedTo('bbc_' . $bbc))
+				if (!User::$me->allowedTo('bbc_' . $bbc)) {
 					$disallowed_bbc[] = $bbc;
+				}
 			}
 
 			$disallowed_tags_regex = Utils::buildRegex(array_unique($disallowed_bbc), '~');
 		}
-		if (!empty($disallowed_tags_regex))
-		{
+
+		if (!empty($disallowed_tags_regex)) {
 			$message = preg_replace('~\[(?=/?' . $disallowed_tags_regex . '\b)~i', '&#91;', $message);
 		}
 
 		// Make sure all tags are lowercase.
 		$message = preg_replace_callback(
 			'~\[(/?)(list|li|table|tr|td)\b([^\]]*)\]~i',
-			function($m)
-			{
-				return "[$m[1]" . strtolower("$m[2]") . "$m[3]]";
+			function ($m) {
+				return "[{$m[1]}" . strtolower("{$m[2]}") . "{$m[3]}]";
 			},
-			$message
+			$message,
 		);
 
 		$list_open = substr_count($message, '[list]') + substr_count($message, '[list ');
 		$list_close = substr_count($message, '[/list]');
 
-		if ($list_close - $list_open > 0)
+		if ($list_close - $list_open > 0) {
 			$message = str_repeat('[list]', $list_close - $list_open) . $message;
+		}
 
-		if ($list_open - $list_close > 0)
+		if ($list_open - $list_close > 0) {
 			$message = $message . str_repeat('[/list]', $list_open - $list_close);
+		}
 
-		$mistake_fixes = array(
+		$mistake_fixes = [
 			// Find [table]s not followed by [tr].
 			'~\[table\](?![\s' . $non_breaking_space . ']*\[tr\])~s' . (Utils::$context['utf8'] ? 'u' : '') => '[table][tr]',
 			// Find [tr]s not followed by [td].
@@ -878,52 +859,49 @@ function($m)
 			'~\[_(li|/li|td|tr|/tr)_\]~' => '[$1]',
 			// Images with no real url.
 			'~\[img\]https?://.{0,7}\[/img\]~' => '',
-		);
+		];
 
 		// Fix up some use of tables without [tr]s, etc. (it has to be done more than once to catch it all.)
-		for ($j = 0; $j < 3; $j++)
+		for ($j = 0; $j < 3; $j++) {
 			$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+		}
 
 		// Remove empty bbc from the sections outside the code tags
-		if (empty($tags_regex))
-		{
-			$allowed_empty = array('anchor', 'td',);
+		if (empty($tags_regex)) {
+			$allowed_empty = ['anchor', 'td'];
 
-			$tags = array();
+			$tags = [];
 
-			foreach (BBCodeParser::getCodes() as $code)
-			{
-				if (!in_array($code['tag'], $allowed_empty))
+			foreach (BBCodeParser::getCodes() as $code) {
+				if (!in_array($code['tag'], $allowed_empty)) {
 					$tags[] = $code['tag'];
+				}
 			}
 
 			$tags_regex = Utils::buildRegex($tags, '~');
 		}
 
-		while (preg_match('~\[(' . $tags_regex . ')\b[^\]]*\]\s*\[/\1\]\s?~i', $message))
-		{
+		while (preg_match('~\[(' . $tags_regex . ')\b[^\]]*\]\s*\[/\1\]\s?~i', $message)) {
 			$message = preg_replace('~\[(' . $tags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
 		}
 
 		// Restore code blocks
-		if (!empty($code_tags))
+		if (!empty($code_tags)) {
 			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+		}
 
 		// Restore white space entities
-		if (!$previewing)
-		{
-			$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', Utils::$context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
-		}
-		else
-		{
-			$message = strtr($message, array('  ' => '&nbsp; ', Utils::$context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+		if (!$previewing) {
+			$message = strtr($message, ['  ' => '&nbsp; ', "\n" => '<br>', Utils::$context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;']);
+		} else {
+			$message = strtr($message, ['  ' => '&nbsp; ', Utils::$context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;']);
 		}
 
 		// Now let's quickly clean up things that will slow our parser (which are common in posted code.)
-		$message = strtr($message, array('[]' => '&#91;]', '[&#039;' => '&#91;&#039;'));
+		$message = strtr($message, ['[]' => '&#91;]', '[&#039;' => '&#91;&#039;']);
 
 		// Any hooks want to work here?
-		IntegrationHook::call('integrate_preparsecode', array(&$message, $previewing));
+		IntegrationHook::call('integrate_preparsecode', [&$message, $previewing]);
 	}
 
 	/**
@@ -935,16 +913,14 @@ function($m)
 	public static function un_preparsecode($message): string
 	{
 		// Any hooks want to work here?
-		IntegrationHook::call('integrate_unpreparsecode', array(&$message));
+		IntegrationHook::call('integrate_unpreparsecode', [&$message]);
 
 		$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
 
 		// We're going to unparse only the stuff outside [code]...
-		for ($i = 0, $n = count($parts); $i < $n; $i++)
-		{
+		for ($i = 0, $n = count($parts); $i < $n; $i++) {
 			// If $i is a multiple of four (0, 4, 8, ...) then it's not a code section...
-			if ($i % 4 == 2)
-			{
+			if ($i % 4 == 2) {
 				$code_tag = $parts[$i - 1] . $parts[$i] . $parts[$i + 1];
 				$substitute = $parts[$i - 1] . $i . $parts[$i + 1];
 				$code_tags[$substitute] = $code_tag;
@@ -956,28 +932,28 @@ public static function un_preparsecode($message): string
 
 		$message = preg_replace_callback(
 			'~\[html\](.+?)\[/html\]~i',
-			function($matches)
-			{
-				return "[html]" . strtr(Utils::htmlspecialchars($matches[1], ENT_QUOTES), array("\\&quot;" => "&quot;", "&amp;#13;" => "<br>", "&amp;#32;" => " ", "&amp;#91;" => "[", "&amp;#93;" => "]")) . "[/html]";
+			function ($matches) {
+				return '[html]' . strtr(Utils::htmlspecialchars($matches[1], ENT_QUOTES), ['\\&quot;' => '&quot;', '&amp;#13;' => '<br>', '&amp;#32;' => ' ', '&amp;#91;' => '[', '&amp;#93;' => ']']) . '[/html]';
 			},
-			$message
+			$message,
 		);
 
-		if (strpos($message, '[cowsay') !== false && !User::$me->allowedTo('bbc_cowsay'))
+		if (strpos($message, '[cowsay') !== false && !User::$me->allowedTo('bbc_cowsay')) {
 			$message = preg_replace('~\[(/?)cowsay[^\]]*\]~iu', '[$1pre]', $message);
+		}
 
 		// Attempt to un-parse the time to something less awful.
 		$message = preg_replace_callback(
 			'~\[time\](\d{0,10})\[/time\]~i',
-			function($matches)
-			{
-				return "[time]" . Time::create('@' . $matches[1])->setTimezone(new \DateTimeZone(User::getTimezone()))->format(null, false) . "[/time]";
+			function ($matches) {
+				return '[time]' . Time::create('@' . $matches[1])->setTimezone(new \DateTimeZone(User::getTimezone()))->format(null, false) . '[/time]';
 			},
-			$message
+			$message,
 		);
 
-		if (!empty($code_tags))
+		if (!empty($code_tags)) {
 			$message = strtr($message, $code_tags);
+		}
 
 		// Change breaks back to \n's and &nsbp; back to spaces.
 		return preg_replace('~<br\s*/?' . '>~', "\n", str_replace('&nbsp;', ' ', $message));
@@ -994,84 +970,81 @@ public static function fixTags(&$message): void
 		// WARNING: Editing the below can cause large security holes in your forum.
 		// Edit only if you are sure you know what you are doing.
 
-		$fixArray = array(
+		$fixArray = [
 			// [img]http://...[/img] or [img width=1]http://...[/img]
-			array(
+			[
 				'tag' => 'img',
-				'protocols' => array('http', 'https'),
+				'protocols' => ['http', 'https'],
 				'embeddedUrl' => false,
 				'hasEqualSign' => false,
 				'hasExtra' => true,
-			),
+			],
 			// [url]http://...[/url]
-			array(
+			[
 				'tag' => 'url',
-				'protocols' => array('http', 'https'),
+				'protocols' => ['http', 'https'],
 				'embeddedUrl' => false,
 				'hasEqualSign' => false,
-			),
+			],
 			// [url=http://...]name[/url]
-			array(
+			[
 				'tag' => 'url',
-				'protocols' => array('http', 'https'),
+				'protocols' => ['http', 'https'],
 				'embeddedUrl' => true,
 				'hasEqualSign' => true,
-			),
+			],
 			// [iurl]http://...[/iurl]
-			array(
+			[
 				'tag' => 'iurl',
-				'protocols' => array('http', 'https'),
+				'protocols' => ['http', 'https'],
 				'embeddedUrl' => false,
 				'hasEqualSign' => false,
-			),
+			],
 			// [iurl=http://...]name[/iurl]
-			array(
+			[
 				'tag' => 'iurl',
-				'protocols' => array('http', 'https'),
+				'protocols' => ['http', 'https'],
 				'embeddedUrl' => true,
 				'hasEqualSign' => true,
-			),
+			],
 			// The rest of these are deprecated.
 			// [ftp]ftp://...[/ftp]
-			array(
+			[
 				'tag' => 'ftp',
-				'protocols' => array('ftp', 'ftps', 'sftp'),
+				'protocols' => ['ftp', 'ftps', 'sftp'],
 				'embeddedUrl' => false,
 				'hasEqualSign' => false,
-			),
+			],
 			// [ftp=ftp://...]name[/ftp]
-			array(
+			[
 				'tag' => 'ftp',
-				'protocols' => array('ftp', 'ftps', 'sftp'),
+				'protocols' => ['ftp', 'ftps', 'sftp'],
 				'embeddedUrl' => true,
 				'hasEqualSign' => true,
-			),
+			],
 			// [flash]http://...[/flash]
-			array(
+			[
 				'tag' => 'flash',
-				'protocols' => array('http', 'https'),
+				'protocols' => ['http', 'https'],
 				'embeddedUrl' => false,
 				'hasEqualSign' => false,
 				'hasExtra' => true,
-			),
-		);
+			],
+		];
 
 		// Fix each type of tag.
-		foreach ($fixArray as $param)
-		{
-			fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+		foreach ($fixArray as $param) {
+			self::fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
 		}
 
 		// Now fix possible security problems with images loading links automatically...
 		$message = preg_replace_callback(
 			'~(\[img.*?\])(.+?)\[/img\]~is',
-			function($m)
-			{
-				return "$m[1]" . preg_replace("~action(=|%3d)(?!dlattach)~i", "action-", "$m[2]") . "[/img]";
+			function ($m) {
+				return "{$m[1]}" . preg_replace('~action(=|%3d)(?!dlattach)~i', 'action-', "{$m[2]}") . '[/img]';
 			},
-			$message
+			$message,
 		);
-
 	}
 
 	/**
@@ -1087,120 +1060,94 @@ function($m)
 	 */
 	public static function fixTag(&$message, $myTag, $protocols, $embeddedUrl = false, $hasEqualSign = false, $hasExtra = false): void
 	{
-		$forbidden_protocols = array(
+		$forbidden_protocols = [
 			// Poses security risks.
 			'javascript',
 			// Allows file data to be embedded, bypassing our attachment system.
 			'data',
-		);
+		];
 
-		if (preg_match('~^([^:]+://[^/]+)~', Config::$boardurl, $match) != 0)
-		{
+		if (preg_match('~^([^:]+://[^/]+)~', Config::$boardurl, $match) != 0) {
 			$domain_url = $match[1];
-		}
-		else
-		{
+		} else {
 			$domain_url = Config::$boardurl . '/';
 		}
 
-		$replaces = array();
+		$replaces = [];
 
-		if ($hasEqualSign && $embeddedUrl)
-		{
+		if ($hasEqualSign && $embeddedUrl) {
 			$quoted = preg_match('~\[(' . $myTag . ')=&quot;~', $message);
 
 			preg_match_all('~\[(' . $myTag . ')=' . ($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)') . '\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
-		}
-		elseif ($hasEqualSign)
-		{
+		} elseif ($hasEqualSign) {
 			preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
-		}
-		else
-		{
+		} else {
 			preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 		}
 
-		foreach ($matches[0] as $k => $dummy)
-		{
+		foreach ($matches[0] as $k => $dummy) {
 			// Remove all leading and trailing whitespace.
 			$replace = trim($matches[2][$k]);
 			$this_tag = $matches[1][$k];
 			$this_close = $hasEqualSign ? (empty($matches[4][$k]) ? '' : $matches[4][$k]) : $matches[3][$k];
 
 			$found = false;
-			foreach ($protocols as $protocol)
-			{
+
+			foreach ($protocols as $protocol) {
 				$found = strncasecmp($replace, $protocol . '://', strlen($protocol) + 3) === 0;
 
-				if ($found)
+				if ($found) {
 					break;
+				}
 			}
 
 			$current_protocol = strtolower(Url::create($replace)->scheme ?? '');
 
-			if (in_array($current_protocol, $forbidden_protocols))
-			{
+			if (in_array($current_protocol, $forbidden_protocols)) {
 				$replace = 'about:invalid';
-			}
-			elseif (!$found && $protocols[0] == 'http')
-			{
+			} elseif (!$found && $protocols[0] == 'http') {
 				// A path
-				if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//')
-				{
+				if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//') {
 					$replace = $domain_url . $replace;
 				}
 				// A query
-				elseif (substr($replace, 0, 1) == '?')
-				{
+				elseif (substr($replace, 0, 1) == '?') {
 					$replace = Config::$scripturl . $replace;
 				}
 				// A fragment
-				elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
-				{
+				elseif (substr($replace, 0, 1) == '#' && $embeddedUrl) {
 					$replace = '#' . preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
 					$this_tag = 'iurl';
 					$this_close = 'iurl';
-				}
-				elseif (substr($replace, 0, 2) != '//' && empty($current_protocol))
-				{
+				} elseif (substr($replace, 0, 2) != '//' && empty($current_protocol)) {
 					$replace = $protocols[0] . '://' . $replace;
 				}
-			}
-			elseif (!$found && $protocols[0] == 'ftp')
-			{
+			} elseif (!$found && $protocols[0] == 'ftp') {
 				$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
-			}
-			elseif (!$found && empty($current_protocol))
-			{
+			} elseif (!$found && empty($current_protocol)) {
 				$replace = $protocols[0] . '://' . $replace;
 			}
 
-			if ($hasEqualSign && $embeddedUrl)
-			{
+			if ($hasEqualSign && $embeddedUrl) {
 				$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
-			}
-			elseif ($hasEqualSign)
-			{
+			} elseif ($hasEqualSign) {
 				$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
-			}
-			elseif ($embeddedUrl)
-			{
+			} elseif ($embeddedUrl) {
 				$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
-			}
-			else
-			{
+			} else {
 				$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
 			}
 		}
 
-		foreach ($replaces as $k => $v)
-		{
-			if ($k == $v)
+		foreach ($replaces as $k => $v) {
+			if ($k == $v) {
 				unset($replaces[$k]);
+			}
 		}
 
-		if (!empty($replaces))
+		if (!empty($replaces)) {
 			$message = strtr($message, $replaces);
+		}
 	}
 
 	/**
@@ -1212,7 +1159,7 @@ public static function fixTag(&$message, $myTag, $protocols, $embeddedUrl = fals
 	public static function spellCheck(): void
 	{
 		// A list of "words" we know about but pspell doesn't.
-		$known_words = array('smf', 'php', 'mysql', 'www', 'gif', 'jpeg', 'png', 'http', 'smfisawesome', 'grandia', 'terranigma', 'rpgs');
+		$known_words = ['smf', 'php', 'mysql', 'www', 'gif', 'jpeg', 'png', 'http', 'smfisawesome', 'grandia', 'terranigma', 'rpgs'];
 
 		Lang::load('Post');
 		Theme::loadTemplate('Post');
@@ -1220,8 +1167,9 @@ public static function spellCheck(): void
 		// Create a pspell or enchant dictionary resource
 		$dict = spell_init();
 
-		if (!isset($_POST['spellstring']) || !$dict)
+		if (!isset($_POST['spellstring']) || !$dict) {
 			die;
+		}
 
 		// Construct a bit of Javascript code.
 		Utils::$context['spell_js'] = '
@@ -1230,17 +1178,16 @@ public static function spellCheck(): void
 			var misps = Array(';
 
 		// Get all the words (Javascript already separated them).
-		$alphas = explode("\n", strtr($_POST['spellstring'], array("\r" => '')));
+		$alphas = explode("\n", strtr($_POST['spellstring'], ["\r" => '']));
 
 		$found_words = false;
-		for ($i = 0, $n = count($alphas); $i < $n; $i++)
-		{
+
+		for ($i = 0, $n = count($alphas); $i < $n; $i++) {
 			// Words are sent like 'word|offset_begin|offset_end'.
 			$check_word = explode('|', $alphas[$i]);
 
 			// If the word is a known word, or spelled right...
-			if (in_array(Utils::strtolower($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2]))
-			{
+			if (in_array(Utils::strtolower($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2])) {
 				continue;
 			}
 
@@ -1249,41 +1196,41 @@ public static function spellCheck(): void
 
 			// Add on the javascript for this misspelling.
 			Utils::$context['spell_js'] .= '
-				new misp("' . strtr($check_word[0], array('\\' => '\\\\', '"' => '\\"', '<' => '', '&gt;' => '')) . '", ' . (int) $check_word[1] . ', ' . (int) $check_word[2] . ', [';
+				new misp("' . strtr($check_word[0], ['\\' => '\\\\', '"' => '\\"', '<' => '', '&gt;' => '']) . '", ' . (int) $check_word[1] . ', ' . (int) $check_word[2] . ', [';
 
 			// If there are suggestions, add them in...
 			$suggestions = spell_suggest($dict, $check_word[0]);
 
-			if (!empty($suggestions))
-			{
+			if (!empty($suggestions)) {
 				// But first check they aren't going to be censored - no naughty words!
-				foreach ($suggestions as $k => $word)
-				{
-					if ($suggestions[$k] != Lang::censorText($word))
+				foreach ($suggestions as $k => $word) {
+					if ($suggestions[$k] != Lang::censorText($word)) {
 						unset($suggestions[$k]);
+					}
 				}
 
-				if (!empty($suggestions))
+				if (!empty($suggestions)) {
 					Utils::$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+				}
 			}
 
 			Utils::$context['spell_js'] .= ']),';
 		}
 
 		// If words were found, take off the last comma.
-		if ($found_words)
+		if ($found_words) {
 			Utils::$context['spell_js'] = substr(Utils::$context['spell_js'], 0, -1);
+		}
 
 		Utils::$context['spell_js'] .= '
 			);';
 
 		// And instruct the template system to just show the spellcheck sub template.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'spellcheck';
 
 		// Free resources for enchant...
-		if (isset(Utils::$context['enchant_broker']))
-		{
+		if (isset(Utils::$context['enchant_broker'])) {
 			enchant_broker_free_dict($dict);
 			enchant_broker_free(Utils::$context['enchant_broker']);
 		}
@@ -1306,15 +1253,15 @@ public static function create(&$msgOptions, &$topicOptions, &$posterOptions): bo
 		// Set optional parameters to the default value.
 		$msgOptions['icon'] = empty($msgOptions['icon']) ? 'xx' : $msgOptions['icon'];
 		$msgOptions['smileys_enabled'] = !empty($msgOptions['smileys_enabled']);
-		$msgOptions['attachments'] = empty($msgOptions['attachments']) ? array() : $msgOptions['attachments'];
+		$msgOptions['attachments'] = empty($msgOptions['attachments']) ? [] : $msgOptions['attachments'];
 		$msgOptions['approved'] = isset($msgOptions['approved']) ? (int) $msgOptions['approved'] : 1;
 		$msgOptions['poster_time'] = isset($msgOptions['poster_time']) ? (int) $msgOptions['poster_time'] : time();
 		$topicOptions['id'] = empty($topicOptions['id']) ? 0 : (int) $topicOptions['id'];
 		$topicOptions['poll'] = isset($topicOptions['poll']) ? (int) $topicOptions['poll'] : null;
-		$topicOptions['lock_mode'] = isset($topicOptions['lock_mode']) ? $topicOptions['lock_mode'] : null;
-		$topicOptions['sticky_mode'] = isset($topicOptions['sticky_mode']) ? $topicOptions['sticky_mode'] : null;
-		$topicOptions['redirect_expires'] = isset($topicOptions['redirect_expires']) ? $topicOptions['redirect_expires'] : null;
-		$topicOptions['redirect_topic'] = isset($topicOptions['redirect_topic']) ? $topicOptions['redirect_topic'] : null;
+		$topicOptions['lock_mode'] = $topicOptions['lock_mode'] ?? null;
+		$topicOptions['sticky_mode'] = $topicOptions['sticky_mode'] ?? null;
+		$topicOptions['redirect_expires'] = $topicOptions['redirect_expires'] ?? null;
+		$topicOptions['redirect_topic'] = $topicOptions['redirect_topic'] ?? null;
 		$posterOptions['id'] = empty($posterOptions['id']) ? 0 : (int) $posterOptions['id'];
 		$posterOptions['ip'] = empty($posterOptions['ip']) ? User::$me->ip : $posterOptions['ip'];
 
@@ -1322,62 +1269,53 @@ public static function create(&$msgOptions, &$topicOptions, &$posterOptions): bo
 		$msgOptions['send_notifications'] = isset($msgOptions['send_notifications']) ? (bool) $msgOptions['send_notifications'] : true;
 
 		// We need to know if the topic is approved. If we're told that's great - if not find out.
-		if (!Config::$modSettings['postmod_active'])
-		{
+		if (!Config::$modSettings['postmod_active']) {
 			$topicOptions['is_approved'] = true;
-		}
-		elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
-		{
-			$request = Db::$db->query('', '
-				SELECT approved
+		} elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT approved
 				FROM {db_prefix}topics
 				WHERE id_topic = {int:id_topic}
 				LIMIT 1',
-				array(
+				[
 					'id_topic' => $topicOptions['id'],
-				)
+				],
 			);
 			list($topicOptions['is_approved']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// If nothing was filled in as name/e-mail address, try the member table.
-		if (!isset($posterOptions['name']) || $posterOptions['name'] == '' || (empty($posterOptions['email']) && !empty($posterOptions['id'])))
-		{
-			if (empty($posterOptions['id']))
-			{
+		if (!isset($posterOptions['name']) || $posterOptions['name'] == '' || (empty($posterOptions['email']) && !empty($posterOptions['id']))) {
+			if (empty($posterOptions['id'])) {
 				$posterOptions['id'] = 0;
 				$posterOptions['name'] = Lang::$txt['guest_title'];
 				$posterOptions['email'] = '';
-			}
-			elseif ($posterOptions['id'] != User::$me->id)
-			{
-				$request = Db::$db->query('', '
-					SELECT member_name, email_address
+			} elseif ($posterOptions['id'] != User::$me->id) {
+				$request = Db::$db->query(
+					'',
+					'SELECT member_name, email_address
 					FROM {db_prefix}members
 					WHERE id_member = {int:id_member}
 					LIMIT 1',
-					array(
+					[
 						'id_member' => $posterOptions['id'],
-					)
+					],
 				);
+
 				// Couldn't find the current poster?
-				if (Db::$db->num_rows($request) == 0)
-				{
+				if (Db::$db->num_rows($request) == 0) {
 					Lang::load('Errors');
 					trigger_error(sprintf(Lang::$txt['create_post_invalid_member_id'], $posterOptions['id']), E_USER_NOTICE);
 					$posterOptions['id'] = 0;
 					$posterOptions['name'] = Lang::$txt['guest_title'];
 					$posterOptions['email'] = '';
-				}
-				else
-				{
-					list ($posterOptions['name'], $posterOptions['email']) = Db::$db->fetch_row($request);
+				} else {
+					list($posterOptions['name'], $posterOptions['email']) = Db::$db->fetch_row($request);
 				}
 				Db::$db->free_result($request);
-			}
-			else
-			{
+			} else {
 				$posterOptions['name'] = User::$me->name;
 				$posterOptions['email'] = User::$me->email;
 			}
@@ -1386,13 +1324,11 @@ public static function create(&$msgOptions, &$topicOptions, &$posterOptions): bo
 		// Get any members who were quoted in this post.
 		$msgOptions['quoted_members'] = Mentions::getQuotedMembers($msgOptions['body'], $posterOptions['id']);
 
-		if (!empty(Config::$modSettings['enable_mentions']))
-		{
+		if (!empty(Config::$modSettings['enable_mentions'])) {
 			// Get any members who were possibly mentioned
 			$msgOptions['mentioned_members'] = Mentions::getMentionedMembers($msgOptions['body']);
 
-			if (!empty($msgOptions['mentioned_members']))
-			{
+			if (!empty($msgOptions['mentioned_members'])) {
 				// Replace @name with [member=id]name[/member]
 				$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
 
@@ -1406,301 +1342,315 @@ public static function create(&$msgOptions, &$topicOptions, &$posterOptions): bo
 
 		$new_topic = empty($topicOptions['id']);
 
-		$message_columns = array(
+		$message_columns = [
 			'id_board' => 'int', 'id_topic' => 'int', 'id_member' => 'int', 'subject' => 'string-255', 'body' => (!empty(Config::$modSettings['max_messageLength']) && Config::$modSettings['max_messageLength'] > 65534 ? 'string-' . Config::$modSettings['max_messageLength'] : (empty(Config::$modSettings['max_messageLength']) ? 'string' : 'string-65534')),
 			'poster_name' => 'string-255', 'poster_email' => 'string-255', 'poster_time' => 'int', 'poster_ip' => 'inet',
 			'smileys_enabled' => 'int', 'modified_name' => 'string', 'icon' => 'string-16', 'approved' => 'int',
-		);
+		];
 
-		$message_parameters = array(
+		$message_parameters = [
 			$topicOptions['board'], $topicOptions['id'], $posterOptions['id'], $msgOptions['subject'], $msgOptions['body'],
 			$posterOptions['name'], $posterOptions['email'], $msgOptions['poster_time'], $posterOptions['ip'],
 			$msgOptions['smileys_enabled'] ? 1 : 0, '', $msgOptions['icon'], $msgOptions['approved'],
-		);
+		];
 
 		// What if we want to do anything with posts?
-		IntegrationHook::call('integrate_create_post', array(&$msgOptions, &$topicOptions, &$posterOptions, &$message_columns, &$message_parameters));
+		IntegrationHook::call('integrate_create_post', [&$msgOptions, &$topicOptions, &$posterOptions, &$message_columns, &$message_parameters]);
 
 		// Insert the post.
-		$msgOptions['id'] = Db::$db->insert('',
+		$msgOptions['id'] = Db::$db->insert(
+			'',
 			'{db_prefix}messages',
 			$message_columns,
 			$message_parameters,
-			array('id_msg'),
-			1
+			['id_msg'],
+			1,
 		);
 
 		// Something went wrong creating the message...
-		if (empty($msgOptions['id']))
+		if (empty($msgOptions['id'])) {
 			return false;
+		}
 
 		// Fix the attachments.
-		if (!empty($msgOptions['attachments']))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}attachments
+		if (!empty($msgOptions['attachments'])) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}attachments
 				SET id_msg = {int:id_msg}
 				WHERE id_attach IN ({array_int:attachment_list})',
-				array(
+				[
 					'attachment_list' => $msgOptions['attachments'],
 					'id_msg' => $msgOptions['id'],
-				)
+				],
 			);
 		}
 
 		// What if we want to export new posts out to a CMS?
-		IntegrationHook::call('integrate_after_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
+		IntegrationHook::call('integrate_after_create_post', [$msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters]);
 
 		// Insert a new topic (if the topicID was left empty.)
-		if ($new_topic)
-		{
-			$topic_columns = array(
+		if ($new_topic) {
+			$topic_columns = [
 				'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
 				'id_last_msg' => 'int', 'locked' => 'int', 'is_sticky' => 'int', 'num_views' => 'int',
 				'id_poll' => 'int', 'unapproved_posts' => 'int', 'approved' => 'int',
 				'redirect_expires' => 'int', 'id_redirect_topic' => 'int',
-			);
+			];
 
-			$topic_parameters = array(
+			$topic_parameters = [
 				$topicOptions['board'], $posterOptions['id'], $posterOptions['id'], $msgOptions['id'],
 				$msgOptions['id'], $topicOptions['lock_mode'] === null ? 0 : $topicOptions['lock_mode'], $topicOptions['sticky_mode'] === null ? 0 : $topicOptions['sticky_mode'], 0,
 				$topicOptions['poll'] === null ? 0 : $topicOptions['poll'], $msgOptions['approved'] ? 0 : 1, $msgOptions['approved'],
 				$topicOptions['redirect_expires'] === null ? 0 : $topicOptions['redirect_expires'], $topicOptions['redirect_topic'] === null ? 0 : $topicOptions['redirect_topic'],
-			);
+			];
 
-			IntegrationHook::call('integrate_before_create_topic', array(&$msgOptions, &$topicOptions, &$posterOptions, &$topic_columns, &$topic_parameters));
+			IntegrationHook::call('integrate_before_create_topic', [&$msgOptions, &$topicOptions, &$posterOptions, &$topic_columns, &$topic_parameters]);
 
-			$topicOptions['id'] = Db::$db->insert('',
+			$topicOptions['id'] = Db::$db->insert(
+				'',
 				'{db_prefix}topics',
 				$topic_columns,
 				$topic_parameters,
-				array('id_topic'),
-				1
+				['id_topic'],
+				1,
 			);
 
 			// The topic couldn't be created for some reason.
-			if (empty($topicOptions['id']))
-			{
+			if (empty($topicOptions['id'])) {
 				// We should delete the post that did work, though...
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}messages
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}messages
 					WHERE id_msg = {int:id_msg}',
-					array(
+					[
 						'id_msg' => $msgOptions['id'],
-					)
+					],
 				);
 
 				return false;
 			}
 
 			// Fix the message with the topic.
-			Db::$db->query('', '
-				UPDATE {db_prefix}messages
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}messages
 				SET id_topic = {int:id_topic}
 				WHERE id_msg = {int:id_msg}',
-				array(
+				[
 					'id_topic' => $topicOptions['id'],
 					'id_msg' => $msgOptions['id'],
-				)
+				],
 			);
 
 			// There's been a new topic AND a new post today.
-			Logging::trackStats(array('topics' => '+', 'posts' => '+'));
+			Logging::trackStats(['topics' => '+', 'posts' => '+']);
 
 			Logging::updateStats('topic', true);
 			Logging::updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
 
 			// What if we want to export new topics out to a CMS?
-			IntegrationHook::call('integrate_create_topic', array(&$msgOptions, &$topicOptions, &$posterOptions));
+			IntegrationHook::call('integrate_create_topic', [&$msgOptions, &$topicOptions, &$posterOptions]);
 		}
 		// The topic already exists, it only needs a little updating.
-		else
-		{
-			$update_parameters = array(
+		else {
+			$update_parameters = [
 				'poster_id' => $posterOptions['id'],
 				'id_msg' => $msgOptions['id'],
 				'locked' => $topicOptions['lock_mode'],
 				'is_sticky' => $topicOptions['sticky_mode'],
 				'id_topic' => $topicOptions['id'],
 				'counter_increment' => 1,
-			);
+			];
 
-			if ($msgOptions['approved'])
-			{
-				$topics_columns = array(
+			if ($msgOptions['approved']) {
+				$topics_columns = [
 					'id_member_updated = {int:poster_id}',
 					'id_last_msg = {int:id_msg}',
 					'num_replies = num_replies + {int:counter_increment}',
-				);
-			}
-			else
-			{
-				$topics_columns = array(
+				];
+			} else {
+				$topics_columns = [
 					'unapproved_posts = unapproved_posts + {int:counter_increment}',
-				);
+				];
 			}
 
-			if ($topicOptions['lock_mode'] !== null)
+			if ($topicOptions['lock_mode'] !== null) {
 				$topics_columns[] = 'locked = {int:locked}';
+			}
 
-			if ($topicOptions['sticky_mode'] !== null)
+			if ($topicOptions['sticky_mode'] !== null) {
 				$topics_columns[] = 'is_sticky = {int:is_sticky}';
+			}
 
-			IntegrationHook::call('integrate_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
+			IntegrationHook::call('integrate_modify_topic', [&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions]);
 
 			// Update the number of replies and the lock/sticky status.
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET
 					' . implode(', ', $topics_columns) . '
 				WHERE id_topic = {int:id_topic}',
-				$update_parameters
+				$update_parameters,
 			);
 
 			// One new post has been added today.
-			Logging::trackStats(array('posts' => '+'));
+			Logging::trackStats(['posts' => '+']);
 		}
 
 		// Creating is modifying...in a way.
 		// @todo Why not set id_msg_modified on the insert?
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_msg_modified = {int:id_msg}
 			WHERE id_msg = {int:id_msg}',
-			array(
+			[
 				'id_msg' => $msgOptions['id'],
-			)
+			],
 		);
 
 		// Increase the number of posts and topics on the board.
-		if ($msgOptions['approved'])
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		if ($msgOptions['approved']) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 				WHERE id_board = {int:id_board}',
-				array(
+				[
 					'id_board' => $topicOptions['board'],
-				)
+				],
 			);
-		}
-		else
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		} else {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET unapproved_posts = unapproved_posts + 1' . ($new_topic ? ', unapproved_topics = unapproved_topics + 1' : '') . '
 				WHERE id_board = {int:id_board}',
-				array(
+				[
 					'id_board' => $topicOptions['board'],
-				)
+				],
 			);
 
 			// Add to the approval queue too.
-			Db::$db->insert('',
+			Db::$db->insert(
+				'',
 				'{db_prefix}approval_queue',
-				array(
+				[
 					'id_msg' => 'int',
-				),
-				array(
+				],
+				[
 					$msgOptions['id'],
-				),
-				array()
+				],
+				[],
 			);
 
-			Db::$db->insert('',
+			Db::$db->insert(
+				'',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array(
-					'$sourcedir/tasks/ApprovePost_Notify.php', 'SMF\Tasks\ApprovePost_Notify', Utils::jsonEncode(array(
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int'],
+				[
+					'SMF\\Tasks\\ApprovePost_Notify',
+					Utils::jsonEncode([
 						'msgOptions' => $msgOptions,
 						'topicOptions' => $topicOptions,
 						'posterOptions' => $posterOptions,
 						'type' => $new_topic ? 'topic' : 'post',
-					)), 0
-				),
-				array('id_task')
+					]),
+					0,
+				],
+				['id_task'],
 			);
 		}
 
 		// Mark inserted topic as read (only for the user calling this function).
-		if (!empty($topicOptions['mark_as_read']) && !User::$me->is_guest)
-		{
+		if (!empty($topicOptions['mark_as_read']) && !User::$me->is_guest) {
 			// Since it's likely they *read* it before replying, let's try an UPDATE first.
-			if (!$new_topic)
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}log_topics
+			if (!$new_topic) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}log_topics
 					SET id_msg = {int:id_msg}
 					WHERE id_member = {int:current_member}
 						AND id_topic = {int:id_topic}',
-					array(
+					[
 						'current_member' => $posterOptions['id'],
 						'id_msg' => $msgOptions['id'],
 						'id_topic' => $topicOptions['id'],
-					)
+					],
 				);
 
 				$flag = Db::$db->affected_rows() != 0;
 			}
 
-			if (empty($flag))
-			{
-				Db::$db->insert('ignore',
+			if (empty($flag)) {
+				Db::$db->insert(
+					'ignore',
 					'{db_prefix}log_topics',
-					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
-					array($topicOptions['id'], $posterOptions['id'], $msgOptions['id']),
-					array('id_topic', 'id_member')
+					['id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int'],
+					[$topicOptions['id'], $posterOptions['id'], $msgOptions['id']],
+					['id_topic', 'id_member'],
 				);
 			}
 		}
 
-		if ($msgOptions['approved'] && empty($topicOptions['is_approved']) && $posterOptions['id'] != User::$me->id)
-		{
-			Db::$db->insert('',
+		if ($msgOptions['approved'] && empty($topicOptions['is_approved']) && $posterOptions['id'] != User::$me->id) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array(
-					'$sourcedir/tasks/ApproveReply_Notify.php', 'SMF\Tasks\ApproveReply_Notify', Utils::jsonEncode(array(
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\ApproveReply_Notify',
+					Utils::jsonEncode([
 						'msgOptions' => $msgOptions,
 						'topicOptions' => $topicOptions,
 						'posterOptions' => $posterOptions,
-					)), 0
-				),
-				array('id_task')
+					]),
+					0,
+				],
+				['id_task'],
 			);
 		}
 
 		// If there's a custom search index, it may need updating...
 		$searchAPI = SearchApi::load();
 
-		if (is_callable(array($searchAPI, 'postCreated')))
+		if (is_callable([$searchAPI, 'postCreated'])) {
 			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+		}
 
 		// Increase the post counter for the user that created the post.
-		if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
-		{
+		if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved']) {
 			// Are you the one that happened to create this post?
-			if (User::$me->id == $posterOptions['id'])
+			if (User::$me->id == $posterOptions['id']) {
 				User::$me->posts++;
+			}
 
-			User::updateMemberData($posterOptions['id'], array('posts' => '+'));
+			User::updateMemberData($posterOptions['id'], ['posts' => '+']);
 		}
 
 		// They've posted, so they can make the view count go up one if they really want. (this is to keep views >= replies...)
 		$_SESSION['last_read_topic'] = 0;
 
 		// Better safe than sorry.
-		if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
+		if (isset($_SESSION['topicseen_cache'][$topicOptions['board']])) {
 			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+		}
 
 		// Keep track of quotes and mentions.
-		if (!empty($msgOptions['quoted_members']))
-		{
+		if (!empty($msgOptions['quoted_members'])) {
 			Mentions::insertMentions('quote', $msgOptions['id'], $msgOptions['quoted_members'], $posterOptions['id']);
 		}
 
-		if (!empty($msgOptions['mentioned_members']))
-		{
+		if (!empty($msgOptions['mentioned_members'])) {
 			Mentions::insertMentions('msg', $msgOptions['id'], $msgOptions['mentioned_members'], $posterOptions['id']);
 		}
 
@@ -1708,24 +1658,31 @@ public static function create(&$msgOptions, &$topicOptions, &$posterOptions): bo
 		Logging::updateStats('message', true, $msgOptions['id']);
 
 		// Update the last message on the board assuming it's approved AND the topic is.
-		if ($msgOptions['approved'])
-		{
+		if ($msgOptions['approved']) {
 			self::updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
 		}
 
 		// Queue createPost background notification
-		if ($msgOptions['send_notifications'] && $msgOptions['approved'])
-		{
-			Db::$db->insert('',
+		if ($msgOptions['send_notifications'] && $msgOptions['approved']) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array('$sourcedir/tasks/CreatePost_Notify.php', 'SMF\Tasks\CreatePost_Notify', Utils::jsonEncode(array(
-					'msgOptions' => $msgOptions,
-					'topicOptions' => $topicOptions,
-					'posterOptions' => $posterOptions,
-					'type' => $new_topic ? 'topic' : 'reply',
-				)), 0),
-				array('id_task')
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\CreatePost_Notify',
+					Utils::jsonEncode([
+						'msgOptions' => $msgOptions,
+						'topicOptions' => $topicOptions,
+						'posterOptions' => $posterOptions,
+						'type' => $new_topic ? 'topic' : 'reply',
+					]),
+					0,
+				],
+				['id_task'],
 			);
 		}
 
@@ -1747,81 +1704,83 @@ public static function create(&$msgOptions, &$topicOptions, &$posterOptions): bo
 	public static function modify(&$msgOptions, &$topicOptions, &$posterOptions): bool
 	{
 		$topicOptions['poll'] = isset($topicOptions['poll']) ? (int) $topicOptions['poll'] : null;
-		$topicOptions['lock_mode'] = isset($topicOptions['lock_mode']) ? $topicOptions['lock_mode'] : null;
-		$topicOptions['sticky_mode'] = isset($topicOptions['sticky_mode']) ? $topicOptions['sticky_mode'] : null;
+		$topicOptions['lock_mode'] = $topicOptions['lock_mode'] ?? null;
+		$topicOptions['sticky_mode'] = $topicOptions['sticky_mode'] ?? null;
 
 		// This is longer than it has to be, but makes it so we only set/change what we have to.
-		$messages_columns = array();
+		$messages_columns = [];
 
-		if (isset($posterOptions['name']))
+		if (isset($posterOptions['name'])) {
 			$messages_columns['poster_name'] = $posterOptions['name'];
+		}
 
-		if (isset($posterOptions['email']))
+		if (isset($posterOptions['email'])) {
 			$messages_columns['poster_email'] = $posterOptions['email'];
+		}
 
-		if (isset($msgOptions['icon']))
+		if (isset($msgOptions['icon'])) {
 			$messages_columns['icon'] = $msgOptions['icon'];
+		}
 
-		if (isset($msgOptions['subject']))
+		if (isset($msgOptions['subject'])) {
 			$messages_columns['subject'] = $msgOptions['subject'];
+		}
 
-		if (isset($msgOptions['body']))
-		{
+		if (isset($msgOptions['body'])) {
 			$messages_columns['body'] = $msgOptions['body'];
 
 			// using a custom search index, then lets get the old message so we can update our index as needed
-			if (!empty(Config::$modSettings['search_custom_index_config']))
-			{
-				$request = Db::$db->query('', '
-					SELECT body
+			if (!empty(Config::$modSettings['search_custom_index_config'])) {
+				$request = Db::$db->query(
+					'',
+					'SELECT body
 					FROM {db_prefix}messages
 					WHERE id_msg = {int:id_msg}',
-					array(
+					[
 						'id_msg' => $msgOptions['id'],
-					)
+					],
 				);
 				list($msgOptions['old_body']) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 			}
 		}
 
-		if (!empty($msgOptions['modify_time']))
-		{
+		if (!empty($msgOptions['modify_time'])) {
 			$messages_columns['modified_time'] = $msgOptions['modify_time'];
 			$messages_columns['modified_name'] = $msgOptions['modify_name'];
 			$messages_columns['modified_reason'] = $msgOptions['modify_reason'];
 			$messages_columns['id_msg_modified'] = Config::$modSettings['maxMsgID'];
 		}
 
-		if (isset($msgOptions['smileys_enabled']))
+		if (isset($msgOptions['smileys_enabled'])) {
 			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+		}
 
 		// Which columns need to be ints?
-		$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
-		$update_parameters = array(
+		$messageInts = ['modified_time', 'id_msg_modified', 'smileys_enabled'];
+		$update_parameters = [
 			'id_msg' => $msgOptions['id'],
-		);
+		];
 
 		// Update search api
 		$searchAPI = SearchApi::load();
 
-		if ($searchAPI->supportsMethod('postRemoved'))
+		if ($searchAPI->supportsMethod('postRemoved')) {
 			$searchAPI->postRemoved($msgOptions['id']);
+		}
 
 		// Anyone quoted or mentioned?
 		$quoted_members = Mentions::getQuotedMembers($msgOptions['body'], $posterOptions['id']);
 		$quoted_modifications = Mentions::modifyMentions('quote', $msgOptions['id'], $quoted_members, $posterOptions['id']);
 
-		if (!empty($quoted_modifications['added']))
-		{
+		if (!empty($quoted_modifications['added'])) {
 			$msgOptions['quoted_members'] = array_intersect_key($quoted_members, array_flip(array_keys($quoted_modifications['added'])));
 
 			// You don't need a notification about quoting yourself.
 			unset($msgOptions['quoted_members'][User::$me->id]);
 		}
 
-		if (!empty(Config::$modSettings['enable_mentions']) && isset($msgOptions['body']))
-		{
+		if (!empty(Config::$modSettings['enable_mentions']) && isset($msgOptions['body'])) {
 			$mentions = Mentions::getMentionedMembers($msgOptions['body']);
 			$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 			$mentions = Mentions::verifyMentionedMembers($msgOptions['body'], $mentions);
@@ -1829,8 +1788,7 @@ public static function modify(&$msgOptions, &$topicOptions, &$posterOptions): bo
 			// Update our records in the database.
 			$mention_modifications = Mentions::modifyMentions('msg', $msgOptions['id'], $mentions, $posterOptions['id']);
 
-			if (!empty($mention_modifications['added']))
-			{
+			if (!empty($mention_modifications['added'])) {
 				// Queue this for notification.
 				$msgOptions['mentioned_members'] = array_intersect_key($mentions, array_flip(array_keys($mention_modifications['added'])));
 
@@ -1843,70 +1801,71 @@ public static function modify(&$msgOptions, &$topicOptions, &$posterOptions): bo
 		$msgOptions['send_notifications'] = isset($msgOptions['send_notifications']) ? (bool) $msgOptions['send_notifications'] : true;
 
 		// Maybe a mod wants to make some changes?
-		IntegrationHook::call('integrate_modify_post', array(&$messages_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions, &$messageInts));
+		IntegrationHook::call('integrate_modify_post', [&$messages_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions, &$messageInts]);
 
-		foreach ($messages_columns as $var => $val)
-		{
+		foreach ($messages_columns as $var => $val) {
 			$messages_columns[$var] = $var . ' = {' . (in_array($var, $messageInts) ? 'int' : 'string') . ':var_' . $var . '}';
 			$update_parameters['var_' . $var] = $val;
 		}
 
 		// Nothing to do?
-		if (empty($messages_columns))
+		if (empty($messages_columns)) {
 			return true;
+		}
 
 		// Change the post.
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET ' . implode(', ', $messages_columns) . '
 			WHERE id_msg = {int:id_msg}',
-			$update_parameters
+			$update_parameters,
 		);
 
 		// Lock and or sticky the post.
-		if ($topicOptions['sticky_mode'] !== null || $topicOptions['lock_mode'] !== null || $topicOptions['poll'] !== null)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+		if ($topicOptions['sticky_mode'] !== null || $topicOptions['lock_mode'] !== null || $topicOptions['poll'] !== null) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET
 					is_sticky = {raw:is_sticky},
 					locked = {raw:locked},
 					id_poll = {raw:id_poll}
 				WHERE id_topic = {int:id_topic}',
-				array(
+				[
 					'is_sticky' => $topicOptions['sticky_mode'] === null ? 'is_sticky' : (int) $topicOptions['sticky_mode'],
 					'locked' => $topicOptions['lock_mode'] === null ? 'locked' : (int) $topicOptions['lock_mode'],
 					'id_poll' => $topicOptions['poll'] === null ? 'id_poll' : (int) $topicOptions['poll'],
 					'id_topic' => $topicOptions['id'],
-				)
+				],
 			);
 		}
 
 		// Mark the edited post as read.
-		if (!empty($topicOptions['mark_as_read']) && !User::$me->is_guest)
-		{
+		if (!empty($topicOptions['mark_as_read']) && !User::$me->is_guest) {
 			// Since it's likely they *read* it before editing, let's try an UPDATE first.
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_topics
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_topics
 				SET id_msg = {int:id_msg}
 				WHERE id_member = {int:current_member}
 					AND id_topic = {int:id_topic}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'id_msg' => Config::$modSettings['maxMsgID'],
 					'id_topic' => $topicOptions['id'],
-				)
+				],
 			);
 
 			$flag = Db::$db->affected_rows() != 0;
 
-			if (empty($flag))
-			{
-				Db::$db->insert('ignore',
+			if (empty($flag)) {
+				Db::$db->insert(
+					'ignore',
 					'{db_prefix}log_topics',
-					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
-					array($topicOptions['id'], User::$me->id, Config::$modSettings['maxMsgID']),
-					array('id_topic', 'id_member')
+					['id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int'],
+					[$topicOptions['id'], User::$me->id, Config::$modSettings['maxMsgID']],
+					['id_topic', 'id_member'],
 				);
 			}
 		}
@@ -1914,8 +1873,9 @@ public static function modify(&$msgOptions, &$topicOptions, &$posterOptions): bo
 		// If there's a custom search index, it needs to be modified...
 		$searchAPI = SearchApi::load();
 
-		if (is_callable(array($searchAPI, 'postModified')))
+		if (is_callable([$searchAPI, 'postModified'])) {
 			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+		}
 
 		// Send notifications about any new quotes or mentions.
 		if (
@@ -1927,43 +1887,52 @@ public static function modify(&$msgOptions, &$topicOptions, &$posterOptions): bo
 				|| !empty($mention_modifications['removed'])
 				|| !empty($quoted_modifications['removed'])
 			)
-		)
-		{
-			Db::$db->insert('',
+		) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}background_tasks',
-				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
-				array('$sourcedir/tasks/CreatePost_Notify.php', 'SMF\Tasks\CreatePost_Notify', Utils::jsonEncode(array(
-					'msgOptions' => $msgOptions,
-					'topicOptions' => $topicOptions,
-					'posterOptions' => $posterOptions,
-					'type' => 'edit',
-				)), 0),
-				array('id_task')
+				[
+					'task_class' => 'string',
+					'task_data' => 'string',
+					'claimed_time' => 'int',
+				],
+				[
+					'SMF\\Tasks\\CreatePost_Notify',
+					Utils::jsonEncode([
+						'msgOptions' => $msgOptions,
+						'topicOptions' => $topicOptions,
+						'posterOptions' => $posterOptions,
+						'type' => 'edit',
+					]),
+					0,
+				],
+				['id_task'],
 			);
 		}
 
-		if (isset($msgOptions['subject']))
-		{
+		if (isset($msgOptions['subject'])) {
 			// Only update the subject if this was the first message in the topic.
-			$request = Db::$db->query('', '
-				SELECT id_topic
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}topics
 				WHERE id_first_msg = {int:id_first_msg}
 				LIMIT 1',
-				array(
+				[
 					'id_first_msg' => $msgOptions['id'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 1)
-			{
+
+			if (Db::$db->num_rows($request) == 1) {
 				Logging::updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
 			}
 			Db::$db->free_result($request);
 		}
 
 		// Finally, if we are setting the approved state we need to do much more work :(
-		if (Config::$modSettings['postmod_active'] && isset($msgOptions['approved']))
+		if (Config::$modSettings['postmod_active'] && isset($msgOptions['approved'])) {
 			Msg::approve($msgOptions['id'], $msgOptions['approved']);
+		}
 
 		return true;
 	}
@@ -1978,25 +1947,28 @@ public static function modify(&$msgOptions, &$topicOptions, &$posterOptions): bo
 	 */
 	public static function approve($msgs, $approve = true, $notify = true): bool
 	{
-		if (!is_array($msgs))
-			$msgs = array($msgs);
+		if (!is_array($msgs)) {
+			$msgs = [$msgs];
+		}
 
-		if (empty($msgs))
+		if (empty($msgs)) {
 			return false;
+		}
 
 		// May as well start at the beginning, working out *what* we need to change.
 		$message_list = $msgs;
 
-		$msgs = array();
-		$topics = array();
-		$topic_changes = array();
-		$board_changes = array();
-		$notification_topics = array();
-		$notification_posts = array();
-		$member_post_changes = array();
-
-		$request = Db::$db->query('', '
-			SELECT m.id_msg, m.approved, m.id_topic, m.id_board, t.id_first_msg, t.id_last_msg,
+		$msgs = [];
+		$topics = [];
+		$topic_changes = [];
+		$board_changes = [];
+		$notification_topics = [];
+		$notification_posts = [];
+		$member_post_changes = [];
+
+		$request = Db::$db->query(
+			'',
+			'SELECT m.id_msg, m.approved, m.id_topic, m.id_board, t.id_first_msg, t.id_last_msg,
 				m.body, m.subject, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.id_member,
 				t.approved AS topic_approved, b.count_posts
 			FROM {db_prefix}messages AS m
@@ -2005,48 +1977,45 @@ public static function approve($msgs, $approve = true, $notify = true): bool
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)
 			WHERE m.id_msg IN ({array_int:message_list})
 				AND m.approved = {int:approved_state}',
-			array(
+			[
 				'message_list' => $message_list,
 				'approved_state' => $approve ? 0 : 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Easy...
 			$msgs[] = $row['id_msg'];
 			$topics[] = $row['id_topic'];
 
 			// Ensure our change array exists already.
-			if (!isset($topic_changes[$row['id_topic']]))
-			{
-				$topic_changes[$row['id_topic']] = array(
+			if (!isset($topic_changes[$row['id_topic']])) {
+				$topic_changes[$row['id_topic']] = [
 					'id_last_msg' => $row['id_last_msg'],
 					'approved' => $row['topic_approved'],
 					'replies' => 0,
 					'unapproved_posts' => 0,
-				);
+				];
 			}
 
-			if (!isset($board_changes[$row['id_board']]))
-			{
-				$board_changes[$row['id_board']] = array(
+			if (!isset($board_changes[$row['id_board']])) {
+				$board_changes[$row['id_board']] = [
 					'posts' => 0,
 					'topics' => 0,
 					'unapproved_posts' => 0,
 					'unapproved_topics' => 0,
-				);
+				];
 			}
 
 			// If it's the first message then the topic state changes!
-			if ($row['id_msg'] == $row['id_first_msg'])
-			{
+			if ($row['id_msg'] == $row['id_first_msg']) {
 				$topic_changes[$row['id_topic']]['approved'] = $approve ? 1 : 0;
 
 				$board_changes[$row['id_board']]['unapproved_topics'] += $approve ? -1 : 1;
 				$board_changes[$row['id_board']]['topics'] += $approve ? 1 : -1;
 
 				// Note we need to ensure we announce this topic!
-				$notification_topics[] = array(
+				$notification_topics[] = [
 					'body' => $row['body'],
 					'subject' => $row['subject'],
 					'name' => $row['poster_name'],
@@ -2055,16 +2024,13 @@ public static function approve($msgs, $approve = true, $notify = true): bool
 					'msg' => $row['id_first_msg'],
 					'poster' => $row['id_member'],
 					'new_topic' => true,
-				);
-			}
-			else
-			{
+				];
+			} else {
 				$topic_changes[$row['id_topic']]['replies'] += $approve ? 1 : -1;
 
 				// This will be a post... but don't notify unless it's not followed by approved ones.
-				if ($row['id_msg'] > $row['id_last_msg'])
-				{
-					$notification_posts[$row['id_topic']] = array(
+				if ($row['id_msg'] > $row['id_last_msg']) {
+					$notification_posts[$row['id_topic']] = [
 						'id' => $row['id_msg'],
 						'body' => $row['body'],
 						'subject' => $row['subject'],
@@ -2074,18 +2040,16 @@ public static function approve($msgs, $approve = true, $notify = true): bool
 						'poster' => $row['id_member'],
 						'new_topic' => false,
 						'msg' => $row['id_msg'],
-					);
+					];
 				}
 			}
 
 			// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
-			if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			{
+			if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg']) {
 				$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
 			}
 			// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
-			elseif (!$approve)
-			{
+			elseif (!$approve) {
 				// Default to the first message and then we'll override in a bit ;)
 				$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
 			}
@@ -2095,163 +2059,160 @@ public static function approve($msgs, $approve = true, $notify = true): bool
 			$board_changes[$row['id_board']]['posts'] += $approve ? 1 : -1;
 
 			// Post count for the user?
-			if ($row['id_member'] && empty($row['count_posts']))
-			{
+			if ($row['id_member'] && empty($row['count_posts'])) {
 				$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
 			}
 		}
 		Db::$db->free_result($request);
 
-		if (empty($msgs))
+		if (empty($msgs)) {
 			return false;
+		}
 
 		// Now we have the differences make the changes, first the easy one.
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET approved = {int:approved_state}
 			WHERE id_msg IN ({array_int:message_list})',
-			array(
+			[
 				'message_list' => $msgs,
 				'approved_state' => $approve ? 1 : 0,
-			)
+			],
 		);
 
 		// If we were unapproving find the last msg in the topics...
-		if (!$approve)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic, MAX(id_msg) AS id_last_msg
+		if (!$approve) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, MAX(id_msg) AS id_last_msg
 				FROM {db_prefix}messages
 				WHERE id_topic IN ({array_int:topic_list})
 					AND approved = {int:approved}
 				GROUP BY id_topic',
-				array(
+				[
 					'topic_list' => $topics,
 					'approved' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
 			}
 			Db::$db->free_result($request);
 		}
 
 		// ... next the topics...
-		foreach ($topic_changes as $id => $changes)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+		foreach ($topic_changes as $id => $changes) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET approved = {int:approved}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 					num_replies = num_replies + {int:num_replies}, id_last_msg = {int:id_last_msg}
 				WHERE id_topic = {int:id_topic}',
-				array(
+				[
 					'approved' => $changes['approved'],
 					'unapproved_posts' => $changes['unapproved_posts'],
 					'num_replies' => $changes['replies'],
 					'id_last_msg' => $changes['id_last_msg'],
 					'id_topic' => $id,
-				)
+				],
 			);
 		}
 
 		// ... finally the boards...
-		foreach ($board_changes as $id => $changes)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		foreach ($board_changes as $id => $changes) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET num_posts = num_posts + {int:num_posts}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 					num_topics = num_topics + {int:num_topics}, unapproved_topics = unapproved_topics + {int:unapproved_topics}
 				WHERE id_board = {int:id_board}',
-				array(
+				[
 					'num_posts' => $changes['posts'],
 					'unapproved_posts' => $changes['unapproved_posts'],
 					'num_topics' => $changes['topics'],
 					'unapproved_topics' => $changes['unapproved_topics'],
 					'id_board' => $id,
-				)
+				],
 			);
 		}
 
 		// Finally, least importantly, notifications!
-		if ($approve)
-		{
-			$task_rows = array();
-
-			foreach (array_merge($notification_topics, $notification_posts) as $topic)
-			{
-				$task_rows[] = array(
-					'$sourcedir/tasks/CreatePost_Notify.php',
-					'SMF\Tasks\CreatePost_Notify',
-					Utils::jsonEncode(array(
-						'msgOptions' => array(
+		if ($approve) {
+			$task_rows = [];
+
+			foreach (array_merge($notification_topics, $notification_posts) as $topic) {
+				$task_rows[] = [
+					'SMF\\Tasks\\CreatePost_Notify',
+					Utils::jsonEncode([
+						'msgOptions' => [
 							'id' => $topic['msg'],
 							'body' => $topic['body'],
 							'subject' => $topic['subject'],
-						),
-						'topicOptions' => array(
+						],
+						'topicOptions' => [
 							'id' => $topic['topic'],
 							'board' => $topic['board'],
-						),
-						'posterOptions' => array(
+						],
+						'posterOptions' => [
 							'id' => $topic['poster'],
 							'name' => $topic['name'],
-						),
+						],
 						'type' => $topic['new_topic'] ? 'topic' : 'reply',
-					)),
+					]),
 					0,
-				);
+				];
 			}
 
-			if ($notify)
-			{
-				Db::$db->insert('',
+			if ($notify) {
+				Db::$db->insert(
+					'',
 					'{db_prefix}background_tasks',
-					array(
-						'task_file' => 'string',
+					[
 						'task_class' => 'string',
 						'task_data' => 'string',
 						'claimed_time' => 'int',
-					),
+					],
 					$task_rows,
-					array('id_task')
+					['id_task'],
 				);
 			}
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}approval_queue
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg IN ({array_int:message_list})
 					AND id_attach = {int:id_attach}',
-				array(
+				[
 					'message_list' => $msgs,
 					'id_attach' => 0,
-				)
+				],
 			);
 
 			// Clean up moderator alerts
-			if (!empty($notification_topics))
-			{
+			if (!empty($notification_topics)) {
 				self::clearApprovalAlerts(array_column($notification_topics, 'topic'), 'unapproved_topic');
 			}
 
-			if (!empty($notification_posts))
-			{
+			if (!empty($notification_posts)) {
 				self::clearApprovalAlerts(array_column($notification_posts, 'id'), 'unapproved_post');
 			}
 		}
 		// If unapproving add to the approval queue!
-		else
-		{
-			$msgInserts = array();
+		else {
+			$msgInserts = [];
 
-			foreach ($msgs as $msg)
-				$msgInserts[] = array($msg);
+			foreach ($msgs as $msg) {
+				$msgInserts[] = [$msg];
+			}
 
-			Db::$db->insert('ignore',
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}approval_queue',
-				array('id_msg' => 'int'),
+				['id_msg' => 'int'],
 				$msgInserts,
-				array('id_msg')
+				['id_msg'],
 			);
 		}
 
@@ -2259,16 +2220,14 @@ public static function approve($msgs, $approve = true, $notify = true): bool
 		self::updateLastMessages(array_keys($board_changes));
 
 		// Post count for the members?
-		if (!empty($member_post_changes))
-		{
-			foreach ($member_post_changes as $id_member => $count_change)
-			{
-				User::updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+		if (!empty($member_post_changes)) {
+			foreach ($member_post_changes as $id_member => $count_change) {
+				User::updateMemberData($id_member, ['posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change]);
 			}
 		}
 
 		// In case an external CMS needs to know about this approval/unapproval.
-		IntegrationHook::call('integrate_after_approve_posts', array($approve, $msgs, $topic_changes, $member_post_changes));
+		IntegrationHook::call('integrate_after_approve_posts', [$approve, $msgs, $topic_changes, $member_post_changes]);
 
 		return true;
 	}
@@ -2278,40 +2237,41 @@ public static function approve($msgs, $approve = true, $notify = true): bool
 	 *
 	 * @param int[] $content_ids either id_msgs or id_topics
 	 * @param string $content_action will be either 'unapproved_post' or 'unapproved_topic'
-	 * @return void
 	 */
 	public static function clearApprovalAlerts($content_ids, $content_action): void
 	{
 		// Some data hygiene...
-		if (!is_array($content_ids))
+		if (!is_array($content_ids)) {
 			return;
+		}
 
 		$content_ids = array_filter(array_map('intval', $content_ids));
 
-		if (empty($content_ids))
+		if (empty($content_ids)) {
 			return;
+		}
 
-		if (!in_array($content_action, array('unapproved_post', 'unapproved_topic')))
+		if (!in_array($content_action, ['unapproved_post', 'unapproved_topic'])) {
 			return;
+		}
 
 		// Check to see if there are unread alerts to delete...
 		// Might be multiple alerts, for multiple moderators...
 		Alert::deleteWhere(
-			array(
+			[
 				'content_id IN ({array_int:content_ids})',
 				'content_type = {string:content_type}',
 				'content_action = {string:content_action}',
 				'is_read = {int:unread}',
-			),
-			array(
+			],
+			[
 				'content_ids' => $content_ids,
 				'content_type' => $content_action === 'unapproved_topic' ? 'topic' : 'msg',
 				'content_action' => $content_action,
 				'unread' => 0,
-			),
-			true
+			],
+			true,
 		);
-
 	}
 
 	/**
@@ -2329,78 +2289,69 @@ public static function clearApprovalAlerts($content_ids, $content_action): void
 	public static function updateLastMessages($setboards, $id_msg = 0)
 	{
 		// Please - let's be sane.
-		if (empty($setboards))
+		if (empty($setboards)) {
 			return false;
+		}
 
-		if (!is_array($setboards))
-			$setboards = array($setboards);
+		if (!is_array($setboards)) {
+			$setboards = [$setboards];
+		}
 
 		// If we don't know the id_msg we need to find it.
-		if (!$id_msg)
-		{
+		if (!$id_msg) {
 			// Find the latest message on this board (highest id_msg.)
-			$lastMsg = array();
+			$lastMsg = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_board, MAX(id_last_msg) AS id_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board, MAX(id_last_msg) AS id_msg
 				FROM {db_prefix}topics
 				WHERE id_board IN ({array_int:board_list})
 					AND approved = {int:approved}
 				GROUP BY id_board',
-				array(
+				[
 					'board_list' => $setboards,
 					'approved' => 1,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$lastMsg[$row['id_board']] = $row['id_msg'];
 			}
 			Db::$db->free_result($request);
-		}
-		else
-		{
+		} else {
 			// Just to note - there should only be one board passed if we are doing this.
-			foreach ($setboards as $id_board)
+			foreach ($setboards as $id_board) {
 				$lastMsg[$id_board] = $id_msg;
+			}
 		}
 
-		$parent_boards = array();
+		$parent_boards = [];
 
 		// Keep track of last modified dates.
 		$lastModified = $lastMsg;
 
 		// Get all the child boards for the parents, if they have some...
-		foreach ($setboards as $id_board)
-		{
-			if (!isset($lastMsg[$id_board]))
-			{
+		foreach ($setboards as $id_board) {
+			if (!isset($lastMsg[$id_board])) {
 				$lastMsg[$id_board] = 0;
 				$lastModified[$id_board] = 0;
 			}
 
-			if (!empty(Board::$info->id) && $id_board == Board::$info->id)
-			{
+			if (!empty(Board::$info->id) && $id_board == Board::$info->id) {
 				$parents = Board::$info->parent_boards;
-			}
-			else
-			{
+			} else {
 				$parents = Board::getParents($id_board);
 			}
 
 			// Ignore any parents on the top child level.
 			// @todo Why?
-			foreach ($parents as $id => $parent)
-			{
-				if ($parent['level'] != 0)
-				{
+			foreach ($parents as $id => $parent) {
+				if ($parent['level'] != 0) {
 					// If we're already doing this one as a board, is this a higher last modified?
-					if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					{
+					if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id]) {
 						$lastModified[$id] = $lastModified[$id_board];
-					}
-					elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					{
+					} elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board])) {
 						$parent_boards[$id] = $lastModified[$id_board];
 					}
 				}
@@ -2410,63 +2361,56 @@ public static function updateLastMessages($setboards, $id_msg = 0)
 		// Note to help understand what is happening here. For parents we update the timestamp of the last message for determining
 		// whether there are child boards which have not been read. For the boards themselves we update both this and id_last_msg.
 
-		$board_updates = array();
-		$parent_updates = array();
+		$board_updates = [];
+		$parent_updates = [];
 
 		// Finally, to save on queries make the changes...
-		foreach ($parent_boards as $id => $msg)
-		{
-			if (!isset($parent_updates[$msg]))
-			{
-				$parent_updates[$msg] = array($id);
-			}
-			else
-			{
+		foreach ($parent_boards as $id => $msg) {
+			if (!isset($parent_updates[$msg])) {
+				$parent_updates[$msg] = [$id];
+			} else {
 				$parent_updates[$msg][] = $id;
 			}
 		}
 
-		foreach ($lastMsg as $id => $msg)
-		{
-			if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			{
-				$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		foreach ($lastMsg as $id => $msg) {
+			if (!isset($board_updates[$msg . '-' . $lastModified[$id]])) {
+				$board_updates[$msg . '-' . $lastModified[$id]] = [
 					'id' => $msg,
 					'updated' => $lastModified[$id],
-					'boards' => array($id)
-				);
-			}
-			else
-			{
+					'boards' => [$id],
+				];
+			} else {
 				$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
 			}
 		}
 
 		// Now commit the changes!
-		foreach ($parent_updates as $id_msg => $boards)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+		foreach ($parent_updates as $id_msg => $boards) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET id_msg_updated = {int:id_msg_updated}
 				WHERE id_board IN ({array_int:board_list})
 					AND id_msg_updated < {int:id_msg_updated}',
-				array(
+				[
 					'board_list' => $boards,
 					'id_msg_updated' => $id_msg,
-				)
+				],
 			);
 		}
-		foreach ($board_updates as $board_data)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+
+		foreach ($board_updates as $board_data) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET id_last_msg = {int:id_last_msg}, id_msg_updated = {int:id_msg_updated}
 				WHERE id_board IN ({array_int:board_list})',
-				array(
+				[
 					'board_list' => $board_data['boards'],
 					'id_last_msg' => $board_data['id'],
 					'id_msg_updated' => $board_data['updated'],
-				)
+				],
 			);
 		}
 	}
@@ -2480,13 +2424,15 @@ public static function updateLastMessages($setboards, $id_msg = 0)
 	 */
 	public static function remove($message, $decreasePostCount = true)
 	{
-		if (empty($message) || !is_numeric($message))
+		if (empty($message) || !is_numeric($message)) {
 			return false;
+		}
 
 		$recycle_board = !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : 0;
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.id_member, m.icon, m.poster_time, m.subject,' . (empty(Config::$modSettings['search_custom_index_config']) ? '' : ' m.body,') . '
 				m.approved, t.id_topic, t.id_first_msg, t.id_last_msg, t.num_replies, t.id_board,
 				t.id_member_started AS id_member_poster,
@@ -2496,146 +2442,112 @@ public static function remove($message, $decreasePostCount = true)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
 			WHERE m.id_msg = {int:id_msg}
 			LIMIT 1',
-			array(
+			[
 				'id_msg' => $message,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			Db::$db->free_result($request);
+
 			return false;
 		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
 		// Give mods a heads-up before we do anything.
-		IntegrationHook::call('integrate_pre_remove_message', array($message, $decreasePostCount, $row));
+		IntegrationHook::call('integrate_pre_remove_message', [$message, $decreasePostCount, $row]);
 
-		if (empty(Board::$info->id) || $row['id_board'] != Board::$info->id)
-		{
+		if (empty(Board::$info->id) || $row['id_board'] != Board::$info->id) {
 			$delete_any = User::$me->boardsAllowedTo('delete_any');
 
-			if (!in_array(0, $delete_any) && !in_array($row['id_board'], $delete_any))
-			{
+			if (!in_array(0, $delete_any) && !in_array($row['id_board'], $delete_any)) {
 				$delete_own = User::$me->boardsAllowedTo('delete_own');
 				$delete_own = in_array(0, $delete_own) || in_array($row['id_board'], $delete_own);
 				$delete_replies = User::$me->boardsAllowedTo('delete_replies');
 				$delete_replies = in_array(0, $delete_replies) || in_array($row['id_board'], $delete_replies);
 
-				if ($row['id_member'] == User::$me->id)
-				{
-					if (!$delete_own)
-					{
-						if ($row['id_member_poster'] == User::$me->id)
-						{
-							if (!$delete_replies)
+				if ($row['id_member'] == User::$me->id) {
+					if (!$delete_own) {
+						if ($row['id_member_poster'] == User::$me->id) {
+							if (!$delete_replies) {
 								ErrorHandler::fatalLang('cannot_delete_replies', 'permission');
-						}
-						else
-						{
+							}
+						} else {
 							ErrorHandler::fatalLang('cannot_delete_own', 'permission');
 						}
-					}
-					elseif (($row['id_member_poster'] != User::$me->id || !$delete_replies) && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 < time())
-					{
+					} elseif (($row['id_member_poster'] != User::$me->id || !$delete_replies) && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 < time()) {
 						ErrorHandler::fatalLang('modify_post_time_passed', false);
 					}
-				}
-				elseif ($row['id_member_poster'] == User::$me->id)
-				{
-					if (!$delete_replies)
+				} elseif ($row['id_member_poster'] == User::$me->id) {
+					if (!$delete_replies) {
 						ErrorHandler::fatalLang('cannot_delete_replies', 'permission');
-				}
-				else
-				{
+					}
+				} else {
 					ErrorHandler::fatalLang('cannot_delete_any', 'permission');
 				}
 			}
 
 			// Can't delete an unapproved message, if you can't see it!
-			if (Config::$modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != User::$me->id && !(in_array(0, $delete_any) || in_array($row['id_board'], $delete_any)))
-			{
+			if (Config::$modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != User::$me->id && !(in_array(0, $delete_any) || in_array($row['id_board'], $delete_any))) {
 				$approve_posts = User::$me->boardsAllowedTo('approve_posts');
 
-				if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts))
+				if (!in_array(0, $approve_posts) && !in_array($row['id_board'], $approve_posts)) {
 					return false;
+				}
 			}
-		}
-		else
-		{
+		} else {
 			// Check permissions to delete this message.
-			if ($row['id_member'] == User::$me->id)
-			{
-				if (!User::$me->allowedTo('delete_own'))
-				{
-					if ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('delete_any'))
-					{
+			if ($row['id_member'] == User::$me->id) {
+				if (!User::$me->allowedTo('delete_own')) {
+					if ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('delete_any')) {
 						User::$me->isAllowedTo('delete_replies');
-					}
-					elseif (!User::$me->allowedTo('delete_any'))
-					{
+					} elseif (!User::$me->allowedTo('delete_any')) {
 						User::$me->isAllowedTo('delete_own');
 					}
-				}
-				elseif (!User::$me->allowedTo('delete_any') && ($row['id_member_poster'] != User::$me->id || !User::$me->allowedTo('delete_replies')) && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 < time())
-				{
+				} elseif (!User::$me->allowedTo('delete_any') && ($row['id_member_poster'] != User::$me->id || !User::$me->allowedTo('delete_replies')) && !empty(Config::$modSettings['edit_disable_time']) && $row['poster_time'] + Config::$modSettings['edit_disable_time'] * 60 < time()) {
 					ErrorHandler::fatalLang('modify_post_time_passed', false);
 				}
-			}
-			elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('delete_any'))
-			{
+			} elseif ($row['id_member_poster'] == User::$me->id && !User::$me->allowedTo('delete_any')) {
 				User::$me->isAllowedTo('delete_replies');
-			}
-			else
-			{
+			} else {
 				User::$me->isAllowedTo('delete_any');
 			}
 
-			if (Config::$modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != User::$me->id && !User::$me->allowedTo('delete_own'))
-			{
+			if (Config::$modSettings['postmod_active'] && !$row['approved'] && $row['id_member'] != User::$me->id && !User::$me->allowedTo('delete_own')) {
 				User::$me->isAllowedTo('approve_posts');
 			}
 		}
 
 		// Delete the *whole* topic, but only if the topic consists of one message.
-		if ($row['id_first_msg'] == $message)
-		{
-			if (empty(Board::$info->id) || $row['id_board'] != Board::$info->id)
-			{
+		if ($row['id_first_msg'] == $message) {
+			if (empty(Board::$info->id) || $row['id_board'] != Board::$info->id) {
 				$remove_any = User::$me->boardsAllowedTo('remove_any');
 				$remove_any = in_array(0, $remove_any) || in_array($row['id_board'], $remove_any);
 
-				if (!$remove_any)
-				{
+				if (!$remove_any) {
 					$remove_own = User::$me->boardsAllowedTo('remove_own');
 					$remove_own = in_array(0, $remove_own) || in_array($row['id_board'], $remove_own);
 				}
 
-				if ($row['id_member'] != User::$me->id && !$remove_any)
-				{
+				if ($row['id_member'] != User::$me->id && !$remove_any) {
 					ErrorHandler::fatalLang('cannot_remove_any', 'permission');
-				}
-				elseif (!$remove_any && !$remove_own)
-				{
+				} elseif (!$remove_any && !$remove_own) {
 					ErrorHandler::fatalLang('cannot_remove_own', 'permission');
 				}
-			}
-			else
-			{
+			} else {
 				// Check permissions to delete a whole topic.
-				if ($row['id_member'] != User::$me->id)
-				{
+				if ($row['id_member'] != User::$me->id) {
 					User::$me->isAllowedTo('remove_any');
-				}
-				elseif (!User::$me->allowedTo('remove_any'))
-				{
+				} elseif (!User::$me->allowedTo('remove_any')) {
 					User::$me->isAllowedTo('remove_own');
 				}
 			}
 
 			// ...if there is only one post.
-			if (!empty($row['num_replies']))
+			if (!empty($row['num_replies'])) {
 				ErrorHandler::fatalLang('delFirstPost', false);
+			}
 
 			Topic::remove($row['id_topic']);
 
@@ -2643,59 +2555,61 @@ public static function remove($message, $decreasePostCount = true)
 		}
 
 		// Deleting a recycled message can not lower anyone's post count.
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
 			$decreasePostCount = false;
+		}
 
 		// This is the last post, update the last post on the board.
-		if ($row['id_last_msg'] == $message)
-		{
+		if ($row['id_last_msg'] == $message) {
 			// Find the last message, set it, and decrease the post count.
-			$request = Db::$db->query('', '
-				SELECT id_msg, id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg, id_member
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:id_topic}
 					AND id_msg != {int:id_msg}
 				ORDER BY ' . (Config::$modSettings['postmod_active'] ? 'approved DESC, ' : '') . 'id_msg DESC
 				LIMIT 1',
-				array(
+				[
 					'id_topic' => $row['id_topic'],
 					'id_msg' => $message,
-				)
+				],
 			);
 			$row2 = Db::$db->fetch_assoc($request);
 			Db::$db->free_result($request);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET
 					id_last_msg = {int:id_last_msg},
 					id_member_updated = {int:id_member_updated}' . (!Config::$modSettings['postmod_active'] || $row['approved'] ? ',
 					num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : ',
 					unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END') . '
 				WHERE id_topic = {int:id_topic}',
-				array(
+				[
 					'id_last_msg' => $row2['id_msg'],
 					'id_member_updated' => $row2['id_member'],
 					'no_replies' => 0,
 					'no_unapproved' => 0,
 					'id_topic' => $row['id_topic'],
-				)
+				],
 			);
 		}
 		// Only decrease post counts.
-		else
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}topics
+		else {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}topics
 				SET ' . ($row['approved'] ? '
 					num_replies = CASE WHEN num_replies = {int:no_replies} THEN 0 ELSE num_replies - 1 END' : '
 					unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END') . '
 				WHERE id_topic = {int:id_topic}',
-				array(
+				[
 					'no_replies' => 0,
 					'no_unapproved' => 0,
 					'id_topic' => $row['id_topic'],
-				)
+				],
 			);
 		}
 
@@ -2704,55 +2618,56 @@ public static function remove($message, $decreasePostCount = true)
 
 		// If recycle topics has been set, make a copy of this message in the recycle board.
 		// Make sure we're not recycling messages that are already on the recycle board.
-		if (!empty(Config::$modSettings['recycle_enable']) && $row['id_board'] != Config::$modSettings['recycle_board'] && $row['icon'] != 'recycled')
-		{
+		if (!empty(Config::$modSettings['recycle_enable']) && $row['id_board'] != Config::$modSettings['recycle_board'] && $row['icon'] != 'recycled') {
 			// Check if the recycle board exists and if so get the read status.
-			$request = Db::$db->query('', '
-				SELECT (COALESCE(lb.id_msg, 0) >= b.id_msg_updated) AS is_seen, id_last_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT (COALESCE(lb.id_msg, 0) >= b.id_msg_updated) AS is_seen, id_last_msg
 				FROM {db_prefix}boards AS b
 					LEFT JOIN {db_prefix}log_boards AS lb ON (lb.id_board = b.id_board AND lb.id_member = {int:current_member})
 				WHERE b.id_board = {int:recycle_board}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'recycle_board' => Config::$modSettings['recycle_board'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
+
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('recycle_no_valid_board');
 			}
 			list($isRead, $last_board_msg) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Is there an existing topic in the recycle board to group this post with?
-			$request = Db::$db->query('', '
-				SELECT id_topic, id_first_msg, id_last_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, id_first_msg, id_last_msg
 				FROM {db_prefix}topics
 				WHERE id_previous_topic = {int:id_previous_topic}
 					AND id_board = {int:recycle_board}',
-				array(
+				[
 					'id_previous_topic' => $row['id_topic'],
 					'recycle_board' => Config::$modSettings['recycle_board'],
-				)
+				],
 			);
 			list($id_recycle_topic, $first_topic_msg, $last_topic_msg) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Insert a new topic in the recycle board if $id_recycle_topic is empty.
-			if (empty($id_recycle_topic))
-			{
-				$id_topic = Db::$db->insert('',
+			if (empty($id_recycle_topic)) {
+				$id_topic = Db::$db->insert(
+					'',
 					'{db_prefix}topics',
-					array(
+					[
 						'id_board' => 'int', 'id_member_started' => 'int', 'id_member_updated' => 'int', 'id_first_msg' => 'int',
 						'id_last_msg' => 'int', 'unapproved_posts' => 'int', 'approved' => 'int', 'id_previous_topic' => 'int',
-					),
-					array(
+					],
+					[
 						Config::$modSettings['recycle_board'], $row['id_member'], $row['id_member'], $message,
 						$message, 0, 1, $row['id_topic'],
-					),
-					array('id_topic'),
-					1
+					],
+					['id_topic'],
+					1,
 				);
 			}
 
@@ -2760,87 +2675,89 @@ public static function remove($message, $decreasePostCount = true)
 			$topicID = empty($id_recycle_topic) ? $id_topic : $id_recycle_topic;
 
 			// If the topic creation went successful, move the message.
-			if ($topicID > 0)
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}messages
+			if ($topicID > 0) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}messages
 					SET
 						id_topic = {int:id_topic},
 						id_board = {int:recycle_board},
 						approved = {int:is_approved}
 					WHERE id_msg = {int:id_msg}',
-					array(
+					[
 						'id_topic' => $topicID,
 						'recycle_board' => Config::$modSettings['recycle_board'],
 						'id_msg' => $message,
 						'is_approved' => 1,
-					)
+					],
 				);
 
 				// Take any reported posts with us...
-				Db::$db->query('', '
-					UPDATE {db_prefix}log_reported
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}log_reported
 					SET
 						id_topic = {int:id_topic},
 						id_board = {int:recycle_board}
 					WHERE id_msg = {int:id_msg}',
-					array(
+					[
 						'id_topic' => $topicID,
 						'recycle_board' => Config::$modSettings['recycle_board'],
 						'id_msg' => $message,
-					)
+					],
 				);
 
 				// Mark recycled topic as read.
-				if (!User::$me->is_guest)
-				{
-					Db::$db->insert('replace',
+				if (!User::$me->is_guest) {
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}log_topics',
-						array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
-						array($topicID, User::$me->id, Config::$modSettings['maxMsgID'], 0),
-						array('id_topic', 'id_member')
+						['id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'],
+						[$topicID, User::$me->id, Config::$modSettings['maxMsgID'], 0],
+						['id_topic', 'id_member'],
 					);
 				}
 
 				// Mark recycle board as seen, if it was marked as seen before.
-				if (!empty($isRead) && !User::$me->is_guest)
-				{
-					Db::$db->insert('replace',
+				if (!empty($isRead) && !User::$me->is_guest) {
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}log_boards',
-						array('id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
-						array(Config::$modSettings['recycle_board'], User::$me->id, Config::$modSettings['maxMsgID']),
-						array('id_board', 'id_member')
+						['id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'],
+						[Config::$modSettings['recycle_board'], User::$me->id, Config::$modSettings['maxMsgID']],
+						['id_board', 'id_member'],
 					);
 				}
 
 				// Add one topic and post to the recycle bin board.
-				Db::$db->query('', '
-					UPDATE {db_prefix}boards
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}boards
 					SET
 						num_topics = num_topics + {int:num_topics_inc},
 						num_posts = num_posts + 1' .
 							($message > $last_board_msg ? ', id_last_msg = {int:id_merged_msg}' : '') . '
 					WHERE id_board = {int:recycle_board}',
-					array(
+					[
 						'num_topics_inc' => empty($id_recycle_topic) ? 1 : 0,
 						'recycle_board' => Config::$modSettings['recycle_board'],
 						'id_merged_msg' => $message,
-					)
+					],
 				);
 
 				// Lets increase the num_replies, and the first/last message ID as appropriate.
-				if (!empty($id_recycle_topic))
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}topics
+				if (!empty($id_recycle_topic)) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}topics
 						SET num_replies = num_replies + 1' .
 							($message > $last_topic_msg ? ', id_last_msg = {int:id_merged_msg}' : '') .
 							($message < $first_topic_msg ? ', id_first_msg = {int:id_merged_msg}' : '') . '
 						WHERE id_topic = {int:id_recycle_topic}',
-						array(
+						[
 							'id_recycle_topic' => $id_recycle_topic,
 							'id_merged_msg' => $message,
-						)
+						],
 					);
 				}
 
@@ -2852,121 +2769,118 @@ public static function remove($message, $decreasePostCount = true)
 			}
 
 			// If it wasn't approved don't keep it in the queue.
-			if (!$row['approved'])
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}approval_queue
+			if (!$row['approved']) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}approval_queue
 					WHERE id_msg = {int:id_msg}
 						AND id_attach = {int:id_attach}',
-					array(
+					[
 						'id_msg' => $message,
 						'id_attach' => 0,
-					)
+					],
 				);
 			}
 		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET ' . ($row['approved'] ? '
 				num_posts = CASE WHEN num_posts = {int:no_posts} THEN 0 ELSE num_posts - 1 END' : '
 				unapproved_posts = CASE WHEN unapproved_posts = {int:no_unapproved} THEN 0 ELSE unapproved_posts - 1 END') . '
 			WHERE id_board = {int:id_board}',
-			array(
+			[
 				'no_posts' => 0,
 				'no_unapproved' => 0,
 				'id_board' => $row['id_board'],
-			)
+			],
 		);
 
 		// If the poster was registered and the board this message was on incremented
 		// the member's posts when it was posted, decrease his or her post count.
-		if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved'])
-		{
-			User::updateMemberData($row['id_member'], array('posts' => '-'));
+		if (!empty($row['id_member']) && $decreasePostCount && empty($row['count_posts']) && $row['approved']) {
+			User::updateMemberData($row['id_member'], ['posts' => '-']);
 		}
 
 		// Only remove posts if they're not recycled.
-		if (!$recycle)
-		{
+		if (!$recycle) {
 			// Callback for search APIs to do their thing
 			$searchAPI = SearchApi::load();
 
-			if ($searchAPI->supportsMethod('postRemoved'))
+			if ($searchAPI->supportsMethod('postRemoved')) {
 				$searchAPI->postRemoved($message);
+			}
 
 			// Remove the message!
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}messages
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}messages
 				WHERE id_msg = {int:id_msg}',
-				array(
+				[
 					'id_msg' => $message,
-				)
+				],
 			);
 
-			if (!empty(Config::$modSettings['search_custom_index_config']))
-			{
+			if (!empty(Config::$modSettings['search_custom_index_config'])) {
 				$customIndexSettings = Utils::jsonDecode(Config::$modSettings['search_custom_index_config'], true);
 
 				$words = Utils::text2words($row['body'], $customIndexSettings['bytes_per_word'], true);
 
-				if (!empty($words))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}log_search_words
+				if (!empty($words)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}log_search_words
 						WHERE id_word IN ({array_int:word_list})
 							AND id_msg = {int:id_msg}',
-						array(
+						[
 							'word_list' => $words,
 							'id_msg' => $message,
-						)
+						],
 					);
 				}
 			}
 
 			// Delete attachment(s) if they exist.
-			$attachmentQuery = array(
+			$attachmentQuery = [
 				'attachment_type' => 0,
 				'id_msg' => $message,
-			);
+			];
 
 			Attachment::remove($attachmentQuery);
 		}
 
 		// Allow mods to remove message related data of their own (likes, maybe?)
-		IntegrationHook::call('integrate_remove_message', array($message, $row, $recycle));
+		IntegrationHook::call('integrate_remove_message', [$message, $row, $recycle]);
 
 		// Update the pesky statistics.
 		Logging::updateStats('message');
 		Logging::updateStats('topic');
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 
 		// And now to update the last message of each board we messed with.
-		if ($recycle)
-		{
-			Msg::updateLastMessages(array($row['id_board'], Config::$modSettings['recycle_board']));
-		}
-		else
-		{
+		if ($recycle) {
+			Msg::updateLastMessages([$row['id_board'], Config::$modSettings['recycle_board']]);
+		} else {
 			Msg::updateLastMessages($row['id_board']);
 		}
 
 		// Close any moderation reports for this message.
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_reported
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_reported
 			SET closed = {int:is_closed}
 			WHERE id_msg = {int:id_msg}',
-			array(
+			[
 				'is_closed' => 1,
 				'id_msg' => $message,
-			)
+			],
 		);
 
-		if (Db::$db->affected_rows() != 0)
-		{
-			Config::updateModSettings(array('last_mod_report_action' => time()));
+		if (Db::$db->affected_rows() != 0) {
+			Config::updateModSettings(['last_mod_report_action' => time()]);
 			ReportedContent::recountOpenReports('posts');
 		}
 
@@ -2988,37 +2902,30 @@ public static function spell_init()
 
 		// Try enchant first since PSpell is (supposedly) deprecated as of PHP 5.3
 		// enchant only does UTF-8, so we need iconv if you aren't using UTF-8
-		if (function_exists('enchant_broker_init') && (Utils::$context['spell_utf8'] || function_exists('iconv')))
-		{
+		if (function_exists('enchant_broker_init') && (Utils::$context['spell_utf8'] || function_exists('iconv'))) {
 			// We'll need this to free resources later...
 			Utils::$context['enchant_broker'] = enchant_broker_init();
 
 			// Try locale first, then general...
-			if (!empty($lang_locale) && enchant_broker_dict_exists(Utils::$context['enchant_broker'], $lang_locale))
-			{
+			if (!empty($lang_locale) && enchant_broker_dict_exists(Utils::$context['enchant_broker'], $lang_locale)) {
 				$enchant_link = enchant_broker_request_dict(Utils::$context['enchant_broker'], $lang_locale);
-			}
-			elseif (enchant_broker_dict_exists(Utils::$context['enchant_broker'], Lang::$txt['lang_dictionary']))
-			{
+			} elseif (enchant_broker_dict_exists(Utils::$context['enchant_broker'], Lang::$txt['lang_dictionary'])) {
 				$enchant_link = enchant_broker_request_dict(Utils::$context['enchant_broker'], Lang::$txt['lang_dictionary']);
 			}
 
 			// Success
-			if (!empty($enchant_link))
-			{
+			if (!empty($enchant_link)) {
 				Utils::$context['provider'] = 'enchant';
+
 				return $enchant_link;
 			}
-			else
-			{
-				// Free up any resources used...
-				@enchant_broker_free(Utils::$context['enchant_broker']);
-			}
+
+			// Free up any resources used...
+			@enchant_broker_free(Utils::$context['enchant_broker']);
 		}
 
 		// Fall through to pspell if enchant didn't work
-		if (function_exists('pspell_new'))
-		{
+		if (function_exists('pspell_new')) {
 			// Okay, this looks funny, but it actually fixes a weird bug.
 			ob_start();
 			$old = error_reporting(0);
@@ -3027,19 +2934,20 @@ public static function spell_init()
 			pspell_new('en');
 
 			// Next, the dictionary in question may not exist. So, we try it... but...
-			$pspell_link = pspell_new(Lang::$txt['lang_dictionary'], '', '', strtr(Utils::$context['character_set'], array('iso-' => 'iso', 'ISO-' => 'iso')), PSPELL_FAST | PSPELL_RUN_TOGETHER);
+			$pspell_link = pspell_new(Lang::$txt['lang_dictionary'], '', '', strtr(Utils::$context['character_set'], ['iso-' => 'iso', 'ISO-' => 'iso']), PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
 			// Most people don't have anything but English installed... So we use English as a last resort.
-			if (!$pspell_link)
+			if (!$pspell_link) {
 				$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+			}
 
 			error_reporting($old);
 			ob_end_clean();
 
 			// If we have pspell, exit now...
-			if ($pspell_link)
-			{
+			if ($pspell_link) {
 				Utils::$context['provider'] = 'pspell';
+
 				return $pspell_link;
 			}
 		}
@@ -3060,19 +2968,17 @@ public static function spell_init()
 	public static function spell_check($dict, $word): bool
 	{
 		// Enchant or pspell?
-		if (Utils::$context['provider'] == 'enchant')
-		{
+		if (Utils::$context['provider'] == 'enchant') {
 			// This is a bit tricky here...
-			if (!Utils::$context['spell_utf8'])
-			{
+			if (!Utils::$context['spell_utf8']) {
 				// Convert the word to UTF-8 with iconv
 				$word = iconv(Lang::$txt['lang_character_set'], 'UTF-8', $word);
 			}
 
 			return enchant_dict_check($dict, $word);
 		}
-		elseif (Utils::$context['provider'] == 'pspell')
-		{
+
+		if (Utils::$context['provider'] == 'pspell') {
 			return pspell_check($dict, $word);
 		}
 	}
@@ -3088,31 +2994,26 @@ public static function spell_check($dict, $word): bool
 	 */
 	public static function spell_suggest($dict, $word): array
 	{
-		if (Utils::$context['provider'] == 'enchant')
-		{
+		if (Utils::$context['provider'] == 'enchant') {
 			// If we're not using UTF-8, we need iconv to handle some stuff...
-			if (!Utils::$context['spell_utf8'])
-			{
+			if (!Utils::$context['spell_utf8']) {
 				// Convert the word to UTF-8 before getting suggestions
 				$word = iconv(Lang::$txt['lang_character_set'], 'UTF-8', $word);
 				$suggestions = enchant_dict_suggest($dict, $word);
 
 				// Go through the suggestions and convert them back to the proper character set
-				foreach ($suggestions as $index => $suggestion)
-				{
+				foreach ($suggestions as $index => $suggestion) {
 					// //TRANSLIT makes it use similar-looking characters for incompatible ones...
 					$suggestions[$index] = iconv('UTF-8', Lang::$txt['lang_character_set'] . '//TRANSLIT', $suggestion);
 				}
 
 				return $suggestions;
 			}
-			else
-			{
-				return enchant_dict_suggest($dict, $word);
-			}
+
+			return enchant_dict_suggest($dict, $word);
 		}
-		elseif (Utils::$context['provider'] == 'pspell')
-		{
+
+		if (Utils::$context['provider'] == 'pspell') {
 			return pspell_suggest($dict, $word);
 		}
 	}
@@ -3134,25 +3035,29 @@ public static function spell_suggest($dict, $word): array
 	 *    If this is left empty, no WHERE clause will be used.
 	 * @param array $order Zero or more conditions for the ORDER BY clause.
 	 *    If this is left empty, no ORDER BY clause will be used.
+	 * @param array $group Zero or more conditions for the GROUP BY clause.
+	 *    If this is left empty, no GROUP BY clause will be used.
 	 * @param int|string $limit Maximum number of results to retrieve.
 	 *    If this is left empty, all results will be retrieved.
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), int|string $limit = 0)
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
 	{
-		self::$messages_request = Db::$db->query('', '
-			SELECT
+		self::$messages_request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $selects) . '
 			FROM {db_prefix}messages AS m' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
-			WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
+			WHERE (' . implode(') AND (', $where) . ')') . (empty($group) ? '' : '
+			GROUP BY ' . implode(', ', $group)) . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . (!empty($limit) ? '
 			LIMIT ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc(self::$messages_request))
-		{
+
+		while ($row = Db::$db->fetch_assoc(self::$messages_request)) {
 			yield $row;
 		}
 		Db::$db->free_result(self::$messages_request);
@@ -3160,7 +3065,8 @@ protected static function queryData(array $selects, array $params = array(), arr
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Msg::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Msg::exportStatic')) {
 	Msg::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/News.php b/Sources/News.php
index acdfb29c56..176cba0ae0 100644
--- a/Sources/News.php
+++ b/Sources/News.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\Feed');
 
diff --git a/Sources/PackageManager/FtpConnection.php b/Sources/PackageManager/FtpConnection.php
index de114dc211..0b7b09fe37 100644
--- a/Sources/PackageManager/FtpConnection.php
+++ b/Sources/PackageManager/FtpConnection.php
@@ -37,7 +37,7 @@ class FtpConnection
 	public $last_message;
 
 	/**
-	 * @var boolean Whether or not this is a passive connection
+	 * @var bool Whether or not this is a passive connection
 	 */
 	public $pasv;
 
@@ -54,10 +54,11 @@ public function __construct($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous'
 		// Initialize variables.
 		$this->connection = 'no_connection';
 		$this->error = false;
-		$this->pasv = array();
+		$this->pasv = [];
 
-		if ($ftp_server !== null)
+		if ($ftp_server !== null) {
 			$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		}
 	}
 
 	/**
@@ -70,50 +71,55 @@ public function __construct($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous'
 	 */
 	public function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@simplemachines.org')
 	{
-		if (strpos($ftp_server, 'ftp://') === 0)
+		if (strpos($ftp_server, 'ftp://') === 0) {
 			$ftp_server = substr($ftp_server, 6);
-		elseif (strpos($ftp_server, 'ftps://') === 0)
+		} elseif (strpos($ftp_server, 'ftps://') === 0) {
 			$ftp_server = 'ssl://' . substr($ftp_server, 7);
-		if (strpos($ftp_server, 'http://') === 0)
+		}
+
+		if (strpos($ftp_server, 'http://') === 0) {
 			$ftp_server = substr($ftp_server, 7);
-		elseif (strpos($ftp_server, 'https://') === 0)
+		} elseif (strpos($ftp_server, 'https://') === 0) {
 			$ftp_server = substr($ftp_server, 8);
-		$ftp_server = strtr($ftp_server, array('/' => '', ':' => '', '@' => ''));
+		}
+		$ftp_server = strtr($ftp_server, ['/' => '', ':' => '', '@' => '']);
 
 		// Connect to the FTP server.
 		$this->connection = @fsockopen($ftp_server, $ftp_port, $err, $err, 5);
-		if (!$this->connection)
-		{
+
+		if (!$this->connection) {
 			$this->error = 'bad_server';
 			$this->last_message = 'Invalid Server';
+
 			return;
 		}
 
 		// Get the welcome message...
-		if (!$this->check_response(220))
-		{
+		if (!$this->check_response(220)) {
 			$this->error = 'bad_response';
 			$this->last_message = 'Bad Response';
+
 			return;
 		}
 
 		// Send the username, it should ask for a password.
 		fwrite($this->connection, 'USER ' . $ftp_user . "\r\n");
 
-		if (!$this->check_response(331))
-		{
+		if (!$this->check_response(331)) {
 			$this->error = 'bad_username';
 			$this->last_message = 'Invalid Username';
+
 			return;
 		}
 
 		// Now send the password... and hope it goes okay.
 
 		fwrite($this->connection, 'PASS ' . $ftp_pass . "\r\n");
-		if (!$this->check_response(230))
-		{
+
+		if (!$this->check_response(230)) {
 			$this->error = 'bad_password';
 			$this->last_message = 'Invalid Password';
+
 			return;
 		}
 	}
@@ -122,21 +128,24 @@ public function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $f
 	 * Changes to a directory (chdir) via the ftp connection
 	 *
 	 * @param string $ftp_path The path to the directory we want to change to
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
 	public function chdir($ftp_path)
 	{
-		if (!is_resource($this->connection))
+		if (!is_resource($this->connection)) {
 			return false;
+		}
 
 		// No slash on the end, please...
-		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/')
+		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/') {
 			$ftp_path = substr($ftp_path, 0, -1);
+		}
 
 		fwrite($this->connection, 'CWD ' . $ftp_path . "\r\n");
-		if (!$this->check_response(250))
-		{
+
+		if (!$this->check_response(250)) {
 			$this->error = 'bad_path';
+
 			return false;
 		}
 
@@ -148,43 +157,41 @@ public function chdir($ftp_path)
 	 *
 	 * @param string $ftp_file The file to CHMOD
 	 * @param int|string $chmod The value for the CHMOD operation
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
 	public function chmod($ftp_file, $chmod)
 	{
-		if (!is_resource($this->connection))
+		if (!is_resource($this->connection)) {
 			return false;
+		}
 
-		if ($ftp_file == '')
+		if ($ftp_file == '') {
 			$ftp_file = '.';
+		}
 
 		// Do we have a file or a dir?
 		$is_dir = is_dir($ftp_file);
 		$is_writable = false;
 
 		// Set different modes.
-		$chmod_values = $is_dir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
+		$chmod_values = $is_dir ? [0750, 0755, 0775, 0777] : [0644, 0664, 0666];
 
-		foreach ($chmod_values as $val)
-		{
+		foreach ($chmod_values as $val) {
 			// If it's writable, break out of the loop.
-			if (is_writable($ftp_file))
-			{
+			if (is_writable($ftp_file)) {
 				$is_writable = true;
 				break;
 			}
 
-			else
-			{
-				// Convert the chmod value from octal (0777) to text ("777").
-				fwrite($this->connection, 'SITE CHMOD ' . decoct($val) . ' ' . $ftp_file . "\r\n");
-				if (!$this->check_response(200))
-				{
-					$this->error = 'bad_file';
-					break;
-				}
+			// Convert the chmod value from octal (0777) to text ("777").
+			fwrite($this->connection, 'SITE CHMOD ' . decoct($val) . ' ' . $ftp_file . "\r\n");
+
+			if (!$this->check_response(200)) {
+				$this->error = 'bad_file';
+				break;
 			}
 		}
+
 		return $is_writable;
 	}
 
@@ -192,24 +199,25 @@ public function chmod($ftp_file, $chmod)
 	 * Deletes a file
 	 *
 	 * @param string $ftp_file The file to delete
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
 	public function unlink($ftp_file)
 	{
 		// We are actually connected, right?
-		if (!is_resource($this->connection))
+		if (!is_resource($this->connection)) {
 			return false;
+		}
 
 		// Delete file X.
 		fwrite($this->connection, 'DELE ' . $ftp_file . "\r\n");
-		if (!$this->check_response(250))
-		{
+
+		if (!$this->check_response(250)) {
 			fwrite($this->connection, 'RMD ' . $ftp_file . "\r\n");
 
 			// Still no love?
-			if (!$this->check_response(250))
-			{
+			if (!$this->check_response(250)) {
 				$this->error = 'bad_file';
+
 				return false;
 			}
 		}
@@ -221,15 +229,16 @@ public function unlink($ftp_file)
 	 * Reads the response to the command from the server
 	 *
 	 * @param string $desired The desired response
-	 * @return boolean Whether or not we got the desired response
+	 * @return bool Whether or not we got the desired response
 	 */
 	public function check_response($desired)
 	{
 		// Wait for a response that isn't continued with -, but don't wait too long.
 		$time = time();
-		do
+
+		do {
 			$this->last_message = fgets($this->connection, 1024);
-		while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
+		} while ((strlen($this->last_message) < 4 || strpos($this->last_message, ' ') === 0 || strpos($this->last_message, ' ', 3) !== 3) && time() - $time < 5);
 
 		// Was the desired response returned?
 		return is_array($desired) ? in_array(substr($this->last_message, 0, 3), $desired) : substr($this->last_message, 0, 3) == $desired;
@@ -238,40 +247,41 @@ public function check_response($desired)
 	/**
 	 * Used to create a passive connection
 	 *
-	 * @return boolean Whether the passive connection was created successfully
+	 * @return bool Whether the passive connection was created successfully
 	 */
 	public function passive()
 	{
 		// We can't create a passive data connection without a primary one first being there.
-		if (!is_resource($this->connection))
-		{
+		if (!is_resource($this->connection)) {
 			$this->error = 'no_connection';
+
 			return false;
 		}
 
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 		@fwrite($this->connection, 'PASV' . "\r\n");
 		$time = time();
-		do
+
+		do {
 			$response = fgets($this->connection, 1024);
-		while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
+		} while (strpos($response, ' ', 3) !== 3 && time() - $time < 5);
 
 		// If it's not 227, we weren't given an IP and port, which means it failed.
-		if (strpos($response, '227 ') !== 0)
-		{
+		if (strpos($response, '227 ') !== 0) {
 			$this->error = 'bad_response';
+
 			return false;
 		}
 
 		// Snatch the IP and port information, or die horribly trying...
-		if (preg_match('~\((\d+),\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))\)~', $response, $match) == 0)
-		{
+		if (preg_match('~\((\d+),\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))\)~', $response, $match) == 0) {
 			$this->error = 'bad_response';
+
 			return false;
 		}
 
 		// This is pretty simple - store it for later use ;).
-		$this->pasv = array('ip' => $match[1] . '.' . $match[2] . '.' . $match[3] . '.' . $match[4], 'port' => $match[5] * 256 + $match[6]);
+		$this->pasv = ['ip' => $match[1] . '.' . $match[2] . '.' . $match[3] . '.' . $match[4], 'port' => $match[5] * 256 + $match[6]];
 
 		return true;
 	}
@@ -280,35 +290,39 @@ public function passive()
 	 * Creates a new file on the server
 	 *
 	 * @param string $ftp_file The file to create
-	 * @return boolean Whether or not the file was created successfully
+	 * @return bool Whether or not the file was created successfully
 	 */
 	public function create_file($ftp_file)
 	{
 		// First, we have to be connected... very important.
-		if (!is_resource($this->connection))
+		if (!is_resource($this->connection)) {
 			return false;
+		}
 
 		// I'd like one passive mode, please!
-		if (!$this->passive())
+		if (!$this->passive()) {
 			return false;
+		}
 
 		// Seems logical enough, so far...
 		fwrite($this->connection, 'STOR ' . $ftp_file . "\r\n");
 
 		// Okay, now we connect to the data port.  If it doesn't work out, it's probably "file already exists", etc.
 		$fp = @fsockopen($this->pasv['ip'], $this->pasv['port'], $err, $err, 5);
-		if (!$fp || !$this->check_response(150))
-		{
+
+		if (!$fp || !$this->check_response(150)) {
 			$this->error = 'bad_file';
 			@fclose($fp);
+
 			return false;
 		}
 
 		// This may look strange, but we're just closing it to indicate a zero-byte upload.
 		fclose($fp);
-		if (!$this->check_response(226))
-		{
+
+		if (!$this->check_response(226)) {
 			$this->error = 'bad_response';
+
 			return false;
 		}
 
@@ -320,40 +334,45 @@ public function create_file($ftp_file)
 	 *
 	 * @param string $ftp_path The path to the directory
 	 * @param bool $search Whether or not to get a recursive directory listing
-	 * @return string|boolean The results of the command or false if unsuccessful
+	 * @return string|bool The results of the command or false if unsuccessful
 	 */
 	public function list_dir($ftp_path = '', $search = false)
 	{
 		// Are we even connected...?
-		if (!is_resource($this->connection))
+		if (!is_resource($this->connection)) {
 			return false;
+		}
 
 		// Passive... non-aggressive...
-		if (!$this->passive())
+		if (!$this->passive()) {
 			return false;
+		}
 
 		// Get the listing!
 		fwrite($this->connection, 'LIST -1' . ($search ? 'R' : '') . ($ftp_path == '' ? '' : ' ' . $ftp_path) . "\r\n");
 
 		// Connect, assuming we've got a connection.
 		$fp = @fsockopen($this->pasv['ip'], $this->pasv['port'], $err, $err, 5);
-		if (!$fp || !$this->check_response(array(150, 125)))
-		{
+
+		if (!$fp || !$this->check_response([150, 125])) {
 			$this->error = 'bad_response';
 			@fclose($fp);
+
 			return false;
 		}
 
 		// Read in the file listing.
 		$data = '';
-		while (!feof($fp))
+
+		while (!feof($fp)) {
 			$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// Everything go okay?
-		if (!$this->check_response(226))
-		{
+		if (!$this->check_response(226)) {
 			$this->error = 'bad_response';
+
 			return false;
 		}
 
@@ -365,30 +384,31 @@ public function list_dir($ftp_path = '', $search = false)
 	 *
 	 * @param string $file The name of a file
 	 * @param string $listing A directory listing or null to generate one
-	 * @return string|boolean The name of the file or false if it wasn't found
+	 * @return string|bool The name of the file or false if it wasn't found
 	 */
 	public function locate($file, $listing = null)
 	{
-		if ($listing === null)
+		if ($listing === null) {
 			$listing = $this->list_dir('', true);
+		}
 		$listing = explode("\n", $listing);
 
 		@fwrite($this->connection, 'PWD' . "\r\n");
 		$time = time();
-		do
+
+		do {
 			$response = fgets($this->connection, 1024);
-		while ($response[3] != ' ' && time() - $time < 5);
+		} while ($response[3] != ' ' && time() - $time < 5);
 
 		// Check for 257!
-		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0)
-			$current_dir = strtr($match[1], array('""' => '"'));
-		else
+		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0) {
+			$current_dir = strtr($match[1], ['""' => '"']);
+		} else {
 			$current_dir = '';
+		}
 
-		for ($i = 0, $n = count($listing); $i < $n; $i++)
-		{
-			if (trim($listing[$i]) == '' && isset($listing[$i + 1]))
-			{
+		for ($i = 0, $n = count($listing); $i < $n; $i++) {
+			if (trim($listing[$i]) == '' && isset($listing[$i + 1])) {
 				$current_dir = substr(trim($listing[++$i]), 0, -1);
 				$i++;
 			}
@@ -396,12 +416,17 @@ public function locate($file, $listing = null)
 			// Okay, this file's name is:
 			$listing[$i] = $current_dir . '/' . trim(strlen($listing[$i]) > 30 ? strrchr($listing[$i], ' ') : $listing[$i]);
 
-			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1))
+			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1)) {
 				return $listing[$i];
-			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1))
+			}
+
+			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1)) {
 				return $listing[$i];
-			if (basename($listing[$i]) == $file || $listing[$i] == $file)
+			}
+
+			if (basename($listing[$i]) == $file || $listing[$i] == $file) {
 				return $listing[$i];
+			}
 		}
 
 		return false;
@@ -411,19 +436,21 @@ public function locate($file, $listing = null)
 	 * Creates a new directory on the server
 	 *
 	 * @param string $ftp_dir The name of the directory to create
-	 * @return boolean Whether or not the operation was successful
+	 * @return bool Whether or not the operation was successful
 	 */
 	public function create_dir($ftp_dir)
 	{
 		// We must be connected to the server to do something.
-		if (!is_resource($this->connection))
+		if (!is_resource($this->connection)) {
 			return false;
+		}
 
 		// Make this new beautiful directory!
 		fwrite($this->connection, 'MKD ' . $ftp_dir . "\r\n");
-		if (!$this->check_response(257))
-		{
+
+		if (!$this->check_response(257)) {
 			$this->error = 'bad_file';
+
 			return false;
 		}
 
@@ -441,51 +468,55 @@ public function detect_path($filesystem_path, $lookup_file = null)
 	{
 		$username = '';
 
-		if (isset($_SERVER['DOCUMENT_ROOT']))
-		{
-			if (preg_match('~^/home[2]?/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match))
-			{
+		if (isset($_SERVER['DOCUMENT_ROOT'])) {
+			if (preg_match('~^/home[2]?/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) {
 				$username = $match[1];
 
-				$path = strtr($_SERVER['DOCUMENT_ROOT'], array('/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => ''));
+				$path = strtr($_SERVER['DOCUMENT_ROOT'], ['/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => '']);
 
-				if (substr($path, -1) == '/')
+				if (substr($path, -1) == '/') {
 					$path = substr($path, 0, -1);
+				}
 
-				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1)
+				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1) {
 					$path .= dirname($_SERVER['PHP_SELF']);
-			}
-			elseif (strpos($filesystem_path, '/var/www/') === 0)
+				}
+			} elseif (strpos($filesystem_path, '/var/www/') === 0) {
 				$path = substr($filesystem_path, 8);
-			else
-				$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
-		}
-		else
+			} else {
+				$path = strtr(strtr($filesystem_path, ['\\' => '/']), [$_SERVER['DOCUMENT_ROOT'] => '']);
+			}
+		} else {
 			$path = '';
+		}
 
-		if (is_resource($this->connection) && $this->list_dir($path) == '')
-		{
+		if (is_resource($this->connection) && $this->list_dir($path) == '') {
 			$data = $this->list_dir('', true);
 
-			if ($lookup_file === null)
+			if ($lookup_file === null) {
 				$lookup_file = $_SERVER['PHP_SELF'];
+			}
 
 			$found_path = dirname($this->locate('*' . basename(dirname($lookup_file)) . '/' . basename($lookup_file), $data));
-			if ($found_path == false)
+
+			if ($found_path == false) {
 				$found_path = dirname($this->locate(basename($lookup_file)));
-			if ($found_path != false)
+			}
+
+			if ($found_path != false) {
 				$path = $found_path;
-		}
-		elseif (is_resource($this->connection))
+			}
+		} elseif (is_resource($this->connection)) {
 			$found_path = true;
+		}
 
-		return array($username, $path, isset($found_path));
+		return [$username, $path, isset($found_path)];
 	}
 
 	/**
 	 * Close the ftp connection
 	 *
-	 * @return boolean Always returns true
+	 * @return bool Always returns true
 	 */
 	public function close()
 	{
diff --git a/Sources/PackageManager/PackageManager.php b/Sources/PackageManager/PackageManager.php
index 9bca2226e4..6f51bc13cd 100644
--- a/Sources/PackageManager/PackageManager.php
+++ b/Sources/PackageManager/PackageManager.php
@@ -14,7 +14,9 @@
 namespace SMF\PackageManager;
 
 use SMF\BBCodeParser;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\ItemList;
@@ -27,8 +29,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 use SMF\WebFetch\WebFetchApi;
 
 /**
@@ -45,7 +45,7 @@ class PackageManager
 	 *
 	 * Delegation makes the world... that is, the package manager go 'round.
 	 */
-	public $subactions = array(
+	public $subactions = [
 		// Sub-actions for working with package files.
 		'browse' => 'browse',
 		'remove' => 'remove',
@@ -67,7 +67,7 @@ class PackageManager
 		'serveradd' => 'serverAdd',
 		'serverremove' => 'serverRemove',
 		'serverbrowse' => 'serverBrowse',
-	);
+	];
 
 	/**********************
 	 * Protected properties
@@ -79,14 +79,14 @@ class PackageManager
 	 * For backward compatibility, maps the old names of some subactions that
 	 * used to live in an obsolete PackageGet.php file to their new names.
 	 */
-	protected $packageget_subactions = array(
+	protected $packageget_subactions = [
 		'upload' => 'upload',
 		'download' => 'download',
 		'servers' => 'servers',
 		'add' => 'serveradd',
 		'remove' => 'serverremove',
 		'browse' => 'serverbrowse',
-	);
+	];
 
 	/**
 	 * An instance of this class.
@@ -106,8 +106,9 @@ class PackageManager
 	 */
 	public static function load(): object
 	{
-		if (!isset(self::$obj))
+		if (!isset(self::$obj)) {
 			self::$obj = new self();
+		}
 
 		return self::$obj;
 	}
@@ -136,49 +137,50 @@ public function execute()
 		Utils::$context['page_title'] = Lang::$txt['package'];
 
 		// Work out exactly who it is we are calling.
-		if (isset($_REQUEST['sa']) && isset($this->subactions[$_REQUEST['sa']]))
+		if (isset($_REQUEST['sa'], $this->subactions[$_REQUEST['sa']])) {
 			Utils::$context['sub_action'] = $_REQUEST['sa'];
-		else
+		} else {
 			Utils::$context['sub_action'] = 'browse';
+		}
 
 		// Set up some tabs...
-		Menu::$loaded['admin']->tab_data = array(
+		Menu::$loaded['admin']->tab_data = [
 			'title' => Lang::$txt['package_manager'],
 			// @todo 'help' => 'registrations',
 			'description' => Lang::$txt['package_manager_desc'],
-			'tabs' => array(
-				'browse' => array(
-				),
-				'packageget' => array(
+			'tabs' => [
+				'browse' => [
+				],
+				'packageget' => [
 					'description' => Lang::$txt['download_packages_desc'],
-				),
-				'perms' => array(
+				],
+				'perms' => [
 					'description' => Lang::$txt['package_file_perms_desc'],
-				),
-				'options' => array(
+				],
+				'options' => [
 					'description' => Lang::$txt['package_install_options_desc'],
-				),
-			),
-		);
+				],
+			],
+		];
 
-		if (Utils::$context['sub_action'] == 'browse')
-			Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		if (Utils::$context['sub_action'] == 'browse') {
+			Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
+		}
 
 		// We need to force the "Download" tab as selected.
-		if (in_array(Utils::$context['sub_action'], $this->packageget_subactions))
+		if (in_array(Utils::$context['sub_action'], $this->packageget_subactions)) {
 			Utils::$context['menu_data_' . Utils::$context['admin_menu_id']]['current_subsection'] = 'packageget';
+		}
 
 		// Call the function we're handing control to.
-		if (method_exists($this, $this->subactions[Utils::$context['sub_action']]))
-		{
-			call_user_func(array($this, $this->subactions[Utils::$context['sub_action']]));
-		}
-		else
-		{
+		if (method_exists($this, $this->subactions[Utils::$context['sub_action']])) {
+			call_user_func([$this, $this->subactions[Utils::$context['sub_action']]]);
+		} else {
 			$call = Utils::getCallable($this->subactions[Utils::$context['sub_action']]);
 
-			if (!empty($call))
+			if (!empty($call)) {
 				call_user_func($call);
+			}
 		}
 	}
 
@@ -188,8 +190,9 @@ public function execute()
 	public function installTest()
 	{
 		// You have to specify a file!!
-		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
+		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
 			Utils::redirectexit('action=admin;area=packages');
+		}
 		Utils::$context['filename'] = preg_replace('~[\.]+~', '.', $_REQUEST['package']);
 
 		// Do we have an existing id, for uninstalls and the like.
@@ -199,149 +202,153 @@ public function installTest()
 		SubsPackage::create_chmod_control();
 
 		// Make sure temp directory exists and is empty.
-		if (file_exists(Config::$packagesdir . '/temp'))
+		if (file_exists(Config::$packagesdir . '/temp')) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp', false);
+		}
 
-		if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0755))
-		{
+		if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0755)) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp', false);
-			if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777))
-			{
+
+			if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777)) {
 				SubsPackage::deltree(Config::$packagesdir . '/temp', false);
-				SubsPackage::create_chmod_control(array(Config::$packagesdir . '/temp/delme.tmp'), array('destination_url' => Config::$scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'], 'crash_on_error' => true));
+				SubsPackage::create_chmod_control([Config::$packagesdir . '/temp/delme.tmp'], ['destination_url' => Config::$scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'], 'crash_on_error' => true]);
 
 				SubsPackage::deltree(Config::$packagesdir . '/temp', false);
-				if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777))
+
+				if (!SubsPackage::mktree(Config::$packagesdir . '/temp', 0777)) {
 					ErrorHandler::fatalLang('package_cant_download', false);
+				}
 			}
 		}
 
 		Utils::$context['uninstalling'] = $_REQUEST['sa'] == 'uninstall';
 
 		// Change our last link tree item for more information on this Packages area.
-		Utils::$context['linktree'][count(Utils::$context['linktree']) - 1] = array(
+		Utils::$context['linktree'][count(Utils::$context['linktree']) - 1] = [
 			'url' => Config::$scripturl . '?action=admin;area=packages;sa=browse',
-			'name' => Utils::$context['uninstalling'] ? Lang::$txt['package_uninstall_actions'] : Lang::$txt['install_actions']
-		);
+			'name' => Utils::$context['uninstalling'] ? Lang::$txt['package_uninstall_actions'] : Lang::$txt['install_actions'],
+		];
 		Utils::$context['page_title'] .= ' - ' . (Utils::$context['uninstalling'] ? Lang::$txt['package_uninstall_actions'] : Lang::$txt['install_actions']);
 
 		Utils::$context['sub_template'] = 'view_package';
 
-		if (!file_exists(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+		if (!file_exists(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp');
 			ErrorHandler::fatalLang('package_no_file', false);
 		}
 
 		// Extract the files so we can get things like the readme, etc.
-		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			Utils::$context['extracted_files'] = SubsPackage::read_tgz_file(Config::$packagesdir . '/' . Utils::$context['filename'], Config::$packagesdir . '/temp');
 
-			if (Utils::$context['extracted_files'] && !file_exists(Config::$packagesdir . '/temp/package-info.xml'))
-				foreach (Utils::$context['extracted_files'] as $file)
-					if (basename($file['filename']) == 'package-info.xml')
-					{
+			if (Utils::$context['extracted_files'] && !file_exists(Config::$packagesdir . '/temp/package-info.xml')) {
+				foreach (Utils::$context['extracted_files'] as $file) {
+					if (basename($file['filename']) == 'package-info.xml') {
 						Utils::$context['base_path'] = dirname($file['filename']) . '/';
 						break;
 					}
+				}
+			}
 
-			if (!isset(Utils::$context['base_path']))
+			if (!isset(Utils::$context['base_path'])) {
 				Utils::$context['base_path'] = '';
-		}
-		elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+			}
+		} elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			SubsPackage::copytree(Config::$packagesdir . '/' . Utils::$context['filename'], Config::$packagesdir . '/temp');
 			Utils::$context['extracted_files'] = SubsPackage::listtree(Config::$packagesdir . '/temp');
 			Utils::$context['base_path'] = '';
-		}
-		else
+		} else {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Load up any custom themes we may want to install into...
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE (id_theme = {int:default_theme} OR id_theme IN ({array_int:known_theme_list}))
 				AND variable IN ({string:name}, {string:theme_dir})',
-			array(
+			[
 				'known_theme_list' => explode(',', Config::$modSettings['knownThemes']),
 				'default_theme' => 1,
 				'name' => 'name',
 				'theme_dir' => 'theme_dir',
-			)
+			],
 		);
-		$theme_paths = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$theme_paths = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+		}
 		Db::$db->free_result($request);
 
 		// Get the package info...
 		$packageInfo = SubsPackage::getPackageInfo(Utils::$context['filename']);
 
-		if (!is_array($packageInfo))
+		if (!is_array($packageInfo)) {
 			ErrorHandler::fatalLang($packageInfo);
+		}
 
 		$packageInfo['filename'] = Utils::$context['filename'];
-		Utils::$context['package_name'] = isset($packageInfo['name']) ? $packageInfo['name'] : Utils::$context['filename'];
+		Utils::$context['package_name'] = $packageInfo['name'] ?? Utils::$context['filename'];
 
 		// Set the type of extraction...
-		Utils::$context['extract_type'] = isset($packageInfo['type']) ? $packageInfo['type'] : 'modification';
+		Utils::$context['extract_type'] = $packageInfo['type'] ?? 'modification';
 
 		// Get our validation info.
-		Utils::$context['validation_tests'] = SubsPackage::package_validate_installtest(array(
+		Utils::$context['validation_tests'] = SubsPackage::package_validate_installtest([
 			'file_name' => Config::$packagesdir . '/' . Utils::$context['filename'],
 			'custom_id' => !empty($packageInfo['id']) ? $packageInfo['id'] : '',
-			'custom_type' => Utils::$context['extract_type']
-		));
+			'custom_type' => Utils::$context['extract_type'],
+		]);
 
 		// The mod isn't installed.... unless proven otherwise.
 		Utils::$context['is_installed'] = false;
 
 		// See if it is installed?
-		$request = Db::$db->query('', '
-			SELECT version, themes_installed, db_changes
+		$request = Db::$db->query(
+			'',
+			'SELECT version, themes_installed, db_changes
 			FROM {db_prefix}log_packages
 			WHERE package_id = {string:current_package}
 				AND install_state != {int:not_installed}
 			ORDER BY time_installed DESC
 			LIMIT 1',
-			array(
+			[
 				'not_installed' => 0,
 				'current_package' => $packageInfo['id'],
-			)
+			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$old_themes = explode(',', $row['themes_installed']);
 			$old_version = $row['version'];
-			$db_changes = empty($row['db_changes']) ? array() : Utils::jsonDecode($row['db_changes'], true);
+			$db_changes = empty($row['db_changes']) ? [] : Utils::jsonDecode($row['db_changes'], true);
 		}
 		Db::$db->free_result($request);
 
-		Utils::$context['database_changes'] = array();
-		if (isset($packageInfo['uninstall']['database']))
+		Utils::$context['database_changes'] = [];
+
+		if (isset($packageInfo['uninstall']['database'])) {
 			Utils::$context['database_changes'][] = sprintf(Lang::$txt['package_db_code'], $packageInfo['uninstall']['database']);
-		if (!empty($db_changes))
-		{
-			foreach ($db_changes as $change)
-			{
-				if (isset($change[2]) && isset(Lang::$txt['package_db_' . $change[0]]))
+		}
+
+		if (!empty($db_changes)) {
+			foreach ($db_changes as $change) {
+				if (isset($change[2], Lang::$txt['package_db_' . $change[0]])) {
 					Utils::$context['database_changes'][] = sprintf(Lang::$txt['package_db_' . $change[0]], $change[1], $change[2]);
-				elseif (isset(Lang::$txt['package_db_' . $change[0]]))
+				} elseif (isset(Lang::$txt['package_db_' . $change[0]])) {
 					Utils::$context['database_changes'][] = sprintf(Lang::$txt['package_db_' . $change[0]], $change[1]);
-				else
+				} else {
 					Utils::$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+				}
 			}
 		}
 
 		// Uninstalling?
-		if (Utils::$context['uninstalling'])
-		{
+		if (Utils::$context['uninstalling']) {
 			// Wait, it's not installed yet!
-			if (!isset($old_version) && Utils::$context['uninstalling'])
-			{
+			if (!isset($old_version) && Utils::$context['uninstalling']) {
 				SubsPackage::deltree(Config::$packagesdir . '/temp');
 				ErrorHandler::fatalLang('package_cant_uninstall', false);
 			}
@@ -349,8 +356,7 @@ public function installTest()
 			$actions = SubsPackage::parsePackageInfo($packageInfo['xml'], true, 'uninstall');
 
 			// Gadzooks!  There's no uninstaller at all!?
-			if (empty($actions))
-			{
+			if (empty($actions)) {
 				SubsPackage::deltree(Config::$packagesdir . '/temp');
 				ErrorHandler::fatalLang('package_uninstall_cannot', false);
 			}
@@ -359,214 +365,205 @@ public function installTest()
 			Utils::$context['themes_locked'] = true;
 
 			// Only let them uninstall themes it was installed into.
-			foreach ($theme_paths as $id => $data)
-				if ($id != 1 && !in_array($id, $old_themes))
+			foreach ($theme_paths as $id => $data) {
+				if ($id != 1 && !in_array($id, $old_themes)) {
 					unset($theme_paths[$id]);
-		}
-		elseif (isset($old_version) && $old_version != $packageInfo['version'])
-		{
+				}
+			}
+		} elseif (isset($old_version) && $old_version != $packageInfo['version']) {
 			// Look for an upgrade...
 			$actions = SubsPackage::parsePackageInfo($packageInfo['xml'], true, 'upgrade', $old_version);
 
 			// There was no upgrade....
-			if (empty($actions))
+			if (empty($actions)) {
 				Utils::$context['is_installed'] = true;
-			else
-			{
+			} else {
 				// Otherwise they can only upgrade themes from the first time around.
-				foreach ($theme_paths as $id => $data)
-					if ($id != 1 && !in_array($id, $old_themes))
+				foreach ($theme_paths as $id => $data) {
+					if ($id != 1 && !in_array($id, $old_themes)) {
 						unset($theme_paths[$id]);
+					}
+				}
 			}
-		}
-		elseif (isset($old_version) && $old_version == $packageInfo['version'])
+		} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
 			Utils::$context['is_installed'] = true;
+		}
 
-		if (!isset($old_version) || Utils::$context['is_installed'])
+		if (!isset($old_version) || Utils::$context['is_installed']) {
 			$actions = SubsPackage::parsePackageInfo($packageInfo['xml'], true, 'install');
+		}
 
-		Utils::$context['actions'] = array();
+		Utils::$context['actions'] = [];
 		Utils::$context['ftp_needed'] = false;
 		Utils::$context['has_failure'] = false;
-		$chmod_files = array();
+		$chmod_files = [];
 
 		// no actions found, return so we can display an error
-		if (empty($actions))
+		if (empty($actions)) {
 			return;
+		}
 
 		// This will hold data about anything that can be installed in other themes.
-		$themeFinds = array(
-			'candidates' => array(),
-			'other_themes' => array(),
-		);
+		$themeFinds = [
+			'candidates' => [],
+			'other_themes' => [],
+		];
 
 		// Now prepare things for the template.
-		foreach ($actions as $action)
-		{
+		foreach ($actions as $action) {
 			// Not failed until proven otherwise.
 			$failed = false;
-			$thisAction = array();
+			$thisAction = [];
 
-			if ($action['type'] == 'chmod')
-			{
+			if ($action['type'] == 'chmod') {
 				$chmod_files[] = $action['filename'];
+
 				continue;
 			}
-			elseif ($action['type'] == 'readme' || $action['type'] == 'license')
-			{
+
+			if ($action['type'] == 'readme' || $action['type'] == 'license') {
 				$type = 'package_' . $action['type'];
-				if (file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']))
+
+				if (file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'])) {
 					Utils::$context[$type] = Utils::htmlspecialchars(trim(file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']), "\n\r"));
-				elseif (file_exists($action['filename']))
+				} elseif (file_exists($action['filename'])) {
 					Utils::$context[$type] = Utils::htmlspecialchars(trim(file_get_contents($action['filename']), "\n\r"));
+				}
 
-				if (!empty($action['parse_bbc']))
-				{
+				if (!empty($action['parse_bbc'])) {
 					Utils::$context[$type] = preg_replace('~\[[/]?html\]~i', '', Utils::$context[$type]);
 					Msg::preparsecode(Utils::$context[$type]);
 					Utils::$context[$type] = BBCodeParser::load()->parse(Utils::$context[$type]);
-				}
-				else
+				} else {
 					Utils::$context[$type] = nl2br(Utils::$context[$type]);
+				}
 
 				continue;
 			}
+
 			// Don't show redirects.
-			elseif ($action['type'] == 'redirect')
+			if ($action['type'] == 'redirect') {
 				continue;
-			elseif ($action['type'] == 'error')
-			{
+			}
+
+			if ($action['type'] == 'error') {
 				Utils::$context['has_failure'] = true;
-				if (isset($action['error_msg']) && isset($action['error_var']))
+
+				if (isset($action['error_msg'], $action['error_var'])) {
 					Utils::$context['failure_details'] = sprintf(Lang::$txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
-				elseif (isset($action['error_msg']))
-					Utils::$context['failure_details'] = isset(Lang::$txt['package_will_fail_' . $action['error_msg']]) ? Lang::$txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
-			}
-			elseif ($action['type'] == 'modification')
-			{
-				if (!file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']))
-				{
+				} elseif (isset($action['error_msg'])) {
+					Utils::$context['failure_details'] = Lang::$txt['package_will_fail_' . $action['error_msg']] ?? $action['error_msg'];
+				}
+			} elseif ($action['type'] == 'modification') {
+				if (!file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'])) {
 					Utils::$context['has_failure'] = true;
 
-					Utils::$context['actions'][] = array(
+					Utils::$context['actions'][] = [
 						'type' => Lang::$txt['execute_modification'],
-						'action' => Utils::htmlspecialchars(strtr($action['filename'], array(Config::$boarddir => '.'))),
+						'action' => Utils::htmlspecialchars(strtr($action['filename'], [Config::$boarddir => '.'])),
 						'description' => Lang::$txt['package_action_missing'],
 						'failed' => true,
-					);
-				}
-				else
-				{
-					if ($action['boardmod'])
+					];
+				} else {
+					if ($action['boardmod']) {
 						$mod_actions = SubsPackage::parseBoardMod(@file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
-					else
+					} else {
 						$mod_actions = SubsPackage::parseModification(@file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
+					}
 
-					if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-')
+					if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') {
 						$mod_actions[0]['filename'] = $action['filename'];
+					}
 
-					foreach ($mod_actions as $key => $mod_action)
-					{
+					foreach ($mod_actions as $key => $mod_action) {
 						// Lets get the last section of the file name.
-						if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
+						if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
 							$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
-						elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
+						} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
 							$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
-						else
+						} else {
 							$actual_filename = $key;
+						}
 
-						if ($mod_action['type'] == 'opened')
+						if ($mod_action['type'] == 'opened') {
 							$failed = false;
-						elseif ($mod_action['type'] == 'failure')
-						{
-							if (empty($mod_action['is_custom']))
+						} elseif ($mod_action['type'] == 'failure') {
+							if (empty($mod_action['is_custom'])) {
 								Utils::$context['has_failure'] = true;
+							}
 							$failed = true;
-						}
-						elseif ($mod_action['type'] == 'chmod')
-						{
+						} elseif ($mod_action['type'] == 'chmod') {
 							$chmod_files[] = $mod_action['filename'];
-						}
-						elseif ($mod_action['type'] == 'saved')
-						{
-							if (!empty($mod_action['is_custom']))
-							{
-								if (!isset(Utils::$context['theme_actions'][$mod_action['is_custom']]))
-									Utils::$context['theme_actions'][$mod_action['is_custom']] = array(
+						} elseif ($mod_action['type'] == 'saved') {
+							if (!empty($mod_action['is_custom'])) {
+								if (!isset(Utils::$context['theme_actions'][$mod_action['is_custom']])) {
+									Utils::$context['theme_actions'][$mod_action['is_custom']] = [
 										'name' => $theme_paths[$mod_action['is_custom']]['name'],
-										'actions' => array(),
+										'actions' => [],
 										'has_failure' => $failed,
-									);
-								else
+									];
+								} else {
 									Utils::$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
+								}
 
-								Utils::$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = array(
+								Utils::$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = [
 									'type' => Lang::$txt['execute_modification'],
-									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
+									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
 									'description' => $failed ? Lang::$txt['package_action_failure'] : Lang::$txt['package_action_success'],
 									'failed' => $failed,
-								);
-							}
-							elseif (!isset(Utils::$context['actions'][$actual_filename]))
-							{
-								Utils::$context['actions'][$actual_filename] = array(
+								];
+							} elseif (!isset(Utils::$context['actions'][$actual_filename])) {
+								Utils::$context['actions'][$actual_filename] = [
 									'type' => Lang::$txt['execute_modification'],
-									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
+									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
 									'description' => $failed ? Lang::$txt['package_action_failure'] : Lang::$txt['package_action_success'],
 									'failed' => $failed,
-								);
-							}
-							else
-							{
+								];
+							} else {
 								Utils::$context['actions'][$actual_filename]['failed'] |= $failed;
 								Utils::$context['actions'][$actual_filename]['description'] = Utils::$context['actions'][$actual_filename]['failed'] ? Lang::$txt['package_action_failure'] : Lang::$txt['package_action_success'];
 							}
-						}
-						elseif ($mod_action['type'] == 'skipping')
-						{
-							Utils::$context['actions'][$actual_filename] = array(
+						} elseif ($mod_action['type'] == 'skipping') {
+							Utils::$context['actions'][$actual_filename] = [
 								'type' => Lang::$txt['execute_modification'],
-								'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
-								'description' => Lang::$txt['package_action_skipping']
-							);
-						}
-						elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
-						{
+								'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
+								'description' => Lang::$txt['package_action_skipping'],
+							];
+						} elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom'])) {
 							Utils::$context['has_failure'] = true;
-							Utils::$context['actions'][$actual_filename] = array(
+							Utils::$context['actions'][$actual_filename] = [
 								'type' => Lang::$txt['execute_modification'],
-								'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
+								'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
 								'description' => Lang::$txt['package_action_missing'],
 								'failed' => true,
-							);
-						}
-						elseif ($mod_action['type'] == 'error')
-							Utils::$context['actions'][$actual_filename] = array(
+							];
+						} elseif ($mod_action['type'] == 'error') {
+							Utils::$context['actions'][$actual_filename] = [
 								'type' => Lang::$txt['execute_modification'],
-								'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
+								'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
 								'description' => Lang::$txt['package_action_error'],
 								'failed' => true,
-							);
+							];
+						}
 					}
 
 					// We need to loop again just to get the operations down correctly.
-					foreach ($mod_actions as $operation_key => $mod_action)
-					{
+					foreach ($mod_actions as $operation_key => $mod_action) {
 						// Lets get the last section of the file name.
-						if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
+						if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
 							$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
-						elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
+						} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
 							$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
-						else
+						} else {
 							$actual_filename = $key;
+						}
 
 						// We just need it for actual parse changes.
-						if (!in_array($mod_action['type'], array('error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod')))
-						{
-							if (empty($mod_action['is_custom']))
-								Utils::$context['actions'][$actual_filename]['operations'][] = array(
+						if (!in_array($mod_action['type'], ['error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod'])) {
+							if (empty($mod_action['is_custom'])) {
+								Utils::$context['actions'][$actual_filename]['operations'][] = [
 									'type' => Lang::$txt['execute_modification'],
-									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
+									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
 									'description' => $mod_action['failed'] ? Lang::$txt['package_action_failure'] : Lang::$txt['package_action_success'],
 									'position' => $mod_action['position'],
 									'operation_key' => $operation_key,
@@ -574,13 +571,14 @@ public function installTest()
 									'is_boardmod' => $action['boardmod'],
 									'failed' => $mod_action['failed'],
 									'ignore_failure' => !empty($mod_action['ignore_failure']),
-								);
+								];
+							}
 
 							// Themes are under the saved type.
-							if (isset($mod_action['is_custom']) && isset(Utils::$context['theme_actions'][$mod_action['is_custom']]))
-								Utils::$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
+							if (isset($mod_action['is_custom'], Utils::$context['theme_actions'][$mod_action['is_custom']])) {
+								Utils::$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = [
 									'type' => Lang::$txt['execute_modification'],
-									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], array(Config::$boarddir => '.'))),
+									'action' => Utils::htmlspecialchars(strtr($mod_action['filename'], [Config::$boarddir => '.'])),
 									'description' => $mod_action['failed'] ? Lang::$txt['package_action_failure'] : Lang::$txt['package_action_success'],
 									'position' => $mod_action['position'],
 									'operation_key' => $operation_key,
@@ -588,77 +586,69 @@ public function installTest()
 									'is_boardmod' => $action['boardmod'],
 									'failed' => $mod_action['failed'],
 									'ignore_failure' => !empty($mod_action['ignore_failure']),
-								);
+								];
+							}
 						}
 					}
 				}
-			}
-			elseif ($action['type'] == 'code')
-			{
-				$thisAction = array(
+			} elseif ($action['type'] == 'code') {
+				$thisAction = [
 					'type' => Lang::$txt['execute_code'],
 					'action' => Utils::htmlspecialchars($action['filename']),
-				);
-			}
-			elseif ($action['type'] == 'database' && !Utils::$context['uninstalling'])
-			{
-				$thisAction = array(
+				];
+			} elseif ($action['type'] == 'database' && !Utils::$context['uninstalling']) {
+				$thisAction = [
 					'type' => Lang::$txt['execute_database_changes'],
 					'action' => Utils::htmlspecialchars($action['filename']),
-				);
-			}
-			elseif (in_array($action['type'], array('create-dir', 'create-file')))
-			{
-				$thisAction = array(
+				];
+			} elseif (in_array($action['type'], ['create-dir', 'create-file'])) {
+				$thisAction = [
 					'type' => Lang::$txt['package_create'] . ' ' . ($action['type'] == 'create-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-					'action' => Utils::htmlspecialchars(strtr($action['destination'], array(Config::$boarddir => '.')))
-				);
-			}
-			elseif ($action['type'] == 'hook')
-			{
+					'action' => Utils::htmlspecialchars(strtr($action['destination'], [Config::$boarddir => '.'])),
+				];
+			} elseif ($action['type'] == 'hook') {
 				$action['description'] = !isset($action['hook'], $action['function']) ? Lang::$txt['package_action_failure'] : Lang::$txt['package_action_success'];
 
-				if (!isset($action['hook'], $action['function']))
+				if (!isset($action['hook'], $action['function'])) {
 					Utils::$context['has_failure'] = true;
+				}
 
-				$thisAction = array(
+				$thisAction = [
 					'type' => $action['reverse'] ? Lang::$txt['execute_hook_remove'] : Lang::$txt['execute_hook_add'],
 					'action' => sprintf(Lang::$txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], Utils::htmlspecialchars($action['hook'])),
-				);
-			}
-			elseif ($action['type'] == 'credits')
-			{
-				$thisAction = array(
+				];
+			} elseif ($action['type'] == 'credits') {
+				$thisAction = [
 					'type' => Lang::$txt['execute_credits_add'],
 					'action' => sprintf(Lang::$txt['execute_credits_action'], Utils::htmlspecialchars($action['title'])),
-				);
-			}
-			elseif ($action['type'] == 'requires')
-			{
+				];
+			} elseif ($action['type'] == 'requires') {
 				$installed = false;
 				$version = true;
 
 				// package missing required values?
-				if (!isset($action['id']))
+				if (!isset($action['id'])) {
 					Utils::$context['has_failure'] = true;
-				else
-				{
+				} else {
 					// See if this dependency is installed
-					$request = Db::$db->query('', '
-						SELECT version
+					$request = Db::$db->query(
+						'',
+						'SELECT version
 						FROM {db_prefix}log_packages
 						WHERE package_id = {string:current_package}
 							AND install_state != {int:not_installed}
 						ORDER BY time_installed DESC
 						LIMIT 1',
-						array(
+						[
 							'not_installed' => 0,
 							'current_package' => $action['id'],
-						)
+						],
 					);
 					$installed = (Db::$db->num_rows($request) !== 0);
-					if ($installed)
-						list ($version) = Db::$db->fetch_row($request);
+
+					if ($installed) {
+						list($version) = Db::$db->fetch_row($request);
+					}
 					Db::$db->free_result($request);
 
 					// do a version level check (if requested) in the most basic way
@@ -669,168 +659,174 @@ public function installTest()
 				$action['description'] = ($installed && $version) ? Lang::$txt['package_action_success'] : Lang::$txt['package_action_failure'];
 				Utils::$context['has_failure'] = !($installed && $version);
 
-				$thisAction = array(
+				$thisAction = [
 					'type' => Lang::$txt['package_requires'],
 					'action' => Lang::$txt['package_check_for'] . ' ' . $action['id'] . (isset($action['version']) ? (' / ' . ($version ? $action['version'] : '<span class="error">' . $action['version'] . '</span>')) : ''),
-				);
-			}
-			elseif (in_array($action['type'], array('require-dir', 'require-file')))
-			{
+				];
+			} elseif (in_array($action['type'], ['require-dir', 'require-file'])) {
 				// Do this one...
-				$thisAction = array(
+				$thisAction = [
 					'type' => Lang::$txt['package_extract'] . ' ' . ($action['type'] == 'require-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-					'action' => Utils::htmlspecialchars(strtr($action['destination'], array(Config::$boarddir => '.')))
-				);
+					'action' => Utils::htmlspecialchars(strtr($action['destination'], [Config::$boarddir => '.'])),
+				];
 
 				// Could this be theme related?
-				if (!empty($action['unparsed_destination']) && preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir|themes_dir)~i', $action['unparsed_destination'], $matches))
-				{
+				if (!empty($action['unparsed_destination']) && preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir|themes_dir)~i', $action['unparsed_destination'], $matches)) {
 					// Is the action already stated?
-					$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto';
+					$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], ['no', 'yes', 'auto']) ? $action['theme_action'] : 'auto';
+
 					// If it's not auto do we think we have something we can act upon?
-					if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
+					if ($theme_action != 'auto' && !in_array($matches[1], ['languagedir', 'languages_dir', 'imagesdir', 'themedir'])) {
 						$theme_action = '';
+					}
 					// ... or if it's auto do we even want to do anything?
-					elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
+					elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
 						$theme_action = '';
+					}
 
 					// So, we still want to do something?
-					if ($theme_action != '')
+					if ($theme_action != '') {
 						$themeFinds['candidates'][] = $action;
+					}
 					// Otherwise is this is going into another theme record it.
-					elseif ($matches[1] == 'themes_dir')
-						$themeFinds['other_themes'][] = strtolower(strtr(SubsPackage::parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
+					elseif ($matches[1] == 'themes_dir') {
+						$themeFinds['other_themes'][] = strtolower(strtr(SubsPackage::parse_path($action['unparsed_destination']), ['\\' => '/']) . '/' . basename($action['filename']));
+					}
 				}
-			}
-			elseif (in_array($action['type'], array('move-dir', 'move-file')))
-				$thisAction = array(
+			} elseif (in_array($action['type'], ['move-dir', 'move-file'])) {
+				$thisAction = [
 					'type' => Lang::$txt['package_move'] . ' ' . ($action['type'] == 'move-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-					'action' => Utils::htmlspecialchars(strtr($action['source'], array(Config::$boarddir => '.'))) . ' => ' . Utils::htmlspecialchars(strtr($action['destination'], array(Config::$boarddir => '.')))
-				);
-			elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
-			{
-				$thisAction = array(
+					'action' => Utils::htmlspecialchars(strtr($action['source'], [Config::$boarddir => '.'])) . ' => ' . Utils::htmlspecialchars(strtr($action['destination'], [Config::$boarddir => '.'])),
+				];
+			} elseif (in_array($action['type'], ['remove-dir', 'remove-file'])) {
+				$thisAction = [
 					'type' => Lang::$txt['package_delete'] . ' ' . ($action['type'] == 'remove-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-					'action' => Utils::htmlspecialchars(strtr($action['filename'], array(Config::$boarddir => '.')))
-				);
+					'action' => Utils::htmlspecialchars(strtr($action['filename'], [Config::$boarddir => '.'])),
+				];
 
 				// Could this be theme related?
-				if (!empty($action['unparsed_filename']) && preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir|themes_dir)~i', $action['unparsed_filename'], $matches))
-				{
+				if (!empty($action['unparsed_filename']) && preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir|themes_dir)~i', $action['unparsed_filename'], $matches)) {
 					// Is the action already stated?
-					$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto';
+					$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], ['no', 'yes', 'auto']) ? $action['theme_action'] : 'auto';
 					$action['unparsed_destination'] = $action['unparsed_filename'];
 
 					// If it's not auto do we think we have something we can act upon?
-					if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
+					if ($theme_action != 'auto' && !in_array($matches[1], ['languagedir', 'languages_dir', 'imagesdir', 'themedir'])) {
 						$theme_action = '';
+					}
 					// ... or if it's auto do we even want to do anything?
-					elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
+					elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
 						$theme_action = '';
+					}
 
 					// So, we still want to do something?
-					if ($theme_action != '')
+					if ($theme_action != '') {
 						$themeFinds['candidates'][] = $action;
+					}
 					// Otherwise is this is going into another theme record it.
-					elseif ($matches[1] == 'themes_dir')
-						$themeFinds['other_themes'][] = strtolower(strtr(SubsPackage::parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
+					elseif ($matches[1] == 'themes_dir') {
+						$themeFinds['other_themes'][] = strtolower(strtr(SubsPackage::parse_path($action['unparsed_filename']), ['\\' => '/']) . '/' . basename($action['filename']));
+					}
 				}
 			}
 
-			if (empty($thisAction))
+			if (empty($thisAction)) {
 				continue;
+			}
 
-			if (!in_array($action['type'], array('hook', 'credits')))
-			{
-				if (Utils::$context['uninstalling'])
-					$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'];
-				else
+			if (!in_array($action['type'], ['hook', 'credits'])) {
+				if (Utils::$context['uninstalling']) {
+					$file = in_array($action['type'], ['remove-dir', 'remove-file']) ? $action['filename'] : Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'];
+				} else {
 					$file = Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'];
+				}
 			}
 
 			// Don't fail if a file/directory we're trying to create doesn't exist...
-			if (isset($action['filename']) && !file_exists($file) && !in_array($action['type'], array('create-dir', 'create-file')))
-			{
+			if (isset($action['filename']) && !file_exists($file) && !in_array($action['type'], ['create-dir', 'create-file'])) {
 				Utils::$context['has_failure'] = true;
 
-				$thisAction += array(
+				$thisAction += [
 					'description' => Lang::$txt['package_action_missing'],
 					'failed' => true,
-				);
+				];
 			}
 
 			// @todo None given?
-			if (empty($thisAction['description']))
-				$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			if (empty($thisAction['description'])) {
+				$thisAction['description'] = $action['description'] ?? '';
+			}
 
 			Utils::$context['actions'][] = $thisAction;
 		}
 
 		// Have we got some things which we might want to do "multi-theme"?
-		if (!empty($themeFinds['candidates']))
-		{
-			foreach ($themeFinds['candidates'] as $action_data)
-			{
+		if (!empty($themeFinds['candidates'])) {
+			foreach ($themeFinds['candidates'] as $action_data) {
 				// Get the part of the file we'll be dealing with.
 				preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches);
 
-				if ($matches[1] == 'imagesdir')
+				if ($matches[1] == 'imagesdir') {
 					$path = '/' . basename(Theme::$current->settings['default_images_url']);
-				elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir')
+				} elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') {
 					$path = '/languages';
-				else
+				} else {
 					$path = '';
+				}
 
-				if (!empty($matches[3]))
+				if (!empty($matches[3])) {
 					$path .= $matches[3];
+				}
 
-				if (!Utils::$context['uninstalling'])
+				if (!Utils::$context['uninstalling']) {
 					$path .= '/' . basename($action_data['filename']);
+				}
 
 				// Loop through each custom theme to note it's candidacy!
-				foreach ($theme_paths as $id => $theme_data)
-				{
-					if (isset($theme_data['theme_dir']) && $id != 1)
-					{
+				foreach ($theme_paths as $id => $theme_data) {
+					if (isset($theme_data['theme_dir']) && $id != 1) {
 						$real_path = $theme_data['theme_dir'] . $path;
 
 						// Confirm that we don't already have this dealt with by another entry.
-						if (!in_array(strtolower(strtr($real_path, array('\\' => '/'))), $themeFinds['other_themes']))
-						{
+						if (!in_array(strtolower(strtr($real_path, ['\\' => '/'])), $themeFinds['other_themes'])) {
 							// Check if we will need to chmod this.
-							if (!SubsPackage::mktree(dirname($real_path), false))
-							{
+							if (!SubsPackage::mktree(dirname($real_path), false)) {
 								$temp = dirname($real_path);
-								while (!file_exists($temp) && strlen($temp) > 1)
+
+								while (!file_exists($temp) && strlen($temp) > 1) {
 									$temp = dirname($temp);
+								}
 								$chmod_files[] = $temp;
 							}
 
-							if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path))))
+							if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) {
 								$chmod_files[] = $real_path;
+							}
 
-							if (!isset(Utils::$context['theme_actions'][$id]))
-								Utils::$context['theme_actions'][$id] = array(
+							if (!isset(Utils::$context['theme_actions'][$id])) {
+								Utils::$context['theme_actions'][$id] = [
 									'name' => $theme_data['name'],
-									'actions' => array(),
-								);
+									'actions' => [],
+								];
+							}
 
-							if (Utils::$context['uninstalling'])
-								Utils::$context['theme_actions'][$id]['actions'][] = array(
+							if (Utils::$context['uninstalling']) {
+								Utils::$context['theme_actions'][$id]['actions'][] = [
 									'type' => Lang::$txt['package_delete'] . ' ' . ($action_data['type'] == 'require-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-									'action' => strtr($real_path, array('\\' => '/', Config::$boarddir => '.')),
+									'action' => strtr($real_path, ['\\' => '/', Config::$boarddir => '.']),
 									'description' => '',
-									'value' => base64_encode(Utils::jsonEncode(array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))),
+									'value' => base64_encode(Utils::jsonEncode(['type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id])),
 									'not_mod' => true,
-								);
-							else
-								Utils::$context['theme_actions'][$id]['actions'][] = array(
+								];
+							} else {
+								Utils::$context['theme_actions'][$id]['actions'][] = [
 									'type' => Lang::$txt['package_extract'] . ' ' . ($action_data['type'] == 'require-dir' ? Lang::$txt['package_tree'] : Lang::$txt['package_file']),
-									'action' => strtr($real_path, array('\\' => '/', Config::$boarddir => '.')),
+									'action' => strtr($real_path, ['\\' => '/', Config::$boarddir => '.']),
 									'description' => '',
-									'value' => base64_encode(Utils::jsonEncode(array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))),
+									'value' => base64_encode(Utils::jsonEncode(['type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id])),
 									'not_mod' => true,
-								);
+								];
+							}
 						}
 					}
 				}
@@ -840,11 +836,11 @@ public function installTest()
 		// Trash the cache... which will also check permissions for us!
 		SubsPackage::package_flush_cache(true);
 
-		if (file_exists(Config::$packagesdir . '/temp'))
+		if (file_exists(Config::$packagesdir . '/temp')) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp');
+		}
 
-		if (!empty($chmod_files))
-		{
+		if (!empty($chmod_files)) {
 			$ftp_status = SubsPackage::create_chmod_control($chmod_files);
 			Utils::$context['ftp_needed'] = !empty($ftp_status['files']['notwritable']) && !empty(Utils::$context['package_ftp']);
 		}
@@ -863,8 +859,9 @@ public function install()
 		User::$me->checkSession();
 
 		// If there's no file, what are we installing?
-		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
+		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
 			Utils::redirectexit('action=admin;area=packages');
+		}
 		Utils::$context['filename'] = $_REQUEST['package'];
 
 		// If this is an uninstall, we'll have an id.
@@ -875,95 +872,102 @@ public function install()
 		Utils::$context['uninstalling'] = $_REQUEST['sa'] == 'uninstall2';
 
 		// Set up the linktree for other.
-		Utils::$context['linktree'][count(Utils::$context['linktree']) - 1] = array(
+		Utils::$context['linktree'][count(Utils::$context['linktree']) - 1] = [
 			'url' => Config::$scripturl . '?action=admin;area=packages;sa=browse',
-			'name' => Utils::$context['uninstalling'] ? Lang::$txt['uninstall'] : Lang::$txt['extracting']
-		);
+			'name' => Utils::$context['uninstalling'] ? Lang::$txt['uninstall'] : Lang::$txt['extracting'],
+		];
 		Utils::$context['page_title'] .= ' - ' . (Utils::$context['uninstalling'] ? Lang::$txt['uninstall'] : Lang::$txt['extracting']);
 
 		Utils::$context['sub_template'] = 'extract_package';
 
-		if (!file_exists(Config::$packagesdir . '/' . Utils::$context['filename']))
+		if (!file_exists(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			ErrorHandler::fatalLang('package_no_file', false);
+		}
 
 		// Load up the package FTP information?
-		SubsPackage::create_chmod_control(array(), array('destination_url' => Config::$scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package']));
+		SubsPackage::create_chmod_control([], ['destination_url' => Config::$scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package']]);
 
 		// Make sure temp directory exists and is empty!
-		if (file_exists(Config::$packagesdir . '/temp'))
+		if (file_exists(Config::$packagesdir . '/temp')) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp', false);
-		else
+		} else {
 			SubsPackage::mktree(Config::$packagesdir . '/temp', 0777);
+		}
 
 		// Let the unpacker do the work.
-		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			Utils::$context['extracted_files'] = SubsPackage::read_tgz_file(Config::$packagesdir . '/' . Utils::$context['filename'], Config::$packagesdir . '/temp');
 
-			if (!file_exists(Config::$packagesdir . '/temp/package-info.xml'))
-				foreach (Utils::$context['extracted_files'] as $file)
-					if (basename($file['filename']) == 'package-info.xml')
-					{
+			if (!file_exists(Config::$packagesdir . '/temp/package-info.xml')) {
+				foreach (Utils::$context['extracted_files'] as $file) {
+					if (basename($file['filename']) == 'package-info.xml') {
 						Utils::$context['base_path'] = dirname($file['filename']) . '/';
 						break;
 					}
+				}
+			}
 
-			if (!isset(Utils::$context['base_path']))
+			if (!isset(Utils::$context['base_path'])) {
 				Utils::$context['base_path'] = '';
-		}
-		elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+			}
+		} elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			SubsPackage::copytree(Config::$packagesdir . '/' . Utils::$context['filename'], Config::$packagesdir . '/temp');
 			Utils::$context['extracted_files'] = SubsPackage::listtree(Config::$packagesdir . '/temp');
 			Utils::$context['base_path'] = '';
-		}
-		else
+		} else {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Are we installing this into any custom themes?
-		$custom_themes = array(1);
+		$custom_themes = [1];
 		$known_themes = explode(',', Config::$modSettings['knownThemes']);
-		if (!empty($_POST['custom_theme']))
-		{
-			foreach ($_POST['custom_theme'] as $tid)
-				if (in_array($tid, $known_themes))
+
+		if (!empty($_POST['custom_theme'])) {
+			foreach ($_POST['custom_theme'] as $tid) {
+				if (in_array($tid, $known_themes)) {
 					$custom_themes[] = (int) $tid;
+				}
+			}
 		}
 
 		// Now load up the paths of the themes that we need to know about.
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE id_theme IN ({array_int:custom_themes})
 				AND variable IN ({string:name}, {string:theme_dir})',
-			array(
+			[
 				'custom_themes' => $custom_themes,
 				'name' => 'name',
 				'theme_dir' => 'theme_dir',
-			)
+			],
 		);
-		$theme_paths = array();
-		$themes_installed = array(1);
+		$theme_paths = [];
+		$themes_installed = [1];
 
-		while ($row = Db::$db->fetch_assoc($request))
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+		}
 
 		Db::$db->free_result($request);
 
 		// Are there any theme copying that we want to take place?
-		Utils::$context['theme_copies'] = array(
-			'require-file' => array(),
-			'require-dir' => array(),
-		);
-		if (!empty($_POST['theme_changes']))
-		{
-			foreach ($_POST['theme_changes'] as $change)
-			{
-				if (empty($change))
+		Utils::$context['theme_copies'] = [
+			'require-file' => [],
+			'require-dir' => [],
+		];
+
+		if (!empty($_POST['theme_changes'])) {
+			foreach ($_POST['theme_changes'] as $change) {
+				if (empty($change)) {
 					continue;
+				}
 				$theme_data = Utils::jsonDecode(base64_decode($change), true);
-				if (empty($theme_data['type']))
+
+				if (empty($theme_data['type'])) {
 					continue;
+				}
 
 				$themes_installed[] = $theme_data['id'];
 				Utils::$context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future'];
@@ -972,143 +976,144 @@ public function install()
 
 		// Get the package info...
 		$packageInfo = SubsPackage::getPackageInfo(Utils::$context['filename']);
-		if (!is_array($packageInfo))
+
+		if (!is_array($packageInfo)) {
 			ErrorHandler::fatalLang($packageInfo);
+		}
 
-		if (is_dir(Config::$packagesdir . '/' . Utils::$context['filename']))
+		if (is_dir(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			Utils::$context['package_sha256_hash'] = '';
-		else
+		} else {
 			Utils::$context['package_sha256_hash'] = hash_file('sha256', Config::$packagesdir . '/' . Utils::$context['filename']);
+		}
 		$packageInfo['filename'] = Utils::$context['filename'];
 
 		// Set the type of extraction...
-		Utils::$context['extract_type'] = isset($packageInfo['type']) ? $packageInfo['type'] : 'modification';
+		Utils::$context['extract_type'] = $packageInfo['type'] ?? 'modification';
 
 		// Create a backup file to roll back to! (but if they do this more than once, don't run it a zillion times.)
-		if (!empty(Config::$modSettings['package_make_full_backups']) && (!isset($_SESSION['last_backup_for']) || $_SESSION['last_backup_for'] != Utils::$context['filename'] . (Utils::$context['uninstalling'] ? '$$' : '$')))
-		{
+		if (!empty(Config::$modSettings['package_make_full_backups']) && (!isset($_SESSION['last_backup_for']) || $_SESSION['last_backup_for'] != Utils::$context['filename'] . (Utils::$context['uninstalling'] ? '$$' : '$'))) {
 			$_SESSION['last_backup_for'] = Utils::$context['filename'] . (Utils::$context['uninstalling'] ? '$$' : '$');
 			$result = SubsPackage::package_create_backup((Utils::$context['uninstalling'] ? 'backup_' : 'before_') . strtok(Utils::$context['filename'], '.'));
-			if (!$result)
+
+			if (!$result) {
 				ErrorHandler::fatalLang('could_not_package_backup', false);
+			}
 		}
 
 		// The mod isn't installed.... unless proven otherwise.
 		Utils::$context['is_installed'] = false;
 
 		// Is it actually installed?
-		$request = Db::$db->query('', '
-			SELECT version, themes_installed, db_changes
+		$request = Db::$db->query(
+			'',
+			'SELECT version, themes_installed, db_changes
 			FROM {db_prefix}log_packages
 			WHERE package_id = {string:current_package}
 				AND install_state != {int:not_installed}
 			ORDER BY time_installed DESC
 			LIMIT 1',
-			array(
+			[
 				'not_installed' => 0,
 				'current_package' => $packageInfo['id'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$old_themes = explode(',', $row['themes_installed']);
 			$old_version = $row['version'];
-			$db_changes = empty($row['db_changes']) ? array() : Utils::jsonDecode($row['db_changes'], true);
+			$db_changes = empty($row['db_changes']) ? [] : Utils::jsonDecode($row['db_changes'], true);
 		}
 		Db::$db->free_result($request);
 
 		// Wait, it's not installed yet!
 		// @todo Replace with a better error message!
-		if (!isset($old_version) && Utils::$context['uninstalling'])
-		{
+		if (!isset($old_version) && Utils::$context['uninstalling']) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp');
 			ErrorHandler::fatal('Hacker?', false);
 		}
 		// Uninstalling?
-		elseif (Utils::$context['uninstalling'])
-		{
+		elseif (Utils::$context['uninstalling']) {
 			$install_log = SubsPackage::parsePackageInfo($packageInfo['xml'], false, 'uninstall');
 
 			// Gadzooks!  There's no uninstaller at all!?
-			if (empty($install_log))
+			if (empty($install_log)) {
 				ErrorHandler::fatalLang('package_uninstall_cannot', false);
+			}
 
 			// They can only uninstall from what it was originally installed into.
-			foreach ($theme_paths as $id => $data)
-				if ($id != 1 && !in_array($id, $old_themes))
+			foreach ($theme_paths as $id => $data) {
+				if ($id != 1 && !in_array($id, $old_themes)) {
 					unset($theme_paths[$id]);
+				}
+			}
 
 			Utils::$context['keep_url'] = Config::$scripturl . '?action=admin;area=packages;sa=browse;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 			Utils::$context['remove_url'] = Config::$scripturl . '?action=admin;area=packages;sa=remove;package=' . Utils::$context['filename'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
-		}
-		elseif (isset($old_version) && $old_version != $packageInfo['version'])
-		{
+		} elseif (isset($old_version) && $old_version != $packageInfo['version']) {
 			// Look for an upgrade...
 			$install_log = SubsPackage::parsePackageInfo($packageInfo['xml'], false, 'upgrade', $old_version);
 
 			// There was no upgrade....
-			if (empty($install_log))
+			if (empty($install_log)) {
 				Utils::$context['is_installed'] = true;
-			else
-			{
+			} else {
 				// Upgrade previous themes only!
-				foreach ($theme_paths as $id => $data)
-					if ($id != 1 && !in_array($id, $old_themes))
+				foreach ($theme_paths as $id => $data) {
+					if ($id != 1 && !in_array($id, $old_themes)) {
 						unset($theme_paths[$id]);
+					}
+				}
 			}
-		}
-		elseif (isset($old_version) && $old_version == $packageInfo['version'])
+		} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
 			Utils::$context['is_installed'] = true;
+		}
 
-		if (!isset($old_version) || Utils::$context['is_installed'])
+		if (!isset($old_version) || Utils::$context['is_installed']) {
 			$install_log = SubsPackage::parsePackageInfo($packageInfo['xml'], false, 'install');
+		}
 
 		Utils::$context['install_finished'] = false;
 
 		// @todo Make a log of any errors that occurred and output them?
 
-		if (!empty($install_log))
-		{
-			$failed_steps = array();
+		if (!empty($install_log)) {
+			$failed_steps = [];
 			$failed_count = 0;
 
-			foreach ($install_log as $action)
-			{
+			foreach ($install_log as $action) {
 				$failed_count++;
 
-				if ($action['type'] == 'modification' && !empty($action['filename']))
-				{
-					if ($action['boardmod'])
+				if ($action['type'] == 'modification' && !empty($action['filename'])) {
+					if ($action['boardmod']) {
 						$mod_actions = SubsPackage::parseBoardMod(file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
-					else
+					} else {
 						$mod_actions = SubsPackage::parseModification(file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
+					}
 
 					// Any errors worth noting?
-					foreach ($mod_actions as $key => $modAction)
-					{
-						if ($modAction['type'] == 'failure')
-							$failed_steps[] = array(
+					foreach ($mod_actions as $key => $modAction) {
+						if ($modAction['type'] == 'failure') {
+							$failed_steps[] = [
 								'file' => $modAction['filename'],
 								'large_step' => $failed_count,
 								'sub_step' => $key,
 								'theme' => 1,
-							);
+							];
+						}
 
 						// Gather the themes we installed into.
-						if (!empty($modAction['is_custom']))
+						if (!empty($modAction['is_custom'])) {
 							$themes_installed[] = $modAction['is_custom'];
+						}
 					}
-				}
-				elseif ($action['type'] == 'code' && !empty($action['filename']))
-				{
+				} elseif ($action['type'] == 'code' && !empty($action['filename'])) {
 					// Now include the file and be done with it ;).
-					if (file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']))
-					{
+					if (file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'])) {
 						// Get all our backward compatibility globals into scope
 						// just in case the file's code wants to use them.
-						if (!empty(Config::$backward_compatibility))
-						{
-							$backcompat_globals = array(
+						if (!empty(Config::$backward_compatibility)) {
+							$backcompat_globals = [
 								'boardurl' => &Config::$boardurl,
 								'scripturl' => &Config::$scripturl,
 								'sourcedir' => &Config::$sourcedir,
@@ -1119,51 +1124,42 @@ public function install()
 								'txt' => &Lang::$txt,
 								'user_info' => &User::$me,
 								'settings' => &Theme::$current->settings,
-							);
+							];
 
 							extract($backcompat_globals, EXTR_REFS | EXTR_SKIP);
 						}
 
-						require(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']);
+						require Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'];
 					}
-				}
-				elseif ($action['type'] == 'credits')
-				{
+				} elseif ($action['type'] == 'credits') {
 					// Time to build the billboard
-					$credits_tag = array(
+					$credits_tag = [
 						'url' => $action['url'],
 						'license' => $action['license'],
 						'licenseurl' => $action['licenseurl'],
 						'copyright' => $action['copyright'],
 						'title' => $action['title'],
-					);
-				}
-				elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
-				{
+					];
+				} elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function'])) {
 					// Set the system to ignore hooks, but only if it wasn't changed before.
-					if (!isset(Utils::$context['ignore_hook_errors']))
+					if (!isset(Utils::$context['ignore_hook_errors'])) {
 						Utils::$context['ignore_hook_errors'] = true;
+					}
 
-					if ($action['reverse'])
-					{
+					if ($action['reverse']) {
 						IntegrationHook::remove($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
-					}
-					else
-					{
+					} else {
 						IntegrationHook::add($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
 					}
 				}
 				// Only do the database changes on uninstall if requested.
-				elseif ($action['type'] == 'database' && !empty($action['filename']) && (!Utils::$context['uninstalling'] || !empty($_POST['do_db_changes'])))
-				{
+				elseif ($action['type'] == 'database' && !empty($action['filename']) && (!Utils::$context['uninstalling'] || !empty($_POST['do_db_changes']))) {
 					// Let the file work its magic ;)
-					if (file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']))
-					{
+					if (file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'])) {
 						// Get all our backward compatibility globals into scope
 						// just in case the file's code wants to use them.
-						if (!empty(Config::$backward_compatibility))
-						{
-							$backcompat_globals = array(
+						if (!empty(Config::$backward_compatibility)) {
+							$backcompat_globals = [
 								'boardurl' => &Config::$boardurl,
 								'scripturl' => &Config::$scripturl,
 								'sourcedir' => &Config::$sourcedir,
@@ -1174,34 +1170,33 @@ public function install()
 								'txt' => &Lang::$txt,
 								'user_info' => &User::$me,
 								'settings' => &Theme::$current->settings,
-							);
+							];
 
 							extract($backcompat_globals, EXTR_REFS | EXTR_SKIP);
 						}
 
-						require(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']);
+						require Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'];
 					}
 				}
 				// Handle a redirect...
-				elseif ($action['type'] == 'redirect' && !empty($action['redirect_url']))
-				{
+				elseif ($action['type'] == 'redirect' && !empty($action['redirect_url'])) {
 					Utils::$context['redirect_url'] = $action['redirect_url'];
 					Utils::$context['redirect_text'] = !empty($action['filename']) && file_exists(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename']) ? Utils::htmlspecialchars(file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $action['filename'])) : (Utils::$context['uninstalling'] ? Lang::$txt['package_uninstall_done'] : Lang::$txt['package_installed_done']);
 					Utils::$context['redirect_timeout'] = empty($action['redirect_timeout']) ? 5 : (int) ceil($action['redirect_timeout'] / 1000);
-					if (!empty($action['parse_bbc']))
-					{
+
+					if (!empty($action['parse_bbc'])) {
 						Utils::$context['redirect_text'] = preg_replace('~\[[/]?html\]~i', '', Utils::$context['redirect_text']);
 						Msg::preparsecode(Utils::$context['redirect_text']);
 						Utils::$context['redirect_text'] = BBCodeParser::load()->parse(Utils::$context['redirect_text']);
 					}
 
 					// Parse out a couple of common urls.
-					$urls = array(
+					$urls = [
 						'$boardurl' => Config::$boardurl,
 						'$scripturl' => Config::$scripturl,
 						'$session_var' => Utils::$context['session_var'],
 						'$session_id' => Utils::$context['session_id'],
-					);
+					];
 
 					Utils::$context['redirect_url'] = strtr(Utils::$context['redirect_url'], $urls);
 				}
@@ -1210,33 +1205,34 @@ public function install()
 			SubsPackage::package_flush_cache();
 
 			// See if this is already installed, and change it's state as required.
-			$request = Db::$db->query('', '
-				SELECT package_id, install_state, db_changes
+			$request = Db::$db->query(
+				'',
+				'SELECT package_id, install_state, db_changes
 				FROM {db_prefix}log_packages
 				WHERE install_state != {int:not_installed}
 					AND package_id = {string:current_package}
 					' . (Utils::$context['install_id'] ? ' AND id_install = {int:install_id} ' : '') . '
 				ORDER BY time_installed DESC
 				LIMIT 1',
-				array(
+				[
 					'not_installed' => 0,
 					'install_id' => Utils::$context['install_id'],
 					'current_package' => $packageInfo['id'],
-				)
+				],
 			);
 			$is_upgrade = false;
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// Uninstalling?
-				if (Utils::$context['uninstalling'])
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_packages
+				if (Utils::$context['uninstalling']) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_packages
 						SET install_state = {int:not_installed}, member_removed = {string:member_name},
 							id_member_removed = {int:current_member}, time_removed = {int:current_time}, sha256_hash = {string:package_hash}
 						WHERE package_id = {string:package_id}
 							AND id_install = {int:install_id}',
-						array(
+						[
 							'current_member' => User::$me->id,
 							'not_installed' => 0,
 							'current_time' => time(),
@@ -1244,23 +1240,23 @@ public function install()
 							'member_name' => User::$me->name,
 							'install_id' => Utils::$context['install_id'],
 							'package_hash' => Utils::$context['package_sha256_hash'],
-						)
+						],
 					);
 				}
 				// Otherwise must be an upgrade.
-				else
-				{
+				else {
 					$is_upgrade = true;
-					$old_db_changes = empty($row['db_changes']) ? array() : Utils::jsonDecode($row['db_changes'], true);
+					$old_db_changes = empty($row['db_changes']) ? [] : Utils::jsonDecode($row['db_changes'], true);
 
 					// Mark the old version as uninstalled
-					Db::$db->query('', '
-						UPDATE {db_prefix}log_packages
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}log_packages
 						SET install_state = {int:not_installed}, member_removed = {string:member_name},
 							id_member_removed = {int:current_member}, time_removed = {int:current_time}, sha256_hash = {string:package_hash}
 						WHERE package_id = {string:package_id}
 							AND version = {string:old_version}',
-						array(
+						[
 							'current_member' => User::$me->id,
 							'not_installed' => 0,
 							'current_time' => time(),
@@ -1268,45 +1264,45 @@ public function install()
 							'member_name' => User::$me->name,
 							'old_version' => $old_version,
 							'package_hash' => Utils::$context['package_sha256_hash'],
-						)
+						],
 					);
 				}
 			}
 
 			// Assuming we're not uninstalling, add the entry.
-			if (!Utils::$context['uninstalling'])
-			{
+			if (!Utils::$context['uninstalling']) {
 				// Reload the settings table for mods that have altered them upon installation
 				Config::reloadModSettings();
 
 				// Any db changes from older version?
-				if (!empty($old_db_changes))
+				if (!empty($old_db_changes)) {
 					Db::$package_log = empty(Db::$package_log) ? $old_db_changes : array_merge($old_db_changes, Db::$package_log);
+				}
 
 				// If there are some database changes we might want to remove then filter them out.
-				if (!empty(Db::$package_log))
-				{
+				if (!empty(Db::$package_log)) {
 					// We're really just checking for entries which are create table AND add columns (etc).
-					$tables = array();
+					$tables = [];
 
-					usort(Db::$package_log, function($a, $b)
-					{
-						if ($a[0] == $b[0])
+					usort(Db::$package_log, function ($a, $b) {
+						if ($a[0] == $b[0]) {
 							return 0;
+						}
+
 						return $a[0] == 'remove_table' ? -1 : 1;
 					});
 
-					foreach (Db::$package_log as $k => $log)
-					{
-						if ($log[0] == 'remove_table')
+					foreach (Db::$package_log as $k => $log) {
+						if ($log[0] == 'remove_table') {
 							$tables[] = $log[1];
-						elseif (in_array($log[1], $tables))
+						} elseif (in_array($log[1], $tables)) {
 							unset(Db::$package_log[$k]);
+						}
 					}
 					$db_changes = Utils::jsonEncode(Db::$package_log);
-				}
-				else
+				} else {
 					$db_changes = '';
+				}
 
 				// What themes did we actually install?
 				$themes_installed = array_unique($themes_installed);
@@ -1316,31 +1312,32 @@ public function install()
 				$failed_step_insert = Utils::jsonEncode($failed_steps);
 
 				// Un-sanitize things before we insert them...
-				$keys = array('filename', 'name', 'id', 'version');
-				foreach ($keys as $key)
-				{
+				$keys = ['filename', 'name', 'id', 'version'];
+
+				foreach ($keys as $key) {
 					// Yay for variable variables...
-					${"package_$key"} = Utils::htmlspecialcharsDecode($packageInfo[$key]);
+					${"package_{$key}"} = Utils::htmlspecialcharsDecode($packageInfo[$key]);
 				}
 
 				// Credits tag?
 				$credits_tag = (empty($credits_tag)) ? '' : Utils::jsonEncode($credits_tag);
-				Db::$db->insert('',
+				Db::$db->insert(
+					'',
 					'{db_prefix}log_packages',
-					array(
+					[
 						'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
 						'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 						'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 						'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
 						'sha256_hash' => 'string',
-					),
-					array(
+					],
+					[
 						$package_filename, $package_name, $package_id, $package_version,
 						User::$me->id, User::$me->name, time(),
 						$is_upgrade ? 2 : 1, $failed_step_insert, $themes_installed,
-						0, $db_changes, $credits_tag, Utils::$context['package_sha256_hash']
-					),
-					array('id_install')
+						0, $db_changes, $credits_tag, Utils::$context['package_sha256_hash'],
+					],
+					['id_install'],
 				);
 			}
 			Db::$db->free_result($request);
@@ -1349,41 +1346,40 @@ public function install()
 		}
 
 		// If there's database changes - and they want them removed - let's do it last!
-		if (!empty($db_changes) && !empty($_POST['do_db_changes']))
-		{
-			foreach ($db_changes as $change)
-			{
-				if ($change[0] == 'remove_table' && isset($change[1]))
+		if (!empty($db_changes) && !empty($_POST['do_db_changes'])) {
+			foreach ($db_changes as $change) {
+				if ($change[0] == 'remove_table' && isset($change[1])) {
 					Db::$db->drop_table($change[1]);
-				elseif ($change[0] == 'remove_column' && isset($change[2]))
+				} elseif ($change[0] == 'remove_column' && isset($change[2])) {
 					Db::$db->remove_column($change[1], $change[2]);
-				elseif ($change[0] == 'remove_index' && isset($change[2]))
+				} elseif ($change[0] == 'remove_index' && isset($change[2])) {
 					Db::$db->remove_index($change[1], $change[2]);
+				}
 			}
 		}
 
 		// Clean house... get rid of the evidence ;).
-		if (file_exists(Config::$packagesdir . '/temp'))
+		if (file_exists(Config::$packagesdir . '/temp')) {
 			SubsPackage::deltree(Config::$packagesdir . '/temp');
+		}
 
 		// Log what we just did.
-		Logging::logAction(Utils::$context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => Utils::htmlspecialchars($packageInfo['name']), 'version' => Utils::htmlspecialchars($packageInfo['version'])), 'admin');
+		Logging::logAction(Utils::$context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), ['package' => Utils::htmlspecialchars($packageInfo['name']), 'version' => Utils::htmlspecialchars($packageInfo['version'])], 'admin');
 
 		// Just in case, let's clear the whole cache and any minimized CSS and JS to avoid anything going up the swanny.
 		CacheApi::clean();
 		Theme::deleteAllMinified();
 
-		foreach (array('css_files', 'javascript_files') as $file_type)
-		{
-			foreach (Utils::$context[$file_type] as $id => $file)
-			{
-				if (isset($file['filePath']) && !file_exists($file['filePath']))
+		foreach (['css_files', 'javascript_files'] as $file_type) {
+			foreach (Utils::$context[$file_type] as $id => $file) {
+				if (isset($file['filePath']) && !file_exists($file['filePath'])) {
 					unset(Utils::$context[$file_type][$id]);
+				}
 			}
 		}
 
 		// Restore file permissions?
-		SubsPackage::create_chmod_control(array(), array(), true);
+		SubsPackage::create_chmod_control([], [], true);
 	}
 
 	/**
@@ -1392,13 +1388,14 @@ public function install()
 	public function list()
 	{
 		// No package?  Show him or her the door.
-		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
+		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
 			Utils::redirectexit('action=admin;area=packages');
+		}
 
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'],
-			'name' => Lang::$txt['list_file']
-		);
+			'name' => Lang::$txt['list_file'],
+		];
 		Utils::$context['page_title'] .= ' - ' . Lang::$txt['list_file'];
 		Utils::$context['sub_template'] = 'list';
 
@@ -1406,10 +1403,11 @@ public function list()
 		Utils::$context['filename'] = $_REQUEST['package'];
 
 		// Let the unpacker do the work.
-		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename']))
+		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			Utils::$context['files'] = SubsPackage::read_tgz_file(Config::$packagesdir . '/' . Utils::$context['filename'], null);
-		elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename']))
+		} elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			Utils::$context['files'] = SubsPackage::listtree(Config::$packagesdir . '/' . Utils::$context['filename']);
+		}
 	}
 
 	/**
@@ -1418,30 +1416,32 @@ public function list()
 	public function examineFile()
 	{
 		// No package?  Show him or her the door.
-		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
+		if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
 			Utils::redirectexit('action=admin;area=packages');
+		}
 
 		// No file?  Show him or her the door.
-		if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '')
+		if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') {
 			Utils::redirectexit('action=admin;area=packages');
+		}
 
-		$_REQUEST['package'] = preg_replace('~[\.]+~', '.', strtr($_REQUEST['package'], array('/' => '_', '\\' => '_')));
-		$_REQUEST['file'] = preg_replace('~[\.]+~', '.', $_REQUEST['file']);
+		$_REQUEST['package'] = preg_replace('~\.+~', '.', strtr($_REQUEST['package'], ['/' => '_', '\\' => '_']));
+		$_REQUEST['file'] = preg_replace('~\.+~', '.', $_REQUEST['file']);
 
-		if (isset($_REQUEST['raw']))
-		{
-			if (is_file(Config::$packagesdir . '/' . $_REQUEST['package']))
+		if (isset($_REQUEST['raw'])) {
+			if (is_file(Config::$packagesdir . '/' . $_REQUEST['package'])) {
 				echo SubsPackage::read_tgz_file(Config::$packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
-			elseif (is_dir(Config::$packagesdir . '/' . $_REQUEST['package']))
+			} elseif (is_dir(Config::$packagesdir . '/' . $_REQUEST['package'])) {
 				echo file_get_contents(Config::$packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
+			}
 
 			Utils::obExit(false);
 		}
 
-		Utils::$context['linktree'][count(Utils::$context['linktree']) - 1] = array(
+		Utils::$context['linktree'][count(Utils::$context['linktree']) - 1] = [
 			'url' => Config::$scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'],
-			'name' => Lang::$txt['package_examine_file']
-		);
+			'name' => Lang::$txt['package_examine_file'],
+		];
 		Utils::$context['page_title'] .= ' - ' . Lang::$txt['package_examine_file'];
 		Utils::$context['sub_template'] = 'examine';
 
@@ -1450,17 +1450,18 @@ public function examineFile()
 		Utils::$context['filename'] = $_REQUEST['file'];
 
 		// Let the unpacker do the work.... but make sure we handle images properly.
-		if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png')))
+		if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), ['.bmp', '.gif', '.jpeg', '.jpg', '.png'])) {
 			Utils::$context['filedata'] = '<img src="' . Config::$scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
-		else
-		{
-			if (is_file(Config::$packagesdir . '/' . $_REQUEST['package']))
+		} else {
+			if (is_file(Config::$packagesdir . '/' . $_REQUEST['package'])) {
 				Utils::$context['filedata'] = Utils::htmlspecialchars(SubsPackage::read_tgz_file(Config::$packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
-			elseif (is_dir(Config::$packagesdir . '/' . $_REQUEST['package']))
+			} elseif (is_dir(Config::$packagesdir . '/' . $_REQUEST['package'])) {
 				Utils::$context['filedata'] = Utils::htmlspecialchars(file_get_contents(Config::$packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
+			}
 
-			if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php')
+			if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') {
 				Utils::$context['filedata'] = BBCodeParser::highlightPhpCode(Utils::$context['filedata']);
+			}
 		}
 	}
 
@@ -1473,19 +1474,18 @@ public function remove()
 		User::$me->checkSession('get');
 
 		// Ack, don't allow deletion of arbitrary files here, could become a security hole somehow!
-		if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups')
+		if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') {
 			Utils::redirectexit('action=admin;area=packages;sa=browse');
-		$_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_')));
+		}
+		$_GET['package'] = preg_replace('~\.+~', '.', strtr($_GET['package'], ['/' => '_', '\\' => '_']));
 
 		// Can't delete what's not there.
-		if (file_exists(Config::$packagesdir . '/' . $_GET['package']) && (substr($_GET['package'], -4) == '.zip' || substr($_GET['package'], -4) == '.tgz' || substr($_GET['package'], -7) == '.tar.gz' || is_dir(Config::$packagesdir . '/' . $_GET['package'])) && $_GET['package'] != 'backups' && substr($_GET['package'], 0, 1) != '.')
-		{
-			SubsPackage::create_chmod_control(array(Config::$packagesdir . '/' . $_GET['package']), array('destination_url' => Config::$scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true));
+		if (file_exists(Config::$packagesdir . '/' . $_GET['package']) && (substr($_GET['package'], -4) == '.zip' || substr($_GET['package'], -4) == '.tgz' || substr($_GET['package'], -7) == '.tar.gz' || is_dir(Config::$packagesdir . '/' . $_GET['package'])) && $_GET['package'] != 'backups' && substr($_GET['package'], 0, 1) != '.') {
+			SubsPackage::create_chmod_control([Config::$packagesdir . '/' . $_GET['package']], ['destination_url' => Config::$scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true]);
 
-			if (is_dir(Config::$packagesdir . '/' . $_GET['package']))
+			if (is_dir(Config::$packagesdir . '/' . $_GET['package'])) {
 				SubsPackage::deltree(Config::$packagesdir . '/' . $_GET['package']);
-			else
-			{
+			} else {
 				Utils::makeWritable(Config::$packagesdir . '/' . $_GET['package'], 0777);
 				unlink(Config::$packagesdir . '/' . $_GET['package']);
 			}
@@ -1503,114 +1503,112 @@ public function browse()
 
 		Utils::$context['forum_version'] = SMF_FULL_VERSION;
 		Utils::$context['available_packages'] = 0;
-		Utils::$context['modification_types'] = array('modification', 'avatar', 'language', 'unknown', 'smiley');
+		Utils::$context['modification_types'] = ['modification', 'avatar', 'language', 'unknown', 'smiley'];
 
 		IntegrationHook::call('integrate_modification_types');
 
-		foreach (Utils::$context['modification_types'] as $type)
-		{
+		foreach (Utils::$context['modification_types'] as $type) {
 			// Use the standard templates for showing this.
-			$listOptions = array(
+			$listOptions = [
 				'id' => 'packages_lists_' . $type,
 				'title' => Lang::$txt[$type . '_package'],
 				'no_items_label' => Lang::$txt['no_packages'],
-				'get_items' => array(
-					'function' => array($this, 'list_getPackages'),
-					'params' => array($type),
-				),
+				'get_items' => [
+					'function' => [$this, 'list_getPackages'],
+					'params' => [$type],
+				],
 				'base_href' => Config::$scripturl . '?action=admin;area=packages;sa=browse;type=' . $type,
 				'default_sort_col' => 'id' . $type,
-				'columns' => array(
-					'id' . $type => array(
-						'header' => array(
+				'columns' => [
+					'id' . $type => [
+						'header' => [
 							'value' => Lang::$txt['package_id'],
 							'style' => 'width: 52px;',
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'sort_id',
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'sort_id',
-							'reverse' => 'sort_id'
-						),
-					),
-					'mod_name' . $type => array(
-						'header' => array(
+							'reverse' => 'sort_id',
+						],
+					],
+					'mod_name' . $type => [
+						'header' => [
 							'value' => Lang::$txt['mod_name'],
 							'style' => 'width: 25%;',
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'name',
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'name',
 							'reverse' => 'name',
-						),
-					),
-					'version' . $type => array(
-						'header' => array(
+						],
+					],
+					'version' . $type => [
+						'header' => [
 							'value' => Lang::$txt['mod_version'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'version',
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'version',
 							'reverse' => 'version',
-						),
-					),
-					'time_installed' . $type => array(
-						'header' => array(
+						],
+					],
+					'time_installed' . $type => [
+						'header' => [
 							'value' => Lang::$txt['mod_installed_time'],
-						),
-						'data' => array(
-							'function' => function($package)
-							{
+						],
+						'data' => [
+							'function' => function ($package) {
 								return !empty($package['time_installed'])
 									? Time::create('@' . $package['time_installed'])->format()
 									: Lang::$txt['not_applicable'];
 							},
 							'class' => 'smalltext',
-						),
-						'sort' => array(
+						],
+						'sort' => [
 							'default' => 'time_installed',
 							'reverse' => 'time_installed',
-						),
-					),
-					'operations' . $type => array(
-						'header' => array(
+						],
+					],
+					'operations' . $type => [
+						'header' => [
 							'value' => '',
-						),
-						'data' => array(
-							'function' => function($package) use ($type)
-							{
+						],
+						'data' => [
+							'function' => function ($package) use ($type) {
 								$return = '';
 
-								if ($package['can_uninstall'])
+								if ($package['can_uninstall']) {
 									$return = '
-										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button floatnone">' . (isset(Lang::$txt['uninstall_' . $type]) ? Lang::$txt['uninstall_' . $type] : Lang::$txt['uninstall']) . '</a>';
-								elseif ($package['can_emulate_uninstall'])
+										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button floatnone">' . (Lang::$txt['uninstall_' . $type] ?? Lang::$txt['uninstall']) . '</a>';
+								} elseif ($package['can_emulate_uninstall']) {
 									$return = '
 										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=uninstall;ve=' . $package['can_emulate_uninstall'] . ';package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button floatnone">' . Lang::$txt['package_emulate_uninstall'] . ' ' . $package['can_emulate_uninstall'] . '</a>';
-								elseif ($package['can_upgrade'])
+								} elseif ($package['can_upgrade']) {
 									$return = '
 										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button floatnone">' . Lang::$txt['package_upgrade'] . '</a>';
-								elseif ($package['can_install'])
+								} elseif ($package['can_install']) {
 									$return = '
 										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button floatnone">' . Lang::$txt['install_' . $type] . '</a>';
-								elseif ($package['can_emulate_install'])
+								} elseif ($package['can_emulate_install']) {
 									$return = '
 										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;ve=' . $package['can_emulate_install'] . ';package=' . $package['filename'] . '" class="button floatnone">' . Lang::$txt['package_emulate_install'] . ' ' . $package['can_emulate_install'] . '</a>';
+								}
 
 								return $return . '
 										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '" class="button floatnone">' . Lang::$txt['list_files'] . '</a>
 										<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=remove;package=' . $package['filename'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '"' . ($package['is_installed'] && $package['is_current'] ? ' data-confirm="' . Lang::$txt['package_delete_bad'] . '"' : '') . ' class="button' . ($package['is_installed'] && $package['is_current'] ? ' you_sure' : '') . ' floatnone">' . Lang::$txt['package_delete'] . '</a>';
 							},
 							'class' => 'righttext',
-						),
-					),
-				),
-			);
+						],
+					],
+				],
+			];
 
 			new ItemList($listOptions);
 		}
@@ -1618,12 +1616,13 @@ public function browse()
 		Utils::$context['sub_template'] = 'browse';
 		Utils::$context['default_list'] = 'packages_lists';
 
-		$get_versions = Db::$db->query('', '
-			SELECT data FROM {db_prefix}admin_info_files WHERE filename={string:versionsfile} AND path={string:smf}',
-			array(
+		$get_versions = Db::$db->query(
+			'',
+			'SELECT data FROM {db_prefix}admin_info_files WHERE filename={string:versionsfile} AND path={string:smf}',
+			[
 				'versionsfile' => 'latest-versions.txt',
 				'smf' => '/smf/',
-			)
+			],
 		);
 
 		$data = Db::$db->fetch_assoc($get_versions);
@@ -1637,8 +1636,7 @@ public function browse()
 		// Current SMF version, which is selected by default
 		Utils::$context['default_version'] = SMF_VERSION;
 
-		if (!in_array(Utils::$context['default_version'], Utils::$context['emulation_versions']))
-		{
+		if (!in_array(Utils::$context['default_version'], Utils::$context['emulation_versions'])) {
 			Utils::$context['emulation_versions'][] = Utils::$context['default_version'];
 		}
 
@@ -1651,40 +1649,39 @@ public function browse()
 	 */
 	public function options()
 	{
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 
-			Config::updateModSettings(array(
+			Config::updateModSettings([
 				'package_server' => trim(Utils::htmlspecialchars($_POST['pack_server'])),
 				'package_port' => trim(Utils::htmlspecialchars($_POST['pack_port'])),
 				'package_username' => trim(Utils::htmlspecialchars($_POST['pack_user'])),
 				'package_make_backups' => !empty($_POST['package_make_backups']),
-				'package_make_full_backups' => !empty($_POST['package_make_full_backups'])
-			));
+				'package_make_full_backups' => !empty($_POST['package_make_full_backups']),
+			]);
 			$_SESSION['adm-save'] = true;
 
 			Utils::redirectexit('action=admin;area=packages;sa=options');
 		}
 
-		if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match))
+		if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) {
 			$default_username = $match[1];
-		else
+		} else {
 			$default_username = '';
+		}
 
 		Utils::$context['page_title'] = Lang::$txt['package_settings'];
 		Utils::$context['sub_template'] = 'install_options';
 
-		Utils::$context['package_ftp_server'] = isset(Config::$modSettings['package_server']) ? Config::$modSettings['package_server'] : 'localhost';
-		Utils::$context['package_ftp_port'] = isset(Config::$modSettings['package_port']) ? Config::$modSettings['package_port'] : '21';
-		Utils::$context['package_ftp_username'] = isset(Config::$modSettings['package_username']) ? Config::$modSettings['package_username'] : $default_username;
+		Utils::$context['package_ftp_server'] = Config::$modSettings['package_server'] ?? 'localhost';
+		Utils::$context['package_ftp_port'] = Config::$modSettings['package_port'] ?? '21';
+		Utils::$context['package_ftp_username'] = Config::$modSettings['package_username'] ?? $default_username;
 		Utils::$context['package_make_backups'] = !empty(Config::$modSettings['package_make_backups']);
 		Utils::$context['package_make_full_backups'] = !empty(Config::$modSettings['package_make_full_backups']);
 
-		if (!empty($_SESSION['adm-save']))
-		{
+		if (!empty($_SESSION['adm-save'])) {
 			Utils::$context['saved_successful'] = true;
-			unset ($_SESSION['adm-save']);
+			unset($_SESSION['adm-save']);
 		}
 	}
 
@@ -1697,98 +1694,103 @@ public function showOperations()
 		User::$me->isAllowedTo('admin_forum');
 
 		// We need to know the operation key for the search and replace, mod file looking at, is it a board mod?
-		if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key']))
+		if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) {
 			ErrorHandler::fatalLang('operation_invalid', 'general');
+		}
 
 		// Uninstalling the mod?
 		$reverse = isset($_REQUEST['reverse']) ? true : false;
 
 		// Get the base name.
-		Utils::$context['filename'] = preg_replace('~[\.]+~', '.', $_REQUEST['package']);
+		Utils::$context['filename'] = preg_replace('~\.+~', '.', $_REQUEST['package']);
 
 		// We need to extract this again.
-		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+		if (is_file(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			Utils::$context['extracted_files'] = SubsPackage::read_tgz_file(Config::$packagesdir . '/' . Utils::$context['filename'], Config::$packagesdir . '/temp');
 
-			if (Utils::$context['extracted_files'] && !file_exists(Config::$packagesdir . '/temp/package-info.xml'))
-				foreach (Utils::$context['extracted_files'] as $file)
-					if (basename($file['filename']) == 'package-info.xml')
-					{
+			if (Utils::$context['extracted_files'] && !file_exists(Config::$packagesdir . '/temp/package-info.xml')) {
+				foreach (Utils::$context['extracted_files'] as $file) {
+					if (basename($file['filename']) == 'package-info.xml') {
 						Utils::$context['base_path'] = dirname($file['filename']) . '/';
 						break;
 					}
+				}
+			}
 
-			if (!isset(Utils::$context['base_path']))
+			if (!isset(Utils::$context['base_path'])) {
 				Utils::$context['base_path'] = '';
-		}
-		elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename']))
-		{
+			}
+		} elseif (is_dir(Config::$packagesdir . '/' . Utils::$context['filename'])) {
 			SubsPackage::copytree(Config::$packagesdir . '/' . Utils::$context['filename'], Config::$packagesdir . '/temp');
 			Utils::$context['extracted_files'] = SubsPackage::listtree(Config::$packagesdir . '/temp');
 			Utils::$context['base_path'] = '';
 		}
 
 		// Load up any custom themes we may want to install into...
-		$request = Db::$db->query('', '
-			SELECT id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE (id_theme = {int:default_theme} OR id_theme IN ({array_int:known_theme_list}))
 				AND variable IN ({string:name}, {string:theme_dir})',
-			array(
+			[
 				'known_theme_list' => explode(',', Config::$modSettings['knownThemes']),
 				'default_theme' => 1,
 				'name' => 'name',
 				'theme_dir' => 'theme_dir',
-			)
+			],
 		);
-		$theme_paths = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$theme_paths = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
+		}
 		Db::$db->free_result($request);
 
 		// If we're viewing uninstall operations, only consider themes that
 		// the package is actually installed into.
-		if (isset($_REQUEST['reverse']) && !empty($_REQUEST['install_id']))
-		{
+		if (isset($_REQUEST['reverse']) && !empty($_REQUEST['install_id'])) {
 			$install_id = (int) $_REQUEST['install_id'];
-			if ($install_id > 0)
-			{
-				$old_themes = array();
-				$request = Db::$db->query('', '
-					SELECT themes_installed
+
+			if ($install_id > 0) {
+				$old_themes = [];
+				$request = Db::$db->query(
+					'',
+					'SELECT themes_installed
 					FROM {db_prefix}log_packages
 					WHERE id_install = {int:install_id}',
-					array(
+					[
 						'install_id' => $install_id,
-					)
+					],
 				);
 
-				if (Db::$db->num_rows($request) == 1)
-				{
-					list ($old_themes) = Db::$db->fetch_row($request);
+				if (Db::$db->num_rows($request) == 1) {
+					list($old_themes) = Db::$db->fetch_row($request);
 					$old_themes = explode(',', $old_themes);
 
-					foreach ($theme_paths as $id => $data)
-						if ($id != 1 && !in_array($id, $old_themes))
+					foreach ($theme_paths as $id => $data) {
+						if ($id != 1 && !in_array($id, $old_themes)) {
 							unset($theme_paths[$id]);
+						}
+					}
 				}
 				Db::$db->free_result($request);
 			}
 		}
 
 		// Boardmod?
-		if (isset($_REQUEST['boardmod']))
+		if (isset($_REQUEST['boardmod'])) {
 			$mod_actions = SubsPackage::parseBoardMod(@file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
-		else
+		} else {
 			$mod_actions = SubsPackage::parseModification(@file_get_contents(Config::$packagesdir . '/temp/' . Utils::$context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
+		}
 
 		// Ok lets get the content of the file.
-		Utils::$context['operations'] = array(
-			'search' => strtr(Utils::htmlspecialchars($mod_actions[$_REQUEST['operation_key']]['search_original']), array('[' => '&#91;', ']' => '&#93;')),
-			'replace' => strtr(Utils::htmlspecialchars($mod_actions[$_REQUEST['operation_key']]['replace_original']), array('[' => '&#91;', ']' => '&#93;')),
+		Utils::$context['operations'] = [
+			'search' => strtr(Utils::htmlspecialchars($mod_actions[$_REQUEST['operation_key']]['search_original']), ['[' => '&#91;', ']' => '&#93;']),
+			'replace' => strtr(Utils::htmlspecialchars($mod_actions[$_REQUEST['operation_key']]['replace_original']), ['[' => '&#91;', ']' => '&#93;']),
 			'position' => $mod_actions[$_REQUEST['operation_key']]['position'],
-		);
+		];
 
 		// Let's do some formatting...
 		$operation_text = Utils::$context['operations']['position'] == 'replace' ? 'operation_replace' : (Utils::$context['operations']['position'] == 'before' ? 'operation_after' : 'operation_before');
@@ -1796,7 +1798,7 @@ public function showOperations()
 		Utils::$context['operations']['replace'] = BBCodeParser::load()->parse('[code=' . Lang::$txt[$operation_text] . ']' . Utils::$context['operations']['replace'] . '[/code]');
 
 		// No layers
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'view_operations';
 
 		// We only want to load these three JavaScript files.
@@ -1804,8 +1806,8 @@ public function showOperations()
 			Utils::$context['javascript_files'],
 			[
 				'smf_script_js' => true,
-				'smf_jquery_js' => true
-			]
+				'smf_jquery_js' => true,
+			],
 		);
 
 		// Since the alerts code is loaded very late in the process, it must be disabled separately.
@@ -1821,9 +1823,8 @@ public function permissions()
 		User::$me->checkSession('get');
 
 		// If we're restoring permissions this is just a pass through really.
-		if (isset($_GET['restore']))
-		{
-			SubsPackage::create_chmod_control(array(), array(), true);
+		if (isset($_GET['restore'])) {
+			SubsPackage::create_chmod_control([], [], true);
 			ErrorHandler::fatalLang('no_access', false);
 		}
 
@@ -1834,243 +1835,246 @@ public function permissions()
 		// Load up some FTP stuff.
 		SubsPackage::create_chmod_control();
 
-		if (empty(SubsPackage::$package_ftp) && !isset($_POST['skip_ftp']))
-		{
+		if (empty(SubsPackage::$package_ftp) && !isset($_POST['skip_ftp'])) {
 			$ftp = new FtpConnection(null);
-			list ($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
+			list($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
 
-			Utils::$context['package_ftp'] = array(
-				'server' => isset(Config::$modSettings['package_server']) ? Config::$modSettings['package_server'] : 'localhost',
-				'port' => isset(Config::$modSettings['package_port']) ? Config::$modSettings['package_port'] : '21',
-				'username' => empty($username) ? (isset(Config::$modSettings['package_username']) ? Config::$modSettings['package_username'] : '') : $username,
+			Utils::$context['package_ftp'] = [
+				'server' => Config::$modSettings['package_server'] ?? 'localhost',
+				'port' => Config::$modSettings['package_port'] ?? '21',
+				'username' => empty($username) ? (Config::$modSettings['package_username'] ?? '') : $username,
 				'path' => $detect_path,
 				'form_elements_only' => true,
-			);
-		}
-		else
+			];
+		} else {
 			Utils::$context['ftp_connected'] = true;
+		}
 
 		// Define the template.
 		Utils::$context['page_title'] = Lang::$txt['package_file_perms'];
 		Utils::$context['sub_template'] = 'file_permissions';
 
 		// Define what files we're interested in, as a tree.
-		Utils::$context['file_tree'] = array(
-			strtr(Config::$boarddir, array('\\' => '/')) => array(
+		Utils::$context['file_tree'] = [
+			strtr(Config::$boarddir, ['\\' => '/']) => [
 				'type' => 'dir',
-				'contents' => array(
-					'agreement.txt' => array(
+				'contents' => [
+					'agreement.txt' => [
 						'type' => 'file',
 						'writable_on' => 'standard',
-					),
-					'Settings.php' => array(
+					],
+					'Settings.php' => [
 						'type' => 'file',
 						'writable_on' => 'restrictive',
-					),
-					'Settings_bak.php' => array(
+					],
+					'Settings_bak.php' => [
 						'type' => 'file',
 						'writable_on' => 'restrictive',
-					),
-					'attachments' => array(
+					],
+					'attachments' => [
 						'type' => 'dir',
 						'writable_on' => 'restrictive',
-					),
-					'avatars' => array(
+					],
+					'avatars' => [
 						'type' => 'dir',
 						'writable_on' => 'standard',
-					),
-					'cache' => array(
+					],
+					'cache' => [
 						'type' => 'dir',
 						'writable_on' => 'restrictive',
-					),
-					'custom_avatar_dir' => array(
+					],
+					'custom_avatar_dir' => [
 						'type' => 'dir',
 						'writable_on' => 'restrictive',
-					),
-					'Smileys' => array(
+					],
+					'Smileys' => [
 						'type' => 'dir_recursive',
 						'writable_on' => 'standard',
-					),
-					'Sources' => array(
+					],
+					'Sources' => [
 						'type' => 'dir_recursive',
 						'list_contents' => true,
 						'writable_on' => 'standard',
-						'contents' => array(
-							'tasks' => array(
+						'contents' => [
+							'tasks' => [
 								'type' => 'dir',
 								'list_contents' => true,
-							),
-						),
-					),
-					'Themes' => array(
+							],
+						],
+					],
+					'Themes' => [
 						'type' => 'dir_recursive',
 						'writable_on' => 'standard',
-						'contents' => array(
-							'default' => array(
+						'contents' => [
+							'default' => [
 								'type' => 'dir_recursive',
 								'list_contents' => true,
-								'contents' => array(
-									'languages' => array(
+								'contents' => [
+									'languages' => [
 										'type' => 'dir',
 										'list_contents' => true,
-									),
-								),
-							),
-						),
-					),
-					'Packages' => array(
+									],
+								],
+							],
+						],
+					],
+					'Packages' => [
 						'type' => 'dir',
 						'writable_on' => 'standard',
-						'contents' => array(
-							'temp' => array(
+						'contents' => [
+							'temp' => [
 								'type' => 'dir',
-							),
-							'backup' => array(
+							],
+							'backup' => [
 								'type' => 'dir',
-							),
-						),
-					),
-				),
-			),
-		);
+							],
+						],
+					],
+				],
+			],
+		];
 
 		// Directories that can move.
-		if (substr(Config::$sourcedir, 0, strlen(Config::$boarddir)) != Config::$boarddir)
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['Sources']);
-			Utils::$context['file_tree'][strtr(Config::$sourcedir, array('\\' => '/'))] = array(
+		if (substr(Config::$sourcedir, 0, strlen(Config::$boarddir)) != Config::$boarddir) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['Sources']);
+			Utils::$context['file_tree'][strtr(Config::$sourcedir, ['\\' => '/'])] = [
 				'type' => 'dir',
 				'list_contents' => true,
 				'writable_on' => 'standard',
-			);
+			];
 		}
 
 		// Moved the cache?
-		if (substr(Config::$cachedir, 0, strlen(Config::$boarddir)) != Config::$boarddir)
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['cache']);
-			Utils::$context['file_tree'][strtr(Config::$cachedir, array('\\' => '/'))] = array(
+		if (substr(Config::$cachedir, 0, strlen(Config::$boarddir)) != Config::$boarddir) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['cache']);
+			Utils::$context['file_tree'][strtr(Config::$cachedir, ['\\' => '/'])] = [
 				'type' => 'dir',
 				'list_contents' => false,
 				'writable_on' => 'restrictive',
-			);
+			];
 		}
 
 		// Are we using multiple attachment directories?
-		if (!empty(Config::$modSettings['currentAttachmentUploadDir']))
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['attachments']);
+		if (!empty(Config::$modSettings['currentAttachmentUploadDir'])) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['attachments']);
 
-			if (!is_array(Config::$modSettings['attachmentUploadDir']))
+			if (!is_array(Config::$modSettings['attachmentUploadDir'])) {
 				Config::$modSettings['attachmentUploadDir'] = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
+			}
 
 			// @todo Should we suggest non-current directories be read only?
-			foreach (Config::$modSettings['attachmentUploadDir'] as $dir)
-				Utils::$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
+			foreach (Config::$modSettings['attachmentUploadDir'] as $dir) {
+				Utils::$context['file_tree'][strtr($dir, ['\\' => '/'])] = [
 					'type' => 'dir',
 					'writable_on' => 'restrictive',
-				);
-		}
-		elseif (substr(Config::$modSettings['attachmentUploadDir'], 0, strlen(Config::$boarddir)) != Config::$boarddir)
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['attachments']);
-			Utils::$context['file_tree'][strtr(Config::$modSettings['attachmentUploadDir'], array('\\' => '/'))] = array(
+				];
+			}
+		} elseif (substr(Config::$modSettings['attachmentUploadDir'], 0, strlen(Config::$boarddir)) != Config::$boarddir) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['attachments']);
+			Utils::$context['file_tree'][strtr(Config::$modSettings['attachmentUploadDir'], ['\\' => '/'])] = [
 				'type' => 'dir',
 				'writable_on' => 'restrictive',
-			);
+			];
 		}
 
-		if (substr(Config::$modSettings['smileys_dir'], 0, strlen(Config::$boarddir)) != Config::$boarddir)
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['Smileys']);
-			Utils::$context['file_tree'][strtr(Config::$modSettings['smileys_dir'], array('\\' => '/'))] = array(
+		if (substr(Config::$modSettings['smileys_dir'], 0, strlen(Config::$boarddir)) != Config::$boarddir) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['Smileys']);
+			Utils::$context['file_tree'][strtr(Config::$modSettings['smileys_dir'], ['\\' => '/'])] = [
 				'type' => 'dir_recursive',
 				'writable_on' => 'standard',
-			);
+			];
 		}
-		if (substr(Config::$modSettings['avatar_directory'], 0, strlen(Config::$boarddir)) != Config::$boarddir)
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['avatars']);
-			Utils::$context['file_tree'][strtr(Config::$modSettings['avatar_directory'], array('\\' => '/'))] = array(
+
+		if (substr(Config::$modSettings['avatar_directory'], 0, strlen(Config::$boarddir)) != Config::$boarddir) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['avatars']);
+			Utils::$context['file_tree'][strtr(Config::$modSettings['avatar_directory'], ['\\' => '/'])] = [
 				'type' => 'dir',
 				'writable_on' => 'standard',
-			);
+			];
 		}
-		if (isset(Config::$modSettings['custom_avatar_dir']) && substr(Config::$modSettings['custom_avatar_dir'], 0, strlen(Config::$boarddir)) != Config::$boarddir)
-		{
-			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['custom_avatar_dir']);
-			Utils::$context['file_tree'][strtr(Config::$modSettings['custom_avatar_dir'], array('\\' => '/'))] = array(
+
+		if (isset(Config::$modSettings['custom_avatar_dir']) && substr(Config::$modSettings['custom_avatar_dir'], 0, strlen(Config::$boarddir)) != Config::$boarddir) {
+			unset(Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['custom_avatar_dir']);
+			Utils::$context['file_tree'][strtr(Config::$modSettings['custom_avatar_dir'], ['\\' => '/'])] = [
 				'type' => 'dir',
 				'writable_on' => 'restrictive',
-			);
+			];
 		}
 
 		// Load up any custom themes.
-		$request = Db::$db->query('', '
-			SELECT value
+		$request = Db::$db->query(
+			'',
+			'SELECT value
 			FROM {db_prefix}themes
 			WHERE id_theme > {int:default_theme_id}
 				AND id_member = {int:guest_id}
 				AND variable = {string:theme_dir}
 			ORDER BY value ASC',
-			array(
+			[
 				'default_theme_id' => 1,
 				'guest_id' => 0,
 				'theme_dir' => 'theme_dir',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen(Config::$boarddir) + 7) == strtolower(strtr(Config::$boarddir, array('\\' => '/')) . '/Themes'))
-				Utils::$context['file_tree'][strtr(Config::$boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen(Config::$boarddir) + 8)] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (substr(strtolower(strtr($row['value'], ['\\' => '/'])), 0, strlen(Config::$boarddir) + 7) == strtolower(strtr(Config::$boarddir, ['\\' => '/']) . '/Themes')) {
+				Utils::$context['file_tree'][strtr(Config::$boarddir, ['\\' => '/'])]['contents']['Themes']['contents'][substr($row['value'], strlen(Config::$boarddir) + 8)] = [
 					'type' => 'dir_recursive',
 					'list_contents' => true,
-					'contents' => array(
-						'languages' => array(
+					'contents' => [
+						'languages' => [
 							'type' => 'dir',
 							'list_contents' => true,
-						),
-					),
-				);
-			else
-			{
-				Utils::$context['file_tree'][strtr($row['value'], array('\\' => '/'))] = array(
+						],
+					],
+				];
+			} else {
+				Utils::$context['file_tree'][strtr($row['value'], ['\\' => '/'])] = [
 					'type' => 'dir_recursive',
 					'list_contents' => true,
-					'contents' => array(
-						'languages' => array(
+					'contents' => [
+						'languages' => [
 							'type' => 'dir',
 							'list_contents' => true,
-						),
-					),
-				);
+						],
+					],
+				];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// If we're submitting then let's move on to another function to keep things cleaner..
-		if (isset($_POST['action_changes']))
-			return PackagePermissionsAction();
+		if (isset($_POST['action_changes'])) {
+			return $this->PackagePermissionsAction();
+		}
+
+		Utils::$context['look_for'] = [];
 
-		Utils::$context['look_for'] = array();
 		// Are we looking for a particular tree - normally an expansion?
-		if (!empty($_REQUEST['find']))
+		if (!empty($_REQUEST['find'])) {
 			Utils::$context['look_for'][] = base64_decode($_REQUEST['find']);
+		}
 		// Only that tree?
 		Utils::$context['only_find'] = isset($_GET['xml']) && !empty($_REQUEST['onlyfind']) ? $_REQUEST['onlyfind'] : '';
-		if (Utils::$context['only_find'])
+
+		if (Utils::$context['only_find']) {
 			Utils::$context['look_for'][] = Utils::$context['only_find'];
+		}
 
 		// Have we got a load of back-catalogue trees to expand from a submit etc?
-		if (!empty($_GET['back_look']))
-		{
+		if (!empty($_GET['back_look'])) {
 			$potententialTrees = Utils::jsonDecode(base64_decode($_GET['back_look']), true);
-			foreach ($potententialTrees as $tree)
+
+			foreach ($potententialTrees as $tree) {
 				Utils::$context['look_for'][] = $tree;
+			}
 		}
+
 		// ... maybe posted?
-		if (!empty($_POST['back_look']))
+		if (!empty($_POST['back_look'])) {
 			Utils::$context['only_find'] = array_merge(Utils::$context['only_find'], $_POST['back_look']);
+		}
 
 		Utils::$context['back_look_data'] = base64_encode(Utils::jsonEncode(array_slice(Utils::$context['look_for'], 0, 15)));
 
@@ -2083,43 +2087,40 @@ public function permissions()
 		Utils::$context['default_level'] = empty(Utils::$context['only_find']) ? 2 : 25;
 
 		// This will be used if we end up catching XML data.
-		Utils::$context['xml_data'] = array(
-			'roots' => array(
+		Utils::$context['xml_data'] = [
+			'roots' => [
 				'identifier' => 'root',
-				'children' => array(
-					array(
+				'children' => [
+					[
 						'value' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find']),
-					),
-				),
-			),
-			'folders' => array(
+					],
+				],
+			],
+			'folders' => [
 				'identifier' => 'folder',
-				'children' => array(),
-			),
-		);
+				'children' => [],
+			],
+		];
 
-		foreach (Utils::$context['file_tree'] as $path => $data)
-		{
+		foreach (Utils::$context['file_tree'] as $path => $data) {
 			// Run this directory.
-			if (file_exists($path) && (empty(Utils::$context['only_find']) || substr(Utils::$context['only_find'], 0, strlen($path)) == $path))
-			{
+			if (file_exists($path) && (empty(Utils::$context['only_find']) || substr(Utils::$context['only_find'], 0, strlen($path)) == $path)) {
 				// Get the first level down only.
 				$this->fetchPerms__recursive($path, Utils::$context['file_tree'][$path], 1);
-				Utils::$context['file_tree'][$path]['perms'] = array(
+				Utils::$context['file_tree'][$path]['perms'] = [
 					'chmod' => @is_writable($path),
 					'perms' => @fileperms($path),
-				);
-			}
-			else
+				];
+			} else {
 				unset(Utils::$context['file_tree'][$path]);
+			}
 		}
 
 		// Is this actually xml?
-		if (isset($_GET['xml']))
-		{
+		if (isset($_GET['xml'])) {
 			Theme::loadTemplate('Xml');
 			Utils::$context['sub_template'] = 'generic_xml';
-			Utils::$context['template_layers'] = array();
+			Utils::$context['template_layers'] = [];
 		}
 	}
 
@@ -2135,46 +2136,53 @@ public function PackagePermissionsAction()
 		Utils::$context['method'] = $_POST['method'] == 'individual' ? 'individual' : 'predefined';
 		Utils::$context['sub_template'] = 'action_permissions';
 		Utils::$context['page_title'] = Lang::$txt['package_file_perms_applying'];
-		Utils::$context['back_look_data'] = isset($_POST['back_look']) ? $_POST['back_look'] : array();
+		Utils::$context['back_look_data'] = $_POST['back_look'] ?? [];
 
 		// Skipping use of FTP?
-		if (empty(SubsPackage::$package_ftp))
+		if (empty(SubsPackage::$package_ftp)) {
 			Utils::$context['skip_ftp'] = true;
+		}
 
 		// We'll start off in a good place, security. Make sure that if we're dealing with individual files that they seem in the right place.
-		if (Utils::$context['method'] == 'individual')
-		{
+		if (Utils::$context['method'] == 'individual') {
 			// Only these path roots are legal.
 			$legal_roots = array_keys(Utils::$context['file_tree']);
 			Utils::$context['custom_value'] = (int) $_POST['custom_value'];
 
 			// Continuing?
-			if (isset($_POST['toProcess']))
+			if (isset($_POST['toProcess'])) {
 				$_POST['permStatus'] = Utils::jsonDecode(base64_decode($_POST['toProcess']), true);
+			}
 
-			if (isset($_POST['permStatus']))
-			{
-				Utils::$context['to_process'] = array();
+			if (isset($_POST['permStatus'])) {
+				Utils::$context['to_process'] = [];
 				$validate_custom = false;
-				foreach ($_POST['permStatus'] as $path => $status)
-				{
+
+				foreach ($_POST['permStatus'] as $path => $status) {
 					// Nothing to see here?
-					if ($status == 'no_change')
+					if ($status == 'no_change') {
 						continue;
+					}
 					$legal = false;
-					foreach ($legal_roots as $root)
-						if (substr($path, 0, strlen($root)) == $root)
+
+					foreach ($legal_roots as $root) {
+						if (substr($path, 0, strlen($root)) == $root) {
 							$legal = true;
+						}
+					}
 
-					if (!$legal)
+					if (!$legal) {
 						continue;
+					}
 
 					// Check it exists.
-					if (!file_exists($path))
+					if (!file_exists($path)) {
 						continue;
+					}
 
-					if ($status == 'custom')
+					if ($status == 'custom') {
 						$validate_custom = true;
+					}
 
 					// Now add it.
 					Utils::$context['to_process'][$path] = $status;
@@ -2182,38 +2190,35 @@ public function PackagePermissionsAction()
 				Utils::$context['total_items'] = isset($_POST['totalItems']) ? (int) $_POST['totalItems'] : count(Utils::$context['to_process']);
 
 				// Make sure the chmod status is valid?
-				if ($validate_custom)
-				{
-					if (preg_match('~^[4567][4567][4567]$~', Utils::$context['custom_value']) == false)
+				if ($validate_custom) {
+					if (preg_match('~^[4567][4567][4567]$~', Utils::$context['custom_value']) == false) {
 						ErrorHandler::fatal(Lang::$txt['chmod_value_invalid']);
+					}
 				}
 
 				// Nothing to do?
-				if (empty(Utils::$context['to_process']))
+				if (empty(Utils::$context['to_process'])) {
 					Utils::redirectexit('action=admin;area=packages;sa=perms' . (!empty(Utils::$context['back_look_data']) ? ';back_look=' . base64_encode(Utils::jsonEncode(Utils::$context['back_look_data'])) : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
+				}
 			}
 			// Should never get here,
-			else
+			else {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 
 			// Setup the custom value.
 			$custom_value = octdec('0' . Utils::$context['custom_value']);
 
 			// Start processing items.
-			foreach (Utils::$context['to_process'] as $path => $status)
-			{
-				if (in_array($status, array('execute', 'writable', 'read')))
+			foreach (Utils::$context['to_process'] as $path => $status) {
+				if (in_array($status, ['execute', 'writable', 'read'])) {
 					SubsPackage::package_chmod($path, $status);
-				elseif ($status == 'custom' && !empty($custom_value))
-				{
+				} elseif ($status == 'custom' && !empty($custom_value)) {
 					// Use FTP if we have it.
-					if (!empty(SubsPackage::$package_ftp) && !empty($_SESSION['pack_ftp']))
-					{
-						$ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => ''));
+					if (!empty(SubsPackage::$package_ftp) && !empty($_SESSION['pack_ftp'])) {
+						$ftp_file = strtr($path, [$_SESSION['pack_ftp']['root'] => '']);
 						SubsPackage::$package_ftp->chmod($ftp_file, $custom_value);
-					}
-					else
-					{
+					} else {
 						Utils::makeWritable($path, $custom_value);
 					}
 				}
@@ -2222,8 +2227,7 @@ public function PackagePermissionsAction()
 				unset(Utils::$context['to_process'][$path]);
 
 				// See if we're out of time?
-				if ((time() - TIME_START) > $timeout_limit)
-				{
+				if ((time() - TIME_START) > $timeout_limit) {
 					// Prepare template usage for to_process.
 					Utils::$context['to_process_encode'] = base64_encode(Utils::jsonEncode(Utils::$context['to_process']));
 
@@ -2235,22 +2239,18 @@ public function PackagePermissionsAction()
 			Utils::$context['to_process_encode'] = base64_encode(Utils::jsonEncode(Utils::$context['to_process']));
 		}
 		// If predefined this is a little different.
-		else
-		{
-			Utils::$context['predefined_type'] = isset($_POST['predefined']) ? $_POST['predefined'] : 'restricted';
+		else {
+			Utils::$context['predefined_type'] = $_POST['predefined'] ?? 'restricted';
 
 			Utils::$context['total_items'] = isset($_POST['totalItems']) ? (int) $_POST['totalItems'] : 0;
-			Utils::$context['directory_list'] = isset($_POST['dirList']) ? Utils::jsonDecode(base64_decode($_POST['dirList']), true) : array();
+			Utils::$context['directory_list'] = isset($_POST['dirList']) ? Utils::jsonDecode(base64_decode($_POST['dirList']), true) : [];
 
 			Utils::$context['file_offset'] = isset($_POST['fileOffset']) ? (int) $_POST['fileOffset'] : 0;
 
 			// Haven't counted the items yet?
-			if (empty(Utils::$context['total_items']))
-			{
-				foreach (Utils::$context['file_tree'] as $path => $data)
-				{
-					if (is_dir($path))
-					{
+			if (empty(Utils::$context['total_items'])) {
+				foreach (Utils::$context['file_tree'] as $path => $data) {
+					if (is_dir($path)) {
 						Utils::$context['directory_list'][$path] = 1;
 						Utils::$context['total_items'] += $this->count_directories__recursive($path);
 						Utils::$context['total_items']++;
@@ -2259,43 +2259,43 @@ public function PackagePermissionsAction()
 			}
 
 			// Have we built up our list of special files?
-			if (!isset($_POST['specialFiles']) && Utils::$context['predefined_type'] != 'free')
-			{
-				Utils::$context['special_files'] = array();
+			if (!isset($_POST['specialFiles']) && Utils::$context['predefined_type'] != 'free') {
+				Utils::$context['special_files'] = [];
 
-				foreach (Utils::$context['file_tree'] as $path => $data)
+				foreach (Utils::$context['file_tree'] as $path => $data) {
 					$this->build_special_files__recursive($path, $data);
+				}
 			}
 			// Free doesn't need special files.
-			elseif (Utils::$context['predefined_type'] == 'free')
-				Utils::$context['special_files'] = array();
-			else
+			elseif (Utils::$context['predefined_type'] == 'free') {
+				Utils::$context['special_files'] = [];
+			} else {
 				Utils::$context['special_files'] = Utils::jsonDecode(base64_decode($_POST['specialFiles']), true);
+			}
 
 			// Now we definitely know where we are, we need to go through again doing the chmod!
-			foreach (Utils::$context['directory_list'] as $path => $dummy)
-			{
+			foreach (Utils::$context['directory_list'] as $path => $dummy) {
 				// Do the contents of the directory first.
 				$dh = @opendir($path);
 				$file_count = 0;
 				$dont_chmod = false;
-				while ($entry = readdir($dh))
-				{
+
+				while ($entry = readdir($dh)) {
 					// Bypass directory abbreviations altogether...
-					if ($entry == '.' || $entry == '..')
+					if ($entry == '.' || $entry == '..') {
 						continue;
+					}
 
 					$file_count++;
+
 					// Actually process this file?
-					if (!$dont_chmod && !is_dir($path . '/' . $entry) && (empty(Utils::$context['file_offset']) || Utils::$context['file_offset'] < $file_count))
-					{
+					if (!$dont_chmod && !is_dir($path . '/' . $entry) && (empty(Utils::$context['file_offset']) || Utils::$context['file_offset'] < $file_count)) {
 						$status = Utils::$context['predefined_type'] == 'free' || isset(Utils::$context['special_files'][$path . '/' . $entry]) ? 'writable' : 'execute';
 						SubsPackage::package_chmod($path . '/' . $entry, $status);
 					}
 
 					// See if we're out of time?
-					if (!$dont_chmod && (time() - TIME_START) > $timeout_limit)
-					{
+					if (!$dont_chmod && (time() - TIME_START) > $timeout_limit) {
 						$dont_chmod = true;
 						// Don't do this again.
 						Utils::$context['file_offset'] = $file_count;
@@ -2304,11 +2304,11 @@ public function PackagePermissionsAction()
 				closedir($dh);
 
 				// If this is set it means we timed out half way through.
-				if ($dont_chmod)
-				{
+				if ($dont_chmod) {
 					Utils::$context['total_files'] = $file_count;
 					Utils::$context['directory_list_encode'] = base64_encode(Utils::jsonEncode(Utils::$context['directory_list']));
 					Utils::$context['special_files_encode'] = base64_encode(Utils::jsonEncode(Utils::$context['special_files']));
+
 					return false;
 				}
 
@@ -2321,8 +2321,7 @@ public function PackagePermissionsAction()
 				unset(Utils::$context['directory_list'][$path]);
 
 				// See if we're out of time?
-				if ((time() - TIME_START) > $timeout_limit)
-				{
+				if ((time() - TIME_START) > $timeout_limit) {
 					// Prepare this for usage on templates.
 					Utils::$context['directory_list_encode'] = base64_encode(Utils::jsonEncode(Utils::$context['directory_list']));
 					Utils::$context['special_files_encode'] = base64_encode(Utils::jsonEncode(Utils::$context['special_files']));
@@ -2348,27 +2347,27 @@ public function ftpTest()
 		User::$me->checkSession('get');
 
 		// Try to make the FTP connection.
-		SubsPackage::create_chmod_control(array(), array('force_find_error' => true));
+		SubsPackage::create_chmod_control([], ['force_find_error' => true]);
 
 		// Deal with the template stuff.
 		Theme::loadTemplate('Xml');
 		Utils::$context['sub_template'] = 'generic_xml';
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 
 		// Define the return data, this is simple.
-		Utils::$context['xml_data'] = array(
-			'results' => array(
+		Utils::$context['xml_data'] = [
+			'results' => [
 				'identifier' => 'result',
-				'children' => array(
-					array(
-						'attributes' => array(
+				'children' => [
+					[
+						'attributes' => [
 							'success' => !empty(SubsPackage::$package_ftp) ? 1 : 0,
-						),
+						],
 						'value' => !empty(SubsPackage::$package_ftp) ? Lang::$txt['package_ftp_test_success'] : (isset(Utils::$context['package_ftp'], Utils::$context['package_ftp']['error']) ? Utils::$context['package_ftp']['error'] : Lang::$txt['package_ftp_test_failed']),
-					),
-				),
-			),
-		);
+					],
+				],
+			],
+		];
 	}
 
 	/**
@@ -2381,76 +2380,70 @@ public function servers()
 		Utils::$context['page_title'] .= ' - ' . Lang::$txt['download_packages'];
 
 		// Load the list of servers.
-		$request = Db::$db->query('', '
-			SELECT id_server, name, url
+		$request = Db::$db->query(
+			'',
+			'SELECT id_server, name, url
 			FROM {db_prefix}package_servers',
-			array(
-			)
+			[
+			],
 		);
-		Utils::$context['servers'] = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Utils::$context['servers'][] = array(
+		Utils::$context['servers'] = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Utils::$context['servers'][] = [
 				'name' => $row['name'],
 				'url' => $row['url'],
 				'id' => $row['id_server'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		Utils::$context['package_download_broken'] = !is_writable(Config::$packagesdir);
 
-		if (Utils::$context['package_download_broken'])
-		{
+		if (Utils::$context['package_download_broken']) {
 			Utils::makeWritable(Config::$packagesdir, 0777);
 		}
 
 		Utils::$context['package_download_broken'] = !is_writable(Config::$packagesdir);
 
-		if (Utils::$context['package_download_broken'])
-		{
-			if (isset($_POST['ftp_username']))
-			{
+		if (Utils::$context['package_download_broken']) {
+			if (isset($_POST['ftp_username'])) {
 				$ftp = new FtpConnection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
 
-				if ($ftp->error === false)
-				{
+				if ($ftp->error === false) {
 					// I know, I know... but a lot of people want to type /home/xyz/... which is wrong, but logical.
-					if (!$ftp->chdir($_POST['ftp_path']))
-					{
+					if (!$ftp->chdir($_POST['ftp_path'])) {
 						$ftp_error = $ftp->error;
 						$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $_POST['ftp_path']));
 					}
 				}
 			}
 
-			if (!isset($ftp) || $ftp->error !== false)
-			{
-				if (!isset($ftp))
-				{
+			if (!isset($ftp) || $ftp->error !== false) {
+				if (!isset($ftp)) {
 					$ftp = new FtpConnection(null);
-				}
-				elseif ($ftp->error !== false && !isset($ftp_error))
+				} elseif ($ftp->error !== false && !isset($ftp_error)) {
 					$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				}
 
-				list ($username, $detect_path, $found_path) = $ftp->detect_path(Config::$packagesdir);
+				list($username, $detect_path, $found_path) = $ftp->detect_path(Config::$packagesdir);
 
-				if ($found_path || !isset($_POST['ftp_path']))
+				if ($found_path || !isset($_POST['ftp_path'])) {
 					$_POST['ftp_path'] = $detect_path;
+				}
 
-				if (!isset($_POST['ftp_username']))
+				if (!isset($_POST['ftp_username'])) {
 					$_POST['ftp_username'] = $username;
+				}
 
-				Utils::$context['package_ftp'] = array(
-					'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset(Config::$modSettings['package_server']) ? Config::$modSettings['package_server'] : 'localhost'),
-					'port' => isset($_POST['ftp_port']) ? $_POST['ftp_port'] : (isset(Config::$modSettings['package_port']) ? Config::$modSettings['package_port'] : '21'),
-					'username' => isset($_POST['ftp_username']) ? $_POST['ftp_username'] : (isset(Config::$modSettings['package_username']) ? Config::$modSettings['package_username'] : ''),
+				Utils::$context['package_ftp'] = [
+					'server' => $_POST['ftp_server'] ?? (Config::$modSettings['package_server'] ?? 'localhost'),
+					'port' => $_POST['ftp_port'] ?? (Config::$modSettings['package_port'] ?? '21'),
+					'username' => $_POST['ftp_username'] ?? (Config::$modSettings['package_username'] ?? ''),
 					'path' => $_POST['ftp_path'],
 					'error' => empty($ftp_error) ? null : $ftp_error,
-				);
-			}
-			else
-			{
+				];
+			} else {
 				Utils::$context['package_download_broken'] = false;
 
 				$ftp->chmod('.', 0777);
@@ -2486,48 +2479,51 @@ public function servers()
 	 */
 	public function serverBrowse()
 	{
-		if (isset($_GET['server']))
-		{
-			if ($_GET['server'] == '')
+		if (isset($_GET['server'])) {
+			if ($_GET['server'] == '') {
 				Utils::redirectexit('action=admin;area=packages;get');
+			}
 
 			$server = (int) $_GET['server'];
 
 			// Query the server list to find the current server.
-			$request = Db::$db->query('', '
-				SELECT name, url
+			$request = Db::$db->query(
+				'',
+				'SELECT name, url
 				FROM {db_prefix}package_servers
 				WHERE id_server = {int:current_server}
 				LIMIT 1',
-				array(
+				[
 					'current_server' => $server,
-				)
+				],
 			);
-			list ($name, $url) = Db::$db->fetch_row($request);
+			list($name, $url) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// If the server does not exist, dump out.
-			if (empty($url))
+			if (empty($url)) {
 				ErrorHandler::fatalLang('couldnt_connect', false);
+			}
 
 			// If there is a relative link, append to the stored server url.
-			if (isset($_GET['relative']))
+			if (isset($_GET['relative'])) {
 				$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+			}
 
 			$the_version = SMF_VERSION;
-			if (!empty($_SESSION['version_emulate']))
+
+			if (!empty($_SESSION['version_emulate'])) {
 				$the_version = $_SESSION['version_emulate'];
+			}
 
 			// Sub out any variables we support in the url.
-			$url = strtr($url, array(
-				'{SMF_VERSION}' => urlencode($the_version)
-			));
+			$url = strtr($url, [
+				'{SMF_VERSION}' => urlencode($the_version),
+			]);
 
 			// Clear any "absolute" URL.  Since "server" is present, "absolute" is garbage.
 			unset($_GET['absolute']);
-		}
-		elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
-		{
+		} elseif (isset($_GET['absolute']) && $_GET['absolute'] != '') {
 			// Initialize the required variables.
 			$server = '';
 			$url = $_GET['absolute'];
@@ -2538,8 +2534,8 @@ public function serverBrowse()
 			unset($_GET['relative']);
 
 			$token = Security::checkConfirm('get_absolute_url');
-			if ($token !== true)
-			{
+
+			if ($token !== true) {
 				Utils::$context['sub_template'] = 'package_confirm';
 
 				Utils::$context['page_title'] = Lang::$txt['package_servers'];
@@ -2550,16 +2546,19 @@ public function serverBrowse()
 			}
 		}
 		// Minimum required parameter did not exist so dump out.
-		else
+		else {
 			ErrorHandler::fatalLang('couldnt_connect', false);
+		}
 
 		// Attempt to connect.  If unsuccessful... try the URL.
-		if (!isset($_GET['package']) || file_exists($_GET['package']))
+		if (!isset($_GET['package']) || file_exists($_GET['package'])) {
 			$_GET['package'] = $url . '/packages.xml?language=' . User::$me->language;
+		}
 
 		// Check to be sure the packages.xml file actually exists where it is should be... or dump out.
-		if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !SubsPackage::url_exists($_GET['package']))
-			ErrorHandler::fatalLang('packageget_unable', false, array($url . '/index.php'));
+		if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !SubsPackage::url_exists($_GET['package'])) {
+			ErrorHandler::fatalLang('packageget_unable', false, [$url . '/index.php']);
+		}
 
 		// Might take some time.
 		@set_time_limit(600);
@@ -2568,17 +2567,19 @@ public function serverBrowse()
 		$listing = new XmlArray(WebFetchApi::fetch($_GET['package']), true);
 
 		// Errm.... empty file?  Try the URL....
-		if (!$listing->exists('package-list'))
-			ErrorHandler::fatalLang('packageget_unable', false, array($url . '/index.php'));
+		if (!$listing->exists('package-list')) {
+			ErrorHandler::fatalLang('packageget_unable', false, [$url . '/index.php']);
+		}
 
 		// List out the packages...
-		Utils::$context['package_list'] = array();
+		Utils::$context['package_list'] = [];
 
 		$listing = $listing->path('package-list[0]');
 
 		// Use the package list's name if it exists.
-		if ($listing->exists('list-title'))
+		if ($listing->exists('list-title')) {
 			$name = Utils::htmlspecialchars($listing->fetch('list-title'));
+		}
 
 		// Pick the correct template.
 		Utils::$context['sub_template'] = 'package_list';
@@ -2591,77 +2592,84 @@ public function serverBrowse()
 
 		$instmods = SubsPackage::loadInstalledPackages();
 
-		$installed_mods = array();
+		$installed_mods = [];
+
 		// Look through the list of installed mods...
-		foreach ($instmods as $installed_mod)
+		foreach ($instmods as $installed_mod) {
 			$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+		}
 
 		// Get default author and email if they exist.
-		if ($listing->exists('default-author'))
-		{
+		if ($listing->exists('default-author')) {
 			$default_author = Utils::htmlspecialchars($listing->fetch('default-author'));
-			if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL))
+
+			if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL)) {
 				$default_email = Utils::htmlspecialchars($listing->fetch('default-author/@email'));
+			}
 		}
 
 		// Get default web site if it exists.
-		if ($listing->exists('default-website'))
-		{
+		if ($listing->exists('default-website')) {
 			$default_website = Utils::htmlspecialchars($listing->fetch('default-website'));
-			if ($listing->exists('default-website/@title'))
+
+			if ($listing->exists('default-website/@title')) {
 				$default_title = Utils::htmlspecialchars($listing->fetch('default-website/@title'));
+			}
 		}
 
 		$the_version = SMF_VERSION;
-		if (!empty($_SESSION['version_emulate']))
+
+		if (!empty($_SESSION['version_emulate'])) {
 			$the_version = $_SESSION['version_emulate'];
+		}
 
 		$packageNum = 0;
 		$packageSection = 0;
 
 		$sections = $listing->set('section');
-		foreach ($sections as $i => $section)
-		{
-			Utils::$context['package_list'][$packageSection] = array(
+
+		foreach ($sections as $i => $section) {
+			Utils::$context['package_list'][$packageSection] = [
 				'title' => '',
 				'text' => '',
-				'items' => array(),
-			);
+				'items' => [],
+			];
 
 			$packages = $section->set('title|heading|text|remote|rule|modification|language|avatar-pack|theme|smiley-set');
-			foreach ($packages as $thisPackage)
-			{
-				$package = array(
+
+			foreach ($packages as $thisPackage) {
+				$package = [
 					'type' => $thisPackage->name(),
-				);
+				];
 
-				if (in_array($package['type'], array('title', 'text')))
+				if (in_array($package['type'], ['title', 'text'])) {
 					Utils::$context['package_list'][$packageSection][$package['type']] = Utils::htmlspecialchars($thisPackage->fetch('.'));
+				}
 				// It's a Title, Heading, Rule or Text.
-				elseif (in_array($package['type'], array('heading', 'rule')))
+				elseif (in_array($package['type'], ['heading', 'rule'])) {
 					$package['name'] = Utils::htmlspecialchars($thisPackage->fetch('.'));
+				}
 				// It's a Remote link.
-				elseif ($package['type'] == 'remote')
-				{
+				elseif ($package['type'] == 'remote') {
 					$remote_type = $thisPackage->exists('@type') ? $thisPackage->fetch('@type') : 'relative';
 
-					if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://')
-					{
-						if (isset($_GET['absolute']))
+					if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://') {
+						if (isset($_GET['absolute'])) {
 							$current_url = $_GET['absolute'] . '/';
-						elseif (isset($_GET['relative']))
+						} elseif (isset($_GET['relative'])) {
 							$current_url = $_GET['relative'] . '/';
-						else
+						} else {
 							$current_url = '';
+						}
 
 						$current_url .= $thisPackage->fetch('@href');
-						if (isset($_GET['absolute']))
+
+						if (isset($_GET['absolute'])) {
 							$package['href'] = Config::$scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
-						else
+						} else {
 							$package['href'] = Config::$scripturl . '?action=admin;area=packages;get;sa=browse;server=' . Utils::$context['package_server'] . ';relative=' . $current_url;
-					}
-					else
-					{
+						}
+					} else {
 						$current_url = $thisPackage->fetch('@href');
 						$package['href'] = Config::$scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
 					}
@@ -2670,41 +2678,44 @@ public function serverBrowse()
 					$package['link'] = '<a href="' . $package['href'] . '">' . $package['name'] . '</a>';
 				}
 				// It's a package...
-				else
-				{
-					if (isset($_GET['absolute']))
+				else {
+					if (isset($_GET['absolute'])) {
 						$current_url = $_GET['absolute'] . '/';
-					elseif (isset($_GET['relative']))
+					} elseif (isset($_GET['relative'])) {
 						$current_url = $_GET['relative'] . '/';
-					else
+					} else {
 						$current_url = '';
+					}
 
 					$server_att = $server != '' ? ';server=' . $server : '';
 
 					$package += $thisPackage->to_array();
 
-					if (isset($package['website']))
+					if (isset($package['website'])) {
 						unset($package['website']);
-					$package['author'] = array();
+					}
+					$package['author'] = [];
 
-					if ($package['description'] == '')
+					if ($package['description'] == '') {
 						$package['description'] = Lang::$txt['package_no_description'];
-					else
+					} else {
 						$package['description'] = BBCodeParser::load()->parse(preg_replace('~\[[/]?html\]~i', '', Utils::htmlspecialchars($package['description'])));
+					}
 
 					$package['is_installed'] = isset($installed_mods[$package['id']]);
 					$package['is_current'] = $package['is_installed'] && ($installed_mods[$package['id']] == $package['version']);
 					$package['is_newer'] = $package['is_installed'] && ($installed_mods[$package['id']] > $package['version']);
 
 					// This package is either not installed, or installed but old.  Is it supported on this version of SMF?
-					if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer']))
-					{
-						if ($thisPackage->exists('version/@for'))
+					if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer'])) {
+						if ($thisPackage->exists('version/@for')) {
 							$package['can_install'] = SubsPackage::matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+						}
 					}
 					// Okay, it's already installed AND up to date.
-					else
+					else {
 						$package['can_install'] = false;
+					}
 
 					$already_exists = SubsPackage::getPackageInfo(basename($package['filename']));
 					$package['download_conflict'] = is_array($already_exists) && $already_exists['id'] == $package['id'] && $already_exists['version'] != $package['version'];
@@ -2714,43 +2725,44 @@ public function serverBrowse()
 					$package['download']['href'] = Config::$scripturl . '?action=admin;area=packages;get;sa=download' . $server_att . ';package=' . $current_url . $package['filename'] . ($package['download_conflict'] ? ';conflict' : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'];
 					$package['download']['link'] = '<a href="' . $package['download']['href'] . '">' . $package['name'] . '</a>';
 
-					if ($thisPackage->exists('author') || isset($default_author))
-					{
-						if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL))
+					if ($thisPackage->exists('author') || isset($default_author)) {
+						if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL)) {
 							$package['author']['email'] = $thisPackage->fetch('author/@email');
-						elseif (isset($default_email))
+						} elseif (isset($default_email)) {
 							$package['author']['email'] = $default_email;
+						}
 
-						if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '')
+						if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '') {
 							$package['author']['name'] = Utils::htmlspecialchars($thisPackage->fetch('author'));
-						else
+						} else {
 							$package['author']['name'] = $default_author;
+						}
 
-						if (!empty($package['author']['email']))
+						if (!empty($package['author']['email'])) {
 							$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+						}
 					}
 
-					if ($thisPackage->exists('website') || isset($default_website))
-					{
-						if ($thisPackage->exists('website') && $thisPackage->exists('website/@title'))
+					if ($thisPackage->exists('website') || isset($default_website)) {
+						if ($thisPackage->exists('website') && $thisPackage->exists('website/@title')) {
 							$package['author']['website']['name'] = Utils::htmlspecialchars($thisPackage->fetch('website/@title'));
-						elseif (isset($default_title))
+						} elseif (isset($default_title)) {
 							$package['author']['website']['name'] = $default_title;
-						elseif ($thisPackage->exists('website'))
+						} elseif ($thisPackage->exists('website')) {
 							$package['author']['website']['name'] = Utils::htmlspecialchars($thisPackage->fetch('website'));
-						else
+						} else {
 							$package['author']['website']['name'] = $default_website;
+						}
 
-						if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '')
+						if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '') {
 							$authorhompage = Utils::htmlspecialchars($thisPackage->fetch('website'));
-						else
+						} else {
 							$authorhompage = $default_website;
+						}
 
 						$package['author']['website']['href'] = $authorhompage;
 						$package['author']['website']['link'] = '<a href="' . $authorhompage . '">' . $package['author']['website']['name'] . '</a>';
-					}
-					else
-					{
+					} else {
 						$package['author']['website']['href'] = '';
 						$package['author']['website']['link'] = '';
 					}
@@ -2762,14 +2774,16 @@ public function serverBrowse()
 				$package['is_text'] = $package['type'] == 'text';
 				$package['is_line'] = $package['type'] == 'rule';
 
-				$packageNum = in_array($package['type'], array('title', 'heading', 'text', 'remote', 'rule')) ? 0 : $packageNum + 1;
+				$packageNum = in_array($package['type'], ['title', 'heading', 'text', 'remote', 'rule']) ? 0 : $packageNum + 1;
 				$package['count'] = $packageNum;
 
-				if (!in_array($package['type'], array('title', 'text')))
+				if (!in_array($package['type'], ['title', 'text'])) {
 					Utils::$context['package_list'][$packageSection]['items'][] = $package;
+				}
 
-				if ($package['count'] > 1)
+				if ($package['count'] > 1) {
 					Utils::$context['list_type'] = 'ol';
+				}
 			}
 
 			$packageSection++;
@@ -2778,36 +2792,32 @@ public function serverBrowse()
 		// Lets make sure we get a nice new spiffy clean $package to work with.  Otherwise we get PAIN!
 		unset($package);
 
-		foreach (Utils::$context['package_list'] as $ps_id => $packageSection)
-		{
-			foreach ($packageSection['items'] as $i => $package)
-			{
-				if ($package['count'] == 0 || isset($package['can_install']))
+		foreach (Utils::$context['package_list'] as $ps_id => $packageSection) {
+			foreach ($packageSection['items'] as $i => $package) {
+				if ($package['count'] == 0 || isset($package['can_install'])) {
 					continue;
+				}
 
 				Utils::$context['package_list'][$ps_id]['items'][$i]['can_install'] = false;
 
 				$packageInfo = SubsPackage::getPackageInfo($url . '/' . $package['filename']);
-				if (is_array($packageInfo) && $packageInfo['xml']->exists('install'))
-				{
+
+				if (is_array($packageInfo) && $packageInfo['xml']->exists('install')) {
 					$installs = $packageInfo['xml']->set('install');
-					foreach ($installs as $install)
-					{
-						if (!$install->exists('@for') || SubsPackage::matchPackageVersion($the_version, $install->fetch('@for')))
-						{
+
+					foreach ($installs as $install) {
+						if (!$install->exists('@for') || SubsPackage::matchPackageVersion($the_version, $install->fetch('@for'))) {
 							// Okay, this one is good to go.
 							Utils::$context['package_list'][$ps_id]['items'][$i]['can_install'] = true;
 							break;
 						}
 
 						// no install found for this version, lets see if one exists for another
-						if (Utils::$context['package_list'][$ps_id]['items'][$i]['can_install'] === false && $install->exists('@for'))
-						{
+						if (Utils::$context['package_list'][$ps_id]['items'][$i]['can_install'] === false && $install->exists('@for')) {
 							$reset = true;
 
 							// Get the highest install version that is available from the package
-							foreach ($installs as $install)
-							{
+							foreach ($installs as $install) {
 								Utils::$context['package_list'][$ps_id]['items'][$i]['can_emulate_install'] = SubsPackage::matchHighestPackageVersion($install->fetch('@for'), $reset, $the_version);
 								$reset = false;
 							}
@@ -2830,93 +2840,99 @@ public function download()
 		User::$me->checkSession('get');
 
 		// To download something, we need a valid server or url.
-		if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package'])))
+		if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package']))) {
 			ErrorHandler::fatalLang('package_get_error_is_zero', false);
+		}
 
-		if (isset($_GET['server']))
-		{
+		if (isset($_GET['server'])) {
 			$server = (int) $_GET['server'];
 
 			// Query the server table to find the requested server.
-			$request = Db::$db->query('', '
-				SELECT name, url
+			$request = Db::$db->query(
+				'',
+				'SELECT name, url
 				FROM {db_prefix}package_servers
 				WHERE id_server = {int:current_server}
 				LIMIT 1',
-				array(
+				[
 					'current_server' => $server,
-				)
+				],
 			);
-			list ($name, $url) = Db::$db->fetch_row($request);
+			list($name, $url) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// If server does not exist then dump out.
-			if (empty($url))
+			if (empty($url)) {
 				ErrorHandler::fatalLang('couldnt_connect', false);
+			}
 
 			$the_version = SMF_VERSION;
-			if (!empty($_SESSION['version_emulate']))
+
+			if (!empty($_SESSION['version_emulate'])) {
 				$the_version = $_SESSION['version_emulate'];
+			}
 
 			// Sub out any variables we support in the url.
-			$url = strtr($url, array(
-				'{SMF_VERSION}' => urlencode($the_version)
-			));
+			$url = strtr($url, [
+				'{SMF_VERSION}' => urlencode($the_version),
+			]);
 
 			$url = $url . '/';
-		}
-		else
-		{
+		} else {
 			// Initialize the required variables.
 			$server = '';
 			$url = '';
 		}
 
-		if (isset($_REQUEST['byurl']) && !empty($_POST['filename']))
+		if (isset($_REQUEST['byurl']) && !empty($_POST['filename'])) {
 			$package_name = basename($_REQUEST['filename']);
-		else
+		} else {
 			$package_name = basename($_REQUEST['package']);
+		}
 
-		if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists(Config::$packagesdir . '/' . $package_name)))
-		{
+		if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists(Config::$packagesdir . '/' . $package_name))) {
 			// Find the extension, change abc.tar.gz to abc_1.tar.gz...
-			if (strrpos(substr($package_name, 0, -3), '.') !== false)
-			{
+			if (strrpos(substr($package_name, 0, -3), '.') !== false) {
 				$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 				$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
-			}
-			else
+			} else {
 				$ext = '';
+			}
 
 			// Find the first available.
 			$i = 1;
-			while (file_exists(Config::$packagesdir . '/' . $package_name . $i . $ext))
+
+			while (file_exists(Config::$packagesdir . '/' . $package_name . $i . $ext)) {
 				$i++;
+			}
 
 			$package_name = $package_name . $i . $ext;
 		}
 
 		// Use FTP if necessary.
-		SubsPackage::create_chmod_control(array(Config::$packagesdir . '/' . $package_name), array('destination_url' => Config::$scripturl . '?action=admin;area=packages;get;sa=download' . (isset($_GET['server']) ? ';server=' . $_GET['server'] : '') . (isset($_REQUEST['auto']) ? ';auto' : '') . ';package=' . $_REQUEST['package'] . (isset($_REQUEST['conflict']) ? ';conflict' : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], 'crash_on_error' => true));
+		SubsPackage::create_chmod_control([Config::$packagesdir . '/' . $package_name], ['destination_url' => Config::$scripturl . '?action=admin;area=packages;get;sa=download' . (isset($_GET['server']) ? ';server=' . $_GET['server'] : '') . (isset($_REQUEST['auto']) ? ';auto' : '') . ';package=' . $_REQUEST['package'] . (isset($_REQUEST['conflict']) ? ';conflict' : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'], 'crash_on_error' => true]);
 		SubsPackage::package_put_contents(Config::$packagesdir . '/' . $package_name, WebFetchApi::fetch($url . $_REQUEST['package']));
 
 		// Done!  Did we get this package automatically?
 		// @ TODO: These are usually update packages.  Allowing both for now until more testing has been done.
-		if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto']))
+		if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto'])) {
 			Utils::redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		}
 
 		// You just downloaded a mod from SERVER_NAME_GOES_HERE.
 		Utils::$context['package_server'] = $server;
 
 		Utils::$context['package'] = SubsPackage::getPackageInfo($package_name);
 
-		if (!is_array(Utils::$context['package']))
+		if (!is_array(Utils::$context['package'])) {
 			ErrorHandler::fatalLang('package_cant_download', false);
+		}
 
-		if (!isset(Utils::$context['package']['type']))
+		if (!isset(Utils::$context['package']['type'])) {
 			Utils::$context['package']['install']['link'] = '';
-		else
-			Utils::$context['package']['install']['link'] = '<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;package=' . Utils::$context['package']['filename'] . '">[ ' . (isset(Lang::$txt['install_' . Utils::$context['package']['type']]) ? Lang::$txt['install_' . Utils::$context['package']['type']] : Lang::$txt['install_unknown']) . ' ]</a>';
+		} else {
+			Utils::$context['package']['install']['link'] = '<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;package=' . Utils::$context['package']['filename'] . '">[ ' . (Lang::$txt['install_' . Utils::$context['package']['type']] ?? Lang::$txt['install_unknown']) . ' ]</a>';
+		}
 
 		// Does a 3rd party hook want to do some additional changes?
 		IntegrationHook::call('integrate_package_download');
@@ -2940,17 +2956,20 @@ public function upload()
 		// @todo Use FTP if the Packages directory is not writable.
 
 		// Check the file was even sent!
-		if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
+		if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '') {
 			ErrorHandler::fatalLang('package_upload_error_nofile', false);
-		elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
+		} elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name']))) {
 			ErrorHandler::fatalLang('package_upload_error_failed', false);
+		}
 
 		// Make sure it has a sane filename.
-		$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
+		$_FILES['package']['name'] = preg_replace(['/\s/', '/\.+/', '/[^\w.-]/'], ['_', '.', ''], $_FILES['package']['name']);
 
 		$found_ext = preg_match('/\.(zip|tgz|tar\.gz)$/i', $_FILES['package']['name'], $match);
-		if ($found_ext === 0)
-			ErrorHandler::fatalLang('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+
+		if ($found_ext === 0) {
+			ErrorHandler::fatalLang('package_upload_error_supports', false, ['zip, tgz, tar.gz']);
+		}
 
 		// We only need the filename...
 		$packageName = substr($_FILES['package']['name'], 0, -strlen($match[0]));
@@ -2958,8 +2977,10 @@ public function upload()
 
 		// Setup the destination and throw an error if the file is already there!
 		$destination = Config::$packagesdir . '/' . $packageFileName;
-		if (file_exists($destination))
+
+		if (file_exists($destination)) {
 			ErrorHandler::fatalLang('package_upload_error_exists', false);
+		}
 
 		// Now move the file.
 		move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -2970,27 +2991,26 @@ public function upload()
 		Utils::$context['package_server'] = '';
 
 		// Not really a package, you lazy bum!
-		if (!is_array(Utils::$context['package']))
-		{
+		if (!is_array(Utils::$context['package'])) {
 			@unlink($destination);
 			Lang::load('Errors');
 			Lang::$txt[Utils::$context['package']] = str_replace('{MANAGETHEMEURL}', Config::$scripturl . '?action=admin;area=theme;sa=admin;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '#theme_install', Lang::$txt[Utils::$context['package']]);
-			ErrorHandler::fatalLang('package_upload_error_broken', false, array(Lang::$txt[Utils::$context['package']]));
+			ErrorHandler::fatalLang('package_upload_error_broken', false, [Lang::$txt[Utils::$context['package']]]);
 		}
 		// Is it already uploaded, maybe?
-		elseif ($dir = @opendir(Config::$packagesdir))
-		{
-			while ($package = readdir($dir))
-			{
-				if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageFileName || (!(is_dir(Config::$packagesdir . '/' . $package) && file_exists(Config::$packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
+		elseif ($dir = @opendir(Config::$packagesdir)) {
+			while ($package = readdir($dir)) {
+				if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageFileName || (!(is_dir(Config::$packagesdir . '/' . $package) && file_exists(Config::$packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
 					continue;
+				}
 
 				$packageInfo = SubsPackage::getPackageInfo($package);
-				if (!is_array($packageInfo))
+
+				if (!is_array($packageInfo)) {
 					continue;
+				}
 
-				if ($packageInfo['id'] == Utils::$context['package']['id'] && $packageInfo['version'] == Utils::$context['package']['version'])
-				{
+				if ($packageInfo['id'] == Utils::$context['package']['id'] && $packageInfo['version'] == Utils::$context['package']['version']) {
 					@unlink($destination);
 					Lang::load('Errors');
 					ErrorHandler::fatalLang('package_upload_error_exists', false);
@@ -2999,10 +3019,11 @@ public function upload()
 			closedir($dir);
 		}
 
-		if (!isset(Utils::$context['package']['type']))
+		if (!isset(Utils::$context['package']['type'])) {
 			Utils::$context['package']['install']['link'] = '';
-		else
-			Utils::$context['package']['install']['link'] = '<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;package=' . Utils::$context['package']['filename'] . '">[ ' . (isset(Lang::$txt['install_' . Utils::$context['package']['type']]) ? Lang::$txt['install_' . Utils::$context['package']['type']] : Lang::$txt['install_unknown']) . ' ]</a>';
+		} else {
+			Utils::$context['package']['install']['link'] = '<a href="' . Config::$scripturl . '?action=admin;area=packages;sa=install;package=' . Utils::$context['package']['filename'] . '">[ ' . (Lang::$txt['install_' . Utils::$context['package']['type']] ?? Lang::$txt['install_unknown']) . ' ]</a>';
+		}
 
 		// Does a 3rd party hook want to do some additional changes?
 		IntegrationHook::call('integrate_package_upload');
@@ -3023,26 +3044,29 @@ public function serverAdd()
 		User::$me->checkSession();
 
 		// If they put a slash on the end, get rid of it.
-		if (substr($_POST['serverurl'], -1) == '/')
+		if (substr($_POST['serverurl'], -1) == '/') {
 			$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+		}
 
 		// Are they both nice and clean?
 		$servername = trim(Utils::htmlspecialchars($_POST['servername']));
 		$serverurl = trim(Utils::htmlspecialchars($_POST['serverurl']));
 
 		// Make sure the URL has the correct prefix.
-		if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0)
+		if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0) {
 			$serverurl = 'http://' . $serverurl;
+		}
 
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}package_servers',
-			array(
+			[
 				'name' => 'string-255', 'url' => 'string-255',
-			),
-			array(
+			],
+			[
 				$servername, $serverurl,
-			),
-			array('id_server')
+			],
+			['id_server'],
 		);
 
 		Utils::redirectexit('action=admin;area=packages;get');
@@ -3055,12 +3079,13 @@ public function serverRemove()
 	{
 		User::$me->checkSession('get');
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}package_servers
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}package_servers
 			WHERE id_server = {int:current_server}',
-			array(
+			[
 				'current_server' => (int) $_GET['server'],
-			)
+			],
 		);
 
 		Utils::redirectexit('action=admin;area=packages;get');
@@ -3086,108 +3111,111 @@ public function list_getPackages($start, $items_per_page, $sort, $params)
 	{
 		static $installed_mods;
 
-		$packages = array();
-		$column = array();
+		$packages = [];
+		$column = [];
 
 		// We need the packages directory to be writable for this.
-		if (!@is_writable(Config::$packagesdir))
-			SubsPackage::create_chmod_control(array(Config::$packagesdir), array('destination_url' => Config::$scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+		if (!@is_writable(Config::$packagesdir)) {
+			SubsPackage::create_chmod_control([Config::$packagesdir], ['destination_url' => Config::$scripturl . '?action=admin;area=packages', 'crash_on_error' => true]);
+		}
 
 		$the_version = SMF_VERSION;
 
 		// Here we have a little code to help those who class themselves as something of gods, version emulation ;)
-		if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], array('SMF ' => '')) == $the_version)
-		{
+		if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], ['SMF ' => '']) == $the_version) {
 			unset($_SESSION['version_emulate']);
-		}
-		elseif (isset($_GET['version_emulate']))
-		{
-			if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === SMF_FULL_VERSION) && isset($_SESSION['version_emulate']))
+		} elseif (isset($_GET['version_emulate'])) {
+			if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === SMF_FULL_VERSION) && isset($_SESSION['version_emulate'])) {
 				unset($_SESSION['version_emulate']);
-			elseif ($_GET['version_emulate'] !== 0)
-				$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
+			} elseif ($_GET['version_emulate'] !== 0) {
+				$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], ['-' => ' ', '+' => ' ', 'SMF ' => '']);
+			}
 		}
-		if (!empty($_SESSION['version_emulate']))
-		{
+
+		if (!empty($_SESSION['version_emulate'])) {
 			Utils::$context['forum_version'] = 'SMF ' . $_SESSION['version_emulate'];
 			$the_version = $_SESSION['version_emulate'];
 		}
-		if (isset($_SESSION['single_version_emulate']))
+
+		if (isset($_SESSION['single_version_emulate'])) {
 			unset($_SESSION['single_version_emulate']);
+		}
 
-		if (empty($installed_mods))
-		{
+		if (empty($installed_mods)) {
 			$instmods = SubsPackage::loadInstalledPackages();
-			$installed_mods = array();
+			$installed_mods = [];
+
 			// Look through the list of installed mods...
-			foreach ($instmods as $installed_mod)
-				$installed_mods[$installed_mod['package_id']] = array(
+			foreach ($instmods as $installed_mod) {
+				$installed_mods[$installed_mod['package_id']] = [
 					'id' => $installed_mod['id'],
 					'version' => $installed_mod['version'],
 					'time_installed' => $installed_mod['time_installed'],
-				);
+				];
+			}
 
 			// Get a list of all the ids installed, so the latest packages won't include already installed ones.
 			Utils::$context['installed_mods'] = array_keys($installed_mods);
 		}
 
-		if ($dir = @opendir(Config::$packagesdir))
-		{
-			$dirs = array();
-			$sort_id = array(
+		if ($dir = @opendir(Config::$packagesdir)) {
+			$dirs = [];
+			$sort_id = [
 				'modification' => 1,
 				'avatar' => 1,
 				'language' => 1,
 				'unknown' => 1,
 				'smiley' => 1,
-			);
-			IntegrationHook::call('integrate_packages_sort_id', array(&$sort_id, &$packages));
+			];
+			IntegrationHook::call('integrate_packages_sort_id', [&$sort_id, &$packages]);
 
-			while ($package = readdir($dir))
-			{
-				if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir(Config::$packagesdir . '/' . $package) && file_exists(Config::$packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
+			while ($package = readdir($dir)) {
+				if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir(Config::$packagesdir . '/' . $package) && file_exists(Config::$packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
 					continue;
+				}
 
 				// Skip directories or files that are named the same.
-				if (is_dir(Config::$packagesdir . '/' . $package))
-				{
-					if (in_array($package, $dirs))
+				if (is_dir(Config::$packagesdir . '/' . $package)) {
+					if (in_array($package, $dirs)) {
 						continue;
+					}
 					$dirs[] = $package;
-				}
-				elseif (substr(strtolower($package), -7) == '.tar.gz')
-				{
-					if (in_array(substr($package, 0, -7), $dirs))
+				} elseif (substr(strtolower($package), -7) == '.tar.gz') {
+					if (in_array(substr($package, 0, -7), $dirs)) {
 						continue;
+					}
 					$dirs[] = substr($package, 0, -7);
-				}
-				elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
-				{
-					if (in_array(substr($package, 0, -4), $dirs))
+				} elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz') {
+					if (in_array(substr($package, 0, -4), $dirs)) {
 						continue;
+					}
 					$dirs[] = substr($package, 0, -4);
 				}
 
 				$packageInfo = SubsPackage::getPackageInfo($package);
-				if (!is_array($packageInfo))
+
+				if (!is_array($packageInfo)) {
 					continue;
+				}
 
-				if (!empty($packageInfo))
-				{
-					if (!isset($sort_id[$packageInfo['type']]))
+				if (!empty($packageInfo)) {
+					if (!isset($sort_id[$packageInfo['type']])) {
 						$packageInfo['sort_id'] = $sort_id['unknown'];
-					else
+					} else {
 						$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
+					}
 
 					$packageInfo['time_installed'] = 0;
 					$packageInfo['is_installed'] = isset($installed_mods[$packageInfo['id']]);
-					if ($packageInfo['is_installed'])
-					{
+
+					if ($packageInfo['is_installed']) {
 						$packageInfo['is_current'] = $installed_mods[$packageInfo['id']]['version'] == $packageInfo['version'];
 						$packageInfo['is_newer'] = $installed_mods[$packageInfo['id']]['version'] > $packageInfo['version'];
 						$packageInfo['installed_id'] = $installed_mods[$packageInfo['id']]['id'];
-						if ($packageInfo['is_current'])
+
+						if ($packageInfo['is_current']) {
 							$packageInfo['time_installed'] = $installed_mods[$packageInfo['id']]['time_installed'];
+						}
 					}
 
 					$packageInfo['can_install'] = false;
@@ -3197,14 +3225,12 @@ public function list_getPackages($start, $items_per_page, $sort, $params)
 					$packageInfo['can_emulate_uninstall'] = false;
 
 					// This package is currently NOT installed.  Check if it can be.
-					if (!$packageInfo['is_installed'] && $packageInfo['xml']->exists('install'))
-					{
+					if (!$packageInfo['is_installed'] && $packageInfo['xml']->exists('install')) {
 						// Check if there's an install for *THIS* version of SMF.
 						$installs = $packageInfo['xml']->set('install');
-						foreach ($installs as $install)
-						{
-							if (!$install->exists('@for') || SubsPackage::matchPackageVersion($the_version, $install->fetch('@for')))
-							{
+
+						foreach ($installs as $install) {
+							if (!$install->exists('@for') || SubsPackage::matchPackageVersion($the_version, $install->fetch('@for'))) {
 								// Okay, this one is good to go.
 								$packageInfo['can_install'] = true;
 								break;
@@ -3212,58 +3238,49 @@ public function list_getPackages($start, $items_per_page, $sort, $params)
 						}
 
 						// no install found for this version, lets see if one exists for another
-						if ($packageInfo['can_install'] === false && $install->exists('@for') && empty($_SESSION['version_emulate']))
-						{
+						if ($packageInfo['can_install'] === false && $install->exists('@for') && empty($_SESSION['version_emulate'])) {
 							$reset = true;
 
 							// Get the highest install version that is available from the package
-							foreach ($installs as $install)
-							{
+							foreach ($installs as $install) {
 								$packageInfo['can_emulate_install'] = SubsPackage::matchHighestPackageVersion($install->fetch('@for'), $reset, $the_version);
 								$reset = false;
 							}
 						}
 					}
 					// An already installed, but old, package.  Can we upgrade it?
-					elseif ($packageInfo['is_installed'] && !$packageInfo['is_current'] && $packageInfo['xml']->exists('upgrade'))
-					{
+					elseif ($packageInfo['is_installed'] && !$packageInfo['is_current'] && $packageInfo['xml']->exists('upgrade')) {
 						$upgrades = $packageInfo['xml']->set('upgrade');
 
 						// First go through, and check against the current version of SMF.
-						foreach ($upgrades as $upgrade)
-						{
+						foreach ($upgrades as $upgrade) {
 							// Even if it is for this SMF, is it for the installed version of the mod?
-							if (!$upgrade->exists('@for') || SubsPackage::matchPackageVersion($the_version, $upgrade->fetch('@for')))
-								if (!$upgrade->exists('@from') || SubsPackage::matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
-								{
+							if (!$upgrade->exists('@for') || SubsPackage::matchPackageVersion($the_version, $upgrade->fetch('@for'))) {
+								if (!$upgrade->exists('@from') || SubsPackage::matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from'))) {
 									$packageInfo['can_upgrade'] = true;
 									break;
 								}
+							}
 						}
 					}
 					// Note that it has to be the current version to be uninstallable.  Shucks.
-					elseif ($packageInfo['is_installed'] && $packageInfo['is_current'] && $packageInfo['xml']->exists('uninstall'))
-					{
+					elseif ($packageInfo['is_installed'] && $packageInfo['is_current'] && $packageInfo['xml']->exists('uninstall')) {
 						$uninstalls = $packageInfo['xml']->set('uninstall');
 
 						// Can we find any uninstallation methods that work for this SMF version?
-						foreach ($uninstalls as $uninstall)
-						{
-							if (!$uninstall->exists('@for') || SubsPackage::matchPackageVersion($the_version, $uninstall->fetch('@for')))
-							{
+						foreach ($uninstalls as $uninstall) {
+							if (!$uninstall->exists('@for') || SubsPackage::matchPackageVersion($the_version, $uninstall->fetch('@for'))) {
 								$packageInfo['can_uninstall'] = true;
 								break;
 							}
 						}
 
 						// no uninstall found for this version, lets see if one exists for another
-						if ($packageInfo['can_uninstall'] === false && $uninstall->exists('@for') && empty($_SESSION['version_emulate']))
-						{
+						if ($packageInfo['can_uninstall'] === false && $uninstall->exists('@for') && empty($_SESSION['version_emulate'])) {
 							$reset = true;
 
 							// Get the highest install version that is available from the package
-							foreach ($uninstalls as $uninstall)
-							{
+							foreach ($uninstalls as $uninstall) {
 								$packageInfo['can_emulate_uninstall'] = SubsPackage::matchHighestPackageVersion($uninstall->fetch('@for'), $reset, $the_version);
 								$reset = false;
 							}
@@ -3273,14 +3290,11 @@ public function list_getPackages($start, $items_per_page, $sort, $params)
 					// Save some memory by not passing the XmlArray object into context.
 					unset($packageInfo['xml']);
 
-					if (isset($sort_id[$packageInfo['type']]) && $params == $packageInfo['type'])
-					{
+					if (isset($sort_id[$packageInfo['type']]) && $params == $packageInfo['type']) {
 						$column[] = $packageInfo[$sort];
 						$sort_id[$packageInfo['type']]++;
 						$packages[] = $packageInfo;
-					}
-					elseif (!isset($sort_id[$packageInfo['type']]) && $params == 'unknown')
-					{
+					} elseif (!isset($sort_id[$packageInfo['type']]) && $params == 'unknown') {
 						$column[] = $packageInfo[$sort];
 						$packageInfo['sort_id'] = $sort_id['unknown'];
 						$sort_id['unknown']++;
@@ -3294,7 +3308,7 @@ public function list_getPackages($start, $items_per_page, $sort, $params)
 		array_multisort(
 			$column,
 			isset($_GET['desc']) ? SORT_DESC : SORT_ASC,
-			$packages
+			$packages,
 		);
 
 		return $packages;
@@ -3312,30 +3326,32 @@ protected function __construct()
 		User::$me->isAllowedTo('admin_forum');
 
 		// Backward compatibility with old URLs.
-		if (isset($_REQUEST['get']) || (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'packageget'))
-		{
-			if (!isset($_REQUEST['sa']))
+		if (isset($_REQUEST['get']) || (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'packageget')) {
+			if (!isset($_REQUEST['sa'])) {
 				$_REQUEST['sa'] = 'servers';
+			}
 
-			if (in_array($_REQUEST['sa'], array('add', 'remove', 'browse')))
+			if (in_array($_REQUEST['sa'], ['add', 'remove', 'browse'])) {
 				$_REQUEST['sa'] = 'server' . $_REQUEST['sa'];
+			}
 
-			if (!isset($this->subactions[$_REQUEST['sa']]))
+			if (!isset($this->subactions[$_REQUEST['sa']])) {
 				$_REQUEST['sa'] = 'servers';
+			}
 
 			// Backward compatibility for deprecated integrate_package_get hook.
-			$temp = array_map(function($sa) {return $this->subactions[$sa];}, $this->packageget_subactions);
-			IntegrationHook::call('integrate_package_get', array(&$temp));
-			foreach ($temp as $sa => $func)
-				$this->subactions[isset($this->packageget_subactions[$sa]) ? $this->packageget_subactions[$sa] : $sa] = $func;
-		}
-		elseif (isset($_REQUEST['pgdownload']))
-		{
+			$temp = array_map(function ($sa) {return $this->subactions[$sa];}, $this->packageget_subactions);
+			IntegrationHook::call('integrate_package_get', [&$temp]);
+
+			foreach ($temp as $sa => $func) {
+				$this->subactions[$this->packageget_subactions[$sa] ?? $sa] = $func;
+			}
+		} elseif (isset($_REQUEST['pgdownload'])) {
 			$_REQUEST['sa'] = 'download';
 		}
 
 		// Give mods access to the sub-actions.
-		IntegrationHook::call('integrate_manage_packages', array(&$this->subactions));
+		IntegrationHook::call('integrate_manage_packages', [&$this->subactions]);
 	}
 
 	/**
@@ -3348,97 +3364,109 @@ protected function __construct()
 	protected function fetchPerms__recursive($path, &$data, $level)
 	{
 		$isLikelyPath = false;
-		foreach (Utils::$context['look_for'] as $possiblePath)
-			if (substr($possiblePath, 0, strlen($path)) == $path)
+
+		foreach (Utils::$context['look_for'] as $possiblePath) {
+			if (substr($possiblePath, 0, strlen($path)) == $path) {
 				$isLikelyPath = true;
+			}
+		}
 
 		// Is this where we stop?
-		if (isset($_GET['xml']) && !empty(Utils::$context['look_for']) && !$isLikelyPath)
+		if (isset($_GET['xml']) && !empty(Utils::$context['look_for']) && !$isLikelyPath) {
 			return;
-		elseif ($level > Utils::$context['default_level'] && !$isLikelyPath)
+		}
+
+		if ($level > Utils::$context['default_level'] && !$isLikelyPath) {
 			return;
+		}
 
 		// Are we actually interested in saving this data?
 		$save_data = empty(Utils::$context['only_find']) || Utils::$context['only_find'] == $path;
 
 		// @todo Shouldn't happen - but better error message?
-		if (!is_dir($path))
+		if (!is_dir($path)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// This is where we put stuff we've found for sorting.
-		$foundData = array(
-			'files' => array(),
-			'folders' => array(),
-		);
+		$foundData = [
+			'files' => [],
+			'folders' => [],
+		];
 
 		$dh = opendir($path);
-		while ($entry = readdir($dh))
-		{
+
+		while ($entry = readdir($dh)) {
 			// Bypass directory abbreviations altogether...
-			if ($entry == '.' || $entry == '..')
+			if ($entry == '.' || $entry == '..') {
 				continue;
+			}
 
 			// Some kind of file?
-			if (is_file($path . '/' . $entry))
-			{
+			if (is_file($path . '/' . $entry)) {
 				// Are we listing PHP files in this directory?
-				if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php')
+				if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') {
 					$foundData['files'][$entry] = true;
+				}
 				// A file we were looking for.
-				elseif ($save_data && isset($data['contents'][$entry]))
+				elseif ($save_data && isset($data['contents'][$entry])) {
 					$foundData['files'][$entry] = true;
+				}
 			}
 			// It's a directory - we're interested one way or another, probably...
-			else
-			{
+			else {
 				// Going further?
-				if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive'))))
-				{
-					if (!isset($data['contents'][$entry]))
+				if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive')))) {
+					if (!isset($data['contents'][$entry])) {
 						$foundData['folders'][$entry] = 'dir_recursive';
-					else
+					} else {
 						$foundData['folders'][$entry] = true;
+					}
 
 					// If this wasn't expected inherit the recursiveness...
-					if (!isset($data['contents'][$entry]))
+					if (!isset($data['contents'][$entry])) {
 						// We need to do this as we will be going all recursive.
-						$data['contents'][$entry] = array(
+						$data['contents'][$entry] = [
 							'type' => 'dir_recursive',
-						);
+						];
+					}
 
 					// Actually do the recursive stuff...
 					$this->fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1);
 				}
 				// Maybe it is a folder we are not descending into.
-				elseif (isset($data['contents'][$entry]))
+				elseif (isset($data['contents'][$entry])) {
 					$foundData['folders'][$entry] = true;
+				}
 				// Otherwise we stop here.
 			}
 		}
 		closedir($dh);
 
 		// Nothing to see here?
-		if (!$save_data)
+		if (!$save_data) {
 			return;
+		}
 
 		// Now actually add the data, starting with the folders.
 		ksort($foundData['folders']);
-		foreach ($foundData['folders'] as $folder => $type)
-		{
-			$additional_data = array(
-				'perms' => array(
+
+		foreach ($foundData['folders'] as $folder => $type) {
+			$additional_data = [
+				'perms' => [
 					'chmod' => @is_writable($path . '/' . $folder),
 					'perms' => @fileperms($path . '/' . $folder),
-				),
-			);
-			if ($type !== true)
+				],
+			];
+
+			if ($type !== true) {
 				$additional_data['type'] = $type;
+			}
 
 			// If there's an offset ignore any folders in XML mode.
-			if (isset($_GET['xml']) && Utils::$context['file_offset'] == 0)
-			{
-				Utils::$context['xml_data']['folders']['children'][] = array(
-					'attributes' => array(
+			if (isset($_GET['xml']) && Utils::$context['file_offset'] == 0) {
+				Utils::$context['xml_data']['folders']['children'][] = [
+					'attributes' => [
 						'writable' => $additional_data['perms']['chmod'] ? 1 : 0,
 						'permissions' => substr(sprintf('%o', $additional_data['perms']['perms']), -4),
 						'folder' => 1,
@@ -3448,45 +3476,46 @@ protected function fetchPerms__recursive($path, &$data, $level)
 						'offset' => Utils::$context['file_offset'],
 						'my_ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find'] . '/' . $folder),
 						'ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find']),
-					),
+					],
 					'value' => $folder,
-				);
-			}
-			elseif (!isset($_GET['xml']))
-			{
-				if (isset($data['contents'][$folder]))
+				];
+			} elseif (!isset($_GET['xml'])) {
+				if (isset($data['contents'][$folder])) {
 					$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
-				else
+				} else {
 					$data['contents'][$folder] = $additional_data;
+				}
 			}
 		}
 
 		// Now we want to do a similar thing with files.
 		ksort($foundData['files']);
 		$counter = -1;
-		foreach ($foundData['files'] as $file => $dummy)
-		{
+
+		foreach ($foundData['files'] as $file => $dummy) {
 			$counter++;
 
 			// Have we reached our offset?
-			if (Utils::$context['file_offset'] > $counter)
+			if (Utils::$context['file_offset'] > $counter) {
 				continue;
+			}
+
 			// Gone too far?
-			if ($counter > (Utils::$context['file_offset'] + Utils::$context['file_limit']))
+			if ($counter > (Utils::$context['file_offset'] + Utils::$context['file_limit'])) {
 				continue;
+			}
 
-			$additional_data = array(
-				'perms' => array(
+			$additional_data = [
+				'perms' => [
 					'chmod' => @is_writable($path . '/' . $file),
 					'perms' => @fileperms($path . '/' . $file),
-				),
-			);
+				],
+			];
 
 			// XML?
-			if (isset($_GET['xml']))
-			{
-				Utils::$context['xml_data']['folders']['children'][] = array(
-					'attributes' => array(
+			if (isset($_GET['xml'])) {
+				Utils::$context['xml_data']['folders']['children'][] = [
+					'attributes' => [
 						'writable' => $additional_data['perms']['chmod'] ? 1 : 0,
 						'permissions' => substr(sprintf('%o', $additional_data['perms']['perms']), -4),
 						'folder' => 0,
@@ -3496,16 +3525,15 @@ protected function fetchPerms__recursive($path, &$data, $level)
 						'offset' => Utils::$context['file_offset'],
 						'my_ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find'] . '/' . $file),
 						'ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find']),
-					),
+					],
 					'value' => $file,
-				);
-			}
-			elseif ($counter != (Utils::$context['file_offset'] + Utils::$context['file_limit']))
-			{
-				if (isset($data['contents'][$file]))
+				];
+			} elseif ($counter != (Utils::$context['file_offset'] + Utils::$context['file_limit'])) {
+				if (isset($data['contents'][$file])) {
 					$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
-				else
+				} else {
 					$data['contents'][$file] = $additional_data;
+				}
 			}
 		}
 	}
@@ -3514,16 +3542,15 @@ protected function fetchPerms__recursive($path, &$data, $level)
 	 * Counts all the directories under a given path
 	 *
 	 * @param string $dir
-	 * @return integer
+	 * @return int
 	 */
 	protected function count_directories__recursive($dir): int
 	{
 		$count = 0;
 		$dh = @opendir($dir);
-		while ($entry = readdir($dh))
-		{
-			if ($entry != '.' && $entry != '..' && is_dir($dir . '/' . $entry))
-			{
+
+		while ($entry = readdir($dh)) {
+			if ($entry != '.' && $entry != '..' && is_dir($dir . '/' . $entry)) {
 				Utils::$context['directory_list'][$dir . '/' . $entry] = 1;
 				$count++;
 				$count += $this->count_directories__recursive($dir . '/' . $entry);
@@ -3542,13 +3569,17 @@ protected function count_directories__recursive($dir): int
 	 */
 	protected function build_special_files__recursive($path, &$data)
 	{
-		if (!empty($data['writable_on']))
-			if (Utils::$context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
+		if (!empty($data['writable_on'])) {
+			if (Utils::$context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive') {
 				Utils::$context['special_files'][$path] = 1;
+			}
+		}
 
-		if (!empty($data['contents']))
-			foreach ($data['contents'] as $name => $contents)
+		if (!empty($data['contents'])) {
+			foreach ($data['contents'] as $name => $contents) {
 				$this->build_special_files__recursive($path . '/' . $name, $contents);
+			}
+		}
 	}
 }
 
diff --git a/Sources/PackageManager/SubsPackage.php b/Sources/PackageManager/SubsPackage.php
index 2985d0ade7..3621092b2c 100644
--- a/Sources/PackageManager/SubsPackage.php
+++ b/Sources/PackageManager/SubsPackage.php
@@ -15,6 +15,7 @@
 
 use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\ItemList;
 use SMF\Lang;
@@ -22,7 +23,6 @@
 use SMF\Time;
 use SMF\Url;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 use SMF\WebFetch\WebFetchApi;
 
 /**
@@ -34,6 +34,46 @@ class SubsPackage
 {
 	use BackwardCompatibility;
 
+	/**
+	 * @var array
+	 *
+	 * BackwardCompatibility settings for this class.
+	 */
+	private static $backcompat = [
+		'func_names' => [
+			'read_tgz_file' => 'read_tgz_file',
+			'read_tgz_data' => 'read_tgz_data',
+			'read_zip_data' => 'read_zip_data',
+			'url_exists' => 'url_exists',
+			'loadInstalledPackages' => 'loadInstalledPackages',
+			'getPackageInfo' => 'getPackageInfo',
+			'create_chmod_control' => 'create_chmod_control',
+			'list_restoreFiles' => 'list_restoreFiles',
+			'packageRequireFTP' => 'packageRequireFTP',
+			'parsePackageInfo' => 'parsePackageInfo',
+			'matchHighestPackageVersion' => 'matchHighestPackageVersion',
+			'matchPackageVersion' => 'matchPackageVersion',
+			'compareVersions' => 'compareVersions',
+			'parse_path' => 'parse_path',
+			'deltree' => 'deltree',
+			'mktree' => 'mktree',
+			'copytree' => 'copytree',
+			'listtree' => 'listtree',
+			'parseModification' => 'parseModification',
+			'parseBoardMod' => 'parseBoardMod',
+			'package_get_contents' => 'package_get_contents',
+			'package_put_contents' => 'package_put_contents',
+			'package_flush_cache' => 'package_flush_cache',
+			'package_chmod' => 'package_chmod',
+			'package_crypt' => 'package_crypt',
+			'package_unique_filename' => 'package_unique_filename',
+			'package_create_backup' => 'package_create_backup',
+			'package_validate_installtest' => 'package_validate_installtest',
+			'package_validate' => 'package_validate',
+			'package_validate_send' => 'package_validate_send',
+		],
+	];
+
 	/**************************
 	 * Public static properties
 	 **************************/
@@ -79,18 +119,23 @@ public static function read_tgz_file($gzfilename, $destination, $single_file = f
 			? WebFetchApi::fetch($gzfilename)
 			: file_get_contents($gzfilename);
 
-		if ($data === false)
+		if ($data === false) {
 			return false;
+		}
 
 		// Too short for magic numbers? No fortune cookie for you!
-		if (strlen($data) < 2)
+		if (strlen($data) < 2) {
 			return false;
+		}
 
-		if ($data[0] == "\x1f" && $data[1] == "\x8b")
+		if ($data[0] == "\x1f" && $data[1] == "\x8b") {
 			return self::read_tgz_data($data, $destination, $single_file, $overwrite, $files_to_extract);
+		}
+
 		// Okay, this ain't no tar.gz, but maybe it's a zip file.
-		elseif ($data[0] == 'P' && $data[1] == 'K')
+		if ($data[0] == 'P' && $data[1] == 'K') {
 			return self::read_zip_data($data, $destination, $single_file, $overwrite, $files_to_extract);
+		}
 
 		return false;
 	}
@@ -127,138 +172,161 @@ public static function read_tgz_data($data, $destination, $single_file = false,
 		Lang::load('Packages');
 
 		// This function sorta needs gzinflate!
-		if (!function_exists('gzinflate'))
-			ErrorHandler::fatalLang('package_no_lib', 'critical', array('package_no_zlib', 'package_no_package_manager'));
+		if (!function_exists('gzinflate')) {
+			ErrorHandler::fatalLang('package_no_lib', 'critical', ['package_no_zlib', 'package_no_package_manager']);
+		}
 
 		umask(0);
-		if (!$single_file && $destination !== null && !file_exists($destination))
+
+		if (!$single_file && $destination !== null && !file_exists($destination)) {
 			self::mktree($destination, 0777);
+		}
 
 		$flags = unpack('Ct/Cf', substr($data, 2, 2));
 
 		// Not deflate!
-		if ($flags['t'] != 8)
+		if ($flags['t'] != 8) {
 			return false;
+		}
 		$flags = $flags['f'];
 
 		$offset = 10;
-		$octdec = array('mode', 'uid', 'gid', 'size', 'mtime', 'checksum');
+		$octdec = ['mode', 'uid', 'gid', 'size', 'mtime', 'checksum'];
 
 		// "Read" the filename and comment.
 		// @todo Might be mussed.
-		if ($flags & 12)
-		{
-			while ($flags & 8 && $data[$offset++] != "\0")
+		if ($flags & 12) {
+			while ($flags & 8 && $data[$offset++] != "\0") {
 				continue;
-			while ($flags & 4 && $data[$offset++] != "\0")
+			}
+
+			while ($flags & 4 && $data[$offset++] != "\0") {
 				continue;
+			}
 		}
 
 		$crc = unpack('Vcrc32/Visize', substr($data, strlen($data) - 8, 8));
 		$data = @gzinflate(substr($data, $offset, strlen($data) - 8 - $offset));
 
 		// smf_crc32 and crc32 may not return the same results, so we accept either.
-		if ($crc['crc32'] != self::smf_crc32($data) && $crc['crc32'] != crc32($data))
+		if ($crc['crc32'] != self::smf_crc32($data) && $crc['crc32'] != crc32($data)) {
 			return false;
+		}
 
 		$blocks = strlen($data) / 512 - 1;
 		$offset = 0;
 
-		$return = array();
+		$return = [];
 
-		while ($offset < $blocks)
-		{
+		while ($offset < $blocks) {
 			$header = substr($data, $offset << 9, 512);
 			$current = unpack('a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100linkname/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor/a155path', $header);
 
 			// Blank record?  This is probably at the end of the file.
-			if (empty($current['filename']))
-			{
+			if (empty($current['filename'])) {
 				$offset += 512;
+
 				continue;
 			}
 
-			foreach ($current as $k => $v)
-			{
-				if (in_array($k, $octdec))
+			foreach ($current as $k => $v) {
+				if (in_array($k, $octdec)) {
 					$current[$k] = octdec(trim($v));
-				else
+				} else {
 					$current[$k] = trim($v);
+				}
 			}
 
-			if ($current['type'] == '5' && substr($current['filename'], -1) != '/')
+			if ($current['type'] == '5' && substr($current['filename'], -1) != '/') {
 				$current['filename'] .= '/';
+			}
 
 			$checksum = 256;
-			for ($i = 0; $i < 148; $i++)
+
+			for ($i = 0; $i < 148; $i++) {
 				$checksum += ord($header[$i]);
-			for ($i = 156; $i < 512; $i++)
+			}
+
+			for ($i = 156; $i < 512; $i++) {
 				$checksum += ord($header[$i]);
+			}
 
-			if ($current['checksum'] != $checksum)
+			if ($current['checksum'] != $checksum) {
 				break;
+			}
 
 			$size = ceil($current['size'] / 512);
 			$current['data'] = substr($data, ++$offset << 9, $current['size']);
 			$offset += $size;
 
 			// If hunting for a file in subdirectories, pass to subsequent write test...
-			if ($single_file && $destination !== null && (substr($destination, 0, 2) == '*/'))
+			if ($single_file && $destination !== null && (substr($destination, 0, 2) == '*/')) {
 				$write_this = true;
+			}
 			// Not a directory and doesn't exist already...
-			elseif (substr($current['filename'], -1, 1) != '/' && $destination !== null && !file_exists($destination . '/' . $current['filename']))
+			elseif (substr($current['filename'], -1, 1) != '/' && $destination !== null && !file_exists($destination . '/' . $current['filename'])) {
 				$write_this = true;
+			}
 			// File exists... check if it is newer.
-			elseif (substr($current['filename'], -1, 1) != '/')
+			elseif (substr($current['filename'], -1, 1) != '/') {
 				$write_this = $overwrite || ($destination !== null && filemtime($destination . '/' . $current['filename']) < $current['mtime']);
+			}
 			// Folder... create.
-			elseif ($destination !== null && !$single_file)
-			{
+			elseif ($destination !== null && !$single_file) {
 				// Protect from accidental parent directory writing...
-				$current['filename'] = strtr($current['filename'], array('../' => '', '/..' => ''));
+				$current['filename'] = strtr($current['filename'], ['../' => '', '/..' => '']);
 
-				if (!file_exists($destination . '/' . $current['filename']))
+				if (!file_exists($destination . '/' . $current['filename'])) {
 					self::mktree($destination . '/' . $current['filename'], 0777);
+				}
 				$write_this = false;
-			}
-			else
+			} else {
 				$write_this = false;
+			}
 
-			if ($write_this && $destination !== null)
-			{
-				if (strpos($current['filename'], '/') !== false && !$single_file)
+			if ($write_this && $destination !== null) {
+				if (strpos($current['filename'], '/') !== false && !$single_file) {
 					self::mktree($destination . '/' . dirname($current['filename']), 0777);
+				}
 
 				// Is this the file we're looking for?
-				if ($single_file && ($destination == $current['filename'] || $destination == '*/' . basename($current['filename'])))
+				if ($single_file && ($destination == $current['filename'] || $destination == '*/' . basename($current['filename']))) {
 					return $current['data'];
+				}
+
 				// If we're looking for another file, keep going.
-				elseif ($single_file)
+				if ($single_file) {
 					continue;
+				}
+
 				// Looking for restricted files?
-				elseif ($files_to_extract !== null && !in_array($current['filename'], $files_to_extract))
+				if ($files_to_extract !== null && !in_array($current['filename'], $files_to_extract)) {
 					continue;
+				}
 
 				self::package_put_contents($destination . '/' . $current['filename'], $current['data']);
 			}
 
-			if (substr($current['filename'], -1, 1) != '/')
-				$return[] = array(
+			if (substr($current['filename'], -1, 1) != '/') {
+				$return[] = [
 					'filename' => $current['filename'],
 					'md5' => md5($current['data']),
 					'preview' => substr($current['data'], 0, 100),
 					'size' => $current['size'],
-					'skipped' => false
-				);
+					'skipped' => false,
+				];
+			}
 		}
 
-		if ($destination !== null && !$single_file)
+		if ($destination !== null && !$single_file) {
 			self::package_flush_cache();
+		}
 
-		if ($single_file)
+		if ($single_file) {
 			return false;
-		else
-			return $return;
+		}
+
+		return $return;
 	}
 
 	/**
@@ -269,40 +337,44 @@ public static function read_tgz_data($data, $destination, $single_file = false,
 	 *
 	 * @param string $data ZIP data
 	 * @param string $destination Null to display a listing of files in the archive, the destination for the files in the archive or the name of a single file to display (if $single_file is true)
-	 * @param boolean $single_file If true, returns the contents of the file specified by destination or false if the file can't be found (default value is false).
-	 * @param boolean $overwrite If true, will overwrite files with newer modification times. Default is false.
+	 * @param bool $single_file If true, returns the contents of the file specified by destination or false if the file can't be found (default value is false).
+	 * @param bool $overwrite If true, will overwrite files with newer modification times. Default is false.
 	 * @param array $files_to_extract
 	 * @return mixed If destination is null, return a short array of a few file details optionally delimited by $files_to_extract. If $single_file is true, return contents of a file as a string; false otherwise
 	 */
 	public static function read_zip_data($data, $destination, $single_file = false, $overwrite = false, $files_to_extract = null)
 	{
 		umask(0);
-		if ($destination !== null && (substr($destination, 0, 2) != '*/') && !file_exists($destination) && !$single_file)
+
+		if ($destination !== null && (substr($destination, 0, 2) != '*/') && !file_exists($destination) && !$single_file) {
 			self::mktree($destination, 0777);
+		}
 
 		// Search for the end of directory signature 0x06054b50.
-		if (($data_ecr = strrpos($data, "\x50\x4b\x05\x06")) === false)
+		if (($data_ecr = strrpos($data, "\x50\x4b\x05\x06")) === false) {
 			return false;
-		$return = array();
+		}
+		$return = [];
 
 		// End of central directory record (EOCD)
 		$cdir = unpack('vdisk/@4/vdisk_entries/ventries/@12/Voffset', substr($data, $data_ecr + 4, 16));
 
 		// We only support a single disk.
-		if ($cdir['disk_entries'] != $cdir['entries'])
+		if ($cdir['disk_entries'] != $cdir['entries']) {
 			return false;
+		}
 
 		// First central file directory
 		$pos_entry = $cdir['offset'];
 
-		for ($i = 0; $i < $cdir['entries']; $i++)
-		{
+		for ($i = 0; $i < $cdir['entries']; $i++) {
 			// Central directory file header
 			$header = unpack('Vcompressed_size/@8/vlen1/vlen2/vlen3/vdisk/@22/Voffset', substr($data, $pos_entry + 20, 26));
 
 			// Sanity check: same disk?
-			if ($header['disk'] != $cdir['disk'])
+			if ($header['disk'] != $cdir['disk']) {
 				continue;
+			}
 
 			// Next central file directory
 			$pos_entry += 46 + $header['len1'] + $header['len2'] + $header['len3'];
@@ -310,7 +382,7 @@ public static function read_zip_data($data, $destination, $single_file = false,
 			// Local file header (so called because it is in the same file as the data in multi-part archives)
 			$file_info = unpack(
 				'vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len',
-				substr($data, $header['offset'] + 6, 24)
+				substr($data, $header['offset'] + 6, 24),
 			);
 
 			$file_info['filename'] = substr($data, $header['offset'] + 30, $file_info['filename_len']);
@@ -323,34 +395,37 @@ public static function read_zip_data($data, $destination, $single_file = false,
 			 * the CRC-32 and size are appended in a 12-byte structure (optionally
 			 * preceded by a 4-byte signature) immediately after the compressed data:
 			 */
-			if ($file_info['flag'] & 0x08)
-			{
+			if ($file_info['flag'] & 0x08) {
 				$gplen = $header['offset'] + 30 + $file_info['filename_len'] + $file_info['extra_len'] + $header['compressed_size'];
 
 				// The spec allows for an optional header in the general purpose record
-				if (substr($data, $gplen, 4) === "\x50\x4b\x07\x08")
+				if (substr($data, $gplen, 4) === "\x50\x4b\x07\x08") {
 					$gplen += 4;
+				}
 
-				if (($general_purpose = unpack('Vcrc/Vcompressed_size/Vsize', substr($data, $gplen, 12))) !== false)
+				if (($general_purpose = unpack('Vcrc/Vcompressed_size/Vsize', substr($data, $gplen, 12))) !== false) {
 					$file_info = $general_purpose + $file_info;
+				}
 			}
 
 			$write_this = false;
-			if ($destination !== null)
-			{
+
+			if ($destination !== null) {
 				// If hunting for a file in subdirectories, pass to subsequent write test...
-				if ($single_file && $destination !== null && (substr($destination, 0, 2) == '*/'))
+				if ($single_file && $destination !== null && (substr($destination, 0, 2) == '*/')) {
 					$write_this = true;
+				}
 				// If this is a file, and it doesn't exist.... happy days!
-				elseif ($is_file)
+				elseif ($is_file) {
 					$write_this = !file_exists($destination . '/' . $file_info['filename']) || $overwrite;
+				}
 				// This is a directory, so we're gonna want to create it. (probably...)
-				elseif (!$single_file)
-				{
-					$file_info['filename'] = strtr($file_info['filename'], array('../' => '', '/..' => ''));
+				elseif (!$single_file) {
+					$file_info['filename'] = strtr($file_info['filename'], ['../' => '', '/..' => '']);
 
-					if (!file_exists($destination . '/' . $file_info['filename']))
+					if (!file_exists($destination . '/' . $file_info['filename'])) {
 						self::mktree($destination . '/' . $file_info['filename'], 0777);
+					}
 				}
 			}
 
@@ -358,48 +433,56 @@ public static function read_zip_data($data, $destination, $single_file = false,
 			$file_info['data'] = substr(
 				$data,
 				$header['offset'] + 30 + $file_info['filename_len'] + $file_info['extra_len'],
-				$file_info['compressed_size']
+				$file_info['compressed_size'],
 			);
 
 			// Only for the deflate method (the most common)
-			if ($file_info['compression'] == 8)
+			if ($file_info['compression'] == 8) {
 				$file_info['data'] = gzinflate($file_info['data']);
+			}
 			// We do not support any other compression methods.
-			elseif ($file_info['compression'] != 0)
+			elseif ($file_info['compression'] != 0) {
 				continue;
+			}
 
 			// PKZip/ITU-T V.42 CRC-32
-			if (hash('crc32b', $file_info['data']) !== sprintf('%08x', $file_info['crc']))
+			if (hash('crc32b', $file_info['data']) !== sprintf('%08x', $file_info['crc'])) {
 				continue;
+			}
 
 			// Okay! We can write this file, looks good from here...
-			if ($write_this)
-			{
+			if ($write_this) {
 				// If we're looking for a specific file, and this is it... ka-bam, baby.
-				if ($single_file && ($destination == $file_info['filename'] || $destination == '*/' . basename($file_info['filename'])))
+				if ($single_file && ($destination == $file_info['filename'] || $destination == '*/' . basename($file_info['filename']))) {
 					return $file_info['data'];
+				}
+
 				// Oh, another file? Fine. You don't like this file, do you?  I know how it is.  Yeah... just go away.  No, don't apologize. I know this file's just not *good enough* for you.
-				elseif ($single_file || ($files_to_extract !== null && !in_array($file_info['filename'], $files_to_extract)))
+				if ($single_file || ($files_to_extract !== null && !in_array($file_info['filename'], $files_to_extract))) {
 					continue;
+				}
 
-				if (!$single_file && strpos($file_info['filename'], '/') !== false)
+				if (!$single_file && strpos($file_info['filename'], '/') !== false) {
 					self::mktree($destination . '/' . dirname($file_info['filename']), 0777);
+				}
 
 				self::package_put_contents($destination . '/' . $file_info['filename'], $file_info['data']);
 			}
 
-			if ($is_file)
-				$return[] = array(
+			if ($is_file) {
+				$return[] = [
 					'filename' => $file_info['filename'],
 					'md5' => md5($file_info['data']),
 					'preview' => substr($file_info['data'], 0, 100),
 					'size' => $file_info['size'],
-					'skipped' => false
-				);
+					'skipped' => false,
+				];
+			}
 		}
 
-		if ($destination !== null && !$single_file)
+		if ($destination !== null && !$single_file) {
 			self::package_flush_cache();
+		}
 
 		return $single_file ? false : $return;
 	}
@@ -416,16 +499,18 @@ public static function url_exists($url)
 		$url = new Url($url);
 		$url->toAscii();
 
-		if (!isset($url->scheme))
+		if (!isset($url->scheme)) {
 			return false;
+		}
 
 		// Attempt to connect...
 		$temp = '';
 
 		$fid = fsockopen($url->host, !isset($url->port) ? 80 : $url->port, $temp, $temp, 8);
 
-		if (!$fid)
+		if (!$fid) {
 			return false;
+		}
 
 		fputs($fid, 'HEAD ' . $url->path . ' HTTP/1.0' . "\r\n" . 'Host: ' . $url->host . "\r\n\r\n");
 		$head = fread($fid, 1024);
@@ -444,35 +529,37 @@ public static function url_exists($url)
 	public static function loadInstalledPackages()
 	{
 		// Load the packages from the database - note this is ordered by install time to ensure latest package uninstalled first.
-		$request = Db::$db->query('', '
-			SELECT id_install, package_id, filename, name, version, time_installed
+		$request = Db::$db->query(
+			'',
+			'SELECT id_install, package_id, filename, name, version, time_installed
 			FROM {db_prefix}log_packages
 			WHERE install_state != {int:not_installed}
 			ORDER BY time_installed DESC',
-			array(
+			[
 				'not_installed' => 0,
-			)
+			],
 		);
-		$installed = array();
-		$found = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$installed = [];
+		$found = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Already found this? If so don't add it twice!
-			if (in_array($row['package_id'], $found))
+			if (in_array($row['package_id'], $found)) {
 				continue;
+			}
 
 			$found[] = $row['package_id'];
 
 			$row = Utils::htmlspecialcharsRecursive($row);
 
-			$installed[] = array(
+			$installed[] = [
 				'id' => $row['id_install'],
 				'name' => Utils::htmlspecialchars($row['name']),
 				'filename' => $row['filename'],
 				'package_id' => $row['package_id'],
 				'version' => Utils::htmlspecialchars($row['version']),
 				'time_installed' => !empty($row['time_installed']) ? $row['time_installed'] : 0,
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -492,38 +579,41 @@ public static function loadInstalledPackages()
 	public static function getPackageInfo($gzfilename)
 	{
 		// Extract package-info.xml from downloaded file. (*/ is used because it could be in any directory.)
-		if (strpos($gzfilename, 'http://') !== false || strpos($gzfilename, 'https://') !== false)
+		if (strpos($gzfilename, 'http://') !== false || strpos($gzfilename, 'https://') !== false) {
 			$packageInfo = self::read_tgz_data($gzfilename, 'package-info.xml', true);
-		else
-		{
-			if (!file_exists(Config::$packagesdir . '/' . $gzfilename))
+		} else {
+			if (!file_exists(Config::$packagesdir . '/' . $gzfilename)) {
 				return 'package_get_error_not_found';
+			}
 
-			if (is_file(Config::$packagesdir . '/' . $gzfilename))
+			if (is_file(Config::$packagesdir . '/' . $gzfilename)) {
 				$packageInfo = self::read_tgz_file(Config::$packagesdir . '/' . $gzfilename, '*/package-info.xml', true);
-			elseif (file_exists(Config::$packagesdir . '/' . $gzfilename . '/package-info.xml'))
+			} elseif (file_exists(Config::$packagesdir . '/' . $gzfilename . '/package-info.xml')) {
 				$packageInfo = file_get_contents(Config::$packagesdir . '/' . $gzfilename . '/package-info.xml');
-			else
+			} else {
 				return 'package_get_error_missing_xml';
+			}
 		}
 
 		// Nothing?
-		if (empty($packageInfo))
-		{
+		if (empty($packageInfo)) {
 			// Perhaps they are trying to install a theme, lets tell them nicely this is the wrong function
 			$packageInfo = self::read_tgz_file(Config::$packagesdir . '/' . $gzfilename, '*/theme_info.xml', true);
-			if (!empty($packageInfo))
+
+			if (!empty($packageInfo)) {
 				return 'package_get_error_is_theme';
-			else
-				return 'package_get_error_is_zero';
+			}
+
+			return 'package_get_error_is_zero';
 		}
 
 		// Parse package-info.xml into an XmlArray.
 		$packageInfo = new XmlArray($packageInfo);
 
 		// @todo Error message of some sort?
-		if (!$packageInfo->exists('package-info[0]'))
+		if (!$packageInfo->exists('package-info[0]')) {
 			return 'package_get_error_packageinfo_corrupt';
+		}
 
 		$packageInfo = $packageInfo->path('package-info[0]');
 
@@ -533,17 +623,17 @@ public static function getPackageInfo($gzfilename)
 		$package['filename'] = $gzfilename;
 
 		// Don't want to mess with code...
-		$types = array('install', 'uninstall', 'upgrade');
-		foreach ($types as $type)
-		{
-			if (isset($package[$type]['code']))
-			{
+		$types = ['install', 'uninstall', 'upgrade'];
+
+		foreach ($types as $type) {
+			if (isset($package[$type]['code'])) {
 				$package[$type]['code'] = Utils::htmlspecialcharsDecode($package[$type]['code']);
 			}
 		}
 
-		if (!isset($package['type']))
+		if (!isset($package['type'])) {
 			$package['type'] = 'modification';
+		}
 
 		return $package;
 	}
@@ -556,108 +646,103 @@ public static function getPackageInfo($gzfilename)
 	 * @param bool $restore_write_status Whether to restore write status
 	 * @return array An array of file info
 	 */
-	public static function create_chmod_control($chmodFiles = array(), $chmodOptions = array(), $restore_write_status = false)
+	public static function create_chmod_control($chmodFiles = [], $chmodOptions = [], $restore_write_status = false)
 	{
 		// If we're restoring the status of existing files prepare the data.
-		if ($restore_write_status && isset($_SESSION['pack_ftp']) && !empty($_SESSION['pack_ftp']['original_perms']))
-		{
-			$listOptions = array(
+		if ($restore_write_status && isset($_SESSION['pack_ftp']) && !empty($_SESSION['pack_ftp']['original_perms'])) {
+			$listOptions = [
 				'id' => 'restore_file_permissions',
 				'title' => Lang::$txt['package_restore_permissions'],
-				'get_items' => array(
+				'get_items' => [
 					'function' => __CLASS__ . '::list_restoreFiles',
-					'params' => array(
+					'params' => [
 						!empty($_POST['restore_perms']),
-					),
-				),
-				'columns' => array(
-					'path' => array(
-						'header' => array(
+					],
+				],
+				'columns' => [
+					'path' => [
+						'header' => [
 							'value' => Lang::$txt['package_restore_permissions_filename'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'path',
 							'class' => 'smalltext',
-						),
-					),
-					'old_perms' => array(
-						'header' => array(
+						],
+					],
+					'old_perms' => [
+						'header' => [
 							'value' => Lang::$txt['package_restore_permissions_orig_status'],
-						),
-						'data' => array(
+						],
+						'data' => [
 							'db' => 'old_perms',
 							'class' => 'smalltext',
-						),
-					),
-					'cur_perms' => array(
-						'header' => array(
+						],
+					],
+					'cur_perms' => [
+						'header' => [
 							'value' => Lang::$txt['package_restore_permissions_cur_status'],
-						),
-						'data' => array(
-							'function' => function($rowData)
-							{
+						],
+						'data' => [
+							'function' => function ($rowData) {
 								$formatTxt = $rowData['result'] == '' || $rowData['result'] == 'skipped' ? Lang::$txt['package_restore_permissions_pre_change'] : Lang::$txt['package_restore_permissions_post_change'];
+
 								return sprintf($formatTxt, $rowData['cur_perms'], $rowData['new_perms'], $rowData['writable_message']);
 							},
 							'class' => 'smalltext',
-						),
-					),
-					'check' => array(
-						'header' => array(
+						],
+					],
+					'check' => [
+						'header' => [
 							'value' => '<input type="checkbox" onclick="invertAll(this, this.form);">',
 							'class' => 'centercol',
-						),
-						'data' => array(
-							'sprintf' => array(
+						],
+						'data' => [
+							'sprintf' => [
 								'format' => '<input type="checkbox" name="restore_files[]" value="%1$s">',
-								'params' => array(
+								'params' => [
 									'path' => false,
-								),
-							),
+								],
+							],
 							'class' => 'centercol',
-						),
-					),
-					'result' => array(
-						'header' => array(
+						],
+					],
+					'result' => [
+						'header' => [
 							'value' => Lang::$txt['package_restore_permissions_result'],
-						),
-						'data' => array(
-							'function' => function($rowData)
-							{
+						],
+						'data' => [
+							'function' => function ($rowData) {
 								return Lang::$txt['package_restore_permissions_action_' . $rowData['result']];
 							},
 							'class' => 'smalltext',
-						),
-					),
-				),
-				'form' => array(
+						],
+					],
+				],
+				'form' => [
 					'href' => !empty($chmodOptions['destination_url']) ? $chmodOptions['destination_url'] : Config::$scripturl . '?action=admin;area=packages;sa=perms;restore;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-				),
-				'additional_rows' => array(
-					array(
+				],
+				'additional_rows' => [
+					[
 						'position' => 'below_table_data',
 						'value' => '<input type="submit" name="restore_perms" value="' . Lang::$txt['package_restore_permissions_restore'] . '" class="button">',
 						'class' => 'titlebg',
-					),
-					array(
+					],
+					[
 						'position' => 'after_title',
 						'value' => '<span class="smalltext">' . Lang::$txt['package_restore_permissions_desc'] . '</span>',
 						'class' => 'windowbg',
-					),
-				),
-			);
+					],
+				],
+			];
 
 			// Work out what columns and the like to show.
-			if (!empty($_POST['restore_perms']))
-			{
+			if (!empty($_POST['restore_perms'])) {
 				$listOptions['additional_rows'][1]['value'] = sprintf(Lang::$txt['package_restore_permissions_action_done'], Config::$scripturl . '?action=admin;area=packages;sa=perms;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 				unset($listOptions['columns']['check'], $listOptions['form'], $listOptions['additional_rows'][0]);
 
 				Utils::$context['sub_template'] = 'show_list';
 				Utils::$context['default_list'] = 'restore_file_permissions';
-			}
-			else
-			{
+			} else {
 				unset($listOptions['columns']['result']);
 			}
 
@@ -665,52 +750,51 @@ public static function create_chmod_control($chmodFiles = array(), $chmodOptions
 			new ItemList($listOptions);
 
 			// If we just restored permissions then whereever we are, we are now done and dusted.
-			if (!empty($_POST['restore_perms']))
+			if (!empty($_POST['restore_perms'])) {
 				Utils::obExit();
+			}
 		}
 		// Otherwise, it's entirely irrelevant?
-		elseif ($restore_write_status)
+		elseif ($restore_write_status) {
 			return true;
+		}
 
 		// This is where we report what we got up to.
-		$return_data = array(
-			'files' => array(
-				'writable' => array(),
-				'notwritable' => array(),
-			),
-		);
+		$return_data = [
+			'files' => [
+				'writable' => [],
+				'notwritable' => [],
+			],
+		];
 
 		// If we have some FTP information already, then let's assume it was required and try to get ourselves connected.
-		if (!empty($_SESSION['pack_ftp']['connected']))
-		{
+		if (!empty($_SESSION['pack_ftp']['connected'])) {
 			self::$package_ftp = new FtpConnection($_SESSION['pack_ftp']['server'], $_SESSION['pack_ftp']['port'], $_SESSION['pack_ftp']['username'], self::package_crypt($_SESSION['pack_ftp']['password']));
 		}
 
 		// Just got a submission did we?
-		if (empty(self::$package_ftp) && isset($_POST['ftp_username']))
-		{
+		if (empty(self::$package_ftp) && isset($_POST['ftp_username'])) {
 			$ftp = new FtpConnection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
 
 			// We're connected, jolly good!
-			if ($ftp->error === false)
-			{
+			if ($ftp->error === false) {
 				// Common mistake, so let's try to remedy it...
-				if (!$ftp->chdir($_POST['ftp_path']))
-				{
+				if (!$ftp->chdir($_POST['ftp_path'])) {
 					$ftp_error = $ftp->last_message;
 					$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $_POST['ftp_path']));
 				}
 
-				if (!in_array($_POST['ftp_path'], array('', '/')))
-				{
-					$ftp_root = strtr(Config::$boarddir, array($_POST['ftp_path'] => ''));
-					if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || substr($_POST['ftp_path'], 0, 1) == '/'))
+				if (!in_array($_POST['ftp_path'], ['', '/'])) {
+					$ftp_root = strtr(Config::$boarddir, [$_POST['ftp_path'] => '']);
+
+					if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || substr($_POST['ftp_path'], 0, 1) == '/')) {
 						$ftp_root = substr($ftp_root, 0, -1);
-				}
-				else
+					}
+				} else {
 					$ftp_root = Config::$boarddir;
+				}
 
-				$_SESSION['pack_ftp'] = array(
+				$_SESSION['pack_ftp'] = [
 					'server' => $_POST['ftp_server'],
 					'port' => $_POST['ftp_port'],
 					'username' => $_POST['ftp_username'],
@@ -718,10 +802,11 @@ public static function create_chmod_control($chmodFiles = array(), $chmodOptions
 					'path' => $_POST['ftp_path'],
 					'root' => $ftp_root,
 					'connected' => true,
-				);
+				];
 
-				if (!isset(Config::$modSettings['package_path']) || Config::$modSettings['package_path'] != $_POST['ftp_path'])
-					Config::updateModSettings(array('package_path' => $_POST['ftp_path']));
+				if (!isset(Config::$modSettings['package_path']) || Config::$modSettings['package_path'] != $_POST['ftp_path']) {
+					Config::updateModSettings(['package_path' => $_POST['ftp_path']]);
+				}
 
 				// This is now the primary connection.
 				self::$package_ftp = $ftp;
@@ -729,18 +814,16 @@ public static function create_chmod_control($chmodFiles = array(), $chmodOptions
 		}
 
 		// Now try to simply make the files writable, with whatever we might have.
-		if (!empty($chmodFiles))
-		{
-			foreach ($chmodFiles as $k => $file)
-			{
+		if (!empty($chmodFiles)) {
+			foreach ($chmodFiles as $k => $file) {
 				// Sometimes this can somehow happen maybe?
-				if (empty($file))
+				if (empty($file)) {
 					unset($chmodFiles[$k]);
+				}
 				// Already writable?
-				elseif (@is_writable($file))
+				elseif (@is_writable($file)) {
 					$return_data['files']['writable'][] = $file;
-				else
-				{
+				} else {
 					// Now try to change that.
 					$return_data['files'][self::package_chmod($file, 'writable', true) ? 'writable' : 'notwritable'][] = $file;
 				}
@@ -748,45 +831,44 @@ public static function create_chmod_control($chmodFiles = array(), $chmodOptions
 		}
 
 		// Have we still got nasty files which ain't writable? Dear me we need more FTP good sir.
-		if (empty(self::$package_ftp) && (!empty($return_data['files']['notwritable']) || !empty($chmodOptions['force_find_error'])))
-		{
-			if (!isset($ftp) || $ftp->error !== false)
-			{
-				if (!isset($ftp))
-				{
+		if (empty(self::$package_ftp) && (!empty($return_data['files']['notwritable']) || !empty($chmodOptions['force_find_error']))) {
+			if (!isset($ftp) || $ftp->error !== false) {
+				if (!isset($ftp)) {
 					$ftp = new FtpConnection(null);
-				}
-				elseif ($ftp->error !== false && !isset($ftp_error))
+				} elseif ($ftp->error !== false && !isset($ftp_error)) {
 					$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				}
 
-				list ($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
+				list($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
 
-				if ($found_path)
+				if ($found_path) {
 					$_POST['ftp_path'] = $detect_path;
-				elseif (!isset($_POST['ftp_path']))
-					$_POST['ftp_path'] = isset(Config::$modSettings['package_path']) ? Config::$modSettings['package_path'] : $detect_path;
+				} elseif (!isset($_POST['ftp_path'])) {
+					$_POST['ftp_path'] = Config::$modSettings['package_path'] ?? $detect_path;
+				}
 
-				if (!isset($_POST['ftp_username']))
+				if (!isset($_POST['ftp_username'])) {
 					$_POST['ftp_username'] = $username;
+				}
 			}
 
-			Utils::$context['package_ftp'] = array(
-				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset(Config::$modSettings['package_server']) ? Config::$modSettings['package_server'] : 'localhost'),
-				'port' => isset($_POST['ftp_port']) ? $_POST['ftp_port'] : (isset(Config::$modSettings['package_port']) ? Config::$modSettings['package_port'] : '21'),
-				'username' => isset($_POST['ftp_username']) ? $_POST['ftp_username'] : (isset(Config::$modSettings['package_username']) ? Config::$modSettings['package_username'] : ''),
+			Utils::$context['package_ftp'] = [
+				'server' => $_POST['ftp_server'] ?? (Config::$modSettings['package_server'] ?? 'localhost'),
+				'port' => $_POST['ftp_port'] ?? (Config::$modSettings['package_port'] ?? '21'),
+				'username' => $_POST['ftp_username'] ?? (Config::$modSettings['package_username'] ?? ''),
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 				'destination' => !empty($chmodOptions['destination_url']) ? $chmodOptions['destination_url'] : '',
-			);
+			];
 
 			// Which files failed?
-			if (!isset(Utils::$context['notwritable_files']))
-				Utils::$context['notwritable_files'] = array();
+			if (!isset(Utils::$context['notwritable_files'])) {
+				Utils::$context['notwritable_files'] = [];
+			}
 			Utils::$context['notwritable_files'] = array_merge(Utils::$context['notwritable_files'], $return_data['files']['notwritable']);
 
 			// Sent here to die?
-			if (!empty($chmodOptions['crash_on_error']))
-			{
+			if (!empty($chmodOptions['crash_on_error'])) {
 				Utils::$context['page_title'] = Lang::$txt['package_ftp_necessary'];
 				Utils::$context['sub_template'] = 'ftp_required';
 				Utils::obExit();
@@ -806,52 +888,47 @@ public static function create_chmod_control($chmodFiles = array(), $chmodOptions
 	 */
 	public static function list_restoreFiles($dummy1, $dummy2, $dummy3, $do_change)
 	{
-		$restore_files = array();
-		foreach ($_SESSION['pack_ftp']['original_perms'] as $file => $perms)
-		{
+		$restore_files = [];
+
+		foreach ($_SESSION['pack_ftp']['original_perms'] as $file => $perms) {
 			// Check the file still exists, and the permissions were indeed different than now.
 			$file_permissions = @fileperms($file);
-			if (!file_exists($file) || $file_permissions == $perms)
-			{
+
+			if (!file_exists($file) || $file_permissions == $perms) {
 				unset($_SESSION['pack_ftp']['original_perms'][$file]);
+
 				continue;
 			}
 
 			// Are we wanting to change the permission?
-			if ($do_change && isset($_POST['restore_files']) && in_array($file, $_POST['restore_files']))
-			{
+			if ($do_change && isset($_POST['restore_files']) && in_array($file, $_POST['restore_files'])) {
 				// Use FTP if we have it.
-				if (!empty(self::$package_ftp))
-				{
-					$ftp_file = strtr($file, array($_SESSION['pack_ftp']['root'] => ''));
+				if (!empty(self::$package_ftp)) {
+					$ftp_file = strtr($file, [$_SESSION['pack_ftp']['root'] => '']);
 					self::$package_ftp->chmod($ftp_file, $perms);
-				}
-				else
-				{
+				} else {
 					Utils::makeWritable($file, $perms);
 				}
 
 				$new_permissions = @fileperms($file);
 				$result = $new_permissions == $perms ? 'success' : 'failure';
 				unset($_SESSION['pack_ftp']['original_perms'][$file]);
-			}
-			elseif ($do_change)
-			{
+			} elseif ($do_change) {
 				$new_permissions = '';
 				$result = 'skipped';
 				unset($_SESSION['pack_ftp']['original_perms'][$file]);
 			}
 
 			// Record the results!
-			$restore_files[] = array(
+			$restore_files[] = [
 				'path' => $file,
 				'old_perms_raw' => $perms,
 				'old_perms' => substr(sprintf('%o', $perms), -4),
 				'cur_perms' => substr(sprintf('%o', $file_permissions), -4),
 				'new_perms' => isset($new_permissions) ? substr(sprintf('%o', $new_permissions), -4) : '',
-				'result' => isset($result) ? $result : '',
+				'result' => $result ?? '',
 				'writable_message' => '<span style="color: ' . (@is_writable($file) ? 'green' : 'red') . '">' . (@is_writable($file) ? Lang::$txt['package_file_perms_writable'] : Lang::$txt['package_file_perms_not_writable']) . '</span>',
-			);
+			];
 		}
 
 		return $restore_files;
@@ -868,170 +945,167 @@ public static function list_restoreFiles($dummy1, $dummy2, $dummy3, $do_change)
 	public static function packageRequireFTP($destination_url, $files = null, $return = false)
 	{
 		// Try to make them writable the manual way.
-		if ($files !== null)
-		{
-			foreach ($files as $k => $file)
-			{
+		if ($files !== null) {
+			foreach ($files as $k => $file) {
 				// If this file doesn't exist, then we actually want to look at the directory, no?
-				if (!file_exists($file))
+				if (!file_exists($file)) {
 					$file = dirname($file);
+				}
 
 				Utils::makeWritable($file);
 
 				$fp = is_dir($file) ? @opendir($file) : @fopen($file, 'rb');
 
-				if (@is_writable($file) && $fp)
-				{
+				if (@is_writable($file) && $fp) {
 					unset($files[$k]);
 
-					if (!is_dir($file))
-					{
+					if (!is_dir($file)) {
 						fclose($fp);
-					}
-					else
-					{
+					} else {
 						closedir($fp);
 					}
 				}
 			}
 
 			// No FTP required!
-			if (empty($files))
-				return array();
+			if (empty($files)) {
+				return [];
+			}
 		}
 
 		// They've opted to not use FTP, and try anyway.
-		if (isset($_SESSION['pack_ftp']) && $_SESSION['pack_ftp'] == false)
-		{
-			if ($files === null)
-				return array();
+		if (isset($_SESSION['pack_ftp']) && $_SESSION['pack_ftp'] == false) {
+			if ($files === null) {
+				return [];
+			}
 
-			foreach ($files as $k => $file)
-			{
+			foreach ($files as $k => $file) {
 				// This looks odd, but it's an attempt to work around PHP suExec.
-				if (!file_exists($file))
-				{
+				if (!file_exists($file)) {
 					self::mktree(dirname($file), 0755);
 					@touch($file);
 				}
 
-				if (Utils::makeWritable($file))
+				if (Utils::makeWritable($file)) {
 					unset($files[$k]);
+				}
 			}
 
 			return $files;
 		}
-		elseif (isset($_SESSION['pack_ftp']))
-		{
+
+		if (isset($_SESSION['pack_ftp'])) {
 			self::$package_ftp = new FtpConnection($_SESSION['pack_ftp']['server'], $_SESSION['pack_ftp']['port'], $_SESSION['pack_ftp']['username'], self::package_crypt($_SESSION['pack_ftp']['password']));
 
-			if ($files === null)
-				return array();
+			if ($files === null) {
+				return [];
+			}
 
-			foreach ($files as $k => $file)
-			{
-				$ftp_file = strtr($file, array($_SESSION['pack_ftp']['root'] => ''));
+			foreach ($files as $k => $file) {
+				$ftp_file = strtr($file, [$_SESSION['pack_ftp']['root'] => '']);
 
 				// This looks odd, but it's an attempt to work around PHP suExec.
-				if (!file_exists($file))
-				{
+				if (!file_exists($file)) {
 					self::mktree(dirname($file), 0755);
 					self::$package_ftp->create_file($ftp_file);
 					self::$package_ftp->chmod($ftp_file, 0755);
 				}
 
-				if (!@is_writable($file))
+				if (!@is_writable($file)) {
 					self::$package_ftp->chmod($ftp_file, 0777);
-				if (!@is_writable(dirname($file)))
+				}
+
+				if (!@is_writable(dirname($file))) {
 					self::$package_ftp->chmod(dirname($ftp_file), 0777);
+				}
 
-				if (@is_writable($file))
+				if (@is_writable($file)) {
 					unset($files[$k]);
+				}
 			}
 
 			return $files;
 		}
 
-		if (isset($_POST['ftp_none']))
-		{
+		if (isset($_POST['ftp_none'])) {
 			$_SESSION['pack_ftp'] = false;
 
 			$files = self::packageRequireFTP($destination_url, $files, $return);
+
 			return $files;
 		}
-		elseif (isset($_POST['ftp_username']))
-		{
+
+		if (isset($_POST['ftp_username'])) {
 			$ftp = new FtpConnection($_POST['ftp_server'], $_POST['ftp_port'], $_POST['ftp_username'], $_POST['ftp_password']);
 
-			if ($ftp->error === false)
-			{
+			if ($ftp->error === false) {
 				// Common mistake, so let's try to remedy it...
-				if (!$ftp->chdir($_POST['ftp_path']))
-				{
+				if (!$ftp->chdir($_POST['ftp_path'])) {
 					$ftp_error = $ftp->last_message;
 					$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $_POST['ftp_path']));
 				}
 			}
 		}
 
-		if (!isset($ftp) || $ftp->error !== false)
-		{
-			if (!isset($ftp))
-			{
+		if (!isset($ftp) || $ftp->error !== false) {
+			if (!isset($ftp)) {
 				$ftp = new FtpConnection(null);
-			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
 				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+			}
 
-			list ($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
+			list($username, $detect_path, $found_path) = $ftp->detect_path(Config::$boarddir);
 
-			if ($found_path)
+			if ($found_path) {
 				$_POST['ftp_path'] = $detect_path;
-			elseif (!isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = isset(Config::$modSettings['package_path']) ? Config::$modSettings['package_path'] : $detect_path;
+			} elseif (!isset($_POST['ftp_path'])) {
+				$_POST['ftp_path'] = Config::$modSettings['package_path'] ?? $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
+			if (!isset($_POST['ftp_username'])) {
 				$_POST['ftp_username'] = $username;
+			}
 
-			Utils::$context['package_ftp'] = array(
-				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset(Config::$modSettings['package_server']) ? Config::$modSettings['package_server'] : 'localhost'),
-				'port' => isset($_POST['ftp_port']) ? $_POST['ftp_port'] : (isset(Config::$modSettings['package_port']) ? Config::$modSettings['package_port'] : '21'),
-				'username' => isset($_POST['ftp_username']) ? $_POST['ftp_username'] : (isset(Config::$modSettings['package_username']) ? Config::$modSettings['package_username'] : ''),
+			Utils::$context['package_ftp'] = [
+				'server' => $_POST['ftp_server'] ?? (Config::$modSettings['package_server'] ?? 'localhost'),
+				'port' => $_POST['ftp_port'] ?? (Config::$modSettings['package_port'] ?? '21'),
+				'username' => $_POST['ftp_username'] ?? (Config::$modSettings['package_username'] ?? ''),
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 				'destination' => $destination_url,
-			);
+			];
 
 			// If we're returning dump out here.
-			if ($return)
+			if ($return) {
 				return $files;
+			}
 
 			Utils::$context['page_title'] = Lang::$txt['package_ftp_necessary'];
 			Utils::$context['sub_template'] = 'ftp_required';
 			Utils::obExit();
-		}
-		else
-		{
-			if (!in_array($_POST['ftp_path'], array('', '/')))
-			{
-				$ftp_root = strtr(Config::$boarddir, array($_POST['ftp_path'] => ''));
-				if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || $_POST['ftp_path'][0] == '/'))
+		} else {
+			if (!in_array($_POST['ftp_path'], ['', '/'])) {
+				$ftp_root = strtr(Config::$boarddir, [$_POST['ftp_path'] => '']);
+
+				if (substr($ftp_root, -1) == '/' && ($_POST['ftp_path'] == '' || $_POST['ftp_path'][0] == '/')) {
 					$ftp_root = substr($ftp_root, 0, -1);
-			}
-			else
+				}
+			} else {
 				$ftp_root = Config::$boarddir;
+			}
 
-			$_SESSION['pack_ftp'] = array(
+			$_SESSION['pack_ftp'] = [
 				'server' => $_POST['ftp_server'],
 				'port' => $_POST['ftp_port'],
 				'username' => $_POST['ftp_username'],
 				'password' => self::package_crypt($_POST['ftp_password']),
 				'path' => $_POST['ftp_path'],
 				'root' => $ftp_root,
-			);
+			];
 
-			if (!isset(Config::$modSettings['package_path']) || Config::$modSettings['package_path'] != $_POST['ftp_path'])
-				Config::updateModSettings(array('package_path' => $_POST['ftp_path']));
+			if (!isset(Config::$modSettings['package_path']) || Config::$modSettings['package_path'] != $_POST['ftp_path']) {
+				Config::updateModSettings(['package_path' => $_POST['ftp_path']]);
+			}
 
 			$files = self::packageRequireFTP($destination_url, $files, $return);
 		}
@@ -1057,119 +1131,118 @@ public static function packageRequireFTP($destination_url, $files = null, $retur
 	public static function parsePackageInfo(&$packageXML, $testing_only = true, $method = 'install', $previous_version = '')
 	{
 		// Mayday!  That action doesn't exist!!
-		if (empty($packageXML) || !$packageXML->exists($method))
-			return array();
+		if (empty($packageXML) || !$packageXML->exists($method)) {
+			return [];
+		}
 
 		// We haven't found the package script yet...
 		$script = false;
 		$the_version = SMF_VERSION;
 
 		// Emulation support...
-		if (!empty($_SESSION['version_emulate']))
+		if (!empty($_SESSION['version_emulate'])) {
 			$the_version = $_SESSION['version_emulate'];
+		}
 
 		// Single package emulation
-		if (!empty($_REQUEST['ve']) && !empty($_REQUEST['package']))
-		{
+		if (!empty($_REQUEST['ve']) && !empty($_REQUEST['package'])) {
 			$the_version = $_REQUEST['ve'];
 			$_SESSION['single_version_emulate'][$_REQUEST['package']] = $the_version;
 		}
-		if (!empty($_REQUEST['package']) && (!empty($_SESSION['single_version_emulate'][$_REQUEST['package']])))
+
+		if (!empty($_REQUEST['package']) && (!empty($_SESSION['single_version_emulate'][$_REQUEST['package']]))) {
 			$the_version = $_SESSION['single_version_emulate'][$_REQUEST['package']];
+		}
 
 		// Get all the versions of this method and find the right one.
 		$these_methods = $packageXML->set($method);
-		foreach ($these_methods as $this_method)
-		{
+
+		foreach ($these_methods as $this_method) {
 			// They specified certain versions this part is for.
-			if ($this_method->exists('@for'))
-			{
+			if ($this_method->exists('@for')) {
 				// Don't keep going if this won't work for this version of SMF.
-				if (!self::matchPackageVersion($the_version, $this_method->fetch('@for')))
+				if (!self::matchPackageVersion($the_version, $this_method->fetch('@for'))) {
 					continue;
+				}
 			}
 
 			// Upgrades may go from a certain old version of the mod.
-			if ($method == 'upgrade' && $this_method->exists('@from'))
-			{
+			if ($method == 'upgrade' && $this_method->exists('@from')) {
 				// Well, this is for the wrong old version...
-				if (!self::matchPackageVersion($previous_version, $this_method->fetch('@from')))
+				if (!self::matchPackageVersion($previous_version, $this_method->fetch('@from'))) {
 					continue;
+				}
 			}
 
 			// We've found it!
 			$script = $this_method;
+
 			break;
 		}
 
 		// Bad news, a matching script wasn't found!
-		if (!($script instanceof XmlArray))
-			return array();
+		if (!($script instanceof XmlArray)) {
+			return [];
+		}
 
 		// Find all the actions in this method - in theory, these should only be allowed actions. (* means all.)
 		$actions = $script->set('*');
-		$return = array();
+		$return = [];
 
 		$temp_auto = 0;
-		self::$temp_path = Config::$packagesdir . '/temp/' . (isset(Utils::$context['base_path']) ? Utils::$context['base_path'] : '');
+		self::$temp_path = Config::$packagesdir . '/temp/' . (Utils::$context['base_path'] ?? '');
 
-		Utils::$context['readmes'] = array();
-		Utils::$context['licences'] = array();
+		Utils::$context['readmes'] = [];
+		Utils::$context['licences'] = [];
 
 		// This is the testing phase... nothing shall be done yet.
-		foreach ($actions as $action)
-		{
+		foreach ($actions as $action) {
 			$actionType = $action->name();
 
-			if (in_array($actionType, array('readme', 'code', 'database', 'modification', 'redirect', 'license')))
-			{
+			if (in_array($actionType, ['readme', 'code', 'database', 'modification', 'redirect', 'license'])) {
 				// Allow for translated readme and license files.
-				if ($actionType == 'readme' || $actionType == 'license')
-				{
+				if ($actionType == 'readme' || $actionType == 'license') {
 					$type = $actionType . 's';
-					if ($action->exists('@lang'))
-					{
+
+					if ($action->exists('@lang')) {
 						// Auto-select the language based on either request variable or current language.
-						if ((isset($_REQUEST['readme']) && $action->fetch('@lang') == $_REQUEST['readme']) || (isset($_REQUEST['license']) && $action->fetch('@lang') == $_REQUEST['license']) || (!isset($_REQUEST['readme']) && $action->fetch('@lang') == Config::$language) || (!isset($_REQUEST['license']) && $action->fetch('@lang') == Config::$language))
-						{
+						if ((isset($_REQUEST['readme']) && $action->fetch('@lang') == $_REQUEST['readme']) || (isset($_REQUEST['license']) && $action->fetch('@lang') == $_REQUEST['license']) || (!isset($_REQUEST['readme']) && $action->fetch('@lang') == Config::$language) || (!isset($_REQUEST['license']) && $action->fetch('@lang') == Config::$language)) {
 							// In case the user put the blocks in the wrong order.
-							if (isset(Utils::$context[$type]['selected']) && Utils::$context[$type]['selected'] == 'default')
+							if (isset(Utils::$context[$type]['selected']) && Utils::$context[$type]['selected'] == 'default') {
 								Utils::$context[$type][] = 'default';
+							}
 
 							Utils::$context[$type]['selected'] = Utils::htmlspecialchars($action->fetch('@lang'));
-						}
-						else
-						{
+						} else {
 							// We don't want this now, but we'll allow the user to select to read it.
 							Utils::$context[$type][] = Utils::htmlspecialchars($action->fetch('@lang'));
+
 							continue;
 						}
 					}
 					// Fallback when we have no lang parameter.
-					else
-					{
+					else {
 						// Already selected one for use?
-						if (isset(Utils::$context[$type]['selected']))
-						{
+						if (isset(Utils::$context[$type]['selected'])) {
 							Utils::$context[$type][] = 'default';
+
 							continue;
 						}
-						else
-							Utils::$context[$type]['selected'] = 'default';
+
+						Utils::$context[$type]['selected'] = 'default';
 					}
 				}
 
 				// @todo Make sure the file actually exists?  Might not work when testing?
-				if ($action->exists('@type') && $action->fetch('@type') == 'inline')
-				{
-					$filename = self::$temp_path . '$auto_' . $temp_auto++ . (in_array($actionType, array('readme', 'redirect', 'license')) ? '.txt' : ($actionType == 'code' || $actionType == 'database' ? '.php' : '.mod'));
+				if ($action->exists('@type') && $action->fetch('@type') == 'inline') {
+					$filename = self::$temp_path . '$auto_' . $temp_auto++ . (in_array($actionType, ['readme', 'redirect', 'license']) ? '.txt' : ($actionType == 'code' || $actionType == 'database' ? '.php' : '.mod'));
 					self::package_put_contents($filename, $action->fetch('.'));
-					$filename = strtr($filename, array(self::$temp_path => ''));
-				}
-				else
+					$filename = strtr($filename, [self::$temp_path => '']);
+				} else {
 					$filename = $action->fetch('.');
+				}
 
-				$return[] = array(
+				$return[] = [
 					'type' => $actionType,
 					'filename' => $filename,
 					'description' => '',
@@ -1179,13 +1252,13 @@ public static function parsePackageInfo(&$packageXML, $testing_only = true, $met
 					'redirect_timeout' => $action->exists('@timeout') ? (int) $action->fetch('@timeout') : '',
 					'parse_bbc' => $action->exists('@parsebbc') && $action->fetch('@parsebbc') == 'true',
 					'language' => (($actionType == 'readme' || $actionType == 'license') && $action->exists('@lang') && $action->fetch('@lang') == Config::$language) ? Config::$language : '',
-				);
+				];
 
 				continue;
 			}
-			elseif ($actionType == 'hook')
-			{
-				$return[] = array(
+
+			if ($actionType == 'hook') {
+				$return[] = [
 					'type' => $actionType,
 					'function' => $action->exists('@function') ? $action->fetch('@function') : '',
 					'hook' => $action->exists('@hook') ? $action->fetch('@hook') : $action->fetch('.'),
@@ -1193,295 +1266,293 @@ public static function parsePackageInfo(&$packageXML, $testing_only = true, $met
 					'reverse' => $action->exists('@reverse') && $action->fetch('@reverse') == 'true' ? true : false,
 					'object' => $action->exists('@object') && $action->fetch('@object') == 'true' ? true : false,
 					'description' => '',
-				);
+				];
+
 				continue;
 			}
-			elseif ($actionType == 'credits')
-			{
+
+			if ($actionType == 'credits') {
 				// quick check of any supplied url
 				$url = $action->exists('@url') ? $action->fetch('@url') : '';
-				if (strlen(trim($url)) > 0 && substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://')
-				{
+
+				if (strlen(trim($url)) > 0 && substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://') {
 					$url = 'http://' . $url;
-					if (strlen($url) < 8 || (substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://'))
+
+					if (strlen($url) < 8 || (substr($url, 0, 7) !== 'http://' && substr($url, 0, 8) !== 'https://')) {
 						$url = '';
+					}
 				}
 
-				$return[] = array(
+				$return[] = [
 					'type' => $actionType,
 					'url' => $url,
 					'license' => $action->exists('@license') ? $action->fetch('@license') : '',
 					'licenseurl' => $action->exists('@licenseurl') ? $action->fetch('@licenseurl') : '',
 					'copyright' => $action->exists('@copyright') ? $action->fetch('@copyright') : '',
 					'title' => $action->fetch('.'),
-				);
+				];
+
 				continue;
 			}
-			elseif ($actionType == 'requires')
-			{
-				$return[] = array(
+
+			if ($actionType == 'requires') {
+				$return[] = [
 					'type' => $actionType,
 					'id' => $action->exists('@id') ? $action->fetch('@id') : '',
 					'version' => $action->exists('@version') ? $action->fetch('@version') : $action->fetch('.'),
 					'description' => '',
-				);
+				];
+
 				continue;
 			}
-			elseif ($actionType == 'error')
-			{
-				$return[] = array(
+
+			if ($actionType == 'error') {
+				$return[] = [
 					'type' => 'error',
-				);
-			}
-			elseif (in_array($actionType, array('require-file', 'remove-file', 'require-dir', 'remove-dir', 'move-file', 'move-dir', 'create-file', 'create-dir')))
-			{
+				];
+			} elseif (in_array($actionType, ['require-file', 'remove-file', 'require-dir', 'remove-dir', 'move-file', 'move-dir', 'create-file', 'create-dir'])) {
 				$this_action = &$return[];
-				$this_action = array(
+				$this_action = [
 					'type' => $actionType,
 					'filename' => $action->fetch('@name'),
-					'description' => $action->fetch('.')
-				);
+					'description' => $action->fetch('.'),
+				];
 
 				// If there is a destination, make sure it makes sense.
-				if (substr($actionType, 0, 6) != 'remove')
-				{
+				if (substr($actionType, 0, 6) != 'remove') {
 					$this_action['unparsed_destination'] = $action->fetch('@destination');
 					$this_action['destination'] = self::parse_path($action->fetch('@destination')) . '/' . basename($this_action['filename']);
-				}
-				else
-				{
+				} else {
 					$this_action['unparsed_filename'] = $this_action['filename'];
 					$this_action['filename'] = self::parse_path($this_action['filename']);
 				}
 
 				// If we're moving or requiring (copying) a file.
-				if (substr($actionType, 0, 4) == 'move' || substr($actionType, 0, 7) == 'require')
-				{
-					if ($action->exists('@from'))
+				if (substr($actionType, 0, 4) == 'move' || substr($actionType, 0, 7) == 'require') {
+					if ($action->exists('@from')) {
 						$this_action['source'] = self::parse_path($action->fetch('@from'));
-					else
+					} else {
 						$this_action['source'] = self::$temp_path . $this_action['filename'];
+					}
 				}
 
 				// Check if these things can be done. (chmod's etc.)
-				if ($actionType == 'create-dir')
-				{
-					if (!self::mktree($this_action['destination'], false))
-					{
+				if ($actionType == 'create-dir') {
+					if (!self::mktree($this_action['destination'], false)) {
 						$temp = $this_action['destination'];
-						while (!file_exists($temp) && strlen($temp) > 1)
+
+						while (!file_exists($temp) && strlen($temp) > 1) {
 							$temp = dirname($temp);
+						}
 
-						$return[] = array(
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $temp
-						);
+							'filename' => $temp,
+						];
 					}
-				}
-				elseif ($actionType == 'create-file')
-				{
-					if (!self::mktree(dirname($this_action['destination']), false))
-					{
+				} elseif ($actionType == 'create-file') {
+					if (!self::mktree(dirname($this_action['destination']), false)) {
 						$temp = dirname($this_action['destination']);
-						while (!file_exists($temp) && strlen($temp) > 1)
+
+						while (!file_exists($temp) && strlen($temp) > 1) {
 							$temp = dirname($temp);
+						}
 
-						$return[] = array(
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $temp
-						);
+							'filename' => $temp,
+						];
 					}
 
-					if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-						$return[] = array(
+					if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $this_action['destination']
-						);
-				}
-				elseif ($actionType == 'require-dir')
-				{
-					if (!self::mktree($this_action['destination'], false))
-					{
+							'filename' => $this_action['destination'],
+						];
+					}
+				} elseif ($actionType == 'require-dir') {
+					if (!self::mktree($this_action['destination'], false)) {
 						$temp = $this_action['destination'];
-						while (!file_exists($temp) && strlen($temp) > 1)
+
+						while (!file_exists($temp) && strlen($temp) > 1) {
 							$temp = dirname($temp);
+						}
 
-						$return[] = array(
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $temp
-						);
+							'filename' => $temp,
+						];
 					}
-				}
-				elseif ($actionType == 'require-file')
-				{
-					if ($action->exists('@theme'))
+				} elseif ($actionType == 'require-file') {
+					if ($action->exists('@theme')) {
 						$this_action['theme_action'] = $action->fetch('@theme');
+					}
 
-					if (!self::mktree(dirname($this_action['destination']), false))
-					{
+					if (!self::mktree(dirname($this_action['destination']), false)) {
 						$temp = dirname($this_action['destination']);
-						while (!file_exists($temp) && strlen($temp) > 1)
+
+						while (!file_exists($temp) && strlen($temp) > 1) {
 							$temp = dirname($temp);
+						}
 
-						$return[] = array(
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $temp
-						);
+							'filename' => $temp,
+						];
 					}
 
-					if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-						$return[] = array(
+					if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $this_action['destination']
-						);
-				}
-				elseif ($actionType == 'move-dir' || $actionType == 'move-file')
-				{
-					if (!self::mktree(dirname($this_action['destination']), false))
-					{
+							'filename' => $this_action['destination'],
+						];
+					}
+				} elseif ($actionType == 'move-dir' || $actionType == 'move-file') {
+					if (!self::mktree(dirname($this_action['destination']), false)) {
 						$temp = dirname($this_action['destination']);
-						while (!file_exists($temp) && strlen($temp) > 1)
+
+						while (!file_exists($temp) && strlen($temp) > 1) {
 							$temp = dirname($temp);
+						}
 
-						$return[] = array(
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $temp
-						);
+							'filename' => $temp,
+						];
 					}
 
-					if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination']))))
-						$return[] = array(
+					if (!is_writable($this_action['destination']) && (file_exists($this_action['destination']) || !is_writable(dirname($this_action['destination'])))) {
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $this_action['destination']
-						);
-				}
-				elseif ($actionType == 'remove-dir')
-				{
-					if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-						$return[] = array(
+							'filename' => $this_action['destination'],
+						];
+					}
+				} elseif ($actionType == 'remove-dir') {
+					if (!is_writable($this_action['filename']) && file_exists($this_action['filename'])) {
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $this_action['filename']
-						);
-				}
-				elseif ($actionType == 'remove-file')
-				{
-					if (!is_writable($this_action['filename']) && file_exists($this_action['filename']))
-						$return[] = array(
+							'filename' => $this_action['filename'],
+						];
+					}
+				} elseif ($actionType == 'remove-file') {
+					if (!is_writable($this_action['filename']) && file_exists($this_action['filename'])) {
+						$return[] = [
 							'type' => 'chmod',
-							'filename' => $this_action['filename']
-						);
+							'filename' => $this_action['filename'],
+						];
+					}
 				}
-			}
-			else
-			{
-				$return[] = array(
+			} else {
+				$return[] = [
 					'type' => 'error',
 					'error_msg' => 'unknown_action',
-					'error_var' => $actionType
-				);
+					'error_var' => $actionType,
+				];
 			}
 		}
 
 		// Only testing - just return a list of things to be done.
-		if ($testing_only)
+		if ($testing_only) {
 			return $return;
+		}
 
 		umask(0);
 
 		$failure = false;
-		$not_done = array(array('type' => '!'));
-		foreach ($return as $action)
-		{
-			if (in_array($action['type'], array('modification', 'code', 'database', 'redirect', 'hook', 'credits')))
+		$not_done = [['type' => '!']];
+
+		foreach ($return as $action) {
+			if (in_array($action['type'], ['modification', 'code', 'database', 'redirect', 'hook', 'credits'])) {
 				$not_done[] = $action;
+			}
 
-			if ($action['type'] == 'create-dir')
-			{
-				if (!self::mktree($action['destination'], 0755) || !is_writable($action['destination']))
+			if ($action['type'] == 'create-dir') {
+				if (!self::mktree($action['destination'], 0755) || !is_writable($action['destination'])) {
 					$failure |= !self::mktree($action['destination'], 0777);
-			}
-			elseif ($action['type'] == 'create-file')
-			{
-				if (!self::mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
+				}
+			} elseif ($action['type'] == 'create-file') {
+				if (!self::mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
 					$failure |= !self::mktree(dirname($action['destination']), 0777);
+				}
 
 				// Create an empty file.
 				self::package_put_contents($action['destination'], self::package_get_contents($action['source']), $testing_only);
 
-				if (!file_exists($action['destination']))
+				if (!file_exists($action['destination'])) {
 					$failure = true;
-			}
-			elseif ($action['type'] == 'require-dir')
-			{
+				}
+			} elseif ($action['type'] == 'require-dir') {
 				self::copytree($action['source'], $action['destination']);
+
 				// Any other theme folders?
-				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['destination']]))
-					foreach (Utils::$context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
+				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['destination']])) {
+					foreach (Utils::$context['theme_copies'][$action['type']][$action['destination']] as $theme_destination) {
 						self::copytree($action['source'], $theme_destination);
-			}
-			elseif ($action['type'] == 'require-file')
-			{
-				if (!self::mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
+					}
+				}
+			} elseif ($action['type'] == 'require-file') {
+				if (!self::mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
 					$failure |= !self::mktree(dirname($action['destination']), 0777);
+				}
 
 				self::package_put_contents($action['destination'], self::package_get_contents($action['source']), $testing_only);
 
 				$failure |= !copy($action['source'], $action['destination']);
 
 				// Any other theme files?
-				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['destination']]))
-					foreach (Utils::$context['theme_copies'][$action['type']][$action['destination']] as $theme_destination)
-					{
-						if (!self::mktree(dirname($theme_destination), 0755) || !is_writable(dirname($theme_destination)))
+				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['destination']])) {
+					foreach (Utils::$context['theme_copies'][$action['type']][$action['destination']] as $theme_destination) {
+						if (!self::mktree(dirname($theme_destination), 0755) || !is_writable(dirname($theme_destination))) {
 							$failure |= !self::mktree(dirname($theme_destination), 0777);
+						}
 
 						self::package_put_contents($theme_destination, self::package_get_contents($action['source']), $testing_only);
 
 						$failure |= !copy($action['source'], $theme_destination);
 					}
-			}
-			elseif ($action['type'] == 'move-file')
-			{
-				if (!self::mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination'])))
+				}
+			} elseif ($action['type'] == 'move-file') {
+				if (!self::mktree(dirname($action['destination']), 0755) || !is_writable(dirname($action['destination']))) {
 					$failure |= !self::mktree(dirname($action['destination']), 0777);
+				}
 
 				$failure |= !rename($action['source'], $action['destination']);
-			}
-			elseif ($action['type'] == 'move-dir')
-			{
-				if (!self::mktree($action['destination'], 0755) || !is_writable($action['destination']))
+			} elseif ($action['type'] == 'move-dir') {
+				if (!self::mktree($action['destination'], 0755) || !is_writable($action['destination'])) {
 					$failure |= !self::mktree($action['destination'], 0777);
+				}
 
 				$failure |= !rename($action['source'], $action['destination']);
-			}
-			elseif ($action['type'] == 'remove-dir')
-			{
+			} elseif ($action['type'] == 'remove-dir') {
 				self::deltree($action['filename']);
 
 				// Any other theme folders?
-				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['filename']]))
-					foreach (Utils::$context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
+				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['filename']])) {
+					foreach (Utils::$context['theme_copies'][$action['type']][$action['filename']] as $theme_destination) {
 						self::deltree($theme_destination);
-			}
-			elseif ($action['type'] == 'remove-file')
-			{
+					}
+				}
+			} elseif ($action['type'] == 'remove-file') {
 				// Make sure the file exists before deleting it.
-				if (file_exists($action['filename']))
-				{
+				if (file_exists($action['filename'])) {
 					self::package_chmod($action['filename']);
 					$failure |= !unlink($action['filename']);
 				}
 				// The file that was supposed to be deleted couldn't be found.
-				else
+				else {
 					$failure = true;
+				}
 
 				// Any other theme folders?
-				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['filename']]))
-					foreach (Utils::$context['theme_copies'][$action['type']][$action['filename']] as $theme_destination)
-						if (file_exists($theme_destination))
+				if (!empty(Utils::$context['theme_copies']) && !empty(Utils::$context['theme_copies'][$action['type']][$action['filename']])) {
+					foreach (Utils::$context['theme_copies'][$action['type']][$action['filename']] as $theme_destination) {
+						if (file_exists($theme_destination)) {
 							$failure |= !unlink($theme_destination);
-						else
+						} else {
 							$failure = true;
+						}
+					}
+				}
 			}
 		}
 
@@ -1496,7 +1567,7 @@ public static function parsePackageInfo(&$packageXML, $testing_only = true, $met
 	 * - returns true if the version matched.
 	 *
 	 * @param string $versions The versions that this package will install on
-	 * @param boolean $reset Whether to reset $near_version
+	 * @param bool $reset Whether to reset $near_version
 	 * @param string $the_version The forum version
 	 * @return string|bool Highest install value string or false
 	 */
@@ -1504,26 +1575,29 @@ public static function matchHighestPackageVersion($versions, $reset, $the_versio
 	{
 		static $near_version = 0;
 
-		if ($reset)
+		if ($reset) {
 			$near_version = 0;
+		}
 
 		// Normalize the $versions while we remove our previous Doh!
-		$versions = explode(',', str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($versions)));
+		$versions = explode(',', str_replace([' ', '2.0rc1-1'], ['', '2.0rc1.1'], strtolower($versions)));
 
 		// Loop through each version, save the highest we can find
-		foreach ($versions as $for)
-		{
+		foreach ($versions as $for) {
 			// Adjust for those wild cards
-			if (strpos($for, '*') !== false)
+			if (strpos($for, '*') !== false) {
 				$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+			}
 
 			// If we have a range, grab the lower value, done this way so it looks normal-er to the user e.g. 2.0 vs 2.0.99
-			if (strpos($for, '-') !== false)
-				list ($for, $higher) = explode('-', $for);
+			if (strpos($for, '-') !== false) {
+				list($for, $higher) = explode('-', $for);
+			}
 
 			// Do the compare, if the for is greater, than what we have but not greater than what we are running .....
-			if (self::compareVersions($near_version, $for) === -1 && self::compareVersions($for, $the_version) !== 1)
+			if (self::compareVersions($near_version, $for) === -1 && self::compareVersions($for, $the_version) !== 1) {
 				$near_version = $for;
+			}
 		}
 
 		return !empty($near_version) ? $near_version : false;
@@ -1542,32 +1616,34 @@ public static function matchHighestPackageVersion($versions, $reset, $the_versio
 	public static function matchPackageVersion($version, $versions)
 	{
 		// Make sure everything is lowercase and clean of spaces and unpleasant history.
-		$version = str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($version));
-		$versions = explode(',', str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($versions)));
+		$version = str_replace([' ', '2.0rc1-1'], ['', '2.0rc1.1'], strtolower($version));
+		$versions = explode(',', str_replace([' ', '2.0rc1-1'], ['', '2.0rc1.1'], strtolower($versions)));
 
 		// Perhaps we do accept anything?
-		if (in_array('all', $versions))
+		if (in_array('all', $versions)) {
 			return true;
+		}
 
 		// Loop through each version.
-		foreach ($versions as $for)
-		{
+		foreach ($versions as $for) {
 			// Wild card spotted?
-			if (strpos($for, '*') !== false)
+			if (strpos($for, '*') !== false) {
 				$for = str_replace('*', '0dev0', $for) . '-' . str_replace('*', '999', $for);
+			}
 
 			// Do we have a range?
-			if (strpos($for, '-') !== false)
-			{
-				list ($lower, $upper) = explode('-', $for);
+			if (strpos($for, '-') !== false) {
+				list($lower, $upper) = explode('-', $for);
 
 				// Compare the version against lower and upper bounds.
-				if (self::compareVersions($version, $lower) > -1 && self::compareVersions($version, $upper) < 1)
+				if (self::compareVersions($version, $lower) > -1 && self::compareVersions($version, $upper) < 1) {
 					return true;
+				}
 			}
 			// Otherwise check if they are equal...
-			elseif (self::compareVersions($version, $for) === 0)
+			elseif (self::compareVersions($version, $for) === 0) {
 				return true;
+			}
 		}
 
 		return false;
@@ -1587,15 +1663,15 @@ public static function compareVersions($version1, $version2)
 	{
 		static $categories;
 
-		$versions = array();
-		foreach (array(1 => $version1, $version2) as $id => $version)
-		{
+		$versions = [];
+
+		foreach ([1 => $version1, $version2] as $id => $version) {
 			// Clean the version and extract the version parts.
-			$clean = str_replace(array(' ', '2.0rc1-1'), array('', '2.0rc1.1'), strtolower($version));
+			$clean = str_replace([' ', '2.0rc1-1'], ['', '2.0rc1.1'], strtolower($version));
 			preg_match('~(\d+)(?:\.(\d+|))?(?:\.)?(\d+|)(?:(alpha|beta|rc)(\d+|)(?:\.)?(\d+|))?(?:(dev))?(\d+|)~', $clean, $parts);
 
 			// Build an array of parts.
-			$versions[$id] = array(
+			$versions[$id] = [
 				'major' => !empty($parts[1]) ? (int) $parts[1] : 0,
 				'minor' => !empty($parts[2]) ? (int) $parts[2] : 0,
 				'patch' => !empty($parts[3]) ? (int) $parts[3] : 0,
@@ -1603,32 +1679,35 @@ public static function compareVersions($version1, $version2)
 				'type_major' => !empty($parts[5]) ? (int) $parts[5] : 0,
 				'type_minor' => !empty($parts[6]) ? (int) $parts[6] : 0,
 				'dev' => !empty($parts[7]),
-			);
+			];
 		}
 
 		// Are they the same, perhaps?
-		if ($versions[1] === $versions[2])
+		if ($versions[1] === $versions[2]) {
 			return 0;
+		}
 
 		// Get version numbering categories...
-		if (!isset($categories))
+		if (!isset($categories)) {
 			$categories = array_keys($versions[1]);
+		}
 
 		// Loop through each category.
-		foreach ($categories as $category)
-		{
+		foreach ($categories as $category) {
 			// Is there something for us to calculate?
-			if ($versions[1][$category] !== $versions[2][$category])
-			{
+			if ($versions[1][$category] !== $versions[2][$category]) {
 				// Dev builds are a problematic exception.
 				// (stable) dev < (stable) but (unstable) dev = (unstable)
-				if ($category == 'type')
+				if ($category == 'type') {
 					return $versions[1][$category] > $versions[2][$category] ? ($versions[1]['dev'] ? -1 : 1) : ($versions[2]['dev'] ? 1 : -1);
-				elseif ($category == 'dev')
+				}
+
+				if ($category == 'dev') {
 					return $versions[1]['dev'] ? ($versions[2]['type'] == 'stable' ? -1 : 0) : ($versions[1]['type'] == 'stable' ? 1 : 0);
+				}
+
 				// Otherwise a simple comparison.
-				else
-					return $versions[1][$category] > $versions[2][$category] ? 1 : -1;
+				return $versions[1][$category] > $versions[2][$category] ? 1 : -1;
 			}
 		}
 
@@ -1644,7 +1723,7 @@ public static function compareVersions($version1, $version2)
 	 */
 	public static function parse_path($path)
 	{
-		$dirs = array(
+		$dirs = [
 			'\\' => '/',
 			'$boarddir' => Config::$boarddir,
 			'$sourcedir' => Config::$sourcedir,
@@ -1657,14 +1736,14 @@ public static function parse_path($path)
 			'$languages_dir' => Theme::$current->settings['default_theme_dir'] . '/languages',
 			'$smileysdir' => Config::$modSettings['smileys_dir'],
 			'$smileys_dir' => Config::$modSettings['smileys_dir'],
-		);
+		];
 
 		// do we parse in a package directory?
-		if (!empty(self::$temp_path))
+		if (!empty(self::$temp_path)) {
 			$dirs['$package'] = self::$temp_path;
+		}
 
-		if (strlen($path) == 0)
-		{
+		if (strlen($path) == 0) {
 			Lang::load('Errors');
 			trigger_error(Lang::$txt['parse_path_filename_required'], E_USER_ERROR);
 		}
@@ -1681,43 +1760,42 @@ public static function parse_path($path)
 	 */
 	public static function deltree($dir, $delete_dir = true)
 	{
-		if (!file_exists($dir))
+		if (!file_exists($dir)) {
 			return;
+		}
 
 		$current_dir = @opendir($dir);
-		if ($current_dir == false)
-		{
-			if ($delete_dir && isset(self::$package_ftp))
-			{
-				$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
-				if (!is_dir($dir))
+
+		if ($current_dir == false) {
+			if ($delete_dir && isset(self::$package_ftp)) {
+				$ftp_file = strtr($dir, [$_SESSION['pack_ftp']['root'] => '']);
+
+				if (!is_dir($dir)) {
 					self::$package_ftp->chmod($ftp_file, 0777);
+				}
 				self::$package_ftp->unlink($ftp_file);
 			}
 
 			return;
 		}
 
-		while ($entryname = readdir($current_dir))
-		{
-			if (in_array($entryname, array('.', '..')))
+		while ($entryname = readdir($current_dir)) {
+			if (in_array($entryname, ['.', '..'])) {
 				continue;
+			}
 
-			if (is_dir($dir . '/' . $entryname))
+			if (is_dir($dir . '/' . $entryname)) {
 				self::deltree($dir . '/' . $entryname);
-			else
-			{
+			} else {
 				// Here, 755 doesn't really matter since we're deleting it anyway.
-				if (isset(self::$package_ftp))
-				{
-					$ftp_file = strtr($dir . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+				if (isset(self::$package_ftp)) {
+					$ftp_file = strtr($dir . '/' . $entryname, [$_SESSION['pack_ftp']['root'] => '']);
 
-					if (!is_writable($dir . '/' . $entryname))
+					if (!is_writable($dir . '/' . $entryname)) {
 						self::$package_ftp->chmod($ftp_file, 0777);
+					}
 					self::$package_ftp->unlink($ftp_file);
-				}
-				else
-				{
+				} else {
 					Utils::makeWritable($dir . '/' . $entryname);
 					unlink($dir . '/' . $entryname);
 				}
@@ -1726,19 +1804,16 @@ public static function deltree($dir, $delete_dir = true)
 
 		closedir($current_dir);
 
-		if ($delete_dir)
-		{
-			if (isset(self::$package_ftp))
-			{
-				$ftp_file = strtr($dir, array($_SESSION['pack_ftp']['root'] => ''));
+		if ($delete_dir) {
+			if (isset(self::$package_ftp)) {
+				$ftp_file = strtr($dir, [$_SESSION['pack_ftp']['root'] => '']);
 
-				if (!is_writable($dir . '/' . $entryname))
+				if (!is_writable($dir . '/' . $entryname)) {
 					self::$package_ftp->chmod($ftp_file, 0777);
+				}
 
 				self::$package_ftp->unlink($ftp_file);
-			}
-			else
-			{
+			} else {
 				Utils::makeWritable($dir);
 				@rmdir($dir);
 			}
@@ -1755,70 +1830,65 @@ public static function deltree($dir, $delete_dir = true)
 	 */
 	public static function mktree($strPath, $mode)
 	{
-		if (is_dir($strPath))
-		{
-			if (!is_writable($strPath) && $mode !== false)
-			{
-				if (isset(self::$package_ftp))
-				{
-					self::$package_ftp->chmod(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')), $mode);
-				}
-				else
-				{
+		if (is_dir($strPath)) {
+			if (!is_writable($strPath) && $mode !== false) {
+				if (isset(self::$package_ftp)) {
+					self::$package_ftp->chmod(strtr($strPath, [$_SESSION['pack_ftp']['root'] => '']), $mode);
+				} else {
 					Utils::makeWritable($strPath, $mode);
 				}
 			}
 
 			$test = @opendir($strPath);
-			if ($test)
-			{
+
+			if ($test) {
 				closedir($test);
+
 				return is_writable($strPath);
 			}
-			else
-				return false;
+
+			return false;
 		}
+
 		// Is this an invalid path and/or we can't make the directory?
-		if ($strPath == dirname($strPath) || !self::mktree(dirname($strPath), $mode))
+		if ($strPath == dirname($strPath) || !self::mktree(dirname($strPath), $mode)) {
 			return false;
+		}
 
-		if (!is_writable(dirname($strPath)) && $mode !== false)
-		{
-			if (isset(self::$package_ftp))
-			{
-				self::$package_ftp->chmod(dirname(strtr($strPath, array($_SESSION['pack_ftp']['root'] => ''))), $mode);
-			}
-			else
-			{
+		if (!is_writable(dirname($strPath)) && $mode !== false) {
+			if (isset(self::$package_ftp)) {
+				self::$package_ftp->chmod(dirname(strtr($strPath, [$_SESSION['pack_ftp']['root'] => ''])), $mode);
+			} else {
 				Utils::makeWritable(dirname($strPath), $mode);
 			}
 		}
 
-		if ($mode !== false && isset(self::$package_ftp))
-			return self::$package_ftp->create_dir(strtr($strPath, array($_SESSION['pack_ftp']['root'] => '')));
-		elseif ($mode === false)
-		{
+		if ($mode !== false && isset(self::$package_ftp)) {
+			return self::$package_ftp->create_dir(strtr($strPath, [$_SESSION['pack_ftp']['root'] => '']));
+		}
+
+		if ($mode === false) {
 			$test = @opendir(dirname($strPath));
-			if ($test)
-			{
+
+			if ($test) {
 				closedir($test);
+
 				return true;
 			}
-			else
-				return false;
+
+			return false;
 		}
-		else
-		{
-			@mkdir($strPath, $mode);
-			$test = @opendir($strPath);
-			if ($test)
-			{
-				closedir($test);
-				return true;
-			}
-			else
-				return false;
+
+		@mkdir($strPath, $mode);
+		$test = @opendir($strPath);
+
+		if ($test) {
+			closedir($test);
+
+			return true;
 		}
+
+		return false;
 	}
 
 	/**
@@ -1830,39 +1900,46 @@ public static function mktree($strPath, $mode)
 	 */
 	public static function copytree($source, $destination)
 	{
-		if (!file_exists($destination) || !is_writable($destination))
+		if (!file_exists($destination) || !is_writable($destination)) {
 			self::mktree($destination, 0755);
-		if (!is_writable($destination))
+		}
+
+		if (!is_writable($destination)) {
 			self::mktree($destination, 0777);
+		}
 
 		$current_dir = opendir($source);
-		if ($current_dir == false)
+
+		if ($current_dir == false) {
 			return;
+		}
 
-		while ($entryname = readdir($current_dir))
-		{
-			if (in_array($entryname, array('.', '..')))
+		while ($entryname = readdir($current_dir)) {
+			if (in_array($entryname, ['.', '..'])) {
 				continue;
+			}
 
-			if (isset(self::$package_ftp))
-				$ftp_file = strtr($destination . '/' . $entryname, array($_SESSION['pack_ftp']['root'] => ''));
+			if (isset(self::$package_ftp)) {
+				$ftp_file = strtr($destination . '/' . $entryname, [$_SESSION['pack_ftp']['root'] => '']);
+			}
 
-			if (is_file($source . '/' . $entryname))
-			{
-				if (isset(self::$package_ftp) && !file_exists($destination . '/' . $entryname))
+			if (is_file($source . '/' . $entryname)) {
+				if (isset(self::$package_ftp) && !file_exists($destination . '/' . $entryname)) {
 					self::$package_ftp->create_file($ftp_file);
-				elseif (!file_exists($destination . '/' . $entryname))
+				} elseif (!file_exists($destination . '/' . $entryname)) {
 					@touch($destination . '/' . $entryname);
+				}
 			}
 
 			self::package_chmod($destination . '/' . $entryname);
 
-			if (is_dir($source . '/' . $entryname))
+			if (is_dir($source . '/' . $entryname)) {
 				self::copytree($source . '/' . $entryname, $destination . '/' . $entryname);
-			elseif (file_exists($destination . '/' . $entryname))
+			} elseif (file_exists($destination . '/' . $entryname)) {
 				self::package_put_contents($destination . '/' . $entryname, self::package_get_contents($source . '/' . $entryname));
-			else
+			} else {
 				copy($source . '/' . $entryname, $destination . '/' . $entryname);
+			}
 		}
 
 		closedir($current_dir);
@@ -1877,24 +1954,28 @@ public static function copytree($source, $destination)
 	 */
 	public static function listtree($path, $sub_path = '')
 	{
-		$data = array();
+		$data = [];
 
 		$dir = @dir($path . $sub_path);
-		if (!$dir)
-			return array();
-		while ($entry = $dir->read())
-		{
-			if ($entry == '.' || $entry == '..')
+
+		if (!$dir) {
+			return [];
+		}
+
+		while ($entry = $dir->read()) {
+			if ($entry == '.' || $entry == '..') {
 				continue;
+			}
 
-			if (is_dir($path . $sub_path . '/' . $entry))
+			if (is_dir($path . $sub_path . '/' . $entry)) {
 				$data = array_merge($data, self::listtree($path, $sub_path . '/' . $entry));
-			else
-				$data[] = array(
+			} else {
+				$data[] = [
 					'filename' => $sub_path == '' ? $entry : $sub_path . '/' . $entry,
 					'size' => filesize($path . $sub_path . '/' . $entry),
 					'skipped' => false,
-				);
+				];
+			}
 		}
 		$dir->close();
 
@@ -1910,20 +1991,20 @@ public static function listtree($path, $sub_path = '')
 	 * @param array $theme_paths An array of information about custom themes to apply the changes to
 	 * @return array An array of those changes made.
 	 */
-	public static function parseModification($file, $testing = true, $undo = false, $theme_paths = array())
+	public static function parseModification($file, $testing = true, $undo = false, $theme_paths = [])
 	{
 		@set_time_limit(600);
-		$xml = new XmlArray(strtr($file, array("\r" => '')));
-		$actions = array();
+		$xml = new XmlArray(strtr($file, ["\r" => '']));
+		$actions = [];
 		$everything_found = true;
 
-		if (!$xml->exists('modification') || !$xml->exists('modification/file'))
-		{
-			$actions[] = array(
+		if (!$xml->exists('modification') || !$xml->exists('modification/file')) {
+			$actions[] = [
 				'type' => 'error',
 				'filename' => '-',
-				'debug' => Lang::$txt['package_modification_malformed']
-			);
+				'debug' => Lang::$txt['package_modification_malformed'],
+			];
+
 			return $actions;
 		}
 
@@ -1931,26 +2012,25 @@ public static function parseModification($file, $testing = true, $undo = false,
 		$files = $xml->set('modification/file');
 
 		// Use this for holding all the template changes in this mod.
-		$template_changes = array();
+		$template_changes = [];
 		// This is needed to hold the long paths, as they can vary...
-		$long_changes = array();
+		$long_changes = [];
 
 		// First, we need to build the list of all the files likely to get changed.
-		foreach ($files as $file)
-		{
+		foreach ($files as $file) {
 			// What is the filename we're currently on?
 			$filename = self::parse_path(trim($file->fetch('@name')));
 
 			// Now, we need to work out whether this is even a template file...
-			foreach ($theme_paths as $id => $theme)
-			{
+			foreach ($theme_paths as $id => $theme) {
 				// If this filename is relative, if so take a guess at what it should be.
 				$real_filename = $filename;
-				if (strpos($filename, 'Themes') === 0)
+
+				if (strpos($filename, 'Themes') === 0) {
 					$real_filename = Config::$boarddir . '/' . $filename;
+				}
 
-				if (strpos($real_filename, $theme['theme_dir']) === 0)
-				{
+				if (strpos($real_filename, $theme['theme_dir']) === 0) {
 					$template_changes[$id][] = substr($real_filename, strlen($theme['theme_dir']) + 1);
 					$long_changes[$id][] = $filename;
 				}
@@ -1958,23 +2038,20 @@ public static function parseModification($file, $testing = true, $undo = false,
 		}
 
 		// Custom themes to add.
-		$custom_themes_add = array();
+		$custom_themes_add = [];
 
 		// If we have some template changes, we need to build a master link of what new ones are required for the custom themes.
-		if (!empty($template_changes[1]))
-		{
-			foreach ($theme_paths as $id => $theme)
-			{
+		if (!empty($template_changes[1])) {
+			foreach ($theme_paths as $id => $theme) {
 				// Default is getting done anyway, so no need for involvement here.
-				if ($id == 1)
+				if ($id == 1) {
 					continue;
+				}
 
 				// For every template, do we want it? Yea, no, maybe?
-				foreach ($template_changes[1] as $index => $template_file)
-				{
+				foreach ($template_changes[1] as $index => $template_file) {
 					// What, it exists and we haven't already got it?! Lordy, get it in!
-					if (file_exists($theme['theme_dir'] . '/' . $template_file) && (!isset($template_changes[$id]) || !in_array($template_file, $template_changes[$id])))
-					{
+					if (file_exists($theme['theme_dir'] . '/' . $template_file) && (!isset($template_changes[$id]) || !in_array($template_file, $template_changes[$id]))) {
 						// Now let's add it to the "todo" list.
 						$custom_themes_add[$long_changes[1][$index]][$id] = $theme['theme_dir'] . '/' . $template_file;
 					}
@@ -1982,22 +2059,20 @@ public static function parseModification($file, $testing = true, $undo = false,
 			}
 		}
 
-		foreach ($files as $file)
-		{
+		foreach ($files as $file) {
 			// This is the actual file referred to in the XML document...
-			$files_to_change = array(
+			$files_to_change = [
 				1 => self::parse_path(trim($file->fetch('@name'))),
-			);
+			];
 
 			// Sometimes though, we have some additional files for other themes, if we have add them to the mix.
-			if (isset($custom_themes_add[$files_to_change[1]]))
+			if (isset($custom_themes_add[$files_to_change[1]])) {
 				$files_to_change += $custom_themes_add[$files_to_change[1]];
+			}
 
 			// Now, loop through all the files we're changing, and, well, change them ;)
-			foreach ($files_to_change as $theme => $working_file)
-			{
-				if ($working_file[0] != '/' && $working_file[1] != ':')
-				{
+			foreach ($files_to_change as $theme => $working_file) {
+				if ($working_file[0] != '/' && $working_file[1] != ':') {
 					Lang::load('Errors');
 					trigger_error(sprintf(Lang::$txt['parse_modification_filename_not_full_path'], $working_file), E_USER_WARNING);
 
@@ -2005,109 +2080,112 @@ public static function parseModification($file, $testing = true, $undo = false,
 				}
 
 				// Doesn't exist - give an error or what?
-				if (!file_exists($working_file) && (!$file->exists('@error') || !in_array(trim($file->fetch('@error')), array('ignore', 'skip'))))
-				{
-					$actions[] = array(
+				if (!file_exists($working_file) && (!$file->exists('@error') || !in_array(trim($file->fetch('@error')), ['ignore', 'skip']))) {
+					$actions[] = [
 						'type' => 'missing',
 						'filename' => $working_file,
-						'debug' => Lang::$txt['package_modification_missing']
-					);
+						'debug' => Lang::$txt['package_modification_missing'],
+					];
 
 					$everything_found = false;
+
 					continue;
 				}
+
 				// Skip the file if it doesn't exist.
-				elseif (!file_exists($working_file) && $file->exists('@error') && trim($file->fetch('@error')) == 'skip')
-				{
-					$actions[] = array(
+				if (!file_exists($working_file) && $file->exists('@error') && trim($file->fetch('@error')) == 'skip') {
+					$actions[] = [
 						'type' => 'skipping',
 						'filename' => $working_file,
-					);
+					];
+
 					continue;
 				}
+
 				// Okay, we're creating this file then...?
-				elseif (!file_exists($working_file))
+				if (!file_exists($working_file)) {
 					$working_data = '';
+				}
 				// Phew, it exists!  Load 'er up!
-				else
+				else {
 					$working_data = str_replace("\r", '', self::package_get_contents($working_file));
+				}
 
-				$actions[] = array(
+				$actions[] = [
 					'type' => 'opened',
-					'filename' => $working_file
-				);
+					'filename' => $working_file,
+				];
 
-				$operations = $file->exists('operation') ? $file->set('operation') : array();
-				foreach ($operations as $operation)
-				{
+				$operations = $file->exists('operation') ? $file->set('operation') : [];
+
+				foreach ($operations as $operation) {
 					// Convert operation to an array.
-					$actual_operation = array(
-						'searches' => array(),
-						'error' => $operation->exists('@error') && in_array(trim($operation->fetch('@error')), array('ignore', 'fatal', 'required')) ? trim($operation->fetch('@error')) : 'fatal',
-					);
+					$actual_operation = [
+						'searches' => [],
+						'error' => $operation->exists('@error') && in_array(trim($operation->fetch('@error')), ['ignore', 'fatal', 'required']) ? trim($operation->fetch('@error')) : 'fatal',
+					];
 
 					// The 'add' parameter is used for all searches in this operation.
 					$add = $operation->exists('add') ? $operation->fetch('add') : '';
 
 					// Grab all search items of this operation (in most cases just 1).
 					$searches = $operation->set('search');
-					foreach ($searches as $i => $search)
-						$actual_operation['searches'][] = array(
-							'position' => $search->exists('@position') && in_array(trim($search->fetch('@position')), array('before', 'after', 'replace', 'end')) ? trim($search->fetch('@position')) : 'replace',
+
+					foreach ($searches as $i => $search) {
+						$actual_operation['searches'][] = [
+							'position' => $search->exists('@position') && in_array(trim($search->fetch('@position')), ['before', 'after', 'replace', 'end']) ? trim($search->fetch('@position')) : 'replace',
 							'is_reg_exp' => $search->exists('@regexp') && trim($search->fetch('@regexp')) === 'true',
 							'loose_whitespace' => $search->exists('@whitespace') && trim($search->fetch('@whitespace')) === 'loose',
 							'search' => $search->fetch('.'),
 							'add' => $add,
 							'preg_search' => '',
 							'preg_replace' => '',
-						);
+						];
+					}
 
 					// At least one search should be defined.
-					if (empty($actual_operation['searches']))
-					{
-						$actions[] = array(
+					if (empty($actual_operation['searches'])) {
+						$actions[] = [
 							'type' => 'failure',
 							'filename' => $working_file,
 							'search' => $search['search'],
 							'is_custom' => $theme > 1 ? $theme : 0,
-						);
+						];
 
 						// Skip to the next operation.
 						continue;
 					}
 
 					// Reverse the operations in case of undoing stuff.
-					if ($undo)
-					{
-						foreach ($actual_operation['searches'] as $i => $search)
-						{
+					if ($undo) {
+						foreach ($actual_operation['searches'] as $i => $search) {
 							// Reverse modification of regular expressions are not allowed.
-							if ($search['is_reg_exp'])
-							{
-								if ($actual_operation['error'] === 'fatal')
-									$actions[] = array(
+							if ($search['is_reg_exp']) {
+								if ($actual_operation['error'] === 'fatal') {
+									$actions[] = [
 										'type' => 'failure',
 										'filename' => $working_file,
 										'search' => $search['search'],
 										'is_custom' => $theme > 1 ? $theme : 0,
-									);
+									];
+								}
 
 								// Continue to the next operation.
 								continue 2;
 							}
 
 							// The replacement is now the search subject...
-							if ($search['position'] === 'replace' || $search['position'] === 'end')
+							if ($search['position'] === 'replace' || $search['position'] === 'end') {
 								$actual_operation['searches'][$i]['search'] = $search['add'];
-							else
-							{
+							} else {
 								// Reversing a before/after modification becomes a replacement.
 								$actual_operation['searches'][$i]['position'] = 'replace';
 
-								if ($search['position'] === 'before')
+								if ($search['position'] === 'before') {
 									$actual_operation['searches'][$i]['search'] .= $search['add'];
-								elseif ($search['position'] === 'after')
+								} elseif ($search['position'] === 'after') {
 									$actual_operation['searches'][$i]['search'] = $search['add'] . $search['search'];
+								}
 							}
 
 							// ...and the search subject is now the replacement.
@@ -2116,14 +2194,11 @@ public static function parseModification($file, $testing = true, $undo = false,
 					}
 
 					// Sort the search list so the replaces come before the add before/after's.
-					if (count($actual_operation['searches']) !== 1)
-					{
-						$replacements = array();
-
-						foreach ($actual_operation['searches'] as $i => $search)
-						{
-							if ($search['position'] === 'replace')
-							{
+					if (count($actual_operation['searches']) !== 1) {
+						$replacements = [];
+
+						foreach ($actual_operation['searches'] as $i => $search) {
+							if ($search['position'] === 'replace') {
 								$replacements[] = $search;
 								unset($actual_operation['searches'][$i]);
 							}
@@ -2132,47 +2207,40 @@ public static function parseModification($file, $testing = true, $undo = false,
 					}
 
 					// Create regular expression replacements from each search.
-					foreach ($actual_operation['searches'] as $i => $search)
-					{
+					foreach ($actual_operation['searches'] as $i => $search) {
 						// Not much needed if the search subject is already a regexp.
-						if ($search['is_reg_exp'])
+						if ($search['is_reg_exp']) {
 							$actual_operation['searches'][$i]['preg_search'] = $search['search'];
-						else
-						{
+						} else {
 							// Make the search subject fit into a regular expression.
 							$actual_operation['searches'][$i]['preg_search'] = preg_quote($search['search'], '~');
 
 							// Using 'loose', a random amount of tabs and spaces may be used.
-							if ($search['loose_whitespace'])
+							if ($search['loose_whitespace']) {
 								$actual_operation['searches'][$i]['preg_search'] = preg_replace('~[ \t]+~', '[ \t]+', $actual_operation['searches'][$i]['preg_search']);
+							}
 						}
 
 						// Shuzzup.  This is done so we can safely use a regular expression. ($0 is bad!!)
-						$actual_operation['searches'][$i]['preg_replace'] = strtr($search['add'], array('$' => '[$PACK' . 'AGE1$]', '\\' => '[$PACK' . 'AGE2$]'));
+						$actual_operation['searches'][$i]['preg_replace'] = strtr($search['add'], ['$' => '[$PACK' . 'AGE1$]', '\\' => '[$PACK' . 'AGE2$]']);
 
 						// Before, so the replacement comes after the search subject :P
-						if ($search['position'] === 'before')
-						{
+						if ($search['position'] === 'before') {
 							$actual_operation['searches'][$i]['preg_search'] = '(' . $actual_operation['searches'][$i]['preg_search'] . ')';
 							$actual_operation['searches'][$i]['preg_replace'] = '$1' . $actual_operation['searches'][$i]['preg_replace'];
 						}
 
 						// After, after what?
-						elseif ($search['position'] === 'after')
-						{
+						elseif ($search['position'] === 'after') {
 							$actual_operation['searches'][$i]['preg_search'] = '(' . $actual_operation['searches'][$i]['preg_search'] . ')';
 							$actual_operation['searches'][$i]['preg_replace'] .= '$1';
 						}
 
 						// Position the replacement at the end of the file (or just before the closing PHP tags).
-						elseif ($search['position'] === 'end')
-						{
-							if ($undo)
-							{
+						elseif ($search['position'] === 'end') {
+							if ($undo) {
 								$actual_operation['searches'][$i]['preg_replace'] = '';
-							}
-							else
-							{
+							} else {
 								$actual_operation['searches'][$i]['preg_search'] = '(\\n\\?\\>)?$';
 								$actual_operation['searches'][$i]['preg_replace'] .= '$1';
 							}
@@ -2182,9 +2250,8 @@ public static function parseModification($file, $testing = true, $undo = false,
 						$failed = preg_match('~' . $actual_operation['searches'][$i]['preg_search'] . '~s', $working_data) === 0;
 
 						// Nope, search pattern not found.
-						if ($failed && $actual_operation['error'] === 'fatal')
-						{
-							$actions[] = array(
+						if ($failed && $actual_operation['error'] === 'fatal') {
+							$actions[] = [
 								'type' => 'failure',
 								'filename' => $working_file,
 								'search' => $actual_operation['searches'][$i]['preg_search'],
@@ -2193,16 +2260,16 @@ public static function parseModification($file, $testing = true, $undo = false,
 								'position' => $search['position'],
 								'is_custom' => $theme > 1 ? $theme : 0,
 								'failed' => $failed,
-							);
+							];
 
 							$everything_found = false;
+
 							continue;
 						}
 
 						// Found, but in this case, that means failure!
-						elseif (!$failed && $actual_operation['error'] === 'required')
-						{
-							$actions[] = array(
+						if (!$failed && $actual_operation['error'] === 'required') {
+							$actions[] = [
 								'type' => 'failure',
 								'filename' => $working_file,
 								'search' => $actual_operation['searches'][$i]['preg_search'],
@@ -2211,20 +2278,22 @@ public static function parseModification($file, $testing = true, $undo = false,
 								'position' => $search['position'],
 								'is_custom' => $theme > 1 ? $theme : 0,
 								'failed' => $failed,
-							);
+							];
 
 							$everything_found = false;
+
 							continue;
 						}
 
 						// Replace it into nothing? That's not an option...unless it's an undoing end.
-						if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo))
+						if ($search['add'] === '' && ($search['position'] !== 'end' || !$undo)) {
 							continue;
+						}
 
 						// Finally, we're doing some replacements.
 						$working_data = preg_replace('~' . $actual_operation['searches'][$i]['preg_search'] . '~s', $actual_operation['searches'][$i]['preg_replace'], $working_data, 1);
 
-						$actions[] = array(
+						$actions[] = [
 							'type' => 'replace',
 							'filename' => $working_file,
 							'search' => $actual_operation['searches'][$i]['preg_search'],
@@ -2235,48 +2304,50 @@ public static function parseModification($file, $testing = true, $undo = false,
 							'failed' => $failed,
 							'ignore_failure' => $failed && $actual_operation['error'] === 'ignore',
 							'is_custom' => $theme > 1 ? $theme : 0,
-						);
+						];
 					}
 				}
 
 				// Fix any little helper symbols ;).
-				$working_data = strtr($working_data, array('[$PACK' . 'AGE1$]' => '$', '[$PACK' . 'AGE2$]' => '\\'));
+				$working_data = strtr($working_data, ['[$PACK' . 'AGE1$]' => '$', '[$PACK' . 'AGE2$]' => '\\']);
 
 				self::package_chmod($working_file);
 
-				if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file))))
-					$actions[] = array(
+				if ((file_exists($working_file) && !is_writable($working_file)) || (!file_exists($working_file) && !is_writable(dirname($working_file)))) {
+					$actions[] = [
 						'type' => 'chmod',
-						'filename' => $working_file
-					);
+						'filename' => $working_file,
+					];
+				}
 
-				if (basename($working_file) == basename(SMF_SETTINGS_BACKUP_FILE))
+				if (basename($working_file) == basename(SMF_SETTINGS_BACKUP_FILE)) {
 					continue;
+				}
 
-				if (!$testing && !empty(Config::$modSettings['package_make_backups']) && file_exists($working_file))
-				{
+				if (!$testing && !empty(Config::$modSettings['package_make_backups']) && file_exists($working_file)) {
 					// No, no, not Settings.php!
-					if (basename($working_file) == basename(SMF_SETTINGS_FILE))
+					if (basename($working_file) == basename(SMF_SETTINGS_FILE)) {
 						@copy($working_file, dirname($working_file) . '/' . basename(SMF_SETTINGS_BACKUP_FILE));
-					else
+					} else {
 						@copy($working_file, $working_file . '~');
+					}
 				}
 
 				// Always call this, even if in testing, because it won't really be written in testing mode.
 				self::package_put_contents($working_file, $working_data, $testing);
 
-				$actions[] = array(
+				$actions[] = [
 					'type' => 'saved',
 					'filename' => $working_file,
 					'is_custom' => $theme > 1 ? $theme : 0,
-				);
+				];
 			}
 		}
 
-		$actions[] = array(
+		$actions[] = [
 			'type' => 'result',
-			'status' => $everything_found
-		);
+			'status' => $everything_found,
+		];
 
 		return $actions;
 	}
@@ -2290,87 +2361,84 @@ public static function parseModification($file, $testing = true, $undo = false,
 	 * @param array $theme_paths An array of information about custom themes to apply the changes to
 	 * @return array An array of those changes made.
 	 */
-	public static function parseBoardMod($file, $testing = true, $undo = false, $theme_paths = array())
+	public static function parseBoardMod($file, $testing = true, $undo = false, $theme_paths = [])
 	{
 		@set_time_limit(600);
-		$file = strtr($file, array("\r" => ''));
+		$file = strtr($file, ["\r" => '']);
 
 		$working_file = null;
 		$working_search = null;
 		$working_data = '';
 		$replace_with = null;
 
-		$actions = array();
+		$actions = [];
 		$everything_found = true;
 
 		// This holds all the template changes in the standard mod file.
-		$template_changes = array();
+		$template_changes = [];
 		// This is just the temporary file.
 		$temp_file = $file;
 		// This holds the actual changes on a step counter basis.
-		$temp_changes = array();
+		$temp_changes = [];
 		$counter = 0;
 		$step_counter = 0;
 
 		// Before we do *anything*, let's build a list of what we're editing, as it's going to be used for other theme edits.
-		while (preg_match('~<(edit file|file|search|search for|add|add after|replace|add before|add above|above|before)>\n(.*?)\n</\\1>~is', $temp_file, $code_match) != 0)
-		{
+		while (preg_match('~<(edit file|file|search|search for|add|add after|replace|add before|add above|above|before)>\n(.*?)\n</\\1>~is', $temp_file, $code_match) != 0) {
 			$counter++;
 
 			// Get rid of the old stuff.
 			$temp_file = substr_replace($temp_file, '', strpos($temp_file, $code_match[0]), strlen($code_match[0]));
 
 			// No interest to us?
-			if ($code_match[1] != 'edit file' && $code_match[1] != 'file')
-			{
+			if ($code_match[1] != 'edit file' && $code_match[1] != 'file') {
 				// It's a step, let's add that to the current steps.
-				if (isset($temp_changes[$step_counter]))
+				if (isset($temp_changes[$step_counter])) {
 					$temp_changes[$step_counter]['changes'][] = $code_match[0];
+				}
+
 				continue;
 			}
 
 			// We've found a new edit - let's make ourself heard, kind of.
 			$step_counter = $counter;
-			$temp_changes[$step_counter] = array(
+			$temp_changes[$step_counter] = [
 				'title' => $code_match[0],
-				'changes' => array(),
-			);
+				'changes' => [],
+			];
 
 			$filename = self::parse_path($code_match[2]);
 
 			// Now, is this a template file, and if so, which?
-			foreach ($theme_paths as $id => $theme)
-			{
+			foreach ($theme_paths as $id => $theme) {
 				// If this filename is relative, if so take a guess at what it should be.
-				if (strpos($filename, 'Themes') === 0)
+				if (strpos($filename, 'Themes') === 0) {
 					$filename = Config::$boarddir . '/' . $filename;
+				}
 
-				if (strpos($filename, $theme['theme_dir']) === 0)
+				if (strpos($filename, $theme['theme_dir']) === 0) {
 					$template_changes[$id][$counter] = substr($filename, strlen($theme['theme_dir']) + 1);
+				}
 			}
 		}
 
 		// Reference for what theme ID this action belongs to.
-		$theme_id_ref = array();
+		$theme_id_ref = [];
 
 		// Now we know what templates we need to touch, cycle through each theme and work out what we need to edit.
-		if (!empty($template_changes[1]))
-		{
-			foreach ($theme_paths as $id => $theme)
-			{
+		if (!empty($template_changes[1])) {
+			foreach ($theme_paths as $id => $theme) {
 				// Don't do default, it means nothing to me.
-				if ($id == 1)
+				if ($id == 1) {
 					continue;
+				}
 
 				// Now, for each file do we need to edit it?
-				foreach ($template_changes[1] as $pos => $template_file)
-				{
+				foreach ($template_changes[1] as $pos => $template_file) {
 					// It does? Add it to the list darlin'.
-					if (file_exists($theme['theme_dir'] . '/' . $template_file) && (!isset($template_changes[$id][$pos]) || !in_array($template_file, $template_changes[$id][$pos])))
-					{
+					if (file_exists($theme['theme_dir'] . '/' . $template_file) && (!isset($template_changes[$id][$pos]) || !in_array($template_file, $template_changes[$id][$pos]))) {
 						// Actually add it to the mod file too, so we can see that it will work ;)
-						if (!empty($temp_changes[$pos]['changes']))
-						{
+						if (!empty($temp_changes[$pos]['changes'])) {
 							$file .= "\n\n" . '<edit file>' . "\n" . $theme['theme_dir'] . '/' . $template_file . "\n" . '</edit file>' . "\n\n" . implode("\n\n", $temp_changes[$pos]['changes']);
 							$theme_id_ref[$counter] = $id;
 							$counter += 1 + count($temp_changes[$pos]['changes']);
@@ -2382,89 +2450,85 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 
 		$counter = 0;
 		$is_custom = 0;
-		while (preg_match('~<(edit file|file|search|search for|add|add after|replace|add before|add above|above|before)>\n(.*?)\n</\\1>~is', $file, $code_match) != 0)
-		{
+
+		while (preg_match('~<(edit file|file|search|search for|add|add after|replace|add before|add above|above|before)>\n(.*?)\n</\\1>~is', $file, $code_match) != 0) {
 			// This is for working out what we should be editing.
 			$counter++;
 
 			// Edit a specific file.
-			if ($code_match[1] == 'file' || $code_match[1] == 'edit file')
-			{
+			if ($code_match[1] == 'file' || $code_match[1] == 'edit file') {
 				// Backup the old file.
-				if ($working_file !== null)
-				{
+				if ($working_file !== null) {
 					self::package_chmod($working_file);
 
 					// Don't even dare.
-					if (basename($working_file) == basename(SMF_SETTINGS_BACKUP_FILE))
+					if (basename($working_file) == basename(SMF_SETTINGS_BACKUP_FILE)) {
 						continue;
+					}
 
-					if (!is_writable($working_file))
-						$actions[] = array(
+					if (!is_writable($working_file)) {
+						$actions[] = [
 							'type' => 'chmod',
-							'filename' => $working_file
-						);
+							'filename' => $working_file,
+						];
+					}
 
-					if (!$testing && !empty(Config::$modSettings['package_make_backups']) && file_exists($working_file))
-					{
-						if (basename($working_file) == basename(SMF_SETTINGS_FILE))
+					if (!$testing && !empty(Config::$modSettings['package_make_backups']) && file_exists($working_file)) {
+						if (basename($working_file) == basename(SMF_SETTINGS_FILE)) {
 							@copy($working_file, dirname($working_file) . '/' . basename(SMF_SETTINGS_BACKUP_FILE));
-						else
+						} else {
 							@copy($working_file, $working_file . '~');
+						}
 					}
 
 					self::package_put_contents($working_file, $working_data, $testing);
 				}
 
-				if ($working_file !== null)
-					$actions[] = array(
+				if ($working_file !== null) {
+					$actions[] = [
 						'type' => 'saved',
 						'filename' => $working_file,
 						'is_custom' => $is_custom,
-					);
+					];
+				}
 
 				// Is this "now working on" file a theme specific one?
-				$is_custom = isset($theme_id_ref[$counter - 1]) ? $theme_id_ref[$counter - 1] : 0;
+				$is_custom = $theme_id_ref[$counter - 1] ?? 0;
 
 				// Make sure the file exists!
 				$working_file = self::parse_path($code_match[2]);
 
-				if ($working_file[0] != '/' && $working_file[1] != ':')
-				{
+				if ($working_file[0] != '/' && $working_file[1] != ':') {
 					Lang::load('Errors');
 					trigger_error(sprintf(Lang::$txt['parse_boardmod_filename_not_full_path'], $working_file), E_USER_WARNING);
 
 					$working_file = Config::$boarddir . '/' . $working_file;
 				}
 
-				if (!file_exists($working_file))
-				{
-					$places_to_check = array(Config::$boarddir, Config::$sourcedir, Theme::$current->settings['default_theme_dir'], Theme::$current->settings['default_theme_dir'] . '/languages');
+				if (!file_exists($working_file)) {
+					$places_to_check = [Config::$boarddir, Config::$sourcedir, Theme::$current->settings['default_theme_dir'], Theme::$current->settings['default_theme_dir'] . '/languages'];
 
-					foreach ($places_to_check as $place)
-						if (file_exists($place . '/' . $working_file))
-						{
+					foreach ($places_to_check as $place) {
+						if (file_exists($place . '/' . $working_file)) {
 							$working_file = $place . '/' . $working_file;
 							break;
 						}
+					}
 				}
 
-				if (file_exists($working_file))
-				{
+				if (file_exists($working_file)) {
 					// Load the new file.
 					$working_data = str_replace("\r", '', self::package_get_contents($working_file));
 
-					$actions[] = array(
+					$actions[] = [
 						'type' => 'opened',
-						'filename' => $working_file
-					);
-				}
-				else
-				{
-					$actions[] = array(
+						'filename' => $working_file,
+					];
+				} else {
+					$actions[] = [
 						'type' => 'missing',
-						'filename' => $working_file
-					);
+						'filename' => $working_file,
+					];
 
 					$working_file = null;
 					$everything_found = false;
@@ -2474,14 +2538,12 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 				$working_search = null;
 			}
 			// Search for a specific string.
-			elseif (($code_match[1] == 'search' || $code_match[1] == 'search for') && $working_file !== null)
-			{
-				if ($working_search !== null)
-				{
-					$actions[] = array(
+			elseif (($code_match[1] == 'search' || $code_match[1] == 'search for') && $working_file !== null) {
+				if ($working_search !== null) {
+					$actions[] = [
 						'type' => 'error',
-						'filename' => $working_file
-					);
+						'filename' => $working_file,
+					];
 
 					$everything_found = false;
 				}
@@ -2489,36 +2551,34 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 				$working_search = $code_match[2];
 			}
 			// Must've already loaded a search string.
-			elseif ($working_search !== null)
-			{
+			elseif ($working_search !== null) {
 				// This is the base string....
 				$replace_with = $code_match[2];
 
 				// Add this afterward...
-				if ($code_match[1] == 'add' || $code_match[1] == 'add after')
+				if ($code_match[1] == 'add' || $code_match[1] == 'add after') {
 					$replace_with = $working_search . "\n" . $replace_with;
+				}
 				// Add this beforehand.
-				elseif ($code_match[1] == 'before' || $code_match[1] == 'add before' || $code_match[1] == 'above' || $code_match[1] == 'add above')
+				elseif ($code_match[1] == 'before' || $code_match[1] == 'add before' || $code_match[1] == 'above' || $code_match[1] == 'add above') {
 					$replace_with .= "\n" . $working_search;
+				}
 				// Otherwise.. replace with $replace_with ;).
 			}
 
 			// If we have a search string, replace string, and open file..
-			if ($working_search !== null && $replace_with !== null && $working_file !== null)
-			{
+			if ($working_search !== null && $replace_with !== null && $working_file !== null) {
 				// Make sure it's somewhere in the string.
-				if ($undo)
-				{
+				if ($undo) {
 					$temp = $replace_with;
 					$replace_with = $working_search;
 					$working_search = $temp;
 				}
 
-				if (strpos($working_data, $working_search) !== false)
-				{
+				if (strpos($working_data, $working_search) !== false) {
 					$working_data = str_replace($working_search, $replace_with, $working_data);
 
-					$actions[] = array(
+					$actions[] = [
 						'type' => 'replace',
 						'filename' => $working_file,
 						'search' => $working_search,
@@ -2528,12 +2588,11 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 						'position' => $code_match[1] == 'replace' ? 'replace' : ($code_match[1] == 'add' || $code_match[1] == 'add after' ? 'before' : 'after'),
 						'is_custom' => $is_custom,
 						'failed' => false,
-					);
+					];
 				}
 				// It wasn't found!
-				else
-				{
-					$actions[] = array(
+				else {
+					$actions[] = [
 						'type' => 'failure',
 						'filename' => $working_file,
 						'search' => $working_search,
@@ -2543,7 +2602,7 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 						'position' => $code_match[1] == 'replace' ? 'replace' : ($code_match[1] == 'add' || $code_match[1] == 'add after' ? 'before' : 'after'),
 						'is_custom' => $is_custom,
 						'failed' => true,
-					);
+					];
 
 					$everything_found = false;
 				}
@@ -2558,38 +2617,39 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 		}
 
 		// Backup the old file.
-		if ($working_file !== null)
-		{
+		if ($working_file !== null) {
 			self::package_chmod($working_file);
 
-			if (!is_writable($working_file))
-				$actions[] = array(
+			if (!is_writable($working_file)) {
+				$actions[] = [
 					'type' => 'chmod',
-					'filename' => $working_file
-				);
+					'filename' => $working_file,
+				];
+			}
 
-			if (!$testing && !empty(Config::$modSettings['package_make_backups']) && file_exists($working_file))
-			{
-				if (basename($working_file) == basename(SMF_SETTINGS_FILE))
+			if (!$testing && !empty(Config::$modSettings['package_make_backups']) && file_exists($working_file)) {
+				if (basename($working_file) == basename(SMF_SETTINGS_FILE)) {
 					@copy($working_file, dirname($working_file) . '/' . basename(SMF_SETTINGS_BACKUP_FILE));
-				else
+				} else {
 					@copy($working_file, $working_file . '~');
+				}
 			}
 
 			self::package_put_contents($working_file, $working_data, $testing);
 		}
 
-		if ($working_file !== null)
-			$actions[] = array(
+		if ($working_file !== null) {
+			$actions[] = [
 				'type' => 'saved',
 				'filename' => $working_file,
 				'is_custom' => $is_custom,
-			);
+			];
+		}
 
-		$actions[] = array(
+		$actions[] = [
 			'type' => 'result',
-			'status' => $everything_found
-		);
+			'status' => $everything_found,
+		];
 
 		return $actions;
 	}
@@ -2602,21 +2662,22 @@ public static function parseBoardMod($file, $testing = true, $undo = false, $the
 	 */
 	public static function package_get_contents($filename)
 	{
-		if (!isset(self::$package_cache))
-		{
+		if (!isset(self::$package_cache)) {
 			$mem_check = Config::setMemoryLimit('128M');
 
 			// Windows doesn't seem to care about the memory_limit.
-			if (!empty(Config::$modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-				self::$package_cache = array();
-			else
+			if (!empty(Config::$modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false) {
+				self::$package_cache = [];
+			} else {
 				self::$package_cache = false;
+			}
 		}
 
-		if (strpos($filename, 'Packages/') !== false || self::$package_cache === false || !isset(self::$package_cache[$filename]))
+		if (strpos($filename, 'Packages/') !== false || self::$package_cache === false || !isset(self::$package_cache[$filename])) {
 			return file_get_contents($filename);
-		else
-			return self::$package_cache[$filename];
+		}
+
+		return self::$package_cache[$filename];
 	}
 
 	/**
@@ -2632,50 +2693,52 @@ public static function package_get_contents($filename)
 	 */
 	public static function package_put_contents($filename, $data, $testing = false)
 	{
-		static $text_filetypes = array('php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm');
+		static $text_filetypes = ['php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm'];
 
-		if (!isset(self::$package_cache))
-		{
+		if (!isset(self::$package_cache)) {
 			// Try to increase the memory limit - we don't want to run out of ram!
 			$mem_check = Config::setMemoryLimit('128M');
 
-			if (!empty(Config::$modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false)
-				self::$package_cache = array();
-			else
+			if (!empty(Config::$modSettings['package_disable_cache']) || $mem_check || stripos(PHP_OS, 'win') !== false) {
+				self::$package_cache = [];
+			} else {
 				self::$package_cache = false;
+			}
 		}
 
-		if (isset(self::$package_ftp))
-			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		if (isset(self::$package_ftp)) {
+			$ftp_file = strtr($filename, [$_SESSION['pack_ftp']['root'] => '']);
+		}
 
-		if (!file_exists($filename) && isset(self::$package_ftp))
+		if (!file_exists($filename) && isset(self::$package_ftp)) {
 			self::$package_ftp->create_file($ftp_file);
-		elseif (!file_exists($filename))
+		} elseif (!file_exists($filename)) {
 			@touch($filename);
+		}
 
 		self::package_chmod($filename);
 
-		if (!$testing && (strpos($filename, 'Packages/') !== false || self::$package_cache === false))
-		{
+		if (!$testing && (strpos($filename, 'Packages/') !== false || self::$package_cache === false)) {
 			$fp = @fopen($filename, in_array(substr($filename, -3), $text_filetypes) ? 'w' : 'wb');
 
 			// We should show an error message or attempt a rollback, no?
-			if (!$fp)
+			if (!$fp) {
 				return false;
+			}
 
 			fwrite($fp, $data);
 			fclose($fp);
-		}
-		elseif (strpos($filename, 'Packages/') !== false || self::$package_cache === false)
+		} elseif (strpos($filename, 'Packages/') !== false || self::$package_cache === false) {
 			return strlen($data);
-		else
-		{
+		} else {
 			self::$package_cache[$filename] = $data;
 
 			// Permission denied, eh?
 			$fp = @fopen($filename, 'r+');
-			if (!$fp)
+
+			if (!$fp) {
 				return false;
+			}
 			fclose($fp);
 		}
 
@@ -2689,60 +2752,60 @@ public static function package_put_contents($filename, $data, $testing = false)
 	 */
 	public static function package_flush_cache($trash = false)
 	{
-		static $text_filetypes = array('php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm');
+		static $text_filetypes = ['php', 'txt', '.js', 'css', 'vbs', 'tml', 'htm'];
 
-		if (empty(self::$package_cache))
+		if (empty(self::$package_cache)) {
 			return;
+		}
 
 		// First, let's check permissions!
-		foreach (self::$package_cache as $filename => $data)
-		{
-			if (isset(self::$package_ftp))
-				$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		foreach (self::$package_cache as $filename => $data) {
+			if (isset(self::$package_ftp)) {
+				$ftp_file = strtr($filename, [$_SESSION['pack_ftp']['root'] => '']);
+			}
 
-			if (!file_exists($filename) && isset(self::$package_ftp))
+			if (!file_exists($filename) && isset(self::$package_ftp)) {
 				self::$package_ftp->create_file($ftp_file);
-			elseif (!file_exists($filename))
+			} elseif (!file_exists($filename)) {
 				@touch($filename);
+			}
 
 			$result = self::package_chmod($filename);
 
 			// if we are not doing our test pass, then lets do a full write check
 			// bypass directories when doing this test
-			if ((!$trash) && !is_dir($filename))
-			{
+			if ((!$trash) && !is_dir($filename)) {
 				// acid test, can we really open this file for writing?
 				$fp = ($result) ? fopen($filename, 'r+') : $result;
-				if (!$fp)
-				{
+
+				if (!$fp) {
 					// We should have package_chmod()'d them before, no?!
 					Lang::load('Errors');
 					trigger_error(Lang::$txt['package_flush_cache_not_writable'], E_USER_WARNING);
+
 					return;
 				}
 				fclose($fp);
 			}
 		}
 
-		if ($trash)
-		{
-			self::$package_cache = array();
+		if ($trash) {
+			self::$package_cache = [];
+
 			return;
 		}
 
 		// Write the cache to disk here.
 		// Bypass directories when doing so - no data to write & the fopen will crash.
-		foreach (self::$package_cache as $filename => $data)
-		{
-			if (!is_dir($filename))
-			{
+		foreach (self::$package_cache as $filename => $data) {
+			if (!is_dir($filename)) {
 				$fp = fopen($filename, in_array(substr($filename, -3), $text_filetypes) ? 'w' : 'wb');
 				fwrite($fp, $data);
 				fclose($fp);
 			}
 		}
 
-		self::$package_cache = array();
+		self::$package_cache = [];
 	}
 
 	/**
@@ -2751,47 +2814,40 @@ public static function package_flush_cache($trash = false)
 	 * @param string $filename The name of the file
 	 * @param string $perm_state The permission state - can be either 'writable' or 'execute'
 	 * @param bool $track_change Whether to track this change
-	 * @return boolean True if it worked, false if it didn't
+	 * @return bool True if it worked, false if it didn't
 	 */
 	public static function package_chmod($filename, $perm_state = 'writable', $track_change = false)
 	{
-		if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable')
+		if (file_exists($filename) && is_writable($filename) && $perm_state == 'writable') {
 			return true;
+		}
 
 		// Start off checking without FTP.
-		if (!isset(self::$package_ftp) || self::$package_ftp === false)
-		{
-			for ($i = 0; $i < 2; $i++)
-			{
+		if (!isset(self::$package_ftp) || self::$package_ftp === false) {
+			for ($i = 0; $i < 2; $i++) {
 				$chmod_file = $filename;
 
 				// Start off with a less aggressive test.
-				if ($i == 0)
-				{
+				if ($i == 0) {
 					// If this file doesn't exist, then we actually want to look at whatever parent directory does.
 					$subTraverseLimit = 2;
-					while (!file_exists($chmod_file) && $subTraverseLimit)
-					{
+
+					while (!file_exists($chmod_file) && $subTraverseLimit) {
 						$chmod_file = dirname($chmod_file);
 						$subTraverseLimit--;
 					}
 
 					// Keep track of the writable status here.
 					$file_permissions = @fileperms($chmod_file);
-				}
-				else
-				{
+				} else {
 					// This looks odd, but it's an attempt to work around PHP suExec.
-					if (!file_exists($chmod_file) && $perm_state == 'writable')
-					{
+					if (!file_exists($chmod_file) && $perm_state == 'writable') {
 						$file_permissions = @fileperms(dirname($chmod_file));
 
 						self::mktree(dirname($chmod_file), 0755);
 						@touch($chmod_file);
 						Utils::makeWritable($chmod_file, 0755);
-					}
-					else
-					{
+					} else {
 						$file_permissions = @fileperms($chmod_file);
 					}
 				}
@@ -2799,68 +2855,70 @@ public static function package_chmod($filename, $perm_state = 'writable', $track
 				Utils::makeWritable($chmod_file);
 
 				// The ultimate writable test.
-				if ($perm_state == 'writable')
-				{
+				if ($perm_state == 'writable') {
 					$fp = is_dir($chmod_file) ? @opendir($chmod_file) : @fopen($chmod_file, 'rb');
-					if (@is_writable($chmod_file) && $fp)
-					{
-						if (!is_dir($chmod_file))
+
+					if (@is_writable($chmod_file) && $fp) {
+						if (!is_dir($chmod_file)) {
 							fclose($fp);
-						else
+						} else {
 							closedir($fp);
+						}
 
 						// It worked!
-						if ($track_change)
+						if ($track_change) {
 							$_SESSION['pack_ftp']['original_perms'][$chmod_file] = $file_permissions;
+						}
 
 						return true;
 					}
-				}
-				elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$chmod_file]))
+				} elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$chmod_file])) {
 					unset($_SESSION['pack_ftp']['original_perms'][$chmod_file]);
+				}
 			}
 
 			// If we're here we're a failure.
 			return false;
 		}
+
 		// Otherwise we do have FTP?
-		elseif (self::$package_ftp !== false && !empty($_SESSION['pack_ftp']))
-		{
-			$ftp_file = strtr($filename, array($_SESSION['pack_ftp']['root'] => ''));
+		if (self::$package_ftp !== false && !empty($_SESSION['pack_ftp'])) {
+			$ftp_file = strtr($filename, [$_SESSION['pack_ftp']['root'] => '']);
 
 			// This looks odd, but it's an attempt to work around PHP suExec.
-			if (!file_exists($filename) && $perm_state == 'writable')
-			{
+			if (!file_exists($filename) && $perm_state == 'writable') {
 				$file_permissions = @fileperms(dirname($filename));
 
 				self::mktree(dirname($filename), 0755);
 				self::$package_ftp->create_file($ftp_file);
 				self::$package_ftp->chmod($ftp_file, 0755);
-			}
-			else
+			} else {
 				$file_permissions = @fileperms($filename);
+			}
 
-			if ($perm_state != 'writable')
-			{
+			if ($perm_state != 'writable') {
 				self::$package_ftp->chmod($ftp_file, $perm_state == 'execute' ? 0755 : 0644);
-			}
-			else
-			{
-				if (!@is_writable($filename))
+			} else {
+				if (!@is_writable($filename)) {
 					self::$package_ftp->chmod($ftp_file, 0777);
-				if (!@is_writable(dirname($filename)))
+				}
+
+				if (!@is_writable(dirname($filename))) {
 					self::$package_ftp->chmod(dirname($ftp_file), 0777);
+				}
 			}
 
-			if (@is_writable($filename))
-			{
-				if ($track_change)
+			if (@is_writable($filename)) {
+				if ($track_change) {
 					$_SESSION['pack_ftp']['original_perms'][$filename] = $file_permissions;
+				}
 
 				return true;
 			}
-			elseif ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$filename]))
+
+			if ($perm_state != 'writable' && isset($_SESSION['pack_ftp']['original_perms'][$filename])) {
 				unset($_SESSION['pack_ftp']['original_perms'][$filename]);
+			}
 		}
 
 		// Oh dear, we failed if we get here.
@@ -2878,11 +2936,14 @@ public static function package_crypt($pass)
 		$n = strlen($pass);
 
 		$salt = session_id();
-		while (strlen($salt) < $n)
+
+		while (strlen($salt) < $n) {
 			$salt .= session_id();
+		}
 
-		for ($i = 0; $i < $n; $i++)
+		for ($i = 0; $i < $n; $i++) {
 			$pass[$i] = chr(ord($pass[$i]) ^ (ord($salt[$i]) - 32));
+		}
 
 		return $pass;
 	}
@@ -2896,11 +2957,12 @@ public static function package_crypt($pass)
 	 */
 	public static function package_unique_filename($dir, $filename, $ext)
 	{
-		if (file_exists($dir . '/' . $filename . '.' . $ext))
-		{
+		if (file_exists($dir . '/' . $filename . '.' . $ext)) {
 			$i = 1;
-			while (file_exists($dir . '/' . $filename . '_' . $i . '.' . $ext))
+
+			while (file_exists($dir . '/' . $filename . '_' . $i . '.' . $ext)) {
 				$i++;
+			}
 			$filename .= '_' . $i;
 		}
 
@@ -2915,50 +2977,53 @@ public static function package_unique_filename($dir, $filename, $ext)
 	 */
 	public static function package_create_backup($id = 'backup')
 	{
-		$files = array();
+		$files = [];
+
+		$base_files = ['index.php', 'SSI.php', 'agreement.txt', 'cron.php', 'proxy.php', 'ssi_examples.php', 'ssi_examples.shtml', 'subscriptions.php'];
 
-		$base_files = array('index.php', 'SSI.php', 'agreement.txt', 'cron.php', 'proxy.php', 'ssi_examples.php', 'ssi_examples.shtml', 'subscriptions.php');
-		foreach ($base_files as $file)
-		{
-			if (file_exists(Config::$boarddir . '/' . $file))
+		foreach ($base_files as $file) {
+			if (file_exists(Config::$boarddir . '/' . $file)) {
 				$files[empty($_REQUEST['use_full_paths']) ? $file : Config::$boarddir . '/' . $file] = Config::$boarddir . '/' . $file;
+			}
 		}
 
-		$dirs = array(
-			Config::$sourcedir => empty($_REQUEST['use_full_paths']) ? 'Sources/' : strtr(Config::$sourcedir . '/', '\\', '/')
-		);
+		$dirs = [
+			Config::$sourcedir => empty($_REQUEST['use_full_paths']) ? 'Sources/' : strtr(Config::$sourcedir . '/', '\\', '/'),
+		];
 
-		$request = Db::$db->query('', '
-			SELECT value
+		$request = Db::$db->query(
+			'',
+			'SELECT value
 			FROM {db_prefix}themes
 			WHERE id_member = {int:no_member}
 				AND variable = {string:theme_dir}',
-			array(
+			[
 				'no_member' => 0,
 				'theme_dir' => 'theme_dir',
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$dirs[$row['value']] = empty($_REQUEST['use_full_paths']) ? 'Themes/' . basename($row['value']) . '/' : strtr($row['value'] . '/', '\\', '/');
+		}
 		Db::$db->free_result($request);
 
-		try
-		{
-			foreach ($dirs as $dir => $dest)
-			{
+		try {
+			foreach ($dirs as $dir => $dest) {
 				$iter = new \RecursiveIteratorIterator(
 					new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
 					\RecursiveIteratorIterator::CHILD_FIRST,
-					\RecursiveIteratorIterator::CATCH_GET_CHILD // Ignore "Permission denied"
+					\RecursiveIteratorIterator::CATCH_GET_CHILD, // Ignore "Permission denied"
 				);
 
-				foreach ($iter as $entry => $dir)
-				{
-					if ($dir->isDir())
+				foreach ($iter as $entry => $dir) {
+					if ($dir->isDir()) {
 						continue;
+					}
 
-					if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~|.*minified_[a-z0-9]{32}\.(js|css))$~', $entry) != 0)
+					if (preg_match('~^(\.{1,2}|CVS|backup.*|help|images|.*\~|.*minified_[a-z0-9]{32}\.(js|css))$~', $entry) != 0) {
 						continue;
+					}
 
 					$files[empty($_REQUEST['use_full_paths']) ? str_replace(realpath(Config::$boarddir), '', $entry) : $entry] = $entry;
 				}
@@ -2966,41 +3031,48 @@ public static function package_create_backup($id = 'backup')
 			$obj = new \ArrayObject($files);
 			$iterator = $obj->getIterator();
 
-			if (!file_exists(Config::$packagesdir . '/backups'))
+			if (!file_exists(Config::$packagesdir . '/backups')) {
 				self::mktree(Config::$packagesdir . '/backups', 0777);
-			if (!is_writable(Config::$packagesdir . '/backups'))
+			}
+
+			if (!is_writable(Config::$packagesdir . '/backups')) {
 				self::package_chmod(Config::$packagesdir . '/backups');
+			}
 			$output_file = Config::$packagesdir . '/backups/' . Time::strftime('%Y-%m-%d_') . preg_replace('~[$\\\\/:<>|?*"\']~', '', $id);
 			$output_ext = '.tar';
 			$output_ext_target = '.tar.gz';
 
-			if (file_exists($output_file . $output_ext_target))
-			{
+			if (file_exists($output_file . $output_ext_target)) {
 				$i = 2;
-				while (file_exists($output_file . '_' . $i . $output_ext_target))
+
+				while (file_exists($output_file . '_' . $i . $output_ext_target)) {
 					$i++;
+				}
 				$output_file = $output_file . '_' . $i . $output_ext;
-			}
-			else
+			} else {
 				$output_file .= $output_ext;
+			}
 
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
+
+			if (function_exists('apache_reset_timeout')) {
 				@apache_reset_timeout();
+			}
 
 			// Phar doesn't handle open_basedir restrictions very well and throws a PHP Warning. Ignore that.
 			set_error_handler(
-				function($errno, $errstr, $errfile, $errline)
-				{
+				function ($errno, $errstr, $errfile, $errline) {
 					// error was suppressed with the @-operator
-					if (0 === error_reporting())
+					if (0 === error_reporting()) {
 						return false;
+					}
 
-					if (strpos($errstr, 'PharData::__construct(): open_basedir') === false && strpos($errstr, 'PharData::compress(): open_basedir') === false)
+					if (strpos($errstr, 'PharData::__construct(): open_basedir') === false && strpos($errstr, 'PharData::compress(): open_basedir') === false) {
 						ErrorHandler::log($errstr, 'general', $errfile, $errline);
+					}
 
 					return true;
-				}
+				},
 			);
 			$a = new \PharData($output_file);
 			$a->buildFromIterator($iterator);
@@ -3013,9 +3085,7 @@ function($errno, $errstr, $errfile, $errline)
 			 */
 			unset($a);
 			unlink($output_file);
-		}
-		catch (\Exception $e)
-		{
+		} catch (\Exception $e) {
 			ErrorHandler::log($e->getMessage(), 'backup');
 
 			return false;
@@ -3035,12 +3105,12 @@ public static function package_validate_installtest($package)
 		// Don't validate directories.
 		Utils::$context['package_sha256_hash'] = is_dir($package['file_name']) ? null : hash_file('sha256', $package['file_name']);
 
-		$sendData = array(array(
+		$sendData = [[
 			'sha256_hash' => Utils::$context['package_sha256_hash'],
 			'file_name' => basename($package['file_name']),
 			'custom_id' => $package['custom_id'],
 			'custom_type' => $package['custom_type'],
-		));
+		]];
 
 		return self::package_validate_send($sendData);
 	}
@@ -3054,28 +3124,31 @@ public static function package_validate_installtest($package)
 	public static function package_validate($packages)
 	{
 		// Setup our send data.
-		$sendData = array();
+		$sendData = [];
 
 		// Go through all packages and get them ready to send up.
-		foreach ($packages as $id_package => $package)
-		{
+		foreach ($packages as $id_package => $package) {
 			$sha256_hash = hash_file('sha256', $package);
 			$packageInfo = self::getPackageInfo($package);
 
 			$packageID = '';
-			if (isset($packageInfo['id']))
+
+			if (isset($packageInfo['id'])) {
 				$packageID = $packageInfo['id'];
+			}
 
 			$packageType = 'modification';
-			if (isset($package['type']))
+
+			if (isset($package['type'])) {
 				$packageType = $package['type'];
+			}
 
-			$sendData[] = array(
+			$sendData[] = [
 				'sha256_hash' => $sha256_hash,
 				'file_name' => basename($package),
 				'custom_id' => $packageID,
 				'custom_type' => $packageType,
-			);
+			];
 		}
 
 		return self::package_validate_send($sendData);
@@ -3090,46 +3163,51 @@ public static function package_validate($packages)
 	public static function package_validate_send($sendData)
 	{
 		// First lets get all package servers into here.
-		if (empty(Utils::$context['package_servers']))
-		{
+		if (empty(Utils::$context['package_servers'])) {
 
-			$request = Db::$db->query('', '
-				SELECT id_server, name, validation_url, extra
+			$request = Db::$db->query(
+				'',
+				'SELECT id_server, name, validation_url, extra
 				FROM {db_prefix}package_servers
 				WHERE validation_url != {string:empty}',
-				array(
+				[
 					'empty' => '',
-			));
-			Utils::$context['package_servers'] = array();
-			while ($row = Db::$db->fetch_assoc($request))
+				],
+			);
+			Utils::$context['package_servers'] = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				Utils::$context['package_servers'][$row['id_server']] = $row;
+			}
 			Db::$db->free_result($request);
 		}
 
 		$the_version = SMF_VERSION;
-		if (!empty($_SESSION['version_emulate']))
+
+		if (!empty($_SESSION['version_emulate'])) {
 			$the_version = $_SESSION['version_emulate'];
+		}
 
 		// Test each server.
-		$return_data = array();
-		foreach (Utils::$context['package_servers'] as $id_server => $server)
-		{
-			$return_data[$id_server] = array();
+		$return_data = [];
+
+		foreach (Utils::$context['package_servers'] as $id_server => $server) {
+			$return_data[$id_server] = [];
 
 			// Sub out any variables we support in the validation url.
-			$validate_url = strtr($server['validation_url'], array(
-				'{SMF_VERSION}' => urlencode($the_version)
-			));
+			$validate_url = strtr($server['validation_url'], [
+				'{SMF_VERSION}' => urlencode($the_version),
+			]);
 
 			$results = WebFetchApi::fetch($validate_url, 'data=' . json_encode($sendData));
 
 			$parsed_data = Utils::jsonDecode($results, true);
-			if (is_array($parsed_data) && isset($parsed_data['data']) && is_array($parsed_data['data']))
-			{
-				foreach ($parsed_data['data'] as $sha256_hash => $status)
-				{
-					if ((string) $status === 'blacklist')
+
+			if (is_array($parsed_data) && isset($parsed_data['data']) && is_array($parsed_data['data'])) {
+				foreach ($parsed_data['data'] as $sha256_hash => $status) {
+					if ((string) $status === 'blacklist') {
 						Utils::$context['package_blacklist_found'] = true;
+					}
 
 					$return_data[$id_server][(string) $sha256_hash] = 'package_validation_status_' . ((string) $status);
 				}
@@ -3153,93 +3231,104 @@ public static function package_validate_send($sendData)
 	protected function fetchPerms__recursive($path, &$data, $level)
 	{
 		$isLikelyPath = false;
-		foreach (Utils::$context['look_for'] as $possiblePath)
-			if (substr($possiblePath, 0, strlen($path)) == $path)
+
+		foreach (Utils::$context['look_for'] as $possiblePath) {
+			if (substr($possiblePath, 0, strlen($path)) == $path) {
 				$isLikelyPath = true;
+			}
+		}
 
 		// Is this where we stop?
-		if (isset($_GET['xml']) && !empty(Utils::$context['look_for']) && !$isLikelyPath)
+		if (isset($_GET['xml']) && !empty(Utils::$context['look_for']) && !$isLikelyPath) {
 			return;
-		elseif ($level > Utils::$context['default_level'] && !$isLikelyPath)
+		}
+
+		if ($level > Utils::$context['default_level'] && !$isLikelyPath) {
 			return;
+		}
 
 		// Are we actually interested in saving this data?
 		$save_data = empty(Utils::$context['only_find']) || Utils::$context['only_find'] == $path;
 
 		// @todo Shouldn't happen - but better error message?
-		if (!is_dir($path))
+		if (!is_dir($path)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// This is where we put stuff we've found for sorting.
-		$foundData = array(
-			'files' => array(),
-			'folders' => array(),
-		);
+		$foundData = [
+			'files' => [],
+			'folders' => [],
+		];
 
 		$dh = opendir($path);
-		while ($entry = readdir($dh))
-		{
+
+		while ($entry = readdir($dh)) {
 			// Some kind of file?
-			if (is_file($path . '/' . $entry))
-			{
+			if (is_file($path . '/' . $entry)) {
 				// Are we listing PHP files in this directory?
-				if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php')
+				if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') {
 					$foundData['files'][$entry] = true;
+				}
 				// A file we were looking for.
-				elseif ($save_data && isset($data['contents'][$entry]))
+				elseif ($save_data && isset($data['contents'][$entry])) {
 					$foundData['files'][$entry] = true;
+				}
 			}
 			// It's a directory - we're interested one way or another, probably...
-			elseif ($entry != '.' && $entry != '..')
-			{
+			elseif ($entry != '.' && $entry != '..') {
 				// Going further?
-				if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive'))))
-				{
-					if (!isset($data['contents'][$entry]))
+				if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive')))) {
+					if (!isset($data['contents'][$entry])) {
 						$foundData['folders'][$entry] = 'dir_recursive';
-					else
+					} else {
 						$foundData['folders'][$entry] = true;
+					}
 
 					// If this wasn't expected inherit the recursiveness...
-					if (!isset($data['contents'][$entry]))
+					if (!isset($data['contents'][$entry])) {
 						// We need to do this as we will be going all recursive.
-						$data['contents'][$entry] = array(
+						$data['contents'][$entry] = [
 							'type' => 'dir_recursive',
-						);
+						];
+					}
 
 					// Actually do the recursive stuff...
 					$this->fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1);
 				}
 				// Maybe it is a folder we are not descending into.
-				elseif (isset($data['contents'][$entry]))
+				elseif (isset($data['contents'][$entry])) {
 					$foundData['folders'][$entry] = true;
+				}
 				// Otherwise we stop here.
 			}
 		}
 		closedir($dh);
 
 		// Nothing to see here?
-		if (!$save_data)
+		if (!$save_data) {
 			return;
+		}
 
 		// Now actually add the data, starting with the folders.
 		ksort($foundData['folders']);
-		foreach ($foundData['folders'] as $folder => $type)
-		{
-			$additional_data = array(
-				'perms' => array(
+
+		foreach ($foundData['folders'] as $folder => $type) {
+			$additional_data = [
+				'perms' => [
 					'chmod' => @is_writable($path . '/' . $folder),
 					'perms' => @fileperms($path . '/' . $folder),
-				),
-			);
-			if ($type !== true)
+				],
+			];
+
+			if ($type !== true) {
 				$additional_data['type'] = $type;
+			}
 
 			// If there's an offset ignore any folders in XML mode.
-			if (isset($_GET['xml']) && Utils::$context['file_offset'] == 0)
-			{
-				Utils::$context['xml_data']['folders']['children'][] = array(
-					'attributes' => array(
+			if (isset($_GET['xml']) && Utils::$context['file_offset'] == 0) {
+				Utils::$context['xml_data']['folders']['children'][] = [
+					'attributes' => [
 						'writable' => $additional_data['perms']['chmod'] ? 1 : 0,
 						'permissions' => substr(sprintf('%o', $additional_data['perms']['perms']), -4),
 						'folder' => 1,
@@ -3249,45 +3338,46 @@ protected function fetchPerms__recursive($path, &$data, $level)
 						'offset' => Utils::$context['file_offset'],
 						'my_ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find'] . '/' . $folder),
 						'ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find']),
-					),
+					],
 					'value' => $folder,
-				);
-			}
-			elseif (!isset($_GET['xml']))
-			{
-				if (isset($data['contents'][$folder]))
+				];
+			} elseif (!isset($_GET['xml'])) {
+				if (isset($data['contents'][$folder])) {
 					$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
-				else
+				} else {
 					$data['contents'][$folder] = $additional_data;
+				}
 			}
 		}
 
 		// Now we want to do a similar thing with files.
 		ksort($foundData['files']);
 		$counter = -1;
-		foreach ($foundData['files'] as $file => $dummy)
-		{
+
+		foreach ($foundData['files'] as $file => $dummy) {
 			$counter++;
 
 			// Have we reached our offset?
-			if (Utils::$context['file_offset'] > $counter)
+			if (Utils::$context['file_offset'] > $counter) {
 				continue;
+			}
+
 			// Gone too far?
-			if ($counter > (Utils::$context['file_offset'] + Utils::$context['file_limit']))
+			if ($counter > (Utils::$context['file_offset'] + Utils::$context['file_limit'])) {
 				continue;
+			}
 
-			$additional_data = array(
-				'perms' => array(
+			$additional_data = [
+				'perms' => [
 					'chmod' => @is_writable($path . '/' . $file),
 					'perms' => @fileperms($path . '/' . $file),
-				),
-			);
+				],
+			];
 
 			// XML?
-			if (isset($_GET['xml']))
-			{
-				Utils::$context['xml_data']['folders']['children'][] = array(
-					'attributes' => array(
+			if (isset($_GET['xml'])) {
+				Utils::$context['xml_data']['folders']['children'][] = [
+					'attributes' => [
 						'writable' => $additional_data['perms']['chmod'] ? 1 : 0,
 						'permissions' => substr(sprintf('%o', $additional_data['perms']['perms']), -4),
 						'folder' => 0,
@@ -3297,16 +3387,15 @@ protected function fetchPerms__recursive($path, &$data, $level)
 						'offset' => Utils::$context['file_offset'],
 						'my_ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find'] . '/' . $file),
 						'ident' => preg_replace('~[^A-Za-z0-9_\-=:]~', ':-:', Utils::$context['only_find']),
-					),
+					],
 					'value' => $file,
-				);
-			}
-			elseif ($counter != (Utils::$context['file_offset'] + Utils::$context['file_limit']))
-			{
-				if (isset($data['contents'][$file]))
+				];
+			} elseif ($counter != (Utils::$context['file_offset'] + Utils::$context['file_limit'])) {
+				if (isset($data['contents'][$file])) {
 					$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
-				else
+				} else {
 					$data['contents'][$file] = $additional_data;
+				}
 			}
 		}
 	}
@@ -3315,16 +3404,15 @@ protected function fetchPerms__recursive($path, &$data, $level)
 	 * Counts all the directories under a given path
 	 *
 	 * @param string $dir
-	 * @return integer
+	 * @return int
 	 */
 	protected function count_directories__recursive($dir)
 	{
 		$count = 0;
 		$dh = @opendir($dir);
-		while ($entry = readdir($dh))
-		{
-			if ($entry != '.' && $entry != '..' && is_dir($dir . '/' . $entry))
-			{
+
+		while ($entry = readdir($dh)) {
+			if ($entry != '.' && $entry != '..' && is_dir($dir . '/' . $entry)) {
 				Utils::$context['directory_list'][$dir . '/' . $entry] = 1;
 				$count++;
 				$count += $this->count_directories__recursive($dir . '/' . $entry);
@@ -3343,13 +3431,17 @@ protected function count_directories__recursive($dir)
 	 */
 	protected function build_special_files__recursive($path, &$data)
 	{
-		if (!empty($data['writable_on']))
-			if (Utils::$context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
+		if (!empty($data['writable_on'])) {
+			if (Utils::$context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive') {
 				Utils::$context['special_files'][$path] = 1;
+			}
+		}
 
-		if (!empty($data['contents']))
-			foreach ($data['contents'] as $name => $contents)
+		if (!empty($data['contents'])) {
+			foreach ($data['contents'] as $name => $contents) {
 				$this->build_special_files__recursive($path . '/' . $name, $contents);
+			}
+		}
 	}
 
 	/*************************
@@ -3365,14 +3457,15 @@ protected function build_special_files__recursive($path, &$data)
 	 */
 	private static function smf_crc32($number)
 	{
-		require_once(Config::$sourcedir . '/Subs-Compat.php');
+		require_once Config::$sourcedir . '/Subs-Compat.php';
 
 		return \smf_crc32($number);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SubsPackage::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SubsPackage::exportStatic')) {
 	SubsPackage::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PackageManager/XmlArray.php b/Sources/PackageManager/XmlArray.php
index 8571954348..b128937b62 100644
--- a/Sources/PackageManager/XmlArray.php
+++ b/Sources/PackageManager/XmlArray.php
@@ -61,18 +61,19 @@ public function __construct($data, $auto_trim = false, $level = null, $is_clone
 		$this->trim = $auto_trim;
 
 		// Is the data already parsed?
-		if ($is_clone)
-		{
+		if ($is_clone) {
 			$this->array = $data;
+
 			return;
 		}
 
 		// Is the input an array? (ie. passed from file()?)
-		if (is_array($data))
+		if (is_array($data)) {
 			$data = implode('', $data);
+		}
 
 		// Remove any xml declaration or doctype, and parse out comments and CDATA.
-		$data = preg_replace('/<!--.*?-->/s', '', $this->_to_cdata(preg_replace(array('/^<\?xml.+?\?' . '>/is', '/<!DOCTYPE[^>]+?' . '>/s'), '', $data)));
+		$data = preg_replace('/<!--.*?-->/s', '', $this->_to_cdata(preg_replace(['/^<\?xml.+?\?' . '>/is', '/<!DOCTYPE[^>]+?' . '>/s'], '', $data)));
 
 		// Now parse the xml!
 		$this->array = $this->_parse($data);
@@ -87,7 +88,7 @@ public function __construct($data, $auto_trim = false, $level = null, $is_clone
 	 */
 	public function name()
 	{
-		return isset($this->array['name']) ? $this->array['name'] : '';
+		return $this->array['name'] ?? '';
 	}
 
 	/**
@@ -106,20 +107,20 @@ public function fetch($path, $get_elements = false)
 		// Get the element, in array form.
 		$array = $this->path($path);
 
-		if ($array === false)
+		if ($array === false) {
 			return false;
+		}
 
 		// Getting elements into this is a bit complicated...
-		if ($get_elements && !is_string($array))
-		{
+		if ($get_elements && !is_string($array)) {
 			$temp = '';
 
 			// Use the _xml() function to get the xml data.
-			foreach ($array->array as $val)
-			{
+			foreach ($array->array as $val) {
 				// Skip the name and any attributes.
-				if (is_array($val))
+				if (is_array($val)) {
 					$temp .= $this->_xml($val, null);
+				}
 			}
 
 			// Just get the XML data and then take out the CDATAs.
@@ -150,47 +151,46 @@ public function path($path, $return_full = false)
 		$array = $this->array;
 
 		// For each element in the path.
-		foreach ($path as $el)
-		{
+		foreach ($path as $el) {
 			// Deal with sets....
-			if (strpos($el, '[') !== false)
-			{
+			if (strpos($el, '[') !== false) {
 				$lvl = (int) substr($el, strpos($el, '[') + 1);
 				$el = substr($el, 0, strpos($el, '['));
 			}
 			// Find an attribute.
-			elseif (substr($el, 0, 1) == '@')
-			{
+			elseif (substr($el, 0, 1) == '@') {
 				// It simplifies things if the attribute is already there ;).
-				if (isset($array[$el]))
+				if (isset($array[$el])) {
 					return $array[$el];
-				else
-				{
-					$trace = debug_backtrace();
-					$i = 0;
-					while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this))
-						$i++;
-					$debug = ' (from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'] . ')';
-
-					// Cause an error.
-					if ($this->debug_level & E_NOTICE)
-					{
-						Lang::load('Errors');
-						trigger_error(sprintf(Lang::$txt['undefined_xml_attribute'], substr($el, 1) . $debug), E_USER_NOTICE);
-					}
-					return false;
 				}
-			}
-			else
+
+				$trace = debug_backtrace();
+				$i = 0;
+
+				while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this)) {
+					$i++;
+				}
+				$debug = ' (from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'] . ')';
+
+				// Cause an error.
+				if ($this->debug_level & E_NOTICE) {
+					Lang::load('Errors');
+					trigger_error(sprintf(Lang::$txt['undefined_xml_attribute'], substr($el, 1) . $debug), E_USER_NOTICE);
+				}
+
+				return false;
+			} else {
 				$lvl = null;
+			}
 
 			// Find this element.
 			$array = $this->_path($array, $el, $lvl);
 		}
 
 		// Clean up after $lvl, for $return_full.
-		if ($return_full && (!isset($array['name']) || substr($array['name'], -1) != ']'))
-			$array = array('name' => $el . '[]', $array);
+		if ($return_full && (!isset($array['name']) || substr($array['name'], -1) != ']')) {
+			$array = ['name' => $el . '[]', $array];
+		}
 
 		// Create the right type of class...
 		$newClass = get_class($this);
@@ -205,7 +205,7 @@ public function path($path, $return_full = false)
 	 *  echo $xml->exists('html/body') ? 'y' : 'n';
 	 *
 	 * @param string $path The path to the element to get.
-	 * @return boolean Whether the specified path exists
+	 * @return bool Whether the specified path exists
 	 */
 	public function exists($path)
 	{
@@ -216,19 +216,18 @@ public function exists($path)
 		$array = $this->array;
 
 		// For each element in the path.
-		foreach ($path as $el)
-		{
+		foreach ($path as $el) {
 			// Deal with sets....
-			if (strpos($el, '[') !== false)
-			{
+			if (strpos($el, '[') !== false) {
 				$lvl = (int) substr($el, strpos($el, '[') + 1);
 				$el = substr($el, 0, strpos($el, '['));
 			}
 			// Find an attribute.
-			elseif (substr($el, 0, 1) == '@')
+			elseif (substr($el, 0, 1) == '@') {
 				return isset($array[$el]);
-			else
+			} else {
 				$lvl = null;
+			}
 
 			// Find this element.
 			$array = $this->_path($array, $el, $lvl, true);
@@ -252,10 +251,11 @@ public function count($path)
 
 		// Start at zero, then count up all the numeric keys.
 		$i = 0;
-		foreach ($temp->array as $item)
-		{
-			if (is_array($item))
+
+		foreach ($temp->array as $item) {
+			if (is_array($item)) {
 				$i++;
+			}
 		}
 
 		return $i;
@@ -274,14 +274,14 @@ public function count($path)
 	public function set($path)
 	{
 		// None as yet, just get the path.
-		$array = array();
+		$array = [];
 		$xml = $this->path($path, true);
 
-		foreach ($xml->array as $val)
-		{
+		foreach ($xml->array as $val) {
 			// Skip these, they aren't elements.
-			if (!is_array($val) || $val['name'] == '!')
+			if (!is_array($val) || $val['name'] == '!') {
 				continue;
+			}
 
 			// Create the right type of class...
 			$newClass = get_class($this);
@@ -304,19 +304,20 @@ public function set($path)
 	public function create_xml($path = null)
 	{
 		// Was a path specified?  If so, use that array.
-		if ($path !== null)
-		{
+		if ($path !== null) {
 			$path = $this->path($path);
 
 			// The path was not found
-			if ($path === false)
+			if ($path === false) {
 				return false;
+			}
 
 			$path = $path->array;
 		}
 		// Just use the current array.
-		else
+		else {
 			$path = $this->array;
+		}
 
 		// Add the xml declaration to the front.
 		return '<?xml version="1.0"?' . '>' . $this->_xml($path, 0);
@@ -333,19 +334,20 @@ public function create_xml($path = null)
 	public function to_array($path = null)
 	{
 		// Are we doing a specific path?
-		if ($path !== null)
-		{
+		if ($path !== null) {
 			$path = $this->path($path);
 
 			// The path was not found
-			if ($path === false)
+			if ($path === false) {
 				return false;
+			}
 
 			$path = $path->array;
 		}
 		// No, so just use the current array.
-		else
+		else {
 			$path = $this->array;
+		}
 
 		return $this->_array($path);
 	}
@@ -359,68 +361,66 @@ public function to_array($path = null)
 	protected function _parse($data)
 	{
 		// Start with an 'empty' array with no data.
-		$current = array(
-		);
+		$current = [
+		];
 
 		// Loop until we're out of data.
-		while ($data != '')
-		{
+		while ($data != '') {
 			// Find and remove the next tag.
 			preg_match('/\A<([\w\-:]+)((?:\s+.+?)?)([\s]?\/)?' . '>/', $data, $match);
-			if (isset($match[0]))
+
+			if (isset($match[0])) {
 				$data = preg_replace('/' . preg_quote($match[0], '/') . '/s', '', $data, 1);
+			}
 
 			// Didn't find a tag?  Keep looping....
-			if (!isset($match[1]) || $match[1] == '')
-			{
+			if (!isset($match[1]) || $match[1] == '') {
 				// If there's no <, the rest is data.
-				if (strpos($data, '<') === false)
-				{
+				if (strpos($data, '<') === false) {
 					$text_value = $this->_from_cdata($data);
 					$data = '';
 
-					if ($text_value != '')
-						$current[] = array(
+					if ($text_value != '') {
+						$current[] = [
 							'name' => '!',
-							'value' => $text_value
-						);
+							'value' => $text_value,
+						];
+					}
 				}
 				// If the < isn't immediately next to the current position... more data.
-				elseif (strpos($data, '<') > 0)
-				{
+				elseif (strpos($data, '<') > 0) {
 					$text_value = $this->_from_cdata(substr($data, 0, strpos($data, '<')));
 					$data = substr($data, strpos($data, '<'));
 
-					if ($text_value != '')
-						$current[] = array(
+					if ($text_value != '') {
+						$current[] = [
 							'name' => '!',
-							'value' => $text_value
-						);
+							'value' => $text_value,
+						];
+					}
 				}
 				// If we're looking at a </something> with no start, kill it.
-				elseif (strpos($data, '<') !== false && strpos($data, '<') == 0)
-				{
-					if (strpos($data, '<', 1) !== false)
-					{
+				elseif (strpos($data, '<') !== false && strpos($data, '<') == 0) {
+					if (strpos($data, '<', 1) !== false) {
 						$text_value = $this->_from_cdata(substr($data, 0, strpos($data, '<', 1)));
 						$data = substr($data, strpos($data, '<', 1));
 
-						if ($text_value != '')
-							$current[] = array(
+						if ($text_value != '') {
+							$current[] = [
 								'name' => '!',
-								'value' => $text_value
-							);
-					}
-					else
-					{
+								'value' => $text_value,
+							];
+						}
+					} else {
 						$text_value = $this->_from_cdata($data);
 						$data = '';
 
-						if ($text_value != '')
-							$current[] = array(
+						if ($text_value != '') {
+							$current[] = [
 								'name' => '!',
-								'value' => $text_value
-							);
+								'value' => $text_value,
+							];
+						}
 					}
 				}
 
@@ -433,65 +433,67 @@ protected function _parse($data)
 			$el['name'] = $match[1];
 
 			// If this ISN'T empty, remove the close tag and parse the inner data.
-			if ((!isset($match[3]) || trim($match[3]) != '/') && (!isset($match[2]) || trim($match[2]) != '/'))
-			{
+			if ((!isset($match[3]) || trim($match[3]) != '/') && (!isset($match[2]) || trim($match[2]) != '/')) {
 				// Because PHP 5.2.0+ seems to croak using regex, we'll have to do this the less fun way.
 				$last_tag_end = strpos($data, '</' . $match[1] . '>');
-				if ($last_tag_end === false)
+
+				if ($last_tag_end === false) {
 					continue;
+				}
 
 				$offset = 0;
-				while (1 == 1)
-				{
+
+				while (1 == 1) {
 					// Where is the next start tag?
 					$next_tag_start = strpos($data, '<' . $match[1], $offset);
+
 					// If the next start tag is after the last end tag then we've found the right close.
-					if ($next_tag_start === false || $next_tag_start > $last_tag_end)
+					if ($next_tag_start === false || $next_tag_start > $last_tag_end) {
 						break;
+					}
 
 					// If not then find the next ending tag.
 					$next_tag_end = strpos($data, '</' . $match[1] . '>', $offset);
 
 					// Didn't find one? Then just use the last and sod it.
-					if ($next_tag_end === false)
+					if ($next_tag_end === false) {
 						break;
-					else
-					{
-						$last_tag_end = $next_tag_end;
-						$offset = $next_tag_start + 1;
 					}
+
+					$last_tag_end = $next_tag_end;
+					$offset = $next_tag_start + 1;
 				}
 				// Parse the insides.
 				$inner_match = substr($data, 0, $last_tag_end);
 				// Data now starts from where this section ends.
 				$data = substr($data, $last_tag_end + strlen('</' . $match[1] . '>'));
 
-				if (!empty($inner_match))
-				{
+				if (!empty($inner_match)) {
 					// Parse the inner data.
-					if (strpos($inner_match, '<') !== false)
+					if (strpos($inner_match, '<') !== false) {
 						$el += $this->_parse($inner_match);
-					elseif (trim($inner_match) != '')
-					{
+					} elseif (trim($inner_match) != '') {
 						$text_value = $this->_from_cdata($inner_match);
-						if ($text_value != '')
-							$el[] = array(
+
+						if ($text_value != '') {
+							$el[] = [
 								'name' => '!',
-								'value' => $text_value
-							);
+								'value' => $text_value,
+							];
+						}
 					}
 				}
 			}
 
 			// If we're dealing with attributes as well, parse them out.
-			if (isset($match[2]) && $match[2] != '')
-			{
+			if (isset($match[2]) && $match[2] != '') {
 				// Find all the attribute pairs in the string.
 				preg_match_all('/([\w:]+)="(.+?)"/', $match[2], $attr, PREG_SET_ORDER);
 
 				// Set them as @attribute-name.
-				foreach ($attr as $match_attr)
+				foreach ($attr as $match_attr) {
 					$el['@' . $match_attr[1]] = $match_attr[2];
+				}
 			}
 		}
 
@@ -512,19 +514,24 @@ protected function _xml($array, $indent)
 ' . str_repeat('	', $indent) : '';
 
 		// This is a set of elements, with no name...
-		if (is_array($array) && !isset($array['name']))
-		{
+		if (is_array($array) && !isset($array['name'])) {
 			$temp = '';
-			foreach ($array as $val)
+
+			foreach ($array as $val) {
 				$temp .= $this->_xml($val, $indent);
+			}
+
 			return $temp;
 		}
 
 		// This is just text!
-		if ($array['name'] == '!')
+		if ($array['name'] == '!') {
 			return $indentation . '<![CDATA[' . $array['value'] . ']]>';
-		elseif (substr($array['name'], -2) == '[]')
+		}
+
+		if (substr($array['name'], -2) == '[]') {
 			$array['name'] = substr($array['name'], 0, -2);
+		}
 
 		// Start the element.
 		$output = $indentation . '<' . $array['name'];
@@ -533,22 +540,21 @@ protected function _xml($array, $indent)
 		$output_el = '';
 
 		// Run through and recursively output all the elements or attributes inside this.
-		foreach ($array as $k => $v)
-		{
-			if (substr($k, 0, 1) == '@')
+		foreach ($array as $k => $v) {
+			if (substr($k, 0, 1) == '@') {
 				$output .= ' ' . substr($k, 1) . '="' . $v . '"';
-			elseif (is_array($v))
-			{
+			} elseif (is_array($v)) {
 				$output_el .= $this->_xml($v, $indent === null ? null : $indent + 1);
 				$inside_elements = true;
 			}
 		}
 
 		// Indent, if necessary.... then close the tag.
-		if ($inside_elements)
+		if ($inside_elements) {
 			$output .= '>' . $output_el . $indentation . '</' . $array['name'] . '>';
-		else
+		} else {
 			$output .= ' />';
+		}
 
 		return $output;
 	}
@@ -561,23 +567,26 @@ protected function _xml($array, $indent)
 	 */
 	protected function _array($array)
 	{
-		$return = array();
+		$return = [];
 		$text = '';
-		foreach ($array as $value)
-		{
-			if (!is_array($value) || !isset($value['name']))
+
+		foreach ($array as $value) {
+			if (!is_array($value) || !isset($value['name'])) {
 				continue;
+			}
 
-			if ($value['name'] == '!')
+			if ($value['name'] == '!') {
 				$text .= $value['value'];
-			else
+			} else {
 				$return[$value['name']] = $this->_array($value);
+			}
 		}
 
-		if (empty($return))
+		if (empty($return)) {
 			return $text;
-		else
-			return $return;
+		}
+
+		return $return;
 	}
 
 	/**
@@ -586,33 +595,38 @@ protected function _array($array)
 	 * @param string $data The data with CDATA tags included
 	 * @return string The data contained within CDATA tags
 	 */
-	function _to_cdata($data)
+	public function _to_cdata($data)
 	{
 		$inCdata = $inComment = false;
 		$output = '';
 
 		$parts = preg_split('~(<!\[CDATA\[|\]\]>|<!--|-->)~', $data, -1, PREG_SPLIT_DELIM_CAPTURE);
-		foreach ($parts as $part)
-		{
+
+		foreach ($parts as $part) {
 			// Handle XML comments.
-			if (!$inCdata && $part === '<!--')
+			if (!$inCdata && $part === '<!--') {
 				$inComment = true;
-			if ($inComment && $part === '-->')
+			}
+
+			if ($inComment && $part === '-->') {
 				$inComment = false;
-			elseif ($inComment)
+			} elseif ($inComment) {
 				continue;
+			}
 
 			// Handle Cdata blocks.
-			elseif (!$inComment && $part === '<![CDATA[')
+			elseif (!$inComment && $part === '<![CDATA[') {
 				$inCdata = true;
-			elseif ($inCdata && $part === ']]>')
+			} elseif ($inCdata && $part === ']]>') {
 				$inCdata = false;
-			elseif ($inCdata)
+			} elseif ($inCdata) {
 				$output .= htmlentities($part, ENT_QUOTES);
+			}
 
 			// Everything else is kept as is.
-			else
+			else {
 				$output .= $part;
+			}
 		}
 
 		return $output;
@@ -633,13 +647,12 @@ protected function _from_cdata($data)
 		$data = strtr(
 			preg_replace_callback(
 				'~&#(\d{1,4});~',
-				function($m)
-				{
-					return chr("$m[1]");
+				function ($m) {
+					return chr("{$m[1]}");
 				},
-				$data
+				$data,
 			),
-			$trans_tbl
+			$trans_tbl,
 		);
 
 		return $this->trim ? trim($data) : $data;
@@ -654,22 +667,26 @@ function($m)
 	protected function _fetch($array)
 	{
 		// Don't return anything if this is just a string.
-		if (is_string($array))
+		if (is_string($array)) {
 			return '';
+		}
 
 		$temp = '';
-		foreach ($array as $text)
-		{
+
+		foreach ($array as $text) {
 			// This means it's most likely an attribute or the name itself.
-			if (!isset($text['name']))
+			if (!isset($text['name'])) {
 				continue;
+			}
 
 			// This is text!
-			if ($text['name'] == '!')
+			if ($text['name'] == '!') {
 				$temp .= $text['value'];
+			}
 			// Another element - dive in ;).
-			else
+			else {
 				$temp .= $this->_fetch($text);
+			}
 		}
 
 		// Return all the bits and pieces we've put together.
@@ -688,58 +705,63 @@ protected function _fetch($array)
 	protected function _path($array, $path, $level, $no_error = false)
 	{
 		// Is $array even an array?  It might be false!
-		if (!is_array($array))
+		if (!is_array($array)) {
 			return false;
+		}
 
 		// Asking for *no* path?
-		if ($path == '' || $path == '.')
+		if ($path == '' || $path == '.') {
 			return $array;
+		}
 		$paths = explode('|', $path);
 
 		// A * means all elements of any name.
 		$show_all = in_array('*', $paths);
 
-		$results = array();
+		$results = [];
 
 		// Check each element.
-		foreach ($array as $value)
-		{
-			if (!is_array($value) || $value['name'] === '!')
+		foreach ($array as $value) {
+			if (!is_array($value) || $value['name'] === '!') {
 				continue;
+			}
 
-			if ($show_all || in_array($value['name'], $paths))
-			{
+			if ($show_all || in_array($value['name'], $paths)) {
 				// Skip elements before "the one".
-				if ($level !== null && $level > 0)
+				if ($level !== null && $level > 0) {
 					$level--;
-				else
+				} else {
 					$results[] = $value;
+				}
 			}
 		}
 
 		// No results found...
-		if (empty($results))
-		{
+		if (empty($results)) {
 			$trace = debug_backtrace();
 			$i = 0;
-			while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this))
+
+			while ($i < count($trace) && isset($trace[$i]['class']) && $trace[$i]['class'] == get_class($this)) {
 				$i++;
+			}
 			$debug = ' from ' . $trace[$i - 1]['file'] . ' on line ' . $trace[$i - 1]['line'];
 
 			// Cause an error.
-			if ($this->debug_level & E_NOTICE && !$no_error)
-			{
+			if ($this->debug_level & E_NOTICE && !$no_error) {
 				Lang::load('Errors');
 				trigger_error(sprintf(Lang::$txt['undefined_xml_element'], $path . $debug), E_USER_NOTICE);
 			}
+
 			return false;
 		}
+
 		// Only one result.
-		elseif (count($results) == 1 || $level !== null)
+		if (count($results) == 1 || $level !== null) {
 			return $results[0];
+		}
+
 		// Return the result set.
-		else
-			return $results + array('name' => $path . '[]');
+		return $results + ['name' => $path . '[]'];
 	}
 }
 
diff --git a/Sources/PackageManager/index.php b/Sources/PackageManager/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/PackageManager/index.php
+++ b/Sources/PackageManager/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/PageIndex.php b/Sources/PageIndex.php
index 85b637f036..1772885ba9 100644
--- a/Sources/PageIndex.php
+++ b/Sources/PageIndex.php
@@ -27,11 +27,11 @@ class PageIndex implements \Stringable
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'constructPageIndex',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -39,14 +39,14 @@ class PageIndex implements \Stringable
 
 	/**
 	 * @var string
-	 * 
+	 *
 	 * The base URL for all the page index links.
 	 */
 	public string $base_url;
 
 	/**
 	 * @var int
-	 * 
+	 *
 	 * The value we are starting at.
 	 *
 	 * Should be the number of a specific item in the overall paginated list.
@@ -55,28 +55,28 @@ class PageIndex implements \Stringable
 
 	/**
 	 * @var int
-	 * 
+	 *
 	 * The total number of items in the overall paginated list.
 	 */
 	public int $max_value;
 
 	/**
 	 * @var int
-	 * 
+	 *
 	 * How many items to show per page.
 	 */
 	public int $num_per_page;
 
 	/**
 	 * @var bool
-	 * 
+	 *
 	 * Whether to use "url.offset" format instead of "url;start=offset" format.
 	 */
 	public bool $short_format = false;
 
 	/**
 	 * @var bool
-	 * 
+	 *
 	 * Set this to false to hide the previous page and next page arrow links.
 	 */
 	public bool $show_prevnext = true;
@@ -225,17 +225,17 @@ public function __construct(string $base_url, int &$start, int $max_value, int $
 
 		$this->extra_before = str_replace('{txt_pages}', Lang::$txt['pages'], $this->extra_before);
 
-		if (isset(Theme::$current->settings['page_index']))
-		{
-			foreach (Theme::$current->settings['page_index'] as $key => $value)
-			{
-				if (property_exists($this, $key))
+		if (isset(Theme::$current->settings['page_index'])) {
+			foreach (Theme::$current->settings['page_index'] as $key => $value) {
+				if (property_exists($this, $key)) {
 					$this->{$key} = $value;
+				}
 			}
 		}
 
-		if (!isset(Utils::$context['current_page']))
+		if (!isset(Utils::$context['current_page'])) {
 			Utils::$context['current_page'] = $this->start / $this->num_per_page;
+		}
 	}
 
 	/**
@@ -254,7 +254,7 @@ public function __toString()
 		$this->last_page_value = $this->max_value - $this->max_value % $this->num_per_page;
 		$this->current_page_num = $this->start / $this->num_per_page + 1;
 		$this->last_page_num = $this->last_page_value / $this->num_per_page + 1;
-		$this->base_link = strtr($this->page, array('{URL}' => $this->short_format ? $this->base_url : strtr($this->base_url, array('%' => '%%')) . ';start=%1$d'));
+		$this->base_link = strtr($this->page, ['{URL}' => $this->short_format ? $this->base_url : strtr($this->base_url, ['%' => '%%']) . ';start=%1$d']);
 
 		// If they didn't enter an odd value, pretend they did.
 		$this->page_contiguous = (int) ((Config::$modSettings['compactTopicPagesContiguous'] ?? 5) - ((Config::$modSettings['compactTopicPagesContiguous'] ?? 5) % 2)) / 2;
@@ -264,12 +264,9 @@ public function __toString()
 		$pageindex .= $this->prevPage();
 
 		// Compact pages is off or on?
-		if (empty(Config::$modSettings['compactTopicPagesEnable']))
-		{
+		if (empty(Config::$modSettings['compactTopicPagesEnable'])) {
 			$pageindex .= $this->pageRange(1, $this->last_page_num);
-		}
-		else
-		{
+		} else {
 			$pageindex .= $this->firstPage();
 			$pageindex .= $this->expandPages();
 			$pageindex .= $this->pageRange($this->current_page_num - $this->page_contiguous, $this->current_page_num + $this->page_contiguous);
@@ -326,8 +323,7 @@ protected function fixStart(int $start): int
 	 */
 	protected function prevPage(): string
 	{
-		if ($this->start != 0 && !$this->start_invalid && $this->show_prevnext)
-		{
+		if ($this->start != 0 && !$this->start_invalid && $this->show_prevnext) {
 			return sprintf($this->base_link, $this->start - $this->num_per_page, $this->previous_page);
 		}
 
@@ -340,8 +336,7 @@ protected function prevPage(): string
 	 */
 	protected function nextPage(): string
 	{
-		if ($this->start != $this->last_page_value && !$this->start_invalid && $this->show_prevnext)
-		{
+		if ($this->start != $this->last_page_value && !$this->start_invalid && $this->show_prevnext) {
 			return sprintf($this->base_link, $this->start + $this->num_per_page, $this->next_page);
 		}
 
@@ -354,8 +349,9 @@ protected function nextPage(): string
 	 */
 	protected function firstPage(): string
 	{
-		if ($this->current_page_num - $this->page_contiguous > 1)
+		if ($this->current_page_num - $this->page_contiguous > 1) {
 			return sprintf($this->base_link, 0, '1');
+		}
 
 		return '';
 	}
@@ -366,8 +362,9 @@ protected function firstPage(): string
 	 */
 	protected function lastPage(): string
 	{
-		if ($this->current_page_num + $this->page_contiguous < $this->last_page_num)
+		if ($this->current_page_num + $this->page_contiguous < $this->last_page_num) {
 			return sprintf($this->base_link, $this->last_page_value, $this->last_page_num);
+		}
 
 		return '';
 	}
@@ -385,25 +382,20 @@ protected function pageRange(int $min, int $max): string
 		$min = max(1, $min);
 		$max = min($this->last_page_num, $max);
 
-		for ($counter = $min; $counter <= $max; $counter++)
-		{
+		for ($counter = $min; $counter <= $max; $counter++) {
 			// Show the current page. (prev page 1 ... 6 7 >[8]< 9 10 ... 15 next page)
-			if ($counter == $this->current_page_num)
-			{
+			if ($counter == $this->current_page_num) {
 				// If start was invalid, show page number as a link to the proper start value.
-				if ($this->start_invalid)
-				{
+				if ($this->start_invalid) {
 					$page_range .= sprintf($this->base_link, $this->start, $this->current_page_num);
 				}
 				// Show page number as plain text.
-				else
-				{
+				else {
 					$page_range .= sprintf($this->current_page, $this->current_page_num);
 				}
 			}
 			// Show other pages.
-			else
-			{
+			else {
 				$page_range .= sprintf($this->base_link, ($counter - 1) * $this->num_per_page, $counter);
 			}
 		}
@@ -426,36 +418,36 @@ protected function pageRange(int $min, int $max): string
 	 */
 	protected function expandPages(bool $after = false): string
 	{
-		if (empty(Config::$modSettings['compactTopicPagesEnable']))
+		if (empty(Config::$modSettings['compactTopicPagesEnable'])) {
 			return '';
+		}
 
-		if (!$after)
-		{
+		if (!$after) {
 			$should_show = $this->start > $this->num_per_page * ($this->page_contiguous + 1);
 			$first_page = $this->num_per_page;
 			$last_page = $this->start - $this->num_per_page * $this->page_contiguous;
-		}
-		else
-		{
+		} else {
 			$should_show = $this->start + $this->num_per_page * ($this->page_contiguous + 1) < $this->last_page_value;
 			$first_page = $this->start + $this->num_per_page * ($this->page_contiguous + 1);
 			$last_page = $this->last_page_value;
 		}
 
-		if (!$should_show)
+		if (!$should_show) {
 			return '';
+		}
 
-		return strtr($this->expand_pages, array(
+		return strtr($this->expand_pages, [
 			'{LINK}' => Utils::JavaScriptEscape(Utils::htmlspecialchars($this->base_link)),
 			'{FIRST_PAGE}' => $first_page,
 			'{LAST_PAGE}' => $last_page,
 			'{PER_PAGE}' => $this->num_per_page,
-		));
+		]);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\PageIndex::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\PageIndex::exportStatic')) {
 	PageIndex::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PersonalMessage.php b/Sources/PersonalMessage.php
index 484d638b94..06be97b30d 100644
--- a/Sources/PersonalMessage.php
+++ b/Sources/PersonalMessage.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\PersonalMessage');
 
diff --git a/Sources/PersonalMessage/Conversation.php b/Sources/PersonalMessage/Conversation.php
index 8df9688f97..a5943bf52a 100644
--- a/Sources/PersonalMessage/Conversation.php
+++ b/Sources/PersonalMessage/Conversation.php
@@ -13,10 +13,10 @@
 
 namespace SMF\PersonalMessage;
 
+use SMF\Db\DatabaseApi as Db;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Represents a collection of related personal messages.
@@ -48,7 +48,7 @@ class Conversation
 	 *
 	 * Keys are ID numbers of PMs. Values are arrays with sender and recipient IDs.
 	 */
-	public array $pms = array();
+	public array $pms = [];
 
 	/**
 	 * @var bool
@@ -71,7 +71,7 @@ class Conversation
 	 * that match those parameters, where each key-value pair is the ID of the
 	 * head PM and the latest PM in a conversation.
 	 */
-	protected static array $recent = array();
+	protected static array $recent = [];
 
 	/****************
 	 * Public methods
@@ -79,14 +79,15 @@ class Conversation
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param int $pm The ID number of any PM in the conversation.
 	 */
 	public function __construct(int $pm)
 	{
 		// Find all the PMs in this conversation.
-		$request = Db::$db->query('', '
-			SELECT pm.id_pm, pm.id_pm_head, pm.id_member_from, pm.deleted_by_sender,
+		$request = Db::$db->query(
+			'',
+			'SELECT pm.id_pm, pm.id_pm_head, pm.id_member_from, pm.deleted_by_sender,
 				pmr.id_member, pmr.bcc, pmr.deleted
 			FROM {db_prefix}personal_messages AS pm
 				LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm AND pmr.id_member = {int:me})
@@ -97,13 +98,13 @@ public function __construct(int $pm)
 				LIMIT 1
 			)
 			ORDER BY pm.id_pm',
-			array(
+			[
 				'pm' => $pm,
 				'me' => User::$me->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row = array_map('intval', $row);
 
 			// Did the curent user send this PM?
@@ -117,24 +118,23 @@ public function __construct(int $pm)
 			$this->head = $row['id_pm_head'];
 
 			// Did the current user start this conversation?
-			if ($this->head == $row['id_pm'])
+			if ($this->head == $row['id_pm']) {
 				$this->started_by_me = $from_me;
+			}
 
 			// If the current user deleted this PM, skip it.
-			if (($from_me && !empty($row['deleted_by_sender'])) || ($to_me && !empty($row['deleted'])))
-			{
+			if (($from_me && !empty($row['deleted_by_sender'])) || ($to_me && !empty($row['deleted']))) {
 				continue;
 			}
 
-			if (!isset($this->pms[$row['id_pm']]))
-			{
-				$this->pms[$row['id_pm']] = array(
+			if (!isset($this->pms[$row['id_pm']])) {
+				$this->pms[$row['id_pm']] = [
 					'sender' => $row['id_member_from'],
-					'received' => array(
-						'to' => array(),
-						'bcc' => array(),
-					),
-				);
+					'received' => [
+						'to' => [],
+						'bcc' => [],
+					],
+				];
 			}
 
 			$this->pms[$row['id_pm']]['received'][empty($row['bcc']) ? 'to' : 'bcc'] = $row['id_member'];
@@ -144,8 +144,9 @@ public function __construct(int $pm)
 		Db::$db->free_result($request);
 
 		// If user wants newest first, make it so.
-		if (!empty(Theme::$current->options['view_newest_pm_first']))
+		if (!empty(Theme::$current->options['view_newest_pm_first'])) {
 			array_reverse($this->pms, true);
+		}
 	}
 
 	/***********************
@@ -164,44 +165,40 @@ public static function count(bool $inbox = true, int $label = -1): int
 	{
 		$num = 0;
 
-		$joins = array();
-		$where = array();
-		$params = array();
+		$joins = [];
+		$where = [];
+		$params = [];
 
-		if ($inbox)
-		{
+		if ($inbox) {
 			$joins[] = 'INNER JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm)';
 
 			$where[] = 'pmr.id_member = {int:me}';
 			$where[] = 'pmr.deleted = 0';
 
-			if ($label === -1)
-			{
+			if ($label === -1) {
 				$where[] = 'pmr.in_inbox = 1';
 			}
 			// If you're viewing a label, it's still the inbox, but filtered
 			// to only show the PMs that have that label.
-			else
-			{
+			else {
 				$joins[] = 'INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pm.id_pm)';
 				$where[] = 'pl.id_label = {int:label}';
 				$params['label'] = $label;
 			}
-		}
-		else
-		{
+		} else {
 			$where[] = 'pm.id_member_from = {int:me}';
 			$where[] = 'pm.deleted_by_sender = 0';
 		}
 
 		$params['me'] = User::$me->id;
 
-		$request = Db::$db->query('', '
-			SELECT COUNT(DISTINCT pm.id_pm_head)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(DISTINCT pm.id_pm_head)
 			FROM {db_prefix}personal_messages AS pm' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . '
 			WHERE (' . implode(') AND (', $where) . ')',
-			$params
+			$params,
 		);
 		list($num) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -224,66 +221,63 @@ public static function count(bool $inbox = true, int $label = -1): int
 	 */
 	public static function getRecent(bool $inbox = true, int $label = -1, string $sort = 'pm.id_pm', bool $descending = false, int $limit = 0, int $offset = 0): array
 	{
-		$paramskey = Utils::jsonEncode(array($inbox, $label, $sort, $descending, $limit, $offset));
+		$paramskey = Utils::jsonEncode([$inbox, $label, $sort, $descending, $limit, $offset]);
 
-		if (isset(self::$recent[$paramskey]))
+		if (isset(self::$recent[$paramskey])) {
 			return self::$recent[$paramskey];
+		}
 
-		self::$recent[$paramskey] = array();
+		self::$recent[$paramskey] = [];
 
-		$joins = array();
-		$where = array();
-		$params = array(
+		$joins = [];
+		$where = [];
+		$params = [
 			'me' => User::$me->id,
-		);
+		];
 
-		if ($inbox)
-		{
+		if ($inbox) {
 			$joins[] = 'INNER JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm)';
 
 			$where[] = 'pmr.id_member = {int:me}';
 			$where[] = 'pmr.deleted = 0';
 
-			if ($label === -1)
-			{
+			if ($label === -1) {
 				$where[] = 'pmr.in_inbox = 1';
 			}
 			// If you're viewing a label, it's still the inbox, but filtered
 			// to only show the PMs that have that label.
-			else
-			{
+			else {
 				$joins[] = 'INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pm.id_pm)';
 				$where[] = 'pl.id_label = {int:label}';
 				$params['label'] = $label;
 			}
-		}
-		else
-		{
-			if ($sort == 'COALESCE(mem.real_name, \'\')')
+		} else {
+			if ($sort == 'COALESCE(mem.real_name, \'\')') {
 				$joins[] = 'LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm)';
+			}
 
 			$where[] = 'pm.id_member_from = {int:me}';
 			$where[] = 'pm.deleted_by_sender = 0';
 		}
 
-		if ($sort == 'COALESCE(mem.real_name, \'\')')
-		{
+		if ($sort == 'COALESCE(mem.real_name, \'\')') {
 			$joins[] = 'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = {raw:pm_member})';
 			$params['pm_member'] = $inbox ? 'pmr.id_member' : 'pm.id_member_from';
 		}
 
-		$request = Db::$db->query('', '
-			SELECT MAX(pm.id_pm) AS id_pm, pm.id_pm_head
+		$request = Db::$db->query(
+			'',
+			'SELECT MAX(pm.id_pm) AS id_pm, pm.id_pm_head
 			FROM {db_prefix}personal_messages AS pm' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . '
 			WHERE (' . implode(') AND (', $where) . ')
 			GROUP BY pm.id_pm_head' . ($sort != 'pm.id_pm' ? ', ' . $sort : '') . '
 			ORDER BY ' . ($sort == 'pm.id_pm' ? 'id_pm' : $sort) . ($descending ? ' DESC' : ' ASC') . (!empty($limit) ? '
 			LIMIT ' . $offset . ', ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$recent[$paramskey][$row['id_pm_head']] = $row['id_pm'];
 		}
 		Db::$db->free_result($request);
diff --git a/Sources/PersonalMessage/DraftPM.php b/Sources/PersonalMessage/DraftPM.php
index c3ff35677b..fed1aa1e15 100644
--- a/Sources/PersonalMessage/DraftPM.php
+++ b/Sources/PersonalMessage/DraftPM.php
@@ -14,9 +14,9 @@
 namespace SMF\PersonalMessage;
 
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Draft;
 use SMF\Lang;
 use SMF\PageIndex;
@@ -24,7 +24,6 @@
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Represents a personal message draft.
@@ -40,12 +39,12 @@ class DraftPM extends Draft
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'save' => 'SavePMDraft',
+	private static $backcompat = [
+		'func_names' => [
+			'showInEditor' => 'showInEditor',
 			'showInProfile' => 'showPMDrafts',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -84,7 +83,6 @@ class DraftPM extends Draft
 	/**
 	 * Prepares the draft data for use in the personal message editor.
 	 *
-	 * @return void
 	 */
 	public function prepare(): void
 	{
@@ -98,7 +96,7 @@ public function prepare(): void
 		$this->recipients['bcc'] = array_map('intval', $this->recipients['bcc']);
 
 		// Pretend we messed up to populate the personal message editor.
-		PM::reportErrors(array(), array(), $this->recipients);
+		PM::reportErrors([], [], $this->recipients);
 	}
 
 	/***********************
@@ -111,49 +109,51 @@ public function prepare(): void
 	 * Used in the posting screens to allow draft selection.
 	 *
 	 * @param int $member_id ID of the member to show drafts for
-	 * @param bool|integer $reply_to ID of the PM that is being replied to.
+	 * @param bool|int $reply_to ID of the PM that is being replied to.
 	 * @return bool Whether the drafts (if any) were loaded.
 	 */
 	public static function showInEditor(int $member_id, $reply_to = false): bool
 	{
 		// Permissions
-		if (empty(Utils::$context['drafts_save']) || empty($member_id))
+		if (empty(Utils::$context['drafts_save']) || empty($member_id)) {
 			return false;
+		}
 
 		Lang::load('Drafts');
 
-		Utils::$context['drafts'] = array();
+		Utils::$context['drafts'] = [];
 
 		// Load the drafts this user has available.
-		$request = Db::$db->query('', '
-			SELECT subject, poster_time, id_draft
+		$request = Db::$db->query(
+			'',
+			'SELECT subject, poster_time, id_draft
 			FROM {db_prefix}user_drafts
 			WHERE id_member = {int:id_member}' . (!empty($reply_to) ? '
 				AND id_reply = {int:id_reply}' : '') . '
 				AND type = {int:draft_type}' . (!empty(Config::$modSettings['drafts_keep_days']) ? '
 				AND poster_time > {int:time}' : '') . '
 			ORDER BY poster_time DESC',
-			array(
+			[
 				'id_member' => $member_id,
 				'id_reply' => (int) $reply_to,
 				'draft_type' => 1,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
-			)
+			],
 		);
 
 		// Add them to the drafts array for display.
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (empty($row['subject']))
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (empty($row['subject'])) {
 				$row['subject'] = Lang::$txt['drafts_none'];
+			}
 
 			$tmp_subject = Utils::shorten(stripslashes($row['subject']), 24);
 
-			Utils::$context['drafts'][] = array(
+			Utils::$context['drafts'][] = [
 				'subject' => Lang::censorText($tmp_subject),
 				'poster_time' => Time::create('@' . $row['poster_time'])->format(),
 				'link' => '<a href="' . Config::$scripturl . '?action=pm;sa=send;id_draft=' . $row['id_draft'] . '">' . $row['subject'] . '</a>',
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -167,7 +167,6 @@ public static function showInEditor(int $member_id, $reply_to = false): bool
 	 * The UI allows for deleting and loading/editing of drafts.
 	 *
 	 * @param int $memID ID of the user whose drafts should be loaded.
-	 * @return void
 	 */
 	public static function showInProfile(int $memID = -1): void
 	{
@@ -175,22 +174,22 @@ public static function showInProfile(int $memID = -1): void
 		Utils::$context['start'] = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] : 0;
 
 		// If just deleting a draft, do it and then redirect back.
-		if (!empty($_REQUEST['delete']))
-		{
+		if (!empty($_REQUEST['delete'])) {
 			User::$me->checkSession('get');
 			$id_delete = (int) $_REQUEST['delete'];
 			$start = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] : 0;
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}user_drafts
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}user_drafts
 				WHERE id_draft = {int:id_draft}
 					AND id_member = {int:id_member}
 					AND type = {int:draft_type}',
-				array(
+				[
 					'id_draft' => $id_delete,
 					'id_member' => $memID,
 					'draft_type' => 1,
-				)
+				],
 			);
 
 			// now redirect back to the list
@@ -198,8 +197,7 @@ public static function showInProfile(int $memID = -1): void
 		}
 
 		// perhaps a draft was selected for editing? if so pass this off
-		if (!empty($_REQUEST['id_draft']) && !empty(Utils::$context['drafts_save']) && $memID == User::$me->id)
-		{
+		if (!empty($_REQUEST['id_draft']) && !empty(Utils::$context['drafts_save']) && $memID == User::$me->id) {
 			User::$me->checkSession('get');
 			$id_draft = (int) $_REQUEST['id_draft'];
 			Utils::redirectexit('action=pm;sa=send;id_draft=' . $id_draft);
@@ -208,21 +206,23 @@ public static function showInProfile(int $memID = -1): void
 		Lang::load('Drafts');
 
 		// Default to 10.
-		if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount']))
+		if (empty($_REQUEST['viewscount']) || !is_numeric($_REQUEST['viewscount'])) {
 			$_REQUEST['viewscount'] = 10;
+		}
 
 		// Get the count of applicable drafts
-		$request = Db::$db->query('', '
-			SELECT COUNT(*)
+		$request = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}user_drafts
 			WHERE id_member = {int:id_member}
 				AND type={int:draft_type}' . (!empty(Config::$modSettings['drafts_keep_days']) ? '
 				AND poster_time > {int:time}' : ''),
-			array(
+			[
 				'id_member' => $memID,
 				'draft_type' => 1,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
-			)
+			],
 		);
 		list($msgCount) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -238,16 +238,16 @@ public static function showInProfile(int $memID = -1): void
 		$start = Utils::$context['start'];
 		$reverse = $_REQUEST['start'] > $msgCount / 2;
 
-		if ($reverse)
-		{
+		if ($reverse) {
 			$maxIndex = $msgCount < Utils::$context['start'] + $maxPerPage + 1 && $msgCount > Utils::$context['start'] ? $msgCount - Utils::$context['start'] : $maxPerPage;
 
 			$start = $msgCount < Utils::$context['start'] + $maxPerPage + 1 || $msgCount < Utils::$context['start'] + $maxPerPage ? 0 : $msgCount - Utils::$context['start'] - $maxPerPage;
 		}
 
 		// Load in this user's PM drafts
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				ud.id_member, ud.id_draft, ud.body, ud.subject, ud.poster_time, ud.id_reply, ud.to_list
 			FROM {db_prefix}user_drafts AS ud
 			WHERE ud.id_member = {int:current_member}
@@ -255,29 +255,30 @@ public static function showInProfile(int $memID = -1): void
 				AND poster_time > {int:time}' : '') . '
 			ORDER BY ud.id_draft ' . ($reverse ? 'ASC' : 'DESC') . '
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'current_member' => $memID,
 				'draft_type' => 1,
 				'time' => (!empty(Config::$modSettings['drafts_keep_days']) ? (time() - (Config::$modSettings['drafts_keep_days'] * 86400)) : 0),
 				'start' => $start,
 				'max' => $maxIndex,
-			)
+			],
 		);
 
 		// Start counting at the number of the first message displayed.
 		$counter = $reverse ? Utils::$context['start'] + $maxIndex + 1 : Utils::$context['start'];
-		Utils::$context['posts'] = array();
+		Utils::$context['posts'] = [];
 
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Censor....
-			if (empty($row['body']))
+			if (empty($row['body'])) {
 				$row['body'] = '';
+			}
 
 			$row['subject'] = Utils::htmlTrim($row['subject']);
 
-			if (empty($row['subject']))
+			if (empty($row['subject'])) {
 				$row['subject'] = Lang::$txt['no_subject'];
+			}
 
 			Lang::censorText($row['body']);
 			Lang::censorText($row['subject']);
@@ -286,31 +287,31 @@ public static function showInProfile(int $memID = -1): void
 			$row['body'] = BBCodeParser::load()->parse($row['body'], true, 'draft' . $row['id_draft']);
 
 			// Have they provide who this will go to?
-			$recipients = array(
-				'to' => array(),
-				'bcc' => array(),
-			);
+			$recipients = [
+				'to' => [],
+				'bcc' => [],
+			];
 
-			$recipient_ids = (!empty($row['to_list'])) ? Utils::jsonDecode($row['to_list'], true) : array();
+			$recipient_ids = (!empty($row['to_list'])) ? Utils::jsonDecode($row['to_list'], true) : [];
 
 			// @todo ... this is a bit ugly since it runs an extra query for every message, do we want this?
 			// at least its only for draft PM's and only the user can see them ... so not heavily used .. still
-			if (!empty($recipient_ids['to']) || !empty($recipient_ids['bcc']))
-			{
+			if (!empty($recipient_ids['to']) || !empty($recipient_ids['bcc'])) {
 				$recipient_ids['to'] = array_map('intval', $recipient_ids['to']);
 				$recipient_ids['bcc'] = array_map('intval', $recipient_ids['bcc']);
 				$allRecipients = array_merge($recipient_ids['to'], $recipient_ids['bcc']);
 
-				$request_2 = Db::$db->query('', '
-					SELECT id_member, real_name
+				$request_2 = Db::$db->query(
+					'',
+					'SELECT id_member, real_name
 					FROM {db_prefix}members
 					WHERE id_member IN ({array_int:member_list})',
-					array(
+					[
 						'member_list' => $allRecipients,
-					)
+					],
 				);
-				while ($result = Db::$db->fetch_assoc($request_2))
-				{
+
+				while ($result = Db::$db->fetch_assoc($request_2)) {
 					$recipientType = in_array($result['id_member'], $recipient_ids['bcc']) ? 'bcc' : 'to';
 					$recipients[$recipientType][] = $result['real_name'];
 				}
@@ -318,7 +319,7 @@ public static function showInProfile(int $memID = -1): void
 			}
 
 			// Add the items to the array for template use
-			Utils::$context['drafts'][$counter += $reverse ? -1 : 1] = array(
+			Utils::$context['drafts'][$counter += $reverse ? -1 : 1] = [
 				'body' => $row['body'],
 				'counter' => $counter,
 				'subject' => $row['subject'],
@@ -328,40 +329,42 @@ public static function showInProfile(int $memID = -1): void
 				'recipients' => $recipients,
 				'age' => floor((time() - $row['poster_time']) / 86400),
 				'remaining' => (!empty(Config::$modSettings['drafts_keep_days']) ? floor(Config::$modSettings['drafts_keep_days'] - ((time() - $row['poster_time']) / 86400)) : 0),
-				'quickbuttons' => array(
-					'edit' => array(
+				'quickbuttons' => [
+					'edit' => [
 						'label' => Lang::$txt['draft_edit'],
-						'href' => Config::$scripturl.'?action=pm;sa=showpmdrafts;id_draft='.$row['id_draft'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'],
-						'icon' => 'modify_button'
-					),
-					'delete' => array(
+						'href' => Config::$scripturl . '?action=pm;sa=showpmdrafts;id_draft=' . $row['id_draft'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
+						'icon' => 'modify_button',
+					],
+					'delete' => [
 						'label' => Lang::$txt['draft_delete'],
-						'href' => Config::$scripturl.'?action=pm;sa=showpmdrafts;delete='.$row['id_draft'].';'.Utils::$context['session_var'].'='.Utils::$context['session_id'],
-						'javascript' => 'data-confirm="'.Lang::$txt['draft_remove'].'?"',
+						'href' => Config::$scripturl . '?action=pm;sa=showpmdrafts;delete=' . $row['id_draft'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
+						'javascript' => 'data-confirm="' . Lang::$txt['draft_remove'] . '?"',
 						'class' => 'you_sure',
-						'icon' => 'remove_button'
-					),
-				),
-			);
+						'icon' => 'remove_button',
+					],
+				],
+			];
 		}
 		Db::$db->free_result($request);
 
 		// if the drafts were retrieved in reverse order, then put them in the right order again.
-		if ($reverse)
+		if ($reverse) {
 			Utils::$context['drafts'] = array_reverse(Utils::$context['drafts'], true);
+		}
 
 		// off to the template we go
 		Utils::$context['page_title'] = Lang::$txt['drafts'];
 		Utils::$context['sub_template'] = 'showPMDrafts';
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=showpmdrafts',
 			'name' => Lang::$txt['drafts'],
-		);
+		];
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\DraftPM::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\DraftPM::exportStatic')) {
 	DraftPM::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PersonalMessage/Folder.php b/Sources/PersonalMessage/Folder.php
index c4314d0115..db09a87e58 100644
--- a/Sources/PersonalMessage/Folder.php
+++ b/Sources/PersonalMessage/Folder.php
@@ -13,6 +13,7 @@
 
 namespace SMF\PersonalMessage;
 
+use SMF\Actions\PersonalMessage as PMAction;
 use SMF\Config;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
@@ -21,7 +22,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\PersonalMessage as PMAction;
 
 /**
  * Represents a personal message folder (i.e. "inbox" or "sent items")
@@ -91,15 +91,16 @@ class Folder
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param bool $is_inbox Whether this is the inbox or the sent items folder.
 	 */
 	public function __construct(bool $is_inbox = true)
 	{
 		Lang::load('PersonalMessage');
 
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('PersonalMessage');
+		}
 
 		$this->is_inbox = $is_inbox;
 
@@ -112,20 +113,25 @@ public function __construct(bool $is_inbox = true)
 		$this->current_label = Label::$loaded[$this->current_label_id]['name'];
 
 		// These context vars should already be set, but just in case...
-		if (!isset(Utils::$context['display_mode']))
+		if (!isset(Utils::$context['display_mode'])) {
 			Utils::$context['display_mode'] = &$this->mode;
+		}
 
-		if (!isset(Utils::$context['folder']))
+		if (!isset(Utils::$context['folder'])) {
 			Utils::$context['folder'] = $this->is_inbox ? 'inbox' : 'sent';
+		}
 
-		if (!isset(Utils::$context['currently_using_labels']))
+		if (!isset(Utils::$context['currently_using_labels'])) {
 			Utils::$context['currently_using_labels'] = !empty(Label::$loaded);
+		}
 
-		if (!isset(Utils::$context['current_label_id']))
+		if (!isset(Utils::$context['current_label_id'])) {
 			Utils::$context['current_label_id'] = &$this->current_label_id;
+		}
 
-		if (!isset(Utils::$context['current_label']))
+		if (!isset(Utils::$context['current_label'])) {
 			Utils::$context['current_label'] = &$this->current_label;
+		}
 	}
 
 	/**
@@ -134,22 +140,18 @@ public function __construct(bool $is_inbox = true)
 	public function show(): void
 	{
 		// Changing view?
-		if (isset($_GET['view']))
-		{
+		if (isset($_GET['view'])) {
 			$this->changeDisplayMode();
 		}
 
 		// Sanitize and validate pmid and pmsg variables, if set.
 		// @todo Can we consolidate these into a single variable?
-		foreach (array('pmid', 'pmsg') as $var)
-		{
-			if (isset($_GET[$var]))
-			{
+		foreach (['pmid', 'pmsg'] as $var) {
+			if (isset($_GET[$var])) {
 				$this->requested_pm = current(PM::load((int) $_GET[$var]));
 
 				// Make sure you have access to this PM.
-				if (!$this->requested_pm->canAccess($this->is_inbox ? 'inbox' : 'sent'))
-				{
+				if (!$this->requested_pm->canAccess($this->is_inbox ? 'inbox' : 'sent')) {
 					ErrorHandler::fatalLang('no_access', false);
 				}
 			}
@@ -158,28 +160,25 @@ public function show(): void
 		// Set up some basic theme stuff.
 		Utils::$context['from_or_to'] = $this->is_inbox ? 'from' : 'to';
 		Utils::$context['signature_enabled'] = substr(Config::$modSettings['signature_settings'], 0, 1) == 1;
-		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : array();
+		Utils::$context['disabled_fields'] = isset(Config::$modSettings['disabled_profile_fields']) ? array_flip(explode(',', Config::$modSettings['disabled_profile_fields'])) : [];
 
 		// Prevent signature images from going outside the box.
-		if (Utils::$context['signature_enabled'])
-		{
+		if (Utils::$context['signature_enabled']) {
 			list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 			$sig_limits = explode(',', $sig_limits);
 
-			if (!empty($sig_limits[5]) || !empty($sig_limits[6]))
-			{
+			if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
 				Theme::addInlineCss("\n\t" . '.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
 			}
 		}
 
-		Utils::$context['get_pmessage'] = array($this, 'prepareMessageContext');
+		Utils::$context['get_pmessage'] = [$this, 'prepareMessageContext'];
 
 		$this->setPaginationAndLinks();
 
 		$this->showSubjects();
 
-		switch ($this->mode)
-		{
+		switch ($this->mode) {
 			case PMAction::VIEW_CONV:
 				$display_pms = $this->showConversation();
 				break;
@@ -199,8 +198,7 @@ public function show(): void
 		Utils::$context['page_title'] = Lang::$txt['pm_inbox'];
 
 		// Finally mark the relevant messages as read.
-		if ($this->is_inbox && !empty(self::$labels[(int) $this->current_label_id]['unread_messages']))
-		{
+		if ($this->is_inbox && !empty(self::$labels[(int) $this->current_label_id]['unread_messages'])) {
 			PM::markRead($display_pms, $this->current_label_id);
 		}
 	}
@@ -218,37 +216,41 @@ public function prepareMessageContext($type = 'subject', $check = false)
 		static $temp_pm_selected = null;
 
 		// Count the current message number....
-		if ($counter === null || $check)
+		if ($counter === null || $check) {
 			$counter = Utils::$context['start'];
+		}
 
-		if ($temp_pm_selected === null)
-		{
-			$temp_pm_selected = isset($_SESSION['pm_selected']) ? $_SESSION['pm_selected'] : array();
-			$_SESSION['pm_selected'] = array();
+		if ($temp_pm_selected === null) {
+			$temp_pm_selected = $_SESSION['pm_selected'] ?? [];
+			$_SESSION['pm_selected'] = [];
 		}
 
-		if ($type == 'subject')
+		if ($type == 'subject') {
 			return $this->prepareSubjectContext();
+		}
 
-		if (!(PM::$getter instanceof \Generator))
+		if (!(PM::$getter instanceof \Generator)) {
 			return false;
+		}
 
-		if ($check)
+		if ($check) {
 			return PM::$getter->valid();
+		}
 
 		$message = PM::$getter->current();
 		PM::$getter->next();
 
-		if (!$message)
+		if (!$message) {
 			return false;
+		}
 
-		$format_options = array(
+		$format_options = [
 			'no_bcc' => $this->is_inbox,
-		);
+		];
 
 		$output = $message->format($counter++, $format_options);
 
-		IntegrationHook::call('integrate_prepare_pm_context', array(&$output, &$message, $counter));
+		IntegrationHook::call('integrate_prepare_pm_context', [&$output, &$message, $counter]);
 
 		return $output;
 	}
@@ -264,7 +266,7 @@ protected function changeDisplayMode(): void
 	{
 		$this->mode = ($this->mode + 1) % 3;
 
-		User::updateMemberData(User::$me->id, array('pm_prefs' => (User::$me->pm_prefs & 252) | $this->mode));
+		User::updateMemberData(User::$me->id, ['pm_prefs' => (User::$me->pm_prefs & 252) | $this->mode]);
 
 		// Remove 'view' from the query string so that refreshing the browser
 		// doesn't cause the view to change again.
@@ -276,16 +278,18 @@ protected function changeDisplayMode(): void
 	 */
 	protected function prepareSubjectContext(): array
 	{
-		if (!(PM::$subject_getter instanceof \Generator))
-			return array();
+		if (!(PM::$subject_getter instanceof \Generator)) {
+			return [];
+		}
 
 		$message = PM::$subject_getter->current();
 		PM::$subject_getter->next();
 
-		if (!$message)
-			return array();
+		if (!$message) {
+			return [];
+		}
 
-		return $message->format(0, array('no_custom_fields' => true));
+		return $message->format(0, ['no_custom_fields' => true]);
 	}
 
 	/**
@@ -294,30 +298,22 @@ protected function prepareSubjectContext(): array
 	protected function setPaginationAndLinks()
 	{
 		// Make sure the starting location is valid.
-		if (isset($_GET['start']) && $_GET['start'] != 'new')
-		{
+		if (isset($_GET['start']) && $_GET['start'] != 'new') {
 			$_GET['start'] = (int) $_GET['start'];
-		}
-		elseif (!isset($_GET['start']) && !empty(Theme::$current->options['view_newest_pm_first']))
-		{
+		} elseif (!isset($_GET['start']) && !empty(Theme::$current->options['view_newest_pm_first'])) {
 			$_GET['start'] = 0;
-		}
-		else
-		{
+		} else {
 			$_GET['start'] = 'new';
 		}
 
 		// If they didn't pick a sort order, use the default.
-		if (!isset($_GET['sort']) || !isset(self::$sort_methods[$_GET['sort']]))
-		{
+		if (!isset($_GET['sort']) || !isset(self::$sort_methods[$_GET['sort']])) {
 			Utils::$context['sort_by'] = 'date';
 			$_GET['sort'] = 'pm.id_pm';
 
 			// An overriding setting?
 			$this->descending = !empty(Theme::$current->options['view_newest_pm_first']);
-		}
-		else
-		{
+		} else {
 			Utils::$context['sort_by'] = $_GET['sort'];
 			$_GET['sort'] = self::$sort_methods[$_GET['sort']];
 			$this->descending = isset($_GET['desc']);
@@ -325,48 +321,34 @@ protected function setPaginationAndLinks()
 
 		Utils::$context['sort_direction'] = $this->descending ? 'down' : 'up';
 
-		if ($this->mode == PMAction::VIEW_CONV)
-		{
+		if ($this->mode == PMAction::VIEW_CONV) {
 			$max_messages = Conversation::count($this->is_inbox, $this->current_label_id);
-		}
-		elseif (!$this->is_inbox)
-		{
+		} elseif (!$this->is_inbox) {
 			$max_messages = PM::countSent();
-		}
-		else
-		{
+		} else {
 			$max_messages = Received::count($this->current_label_id);
 		}
 
 		// Start on the last page.
-		if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages)
-		{
+		if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) {
 			$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $this->per_page);
-		}
-		elseif ($_GET['start'] < 0)
-		{
+		} elseif ($_GET['start'] < 0) {
 			$_GET['start'] = 0;
 		}
 
 		// ... but wait - what if we want to start from a specific message?
-		if (isset($_GET['pmid']))
-		{
+		if (isset($_GET['pmid'])) {
 			Utils::$context['current_pm'] = $pmID = (int) $_GET['pmid'];
 
 			// With only one page of PM's we're gonna want page 1.
-			if ($max_messages <= $this->per_page)
-			{
+			if ($max_messages <= $this->per_page) {
 				$_GET['start'] = 0;
 			}
 			// If we pass kstart we assume we're in the right place.
-			elseif (!isset($_GET['kstart']))
-			{
-				if (!$this->is_inbox)
-				{
+			elseif (!isset($_GET['kstart'])) {
+				if (!$this->is_inbox) {
 					$_GET['start'] = PM::countSent($pmID, $this->descending);
-				}
-				else
-				{
+				} else {
 					$_GET['start'] = Received::count($this->current_label_id, $pmID, $this->descending);
 				}
 
@@ -381,33 +363,30 @@ protected function setPaginationAndLinks()
 		Utils::$context['start'] = $_GET['start'];
 
 		// Determine the navigation context.
-		Utils::$context['links'] = array(
+		Utils::$context['links'] = [
 			'first' => $_GET['start'] >= $this->per_page ? Config::$scripturl . '?action=pm;start=0' : '',
 			'prev' => $_GET['start'] >= $this->per_page ? Config::$scripturl . '?action=pm;start=' . ($_GET['start'] - $this->per_page) : '',
 			'next' => $_GET['start'] + $this->per_page < $max_messages ? Config::$scripturl . '?action=pm;start=' . ($_GET['start'] + $this->per_page) : '',
 			'last' => $_GET['start'] + $this->per_page < $max_messages ? Config::$scripturl . '?action=pm;start=' . (floor(($max_messages - 1) / $this->per_page) * $this->per_page) : '',
 			'up' => Config::$scripturl,
-		);
+		];
 
-		Utils::$context['page_info'] = array(
+		Utils::$context['page_info'] = [
 			'current_page' => $_GET['start'] / $this->per_page + 1,
-			'num_pages' => floor(($max_messages - 1) / $this->per_page) + 1
-		);
+			'num_pages' => floor(($max_messages - 1) / $this->per_page) + 1,
+		];
 
 		// Now, build the link tree!
-		if ($this->current_label_id == -1)
-		{
-			Utils::$context['linktree'][] = array(
+		if ($this->current_label_id == -1) {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=pm;f=' . Utils::$context['folder'],
 				'name' => $this->is_inbox ? Lang::$txt['inbox'] : Lang::$txt['sent_items'],
-			);
-		}
-		else
-		{
-			Utils::$context['linktree'][] = array(
+			];
+		} else {
+			Utils::$context['linktree'][] = [
 				'url' => Config::$scripturl . '?action=pm;f=' . Utils::$context['folder'] . ';l=' . $this->current_label_id,
-				'name' => Lang::$txt['pm_current_label'] . ': ' . $this->current_label
-			);
+				'name' => Lang::$txt['pm_current_label'] . ': ' . $this->current_label,
+			];
 		}
 
 		// Set the text to resemble the current folder.
@@ -422,49 +401,45 @@ protected function setPaginationAndLinks()
 	 */
 	protected function showSubjects(): void
 	{
-		$query_customizations = array('order' => array());
+		$query_customizations = ['order' => []];
 
-		if ($this->mode === PMAction::VIEW_CONV)
-		{
+		if ($this->mode === PMAction::VIEW_CONV) {
 			$subject_pms = Conversation::getRecent(
 				$this->is_inbox,
 				$this->current_label_id,
 				$_GET['sort'] ?? 'pm.id_pm',
 				true,
 				$this->per_page,
-				$_GET['start'] ?? 0
+				$_GET['start'] ?? 0,
 			);
 
 			asort($subject_pms);
-		}
-		elseif ($this->is_inbox)
-		{
+		} elseif ($this->is_inbox) {
 			$subject_pms = Received::getRecent(
 				$this->current_label_id,
 				$_GET['sort'] ?? 'pm.id_pm',
 				true,
 				$this->per_page,
-				$_GET['start'] ?? 0
+				$_GET['start'] ?? 0,
 			);
 
 			sort($subject_pms);
-		}
-		else
-		{
+		} else {
 			$subject_pms = PM::getRecent(
 				$_GET['sort'] ?? 'pm.id_pm',
 				true,
 				$this->per_page,
-				$_GET['start'] ?? 0
+				$_GET['start'] ?? 0,
 			);
 
 			sort($subject_pms);
 		}
 
-		foreach ($subject_pms as $pm)
+		foreach ($subject_pms as $pm) {
 			$query_customizations['order'][] = 'pm.id_pm = ' . $pm;
+		}
 
-		PM::$subject_getter = !empty($subject_pms) ? PM::get($subject_pms, $query_customizations) : array();
+		PM::$subject_getter = !empty($subject_pms) ? PM::get($subject_pms, $query_customizations) : [];
 	}
 
 	/**
@@ -476,10 +451,10 @@ protected function showConversation(): array
 	{
 		$id = isset($this->requested_pm) ? $this->requested_pm->id : ($this->is_inbox ? Received::getLatest($this->current_label_id) : PM::getLatest());
 
-		if (empty($id))
-		{
-			PM::$getter = array();
-			return array();
+		if (empty($id)) {
+			PM::$getter = [];
+
+			return [];
 		}
 
 		$conversation = new Conversation($id);
@@ -487,24 +462,23 @@ protected function showConversation(): array
 		Utils::$context['current_pm'] = $conversation->latest;
 
 		// The templates need some profile data for the senders.
-		User::load(array_map(fn($pm) => $pm['sender'], $conversation->pms));
+		User::load(array_map(fn ($pm) => $pm['sender'], $conversation->pms));
 
 		// Get the PMs.
-		$query_customizations = array(
-			'order' => array('pm.id_pm' . ($this->descending ? ' DESC' : ' ASC')),
+		$query_customizations = [
+			'order' => ['pm.id_pm' . ($this->descending ? ' DESC' : ' ASC')],
 			'limit' => count(array_keys($conversation->pms)),
-		);
+		];
 
-		if (!$this->is_inbox)
-		{
-			$query_customizations['group'] = array(
+		if (!$this->is_inbox) {
+			$query_customizations['group'] = [
 				'pm.id_pm',
 				'pm.subject',
 				'pm.id_member_from',
 				'pm.body',
 				'pm.msgtime',
 				'pm.from_name',
-			);
+			];
 		}
 
 		PM::$getter = PM::get(array_keys($conversation->pms), $query_customizations);
@@ -516,15 +490,15 @@ protected function showConversation(): array
 		Utils::$context['current_pm_author'] = $head_pm->formatted['member']['link'];
 
 		// Build the conversation button array.
-		Utils::$context['conversation_buttons'] = array(
-			'delete' => array(
+		Utils::$context['conversation_buttons'] = [
+			'delete' => [
 				'text' => 'delete_conversation',
 				'image' => 'delete.png',
 				'url' => Config::$scripturl . '?action=pm;sa=pmactions;pm_actions[' . $conversation->latest . ']=delete;conversation;f=' . Utils::$context['folder'] . ';start=' . Utils::$context['start'] . ($this->current_label_id != -1 ? ';l=' . $this->current_label_id : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 				'custom' => 'data-confirm="' . Lang::$txt['remove_conversation'] . '"',
 				'class' => 'you_sure',
-			),
-		);
+			],
+		];
 
 		// Allow mods to add additional buttons here
 		IntegrationHook::call('integrate_conversation_buttons');
@@ -541,17 +515,17 @@ protected function showOne(): array
 	{
 		$id = isset($this->requested_pm) ? $this->requested_pm->id : ($this->is_inbox ? Received::getLatest($this->current_label_id) : PM::getLatest());
 
-		if (empty($id))
-		{
-			PM::$getter = array();
-			return array();
+		if (empty($id)) {
+			PM::$getter = [];
+
+			return [];
 		}
 
 		PM::$getter = PM::get($id);
 
 		Utils::$context['current_pm'] = $id;
 
-		return array($id);
+		return [$id];
 	}
 
 	/**
@@ -561,48 +535,40 @@ protected function showOne(): array
 	 */
 	protected function showAll(): array
 	{
-		if ($this->is_inbox)
-		{
+		if ($this->is_inbox) {
 			$pms = Received::getRecent(
 				$this->current_label_id,
 				$_GET['sort'] ?? 'pm.id_pm',
 				true,
 				$this->per_page,
-				$_GET['start'] ?? 0
+				$_GET['start'] ?? 0,
 			);
 
-			if ($this->descending)
-			{
+			if ($this->descending) {
 				sort($pms);
-			}
-			else
-			{
+			} else {
 				rsort($pms);
 			}
-		}
-		else
-		{
+		} else {
 			$pms = PM::getRecent(
 				$_GET['sort'] ?? 'pm.id_pm',
 				true,
 				$this->per_page,
-				$_GET['start'] ?? 0
+				$_GET['start'] ?? 0,
 			);
 
-			if ($this->descending)
-			{
+			if ($this->descending) {
 				sort($pms);
-			}
-			else
-			{
+			} else {
 				rsort($pms);
 			}
 		}
 
-		foreach ($pms as $pm)
+		foreach ($pms as $pm) {
 			$query_customizations['order'][] = 'pm.id_pm = ' . $pm;
+		}
 
-		PM::$getter = !empty($pms) ? PM::get($pms, $query_customizations) : array();
+		PM::$getter = !empty($pms) ? PM::get($pms, $query_customizations) : [];
 
 		Utils::$context['current_pm'] = reset($pms);
 
diff --git a/Sources/PersonalMessage/Label.php b/Sources/PersonalMessage/Label.php
index 13f3b305d1..89ce3e459c 100644
--- a/Sources/PersonalMessage/Label.php
+++ b/Sources/PersonalMessage/Label.php
@@ -14,14 +14,12 @@
 namespace SMF\PersonalMessage;
 
 use SMF\ArrayAccessHelper;
-
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Lang;
-use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Represents a personal message label.
@@ -67,7 +65,7 @@ class Label implements \ArrayAccess
 	 *
 	 * IDs of the PMs that have this label.
 	 */
-	public array $pms = array();
+	public array $pms = [];
 
 	/**************************
 	 * Public static properties
@@ -78,7 +76,7 @@ class Label implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -89,10 +87,10 @@ class Label implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_label' => 'id',
 		'id_member' => 'member',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -100,12 +98,12 @@ class Label implements \ArrayAccess
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param int $id ID number of this label.
 	 * @param string $name Name of this label.
 	 * @param array $props Properties to set for this label.
 	 */
-	public function __construct(int $id, string $name, array $props = array())
+	public function __construct(int $id, string $name, array $props = [])
 	{
 		$this->id = $id;
 		$this->name = $name;
@@ -124,77 +122,79 @@ public function __construct(int $id, string $name, array $props = array())
 	 */
 	public static function load(): array
 	{
-		if (!empty(self::$loaded))
+		if (!empty(self::$loaded)) {
 			return self::$loaded;
+		}
 
 		// Load the label data.
-		if (User::$me->new_pm || ($labels = CacheApi::get('labelCounts:' . User::$me->id, 720)) === null)
-		{
+		if (User::$me->new_pm || ($labels = CacheApi::get('labelCounts:' . User::$me->id, 720)) === null) {
 			// Inbox "label"
-			$labels[-1] = array(
+			$labels[-1] = [
 				'id' => -1,
 				'name' => Lang::$txt['pm_msg_label_inbox'],
 				'messages' => 0,
 				'unread_messages' => 0,
-				'pms' => array(),
-			);
+				'pms' => [],
+			];
 
-			$selects = array(
+			$selects = [
 				'SUM(is_read & 1) AS num_read',
 				'COUNT(*) AS total',
 				Db::$db->title === POSTGRE_TITLE ? "string_agg(id_pm::text, ',') AS pms" : 'GROUP_CONCAT(id_pm) AS pms',
-			);
+			];
 
 			// First get the inbox counts
-			$result = Db::$db->query('', '
-				SELECT ' . implode(', ', $selects) . '
+			$result = Db::$db->query(
+				'',
+				'SELECT ' . implode(', ', $selects) . '
 				FROM {db_prefix}pm_recipients
 				WHERE id_member = {int:me}
 					AND in_inbox = {int:in_inbox}
 					AND deleted = {int:not_deleted}',
-				array(
+				[
 					'me' => User::$me->id,
 					'in_inbox' => 1,
 					'not_deleted' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$labels[-1]['messages'] = $row['total'];
 				$labels[-1]['unread_messages'] = $row['total'] - $row['num_read'];
-				$labels[-1]['pms'] = empty($row['pms']) ? array() : explode(',', $row['pms']);
+				$labels[-1]['pms'] = empty($row['pms']) ? [] : explode(',', $row['pms']);
 			}
 			Db::$db->free_result($result);
 
-			$selects = array(
+			$selects = [
 				'l.id_label',
 				'l.name',
 				'COALESCE(SUM(pr.is_read & 1), 0) AS num_read',
 				'COALESCE(COUNT(pr.id_pm), 0) AS total',
 				Db::$db->title === POSTGRE_TITLE ? "string_agg(pr.id_pm::text, ',') AS pms" : 'GROUP_CONCAT(pr.id_pm) AS pms',
-			);
+			];
 
 			// Now load info about all the other labels
-			$result = Db::$db->query('', '
-				SELECT ' . implode(', ', $selects) . '
+			$result = Db::$db->query(
+				'',
+				'SELECT ' . implode(', ', $selects) . '
 				FROM {db_prefix}pm_labels AS l
 					LEFT JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_label = l.id_label)
 					LEFT JOIN {db_prefix}pm_recipients AS pr ON (pr.id_pm = pl.id_pm)
 				WHERE l.id_member = {int:me}
 				GROUP BY l.id_label, l.name',
-				array(
+				[
 					'me' => User::$me->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
-				$labels[(int) $row['id_label']] = array(
+
+			while ($row = Db::$db->fetch_assoc($result)) {
+				$labels[(int) $row['id_label']] = [
 					'id' => (int) $row['id_label'],
 					'name' => $row['name'],
 					'messages' => (int) $row['total'],
 					'unread_messages' => (int) ($row['total'] - $row['num_read']),
-					'pms' => empty($row['pms']) ? array() : array_filter(explode(',', $row['pms'])),
-				);
+					'pms' => empty($row['pms']) ? [] : array_filter(explode(',', $row['pms'])),
+				];
 			}
 			Db::$db->free_result($result);
 
@@ -202,8 +202,9 @@ public static function load(): array
 			CacheApi::put('labelCounts:' . User::$me->id, $labels, 720);
 		}
 
-		foreach ($labels as $label)
+		foreach ($labels as $label) {
 			new self($label['id'], $label['name'], $label);
+		}
 
 		Utils::$context['labels'] = &self::$loaded;
 
@@ -216,90 +217,80 @@ public static function load(): array
 	public static function manage(): void
 	{
 		// Build the link tree elements...
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=manlabels',
-			'name' => Lang::$txt['pm_manage_labels']
-		);
+			'name' => Lang::$txt['pm_manage_labels'],
+		];
 
 		Utils::$context['page_title'] = Lang::$txt['pm_manage_labels'];
 		Utils::$context['sub_template'] = 'labels';
 
-		$the_labels = array();
-		$labels_to_add = array();
-		$labels_to_remove = array();
-		$label_updates = array();
+		$the_labels = [];
+		$labels_to_add = [];
+		$labels_to_remove = [];
+		$label_updates = [];
 
 		// Add all of the current user's existing labels to the array to save, slashing them as necessary...
-		foreach (Label::$loaded as $label)
-		{
-			if ($label['id'] != -1)
+		foreach (Label::$loaded as $label) {
+			if ($label['id'] != -1) {
 				$the_labels[$label['id']] = $label['name'];
+			}
 		}
 
-		if (isset($_POST[Utils::$context['session_var']]))
-		{
+		if (isset($_POST[Utils::$context['session_var']])) {
 			User::$me->checkSession();
 
 			// This will be for updating messages.
-			$message_changes = array();
-			$rule_changes = array();
+			$message_changes = [];
+			$rule_changes = [];
 
 			// We will most likely need this.
 			Rule::load();
 
 			// Adding a new label?
-			if (isset($_POST['add']))
-			{
-				$_POST['label'] = strtr(Utils::htmlspecialchars(trim($_POST['label'])), array(',' => '&#044;'));
+			if (isset($_POST['add'])) {
+				$_POST['label'] = strtr(Utils::htmlspecialchars(trim($_POST['label'])), [',' => '&#044;']);
 
-				if (Utils::entityStrlen($_POST['label']) > 30)
+				if (Utils::entityStrlen($_POST['label']) > 30) {
 					$_POST['label'] = Utils::entitySubstr($_POST['label'], 0, 30);
+				}
 
-				if ($_POST['label'] != '')
-				{
+				if ($_POST['label'] != '') {
 					$the_labels[] = $_POST['label'];
 					$labels_to_add[] = $_POST['label'];
 				}
 			}
 			// Deleting an existing label?
-			elseif (isset($_POST['delete'], $_POST['delete_label']))
-			{
-				foreach ($_POST['delete_label'] AS $label => $dummy)
-				{
-					if (array_key_exists($label, $the_labels))
-					{
+			elseif (isset($_POST['delete'], $_POST['delete_label'])) {
+				foreach ($_POST['delete_label'] as $label => $dummy) {
+					if (array_key_exists($label, $the_labels)) {
 						unset($the_labels[$label]);
 						$labels_to_remove[] = $label;
 					}
 				}
 			}
 			// The hardest one to deal with... changes.
-			elseif (isset($_POST['save']) && !empty($_POST['label_name']))
-			{
-				foreach ($the_labels as $id => $name)
-				{
-					if ($id == -1)
+			elseif (isset($_POST['save']) && !empty($_POST['label_name'])) {
+				foreach ($the_labels as $id => $name) {
+					if ($id == -1) {
 						continue;
+					}
 
-					if (isset($_POST['label_name'][$id]))
-					{
-						$_POST['label_name'][$id] = trim(strtr(Utils::htmlspecialchars($_POST['label_name'][$id]), array(',' => '&#044;')));
+					if (isset($_POST['label_name'][$id])) {
+						$_POST['label_name'][$id] = trim(strtr(Utils::htmlspecialchars($_POST['label_name'][$id]), [',' => '&#044;']));
 
-						if (Utils::entityStrlen($_POST['label_name'][$id]) > 30)
-						{
+						if (Utils::entityStrlen($_POST['label_name'][$id]) > 30) {
 							$_POST['label_name'][$id] = Utils::entitySubstr($_POST['label_name'][$id], 0, 30);
 						}
 
-						if ($_POST['label_name'][$id] != '')
-						{
+						if ($_POST['label_name'][$id] != '') {
 							// Changing the name of this label?
-							if ($the_labels[$id] != $_POST['label_name'][$id])
+							if ($the_labels[$id] != $_POST['label_name'][$id]) {
 								$label_updates[$id] = $_POST['label_name'][$id];
+							}
 
 							$the_labels[(int) $id] = $_POST['label_name'][$id];
-						}
-						else
-						{
+						} else {
 							unset($the_labels[(int) $id]);
 							$labels_to_remove[] = $id;
 							$message_changes[(int) $id] = true;
@@ -309,107 +300,107 @@ public static function manage(): void
 			}
 
 			// Save any new labels
-			if (!empty($labels_to_add))
-			{
-				$inserts = array();
+			if (!empty($labels_to_add)) {
+				$inserts = [];
 
-				foreach ($labels_to_add AS $label)
-					$inserts[] = array(User::$me->id, $label);
+				foreach ($labels_to_add as $label) {
+					$inserts[] = [User::$me->id, $label];
+				}
 
-				Db::$db->insert('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
+				Db::$db->insert('', '{db_prefix}pm_labels', ['id_member' => 'int', 'name' => 'string-30'], $inserts, []);
 			}
 
 			// Update existing labels as needed
-			if (!empty($label_updates))
-			{
-				foreach ($label_updates AS $id => $name)
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}pm_labels
+			if (!empty($label_updates)) {
+				foreach ($label_updates as $id => $name) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}pm_labels
 						SET name = {string:name}
 						WHERE id_label = {int:id_label}
 						AND id_member = {int:me}',
-						array(
+						[
 							'name' => $name,
 							'id_label' => $id,
 							'me' => User::$me->id,
-						)
+						],
 					);
 				}
 			}
 
 			// Now the fun part... Deleting labels.
-			if (!empty($labels_to_remove))
-			{
+			if (!empty($labels_to_remove)) {
 				// First delete the labels
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}pm_labels
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}pm_labels
 					WHERE id_label IN ({array_int:labels_to_delete})
 					AND id_member = {int:me}',
-					array(
+					[
 						'labels_to_delete' => $labels_to_remove,
 						'me' => User::$me->id,
-					)
+					],
 				);
 
 				// Now remove the now-deleted labels from any PMs...
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}pm_labeled_messages
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}pm_labeled_messages
 					WHERE id_label IN ({array_int:labels_to_delete})',
-					array(
+					[
 						'labels_to_delete' => $labels_to_remove,
-					)
+					],
 				);
 
 				// Get any PMs with no labels which aren't in the inbox.
-				$stranded_messages = array();
+				$stranded_messages = [];
 
-				$get_stranded_pms = Db::$db->query('', '
-					SELECT pmr.id_pm
+				$get_stranded_pms = Db::$db->query(
+					'',
+					'SELECT pmr.id_pm
 					FROM {db_prefix}pm_recipients AS pmr
 						LEFT JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)
 					WHERE pml.id_label IS NULL
 						AND pmr.in_inbox = {int:not_in_inbox}
 						AND pmr.deleted = {int:not_deleted}
 						AND pmr.id_member = {int:me}',
-					array(
+					[
 						'not_in_inbox' => 0,
 						'not_deleted' => 0,
 						'me' => User::$me->id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($get_stranded_pms))
-				{
+
+				while ($row = Db::$db->fetch_assoc($get_stranded_pms)) {
 					$stranded_messages[] = $row['id_pm'];
 				}
 				Db::$db->free_result($get_stranded_pms);
 
 				// Move these back to the inbox if necessary.
-				if (!empty($stranded_messages))
-				{
+				if (!empty($stranded_messages)) {
 					// We now have more messages in the inbox.
 					Label::$loaded[-1]['messages'] += count($stranded_messages);
-					Db::$db->query('', '
-						UPDATE {db_prefix}pm_recipients
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}pm_recipients
 						SET in_inbox = {int:in_inbox}
 						WHERE id_pm IN ({array_int:stranded_messages})
 							AND id_member = {int:me}',
-						array(
+						[
 							'stranded_messages' => $stranded_messages,
 							'in_inbox' => 1,
 							'me' => User::$me->id,
-						)
+						],
 					);
 				}
 
 				// Now do the same the rules - check through each rule.
-				foreach (Rule::$loaded as $k => $rule)
-				{
+				foreach (Rule::$loaded as $k => $rule) {
 					// Each action...
-					foreach ($rule->actions as $k2 => $action)
-					{
-						if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove))
+					foreach ($rule->actions as $k2 => $action) {
+						if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) {
 							continue;
+						}
 
 						$rule_changes[] = $rule->id;
 
@@ -420,41 +411,39 @@ public static function manage(): void
 			}
 
 			// If we have rules to change do so now.
-			if (!empty($rule_changes))
-			{
+			if (!empty($rule_changes)) {
 				$rule_changes = array_unique($rule_changes);
 
 				// Update/delete as appropriate.
-				foreach ($rule_changes as $k => $id)
-				{
-					if (!empty(Rule::$loaded[$id]->actions))
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}pm_rules
+				foreach ($rule_changes as $k => $id) {
+					if (!empty(Rule::$loaded[$id]->actions)) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}pm_rules
 							SET actions = {string:actions}
 							WHERE id_rule = {int:id_rule}
 								AND id_member = {int:me}',
-							array(
+							[
 								'me' => User::$me->id,
 								'id_rule' => $id,
 								'actions' => Utils::jsonEncode(Rule::$loaded[$id]->actions),
-							)
+							],
 						);
 						unset($rule_changes[$k]);
 					}
 				}
 
 				// Anything left here means it's lost all actions...
-				if (!empty($rule_changes))
-				{
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}pm_rules
+				if (!empty($rule_changes)) {
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}pm_rules
 						WHERE id_rule IN ({array_int:rule_list})
 							AND id_member = {int:me}',
-						array(
+						[
 							'me' => User::$me->id,
 							'rule_list' => $rule_changes,
-						)
+						],
 					);
 				}
 			}
diff --git a/Sources/PersonalMessage/PM.php b/Sources/PersonalMessage/PM.php
index 26ef4178d8..058ec72dc0 100644
--- a/Sources/PersonalMessage/PM.php
+++ b/Sources/PersonalMessage/PM.php
@@ -13,15 +13,18 @@
 
 namespace SMF\PersonalMessage;
 
+use SMF\Actions\Notify;
+use SMF\Actions\PersonalMessage as PMAction;
 use SMF\ArrayAccessHelper;
 use SMF\BackwardCompatibility;
-
 use SMF\BBCodeParser;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Editor;
 use SMF\ErrorHandler;
-use SMF\IntegrationHook;
 use SMF\Group;
+use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Mail;
 use SMF\Menu;
@@ -32,35 +35,35 @@
 use SMF\User;
 use SMF\Utils;
 use SMF\Verifier;
-use SMF\Actions\Notify;
-use SMF\Actions\PersonalMessage as PMAction;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Represents a single personal message.
  */
 class PM implements \ArrayAccess
-{  
-	use BackwardCompatibility, ArrayAccessHelper;
+{
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'get' => false,
+	private static $backcompat = [
+		'func_names' => [
+			'old' => 'old',
+			'compose' => 'compose',
+			'compose2' => 'compose2',
 			'send' => 'sendpm',
-			'count' => false,
 			'delete' => 'deleteMessages',
 			'markRead' => 'markMessages',
+			'getLatest' => 'getLatest',
+			'getRecent' => 'getRecent',
+			'countSent' => 'countSent',
 			'reportErrors' => 'messagePostError',
 			'isAccessible' => 'isAccessiblePM',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -127,7 +130,7 @@ class PM implements \ArrayAccess
 	 *
 	 * Data about received copies of this PM.
 	 */
-	public array $received = array();
+	public array $received = [];
 
 	/**
 	 * @var string
@@ -142,7 +145,7 @@ class PM implements \ArrayAccess
 	 *
 	 * Formatted versions of this PM's properties, suitable for display.
 	 */
-	public array $formatted = array();
+	public array $formatted = [];
 
 	/**************************
 	 * Public static properties
@@ -153,7 +156,7 @@ class PM implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var object|array
@@ -180,11 +183,11 @@ class PM implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_pm' => 'id',
 		'id_pm_head' => 'head',
 		'id_member_from' => 'member_from',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -210,7 +213,7 @@ class PM implements \ArrayAccess
 	 *
 	 * Membergroup message limits.
 	 */
-	protected static $message_limit_cache = array();
+	protected static $message_limit_cache = [];
 
 	/**
 	 * @var array
@@ -221,7 +224,7 @@ class PM implements \ArrayAccess
 	 * PM::getRecent() was called with. The values are lists of PM IDs that
 	 * match those parameters.
 	 */
-	protected static array $recent = array();
+	protected static array $recent = [];
 
 	/****************
 	 * Public methods
@@ -233,7 +236,7 @@ class PM implements \ArrayAccess
 	 * @param int $id The ID number of the personal message.
 	 * @param array $props Properties to set for this message.
 	 */
-	public function __construct(int $id, array $props = array())
+	public function __construct(int $id, array $props = [])
 	{
 		$this->id = $id;
 		$this->set($props);
@@ -249,7 +252,7 @@ public function __construct(int $id, array $props = array())
 	 * @param array $format_options Options to control output.
 	 * @return array A copy of $this->formatted.
 	 */
-	public function format(int $counter = 0, array $format_options = array()): array
+	public function format(int $counter = 0, array $format_options = []): array
 	{
 		// If these context vars haven't already been set, do it now.
 		Utils::$context['start'] = (int) (Utils::$context['start'] ?? $_GET['start'] ?? 0);
@@ -260,12 +263,12 @@ public function format(int $counter = 0, array $format_options = array()): array
 		// Use '(no subject)' if none was specified.
 		$this->subject = $this->subject == '' ? Lang::$txt['no_subject'] : $this->subject;
 
-		if (!empty($this->member_from) && !isset(User::$loaded[$this->member_from]))
+		if (!empty($this->member_from) && !isset(User::$loaded[$this->member_from])) {
 			User::load($this->member_from);
+		}
 
 		// Load the author's information - if it's not there, load the guest information.
-		if (!isset(User::$loaded[$this->member_from]))
-		{
+		if (!isset(User::$loaded[$this->member_from])) {
 			$author['id'] = 0;
 			$author['name'] = $this->from_name;
 
@@ -275,9 +278,7 @@ public function format(int $counter = 0, array $format_options = array()): array
 			$author['email'] = '';
 			$author['show_email'] = false;
 			$author['is_guest'] = true;
-		}
-		else
-		{
+		} else {
 			$author = User::$loaded[$this->member_from]->format(true);
 
 			$author['can_view_profile'] = User::$me->allowedTo('profile_view') || ($this->member_from == User::$me->id && !User::$me->is_guest);
@@ -293,57 +294,55 @@ public function format(int $counter = 0, array $format_options = array()): array
 		Label::load();
 
 		// We need basic info about the recipients, too.
-		$recipients = array(
-			'to' => array(),
-			'bcc' => array(),
-		);
+		$recipients = [
+			'to' => [],
+			'bcc' => [],
+		];
 
-		$labels = array();
+		$labels = [];
 		$is_unread = false;
 		$is_replied_to = false;
 
-		foreach ($this->received as $member => $received_copy)
-		{
-			if (empty($format_options['no_bcc']) || !$received_copy->bcc)
-			{
+		foreach ($this->received as $member => $received_copy) {
+			if (empty($format_options['no_bcc']) || !$received_copy->bcc) {
 				$recipients[$received_copy->bcc ? 'bcc' : 'to'][] = empty($received_copy->name) ? Lang::$txt['guest_title'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $received_copy->member . '">' . $received_copy->name . '</a>';
 			}
 
-			if ($received_copy->member === User::$me->id)
-			{
+			if ($received_copy->member === User::$me->id) {
 				$is_unread = $received_copy->unread;
 				$is_replied_to = $received_copy->replied;
 
-				foreach ($received_copy->labels as $label_id)
+				foreach ($received_copy->labels as $label_id) {
 					$labels[$label_id] = Label::$loaded[$label_id];
+				}
 			}
 		}
 
 		// Sent to a member that no longer exists?
-		if ($this->member_from === User::$me->id && empty($this->received))
-			$recipients['to'] = array(Lang::$txt['guest_title']);
+		if ($this->member_from === User::$me->id && empty($this->received)) {
+			$recipients['to'] = [Lang::$txt['guest_title']];
+		}
 
 		// Censor all the important text...
 		Lang::censorText($this->body);
 		Lang::censorText($this->subject);
 
 		// Any custom profile fields?
-		$custom_fields = array();
-		if (empty($format_options['no_custom_fields']) && !empty($author['custom_fields']))
-		{
-			foreach ($author['custom_fields'] as $custom)
-			{
+		$custom_fields = [];
+
+		if (empty($format_options['no_custom_fields']) && !empty($author['custom_fields'])) {
+			foreach ($author['custom_fields'] as $custom) {
 				$custom_fields[Utils::$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
 			}
 		}
 
-		$label_ids = array_diff(array_keys($labels), array(-1));
+		$label_ids = array_diff(array_keys($labels), [-1]);
 
 		$href = Config::$scripturl . '?action=pm;f=' . $this->folder . (Utils::$context['current_label_id'] != -1 && !empty($label_ids) && in_array(Utils::$context['current_label_id'], $label_ids) ? ';l=' . Utils::$context['current_label_id'] : '') . ';pmid=' . $this->id . '#msg' . $this->id;
 
 		$number_recipients = count($recipients['to']);
 
-		$this->formatted = array(
+		$this->formatted = [
 			'id' => $this->id,
 			'member' => $author,
 			'subject' => $this->subject,
@@ -365,47 +364,47 @@ public function format(int $counter = 0, array $format_options = array()): array
 			'can_report' => !empty(Config::$modSettings['enableReportPM']),
 			'can_see_ip' => User::$me->allowedTo('moderate_forum') || ($this->member_from == User::$me->id && !empty(User::$me->id)),
 			'custom_fields' => $custom_fields,
-			'quickbuttons' => array(
-				'reply_to_all' => array(
+			'quickbuttons' => [
+				'reply_to_all' => [
 					'label' => Lang::$txt['reply_to_all'],
 					'href' => Config::$scripturl . '?action=pm;sa=send;f=' . $this->folder . (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '') . ';pmsg=' . $this->id . ($this->member_from != User::$me->id ? ';quote' : '') . ';u=all',
 					'icon' => 'reply_all_button',
 					'show' => Utils::$context['can_send_pm'] && !$author['is_guest'] && ($number_recipients > 1 || $this->member_from == User::$me->id),
-				),
-				'reply' => array(
+				],
+				'reply' => [
 					'label' => Lang::$txt['reply'],
 					'href' => Config::$scripturl . '?action=pm;sa=send;f=' . $this->folder . (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '') . ';pmsg=' . $this->id . ';u=' . $this->member_from,
 					'icon' => 'reply_button',
 					'show' => Utils::$context['can_send_pm'] && !$author['is_guest'] && $this->member_from != User::$me->id,
-				),
-				'quote' => array(
+				],
+				'quote' => [
 					'label' => Lang::$txt['quote_action'],
 					'href' => Config::$scripturl . '?action=pm;sa=send;f=' . $this->folder . (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '') . ';pmsg=' . $this->id . ';quote' . ($number_recipients > 1 || $this->member_from == User::$me->id ? ';u=all' : (!$author['is_guest'] ? ';u=' . $this->member_from : '')),
 					'icon' => 'quote',
 					'show' => Utils::$context['can_send_pm'],
-				),
-				'delete' => array(
+				],
+				'delete' => [
 					'label' => Lang::$txt['delete'],
 					'href' => Config::$scripturl . '?action=pm;sa=pmactions;pm_actions%5b' . $this->id . '%5D=delete;f=' . $this->folder . ';start=' . Utils::$context['start'] . (Utils::$context['current_label_id'] != -1 ? ';l=' . Utils::$context['current_label_id'] : '') . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'javascript' => 'data-confirm="' . Utils::JavaScriptEscape(Lang::$txt['remove_message_question']) . '"',
 					'class' => 'you_sure',
 					'icon' => 'remove_button',
-				),
-				'more' => array(
-					'report' => array(
+				],
+				'more' => [
+					'report' => [
 						'label' => Lang::$txt['pm_report_to_admin'],
 						'href' => Config::$scripturl . '?action=pm;sa=report;l=' . Utils::$context['current_label_id'] . ';pmsg=' . $this->id,
 						'icon' => 'error',
 						'show' => !empty(Config::$modSettings['enableReportPM']),
-					),
-				),
-				'quickmod' => array(
+					],
+				],
+				'quickmod' => [
 					'class' => 'inline_mod_check',
 					'content' => '<input type="checkbox" name="pms[]" id="deletedisplay' . $this->id . '" value="' . $this->id . '" onclick="document.getElementById(\'deletelisting' . $this->id . '\').checked = this.checked;">',
 					'show' => Utils::$context['display_mode'] == PMAction::VIEW_ALL,
-				),
-			),
-		);
+				],
+			],
+		];
 
 		return $this->formatted;
 	}
@@ -417,28 +416,25 @@ public function format(int $counter = 0, array $format_options = array()): array
 	 */
 	public function canAccess(string $folders = 'both'): bool
 	{
-		if ($folders === 'in_or_outbox')
+		if ($folders === 'in_or_outbox') {
 			$folders = 'both';
+		}
 
-		if ($folders === 'outbox')
+		if ($folders === 'outbox') {
 			$folders = 'sent';
+		}
 
-		$valid_for = array(
+		$valid_for = [
 			'inbox' => false,
 			'sent' => false,
 			'both' => false,
-		);
+		];
 
-		if ($this->member_from === User::$me->id)
-		{
+		if ($this->member_from === User::$me->id) {
 			$valid_for['sent'] = !$this->deleted_by_sender;
-		}
-		else
-		{
-			foreach ($this->received as $received)
-			{
-				if ($received->member === User::$me->id)
-				{
+		} else {
+			foreach ($this->received as $received) {
+				if ($received->member === User::$me->id) {
 					$valid_for['inbox'] = !$received->deleted;
 					break;
 				}
@@ -464,31 +460,31 @@ public function canAccess(string $folders = 'both'): bool
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return array Instances of this class for the loaded messages.
 	 */
-	public static function load($ids, array $query_customizations = array()): array
+	public static function load($ids, array $query_customizations = []): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$ids = (array) $ids;
 
 		// Have we already loaded these?
-		foreach ($ids as $key => $id)
-		{
-			if (isset(self::$loaded[$id]))
-			{
+		foreach ($ids as $key => $id) {
+			if (isset(self::$loaded[$id])) {
 				$loaded[$id] = self::$loaded[$id];
 				unset($ids[$key]);
 			}
 		}
 
-		if (empty($ids))
+		if (empty($ids)) {
 			return $loaded;
+		}
 
 		// Loading is similar to getting, except that we keep all instances and
 		// then return them all at once.
 		self::$keep_all = true;
 
-		foreach (self::get($ids, $query_customizations) as $pm)
+		foreach (self::get($ids, $query_customizations) as $pm) {
 			$loaded[$pm->id] = $pm;
+		}
 
 		self::$keep_all = false;
 
@@ -506,7 +502,7 @@ public static function load($ids, array $query_customizations = array()): array
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return Generator<array> Iterating over result gives PM instances.
 	 */
-	public static function get($ids, array $query_customizations = array())
+	public static function get($ids, array $query_customizations = [])
 	{
 		$ids = (array) $ids;
 
@@ -514,40 +510,39 @@ public static function get($ids, array $query_customizations = array())
 		Received::loadByPm($ids);
 
 		// Asked for single PM that has already been loaded? Just yield and return.
-		if (count($ids) === 1 && isset(self::$loaded[reset($ids)]))
-		{
+		if (count($ids) === 1 && isset(self::$loaded[reset($ids)])) {
 			yield self::$loaded[reset($ids)];
+
 			return;
 		}
 
-		$selects = $query_customizations['selects'] ?? array(
+		$selects = $query_customizations['selects'] ?? [
 			'pm.*',
-		);
+		];
 
-		$joins = $query_customizations['joins'] ?? array();
+		$joins = $query_customizations['joins'] ?? [];
 
-		$where = $query_customizations['where'] ?? array(
+		$where = $query_customizations['where'] ?? [
 			'pm.id_pm IN ({array_int:ids})',
-		);
+		];
 
-		$order = $query_customizations['order'] ?? array();
-		$group = $query_customizations['group'] ?? array();
+		$order = $query_customizations['order'] ?? [];
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? count($ids);
-		$params = $query_customizations['params'] ?? array();
+		$params = $query_customizations['params'] ?? [];
 
-		if (!empty($ids))
-		{
+		if (!empty($ids)) {
 			$params['ids'] = array_filter(array_unique(array_map('intval', $ids)));
 		}
 
-		foreach(self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row)
-		{
+		foreach(self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			$id = (int) $row['id_pm'];
 
 			yield (new self($id, $row));
 
-			if (!self::$keep_all)
+			if (!self::$keep_all) {
 				unset(self::$loaded[$id]);
+			}
 		}
 	}
 
@@ -559,28 +554,29 @@ public static function get($ids, array $query_customizations = array())
 	 */
 	public static function old(int $time): array
 	{
-		$ids = array();
+		$ids = [];
 
-		$selects = array(
+		$selects = [
 			'pm.id_pm',
-		);
+		];
 
-		$joins = array();
+		$joins = [];
 
-		$where = array(
+		$where = [
 			'pm.id_member_from = {int:me}',
 			'pm.deleted_by_sender = {int:not_deleted}',
 			'pm.msgtime < {int:time}',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'me' => User::$me->id,
 			'not_deleted' => 0,
 			'time' => $time,
-		);
+		];
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$ids[] = $row['id_pm'];
+		}
 
 		return $ids;
 	}
@@ -596,12 +592,11 @@ public static function compose(): void
 
 		// Just in case it was loaded from somewhere else.
 		Theme::loadTemplate('PersonalMessage');
-		Theme::loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
-		Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+		Theme::loadJavaScriptFile('PersonalMessage.js', ['defer' => false, 'minimize' => true], 'smf_pms');
+		Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
 
-		if (Utils::$context['drafts_autosave'])
-		{
-			Theme::loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
+		if (Utils::$context['drafts_autosave']) {
+			Theme::loadJavaScriptFile('drafts.js', ['defer' => false, 'minimize' => true], 'smf_drafts');
 		}
 
 		Utils::$context['sub_template'] = 'send';
@@ -615,32 +610,30 @@ public static function compose(): void
 		Utils::$context['reply'] = isset($_REQUEST['pmsg']) || isset($_REQUEST['quote']);
 
 		// Check whether we've gone over the limit of messages we can send per hour.
-		if (!empty(Config::$modSettings['pm_posts_per_hour']) && !User::$me->allowedTo(array('admin_forum', 'moderate_forum', 'send_mail')) && User::$me->mod_cache['bq'] == '0=1' && User::$me->mod_cache['gq'] == '0=1')
-		{
+		if (!empty(Config::$modSettings['pm_posts_per_hour']) && !User::$me->allowedTo(['admin_forum', 'moderate_forum', 'send_mail']) && User::$me->mod_cache['bq'] == '0=1' && User::$me->mod_cache['gq'] == '0=1') {
 			// How many messages have they sent this last hour?
-			$request = Db::$db->query('', '
-				SELECT COUNT(pr.id_pm) AS post_count
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(pr.id_pm) AS post_count
 				FROM {db_prefix}personal_messages AS pm
 					INNER JOIN {db_prefix}pm_recipients AS pr ON (pr.id_pm = pm.id_pm)
 				WHERE pm.id_member_from = {int:me}
 					AND pm.msgtime > {int:msgtime}',
-				array(
+				[
 					'me' => User::$me->id,
 					'msgtime' => time() - 3600,
-				)
+				],
 			);
 			list($postCount) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			if (!empty($postCount) && $postCount >= Config::$modSettings['pm_posts_per_hour'])
-			{
-				ErrorHandler::fatalLang('pm_too_many_per_hour', true, array(Config::$modSettings['pm_posts_per_hour']));
+			if (!empty($postCount) && $postCount >= Config::$modSettings['pm_posts_per_hour']) {
+				ErrorHandler::fatalLang('pm_too_many_per_hour', true, [Config::$modSettings['pm_posts_per_hour']]);
 			}
 		}
 
 		// Quoting/Replying to a message?
-		if (!empty($_REQUEST['pmsg']))
-		{
+		if (!empty($_REQUEST['pmsg'])) {
 			$pmsg = (int) $_REQUEST['pmsg'];
 
 			self::load($pmsg);
@@ -648,21 +641,18 @@ public static function compose(): void
 			$pm = self::$loaded[$pmsg];
 
 			// Make sure this is yours.
-			if (!$pm->canAccess('both'))
+			if (!$pm->canAccess('both')) {
 				ErrorHandler::fatalLang('pm_not_yours', false);
+			}
 
 			// Format it all.
 			$pm->format();
 
 			// Add 'Re: ' to it....
-			if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix')))
-			{
-				if (Lang::$default === User::$me->language)
-				{
+			if (!isset(Utils::$context['response_prefix']) && !(Utils::$context['response_prefix'] = CacheApi::get('response_prefix'))) {
+				if (Lang::$default === User::$me->language) {
 					Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
-				}
-				else
-				{
+				} else {
 					Lang::load('index', Lang::$default, false);
 					Utils::$context['response_prefix'] = Lang::$txt['response_prefix'];
 					Lang::load('index');
@@ -673,181 +663,160 @@ public static function compose(): void
 
 			$form_subject = $pm->formatted['subject'];
 
-			if (Utils::$context['reply'] && trim(Utils::$context['response_prefix']) != '' && Utils::entityStrpos($form_subject, trim(Utils::$context['response_prefix'])) !== 0)
-			{
+			if (Utils::$context['reply'] && trim(Utils::$context['response_prefix']) != '' && Utils::entityStrpos($form_subject, trim(Utils::$context['response_prefix'])) !== 0) {
 				$form_subject = Utils::$context['response_prefix'] . $form_subject;
 			}
 
-			if (isset($_REQUEST['quote']))
-			{
+			if (isset($_REQUEST['quote'])) {
 				// Remove any nested quotes and <br>...
 				$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $pm->body);
 
-				if (!empty(Config::$modSettings['removeNestedQuotes']))
-				{
-					$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+				if (!empty(Config::$modSettings['removeNestedQuotes'])) {
+					$form_message = preg_replace(['~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'], '', $form_message);
 				}
 
-				if (empty($pm->member_from))
-				{
+				if (empty($pm->member_from)) {
 					$form_message = '[quote author=&quot;' . $pm->formatted['member']['name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
-				}
-				else
-				{
+				} else {
 					$form_message = '[quote author=' . $pm->formatted['member']['name'] . ' link=action=profile;u=' . $pm->member_from . ' date=' . $pm->msgtime . ']' . "\n" . $form_message . "\n" . '[/quote]';
 				}
-			}
-			else
-			{
+			} else {
 				$form_message = '';
 			}
 
 			// Set up the quoted message array.
 			Utils::$context['quoted_message'] = $pm->formatted;
-		}
-		else
-		{
+		} else {
 			Utils::$context['quoted_message'] = false;
 			$form_subject = '';
 			$form_message = '';
 		}
 
-		Utils::$context['recipients'] = array(
-			'to' => array(),
-			'bcc' => array(),
-		);
+		Utils::$context['recipients'] = [
+			'to' => [],
+			'bcc' => [],
+		];
 
 		// Sending by ID?  Replying to all?  Fetch the real_name(s).
-		if (isset($_REQUEST['u']))
-		{
-			if ($_REQUEST['u'] != 'all')
-			{
+		if (isset($_REQUEST['u'])) {
+			if ($_REQUEST['u'] != 'all') {
 				$_REQUEST['u'] = array_unique(array_map('intval', explode(',', $_REQUEST['u'])));
 			}
 
-			if (isset($pm))
-			{
-				if ($pm->member_from != User::$me->id && ($_REQUEST['u'] == 'all' || in_array($pm->member_from, $_REQUEST['u'])))
-				{
-					Utils::$context['recipients']['to'][$pm->member_from] = array(
+			if (isset($pm)) {
+				if ($pm->member_from != User::$me->id && ($_REQUEST['u'] == 'all' || in_array($pm->member_from, $_REQUEST['u']))) {
+					Utils::$context['recipients']['to'][$pm->member_from] = [
 						'id' => $pm->member_from,
 						'name' => Utils::htmlspecialchars($pm->from_name),
-					);
+					];
 				}
 
-				foreach ($pm->received as $member => $received_copy)
-				{
-					if ($received_copy->member == User::$me->id)
+				foreach ($pm->received as $member => $received_copy) {
+					if ($received_copy->member == User::$me->id) {
 						continue;
+					}
 
-					if (!$received_copy->bcc)
-					{
-						Utils::$context['recipients']['to'][$received_copy->member] = array(
+					if (!$received_copy->bcc) {
+						Utils::$context['recipients']['to'][$received_copy->member] = [
 							'id' => $received_copy->member,
 							'name' => Utils::htmlspecialchars($received_copy->name),
-						);
+						];
 					}
 				}
-			}
-			elseif ($_REQUEST['u'] != 'all')
-			{
-				foreach ($_REQUEST['u'] as $key => $member)
-				{
-					if (isset(User::$loaded[$member]))
-					{
-						Utils::$context['recipients']['to'][User::$loaded[$member]->id] = array(
+			} elseif ($_REQUEST['u'] != 'all') {
+				foreach ($_REQUEST['u'] as $key => $member) {
+					if (isset(User::$loaded[$member])) {
+						Utils::$context['recipients']['to'][User::$loaded[$member]->id] = [
 							'id' => User::$loaded[$member]->id,
 							'name' => User::$loaded[$member]->name,
-						);
+						];
 
 						unset($_REQUEST['u'][$key]);
 					}
 				}
 
-				if (!empty($_REQUEST['u']))
-				{
-					$request = Db::$db->query('', '
-						SELECT id_member, real_name
+				if (!empty($_REQUEST['u'])) {
+					$request = Db::$db->query(
+						'',
+						'SELECT id_member, real_name
 						FROM {db_prefix}members
 						WHERE id_member IN ({array_int:member_list})
 						LIMIT {int:limit}',
-						array(
+						[
 							'member_list' => $_REQUEST['u'],
 							'limit' => count($_REQUEST['u']),
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
-						Utils::$context['recipients']['to'][(int) $row['id_member']] = array(
+
+					while ($row = Db::$db->fetch_assoc($request)) {
+						Utils::$context['recipients']['to'][(int) $row['id_member']] = [
 							'id' => (int) $row['id_member'],
 							'name' => $row['real_name'],
-						);
+						];
 					}
 					Db::$db->free_result($request);
 				}
 			}
 
 			// Get a literal name list in case the user has JavaScript disabled.
-			$names = array();
+			$names = [];
 
-			foreach (Utils::$context['recipients']['to'] as $to)
+			foreach (Utils::$context['recipients']['to'] as $to) {
 				$names[] = $to['name'];
+			}
 
 			Utils::$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
-		}
-		else
-		{
+		} else {
 			Utils::$context['to_value'] = '';
 		}
 
 		// Set the defaults...
 		Utils::$context['subject'] = $form_subject;
 
-		Utils::$context['message'] = str_replace(array('"', '<', '>', '&nbsp;'), array('&quot;', '&lt;', '&gt;', ' '), $form_message);
+		Utils::$context['message'] = str_replace(['"', '<', '>', '&nbsp;'], ['&quot;', '&lt;', '&gt;', ' '], $form_message);
 
-		Utils::$context['post_error'] = array();
+		Utils::$context['post_error'] = [];
 
 		// And build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=send',
-			'name' => Lang::$txt['new_message']
-		);
+			'name' => Lang::$txt['new_message'],
+		];
 
 		// Generate a list of drafts that they can load in to the editor
-		if (!empty(Utils::$context['drafts_save']))
-		{
-			$reply_to = isset($_REQUEST['pmsg']) ? $_REQUEST['pmsg'] : (isset($_REQUEST['quote']) ? $_REQUEST['quote'] : 0);
+		if (!empty(Utils::$context['drafts_save'])) {
+			$reply_to = $_REQUEST['pmsg'] ?? ($_REQUEST['quote'] ?? 0);
 
 			DraftPM::showInEditor(User::$me->id, $reply_to);
 
 			// Has a specific draft has been selected?
 			// Load its data if there is not a message already in the editor.
-			if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message']))
-			{
+			if (isset($_REQUEST['id_draft']) && empty($_POST['subject']) && empty($_POST['message'])) {
 				$draft = new DraftPM((int) $_REQUEST['id_draft'], true);
 				$draft->prepare();
 			}
 		}
 
 		// Now create the editor.
-		new Editor(array(
+		new Editor([
 			'id' => 'message',
 			'value' => Utils::$context['message'],
 			'height' => '175px',
 			'width' => '100%',
-			'labels' => array(
+			'labels' => [
 				'post_button' => Lang::$txt['send_message'],
-			),
+			],
 			'preview_type' => Editor::PREVIEW_XML,
 			'required' => true,
-		));
+		]);
 
 		Utils::$context['bcc_value'] = '';
 
 		Utils::$context['require_verification'] = !User::$me->is_admin && !empty(Config::$modSettings['pm_posts_verification']) && User::$me->posts < Config::$modSettings['pm_posts_verification'];
 
-		if (Utils::$context['require_verification'])
-			$verifier = new Verifier(array('id' => 'pm'));
+		if (Utils::$context['require_verification']) {
+			$verifier = new Verifier(['id' => 'pm']);
+		}
 
 		IntegrationHook::call('integrate_pm_post');
 
@@ -858,15 +827,16 @@ public static function compose(): void
 	/**
 	 * Validates a composed personal message and then passes it to PM::send()
 	 * if it is valid. If errors were found, or if the user requested a preview,
-	 * will instead send the user back to the composition page.
+	 * will return false.
+	 *
+	 * @return bool Whether the PM could be sent.
 	 */
-	public static function compose2(): void
+	public static function compose2(): bool
 	{
 		User::$me->isAllowedTo('pm_send');
 
 		// PM Drafts enabled and needed?
-		if (Utils::$context['drafts_save'] && (isset($_POST['save_draft']) || isset($_POST['id_draft'])))
-		{
+		if (Utils::$context['drafts_save'] && (isset($_POST['save_draft']) || isset($_POST['id_draft']))) {
 			Utils::$context['id_draft'] = !empty($_POST['id_draft']) ? (int) $_POST['id_draft'] : 0;
 		}
 
@@ -876,42 +846,39 @@ public static function compose2(): void
 		list(Config::$modSettings['max_pm_recipients'], Config::$modSettings['pm_posts_verification'], Config::$modSettings['pm_posts_per_hour']) = explode(',', Config::$modSettings['pm_spam_settings']);
 
 		// Initialize the errors we're about to make.
-		$post_errors = array();
+		$post_errors = [];
 
 		// Check whether we've gone over the limit of messages we can send per hour - fatal error if fails!
-		if (!empty(Config::$modSettings['pm_posts_per_hour']) && !User::$me->allowedTo(array('admin_forum', 'moderate_forum', 'send_mail')) && User::$me->mod_cache['bq'] == '0=1' && User::$me->mod_cache['gq'] == '0=1')
-		{
+		if (!empty(Config::$modSettings['pm_posts_per_hour']) && !User::$me->allowedTo(['admin_forum', 'moderate_forum', 'send_mail']) && User::$me->mod_cache['bq'] == '0=1' && User::$me->mod_cache['gq'] == '0=1') {
 			// How many have they sent this last hour?
-			$request = Db::$db->query('', '
-				SELECT COUNT(pr.id_pm) AS post_count
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(pr.id_pm) AS post_count
 				FROM {db_prefix}personal_messages AS pm
 					INNER JOIN {db_prefix}pm_recipients AS pr ON (pr.id_pm = pm.id_pm)
 				WHERE pm.id_member_from = {int:me}
 					AND pm.msgtime > {int:msgtime}',
-				array(
+				[
 					'me' => User::$me->id,
 					'msgtime' => time() - 3600,
-				)
+				],
 			);
 			list($postCount) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			if (!empty($postCount) && $postCount >= Config::$modSettings['pm_posts_per_hour'])
-			{
-				if (!isset($_REQUEST['xml']))
-				{
-					ErrorHandler::fatalLang('pm_too_many_per_hour', true, array(Config::$modSettings['pm_posts_per_hour']));
-				}
-				else
-				{
+			if (!empty($postCount) && $postCount >= Config::$modSettings['pm_posts_per_hour']) {
+				if (!isset($_REQUEST['xml'])) {
+					ErrorHandler::fatalLang('pm_too_many_per_hour', true, [Config::$modSettings['pm_posts_per_hour']]);
+				} else {
 					$post_errors[] = 'pm_too_many_per_hour';
 				}
 			}
 		}
 
 		// If your session timed out, show an error, but do allow to re-submit.
-		if (!isset($_REQUEST['xml']) && User::$me->checkSession('post', '', false) != '')
+		if (!isset($_REQUEST['xml']) && User::$me->checkSession('post', '', false) != '') {
 			$post_errors[] = 'session_timeout';
+		}
 
 		$_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
 
@@ -920,64 +887,56 @@ public static function compose2(): void
 		$_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc'];
 
 		// Route the input from the 'u' parameter to the 'to'-list.
-		if (!empty($_POST['u']))
+		if (!empty($_POST['u'])) {
 			$_POST['recipient_to'] = explode(',', $_POST['u']);
+		}
 
 		// Construct the list of recipients.
-		$recipientList = array();
-		$namedRecipientList = array();
-		$namesNotFound = array();
+		$recipientList = [];
+		$namedRecipientList = [];
+		$namesNotFound = [];
 
-		foreach (array('to', 'bcc') as $recipientType)
-		{
+		foreach (['to', 'bcc'] as $recipientType) {
 			// First, let's see if there's user ID's given.
-			$recipientList[$recipientType] = array();
+			$recipientList[$recipientType] = [];
 
-			if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
-			{
-				foreach ($_POST['recipient_' . $recipientType] as $recipient)
+			if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType])) {
+				foreach ($_POST['recipient_' . $recipientType] as $recipient) {
 					$recipientList[$recipientType][] = (int) $recipient;
+				}
 			}
 
 			// Are there also literal names set?
-			if (!empty($_REQUEST[$recipientType]))
-			{
+			if (!empty($_REQUEST[$recipientType])) {
 				// We're going to take out the "s anyway ;).
-				$recipientString = strtr($_REQUEST[$recipientType], array('\\"' => '"'));
+				$recipientString = strtr($_REQUEST[$recipientType], ['\\"' => '"']);
 
 				preg_match_all('~"([^"]+)"~', $recipientString, $matches);
 
 				$namedRecipientList[$recipientType] = array_unique(array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $recipientString))));
 
-				foreach ($namedRecipientList[$recipientType] as $index => $recipient)
-				{
-					if (strlen(trim($recipient)) > 0)
-					{
+				foreach ($namedRecipientList[$recipientType] as $index => $recipient) {
+					if (strlen(trim($recipient)) > 0) {
 						$namedRecipientList[$recipientType][$index] = Utils::htmlspecialchars(Utils::strtolower(trim($recipient)));
-					}
-					else
-					{
+					} else {
 						unset($namedRecipientList[$recipientType][$index]);
 					}
 				}
 
-				if (!empty($namedRecipientList[$recipientType]))
-				{
+				if (!empty($namedRecipientList[$recipientType])) {
 					$foundMembers = User::find($namedRecipientList[$recipientType]);
 
 					// Assume all are not found, until proven otherwise.
 					$namesNotFound[$recipientType] = $namedRecipientList[$recipientType];
 
-					foreach ($foundMembers as $member)
-					{
-						$testNames = array(
+					foreach ($foundMembers as $member) {
+						$testNames = [
 							Utils::strtolower($member['username']),
 							Utils::strtolower($member['name']),
 							Utils::strtolower($member['email']),
-						);
+						];
 
-						if (count(array_intersect($testNames, $namedRecipientList[$recipientType])) !== 0)
-						{
+						if (count(array_intersect($testNames, $namedRecipientList[$recipientType])) !== 0) {
 							$recipientList[$recipientType][] = $member['id'];
 
 							// Get rid of this username, since we found it.
@@ -988,9 +947,8 @@ public static function compose2(): void
 			}
 
 			// Selected a recipient to be deleted? Remove them now.
-			if (!empty($_POST['delete_recipient']))
-			{
-				$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+			if (!empty($_POST['delete_recipient'])) {
+				$recipientList[$recipientType] = array_diff($recipientList[$recipientType], [(int) $_POST['delete_recipient']]);
 			}
 
 			// Make sure we don't include the same name twice
@@ -1001,23 +959,20 @@ public static function compose2(): void
 		$is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']);
 
 		// Check if there's at least one recipient.
-		if (empty($recipientList['to']) && empty($recipientList['bcc']))
+		if (empty($recipientList['to']) && empty($recipientList['bcc'])) {
 			$post_errors[] = 'no_to';
+		}
 
 		// Make sure that we remove the members who did get it from the screen.
-		if (!$is_recipient_change)
-		{
-			foreach ($recipientList as $recipientType => $dummy)
-			{
-				if (!empty($namesNotFound[$recipientType]))
-				{
+		if (!$is_recipient_change) {
+			foreach ($recipientList as $recipientType => $dummy) {
+				if (!empty($namesNotFound[$recipientType])) {
 					$post_errors[] = 'bad_' . $recipientType;
 
 					// Since we already have a post error, remove the previous one.
-					$post_errors = array_diff($post_errors, array('no_to'));
+					$post_errors = array_diff($post_errors, ['no_to']);
 
-					foreach ($namesNotFound[$recipientType] as $name)
-					{
+					foreach ($namesNotFound[$recipientType] as $name) {
 						Utils::$context['send_log']['failed'][] = sprintf(Lang::$txt['pm_error_user_not_found'], $name);
 					}
 				}
@@ -1025,45 +980,40 @@ public static function compose2(): void
 		}
 
 		// Did they make any mistakes?
-		if ($_REQUEST['subject'] == '')
+		if ($_REQUEST['subject'] == '') {
 			$post_errors[] = 'no_subject';
+		}
 
-		if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '')
-		{
+		if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') {
 			$post_errors[] = 'no_message';
-		}
-		elseif (!empty(Config::$modSettings['max_messageLength']) && Utils::entityStrlen($_REQUEST['message']) > Config::$modSettings['max_messageLength'])
-		{
+		} elseif (!empty(Config::$modSettings['max_messageLength']) && Utils::entityStrlen($_REQUEST['message']) > Config::$modSettings['max_messageLength']) {
 			$post_errors[] = 'long_message';
-		}
-		else
-		{
+		} else {
 			// Preparse the message.
 			$message = $_REQUEST['message'];
 			Msg::preparsecode($message);
 
 			// Make sure there's still some content left without the tags.
-			if (Utils::htmlTrim(strip_tags(BBCodeParser::load()->parse(Utils::htmlspecialchars($message, ENT_QUOTES), false), '<img>')) === '' && (!User::$me->allowedTo('bbc_html') || strpos($message, '[html]') === false))
+			if (Utils::htmlTrim(strip_tags(BBCodeParser::load()->parse(Utils::htmlspecialchars($message, ENT_QUOTES), false), '<img>')) === '' && (!User::$me->allowedTo('bbc_html') || strpos($message, '[html]') === false)) {
 				$post_errors[] = 'no_message';
+			}
 		}
 
 		// Wrong verification code?
-		if (!User::$me->is_admin && !isset($_REQUEST['xml']) && !empty(Config::$modSettings['pm_posts_verification']) && User::$me->posts < Config::$modSettings['pm_posts_verification'])
-		{
-			$verifier = new Verifier(array('id' => 'pm'));
+		if (!User::$me->is_admin && !isset($_REQUEST['xml']) && !empty(Config::$modSettings['pm_posts_verification']) && User::$me->posts < Config::$modSettings['pm_posts_verification']) {
+			$verifier = new Verifier(['id' => 'pm']);
 			$post_errors = array_merge($post_errors, $verifier->errors);
 		}
 
 		// If they did, give a chance to make amends.
-		if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml']))
-		{
+		if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) {
 			self::reportErrors($post_errors, $namedRecipientList, $recipientList);
-			return;
+
+			return false;
 		}
 
 		// Want to take a second glance before you send?
-		if (isset($_REQUEST['preview']))
-		{
+		if (isset($_REQUEST['preview'])) {
 			// Set everything up to be displayed.
 			Utils::$context['preview_subject'] = Utils::htmlspecialchars($_REQUEST['subject']);
 
@@ -1083,45 +1033,46 @@ public static function compose2(): void
 
 			// Pretend they messed up but don't ignore if they really did :P.
 			self::reportErrors($post_errors, $namedRecipientList, $recipientList);
-			return;
+
+			return false;
 		}
+
 		// Adding a recipient cause javascript ain't working?
-		elseif ($is_recipient_change)
-		{
+		if ($is_recipient_change) {
 			// Maybe we couldn't find one?
-			foreach ($namesNotFound as $recipientType => $names)
-			{
+			foreach ($namesNotFound as $recipientType => $names) {
 				$post_errors[] = 'bad_' . $recipientType;
 
-				foreach ($names as $name)
-				{
+				foreach ($names as $name) {
 					Utils::$context['send_log']['failed'][] = sprintf(Lang::$txt['pm_error_user_not_found'], $name);
 				}
 			}
 
-			self::reportErrors(array(), $namedRecipientList, $recipientList);
-			return;
+			self::reportErrors([], $namedRecipientList, $recipientList);
+
+			return false;
 		}
 
 		// Want to save this as a draft and think about it some more?
-		if (Utils::$context['drafts_save'] && isset($_POST['save_draft']))
-		{
+		if (Utils::$context['drafts_save'] && isset($_POST['save_draft'])) {
 			$draft = new DraftPM((int) $_POST['id_draft'], true, $recipientList);
 			$draft->save($post_errors);
 
 			self::reportErrors($post_errors, $namedRecipientList, $recipientList);
-			return;
+
+			return false;
 		}
+
 		// Before we send the PM, let's make sure we don't have an abuse of numbers.
-		elseif (!empty(Config::$modSettings['max_pm_recipients']) && count($recipientList['to']) + count($recipientList['bcc']) > Config::$modSettings['max_pm_recipients'] && !User::$me->allowedTo(array('moderate_forum', 'send_mail', 'admin_forum')))
-		{
-			Utils::$context['send_log'] = array(
-				'sent' => array(),
-				'failed' => array(sprintf(Lang::$txt['pm_too_many_recipients'], Config::$modSettings['max_pm_recipients'])),
-			);
+		if (!empty(Config::$modSettings['max_pm_recipients']) && count($recipientList['to']) + count($recipientList['bcc']) > Config::$modSettings['max_pm_recipients'] && !User::$me->allowedTo(['moderate_forum', 'send_mail', 'admin_forum'])) {
+			Utils::$context['send_log'] = [
+				'sent' => [],
+				'failed' => [sprintf(Lang::$txt['pm_too_many_recipients'], Config::$modSettings['max_pm_recipients'])],
+			];
 
 			self::reportErrors($post_errors, $namedRecipientList, $recipientList);
-			return;
+
+			return false;
 		}
 
 		// Protect from message spamming.
@@ -1131,56 +1082,46 @@ public static function compose2(): void
 		Security::checkSubmitOnce('check');
 
 		// Do the actual sending of the PM.
-		if (!empty($recipientList['to']) || !empty($recipientList['bcc']))
-		{
+		if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) {
 			Utils::$context['send_log'] = PM::send($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
-		}
-		else
-		{
-			Utils::$context['send_log'] = array(
-				'sent' => array(),
-				'failed' => array()
-			);
+		} else {
+			Utils::$context['send_log'] = [
+				'sent' => [],
+				'failed' => [],
+			];
 		}
 
 		// Mark the message as "replied to".
-		if (!empty(Utils::$context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox')
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}pm_recipients
+		if (!empty(Utils::$context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox') {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}pm_recipients
 				SET is_read = is_read | 2
 				WHERE id_pm = {int:replied_to}
 					AND id_member = {int:me}',
-				array(
+				[
 					'me' => User::$me->id,
 					'replied_to' => (int) $_REQUEST['replied_to'],
-				)
+				],
 			);
 		}
 
 		// If one or more of the recipient were invalid, go back to the post screen with the failed usernames.
-		if (!empty(Utils::$context['send_log']['failed']))
-		{
-			self::reportErrors($post_errors, $namesNotFound, array(
+		if (!empty(Utils::$context['send_log']['failed'])) {
+			self::reportErrors($post_errors, $namesNotFound, [
 				'to' => array_intersect($recipientList['to'], Utils::$context['send_log']['failed']),
-				'bcc' => array_intersect($recipientList['bcc'], Utils::$context['send_log']['failed'])
-			));
+				'bcc' => array_intersect($recipientList['bcc'], Utils::$context['send_log']['failed']),
+			]);
 
-			return;
+			return false;
 		}
 
-		// Message sent successfully?
-		if (!empty(Utils::$context['send_log']) && empty(Utils::$context['send_log']['failed']))
-		{
-			$this->current_label_redirect = $this->current_label_redirect . ';done=sent';
-
-			// If we had a PM draft for this one, then its time to remove it since it was just sent
-			if (Utils::$context['drafts_save'] && !empty($_POST['id_draft']))
-				DraftPM::delete($_POST['id_draft']);
+		// If we had a PM draft for this one, then its time to remove it since it was just sent
+		if (Utils::$context['drafts_save'] && !empty($_POST['id_draft'])) {
+			DraftPM::delete($_POST['id_draft']);
 		}
 
-		// Go back to the where they sent from, if possible...
-		Utils::redirectexit($this->current_label_redirect);
+		return true;
 	}
 
 	/**
@@ -1201,18 +1142,17 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 		Lang::load('PersonalMessage');
 
 		// Initialize log array.
-		$log = array(
-			'failed' => array(),
-			'sent' => array()
-		);
+		$log = [
+			'failed' => [],
+			'sent' => [],
+		];
 
-		if ($from === null)
-		{
-			$from = array(
+		if ($from === null) {
+			$from = [
 				'id' => User::$me->id,
 				'name' => User::$me->name,
-				'username' => User::$me->username
-			);
+				'username' => User::$me->username,
+			];
 		}
 
 		// This is the one that will go in their inbox.
@@ -1220,26 +1160,26 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 
 		Msg::preparsecode($htmlmessage);
 
-		$htmlsubject = strtr(Utils::htmlspecialchars($subject), array("\r" => '', "\n" => '', "\t" => ''));
+		$htmlsubject = strtr(Utils::htmlspecialchars($subject), ["\r" => '', "\n" => '', "\t" => '']);
 
-		if (Utils::entityStrlen($htmlsubject) > 100)
+		if (Utils::entityStrlen($htmlsubject) > 100) {
 			$htmlsubject = Utils::entitySubstr($htmlsubject, 0, 100);
+		}
 
 		// Make sure is an array
-		if (!is_array($recipients))
-			$recipients = array($recipients);
+		if (!is_array($recipients)) {
+			$recipients = [$recipients];
+		}
 
 		// Integrated PMs
-		IntegrationHook::call('integrate_personal_message', array(&$recipients, &$from, &$subject, &$message));
+		IntegrationHook::call('integrate_personal_message', [&$recipients, &$from, &$subject, &$message]);
 
 		// Get a list of usernames and convert them to IDs.
-		$usernames = array();
-		foreach ($recipients as $rec_type => $rec)
-		{
-			foreach ($rec as $id => $member)
-			{
-				if (!is_numeric($recipients[$rec_type][$id]))
-				{
+		$usernames = [];
+
+		foreach ($recipients as $rec_type => $rec) {
+			foreach ($rec as $id => $member) {
+				if (!is_numeric($recipients[$rec_type][$id])) {
 					$recipients[$rec_type][$id] = Utils::strtolower(trim(preg_replace('~[<>&"\'=\\\]~', '', $recipients[$rec_type][$id])));
 
 					$usernames[$recipients[$rec_type][$id]] = 0;
@@ -1247,37 +1187,34 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 			}
 		}
 
-		if (!empty($usernames))
-		{
-			$request = Db::$db->query('pm_find_username', '
-				SELECT id_member, member_name
+		if (!empty($usernames)) {
+			$request = Db::$db->query(
+				'pm_find_username',
+				'SELECT id_member, member_name
 				FROM {db_prefix}members
 				WHERE ' . (Db::$db->case_sensitive ? 'LOWER(member_name)' : 'member_name') . ' IN ({array_string:usernames})',
-				array(
+				[
 					'usernames' => array_keys($usernames),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (isset($usernames[Utils::strtolower($row['member_name'])]))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (isset($usernames[Utils::strtolower($row['member_name'])])) {
 					$usernames[Utils::strtolower($row['member_name'])] = $row['id_member'];
+				}
 			}
 			Db::$db->free_result($request);
 
 			// Replace the usernames with IDs. Drop usernames that couldn't be found.
-			foreach ($recipients as $rec_type => $rec)
-			{
-				foreach ($rec as $id => $member)
-				{
-					if (is_numeric($recipients[$rec_type][$id]))
+			foreach ($recipients as $rec_type => $rec) {
+				foreach ($rec as $id => $member) {
+					if (is_numeric($recipients[$rec_type][$id])) {
 						continue;
+					}
 
-					if (!empty($usernames[$member]))
-					{
+					if (!empty($usernames[$member])) {
 						$recipients[$rec_type][$id] = $usernames[$member];
-					}
-					else
-					{
+					} else {
 						$log['failed'][$id] = sprintf(Lang::$txt['pm_error_user_not_found'], $recipients[$rec_type][$id]);
 
 						unset($recipients[$rec_type][$id]);
@@ -1296,26 +1233,27 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 		$all_to = array_merge($recipients['to'], $recipients['bcc']);
 
 		// Check no-one will want it deleted right away!
-		$deletes = array();
-		$request = Db::$db->query('', '
-			SELECT
+		$deletes = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				id_member, criteria, is_or
 			FROM {db_prefix}pm_rules
 			WHERE id_member IN ({array_int:to_members})
 				AND delete_pm = {int:delete_pm}',
-			array(
+			[
 				'to_members' => $all_to,
 				'delete_pm' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$criteria = Utils::jsonDecode($row['criteria'], true);
 
 			// Note we don't check the buddy status, cause deletion from buddy = madness!
 			$delete = false;
-			foreach ($criteria as $criterium)
-			{
+
+			foreach ($criteria as $criterium) {
 				if (
 					(
 						$criterium['t'] == 'mid'
@@ -1333,42 +1271,43 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 						$criterium['t'] == 'msg'
 						&& strpos($message, $criterium['v']) !== false
 					)
-				)
-				{
+				) {
 					$delete = true;
 				}
 				// If we're adding and one criteria doesn't match then we stop!
-				elseif (!$row['is_or'])
-				{
+				elseif (!$row['is_or']) {
 					$delete = false;
 					break;
 				}
 			}
 
-			if ($delete)
+			if ($delete) {
 				$deletes[$row['id_member']] = 1;
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Load the membergroup message limits.
-		if (!User::$me->allowedTo('moderate_forum') && empty(self::$message_limit_cache))
-		{
-			foreach (Group::load() as $group)
+		if (!User::$me->allowedTo('moderate_forum') && empty(self::$message_limit_cache)) {
+			foreach (Group::load() as $group) {
 				self::$message_limit_cache[$group->id] = $group->max_messages;
+			}
 		}
 
 		// Load the groups that are allowed to read PMs.
 		$pmReadGroups = User::groupsAllowedTo('pm_read');
 
-		if (empty(Config::$modSettings['permission_enable_deny']))
-			$pmReadGroups['denied'] = array();
+		if (empty(Config::$modSettings['permission_enable_deny'])) {
+			$pmReadGroups['denied'] = [];
+		}
 
 		// Load their alert preferences
-		$notifyPrefs = Notify::getNotifyPrefs($all_to, array('pm_new', 'pm_reply', 'pm_notify'), true);
+		$notifyPrefs = Notify::getNotifyPrefs($all_to, ['pm_new', 'pm_reply', 'pm_notify'], true);
 
-		$notifications = array();
-		$request = Db::$db->query('', '
-			SELECT
+		$notifications = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				member_name, real_name, id_member, email_address, lngfile,
 				instant_messages,' . (User::$me->allowedTo('moderate_forum') ? ' 0' : '
 				(pm_receive_from = {int:admins_only}' . (empty(Config::$modSettings['enable_buddylist']) ? '' : ' OR
@@ -1380,28 +1319,29 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 			WHERE id_member IN ({array_int:recipients})
 			ORDER BY lngfile
 			LIMIT {int:count_recipients}',
-			array(
+			[
 				'not_on_ignore_list' => 1,
 				'buddies_only' => 2,
 				'admins_only' => 3,
 				'recipients' => $all_to,
 				'count_recipients' => count($all_to),
 				'from_id' => $from['id'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Don't do anything for members to be deleted!
-			if (isset($deletes[$row['id_member']]))
+			if (isset($deletes[$row['id_member']])) {
 				continue;
+			}
 
 			// Load the preferences for this member (if any)
-			$prefs = !empty($notifyPrefs[$row['id_member']]) ? $notifyPrefs[$row['id_member']] : array();
-			$prefs = array_merge(array(
+			$prefs = !empty($notifyPrefs[$row['id_member']]) ? $notifyPrefs[$row['id_member']] : [];
+			$prefs = array_merge([
 				'pm_new' => 0,
 				'pm_reply' => 0,
 				'pm_notify' => 0,
-			), $prefs);
+			], $prefs);
 
 			// We need to know this members groups.
 			$groups = explode(',', $row['additional_groups']);
@@ -1411,41 +1351,33 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 			$message_limit = -1;
 
 			// For each group see whether they've gone over their limit - assuming they're not an admin.
-			if (!in_array(1, $groups))
-			{
-				foreach ($groups as $id)
-				{
-					if (isset(self::$message_limit_cache[$id]) && $message_limit != 0 && $message_limit < self::$message_limit_cache[$id])
-					{
+			if (!in_array(1, $groups)) {
+				foreach ($groups as $id) {
+					if (isset(self::$message_limit_cache[$id]) && $message_limit != 0 && $message_limit < self::$message_limit_cache[$id]) {
 						$message_limit = self::$message_limit_cache[$id];
 					}
 				}
 
-				if ($message_limit > 0 && $message_limit <= $row['instant_messages'])
-				{
+				if ($message_limit > 0 && $message_limit <= $row['instant_messages']) {
 					$log['failed'][$row['id_member']] = sprintf(Lang::$txt['pm_error_data_limit_reached'], $row['real_name']);
 
 					unset($all_to[array_search($row['id_member'], $all_to)]);
 
 					continue;
-
 				}
 
 				// Do they have any of the allowed groups?
-				if (count(array_intersect($pmReadGroups['allowed'], $groups)) == 0 || count(array_intersect($pmReadGroups['denied'], $groups)) != 0)
-				{
+				if (count(array_intersect($pmReadGroups['allowed'], $groups)) == 0 || count(array_intersect($pmReadGroups['denied'], $groups)) != 0) {
 					$log['failed'][$row['id_member']] = sprintf(Lang::$txt['pm_error_user_cannot_read'], $row['real_name']);
 
 					unset($all_to[array_search($row['id_member'], $all_to)]);
 
 					continue;
-
 				}
 			}
 
 			// Note that PostgreSQL can return a lowercase t/f for FIND_IN_SET
-			if (!empty($row['ignored']) && $row['ignored'] != 'f' && $row['id_member'] != $from['id'])
-			{
+			if (!empty($row['ignored']) && $row['ignored'] != 'f' && $row['id_member'] != $from['id']) {
 				$log['failed'][$row['id_member']] = sprintf(Lang::$txt['pm_error_ignored_by_user'], $row['real_name']);
 
 				unset($all_to[array_search($row['id_member'], $all_to)]);
@@ -1454,8 +1386,7 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 			}
 
 			// If the receiving account is banned (>=10) or pending deletion (4), refuse to send the PM.
-			if ($row['is_activated'] >= 10 || ($row['is_activated'] == 4 && !User::$me->is_admin))
-			{
+			if ($row['is_activated'] >= 10 || ($row['is_activated'] == 4 && !User::$me->is_admin)) {
 				$log['failed'][$row['id_member']] = sprintf(Lang::$txt['pm_error_user_cannot_read'], $row['real_name']);
 
 				unset($all_to[array_search($row['id_member'], $all_to)]);
@@ -1487,140 +1418,140 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 						)
 					)
 				)
-			)
-			{
+			) {
 				$notifications[empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $row['lngfile']][] = $row['email_address'];
 			}
 
-			$log['sent'][$row['id_member']] = sprintf(isset(Lang::$txt['pm_successfully_sent']) ? Lang::$txt['pm_successfully_sent'] : '', $row['real_name']);
+			$log['sent'][$row['id_member']] = sprintf(Lang::$txt['pm_successfully_sent'] ?? '', $row['real_name']);
 		}
 		Db::$db->free_result($request);
 
 		// Only 'send' the message if there are any recipients left.
-		if (empty($all_to))
+		if (empty($all_to)) {
 			return $log;
+		}
 
 		// Insert the message itself and then grab the last insert id.
-		$id_pm = Db::$db->insert('',
+		$id_pm = Db::$db->insert(
+			'',
 			'{db_prefix}personal_messages',
-			array(
+			[
 				'id_pm_head' => 'int', 'id_member_from' => 'int', 'deleted_by_sender' => 'int',
 				'from_name' => 'string-255', 'msgtime' => 'int', 'subject' => 'string-255', 'body' => 'string-65534',
-			),
-			array(
+			],
+			[
 				$pm_head, $from['id'], ($store_outbox ? 0 : 1),
 				$from['username'], time(), $htmlsubject, $htmlmessage,
-			),
-			array('id_pm'),
-			1
+			],
+			['id_pm'],
+			1,
 		);
 
 		// Add the recipients.
-		if (!empty($id_pm))
-		{
+		if (!empty($id_pm)) {
 			// If this is new we need to set it part of its own conversation.
-			if (empty($pm_head))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}personal_messages
+			if (empty($pm_head)) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}personal_messages
 					SET id_pm_head = {int:id_pm_head}
 					WHERE id_pm = {int:id_pm_head}',
-					array(
+					[
 						'id_pm_head' => $id_pm,
-					)
+					],
 				);
 			}
 
 			// Some people think manually deleting personal_messages is fun... it's not. We protect against it though :)
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}pm_recipients
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}pm_recipients
 				WHERE id_pm = {int:id_pm}',
-				array(
+				[
 					'id_pm' => $id_pm,
-				)
+				],
 			);
 
-			$insertRows = array();
-			$to_list = array();
-			foreach ($all_to as $to)
-			{
-				$insertRows[] = array($id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1);
+			$insertRows = [];
+			$to_list = [];
+
+			foreach ($all_to as $to) {
+				$insertRows[] = [$id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1];
 
-				if (!in_array($to, $recipients['bcc']))
+				if (!in_array($to, $recipients['bcc'])) {
 					$to_list[] = $to;
+				}
 			}
 
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}pm_recipients',
-				array(
-					'id_pm' => 'int', 'id_member' => 'int', 'bcc' => 'int', 'deleted' => 'int', 'is_new' => 'int'
-				),
+				[
+					'id_pm' => 'int', 'id_member' => 'int', 'bcc' => 'int', 'deleted' => 'int', 'is_new' => 'int',
+				],
 				$insertRows,
-				array('id_pm', 'id_member')
+				['id_pm', 'id_member'],
 			);
 		}
 
-		$to_names = array();
-		if (count($to_list) > 1)
-		{
-			$request = Db::$db->query('', '
-				SELECT real_name
+		$to_names = [];
+
+		if (count($to_list) > 1) {
+			$request = Db::$db->query(
+				'',
+				'SELECT real_name
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:to_members})
 					AND id_member != {int:from}',
-				array(
+				[
 					'to_members' => $to_list,
 					'from' => $from['id'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$to_names[] = Utils::htmlspecialcharsDecode($row['real_name']);
 			}
 			Db::$db->free_result($request);
 		}
 
-		$replacements = array(
+		$replacements = [
 			'SUBJECT' => $subject,
 			'MESSAGE' => $message,
 			'SENDER' => Utils::htmlspecialcharsDecode($from['name']),
 			'READLINK' => Config::$scripturl . '?action=pm;pmsg=' . $id_pm . '#msg' . $id_pm,
 			'REPLYLINK' => Config::$scripturl . '?action=pm;sa=send;f=inbox;pmsg=' . $id_pm . ';quote;u=' . $from['id'],
 			'TOLIST' => implode(', ', $to_names),
-		);
+		];
 
 		$email_template = 'new_pm' . (empty(Config::$modSettings['disallow_sendBody']) ? '_body' : '') . (!empty($to_names) ? '_tolist' : '');
 
-		$notification_texts = array();
+		$notification_texts = [];
 
-		foreach ($notifications as $lang => $notification_list)
-		{
+		foreach ($notifications as $lang => $notification_list) {
 			// Censor and parse BBC in the receiver's language. Only do each language once.
-			if (empty($notification_texts[$lang]))
-			{
-				if ($lang != User::$me->language)
+			if (empty($notification_texts[$lang])) {
+				if ($lang != User::$me->language) {
 					Lang::load('index+Modifications', $lang, false);
+				}
 
 				$notification_texts[$lang]['subject'] = $subject;
 
 				Lang::censorText($notification_texts[$lang]['subject']);
 
-				if (empty(Config::$modSettings['disallow_sendBody']))
-				{
+				if (empty(Config::$modSettings['disallow_sendBody'])) {
 					$notification_texts[$lang]['body'] = $message;
 
 					Lang::censorText($notification_texts[$lang]['body']);
 
-					$notification_texts[$lang]['body'] = trim(Utils::htmlspecialcharsDecode(strip_tags(strtr(BBCodeParser::load()->parse(Utils::htmlspecialchars($notification_texts[$lang]['body']), false), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']')))));
-				}
-				else
-				{
+					$notification_texts[$lang]['body'] = trim(Utils::htmlspecialcharsDecode(strip_tags(strtr(BBCodeParser::load()->parse(Utils::htmlspecialchars($notification_texts[$lang]['body']), false), ['<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']']))));
+				} else {
 					$notification_texts[$lang]['body'] = '';
 				}
 
-
-				if ($lang != User::$me->language)
+				if ($lang != User::$me->language) {
 					Lang::load('index+Modifications', User::$me->language, false);
+				}
 			}
 
 			$replacements['SUBJECT'] = $notification_texts[$lang]['subject'];
@@ -1633,21 +1564,20 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 		}
 
 		// Integrated After PMs
-		IntegrationHook::call('integrate_personal_message_after', array(&$id_pm, &$log, &$recipients, &$from, &$subject, &$message));
+		IntegrationHook::call('integrate_personal_message_after', [&$id_pm, &$log, &$recipients, &$from, &$subject, &$message]);
 
 		// Back to what we were on before!
 		Lang::load('index+PersonalMessage');
 
 		// Add one to their unread and read message counts.
-		foreach ($all_to as $k => $id)
-		{
-			if (isset($deletes[$id]))
+		foreach ($all_to as $k => $id) {
+			if (isset($deletes[$id])) {
 				unset($all_to[$k]);
+			}
 		}
 
-		if (!empty($all_to))
-		{
-			User::updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+		if (!empty($all_to)) {
+			User::updateMemberData($all_to, ['instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1]);
 		}
 
 		return $log;
@@ -1662,182 +1592,177 @@ public static function send($recipients, $subject, $message, $store_outbox = fal
 	 */
 	public static function delete($personal_messages, $folder = null, $owner = null): void
 	{
-		if ($owner === null)
-		{
-			$owner = array(User::$me->id);
-		}
-		elseif (empty($owner))
-		{
+		if ($owner === null) {
+			$owner = [User::$me->id];
+		} elseif (empty($owner)) {
 			return;
-		}
-		elseif (!is_array($owner))
-		{
-			$owner = array($owner);
+		} elseif (!is_array($owner)) {
+			$owner = [$owner];
 		}
 
-		if ($personal_messages !== null)
-		{
-			if (empty($personal_messages) || !is_array($personal_messages))
+		if ($personal_messages !== null) {
+			if (empty($personal_messages) || !is_array($personal_messages)) {
 				return;
+			}
 
-			foreach ($personal_messages as $index => $delete_id)
+			foreach ($personal_messages as $index => $delete_id) {
 				$personal_messages[$index] = (int) $delete_id;
+			}
 
 			$where = '
 					AND id_pm IN ({array_int:pm_list})';
-		}
-		else
-		{
+		} else {
 			$where = '';
 		}
 
-		if ($folder == 'sent' || $folder === null)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}personal_messages
+		if ($folder == 'sent' || $folder === null) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}personal_messages
 				SET deleted_by_sender = {int:is_deleted}
 				WHERE id_member_from IN ({array_int:member_list})
 					AND deleted_by_sender = {int:not_deleted}' . $where,
-				array(
+				[
 					'member_list' => $owner,
 					'is_deleted' => 1,
 					'not_deleted' => 0,
-					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : array(),
-				)
+					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : [],
+				],
 			);
 		}
 
-		if ($folder != 'sent' || $folder === null)
-		{
+		if ($folder != 'sent' || $folder === null) {
 			// Calculate the number of messages each member's gonna lose...
-			$request = Db::$db->query('', '
-				SELECT id_member, COUNT(*) AS num_deleted_messages, CASE WHEN is_read & 1 >= 1 THEN 1 ELSE 0 END AS is_read
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, COUNT(*) AS num_deleted_messages, CASE WHEN is_read & 1 >= 1 THEN 1 ELSE 0 END AS is_read
 				FROM {db_prefix}pm_recipients
 				WHERE id_member IN ({array_int:member_list})
 					AND deleted = {int:not_deleted}' . $where . '
 				GROUP BY id_member, is_read',
-				array(
+				[
 					'member_list' => $owner,
 					'not_deleted' => 0,
-					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : array(),
-				)
+					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : [],
+				],
 			);
+
 			// ...And update the statistics accordingly - now including unread messages!.
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if ($row['is_read'])
-				{
-					User::updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
-				}
-				else
-				{
-					User::updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if ($row['is_read']) {
+					User::updateMemberData($row['id_member'], ['instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']]);
+				} else {
+					User::updateMemberData($row['id_member'], ['instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']]);
 				}
 
 				// If this is the current member we need to make their message count correct.
-				if (User::$me->id == $row['id_member'])
-				{
+				if (User::$me->id == $row['id_member']) {
 					User::$me->messages -= $row['num_deleted_messages'];
 
-					if (!($row['is_read']))
+					if (!($row['is_read'])) {
 						User::$me->unread_messages -= $row['num_deleted_messages'];
+					}
 				}
 			}
 			Db::$db->free_result($request);
 
 			// Do the actual deletion.
-			Db::$db->query('', '
-				UPDATE {db_prefix}pm_recipients
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}pm_recipients
 				SET deleted = {int:is_deleted}
 				WHERE id_member IN ({array_int:member_list})
 					AND deleted = {int:not_deleted}' . $where,
-				array(
+				[
 					'member_list' => $owner,
 					'is_deleted' => 1,
 					'not_deleted' => 0,
-					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : array(),
-				)
+					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : [],
+				],
 			);
 
-			$labels = array();
+			$labels = [];
 
 			// Get any labels that the owner may have applied to this PM
 			// The join is here to ensure we only get labels applied by the specified member(s)
-			$get_labels = Db::$db->query('', '
-				SELECT pml.id_label
+			$get_labels = Db::$db->query(
+				'',
+				'SELECT pml.id_label
 				FROM {db_prefix}pm_labels AS l
 					INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_label = l.id_label)
 				WHERE l.id_member IN ({array_int:member_list})' . $where,
-				array(
+				[
 					'member_list' => $owner,
-					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : array(),
-				)
+					'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : [],
+				],
 			);
 
-			while ($row = Db::$db->fetch_assoc($get_labels))
-			{
+			while ($row = Db::$db->fetch_assoc($get_labels)) {
 				$labels[] = $row['id_label'];
 			}
 
 			Db::$db->free_result($get_labels);
 
-			if (!empty($labels))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}pm_labeled_messages
+			if (!empty($labels)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}pm_labeled_messages
 					WHERE id_label IN ({array_int:labels})' . $where,
-					array(
+					[
 						'labels' => $labels,
-						'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : array(),
-					)
+						'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : [],
+					],
 				);
 			}
 		}
 
 		// If sender and recipients all have deleted their message, it can be removed.
-		$remove_pms = array();
-		$request = Db::$db->query('', '
-			SELECT pm.id_pm AS sender, pmr.id_pm
+		$remove_pms = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT pm.id_pm AS sender, pmr.id_pm
 			FROM {db_prefix}personal_messages AS pm
 				LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pmr.id_pm = pm.id_pm AND pmr.deleted = {int:not_deleted})
 			WHERE pm.deleted_by_sender = {int:is_deleted} AND pmr.id_pm is null
 				' . str_replace('id_pm', 'pm.id_pm', $where),
-			array(
+			[
 				'not_deleted' => 0,
 				'is_deleted' => 1,
-				'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : array(),
-			)
+				'pm_list' => $personal_messages !== null ? array_unique($personal_messages) : [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$remove_pms[] = $row['sender'];
 		}
 		Db::$db->free_result($request);
 
-		if (!empty($remove_pms))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}personal_messages
+		if (!empty($remove_pms)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}personal_messages
 				WHERE id_pm IN ({array_int:pm_list})',
-				array(
+				[
 					'pm_list' => $remove_pms,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}pm_recipients
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}pm_recipients
 				WHERE id_pm IN ({array_int:pm_list})',
-				array(
+				[
 					'pm_list' => $remove_pms,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}pm_labeled_messages
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}pm_labeled_messages
 				WHERE id_pm IN ({array_int:pm_list})',
-				array(
+				[
 					'pm_list' => $remove_pms,
-				)
+				],
 			);
 		}
 
@@ -1854,115 +1779,120 @@ public static function delete($personal_messages, $folder = null, $owner = null)
 	 */
 	public static function markRead($personal_messages = null, $label = null, $owner = null): void
 	{
-		if ($owner === null)
+		if ($owner === null) {
 			$owner = User::$me->id;
+		}
 
 		$in_inbox = '';
 
 		// Marking all messages with a specific label as read?
 		// If we know which PMs we're marking read, then we don't need label info
-		if ($personal_messages === null && $label !== null && $label != '-1')
-		{
-			$personal_messages = array();
+		if ($personal_messages === null && $label !== null && $label != '-1') {
+			$personal_messages = [];
 
-			$get_messages = Db::$db->query('', '
-				SELECT id_pm
+			$get_messages = Db::$db->query(
+				'',
+				'SELECT id_pm
 				FROM {db_prefix}pm_labeled_messages
 				WHERE id_label = {int:current_label}',
-				array(
+				[
 					'current_label' => $label,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($get_messages))
-			{
+
+			while ($row = Db::$db->fetch_assoc($get_messages)) {
 				$personal_messages[] = $row['id_pm'];
 			}
 			Db::$db->free_result($get_messages);
-		}
-		elseif ($label = '-1')
-		{
+		} elseif ($label = '-1') {
 			// Marking all PMs in your inbox read
 			$in_inbox = '
 				AND in_inbox = {int:in_inbox}';
 		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}pm_recipients
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}pm_recipients
 			SET is_read = is_read | 1
 			WHERE id_member = {int:id_member}
 				AND NOT (is_read & 1 >= 1)' . ($personal_messages !== null ? '
 				AND id_pm IN ({array_int:personal_messages})' : '') . $in_inbox,
-			array(
+			[
 				'personal_messages' => $personal_messages,
 				'id_member' => $owner,
 				'in_inbox' => 1,
-			)
+			],
 		);
 
 		// If something wasn't marked as read, get the number of unread messages remaining.
-		if (Db::$db->affected_rows() > 0)
-		{
-			if ($owner == User::$me->id)
-			{
-				foreach (Utils::$context['labels'] as $label)
+		if (Db::$db->affected_rows() > 0) {
+			if ($owner == User::$me->id) {
+				foreach (Utils::$context['labels'] as $label) {
 					Utils::$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+				}
 			}
 
 			$total_unread = 0;
-			$result = Db::$db->query('', '
-				SELECT id_pm, in_inbox, COUNT(*) AS num
+			$result = Db::$db->query(
+				'',
+				'SELECT id_pm, in_inbox, COUNT(*) AS num
 				FROM {db_prefix}pm_recipients
 				WHERE id_member = {int:id_member}
 					AND NOT (is_read & 1 >= 1)
 					AND deleted = {int:is_not_deleted}
 				GROUP BY id_pm, in_inbox',
-				array(
+				[
 					'id_member' => $owner,
 					'is_not_deleted' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$total_unread += $row['num'];
 
-				if ($owner != User::$me->id || empty($row['id_pm']))
+				if ($owner != User::$me->id || empty($row['id_pm'])) {
 					continue;
+				}
 
-				$this_labels = array();
+				$this_labels = [];
 
 				// Get all the labels
-				$result2 = Db::$db->query('', '
-					SELECT pml.id_label
+				$result2 = Db::$db->query(
+					'',
+					'SELECT pml.id_label
 					FROM {db_prefix}pm_labels AS l
 						INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_label = l.id_label)
 					WHERE l.id_member = {int:id_member}
 						AND pml.id_pm = {int:current_pm}',
-					array(
+					[
 						'id_member' => $owner,
 						'current_pm' => $row['id_pm'],
-					)
+					],
 				);
-				while ($row2 = Db::$db->fetch_assoc($result2))
-				{
+
+				while ($row2 = Db::$db->fetch_assoc($result2)) {
 					$this_labels[] = $row2['id_label'];
 				}
 				Db::$db->free_result($result2);
 
-				foreach ($this_labels as $this_label)
+				foreach ($this_labels as $this_label) {
 					Utils::$context['labels'][$this_label]['unread_messages'] += $row['num'];
+				}
 
-				if ($row['in_inbox'] == 1)
+				if ($row['in_inbox'] == 1) {
 					Utils::$context['labels'][-1]['unread_messages'] += $row['num'];
+				}
 			}
 			Db::$db->free_result($result);
 
 			// Need to store all this.
 			CacheApi::put('labelCounts:' . $owner, Utils::$context['labels'], 720);
-			User::updateMemberData($owner, array('unread_messages' => $total_unread));
+			User::updateMemberData($owner, ['unread_messages' => $total_unread]);
 
 			// If it was for the current member, reflect this in User::$me as well.
-			if ($owner == User::$me->id)
+			if ($owner == User::$me->id) {
 				User::$me->unread_messages = $total_unread;
+			}
 		}
 	}
 
@@ -1974,6 +1904,7 @@ public static function markRead($personal_messages = null, $label = null, $owner
 	public static function getLatest(): int
 	{
 		$latest = self::getRecent('pm.id_pm', true, 1);
+
 		return reset($latest);
 	}
 
@@ -1992,33 +1923,34 @@ public static function getLatest(): int
 	 */
 	public static function getRecent(string $sort = 'pm.id_pm', bool $descending = true, int $limit = 0, int $offset = 0): array
 	{
-		$paramskey = Utils::jsonEncode(array($sort, $descending, $limit, $offset));
+		$paramskey = Utils::jsonEncode([$sort, $descending, $limit, $offset]);
 
-		if (isset(self::$recent[$paramskey]))
+		if (isset(self::$recent[$paramskey])) {
 			return self::$recent[$paramskey];
+		}
 
-		$joins = array();
+		$joins = [];
 
-		if ($sort === 'COALESCE(mem.real_name, \'\')')
-		{
+		if ($sort === 'COALESCE(mem.real_name, \'\')') {
 			$joins[] = 'LEFT JOIN {db_prefix}pm_recipients AS pmr ON (pm.id_pm = pmr.id_pm)';
 			$joins[] = 'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pm.id_member_from)';
 		}
 
-		$request = Db::$db->query('', '
-			SELECT pm.id_pm
+		$request = Db::$db->query(
+			'',
+			'SELECT pm.id_pm
 			FROM {db_prefix}personal_messages AS pm' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . '
 			WHERE pm.id_member_from = {int:me}
 				AND pm.deleted_by_sender = 0
 			ORDER BY ' . $sort . ($descending ? ' DESC' : ' ASC') . (!empty($limit) ? '
 			LIMIT ' . $offset . ', ' . $limit : ''),
-			array(
+			[
 				'me' => User::$me->id,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$recent[$paramskey][] = $row['id_pm'];
 		}
 		Db::$db->free_result($request);
@@ -2033,30 +1965,28 @@ public static function countSent(int $boundary = 0, bool $greater_than = false):
 	{
 		$num = 0;
 
-		$selects = array(
+		$selects = [
 			'COUNT(*)',
-		);
+		];
 
-		$joins = array();
+		$joins = [];
 
-		$where = array(
+		$where = [
 			'pm.id_member_from = {int:me}',
 			'pm.deleted_by_sender = {int:not_deleted}',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'me' => User::$me->id,
 			'not_deleted' => 0,
-		);
+		];
 
-		if (!empty($boundary))
-		{
+		if (!empty($boundary)) {
 			$where[] = 'pmr.id_pm ' . ($greater_than ? '>' : '<') . ' {int:boundary}';
 			$params['boundary'] = $boundary;
 		}
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$num += reset($row);
 		}
 
@@ -2070,48 +2000,45 @@ public static function countSent(int $boundary = 0, bool $greater_than = false):
 	 * @param array $named_recipients Names of recipients.
 	 * @param array $recipient_ids IDs of recipients.
 	 */
-	public static function reportErrors(array $error_types, array $named_recipients, array $recipient_ids = array()): void
+	public static function reportErrors(array $error_types, array $named_recipients, array $recipient_ids = []): void
 	{
-		if (!isset($_REQUEST['xml']))
-		{
+		if (!isset($_REQUEST['xml'])) {
 			Menu::$loaded['pm']['current_area'] = 'send';
 			Utils::$context['sub_template'] = 'send';
-			Theme::loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
-			Theme::loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-		}
-		else
-		{
+			Theme::loadJavaScriptFile('PersonalMessage.js', ['defer' => false, 'minimize' => true], 'smf_pms');
+			Theme::loadJavaScriptFile('suggest.js', ['defer' => false, 'minimize' => true], 'smf_suggest');
+		} else {
 			Utils::$context['sub_template'] = 'pm';
 		}
 
 		Utils::$context['page_title'] = Lang::$txt['send_message'];
 
 		// Got some known members?
-		Utils::$context['recipients'] = array(
-			'to' => array(),
-			'bcc' => array(),
-		);
+		Utils::$context['recipients'] = [
+			'to' => [],
+			'bcc' => [],
+		];
 
-		if (!empty($recipient_ids['to']) || !empty($recipient_ids['bcc']))
-		{
+		if (!empty($recipient_ids['to']) || !empty($recipient_ids['bcc'])) {
 			$allRecipients = array_merge($recipient_ids['to'], $recipient_ids['bcc']);
 
-			$request = Db::$db->query('', '
-				SELECT id_member, real_name
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, real_name
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:member_list})',
-				array(
+				[
 					'member_list' => $allRecipients,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$recipientType = in_array($row['id_member'], $recipient_ids['bcc']) ? 'bcc' : 'to';
 
-				Utils::$context['recipients'][$recipientType][] = array(
+				Utils::$context['recipients'][$recipientType][] = [
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
 		}
@@ -2119,16 +2046,16 @@ public static function reportErrors(array $error_types, array $named_recipients,
 		// Set everything up like before....
 		Utils::$context['subject'] = isset($_REQUEST['subject']) ? Utils::htmlspecialchars($_REQUEST['subject']) : '';
 
-		Utils::$context['message'] = isset($_REQUEST['message']) ? str_replace(array('  '), array('&nbsp; '), Utils::htmlspecialchars($_REQUEST['message'])) : '';
+		Utils::$context['message'] = isset($_REQUEST['message']) ? str_replace(['  '], ['&nbsp; '], Utils::htmlspecialchars($_REQUEST['message'])) : '';
 
 		Utils::$context['reply'] = !empty($_REQUEST['replied_to']);
 
-		if (Utils::$context['reply'])
-		{
+		if (Utils::$context['reply']) {
 			$_REQUEST['replied_to'] = (int) $_REQUEST['replied_to'];
 
-			$request = Db::$db->query('', '
-				SELECT
+			$request = Db::$db->query(
+				'',
+				'SELECT
 					pm.id_pm, CASE WHEN pm.id_pm_head = {int:no_id_pm_head} THEN pm.id_pm ELSE pm.id_pm_head END AS pm_head,
 					pm.body, pm.subject, pm.msgtime, mem.member_name, COALESCE(mem.id_member, 0) AS id_member,
 					COALESCE(mem.real_name, pm.from_name) AS real_name
@@ -2139,20 +2066,17 @@ public static function reportErrors(array $error_types, array $named_recipients,
 					AND pm.id_member_from = {int:me}' : '
 					AND pmr.id_member = {int:me}') . '
 				LIMIT 1',
-				array(
+				[
 					'me' => User::$me->id,
 					'no_id_pm_head' => 0,
 					'replied_to' => $_REQUEST['replied_to'],
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) == 0)
-			{
-				if (!isset($_REQUEST['xml']))
-				{
+
+			if (Db::$db->num_rows($request) == 0) {
+				if (!isset($_REQUEST['xml'])) {
 					ErrorHandler::fatalLang('pm_not_yours', false);
-				}
-				else
-				{
+				} else {
 					$error_types[] = 'pm_not_yours';
 				}
 			}
@@ -2162,48 +2086,45 @@ public static function reportErrors(array $error_types, array $named_recipients,
 			Lang::censorText($row_quoted['subject']);
 			Lang::censorText($row_quoted['body']);
 
-			Utils::$context['quoted_message'] = array(
+			Utils::$context['quoted_message'] = [
 				'id' => $row_quoted['id_pm'],
 				'pm_head' => $row_quoted['pm_head'],
-				'member' => array(
+				'member' => [
 					'name' => $row_quoted['real_name'],
 					'username' => $row_quoted['member_name'],
 					'id' => $row_quoted['id_member'],
 					'href' => !empty($row_quoted['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row_quoted['id_member'] : '',
 					'link' => !empty($row_quoted['id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row_quoted['id_member'] . '">' . $row_quoted['real_name'] . '</a>' : $row_quoted['real_name'],
-				),
+				],
 				'subject' => $row_quoted['subject'],
 				'time' => Time::create('@' . $row_quoted['msgtime'])->format(),
 				'timestamp' => $row_quoted['msgtime'],
 				'body' => BBCodeParser::load()->parse($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']),
-			);
+			];
 		}
 
 		// Build the link tree....
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=send',
-			'name' => Lang::$txt['new_message']
-		);
+			'name' => Lang::$txt['new_message'],
+		];
 
 		// Set each of the errors for the template.
 		Lang::load('Errors');
 
 		Utils::$context['error_type'] = 'minor';
 
-		Utils::$context['post_error'] = array(
-			'messages' => array(),
+		Utils::$context['post_error'] = [
+			'messages' => [],
 			// @todo error handling: maybe fatal errors can be error_type => serious
 			'error_type' => '',
-		);
+		];
 
-		foreach ($error_types as $error_type)
-		{
+		foreach ($error_types as $error_type) {
 			Utils::$context['post_error'][$error_type] = true;
 
-			if (isset(Lang::$txt['error_' . $error_type]))
-			{
-				if ($error_type == 'long_message')
-				{
+			if (isset(Lang::$txt['error_' . $error_type])) {
+				if ($error_type == 'long_message') {
 					Lang::$txt['error_' . $error_type] = sprintf(Lang::$txt['error_' . $error_type], Config::$modSettings['max_messageLength']);
 				}
 
@@ -2211,29 +2132,29 @@ public static function reportErrors(array $error_types, array $named_recipients,
 			}
 
 			// If it's not a minor error flag it as such.
-			if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject')))
-			{
+			if (!in_array($error_type, ['new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'])) {
 				Utils::$context['error_type'] = 'serious';
 			}
 		}
 
 		// Create it...
-		new Editor(array(
+		new Editor([
 			'id' => 'message',
 			'value' => Utils::$context['message'],
 			'width' => '90%',
 			'height' => '175px',
-			'labels' => array(
+			'labels' => [
 				'post_button' => Lang::$txt['send_message'],
-			),
+			],
 			'preview_type' => Editor::PREVIEW_XML,
-		));
+		]);
 
 		// Check whether we need to show the code again.
 		Utils::$context['require_verification'] = !User::$me->is_admin && !empty(Config::$modSettings['pm_posts_verification']) && User::$me->posts < Config::$modSettings['pm_posts_verification'];
 
-		if (Utils::$context['require_verification'] && !isset($_REQUEST['xml']))
-			$verifier = new Verifier(array('id' => 'pm'));
+		if (Utils::$context['require_verification'] && !isset($_REQUEST['xml'])) {
+			$verifier = new Verifier(['id' => 'pm']);
+		}
 
 		Utils::$context['to_value'] = empty($named_recipients['to']) ? '' : '&quot;' . implode('&quot;, &quot;', $named_recipients['to']) . '&quot;';
 
@@ -2259,14 +2180,17 @@ public static function reportErrors(array $error_types, array $named_recipients,
 	 */
 	public static function isAccessible($pmID, $folders = 'both'): bool
 	{
-		if ($folders === 'in_or_outbox')
+		if ($folders === 'in_or_outbox') {
 			$folders = 'both';
+		}
 
-		if ($folders === 'outbox')
+		if ($folders === 'outbox') {
 			$folders = 'sent';
+		}
 
-		if (!isset(self::$loaded[$pmID]))
+		if (!isset(self::$loaded[$pmID])) {
 			self::load($pmID);
+		}
 
 		return self::$loaded[$pmID]->canAccess($folders);
 	}
@@ -2295,10 +2219,11 @@ public static function isAccessible($pmID, $folders = 'both'): bool
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), array $group = array(), int|string $limit = 0)
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
 	{
-		self::$messages_request = Db::$db->query('', '
-			SELECT
+		self::$messages_request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $selects) . '
 			FROM {db_prefix}personal_messages AS pm' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
@@ -2306,10 +2231,10 @@ protected static function queryData(array $selects, array $params = array(), arr
 			GROUP BY ' . implode(', ', $group)) . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . (empty($limit) ? '' : '
 			LIMIT ' . $limit),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc(self::$messages_request))
-		{
+
+		while ($row = Db::$db->fetch_assoc(self::$messages_request)) {
 			yield $row;
 		}
 		Db::$db->free_result(self::$messages_request);
@@ -2317,7 +2242,8 @@ protected static function queryData(array $selects, array $params = array(), arr
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\PM::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\PM::exportStatic')) {
 	PM::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PersonalMessage/Popup.php b/Sources/PersonalMessage/Popup.php
index 759da17548..22b10cbc04 100644
--- a/Sources/PersonalMessage/Popup.php
+++ b/Sources/PersonalMessage/Popup.php
@@ -32,14 +32,15 @@ public function __construct()
 	{
 		Lang::load('PersonalMessage');
 
-		if (!isset($_REQUEST['xml']))
+		if (!isset($_REQUEST['xml'])) {
 			Theme::loadTemplate('PersonalMessage');
+		}
 
 		// We do not want to output debug information here.
 		Config::$db_show_debug = false;
 
 		// We only want to output our little layer here.
-		Utils::$context['template_layers'] = array();
+		Utils::$context['template_layers'] = [];
 		Utils::$context['sub_template'] = 'pm_popup';
 
 		Utils::$context['can_send_pm'] = User::$me->allowedTo('pm_send');
@@ -52,25 +53,23 @@ public function __construct()
 	public function show(): void
 	{
 		// So are we loading stuff?
-		$pms = array_map(fn($unread) => $unread->id, Received::loadUnread());
+		$pms = array_map(fn ($unread) => $unread->id, Received::loadUnread());
 
-		if (!empty($pms))
-		{
+		if (!empty($pms)) {
 			// Just quickly, it's possible that the number of PMs can get out of sync.
 			$count_unread = count($pms);
 
-			if ($count_unread != User::$me->unread_messages)
-			{
-				User::updateMemberData(User::$me->id, array('unread_messages' => $count_unread));
+			if ($count_unread != User::$me->unread_messages) {
+				User::updateMemberData(User::$me->id, ['unread_messages' => $count_unread]);
 				User::$me->unread_messages = count($pms);
 			}
 
 			// Now, actually fetch me some PMs.
-			foreach (PM::load($pms, false) as $pm)
-			{
+			foreach (PM::load($pms, false) as $pm) {
 				// Make sure we track the senders. We have some work to do for them.
-				if (!empty($pm->member_from))
+				if (!empty($pm->member_from)) {
 					$senders[] = $pm->member_from;
+				}
 
 				$pm->replied_to_you = $pm->id != $pm->head;
 				$pm->time = Time::create('@' . $pm->msgtime)->format();
@@ -82,10 +81,8 @@ public function show(): void
 			User::load($senders);
 
 			// Having loaded everyone, attach them to the PMs.
-			foreach (Utils::$context['unread_pms'] as $id => $pm)
-			{
-				if (!empty(User::$loaded[$pm->member_from]))
-				{
+			foreach (Utils::$context['unread_pms'] as $id => $pm) {
+				if (!empty(User::$loaded[$pm->member_from])) {
 					Utils::$context['unread_pms'][$id]->member = User::$loaded[$pm->member_from]->format();
 				}
 			}
diff --git a/Sources/PersonalMessage/Received.php b/Sources/PersonalMessage/Received.php
index 0ab639b25e..7f20c3b537 100644
--- a/Sources/PersonalMessage/Received.php
+++ b/Sources/PersonalMessage/Received.php
@@ -14,12 +14,10 @@
 namespace SMF\PersonalMessage;
 
 use SMF\ArrayAccessHelper;
-
-use SMF\Lang;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class represents the received copy of a personal message in a member's
@@ -32,7 +30,7 @@
  * misleading.
  */
 class Received implements \ArrayAccess
-{  
+{
 	use ArrayAccessHelper;
 
 	/*******************
@@ -110,7 +108,7 @@ class Received implements \ArrayAccess
 	 *
 	 * Labels assigned to this PM by the recipent.
 	 */
-	public array $labels = array();
+	public array $labels = [];
 
 	/**************************
 	 * Public static properties
@@ -121,7 +119,7 @@ class Received implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -132,11 +130,11 @@ class Received implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_pm' => 'id',
 		'id_member' => 'member',
 		'real_name' => 'name',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -158,7 +156,7 @@ class Received implements \ArrayAccess
 	 * Received::getRecent() was called with. The values are lists of PM IDs
 	 * that match those parameters.
 	 */
-	protected static array $recent = array();
+	protected static array $recent = [];
 
 	/****************
 	 * Public methods
@@ -169,13 +167,14 @@ class Received implements \ArrayAccess
 	 *
 	 * @param array $props Properties to set for this message.
 	 */
-	public function __construct(array $props = array())
+	public function __construct(array $props = [])
 	{
 		$this->set($props);
 		$this->getLabels();
 
-		if (isset($this->id, $this->member))
+		if (isset($this->id, $this->member)) {
 			self::$loaded[$this->id][$this->member] = $this;
+		}
 	}
 
 	/**
@@ -187,14 +186,14 @@ public function addLabel(int $label_id): void
 	{
 		Label::load();
 
-		if (isset(Label::$loaded[$label_id]))
+		if (isset(Label::$loaded[$label_id])) {
 			$this->labels[] = $label_id;
+		}
 
 		// Some people want to remove the inbox label when adding a different label.
-		if (!empty(Theme::$current->options['pm_remove_inbox_label']) && $label_id !== -1)
-		{
+		if (!empty(Theme::$current->options['pm_remove_inbox_label']) && $label_id !== -1) {
 			$this->in_inbox = false;
-			$this->labels = array_diff($this->labels, array(-1));
+			$this->labels = array_diff($this->labels, [-1]);
 		}
 
 		$this->labels = array_unique($this->labels);
@@ -211,11 +210,10 @@ public function addLabel(int $label_id): void
 	 */
 	public function removeLabel(int $label_id): void
 	{
-		$this->labels = array_diff($this->labels, array($label_id));
+		$this->labels = array_diff($this->labels, [$label_id]);
 
 		// If it has no labels, put it back in the inbox.
-		if (empty($this->labels) || in_array(-1, $this->labels))
-		{
+		if (empty($this->labels) || in_array(-1, $this->labels)) {
 			$this->in_inbox = true;
 			$this->labels[] = -1;
 		}
@@ -236,11 +234,13 @@ public function save(): void
 
 		$this->$labels = array_map('intval', $this->$labels);
 
-		if (empty($this->labels) || in_array(-1, $this->labels))
+		if (empty($this->labels) || in_array(-1, $this->labels)) {
 			$this->in_inbox = true;
+		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}pm_recipients
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}pm_recipients
 			SET
 				id_member = {int:member},
 				bcc = {int:bcc},
@@ -249,7 +249,7 @@ public function save(): void
 				deleted = {int:deleted},
 				in_inbox = {int:in_inbox}
 			WHERE id_pm = {int:id}',
-			array(
+			[
 				'id' => (int) $this->id,
 				'member' => (int) $this->member,
 				'bcc' => (int) $this->bcc,
@@ -257,35 +257,36 @@ public function save(): void
 				'is_new' => (int) $this->is_new,
 				'deleted' => (int) $this->deleted,
 				'in_inbox' => (int) $this->in_inbox,
-			)
+			],
 		);
 
-		$labels = array_diff($this->labels, array(-1));
+		$labels = array_diff($this->labels, [-1]);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}pm_labeled_messages
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}pm_labeled_messages
 			WHERE id_pm = {int:current_pm}' . (empty($labels) ? '' : '
 				AND id_label NOT IN ({array_int:labels})'),
-			array(
+			[
 				'current_pm' => $this->id,
 				'labels' => $labels,
-			)
+			],
 		);
 
-		if (!empty($labels))
-		{
-			$inserts = array();
+		if (!empty($labels)) {
+			$inserts = [];
 
-			foreach ($labels as $label)
-				$inserts[] = array($this->id, $label);
+			foreach ($labels as $label) {
+				$inserts[] = [$this->id, $label];
+			}
 
-			Db::$db->insert('ignore',
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}pm_labeled_messages',
-				array('id_pm' => 'int', 'id_label' => 'int'),
+				['id_pm' => 'int', 'id_label' => 'int'],
 				$inserts,
-				array()
+				[],
 			);
-
 		}
 	}
 
@@ -299,13 +300,10 @@ public function __set(string $prop, $value): void
 	{
 		// This is a bitmap where the lowest bit is the read status and the
 		// second bit is the replied status.
-		if ($prop == 'is_read')
-		{
+		if ($prop == 'is_read') {
 			$this->unread = !($value & 0b01);
 			$this->replied = $value & 0b10;
-		}
-		else
-		{
+		} else {
 			$this->customPropertySet($prop, $value);
 		}
 	}
@@ -325,50 +323,51 @@ public function __set(string $prop, $value): void
 	 */
 	public static function loadByPm(int|array $ids): array
 	{
-		$loaded = array();
+		$loaded = [];
 
 		$ids = (array) $ids;
 
 		// Have we already loaded these?
-		foreach ($ids as $key => $id)
-		{
-			if (isset(self::$loaded[$id]))
-			{
-				foreach (self::$loaded[$id] as $received)
+		foreach ($ids as $key => $id) {
+			if (isset(self::$loaded[$id])) {
+				foreach (self::$loaded[$id] as $received) {
 					$loaded[$id] = $received;
+				}
 
 				unset($ids[$key]);
 			}
 		}
 
-		if (empty($ids))
-		{
+		if (empty($ids)) {
 			ksort($loaded);
+
 			return $loaded;
 		}
 
 		// We have new ones that we need to load.
-		$selects = array(
+		$selects = [
 			'pmr.*',
-			'COALESCE(mem.real_name, "") AS real_name'
-		);
+			'COALESCE(mem.real_name, "") AS real_name',
+		];
 
-		$joins = array(
+		$joins = [
 			'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pmr.id_member)',
-		);
+		];
 
-		$where = array(
+		$where = [
 			'pmr.id_pm IN ({array_int:ids})',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'ids' => $ids,
-		);
+		];
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$loaded[(int) $row['id_pm']] = new self($row);
+		}
 
 		ksort($loaded);
+
 		return $loaded;
 	}
 
@@ -377,28 +376,27 @@ public static function loadByPm(int|array $ids): array
 	 */
 	public static function loadUnread(): array
 	{
-		$loaded = array();
+		$loaded = [];
 
-		$selects = array(
+		$selects = [
 			'pmr.*',
-		);
+		];
 
-		$joins = array();
+		$joins = [];
 
-		$where = array(
+		$where = [
 			'pmr.id_member = {int:me}',
 			'pmr.is_read = {int:not_read}',
 			'pmr.deleted = {int:not_deleted}',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'me' => User::$me->id,
 			'not_read' => 0,
 			'not_deleted' => 0,
-		);
+		];
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$loaded[] = new self($row);
 		}
 
@@ -413,30 +411,31 @@ public static function loadUnread(): array
 	 */
 	public static function old(int $time): array
 	{
-		$ids = array();
+		$ids = [];
 
-		$selects = array(
+		$selects = [
 			'pmr.id_pm',
-		);
+		];
 
-		$joins = array(
+		$joins = [
 			'INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)',
-		);
+		];
 
-		$where = array(
+		$where = [
 			'pmr.id_member = {int:me}',
 			'pmr.deleted = {int:not_deleted}',
 			'pm.msgtime < {int:time}',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'me' => User::$me->id,
 			'not_deleted' => 0,
 			'time' => $time,
-		);
+		];
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$ids[] = $row['id_pm'];
+		}
 
 		return $loaded;
 	}
@@ -453,41 +452,36 @@ public static function count(int $label = -1, int $boundary = 0, bool $greater_t
 	{
 		$num = 0;
 
-		$selects = array(
+		$selects = [
 			'COUNT(*)',
-		);
+		];
 
-		$joins = array();
+		$joins = [];
 
-		$where = array(
+		$where = [
 			'pmr.id_member = {int:me}',
 			'pmr.deleted = {int:not_deleted}',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'me' => User::$me->id,
 			'not_deleted' => 0,
-		);
+		];
 
-		if ($label === -1)
-		{
+		if ($label === -1) {
 			$where[] = 'pmr.in_inbox = 1';
-		}
-		else
-		{
+		} else {
 			$joins[] = 'INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
 			$where[] = 'pl.id_label = {int:label}';
 			$params['label'] = $label;
 		}
 
-		if (!empty($boundary))
-		{
+		if (!empty($boundary)) {
 			$where[] = 'pmr.id_pm ' . ($greater_than ? '>' : '<') . ' {int:boundary}';
 			$params['boundary'] = $boundary;
 		}
 
-		foreach (self::queryData($selects, $params, $joins, $where) as $row)
-		{
+		foreach (self::queryData($selects, $params, $joins, $where) as $row) {
 			$num += reset($row);
 		}
 
@@ -503,6 +497,7 @@ public static function count(int $label = -1, int $boundary = 0, bool $greater_t
 	public static function getLatest(int $label = -1): int
 	{
 		$latest = self::getRecent($label, 'pmr.id_pm', true, 1);
+
 		return reset($latest);
 	}
 
@@ -521,53 +516,52 @@ public static function getLatest(int $label = -1): int
 	 *    Default: 0.
 	 * @return array The IDs of the most recent PMs.
 	 */
-	public static function getRecent(int $label = -1, string $sort = 'pmr.id_pm', bool $descending = true, int $limit = 0, int $offset = 0,): array
+	public static function getRecent(int $label = -1, string $sort = 'pmr.id_pm', bool $descending = true, int $limit = 0, int $offset = 0): array
 	{
-		$paramskey = Utils::jsonEncode(array($label, $sort, $descending, $limit, $offset));
+		$paramskey = Utils::jsonEncode([$label, $sort, $descending, $limit, $offset]);
 
-		if (isset(self::$recent[$paramskey]))
+		if (isset(self::$recent[$paramskey])) {
 			return self::$recent[$paramskey];
+		}
 
-		$joins = array();
+		$joins = [];
 
-		$where = array(
+		$where = [
 			'pmr.id_member = {int:me}',
 			'pmr.deleted = 0',
-		);
+		];
 
-		$params = array(
+		$params = [
 			'me' => User::$me->id,
-		);
+		];
 
-		if ($label === -1)
-		{
+		if ($label === -1) {
 			$where[] = 'pmr.in_inbox = 1';
 		}
 		// If you're viewing a label, it's still the inbox, but filtered
 		// to only show the PMs that have that label.
-		else
-		{
+		else {
 			$joins[] = 'INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
 			$where[] = 'pl.id_label = {int:label}';
 			$params['label'] = $label;
 		}
 
-		if ($sort == 'COALESCE(mem.real_name, \'\')')
-		{
+		if ($sort == 'COALESCE(mem.real_name, \'\')') {
 			$joins[] = 'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = pmr.id_member)';
 		}
 
-		$request = Db::$db->query('', '
-			SELECT pmr.id_pm
+		$request = Db::$db->query(
+			'',
+			'SELECT pmr.id_pm
 			FROM {db_prefix}pm_recipients AS pmr' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . '
 			WHERE (' . implode(') AND (', $where) . ')
 			ORDER BY ' . ($sort == 'pm.id_pm' ? 'pmr.id_pm' : $sort) . ($descending ? ' DESC' : ' ASC') . (!empty($limit) ? '
 			LIMIT ' . $offset . ', ' . $limit : ''),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$recent[$paramskey][] = $row['id_pm'];
 		}
 		Db::$db->free_result($request);
@@ -580,16 +574,17 @@ public static function getRecent(int $label = -1, string $sort = 'pmr.id_pm', bo
 	 */
 	public static function setNotNew(): void
 	{
-		User::updateMemberData(User::$me->id, array('new_pm' => 0));
+		User::updateMemberData(User::$me->id, ['new_pm' => 0]);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}pm_recipients
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}pm_recipients
 			SET is_new = {int:not_new}
 			WHERE id_member = {int:me}',
-			array(
+			[
 				'me' => User::$me->id,
 				'not_new' => 0,
-			)
+			],
 		);
 	}
 
@@ -604,17 +599,19 @@ public static function setNotNew(): void
 	 */
 	protected function getLabels(): void
 	{
-		if ($this->in_inbox)
+		if ($this->in_inbox) {
 			$this->labels[] = -1;
+		}
 
-		foreach (Label::load() as $label)
-		{
-			if (in_array($this->id, $label->pms))
+		foreach (Label::load() as $label) {
+			if (in_array($this->id, $label->pms)) {
 				$this->labels[] = $label->id;
+			}
 		}
 
-		if (empty($this->labels) || in_array(-1, $this->labels))
+		if (empty($this->labels) || in_array(-1, $this->labels)) {
 			$this->in_inbox = true;
+		}
 
 		sort($this->labels);
 	}
@@ -643,20 +640,21 @@ protected function getLabels(): void
 	 *
 	 * @return Generator<array> Iterating over the result gives database rows.
 	 */
-	protected static function queryData(array $selects, array $params = array(), array $joins = array(), array $where = array(), array $order = array(), array $group = array(), int|string $limit = 0)
+	protected static function queryData(array $selects, array $params = [], array $joins = [], array $where = [], array $order = [], array $group = [], int|string $limit = 0)
 	{
-		self::$messages_request = Db::$db->query('', '
-			SELECT
+		self::$messages_request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $selects) . '
 			FROM {db_prefix}pm_recipients AS pmr' . (empty($joins) ? '' : '
 				' . implode("\n\t\t\t\t", $joins)) . (empty($where) ? '' : '
 			WHERE (' . implode(') AND (', $where) . ')') . (empty($order) ? '' : '
 			ORDER BY ' . implode(', ', $order)) . (empty($group) ? '' : '
 			LIMIT ' . $limit),
-			$params
+			$params,
 		);
-		while ($row = Db::$db->fetch_assoc(self::$messages_request))
-		{
+
+		while ($row = Db::$db->fetch_assoc(self::$messages_request)) {
 			yield $row;
 		}
 		Db::$db->free_result(self::$messages_request);
diff --git a/Sources/PersonalMessage/Rule.php b/Sources/PersonalMessage/Rule.php
index 299363d37d..8650dc68cc 100644
--- a/Sources/PersonalMessage/Rule.php
+++ b/Sources/PersonalMessage/Rule.php
@@ -15,8 +15,8 @@
 
 use SMF\ArrayAccessHelper;
 use SMF\BackwardCompatibility;
-
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Group;
 use SMF\Lang;
@@ -24,26 +24,28 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Represents a sorting rule that can be applied to incoming personal messages.
  */
 class Rule implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'loadRules',
 			'apply' => 'applyRules',
-		),
-	);
+			'delete' => 'delete',
+			'manage' => 'manage',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -52,16 +54,16 @@ class Rule implements \ArrayAccess
 	/**
 	 * Whether a rule's criteria are combined using AND or OR logic.
 	 */
-	const RULE_AND = false;
-	const RULE_OR = true;
+	public const RULE_AND = false;
+	public const RULE_OR = true;
 
 	/**
 	 * Maximum number of criteria and actions allowed per rule.
 	 */
-	const LIMITS = array(
+	public const LIMITS = [
 		'criteria' => 10,
 		'actions' => 10,
-	);
+	];
 
 	/*******************
 	 * Public properties
@@ -93,14 +95,14 @@ class Rule implements \ArrayAccess
 	 *
 	 * This rule's criteria.
 	 */
-	public array $criteria = array();
+	public array $criteria = [];
 
 	/**
 	 * @var array
 	 *
 	 * Actions that this rule performs.
 	 */
-	public array $actions = array();
+	public array $actions = [];
 
 	/**
 	 * @var bool
@@ -126,20 +128,20 @@ class Rule implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var array
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_rule' => 'id',
 		'id_member' => 'member',
 		'rule_name' => 'name',
 		'delete_pm' => 'delete',
 		'is_or' => 'logic',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -150,15 +152,16 @@ class Rule implements \ArrayAccess
 	 *
 	 * @param array $props Properties to set for this rule.
 	 */
-	public function __construct(array $props = array())
+	public function __construct(array $props = [])
 	{
 		$this->set($props);
 
 		// Default to the current user.
 		$this->member = $this->member ?? User::$me->id;
 
-		if (!empty($this->id))
+		if (!empty($this->id)) {
 			self::$loaded[$this->id] = $this;
+		}
 	}
 
 	/**
@@ -166,42 +169,43 @@ public function __construct(array $props = array())
 	 */
 	public function save(): void
 	{
-		if (empty($this->name))
+		if (empty($this->name)) {
 			ErrorHandler::fatalLang('pm_rule_no_name', false);
+		}
 
-		if (empty($this->criteria) || (empty($this->actions) && !$this->delete))
+		if (empty($this->criteria) || (empty($this->actions) && !$this->delete)) {
 			ErrorHandler::fatalLang('pm_rule_no_criteria', false);
+		}
 
-		if (empty($this->id))
-		{
-			$this->id = Db::$db->insert('',
+		if (empty($this->id)) {
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}pm_rules',
-				array(
+				[
 					'id_member' => 'int',
 					'rule_name' => 'string',
 					'criteria' => 'string',
 					'actions' => 'string',
 					'delete_pm' => 'int',
 					'is_or' => 'int',
-				),
-				array(
+				],
+				[
 					$this->member,
 					$this->name,
 					Utils::jsonEncode($this->criteria),
 					Utils::jsonEncode($this->actions),
 					(int) $this->delete,
 					(int) $this->logic,
-				),
-				array('id_rule'),
-				1
+				],
+				['id_rule'],
+				1,
 			);
 
 			self::$loaded[$this->id] = $this;
-		}
-		else
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}pm_rules
+		} else {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}pm_rules
 				SET
 					rule_name = {string:rule_name},
 					criteria = {string:criteria},
@@ -210,7 +214,7 @@ public function save(): void
 					is_or = {int:is_or}
 				WHERE id_rule = {int:id_rule}
 					AND id_member = {int:current_member}',
-				array(
+				[
 					'id_rule' => $this->id,
 					'current_member' => $this->member,
 					'rule_name' => $this->name,
@@ -218,7 +222,7 @@ public function save(): void
 					'actions' => Utils::jsonEncode($this->actions),
 					'delete_pm' => (int) $this->delete,
 					'is_or' => (int) $this->logic,
-				)
+				],
 			);
 		}
 	}
@@ -234,33 +238,34 @@ public function save(): void
 	 */
 	public static function load(bool $reload = false): array
 	{
-		if (!empty(self::$loaded) && !$reload)
+		if (!empty(self::$loaded) && !$reload) {
 			return self::$loaded;
+		}
 
-		self::$loaded = array();
+		self::$loaded = [];
 		Utils::$context['rules'] = &self::$loaded;
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				id_rule, rule_name, criteria, actions, delete_pm, is_or
 			FROM {db_prefix}pm_rules
 			WHERE id_member = {int:me}',
-			array(
+			[
 				'me' => User::$me->id,
-			)
+			],
 		);
+
 		// Simply fill in the data!
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$row['criteria'] = Utils::jsonDecode($row['criteria'], true);
 			$row['actions'] = Utils::jsonDecode($row['actions'], true);
 
-			if ($row['delete_pm'])
-			{
-				$row['actions'][] = array(
+			if ($row['delete_pm']) {
+				$row['actions'][] = [
 					't' => 'del',
 					'v' => 1,
-				);
+				];
 			}
 
 			new self($row);
@@ -283,18 +288,20 @@ public static function apply(bool $all_messages = false): void
 		self::load();
 
 		// No rules?
-		if (empty(self::$loaded))
+		if (empty(self::$loaded)) {
 			return;
+		}
 
 		// Just unread ones?
 		$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
 
 		// @todo Apply all should have timeout protection!
 		// Get all the messages that match this.
-		$actions = array();
+		$actions = [];
 
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				pmr.id_pm, pm.id_member_from, pm.subject, pm.body, mem.id_group
 			FROM {db_prefix}pm_recipients AS pmr
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)
@@ -302,20 +309,18 @@ public static function apply(bool $all_messages = false): void
 			WHERE pmr.id_member = {int:me}
 				AND pmr.deleted = {int:not_deleted}
 				' . $ruleQuery,
-			array(
+			[
 				'me' => User::$me->id,
 				'not_deleted' => 0,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			foreach (self::$loaded as $rule)
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			foreach (self::$loaded as $rule) {
 				$match = false;
 
 				// Loop through all the criteria hoping to make a match.
-				foreach ($rule->criteria as $criterion)
-				{
+				foreach ($rule->criteria as $criterion) {
 					if (
 						(
 							$criterion['t'] == 'mid'
@@ -333,34 +338,27 @@ public static function apply(bool $all_messages = false): void
 							$criterion['t'] == 'msg'
 							&& strpos($row['body'], $criterion['v']) !== false
 						)
-					)
-					{
+					) {
 						$match = true;
 					}
 					// If all criteria must match but one criterion doesn't, then we stop!
-					elseif ($rule->logic == self::RULE_AND)
-					{
+					elseif ($rule->logic == self::RULE_AND) {
 						$match = false;
 						break;
 					}
 				}
 
 				// Criteria matched, so act on this message.
-				if ($match)
-				{
-					if ($rule->delete)
-					{
+				if ($match) {
+					if ($rule->delete) {
 						$actions['deletes'][] = $row['id_pm'];
-					}
-					else
-					{
-						foreach ($rule->actions as $ruleAction)
-						{
-							if ($ruleAction['t'] == 'lab')
-							{
+					} else {
+						foreach ($rule->actions as $ruleAction) {
+							if ($ruleAction['t'] == 'lab') {
 								// Get a collection started.
-								if (!isset($actions['labels'][$row['id_pm']]))
-									$actions['labels'][$row['id_pm']] = array();
+								if (!isset($actions['labels'][$row['id_pm']])) {
+									$actions['labels'][$row['id_pm']] = [];
+								}
 
 								$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
 							}
@@ -372,49 +370,50 @@ public static function apply(bool $all_messages = false): void
 		Db::$db->free_result($request);
 
 		// Deletes are easy!
-		if (!empty($actions['deletes']))
+		if (!empty($actions['deletes'])) {
 			PM::delete($actions['deletes']);
+		}
 
 		// Relabel?
-		if (!empty($actions['labels']))
-		{
-			foreach ($actions['labels'] as $pm => $labels)
-			{
+		if (!empty($actions['labels'])) {
+			foreach ($actions['labels'] as $pm => $labels) {
 				// Quickly check each label is valid!
-				$realLabels = array();
+				$realLabels = [];
 
-				foreach (Utils::$context['labels'] as $label)
-				{
-					if (in_array($label['id'], $labels))
+				foreach (Utils::$context['labels'] as $label) {
+					if (in_array($label['id'], $labels)) {
 						$realLabels[] = $label['id'];
+					}
 				}
 
-				if (!empty(Theme::$current->options['pm_remove_inbox_label']))
-				{
-					Db::$db->query('', '
-						UPDATE {db_prefix}pm_recipients
+				if (!empty(Theme::$current->options['pm_remove_inbox_label'])) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}pm_recipients
 						SET in_inbox = {int:in_inbox}
 						WHERE id_pm = {int:id_pm}
 							AND id_member = {int:me}',
-						array(
+						[
 							'in_inbox' => 0,
 							'id_pm' => $pm,
 							'me' => User::$me->id,
-						)
+						],
 					);
 				}
 
-				$inserts = array();
+				$inserts = [];
 
 				// Now we insert the label info
-				foreach ($realLabels as $a_label)
-					$inserts[] = array($pm, $a_label);
+				foreach ($realLabels as $a_label) {
+					$inserts[] = [$pm, $a_label];
+				}
 
-				Db::$db->insert('ignore',
+				Db::$db->insert(
+					'ignore',
 					'{db_prefix}pm_labeled_messages',
-					array('id_pm' => 'int', 'id_label' => 'int'),
+					['id_pm' => 'int', 'id_label' => 'int'],
 					$inserts,
-					array('id_pm', 'id_label')
+					['id_pm', 'id_label'],
 				);
 			}
 		}
@@ -429,21 +428,24 @@ public static function delete(array $ids): void
 	{
 		$ids = array_filter(array_map('intval', $ids));
 
-		if (empty($ids))
+		if (empty($ids)) {
 			return;
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}pm_rules
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}pm_rules
 			WHERE id_rule IN ({array_int:delete_list})
 				AND id_member = {int:me}',
-			array(
+			[
 				'me' => User::$me->id,
 				'delete_list' => $ids,
-			)
+			],
 		);
 
-		foreach ($ids as $id)
+		foreach ($ids as $id) {
 			unset(self::$loaded[$id]);
+		}
 	}
 
 	/**
@@ -455,10 +457,10 @@ public static function manage(): void
 		Utils::$context['rule_limiters'] = self::LIMITS;
 
 		// The link tree - gotta have this :o
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=manrules',
-			'name' => Lang::$txt['pm_manage_rules']
-		);
+			'name' => Lang::$txt['pm_manage_rules'],
+		];
 
 		Utils::$context['page_title'] = Lang::$txt['pm_manage_rules'];
 		Utils::$context['sub_template'] = 'rules';
@@ -467,22 +469,21 @@ public static function manage(): void
 		self::load();
 
 		// Likely to need all the groups!
-		Utils::$context['groups'] = array();
+		Utils::$context['groups'] = [];
 
 		$groups = Group::loadSimple();
-		Group::loadModeratorsBatch(array_map(fn($group) => $group->id, $groups));
+		Group::loadModeratorsBatch(array_map(fn ($group) => $group->id, $groups));
 
-		foreach ($groups as $group)
-		{
-			if ($group->hidden === Group::INVISIBLE && !$group->can_moderate)
+		foreach ($groups as $group) {
+			if ($group->hidden === Group::INVISIBLE && !$group->can_moderate) {
 				continue;
+			}
 
 			Utils::$context['groups'][$group->id] = $group->name;
 		}
 
 		// Applying all rules?
-		if (isset($_GET['apply']))
-		{
+		if (isset($_GET['apply'])) {
 			User::$me->checkSession('get');
 			Security::spamProtection('pm');
 
@@ -491,58 +492,53 @@ public static function manage(): void
 		}
 
 		// Editing a specific one?
-		if (isset($_GET['add']))
-		{
+		if (isset($_GET['add'])) {
 			Utils::$context['rid'] = isset($_GET['rid']) && isset(self::$loaded[$_GET['rid']]) ? (int) $_GET['rid'] : 0;
 
 			Utils::$context['sub_template'] = 'add_rule';
 
 			// Current rule information...
-			if (Utils::$context['rid'])
-			{
+			if (Utils::$context['rid']) {
 				$rule = self::$loaded[Utils::$context['rid']];
 				Utils::$context['rule'] = &$rule;
 
-				$members = array();
+				$members = [];
 
 				// Need to get member names!
-				foreach ($rule->criteria as $k => $criteria)
-				{
-					if ($criteria['t'] == 'mid' && !empty($criteria['v']))
+				foreach ($rule->criteria as $k => $criteria) {
+					if ($criteria['t'] == 'mid' && !empty($criteria['v'])) {
 						$members[(int) $criteria['v']] = $k;
+					}
 				}
 
-				if (!empty($members))
-				{
-					$request = Db::$db->query('', '
-						SELECT id_member, member_name
+				if (!empty($members)) {
+					$request = Db::$db->query(
+						'',
+						'SELECT id_member, member_name
 						FROM {db_prefix}members
 						WHERE id_member IN ({array_int:member_list})',
-						array(
+						[
 							'member_list' => array_keys($members),
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
+
+					while ($row = Db::$db->fetch_assoc($request)) {
 						$rule->criteria[$members[$row['id_member']]]['v'] = $row['member_name'];
 					}
 					Db::$db->free_result($request);
 				}
-			}
-			else
-			{
-				Utils::$context['rule'] = new self(array(
+			} else {
+				Utils::$context['rule'] = new self([
 					'id' => 0,
 					'name' => '',
-					'criteria' => array(),
-					'actions' => array(),
+					'criteria' => [],
+					'actions' => [],
 					'logic' => 'and',
-				));
+				]);
 			}
 		}
 		// Saving?
-		elseif (isset($_GET['save']))
-		{
+		elseif (isset($_GET['save'])) {
 			User::$me->checkSession();
 
 			$rid = isset($_GET['rid']) && isset(self::$loaded[$_GET['rid']]) ? (int) $_GET['rid'] : 0;
@@ -553,86 +549,80 @@ public static function manage(): void
 			$rule->name = Utils::htmlspecialchars(trim($_POST['rule_name']));
 
 			// Sanity check...
-			if (empty($_POST['ruletype']) || empty($_POST['acttype']))
+			if (empty($_POST['ruletype']) || empty($_POST['acttype'])) {
 				ErrorHandler::fatalLang('pm_rule_no_criteria', false);
+			}
 
 			// Let's do the criteria first - it's also hardest!
-			$rule->criteria = array();
+			$rule->criteria = [];
 			$criteriaCount = 0;
 
-			foreach ($_POST['ruletype'] as $ind => $type)
-			{
+			foreach ($_POST['ruletype'] as $ind => $type) {
 				// Check everything is here...
-				if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset(Utils::$context['groups'][$_POST['ruledefgroup'][$ind]])))
-				{
+				if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset(Utils::$context['groups'][$_POST['ruledefgroup'][$ind]]))) {
 					continue;
 				}
 
-				if ($type != 'bud' && !isset($_POST['ruledef'][$ind]))
+				if ($type != 'bud' && !isset($_POST['ruledef'][$ind])) {
 					continue;
+				}
 
 				// Too many criteria in this rule.
-				if ($criteriaCount++ >= self::LIMITS['criteria'])
+				if ($criteriaCount++ >= self::LIMITS['criteria']) {
 					break;
+				}
 
 				// Members need to be found.
-				if ($type == 'mid')
-				{
+				if ($type == 'mid') {
 					$name = trim($_POST['ruledef'][$ind]);
 
-					$request = Db::$db->query('', '
-						SELECT id_member
+					$request = Db::$db->query(
+						'',
+						'SELECT id_member
 						FROM {db_prefix}members
 						WHERE real_name = {string:member_name}
 							OR member_name = {string:member_name}',
-						array(
+						[
 							'member_name' => $name,
-						)
+						],
 					);
-					if (Db::$db->num_rows($request) == 0)
-					{
+
+					if (Db::$db->num_rows($request) == 0) {
 						Lang::load('Errors');
 						ErrorHandler::fatalLang('invalid_username', false);
 					}
 					list($memID) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
-					$rule->criteria[] = array(
+					$rule->criteria[] = [
 						't' => 'mid',
 						'v' => $memID,
-					);
-				}
-				elseif ($type == 'bud')
-				{
-					$rule->criteria[] = array(
+					];
+				} elseif ($type == 'bud') {
+					$rule->criteria[] = [
 						't' => 'bud',
 						'v' => 1,
-					);
-				}
-				elseif ($type == 'gid')
-				{
-					$rule->criteria[] = array(
+					];
+				} elseif ($type == 'gid') {
+					$rule->criteria[] = [
 						't' => 'gid',
 						'v' => (int) $_POST['ruledefgroup'][$ind],
-					);
-				}
-				elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '')
-				{
-					$rule->criteria[] = array(
+					];
+				} elseif (in_array($type, ['sub', 'msg']) && trim($_POST['ruledef'][$ind]) != '') {
+					$rule->criteria[] = [
 						't' => $type,
 						'v' => Utils::htmlspecialchars(trim($_POST['ruledef'][$ind])),
-					);
+					];
 				}
 			}
 
 			// Also do the actions!
-			$rule->actions = array();
+			$rule->actions = [];
 			$rule->delete = false;
 			$rule->logic = $_POST['rule_logic'] == 'or' ? true : false;
 			$actionCount = 0;
 
-			foreach ($_POST['acttype'] as $ind => $type)
-			{
+			foreach ($_POST['acttype'] as $ind => $type) {
 				// Picking a valid label?
 				if (
 					$type == 'lab'
@@ -642,26 +632,23 @@ public static function manage(): void
 						|| $_POST['labdef'][$ind] == ''
 						|| !isset(self::$labels[$_POST['labdef'][$ind]])
 					)
-				)
-				{
+				) {
 					continue;
 				}
 
 				// Too many actions in this rule.
-				if ($actionCount++ >= self::LIMITS['actions'])
+				if ($actionCount++ >= self::LIMITS['actions']) {
 					break;
+				}
 
 				// Record what we're doing.
-				if ($type == 'del')
-				{
+				if ($type == 'del') {
 					$rule->delete = true;
-				}
-				elseif ($type == 'lab')
-				{
-					$rule->actions[] = array(
+				} elseif ($type == 'lab') {
+					$rule->actions[] = [
 						't' => 'lab',
 						'v' => (int) $_POST['labdef'][$ind],
-					);
+					];
 				}
 			}
 
@@ -670,8 +657,7 @@ public static function manage(): void
 			Utils::redirectexit('action=pm;sa=manrules');
 		}
 		// Deleting?
-		elseif (isset($_POST['delselected']) && !empty($_POST['delrule']))
-		{
+		elseif (isset($_POST['delselected']) && !empty($_POST['delrule'])) {
 			User::$me->checkSession();
 
 			self::delete(array_keys($_POST['delrule']));
@@ -679,11 +665,11 @@ public static function manage(): void
 			Utils::redirectexit('action=pm;sa=manrules');
 		}
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Rule::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Rule::exportStatic')) {
 	Rule::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PersonalMessage/Search.php b/Sources/PersonalMessage/Search.php
index 15edeb8f20..7db2d838aa 100644
--- a/Sources/PersonalMessage/Search.php
+++ b/Sources/PersonalMessage/Search.php
@@ -13,18 +13,17 @@
 
 namespace SMF\PersonalMessage;
 
-use SMF\Category;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Menu;
 use SMF\PageIndex;
+use SMF\Search\SearchApi;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
-use SMF\Search\SearchApi;
 
 /**
  * Shows the search form.
@@ -56,7 +55,7 @@ class Search
 	 *
 	 * The user-specified search parameters.
 	 */
-	public array $params = array();
+	public array $params = [];
 
 	/**
 	 * @var string
@@ -86,9 +85,9 @@ class Search
 	 *
 	 * @todo Add more here?
 	 */
-	public array $sort_columns = array(
+	public array $sort_columns = [
 		'pm.id_pm',
-	);
+	];
 
 	/**
 	 * @var int
@@ -107,7 +106,7 @@ class Search
 	 * Words to highlight in search results.
 	 * This is static for the sake of easy access by SearchResult.
 	 */
-	public static array $to_mark = array();
+	public static array $to_mark = [];
 
 	/*********************
 	 * Internal properties
@@ -118,7 +117,7 @@ class Search
 	 *
 	 * Collection of runtime parameters for performing the search.
 	 */
-	protected array $searchq_parameters = array();
+	protected array $searchq_parameters = [];
 
 	/**
 	 * @var string
@@ -184,11 +183,10 @@ public function __construct(int $inbox)
 
 		Utils::$context['page_title'] = Lang::$txt['pm_search_title'];
 		Menu::$loaded['pm']['current_area'] = 'search';
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=pm;sa=search',
 			'name' => Lang::$txt['pm_search_bar_title'],
-		);
-
+		];
 	}
 
 	/**
@@ -198,41 +196,38 @@ public function showForm(): void
 	{
 		$this->setParams();
 
-		if (isset($_REQUEST['search']))
-		{
+		if (isset($_REQUEST['search'])) {
 			$this->params['search'] = Utils::htmlspecialcharsDecode($_REQUEST['search']);
 		}
 
 		$this->setContextualParams();
 
 		// Create the array of labels to be searched.
-		Utils::$context['search_labels'] = array();
+		Utils::$context['search_labels'] = [];
 
-		$searchedLabels = isset($this->params['labels']) && $this->params['labels'] != '' ? explode(',', $this->params['labels']) : array();
+		$searchedLabels = isset($this->params['labels']) && $this->params['labels'] != '' ? explode(',', $this->params['labels']) : [];
 
-		foreach (Label::$loaded as $label)
-		{
-			Utils::$context['search_labels'][] = array(
+		foreach (Label::$loaded as $label) {
+			Utils::$context['search_labels'][] = [
 				'id' => $label['id'],
 				'name' => $label['name'],
 				'checked' => !empty($searchedLabels) ? in_array($label['id'], $searchedLabels) : true,
-			);
+			];
 		}
 
 		// Are all the labels checked?
 		Utils::$context['check_all'] = empty($searchedLabels) || count(Utils::$context['search_labels']) == count($searchedLabels);
 
 		// Load the error text strings if there were errors in the search.
-		if (!empty(Utils::$context['search_errors']))
-		{
+		if (!empty(Utils::$context['search_errors'])) {
 			Lang::load('Errors');
 
-			Utils::$context['search_errors']['messages'] = array();
+			Utils::$context['search_errors']['messages'] = [];
 
-			foreach (Utils::$context['search_errors'] as $search_error => $dummy)
-			{
-				if ($search_error == 'messages')
+			foreach (Utils::$context['search_errors'] as $search_error => $dummy) {
+				if ($search_error == 'messages') {
 					continue;
+				}
 
 				Utils::$context['search_errors']['messages'][] = Lang::$txt['error_' . $search_error];
 			}
@@ -246,8 +241,7 @@ public function showForm(): void
 	 */
 	public function performSearch(): void
 	{
-		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_search']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_search'])
-		{
+		if (!empty(Utils::$context['load_average']) && !empty(Config::$modSettings['loadavg_search']) && Utils::$context['load_average'] >= Config::$modSettings['loadavg_search']) {
 			ErrorHandler::fatalLang('loadavg_search_disabled', false);
 		}
 
@@ -257,11 +251,12 @@ public function performSearch(): void
 		$this->setParams();
 
 		// What are we actually searching for?
-		$this->params['search'] = !empty($this->params['search']) ? $this->params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : '');
+		$this->params['search'] = !empty($this->params['search']) ? $this->params['search'] : ($_REQUEST['search'] ?? '');
 
 		// If we ain't got nothing, we should error!
-		if (!isset($this->params['search']) || $this->params['search'] == '')
+		if (!isset($this->params['search']) || $this->params['search'] == '') {
 			Utils::$context['search_errors']['invalid_search_string'] = true;
+		}
 
 		$this->setTimeQuery();
 		$this->setUserQuery();
@@ -275,21 +270,22 @@ public function performSearch(): void
 		$this->setSearchQuery();
 
 		// If we have errors, return to the form...
-		if (!empty(Utils::$context['search_errors']))
-		{
+		if (!empty(Utils::$context['search_errors'])) {
 			$_REQUEST['params'] = $this->compressed_params;
 
 			$this->showForm();
+
 			return;
 		}
 
 		// Get all the matching messages... using standard search only (No caching and the like!)
-		$pms = array();
-		$posters = array();
+		$pms = [];
+		$posters = [];
 
 		// @todo This doesn't support sent item searching yet.
-		$request = Db::$db->query('', '
-			SELECT pm.id_pm, pm.id_member_from
+		$request = Db::$db->query(
+			'',
+			'SELECT pm.id_pm, pm.id_member_from
 			FROM {db_prefix}pm_recipients AS pmr
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)
 				' . $this->label_join . '
@@ -301,15 +297,15 @@ public function performSearch(): void
 				' . $this->user_query . $this->label_query . $this->time_query . '
 				AND (' . $this->search_query . ')
 			ORDER BY {raw:sort} {raw:sort_dir}',
-			array_merge($this->searchq_parameters, array(
+			array_merge($this->searchq_parameters, [
 				'me' => User::$me->id,
 				'not_deleted' => 0,
 				'sort' => $this->params['sort'],
 				'sort_dir' => $this->params['sort_dir'],
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$pms[] = $row['id_pm'];
 			$posters[] = $row['id_member_from'];
 		}
@@ -328,7 +324,7 @@ public function performSearch(): void
 			$_GET['start'],
 			Utils::$context['num_results'],
 			$this->per_page,
-			false
+			false,
 		);
 
 		Utils::$context['sub_template'] = 'search_results';
@@ -356,44 +352,37 @@ public function performSearch(): void
 	protected function setParams(): void
 	{
 		// Extract all the search parameters.
-		if (isset($_REQUEST['params']))
-		{
-			$temp_params = explode('|"|', base64_decode(strtr($_REQUEST['params'], array(' ' => '+'))));
+		if (isset($_REQUEST['params'])) {
+			$temp_params = explode('|"|', base64_decode(strtr($_REQUEST['params'], [' ' => '+'])));
 
-			foreach ($temp_params as $i => $data)
-			{
+			foreach ($temp_params as $i => $data) {
 				@list($k, $v) = explode('|\'|', $data);
 				$this->params[$k] = $v;
 			}
 		}
 
 		// Store whether simple search was used (needed if the user wants to do another query).
-		if (!isset($this->params['advanced']))
-		{
+		if (!isset($this->params['advanced'])) {
 			$this->params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
 		}
 
 		// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-		if (!empty($this->params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		{
+		if (!empty($this->params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
 			$this->params['searchtype'] = 2;
 		}
 
 		// Default the user name to a wildcard matching every user (*).
-		if (!empty($this->params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		{
-			$this->params['userspec'] = isset($this->params['userspec']) ? $this->params['userspec'] : $_REQUEST['userspec'];
+		if (!empty($this->params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$this->params['userspec'] = $this->params['userspec'] ?? $_REQUEST['userspec'];
 		}
 
 		// Minimum age of messages. Default to zero (don't set param in that case).
-		if (!empty($this->params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		{
+		if (!empty($this->params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
 			$this->params['minage'] = !empty($this->params['minage']) ? (int) $this->params['minage'] : (int) $_REQUEST['minage'];
 		}
 
 		// Maximum age of messages. Default to infinite (9999 days: param not set).
-		if (!empty($this->params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999))
-		{
+		if (!empty($this->params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999)) {
 			$this->params['maxage'] = !empty($this->params['maxage']) ? (int) $this->params['maxage'] : (int) $_REQUEST['maxage'];
 		}
 
@@ -401,8 +390,7 @@ protected function setParams(): void
 
 		$this->params['show_complete'] = !empty($this->params['show_complete']) || !empty($_REQUEST['show_complete']);
 
-		if (empty($this->params['sort']) && !empty($_REQUEST['sort']))
-		{
+		if (empty($this->params['sort']) && !empty($_REQUEST['sort'])) {
 			list($this->params['sort'], $this->params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
 		}
 
@@ -418,10 +406,10 @@ protected function setContextualParams(): void
 	{
 		Utils::$context['search_params'] = $this->params;
 
-		foreach (array('search', 'userspec') as $key)
-		{
-			if (!isset(Utils::$context['search_params'][$key]))
+		foreach (['search', 'userspec'] as $key) {
+			if (!isset(Utils::$context['search_params'][$key])) {
 				continue;
+			}
 
 			Utils::$context['search_params'][$key] = Utils::htmlspecialchars(Utils::$context['search_params'][$key]);
 		}
@@ -434,10 +422,11 @@ protected function setContextualParams(): void
 	 */
 	protected function compressParams(): string
 	{
-		$temp = array();
+		$temp = [];
 
-		foreach ($this->params as $k => $v)
+		foreach ($this->params as $k => $v) {
 			$temp[] = $k . '|\'|' . $v;
+		}
 
 		$this->compressed_params = base64_encode(implode('|"|', $temp));
 
@@ -450,76 +439,69 @@ protected function compressParams(): string
 	protected function setUserQuery(): void
 	{
 		// If there's no specific user, then don't mention it in the main query.
-		if (empty($this->params['userspec']))
-		{
+		if (empty($this->params['userspec'])) {
 			$this->user_query = '';
+
 			return;
 		}
 
-		$userString = strtr(Utils::htmlspecialchars($this->params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
-		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
+		$userString = strtr(Utils::htmlspecialchars($this->params['userspec'], ENT_QUOTES), ['&quot;' => '"']);
+		$userString = strtr($userString, ['%' => '\\%', '_' => '\\_', '*' => '%', '?' => '_']);
 
 		preg_match_all('~"([^"]+)"~', $userString, $matches);
 
 		$possible_users = array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $userString)));
 
-		for ($k = 0, $n = count($possible_users); $k < $n; $k++)
-		{
+		for ($k = 0, $n = count($possible_users); $k < $n; $k++) {
 			$possible_users[$k] = trim($possible_users[$k]);
 
-			if (strlen($possible_users[$k]) == 0)
+			if (strlen($possible_users[$k]) == 0) {
 				unset($possible_users[$k]);
+			}
 		}
 
-		if (empty($possible_users))
-		{
+		if (empty($possible_users)) {
 			$this->user_query = '';
+
 			return;
 		}
 
 		// We need to bring this into the query and do it nice and cleanly.
-		$where_params = array();
-		$where_clause = array();
+		$where_params = [];
+		$where_clause = [];
 
-		foreach ($possible_users as $k => $v)
-		{
+		foreach ($possible_users as $k => $v) {
 			$where_params['name_' . $k] = $v;
 			$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
 
-			if (!isset($where_params['real_name']))
-			{
+			if (!isset($where_params['real_name'])) {
 				$where_params['real_name'] = Db::$db->case_sensitive ? 'LOWER(real_name)' : 'real_name';
 			}
 		}
 
 		// Who matches those criteria?
 		// @todo This doesn't support sent item searching.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}members
 			WHERE ' . implode(' OR ', $where_clause),
-			$where_params
+			$where_params,
 		);
 
 		// Simply do nothing if there're too many members matching the criteria.
-		if (Db::$db->num_rows($request) > $this->max_members_to_search)
-		{
+		if (Db::$db->num_rows($request) > $this->max_members_to_search) {
 			$this->user_query = '';
-		}
-		elseif (Db::$db->num_rows($request) == 0)
-		{
+		} elseif (Db::$db->num_rows($request) == 0) {
 			$this->user_query = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
 
 			$this->searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . (Db::$db->case_sensitive ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 
 			$this->searchq_parameters['pm_from_name'] = Db::$db->case_sensitive ? 'LOWER(pm.from_name)' : 'pm.from_name';
-		}
-		else
-		{
-			$memberlist = array();
+		} else {
+			$memberlist = [];
 
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$memberlist[] = $row['id_member'];
 			}
 
@@ -540,59 +522,49 @@ protected function setUserQuery(): void
 	protected function setLabelQuery(): void
 	{
 		// This is used by the template to tell the user where we searched.
-		Utils::$context['search_in'] = array();
+		Utils::$context['search_in'] = [];
 
-		if ($this->folder === 'inbox' && !empty($this->params['advanced']) && !empty(Label::$loaded))
-		{
+		if ($this->folder === 'inbox' && !empty($this->params['advanced']) && !empty(Label::$loaded)) {
 			// Came here from pagination?  Put them back into $_REQUEST for sanitization.
-			if (isset($this->params['labels']))
+			if (isset($this->params['labels'])) {
 				$_REQUEST['searchlabel'] = explode(',', $this->params['labels']);
+			}
 
 			// Assuming we have some labels - make them all integers.
-			if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel']))
-			{
+			if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel'])) {
 				$_REQUEST['searchlabel'] = array_map('intval', $_REQUEST['searchlabel']);
-			}
-			else
-			{
-				$_REQUEST['searchlabel'] = array();
+			} else {
+				$_REQUEST['searchlabel'] = [];
 			}
 
 			// Now that everything is cleaned up a bit, make the labels a param.
 			$this->params['labels'] = implode(',', $_REQUEST['searchlabel']);
 
 			// No labels selected? That must be an error!
-			if (empty($_REQUEST['searchlabel']))
-			{
+			if (empty($_REQUEST['searchlabel'])) {
 				Utils::$context['search_errors']['no_labels_selected'] = true;
 			}
 			// Otherwise prepare the query!
-			elseif (count($_REQUEST['searchlabel']) != count(Label::$loaded))
-			{
+			elseif (count($_REQUEST['searchlabel']) != count(Label::$loaded)) {
 				// Special case here... "inbox" isn't a real label...
-				if (in_array(-1, $_REQUEST['searchlabel']))
-				{
+				if (in_array(-1, $_REQUEST['searchlabel'])) {
 					Utils::$context['search_in'][] = Label::$loaded[-1]['name'];
 
 					$this->label_query = '	AND pmr.in_inbox = {int:in_inbox}';
 					$this->searchq_parameters['in_inbox'] = 1;
 
 					// Now we get rid of that...
-					$temp = array_diff($_REQUEST['searchlabel'], array(-1));
+					$temp = array_diff($_REQUEST['searchlabel'], [-1]);
 					$_REQUEST['searchlabel'] = $temp;
 				}
 
 				// Still have something?
-				if (!empty($_REQUEST['searchlabel']))
-				{
-					if ($this->label_query == '')
-					{
+				if (!empty($_REQUEST['searchlabel'])) {
+					if ($this->label_query == '') {
 						// Not searching the inbox - PM must be labeled
 						$this->label_query = ' AND pml.id_label IN ({array_int:labels})';
 						$this->label_join = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
-					}
-					else
-					{
+					} else {
 						// Searching the inbox - PM doesn't have to be labeled
 						$this->label_query = ' AND (' . substr($this->label_query, 5) . ' OR pml.id_label IN ({array_int:labels}))';
 						$this->label_join = ' LEFT JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
@@ -600,16 +572,16 @@ protected function setLabelQuery(): void
 
 					$this->searchq_parameters['labels'] = $_REQUEST['searchlabel'];
 
-					foreach ($_REQUEST['searchlabel'] as $label_key)
-					{
+					foreach ($_REQUEST['searchlabel'] as $label_key) {
 						Utils::$context['search_in'][] = Label::$loaded[$label_key]['name'];
 					}
 				}
 			}
 		}
 
-		if (empty(Utils::$context['search_in']))
+		if (empty(Utils::$context['search_in'])) {
 			Utils::$context['search_in'][] = $this->folder;
+		}
 	}
 
 	/**
@@ -619,13 +591,11 @@ protected function setTimeQuery(): void
 	{
 		$this->time_query = '';
 
-		if (!empty($this->params['minage']))
-		{
+		if (!empty($this->params['minage'])) {
 			$this->time_query .= ' AND pm.msgtime < ' . (time() - $this->params['minage'] * 86400);
 		}
 
-		if (!empty($this->params['maxage']))
-		{
+		if (!empty($this->params['maxage'])) {
 			$this->time_query .= ' AND pm.msgtime > ' . (time() - $this->params['maxage'] * 86400);
 		}
 	}
@@ -645,31 +615,29 @@ protected function setSearchQuery(): void
 		$tempSearch = explode(' ', preg_replace('~(?:^|\s)(?:[-]?)"(?:[^"]+)"(?:$|\s)~' . (Utils::$context['utf8'] ? 'u' : ''), ' ', $this->params['search']));
 
 		// A minus sign in front of a word excludes the word.... so...
-		$excludedWords = array();
+		$excludedWords = [];
 
 		// .. first, we check for things like -"some words", but not "-some words".
-		foreach ($matches[1] as $index => $word)
-		{
-			if ($word == '-')
-			{
+		foreach ($matches[1] as $index => $word) {
+			if ($word == '-') {
 				$word = Utils::strtolower(trim($searchArray[$index]));
 
-				if (strlen($word) > 0)
+				if (strlen($word) > 0) {
 					$excludedWords[] = $word;
+				}
 
 				unset($searchArray[$index]);
 			}
 		}
 
 		// Now we look for -test, etc.... normaller.
-		foreach ($tempSearch as $index => $word)
-		{
-			if (strpos(trim($word), '-') === 0)
-			{
+		foreach ($tempSearch as $index => $word) {
+			if (strpos(trim($word), '-') === 0) {
 				$word = substr(Utils::strtolower($word), 1);
 
-				if (strlen($word) > 0)
+				if (strlen($word) > 0) {
 					$excludedWords[] = $word;
+				}
 
 				unset($tempSearch[$index]);
 			}
@@ -678,16 +646,12 @@ protected function setSearchQuery(): void
 		$searchArray = array_merge($searchArray, $tempSearch);
 
 		// Trim everything and make sure there are no words that are the same.
-		foreach ($searchArray as $index => $value)
-		{
+		foreach ($searchArray as $index => $value) {
 			$searchArray[$index] = Utils::strtolower(trim($value));
 
-			if ($searchArray[$index] == '')
-			{
+			if ($searchArray[$index] == '') {
 				unset($searchArray[$index]);
-			}
-			else
-			{
+			} else {
 				// Sort out entities first.
 				$searchArray[$index] = Utils::htmlspecialchars($searchArray[$index]);
 			}
@@ -702,43 +666,38 @@ protected function setSearchQuery(): void
 		$searchWords = array_merge($searchArray, $excludedWords);
 
 		// Make sure at least one word is being searched for.
-		if (empty($searchArray))
-		{
+		if (empty($searchArray)) {
 			Utils::$context['search_errors']['invalid_search_string'] = true;
 		}
 
 		// Compile the subject query part.
-		$andQueryParts = array();
+		$andQueryParts = [];
 
-		foreach ($searchWords as $index => $word)
-		{
-			if ($word == '')
+		foreach ($searchWords as $index => $word) {
+			if ($word == '') {
 				continue;
+			}
 
-			if ($this->params['subject_only'])
-			{
+			if ($this->params['subject_only']) {
 				$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
-			}
-			else
-			{
+			} else {
 				$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
 			}
 
-			$this->searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%';
+			$this->searchq_parameters['search_' . $index] = '%' . strtr($word, ['_' => '\\_', '%' => '\\%']) . '%';
 		}
 
 		$this->search_query = ' 1=1';
 
-		if (!empty($andQueryParts))
-		{
+		if (!empty($andQueryParts)) {
 			$this->search_query = implode(!empty($this->params['searchtype']) && $this->params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
 		}
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Search::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Search::exportStatic')) {
 	Search::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PersonalMessage/SearchResult.php b/Sources/PersonalMessage/SearchResult.php
index e605cded1e..97bce3e046 100644
--- a/Sources/PersonalMessage/SearchResult.php
+++ b/Sources/PersonalMessage/SearchResult.php
@@ -28,11 +28,10 @@ class SearchResult extends PM
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return Generator<array> Iterating over result gives SearchResult instances.
 	 */
-	public static function getFormatted($ids, array $query_customizations = array())
+	public static function getFormatted($ids, array $query_customizations = [])
 	{
-		foreach (parent::get($ids, $query_customizations) as $pm)
-		{
-			$output = $pm->format(0, array('no_bcc' => true));
+		foreach (parent::get($ids, $query_customizations) as $pm) {
+			$output = $pm->format(0, ['no_bcc' => true]);
 
 			$output['body'] = SR::highlight($output['body'], Search::$to_mark);
 			$output['subject'] = SR::highlight($output['subject'], Search::$to_mark);
@@ -40,7 +39,7 @@ public static function getFormatted($ids, array $query_customizations = array())
 
 			unset($output['quickbuttons']['quickmod']);
 
-			IntegrationHook::call('integrate_pm_search_result', array(&$output));
+			IntegrationHook::call('integrate_pm_search_result', [&$output]);
 
 			yield $output;
 		}
diff --git a/Sources/PersonalMessage/index.php b/Sources/PersonalMessage/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Sources/PersonalMessage/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Sources/Poll.php b/Sources/Poll.php
index c6138b97bb..0cc15a1606 100644
--- a/Sources/Poll.php
+++ b/Sources/Poll.php
@@ -22,41 +22,40 @@
  */
 class Poll implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'create' => false,
-			'checkCreatePermission' => false,
-			'checkEditPermission' => false,
+	private static $backcompat = [
+		'func_names' => [
+			'checkRemovePermission' => 'checkRemovePermission',
+			'vote' => 'Vote',
 			'lock' => 'LockVoting',
 			'edit' => 'EditPoll',
 			'edit2' => 'EditPoll2',
 			'remove' => 'RemovePoll',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
 	// The LOAD_* constants indicate how to find the poll we want.
-	const LOAD_BY_ID = 0;
-	const LOAD_BY_TOPIC = 1;
-	const LOAD_BY_RECENT = 2;
-	const LOAD_BY_VOTES = 4;
+	public const LOAD_BY_ID = 0;
+	public const LOAD_BY_TOPIC = 1;
+	public const LOAD_BY_RECENT = 2;
+	public const LOAD_BY_VOTES = 4;
 
 	// The CHECK_* constants are used to filter the results while loading.
-	const CHECK_ACCESS = 8;
-	const CHECK_IGNORE = 16;
-	const CHECK_LOCKED = 32;
-	const CHECK_EXPIRY = 64;
+	public const CHECK_ACCESS = 8;
+	public const CHECK_IGNORE = 16;
+	public const CHECK_LOCKED = 32;
+	public const CHECK_EXPIRY = 64;
 
 	/*******************
 	 * Public properties
@@ -158,7 +157,7 @@ class Poll implements \ArrayAccess
 	 *
 	 * The available choices for this poll.
 	 */
-	public array $choices = array();
+	public array $choices = [];
 
 	/**
 	 * @var int
@@ -179,7 +178,7 @@ class Poll implements \ArrayAccess
 	 *
 	 * IDs of members who have voted in this poll.
 	 */
-	public array $voters = array();
+	public array $voters = [];
 
 	/**
 	 * @var bool
@@ -200,7 +199,7 @@ class Poll implements \ArrayAccess
 	 *
 	 * Permissions that the current user has regarding this poll.
 	 */
-	public array $permissions = array(
+	public array $permissions = [
 		'allow_lock_poll' => false,
 		'allow_edit_poll' => false,
 		'can_remove_poll' => false,
@@ -208,14 +207,14 @@ class Poll implements \ArrayAccess
 		'allow_results_view' => false,
 		'allow_change_vote' => false,
 		'allow_return_vote' => false,
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Formatted versions of this poll's properties, suitable for display.
 	 */
-	public array $formatted = array();
+	public array $formatted = [];
 
 	/**************************
 	 * Public static properties
@@ -226,7 +225,7 @@ class Poll implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -237,56 +236,56 @@ class Poll implements \ArrayAccess
 	 *
 	 * SQL select statements to use when loading data.
 	 */
-	protected array $selects = array(
+	protected array $selects = [
 		'pc.*',
 		'p.*',
 		'COALESCE(mem.real_name, p.poster_name) AS poster_name',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * SQL join statements to use when loading data.
 	 */
-	protected array $joins = array(
+	protected array $joins = [
 		'pc' => 'LEFT JOIN {db_prefix}poll_choices AS pc ON (pc.id_poll = p.id_poll)',
 		'mem' => 'LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = p.id_member)',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * SQL where statements to use when loading data.
 	 */
-	protected array $where = array('1=1');
+	protected array $where = ['1=1'];
 
 	/**
 	 * @var array
 	 *
 	 * SQL order by statements to use when loading data.
 	 */
-	protected array $order = array('p.id_poll DESC');
+	protected array $order = ['p.id_poll DESC'];
 
 	/**
 	 * @var array
 	 *
 	 * Parameters for the SQL query when loading data.
 	 */
-	protected array $params = array();
+	protected array $params = [];
 
 	/**
 	 * @var array
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_poll' => 'id',
 		'id_member' => 'member',
 		'expire' => 'expire_time',
 		'hide' => 'hide_results',
 		'id_topic' => 'topic',
 		'options' => 'choices',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -357,8 +356,9 @@ public function buildPermissions(): void
 		$this->permissions['allow_return_vote'] = $this->permissions['allow_vote'] && $this->permissions['allow_results_view'] && !empty($this->viewresults);
 
 		// Make these permissions available in Utils::$context.
-		foreach ($this->permissions as $key => $value)
+		foreach ($this->permissions as $key => $value) {
 			Utils::$context[$key] = &$this->permissions[$key];
+		}
 	}
 
 	/**
@@ -369,7 +369,7 @@ public function buildPermissions(): void
 	 * @param array $format_options Options to control output.
 	 * @return array A copy of $this->formatted.
 	 */
-	public function format(array $format_options = array()): array
+	public function format(array $format_options = []): array
 	{
 		$this->viewresults = isset($_REQUEST['viewresults']) || isset($_REQUEST['viewResults']);
 
@@ -377,7 +377,7 @@ public function format(array $format_options = array()): array
 
 		Lang::censorText($this->question);
 
-		$this->formatted = array(
+		$this->formatted = [
 			'id' => $this->id ?? 0,
 			'image' => 'normal_' . (empty($this->voting_locked) ? 'poll' : 'locked_poll'),
 			'question' => BBCodeParser::load()->parse($this->question),
@@ -388,7 +388,7 @@ public function format(array $format_options = array()): array
 			'change_vote' => !empty($this->change_vote),
 			'hide_results' => $this->hide_results,
 			'is_locked' => !empty($this->voting_locked),
-			'choices' => array(),
+			'choices' => [],
 			'allow_vote' => $this->permissions['allow_vote'] && !$this->has_voted,
 			'allow_view_results' => $this->permissions['allow_results_view'],
 			'lock' => $this->permissions['allow_lock_poll'],
@@ -399,17 +399,18 @@ public function format(array $format_options = array()): array
 			'expire_time' => !empty($this->expire_time) ? Time::create('@' . $this->expire_time)->format() : 0,
 			'expiration' => empty($this->expire_time) ? '' : ceil($this->expire_time <= time() ? -1 : ($this->expire_time - time()) / (3600 * 24)),
 			'has_voted' => !empty($this->has_voted),
-			'starter' => array(
+			'starter' => [
 				'id' => $this->id_member,
 				'name' => $this->poster_name,
 				'href' => $this->id_member == 0 ? '' : Config::$scripturl . '?action=profile;u=' . $this->id_member,
-				'link' => $this->id_member == 0 ? $this->poster_name : '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id_member . '">' . $this->poster_name . '</a>'
-			),
-			'buttons' => array(),
-		);
+				'link' => $this->id_member == 0 ? $this->poster_name : '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id_member . '">' . $this->poster_name . '</a>',
+			],
+			'buttons' => [],
+		];
 
-		if (isset($this->topic))
+		if (isset($this->topic)) {
 			$this->formatted['topic'] = $this->topic;
+		}
 
 		// Backward compatibility.
 		$this->formatted['options'] = &$this->formatted['choices'];
@@ -428,8 +429,8 @@ public function format(array $format_options = array()): array
 
 		// Now look through each option, and...
 		$choice_number = 0;
-		foreach ($this->choices as $i => $option)
-		{
+
+		foreach ($this->choices as $i => $option) {
 			Lang::censorText($option->label);
 
 			// First calculate the percentage, and then the width of the bar...
@@ -437,7 +438,7 @@ public function format(array $format_options = array()): array
 			$barWide = $bar == 0 ? 1 : floor(($bar * 8) / 3);
 
 			// Now add it to the poll's contextual theme data.
-			$this->formatted['choices'][$i] = array(
+			$this->formatted['choices'][$i] = [
 				'id' => 'options-' . $i,
 				'number' => ++$choice_number,
 				'percent' => $bar,
@@ -446,8 +447,8 @@ public function format(array $format_options = array()): array
 				'bar_ndt' => $bar > 0 ? '<div class="bar" style="width: ' . $bar . '%;"></div>' : '',
 				'bar_width' => $barWide,
 				'label' => BBCodeParser::load()->parse($option->label),
-				'vote_button' => '<input type="' . ($this->max_votes > 1 ? 'checkbox' : 'radio') . '" name="options[]" id="options-' . $i . '" value="' . $i . '">'
-			);
+				'vote_button' => '<input type="' . ($this->max_votes > 1 ? 'checkbox' : 'radio') . '" name="options[]" id="options-' . $i . '" value="' . $i . '">',
+			];
 
 			$this->formatted['choices'][$i]['option'] = &$this->formatted['choices'][$i]['label'];
 		}
@@ -459,8 +460,9 @@ public function format(array $format_options = array()): array
 
 		Utils::$context['poll_buttons'] = &$this->formatted['buttons'];
 
-		if (!empty($format_options['no_buttons']) || empty($this->topic) || !isset(Utils::$context['start']))
+		if (!empty($format_options['no_buttons']) || empty($this->topic) || !isset(Utils::$context['start'])) {
 			return $this->formatted;
+		}
 
 		// Show the view results button if:
 		// 1. You can vote in the poll (see above), and
@@ -469,60 +471,54 @@ public function format(array $format_options = array()): array
 		$show_view_results_button = $this->permissions['allow_vote'] && $this->permissions['allow_results_view'] && !$this->formatted['show_results'];
 
 		// Build the poll moderation button array.
-		if ($this->permissions['allow_return_vote'])
-		{
-			$this->formatted['buttons']['vote'] = array(
+		if ($this->permissions['allow_return_vote']) {
+			$this->formatted['buttons']['vote'] = [
 				'text' => 'poll_return_vote',
 				'image' => 'poll_options.png',
 				'url' => Config::$scripturl . '?topic=' . $this->topic . '.' . Utils::$context['start'],
-			);
+			];
 		}
 
-		if ($show_view_results_button)
-		{
-			$this->formatted['buttons']['results'] = array(
+		if ($show_view_results_button) {
+			$this->formatted['buttons']['results'] = [
 				'text' => 'poll_results',
 				'image' => 'poll_results.png',
 				'url' => Config::$scripturl . '?topic=' . $this->topic . '.' . Utils::$context['start'] . ';viewresults',
-			);
+			];
 		}
 
-		if ($this->permissions['allow_change_vote'] && isset(Utils::$context['session_var']))
-		{
-			$this->formatted['buttons']['change_vote'] = array(
+		if ($this->permissions['allow_change_vote'] && isset(Utils::$context['session_var'])) {
+			$this->formatted['buttons']['change_vote'] = [
 				'text' => 'poll_change_vote',
 				'image' => 'poll_change_vote.png',
 				'url' => Config::$scripturl . '?action=vote;topic=' . $this->topic . '.' . Utils::$context['start'] . ';poll=' . $this->id . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-			);
+			];
 		}
 
-		if ($this->permissions['allow_lock_poll'] && isset(Utils::$context['session_var']))
-		{
-			$this->formatted['buttons']['lock'] = array(
+		if ($this->permissions['allow_lock_poll'] && isset(Utils::$context['session_var'])) {
+			$this->formatted['buttons']['lock'] = [
 				'text' => (!$this->voting_locked ? 'poll_lock' : 'poll_unlock'),
 				'image' => 'poll_lock.png',
 				'url' => Config::$scripturl . '?action=lockvoting;topic=' . $this->topic . '.' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-			);
+			];
 		}
 
-		if ($this->permissions['allow_edit_poll'])
-		{
-			$this->formatted['buttons']['edit'] = array(
+		if ($this->permissions['allow_edit_poll']) {
+			$this->formatted['buttons']['edit'] = [
 				'text' => 'poll_edit',
 				'image' => 'poll_edit.png',
 				'url' => Config::$scripturl . '?action=editpoll;topic=' . $this->topic . '.' . Utils::$context['start'],
-			);
+			];
 		}
 
-		if ($this->permissions['can_remove_poll'] && isset(Utils::$context['session_var']))
-		{
-			$this->formatted['buttons']['remove_poll'] = array(
+		if ($this->permissions['can_remove_poll'] && isset(Utils::$context['session_var'])) {
+			$this->formatted['buttons']['remove_poll'] = [
 				'text' => 'poll_remove',
 				'image' => 'admin_remove_poll.png',
 				'custom' => 'data-confirm="' . Lang::$txt['poll_remove_warn'] . '"',
 				'class' => 'you_sure',
 				'url' => Config::$scripturl . '?action=removepoll;topic=' . $this->topic . '.' . Utils::$context['start'] . ';' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
-			);
+			];
 		}
 
 		// Allow mods to add additional buttons here
@@ -539,19 +535,18 @@ public function addChoice(array $choice_props, bool $allow_empty = false): void
 		// Clean up the label.
 		$choice_props['label'] = isset($choice_props['label']) ? Utils::htmlTrim(Utils::normalizeSpaces((string) $choice_props['label'])) : '';
 
-		if (!$allow_empty && $choice_props['label'] === '')
+		if (!$allow_empty && $choice_props['label'] === '') {
 			return;
+		}
 
 		// Standardize id_choice to id.
-		if (isset($choice_props['id_choice']))
-		{
+		if (isset($choice_props['id_choice'])) {
 			$choice_props['id'] = $choice_props['id_choice'];
 			unset($choice_props['id_choice']);
 		}
 
 		// Standardize id_poll to poll.
-		if (isset($choice_props['id_poll']))
-		{
+		if (isset($choice_props['id_poll'])) {
 			$choice_props['poll'] = $choice_props['id_poll'];
 			unset($choice_props['id_poll']);
 		}
@@ -573,14 +568,15 @@ public function save(): void
 		$is_edit = !empty($this->id);
 
 		// Saving a new poll.
-		if (empty($this->id))
-		{
-			if (!self::checkCreatePermission())
+		if (empty($this->id)) {
+			if (!self::checkCreatePermission()) {
 				return;
+			}
 
-			$this->id = Db::$db->insert('',
+			$this->id = Db::$db->insert(
+				'',
 				'{db_prefix}polls',
-				array(
+				[
 					'question' => 'string-255',
 					'max_votes' => 'int',
 					'expire_time' => 'int',
@@ -589,8 +585,8 @@ public function save(): void
 					'guest_vote' => 'int',
 					'id_member' => 'int',
 					'poster_name' => 'string-255',
-				),
-				array(
+				],
+				[
 					$this->question,
 					(int) $this->max_votes,
 					(int) $this->expire_time,
@@ -599,40 +595,39 @@ public function save(): void
 					(int) $this->guest_vote,
 					(int) $this->id_member,
 					$this->poster_name,
-				),
-				array('id_poll'),
-				1
+				],
+				['id_poll'],
+				1,
 			);
 
 			// Create each answer choice.
-			foreach ($this->choices as $choice)
-			{
+			foreach ($this->choices as $choice) {
 				$choice->poll = $this->id;
 				$choice->save();
 			}
 
-			if (!empty($this->topic))
-			{
-				Db::$db->query('', '
-					UPDATE {db_prefix}topics
+			if (!empty($this->topic)) {
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}topics
 					SET id_poll = {int:id_poll}
 					WHERE id_topic = {int:id_topic}',
-					array(
+					[
 						'id_poll' => $this->id,
 						'id_topic' => $this->topic,
-					)
+					],
 				);
 			}
 
 			self::$loaded[$this->id] = $this;
 		}
 		// Updating an existing poll.
-		else
-		{
-			if (!self::checkEditPermission($this))
+		else {
+			if (!self::checkEditPermission($this)) {
 				return;
+			}
 
-			$set = array(
+			$set = [
 				'question = {string:question}',
 				'change_vote = {int:change_vote}',
 				'hide_results = {int:hide_results}',
@@ -641,9 +636,9 @@ public function save(): void
 				'max_votes = {int:max_votes}',
 				'guest_vote = {int:guest_vote}',
 				'reset_poll = {int:reset_poll}',
-			);
+			];
 
-			$params = array(
+			$params = [
 				'id_poll' => $this->id,
 				'question' => $this->question,
 				'change_vote' => (int) $this->change_vote,
@@ -653,24 +648,27 @@ public function save(): void
 				'max_votes' => (int) $this->max_votes,
 				'guest_vote' => (int) $this->guest_vote,
 				'reset_poll' => (int) $this->reset_poll,
-			);
+			];
 
-			if (empty($this->expire_time) && $params['hide_results'] == 2)
+			if (empty($this->expire_time) && $params['hide_results'] == 2) {
 				$params['hide_results'] = 1;
+			}
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}polls
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}polls
 				SET ' . (implode(', ', $set)) . '
 				WHERE id_poll = {int:id_poll}',
-				$params
+				$params,
 			);
 
-			foreach ($this->choices as $choice)
+			foreach ($this->choices as $choice) {
 				$choice->save();
+			}
 		}
 
 		// Let mods know that this poll has been added or edited.
-		IntegrationHook::call('integrate_poll_add_edit', array($this->id, $is_edit));
+		IntegrationHook::call('integrate_poll_add_edit', [$this->id, $is_edit]);
 	}
 
 	/**
@@ -678,49 +676,52 @@ public function save(): void
 	 */
 	public function resetVotes(): void
 	{
-		if (!isset($this->id))
+		if (!isset($this->id)) {
 			return;
+		}
 
 		$this->num_guest_voters = 0;
 		$this->reset_poll = time();
 		$this->total = 0;
 		$this->total_voters = 0;
-		$this->voters = array();
+		$this->voters = [];
 		$this->has_voted = false;
 
-		foreach ($this->choices as &$choice)
-		{
+		foreach ($this->choices as &$choice) {
 			$choice['votes'] = 0;
 			$choice['voted_this'] = false;
 		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}polls
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}polls
 			SET num_guest_voters = {int:no_votes}, reset_poll = {int:time}
 			WHERE id_poll = {int:id_poll}',
-			array(
+			[
 				'no_votes' => 0,
 				'id_poll' => $this->id,
 				'time' => time(),
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}poll_choices
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}poll_choices
 			SET votes = {int:no_votes}
 			WHERE id_poll = {int:id_poll}',
-			array(
+			[
 				'no_votes' => 0,
 				'id_poll' => $this->id,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_polls
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_polls
 			WHERE id_poll = {int:id_poll}',
-			array(
+			[
 				'id_poll' => $this->id,
-			)
+			],
 		);
 	}
 
@@ -732,58 +733,49 @@ public function resetVotes(): void
 	 */
 	public function __set(string $prop, $value): void
 	{
-		if ($prop === 'choices' || $prop === 'options')
-		{
-			foreach ($value as $id_choice => $choice_props)
+		if ($prop === 'choices' || $prop === 'options') {
+			foreach ($value as $id_choice => $choice_props) {
 				$this->choices[$id_choice] = new PollChoice((array) $choice_props);
-		}
-		elseif (property_exists($this, $prop))
-		{
-			if (!isset($this->id) && $prop === 'id')
-			{
+			}
+		} elseif (property_exists($this, $prop)) {
+			if (!isset($this->id) && $prop === 'id') {
 				self::$loaded[$value] = $this;
 
-				if (isset($this->id))
+				if (isset($this->id)) {
 					unset(self::$loaded[$this->id]);
+				}
 			}
 
 			$this->{$prop} = $value;
-		}
-		elseif (array_key_exists($prop, $this->prop_aliases))
-		{
+		} elseif (array_key_exists($prop, $this->prop_aliases)) {
 			// Can't unset a virtual property.
-			if (is_null($value))
+			if (is_null($value)) {
 				return;
+			}
 
 			$real_prop = $this->prop_aliases[$prop];
 
-			if (empty($this->id) && $real_prop === 'id')
-			{
+			if (empty($this->id) && $real_prop === 'id') {
 				self::$loaded[$value] = $this;
 
-				if (isset($this->id))
+				if (isset($this->id)) {
 					unset(self::$loaded[$this->id]);
+				}
 			}
 
-			if (strpos($real_prop, '!') === 0)
-			{
+			if (strpos($real_prop, '!') === 0) {
 				$real_prop = ltrim($real_prop, '!');
 				$value = !$value;
 			}
 
-			if (strpos($real_prop, '[') !== false)
-			{
+			if (strpos($real_prop, '[') !== false) {
 				$real_prop = explode('[', rtrim($real_prop, ']'));
 
 				$this->{$real_prop[0]}[$real_prop[1]] = $value;
-			}
-			else
-			{
+			} else {
 				$this->{$real_prop} = $value;
 			}
-		}
-		else
-		{
+		} else {
 			$this->custom[$prop] = $value;
 		}
 	}
@@ -812,35 +804,42 @@ public static function load(int $id, int $options = 0): object
 	 * @param array &$errors Will hold errors encountered while creating the poll.
 	 * @return object An instance of this class, or null on failure.
 	 */
-	public static function create(array &$errors = array()): object|null
+	public static function create(array &$errors = []): ?object
 	{
-		if (!self::checkCreatePermission())
+		if (!self::checkCreatePermission()) {
 			return null;
+		}
 
 		self::sanitizeInput($errors);
 
 		$poll = new self();
 
 		// Set the properties.
-		$props = array();
+		$props = [];
 
-		if (isset($_POST['question']))
+		if (isset($_POST['question'])) {
 			$props['question'] = $_POST['question'];
+		}
 
-		if (isset($_POST['max_votes']))
+		if (isset($_POST['max_votes'])) {
 			$props['max_votes'] = $_POST['max_votes'];
+		}
 
-		if (isset($_POST['expire_time']))
+		if (isset($_POST['expire_time'])) {
 			$props['expire_time'] = empty($_POST['poll_expire']) ? 0 : time() + $_POST['poll_expire'] * 86400;
+		}
 
-		if (isset($_POST['hide_results']))
+		if (isset($_POST['hide_results'])) {
 			$props['hide_results'] = $_POST['poll_hide'];
+		}
 
-		if (isset($_POST['change_vote']))
+		if (isset($_POST['change_vote'])) {
 			$props['change_vote'] = $_POST['poll_change_vote'];
+		}
 
-		if (isset($_POST['guest_vote']))
+		if (isset($_POST['guest_vote'])) {
 			$props['guest_vote'] = $_POST['poll_guest_vote'];
+		}
 
 		$props['member'] = User::$me->id;
 		$props['poster_name'] = User::$me->name;
@@ -848,14 +847,13 @@ public static function create(array &$errors = array()): object|null
 
 		$poll->set($props);
 
-		foreach (array_values($_POST['options']) as $id => $label)
-		{
-			$poll->addChoice(array(
+		foreach (array_values($_POST['options']) as $id => $label) {
+			$poll->addChoice([
 				'id' => $id,
 				'label' => $label,
 				'votes' => 0,
 				'new' => true,
-			));
+			]);
 		}
 
 		return $poll;
@@ -871,22 +869,20 @@ public static function create(array &$errors = array()): object|null
 	 */
 	public static function checkCreatePermission(): bool
 	{
-		if (Config::$modSettings['pollMode'] != 1)
+		if (Config::$modSettings['pollMode'] != 1) {
 			return false;
+		}
 
 		// New topic, new poll.
-		if (empty(Topic::$topic_id))
-		{
+		if (empty(Topic::$topic_id)) {
 			User::$me->isAllowedTo('poll_post');
 		}
 		// This is an old topic, but it is theirs!  Can they add to it?
-		elseif (User::$me->id == Topic::load()->id_member_started && !User::$me->allowedTo('poll_add_any'))
-		{
+		elseif (User::$me->id == Topic::load()->id_member_started && !User::$me->allowedTo('poll_add_any')) {
 			User::$me->isAllowedTo('poll_add_own');
 		}
 		// If they're not the owner, can they add a poll to any topic?
-		else
-		{
+		else {
 			User::$me->isAllowedTo('poll_add_any');
 		}
 
@@ -906,12 +902,14 @@ public static function checkCreatePermission(): bool
 	 */
 	public static function checkEditPermission($poll): bool
 	{
-		if (Config::$modSettings['pollMode'] != 1 || empty($poll->id))
+		if (Config::$modSettings['pollMode'] != 1 || empty($poll->id)) {
 			return false;
+		}
 
 		// If they can edit any poll, they're good to go.
-		if (User::$me->allowedTo('poll_edit_any'))
+		if (User::$me->allowedTo('poll_edit_any')) {
 			return true;
+		}
 
 		// Does this poll belong to current user?
 		$is_own_topic = User::$me->id == Topic::load($poll->topic ?? null)->id_member_started;
@@ -933,8 +931,9 @@ public static function checkEditPermission($poll): bool
 	public static function checkRemovePermission($poll): bool
 	{
 		// If they can remove any poll, they're good to go.
-		if (User::$me->allowedTo('poll_remove_any'))
+		if (User::$me->allowedTo('poll_remove_any')) {
 			return true;
+		}
 
 		// Does this poll belong to current user?
 		$is_own_topic = User::$me->id == Topic::load($poll->topic ?? null)->id_member_started;
@@ -967,17 +966,18 @@ public static function vote(): void
 
 		$poll = self::load(Topic::$topic_id, self::LOAD_BY_TOPIC);
 
-		if (empty($poll->id))
+		if (empty($poll->id)) {
 			ErrorHandler::fatalLang('poll_error', false);
+		}
 
 		$poll->buildPermissions();
 
 		// If they can't vote, bail out.
-		if (!$poll->permissions['allow_vote'] && !$poll->permissions['allow_change_vote'])
-		{
+		if (!$poll->permissions['allow_vote'] && !$poll->permissions['allow_change_vote']) {
 			// Guests trying to vote illegally get their own error message.
-			if (User::$me->is_guest && !$poll->guest_vote)
+			if (User::$me->is_guest && !$poll->guest_vote) {
 				ErrorHandler::fatalLang('guest_vote_disabled', false);
+			}
 
 			ErrorHandler::fatalLang('poll_error', false);
 		}
@@ -985,13 +985,11 @@ public static function vote(): void
 		User::$me->checkSession('request');
 
 		// Removing their vote(s)?
-		if ($poll->permissions['allow_change_vote'] && !User::$me->is_guest && empty($_POST['options']))
-		{
+		if ($poll->permissions['allow_change_vote'] && !User::$me->is_guest && empty($_POST['options'])) {
 			$changed = false;
-			foreach ($poll->choices as $id => $choice)
-			{
-				if (!empty($choice->voted_this))
-				{
+
+			foreach ($poll->choices as $id => $choice) {
+				if (!empty($choice->voted_this)) {
 					$changed = true;
 					$poll->choices[$id]->votes--;
 					$poll->choices[$id]->voted_this = false;
@@ -999,20 +997,20 @@ public static function vote(): void
 			}
 
 			// Just skip it if they had voted for nothing before.
-			if ($changed)
-			{
+			if ($changed) {
 				// Update the poll.
 				$poll->save();
 
 				// Delete off the log.
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_polls
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_polls
 					WHERE id_member = {int:current_member}
 						AND id_poll = {int:id_poll}',
-					array(
+					[
 						'current_member' => User::$me->id,
 						'id_poll' => $poll->id,
-					)
+					],
 				);
 			}
 
@@ -1021,26 +1019,27 @@ public static function vote(): void
 		}
 
 		// Make sure the option(s) are valid.
-		if (empty($_POST['options']))
+		if (empty($_POST['options'])) {
 			ErrorHandler::fatalLang('didnt_select_vote', false);
+		}
 
 		// Too many options checked!
-		if (count($_REQUEST['options']) > $poll->max_votes)
-			ErrorHandler::fatalLang('poll_too_many_votes', false, array($poll->max_votes));
+		if (count($_REQUEST['options']) > $poll->max_votes) {
+			ErrorHandler::fatalLang('poll_too_many_votes', false, [$poll->max_votes]);
+		}
 
 		$choices = array_map('intval', $_REQUEST['options']);
 
-		$inserts = array();
-		foreach ($choices as $id_choice)
-		{
+		$inserts = [];
+
+		foreach ($choices as $id_choice) {
 			$id_choice = (int) $id_choice;
 			$poll->choices[$id_choice]->votes++;
-			$inserts[] = array($poll->id, User::$me->id, $id_choice);
+			$inserts[] = [$poll->id, User::$me->id, $id_choice];
 		}
 
 		// If it's a guest don't let them vote again.
-		if (User::$me->is_guest && count($choices) > 0)
-		{
+		if (User::$me->is_guest && count($choices) > 0) {
 			// Time is stored in case the poll is reset later, plus what they voted for.
 			$_COOKIE['guest_poll_vote'] = empty($_COOKIE['guest_poll_vote']) ? '' : $_COOKIE['guest_poll_vote'];
 
@@ -1057,15 +1056,16 @@ public static function vote(): void
 		$poll->save();
 
 		// Add their vote to the tally.
-		Db::$db->insert('insert',
+		Db::$db->insert(
+			'insert',
 			'{db_prefix}log_polls',
-			array('id_poll' => 'int', 'id_member' => 'int', 'id_choice' => 'int'),
+			['id_poll' => 'int', 'id_member' => 'int', 'id_choice' => 'int'],
 			$inserts,
-			array('id_poll', 'id_member', 'id_choice')
+			['id_poll', 'id_member', 'id_choice'],
 		);
 
 		// Let mods know about this vote.
-		IntegrationHook::call('integrate_poll_vote', array($poll->id, $choices));
+		IntegrationHook::call('integrate_poll_vote', [$poll->id, $choices]);
 
 		// Return to the post...
 		Utils::redirectexit('topic=' . Topic::$topic_id . '.' . (int) ($_REQUEST['start'] ?? 0));
@@ -1087,25 +1087,28 @@ public static function lock(): void
 
 		$poll = self::load(Topic::$topic_id, self::LOAD_BY_TOPIC);
 
-		if (empty($poll->id))
+		if (empty($poll->id)) {
 			ErrorHandler::fatalLang('poll_error', false);
+		}
 
 		$poll->buildPermissions();
 
 		// Not allowed, so log and show fatal error.
-		if (!$poll->permissions['allow_lock_poll'])
+		if (!$poll->permissions['allow_lock_poll']) {
 			User::$me->isAllowedTo('poll_lock_' . (User::$me->id == $poll->member ? 'own' : 'any'));
+		}
 
-		switch ($poll->voting_locked)
-		{
+		switch ($poll->voting_locked) {
 			// Was locked by a moderator.
 			case 2:
 				// If current user is not a moderator, they can't unlock it.
-				if (!User::$me->allowedTo('moderate_board'))
+				if (!User::$me->allowedTo('moderate_board')) {
 					ErrorHandler::fatalLang('locked_by_admin', 'user');
+				}
 
 				// Otherwise, unlock it.
 				$poll->voting_locked = 0;
+
 				break;
 
 			// Was locked by a regular user, so unlock it.
@@ -1122,7 +1125,7 @@ public static function lock(): void
 
 		$poll->save();
 
-		Logging::logAction(($poll->voting_locked ? '' : 'un') . 'lock_poll', array('topic' => Topic::$topic_id));
+		Logging::logAction(($poll->voting_locked ? '' : 'un') . 'lock_poll', ['topic' => Topic::$topic_id]);
 
 		Utils::redirectexit('topic=' . Topic::$topic_id . '.' . (int) ($_REQUEST['start'] ?? 0));
 	}
@@ -1143,8 +1146,9 @@ public static function lock(): void
 	 */
 	public static function edit(): void
 	{
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		Lang::load('Post');
 		Theme::loadTemplate('Poll');
@@ -1153,19 +1157,22 @@ public static function edit(): void
 		Utils::$context['is_edit'] = isset($_REQUEST['add']) ? 0 : 1;
 
 		// Topic must exist.
-		if (empty(Topic::load()->id))
+		if (empty(Topic::load()->id)) {
 			ErrorHandler::fatalLang('no_board', false);
+		}
 
 		// Get the poll attached to this topic, if there is one.
 		$poll = self::load(Topic::$topic_id, self::LOAD_BY_TOPIC);
 
 		// If we are adding a new poll, make sure that there isn't already a poll there.
-		if (!Utils::$context['is_edit'] && !empty($poll->id))
+		if (!Utils::$context['is_edit'] && !empty($poll->id)) {
 			ErrorHandler::fatalLang('poll_already_exists', false);
+		}
 
 		// Otherwise, if we're editing it, it obviously needs to exist.
-		if (Utils::$context['is_edit'] && empty($poll->id))
+		if (Utils::$context['is_edit'] && empty($poll->id)) {
 			ErrorHandler::fatalLang('poll_not_found', false);
+		}
 
 		// Can you do this?
 		Utils::$context['can_moderate_poll'] = Utils::$context['is_edit'] ? self::checkEditPermission($poll) : self::checkCreatePermission();
@@ -1174,18 +1181,15 @@ public static function edit(): void
 		self::canGuestsVote();
 
 		// Always show one extra box...
-		if (Utils::$context['is_edit'])
-		{
-			do
-			{
-				$poll->addChoice(array(
+		if (Utils::$context['is_edit']) {
+			do {
+				$poll->addChoice([
 					'id' => empty($poll->choices) ? 0 : max(array_keys($poll->choices)) + 1,
 					'number' => count($poll->choices),
 					'label' => '',
 					'votes' => -1,
-				), true);
-			}
-			while (count($poll->choices) < 2);
+				], true);
+			} while (count($poll->choices) < 2);
 		}
 
 		// Basic theme info...
@@ -1198,13 +1202,13 @@ public static function edit(): void
 		Utils::$context['page_title'] = Utils::$context['is_edit'] ? Lang::$txt['poll_edit'] : Lang::$txt['add_poll'];
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?topic=' . Topic::$info->id . '.0',
 			'name' => Topic::$info->subject,
-		);
-		Utils::$context['linktree'][] = array(
+		];
+		Utils::$context['linktree'][] = [
 			'name' => Utils::$context['page_title'],
-		);
+		];
 
 		// Register this form in the session variables.
 		Security::checkSubmitOnce('register');
@@ -1225,18 +1229,21 @@ public static function edit(): void
 	 */
 	public static function edit2(): void
 	{
-		$errors = array();
+		$errors = [];
 
 		// Sneaking off, are we?
-		if (empty($_POST))
+		if (empty($_POST)) {
 			Utils::redirectexit('action=editpoll;topic=' . Topic::$topic_id . '.0');
+		}
 
-		if (User::$me->checkSession('post', '', false) != '')
+		if (User::$me->checkSession('post', '', false) != '') {
 			$errors[] = 'session_timeout';
+		}
 
 		// Topic must exist.
-		if (empty(Topic::load()->id))
+		if (empty(Topic::load()->id)) {
 			ErrorHandler::fatalLang('no_board', false);
+		}
 
 		// Is this a new poll, or editing an existing?
 		$is_edit = isset($_REQUEST['add']) ? 0 : 1;
@@ -1245,24 +1252,23 @@ public static function edit2(): void
 		$poll = self::load(Topic::$topic_id, self::LOAD_BY_TOPIC);
 
 		// Check their adding/editing is valid.
-		if (!$is_edit && !empty($poll->id))
+		if (!$is_edit && !empty($poll->id)) {
 			ErrorHandler::fatalLang('poll_already_exists');
+		}
 
 		// Are we editing a poll that doesn't exist?
-		if ($is_edit && empty($poll->id))
+		if ($is_edit && empty($poll->id)) {
 			ErrorHandler::fatalLang('poll_not_found');
+		}
 
 		// Does this poll belong to the current user?
 		$is_own_topic = User::$me->id == Topic::$info->id_member_started;
 		$is_own_poll = $is_own_topic || (!empty($poll->member) && User::$me->id == $poll->member);
 
 		// Check if they have the power to add or edit the poll.
-		if ($is_edit && !User::$me->allowedTo('poll_edit_any'))
-		{
+		if ($is_edit && !User::$me->allowedTo('poll_edit_any')) {
 			User::$me->isAllowedTo('poll_edit_' . ($is_own_poll ? 'own' : 'any'));
-		}
-		elseif (!$is_edit && !User::$me->allowedTo('poll_add_any'))
-		{
+		} elseif (!$is_edit && !User::$me->allowedTo('poll_add_any')) {
 			User::$me->isAllowedTo('poll_add_' . ($is_own_topic ? 'own' : 'any'));
 		}
 
@@ -1270,74 +1276,70 @@ public static function edit2(): void
 		Security::checkSubmitOnce('check');
 
 		// If adding a new poll to this topic, use the create method.
-		if (!$is_edit && empty($poll->id))
-		{
+		if (!$is_edit && empty($poll->id)) {
 			unset($poll);
 			$poll = self::create($errors);
 			$poll->topic = Topic::$topic_id;
 
-			if (!empty($errors))
-			{
+			if (!empty($errors)) {
 				self::edit();
+
 				return;
 			}
 
 			$poll->save();
 
-			Logging::logAction('add_poll', array('topic' => Topic::$topic_id));
+			Logging::logAction('add_poll', ['topic' => Topic::$topic_id]);
 			Utils::redirectexit('topic=' . Topic::$topic_id . '.' . (int) ($_REQUEST['start'] ?? 0));
 		}
 
 		// Clean up everything in $_POST.
 		self::sanitizeInput($errors);
 
-		if (!empty($errors))
-		{
+		if (!empty($errors)) {
 			self::edit();
+
 			return;
 		}
 
 		// Set the properties.
-		$props = array(
+		$props = [
 			'question' => $_POST['question'],
 			'max_votes' => $_POST['poll_max_votes'],
 			'expire_time' => empty($_POST['poll_expire']) ? 0 : time() + $_POST['poll_expire'] * 86400,
 			'hide_results' => $_POST['poll_hide'],
 			'change_vote' => $_POST['poll_change_vote'],
 			'guest_vote' => $_POST['poll_guest_vote'],
-			'choices' => array(),
-		);
+			'choices' => [],
+		];
 
 		$poll->set($props);
 
-		foreach (array_values($_POST['options']) as $id => $label)
-		{
+		foreach (array_values($_POST['options']) as $id => $label) {
 			$id = (int) $id;
 
-			if (isset($poll->choices[$id]))
-			{
+			if (isset($poll->choices[$id])) {
 				$poll->choices[$id]->label = $label;
-			}
-			else
-			{
-				$poll->addChoice(array(
+			} else {
+				$poll->addChoice([
 					'id' => $id,
 					'poll' => $poll->id,
 					'label' => $label,
 					'votes' => 0,
-				));
+				]);
 			}
 		}
 
 		// Shall I reset the vote count, sir?
-		if (isset($_POST['resetVoteCount']))
+		if (isset($_POST['resetVoteCount'])) {
 			$poll->resetVotes();
+		}
 
 		$poll->save();
 
 		// Log this edit.
 		$action = isset($_POST['resetVoteCount']) ? 'reset' : 'edit';
-		Logging::logAction($action . '_poll', array('topic' => Topic::$topic_id));
+		Logging::logAction($action . '_poll', ['topic' => Topic::$topic_id]);
 
 		// Off we go.
 		Utils::redirectexit('topic=' . Topic::$topic_id . '.' . (int) ($_REQUEST['start'] ?? 0));
@@ -1355,62 +1357,68 @@ public static function edit2(): void
 	public static function remove()
 	{
 		// Make sure the topic is not empty.
-		if (empty(Topic::$topic_id))
+		if (empty(Topic::$topic_id)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Verify the session.
 		User::$me->checkSession('get');
 
 		$poll = self::load(Topic::$topic_id, self::LOAD_BY_TOPIC);
 
-		if (empty($poll->id))
+		if (empty($poll->id)) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		self::checkRemovePermission($poll);
 
 		// Remove all user logs for this poll.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_polls
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_polls
 			WHERE id_poll = {int:id_poll}',
-			array(
+			[
 				'id_poll' => $poll->id,
-			)
+			],
 		);
 
 		// Remove all poll choices.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}poll_choices
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}poll_choices
 			WHERE id_poll = {int:id_poll}',
-			array(
+			[
 				'id_poll' => $poll->id,
-			)
+			],
 		);
 
 		// Remove the poll itself.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}polls
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}polls
 			WHERE id_poll = {int:id_poll}',
-			array(
+			[
 				'id_poll' => $poll->id,
-			)
+			],
 		);
 
 		// Finally set the topic's poll ID back to 0.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_poll = {int:no_poll}
 			WHERE id_topic = {int:current_topic}',
-			array(
+			[
 				'current_topic' => Topic::$topic_id,
 				'no_poll' => 0,
-			)
+			],
 		);
 
 		// Let mods know that this poll has been removed.
-		IntegrationHook::call('integrate_poll_remove', array($poll->id));
+		IntegrationHook::call('integrate_poll_remove', [$poll->id]);
 
 		// Log this!
-		Logging::logAction('remove_poll', array('topic' => Topic::$topic_id));
+		Logging::logAction('remove_poll', ['topic' => Topic::$topic_id]);
 
 		// Take the moderator back to the topic.
 		Utils::redirectexit('topic=' . Topic::$topic_id . '.' . (int) ($_REQUEST['start'] ?? 0));
@@ -1432,16 +1440,19 @@ protected function __construct(int $id = 0, int $options = 0)
 		$load_by = self::LOAD_BY_ID;
 
 		// The LOAD_BY_* constants are mutually exclusive.
-		foreach (array(self::LOAD_BY_TOPIC, self::LOAD_BY_RECENT, self::LOAD_BY_VOTES) as $const)
+		foreach ([self::LOAD_BY_TOPIC, self::LOAD_BY_RECENT, self::LOAD_BY_VOTES] as $const) {
 			$load_by = $options & $const ? $const : $load_by;
+		}
 
 		// ID will be empty if loading by recent or by votes.
-		if (!empty($id) || $load_by == self::LOAD_BY_RECENT || $load_by == self::LOAD_BY_VOTES)
+		if (!empty($id) || $load_by == self::LOAD_BY_RECENT || $load_by == self::LOAD_BY_VOTES) {
 			$this->loadPollData($id, $load_by, $options);
+		}
 
 		// No poll found, so initialize a new one.
-		if (empty($this->id))
+		if (empty($this->id)) {
 			$this->initNewPoll();
+		}
 
 		self::$loaded[$this->id] = $this;
 	}
@@ -1453,25 +1464,25 @@ protected function __construct(int $id = 0, int $options = 0)
 	 */
 	protected function initNewPoll(): void
 	{
-		$this->set(array(
+		$this->set([
 			'id' => 0,
 			'max_votes' => max(1, (int) ($_POST['poll_max_votes'] ?? 0)),
 			'hide_results' => min(max((int) ($_POST['poll_hide'] ?? 0), 0), 2),
 			'expire_time' => (int) ($_POST['poll_expire'] ?? 0),
 			'change_vote' => !empty($_POST['poll_change_vote']),
 			'guest_vote' => !empty($_POST['poll_guest_vote']),
-		));
+		]);
 
 		// Make all five poll choices empty.
 		Utils::$context['last_choice_id'] = 4;
-		for ($i = 0; $i <= Utils::$context['last_choice_id']; $i++)
-		{
-			$this->addChoice(array(
+
+		for ($i = 0; $i <= Utils::$context['last_choice_id']; $i++) {
+			$this->addChoice([
 				'id' => $i,
 				'number' => $i + 1,
 				'label' => '',
 				'is_last' => $i === Utils::$context['last_choice_id'],
-			), true);
+			], true);
 		}
 	}
 
@@ -1484,19 +1495,19 @@ protected function initNewPoll(): void
 	 */
 	protected function loadPollData(int $id, int $load_by, int &$options): void
 	{
-		switch ($load_by)
-		{
+		switch ($load_by) {
 			case self::LOAD_BY_VOTES:
 				$most_active = $this->getMostActive($options);
 
 				$this->selects[] = 't.id_topic';
 
-				$this->joins = array_merge(array(
+				$this->joins = array_merge([
 					't' => 'INNER JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)',
-				), $this->joins);
+				], $this->joins);
 
-				$this->where = array('p.id_poll = {int:id}');
+				$this->where = ['p.id_poll = {int:id}'];
 				$this->params['id'] = $most_active;
+
 				break;
 
 			case self::LOAD_BY_RECENT:
@@ -1504,34 +1515,36 @@ protected function loadPollData(int $id, int $load_by, int &$options): void
 
 				$this->selects[] = 't.id_topic';
 
-				$this->joins = array_merge(array(
+				$this->joins = array_merge([
 					't' => 'INNER JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)',
-				), $this->joins);
+				], $this->joins);
 
-				$this->where = array('p.id_poll = {int:id}');
+				$this->where = ['p.id_poll = {int:id}'];
 				$this->params['id'] = $most_recent;
+
 				break;
 
 			case self::LOAD_BY_TOPIC:
 				$this->selects[] = 't.id_topic';
 
-				$this->joins = array_merge(array(
+				$this->joins = array_merge([
 					't' => 'INNER JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)',
-				), $this->joins);
+				], $this->joins);
 
-				$this->where = array('t.id_topic = {int:id}');
+				$this->where = ['t.id_topic = {int:id}'];
 				$this->params['id'] = $id;
+
 				break;
 
 			case self::LOAD_BY_ID:
-				if (isset(Topic::$topic_id))
-				{
+				if (isset(Topic::$topic_id)) {
 					$selects[] = '{int:topic} AS id_topic';
 					$params['topic'] = Topic::$topic_id;
 				}
 
-				$this->where = array('p.id_poll = {int:id}');
+				$this->where = ['p.id_poll = {int:id}'];
 				$this->params['id'] = $id;
+
 				break;
 		}
 
@@ -1539,25 +1552,29 @@ protected function loadPollData(int $id, int $load_by, int &$options): void
 		$this->checkLocked($options);
 		$this->checkExpiry($options);
 
-		$request = Db::$db->query('', '
-			SELECT ' . (implode(", ", $this->selects)) . '
+		$request = Db::$db->query(
+			'',
+			'SELECT ' . (implode(', ', $this->selects)) . '
 			FROM {db_prefix}polls AS p
 				' . (implode("\n\t\t\t\t", $this->joins)) . '
 			WHERE (' . (implode(")\n\t\t\t\tAND (", $this->where)) . ')
 			ORDER BY ' . (implode(', ', $this->order)),
-			$this->params
+			$this->params,
 		);
 
-		if (Db::$db->num_rows($request) == 0)
+		if (Db::$db->num_rows($request) == 0) {
 			return;
+		}
 
-		while ($row = Db::$db->fetch_assoc($request))
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$this->setProperties($row);
+		}
 
 		Db::$db->free_result($request);
 
-		foreach ($this->choices as $choice)
+		foreach ($this->choices as $choice) {
 			$this->total += $choice->votes;
+		}
 
 		$this->getVoters();
 	}
@@ -1570,15 +1587,17 @@ protected function loadPollData(int $id, int $load_by, int &$options): void
 	protected function setProperties(array $row): void
 	{
 		// This should never happen, but just in case...
-		if (isset($this->id) && $this->id != $row['id_poll'])
+		if (isset($this->id) && $this->id != $row['id_poll']) {
 			return;
+		}
 
 		$this->addChoice($row);
 
 		unset($row['id_choice'], $row['label'], $row['votes']);
 
-		if (!isset($this->id))
+		if (!isset($this->id)) {
 			$this->set($row);
+		}
 	}
 
 	/**
@@ -1586,18 +1605,20 @@ protected function setProperties(array $row): void
 	 */
 	protected function getVoters(): void
 	{
-		if (!isset($this->id))
+		if (!isset($this->id)) {
 			return;
+		}
 
-		$request = Db::$db->query('', '
-			SELECT id_member, id_choice
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, id_choice
 			FROM {db_prefix}log_polls
 			WHERE id_poll = {int:id_poll}
 				AND id_member != {int:guest}',
-			array(
+			[
 				'id_poll' => $this->id,
 				'guest' => 0,
-			)
+			],
 		);
 		$votes = Db::$db->fetch_all($request);
 		Db::$db->free_result($request);
@@ -1606,57 +1627,47 @@ protected function getVoters(): void
 		$this->total_voters = count($this->voters) + $this->num_guest_voters;
 
 		// Did you vote, and what did you vote for?
-		if (!User::$me->is_guest)
-		{
+		if (!User::$me->is_guest) {
 			$this->has_voted = in_array(User::$me->id, $this->voters);
 
-			foreach ($votes as $vote)
-			{
-				if ($vote['id_member'] != User::$me->id)
+			foreach ($votes as $vote) {
+				if ($vote['id_member'] != User::$me->id) {
 					continue;
+				}
 
 				$this->choices[$vote['id_choice']]['voted_this'] = true;
 			}
 		}
 		// If this is a guest we need to do our best to work out if they have voted, and what they voted for.
-		elseif ($this->guest_vote && User::$me->allowedTo('poll_vote'))
-		{
-			if (!empty($_COOKIE['guest_poll_vote']) && preg_match('~^[0-9,;]+$~', $_COOKIE['guest_poll_vote']) && strpos($_COOKIE['guest_poll_vote'], ';' . Topic::$info->id_poll . ',') !== false)
-			{
+		elseif ($this->guest_vote && User::$me->allowedTo('poll_vote')) {
+			if (!empty($_COOKIE['guest_poll_vote']) && preg_match('~^[0-9,;]+$~', $_COOKIE['guest_poll_vote']) && strpos($_COOKIE['guest_poll_vote'], ';' . Topic::$info->id_poll . ',') !== false) {
 				// ;id,timestamp,[vote,vote...]; etc
 				$guestinfo = explode(';', $_COOKIE['guest_poll_vote']);
 
 				// Find the poll we're after.
-				foreach ($guestinfo as $i => $guestvoted)
-				{
+				foreach ($guestinfo as $i => $guestvoted) {
 					$guestvoted = explode(',', $guestvoted);
 
-					if ($guestvoted[0] == $this->id)
+					if ($guestvoted[0] == $this->id) {
 						break;
+					}
 				}
 
 				// Has the poll been reset since guest voted?
-				if ($pollinfo->reset_poll > $guestvoted[1])
-				{
+				if ($pollinfo->reset_poll > $guestvoted[1]) {
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
 
-					if (!empty($guestinfo))
-					{
+					if (!empty($guestinfo)) {
 						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					}
-					else
-					{
+					} else {
 						unset($_COOKIE['guest_poll_vote']);
 					}
-				}
-				else
-				{
+				} else {
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
 
-					foreach ($pollinfo->choices as $choice => $details)
-					{
+					foreach ($pollinfo->choices as $choice => $details) {
 						$choice->voted_this = in_array($choice, $guestvoted);
 						$pollinfo->has_voted |= $choice->voted_this;
 					}
@@ -1674,25 +1685,21 @@ protected function getVoters(): void
 	 */
 	protected function checkAccess(int $options): void
 	{
-		if ($options & self::CHECK_ACCESS || $options & self::CHECK_IGNORE)
-		{
+		if ($options & self::CHECK_ACCESS || $options & self::CHECK_IGNORE) {
 			$this->selects[] = 't.id_board';
 			$this->where[] = $options & self::CHECK_IGNORE ? '{query_wanna_see_topic_board}' : '{query_see_topic_board}';
 
-			if (!empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']))
-			{
+			if (!empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board'])) {
 				$this->where[] = 't.id_board != {int:recycle_board}';
 				$this->params['recycle_board'] = Config::$modSettings['recycle_board'];
 			}
 
-			if (Config::$modSettings['postmod_active'])
-			{
+			if (Config::$modSettings['postmod_active']) {
 				$this->where[] = 't.approved = {int:is_approved}';
 				$this->params['is_approved'] = 1;
 			}
 
-			if ($options & self::CHECK_ACCESS && !in_array(0, ($boardsAllowed = User::$me->boardsAllowedTo('poll_view'))))
-			{
+			if ($options & self::CHECK_ACCESS && !in_array(0, ($boardsAllowed = User::$me->boardsAllowedTo('poll_view')))) {
 				$this->where[] = 't.id_board IN ({array_int:boards_allowed_see})';
 				$this->params['boards_allowed_see'] = $boardsAllowed;
 			}
@@ -1707,8 +1714,7 @@ protected function checkAccess(int $options): void
 	 */
 	protected function checkLocked(int $options): void
 	{
-		if ($options & self::CHECK_LOCKED)
-		{
+		if ($options & self::CHECK_LOCKED) {
 			$this->where[] = 'p.voting_locked = {int:voting_opened}';
 			$this->params['voting_opened'] = 0;
 		}
@@ -1722,8 +1728,7 @@ protected function checkLocked(int $options): void
 	 */
 	protected function checkExpiry(int $options): void
 	{
-		if ($options & self::CHECK_EXPIRY)
-		{
+		if ($options & self::CHECK_EXPIRY) {
 			$this->where[] = 'p.expire_time = {int:no_expiration} OR {int:current_time} < p.expire_time';
 			$this->params['no_expiration'] = 0;
 			$this->params['current_time'] = time();
@@ -1746,8 +1751,9 @@ protected function resetQueryOptions(int &$options): void
 		// Reset the query to default.
 		$class_vars = get_class_vars(__CLASS__);
 
-		foreach (array('selects', 'joins', 'where', 'order', 'params') as $var)
+		foreach (['selects', 'joins', 'where', 'order', 'params'] as $var) {
 			$this->{$var} = $class_vars[$var];
+		}
 	}
 
 	/**
@@ -1758,21 +1764,23 @@ protected function resetQueryOptions(int &$options): void
 	 */
 	protected function getMostRecent(&$options): int
 	{
-		$this->joins = array_merge(array(
+		$this->joins = array_merge([
 			't' => 'INNER JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)',
-		), $this->joins);
+		], $this->joins);
 
 		$this->checkAccess($options);
 		$this->checkLocked($options);
 		$this->checkExpiry($options);
 
-		$request = Db::$db->query('', '
-			SELECT MAX(p.id_poll)
+		$request = Db::$db->query(
+			'',
+			'SELECT MAX(p.id_poll)
 			FROM {db_prefix}polls AS p
 				' . (implode("\n\t\t\t\t", $this->joins)) . '
 			WHERE (' . (implode(")\n\t\t\t\tAND (", $this->where)) . ')
+			GROUP BY p.id_poll
 			ORDER BY ' . (implode(', ', $this->order)),
-			$this->params
+			$this->params,
 		);
 		list($most_recent) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -1790,24 +1798,25 @@ protected function getMostRecent(&$options): int
 	 */
 	protected function getMostActive(&$options): int
 	{
-		$this->joins = array(
+		$this->joins = [
 			'p' => 'INNER JOIN {db_prefix}polls AS p ON (lp.id_poll = p.id_poll)',
 			't' => 'INNER JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)',
-		);
+		];
 
 		$this->checkAccess($options);
 		$this->checkLocked($options);
 		$this->checkExpiry($options);
 
-		$request = Db::$db->query('', '
-			SELECT lp.id_poll, COUNT(*) AS num_votes
+		$request = Db::$db->query(
+			'',
+			'SELECT lp.id_poll, COUNT(*) AS num_votes
 			FROM {db_prefix}log_polls AS lp
 				' . (implode("\n\t\t\t\t", $this->joins)) . '
 			WHERE (' . (implode(")\n\t\t\t\tAND (", $this->where)) . ')
 			GROUP BY lp.id_poll
 			ORDER BY num_votes DESC
 			LIMIT 1',
-			$this->params
+			$this->params,
 		);
 		list($most_active, $num_votes) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -1828,13 +1837,13 @@ protected function getMostActive(&$options): int
 	 */
 	protected static function canGuestsVote(): bool
 	{
-		if (isset(self::$guest_vote_enabled))
+		if (isset(self::$guest_vote_enabled)) {
 			return self::$guest_vote_enabled;
+		}
 
 		self::$guest_vote_enabled = false;
 
-		if (isset(Board::$info->id))
-		{
+		if (isset(Board::$info->id)) {
 			$groupsAllowedVote = User::groupsAllowedTo('poll_vote', Board::$info->id);
 			self::$guest_vote_enabled = in_array(-1, $groupsAllowedVote['allowed']);
 		}
@@ -1847,52 +1856,48 @@ protected static function canGuestsVote(): bool
 	 */
 	protected static function sanitizeInput(&$errors): void
 	{
-		if (!isset($_POST['question']) || trim($_POST['question']) == '')
+		if (!isset($_POST['question']) || trim($_POST['question']) == '') {
 			$errors[] = 'no_question';
+		}
 
-		$_POST['options'] = empty($_POST['options']) ? array() : Utils::htmlTrimRecursive($_POST['options']);
+		$_POST['options'] = empty($_POST['options']) ? [] : Utils::htmlTrimRecursive($_POST['options']);
 
 		// Get rid of empty ones.
-		foreach ($_POST['options'] as $k => $option)
-		{
-			if ($option == '')
+		foreach ($_POST['options'] as $k => $option) {
+			if ($option == '') {
 				unset($_POST['options'][$k], $_POST['options'][$k]);
+			}
 		}
 
 		// What are you going to vote between with one choice?!?
-		if (count($_POST['options']) < 2)
-		{
+		if (count($_POST['options']) < 2) {
 			$errors[] = 'poll_few';
-		}
-		elseif (count($_POST['options']) > 256)
-		{
+		} elseif (count($_POST['options']) > 256) {
 			$errors[] = 'poll_many';
 		}
 
-		if (!empty($errors))
+		if (!empty($errors)) {
 			return;
+		}
 
 		// Make sure these things are all sane.
-		$_POST['poll_max_votes'] = min(max((int) ($_POST['poll_max_votes'] ?? 1), 1), count($_POST['options'] ?? array()));
+		$_POST['poll_max_votes'] = min(max((int) ($_POST['poll_max_votes'] ?? 1), 1), count($_POST['options'] ?? []));
 		$_POST['poll_expire'] = min(max((int) ($_POST['poll_expire'] ?? 0), 0), 9999);
 		$_POST['poll_hide'] = (int) ($_POST['poll_hide'] ?? 0);
 		$_POST['poll_change_vote'] = (int) !empty($_POST['poll_change_vote']);
 		$_POST['poll_guest_vote'] = (int) !empty($_POST['poll_guest_vote']);
 
 		// Make sure guests are actually allowed to vote generally.
-		if ($_POST['poll_guest_vote'])
-		{
+		if ($_POST['poll_guest_vote']) {
 			$_POST['poll_guest_vote'] = self::canGuestsVote();
 		}
 
 		// If the user tries to set the poll too far in advance, don't let them.
-		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1)
-		{
+		if (!empty($_POST['poll_expire']) && $_POST['poll_expire'] < 1) {
 			ErrorHandler::fatalLang('poll_range_error', false);
 		}
 		// Don't allow them to select option 2 for hidden results if it's not time limited.
-		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2)
-		{
+		elseif (empty($_POST['poll_expire']) && $_POST['poll_hide'] == 2) {
 			$_POST['poll_hide'] = 1;
 		}
 
@@ -1905,7 +1910,8 @@ protected static function sanitizeInput(&$errors): void
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Poll::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Poll::exportStatic')) {
 	Poll::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/PollChoice.php b/Sources/PollChoice.php
index c80a673abd..0c8b5d0e8e 100644
--- a/Sources/PollChoice.php
+++ b/Sources/PollChoice.php
@@ -77,10 +77,10 @@ class PollChoice implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_choice' => 'id',
 		'id_poll' => 'poll',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -91,7 +91,7 @@ class PollChoice implements \ArrayAccess
 	 *
 	 * @param array $props Properties to set.
 	 */
-	public function __construct(array $props = array())
+	public function __construct(array $props = [])
 	{
 		$this->set($props);
 	}
@@ -104,18 +104,15 @@ public function __construct(array $props = array())
 	public function save(): void
 	{
 		// Delete if label is empty.
-		if (trim(Utils::normalizeSpaces($this->label)) === '')
-		{
+		if (trim(Utils::normalizeSpaces($this->label)) === '') {
 			$this->delete();
 		}
 		// Not new, so update the existing one.
-		elseif (empty($this->new))
-		{
+		elseif (empty($this->new)) {
 			$this->update();
 		}
 		// New, so add it.
-		else
-		{
+		else {
 			$this->add();
 		}
 	}
@@ -125,11 +122,12 @@ public function save(): void
 	 */
 	public function add(): void
 	{
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}poll_choices',
-			array('id_poll' => 'int', 'id_choice' => 'int', 'label' => 'string-255'),
-			array($this->poll, $this->id, $this->label),
-			array()
+			['id_poll' => 'int', 'id_choice' => 'int', 'label' => 'string-255'],
+			[$this->poll, $this->id, $this->label],
+			[],
 		);
 	}
 
@@ -138,17 +136,18 @@ public function add(): void
 	 */
 	public function update(): void
 	{
-		Db::$db->query('', '
-			UPDATE {db_prefix}poll_choices
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}poll_choices
 			SET label = {string:label}, votes = {int:votes}
 			WHERE id_poll = {int:id_poll}
 				AND id_choice = {int:id_choice}',
-			array(
+			[
 				'id_poll' => $this->poll,
 				'id_choice' => $this->id,
 				'label' => $this->label,
 				'votes' => $this->votes,
-			)
+			],
 		);
 	}
 
@@ -157,24 +156,26 @@ public function update(): void
 	 */
 	public function delete(): void
 	{
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_polls
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_polls
 			WHERE id_poll = {int:id_poll}
 				AND id_choice = {int:to_delete}',
-			array(
+			[
 				'to_delete' => $this->id,
 				'id_poll' => $this->id_poll,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}poll_choices
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}poll_choices
 			WHERE id_poll = {int:id_poll}
 				AND id_choice = {int:to_delete}',
-			array(
+			[
 				'to_delete' => $this->id,
 				'id_poll' => $this->id_poll,
-			)
+			],
 		);
 	}
 }
diff --git a/Sources/Profile-Actions.php b/Sources/Profile-Actions.php
index 8e3bbfddfe..cf6a76baf5 100644
--- a/Sources/Profile-Actions.php
+++ b/Sources/Profile-Actions.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('\\SMF\\Actions\\Profile\\Activate');
 class_exists('\\SMF\\Actions\\Profile\\Delete');
diff --git a/Sources/Profile-Modify.php b/Sources/Profile-Modify.php
index 5c2dd5b0df..69c4a0243b 100644
--- a/Sources/Profile-Modify.php
+++ b/Sources/Profile-Modify.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('\\SMF\\Alert');
 class_exists('\\SMF\\Profile');
diff --git a/Sources/Profile-View.php b/Sources/Profile-View.php
index 5e6a2316c0..9749390666 100644
--- a/Sources/Profile-View.php
+++ b/Sources/Profile-View.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('\\SMF\\Alert');
 class_exists('\\SMF\\Actions\\Profile\\ShowAlerts');
diff --git a/Sources/Profile.php b/Sources/Profile.php
index 702f059e6c..38b3cf60ba 100644
--- a/Sources/Profile.php
+++ b/Sources/Profile.php
@@ -26,15 +26,18 @@
  */
 class Profile extends User implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
+			'loadCustomFieldDefinitions' => 'loadCustomFieldDefinitions',
+			'validateSignature' => 'validateSignature',
 			'backcompat_profileLoadGroups' => 'profileLoadGroups',
 			'backcompat_loadProfileFields' => 'loadProfileFields',
 			'backcompat_loadCustomFields' => 'loadCustomFields',
@@ -42,19 +45,19 @@ class Profile extends User implements \ArrayAccess
 			'backcompat_setupProfileContext' => 'setupProfileContext',
 			'backcompat_makeCustomFieldChanges' => 'makeCustomFieldChanges',
 			'backcompat_makeThemeChanges' => 'makeThemeChanges',
-		),
-		'prop_names' => array(
+		],
+		'prop_names' => [
 			'profile_fields' => 'profile_fields',
 			'profile_vars' => 'profile_vars',
 			'cur_profile' => 'cur_profile',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const RESERVED_VARS = array(
+	public const RESERVED_VARS = [
 		'actual_theme_url',
 		'actual_images_url',
 		'base_theme_dir',
@@ -71,7 +74,7 @@ class Profile extends User implements \ArrayAccess
 		'theme_layers',
 		'theme_templates',
 		'theme_url',
-	);
+	];
 
 	/*******************
 	 * Public properties
@@ -82,14 +85,14 @@ class Profile extends User implements \ArrayAccess
 	 *
 	 * The standard profile fields for this member.
 	 */
-	public array $standard_fields = array();
+	public array $standard_fields = [];
 
 	/**
 	 * @var array
 	 *
 	 * The standard custom fields for this member.
 	 */
-	public array $custom_fields = array();
+	public array $custom_fields = [];
 
 	/**
 	 * @var bool
@@ -103,7 +106,7 @@ class Profile extends User implements \ArrayAccess
 	 *
 	 * Info about groups that this member could be assigned to.
 	 */
-	public array $assignable_groups = array();
+	public array $assignable_groups = [];
 
 	/**
 	 * @var array
@@ -112,41 +115,41 @@ class Profile extends User implements \ArrayAccess
 	 *
 	 * This is a reference to User::$profiles[$this->id].
 	 */
-	public array $data = array();
+	public array $data = [];
 
 	/**
 	 * @var array
 	 *
 	 * New profile values to save.
 	 */
-	public array $new_data = array();
+	public array $new_data = [];
 
 	/**
 	 * @var array
 	 *
 	 * New custom profile field values to save.
 	 */
-	public array $new_cf_data = array(
-		'updates' => array(),
-		'deletes' => array(),
-	);
+	public array $new_cf_data = [
+		'updates' => [],
+		'deletes' => [],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * New theme option values to save.
 	 */
-	public array $new_options = array(
-		'updates' => array(),
-		'deletes' => array(),
-	);
+	public array $new_options = [
+		'updates' => [],
+		'deletes' => [],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Any errors encountered while trying to save changes.
 	 */
-	public array $save_errors = array();
+	public array $save_errors = [];
 
 	/**
 	 * @var bool
@@ -164,7 +167,7 @@ class Profile extends User implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var int
@@ -200,7 +203,7 @@ class Profile extends User implements \ArrayAccess
 	 * This is a reference to Profile::$member->data.
 	 * Only exists for backward compatibility reasons.
 	 */
-	public static array $cur_profile = array();
+	public static array $cur_profile = [];
 
 	/**
 	 * @var array
@@ -208,7 +211,7 @@ class Profile extends User implements \ArrayAccess
 	 * This is a reference to Profile::$member->standard_fields.
 	 * Only exists for backward compatibility reasons.
 	 */
-	public static array $profile_fields = array();
+	public static array $profile_fields = [];
 
 	/**
 	 * @var array
@@ -216,7 +219,7 @@ class Profile extends User implements \ArrayAccess
 	 * This is a reference to Profile::$member->new_data.
 	 * Only exists for backward compatibility reasons.
 	 */
-	public static array $profile_vars = array();
+	public static array $profile_vars = [];
 
 	/**
 	 * @var array
@@ -224,7 +227,7 @@ class Profile extends User implements \ArrayAccess
 	 * This is a reference to Profile::$member->save_errors.
 	 * Only exists for backward compatibility reasons.
 	 */
-	public static array $post_errors = array();
+	public static array $post_errors = [];
 
 	/*********************
 	 * Internal properties
@@ -242,14 +245,14 @@ class Profile extends User implements \ArrayAccess
 	 *
 	 * Data about a downloaded avatar.
 	 */
-	protected array $new_avatar_data = array();
+	protected array $new_avatar_data = [];
 
 	/**
 	 * @var array
 	 *
 	 * Data to pass to logChanges() upon a successful save.
 	 */
-	protected array $log_changes = array();
+	protected array $log_changes = [];
 
 	/**
 	 * @var int
@@ -266,7 +269,7 @@ class Profile extends User implements \ArrayAccess
 	 * Everything in this array is also added to $save_errors, but it is helpful
 	 * in some places to be able to distinguish these from the others.
 	 */
-	protected array $cf_save_errors = array();
+	protected array $cf_save_errors = [];
 
 	/****************
 	 * Public methods
@@ -280,10 +283,11 @@ class Profile extends User implements \ArrayAccess
 	public function loadStandardFields(bool $force_reload = false)
 	{
 		// Don't load this twice!
-		if (!empty($this->standard_fields) && !$force_reload)
+		if (!empty($this->standard_fields) && !$force_reload) {
 			return;
+		}
 
-		/**
+		/*
 		 * This horrific array defines all the profile fields in the world!
 		 *
 		 * In general each "field" has one array, the key of which is the
@@ -355,108 +359,93 @@ public function loadStandardFields(bool $force_reload = false)
 		 * sets the value of $this->data correctly in order to
 		 * enable the changes to be displayed correctly on submit of the form.
 		 */
-		$this->standard_fields = array(
-			'avatar_choice' => array(
+		$this->standard_fields = [
+			'avatar_choice' => [
 				'type' => 'callback',
 				'callback_func' => 'avatar_select',
 				// This handles the permissions too.
-				'preload' => array(array($this, 'loadAvatarData')),
-				'input_validate' => array($this, 'validateAvatarData'),
+				'preload' => [[$this, 'loadAvatarData']],
+				'input_validate' => [$this, 'validateAvatarData'],
 				'save_key' => 'avatar',
-			),
-			'bday1' => array(
+			],
+			'bday1' => [
 				'type' => 'callback',
 				'callback_func' => 'birthdate',
 				'permission' => 'profile_extra',
-				'preload' => function()
-				{
+				'preload' => function () {
 					// Split up the birthdate....
 					list($uyear, $umonth, $uday) = explode('-', empty($this->birthdate) || $this->birthdate === '1004-01-01' ? '--' : $this->birthdate);
 
-					Utils::$context['member']['birth_date'] = array(
+					Utils::$context['member']['birth_date'] = [
 						'year' => $uyear,
 						'month' => $umonth,
 						'day' => $uday,
-					);
+					];
 
 					return true;
 				},
-				'input_validate' => function(&$value)
-				{
-					if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
-					{
+				'input_validate' => function (&$value) {
+					if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0) {
 						// Set to blank?
-						if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1)
-						{
+						if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1) {
 							$value = '1004-01-01';
-						}
-						else
-						{
+						} else {
 							$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 1004 ? 1004 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 1004 ? 1004 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '1004-01-01';
 						}
-					}
-					else
-					{
+					} else {
 						$value = '1004-01-01';
 					}
 
 					$this->new_data['birthdate'] = $value;
 					$this->birthdate = $value;
+
 					return false;
 				},
-			),
+			],
 			// Setting the birthdate the old style way?
-			'birthdate' => array(
+			'birthdate' => [
 				'type' => 'hidden',
 				'permission' => 'profile_extra',
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					// @todo Should we check for this year and tell them they made a mistake :P? (based on coppa at least?)
-					if (preg_match('/(\d{4})[\-\., ](\d{2})[\-\., ](\d{2})/', $value, $dates) === 1)
-					{
+					if (preg_match('/(\d{4})[\-., ](\d{2})[\-., ](\d{2})/', $value, $dates) === 1) {
 						$value = checkdate($dates[2], $dates[3], $dates[1] < 4 ? 4 : $dates[1]) ? sprintf('%04d-%02d-%02d', $dates[1] < 4 ? 4 : $dates[1], $dates[2], $dates[3]) : '1004-01-01';
 
 						return true;
 					}
-					else
-					{
-						$value = empty($this->birthdate) ? '1004-01-01' : $this->birthdate;
 
-						return false;
-					}
+					$value = empty($this->birthdate) ? '1004-01-01' : $this->birthdate;
+
+					return false;
 				},
-			),
-			'date_registered' => array(
+			],
+			'date_registered' => [
 				'type' => 'date',
 				'value' => empty($this->date_registered) || !is_int($this->date_registered) ? Lang::$txt['not_applicable'] : Time::strftime('%Y-%m-%d', $this->date_registered),
 				'label' => Lang::$txt['date_registered'],
 				'log_change' => true,
 				'permission' => 'moderate_forum',
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					// Bad date!  Go try again - please?
-					if (($value = strtotime($value)) === false)
-					{
+					if (($value = strtotime($value)) === false) {
 						$value = $this->date_registered;
 
 						return Lang::$txt['invalid_registration'] . ' ' . Time::strftime('%d %b %Y ' . (strpos(User::$me->time_format, '%H') !== false ? '%I:%M:%S %p' : '%H:%M:%S'), time());
 					}
+
 					// As long as it doesn't equal "N/A"...
-					elseif ($value != Lang::$txt['not_applicable'] && $value != strtotime(Time::strftime('%Y-%m-%d', $this->date_registered)))
-					{
+					if ($value != Lang::$txt['not_applicable'] && $value != strtotime(Time::strftime('%Y-%m-%d', $this->date_registered))) {
 						$diff = $this->date_registered - strtotime(Time::strftime('%Y-%m-%d', $this->date_registered));
 
 						$value = $value + $diff;
-					}
-					else
-					{
+					} else {
 						$value = $this->date_registered;
 					}
 
 					return true;
 				},
-			),
-			'email_address' => array(
+			],
+			'email_address' => [
 				'type' => 'email',
 				'label' => Lang::$txt['user_email_address'],
 				'subtext' => Lang::$txt['valid_email'],
@@ -471,117 +460,108 @@ public function loadStandardFields(bool $force_reload = false)
 							return true;
 						}
 					}, false);' : '',
-				'input_validate' => function(&$value)
-				{
-					if (strtolower($value) == strtolower($this->email))
+				'input_validate' => function (&$value) {
+					if (strtolower($value) == strtolower($this->email)) {
 						return false;
+					}
 
 					$isValid = self::validateEmail($value, $this->id);
 
 					// Do they need to revalidate? If so schedule the function!
-					if ($isValid === true && !empty(Config::$modSettings['send_validation_onChange']) && !User::$me->allowedTo('moderate_forum'))
-					{
+					if ($isValid === true && !empty(Config::$modSettings['send_validation_onChange']) && !User::$me->allowedTo('moderate_forum')) {
 						$this->new_data['validation_code'] = User::generateValidationCode();
 
 						$this->new_data['is_activated'] = 2;
 
-						Utils::$context['profile_execute_on_save'][] = array(array($this, 'sendActivation'));
+						Utils::$context['profile_execute_on_save'][] = [[$this, 'sendActivation']];
 
 						unset(Utils::$context['profile_execute_on_save']['reload_user']);
 					}
 
 					return $isValid;
 				},
-			),
+			],
 			// Selecting group membership is complicated so we handle it separately.
-			'id_group' => array(
+			'id_group' => [
 				'type' => 'callback',
 				'callback_func' => 'group_manage',
 				'permission' => 'manage_membergroups',
-				'preload' => array(array($this, 'loadAssignableGroups')),
+				'preload' => [[$this, 'loadAssignableGroups']],
 				'log_change' => true,
-				'input_validate' => function(&$value)
-				{
-					return $this->validateGroups($value, $_POST['additional_groups'] ?? array());
+				'input_validate' => function (&$value) {
+					return $this->validateGroups($value, $_POST['additional_groups'] ?? []);
 				},
-			),
-			'id_theme' => array(
+			],
+			'id_theme' => [
 				'type' => 'callback',
 				'callback_func' => 'theme_pick',
 				'permission' => 'profile_extra',
 				'enabled' => Config::$modSettings['theme_allow'] || User::$me->allowedTo('admin_forum'),
-				'preload' => function()
-				{
-					$request = Db::$db->query('', '
-						SELECT value
+				'preload' => function () {
+					$request = Db::$db->query(
+						'',
+						'SELECT value
 						FROM {db_prefix}themes
 						WHERE id_theme = {int:id_theme}
 							AND variable = {string:variable}
-						LIMIT 1', array(
+						LIMIT 1',
+						[
 							'id_theme' => $this->theme,
 							'variable' => 'name',
-						)
+						],
 					);
 					list($name) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
-					Utils::$context['member']['theme'] = array(
+					Utils::$context['member']['theme'] = [
 						'id' => $this->theme,
-						'name' => empty($this->theme) ? Lang::$txt['theme_forum_default'] : $name
-					);
+						'name' => empty($this->theme) ? Lang::$txt['theme_forum_default'] : $name,
+					];
 
 					return true;
 				},
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					$value = (int) $value;
+
 					return true;
 				},
-			),
-			'lngfile' => array(
+			],
+			'lngfile' => [
 				'type' => 'select',
-				'options' => function()
-				{
-					return array_map(fn($lang) => $lang['name'], Lang::get());
+				'options' => function () {
+					return array_map(fn ($lang) => $lang['name'], Lang::get());
 				},
 				'label' => Lang::$txt['preferred_language'],
 				'permission' => 'profile_identity',
 				'enabled' => !empty(Config::$modSettings['userLanguage']),
 				'value' => $this->language,
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					// Load the languages.
 					Lang::get();
 
-					if (isset(Utils::$context['languages'][$value]))
-					{
-						if (User::$me->is_owner && empty(Utils::$context['password_auth_failed']))
-						{
+					if (isset(Utils::$context['languages'][$value])) {
+						if (User::$me->is_owner && empty(Utils::$context['password_auth_failed'])) {
 							$_SESSION['language'] = $value;
 						}
 
 						return true;
 					}
-					else
-					{
-						$value = $this->language;
 
-						return false;
-					}
+					$value = $this->language;
+
+					return false;
 				},
-			),
+			],
 			// The username is not always editable - so adjust it as such.
-			'member_name' => array(
+			'member_name' => [
 				'type' => User::$me->allowedTo('admin_forum') && isset($_GET['changeusername']) ? 'text' : 'label',
 				'label' => Lang::$txt['username'],
 				'subtext' => User::$me->allowedTo('admin_forum') && !isset($_GET['changeusername']) ? '[<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id . ';area=account;changeusername" style="font-style: italic;">' . Lang::$txt['username_change'] . '</a>]' : '',
 				'log_change' => true,
 				'permission' => 'profile_identity',
 				'prehtml' => User::$me->allowedTo('admin_forum') && isset($_GET['changeusername']) ? '<div class="alert">' . Lang::$txt['username_warning'] . '</div>' : '',
-				'input_validate' => function(&$value)
-				{
-					if (User::$me->allowedTo('admin_forum'))
-					{
+				'input_validate' => function (&$value) {
+					if (User::$me->allowedTo('admin_forum')) {
 						// Maybe they are trying to change their password as well?
 						$reset_password = true;
 
@@ -590,31 +570,28 @@ public function loadStandardFields(bool $force_reload = false)
 							&& $_POST['passwrd1'] != ''
 							&& isset($_POST['passwrd2'])
 							&& $_POST['passwrd1'] == $_POST['passwrd2']
-							&& User::validatePassword(Utils::htmlspecialcharsDecode($_POST['passwrd1']), $value, array($this->name, User::$me->username, User::$me->name, User::$me->email)) == null
-						)
-						{
+							&& User::validatePassword(Utils::htmlspecialcharsDecode($_POST['passwrd1']), $value, [$this->name, User::$me->username, User::$me->name, User::$me->email]) == null
+						) {
 							$reset_password = false;
 						}
 
 						// Do the reset... this will send them an email too.
-						if ($reset_password)
-						{
+						if ($reset_password) {
 							$this->resetPassword($this->id, $value);
-						}
-						elseif ($value !== null)
-						{
-							User::validateUsername($this->id, trim(Utils::normalizeSpaces(Utils::sanitizeChars($value, 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true))));
+						} elseif ($value !== null) {
+							User::validateUsername($this->id, trim(Utils::normalizeSpaces(Utils::sanitizeChars($value, 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true])));
 
-							User::updateMemberData($this->id, array('member_name' => $value));
+							User::updateMemberData($this->id, ['member_name' => $value]);
 
 							// Call this here so any integrated systems will know about the name change (resetPassword() takes care of this if we're letting SMF generate the password)
-							IntegrationHook::call('integrate_reset_pass', array($this->username, $value, $_POST['passwrd1']));
+							IntegrationHook::call('integrate_reset_pass', [$this->username, $value, $_POST['passwrd1']]);
 						}
 					}
+
 					return false;
 				},
-			),
-			'passwrd1' => array(
+			],
+			'passwrd1' => [
 				'type' => 'password',
 				'label' => Lang::$txt['choose_pass'],
 				'subtext' => Lang::$txt['password_strength'],
@@ -623,67 +600,67 @@ public function loadStandardFields(bool $force_reload = false)
 				'permission' => 'profile_password',
 				'save_key' => 'passwd',
 				// Note this will only work if passwrd2 also exists!
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					// If we didn't try it then ignore it!
-					if ($value == '')
+					if ($value == '') {
 						return false;
+					}
 
 					// Do the two entries for the password even match?
-					if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2'])
+					if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2']) {
 						return 'bad_new_password';
+					}
 
 					// Let's get the validation function into play...
-					$passwordErrors = User::validatePassword(Utils::htmlspecialcharsDecode($value), $this->username, array($this->name, User::$me->username, User::$me->name, User::$me->email));
+					$passwordErrors = User::validatePassword(Utils::htmlspecialcharsDecode($value), $this->username, [$this->name, User::$me->username, User::$me->name, User::$me->email]);
 
 					// Were there errors?
-					if ($passwordErrors != null)
+					if ($passwordErrors != null) {
 						return 'password_' . $passwordErrors;
+					}
 
 					// Set up the new password variable... ready for storage.
 					$value = Security::hashPassword($this->username, Utils::htmlspecialcharsDecode($value));
 
 					return true;
 				},
-			),
-			'passwrd2' => array(
+			],
+			'passwrd2' => [
 				'type' => 'password',
 				'label' => Lang::$txt['verify_pass'],
 				'size' => 20,
 				'value' => '',
 				'permission' => 'profile_password',
 				'is_dummy' => true,
-			),
-			'personal_text' => array(
+			],
+			'personal_text' => [
 				'type' => 'text',
 				'label' => Lang::$txt['personal_text'],
 				'log_change' => true,
-				'input_attr' => array('maxlength="50"'),
+				'input_attr' => ['maxlength="50"'],
 				'size' => 50,
 				'permission' => 'profile_blurb',
-				'input_validate' => function(&$value)
-				{
-					if (Utils::entityStrlen($value) > 50)
+				'input_validate' => function (&$value) {
+					if (Utils::entityStrlen($value) > 50) {
 						return 'personal_text_too_long';
+					}
 
 					return true;
 				},
-			),
+			],
 			// This does ALL the pm settings
-			'pm_prefs' => array(
+			'pm_prefs' => [
 				'type' => 'callback',
 				'callback_func' => 'pm_settings',
 				'permission' => 'pm_read',
-				'preload' => function()
-				{
+				'preload' => function () {
 					Utils::$context['display_mode'] = $this->pm_prefs & 3;
 
 					Utils::$context['receive_from'] = !empty($this->pm_receive_from) ? $this->pm_receive_from : 0;
 
 					return true;
 				},
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					// Simple validate and apply the two "sub settings"
 					$value = max(min($value, 2), 0);
 
@@ -691,8 +668,8 @@ public function loadStandardFields(bool $force_reload = false)
 
 					return true;
 				},
-			),
-			'posts' => array(
+			],
+			'posts' => [
 				'type' => 'int',
 				'label' => Lang::$txt['profile_posts'],
 				'log_change' => true,
@@ -700,53 +677,54 @@ public function loadStandardFields(bool $force_reload = false)
 				'min' => 0,
 				'max' => 2 ** 24 - 1,
 				'permission' => 'moderate_forum',
-				'input_validate' => function(&$value)
-				{
-					if (!is_numeric($value))
+				'input_validate' => function (&$value) {
+					if (!is_numeric($value)) {
 						return 'digits_only';
+					}
 
-					if ($value < 0 || $value > 2 ** 24 - 1)
+					if ($value < 0 || $value > 2 ** 24 - 1) {
 						return 'posts_out_of_range';
+					}
 
-					$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+					$value = $value != '' ? strtr($value, [',' => '', '.' => '', ' ' => '']) : 0;
 
 					return true;
 				},
-			),
-			'real_name' => array(
+			],
+			'real_name' => [
 				'type' => User::$me->allowedTo('profile_displayed_name_own') || User::$me->allowedTo('profile_displayed_name_any') || User::$me->allowedTo('moderate_forum') ? 'text' : 'label',
 				'label' => Lang::$txt['name'],
 				'subtext' => Lang::$txt['display_name_desc'],
 				'log_change' => true,
-				'input_attr' => array('maxlength="60"'),
+				'input_attr' => ['maxlength="60"'],
 				'permission' => 'profile_displayed_name',
 				'enabled' => User::$me->allowedTo('profile_displayed_name_own') || User::$me->allowedTo('profile_displayed_name_any') || User::$me->allowedTo('moderate_forum'),
-				'input_validate' => function(&$value)
-				{
-					$value = trim(Utils::normalizeSpaces(Utils::sanitizeChars($value, 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
+				'input_validate' => function (&$value) {
+					$value = trim(Utils::normalizeSpaces(Utils::sanitizeChars($value, 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
 
-					if (trim($value) == '')
+					if (trim($value) == '') {
 						return 'no_name';
+					}
 
-					if (Utils::entityStrlen($value) > 60)
+					if (Utils::entityStrlen($value) > 60) {
 						return 'name_too_long';
+					}
 
-					if ($this->name != $value && User::isReservedName($value, $this->id))
-					{
+					if ($this->name != $value && User::isReservedName($value, $this->id)) {
 						return 'name_taken';
 					}
 
 					return true;
 				},
-			),
-			'secret_question' => array(
+			],
+			'secret_question' => [
 				'type' => 'text',
 				'label' => Lang::$txt['secret_question'],
 				'subtext' => Lang::$txt['secret_desc'],
 				'size' => 50,
 				'permission' => 'profile_password',
-			),
-			'secret_answer' => array(
+			],
+			'secret_answer' => [
 				'type' => 'text',
 				'label' => Lang::$txt['secret_answer'],
 				'subtext' => Lang::$txt['secret_desc2'],
@@ -754,52 +732,52 @@ public function loadStandardFields(bool $force_reload = false)
 				'postinput' => '<span class="smalltext"><a href="' . Config::$scripturl . '?action=helpadmin;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);"><span class="main_icons help"></span> ' . Lang::$txt['secret_why_blank'] . '</a></span>',
 				'value' => '',
 				'permission' => 'profile_password',
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					$value = $value != '' ? Security::hashPassword($this->username, $value) : '';
+
 					return true;
 				},
-			),
-			'signature' => array(
+			],
+			'signature' => [
 				'type' => 'callback',
 				'callback_func' => 'signature_modify',
 				'permission' => 'profile_signature',
 				'enabled' => substr(Config::$modSettings['signature_settings'], 0, 1) == 1,
-				'preload' => array(array($this, 'loadSignatureData')),
+				'preload' => [[$this, 'loadSignatureData']],
 				'input_validate' => __CLASS__ . '::validateSignature',
-			),
-			'show_online' => array(
+			],
+			'show_online' => [
 				'type' => 'check',
 				'label' => Lang::$txt['show_online'],
 				'permission' => 'profile_identity',
 				'enabled' => !empty(Config::$modSettings['allow_hideOnline']) || User::$me->allowedTo('moderate_forum'),
-			),
-			'smiley_set' => array(
+			],
+			'smiley_set' => [
 				'type' => 'callback',
 				'callback_func' => 'smiley_pick',
 				'enabled' => !empty(Config::$modSettings['smiley_sets_enable']),
 				'permission' => 'profile_extra',
-				'preload' => function()
-				{
+				'preload' => function () {
 					Utils::$context['member']['smiley_set']['id'] = empty($this->smiley_set) ? '' : $this->smiley_set;
 
 					Utils::$context['smiley_sets'] = explode(',', 'none,,' . Config::$modSettings['smiley_sets_known']);
 
 					$set_names = explode("\n", Lang::$txt['smileys_none'] . "\n" . Lang::$txt['smileys_forum_board_default'] . "\n" . Config::$modSettings['smiley_sets_names']);
 
-					$filenames = array();
+					$filenames = [];
 
-					$result = Db::$db->query('', '
-						SELECT f.filename, f.smiley_set
+					$result = Db::$db->query(
+						'',
+						'SELECT f.filename, f.smiley_set
 						FROM {db_prefix}smiley_files AS f
 							JOIN {db_prefix}smileys AS s ON (s.id_smiley = f.id_smiley)
 						WHERE s.code = {string:smiley}',
-						array(
+						[
 							'smiley' => ':)',
-						)
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($result))
-					{
+
+					while ($row = Db::$db->fetch_assoc($result)) {
 						$filenames[$row['smiley_set']] = $row['filename'];
 					}
 					Db::$db->free_result($result);
@@ -807,53 +785,43 @@ public function loadStandardFields(bool $force_reload = false)
 					// In case any sets don't contain a ':)' smiley
 					$no_smiley_sets = array_diff(explode(',', Config::$modSettings['smiley_sets_known']), array_keys($filenames));
 
-					foreach ($no_smiley_sets as $set)
-					{
-						$allowedTypes = array('gif', 'png', 'jpg', 'jpeg', 'tiff', 'svg');
-						$images = glob(implode('/', array(Config::$modSettings['smileys_dir'], $set, '*.{' . (implode(',', $allowedTypes) . '}'))), GLOB_BRACE);
+					foreach ($no_smiley_sets as $set) {
+						$allowedTypes = ['gif', 'png', 'jpg', 'jpeg', 'tiff', 'svg'];
+						$images = glob(implode('/', [Config::$modSettings['smileys_dir'], $set, '*.{' . (implode(',', $allowedTypes) . '}')]), GLOB_BRACE);
 
 						// Just use some image or other
-						if (!empty($images))
-						{
+						if (!empty($images)) {
 							$image = array_pop($images);
 							$filenames[$set] = pathinfo($image, PATHINFO_BASENAME);
 						}
 						// No images at all? That's no good. Let the admin know, and quietly skip for this user.
-						else
-						{
+						else {
 							Lang::load('Errors', Lang::$default);
 
 							ErrorHandler::log(sprintf(Lang::$txt['smiley_set_dir_not_found'], $set_names[array_search($set, Utils::$context['smiley_sets'])]));
 
-							Utils::$context['smiley_sets'] = array_filter(Utils::$context['smiley_sets'], fn($v) => $v != $set);
+							Utils::$context['smiley_sets'] = array_filter(Utils::$context['smiley_sets'], fn ($v) => $v != $set);
 						}
 					}
 
-					foreach (Utils::$context['smiley_sets'] as $i => $set)
-					{
-						Utils::$context['smiley_sets'][$i] = array(
+					foreach (Utils::$context['smiley_sets'] as $i => $set) {
+						Utils::$context['smiley_sets'][$i] = [
 							'id' => Utils::htmlspecialchars($set),
 							'name' => Utils::htmlspecialchars($set_names[$i]),
-							'selected' => $set == Utils::$context['member']['smiley_set']['id']
-						);
+							'selected' => $set == Utils::$context['member']['smiley_set']['id'],
+						];
 
-						if ($set === 'none')
-						{
+						if ($set === 'none') {
 							Utils::$context['smiley_sets'][$i]['preview'] = Theme::$current->settings['images_url'] . '/blank.png';
-						}
-						elseif ($set === '')
-						{
+						} elseif ($set === '') {
 							$default_set = !empty(Theme::$current->settings['smiley_sets_default']) ? Theme::$current->settings['smiley_sets_default'] : Config::$modSettings['smiley_sets_default'];
 
-							Utils::$context['smiley_sets'][$i]['preview'] = implode('/', array(Config::$modSettings['smileys_url'], $default_set, $filenames[$default_set]));
-						}
-						else
-						{
-							Utils::$context['smiley_sets'][$i]['preview'] = implode('/', array(Config::$modSettings['smileys_url'], $set, $filenames[$set]));
+							Utils::$context['smiley_sets'][$i]['preview'] = implode('/', [Config::$modSettings['smileys_url'], $default_set, $filenames[$default_set]]);
+						} else {
+							Utils::$context['smiley_sets'][$i]['preview'] = implode('/', [Config::$modSettings['smileys_url'], $set, $filenames[$set]]);
 						}
 
-						if (Utils::$context['smiley_sets'][$i]['selected'])
-						{
+						if (Utils::$context['smiley_sets'][$i]['selected']) {
 							Utils::$context['member']['smiley_set']['name'] = $set_names[$i];
 
 							Utils::$context['member']['smiley_set']['preview'] = Utils::$context['smiley_sets'][$i]['preview'];
@@ -864,80 +832,76 @@ public function loadStandardFields(bool $force_reload = false)
 
 					return true;
 				},
-				'input_validate' => function(&$value)
-				{
+				'input_validate' => function (&$value) {
 					$smiley_sets = explode(',', Config::$modSettings['smiley_sets_known']);
 
-					if (!in_array($value, $smiley_sets) && $value != 'none')
+					if (!in_array($value, $smiley_sets) && $value != 'none') {
 						$value = '';
+					}
 
 					return true;
 				},
-			),
+			],
 			// Pretty much a dummy entry - it populates all the theme settings.
-			'theme_settings' => array(
+			'theme_settings' => [
 				'type' => 'callback',
 				'callback_func' => 'theme_settings',
 				'permission' => 'profile_extra',
 				'is_dummy' => true,
-				'preload' => function()
-				{
+				'preload' => function () {
 					Lang::load('Settings');
 
 					Utils::$context['allow_no_censored'] = false;
 
-					if (User::$me->is_admin || User::$me->is_owner)
-					{
+					if (User::$me->is_admin || User::$me->is_owner) {
 						Utils::$context['allow_no_censored'] = !empty(Config::$modSettings['allow_no_censored']);
 					}
 
 					return true;
 				},
-			),
-			'tfa' => array(
+			],
+			'tfa' => [
 				'type' => 'callback',
 				'callback_func' => 'tfa',
 				'permission' => 'profile_password',
 				'enabled' => !empty(Config::$modSettings['tfa_mode']),
-				'preload' => function()
-				{
+				'preload' => function () {
 					Utils::$context['tfa_enabled'] = !empty($this->tfa_secret);
 
 					return true;
 				},
-			),
-			'time_format' => array(
+			],
+			'time_format' => [
 				'type' => 'callback',
 				'callback_func' => 'timeformat_modify',
 				'permission' => 'profile_extra',
-				'preload' => function()
-				{
-					Utils::$context['easy_timeformats'] = array(
-						array(
+				'preload' => function () {
+					Utils::$context['easy_timeformats'] = [
+						[
 							'format' => '',
 							'title' => Lang::$txt['timeformat_default'],
-						),
-						array(
+						],
+						[
 							'format' => '%B %d, %Y, %I:%M:%S %p',
 							'title' => Lang::$txt['timeformat_easy1'],
-						),
-						array(
+						],
+						[
 							'format' => '%B %d, %Y, %H:%M:%S',
 							'title' => Lang::$txt['timeformat_easy2'],
-						),
-						array(
+						],
+						[
 							'format' => '%Y-%m-%d, %H:%M:%S',
 							'title' => Lang::$txt['timeformat_easy3'],
-						),
-						array(
+						],
+						[
 							'format' => '%d %B %Y, %H:%M:%S',
 							'title' => Lang::$txt['timeformat_easy4'],
-						),
-						array(
+						],
+						[
 							'format' => '%d-%m-%Y, %H:%M:%S',
 							'title' => Lang::$txt['timeformat_easy5'],
-						),
-					);
+						],
+					];
 
 					Utils::$context['member']['time_format'] = $this->time_format;
 
@@ -949,98 +913,97 @@ public function loadStandardFields(bool $force_reload = false)
 
 					return true;
 				},
-			),
-			'timezone' => array(
+			],
+			'timezone' => [
 				'type' => 'select',
 				'options' => TimeZone::list(),
 				'disabled_options' => array_filter(array_keys(TimeZone::list()), 'is_int'),
 				'permission' => 'profile_extra',
 				'label' => Lang::$txt['timezone'],
 				'value' => empty(User::$me->timezone) ? Config::$modSettings['default_timezone'] : User::$me->timezone,
-				'input_validate' => function($value)
-				{
+				'input_validate' => function ($value) {
 					$tz = TimeZone::list();
 
-					if (!isset($tz[$value]))
+					if (!isset($tz[$value])) {
 						return 'bad_timezone';
+					}
 
 					return true;
 				},
-			),
-			'usertitle' => array(
+			],
+			'usertitle' => [
 				'type' => 'text',
 				'label' => Lang::$txt['custom_title'],
 				'log_change' => true,
-				'input_attr' => array('maxlength="50"'),
+				'input_attr' => ['maxlength="50"'],
 				'size' => 50,
 				'permission' => 'profile_title',
 				'enabled' => !empty(Config::$modSettings['titlesEnable']),
-				'input_validate' => function(&$value)
-				{
-					if (Utils::entityStrlen($value) > 50)
+				'input_validate' => function (&$value) {
+					if (Utils::entityStrlen($value) > 50) {
 						return 'user_title_too_long';
+					}
 
 					return true;
 				},
-			),
-			'website_title' => array(
+			],
+			'website_title' => [
 				'type' => 'text',
 				'label' => Lang::$txt['website_title'],
 				'subtext' => Lang::$txt['include_website_url'],
 				'size' => 50,
 				'permission' => 'profile_website',
 				'link_with' => 'website',
-				'input_validate' => function(&$value)
-				{
-					if (mb_strlen($value) > 250)
+				'input_validate' => function (&$value) {
+					if (mb_strlen($value) > 250) {
 						return 'website_title_too_long';
+					}
 
 					return true;
 				},
-			),
-			'website_url' => array(
+			],
+			'website_url' => [
 				'type' => 'url',
 				'label' => Lang::$txt['website_url'],
 				'subtext' => Lang::$txt['complete_url'],
 				'size' => 50,
 				'permission' => 'profile_website',
 				// Fix the URL...
-				'input_validate' => function(&$value)
-				{
-					if (strlen(trim($value)) > 0 && strpos($value, '://') === false)
+				'input_validate' => function (&$value) {
+					if (strlen(trim($value)) > 0 && strpos($value, '://') === false) {
 						$value = 'http://' . $value;
+					}
 
-					if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://'))
+					if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://')) {
 						$value = '';
+					}
 
 					$value = Url::create($value, true)->validate()->toUtf8();
 
 					return true;
 				},
 				'link_with' => 'website',
-			),
-		);
+			],
+		];
 
-		IntegrationHook::call('integrate_load_profile_fields', array(&$this->standard_fields));
+		IntegrationHook::call('integrate_load_profile_fields', [&$this->standard_fields]);
 
-		$disabled_fields = !empty(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : array();
+		$disabled_fields = !empty(Config::$modSettings['disabled_profile_fields']) ? explode(',', Config::$modSettings['disabled_profile_fields']) : [];
 
 		// For each of the above let's take out the bits which don't apply - to save memory and security!
-		foreach ($this->standard_fields as $key => $field)
-		{
+		foreach ($this->standard_fields as $key => $field) {
 			// Do we have permission to do this?
-			if (isset($field['permission']) && !User::$me->allowedTo((User::$me->is_owner ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !User::$me->allowedTo($field['permission']))
-			{
+			if (isset($field['permission']) && !User::$me->allowedTo((User::$me->is_owner ? [$field['permission'] . '_own', $field['permission'] . '_any'] : $field['permission'] . '_any')) && !User::$me->allowedTo($field['permission'])) {
 				unset($this->standard_fields[$key]);
 			}
 
 			// Is it enabled?
-			if (isset($field['enabled']) && !$field['enabled'])
+			if (isset($field['enabled']) && !$field['enabled']) {
 				unset($this->standard_fields[$key]);
+			}
 
 			// Is it specifically disabled?
-			if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields)))
-			{
+			if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields))) {
 				unset($this->standard_fields[$key]);
 			}
 		}
@@ -1057,28 +1020,31 @@ public function loadCustomFields(string $area = 'summary'): void
 	{
 		self::loadCustomFieldDefinitions();
 
-		foreach (self::$custom_field_definitions as $cf_def)
-		{
+		foreach (self::$custom_field_definitions as $cf_def) {
 			// Skips custom fields that are not active.
-			if (empty($cf_def['active']))
+			if (empty($cf_def['active'])) {
 				continue;
+			}
 
 			// Skip custom fields that don't belong in the area we are viewing.
-			if (!in_array($area, array('summary', $cf_def['show_profile'])))
+			if (!in_array($area, ['summary', $cf_def['show_profile']])) {
 				continue;
+			}
 
 			// If this is for registration, skip any that aren't shown there.
-			if ($area === 'register' && empty($cf_def['show_reg']))
+			if ($area === 'register' && empty($cf_def['show_reg'])) {
 				continue;
+			}
 
 			// Check the privacy level for this field.
-			if ($area !== 'register' && !User::$me->allowedTo('admin_forum'))
-			{
-				if ($cf_def['private'] >= (User::$me->is_owner ? 3 : 2))
+			if ($area !== 'register' && !User::$me->allowedTo('admin_forum')) {
+				if ($cf_def['private'] >= (User::$me->is_owner ? 3 : 2)) {
 					continue;
+				}
 
-				if ($area !== 'summary' && $cf_def['private'] == 1)
+				if ($area !== 'summary' && $cf_def['private'] == 1) {
 					continue;
+				}
 			}
 
 			// Shortcut.
@@ -1089,106 +1055,94 @@ public function loadCustomFields(string $area = 'summary'): void
 			$cf_def['field_options'] = array_filter(explode(',', $cf_def['field_options']), 'strlen');
 
 			$current_key = 0;
-			if (!empty($cf_def['field_options']))
-			{
-				foreach ($cf_def['field_options'] as $k => $v)
-				{
-					if (empty($current_key))
+
+			if (!empty($cf_def['field_options'])) {
+				foreach ($cf_def['field_options'] as $k => $v) {
+					if (empty($current_key)) {
 						$current_key = $v === $value ? $k : 0;
+					}
 				}
 			}
 
 			// If this was submitted already then make the value the posted version.
-			if (isset($_POST['customfield']) && isset($_POST['customfield'][$cf_def['col_name']]))
-			{
+			if (isset($_POST['customfield'], $_POST['customfield'][$cf_def['col_name']])) {
 				$value = Utils::htmlspecialchars($_POST['customfield'][$cf_def['col_name']]);
 
-				if (in_array($cf_def['field_type'], array('select', 'radio')))
+				if (in_array($cf_def['field_type'], ['select', 'radio'])) {
 					$value = $cf_def['field_options'][$value] ?? '';
+				}
 			}
 
 			// Don't show the "disabled" option for the "gender" field if we are on the "summary" area.
-			if ($area == 'summary' && $cf_def['col_name'] == 'cust_gender' && $value == '{gender_0}')
+			if ($area == 'summary' && $cf_def['col_name'] == 'cust_gender' && $value == '{gender_0}') {
 				continue;
+			}
 
 			// HTML for the input form.
 			$output_html = $value;
 
-			if ($cf_def['field_type'] == 'check')
-			{
+			if ($cf_def['field_type'] == 'check') {
 				$true = (!$exists && !empty($cf_def['default_value'])) || !empty($value);
 
 				$input_html = '<input type="checkbox" name="customfield[' . $cf_def['col_name'] . ']" id="customfield[' . $cf_def['col_name'] . ']"' . ($true ? ' checked' : '') . '>';
 
 				$output_html = $true ? Lang::$txt['yes'] : Lang::$txt['no'];
-			}
-			elseif ($cf_def['field_type'] == 'select')
-			{
+			} elseif ($cf_def['field_type'] == 'select') {
 				$input_html = '<select name="customfield[' . $cf_def['col_name'] . ']" id="customfield[' . $cf_def['col_name'] . ']"><option value="-1"></option>';
 
-				foreach ($cf_def['field_options'] as $k => $v)
-				{
+				foreach ($cf_def['field_options'] as $k => $v) {
 					$true = (!$exists && $cf_def['default_value'] == $v) || $value == $v;
 
 					$input_html .= '<option value="' . $k . '"' . ($true ? ' selected' : '') . '>' . Lang::tokenTxtReplace($v) . '</option>';
 
-					if ($true)
+					if ($true) {
 						$output_html = $v;
+					}
 				}
 
 				$input_html .= '</select>';
-			}
-			elseif ($cf_def['field_type'] == 'radio')
-			{
+			} elseif ($cf_def['field_type'] == 'radio') {
 				$input_html = '<fieldset>';
 
-				foreach ($cf_def['field_options'] as $k => $v)
-				{
+				foreach ($cf_def['field_options'] as $k => $v) {
 					$true = (!$exists && $cf_def['default_value'] == $v) || $value == $v;
 
 					$input_html .= '<label for="customfield_' . $cf_def['col_name'] . '_' . $k . '"><input type="radio" name="customfield[' . $cf_def['col_name'] . ']" id="customfield_' . $cf_def['col_name'] . '_' . $k . '" value="' . $k . '"' . ($true ? ' checked' : '') . '>' . Lang::tokenTxtReplace($v) . '</label><br>';
 
-					if ($true)
+					if ($true) {
 						$output_html = $v;
+					}
 				}
 
 				$input_html .= '</fieldset>';
-			}
-			elseif ($cf_def['field_type'] == 'text')
-			{
+			} elseif ($cf_def['field_type'] == 'text') {
 				$input_html = '<input type="text" name="customfield[' . $cf_def['col_name'] . ']" id="customfield[' . $cf_def['col_name'] . ']"' . ($cf_def['field_length'] != 0 ? ' maxlength="' . $cf_def['field_length'] . '"' : '') . ' size="' . ($cf_def['field_length'] == 0 || $cf_def['field_length'] >= 50 ? 50 : ($cf_def['field_length'] > 30 ? 30 : ($cf_def['field_length'] > 10 ? 20 : 10))) . '" value="' . Utils::htmlspecialcharsDecode($value) . '"' . ($cf_def['show_reg'] == 2 ? ' required' : '') . '>';
-			}
-			else
-			{
+			} else {
 				list($rows, $cols) = explode(',', $cf_def['default_value'] ?? '');
 
 				$input_html = '<textarea name="customfield[' . $cf_def['col_name'] . ']" id="customfield[' . $cf_def['col_name'] . ']"' . ($cf_def['field_length'] != 0 ? ' maxlength="' . $cf_def['field_length'] . '"' : '') . (!empty($rows) ? ' rows="' . $rows . '"' : '') . (!empty($cols) ? ' cols="' . $cols . '"' : '') . ($cf_def['show_reg'] == 2 ? ' required' : '') . '>' . Utils::htmlspecialcharsDecode($value) . '</textarea>';
 			}
 
 			// Parse BBCode
-			if ($cf_def['bbc'])
-			{
+			if ($cf_def['bbc']) {
 				$output_html = BBCodeParser::load()->parse($output_html);
-			}
-			elseif ($cf_def['field_type'] == 'textarea')
-			{
+			} elseif ($cf_def['field_type'] == 'textarea') {
 				// Allow for newlines at least
-				$output_html = strtr($output_html, array("\n" => '<br>'));
+				$output_html = strtr($output_html, ["\n" => '<br>']);
 			}
 
 			// Enclosing the user input within some other text?
-			if (!empty($cf_def['enclose']) && !empty($output_html))
-			{
-				$output_html = strtr($cf_def['enclose'], array(
+			if (!empty($cf_def['enclose']) && !empty($output_html)) {
+				$output_html = strtr($cf_def['enclose'], [
 					'{SCRIPTURL}' => Config::$scripturl,
 					'{IMAGES_URL}' => Theme::$current->settings['images_url'],
 					'{DEFAULT_IMAGES_URL}' => Theme::$current->settings['default_images_url'],
 					'{INPUT}' => Utils::htmlspecialcharsDecode($output_html),
-					'{KEY}' => $current_key
-				));
+					'{KEY}' => $current_key,
+				]);
 			}
 
-			$this->custom_fields[] = array(
+			$this->custom_fields[] = [
 				'name' => Lang::tokenTxtReplace($cf_def['field_name']),
 				'desc' => Lang::tokenTxtReplace($cf_def['field_desc']),
 				'type' => $cf_def['field_type'],
@@ -1199,7 +1153,7 @@ public function loadCustomFields(string $area = 'summary'): void
 				'colname' => $cf_def['col_name'],
 				'value' => $value,
 				'show_reg' => $cf_def['show_reg'],
-			);
+			];
 
 			$this->custom_fields_required = $this->custom_fields_required || $cf_def['show_reg'] == 2;
 		}
@@ -1207,7 +1161,7 @@ public function loadCustomFields(string $area = 'summary'): void
 		Utils::$context['custom_fields'] = &$this->custom_fields;
 		Utils::$context['custom_fields_required'] = &$this->custom_fields_required;
 
-		IntegrationHook::call('integrate_load_custom_profile_fields', array($this->id, $area));
+		IntegrationHook::call('integrate_load_custom_profile_fields', [$this->id, $area]);
 	}
 
 	/**
@@ -1217,26 +1171,25 @@ public function loadCustomFields(string $area = 'summary'): void
 	 */
 	public function loadThemeOptions(bool $defaultSettings = false)
 	{
-		if (isset($_POST['default_options']))
-		{
+		if (isset($_POST['default_options'])) {
 			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
 		}
 
-		Utils::$context['member']['options'] = $this->data['options'] ?? array();
+		Utils::$context['member']['options'] = $this->data['options'] ?? [];
 
-		if (isset($_POST['options']) && is_array($_POST['options']))
-		{
-			foreach ($_POST['options'] as $k => $v)
+		if (isset($_POST['options']) && is_array($_POST['options'])) {
+			foreach ($_POST['options'] as $k => $v) {
 				Utils::$context['member']['options'][$k] = $v;
+			}
 		}
 
 		// Load up the default theme options for any missing.
 		parent::loadOptions(-1);
 
-		foreach (parent::$profiles[-1]['options'] as $k => $v)
-		{
-			if (!isset(Utils::$context['member']['options'][$k]))
+		foreach (parent::$profiles[-1]['options'] as $k => $v) {
+			if (!isset(Utils::$context['member']['options'][$k])) {
 				Utils::$context['member']['options'][$k] = $v;
+			}
 		}
 	}
 
@@ -1250,14 +1203,14 @@ public function loadAvatarData(): bool
 		Utils::$context['avatar_url'] = Config::$modSettings['avatar_url'];
 
 		// Default context.
-		$this->formatted['avatar'] += array(
+		$this->formatted['avatar'] += [
 			'custom' => stristr($this->avatar['url'], 'http://') || stristr($this->avatar['url'], 'https://') ? $this->avatar['url'] : 'http://',
 			'selection' => $this->avatar['url'] == '' || (stristr($this->avatar['url'], 'http://') || stristr($this->avatar['url'], 'https://')) ? '' : $this->avatar['url'],
 			'allow_server_stored' => (empty(Config::$modSettings['gravatarEnabled']) || empty(Config::$modSettings['gravatarOverride'])) && (User::$me->allowedTo('profile_server_avatar') || (!User::$me->is_owner && User::$me->allowedTo('profile_extra_any'))),
 			'allow_upload' => (empty(Config::$modSettings['gravatarEnabled']) || empty(Config::$modSettings['gravatarOverride'])) && (User::$me->allowedTo('profile_upload_avatar') || (!User::$me->is_owner && User::$me->allowedTo('profile_extra_any'))),
 			'allow_external' => (empty(Config::$modSettings['gravatarEnabled']) || empty(Config::$modSettings['gravatarOverride'])) && (User::$me->allowedTo('profile_remote_avatar') || (!User::$me->is_owner && User::$me->allowedTo('profile_extra_any'))),
 			'allow_gravatar' => !empty(Config::$modSettings['gravatarEnabled']),
-		);
+		];
 
 		// Gravatar?
 		if (
@@ -1266,13 +1219,12 @@ public function loadAvatarData(): bool
 				stristr($this->avatar['url'], 'gravatar://')
 				|| !empty(Config::$modSettings['gravatarOverride'])
 			)
-		)
-		{
-			$this->formatted['avatar'] += array(
+		) {
+			$this->formatted['avatar'] += [
 				'choice' => 'gravatar',
 				'server_pic' => 'blank.png',
-				'external' => $this->avatar['url'] == 'gravatar://' || empty(Config::$modSettings['gravatarAllowExtraEmail']) || (!empty(Config::$modSettings['gravatarOverride']) && substr($this->avatar['url'], 0, 11) != 'gravatar://') ? $this->email : substr($this->avatar['url'], 11)
-			);
+				'external' => $this->avatar['url'] == 'gravatar://' || empty(Config::$modSettings['gravatarAllowExtraEmail']) || (!empty(Config::$modSettings['gravatarOverride']) && substr($this->avatar['url'], 0, 11) != 'gravatar://') ? $this->email : substr($this->avatar['url'], 11),
+			];
 			$this->formatted['avatar']['href'] = self::getGravatarUrl($this->formatted['avatar']['external']);
 		}
 		// An attachment?
@@ -1280,13 +1232,12 @@ public function loadAvatarData(): bool
 			$this->avatar['original_url'] == ''
 			&& $this->avatar['id_attach'] > 0
 			&& $this->formatted['avatar']['allow_upload']
-		)
-		{
-			$this->formatted['avatar'] += array(
+		) {
+			$this->formatted['avatar'] += [
 				'choice' => 'upload',
 				'server_pic' => 'blank.png',
-				'external' => 'http://'
-			);
+				'external' => 'http://',
+			];
 
 			$this->formatted['avatar']['href'] = !$this->avatar['custom_dir'] ? Config::$scripturl . '?action=dlattach;attach=' . $this->avatar['id_attach'] . ';type=avatar' : Config::$modSettings['custom_avatar_url'] . '/' . $this->avatar['filename'];
 		}
@@ -1297,46 +1248,40 @@ public function loadAvatarData(): bool
 			&& (
 				stristr($this->avatar['url'], 'http://')
 				|| stristr($this->avatar['url'], 'https://')
-			))
-		{
-			$this->formatted['avatar'] += array(
+			)) {
+			$this->formatted['avatar'] += [
 				'choice' => 'external',
 				'server_pic' => 'blank.png',
 				'external' => $this->avatar['original_url'],
-			);
+			];
 		}
 		// Server stored image?
 		elseif (
 			$this->avatar['url'] != ''
 			&& $this->formatted['avatar']['allow_server_stored']
 			&& file_exists(Config::$modSettings['avatar_directory'] . '/' . $this->avatar['url'])
-		)
-		{
-			$this->formatted['avatar'] += array(
+		) {
+			$this->formatted['avatar'] += [
 				'choice' => 'server_stored',
 				'server_pic' => $this->avatar['url'] == '' ? 'blank.png' : $this->avatar['url'],
-				'external' => 'http://'
-			);
+				'external' => 'http://',
+			];
 		}
 		// No avatar?
-		else
-		{
-			$this->formatted['avatar'] += array(
+		else {
+			$this->formatted['avatar'] += [
 				'choice' => 'none',
 				'server_pic' => 'blank.png',
-				'external' => 'http://'
-			);
+				'external' => 'http://',
+			];
 		}
 
 		// Get a list of all the server stored avatars.
-		if ($this->formatted['avatar']['allow_server_stored'])
-		{
-			Utils::$context['avatar_list'] = array();
-			Utils::$context['avatars'] = is_dir(Config::$modSettings['avatar_directory']) ? $this->getAvatars('', 0) : array();
-		}
-		else
-		{
-			Utils::$context['avatars'] = array();
+		if ($this->formatted['avatar']['allow_server_stored']) {
+			Utils::$context['avatar_list'] = [];
+			Utils::$context['avatars'] = is_dir(Config::$modSettings['avatar_directory']) ? $this->getAvatars('', 0) : [];
+		} else {
+			Utils::$context['avatars'] = [];
 		}
 
 		// Second level selected avatar...
@@ -1356,18 +1301,18 @@ public function loadSignatureData(): bool
 		list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 		$sig_limits = explode(',', $sig_limits);
 
-		Utils::$context['signature_enabled'] = isset($sig_limits[0]) ? $sig_limits[0] : 0;
-
-		Utils::$context['signature_limits'] = array(
-			'max_length' => isset($sig_limits[1]) ? $sig_limits[1] : 0,
-			'max_lines' => isset($sig_limits[2]) ? $sig_limits[2] : 0,
-			'max_images' => isset($sig_limits[3]) ? $sig_limits[3] : 0,
-			'max_smileys' => isset($sig_limits[4]) ? $sig_limits[4] : 0,
-			'max_image_width' => isset($sig_limits[5]) ? $sig_limits[5] : 0,
-			'max_image_height' => isset($sig_limits[6]) ? $sig_limits[6] : 0,
-			'max_font_size' => isset($sig_limits[7]) ? $sig_limits[7] : 0,
-			'bbc' => !empty($sig_bbc) ? explode(',', $sig_bbc) : array(),
-		);
+		Utils::$context['signature_enabled'] = $sig_limits[0] ?? 0;
+
+		Utils::$context['signature_limits'] = [
+			'max_length' => $sig_limits[1] ?? 0,
+			'max_lines' => $sig_limits[2] ?? 0,
+			'max_images' => $sig_limits[3] ?? 0,
+			'max_smileys' => $sig_limits[4] ?? 0,
+			'max_image_width' => $sig_limits[5] ?? 0,
+			'max_image_height' => $sig_limits[6] ?? 0,
+			'max_font_size' => $sig_limits[7] ?? 0,
+			'bbc' => !empty($sig_bbc) ? explode(',', $sig_bbc) : [],
+		];
 
 		// Kept this line in for backwards compatibility!
 		Utils::$context['max_signature_length'] = Utils::$context['signature_limits']['max_length'];
@@ -1375,35 +1320,29 @@ public function loadSignatureData(): bool
 		// Warning message for signature image limits?
 		Utils::$context['signature_warning'] = '';
 
-		if (Utils::$context['signature_limits']['max_image_width'] && Utils::$context['signature_limits']['max_image_height'])
-		{
+		if (Utils::$context['signature_limits']['max_image_width'] && Utils::$context['signature_limits']['max_image_height']) {
 			Utils::$context['signature_warning'] = sprintf(Lang::$txt['profile_error_signature_max_image_size'], Utils::$context['signature_limits']['max_image_width'], Utils::$context['signature_limits']['max_image_height']);
-		}
-		elseif (Utils::$context['signature_limits']['max_image_width'] || Utils::$context['signature_limits']['max_image_height'])
-		{
+		} elseif (Utils::$context['signature_limits']['max_image_width'] || Utils::$context['signature_limits']['max_image_height']) {
 			Utils::$context['signature_warning'] = sprintf(Lang::$txt['profile_error_signature_max_image_' . (Utils::$context['signature_limits']['max_image_width'] ? 'width' : 'height')], Utils::$context['signature_limits'][Utils::$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
 		}
 
-		if (empty(Utils::$context['do_preview']))
-		{
-			Utils::$context['member']['signature'] = empty($this->data['signature']) ? '' : str_replace(array('<br>', '<br/>', '<br />', '<', '>', '"', '\''), array("\n", "\n", "\n", '&lt;', '&gt;', '&quot;', '&#039;'), $this->data['signature']);
-		}
-		else
-		{
+		if (empty(Utils::$context['do_preview'])) {
+			Utils::$context['member']['signature'] = empty($this->data['signature']) ? '' : str_replace(['<br>', '<br/>', '<br />', '<', '>', '"', '\''], ["\n", "\n", "\n", '&lt;', '&gt;', '&quot;', '&#039;'], $this->data['signature']);
+		} else {
 			$signature = $_POST['signature'] = !empty($_POST['signature']) ? Utils::normalize($_POST['signature']) : '';
 
 			$validation = self::validateSignature($signature);
 
-			if (empty(Utils::$context['post_errors']))
-			{
+			if (empty(Utils::$context['post_errors'])) {
 				Lang::load('Errors');
-				Utils::$context['post_errors'] = array();
+				Utils::$context['post_errors'] = [];
 			}
 
 			Utils::$context['post_errors'][] = 'signature_not_yet_saved';
 
-			if ($validation !== true && $validation !== false)
+			if ($validation !== true && $validation !== false) {
 				Utils::$context['post_errors'][] = $validation;
+			}
 
 			Lang::censorText(Utils::$context['member']['signature']);
 
@@ -1417,9 +1356,8 @@ public function loadSignatureData(): bool
 		}
 
 		// Load the spell checker?
-		if (Utils::$context['show_spellchecking'])
-		{
-			Theme::loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+		if (Utils::$context['show_spellchecking']) {
+			Theme::loadJavaScriptFile('spellcheck.js', ['defer' => false, 'minimize' => true], 'smf_spellcheck');
 		}
 
 		return true;
@@ -1439,11 +1377,11 @@ public function loadAssignableGroups(): bool
 		$this->assignable_groups = Group::loadAssignable();
 
 		// Set a few custom properties.
-		foreach ($this->assignable_groups as $group)
-		{
+		foreach ($this->assignable_groups as $group) {
 			// Mark the regular members group as requestable.
-			if ($group->id === Group::REGULAR)
+			if ($group->id === Group::REGULAR) {
 				$group->type = Group::TYPE_REQUESTABLE;
+			}
 
 			$group->is_primary = $this->data['id_group'] == $group->id;
 			$group->is_additional = in_array($group->id, $this->additional_groups);
@@ -1469,45 +1407,40 @@ public function setupContext(array $fields): void
 		Utils::$context['profile_javascript'] = '';
 		Utils::$context['profile_onsubmit_javascript'] = '';
 
-		IntegrationHook::call('integrate_setup_profile_context', array(&$fields));
+		IntegrationHook::call('integrate_setup_profile_context', [&$fields]);
 
 		// Make sure we have this!
 		$this->loadStandardFields(true);
 
 		// First check for any linked sets.
-		foreach ($this->standard_fields as $key => $field)
-		{
-			if (isset($field['link_with']) && in_array($field['link_with'], $fields))
+		foreach ($this->standard_fields as $key => $field) {
+			if (isset($field['link_with']) && in_array($field['link_with'], $fields)) {
 				$fields[] = $key;
+			}
 		}
 
 		$i = 0;
 		$last_type = '';
-		foreach ($fields as $key => $field)
-		{
-			if (isset($this->standard_fields[$field]))
-			{
+
+		foreach ($fields as $key => $field) {
+			if (isset($this->standard_fields[$field])) {
 				// Shortcut.
 				$cur_field = &$this->standard_fields[$field];
 
 				// Does it have a preload and does that preload succeed?
-				if (isset($cur_field['preload']) && !call_user_func(...((array) $cur_field['preload'])))
-				{
+				if (isset($cur_field['preload']) && !call_user_func(...((array) $cur_field['preload']))) {
 					continue;
 				}
 
 				// If this is anything but complex we need to do more cleaning!
-				if ($cur_field['type'] != 'callback' && $cur_field['type'] != 'hidden')
-				{
-					if (!isset($cur_field['label']))
-					{
-						$cur_field['label'] = isset(Lang::$txt[$field]) ? Lang::$txt[$field] : $field;
+				if ($cur_field['type'] != 'callback' && $cur_field['type'] != 'hidden') {
+					if (!isset($cur_field['label'])) {
+						$cur_field['label'] = Lang::$txt[$field] ?? $field;
 					}
 
 					// Everything has a value!
-					if (!isset($cur_field['value']))
-					{
-						$cur_field['value'] = isset($this->data[$field]) ? $this->data[$field] : '';
+					if (!isset($cur_field['value'])) {
+						$cur_field['value'] = $this->data[$field] ?? '';
 					}
 
 					// Any input attributes?
@@ -1515,29 +1448,31 @@ public function setupContext(array $fields): void
 				}
 
 				// Any javascript stuff?
-				if (!empty($cur_field['js_submit']))
+				if (!empty($cur_field['js_submit'])) {
 					Utils::$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+				}
 
-				if (!empty($cur_field['js']))
+				if (!empty($cur_field['js'])) {
 					Utils::$context['profile_javascript'] .= $cur_field['js'];
+				}
 
 				// Any template stuff?
-				if (!empty($cur_field['prehtml']))
+				if (!empty($cur_field['prehtml'])) {
 					Utils::$context['profile_prehtml'] .= $cur_field['prehtml'];
+				}
 
-				if (!empty($cur_field['posthtml']))
+				if (!empty($cur_field['posthtml'])) {
 					Utils::$context['profile_posthtml'] .= $cur_field['posthtml'];
+				}
 
 				// Finally put it into context?
-				if ($cur_field['type'] != 'hidden')
-				{
+				if ($cur_field['type'] != 'hidden') {
 					$last_type = $cur_field['type'];
 					Utils::$context['profile_fields'][$field] = &$this->standard_fields[$field];
 				}
 			}
 			// Bodge in a line break - without doing two in a row ;)
-			elseif ($field == 'hr' && $last_type != 'hr' && $last_type != '')
-			{
+			elseif ($field == 'hr' && $last_type != 'hr' && $last_type != '') {
 				$last_type = 'hr';
 				Utils::$context['profile_fields'][$i++]['type'] = 'hr';
 			}
@@ -1559,12 +1494,14 @@ public function setupContext(array $fields): void
 		}, false);' : ''), true);
 
 		// Any onsubmit JavaScript?
-		if (!empty(Utils::$context['profile_onsubmit_javascript']))
+		if (!empty(Utils::$context['profile_onsubmit_javascript'])) {
 			Theme::addInlineJavaScript(Utils::$context['profile_onsubmit_javascript'], true);
+		}
 
 		// Any totally custom stuff?
-		if (!empty(Utils::$context['profile_javascript']))
+		if (!empty(Utils::$context['profile_javascript'])) {
 			Theme::addInlineJavaScript(Utils::$context['profile_javascript'], true);
+		}
 	}
 
 	/**
@@ -1573,25 +1510,23 @@ public function setupContext(array $fields): void
 	public function save()
 	{
 		// General-purpose permission for anything that doesn't have its own.
-		$this->can_change_extra = User::$me->allowedTo(User::$me->is_owner ? array('profile_extra_any', 'profile_extra_own') : array('profile_extra_any'));
+		$this->can_change_extra = User::$me->allowedTo(User::$me->is_owner ? ['profile_extra_any', 'profile_extra_own'] : ['profile_extra_any']);
 
 		// The applicator is the same as the member affected if we are registering a new member.
 		$this->applicator = empty(User::$me->id) && ($_REQUEST['sa'] ?? null) === 'register' ? $this->id : User::$me->id;
 
 		// If $_POST hasn't already been sanitized, do that now.
-		if (!$this->post_sanitized)
-		{
+		if (!$this->post_sanitized) {
 			$_POST = Utils::htmlTrimRecursive($_POST);
 			$_POST = Utils::htmlspecialcharsRecursive($_POST);
 			$this->post_sanitized = true;
 		}
 
 		// This allows variables to call activities when they save.
-		Utils::$context['profile_execute_on_save'] = array();
+		Utils::$context['profile_execute_on_save'] = [];
 
-		if (User::$me->is_owner && in_array(Menu::$loaded['profile']->current_area, array('account', 'forumprofile', 'theme')))
-		{
-			Utils::$context['profile_execute_on_save']['reload_user'] = array(__CLASS__ . '::reloadUser', Profile::$member->id);
+		if (User::$me->is_owner && in_array(Menu::$loaded['profile']->current_area, ['account', 'forumprofile', 'theme'])) {
+			Utils::$context['profile_execute_on_save']['reload_user'] = [__CLASS__ . '::reloadUser', Profile::$member->id];
 		}
 
 		$this->prepareToSaveStandardFields();
@@ -1601,11 +1536,10 @@ public function save()
 		$this->prepareToSaveCustomFields($_REQUEST['sa'] ?? null);
 
 		// Give hooks some access to the save data.
-		IntegrationHook::call('integrate_profile_save', array(&Profile::$member->new_data, &Profile::$member->save_errors, Profile::$member->id, Profile::$member->data, Menu::$loaded['profile']->current_area));
+		IntegrationHook::call('integrate_profile_save', [&Profile::$member->new_data, &Profile::$member->save_errors, Profile::$member->id, Profile::$member->data, Menu::$loaded['profile']->current_area]);
 
 		// There was a problem. Let them try again.
-		if (!empty($this->save_errors))
-		{
+		if (!empty($this->save_errors)) {
 			// Load the language file so we can give a nice explanation of the errors.
 			Lang::load('Errors');
 			Utils::$context['post_errors'] = $this->save_errors;
@@ -1614,42 +1548,40 @@ public function save()
 		}
 
 		// Save the standard profile data.
-		if (!empty($this->new_data))
-		{
+		if (!empty($this->new_data)) {
 			// If we've changed the password, notify any integration that may be listening in.
-			if (isset($this->new_data['passwd']))
-			{
-				IntegrationHook::call('integrate_reset_pass', array($this->username, $this->username, $_POST['passwrd2']));
+			if (isset($this->new_data['passwd'])) {
+				IntegrationHook::call('integrate_reset_pass', [$this->username, $this->username, $_POST['passwrd2']]);
 			}
 
 			parent::updateMemberData($this->id, $this->new_data);
 		}
 
 		// Make any updates to custom fields and theme options.
-		if (!empty($this->new_cf_data['updates']) || !empty($this->new_options['updates']))
-		{
-			Db::$db->insert('replace',
+		if (!empty($this->new_cf_data['updates']) || !empty($this->new_options['updates'])) {
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}themes',
-				array(
+				[
 					'id_theme' => 'int',
 					'variable' => 'string-255',
 					'value' => 'string-65534',
 					'id_member' => 'int',
-				),
+				],
 				array_merge($this->new_cf_data['updates'], $this->new_options['updates']),
-				array(
+				[
 					'id_member',
 					'id_theme',
 					'variable',
-				)
+				],
 			);
 		}
 
 		// Delete any removed custom fields or theme options.
-		if (!empty($this->new_cf_data['deletes']) || !empty($this->new_options['deletes']))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}themes
+		if (!empty($this->new_cf_data['deletes']) || !empty($this->new_options['deletes'])) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}themes
 				WHERE id_member = {int:id_member}
 					AND (
 						(
@@ -1661,44 +1593,42 @@ public function save()
 							AND variable IN ({array_string:opt}
 						)
 					)',
-				array(
+				[
 					'id_theme' => 1,
 					'id_member' => $this->id,
-					'cf' => !empty($this->new_cf_data['deletes']) ? $this->new_cf_data['deletes'] : array(''),
-					'opt' => !empty($this->new_options['deletes']) ? $this->new_options['deletes'] : array(''),
-				)
+					'cf' => !empty($this->new_cf_data['deletes']) ? $this->new_cf_data['deletes'] : [''],
+					'opt' => !empty($this->new_options['deletes']) ? $this->new_options['deletes'] : [''],
+				],
 			);
 		}
 
 		// What if this is the newest member?
-		if (Config::$modSettings['latestMember'] == $this->id)
-		{
+		if (Config::$modSettings['latestMember'] == $this->id) {
 			Logging::updateStats('member');
 		}
 		// Did the member change his/her name or birthdate?
-		elseif (isset($this->new_data['birthdate']) || isset($this->new_data['real_name']))
-		{
+		elseif (isset($this->new_data['birthdate']) || isset($this->new_data['real_name'])) {
 			// Changing name or birthdate both entail changing the calendar.
-			$to_update = array('calendar_updated' => time());
+			$to_update = ['calendar_updated' => time()];
 
 			// Changing the name means the memberlist has been updated.
-			if (isset($this->new_data['real_name']))
+			if (isset($this->new_data['real_name'])) {
 				$to_update['memberlist_updated'] = time();
+			}
 
 			Config::updateModSettings($to_update);
 		}
 
 		// Anything worth logging?
-		if (!empty($this->log_changes) && !empty(Config::$modSettings['modlog_enabled']))
-		{
+		if (!empty($this->log_changes) && !empty(Config::$modSettings['modlog_enabled'])) {
 			Logging::logActions($this->log_changes);
 		}
 
 		// Do we have any post save functions to execute?
-		if (!empty(Utils::$context['profile_execute_on_save']))
-		{
-			foreach (Utils::$context['profile_execute_on_save'] as $saveFunc)
+		if (!empty(Utils::$context['profile_execute_on_save'])) {
+			foreach (Utils::$context['profile_execute_on_save'] as $saveFunc) {
 				call_user_func(...((array) $saveFunc));
+			}
 		}
 
 		// Let them know it worked!
@@ -1717,26 +1647,29 @@ public function save()
 	 */
 	public function validateEmail($email): bool|string
 	{
-		$email = strtr($email, array('&#039;' => '\''));
+		$email = strtr($email, ['&#039;' => '\'']);
 
 		// Check the name and email for validity.
-		if (trim($email) == '')
+		if (trim($email) == '') {
 			return 'no_email';
+		}
 
-		if (!filter_var($email, FILTER_VALIDATE_EMAIL))
+		if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 			return 'bad_email';
+		}
 
 		// Email addresses should be and stay unique.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}members
 			WHERE id_member != {int:selected_member}
 				AND email_address = {string:email_address}
 			LIMIT 1',
-			array(
+			[
 				'selected_member' => $this->id,
 				'email_address' => $email,
-			)
+			],
 		);
 		$return = Db::$db->num_rows($request) > 0 ? 'email_taken' : true;
 		Db::$db->free_result($request);
@@ -1751,7 +1684,7 @@ public function validateEmail($email): bool|string
 	 * @param array $additional_groups The contents of $_POST['additional_groups'].
 	 * @return bool Always returns true.
 	 */
-	public function validateGroups(int &$value, array $additional_groups = array()): bool
+	public function validateGroups(int &$value, array $additional_groups = []): bool
 	{
 		$additional_groups = array_unique($additional_groups);
 
@@ -1759,8 +1692,7 @@ public function validateGroups(int &$value, array $additional_groups = array()):
 		Group::getUnassignable();
 
 		// The account page allows you to change your id_group - but not to a protected group!
-		if (!empty(Group::$unassignable) && in_array($value, Group::$unassignable) && !in_array($value, $this->groups))
-		{
+		if (!empty(Group::$unassignable) && in_array($value, Group::$unassignable) && !in_array($value, $this->groups)) {
 			$value = $this->data['id_group'];
 		}
 
@@ -1772,57 +1704,52 @@ public function validateGroups(int &$value, array $additional_groups = array()):
 		$additional_groups = array_unique(array_merge($additional_groups, array_intersect($this->additional_groups, Group::$unassignable)));
 
 		// Don't include the primary group in the additional groups.
-		$additional_groups = array_diff($additional_groups, array($value));
+		$additional_groups = array_diff($additional_groups, [$value]);
 
-		if (implode(',', $additional_groups) !== $this->data['additional_groups'])
-		{
+		if (implode(',', $additional_groups) !== $this->data['additional_groups']) {
 			$this->new_data['additional_groups'] = implode(',', $additional_groups);
 			$this->data['additional_groups'] = implode(',', $additional_groups);
 			$this->additional_groups = $additional_groups;
 		}
 
 		// Make sure there is always an admin.
-		if ($this->is_admin)
-		{
+		if ($this->is_admin) {
 			$stillAdmin = $value == 1 || in_array(1, $additional_groups);
 
 			// If they would no longer be an admin, look for another...
-			if (!$stillAdmin)
-			{
-				$request = Db::$db->query('', '
-					SELECT id_member
+			if (!$stillAdmin) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE (id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0)
 						AND id_member != {int:selected_member}
 					LIMIT 1',
-					array(
+					[
 						'admin_group' => 1,
 						'selected_member' => $this->id,
-					)
+					],
 				);
 				list($another) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 
-				if (empty($another))
+				if (empty($another)) {
 					ErrorHandler::fatalLang('at_least_one_admin', 'critical');
+				}
 			}
 		}
 
 		// If we are changing group status, update permission cache as necessary.
-		if ($value != $this->data['id_group'] || isset($this->new_data['additional_groups']))
-		{
-			if (User::$me->is_owner)
-			{
+		if ($value != $this->data['id_group'] || isset($this->new_data['additional_groups'])) {
+			if (User::$me->is_owner) {
 				$_SESSION['mc']['time'] = 0;
-			}
-			else
-			{
-				Config::updateModSettings(array('settings_updated' => time()));
+			} else {
+				Config::updateModSettings(['settings_updated' => time()]);
 			}
 		}
 
 		// Announce to any hooks that we have changed groups, but don't allow them to change it.
-		IntegrationHook::call('integrate_profile_profileSaveGroups', array($value, $additional_groups));
+		IntegrationHook::call('integrate_profile_profileSaveGroups', [$value, $additional_groups]);
 
 		return true;
 	}
@@ -1838,13 +1765,13 @@ public function validateAvatarData(string &$value): bool|string
 	{
 		Utils::$context['max_external_size_url'] = 255;
 
-		if (empty($this->id) && !empty(Utils::$context['password_auth_failed']))
+		if (empty($this->id) && !empty(Utils::$context['password_auth_failed'])) {
 			return false;
+		}
 
-		IntegrationHook::call('before_profile_save_avatar', array(&$value));
+		IntegrationHook::call('before_profile_save_avatar', [&$value]);
 
-		switch ($value)
-		{
+		switch ($value) {
 			case 'server_stored':
 				$result = $this->setAvatarServerStored($_POST['file'] ?? $_POST['cat'] ?? '');
 				break;
@@ -1864,11 +1791,11 @@ public function validateAvatarData(string &$value): bool|string
 			default:
 				$result = $this->setAvatarNone();
 				break;
-
 		}
 
-		if (is_string($result))
+		if (is_string($result)) {
 			return $result;
+		}
 
 		// Setup the profile variables so it shows things right on display!
 		$this->data['avatar'] = $this->new_data['avatar'];
@@ -1898,36 +1825,33 @@ public function validateAvatarData(string &$value): bool|string
 	 * @param string $dataset Ignored.
 	 * @return array The IDs of the loaded members.
 	 */
-	public static function load($users = array(), int $type = self::LOAD_BY_ID, string $dataset = null): array
+	public static function load($users = [], int $type = self::LOAD_BY_ID, ?string $dataset = null): array
 	{
 		$users = (array) $users;
 
-		if (empty($users))
-		{
+		if (empty($users)) {
 			// Did we get the user by name...
-			if (isset($_REQUEST['user']))
-			{
+			if (isset($_REQUEST['user'])) {
 				$users = (array) $_REQUEST['user'];
 				$type = self::LOAD_BY_NAME;
 			}
 			// ... or by id_member?
-			elseif (!empty($_REQUEST['u']))
-			{
+			elseif (!empty($_REQUEST['u'])) {
 				$users = array_map('intval', (array) $_REQUEST['u']);
 			}
 			// If it was just ?action=profile, edit your own profile, but only if you're not a guest.
-			else
-			{
+			else {
 				// Members only...
 				User::$me->kickIfGuest();
-				$users = array(User::$me->id);
+				$users = [User::$me->id];
 			}
 		}
 
 		$loaded_ids = parent::loadUserData($users, $type, 'profile');
 
-		foreach (array_diff($loaded_ids, array_keys(self::$loaded)) as $id)
+		foreach (array_diff($loaded_ids, array_keys(self::$loaded)) as $id) {
 			new self($id);
+		}
 
 		return $loaded_ids;
 	}
@@ -1937,17 +1861,19 @@ public static function load($users = array(), int $type = self::LOAD_BY_ID, stri
 	 */
 	public static function loadCustomFieldDefinitions(): void
 	{
-		if (!empty(self::$custom_field_definitions))
+		if (!empty(self::$custom_field_definitions)) {
 			return;
+		}
 
-		$request = Db::$db->query('', '
-			SELECT *
+		$request = Db::$db->query(
+			'',
+			'SELECT *
 			FROM {db_prefix}custom_fields
 			ORDER BY field_order',
-			array()
+			[],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$custom_field_definitions[$row['col_name']] = $row;
 		}
 		Db::$db->free_result($request);
@@ -1965,26 +1891,23 @@ public static function loadCustomFieldDefinitions(): void
 	public static function validateSignature(&$value): bool|string
 	{
 		// Admins can do whatever they hell they want!
-		if (!User::$me->allowedTo('admin_forum'))
-		{
+		if (!User::$me->allowedTo('admin_forum')) {
 			// Load all the signature limits.
 			list($sig_limits, $sig_bbc) = explode(':', Config::$modSettings['signature_settings']);
 			$sig_limits = explode(',', $sig_limits);
-			$disabledTags = !empty($sig_bbc) ? explode(',', $sig_bbc) : array();
+			$disabledTags = !empty($sig_bbc) ? explode(',', $sig_bbc) : [];
 
-			$unparsed_signature = strtr(Utils::htmlspecialcharsDecode($value), array("\r" => '', '&#039' => '\''));
+			$unparsed_signature = strtr(Utils::htmlspecialcharsDecode($value), ["\r" => '', '&#039' => '\'']);
 
 			// Too many lines?
-			if (!empty($sig_limits[2]) && substr_count($unparsed_signature, "\n") >= $sig_limits[2])
-			{
+			if (!empty($sig_limits[2]) && substr_count($unparsed_signature, "\n") >= $sig_limits[2]) {
 				Lang::$txt['profile_error_signature_max_lines'] = sprintf(Lang::$txt['profile_error_signature_max_lines'], $sig_limits[2]);
 
 				return 'signature_max_lines';
 			}
 
 			// Too many images?!
-			if (!empty($sig_limits[3]) && (substr_count(strtolower($unparsed_signature), '[img') + substr_count(strtolower($unparsed_signature), '<img')) > $sig_limits[3])
-			{
+			if (!empty($sig_limits[3]) && (substr_count(strtolower($unparsed_signature), '[img') + substr_count(strtolower($unparsed_signature), '<img')) > $sig_limits[3]) {
 				Lang::$txt['profile_error_signature_max_image_count'] = sprintf(Lang::$txt['profile_error_signature_max_image_count'], $sig_limits[3]);
 
 				return 'signature_max_image_count';
@@ -1995,44 +1918,33 @@ public static function validateSignature(&$value): bool|string
 
 			$smiley_count = substr_count(strtolower($smiley_parsed), '<img') - substr_count(strtolower($unparsed_signature), '<img');
 
-			if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0)
-			{
+			if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0) {
 				return 'signature_allow_smileys';
 			}
-			elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
-			{
+
+			if (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4]) {
 				Lang::$txt['profile_error_signature_max_smileys'] = sprintf(Lang::$txt['profile_error_signature_max_smileys'], $sig_limits[4]);
 
 				return 'signature_max_smileys';
 			}
 
 			// Maybe we are abusing font sizes?
-			if (!empty($sig_limits[7]) && preg_match_all('~\[size=([\d\.]+)?(px|pt|em|x-large|larger)~i', $unparsed_signature, $matches) !== false && isset($matches[2]))
-			{
-				foreach ($matches[1] as $ind => $size)
-				{
+			if (!empty($sig_limits[7]) && preg_match_all('~\[size=([\d.]+)?(px|pt|em|x-large|larger)~i', $unparsed_signature, $matches) !== false && isset($matches[2])) {
+				foreach ($matches[1] as $ind => $size) {
 					$limit_broke = 0;
 
 					// Attempt to allow all sizes of abuse, so to speak.
-					if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-					{
+					if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
 						$limit_broke = $sig_limits[7] . 'px';
-					}
-					elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-					{
+					} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
 						$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-					}
-					elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-					{
+					} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
 						$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-					}
-					elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-					{
+					} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
 						$limit_broke = 'large';
 					}
 
-					if ($limit_broke)
-					{
+					if ($limit_broke) {
 						Lang::$txt['profile_error_signature_max_font_size'] = sprintf(Lang::$txt['profile_error_signature_max_font_size'], $limit_broke);
 
 						return 'signature_max_font_size';
@@ -2041,19 +1953,16 @@ public static function validateSignature(&$value): bool|string
 			}
 
 			// The difficult one - image sizes! Don't error on this - just fix it.
-			if ((!empty($sig_limits[5]) || !empty($sig_limits[6])))
-			{
+			if ((!empty($sig_limits[5]) || !empty($sig_limits[6]))) {
 				// Get all BBC tags...
-				preg_match_all('~\[img(\s+width=([\d]+))?(\s+height=([\d]+))?(\s+width=([\d]+))?\s*\](?:<br>)*([^<">]+?)(?:<br>)*\[/img\]~i', $unparsed_signature, $matches);
+				preg_match_all('~\[img(\s+width=(\d+))?(\s+height=(\d+))?(\s+width=(\d+))?\s*\](?:<br>)*([^<">]+?)(?:<br>)*\[/img\]~i', $unparsed_signature, $matches);
 
 				// ... and all HTML ones.
 				preg_match_all('~<img\s+src=(?:")?((?:http://|ftp://|https://|ftps://).+?)(?:")?(?:\s+alt=(?:")?(.*?)(?:")?)?(?:\s?/)?' . '>~i', $unparsed_signature, $matches2, PREG_PATTERN_ORDER);
 
 				// And stick the HTML in the BBC.
-				if (!empty($matches2))
-				{
-					foreach ($matches2[0] as $ind => $dummy)
-					{
+				if (!empty($matches2)) {
+					foreach ($matches2[0] as $ind => $dummy) {
 						$matches[0][] = $matches2[0][$ind];
 						$matches[1][] = '';
 						$matches[2][] = '';
@@ -2065,83 +1974,70 @@ public static function validateSignature(&$value): bool|string
 					}
 				}
 
-				$replaces = array();
+				$replaces = [];
 
 				// Try to find all the images!
-				if (!empty($matches))
-				{
-					foreach ($matches[0] as $key => $image)
-					{
+				if (!empty($matches)) {
+					foreach ($matches[0] as $key => $image) {
 						$width = -1;
 						$height = -1;
 
 						// Does it have predefined restraints? Width first.
-						if ($matches[6][$key])
+						if ($matches[6][$key]) {
 							$matches[2][$key] = $matches[6][$key];
+						}
 
-						if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
-						{
+						if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5]) {
 							$width = $sig_limits[5];
 							$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
-						}
-						elseif ($matches[2][$key])
-						{
+						} elseif ($matches[2][$key]) {
 							$width = $matches[2][$key];
 						}
 
 						// ... and height.
-						if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
-						{
+						if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6]) {
 							$height = $sig_limits[6];
 
-							if ($width != -1)
+							if ($width != -1) {
 								$width = $width * ($height / $matches[4][$key]);
-						}
-						elseif ($matches[4][$key])
-						{
+							}
+						} elseif ($matches[4][$key]) {
 							$height = $matches[4][$key];
 						}
 
 						// If the dimensions are still not fixed - we need to check the actual image.
-						if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
-						{
+						if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6])) {
 							$sizes = Image::getSizeExternal($matches[7][$key]);
 
-							if (is_array($sizes))
-							{
+							if (is_array($sizes)) {
 								// Too wide?
-								if ($sizes[0] > $sig_limits[5] && $sig_limits[5])
-								{
+								if ($sizes[0] > $sig_limits[5] && $sig_limits[5]) {
 									$width = $sig_limits[5];
 									$sizes[1] = $sizes[1] * ($width / $sizes[0]);
 								}
 
 								// Too high?
-								if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
-								{
+								if ($sizes[1] > $sig_limits[6] && $sig_limits[6]) {
 									$height = $sig_limits[6];
 
-									if ($width == -1)
+									if ($width == -1) {
 										$width = $sizes[0];
+									}
 
 									$width = $width * ($height / $sizes[1]);
-								}
-								elseif ($width != -1)
-								{
+								} elseif ($width != -1) {
 									$height = $sizes[1];
 								}
 							}
 						}
 
 						// Did we come up with some changes? If so remake the string.
-						if ($width != -1 || $height != -1)
-						{
+						if ($width != -1 || $height != -1) {
 							$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
 						}
 					}
 
-					if (!empty($replaces))
-					{
+					if (!empty($replaces)) {
 						$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 					}
 				}
@@ -2149,10 +2045,9 @@ public static function validateSignature(&$value): bool|string
 
 			// Any disabled BBC?
 			$disabledSigBBC = implode('|', $disabledTags);
-			if (!empty($disabledSigBBC))
-			{
-				if (preg_match('~\[(' . $disabledSigBBC . '[ =\]/])~i', $unparsed_signature, $matches) !== false && isset($matches[1]))
-				{
+
+			if (!empty($disabledSigBBC)) {
+				if (preg_match('~\[(' . $disabledSigBBC . '[ =\]/])~i', $unparsed_signature, $matches) !== false && isset($matches[1])) {
 					$disabledTags = array_unique($disabledTags);
 
 					Lang::$txt['profile_error_signature_disabled_bbc'] = sprintf(Lang::$txt['profile_error_signature_disabled_bbc'], implode(', ', $disabledTags));
@@ -2165,8 +2060,7 @@ public static function validateSignature(&$value): bool|string
 		Msg::preparsecode($value);
 
 		// Too long?
-		if (!User::$me->allowedTo('admin_forum') && !empty($sig_limits[1]) && Utils::entityStrlen(str_replace('<br>', "\n", $value)) > $sig_limits[1])
-		{
+		if (!User::$me->allowedTo('admin_forum') && !empty($sig_limits[1]) && Utils::entityStrlen(str_replace('<br>', "\n", $value)) > $sig_limits[1]) {
 			$_POST['signature'] = trim(Utils::htmlspecialchars(str_replace('<br>', "\n", $value), ENT_QUOTES));
 
 			Lang::$txt['profile_error_signature_max_length'] = sprintf(Lang::$txt['profile_error_signature_max_length'], $sig_limits[1]);
@@ -2183,12 +2077,14 @@ public static function validateSignature(&$value): bool|string
 	 * @param int $id ID number of the member whose profile is being viewed.
 	 * @return true Always returns true
 	 */
-	public static function backcompat_profileLoadGroups(int $id = null)
+	public static function backcompat_profileLoadGroups(?int $id = null)
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		self::$loaded[$id]->loadAssignableGroups();
+
 		return true;
 	}
 
@@ -2198,10 +2094,11 @@ public static function backcompat_profileLoadGroups(int $id = null)
 	 * @param bool $force_reload Whether to reload the data.
 	 * @param int $id The ID of the member.
 	 */
-	public static function backcompat_loadProfileFields($force_reload = false, int $id = null): void
+	public static function backcompat_loadProfileFields($force_reload = false, ?int $id = null): void
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		self::$loaded[$id]->loadStandardFields($force_reload);
 	}
@@ -2214,8 +2111,9 @@ public static function backcompat_loadProfileFields($force_reload = false, int $
 	 */
 	public static function backcompat_loadCustomFields(int $id, string $area = 'summary'): void
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		self::$loaded[$id]->loadCustomFields($area);
 	}
@@ -2228,8 +2126,9 @@ public static function backcompat_loadCustomFields(int $id, string $area = 'summ
 	 */
 	public static function backcompat_loadThemeOptions(int $id, bool $defaultSettings = false)
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		self::$loaded[$id]->loadThemeOptions($defaultSettings);
 	}
@@ -2243,8 +2142,9 @@ public static function backcompat_loadThemeOptions(int $id, bool $defaultSetting
 	 */
 	public static function backcompat_setupProfileContext(array $fields, int $id): void
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		self::$member->setupContext($fields);
 	}
@@ -2261,15 +2161,17 @@ public static function backcompat_setupProfileContext(array $fields, int $id): v
 	 */
 	public static function backcompat_makeCustomFieldChanges($id, $area, $sanitize = true, $return_errors = false)
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		$_REQUEST['sa'] = $area;
 		self::$member->post_sanitized = !$sanitize;
 		self::$member->save();
 
-		if (!empty($return_errors))
+		if (!empty($return_errors)) {
 			return $this->cf_save_errors;
+		}
 	}
 	/**
 	 * Backward compatibilty wrapper for the save() method.
@@ -2280,8 +2182,9 @@ public static function backcompat_makeCustomFieldChanges($id, $area, $sanitize =
 	 */
 	public static function backcompat_makeThemeChanges($id, $id_theme)
 	{
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load($id);
+		}
 
 		self::$member->new_data['id_theme'] = $id_theme;
 		self::$member->save();
@@ -2302,8 +2205,7 @@ protected function __construct(int $id)
 
 		self::$loaded[$this->id] = $this;
 
-		if (empty(self::$member->id))
-		{
+		if (empty(self::$member->id)) {
 			self::$member = $this;
 			self::$memID = $this->id;
 		}
@@ -2333,30 +2235,25 @@ protected function prepareToSaveStandardFields(): void
 		$this->loadStandardFields();
 
 		// Cycle through the profile fields working out what to do!
-		foreach ($this->standard_fields as $key => $field)
-		{
-			if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature'))
-			{
+		foreach ($this->standard_fields as $key => $field) {
+			if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature')) {
 				continue;
 			}
 
 			// Make sure there are no evil characters in the input.
-			$_POST[$key] = Utils::sanitizeChars(Utils::normalize($_POST[$key]), in_array($key, array('member_name', 'real_name')) ? 1 : 0);
+			$_POST[$key] = Utils::sanitizeChars(Utils::normalize($_POST[$key]), in_array($key, ['member_name', 'real_name']) ? 1 : 0);
 
 			// What gets updated?
-			$db_key = isset($field['save_key']) ? $field['save_key'] : $key;
+			$db_key = $field['save_key'] ?? $key;
 
 			// Right - we have something that is enabled, we can act upon and has a value posted to it. Does it have a validation function?
-			if (isset($field['input_validate']))
-			{
+			if (isset($field['input_validate'])) {
 				$is_valid = $field['input_validate']($_POST[$key], $this->id);
 
 				// An error occurred - set it as such!
-				if ($is_valid !== true)
-				{
+				if ($is_valid !== true) {
 					// Is this an actual error?
-					if ($is_valid !== false)
-					{
+					if ($is_valid !== false) {
 						$this->save_errors[$key] = $is_valid;
 						$this->standard_fields[$key]['is_error'] = $is_valid;
 					}
@@ -2369,22 +2266,16 @@ protected function prepareToSaveStandardFields(): void
 			$field['cast_type'] = empty($field['cast_type']) ? $field['type'] : $field['cast_type'];
 
 			// Finally, clean up certain types.
-			if ($field['cast_type'] == 'int')
-			{
+			if ($field['cast_type'] == 'int') {
 				$_POST[$key] = (int) $_POST[$key];
-			}
-			elseif ($field['cast_type'] == 'float')
-			{
+			} elseif ($field['cast_type'] == 'float') {
 				$_POST[$key] = (float) $_POST[$key];
-			}
-			elseif ($field['cast_type'] == 'check')
-			{
+			} elseif ($field['cast_type'] == 'check') {
 				$_POST[$key] = (int) !empty($_POST[$key]);
 			}
 
 			// If we got here we're doing OK.
-			if ($field['type'] != 'hidden' && (!isset($this->data[$key]) || $_POST[$key] != $this->data[$key]))
-			{
+			if ($field['type'] != 'hidden' && (!isset($this->data[$key]) || $_POST[$key] != $this->data[$key])) {
 				// Set the save variable.
 				$this->new_data[$db_key] = $_POST[$key];
 
@@ -2392,79 +2283,70 @@ protected function prepareToSaveStandardFields(): void
 				$this->data[$key] = $this->new_data[$key];
 
 				// Are we logging it?
-				if (!empty($field['log_change']) && isset($this->data[$key]))
-				{
-					$this->log_changes[] = array(
+				if (!empty($field['log_change']) && isset($this->data[$key])) {
+					$this->log_changes[] = [
 						'action' => $key,
 						'log_type' => 'user',
-						'extra' => array(
+						'extra' => [
 							'previous' => $this->data[$key],
 							'new' => $this->new_data[$db_key],
 							'applicator' => $this->applicator,
 							'member_affected' => $this->id,
-						),
-					);
+						],
+					];
 				}
 			}
 
 			// Logging group changes are a bit different...
-			if ($key == 'id_group' && $field['log_change'])
-			{
+			if ($key == 'id_group' && $field['log_change']) {
 				$this->loadAssignableGroups();
 
 				// Any changes to primary group?
-				if (isset($this->new_data['id_group']) && $this->new_data['id_group'] != $this->group_id)
-				{
-					$this->log_changes[] = array(
+				if (isset($this->new_data['id_group']) && $this->new_data['id_group'] != $this->group_id) {
+					$this->log_changes[] = [
 						'action' => 'id_group',
 						'log_type' => 'user',
-						'extra' => array(
+						'extra' => [
 							'previous' => !empty($this->data[$key]) && isset(Utils::$context['member_groups'][$this->data[$key]]) ? Utils::$context['member_groups'][$this->data[$key]]['name'] : '',
 							'new' => !empty($this->new_data[$key]) && isset(Utils::$context['member_groups'][$this->new_data[$key]]) ? Utils::$context['member_groups'][$this->new_data[$key]]['name'] : '',
 							'applicator' => $this->applicator,
 							'member_affected' => $this->id,
-						),
-					);
+						],
+					];
 				}
 
 				// Prepare additional groups for comparison.
-				$additional_groups = array(
-					'previous' => !empty($this->additional_groups) ? $this->additional_groups : array(),
-					'new' => !empty($this->new_data['additional_groups']) ? array_diff(explode(',', $this->new_data['additional_groups']), array(0)) : array(),
-				);
+				$additional_groups = [
+					'previous' => !empty($this->additional_groups) ? $this->additional_groups : [],
+					'new' => !empty($this->new_data['additional_groups']) ? array_diff(explode(',', $this->new_data['additional_groups']), [0]) : [],
+				];
 
 				sort($additional_groups['previous']);
 				sort($additional_groups['new']);
 
 				// What about additional groups?
-				if ($additional_groups['previous'] != $additional_groups['new'])
-				{
-					foreach ($additional_groups as $type => $groups)
-					{
-						foreach ($groups as $id => $group)
-						{
-							if (isset(Utils::$context['member_groups'][$group]))
-							{
+				if ($additional_groups['previous'] != $additional_groups['new']) {
+					foreach ($additional_groups as $type => $groups) {
+						foreach ($groups as $id => $group) {
+							if (isset(Utils::$context['member_groups'][$group])) {
 								$additional_groups[$type][$id] = Utils::$context['member_groups'][$group]['name'];
-							}
-							else
-							{
+							} else {
 								unset($additional_groups[$type][$id]);
 							}
 						}
 						$additional_groups[$type] = implode(', ', $additional_groups[$type]);
 					}
 
-					$this->log_changes[] = array(
+					$this->log_changes[] = [
 						'action' => 'additional_groups',
 						'log_type' => 'user',
-						'extra' => array(
+						'extra' => [
 							'previous' => $additional_groups['previous'],
 							'new' => $additional_groups['new'],
 							'applicator' => $this->applicator,
 							'member_affected' => $this->id,
-						),
-					);
+						],
+					];
 				}
 			}
 		}
@@ -2475,17 +2357,20 @@ protected function prepareToSaveStandardFields(): void
 	 */
 	protected function prepareToSaveIgnoreBoards(): void
 	{
-		if (!$this->can_change_extra || ($_POST['sa'] ?? null) !== 'ignoreboards')
+		if (!$this->can_change_extra || ($_POST['sa'] ?? null) !== 'ignoreboards') {
 			return;
+		}
 
 		// Whatever it is set to is a dirty filthy thing. Kinda like our minds.
 		unset($_POST['ignore_boards']);
 
-		if (empty($_POST['brd']))
-			$_POST['brd'] = array();
+		if (empty($_POST['brd'])) {
+			$_POST['brd'] = [];
+		}
 
-		if (!is_array($_POST['brd']))
-			$_POST['brd'] = array($_POST['brd']);
+		if (!is_array($_POST['brd'])) {
+			$_POST['brd'] = [$_POST['brd']];
+		}
 
 		$this->new_data['ignore_boards'] = implode(',', array_unique(array_filter(array_map('intval', $_POST['brd']))));
 
@@ -2497,8 +2382,9 @@ protected function prepareToSaveIgnoreBoards(): void
 	 */
 	protected function prepareToSaveBuddyList(): void
 	{
-		if (!$this->can_change_extra || !isset($_POST['buddy_list']))
+		if (!$this->can_change_extra || !isset($_POST['buddy_list'])) {
 			return;
+		}
 
 		$this->new_data['buddy_list'] = implode(',', array_unique(array_filter(array_map('intval', explode(',', $_POST['buddy_list'])))));
 	}
@@ -2506,95 +2392,87 @@ protected function prepareToSaveBuddyList(): void
 	/**
 	 * Sanitizes and validates input for any changes to the custom fields.
 	 */
-	protected function prepareToSaveCustomFields(string $area = null): void
+	protected function prepareToSaveCustomFields(?string $area = null): void
 	{
-		if (!$this->can_change_extra || !isset($area))
+		if (!$this->can_change_extra || !isset($area)) {
 			return;
+		}
 
-		$deletes = array();
-		$errors = array();
+		$deletes = [];
+		$errors = [];
 
 		self::loadCustomFieldDefinitions();
 
-		foreach (self::$custom_field_definitions as $cf_def)
-		{
+		foreach (self::$custom_field_definitions as $cf_def) {
 			$mask_error = false;
 
 			// Skips custom fields that are not active.
-			if (empty($cf_def['active']))
+			if (empty($cf_def['active'])) {
 				continue;
+			}
 
 			// Skip custom fields that don't belong in the area we are viewing.
-			if ($area !== $cf_def['show_profile'])
+			if ($area !== $cf_def['show_profile']) {
 				continue;
+			}
 
 			// If this is for registration, skip any that aren't shown there.
-			if ($area === 'register' && empty($cf_def['show_reg']))
+			if ($area === 'register' && empty($cf_def['show_reg'])) {
 				continue;
+			}
 
 			// Check the privacy level for this field.
-			if ($area !== 'register' && !User::$me->allowedTo('admin_forum'))
-			{
+			if ($area !== 'register' && !User::$me->allowedTo('admin_forum')) {
 				// If not the admin or the owner, cannot modify.
-				if (!User::$me->is_owner)
+				if (!User::$me->is_owner) {
 					continue;
+				}
 
 				// Owners can only modify levels 0 and 2.
-				if (!in_array($cf_def['private'], array(0, 2)))
+				if (!in_array($cf_def['private'], [0, 2])) {
 					continue;
+				}
 			}
 
 			// Validate the user data.
-			if ($cf_def['field_type'] == 'check')
-			{
+			if ($cf_def['field_type'] == 'check') {
 				$value = (int) isset($_POST['customfield'][$cf_def['col_name']]);
-			}
-			elseif ($cf_def['field_type'] == 'select' || $cf_def['field_type'] == 'radio')
-			{
+			} elseif ($cf_def['field_type'] == 'select' || $cf_def['field_type'] == 'radio') {
 				$value = $cf_def['default_value'];
 
-				foreach (explode(',', $cf_def['field_options']) as $k => $v)
-				{
-					if (isset($_POST['customfield'][$cf_def['col_name']]) && $_POST['customfield'][$cf_def['col_name']] == $k)
-					{
+				foreach (explode(',', $cf_def['field_options']) as $k => $v) {
+					if (isset($_POST['customfield'][$cf_def['col_name']]) && $_POST['customfield'][$cf_def['col_name']] == $k) {
 						$value = $v;
 					}
 				}
 			}
 			// Otherwise some form of text!
-			else
-			{
+			else {
 				$value = $_POST['customfield'][$cf_def['col_name']] ?? '';
 
-				if ($cf_def['field_length'])
+				if ($cf_def['field_length']) {
 					$value = Utils::entitySubstr($value, 0, $cf_def['field_length']);
+				}
 
 				// Any masks?
-				if ($cf_def['field_type'] == 'text' && !empty($cf_def['mask']) && $cf_def['mask'] != 'none')
-				{
+				if ($cf_def['field_type'] == 'text' && !empty($cf_def['mask']) && $cf_def['mask'] != 'none') {
 					$value = Utils::htmlTrim($value);
 					$valueReference = Utils::htmlspecialcharsDecode($value);
 
 					// Try and avoid some checks. '0' could be a valid non-empty value.
-					if (empty($value) && !is_numeric($value))
+					if (empty($value) && !is_numeric($value)) {
 						$value = '';
+					}
 
-					if ($cf_def['mask'] == 'nohtml' && ($valueReference != strip_tags($valueReference) || $value != Utils::htmlspecialchars($value, ENT_NOQUOTES) || preg_match('/<(.+?)[\s]*\/?[\s]*>/si', $valueReference)))
-					{
+					if ($cf_def['mask'] == 'nohtml' && ($valueReference != strip_tags($valueReference) || $value != Utils::htmlspecialchars($value, ENT_NOQUOTES) || preg_match('/<(.+?)\s*\\/?\s*>/si', $valueReference))) {
 						$mask_error = 'custom_field_nohtml_fail';
 						$value = '';
-					}
-					elseif ($cf_def['mask'] == 'email' && !empty($value) && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
-					{
+					} elseif ($cf_def['mask'] == 'email' && !empty($value) && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) {
 						$mask_error = 'custom_field_mail_fail';
 						$value = '';
-					}
-					elseif ($cf_def['mask'] == 'number')
-					{
+					} elseif ($cf_def['mask'] == 'number') {
 						$value = (int) $value;
-					}
-					elseif (substr($cf_def['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($cf_def['mask'], 5), $value) === 0)
-					{
+					} elseif (substr($cf_def['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($cf_def['mask'], 5), $value) === 0) {
 						$mask_error = 'custom_field_regex_fail';
 						$value = '';
 					}
@@ -2603,49 +2481,45 @@ protected function prepareToSaveCustomFields(string $area = null): void
 				}
 			}
 
-			if (!isset($this->options[$cf_def['col_name']]))
+			if (!isset($this->options[$cf_def['col_name']])) {
 				$this->options[$cf_def['col_name']] = '';
+			}
 
 			// If they tried to set a bad value, report the error.
-			if (is_string($mask_error))
-			{
+			if (is_string($mask_error)) {
 				$this->cf_save_errors[] = $mask_error;
 			}
 			// Did it change?
-			elseif ($this->options[$cf_def['col_name']] != $value)
-			{
-				$this->log_changes[] = array(
+			elseif ($this->options[$cf_def['col_name']] != $value) {
+				$this->log_changes[] = [
 					'action' => 'customfield_' . $cf_def['col_name'],
 					'log_type' => 'user',
-					'extra' => array(
+					'extra' => [
 						'previous' => !empty($this->options[$cf_def['col_name']]) ? $this->options[$cf_def['col_name']] : '',
 						'new' => $value,
 						'applicator' => $this->applicator,
 						'member_affected' => $this->id,
-					),
-				);
+					],
+				];
 
-				if (empty($value))
-				{
+				if (empty($value)) {
 					// Even though id_theme and id_member will be the same in
 					// every element of this array, we include them for the sake
 					// of backward compatibility with what the hook expects.
-					$deletes[] = array(
+					$deletes[] = [
 						'id_theme' => 1,
 						'variable' => $cf_def['col_name'],
 						'id_member' => $this->id,
-					);
+					];
 
 					unset($this->options[$cf_def['col_name']]);
-				}
-				else
-				{
-					$this->new_cf_data['updates'][] = array(
+				} else {
+					$this->new_cf_data['updates'][] = [
 						1,
 						$cf_def['col_name'],
 						$value,
 						$this->id,
-					);
+					];
 
 					$this->options[$cf_def['col_name']] = $value;
 				}
@@ -2654,7 +2528,7 @@ protected function prepareToSaveCustomFields(string $area = null): void
 
 		// The true in the hook params replaces an obsolete $returnErrors variable.
 		// The !self::$member->post_sanitized replaces an obsolete $sanitize variable.
-		$hook_errors = IntegrationHook::call('integrate_save_custom_profile_fields', array(
+		$hook_errors = IntegrationHook::call('integrate_save_custom_profile_fields', [
 			&$this->new_cf_data['updates'],
 			&$this->log_changes,
 			&$this->cf_save_errors,
@@ -2663,13 +2537,14 @@ protected function prepareToSaveCustomFields(string $area = null): void
 			$area,
 			!self::$member->post_sanitized,
 			&$deletes,
-		));
+		]);
 
 		// Now that the hook is done, we can set deletes to just the value we need.
-		$this->new_cf_data['deletes'] = array_map(fn($del) => $del['variable'], $deletes);
+		$this->new_cf_data['deletes'] = array_map(fn ($del) => $del['variable'], $deletes);
 
-		if (!empty($hook_errors) && is_array($hook_errors))
+		if (!empty($hook_errors) && is_array($hook_errors)) {
 			$this->cf_save_errors = array_merge($this->cf_save_errors, $hook_errors);
+		}
 
 		$this->save_errors = array_merge($this->save_errors, $this->cf_save_errors);
 	}
@@ -2679,69 +2554,73 @@ protected function prepareToSaveCustomFields(string $area = null): void
 	 */
 	protected function prepareToSaveOptions(): void
 	{
-		if (!$this->can_change_extra)
+		if (!$this->can_change_extra) {
 			return;
+		}
 
 		$id_theme = (int) ($this->new_data['id_theme'] ?? $this->theme);
 
 		// Can't change reserved vars.
-		foreach (array('options', 'default_options') as $key)
-		{
-			if (!isset($_POST[$key]))
+		foreach (['options', 'default_options'] as $key) {
+			if (!isset($_POST[$key])) {
 				continue;
+			}
 
-			if (count(array_intersect(array_keys($_POST[$key]), self::RESERVED_VARS)) != 0)
+			if (count(array_intersect(array_keys($_POST[$key]), self::RESERVED_VARS)) != 0) {
 				ErrorHandler::fatalLang('no_access', false);
+			}
 		}
 
 		self::loadCustomFieldDefinitions();
 
 		// These are the theme changes...
-		if (isset($_POST['options']) && is_array($_POST['options']))
-		{
-			foreach ($_POST['options'] as $opt => $val)
-			{
-				if (isset(self::$custom_field_definitions[$opt]))
+		if (isset($_POST['options']) && is_array($_POST['options'])) {
+			foreach ($_POST['options'] as $opt => $val) {
+				if (isset(self::$custom_field_definitions[$opt])) {
 					continue;
+				}
 
 				// We don't set this per theme anymore.
-				if ($opt == 'allow_no_censored')
+				if ($opt == 'allow_no_censored') {
 					continue;
+				}
 
 				// These need to be controlled.
-				if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
+				if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
 					$val = min(max($val, 0), 50);
+				}
 
-				$this->new_options['updates'][] = array(
+				$this->new_options['updates'][] = [
 					$id_theme,
 					$opt,
 					is_array($val) ? implode(',', $val) : $val,
 					$this->id,
-				);
+				];
 			}
 		}
 
-		if (isset($_POST['default_options']) && is_array($_POST['default_options']))
-		{
-			foreach ($_POST['default_options'] as $opt => $val)
-			{
-				if (isset(self::$custom_field_definitions[$opt]))
+		if (isset($_POST['default_options']) && is_array($_POST['default_options'])) {
+			foreach ($_POST['default_options'] as $opt => $val) {
+				if (isset(self::$custom_field_definitions[$opt])) {
 					continue;
+				}
 
 				// Only let admins and owners change the censor.
-				if ($opt == 'allow_no_censored' && !User::$me->is_admin && !User::$me->is_owner)
+				if ($opt == 'allow_no_censored' && !User::$me->is_admin && !User::$me->is_owner) {
 					continue;
+				}
 
 				// These need to be controlled.
-				if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
+				if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
 					$val = min(max($val, 0), 50);
+				}
 
-				$this->new_options['updates'][] = array(
+				$this->new_options['updates'][] = [
 					1,
 					$opt,
 					is_array($val) ? implode(',', $val) : $val,
 					$this->id,
-				);
+				];
 
 				// If this option appeared in any themes besides the default, remove it.
 				$this->new_options['deletes'][] = $opt;
@@ -2758,28 +2637,26 @@ protected function prepareToSaveOptions(): void
 	 */
 	protected function getAvatars(string $directory, int $level = 0): array
 	{
-		$result = array();
+		$result = [];
 
-		$dirs = array();
-		$files = array();
+		$dirs = [];
+		$files = [];
 
 		// Open the directory..
 		$dir = dir(Config::$modSettings['avatar_directory'] . (!empty($directory) ? '/' : '') . $directory);
 
-		if (!$dir)
-			return array();
+		if (!$dir) {
+			return [];
+		}
 
-		while ($line = $dir->read())
-		{
-			if (in_array($line, array('.', '..', 'blank.png', 'index.php')))
+		while ($line = $dir->read()) {
+			if (in_array($line, ['.', '..', 'blank.png', 'index.php'])) {
 				continue;
+			}
 
-			if (is_dir(Config::$modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line))
-			{
+			if (is_dir(Config::$modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line)) {
 				$dirs[] = $line;
-			}
-			else
-			{
+			} else {
 				$files[] = $line;
 			}
 		}
@@ -2789,36 +2666,32 @@ protected function getAvatars(string $directory, int $level = 0): array
 		natcasesort($dirs);
 		natcasesort($files);
 
-		if ($level == 0)
-		{
-			$result[] = array(
+		if ($level == 0) {
+			$result[] = [
 				'filename' => 'blank.png',
-				'checked' => in_array(Utils::$context['member']['avatar']['server_pic'], array('', 'blank.png')),
+				'checked' => in_array(Utils::$context['member']['avatar']['server_pic'], ['', 'blank.png']),
 				'name' => Lang::$txt['no_pic'],
-				'is_dir' => false
-			);
+				'is_dir' => false,
+			];
 		}
 
-		foreach ($dirs as $line)
-		{
+		foreach ($dirs as $line) {
 			$tmp = $this->getAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1);
 
-			if (!empty($tmp))
-			{
-				$result[] = array(
+			if (!empty($tmp)) {
+				$result[] = [
 					'filename' => Utils::htmlspecialchars($line),
 					'checked' => strpos(Utils::$context['member']['avatar']['server_pic'], $line . '/') !== false,
 					'name' => '[' . Utils::htmlspecialchars(str_replace('_', ' ', $line)) . ']',
 					'is_dir' => true,
-					'files' => $tmp
-				);
+					'files' => $tmp,
+				];
 			}
 
 			unset($tmp);
 		}
 
-		foreach ($files as $line)
-		{
+		foreach ($files as $line) {
 			$filename = substr($line, 0, (strlen($line) - strlen(strrchr($line, '.'))));
 			$extension = substr(strrchr($line, '.'), 1);
 
@@ -2830,20 +2703,20 @@ protected function getAvatars(string $directory, int $level = 0): array
 				&& strcasecmp($extension, 'jpeg') != 0
 				&& strcasecmp($extension, 'png') != 0
 				&& strcasecmp($extension, 'bmp') != 0
-			)
-			{
+			) {
 				continue;
 			}
 
-			$result[] = array(
+			$result[] = [
 				'filename' => Utils::htmlspecialchars($line),
 				'checked' => $line == Utils::$context['member']['avatar']['server_pic'],
 				'name' => Utils::htmlspecialchars(str_replace('_', ' ', $filename)),
-				'is_dir' => false
-			);
+				'is_dir' => false,
+			];
 
-			if ($level == 1)
+			if ($level == 1) {
 				Utils::$context['avatar_list'][] = $directory . '/' . $line;
+			}
 		}
 
 		return $result;
@@ -2860,7 +2733,7 @@ protected function setAvatarNone(): void
 		$this->data['id_attach'] = 0;
 		$this->data['attachment_type'] = 0;
 		$this->data['filename'] = '';
-		Attachment::remove(array('id_member' => $this->id));
+		Attachment::remove(['id_member' => $this->id]);
 	}
 
 	/**
@@ -2868,18 +2741,19 @@ protected function setAvatarNone(): void
 	 */
 	protected function setAvatarServerStored(string $filename): void
 	{
-		if (!User::$me->allowedTo('profile_server_avatar'))
+		if (!User::$me->allowedTo('profile_server_avatar')) {
 			return;
+		}
 
 		$filename = trim($filename);
 
-		if ($filename === '')
-		{
+		if ($filename === '') {
 			$this->setAvatarNone();
+
 			return;
 		}
 
-		$this->new_data['avatar'] = strtr($filename, array('&amp;' => '&'));
+		$this->new_data['avatar'] = strtr($filename, ['&amp;' => '&']);
 
 		$avatar_path = (string) realpath(Config::$modSettings['avatar_directory'] . '/' . $this->new_data['avatar']);
 
@@ -2892,8 +2766,7 @@ protected function setAvatarServerStored(string $filename): void
 			|| !is_file($avatar_path)
 			// Not a valid image file.
 			|| empty(($image = new Image($avatar_path))->mime_type)
-		)
-		{
+		) {
 			$this->new_data['avatar'] = '';
 		}
 
@@ -2901,52 +2774,53 @@ protected function setAvatarServerStored(string $filename): void
 		$this->data['id_attach'] = 0;
 		$this->data['attachment_type'] = 0;
 		$this->data['filename'] = '';
-		Attachment::remove(array('id_member' => $this->id));
+		Attachment::remove(['id_member' => $this->id]);
 	}
 
 	/**
 	 *
 	 */
-	protected function setAvatarExternal(string $url): string|null
+	protected function setAvatarExternal(string $url): ?string
 	{
-		if (!User::$me->allowedTo('profile_remote_avatar'))
+		if (!User::$me->allowedTo('profile_remote_avatar')) {
 			return null;
+		}
 
 		$url = trim($url);
 
-		if ($url === '')
-		{
+		if ($url === '') {
 			$this->setAvatarNone();
+
 			return null;
 		}
 
 		$url = str_replace(' ', '%20', $url);
 
 		// External URL is too long.
-		if (strlen($url) > 255)
+		if (strlen($url) > 255) {
 			return 'bad_avatar_url_too_long';
+		}
 
 		$image = new Image($url);
 
 		// Source will be empty if the URL doesn't point to a valid image.
-		if (empty($image->source))
+		if (empty($image->source)) {
 			return 'bad_avatar_invalid_url';
+		}
 
 		// Save a local copy? For security reasons, this should always be done for SVGs.
-		if (!empty(Config::$modSettings['avatar_download_external']) || $this->mime_type === 'image/svg+xml')
-		{
+		if (!empty(Config::$modSettings['avatar_download_external']) || $this->mime_type === 'image/svg+xml') {
 			return $this->setAvatarAttachment($image->source);
 		}
 
 		// Is is safe?
-		if (!$image->check(!empty(Config::$modSettings['avatar_paranoid'])))
+		if (!$image->check(!empty(Config::$modSettings['avatar_paranoid']))) {
 			return 'bad_avatar';
+		}
 
 		// Is it too big?
-		if ($image->shouldResize(Config::$modSettings['avatar_max_width_external'] ?? 0, Config::$modSettings['avatar_max_height_external'] ?? 0))
-		{
-			switch (Config::$modSettings['avatar_action_too_large'])
-			{
+		if ($image->shouldResize(Config::$modSettings['avatar_max_width_external'] ?? 0, Config::$modSettings['avatar_max_height_external'] ?? 0)) {
+			switch (Config::$modSettings['avatar_action_too_large']) {
 				case 'option_download_and_resize':
 					return $this->setAvatarAttachment($image->source);
 
@@ -2965,7 +2839,7 @@ protected function setAvatarExternal(string $url): string|null
 		$this->data['id_attach'] = 0;
 		$this->data['attachment_type'] = 0;
 		$this->data['filename'] = '';
-		Attachment::remove(array('id_member' => $this->id));
+		Attachment::remove(['id_member' => $this->id]);
 
 		return null;
 	}
@@ -2973,36 +2847,39 @@ protected function setAvatarExternal(string $url): string|null
 	/**
 	 *
 	 */
-	protected function setAvatarAttachment(string $filepath): string|null
+	protected function setAvatarAttachment(string $filepath): ?string
 	{
-		if (!User::$me->allowedTo('profile_upload_avatar'))
+		if (!User::$me->allowedTo('profile_upload_avatar')) {
 			return null;
+		}
 
 		$filepath = trim($filepath);
 
-		if ($filepath === '')
-		{
+		if ($filepath === '') {
 			$this->setAvatarNone();
+
 			return null;
 		}
 
-		if (!is_file($filepath))
+		if (!is_file($filepath)) {
 			return 'bad_avatar';
+		}
 
 		// We're going to put this in a nice custom dir.
 		$upload_dir = Config::$modSettings['custom_avatar_dir'];
 		$id_folder = 1;
 
 		// If this is an uploaded file, move it to the avatar directory with a temporary name.
-		if (isset($_FILES['attachment']['tmp_name']) && $_FILES['attachment']['tmp_name'] == $filepath)
-		{
-			if (!is_writable($upload_dir))
+		if (isset($_FILES['attachment']['tmp_name']) && $_FILES['attachment']['tmp_name'] == $filepath) {
+			if (!is_writable($upload_dir)) {
 				ErrorHandler::fatalLang('avatars_no_write', 'critical');
+			}
 
 			$new_filepath = tempnam($upload_dir, '');
 
-			if (!move_uploaded_file($filepath, $new_filepath))
+			if (!move_uploaded_file($filepath, $new_filepath)) {
 				ErrorHandler::fatalLang('attach_timeout', 'critical');
+			}
 
 			$filepath = $_FILES['attachment']['tmp_name'] = $new_filepath;
 		}
@@ -3011,27 +2888,26 @@ protected function setAvatarAttachment(string $filepath): string|null
 		$image = new Image($filepath);
 
 		// No size or MIME type? Then it's not a valid image.
-		if (empty($image->mime_type) || empty($image->width) || empty($image->height))
-		{
+		if (empty($image->mime_type) || empty($image->width) || empty($image->height)) {
 			@unlink($image->source);
 			unset($image);
+
 			return 'bad_avatar';
 		}
 
 		// Now try to find an infection.
-		if (!$image->check(!empty(Config::$modSettings['avatar_paranoid'])))
-		{
+		if (!$image->check(!empty(Config::$modSettings['avatar_paranoid']))) {
 			// It's bad. Try to re-encode the contents?
-			if (empty(Config::$modSettings['avatar_reencode']) || !$image->reencode())
-			{
+			if (empty(Config::$modSettings['avatar_reencode']) || !$image->reencode()) {
 				@unlink($image->source);
+
 				return 'bad_avatar_fail_reencode';
 			}
 
 			// It's been re-encoded. Check it again.
-			if (!$image->check(!empty(Config::$modSettings['avatar_paranoid'])))
-			{
+			if (!$image->check(!empty(Config::$modSettings['avatar_paranoid']))) {
 				@unlink($image->source);
+
 				return 'bad_avatar_fail_reencode';
 			}
 		}
@@ -3040,32 +2916,31 @@ protected function setAvatarAttachment(string $filepath): string|null
 		$max_width = Config::$modSettings['avatar_max_width_external'] ?? 0;
 		$max_height = Config::$modSettings['avatar_max_height_external'] ?? 0;
 
-		if ($image->shouldResize($max_width, $max_height))
-		{
+		if ($image->shouldResize($max_width, $max_height)) {
 			// Try to resize it, unless the admin disabled resizing.
-			if (empty(Config::$modSettings['avatar_resize_upload']) || !$image->resize($image->source, $max_width, $max_height))
-			{
+			if (empty(Config::$modSettings['avatar_resize_upload']) || !$image->resize($image->source, $max_width, $max_height)) {
 				// Admin disabled resizing, or resizing failed.
 				@unlink($image->source);
 				unset($image);
+
 				return 'bad_avatar';
 			}
 		}
 
 		// Move to its final name and location. Error on failure.
-		if (!$image->move($upload_dir . '/avatar_' . $this->id . '_' . time() . '.' . image_type_to_extension($image->type)))
-		{
+		if (!$image->move($upload_dir . '/avatar_' . $this->id . '_' . time() . image_type_to_extension($image->type))) {
 			ErrorHandler::fatalLang('attach_timeout', 'critical');
 		}
 
 		// Remove previous attachments this member might have had.
-		Attachment::remove(array('id_member' => $this->id));
+		Attachment::remove(['id_member' => $this->id]);
 
 		$this->new_data['avatar'] = '';
 
-		$this->data['id_attach'] = Db::$db->insert('',
+		$this->data['id_attach'] = Db::$db->insert(
+			'',
 			'{db_prefix}attachments',
-			array(
+			[
 				'id_member' => 'int',
 				'attachment_type' => 'int',
 				'filename' => 'string',
@@ -3076,8 +2951,8 @@ protected function setAvatarAttachment(string $filepath): string|null
 				'height' => 'int',
 				'mime_type' => 'string',
 				'id_folder' => 'int',
-			),
-			array(
+			],
+			[
 				$this->id,
 				1,
 				$image->pathinfo['basename'],
@@ -3088,9 +2963,9 @@ protected function setAvatarAttachment(string $filepath): string|null
 				$image->height,
 				$image->mime_type,
 				$id_folder,
-			),
-			array('id_attach'),
-			1
+			],
+			['id_attach'],
+			1,
 		);
 
 		$this->data['filename'] = $image->pathinfo['basename'];
@@ -3104,25 +2979,23 @@ protected function setAvatarAttachment(string $filepath): string|null
 	 */
 	protected function setAvatarGravatar(): void
 	{
-		if (empty(Config::$modSettings['gravatarEnabled']))
+		if (empty(Config::$modSettings['gravatarEnabled'])) {
 			return;
+		}
 
 		// One wasn't specified, or it's not allowed to use extra email addresses, or it's not a valid one, reset to default Gravatar.
 		if (
 			empty($_POST['gravatarEmail'])
 			|| empty(Config::$modSettings['gravatarAllowExtraEmail'])
 			|| !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL)
-		)
-		{
+		) {
 			$this->new_data['avatar'] = 'gravatar://';
-		}
-		else
-		{
+		} else {
 			$this->new_data['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $this->data['email_address'] ? $_POST['gravatarEmail'] : '');
 		}
 
 		// Get rid of their old avatar. (if uploaded.)
-		Attachment::remove(array('id_member' => $this->id));
+		Attachment::remove(['id_member' => $this->id]);
 	}
 
 	/**
@@ -3131,14 +3004,15 @@ protected function setAvatarGravatar(): void
 	protected function sendActivation(): void
 	{
 		// Shouldn't happen but just in case.
-		if (empty($this->new_data['email_address']))
+		if (empty($this->new_data['email_address'])) {
 			return;
+		}
 
-		$replacements = array(
+		$replacements = [
 			'ACTIVATIONLINK' => Config::$scripturl . '?action=activate;u=' . $this->id . ';code=' . $this->new_data['validation_code'],
 			'ACTIVATIONCODE' => $this->new_data['validation_code'],
 			'ACTIVATIONLINKWITHOUTCODE' => Config::$scripturl . '?action=activate;u=' . $this->id,
-		);
+		];
 
 		// Send off the email.
 		$emaildata = Mail::loadEmailTemplate('activate_reactivate', $replacements, empty(User::$profiles[$this->id]['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : User::$profiles[$this->id]['lngfile']);
@@ -3146,19 +3020,21 @@ protected function sendActivation(): void
 		Mail::send($this->new_data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'reactivate', $emaildata['is_html'], 0);
 
 		// Log the user out.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_online
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_online
 			WHERE id_member = {int:selected_member}',
-			array(
+			[
 				'selected_member' => $this->id,
-			)
+			],
 		);
 
 		$_SESSION['log_time'] = 0;
-		$_SESSION['login_' . Config::$cookiename] = Utils::jsonEncode(array(0, '', 0));
+		$_SESSION['login_' . Config::$cookiename] = Utils::jsonEncode([0, '', 0]);
 
-		if (isset($_COOKIE[Config::$cookiename]))
+		if (isset($_COOKIE[Config::$cookiename])) {
 			$_COOKIE[Config::$cookiename] = '';
+		}
 
 		User::setMe(0);
 
@@ -3175,14 +3051,13 @@ protected function sendActivation(): void
 	 *
 	 * @param string $username The new username. If set, also checks the validity of the username
 	 */
-	protected function resetPassword(string $username = null): void
+	protected function resetPassword(?string $username = null): void
 	{
 		// Language...
 		Lang::load('Login');
 
-		if ($username !== null)
-		{
-			$username = trim(Utils::normalizeSpaces(Utils::sanitizeChars($username, 1, ' '), true, true, array('no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true)));
+		if ($username !== null) {
+			$username = trim(Utils::normalizeSpaces(Utils::sanitizeChars($username, 1, ' '), true, true, ['no_breaks' => true, 'replace_tabs' => true, 'collapse_hspace' => true]));
 		}
 
 		// Generate a random password.
@@ -3190,24 +3065,21 @@ protected function resetPassword(string $username = null): void
 		$new_password_sha1 = Security::hashPassword($username ?? $this->username, $new_password);
 
 		// Do some checks on the username if needed.
-		if ($username !== null)
-		{
+		if ($username !== null) {
 			User::validateUsername($this->id, $username);
 
 			// Update the database...
-			User::updateMemberData($this->id, array('member_name' => $username, 'passwd' => $new_password_sha1));
-		}
-		else
-		{
-			User::updateMemberData($this->id, array('passwd' => $new_password_sha1));
+			User::updateMemberData($this->id, ['member_name' => $username, 'passwd' => $new_password_sha1]);
+		} else {
+			User::updateMemberData($this->id, ['passwd' => $new_password_sha1]);
 		}
 
-		IntegrationHook::call('integrate_reset_pass', array($this->username, $username, $new_password));
+		IntegrationHook::call('integrate_reset_pass', [$this->username, $username, $new_password]);
 
-		$replacements = array(
+		$replacements = [
 			'USERNAME' => $username,
 			'PASSWORD' => $new_password,
-		);
+		];
 
 		$emaildata = Mail::loadEmailTemplate('change_password', $replacements, $this->language);
 
@@ -3224,8 +3096,7 @@ protected function resetPassword(string $username = null): void
 	 */
 	protected static function reloadUser(int $memID): void
 	{
-		if ($memID == User::$me->id && isset($_POST['passwrd2']) && $_POST['passwrd2'] != '')
-		{
+		if ($memID == User::$me->id && isset($_POST['passwrd2']) && $_POST['passwrd2'] != '') {
 			Cookie::setLoginCookie(60 * Config::$modSettings['cookieTime'], User::$me->id, Cookie::encrypt($_POST['passwrd1'], User::$me->password_salt));
 		}
 
@@ -3236,8 +3107,9 @@ protected static function reloadUser(int $memID): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Profile::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Profile::exportStatic')) {
 	Profile::exportStatic();
+}
 
 // Old mods might include this file to get access to functions that have been moved.
 class_exists('\\SMF\\Actions\\Profile\\Main');
diff --git a/Sources/ProxyServer.php b/Sources/ProxyServer.php
index 685a8cb6cd..712d970873 100644
--- a/Sources/ProxyServer.php
+++ b/Sources/ProxyServer.php
@@ -106,37 +106,40 @@ public function __construct()
 	 */
 	public function checkRequest(): bool
 	{
-		if (!$this->enabled)
+		if (!$this->enabled) {
 			return false;
+		}
 
 		// Try to create the image cache directory if it doesn't exist
-		if (!file_exists($this->cache))
-		{
-			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php'))
-			{
+		if (!file_exists($this->cache)) {
+			if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php')) {
 				return false;
 			}
 		}
 
 		// We aren't going anywhere without these
-		if (empty($_GET['hash']) || empty($_GET['request']))
+		if (empty($_GET['hash']) || empty($_GET['request'])) {
 			return false;
+		}
 
 		$request = new Url($_GET['request']);
 
 		// Basic sanity check.
-		if (!$request->isValid())
+		if (!$request->isValid()) {
 			return false;
+		}
 
 		// Ensure any non-ASCII characters in the URL are encoded correctly
 		$request = $request->toAscii();
 
-		if (hash_hmac('sha1', $request, $this->secret) != $_GET['hash'])
+		if (hash_hmac('sha1', $request, $this->secret) != $_GET['hash']) {
 			return false;
+		}
 
 		// Attempt to cache the request if it doesn't exist
-		if (!$this->isCached($request))
+		if (!$this->isCached($request)) {
 			return $this->cacheImage($request);
+		}
 
 		return true;
 	}
@@ -151,10 +154,10 @@ public function serve(): void
 		// Did we get an error when trying to fetch the image
 		$response = $this->checkRequest();
 
-		if (!$response)
-		{
+		if (!$response) {
 			// Throw a 404
 			Utils::sendHttpStatus(404);
+
 			exit;
 		}
 
@@ -162,8 +165,7 @@ public function serve(): void
 		$cached_file = $this->getCachedPath($request);
 
 		// Read from cache if you need to...
-		if ($this->cachedbody === null)
-		{
+		if ($this->cachedbody === null) {
 			$cached = json_decode(file_get_contents($cached_file), true);
 			$this->cachedtime = $cached['time'];
 			$this->cachedtype = $cached['content_type'];
@@ -174,29 +176,30 @@ public function serve(): void
 		$time = time();
 
 		// Is the cache expired? Delete and reload.
-		if ($time - $this->cachedtime > ($this->maxDays * 86400))
-		{
+		if ($time - $this->cachedtime > ($this->maxDays * 86400)) {
 			@unlink($cached_file);
 
-			if ($this->checkRequest())
+			if ($this->checkRequest()) {
 				$this->serve();
+			}
 
 			$this->redirectexit($request);
 		}
 
 		$eTag = '"' . substr(sha1($request) . $this->cachedtime, 0, 64) . '"';
 
-		if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag) !== false)
-		{
+		if (!empty($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag) !== false) {
 			Utils::sendHttpStatus(304);
+
 			exit;
 		}
 
 		// Make sure we're serving an image
 		$contentParts = explode('/', !empty($this->cachedtype) ? $this->cachedtype : '');
 
-		if ($contentParts[0] != 'image')
+		if ($contentParts[0] != 'image') {
 			exit;
+		}
 
 		$max_age = $time - $this->cachedtime + (5 * 86400);
 		header('content-type: ' . $this->cachedtype);
@@ -250,28 +253,30 @@ protected function cacheImage(string $request): bool
 		$image = WebFetchApi::fetch($request);
 
 		// Looks like nobody was home
-		if (empty($image))
+		if (empty($image)) {
 			$this->redirectexit($request);
+		}
 
 		// What kind of file did they give us?
 		$finfo = finfo_open(FILEINFO_MIME_TYPE);
 		$mime_type = finfo_buffer($finfo, $image);
 
 		// SVG needs a little extra care
-		if ($ext == 'svg' && in_array($mime_type, array('text/plain', 'text/xml')) && strpos($image, '<svg') !== false && strpos($image, '</svg>') !== false)
-		{
+		if ($ext == 'svg' && in_array($mime_type, ['text/plain', 'text/xml']) && strpos($image, '<svg') !== false && strpos($image, '</svg>') !== false) {
 			$mime_type = 'image/svg+xml';
 		}
 
 		// Make sure the url is returning an image
-		if (strpos($mime_type, 'image/') !== 0)
+		if (strpos($mime_type, 'image/') !== 0) {
 			$this->redirectexit($request);
+		}
 
 		// Validate the filesize
 		$size = strlen($image);
 
-		if ($size > ($this->maxSize * 1024))
+		if ($size > ($this->maxSize * 1024)) {
 			$this->redirectexit($request);
+		}
 
 		// Populate object for current serve execution (so you don't have to read it again...)
 		$this->cachedtime = time();
@@ -280,12 +285,12 @@ protected function cacheImage(string $request): bool
 		$this->cachedbody = base64_encode($image);
 
 		// Cache it for later
-		return file_put_contents($dest, json_encode(array(
+		return file_put_contents($dest, json_encode([
 			'content_type' => $this->cachedtype,
 			'size' => $this->cachedsize,
 			'time' => $this->cachedtime,
 			'body' => $this->cachedbody,
-		))) !== false;
+		])) !== false;
 	}
 
 	/**
@@ -296,6 +301,7 @@ protected function cacheImage(string $request): bool
 	private function redirectexit(string $request): void
 	{
 		header('Location: ' . Utils::htmlspecialcharsDecode($request), false, 301);
+
 		exit;
 	}
 
@@ -306,12 +312,9 @@ public function housekeeping(): void
 	{
 		$path = $this->cache . '/';
 
-		if ($handle = opendir($path))
-		{
-			while (false !== ($file = readdir($handle)))
-			{
-				if (is_file($path . $file) && !in_array($file, array('index.php', '.htaccess')) && time() - filemtime($path . $file) > $this->maxDays * 86400)
-				{
+		if ($handle = opendir($path)) {
+			while (false !== ($file = readdir($handle))) {
+				if (is_file($path . $file) && !in_array($file, ['index.php', '.htaccess']) && time() - filemtime($path . $file) > $this->maxDays * 86400) {
 					unlink($path . $file);
 				}
 			}
diff --git a/Sources/Punycode.php b/Sources/Punycode.php
index d96fd5afc5..294593d2a9 100755
--- a/Sources/Punycode.php
+++ b/Sources/Punycode.php
@@ -32,57 +32,57 @@ class Punycode
 	 * Bootstring parameter values
 	 *
 	 */
-	const BASE = 36;
-	const TMIN = 1;
-	const TMAX = 26;
-	const SKEW = 38;
-	const DAMP = 700;
-	const INITIAL_BIAS = 72;
-	const INITIAL_N = 128;
-	const PREFIX = 'xn--';
-	const DELIMITER = '-';
+	public const BASE = 36;
+	public const TMIN = 1;
+	public const TMAX = 26;
+	public const SKEW = 38;
+	public const DAMP = 700;
+	public const INITIAL_BIAS = 72;
+	public const INITIAL_N = 128;
+	public const PREFIX = 'xn--';
+	public const DELIMITER = '-';
 
 	/**
 	 * IDNA Error constants
 	 */
-	const IDNA_ERROR_EMPTY_LABEL = 1;
-	const IDNA_ERROR_LABEL_TOO_LONG = 2;
-	const IDNA_ERROR_DOMAIN_NAME_TOO_LONG = 4;
-	const IDNA_ERROR_LEADING_HYPHEN = 8;
-	const IDNA_ERROR_TRAILING_HYPHEN = 16;
-	const IDNA_ERROR_HYPHEN_3_4 = 32;
-	const IDNA_ERROR_LEADING_COMBINING_MARK = 64;
-	const IDNA_ERROR_DISALLOWED = 128;
-	const IDNA_ERROR_PUNYCODE = 256;
-	const IDNA_ERROR_LABEL_HAS_DOT = 512;
-	const IDNA_ERROR_INVALID_ACE_LABEL = 1024;
-	const IDNA_ERROR_BIDI = 2048;
-	const IDNA_ERROR_CONTEXTJ = 4096;
+	public const IDNA_ERROR_EMPTY_LABEL = 1;
+	public const IDNA_ERROR_LABEL_TOO_LONG = 2;
+	public const IDNA_ERROR_DOMAIN_NAME_TOO_LONG = 4;
+	public const IDNA_ERROR_LEADING_HYPHEN = 8;
+	public const IDNA_ERROR_TRAILING_HYPHEN = 16;
+	public const IDNA_ERROR_HYPHEN_3_4 = 32;
+	public const IDNA_ERROR_LEADING_COMBINING_MARK = 64;
+	public const IDNA_ERROR_DISALLOWED = 128;
+	public const IDNA_ERROR_PUNYCODE = 256;
+	public const IDNA_ERROR_LABEL_HAS_DOT = 512;
+	public const IDNA_ERROR_INVALID_ACE_LABEL = 1024;
+	public const IDNA_ERROR_BIDI = 2048;
+	public const IDNA_ERROR_CONTEXTJ = 4096;
 
 	/**
 	 * Encode table
 	 *
 	 * @param array
 	 */
-	protected static $encodeTable = array(
+	protected static $encodeTable = [
 		'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
 		'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
 		'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-	);
+	];
 
 	/**
 	 * Decode table
 	 *
 	 * @param array
 	 */
-	protected static $decodeTable = array(
+	protected static $decodeTable = [
 		'a' => 0, 'b' => 1, 'c' => 2, 'd' => 3, 'e' => 4, 'f' => 5,
 		'g' => 6, 'h' => 7, 'i' => 8, 'j' => 9, 'k' => 10, 'l' => 11,
 		'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17,
 		's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23,
 		'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29,
-		'4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35
-	);
+		'4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35,
+	];
 
 	/**
 	 * Character encoding
@@ -145,18 +145,19 @@ public function useStd3(bool $std3)
 	public function encode($input)
 	{
 		// For compatibility with idn_to_* functions
-		if ($this->decode($input) === false)
+		if ($this->decode($input) === false) {
 			return false;
+		}
 
-		$errors = array();
+		$errors = [];
 		$preprocessed = $this->preprocess($input, $errors);
 
-		if (!empty($errors))
-		{
+		if (!empty($errors)) {
 			return false;
 		}
 
 		$parts = explode('.', $preprocessed);
+
 		foreach ($parts as $p => &$part) {
 			$part = $this->encodePart($part);
 
@@ -174,7 +175,6 @@ public function encode($input)
 				case self::IDNA_ERROR_BIDI:
 				case self::IDNA_ERROR_CONTEXTJ:
 					return false;
-					break;
 
 				case self::IDNA_ERROR_HYPHEN_3_4:
 					$part = $parts[$p];
@@ -182,8 +182,11 @@ public function encode($input)
 
 				case self::IDNA_ERROR_EMPTY_LABEL:
 					$parts_count = count($parts);
-					if ($parts_count === 1 || $p !== $parts_count - 1)
+
+					if ($parts_count === 1 || $p !== $parts_count - 1) {
 						return false;
+					}
+
 					break;
 
 				default:
@@ -193,8 +196,9 @@ public function encode($input)
 		$output = implode('.', $parts);
 
 		// IDNA_ERROR_DOMAIN_NAME_TOO_LONG
-		if (strlen(rtrim($output, '.')) > 253)
+		if (strlen(rtrim($output, '.')) > 253) {
 			return false;
+		}
 
 		return $output;
 	}
@@ -215,12 +219,15 @@ protected function encodePart($input)
 		$h = $b = count($codePoints['basic']);
 
 		$output = '';
+
 		foreach ($codePoints['basic'] as $code) {
 			$output .= $this->codePointToChar($code);
 		}
+
 		if ($input === $output) {
 			return $output;
 		}
+
 		if ($b > 0) {
 			$output .= static::DELIMITER;
 		}
@@ -230,6 +237,7 @@ protected function encodePart($input)
 
 		$i = 0;
 		$length = mb_strlen($input, $this->encoding);
+
 		while ($h < $length) {
 			$m = $codePoints['nonBasic'][$i++];
 			$delta = $delta + ($m - $n) * ($h + 1);
@@ -239,10 +247,13 @@ protected function encodePart($input)
 				if ($c < $n || $c < static::INITIAL_N) {
 					$delta++;
 				}
+
 				if ($c === $n) {
 					$q = $delta;
+
 					for ($k = static::BASE;; $k += static::BASE) {
 						$t = $this->calculateThreshold($k, $bias);
+
 						if ($q < $t) {
 							break;
 						}
@@ -276,37 +287,35 @@ protected function encodePart($input)
 	 */
 	public function decode($input)
 	{
-		$errors = array();
+		$errors = [];
 		$preprocessed = $this->preprocess($input, $errors);
 
-		if (!empty($errors))
-		{
+		if (!empty($errors)) {
 			return false;
 		}
 
 		$parts = explode('.', $preprocessed);
-		foreach ($parts as $p => &$part)
-		{
-			if (strpos($part, static::PREFIX) === 0)
-			{
+
+		foreach ($parts as $p => &$part) {
+			if (strpos($part, static::PREFIX) === 0) {
 				$part = substr($part, strlen(static::PREFIX));
 				$part = $this->decodePart($part);
 
-				if ($part === false)
+				if ($part === false) {
 					return false;
+				}
 			}
 
-			if ($this->validateLabel($part, false) !== 0)
-			{
-				if ($part === '')
-				{
+			if ($this->validateLabel($part, false) !== 0) {
+				if ($part === '') {
 					$parts_count = count($parts);
 
-					if ($parts_count === 1 || $p !== $parts_count - 1)
+					if ($parts_count === 1 || $p !== $parts_count - 1) {
 						return false;
-				}
-				else
+					}
+				} else {
 					return false;
+				}
 			}
 		}
 		$output = implode('.', $parts);
@@ -328,33 +337,30 @@ protected function decodePart($input)
 		$output = '';
 
 		$pos = strrpos($input, static::DELIMITER);
-		if ($pos !== false)
-		{
+
+		if ($pos !== false) {
 			$output = substr($input, 0, $pos++);
-		}
-		else
-		{
+		} else {
 			$pos = 0;
 		}
 
 		$outputLength = strlen($output);
 		$inputLength = strlen($input);
-		while ($pos < $inputLength)
-		{
+
+		while ($pos < $inputLength) {
 			$oldi = $i;
 			$w = 1;
 
-			for ($k = static::BASE;; $k += static::BASE)
-			{
-				if (!isset($input[$pos]) || !isset(static::$decodeTable[$input[$pos]]))
+			for ($k = static::BASE;; $k += static::BASE) {
+				if (!isset($input[$pos]) || !isset(static::$decodeTable[$input[$pos]])) {
 					return false;
+				}
 
 				$digit = static::$decodeTable[$input[$pos++]];
 				$i = $i + ($digit * $w);
 				$t = $this->calculateThreshold($k, $bias);
 
-				if ($digit < $t)
-				{
+				if ($digit < $t) {
 					break;
 				}
 
@@ -375,30 +381,30 @@ protected function decodePart($input)
 	/**
 	 * Calculate the bias threshold to fall between TMIN and TMAX
 	 *
-	 * @param integer $k
-	 * @param integer $bias
-	 * @return integer
+	 * @param int $k
+	 * @param int $bias
+	 * @return int
 	 */
 	protected function calculateThreshold($k, $bias)
 	{
-		if ($k <= $bias + static::TMIN)
-		{
+		if ($k <= $bias + static::TMIN) {
 			return static::TMIN;
 		}
-		elseif ($k >= $bias + static::TMAX)
-		{
+
+		if ($k >= $bias + static::TMAX) {
 			return static::TMAX;
 		}
+
 		return $k - $bias;
 	}
 
 	/**
 	 * Bias adaptation
 	 *
-	 * @param integer $delta
-	 * @param integer $numPoints
-	 * @param boolean $firstTime
-	 * @return integer
+	 * @param int $delta
+	 * @param int $numPoints
+	 * @param bool $firstTime
+	 * @return int
 	 */
 	protected function adapt($delta, $numPoints, $firstTime)
 	{
@@ -410,8 +416,8 @@ protected function adapt($delta, $numPoints, $firstTime)
 		$delta += (int) ($delta / $numPoints);
 
 		$k = 0;
-		while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2)
-		{
+
+		while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2) {
 			$delta = (int) ($delta / (static::BASE - static::TMIN));
 			$k = $k + static::BASE;
 		}
@@ -428,23 +434,21 @@ protected function adapt($delta, $numPoints, $firstTime)
 	 */
 	protected function listCodePoints($input)
 	{
-		$codePoints = array(
-			'all' => array(),
-			'basic' => array(),
-			'nonBasic' => array(),
-		);
+		$codePoints = [
+			'all' => [],
+			'basic' => [],
+			'nonBasic' => [],
+		];
 
 		$length = mb_strlen($input, $this->encoding);
-		for ($i = 0; $i < $length; $i++)
-		{
+
+		for ($i = 0; $i < $length; $i++) {
 			$char = mb_substr($input, $i, 1, $this->encoding);
 			$code = $this->charToCodePoint($char);
-			if ($code < 128)
-			{
+
+			if ($code < 128) {
 				$codePoints['all'][] = $codePoints['basic'][] = $code;
-			}
-			else
-			{
+			} else {
 				$codePoints['all'][] = $codePoints['nonBasic'][] = $code;
 			}
 		}
@@ -456,53 +460,48 @@ protected function listCodePoints($input)
 	 * Convert a single or multi-byte character to its code point
 	 *
 	 * @param string $char
-	 * @return integer
+	 * @return int
 	 */
 	protected function charToCodePoint($char)
 	{
 		$code = ord($char[0]);
-		if ($code < 128)
-		{
+
+		if ($code < 128) {
 			return $code;
 		}
-		elseif ($code < 224)
-		{
+
+		if ($code < 224) {
 			return (($code - 192) * 64) + (ord($char[1]) - 128);
 		}
-		elseif ($code < 240)
-		{
+
+		if ($code < 240) {
 			return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128);
 		}
-		else
-		{
-			return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128);
-		}
+
+		return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128);
 	}
 
 	/**
 	 * Convert a code point to its single or multi-byte character
 	 *
-	 * @param integer $code
+	 * @param int $code
 	 * @return string
 	 */
 	protected function codePointToChar($code)
 	{
-		if ($code <= 0x7F)
-		{
+		if ($code <= 0x7F) {
 			return chr($code);
 		}
-		elseif ($code <= 0x7FF)
-		{
+
+		if ($code <= 0x7FF) {
 			return chr(($code >> 6) + 192) . chr(($code & 63) + 128);
 		}
-		elseif ($code <= 0xFFFF)
-		{
+
+		if ($code <= 0xFFFF) {
 			return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
 		}
-		else
-		{
-			return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
-		}
+
+		return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
 	}
 
 	/**
@@ -512,14 +511,15 @@ protected function codePointToChar($code)
 	 * @param string $domain A domain name
 	 * @param array $errors Will record any errors encountered during preprocessing
 	 */
-	protected function preprocess(string $domain, array &$errors = array())
+	protected function preprocess(string $domain, array &$errors = [])
 	{
-		require_once(Config::$sourcedir . '/Unicode/Idna.php');
+		require_once Config::$sourcedir . '/Unicode/Idna.php';
 
 		$regexes = Unicode\idna_regex();
 
-		if (preg_match('/[' . $regexes['disallowed'] . ($this->std3 ? $regexes['disallowed_std3'] : '') . ']/u', $domain))
+		if (preg_match('/[' . $regexes['disallowed'] . ($this->std3 ? $regexes['disallowed_std3'] : '') . ']/u', $domain)) {
 			$errors[] = 'disallowed';
+		}
 
 		$domain = preg_replace('/[' . $regexes['ignored'] . ']/u', '', $domain);
 
@@ -527,11 +527,13 @@ protected function preprocess(string $domain, array &$errors = array())
 
 		$maps = idna_maps();
 
-		if (!$this->nonTransitional)
+		if (!$this->nonTransitional) {
 			$maps = array_merge($maps, idna_maps_deviation());
+		}
 
-		if (!$this->std3)
+		if (!$this->std3) {
 			$maps = array_merge($maps, idna_maps_not_std3());
+		}
 
 		return Utils::normalize(strtr($domain, $maps));
 	}
@@ -546,55 +548,45 @@ protected function validateLabel(string $label, bool $toPunycode = true)
 	{
 		$length = strlen($label);
 
-		if ($length === 0)
-		{
+		if ($length === 0) {
 			return self::IDNA_ERROR_EMPTY_LABEL;
 		}
 
-		if ($toPunycode)
-		{
-			if ($length > 63)
-			{
+		if ($toPunycode) {
+			if ($length > 63) {
 				return self::IDNA_ERROR_LABEL_TOO_LONG;
 			}
 
-			if ($this->std3 && $length !== strspn($label, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-'))
-			{
+			if ($this->std3 && $length !== strspn($label, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-')) {
 				return self::IDNA_ERROR_PUNYCODE;
 			}
 		}
 
-		if (strpos($label, '-') === 0)
-		{
+		if (strpos($label, '-') === 0) {
 			return self::IDNA_ERROR_LEADING_HYPHEN;
 		}
 
-		if (strrpos($label, '-') === $length - 1)
-		{
+		if (strrpos($label, '-') === $length - 1) {
 			return self::IDNA_ERROR_TRAILING_HYPHEN;
 		}
 
-		if (substr($label, 2, 2) === '--')
-		{
+		if (substr($label, 2, 2) === '--') {
 			return self::IDNA_ERROR_HYPHEN_3_4;
 		}
 
-		if (preg_match('/^\p{M}/u', $label))
-		{
+		if (preg_match('/^\p{M}/u', $label)) {
 			return self::IDNA_ERROR_LEADING_COMBINING_MARK;
 		}
 
-		require_once(Config::$sourcedir . '/Unicode/Idna.php');
+		require_once Config::$sourcedir . '/Unicode/Idna.php';
 
 		$regexes = Unicode\idna_regex();
 
-		if (preg_match('/[' . $regexes['disallowed'] . ($this->std3 ? $regexes['disallowed_std3'] : '') . ']/u', $label))
-		{
+		if (preg_match('/[' . $regexes['disallowed'] . ($this->std3 ? $regexes['disallowed_std3'] : '') . ']/u', $label)) {
 			return self::IDNA_ERROR_INVALID_ACE_LABEL;
 		}
 
-		if (!$toPunycode && $label !== Utils::normalize($label, 'kc'))
-		{
+		if (!$toPunycode && $label !== Utils::normalize($label, 'kc')) {
 			return self::IDNA_ERROR_INVALID_ACE_LABEL;
 		}
 
diff --git a/Sources/QueryString.php b/Sources/QueryString.php
index 4e4f73334e..9a80f42d65 100644
--- a/Sources/QueryString.php
+++ b/Sources/QueryString.php
@@ -27,13 +27,14 @@ class QueryString
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		// Public static methods not listed here will keep the same name when
-		// exported to global namespace.
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
+			'cleanRequest' => 'cleanRequest',
 			'isFilteredRequest' => 'is_filtered_request',
-		),
-	);
+			'ob_sessrewrite' => 'ob_sessrewrite',
+			'matchIPtoCIDR' => 'matchIPtoCIDR',
+		],
+	];
 
 	/***********************
 	 * Public static methods
@@ -58,43 +59,43 @@ public static function cleanRequest(): void
 		$magicQuotesEnabled = version_compare(PHP_VERSION, '7.4.0') == -1 && function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty(Config::$modSettings['integrate_magic_quotes']);
 
 		// Save some memory.. (since we don't use these anyway.)
-		unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS']);
-		unset($GLOBALS['HTTP_POST_FILES'], $GLOBALS['HTTP_POST_FILES']);
+		unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_FILES'], $GLOBALS['HTTP_POST_FILES']);
 
 		// These keys shouldn't be set...ever.
-		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 			die('Invalid request variable.');
+		}
 
 		// Same goes for numeric keys.
-		foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key)
-		{
-			if (is_numeric($key))
+		foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key) {
+			if (is_numeric($key)) {
 				die('Numeric request keys are invalid.');
+			}
 		}
 
 		// Numeric keys in cookies are less of a problem. Just unset those.
-		foreach ($_COOKIE as $key => $value)
-		{
-			if (is_numeric($key))
+		foreach ($_COOKIE as $key => $value) {
+			if (is_numeric($key)) {
 				unset($_COOKIE[$key]);
+			}
 		}
 
 		// Get the correct query string.  It may be in an environment variable...
-		if (!isset($_SERVER['QUERY_STRING']))
+		if (!isset($_SERVER['QUERY_STRING'])) {
 			$_SERVER['QUERY_STRING'] = getenv('QUERY_STRING');
+		}
 
 		// It seems that sticking a URL after the query string is mighty common, well, it's evil - don't.
-		if (strpos($_SERVER['QUERY_STRING'], 'http') === 0)
-		{
+		if (strpos($_SERVER['QUERY_STRING'], 'http') === 0) {
 			Utils::sendHttpStatus(400);
+
 			die;
 		}
 
 		// Are we going to need to parse the ; out?
-		if (strpos(ini_get('arg_separator.input'), ';') === false && !empty($_SERVER['QUERY_STRING']))
-		{
+		if (strpos(ini_get('arg_separator.input'), ';') === false && !empty($_SERVER['QUERY_STRING'])) {
 			// Get rid of the old one! You don't know where it's been!
-			$_GET = array();
+			$_GET = [];
 
 			// Was this redirected? If so, get the REDIRECT_QUERY_STRING.
 			// Do not urldecode() the querystring.
@@ -102,37 +103,34 @@ public static function cleanRequest(): void
 
 			// Replace ';' with '&' and '&something&' with '&something=&'.  (this is done for compatibility...)
 			// @todo smflib
-			parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr($_SERVER['QUERY_STRING'], array(';?' => '&', ';' => '&', '%00' => '', "\0" => ''))), $_GET);
+			parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr($_SERVER['QUERY_STRING'], [';?' => '&', ';' => '&', '%00' => '', "\0" => ''])), $_GET);
 
 			// Magic quotes still applies with parse_str - so clean it up.
-			if ($magicQuotesEnabled)
+			if ($magicQuotesEnabled) {
 				$_GET = $removeMagicQuoteFunction($_GET);
-		}
-		elseif (strpos(ini_get('arg_separator.input'), ';') !== false)
-		{
-			if ($magicQuotesEnabled)
+			}
+		} elseif (strpos(ini_get('arg_separator.input'), ';') !== false) {
+			if ($magicQuotesEnabled) {
 				$_GET = $removeMagicQuoteFunction($_GET);
+			}
 
 			// Search engines will send action=profile%3Bu=1, which confuses PHP.
-			foreach ($_GET as $k => $v)
-			{
-				if ((string) $v === $v && strpos($k, ';') !== false)
-				{
+			foreach ($_GET as $k => $v) {
+				if ((string) $v === $v && strpos($k, ';') !== false) {
 					$temp = explode(';', $v);
 					$_GET[$k] = $temp[0];
 
-					for ($i = 1, $n = count($temp); $i < $n; $i++)
-					{
+					for ($i = 1, $n = count($temp); $i < $n; $i++) {
 						@list($key, $val) = @explode('=', $temp[$i], 2);
 
-						if (!isset($_GET[$key]))
+						if (!isset($_GET[$key])) {
 							$_GET[$key] = $val;
+						}
 					}
 				}
 
 				// This helps a lot with integration!
-				if (strpos($k, '?') === 0)
-				{
+				if (strpos($k, '?') === 0) {
 					$_GET[substr($k, 1)] = $v;
 					unset($_GET[$k]);
 				}
@@ -140,26 +138,20 @@ public static function cleanRequest(): void
 		}
 
 		// There's no query string, but there is a URL... try to get the data from there.
-		if (!empty($_SERVER['REQUEST_URI']))
-		{
+		if (!empty($_SERVER['REQUEST_URI'])) {
 			// Remove the .html, assuming there is one.
-			if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm')
-			{
+			if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm') {
 				$request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.'));
-			}
-			else
-			{
+			} else {
 				$request = $_SERVER['REQUEST_URI'];
 			}
 
 			// @todo smflib.
 			// Replace 'index.php/a,b,c/d/e,f' with 'a=b,c&d=&e=f' and parse it into $_GET.
-			if (strpos($request, basename(Config::$scripturl) . '/') !== false)
-			{
+			if (strpos($request, basename(Config::$scripturl) . '/') !== false) {
 				parse_str(substr(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr(preg_replace('~/([^,/]+),~', '/$1=', substr($request, strpos($request, basename(Config::$scripturl)) + strlen(basename(Config::$scripturl)))), '/', '&')), 1), $temp);
 
-				if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty(Config::$modSettings['integrate_magic_quotes']))
-				{
+				if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty(Config::$modSettings['integrate_magic_quotes'])) {
 					$temp = $removeMagicQuoteFunction($temp);
 				}
 
@@ -168,16 +160,15 @@ public static function cleanRequest(): void
 		}
 
 		// If magic quotes is on we have some work...
-		if ($magicQuotesEnabled)
-		{
+		if ($magicQuotesEnabled) {
 			$_ENV = $removeMagicQuoteFunction($_ENV);
 			$_POST = $removeMagicQuoteFunction($_POST);
 			$_COOKIE = $removeMagicQuoteFunction($_COOKIE);
 
-			foreach ($_FILES as $k => $dummy)
-			{
-				if (isset($_FILES[$k]['name']))
+			foreach ($_FILES as $k => $dummy) {
+				if (isset($_FILES[$k]['name'])) {
 					$_FILES[$k]['name'] = $removeMagicQuoteFunction($_FILES[$k]['name']);
+				}
 			}
 		}
 
@@ -188,20 +179,17 @@ public static function cleanRequest(): void
 		$_REQUEST = $_POST + $_GET;
 
 		// Make sure Board::$board_id and Topic::$topic_id are numbers.
-		if (isset($_REQUEST['board']))
-		{
+		if (isset($_REQUEST['board'])) {
 			// Make sure it's a string and not something else like an array
 			$_REQUEST['board'] = (string) $_REQUEST['board'];
 
 			// If there's a slash in it, we've got a start value! (old, compatible links.)
-			if (strpos($_REQUEST['board'], '/') !== false)
-			{
-				list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']);
+			if (strpos($_REQUEST['board'], '/') !== false) {
+				list($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']);
 			}
 			// Same idea, but dots.  This is the currently used format - ?board=1.0...
-			elseif (strpos($_REQUEST['board'], '.') !== false)
-			{
-				list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']);
+			elseif (strpos($_REQUEST['board'], '.') !== false) {
+				list($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']);
 			}
 
 			// Now make absolutely sure it's a number.
@@ -212,29 +200,26 @@ public static function cleanRequest(): void
 			$_GET['board'] = Board::$board_id;
 		}
 		// Well, Board::$board_id is going to be a number no matter what.
-		else
-		{
+		else {
 			Board::$board_id = 0;
 		}
 
 		// If there's a threadid, it's probably an old YaBB SE link.  Flow with it.
-		if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic']))
+		if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic'])) {
 			$_REQUEST['topic'] = $_REQUEST['threadid'];
+		}
 
 		// We've got topic!
-		if (isset($_REQUEST['topic']))
-		{
+		if (isset($_REQUEST['topic'])) {
 			// Make sure it's a string and not something else like an array
 			$_REQUEST['topic'] = (string) $_REQUEST['topic'];
 
 			// Slash means old, beta style, formatting.  That's okay though, the link should still work.
-			if (strpos($_REQUEST['topic'], '/') !== false)
-			{
+			if (strpos($_REQUEST['topic'], '/') !== false) {
 				list($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']);
 			}
 			// Dots are useful and fun ;).  This is ?topic=1.15.
-			elseif (strpos($_REQUEST['topic'], '.') !== false)
-			{
+			elseif (strpos($_REQUEST['topic'], '.') !== false) {
 				list($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']);
 			}
 
@@ -243,143 +228,122 @@ public static function cleanRequest(): void
 
 			// Start could be a lot of things...
 			// ... empty ...
-			if (empty($_REQUEST['start']))
-			{
+			if (empty($_REQUEST['start'])) {
 				$_REQUEST['start'] = 0;
 			}
 			// ... a simple number ...
-			elseif (is_numeric($_REQUEST['start']))
-			{
+			elseif (is_numeric($_REQUEST['start'])) {
 				$_REQUEST['start'] = (int) $_REQUEST['start'];
 			}
 			// ... or a specific message ...
-			elseif (strpos($_REQUEST['start'], 'msg') === 0)
-			{
+			elseif (strpos($_REQUEST['start'], 'msg') === 0) {
 				$virtual_msg = (int) substr($_REQUEST['start'], 3);
 				$_REQUEST['start'] = $virtual_msg === 0 ? 0 : 'msg' . $virtual_msg;
 			}
 			// ... or whatever is new ...
-			elseif (strpos($_REQUEST['start'], 'new') === 0)
-			{
+			elseif (strpos($_REQUEST['start'], 'new') === 0) {
 				$_REQUEST['start'] = 'new';
 			}
 			// ... or since a certain time ...
-			elseif (strpos($_REQUEST['start'], 'from') === 0)
-			{
+			elseif (strpos($_REQUEST['start'], 'from') === 0) {
 				$timestamp = (int) substr($_REQUEST['start'], 4);
 				$_REQUEST['start'] = $timestamp === 0 ? 0 : 'from' . $timestamp;
 			}
 			// ... or something invalid, in which case we reset it to 0.
-			else
-			{
+			else {
 				$_REQUEST['start'] = 0;
 			}
-		}
-		else
-		{
+		} else {
 			Topic::$topic_id = 0;
 		}
 
 		// There should be a $_REQUEST['start'], some at least.
 		// If you need to default to other than 0, use $_GET['start'].
-		if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647)
-		{
+		if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647) {
 			$_REQUEST['start'] = 0;
 		}
 
 		// The action needs to be a string and not an array or anything else
-		if (isset($_REQUEST['action']))
+		if (isset($_REQUEST['action'])) {
 			$_REQUEST['action'] = (string) $_REQUEST['action'];
+		}
 
-		if (isset($_GET['action']))
+		if (isset($_GET['action'])) {
 			$_GET['action'] = (string) $_GET['action'];
+		}
 
 		// Some mail providers like to encode semicolons in activation URLs...
-		if (!empty($_REQUEST['action']) && substr($_SERVER['QUERY_STRING'], 0, 18) == 'action=activate%3b')
-		{
+		if (!empty($_REQUEST['action']) && substr($_SERVER['QUERY_STRING'], 0, 18) == 'action=activate%3b') {
 			header('location: ' . Config::$scripturl . '?' . str_replace('%3b', ';', $_SERVER['QUERY_STRING']));
 
 			exit;
 		}
 
 		// Make sure we have a valid REMOTE_ADDR.
-		if (!isset($_SERVER['REMOTE_ADDR']))
-		{
+		if (!isset($_SERVER['REMOTE_ADDR'])) {
 			$_SERVER['REMOTE_ADDR'] = '';
 
 			// A new magic variable to indicate we think this is command line.
 			$_SERVER['is_cli'] = true;
 		}
 		// Perhaps we have a IPv6 address.
-		elseif (IP::create($_SERVER['REMOTE_ADDR'])->isValid())
-		{
-			$_SERVER['REMOTE_ADDR'] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '\1', $_SERVER['REMOTE_ADDR']);
+		elseif (IP::create($_SERVER['REMOTE_ADDR'])->isValid()) {
+			$_SERVER['REMOTE_ADDR'] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '$1', $_SERVER['REMOTE_ADDR']);
 		}
 
 		// Try to calculate their most likely IP for those people behind proxies (And the like).
 		$_SERVER['BAN_CHECK_IP'] = $_SERVER['REMOTE_ADDR'];
 
 		// If we haven't specified how to handle Reverse Proxy IP headers, lets do what we always used to do.
-		if (!isset(Config::$modSettings['proxy_ip_header']))
+		if (!isset(Config::$modSettings['proxy_ip_header'])) {
 			Config::$modSettings['proxy_ip_header'] = 'autodetect';
+		}
 
 		// Which headers are we going to check for Reverse Proxy IP headers?
-		if (Config::$modSettings['proxy_ip_header'] == 'disabled')
-		{
-			$reverseIPheaders = array();
-		}
-		elseif (Config::$modSettings['proxy_ip_header'] == 'autodetect')
-		{
-			$reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_X_REAL_IP', 'HTTP_CF_CONNECTING_IP');
-		}
-		else
-		{
-			$reverseIPheaders = array(Config::$modSettings['proxy_ip_header']);
+		if (Config::$modSettings['proxy_ip_header'] == 'disabled') {
+			$reverseIPheaders = [];
+		} elseif (Config::$modSettings['proxy_ip_header'] == 'autodetect') {
+			$reverseIPheaders = ['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_X_REAL_IP', 'HTTP_CF_CONNECTING_IP'];
+		} else {
+			$reverseIPheaders = [Config::$modSettings['proxy_ip_header']];
 		}
 
 		// Find the user's IP address. (but don't let it give you 'unknown'!)
-		foreach ($reverseIPheaders as $proxyIPheader)
-		{
+		foreach ($reverseIPheaders as $proxyIPheader) {
 			// Ignore if this is not set.
-			if (!isset($_SERVER[$proxyIPheader]))
+			if (!isset($_SERVER[$proxyIPheader])) {
 				continue;
+			}
 
-			if (!empty(Config::$modSettings['proxy_ip_servers']))
-			{
+			if (!empty(Config::$modSettings['proxy_ip_servers'])) {
 				$valid_sender = false;
 
-				foreach (explode(',', Config::$modSettings['proxy_ip_servers']) as $proxy)
-				{
-					if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy))
-					{
+				foreach (explode(',', Config::$modSettings['proxy_ip_servers']) as $proxy) {
+					if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy)) {
 						$valid_sender = true;
 						break;
 					}
 				}
 
-				if (!$valid_sender)
+				if (!$valid_sender) {
 					continue;
+				}
 			}
 
 			// If there are commas, get the last one.. probably.
-			if (strpos($_SERVER[$proxyIPheader], ',') !== false)
-			{
+			if (strpos($_SERVER[$proxyIPheader], ',') !== false) {
 				$ips = array_reverse(explode(', ', $_SERVER[$proxyIPheader]));
 
 				// Go through each IP...
-				foreach ($ips as $i => $ip)
-				{
+				foreach ($ips as $i => $ip) {
 					// Make sure it's in a valid range...
-					if (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $ip) != 0 && preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) == 0)
-					{
-						if (!IP::create($_SERVER[$proxyIPheader])->isValid(FILTER_FLAG_IPV6) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0)
-						{
-							$_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '\1', $_SERVER[$proxyIPheader]);
+					if (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $ip) != 0 && preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) == 0) {
+						if (!IP::create($_SERVER[$proxyIPheader])->isValid(FILTER_FLAG_IPV6) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0) {
+							$_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '$1', $_SERVER[$proxyIPheader]);
 
 							// Just incase we have a legacy IPv4 address.
 							// @ TODO: Convert to IPv6.
-							if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0)
-							{
+							if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) {
 								continue;
 							}
 						}
@@ -389,38 +353,30 @@ public static function cleanRequest(): void
 
 					// Otherwise, we've got an IP!
 					$_SERVER['BAN_CHECK_IP'] = trim($ip);
+
 					break;
 				}
 			}
 			// Otherwise just use the only one.
-			elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0)
-			{
+			elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0) {
 				$_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader];
-			}
-			elseif (!IP::create($_SERVER[$proxyIPheader])->isValid(FILTER_FLAG_IPV6) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0)
-			{
-				$_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '\1', $_SERVER[$proxyIPheader]);
+			} elseif (!IP::create($_SERVER[$proxyIPheader])->isValid(FILTER_FLAG_IPV6) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0) {
+				$_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '$1', $_SERVER[$proxyIPheader]);
 
 				// Just incase we have a legacy IPv4 address.
 				// @ TODO: Convert to IPv6.
-				if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0)
-				{
+				if (preg_match('~^(((1?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) {
 					continue;
 				}
 			}
 		}
 
 		// Make sure we know the URL of the current request.
-		if (empty($_SERVER['REQUEST_URI']))
-		{
+		if (empty($_SERVER['REQUEST_URI'])) {
 			$_SERVER['REQUEST_URL'] = Config::$scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
-		}
-		elseif (preg_match('~^([^/]+//[^/]+)~', Config::$scripturl, $match) == 1)
-		{
+		} elseif (preg_match('~^([^/]+//[^/]+)~', Config::$scripturl, $match) == 1) {
 			$_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI'];
-		}
-		else
-		{
+		} else {
 			$_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI'];
 		}
 
@@ -428,11 +384,13 @@ public static function cleanRequest(): void
 		$_SERVER['HTTP_USER_AGENT'] = isset($_SERVER['HTTP_USER_AGENT']) ? Utils::htmlspecialchars(Db::$db->unescape_string($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES) : '';
 
 		// Some final checking.
-		if (!IP::create($_SERVER['BAN_CHECK_IP'])->isValid())
+		if (!IP::create($_SERVER['BAN_CHECK_IP'])->isValid()) {
 			$_SERVER['BAN_CHECK_IP'] = '';
+		}
 
-		if ($_SERVER['REMOTE_ADDR'] == 'unknown')
+		if ($_SERVER['REMOTE_ADDR'] == 'unknown') {
 			$_SERVER['REMOTE_ADDR'] = '';
+		}
 	}
 
 	/**
@@ -470,15 +428,12 @@ public static function isFilteredRequest(array $value_list, string $var): bool
 	{
 		$matched = false;
 
-		if (isset($_REQUEST[$var], $value_list[$_REQUEST[$var]]))
-		{
-			if (is_array($value_list[$_REQUEST[$var]]))
-			{
-				foreach ($value_list[$_REQUEST[$var]] as $subvar => $subvalues)
+		if (isset($_REQUEST[$var], $value_list[$_REQUEST[$var]])) {
+			if (is_array($value_list[$_REQUEST[$var]])) {
+				foreach ($value_list[$_REQUEST[$var]] as $subvar => $subvalues) {
 					$matched |= isset($_REQUEST[$subvar]) && in_array($_REQUEST[$subvar], $subvalues);
-			}
-			else
-			{
+				}
+			} else {
 				$matched = true;
 			}
 		}
@@ -504,18 +459,17 @@ public static function isFilteredRequest(array $value_list, string $var): bool
 	public static function ob_sessrewrite(string $buffer): string
 	{
 		// If Config::$scripturl is set to nothing, or the SID is not defined (SSI?) just quit.
-		if (Config::$scripturl == '' || !defined('SID'))
+		if (Config::$scripturl == '' || !defined('SID')) {
 			return $buffer;
+		}
 
 		// Do nothing if the session is cookied, or they are a crawler - guests are caught by redirectexit().
-		if (empty($_COOKIE) && SID != '' && !BrowserDetector::isBrowser('possibly_robot'))
-		{
-			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote(Config::$scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . Config::$scripturl . '?' . SID . '&amp;', $buffer);
+		if (empty($_COOKIE) && SID != '' && !BrowserDetector::isBrowser('possibly_robot')) {
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote(Config::$scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\??/', '"' . Config::$scripturl . '?' . SID . '&amp;', $buffer);
 		}
 		// Debugging templates, are we?
-		elseif (isset($_GET['debug']))
-		{
-			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote(Config::$scripturl, '/') . '\\??/', '"' . Config::$scripturl . '?debug;', $buffer);
+		elseif (isset($_GET['debug'])) {
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote(Config::$scripturl, '/') . '\??/', '"' . Config::$scripturl . '?debug;', $buffer);
 		}
 
 		// More work needed if using "queryless" URLS.
@@ -531,29 +485,23 @@ public static function ob_sessrewrite(string $buffer): string
 				|| Utils::$context['server']['is_lighttpd']
 				|| Utils::$context['server']['is_litespeed']
 			)
-		)
-		{
+		) {
 			// Let's do something special for session ids!
-			if (defined('SID') && SID != '')
-			{
+			if (defined('SID') && SID != '') {
 				$buffer = preg_replace_callback(
 					'~"' . preg_quote(Config::$scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~',
-					function($m)
-					{
-						return '"' . Config::$scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"';
+					function ($m) {
+						return '"' . Config::$scripturl . '/' . strtr("{$m[1]}", '&;=', '//,') . '.html?' . SID . ($m[2] ?? '') . '"';
 					},
-					$buffer
+					$buffer,
 				);
-			}
-			else
-			{
+			} else {
 				$buffer = preg_replace_callback(
 					'~"' . preg_quote(Config::$scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~',
-					function($m)
-					{
-						return '"' . Config::$scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"';
+					function ($m) {
+						return '"' . Config::$scripturl . '/' . strtr("{$m[1]}", '&;=', '//,') . '.html' . ($m[2] ?? '') . '"';
 					},
-					$buffer
+					$buffer,
 				);
 			}
 		}
@@ -573,38 +521,45 @@ public function matchIPtoCIDR(string $ip_address, string $cidr_address): bool
 	{
 		list($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address);
 
-		//v6?
-		if ((strpos($cidr_network, ':') !== false))
-		{
-			if (!filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || !filter_var($cidr_network, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+		// v6?
+		if ((strpos($cidr_network, ':') !== false)) {
+			if (!filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || !filter_var($cidr_network, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 				return false;
+			}
 
 			$ip_address = inet_pton($ip_address);
 			$cidr_network = inet_pton($cidr_network);
-			$binMask = str_repeat("f", $cidr_subnetmask / 4);
-			switch ($cidr_subnetmask % 4)
-			{
+			$binMask = str_repeat('f', $cidr_subnetmask / 4);
+
+			switch ($cidr_subnetmask % 4) {
 				case 0:
 					break;
+
 				case 1:
-					$binMask .= "8";
+					$binMask .= '8';
 					break;
+
 				case 2:
-					$binMask .= "c";
+					$binMask .= 'c';
 					break;
+
 				case 3:
-					$binMask .= "e";
+					$binMask .= 'e';
 					break;
 			}
 			$binMask = str_pad($binMask, 32, '0');
-			$binMask = pack("H*", $binMask);
+			$binMask = pack('H*', $binMask);
 
 			return ($ip_address & $binMask) == $cidr_network;
 		}
-		else
-			return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network);
+
+		return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network);
 	}
+}
 
+// Export public static functions and properties to global namespace for backward compatibility.
+if (is_callable(__NAMESPACE__ . '\\QueryString::exportStatic')) {
+	QueryString::exportStatic();
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/ReCaptcha/RequestMethod/index.php b/Sources/ReCaptcha/RequestMethod/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/ReCaptcha/RequestMethod/index.php
+++ b/Sources/ReCaptcha/RequestMethod/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/ReCaptcha/index.php b/Sources/ReCaptcha/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/ReCaptcha/index.php
+++ b/Sources/ReCaptcha/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/ScheduledTasks.php b/Sources/ScheduledTasks.php
index 0dbb2ed10c..80622916cd 100644
--- a/Sources/ScheduledTasks.php
+++ b/Sources/ScheduledTasks.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Mail');
 class_exists('SMF\\TaskRunner');
diff --git a/Sources/Search.php b/Sources/Search.php
index 32cc30b62b..8903ecad10 100644
--- a/Sources/Search.php
+++ b/Sources/Search.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\Search');
 class_exists('SMF\\Actions\\Search2');
diff --git a/Sources/Search/APIs/Custom.php b/Sources/Search/APIs/Custom.php
index 74245a86f2..f0b8ba8e8e 100644
--- a/Sources/Search/APIs/Custom.php
+++ b/Sources/Search/APIs/Custom.php
@@ -14,9 +14,9 @@
 namespace SMF\Search\APIs;
 
 use SMF\Config;
-use SMF\Utils;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Search\SearchApi;
+use SMF\Utils;
 
 /**
  * Used for the "custom search index" option
@@ -27,12 +27,12 @@ class Custom extends SearchApi
 	/**
 	 * @var array Index settings
 	 */
-	protected $indexSettings = array();
+	protected $indexSettings = [];
 
 	/**
 	 * @var array An array of banned words
 	 */
-	protected $bannedWords = array();
+	protected $bannedWords = [];
 
 	/**
 	 * @var int|null Minimum word length (null for no minimum)
@@ -42,7 +42,7 @@ class Custom extends SearchApi
 	/**
 	 * @var array Which databases support this method
 	 */
-	protected $supported_databases = array('mysql', 'postgresql');
+	protected $supported_databases = ['mysql', 'postgresql'];
 
 	/**
 	 * Constructor function
@@ -50,18 +50,19 @@ class Custom extends SearchApi
 	public function __construct()
 	{
 		// Is this database supported?
-		if (!in_array(Config::$db_type, $this->supported_databases))
-		{
+		if (!in_array(Config::$db_type, $this->supported_databases)) {
 			$this->is_supported = false;
+
 			return;
 		}
 
-		if (empty(Config::$modSettings['search_custom_index_config']))
+		if (empty(Config::$modSettings['search_custom_index_config'])) {
 			return;
+		}
 
 		$this->indexSettings = Utils::jsonDecode(Config::$modSettings['search_custom_index_config'], true);
 
-		$this->bannedWords = empty(Config::$modSettings['search_stopwords']) ? array() : explode(',', Config::$modSettings['search_stopwords']);
+		$this->bannedWords = empty(Config::$modSettings['search_stopwords']) ? [] : explode(',', Config::$modSettings['search_stopwords']);
 		$this->min_word_length = $this->indexSettings['bytes_per_word'];
 
 		parent::__construct();
@@ -73,8 +74,8 @@ public function __construct()
 	public function supportsMethod($methodName, $query_params = null): bool
 	{
 		$return = false;
-		switch ($methodName)
-		{
+
+		switch ($methodName) {
 			case 'isValid':
 			case 'searchSort':
 			case 'prepareIndexes':
@@ -90,8 +91,9 @@ public function supportsMethod($methodName, $query_params = null): bool
 		}
 
 		// Maybe parent got support
-		if (!$return)
+		if (!$return) {
 			$return = parent::supportsMethod($methodName, $query_params);
+		}
 
 		return $return;
 	}
@@ -124,22 +126,21 @@ public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude,
 	{
 		$subwords = Utils::text2words($word, $this->min_word_length, true);
 
-		if (empty(Config::$modSettings['search_force_index']))
+		if (empty(Config::$modSettings['search_force_index'])) {
 			$wordsSearch['words'][] = $word;
+		}
 
 		// Excluded phrases don't benefit from being split into subwords.
-		if (count($subwords) > 1 && $isExcluded)
+		if (count($subwords) > 1 && $isExcluded) {
 			return;
-		else
-		{
-			foreach ($subwords as $subword)
-			{
-				if (Utils::entityStrlen($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords))
-				{
-					$wordsSearch['indexed_words'][] = $subword;
-
-					if ($isExcluded)
-						$wordsExclude[] = $subword;
+		}
+
+		foreach ($subwords as $subword) {
+			if (Utils::entityStrlen($subword) >= $this->min_word_length && !in_array($subword, $this->bannedWords)) {
+				$wordsSearch['indexed_words'][] = $subword;
+
+				if ($isExcluded) {
+					$wordsExclude[] = $subword;
 				}
 			}
 		}
@@ -150,85 +151,100 @@ public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude,
 	 */
 	public function indexedWordQuery(array $words, array $search_data)
 	{
-		$query_select = array(
+		$query_select = [
 			'id_msg' => 'm.id_msg',
-		);
-		$query_inner_join = array();
-		$query_left_join = array();
-		$query_where = array();
+		];
+		$query_inner_join = [];
+		$query_left_join = [];
+		$query_where = [];
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
+		if ($query_params['id_search']) {
 			$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
-		foreach ($words['words'] as $regularWord)
-		{
-			if (in_array($regularWord, $query_params['excluded_words']))
+
+		foreach ($words['words'] as $regularWord) {
+			if (in_array($regularWord, $query_params['excluded_words'])) {
 				$query_where[] = 'm.body NOT ' . $this->query_match_type . ' {string:complex_body_' . $count . '}';
-			else
+			} else {
 				$query_where[] = 'm.body ' . $this->query_match_type . ' {string:complex_body_' . $count . '}';
+			}
 
-			if ($this->query_match_type === 'RLIKE')
+			if ($this->query_match_type === 'RLIKE') {
 				$query_params['complex_body_' . $count++] = self::wordBoundaryWrapper(self::escapeSqlRegex($regularWord));
-			else
+			} else {
 				$query_params['complex_body_' . $count++] = '%' . Db::$db->escape_wildcard_string($regularWord) . '%';
+			}
 		}
 
-		if ($query_params['user_query'])
+		if ($query_params['user_query']) {
 			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
+		}
+
+		if ($query_params['board_query']) {
 			$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
+		if ($query_params['topic']) {
 			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
+		}
+
+		if ($query_params['min_msg_id']) {
 			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
+		}
+
+		if ($query_params['max_msg_id']) {
 			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty(Config::$modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
-			{
+
+		if (!empty($query_params['excluded_phrases']) && empty(Config::$modSettings['search_force_index'])) {
+			foreach ($query_params['excluded_phrases'] as $phrase) {
 				$query_where[] = 'subject NOT ' . $this->query_match_type . ' {string:exclude_subject_words_' . $count . '}';
 
-				if ($this->query_match_type === 'RLIKE')
+				if ($this->query_match_type === 'RLIKE') {
 					$query_params['exclude_subject_words_' . $count++] = self::wordBoundaryWrapper(self::escapeSqlRegex($excludedWord));
-				else
+				} else {
 					$query_params['exclude_subject_words_' . $count++] = '%' . Db::$db->escape_wildcard_string($excludedWord) . '%';
+				}
 			}
+		}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty(Config::$modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
-			{
+
+		if (!empty($query_params['excluded_subject_words']) && empty(Config::$modSettings['search_force_index'])) {
+			foreach ($query_params['excluded_subject_words'] as $excludedWord) {
 				$query_where[] = 'subject NOT ' . $this->query_match_type . ' {string:exclude_subject_words_' . $count . '}';
 
-				if ($this->query_match_type === 'RLIKE')
+				if ($this->query_match_type === 'RLIKE') {
 					$query_params['exclude_subject_words_' . $count++] = self::wordBoundaryWrapper(self::escapeSqlRegex($excludedWord));
-				else
+				} else {
 					$query_params['exclude_subject_words_' . $count++] = '%' . Db::$db->escape_wildcard_string($excludedWord) . '%';
+				}
 			}
+		}
 
 		$numTables = 0;
 		$prev_join = 0;
-		foreach ($words['indexed_words'] as $indexedWord)
-		{
+
+		foreach ($words['indexed_words'] as $indexedWord) {
 			$numTables++;
-			if (in_array($indexedWord, $query_params['excluded_index_words']))
-			{
+
+			if (in_array($indexedWord, $query_params['excluded_index_words'])) {
 				$query_left_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_word = ' . $indexedWord . ' AND lsw' . $numTables . '.id_msg = m.id_msg)';
 				$query_where[] = '(lsw' . $numTables . '.id_word IS NULL)';
-			}
-			else
-			{
+			} else {
 				$query_inner_join[] = '{db_prefix}log_search_words AS lsw' . $numTables . ' ON (lsw' . $numTables . '.id_msg = ' . ($prev_join === 0 ? 'm' : 'lsw' . $prev_join) . '.id_msg)';
 				$query_where[] = 'lsw' . $numTables . '.id_word = ' . $indexedWord;
 				$prev_join = $numTables;
 			}
 		}
 
-		$ignoreRequest = Db::$db->search_query('insert_into_log_messages_fulltext', (Db::$db->support_ignore ? ('
+		$ignoreRequest = Db::$db->search_query(
+			'insert_into_log_messages_fulltext',
+			(Db::$db->support_ignore ? ('
 			INSERT IGNORE INTO {db_prefix}' . $search_data['insert_into'] . '
 				(' . implode(', ', array_keys($query_select)) . ')') : '') . '
 			SELECT ' . implode(', ', $query_select) . '
@@ -240,7 +256,7 @@ public function indexedWordQuery(array $words, array $search_data)
 			WHERE ' . implode('
 				AND ', $query_where) . (empty($search_data['max_results']) ? '' : '
 			LIMIT ' . ($search_data['max_results'] - $search_data['indexed_results'])),
-			$query_params
+			$query_params,
 		);
 
 		return $ignoreRequest;
@@ -253,17 +269,21 @@ public function postCreated(array &$msgOptions, array &$topicOptions, array &$po
 	{
 		$customIndexSettings = Utils::jsonDecode(Config::$modSettings['search_custom_index_config'], true);
 
-		$inserts = array();
-		foreach (Utils::text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word)
-			$inserts[] = array($word, $msgOptions['id']);
+		$inserts = [];
 
-		if (!empty($inserts))
-			Db::$db->insert('ignore',
+		foreach (Utils::text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word) {
+			$inserts[] = [$word, $msgOptions['id']];
+		}
+
+		if (!empty($inserts)) {
+			Db::$db->insert(
+				'ignore',
 				'{db_prefix}log_search_words',
-				array('id_word' => 'int', 'id_msg' => 'int'),
+				['id_word' => 'int', 'id_msg' => 'int'],
 				$inserts,
-				array('id_word', 'id_msg')
+				['id_word', 'id_msg'],
 			);
+		}
 	}
 
 	/**
@@ -271,11 +291,10 @@ public function postCreated(array &$msgOptions, array &$topicOptions, array &$po
 	 */
 	public function postModified(array &$msgOptions, array &$topicOptions, array &$posterOptions): void
 	{
-		if (isset($msgOptions['body']))
-		{
+		if (isset($msgOptions['body'])) {
 			$customIndexSettings = Utils::jsonDecode(Config::$modSettings['search_custom_index_config'], true);
-			$stopwords = empty(Config::$modSettings['search_stopwords']) ? array() : explode(',', Config::$modSettings['search_stopwords']);
-			$old_body = isset($msgOptions['old_body']) ? $msgOptions['old_body'] : '';
+			$stopwords = empty(Config::$modSettings['search_stopwords']) ? [] : explode(',', Config::$modSettings['search_stopwords']);
+			$old_body = $msgOptions['old_body'] ?? '';
 
 			// create thew new and old index
 			$old_index = Utils::text2words($old_body, $customIndexSettings['bytes_per_word'], true);
@@ -286,31 +305,33 @@ public function postModified(array &$msgOptions, array &$topicOptions, array &$p
 			$inserted_words = array_diff(array_diff($new_index, $old_index), $stopwords);
 
 			// Delete the removed words AND the added ones to avoid key constraints.
-			if (!empty($removed_words))
-			{
+			if (!empty($removed_words)) {
 				$removed_words = array_merge($removed_words, $inserted_words);
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_search_words
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_search_words
 					WHERE id_msg = {int:id_msg}
 						AND id_word IN ({array_int:removed_words})',
-					array(
+					[
 						'removed_words' => $removed_words,
 						'id_msg' => $msgOptions['id'],
-					)
+					],
 				);
 			}
 
 			// Add the new words to be indexed.
-			if (!empty($inserted_words))
-			{
-				$inserts = array();
-				foreach ($inserted_words as $word)
-					$inserts[] = array($word, $msgOptions['id']);
-				Db::$db->insert('insert',
+			if (!empty($inserted_words)) {
+				$inserts = [];
+
+				foreach ($inserted_words as $word) {
+					$inserts[] = [$word, $msgOptions['id']];
+				}
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}log_search_words',
-					array('id_word' => 'string', 'id_msg' => 'int'),
+					['id_word' => 'string', 'id_msg' => 'int'],
 					$inserts,
-					array('id_word', 'id_msg')
+					['id_word', 'id_msg'],
 				);
 			}
 		}
diff --git a/Sources/Search/APIs/Fulltext.php b/Sources/Search/APIs/Fulltext.php
index 919bd0110e..499d58fa11 100644
--- a/Sources/Search/APIs/Fulltext.php
+++ b/Sources/Search/APIs/Fulltext.php
@@ -14,9 +14,9 @@
 namespace SMF\Search\APIs;
 
 use SMF\Config;
-use SMF\Utils;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Search\SearchApi;
+use SMF\Utils;
 
 /**
  * Class Fulltext
@@ -27,7 +27,7 @@ class Fulltext extends SearchApi
 	/**
 	 * @var array Which words are banned
 	 */
-	protected $bannedWords = array();
+	protected $bannedWords = [];
 
 	/**
 	 * @var int The minimum word length
@@ -37,7 +37,7 @@ class Fulltext extends SearchApi
 	/**
 	 * @var array Which databases support this method?
 	 */
-	protected $supported_databases = array('mysql', 'postgresql');
+	protected $supported_databases = ['mysql', 'postgresql'];
 
 	/**
 	 * The constructor function
@@ -45,13 +45,13 @@ class Fulltext extends SearchApi
 	public function __construct()
 	{
 		// Is this database supported?
-		if (!in_array(Config::$db_type, $this->supported_databases))
-		{
+		if (!in_array(Config::$db_type, $this->supported_databases)) {
 			$this->is_supported = false;
+
 			return;
 		}
 
-		$this->bannedWords = empty(Config::$modSettings['search_banned_words']) ? array() : explode(',', Config::$modSettings['search_banned_words']);
+		$this->bannedWords = empty(Config::$modSettings['search_banned_words']) ? [] : explode(',', Config::$modSettings['search_banned_words']);
 		$this->min_word_length = $this->_getMinWordLength();
 
 		parent::__construct();
@@ -63,8 +63,8 @@ public function __construct()
 	public function supportsMethod($methodName, $query_params = null): bool
 	{
 		$return = false;
-		switch ($methodName)
-		{
+
+		switch ($methodName) {
 			case 'searchSort':
 			case 'prepareIndexes':
 			case 'indexedWordQuery':
@@ -78,8 +78,9 @@ public function supportsMethod($methodName, $query_params = null): bool
 		}
 
 		// Maybe parent got support
-		if (!$return)
+		if (!$return) {
 			$return = parent::supportsMethod($methodName, $query_params);
+		}
 
 		return $return;
 	}
@@ -93,26 +94,29 @@ public function supportsMethod($methodName, $query_params = null): bool
 	 */
 	protected function _getMinWordLength()
 	{
-		if (Config::$db_type == 'postgresql')
+		if (Config::$db_type == 'postgresql') {
 			return 0;
+		}
 
 		// Try to determine the minimum number of letters for a fulltext search.
-		$request = Db::$db->search_query('max_fulltext_length', '
+		$request = Db::$db->search_query(
+			'max_fulltext_length',
+			'
 			SHOW VARIABLES
 			LIKE {string:fulltext_minimum_word_length}',
-			array(
+			[
 				'fulltext_minimum_word_length' => 'ft_min_word_len',
-			)
+			],
 		);
 
-		if ($request !== false && Db::$db->num_rows($request) == 1)
-		{
-			list (, $min_word_length) = Db::$db->fetch_row($request);
+		if ($request !== false && Db::$db->num_rows($request) == 1) {
+			list(, $min_word_length) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 		// 4 is the MySQL default...
-		else
+		else {
 			$min_word_length = 4;
+		}
 
 		return $min_word_length;
 	}
@@ -137,23 +141,18 @@ public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude,
 	{
 		$subwords = Utils::text2words($word, PHP_INT_MAX, false);
 
-		if (empty(Config::$modSettings['search_force_index']))
-		{
+		if (empty(Config::$modSettings['search_force_index'])) {
 			// A boolean capable search engine and not forced to only use an index, we may use a non indexed search
 			// this is harder on the server so we are restrictive here
-			if (count($subwords) > 1 && preg_match('~[.:@$]~', $word))
-			{
+			if (count($subwords) > 1 && preg_match('~[.:@$]~', $word)) {
 				// using special characters that a full index would ignore and the remaining words are short which would also be ignored
-				if ((Utils::entityStrlen(current($subwords)) < $this->min_word_length) && (Utils::entityStrlen(next($subwords)) < $this->min_word_length))
-				{
-					$wordsSearch['words'][] = trim($word, "/*- ");
+				if ((Utils::entityStrlen(current($subwords)) < $this->min_word_length) && (Utils::entityStrlen(next($subwords)) < $this->min_word_length)) {
+					$wordsSearch['words'][] = trim($word, '/*- ');
 					$wordsSearch['complex_words'][] = count($subwords) === 1 ? $word : '"' . $word . '"';
 				}
-			}
-			elseif (Utils::entityStrlen(trim($word, "/*- ")) < $this->min_word_length)
-			{
+			} elseif (Utils::entityStrlen(trim($word, '/*- ')) < $this->min_word_length) {
 				// short words have feelings too
-				$wordsSearch['words'][] = trim($word, "/*- ");
+				$wordsSearch['words'][] = trim($word, '/*- ');
 				$wordsSearch['complex_words'][] = count($subwords) === 1 ? $word : '"' . $word . '"';
 			}
 		}
@@ -161,8 +160,9 @@ public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude,
 		$fulltextWord = count($subwords) === 1 ? $word : '"' . $word . '"';
 		$wordsSearch['indexed_words'][] = $fulltextWord;
 
-		if ($isExcluded)
+		if ($isExcluded) {
 			$wordsExclude[] = $fulltextWord;
+		}
 	}
 
 	/**
@@ -170,120 +170,133 @@ public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude,
 	 */
 	public function indexedWordQuery(array $words, array $search_data)
 	{
-		$query_select = array(
+		$query_select = [
 			'id_msg' => 'm.id_msg',
-		);
-		$query_where = array();
+		];
+		$query_where = [];
 		$query_params = $search_data['params'];
 
-		if (Db::$db->title === POSTGRE_TITLE)
+		if (Db::$db->title === POSTGRE_TITLE) {
 			Config::$modSettings['search_simple_fulltext'] = true;
+		}
 
-		if ($query_params['id_search'])
+		if ($query_params['id_search']) {
 			$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
-		if (empty(Config::$modSettings['search_simple_fulltext']))
-			foreach ($words['words'] as $regularWord)
-			{
-				if (in_array($regularWord, $query_params['excluded_words']))
+
+		if (empty(Config::$modSettings['search_simple_fulltext'])) {
+			foreach ($words['words'] as $regularWord) {
+				if (in_array($regularWord, $query_params['excluded_words'])) {
 					$query_where[] = 'm.body NOT ' . $this->query_match_type . ' {string:complex_body_' . $count . '}';
-				else
+				} else {
 					$query_where[] = 'm.body ' . $this->query_match_type . ' {string:complex_body_' . $count . '}';
+				}
 
-				if ($this->query_match_type === 'RLIKE')
+				if ($this->query_match_type === 'RLIKE') {
 					$query_params['complex_body_' . $count++] = self::wordBoundaryWrapper(self::escapeSqlRegex($regularWord));
-				else
+				} else {
 					$query_params['complex_body_' . $count++] = '%' . Db::$db->escape_wildcard_string($regularWord) . '%';
+				}
 			}
+		}
 
-		if ($query_params['user_query'])
+		if ($query_params['user_query']) {
 			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
+		}
+
+		if ($query_params['board_query']) {
 			$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
+		if ($query_params['topic']) {
 			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
+		}
+
+		if ($query_params['min_msg_id']) {
 			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
+		}
+
+		if ($query_params['max_msg_id']) {
 			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty(Config::$modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
-			{
+
+		if (!empty($query_params['excluded_phrases']) && empty(Config::$modSettings['search_force_index'])) {
+			foreach ($query_params['excluded_phrases'] as $phrase) {
 				$query_where[] = 'subject NOT ' . $this->query_match_type . ' {string:exclude_subject_phrase_' . $count . '}';
 
-				if ($this->query_match_type === 'RLIKE')
+				if ($this->query_match_type === 'RLIKE') {
 					$query_params['exclude_subject_phrase_' . $count++] = self::wordBoundaryWrapper(self::escapeSqlRegex($phrase));
-				else
+				} else {
 					$query_params['exclude_subject_phrase_' . $count++] = '%' . Db::$db->escape_wildcard_string($phrase) . '%';
+				}
 			}
+		}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty(Config::$modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
-			{
+
+		if (!empty($query_params['excluded_subject_words']) && empty(Config::$modSettings['search_force_index'])) {
+			foreach ($query_params['excluded_subject_words'] as $excludedWord) {
 				$query_where[] = 'subject NOT ' . $this->query_match_type . ' {string:exclude_subject_words_' . $count . '}';
 
-				if ($this->query_match_type === 'RLIKE')
+				if ($this->query_match_type === 'RLIKE') {
 					$query_params['exclude_subject_words_' . $count++] = self::wordBoundaryWrapper(self::escapeSqlRegex($excludedWord));
-				else
+				} else {
 					$query_params['exclude_subject_words_' . $count++] = '%' . Db::$db->escape_wildcard_string($excludedWord) . '%';
+				}
 			}
+		}
 
-		if (!empty(Config::$modSettings['search_simple_fulltext']))
-		{
-			if (Db::$db->title === POSTGRE_TITLE)
-			{
+		if (!empty(Config::$modSettings['search_simple_fulltext'])) {
+			if (Db::$db->title === POSTGRE_TITLE) {
 				$language_ftx = Db::$db->search_language();
 
 				$query_where[] = 'to_tsvector({string:language_ftx},body) @@ plainto_tsquery({string:language_ftx},{string:body_match})';
 				$query_params['language_ftx'] = $language_ftx;
-			}
-			else
+			} else {
 				$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
+			}
 			$query_params['body_match'] = implode(' ', array_diff($words['indexed_words'], $query_params['excluded_index_words']));
-		}
-		else
-		{
+		} else {
 			$query_params['boolean_match'] = '';
 
 			// remove any indexed words that are used in the complex body search terms
 			$words['indexed_words'] = array_diff($words['indexed_words'], $words['complex_words']);
 
-			if (Db::$db->title === POSTGRE_TITLE)
-			{
+			if (Db::$db->title === POSTGRE_TITLE) {
 				$row = 0;
-				foreach ($words['indexed_words'] as $fulltextWord)
-				{
-					$query_params['boolean_match'] .= ($row <> 0 ? '&' : '');
+
+				foreach ($words['indexed_words'] as $fulltextWord) {
+					$query_params['boolean_match'] .= ($row != 0 ? '&' : '');
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '!' : '') . $fulltextWord . ' ';
 					$row++;
 				}
-			}
-			else
-				foreach ($words['indexed_words'] as $fulltextWord)
+			} else {
+				foreach ($words['indexed_words'] as $fulltextWord) {
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '-' : '+') . $fulltextWord . ' ';
+				}
+			}
 
 			$query_params['boolean_match'] = substr($query_params['boolean_match'], 0, -1);
 
 			// if we have bool terms to search, add them in
-			if ($query_params['boolean_match'])
-			{
-				if (Db::$db->title === POSTGRE_TITLE)
-				{
+			if ($query_params['boolean_match']) {
+				if (Db::$db->title === POSTGRE_TITLE) {
 					$language_ftx = Db::$db->search_language();
 
 					$query_where[] = 'to_tsvector({string:language_ftx},body) @@ plainto_tsquery({string:language_ftx},{string:boolean_match})';
 					$query_params['language_ftx'] = $language_ftx;
-				}
-				else
+				} else {
 					$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
+				}
 			}
 		}
 
-		$ignoreRequest = Db::$db->search_query('insert_into_log_messages_fulltext', (Db::$db->support_ignore ? ('
+		$ignoreRequest = Db::$db->search_query(
+			'insert_into_log_messages_fulltext',
+			(Db::$db->support_ignore ? ('
 			INSERT IGNORE INTO {db_prefix}' . $search_data['insert_into'] . '
 				(' . implode(', ', array_keys($query_select)) . ')') : '') . '
 			SELECT ' . implode(', ', $query_select) . '
@@ -291,7 +304,7 @@ public function indexedWordQuery(array $words, array $search_data)
 			WHERE ' . implode('
 				AND ', $query_where) . (empty($search_data['max_results']) ? '' : '
 			LIMIT ' . ($search_data['max_results'] - $search_data['indexed_results'])),
-			$query_params
+			$query_params,
 		);
 
 		return $ignoreRequest;
diff --git a/Sources/Search/APIs/Standard.php b/Sources/Search/APIs/Standard.php
index 5f24c16b1b..f4d1bed09d 100644
--- a/Sources/Search/APIs/Standard.php
+++ b/Sources/Search/APIs/Standard.php
@@ -28,8 +28,9 @@ public function supportsMethod($methodName, $query_params = null): bool
 		$return = false;
 
 		// Maybe parent got support
-		if (!$return)
+		if (!$return) {
 			$return = parent::supportsMethod($methodName, $query_params);
+		}
 
 		return $return;
 	}
@@ -41,7 +42,6 @@ public function __construct()
 	{
 		parent::__construct();
 	}
-
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Search/APIs/index.php b/Sources/Search/APIs/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Search/APIs/index.php
+++ b/Sources/Search/APIs/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Search/SearchApi.php b/Sources/Search/SearchApi.php
index ea80fff986..d99278da11 100644
--- a/Sources/Search/SearchApi.php
+++ b/Sources/Search/SearchApi.php
@@ -15,13 +15,13 @@
 
 use SMF\BackwardCompatibility;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
+use SMF\PackageManager\SubsPackage;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
-use SMF\PackageManager\SubsPackage;
 
 /**
  * Class SearchApi
@@ -35,22 +35,22 @@ abstract class SearchApi implements SearchApiInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'findSearchAPI',
 			'detect' => 'loadSearchAPIs',
-		),
-		'prop_names' => array(
+		],
+		'prop_names' => [
 			'loadedApi' => 'searchAPI',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
 	// This is the hard coded maximum search string length.
-	const MAX_LENGTH = 100;
+	public const MAX_LENGTH = 100;
 
 	/*******************
 	 * Public properties
@@ -121,7 +121,7 @@ abstract class SearchApi implements SearchApiInterface
 	 * @todo Setting to add custom values?
 	 * @todo Maybe only blacklist if they are the only word, or "any" is used?
 	 */
-	public array $blacklisted_words = array(
+	public array $blacklisted_words = [
 		'img',
 		'url',
 		'quote',
@@ -132,18 +132,18 @@ abstract class SearchApi implements SearchApiInterface
 		'it',
 		'are',
 		'if',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Names of columns that results can be sorted by.
 	 */
-	public array $sort_columns = array(
+	public array $sort_columns = [
 		'relevance',
 		'num_replies',
 		'id_msg',
-	);
+	];
 
 	/**
 	 * @var array
@@ -151,7 +151,7 @@ abstract class SearchApi implements SearchApiInterface
 	 * The supplied search parameters.
 	 * Any unsupplied values will be set to the values in self::$default_params.
 	 */
-	public array $params = array();
+	public array $params = [];
 
 	/**
 	 * @var string
@@ -167,63 +167,63 @@ abstract class SearchApi implements SearchApiInterface
 	 *
 	 * Records errors encountered while preparing to search.
 	 */
-	public array $errors = array();
+	public array $errors = [];
 
 	/**
 	 * @var array
 	 *
 	 * User-supplied search terms that we have chosen to ignore.
 	 */
-	public array $ignored = array();
+	public array $ignored = [];
 
 	/**
 	 * @var array
 	 *
 	 * Array of replacements for highlighting.
 	 */
-	public array $marked = array();
+	public array $marked = [];
 
 	/**
 	 * @var array
 	 *
 	 * The list of terms to search for.
 	 */
-	public array $searchArray = array();
+	public array $searchArray = [];
 
 	/**
 	 * @var array
 	 *
 	 * Structured list of search term data.
 	 */
-	public array $searchWords = array();
+	public array $searchWords = [];
 
 	/**
 	 * @var array
 	 *
 	 * Terms that the user wants to exclude from the search.
 	 */
-	public array $excludedWords = array();
+	public array $excludedWords = [];
 
 	/**
 	 * @var array
 	 *
 	 * Terms to exclude when building a search index.
 	 */
-	public array $excludedIndexWords = array();
+	public array $excludedIndexWords = [];
 
 	/**
 	 * @var array
 	 *
 	 * Terms to exclude from a subject search.
 	 */
-	public array $excludedSubjectWords = array();
+	public array $excludedSubjectWords = [];
 
 	/**
 	 * @var array
 	 *
 	 * Phrases to exclude from the search.
 	 */
-	public array $excludedPhrases = array();
+	public array $excludedPhrases = [];
 
 	/**
 	 * @var array
@@ -231,7 +231,7 @@ abstract class SearchApi implements SearchApiInterface
 	 * The results of the search.
 	 * Keys are message IDs, values are arrays of relevance data.
 	 */
-	public array $results = array();
+	public array $results = [];
 
 	/**
 	 * @var array
@@ -240,7 +240,7 @@ abstract class SearchApi implements SearchApiInterface
 	 * Keys are topic IDs, values are booleans about whether the current user
 	 * has posted anything in that topic.
 	 */
-	public array $participants = array();
+	public array $participants = [];
 
 	/**************************
 	 * Public static properties
@@ -260,9 +260,9 @@ abstract class SearchApi implements SearchApiInterface
 	 *
 	 * Default values for $this->params.
 	 */
-	public static array $default_params = array(
+	public static array $default_params = [
 		'advanced' => false,
-		'brd' => array(),
+		'brd' => [],
 		'maxage' => 9999,
 		'minage' => 0,
 		'search' => '',
@@ -273,7 +273,7 @@ abstract class SearchApi implements SearchApiInterface
 		'subject_only' => false,
 		'topic' => '',
 		'userspec' => '',
-	);
+	];
 
 	/**
 	 * @var array
@@ -281,31 +281,31 @@ abstract class SearchApi implements SearchApiInterface
 	 * Info about how to weigh different factors when searching for relevant
 	 * results.
 	 */
-	public static array $weight_factors = array(
-		'frequency' => array(
+	public static array $weight_factors = [
+		'frequency' => [
 			'search' => 'COUNT(*) / (MAX(t.num_replies) + 1)',
 			'results' => '(t.num_replies + 1)',
-		),
-		'age' => array(
+		],
+		'age' => [
 			'search' => 'CASE WHEN MAX(m.id_msg) < {int:min_msg} THEN 0 ELSE (MAX(m.id_msg) - {int:min_msg}) / {int:recent_message} END',
 			'results' => 'CASE WHEN t.id_first_msg < {int:min_msg} THEN 0 ELSE (t.id_first_msg - {int:min_msg}) / {int:recent_message} END',
-		),
-		'length' => array(
+		],
+		'length' => [
 			'search' => 'CASE WHEN MAX(t.num_replies) < {int:huge_topic_posts} THEN MAX(t.num_replies) / {int:huge_topic_posts} ELSE 1 END',
 			'results' => 'CASE WHEN t.num_replies < {int:huge_topic_posts} THEN t.num_replies / {int:huge_topic_posts} ELSE 1 END',
-		),
-		'subject' => array(
+		],
+		'subject' => [
 			'search' => 0,
 			'results' => 0,
-		),
-		'first_message' => array(
+		],
+		'first_message' => [
 			'search' => 'CASE WHEN MIN(m.id_msg) = MAX(t.id_first_msg) THEN 1 ELSE 0 END',
-		),
-		'sticky' => array(
+		],
+		'sticky' => [
 			'search' => 'MAX(t.is_sticky)',
 			'results' => 't.is_sticky',
-		),
-	);
+		],
+	];
 
 	/*********************
 	 * Internal properties
@@ -316,7 +316,7 @@ abstract class SearchApi implements SearchApiInterface
 	 *
 	 * Calculated weight factors.
 	 */
-	protected array $weight = array();
+	protected array $weight = [];
 
 	/**
 	 * @var int
@@ -359,7 +359,7 @@ abstract class SearchApi implements SearchApiInterface
 	 *
 	 * IDs of members to filter our results by.
 	 */
-	protected array $memberlist = array();
+	protected array $memberlist = [];
 
 	/**
 	 * @var string
@@ -399,10 +399,9 @@ public function __construct()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function supportsMethod($methodName, $query_params = array()): bool
+	public function supportsMethod($methodName, $query_params = []): bool
 	{
-		switch ($methodName)
-		{
+		switch ($methodName) {
 			case 'postRemoved':
 			case 'initializeSearch':
 			case 'searchQuery':
@@ -410,12 +409,10 @@ public function supportsMethod($methodName, $query_params = array()): bool
 			case 'compressParams':
 			case 'getQueryParams':
 				return true;
-				break;
 
 			// All other methods, too bad dunno you.
 			default:
 				return false;
-				break;
 		}
 	}
 
@@ -466,44 +463,51 @@ public function postModified(array &$msgOptions, array &$topicOptions, array &$p
 	 */
 	public function postRemoved($id_msg): void
 	{
-		$result = Db::$db->query('', '
-			SELECT DISTINCT id_search
+		$result = Db::$db->query(
+			'',
+			'SELECT DISTINCT id_search
 			FROM {db_prefix}log_search_results
 			WHERE id_msg = {int:id_msg}',
-			array(
+			[
 				'id_msg' => $id_msg,
-			)
+			],
 		);
 
-		$id_searchs = array();
-		while ($row = Db::$db->fetch_assoc($result))
+		$id_searchs = [];
+
+		while ($row = Db::$db->fetch_assoc($result)) {
 			$id_searchs[] = $row['id_search'];
+		}
 
-		if (count($id_searchs) < 1)
+		if (count($id_searchs) < 1) {
 			return;
+		}
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_search_results
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_search_results
 			WHERE id_search in ({array_int:id_searchs})',
-			array(
+			[
 				'id_searchs' => $id_searchs,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_search_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_search_topics
 			WHERE id_search in ({array_int:id_searchs})',
-			array(
+			[
 				'id_searchs' => $id_searchs,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_search_messages
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_search_messages
 			WHERE id_search in ({array_int:id_searchs})',
-			array(
+			[
 				'id_searchs' => $id_searchs,
-			)
+			],
 		);
 	}
 
@@ -540,80 +544,82 @@ public function searchQuery(array $query_params, array $searchWords, array $excl
 		$update_cache = empty($_SESSION['search_cache']) || ($_SESSION['search_cache']['params'] != $this->compressParams());
 
 		// Are the results fresh?
-		if (!$update_cache && !empty($_SESSION['search_cache']['id_search']))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_search
+		if (!$update_cache && !empty($_SESSION['search_cache']['id_search'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_search
 				FROM {db_prefix}log_search_results
 				WHERE id_search = {int:search_id}
 				LIMIT 1',
-				array(
+				[
 					'search_id' => $_SESSION['search_cache']['id_search'],
-				)
+				],
 			);
 
-			if (Db::$db->num_rows($request) === 0)
+			if (Db::$db->num_rows($request) === 0) {
 				$update_cache = true;
+			}
 		}
 
-		if ($update_cache)
-		{
+		if ($update_cache) {
 			// Increase the pointer...
 			Config::$modSettings['search_pointer'] = empty(Config::$modSettings['search_pointer']) ? 0 : (int) Config::$modSettings['search_pointer'];
 
 			// ...and store it right off.
-			Config::updateModSettings(array('search_pointer' => Config::$modSettings['search_pointer'] >= 255 ? 0 : Config::$modSettings['search_pointer'] + 1));
+			Config::updateModSettings(['search_pointer' => Config::$modSettings['search_pointer'] >= 255 ? 0 : Config::$modSettings['search_pointer'] + 1]);
 
 			// As long as you don't change the parameters, the cache result is yours.
-			$_SESSION['search_cache'] = array(
+			$_SESSION['search_cache'] = [
 				'id_search' => Config::$modSettings['search_pointer'],
 				'num_results' => -1,
 				'params' => $this->compressParams(),
-			);
+			];
 
 			// Clear the previous cache of the final results cache.
-			Db::$db->search_query('delete_log_search_results', '
+			Db::$db->search_query(
+				'delete_log_search_results',
+				'
 				DELETE FROM {db_prefix}log_search_results
 				WHERE id_search = {int:search_id}',
-				array(
+				[
 					'search_id' => $_SESSION['search_cache']['id_search'],
-				)
+				],
 			);
 
-			if ($this->params['subject_only'])
-			{
+			if ($this->params['subject_only']) {
 				$this->searchSubjectOnly();
-			}
-			else
-			{
+			} else {
 				$this->searchSubjectAndMessage();
 			}
 		}
 
 		$approve_query = '';
 
-		if (!empty(Config::$modSettings['postmod_active']))
-		{
+		if (!empty(Config::$modSettings['postmod_active'])) {
 			// Exclude unapproved topics, but show ones they started.
-			if (empty(User::$me->mod_cache['ap']))
+			if (empty(User::$me->mod_cache['ap'])) {
 				$approve_query = '
 				AND (t.approved = {int:is_approved} OR t.id_member_started = {int:current_member})';
+			}
 
 			// Show unapproved topics in boards they have access to.
-			elseif (User::$me->mod_cache['ap'] !== array(0))
+			elseif (User::$me->mod_cache['ap'] !== [0]) {
 				$approve_query = '
 				AND (t.approved = {int:is_approved} OR t.id_member_started = {int:current_member} OR t.id_board IN ({array_int:approve_boards}))';
+			}
 		}
 
 		// *** Retrieve the results to be shown on the page
-		$request = Db::$db->search_query('', '
+		$request = Db::$db->search_query(
+			'',
+			'
 			SELECT ' . (empty($this->params['topic']) ? 'lsr.id_topic' : $this->params['topic'] . ' AS id_topic') . ', lsr.id_msg, lsr.relevance, lsr.num_matches
 			FROM {db_prefix}log_search_results AS lsr' . ($this->params['sort'] == 'num_replies' || !empty($approve_query) ? '
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = lsr.id_topic)' : '') . '
 			WHERE lsr.id_search = {int:id_search}' . $approve_query . '
 			ORDER BY {raw:sort} {raw:sort_dir}
 			LIMIT {int:start}, {int:max}',
-			array(
+			[
 				'id_search' => $_SESSION['search_cache']['id_search'],
 				'sort' => $this->params['sort'],
 				'sort_dir' => $this->params['sort_dir'],
@@ -621,16 +627,16 @@ public function searchQuery(array $query_params, array $searchWords, array $excl
 				'max' => Config::$modSettings['search_results_per_page'],
 				'is_approved' => 1,
 				'current_member' => User::$me->id,
-				'approve_boards' => !empty(Config::$modSettings['postmod_active']) ? User::$me->mod_cache['ap'] : array(),
-			)
+				'approve_boards' => !empty(Config::$modSettings['postmod_active']) ? User::$me->mod_cache['ap'] : [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$this->results[$row['id_msg']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$this->results[$row['id_msg']] = [
 				'relevance' => round($row['relevance'] / 10, 1) . '%',
 				'num_matches' => $row['num_matches'],
-				'matches' => array(),
-			);
+				'matches' => [],
+			];
 
 			// By default they didn't participate in the topic!
 			$this->participants[$row['id_topic']] = false;
@@ -648,23 +654,23 @@ public function searchQuery(array $query_params, array $searchWords, array $excl
 	public function setParticipants(): void
 	{
 		// If we want to know who participated in what then load this now.
-		if (!empty(Config::$modSettings['enableParticipation']) && !User::$me->is_guest)
-		{
-			$result = Db::$db->query('', '
-				SELECT id_topic
+		if (!empty(Config::$modSettings['enableParticipation']) && !User::$me->is_guest) {
+			$result = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}messages
 				WHERE id_topic IN ({array_int:topic_list})
 					AND id_member = {int:current_member}
 				GROUP BY id_topic
 				LIMIT {int:limit}',
-				array(
+				[
 					'current_member' => User::$me->id,
 					'topic_list' => array_keys($this->participants),
 					'limit' => count($this->participants),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($result))
-			{
+
+			while ($row = Db::$db->fetch_assoc($result)) {
 				$this->participants[$row['id_topic']] = true;
 			}
 			Db::$db->free_result($result);
@@ -676,36 +682,39 @@ public function setParticipants(): void
 	 */
 	public function compressParams(): string
 	{
-		if (isset($this->compressed_params))
+		if (isset($this->compressed_params)) {
 			return $this->compressed_params;
+		}
 
 		$temp_params = $this->params;
 
-		foreach ($temp_params as $key => $value)
-		{
-			if ($temp_params[$key] === self::$default_params[$key])
+		foreach ($temp_params as $key => $value) {
+			if ($temp_params[$key] === self::$default_params[$key]) {
 				unset($temp_params[$key]);
+			}
 		}
 
-		if (isset($temp_params['brd']))
+		if (isset($temp_params['brd'])) {
 			$temp_params['brd'] = implode(',', $temp_params['brd']);
+		}
 
-		if (!empty($temp_params))
-		{
-			foreach ($temp_params as $k => $v)
+		if (!empty($temp_params)) {
+			foreach ($temp_params as $k => $v) {
 				$temp_params[$k] = $k . '|\'|' . $v;
+			}
 
 			$temp_params = implode('|"|', $temp_params);
 
 			// Due to old IE's 2083 character limit, we try to compress long search strings
-			if (($compressed = @gzcompress($temp_params)) !== false)
+			if (($compressed = @gzcompress($temp_params)) !== false) {
 				$temp_params = $compressed;
+			}
 
 			// Base64 encode, then replace +/= with URI safe ones that can be reverted.
-			$this->compressed_params = str_replace(array('+', '/', '='), array('-', '_', '.'), base64_encode($temp_params));
-		}
-		else
+			$this->compressed_params = str_replace(['+', '/', '='], ['-', '_', '.'], base64_encode($temp_params));
+		} else {
 			$this->compressed_params = '';
+		}
 
 		return $this->compressed_params;
 	}
@@ -723,11 +732,11 @@ public function compressParams(): string
 	 */
 	public function getQueryParams(): array
 	{
-		return array_merge($this->params, array(
+		return array_merge($this->params, [
 			'min_msg_id' => $this->minMsgID,
 			'max_msg_id' => $this->maxMsgID,
 			'memberlist' => $this->memberlist,
-		));
+		]);
 	}
 
 	/***********************
@@ -746,8 +755,9 @@ final public static function load(): object
 
 		$search_class_name = __NAMESPACE__ . '\\APIs\\' . ucwords(Config::$modSettings['search_index']);
 
-		if (!class_exists($search_class_name))
+		if (!class_exists($search_class_name)) {
 			ErrorHandler::fatalLang('search_api_missing');
+		}
 
 		// Create an instance of the search API and check it is valid for this version of SMF.
 		self::$loadedApi = new $search_class_name();
@@ -758,22 +768,21 @@ final public static function load(): object
 			|| !(self::$loadedApi instanceof SearchApiInterface)
 			|| (self::$loadedApi->supportsMethod('isValid') && !self::$loadedApi->isValid())
 			|| !SubsPackage::matchPackageVersion(SMF_VERSION, self::$loadedApi->min_smf_version . '-' . self::$loadedApi->version_compatible)
-		)
-		{
+		) {
 			// Log the error.
 			Lang::load('Errors');
 
 			ErrorHandler::log(sprintf(Lang::$txt['search_api_not_compatible'], 'Search/APIs/' . ucwords(Config::$modSettings['search_index']) . '.php'), 'critical');
 
 			// Fall back to standard search.
-			if (Config::$modSettings['search_index'] !== 'standard')
-			{
+			if (Config::$modSettings['search_index'] !== 'standard') {
 				Config::$modSettings['search_index'] = 'standard';
 				self::load();
 			}
 			// This should never happen, but...
-			else
+			else {
 				self::$loadedApi = false;
+			}
 		}
 
 		return self::$loadedApi;
@@ -786,88 +795,96 @@ final public static function load(): object
 	 */
 	final public static function detect(): array
 	{
-		$loadedApis = array();
+		$loadedApis = [];
 
 		$api_classes = new \GlobIterator(__DIR__ . '/APIs/*.php', \FilesystemIterator::NEW_CURRENT_AND_KEY);
 
-		foreach ($api_classes as $file_path => $file_info)
-		{
+		foreach ($api_classes as $file_path => $file_info) {
 			$class_name = $file_info->getBasename('.php');
 			$index_name = strtolower($class_name);
 			$fully_qualified_class_name = __NAMESPACE__ . '\\APIs\\' . $class_name;
 
-			if (!class_exists($fully_qualified_class_name))
+			if (!class_exists($fully_qualified_class_name)) {
 				continue;
+			}
 
 			$search_api = new $fully_qualified_class_name();
 
-			if (!($search_api instanceof SearchApiInterface) || !($search_api instanceof SearchApi))
+			if (!($search_api instanceof SearchApiInterface) || !($search_api instanceof SearchApi)) {
 				continue;
+			}
 
-			if (!$search_api->is_supported)
+			if (!$search_api->is_supported) {
 				continue;
+			}
 
-			$loadedApis[$index_name] = array(
+			$loadedApis[$index_name] = [
 				'filename' => 'Search/APIs/' . $file_info->getBasename(),
 				'setting_index' => $index_name,
-				'has_template' => in_array($index_name, array('custom', 'fulltext', 'standard')),
+				'has_template' => in_array($index_name, ['custom', 'fulltext', 'standard']),
 				'label' => $index_name && isset(Lang::$txt['search_index_' . $index_name]) ? Lang::$txt['search_index_' . $index_name] : '',
 				'desc' => $index_name && isset(Lang::$txt['search_index_' . $index_name . '_desc']) ? Lang::$txt['search_index_' . $index_name . '_desc'] : '',
-			);
+			];
 		}
 
 		// Check for search APIs using the old SearchAPI-*.php system.
 		// Kept for backward compatibility.
 		$source_files = new \GlobIterator(Config::$sourcedir . '/SearchAPI-*.php', \FilesystemIterator::NEW_CURRENT_AND_KEY);
 
-		foreach ($source_files as $file_path => $file_info)
-		{
+		foreach ($source_files as $file_path => $file_info) {
 			// Skip if not a file.
-			if (!$file_info->isFile())
+			if (!$file_info->isFile()) {
 				continue;
+			}
 
 			// Skip if file name doesn't match.
-			if (!preg_match('~^SearchAPI-([A-Za-z\d_]+)\.php$~', $file_info->getFilename(), $matches))
+			if (!preg_match('~^SearchAPI-([A-Za-z\d_]+)\.php$~', $file_info->getFilename(), $matches)) {
 				continue;
+			}
 
 			$index_name = strtolower($matches[1]);
 			$class_name = $index_name . '_search';
 
 			// Skip if we already have an API by this name.
-			if (isset($loadedApis[$index_name]))
+			if (isset($loadedApis[$index_name])) {
 				continue;
+			}
 
 			// Check this is definitely a valid API.
 			$fp = fopen($file_info->getPathname(), 'rb');
 			$header = fread($fp, 4096);
 			fclose($fp);
 
-			if (strpos($header, '* SearchAPI-' . $matches[1] . '.php') === false)
+			if (strpos($header, '* SearchAPI-' . $matches[1] . '.php') === false) {
 				continue;
+			}
 
-			require_once($file_info->getPathname());
+			require_once $file_info->getPathname();
 
-			if (!class_exists($class_name, false))
+			if (!class_exists($class_name, false)) {
 				continue;
+			}
 
 			$search_api = new $class_name();
 
-			if (!($search_api instanceof SearchApiInterface) || !($search_api instanceof SearchApi))
+			if (!($search_api instanceof SearchApiInterface) || !($search_api instanceof SearchApi)) {
 				continue;
+			}
 
-			if (!$search_api->is_supported)
+			if (!$search_api->is_supported) {
 				continue;
+			}
 
-			$loadedApis[$index_name] = array(
+			$loadedApis[$index_name] = [
 				'filename' => $file_info->getFilename(),
 				'setting_index' => $index_name,
-				'has_template' => in_array($index_name, array('custom', 'fulltext', 'standard')),
+				'has_template' => in_array($index_name, ['custom', 'fulltext', 'standard']),
 				'label' => $index_name && isset(Lang::$txt['search_index_' . $index_name]) ? Lang::$txt['search_index_' . $index_name] : '',
 				'desc' => $index_name && isset(Lang::$txt['search_index_' . $index_name . '_desc']) ? Lang::$txt['search_index_' . $index_name . '_desc'] : '',
-			);
+			];
 		}
 
-		IntegrationHook::call('integrate_load_search_apis', array(&$loadedApis));
+		IntegrationHook::call('integrate_load_search_apis', [&$loadedApis]);
 
 		return $loadedApis;
 	}
@@ -884,17 +901,17 @@ final public static function detect(): array
 	 */
 	protected function calculateWeight(): void
 	{
-		IntegrationHook::call('integrate_search_weights', array(&self::$weight_factors));
+		IntegrationHook::call('integrate_search_weights', [&self::$weight_factors]);
 
-		foreach (self::$weight_factors as $weight_factor => $value)
-		{
+		foreach (self::$weight_factors as $weight_factor => $value) {
 			$this->weight[$weight_factor] = empty(Config::$modSettings['search_weight_' . $weight_factor]) ? 0 : (int) Config::$modSettings['search_weight_' . $weight_factor];
 			$this->weight_total += $this->weight[$weight_factor];
 		}
 
 		// Zero weight.  Weightless :P.
-		if (empty($this->weight_total))
+		if (empty($this->weight_total)) {
 			ErrorHandler::fatalLang('search_invalid_weights');
+		}
 	}
 
 	/**
@@ -905,7 +922,7 @@ protected function calculateWeight(): void
 	 */
 	protected function setBlacklistedWords(): void
 	{
-		IntegrationHook::call('integrate_search_blacklisted_words', array(&$this->blacklisted_words));
+		IntegrationHook::call('integrate_search_blacklisted_words', [&$this->blacklisted_words]);
 	}
 
 	/**
@@ -916,69 +933,58 @@ protected function setBlacklistedWords(): void
 	 */
 	protected function setParams(): void
 	{
-		if (isset($_REQUEST['params']))
-		{
+		if (isset($_REQUEST['params'])) {
 			// Due to IE's 2083 character limit, we have to compress long search strings
-			$temp_params = base64_decode(str_replace(array('-', '_', '.'), array('+', '/', '='), $_REQUEST['params']));
+			$temp_params = base64_decode(str_replace(['-', '_', '.'], ['+', '/', '='], $_REQUEST['params']));
 
 			// Test for gzuncompress failing
 			$temp_params2 = @gzuncompress($temp_params);
 			$temp_params = explode('|"|', (!empty($temp_params2) ? $temp_params2 : $temp_params));
 
-			foreach ($temp_params as $i => $data)
-			{
+			foreach ($temp_params as $i => $data) {
 				@list($k, $v) = explode('|\'|', $data);
 				$this->params[$k] = $v;
 			}
 
-			if (isset($this->params['brd']))
-			{
-				$this->params['brd'] = empty($this->params['brd']) ? array() : explode(',', $this->params['brd']);
+			if (isset($this->params['brd'])) {
+				$this->params['brd'] = empty($this->params['brd']) ? [] : explode(',', $this->params['brd']);
 			}
 		}
 
 		// Store whether simple search was used (needed if the user wants to do another query).
-		if (!isset($this->params['advanced']))
-		{
+		if (!isset($this->params['advanced'])) {
 			$this->params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
 		}
 
 		// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-		if (!empty($this->params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		{
+		if (!empty($this->params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
 			$this->params['searchtype'] = 2;
 		}
 
 		// Minimum age of messages. Default to zero (don't set param in that case).
-		if (!empty($this->params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		{
+		if (!empty($this->params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
 			$this->params['minage'] = !empty($this->params['minage']) ? (int) $this->params['minage'] : (int) $_REQUEST['minage'];
 		}
 
 		// Maximum age of messages. Default to infinite (9999 days: param not set).
-		if (!empty($this->params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999))
-		{
+		if (!empty($this->params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999)) {
 			$this->params['maxage'] = !empty($this->params['maxage']) ? (int) $this->params['maxage'] : (int) $_REQUEST['maxage'];
 		}
 
 		// Searching a specific topic?
-		if (!empty($_REQUEST['topic']) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'topic'))
-		{
+		if (!empty($_REQUEST['topic']) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'topic')) {
 			$this->params['topic'] = empty($_REQUEST['search_selection']) ? (int) $_REQUEST['topic'] : (isset($_REQUEST['sd_topic']) ? (int) $_REQUEST['sd_topic'] : '');
 
 			$this->params['show_complete'] = true;
-		}
-		elseif (!empty($this->params['topic']))
-		{
+		} elseif (!empty($this->params['topic'])) {
 			$this->params['topic'] = (int) $this->params['topic'];
 		}
 
 		$this->setMsgBounds();
 
 		// Default the user name to a wildcard matching every user (*).
-		if (!empty($this->params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		{
-			$this->params['userspec'] = isset($this->params['userspec']) ? $this->params['userspec'] : $_REQUEST['userspec'];
+		if (!empty($this->params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$this->params['userspec'] = $this->params['userspec'] ?? $_REQUEST['userspec'];
 		}
 
 		$this->setUserQuery();
@@ -996,37 +1002,31 @@ protected function setParams(): void
 		$this->ageRecentMsg = Config::$modSettings['maxMsgID'] - $this->ageMinMsg;
 
 		// *** Parse the search query
-		IntegrationHook::call('integrate_search_params', array(&$this->params));
+		IntegrationHook::call('integrate_search_params', [&$this->params]);
 
 		// What are we searching for?
-		if (empty($this->params['search']))
-		{
-			if (isset($_GET['search']))
-			{
+		if (empty($this->params['search'])) {
+			if (isset($_GET['search'])) {
 				$this->params['search'] = Utils::htmlspecialcharsDecode($_GET['search']);
-			}
-			elseif (isset($_POST['search']))
-			{
+			} elseif (isset($_POST['search'])) {
 				$this->params['search'] = $_POST['search'];
 			}
 		}
 
 		// Nothing??
-		if (!isset($this->params['search']) || $this->params['search'] == '')
-		{
+		if (!isset($this->params['search']) || $this->params['search'] == '') {
 			$this->errors['invalid_search_string'] = true;
 		}
 		// Too long?
-		elseif (Utils::entityStrlen($this->params['search']) > self::MAX_LENGTH)
-		{
+		elseif (Utils::entityStrlen($this->params['search']) > self::MAX_LENGTH) {
 			$this->errors['string_too_long'] = true;
 		}
 
 		// Populate anything that hasn't already been set.
-		foreach (self::$default_params as $param => $value)
-		{
-			if (!isset($this->params[$param]))
+		foreach (self::$default_params as $param => $value) {
+			if (!isset($this->params[$param])) {
 				$this->params[$param] = $value;
+			}
 		}
 
 		// Ensure all the boards are integers.
@@ -1048,8 +1048,9 @@ protected function setSearchTerms(): void
 		$stripped_query = Utils::htmlspecialcharsDecode(Utils::strtolower($stripped_query));
 
 		// This (hidden) setting will do fulltext searching in the most basic way.
-		if (!empty(Config::$modSettings['search_simple_fulltext']))
-			$stripped_query = strtr($stripped_query, array('"' => ''));
+		if (!empty(Config::$modSettings['search_simple_fulltext'])) {
+			$stripped_query = strtr($stripped_query, ['"' => '']);
+		}
 
 		// Specify the function to search with. Regex is for word boundaries.
 		$this->query_match_type = !empty(Config::$modSettings['search_match_words']) && !preg_match('~&#(?:\d{1,7}|x[0-9a-fA-F]{1,6});~', $stripped_query) ? 'RLIKE' : 'LIKE';
@@ -1065,12 +1066,9 @@ protected function setSearchTerms(): void
 		$wordArray = explode(' ', Utils::htmlspecialchars(Utils::htmlspecialcharsDecode($wordArray), ENT_QUOTES));
 
 		// .. first, we check for things like -"some words", but not "-some words".
-		foreach ($matches[1] as $index => $word)
-		{
-			if ($word === '-')
-			{
-				if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				{
+		foreach ($matches[1] as $index => $word) {
+			if ($word === '-') {
+				if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
 					$this->excludedWords[] = $word;
 				}
 
@@ -1079,12 +1077,9 @@ protected function setSearchTerms(): void
 		}
 
 		// Now we look for -test, etc.... normaller.
-		foreach ($wordArray as $index => $word)
-		{
-			if (strpos(trim($word), '-') === 0)
-			{
-				if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				{
+		foreach ($wordArray as $index => $word) {
+			if (strpos(trim($word), '-') === 0) {
+				if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
 					$this->excludedWords[] = $word;
 				}
 
@@ -1096,22 +1091,18 @@ protected function setSearchTerms(): void
 		$this->searchArray = array_merge($phraseArray, $wordArray);
 
 		// Trim everything and make sure there are no words that are the same.
-		foreach ($this->searchArray as $index => $value)
-		{
+		foreach ($this->searchArray as $index => $value) {
 			// Skip anything practically empty.
-			if (($this->searchArray[$index] = trim($value, '-_\' ')) === '')
-			{
+			if (($this->searchArray[$index] = trim($value, '-_\' ')) === '') {
 				unset($this->searchArray[$index]);
 			}
 			// Skip blacklisted words. Make sure to note we skipped them in case we end up with nothing.
-			elseif (in_array($this->searchArray[$index], $this->blacklisted_words))
-			{
+			elseif (in_array($this->searchArray[$index], $this->blacklisted_words)) {
 				$foundBlackListedWords = true;
 				unset($this->searchArray[$index]);
 			}
 			// Don't allow very, very short words.
-			elseif (Utils::entityStrlen($value) < 2)
-			{
+			elseif (Utils::entityStrlen($value) < 2) {
 				$this->ignored[] = $value;
 				unset($this->searchArray[$index]);
 			}
@@ -1119,102 +1110,94 @@ protected function setSearchTerms(): void
 
 		$this->searchArray = array_slice(array_unique($this->searchArray), 0, 10);
 
-		foreach ($this->searchArray as $word)
+		foreach ($this->searchArray as $word) {
 			$this->marked[$word] = '<mark class="highlight">' . $word . '</mark>';
+		}
 
 		// Initialize two arrays storing the words that have to be searched for.
-		$orParts = array();
-		$this->searchWords = array();
+		$orParts = [];
+		$this->searchWords = [];
 
 		// Make sure at least one word is being searched for.
-		if (empty($this->searchArray))
-		{
+		if (empty($this->searchArray)) {
 			$this->errors['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
 		}
 		// All words/sentences must match.
-		elseif (empty($this->params['searchtype']))
-		{
+		elseif (empty($this->params['searchtype'])) {
 			$orParts[0] = $this->searchArray;
 		}
 		// Any word/sentence must match.
-		else
-		{
-			foreach ($this->searchArray as $index => $value)
-				$orParts[$index] = array($value);
+		else {
+			foreach ($this->searchArray as $index => $value) {
+				$orParts[$index] = [$value];
+			}
 		}
 
 		// Don't allow duplicate error messages if one string is too short.
-		if (isset($this->errors['search_string_small_words'], $this->errors['invalid_search_string']))
+		if (isset($this->errors['search_string_small_words'], $this->errors['invalid_search_string'])) {
 			unset($this->errors['invalid_search_string']);
+		}
 
 		// Make sure the excluded words are in all or-branches.
-		foreach ($orParts as $orIndex => $andParts)
-		{
-			foreach ($this->excludedWords as $word)
+		foreach ($orParts as $orIndex => $andParts) {
+			foreach ($this->excludedWords as $word) {
 				$orParts[$orIndex][] = $word;
+			}
 		}
 
 		// Determine the or-branches and the fulltext search words.
-		foreach ($orParts as $orIndex => $andParts)
-		{
-			$this->searchWords[$orIndex] = array(
-				'indexed_words' => array(),
-				'words' => array(),
-				'subject_words' => array(),
-				'all_words' => array(),
-				'complex_words' => array(),
-			);
+		foreach ($orParts as $orIndex => $andParts) {
+			$this->searchWords[$orIndex] = [
+				'indexed_words' => [],
+				'words' => [],
+				'subject_words' => [],
+				'all_words' => [],
+				'complex_words' => [],
+			];
 
 			// Sort the indexed words (large words -> small words -> excluded words).
-			if ($this->supportsMethod('searchSort'))
-				usort($orParts[$orIndex], array($this, 'searchSort'));
+			if ($this->supportsMethod('searchSort')) {
+				usort($orParts[$orIndex], [$this, 'searchSort']);
+			}
 
-			foreach ($orParts[$orIndex] as $word)
-			{
+			foreach ($orParts[$orIndex] as $word) {
 				$is_excluded = in_array($word, $this->excludedWords);
 
 				$this->searchWords[$orIndex]['all_words'][] = $word;
 
 				$subjectWords = Utils::text2words($word);
 
-				if (!$is_excluded || count($subjectWords) === 1)
-				{
+				if (!$is_excluded || count($subjectWords) === 1) {
 					$this->searchWords[$orIndex]['subject_words'] = array_merge($this->searchWords[$orIndex]['subject_words'], $subjectWords);
 
-					if ($is_excluded)
-					{
+					if ($is_excluded) {
 						$this->excludedSubjectWords = array_merge($this->excludedSubjectWords, $subjectWords);
 					}
-				}
-				else
+				} else {
 					$this->excludedPhrases[] = $word;
+				}
 
 				// Have we got indexes to prepare?
-				if ($this->supportsMethod('prepareIndexes'))
-				{
+				if ($this->supportsMethod('prepareIndexes')) {
 					$this->prepareIndexes($word, $this->searchWords[$orIndex], $this->excludedIndexWords, $is_excluded);
 				}
 			}
 
 			// Search_force_index requires all AND parts to have at least one fulltext word.
-			if (!empty(Config::$modSettings['search_force_index']) && empty($this->searchWords[$orIndex]['indexed_words']))
-			{
+			if (!empty(Config::$modSettings['search_force_index']) && empty($this->searchWords[$orIndex]['indexed_words'])) {
 				$this->errors['query_not_specific_enough'] = true;
 				break;
 			}
-			elseif ($this->params['subject_only'] && empty($this->searchWords[$orIndex]['subject_words']) && empty($this->excludedSubjectWords))
-			{
+
+			if ($this->params['subject_only'] && empty($this->searchWords[$orIndex]['subject_words']) && empty($this->excludedSubjectWords)) {
 				$this->errors['query_not_specific_enough'] = true;
 				break;
 			}
 
 			// Make sure we aren't searching for too many indexed words.
-			else
-			{
-				$this->searchWords[$orIndex]['indexed_words'] = array_slice($this->searchWords[$orIndex]['indexed_words'], 0, 7);
-				$this->searchWords[$orIndex]['subject_words'] = array_slice($this->searchWords[$orIndex]['subject_words'], 0, 7);
-				$this->searchWords[$orIndex]['words'] = array_slice($this->searchWords[$orIndex]['words'], 0, 4);
-			}
+			$this->searchWords[$orIndex]['indexed_words'] = array_slice($this->searchWords[$orIndex]['indexed_words'], 0, 7);
+			$this->searchWords[$orIndex]['subject_words'] = array_slice($this->searchWords[$orIndex]['subject_words'], 0, 7);
+			$this->searchWords[$orIndex]['words'] = array_slice($this->searchWords[$orIndex]['words'], 0, 4);
 		}
 	}
 
@@ -1239,26 +1222,27 @@ protected function escapeSqlRegex(string $str): string
 	 */
 	protected function setMsgBounds(): void
 	{
-		if (!empty($this->params['minage']) || !empty($this->params['maxage']))
-		{
-			$request = Db::$db->query('', '
-				SELECT ' . (empty($this->params['maxage']) ? '0, ' : 'COALESCE(MIN(id_msg), -1), ') . (empty($this->params['minage']) ? '0' : 'COALESCE(MAX(id_msg), -1)') . '
+		if (!empty($this->params['minage']) || !empty($this->params['maxage'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT ' . (empty($this->params['maxage']) ? '0, ' : 'COALESCE(MIN(id_msg), -1), ') . (empty($this->params['minage']) ? '0' : 'COALESCE(MAX(id_msg), -1)') . '
 				FROM {db_prefix}messages
 				WHERE 1=1' . (Config::$modSettings['postmod_active'] ? '
 					AND approved = {int:is_approved_true}' : '') . (empty($this->params['minage']) ? '' : '
 					AND poster_time <= {int:timestamp_minimum_age}') . (empty($this->params['maxage']) ? '' : '
 					AND poster_time >= {int:timestamp_maximum_age}'),
-				array(
+				[
 					'timestamp_minimum_age' => empty($this->params['minage']) ? 0 : time() - 86400 * $this->params['minage'],
 					'timestamp_maximum_age' => empty($this->params['maxage']) ? 0 : time() - 86400 * $this->params['maxage'],
 					'is_approved_true' => 1,
-				)
+				],
 			);
-			list ($this->minMsgID, $this->maxMsgID) = Db::$db->fetch_row($request);
+			list($this->minMsgID, $this->maxMsgID) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
-			if ($this->minMsgID < 0 || $this->maxMsgID < 0)
+			if ($this->minMsgID < 0 || $this->maxMsgID < 0) {
 				$this->errors['no_messages_in_time_frame'] = true;
+			}
 		}
 	}
 
@@ -1268,79 +1252,73 @@ protected function setMsgBounds(): void
 	protected function setUserQuery(): void
 	{
 		// If there's no specific user, then don't mention it in the main query.
-		if (empty($this->params['userspec']))
+		if (empty($this->params['userspec'])) {
 			$this->userQuery = '';
-		else
-		{
-			$userString = strtr(Utils::htmlspecialchars($this->params['userspec'], ENT_QUOTES), array('&quot;' => '"', '%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
+		} else {
+			$userString = strtr(Utils::htmlspecialchars($this->params['userspec'], ENT_QUOTES), ['&quot;' => '"', '%' => '\\%', '_' => '\\_', '*' => '%', '?' => '_']);
 
 			preg_match_all('~"([^"]+)"~', $userString, $matches);
 			$possible_users = array_merge($matches[1], explode(',', preg_replace('~"[^"]+"~', '', $userString)));
 
-			for ($k = 0, $n = count($possible_users); $k < $n; $k++)
-			{
+			for ($k = 0, $n = count($possible_users); $k < $n; $k++) {
 				$possible_users[$k] = trim($possible_users[$k]);
 
-				if (strlen($possible_users[$k]) == 0)
+				if (strlen($possible_users[$k]) == 0) {
 					unset($possible_users[$k]);
+				}
 			}
 
-			if (empty($possible_users))
-			{
+			if (empty($possible_users)) {
 				$this->userQuery = '';
-			}
-			else
-			{
+			} else {
 				// Create a list of database-escaped search names.
-				$realNameMatches = array();
+				$realNameMatches = [];
 
-				foreach ($possible_users as $possible_user)
+				foreach ($possible_users as $possible_user) {
 					$realNameMatches[] = Db::$db->quote(
 						'{string:possible_user}',
-						array(
-							'possible_user' => $possible_user
-						)
+						[
+							'possible_user' => $possible_user,
+						],
 					);
+				}
 
 				// Retrieve a list of possible members.
-				$request = Db::$db->query('', '
-					SELECT id_member
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member
 					FROM {db_prefix}members
 					WHERE {raw:match_possible_users}',
-					array(
+					[
 						'match_possible_users' => 'real_name LIKE ' . implode(' OR real_name LIKE ', $realNameMatches),
-					)
+					],
 				);
 
 				// Simply do nothing if there're too many members matching the criteria.
-				if (Db::$db->num_rows($request) > $this->maxMembersToSearch)
-				{
+				if (Db::$db->num_rows($request) > $this->maxMembersToSearch) {
 					$this->userQuery = '';
-				}
-				elseif (Db::$db->num_rows($request) == 0)
-				{
+				} elseif (Db::$db->num_rows($request) == 0) {
 					$this->userQuery = Db::$db->quote(
 						'm.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})',
-						array(
+						[
 							'id_member_guest' => 0,
 							'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
-						)
+						],
 					);
-				}
-				else
-				{
-					$this->memberlist = array();
+				} else {
+					$this->memberlist = [];
 
-					while ($row = Db::$db->fetch_assoc($request))
+					while ($row = Db::$db->fetch_assoc($request)) {
 						$this->memberlist[] = $row['id_member'];
+					}
 
 					$this->userQuery = Db::$db->quote(
 						'(m.id_member IN ({array_int:matched_members}) OR (m.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})))',
-						array(
+						[
 							'matched_members' => $this->memberlist,
 							'id_member_guest' => 0,
 							'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
-						)
+						],
 					);
 				}
 				Db::$db->free_result($request);
@@ -1354,118 +1332,116 @@ protected function setUserQuery(): void
 	protected function setBoardQuery(): void
 	{
 		// If the boards were passed by URL (params=), temporarily put them back in $_REQUEST.
-		if (!empty($this->params['brd']) && is_array($this->params['brd']))
+		if (!empty($this->params['brd']) && is_array($this->params['brd'])) {
 			$_REQUEST['brd'] = $this->params['brd'];
+		}
 
 		// Ensure that brd is an array.
-		if ((!empty($_REQUEST['brd']) && !is_array($_REQUEST['brd'])) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'board'))
-		{
-			if (!empty($_REQUEST['brd']))
-			{
-				$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
-			}
-			else
-				$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		if ((!empty($_REQUEST['brd']) && !is_array($_REQUEST['brd'])) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'board')) {
+			if (!empty($_REQUEST['brd'])) {
+				$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : [$_REQUEST['brd']];
+			} else {
+				$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? [$_REQUEST['sd_brd']] : [];
+			}
 		}
 
 		// Make sure all boards are integers.
-		if (!empty($_REQUEST['brd']))
-		{
-			foreach ($_REQUEST['brd'] as $id => $brd)
+		if (!empty($_REQUEST['brd'])) {
+			foreach ($_REQUEST['brd'] as $id => $brd) {
 				$_REQUEST['brd'][$id] = (int) $brd;
+			}
 		}
 
 		// Special case for boards: searching just one topic?
-		if (!empty($this->params['topic']))
-		{
-			$request = Db::$db->query('', '
-				SELECT t.id_board
+		if (!empty($this->params['topic'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT t.id_board
 				FROM {db_prefix}topics AS t
 				WHERE t.id_topic = {int:search_topic_id}
 					AND {query_see_topic_board}' . (Config::$modSettings['postmod_active'] ? '
 					AND t.approved = {int:is_approved_true}' : '') . '
 				LIMIT 1',
-				array(
+				[
 					'search_topic_id' => $this->params['topic'],
 					'is_approved_true' => 1,
-				)
+				],
 			);
 
-			if (Db::$db->num_rows($request) == 0)
+			if (Db::$db->num_rows($request) == 0) {
 				ErrorHandler::fatalLang('topic_gone', false);
+			}
 
-			$this->params['brd'] = array();
-			list ($this->params['brd'][0]) = Db::$db->fetch_row($request);
+			$this->params['brd'] = [];
+			list($this->params['brd'][0]) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 		// Select all boards you've selected AND are allowed to see.
-		elseif (User::$me->is_admin && (!empty($this->params['advanced']) || !empty($_REQUEST['brd'])))
-		{
-			$this->params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
-		}
-		else
-		{
+		elseif (User::$me->is_admin && (!empty($this->params['advanced']) || !empty($_REQUEST['brd']))) {
+			$this->params['brd'] = empty($_REQUEST['brd']) ? [] : $_REQUEST['brd'];
+		} else {
 			$see_board = empty($this->params['advanced']) ? 'query_wanna_see_board' : 'query_see_board';
 
-			$request = Db::$db->query('', '
-				SELECT b.id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT b.id_board
 				FROM {db_prefix}boards AS b
 				WHERE {raw:boards_allowed_to_see}
 					AND redirect = {string:empty_string}' . (empty($_REQUEST['brd']) ? (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? '
 					AND b.id_board != {int:recycle_board_id}' : '') : '
 					AND b.id_board IN ({array_int:selected_search_boards})'),
-				array(
+				[
 					'boards_allowed_to_see' => User::$me->{$see_board},
 					'empty_string' => '',
-					'selected_search_boards' => empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'],
+					'selected_search_boards' => empty($_REQUEST['brd']) ? [] : $_REQUEST['brd'],
 					'recycle_board_id' => Config::$modSettings['recycle_board'],
-				)
+				],
 			);
 
-			$this->params['brd'] = array();
+			$this->params['brd'] = [];
 
-			while ($row = Db::$db->fetch_assoc($request))
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->params['brd'][] = $row['id_board'];
+			}
 
 			Db::$db->free_result($request);
 
 			// This error should pro'bly only happen for hackers.
-			if (empty($this->params['brd']))
+			if (empty($this->params['brd'])) {
 				$this->errors['no_boards_selected'] = true;
+			}
 		}
 
-		if (count($this->params['brd']) != 0)
-		{
-			foreach ($this->params['brd'] as $k => $v)
+		if (count($this->params['brd']) != 0) {
+			foreach ($this->params['brd'] as $k => $v) {
 				$this->params['brd'][$k] = (int) $v;
+			}
 
 			// If we've selected all boards, this parameter can be left empty.
-			$request = Db::$db->query('', '
-				SELECT COUNT(*)
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(*)
 				FROM {db_prefix}boards
 				WHERE redirect = {string:empty_string}',
-				array(
+				[
 					'empty_string' => '',
-				)
+				],
 			);
 
-			list ($num_boards) = Db::$db->fetch_row($request);
+			list($num_boards) = Db::$db->fetch_row($request);
 
 			Db::$db->free_result($request);
 
-			if (count($this->params['brd']) == $num_boards)
-			{
+			if (count($this->params['brd']) == $num_boards) {
 				$this->boardQuery = '';
-			}
-			elseif (count($this->params['brd']) == $num_boards - 1 && !empty(Config::$modSettings['recycle_board']) && !in_array(Config::$modSettings['recycle_board'], $this->params['brd']))
-			{
+			} elseif (count($this->params['brd']) == $num_boards - 1 && !empty(Config::$modSettings['recycle_board']) && !in_array(Config::$modSettings['recycle_board'], $this->params['brd'])) {
 				$this->boardQuery = '!= ' . Config::$modSettings['recycle_board'];
-			}
-			else
+			} else {
 				$this->boardQuery = 'IN (' . implode(', ', $this->params['brd']) . ')';
-		}
-		else
+			}
+		} else {
 			$this->boardQuery = '';
+		}
 	}
 
 	/**
@@ -1473,17 +1449,17 @@ protected function setBoardQuery(): void
 	 */
 	protected function setSort(): void
 	{
-		IntegrationHook::call('integrate_search_sort_columns', array(&$this->sort_columns));
+		IntegrationHook::call('integrate_search_sort_columns', [&$this->sort_columns]);
 
-		if (empty($this->params['sort']) && !empty($_REQUEST['sort']))
-		{
-			list ($this->params['sort'], $this->params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+		if (empty($this->params['sort']) && !empty($_REQUEST['sort'])) {
+			list($this->params['sort'], $this->params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
 		}
 
 		$this->params['sort'] = !empty($this->params['sort']) && in_array($this->params['sort'], $this->sort_columns) ? $this->params['sort'] : 'relevance';
 
-		if (!empty($this->params['topic']) && $this->params['sort'] === 'num_replies')
+		if (!empty($this->params['topic']) && $this->params['sort'] === 'num_replies') {
 			$this->params['sort'] = 'id_msg';
+		}
 
 		// Sorting direction: descending unless stated otherwise.
 		$this->params['sort_dir'] = !empty($this->params['sort_dir']) && $this->params['sort_dir'] == 'asc' ? 'asc' : 'desc';
@@ -1495,43 +1471,39 @@ protected function setSort(): void
 	protected function searchSubjectOnly(): void
 	{
 		// We do this to try and avoid duplicate keys on databases not supporting INSERT IGNORE.
-		$inserts = array();
+		$inserts = [];
 
-		foreach ($this->searchWords as $orIndex => $words)
-		{
-			$subject_query_params = array(
+		foreach ($this->searchWords as $orIndex => $words) {
+			$subject_query_params = [
 				'not_redirected' => 0,
 				'never_expires' => 0,
-			);
-			$subject_query = array(
+			];
+			$subject_query = [
 				'from' => '{db_prefix}topics AS t',
-				'inner_join' => array(),
-				'left_join' => array(),
-				'where' => array(
+				'inner_join' => [],
+				'left_join' => [],
+				'where' => [
 					't.id_redirect_topic = {int:not_redirected}',
-				    't.redirect_expires = {int:never_expires}',
-				),
-			);
+					't.redirect_expires = {int:never_expires}',
+				],
+			];
 
-			if (Config::$modSettings['postmod_active'])
+			if (Config::$modSettings['postmod_active']) {
 				$subject_query['where'][] = 't.approved = {int:is_approved}';
+			}
 
 			$numTables = 0;
 			$prev_join = 0;
 			$numSubjectResults = 0;
 
-			foreach ($words['subject_words'] as $subjectWord)
-			{
+			foreach ($words['subject_words'] as $subjectWord) {
 				$numTables++;
 
-				if (in_array($subjectWord, $this->excludedSubjectWords))
-				{
+				if (in_array($subjectWord, $this->excludedSubjectWords)) {
 					$subject_query['left_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.word ' . (empty(Config::$modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}') . ' AND subj' . $numTables . '.id_topic = t.id_topic)';
 
 					$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
-				}
-				else
-				{
+				} else {
 					$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 
 					$subject_query['where'][] = 'subj' . $numTables . '.word ' . (empty(Config::$modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}');
@@ -1543,58 +1515,58 @@ protected function searchSubjectOnly(): void
 				$subject_query_params['subject_words_' . $numTables . '_wild'] = '%' . $subjectWord . '%';
 			}
 
-			if (!empty($this->userQuery))
-			{
-				if ($subject_query['from'] != '{db_prefix}messages AS m')
-				{
+			if (!empty($this->userQuery)) {
+				if ($subject_query['from'] != '{db_prefix}messages AS m') {
 					$subject_query['inner_join'][] = '{db_prefix}messages AS m ON (m.id_topic = t.id_topic)';
 				}
 
 				$subject_query['where'][] = $this->userQuery;
 			}
 
-			if (!empty($this->params['topic']))
+			if (!empty($this->params['topic'])) {
 				$subject_query['where'][] = 't.id_topic = ' . $this->params['topic'];
+			}
 
-			if (!empty($this->minMsgID))
+			if (!empty($this->minMsgID)) {
 				$subject_query['where'][] = 't.id_first_msg >= ' . $this->minMsgID;
+			}
 
-			if (!empty($this->maxMsgID))
+			if (!empty($this->maxMsgID)) {
 				$subject_query['where'][] = 't.id_last_msg <= ' . $this->maxMsgID;
+			}
 
-			if (!empty($this->boardQuery))
+			if (!empty($this->boardQuery)) {
 				$subject_query['where'][] = 't.id_board ' . $this->boardQuery;
+			}
 
-			if (!empty($this->excludedPhrases))
-			{
-				if ($subject_query['from'] != '{db_prefix}messages AS m')
-				{
+			if (!empty($this->excludedPhrases)) {
+				if ($subject_query['from'] != '{db_prefix}messages AS m') {
 					$subject_query['inner_join']['m'] = '{db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)';
 				}
 
 				$count = 0;
 
-				foreach ($this->excludedPhrases as $phrase)
-				{
+				foreach ($this->excludedPhrases as $phrase) {
 					$subject_query['where'][] = 'm.subject NOT ' . $this->query_match_type . ' {string:excluded_phrases_' . $count . '}';
 
-					if ($this->query_match_type === 'RLIKE')
+					if ($this->query_match_type === 'RLIKE') {
 						$subject_query_params['excluded_phrases_' . $count++] = $this->wordBoundaryWrapper($this->escapeSqlRegex($phrase));
-					else
+					} else {
 						$subject_query_params['excluded_phrases_' . $count++] = '%' . Db::$db->escape_wildcard_string($phrase) . '%';
+					}
 				}
 			}
 
-			IntegrationHook::call('integrate_subject_only_search_query', array(&$subject_query, &$subject_query_params));
+			IntegrationHook::call('integrate_subject_only_search_query', [&$subject_query, &$subject_query_params]);
 
 			$relevance = '1000 * (';
 
-			foreach (self::$weight_factors as $type => $value)
-			{
+			foreach (self::$weight_factors as $type => $value) {
 				$relevance .= $this->weight[$type];
 
-				if (!empty($value['results']))
+				if (!empty($value['results'])) {
 					$relevance .= ' * ' . $value['results'];
+				}
 
 				$relevance .= ' + ';
 			}
@@ -1605,7 +1577,8 @@ protected function searchSubjectOnly(): void
 				INSERT IGNORE INTO {db_prefix}log_search_results
 					(id_search, id_topic, relevance, id_msg, num_matches)';
 
-			$ignoreRequest = Db::$db->search_query('insert_log_search_results_subject',
+			$ignoreRequest = Db::$db->search_query(
+				'insert_log_search_results_subject',
 				$ignore_clause . '
 				SELECT
 					{int:id_search},
@@ -1621,45 +1594,46 @@ protected function searchSubjectOnly(): void
 				WHERE ' . implode('
 					AND ', $subject_query['where']) . (empty(Config::$modSettings['search_max_results']) ? '' : '
 				LIMIT ' . (Config::$modSettings['search_max_results'] - $numSubjectResults)),
-				array_merge($subject_query_params, array(
+				array_merge($subject_query_params, [
 					'id_search' => $_SESSION['search_cache']['id_search'],
 					'min_msg' => $this->ageMinMsg,
 					'recent_message' => $this->ageMinMsg,
 					'huge_topic_posts' => $this->humungousTopicPosts,
 					'is_approved' => 1,
-				))
+				]),
 			);
 
 			// If the database doesn't support IGNORE to make this fast we need to do some tracking.
-			if (!Db::$db->support_ignore)
-			{
-				while ($row = Db::$db->fetch_row($ignoreRequest))
-				{
+			if (!Db::$db->support_ignore) {
+				while ($row = Db::$db->fetch_row($ignoreRequest)) {
 					// No duplicates!
-					if (isset($inserts[$row[1]]))
+					if (isset($inserts[$row[1]])) {
 						continue;
+					}
 
-					foreach ($row as $key => $value)
+					foreach ($row as $key => $value) {
 						$inserts[$row[1]][] = (int) $row[$key];
+					}
 				}
 				Db::$db->free_result($ignoreRequest);
 				$numSubjectResults = count($inserts);
-			}
-			else
+			} else {
 				$numSubjectResults += Db::$db->affected_rows();
+			}
 
-			if (!empty(Config::$modSettings['search_max_results']) && $numSubjectResults >= Config::$modSettings['search_max_results'])
+			if (!empty(Config::$modSettings['search_max_results']) && $numSubjectResults >= Config::$modSettings['search_max_results']) {
 				break;
+			}
 		}
 
 		// If there's data to be inserted for non-IGNORE databases do it here!
-		if (!empty($inserts))
-		{
-			Db::$db->insert('',
+		if (!empty($inserts)) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}log_search_results',
-				array('id_search' => 'int', 'id_topic' => 'int', 'relevance' => 'int', 'id_msg' => 'int', 'num_matches' => 'int'),
+				['id_search' => 'int', 'id_topic' => 'int', 'relevance' => 'int', 'id_msg' => 'int', 'num_matches' => 'int'],
 				$inserts,
-				array('id_search', 'id_topic')
+				['id_search', 'id_topic'],
 			);
 		}
 
@@ -1671,34 +1645,33 @@ protected function searchSubjectOnly(): void
 	 */
 	protected function searchSubjectAndMessage()
 	{
-		$main_query = array(
-			'select' => array(
+		$main_query = [
+			'select' => [
 				'id_search' => $_SESSION['search_cache']['id_search'],
 				'relevance' => '0',
-			),
-			'weights' => array(),
+			],
+			'weights' => [],
 			'from' => '{db_prefix}topics AS t',
-			'inner_join' => array(
-				'{db_prefix}messages AS m ON (m.id_topic = t.id_topic)'
-			),
-			'left_join' => array(),
-			'where' => array(
+			'inner_join' => [
+				'{db_prefix}messages AS m ON (m.id_topic = t.id_topic)',
+			],
+			'left_join' => [],
+			'where' => [
 				't.id_redirect_topic = {int:not_redirected}',
 				't.redirect_expires = {int:never_expires}',
-			),
-			'group_by' => array(),
-			'parameters' => array(
+			],
+			'group_by' => [],
+			'parameters' => [
 				'min_msg' => $this->ageMinMsg,
 				'recent_message' => $this->ageRecentMsg,
 				'huge_topic_posts' => $this->humungousTopicPosts,
 				'is_approved' => 1,
 				'not_redirected' => 0,
 				'never_expires' => 0,
-			),
-		);
+			],
+		];
 
-		if (empty($this->params['topic']) && empty($this->params['show_complete']))
-		{
+		if (empty($this->params['topic']) && empty($this->params['show_complete'])) {
 			$main_query['select']['id_topic'] = 't.id_topic';
 			$main_query['select']['id_msg'] = 'MAX(m.id_msg) AS id_msg';
 			$main_query['select']['num_matches'] = 'COUNT(*) AS num_matches';
@@ -1706,96 +1679,96 @@ protected function searchSubjectAndMessage()
 			$main_query['weights'] = self::$weight_factors;
 
 			$main_query['group_by'][] = 't.id_topic';
-		}
-		else
-		{
+		} else {
 			// This is outrageous!
 			$main_query['select']['id_topic'] = 'm.id_msg AS id_topic';
 			$main_query['select']['id_msg'] = 'm.id_msg';
 			$main_query['select']['num_matches'] = '1 AS num_matches';
 
-			$main_query['weights'] = array(
-				'age' => array(
+			$main_query['weights'] = [
+				'age' => [
 					'search' => '((m.id_msg - t.id_first_msg) / CASE WHEN t.id_last_msg = t.id_first_msg THEN 1 ELSE t.id_last_msg - t.id_first_msg END)',
-				),
-				'first_message' => array(
+				],
+				'first_message' => [
 					'search' => 'CASE WHEN m.id_msg = t.id_first_msg THEN 1 ELSE 0 END',
-				),
-			);
+				],
+			];
 
-			if (!empty($this->params['topic']))
-			{
+			if (!empty($this->params['topic'])) {
 				$main_query['where'][] = 't.id_topic = {int:topic}';
 				$main_query['parameters']['topic'] = $this->params['topic'];
 			}
 
-			if (!empty($this->params['show_complete']))
+			if (!empty($this->params['show_complete'])) {
 				$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+			}
 		}
 
 		// *** Get the subject results.
 		$numSubjectResults = 0;
 
-		if (empty($this->params['topic']))
-		{
-			$inserts = array();
+		if (empty($this->params['topic'])) {
+			$inserts = [];
 
 			// Create a temporary table to store some preliminary results in.
-			Db::$db->search_query('drop_tmp_log_search_topics', '
+			Db::$db->search_query(
+				'drop_tmp_log_search_topics',
+				'
 				DROP TABLE IF EXISTS {db_prefix}tmp_log_search_topics',
-				array(
-				)
+				[
+				],
 			);
 
-			$createTemporary = Db::$db->search_query('create_tmp_log_search_topics', '
+			$createTemporary = Db::$db->search_query(
+				'create_tmp_log_search_topics',
+				'
 				CREATE TEMPORARY TABLE {db_prefix}tmp_log_search_topics (
 					id_topic int NOT NULL default {string:string_zero},
 					PRIMARY KEY (id_topic)
 				) ENGINE=MEMORY',
-				array(
+				[
 					'string_zero' => '0',
-				)
+				],
 			) !== false;
 
 			// Clean up some previous cache.
-			if (!$createTemporary)
-			{
-				Db::$db->search_query('delete_log_search_topics', '
+			if (!$createTemporary) {
+				Db::$db->search_query(
+					'delete_log_search_topics',
+					'
 					DELETE FROM {db_prefix}log_search_topics
 					WHERE id_search = {int:search_id}',
-					array(
+					[
 						'search_id' => $_SESSION['search_cache']['id_search'],
-					)
+					],
 				);
 			}
 
-			foreach ($this->searchWords as $orIndex => $words)
-			{
-				$subject_query = array(
+			foreach ($this->searchWords as $orIndex => $words) {
+				$subject_query = [
 					'from' => '{db_prefix}topics AS t',
-					'inner_join' => array(),
-					'left_join' => array(),
-					'where' => array(
+					'inner_join' => [],
+					'left_join' => [],
+					'where' => [
 						't.id_redirect_topic = {int:not_redirected}',
 						't.redirect_expires = {int:never_expires}',
-					),
-					'params' => array(
+					],
+					'params' => [
 						'not_redirected' => 0,
 						'never_expires' => 0,
-					),
-				);
+					],
+				];
 
 				$numTables = 0;
 				$prev_join = 0;
 				$count = 0;
 				$excluded = false;
-				foreach ($words['subject_words'] as $subjectWord)
-				{
+
+				foreach ($words['subject_words'] as $subjectWord) {
 					$numTables++;
-					if (in_array($subjectWord, $this->excludedSubjectWords))
-					{
-						if (($subject_query['from'] != '{db_prefix}messages AS m') && !$excluded)
-						{
+
+					if (in_array($subjectWord, $this->excludedSubjectWords)) {
+						if (($subject_query['from'] != '{db_prefix}messages AS m') && !$excluded) {
 							$subject_query['inner_join']['m'] = '{db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)';
 							$excluded = true;
 						}
@@ -1808,17 +1781,12 @@ protected function searchSubjectAndMessage()
 
 						$subject_query['where'][] = 'm.body NOT ' . $this->query_match_type . ' {string:body_not_' . $count . '}';
 
-						if ($this->query_match_type === 'RLIKE')
-						{
+						if ($this->query_match_type === 'RLIKE') {
 							$subject_query['params']['body_not_' . $count++] = $this->wordBoundaryWrapper($this->escapeSqlRegex($subjectWord));
-						}
-						else
-						{
+						} else {
 							$subject_query['params']['body_not_' . $count++] = '%' . Db::$db->escape_wildcard_string($subjectWord) . '%';
 						}
-					}
-					else
-					{
+					} else {
 						$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 
 						$subject_query['where'][] = 'subj' . $numTables . '.word LIKE {string:subject_like_' . $count . '}';
@@ -1829,72 +1797,68 @@ protected function searchSubjectAndMessage()
 					}
 				}
 
-				if (!empty($this->userQuery))
-				{
-					if ($subject_query['from'] != '{db_prefix}messages AS m')
-					{
+				if (!empty($this->userQuery)) {
+					if ($subject_query['from'] != '{db_prefix}messages AS m') {
 						$subject_query['inner_join']['m'] = '{db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)';
 					}
 
 					$subject_query['where'][] = '{raw:user_query}';
 					$subject_query['params']['user_query'] = $this->userQuery;
 				}
-				if (!empty($this->params['topic']))
-				{
+
+				if (!empty($this->params['topic'])) {
 					$subject_query['where'][] = 't.id_topic = {int:topic}';
 					$subject_query['params']['topic'] = $this->params['topic'];
 				}
-				if (!empty($this->minMsgID))
-				{
+
+				if (!empty($this->minMsgID)) {
 					$subject_query['where'][] = 't.id_first_msg >= {int:min_msg_id}';
 					$subject_query['params']['min_msg_id'] = $this->minMsgID;
 				}
-				if (!empty($this->maxMsgID))
-				{
+
+				if (!empty($this->maxMsgID)) {
 					$subject_query['where'][] = 't.id_last_msg <= {int:max_msg_id}';
 					$subject_query['params']['max_msg_id'] = $this->maxMsgID;
 				}
-				if (!empty($this->boardQuery))
-				{
+
+				if (!empty($this->boardQuery)) {
 					$subject_query['where'][] = 't.id_board {raw:board_query}';
 					$subject_query['params']['board_query'] = $this->boardQuery;
 				}
-				if (!empty($this->excludedPhrases))
-				{
-					if ($subject_query['from'] != '{db_prefix}messages AS m')
-					{
+
+				if (!empty($this->excludedPhrases)) {
+					if ($subject_query['from'] != '{db_prefix}messages AS m') {
 						$subject_query['inner_join']['m'] = '{db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)';
 					}
 
 					$count = 0;
-					foreach ($this->excludedPhrases as $phrase)
-					{
+
+					foreach ($this->excludedPhrases as $phrase) {
 						$subject_query['where'][] = 'm.subject NOT ' . $this->query_match_type . ' {string:exclude_phrase_' . $count . '}';
 
 						$subject_query['where'][] = 'm.body NOT ' . $this->query_match_type . ' {string:exclude_phrase_' . $count . '}';
 
-						if ($this->query_match_type === 'RLIKE')
-						{
+						if ($this->query_match_type === 'RLIKE') {
 							$subject_query['params']['exclude_phrase_' . $count++] = $this->wordBoundaryWrapper($this->escapeSqlRegex($phrase));
-						}
-						else
-						{
+						} else {
 							$subject_query['params']['exclude_phrase_' . $count++] = '%' . Db::$db->escape_wildcard_string($phrase) . '%';
 						}
 					}
 				}
 
-				IntegrationHook::call('integrate_subject_search_query', array(&$subject_query));
+				IntegrationHook::call('integrate_subject_search_query', [&$subject_query]);
 
 				// Nothing to search for?
-				if (empty($subject_query['where']))
+				if (empty($subject_query['where'])) {
 					continue;
+				}
 
 				$ignore_clause = !Db::$db->support_ignore ? '' : '
 					INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
 						(' . ($createTemporary ? '' : 'id_search, ') . 'id_topic)';
 
-				$ignoreRequest = Db::$db->search_query('insert_log_search_topics',
+				$ignoreRequest = Db::$db->search_query(
+					'insert_log_search_topics',
 					$ignore_clause . '
 					SELECT ' . ($createTemporary ? '' : $_SESSION['search_cache']['id_search'] . ', ') . 't.id_topic
 					FROM ' . $subject_query['from'] . (empty($subject_query['inner_join']) ? '' : '
@@ -1905,105 +1869,103 @@ protected function searchSubjectAndMessage()
 					WHERE ' . implode('
 						AND ', $subject_query['where']) . (empty(Config::$modSettings['search_max_results']) ? '' : '
 					LIMIT ' . (Config::$modSettings['search_max_results'] - $numSubjectResults)),
-					$subject_query['params']
+					$subject_query['params'],
 				);
 
 				// Don't do INSERT IGNORE? Manually fix this up!
-				if (!Db::$db->support_ignore)
-				{
-					while ($row = Db::$db->fetch_row($ignoreRequest))
-					{
+				if (!Db::$db->support_ignore) {
+					while ($row = Db::$db->fetch_row($ignoreRequest)) {
 						$ind = $createTemporary ? 0 : 1;
 
 						// No duplicates!
-						if (isset($inserts[$row[$ind]]))
+						if (isset($inserts[$row[$ind]])) {
 							continue;
+						}
 
 						$inserts[$row[$ind]] = $row;
 					}
 					Db::$db->free_result($ignoreRequest);
 
 					$numSubjectResults = count($inserts);
-				}
-				else
-				{
+				} else {
 					$numSubjectResults += Db::$db->affected_rows();
 				}
 
-				if (!empty(Config::$modSettings['search_max_results']) && $numSubjectResults >= Config::$modSettings['search_max_results'])
-				{
+				if (!empty(Config::$modSettings['search_max_results']) && $numSubjectResults >= Config::$modSettings['search_max_results']) {
 					break;
 				}
 			}
 
 			// Got some non-MySQL data to plonk in?
-			if (!empty($inserts))
-			{
-				Db::$db->insert('',
+			if (!empty($inserts)) {
+				Db::$db->insert(
+					'',
 					('{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics'),
-					$createTemporary ? array('id_topic' => 'int') : array('id_search' => 'int', 'id_topic' => 'int'),
+					$createTemporary ? ['id_topic' => 'int'] : ['id_search' => 'int', 'id_topic' => 'int'],
 					$inserts,
-					$createTemporary ? array('id_topic') : array('id_search', 'id_topic')
+					$createTemporary ? ['id_topic'] : ['id_search', 'id_topic'],
 				);
 			}
 
-			if ($numSubjectResults !== 0)
-			{
+			if ($numSubjectResults !== 0) {
 				$main_query['weights']['subject']['search'] = 'CASE WHEN MAX(lst.id_topic) IS NULL THEN 0 ELSE 1 END';
 
 				$main_query['left_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics AS lst ON (' . ($createTemporary ? '' : 'lst.id_search = {int:id_search} AND ') . 'lst.id_topic = t.id_topic)';
 
-				if (!$createTemporary)
+				if (!$createTemporary) {
 					$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+				}
 			}
 		}
 
 		$indexedResults = 0;
 
 		// We building an index?
-		if ($this->supportsMethod('indexedWordQuery', $this->getQueryParams()))
-		{
-			$inserts = array();
+		if ($this->supportsMethod('indexedWordQuery', $this->getQueryParams())) {
+			$inserts = [];
 
-			Db::$db->search_query('drop_tmp_log_search_messages', '
+			Db::$db->search_query(
+				'drop_tmp_log_search_messages',
+				'
 				DROP TABLE IF EXISTS {db_prefix}tmp_log_search_messages',
-				array(
-				)
+				[
+				],
 			);
 
-			$createTemporary = Db::$db->search_query('create_tmp_log_search_messages', '
+			$createTemporary = Db::$db->search_query(
+				'create_tmp_log_search_messages',
+				'
 				CREATE TEMPORARY TABLE {db_prefix}tmp_log_search_messages (
 					id_msg int NOT NULL default {string:string_zero},
 					PRIMARY KEY (id_msg)
 				) ENGINE=MEMORY',
-				array(
+				[
 					'string_zero' => '0',
-				)
+				],
 			) !== false;
 
 			// Clear, all clear!
-			if (!$createTemporary)
-			{
-				Db::$db->search_query('delete_log_search_messages', '
+			if (!$createTemporary) {
+				Db::$db->search_query(
+					'delete_log_search_messages',
+					'
 					DELETE FROM {db_prefix}log_search_messages
 					WHERE id_search = {int:id_search}',
-					array(
+					[
 						'id_search' => $_SESSION['search_cache']['id_search'],
-					)
+					],
 				);
 			}
 
-			foreach ($this->searchWords as $orIndex => $words)
-			{
+			foreach ($this->searchWords as $orIndex => $words) {
 				// Search for this word, assuming we have some words!
-				if (!empty($words['indexed_words']))
-				{
+				if (!empty($words['indexed_words'])) {
 					// Variables required for the search.
-					$search_data = array(
+					$search_data = [
 						'insert_into' => ($createTemporary ? 'tmp_' : '') . 'log_search_messages',
 						'max_results' => $this->maxMessageResults,
 						'indexed_results' => $indexedResults,
-						'params' => array(
+						'params' => [
 							'id_search' => !$createTemporary ? $_SESSION['search_cache']['id_search'] : 0,
 							'excluded_words' => $this->excludedWords,
 							'user_query' => !empty($this->userQuery) ? $this->userQuery : '',
@@ -2011,153 +1973,135 @@ protected function searchSubjectAndMessage()
 							'topic' => !empty($this->params['topic']) ? $this->params['topic'] : 0,
 							'min_msg_id' => !empty($this->minMsgID) ? $this->minMsgID : 0,
 							'max_msg_id' => !empty($this->maxMsgID) ? $this->maxMsgID : 0,
-							'excluded_phrases' => !empty($this->excludedPhrases) ? $this->excludedPhrases : array(),
-							'excluded_index_words' => !empty($this->excludedIndexWords) ? $this->excludedIndexWords : array(),
-							'excluded_subject_words' => !empty($this->excludedSubjectWords) ? $this->excludedSubjectWords : array(),
-						),
-					);
+							'excluded_phrases' => !empty($this->excludedPhrases) ? $this->excludedPhrases : [],
+							'excluded_index_words' => !empty($this->excludedIndexWords) ? $this->excludedIndexWords : [],
+							'excluded_subject_words' => !empty($this->excludedSubjectWords) ? $this->excludedSubjectWords : [],
+						],
+					];
 
 					$ignoreRequest = $this->indexedWordQuery($words, $search_data);
 
-					if (!Db::$db->support_ignore)
-					{
-						while ($row = Db::$db->fetch_row($ignoreRequest))
-						{
+					if (!Db::$db->support_ignore) {
+						while ($row = Db::$db->fetch_row($ignoreRequest)) {
 							// No duplicates!
-							if (isset($inserts[$row[0]]))
+							if (isset($inserts[$row[0]])) {
 								continue;
+							}
 
 							$inserts[$row[0]] = $row;
 						}
 						Db::$db->free_result($ignoreRequest);
 
 						$indexedResults = count($inserts);
-					}
-					else
-					{
+					} else {
 						$indexedResults += Db::$db->affected_rows();
 					}
 
-					if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults)
+					if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults) {
 						break;
+					}
 				}
 			}
 
 			// More non-MySQL stuff needed?
-			if (!empty($inserts))
-			{
-				Db::$db->insert('',
+			if (!empty($inserts)) {
+				Db::$db->insert(
+					'',
 					'{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_messages',
-					$createTemporary ? array('id_msg' => 'int') : array('id_msg' => 'int', 'id_search' => 'int'),
+					$createTemporary ? ['id_msg' => 'int'] : ['id_msg' => 'int', 'id_search' => 'int'],
 					$inserts,
-					$createTemporary ? array('id_msg') : array('id_msg', 'id_search')
+					$createTemporary ? ['id_msg'] : ['id_msg', 'id_search'],
 				);
 			}
 
-			if (empty($indexedResults) && empty($numSubjectResults) && !empty(Config::$modSettings['search_force_index']))
-			{
+			if (empty($indexedResults) && empty($numSubjectResults) && !empty(Config::$modSettings['search_force_index'])) {
 				$this->errors['query_not_specific_enough'] = true;
 				$_REQUEST['params'] = $this->compressParams();
 				Search::call();
+
 				return;
 			}
-			elseif (!empty($indexedResults))
-			{
+
+			if (!empty($indexedResults)) {
 				$main_query['inner_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_messages AS lsm ON (lsm.id_msg = m.id_msg)';
 
-				if (!$createTemporary)
-				{
+				if (!$createTemporary) {
 					$main_query['where'][] = 'lsm.id_search = {int:id_search}';
 					$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
 				}
 			}
 		}
 		// Not using an index? All conditions have to be carried over.
-		else
-		{
-			$orWhere = array();
+		else {
+			$orWhere = [];
 			$count = 0;
-			foreach ($this->searchWords as $orIndex => $words)
-			{
-				$where = array();
-				foreach ($words['all_words'] as $regularWord)
-				{
-					if (in_array($regularWord, $this->excludedWords))
-					{
+
+			foreach ($this->searchWords as $orIndex => $words) {
+				$where = [];
+
+				foreach ($words['all_words'] as $regularWord) {
+					if (in_array($regularWord, $this->excludedWords)) {
 						$where[] = 'm.subject NOT ' . $this->query_match_type . ' {string:all_word_body_' . $count . '}';
 						$where[] = 'm.body NOT ' . $this->query_match_type . ' {string:all_word_body_' . $count . '}';
-					}
-					else
-					{
+					} else {
 						$where[] = 'm.body ' . $this->query_match_type . ' {string:all_word_body_' . $count . '}';
 					}
 
-					if ($this->query_match_type === 'RLIKE')
-					{
+					if ($this->query_match_type === 'RLIKE') {
 						$main_query['parameters']['all_word_body_' . $count++] = $this->wordBoundaryWrapper($this->escapeSqlRegex($regularWord));
-					}
-					else
-					{
+					} else {
 						$main_query['parameters']['all_word_body_' . $count++] = '%' . Db::$db->escape_wildcard_string($regularWord) . '%';
 					}
 				}
 
-				if (!empty($where))
-				{
+				if (!empty($where)) {
 					$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
 				}
 			}
 
-			if (!empty($orWhere))
-			{
+			if (!empty($orWhere)) {
 				$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 			}
 
-			if (!empty($this->userQuery))
-			{
+			if (!empty($this->userQuery)) {
 				$main_query['where'][] = '{raw:user_query}';
 				$main_query['parameters']['user_query'] = $this->userQuery;
 			}
 
-			if (!empty($this->params['topic']))
-			{
+			if (!empty($this->params['topic'])) {
 				$main_query['where'][] = 'm.id_topic = {int:topic}';
 				$main_query['parameters']['topic'] = $this->params['topic'];
 			}
 
-			if (!empty($this->minMsgID))
-			{
+			if (!empty($this->minMsgID)) {
 				$main_query['where'][] = 'm.id_msg >= {int:min_msg_id}';
 				$main_query['parameters']['min_msg_id'] = $this->minMsgID;
 			}
 
-			if (!empty($this->maxMsgID))
-			{
+			if (!empty($this->maxMsgID)) {
 				$main_query['where'][] = 'm.id_msg <= {int:max_msg_id}';
 				$main_query['parameters']['max_msg_id'] = $this->maxMsgID;
 			}
 
-			if (!empty($this->boardQuery))
-			{
+			if (!empty($this->boardQuery)) {
 				$main_query['where'][] = 'm.id_board {raw:board_query}';
 				$main_query['parameters']['board_query'] = $this->boardQuery;
 			}
 		}
 
-		IntegrationHook::call('integrate_main_search_query', array(&$main_query));
+		IntegrationHook::call('integrate_main_search_query', [&$main_query]);
 
 		// Did we either get some indexed results, or otherwise did not do an indexed query?
-		if (!empty($indexedResults) || !$this->supportsMethod('indexedWordQuery', $this->getQueryParams()))
-		{
+		if (!empty($indexedResults) || !$this->supportsMethod('indexedWordQuery', $this->getQueryParams())) {
 			$relevance = '1000 * (';
 			$new_weight_total = 0;
 
-			foreach ($main_query['weights'] as $type => $value)
-			{
+			foreach ($main_query['weights'] as $type => $value) {
 				$relevance .= $this->weight[$type];
 
-				if (!empty($value['search']))
+				if (!empty($value['search'])) {
 					$relevance .= ' * ' . $value['search'];
+				}
 
 				$relevance .= ' + ';
 				$new_weight_total += $this->weight[$type];
@@ -2169,7 +2113,8 @@ protected function searchSubjectAndMessage()
 				INSERT IGNORE INTO ' . '{db_prefix}log_search_results
 					(' . implode(', ', array_keys($main_query['select'])) . ')') : '';
 
-			$ignoreRequest = Db::$db->search_query('insert_log_search_results_no_index',
+			$ignoreRequest = Db::$db->search_query(
+				'insert_log_search_results_no_index',
 				$ignore_clause . '
 				SELECT
 					' . implode(',
@@ -2183,74 +2128,73 @@ protected function searchSubjectAndMessage()
 					AND ', $main_query['where']) . (empty($main_query['group_by']) ? '' : '
 				GROUP BY ' . implode(', ', $main_query['group_by'])) . (empty(Config::$modSettings['search_max_results']) ? '' : '
 				LIMIT ' . Config::$modSettings['search_max_results']),
-				$main_query['parameters']
+				$main_query['parameters'],
 			);
 
 			// We love to handle non-good databases that don't support our ignore!
-			if (!Db::$db->support_ignore)
-			{
-				$inserts = array();
+			if (!Db::$db->support_ignore) {
+				$inserts = [];
 
-				while ($row = Db::$db->fetch_row($ignoreRequest))
-				{
+				while ($row = Db::$db->fetch_row($ignoreRequest)) {
 					// No duplicates!
-					if (isset($inserts[$row[2]]))
+					if (isset($inserts[$row[2]])) {
 						continue;
+					}
 
-					foreach ($row as $key => $value)
+					foreach ($row as $key => $value) {
 						$inserts[$row[2]][] = (int) $row[$key];
+					}
 				}
 				Db::$db->free_result($ignoreRequest);
 
 				// Now put them in!
-				if (!empty($inserts))
-				{
-					$query_columns = array();
+				if (!empty($inserts)) {
+					$query_columns = [];
 
-					foreach ($main_query['select'] as $k => $v)
+					foreach ($main_query['select'] as $k => $v) {
 						$query_columns[$k] = 'int';
+					}
 
-					Db::$db->insert('',
+					Db::$db->insert(
+						'',
 						'{db_prefix}log_search_results',
 						$query_columns,
 						$inserts,
-						array('id_search', 'id_topic')
+						['id_search', 'id_topic'],
 					);
 				}
 
 				$_SESSION['search_cache']['num_results'] += count($inserts);
-			}
-			else
-			{
+			} else {
 				$_SESSION['search_cache']['num_results'] = Db::$db->affected_rows();
 			}
 		}
 
 		// Insert subject-only matches.
-		if ($_SESSION['search_cache']['num_results'] < Config::$modSettings['search_max_results'] && $numSubjectResults !== 0)
-		{
+		if ($_SESSION['search_cache']['num_results'] < Config::$modSettings['search_max_results'] && $numSubjectResults !== 0) {
 			$relevance = '1000 * (';
 
-			foreach (self::$weight_factors as $type => $value)
-			{
-				if (isset($value['results']))
-				{
+			foreach (self::$weight_factors as $type => $value) {
+				if (isset($value['results'])) {
 					$relevance .= $this->weight[$type];
-					if (!empty($value['results']))
+
+					if (!empty($value['results'])) {
 						$relevance .= ' * ' . $value['results'];
+					}
 					$relevance .= ' + ';
 				}
 			}
 
 			$relevance = substr($relevance, 0, -3) . ') / ' . $this->weight_total . ' AS relevance';
 
-			$usedIDs = array_flip(empty($inserts) ? array() : array_keys($inserts));
+			$usedIDs = array_flip(empty($inserts) ? [] : array_keys($inserts));
 
 			$ignore_clause = Db::$db->support_ignore ? ('
 				INSERT IGNORE INTO {db_prefix}log_search_results
 					(id_search, id_topic, relevance, id_msg, num_matches)') : '';
 
-			$ignoreRequest = Db::$db->search_query('insert_log_search_results_sub_only',
+			$ignoreRequest = Db::$db->search_query(
+				'insert_log_search_results_sub_only',
 				$ignore_clause . '
 				SELECT
 					{int:id_search},
@@ -2263,24 +2207,23 @@ protected function searchSubjectAndMessage()
 				. ($createTemporary ? '' : ' WHERE lst.id_search = {int:id_search}')
 				. (empty(Config::$modSettings['search_max_results']) ? '' : '
 				LIMIT ' . (Config::$modSettings['search_max_results'] - $_SESSION['search_cache']['num_results'])),
-				array(
+				[
 					'id_search' => $_SESSION['search_cache']['id_search'],
 					'min_msg' => $this->ageMinMsg,
 					'recent_message' => $this->ageRecentMsg,
 					'huge_topic_posts' => $this->humungousTopicPosts,
-				)
+				],
 			);
 
 			// Once again need to do the inserts if the database don't support ignore!
-			if (!Db::$db->support_ignore)
-			{
-				$inserts = array();
+			if (!Db::$db->support_ignore) {
+				$inserts = [];
 
-				while ($row = Db::$db->fetch_row($ignoreRequest))
-				{
+				while ($row = Db::$db->fetch_row($ignoreRequest)) {
 					// No duplicates!
-					if (isset($usedIDs[$row[1]]))
+					if (isset($usedIDs[$row[1]])) {
 						continue;
+					}
 
 					$usedIDs[$row[1]] = true;
 					$inserts[] = $row;
@@ -2288,32 +2231,29 @@ protected function searchSubjectAndMessage()
 				Db::$db->free_result($ignoreRequest);
 
 				// Now put them in!
-				if (!empty($inserts))
-				{
-					Db::$db->insert('',
+				if (!empty($inserts)) {
+					Db::$db->insert(
+						'',
 						'{db_prefix}log_search_results',
-						array('id_search' => 'int', 'id_topic' => 'int', 'relevance' => 'float', 'id_msg' => 'int', 'num_matches' => 'int'),
+						['id_search' => 'int', 'id_topic' => 'int', 'relevance' => 'float', 'id_msg' => 'int', 'num_matches' => 'int'],
 						$inserts,
-						array('id_search', 'id_topic')
+						['id_search', 'id_topic'],
 					);
 				}
 
 				$_SESSION['search_cache']['num_results'] += count($inserts);
-			}
-			else
-			{
+			} else {
 				$_SESSION['search_cache']['num_results'] += Db::$db->affected_rows();
 			}
-		}
-		elseif ($_SESSION['search_cache']['num_results'] == -1)
-		{
+		} elseif ($_SESSION['search_cache']['num_results'] == -1) {
 			$_SESSION['search_cache']['num_results'] = 0;
 		}
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SearchApi::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SearchApi::exportStatic')) {
 	SearchApi::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Search/SearchApiInterface.php b/Sources/Search/SearchApiInterface.php
index ad4522cf26..b049de8128 100644
--- a/Sources/Search/SearchApiInterface.php
+++ b/Sources/Search/SearchApiInterface.php
@@ -25,17 +25,15 @@ interface SearchApiInterface
 	 * The operations are the functions listed in the interface, if not supported
 	 * they need not be declared
 	 *
-	 * @access public
 	 * @param string $methodName The method
 	 * @param array $query_params Any parameters for the query
-	 * @return boolean Whether or not the specified method is supported
+	 * @return bool Whether or not the specified method is supported
 	 */
-	public function supportsMethod($methodName, $query_params = array()): bool;
+	public function supportsMethod($methodName, $query_params = []): bool;
 
 	/**
 	 * Whether this method is valid for implementation or not.
 	 *
-	 * @access public
 	 * @return bool Whether or not this method is valid
 	 */
 	public function isValid(): bool;
@@ -45,7 +43,6 @@ public function isValid(): bool;
 	 * the order of sorting is: large words, small words, large words that
 	 * are excluded from the search, small words that are excluded.
 	 *
-	 * @access public
 	 * @param string $a Word A
 	 * @param string $b Word B
 	 * @return int An integer indicating how the words should be sorted
@@ -55,7 +52,6 @@ public function searchSort($a, $b): int;
 	/**
 	 * Callback while preparing indexes for searching.
 	 *
-	 * @access public
 	 * @param string $word A word to index
 	 * @param array $wordsSearch Search words
 	 * @param array $wordsExclude Words to exclude
@@ -66,7 +62,6 @@ public function prepareIndexes($word, array &$wordsSearch, array &$wordsExclude,
 	/**
 	 * Search for indexed words.
 	 *
-	 * @access public
 	 * @param array $words An array of words
 	 * @param array $search_data An array of search data
 	 * @return mixed
@@ -78,11 +73,9 @@ public function indexedWordQuery(array $words, array $search_data);
 	 *
 	 * @see Msg::create()
 	 *
-	 * @access public
 	 * @param array $msgOptions An array of post data
 	 * @param array $topicOptions An array of topic data
 	 * @param array $posterOptions An array of info about the person who made this post
-	 * @return void
 	 */
 	public function postCreated(array &$msgOptions, array &$topicOptions, array &$posterOptions): void;
 
@@ -91,39 +84,31 @@ public function postCreated(array &$msgOptions, array &$topicOptions, array &$po
 	 *
 	 * @see Msg::modify()
 	 *
-	 * @access public
 	 * @param array $msgOptions An array of post data
 	 * @param array $topicOptions An array of topic data
 	 * @param array $posterOptions An array of info about the person who made this post
-	 * @return void
 	 */
 	public function postModified(array &$msgOptions, array &$topicOptions, array &$posterOptions): void;
 
 	/**
 	 * Callback when a post is removed.
 	 *
-	 * @access public
 	 * @param int $id_msg The ID of the post that was removed
-	 * @return void
 	 */
 	public function postRemoved($id_msg): void;
 
 	/**
 	 * Callback when a topic is removed.
 	 *
-	 * @access public
 	 * @param array $topics The ID(s) of the removed topic(s)
-	 * @return void
 	 */
 	public function topicsRemoved(array $topics): void;
 
 	/**
 	 * Callback when a topic is moved.
 	 *
-	 * @access public
 	 * @param array $topics The ID(s) of the moved topic(s)
 	 * @param int $board_to The board that the topics were moved to
-	 * @return void
 	 */
 	public function topicsMoved(array $topics, $board_to): void;
 
@@ -133,7 +118,6 @@ public function topicsMoved(array $topics, $board_to): void;
 	 * This is separate from the constructor because there are a number of other
 	 * places where the search API will be loaded for other purposes.
 	 *
-	 * @return void
 	 */
 	public function initializeSearch(): void;
 
@@ -143,7 +127,6 @@ public function initializeSearch(): void;
 	 * All of the arguments for this method are deprecated as of SMF 3.0.
 	 * The relevant data is directly accessible in the properties of SearchApi.
 	 *
-	 * @access public
 	 * @param array $query_params An array of parameters for the query
 	 * @param array $searchWords The words that were searched for
 	 * @param array $excludedIndexWords Indexed words that should be excluded
@@ -156,7 +139,6 @@ public function searchQuery(array $query_params, array $searchWords, array $excl
 	/**
 	 * Figures out which search result topics the user participated in.
 	 *
-	 * @return void
 	 */
 	public function setParticipants(): void;
 
diff --git a/Sources/Search/SearchResult.php b/Sources/Search/SearchResult.php
index e684085e6e..11067f2fde 100644
--- a/Sources/Search/SearchResult.php
+++ b/Sources/Search/SearchResult.php
@@ -16,13 +16,13 @@
 use SMF\BackwardCompatibility;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IP;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\Time;
 use SMF\User;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  *
@@ -36,13 +36,11 @@ class SearchResult extends \SMF\Msg
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'get' => false,
-			'getNumResults' => false,
-			'setBoardsCan' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'highlight' => 'highlight',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -169,7 +167,7 @@ class SearchResult extends \SMF\Msg
 	 *
 	 * Permissions this user has in the boards containing the search results.
 	 */
-	public static array $boards_can = array();
+	public static array $boards_can = [];
 
 	/****************
 	 * Public methods
@@ -182,7 +180,7 @@ class SearchResult extends \SMF\Msg
 	 * @param array $format_options Options to control output. (Currently ignored.)
 	 * @return array A copy of $this->formatted.
 	 */
-	public function format(int $counter = 0, array $format_options = array()): array
+	public function format(int $counter = 0, array $format_options = []): array
 	{
 		// Can't have an empty subject can we?
 		$this->subject = $this->subject != '' ? $this->subject : Lang::$txt['no_subject'];
@@ -191,17 +189,16 @@ public function format(int $counter = 0, array $format_options = array()): array
 		$this->last_subject = $this->last_subject != '' ? $this->last_subject : Lang::$txt['no_subject'];
 
 		// If it couldn't load, or the user was a guest.... someday may be done with a guest table.
-		if (empty($this->id_member) || !isset(User::$loaded[$this->id_member]))
-		{
+		if (empty($this->id_member) || !isset(User::$loaded[$this->id_member])) {
 			// Notice this information isn't used anywhere else.... *cough guest table cough*.
 			$author['name'] = $this->poster_name;
 			$author['id'] = 0;
 			$author['group'] = Lang::$txt['guest_title'];
 			$author['link'] = $this->poster_name;
 			$author['email'] = $this->poster_email;
-		}
-		else
+		} else {
 			$author = User::$loaded[$this->id_member]->format(true);
+		}
 
 		$author['ip'] = new IP($this->poster_ip);
 
@@ -213,45 +210,44 @@ public function format(int $counter = 0, array $format_options = array()): array
 		Lang::censorText($this->last_subject);
 
 		// Shorten this message if necessary.
-		if (!SearchApi::$loadedApi->params['show_complete'])
-		{
+		if (!SearchApi::$loadedApi->params['show_complete']) {
 			// Set the number of characters before and after the searched keyword.
 			$charLimit = 50;
 
-			$this->body = strtr($this->body, array("\n" => ' ', '<br>' => "\n", '<br/>' => "\n", '<br />' => "\n"));
+			$this->body = strtr($this->body, ["\n" => ' ', '<br>' => "\n", '<br/>' => "\n", '<br />' => "\n"]);
 			$this->body = BBCodeParser::load()->parse($this->body, $this->smileys_enabled, $this->id_msg);
-			$this->body = strip_tags(strtr($this->body, array('</div>' => '<br>', '</li>' => '<br>')), '<br>');
+			$this->body = strip_tags(strtr($this->body, ['</div>' => '<br>', '</li>' => '<br>']), '<br>');
 
-			if (Utils::entityStrlen($this->body) > $charLimit)
-			{
-				if (empty(SearchApi::$loadedApi->searchArray))
+			if (Utils::entityStrlen($this->body) > $charLimit) {
+				if (empty(SearchApi::$loadedApi->searchArray)) {
 					$this->body = Utils::entitySubstr($this->body, 0, $charLimit) . '<strong>...</strong>';
-				else
-				{
+				} else {
 					$matchString = '';
 					$force_partial_word = false;
-					foreach (SearchApi::$loadedApi->searchArray as $keyword)
-					{
+
+					foreach (SearchApi::$loadedApi->searchArray as $keyword) {
 						$keyword = Utils::htmlspecialcharsDecode($keyword);
-						$keyword = Utils::sanitizeEntities(Utils::entityFix(strtr($keyword, array('\\\'' => '\'', '&' => '&amp;'))));
+						$keyword = Utils::sanitizeEntities(Utils::entityFix(strtr($keyword, ['\\\'' => '\'', '&' => '&amp;'])));
 
-						if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0)
+						if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword)) {
 							$force_partial_word = true;
-						$matchString .= strtr(preg_quote($keyword, '/'), array('\*' => '.+?')) . '|';
+						}
+						$matchString .= strtr(preg_quote($keyword, '/'), ['\\*' => '.+?']) . '|';
 					}
 					$matchString = Utils::htmlspecialcharsDecode(substr($matchString, 0, -1));
 
-					$this->body = Utils::htmlspecialcharsDecode(strtr($this->body, array('&nbsp;' => ' ', '<br>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#58;' => ':', '&#64;' => '@')));
+					$this->body = Utils::htmlspecialcharsDecode(strtr($this->body, ['&nbsp;' => ' ', '<br>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#58;' => ':', '&#64;' => '@']));
 
-					if (empty(Config::$modSettings['search_method']) || $force_partial_word)
+					if (empty(Config::$modSettings['search_method']) || $force_partial_word) {
 						preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . (Utils::$context['utf8'] ? 'u' : ''), $this->body, $matches);
-					else
+					} else {
 						preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . (Utils::$context['utf8'] ? 'u' : ''), $this->body, $matches);
+					}
 
 					$this->body = '';
-					foreach ($matches[0] as $index => $match)
-					{
-						$match = strtr(Utils::htmlspecialchars($match, ENT_QUOTES), array("\n" => '&nbsp;'));
+
+					foreach ($matches[0] as $index => $match) {
+						$match = strtr(Utils::htmlspecialchars($match, ENT_QUOTES), ["\n" => '&nbsp;']);
 						$this->body .= '<strong>......</strong>&nbsp;' . $match . '&nbsp;<strong>......</strong>';
 					}
 				}
@@ -261,9 +257,7 @@ public function format(int $counter = 0, array $format_options = array()): array
 			}
 			$this->subject_highlighted = self::highlight($this->subject, SearchApi::$loadedApi->searchArray);
 			$this->body_highlighted = self::highlight($this->body, SearchApi::$loadedApi->searchArray);
-		}
-		else
-		{
+		} else {
 			// Run BBC interpreter on the message.
 			$this->body = BBCodeParser::load()->parse($this->body, $this->smileys_enabled, $this->id_msg);
 
@@ -274,31 +268,37 @@ public function format(int $counter = 0, array $format_options = array()): array
 		// Make sure we don't end up with a practically empty message body.
 		$this->body = preg_replace('~^(?:&nbsp;)+$~', '', $this->body);
 
-		if (!empty($recycle_board) && $this->id_board == $recycle_board)
-		{
+		if (!empty($recycle_board) && $this->id_board == $recycle_board) {
 			$this->first_icon = 'recycled';
 			$this->last_icon = 'recycled';
 			$this->icon = 'recycled';
 		}
 
 		// Sadly, we need to check the icon ain't broke.
-		if (!empty(Config::$modSettings['messageIconChecks_enable']))
-		{
-			if (!isset(Utils::$context['icon_sources'][$this->first_icon]))
+		if (!empty(Config::$modSettings['messageIconChecks_enable'])) {
+			if (!isset(Utils::$context['icon_sources'][$this->first_icon])) {
 				Utils::$context['icon_sources'][$this->first_icon] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $this->first_icon . '.png') ? 'images_url' : 'default_images_url';
-			if (!isset(Utils::$context['icon_sources'][$this->last_icon]))
+			}
+
+			if (!isset(Utils::$context['icon_sources'][$this->last_icon])) {
 				Utils::$context['icon_sources'][$this->last_icon] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $this->last_icon . '.png') ? 'images_url' : 'default_images_url';
-			if (!isset(Utils::$context['icon_sources'][$this->icon]))
+			}
+
+			if (!isset(Utils::$context['icon_sources'][$this->icon])) {
 				Utils::$context['icon_sources'][$this->icon] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $this->icon . '.png') ? 'images_url' : 'default_images_url';
-		}
-		else
-		{
-			if (!isset(Utils::$context['icon_sources'][$this->first_icon]))
+			}
+		} else {
+			if (!isset(Utils::$context['icon_sources'][$this->first_icon])) {
 				Utils::$context['icon_sources'][$this->first_icon] = 'images_url';
-			if (!isset(Utils::$context['icon_sources'][$this->last_icon]))
+			}
+
+			if (!isset(Utils::$context['icon_sources'][$this->last_icon])) {
 				Utils::$context['icon_sources'][$this->last_icon] = 'images_url';
-			if (!isset(Utils::$context['icon_sources'][$this->icon]))
+			}
+
+			if (!isset(Utils::$context['icon_sources'][$this->icon])) {
 				Utils::$context['icon_sources'][$this->icon] = 'images_url';
+			}
 		}
 
 		// Do we have quote tag enabled?
@@ -308,14 +308,16 @@ public function format(int $counter = 0, array $format_options = array()): array
 		$colorClass = 'windowbg';
 
 		// Sticky topics should get a different color, too.
-		if ($this->is_sticky)
+		if ($this->is_sticky) {
 			$colorClass .= ' sticky';
+		}
 
 		// Locked topics get special treatment as well.
-		if ($this->locked)
+		if ($this->locked) {
 			$colorClass .= ' locked';
+		}
 
-		$output = array_merge(SearchApi::$loadedApi->results[$this->id_msg], array(
+		$output = array_merge(SearchApi::$loadedApi->results[$this->id], [
 			'id' => $this->id_topic,
 			'is_sticky' => !empty($this->is_sticky),
 			'is_locked' => !empty($this->locked),
@@ -326,7 +328,7 @@ public function format(int $counter = 0, array $format_options = array()): array
 			'replies' => $this->num_replies,
 			'can_reply' => in_array($this->id_board, self::$boards_can['post_reply_any']) || in_array(0, self::$boards_can['post_reply_any']),
 			'can_quote' => (in_array($this->id_board, self::$boards_can['post_reply_any']) || in_array(0, self::$boards_can['post_reply_any'])) && $quote_enabled,
-			'first_post' => array(
+			'first_post' => [
 				'id' => $this->first_msg,
 				'time' => Time::create('@' . $this->first_poster_time)->format(),
 				'timestamp' => $this->first_poster_time,
@@ -335,14 +337,14 @@ public function format(int $counter = 0, array $format_options = array()): array
 				'link' => '<a href="' . Config::$scripturl . '?topic=' . $this->id_topic . '.0">' . $this->first_subject . '</a>',
 				'icon' => $this->first_icon,
 				'icon_url' => Theme::$current->settings[Utils::$context['icon_sources'][$this->first_icon]] . '/post/' . $this->first_icon . '.png',
-				'member' => array(
+				'member' => [
 					'id' => $this->first_member_id,
 					'name' => $this->first_member_name,
 					'href' => !empty($this->first_member_id) ? Config::$scripturl . '?action=profile;u=' . $this->first_member_id : '',
-					'link' => !empty($this->first_member_id) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->first_member_id . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $this->first_member_name) . '">' . $this->first_member_name . '</a>' : $this->first_member_name
-				)
-			),
-			'last_post' => array(
+					'link' => !empty($this->first_member_id) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->first_member_id . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $this->first_member_name) . '">' . $this->first_member_name . '</a>' : $this->first_member_name,
+				],
+			],
+			'last_post' => [
 				'id' => $this->last_msg,
 				'time' => Time::create('@' . $this->last_poster_time)->format(),
 				'timestamp' => $this->last_poster_time,
@@ -351,30 +353,30 @@ public function format(int $counter = 0, array $format_options = array()): array
 				'link' => '<a href="' . Config::$scripturl . '?topic=' . $this->id_topic . ($this->num_replies == 0 ? '.0' : '.msg' . $this->last_msg) . '#msg' . $this->last_msg . '">' . $this->last_subject . '</a>',
 				'icon' => $this->last_icon,
 				'icon_url' => Theme::$current->settings[Utils::$context['icon_sources'][$this->last_icon]] . '/post/' . $this->last_icon . '.png',
-				'member' => array(
+				'member' => [
 					'id' => $this->last_member_id,
 					'name' => $this->last_member_name,
 					'href' => !empty($this->last_member_id) ? Config::$scripturl . '?action=profile;u=' . $this->last_member_id : '',
-					'link' => !empty($this->last_member_id) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->last_member_id . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $this->last_member_name) . '">' . $this->last_member_name . '</a>' : $this->last_member_name
-				)
-			),
-			'board' => array(
+					'link' => !empty($this->last_member_id) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->last_member_id . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $this->last_member_name) . '">' . $this->last_member_name . '</a>' : $this->last_member_name,
+				],
+			],
+			'board' => [
 				'id' => $this->id_board,
 				'name' => $this->board_name,
 				'href' => Config::$scripturl . '?board=' . $this->id_board . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?board=' . $this->id_board . '.0">' . $this->board_name . '</a>'
-			),
-			'category' => array(
+				'link' => '<a href="' . Config::$scripturl . '?board=' . $this->id_board . '.0">' . $this->board_name . '</a>',
+			],
+			'category' => [
 				'id' => $this->id_cat,
 				'name' => $this->cat_name,
 				'href' => Config::$scripturl . '#c' . $this->id_cat,
-				'link' => '<a href="' . Config::$scripturl . '#c' . $this->id_cat . '">' . $this->cat_name . '</a>'
-			),
-		));
+				'link' => '<a href="' . Config::$scripturl . '#c' . $this->id_cat . '">' . $this->cat_name . '</a>',
+			],
+		]);
 
-		$output['matches'][] = array(
+		$output['matches'][] = [
 			'id' => $this->id_msg,
-			'attachment' => array(),
+			'attachment' => [],
 			'member' => &$author,
 			'icon' => $this->icon,
 			'icon_url' => Theme::$current->settings[Utils::$context['icon_sources'][$this->icon]] . '/post/' . $this->icon . '.png',
@@ -383,15 +385,15 @@ public function format(int $counter = 0, array $format_options = array()): array
 			'time' => Time::create('@' . $this->poster_time)->format(),
 			'timestamp' => $this->poster_time,
 			'counter' => $counter,
-			'modified' => array(
+			'modified' => [
 				'time' => Time::create('@' . $this->modified_time)->format(),
 				'timestamp' => $this->modified_time,
-				'name' => $this->modified_name
-			),
+				'name' => $this->modified_name,
+			],
 			'body' => $this->body,
 			'body_highlighted' => $this->body_highlighted,
-			'start' => 'msg' . $this->id_msg
-		);
+			'start' => 'msg' . $this->id_msg,
+		];
 
 		return $output;
 	}
@@ -407,20 +409,20 @@ public function format(int $counter = 0, array $format_options = array()): array
 	 * @param array $query_customizations Customizations to the SQL query.
 	 * @return Generator<array> Iterating over result gives SearchResult instances.
 	 */
-	public static function get($ids, array $query_customizations = array())
+	public static function get($ids, array $query_customizations = [])
 	{
-		$selects = $query_customizations['selects'] ?? array(
+		$selects = $query_customizations['selects'] ?? [
 			'm.*',
 			't.*',
 			'first_m.id_msg AS first_msg',
 			'first_m.subject AS first_subject',
 			'first_m.icon AS first_icon',
 			'first_m.poster_time AS first_poster_time',
-			'first_mem.id_member AS first_member_id',
+			'COALESCE(first_mem.id_member, 0) AS first_member_id',
 			'COALESCE(first_mem.real_name, first_m.poster_name) AS first_member_name',
 			'last_m.id_msg AS last_msg',
 			'last_m.poster_time AS last_poster_time',
-			'last_mem.id_member AS last_member_id',
+			'COALESCE(last_mem.id_member, 0) AS last_member_id',
 			'COALESCE(last_mem.real_name, last_m.poster_name) AS last_member_name',
 			'last_m.icon AS last_icon',
 			'last_m.subject AS last_subject',
@@ -428,9 +430,9 @@ public static function get($ids, array $query_customizations = array())
 			'b.name AS board_name',
 			'c.id_cat',
 			'c.name AS cat_name',
-		);
+		];
 
-		$joins = $query_customizations['joins'] ?? array(
+		$joins = $query_customizations['joins'] ?? [
 			'INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)',
 			'INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)',
 			'INNER JOIN {db_prefix}categories AS c ON (c.id_cat = b.id_cat)',
@@ -438,9 +440,9 @@ public static function get($ids, array $query_customizations = array())
 			'INNER JOIN {db_prefix}messages AS last_m ON (last_m.id_msg = t.id_last_msg)',
 			'LEFT JOIN {db_prefix}members AS first_mem ON (first_mem.id_member = first_m.id_member)',
 			'LEFT JOIN {db_prefix}members AS last_mem ON (last_mem.id_member = first_m.id_member)',
-		);
+		];
 
-		$where = $query_customizations['where'] ?? array_filter(array(
+		$where = $query_customizations['where'] ?? array_filter([
 			'm.id_msg IN ({array_int:message_list})',
 			// If post moderation is enabled, only get the posts this user can see.
 			empty(Config::$modSettings['postmod_active'])
@@ -449,41 +451,43 @@ public static function get($ids, array $query_customizations = array())
 				empty(User::$me->mod_cache['ap'])
 				? 'm.approved = {int:is_approved} OR m.id_member = {int:current_member}'
 				: (
-					User::$me->mod_cache['ap'] !== array(0)
+					User::$me->mod_cache['ap'] !== [0]
 					? 'm.approved = {int:is_approved} OR m.id_member = {int:current_member} OR m.id_board IN ({array_int:approve_boards})'
 					: null
 				)
 			),
-		));
+		]);
 
-		$order = $query_customizations['order'] ?? array(
+		$order = $query_customizations['order'] ?? [
 			Db::$db->custom_order('m.id_msg', $ids),
-		);
+		];
 
+		$group = $query_customizations['group'] ?? [];
 		$limit = $query_customizations['limit'] ?? '{int:limit}';
 
-		$params = $query_customizations['params'] ?? array(
+		$params = $query_customizations['params'] ?? [
 			'is_approved' => 1,
 			'current_member' => User::$me->id,
-			'approve_boards' => !empty(Config::$modSettings['postmod_active']) ? User::$me->mod_cache['ap'] : array(),
+			'approve_boards' => !empty(Config::$modSettings['postmod_active']) ? User::$me->mod_cache['ap'] : [],
 			'limit' => count($ids),
-		);
+		];
 
-		if (!empty($ids))
+		if (!empty($ids)) {
 			$params['message_list'] = self::$messages_to_get = array_filter(array_unique(array_map('intval', (array) $ids)));
+		}
 
-		foreach(self::queryData($selects, $params, $joins, $where, $order, $limit) as $row)
-		{
+		foreach(self::queryData($selects, $params, $joins, $where, $order, $group, $limit) as $row) {
 			$id = (int) $row['id_msg'];
 
 			yield (new self($id, $row));
 
-			if (!self::$keep_all)
+			if (!self::$keep_all) {
 				unset(self::$loaded[$id]);
+			}
 		}
 
 		// Reset this when done.
-		self::$messages_to_get = array();
+		self::$messages_to_get = [];
 	}
 
 	/**
@@ -502,13 +506,13 @@ public static function highlight(string $text, array $words): string
 		// Don't mess with the content of HTML tags.
 		$parts = preg_split('~(<[^>]+>)~', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-		for ($i = 0, $n = count($parts); $i < $n; $i++)
-		{
+		for ($i = 0, $n = count($parts); $i < $n; $i++) {
 			$highlighted .= $i % 2 === 0 ? preg_replace('~' . $words . '~iu', '<mark class="highlight">$0</mark>', $parts[$i]) : $parts[$i];
 		}
 
-		if (!empty($highlighted))
+		if (!empty($highlighted)) {
 			$text = $highlighted;
+		}
 
 		return $text;
 	}
@@ -518,11 +522,10 @@ public static function highlight(string $text, array $words): string
 	 */
 	public static function getNumResults(): int
 	{
-		// @todo Should this trigger an error instead?
-		if (!isset(self::$messages_request))
-			return 0;
+		// Initialize the generator in order to set self::$messages_request.
+		self::$getter->current();
 
-		return Db::$db->num_rows(self::$messages_request);
+		return Db::$db->num_rows(self::$messages_request) + (int) $_REQUEST['start'];
 	}
 
 	/**
@@ -531,16 +534,16 @@ public static function getNumResults(): int
 	public static function setBoardsCan(): void
 	{
 		// Create an array for the permissions.
-		$perms = array('post_reply_own', 'post_reply_any');
+		$perms = ['post_reply_own', 'post_reply_any'];
 
-		if (!empty(Theme::$current->options['display_quick_mod']))
-			$perms = array_merge($perms, array('lock_any', 'lock_own', 'make_sticky', 'move_any', 'move_own', 'remove_any', 'remove_own', 'merge_any'));
+		if (!empty(Theme::$current->options['display_quick_mod'])) {
+			$perms = array_merge($perms, ['lock_any', 'lock_own', 'make_sticky', 'move_any', 'move_own', 'remove_any', 'remove_own', 'merge_any']);
+		}
 
 		self::$boards_can = User::$me->boardsAllowedTo($perms, true, false);
 
 		// How's about some quick moderation?
-		if (!empty(Theme::$current->options['display_quick_mod']))
-		{
+		if (!empty(Theme::$current->options['display_quick_mod'])) {
 			Utils::$context['can_lock'] = in_array(0, self::$boards_can['lock_any']);
 			Utils::$context['can_sticky'] = in_array(0, self::$boards_can['make_sticky']);
 			Utils::$context['can_move'] = in_array(0, self::$boards_can['move_any']);
@@ -551,7 +554,8 @@ public static function setBoardsCan(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SearchResult::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SearchResult::exportStatic')) {
 	SearchResult::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Search/index.php b/Sources/Search/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Search/index.php
+++ b/Sources/Search/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/SearchAPI-Custom.php b/Sources/SearchAPI-Custom.php
index 4f8c27f097..db1de92227 100644
--- a/Sources/SearchAPI-Custom.php
+++ b/Sources/SearchAPI-Custom.php
@@ -15,8 +15,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\Search\\APIs\\Custom', '\\custom_search');
 
diff --git a/Sources/SearchAPI-Fulltext.php b/Sources/SearchAPI-Fulltext.php
index f18180507e..8a12aabbaf 100644
--- a/Sources/SearchAPI-Fulltext.php
+++ b/Sources/SearchAPI-Fulltext.php
@@ -15,8 +15,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\Search\\APIs\\Fulltext', '\\fulltext_search');
 
diff --git a/Sources/SearchAPI-Standard.php b/Sources/SearchAPI-Standard.php
index 65bb25ba9a..0763ddb5ad 100644
--- a/Sources/SearchAPI-Standard.php
+++ b/Sources/SearchAPI-Standard.php
@@ -15,8 +15,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_alias('SMF\\Search\\APIs\\Standard', '\\standard_search');
 
diff --git a/Sources/Security.php b/Sources/Security.php
index 45c0b1aaff..3c18094912 100644
--- a/Sources/Security.php
+++ b/Sources/Security.php
@@ -27,13 +27,20 @@ class Security
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'hashPassword' => 'hash_password',
 			'hashVerifyPassword' => 'hash_verify_password',
 			'hashBenchmark' => 'hash_benchmark',
-		),
-	);
+			'checkConfirm' => 'checkConfirm',
+			'checkSubmitOnce' => 'checkSubmitOnce',
+			'spamProtection' => 'spamProtection',
+			'secureDirectory' => 'secureDirectory',
+			'frameOptionsHeader' => 'frameOptionsHeader',
+			'corsPolicyHeader' => 'corsPolicyHeader',
+			'kickGuest' => 'KickGuest',
+		],
+	];
 
 	/***********************
 	 * Public static methods
@@ -51,9 +58,9 @@ public static function hashPassword($username, $password, $cost = null)
 	{
 		$cost = empty($cost) ? (empty(Config::$modSettings['bcrypt_hash_cost']) ? 10 : Config::$modSettings['bcrypt_hash_cost']) : $cost;
 
-		return password_hash(Utils::strtolower($username) . $password, PASSWORD_BCRYPT, array(
+		return password_hash(Utils::strtolower($username) . $password, PASSWORD_BCRYPT, [
 			'cost' => $cost,
-		));
+		]);
 	}
 
 	/**
@@ -79,14 +86,12 @@ public static function hashBenchmark($hashTime = 0.2)
 	{
 		$cost = 9;
 
-		do
-		{
+		do {
 			$timeStart = microtime(true);
 			self::hashPassword('test', 'thisisatestpassword', $cost);
 			$timeTaken = microtime(true) - $timeStart;
 			$cost++;
-		}
-		while ($timeTaken < $hashTime);
+		} while ($timeTaken < $hashTime);
 
 		return $cost;
 	}
@@ -99,18 +104,15 @@ public static function hashBenchmark($hashTime = 0.2)
 	 */
 	public static function checkConfirm(string $action): bool|string
 	{
-		if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && hash_hmac('md5', $_SERVER['HTTP_USER_AGENT'], $_GET['confirm']) == $_SESSION['confirm_' . $action])
-		{
+		if (isset($_GET['confirm'], $_SESSION['confirm_' . $action])     && hash_hmac('md5', $_SERVER['HTTP_USER_AGENT'], $_GET['confirm']) == $_SESSION['confirm_' . $action]) {
 			return true;
 		}
-		else
-		{
-			$token = bin2hex(Utils::randomBytes(16));
 
-			$_SESSION['confirm_' . $action] = hash_hmac('md5', $_SERVER['HTTP_USER_AGENT'], $token);
+		$token = bin2hex(Utils::randomBytes(16));
 
-			return $token;
-		}
+		$_SESSION['confirm_' . $action] = hash_hmac('md5', $_SERVER['HTTP_USER_AGENT'], $token);
+
+		return $token;
 	}
 
 	/**
@@ -132,48 +134,46 @@ public static function checkConfirm(string $action): bool|string
 	 * @return null|bool If $action == 'check', returns whether the check was
 	 *    successful. Otherwise, returns null.
 	 */
-	public static function checkSubmitOnce(string $action, bool $is_fatal = true): null|bool
+	public static function checkSubmitOnce(string $action, bool $is_fatal = true): ?bool
 	{
-		if (!isset($_SESSION['forms']))
-			$_SESSION['forms'] = array();
+		if (!isset($_SESSION['forms'])) {
+			$_SESSION['forms'] = [];
+		}
 
 		// Check whether the submitted number can be found in the session.
-		if ($action == 'check')
-		{
-			if (!isset($_REQUEST['seqnum']))
+		if ($action == 'check') {
+			if (!isset($_REQUEST['seqnum'])) {
 				return true;
+			}
 
-			if (!in_array($_REQUEST['seqnum'], $_SESSION['forms']))
-			{
+			if (!in_array($_REQUEST['seqnum'], $_SESSION['forms'])) {
 				$_SESSION['forms'][] = (int) $_REQUEST['seqnum'];
+
 				return true;
 			}
 
-			if ($is_fatal)
+			if ($is_fatal) {
 				ErrorHandler::fatalLang('error_form_already_submitted', false);
+			}
 
 			return false;
 		}
 
 		// Register a form number and store it in the session stack.
 		// (Use this value on the page that has the form.)
-		if ($action == 'register')
-		{
+		if ($action == 'register') {
 			Utils::$context['form_sequence_number'] = 0;
 
-			while (empty(Utils::$context['form_sequence_number']) || in_array(Utils::$context['form_sequence_number'], $_SESSION['forms']))
-			{
+			while (empty(Utils::$context['form_sequence_number']) || in_array(Utils::$context['form_sequence_number'], $_SESSION['forms'])) {
 				Utils::$context['form_sequence_number'] = Utils::randomInt(1, 16000000);
 			}
 		}
 		// Don't check, just free the stack number.
-		elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms']))
-		{
-			$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
+		elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) {
+			$_SESSION['forms'] = array_diff($_SESSION['forms'], [$_REQUEST['seqnum']]);
 		}
 		// Bail out if $action is unknown.
-		elseif ($action != 'free')
-		{
+		elseif ($action != 'free') {
 			Lang::load('Errors');
 
 			trigger_error(sprintf(Lang::$txt['check_submit_once_invalid_action'], $action), E_USER_WARNING);
@@ -197,60 +197,59 @@ public static function checkSubmitOnce(string $action, bool $is_fatal = true): n
 	public static function spamProtection(string $error_type, bool $only_return_result = false): bool
 	{
 		// Certain types take less/more time.
-		$timeOverrides = array(
+		$timeOverrides = [
 			'login' => 2,
 			'register' => 2,
 			'remind' => 30,
 			'sendmail' => Config::$modSettings['spamWaitTime'] * 5,
 			'reporttm' => Config::$modSettings['spamWaitTime'] * 4,
 			'search' => !empty(Config::$modSettings['search_floodcontrol_time']) ? Config::$modSettings['search_floodcontrol_time'] : 1,
-		);
+		];
 
-		IntegrationHook::call('integrate_spam_protection', array(&$timeOverrides));
+		IntegrationHook::call('integrate_spam_protection', [&$timeOverrides]);
 
 		// Moderators are free...
-		if (!User::$me->allowedTo('moderate_board'))
-		{
-			$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : Config::$modSettings['spamWaitTime'];
-		}
-		else
-		{
+		if (!User::$me->allowedTo('moderate_board')) {
+			$timeLimit = $timeOverrides[$error_type] ?? Config::$modSettings['spamWaitTime'];
+		} else {
 			$timeLimit = 2;
 		}
 
 		// Delete old entries...
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_floodcontrol
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_floodcontrol
 			WHERE log_time < {int:log_time}
 				AND log_type = {string:log_type}',
-			array(
+			[
 				'log_time' => time() - $timeLimit,
 				'log_type' => $error_type,
-			)
+			],
 		);
 
 		// Add a new entry, deleting the old if necessary.
-		Db::$db->insert('replace',
+		Db::$db->insert(
+			'replace',
 			'{db_prefix}log_floodcontrol',
-			array(
+			[
 				'ip' => 'inet',
 				'log_time' => 'int',
 				'log_type' => 'string',
-			),
-			array(
+			],
+			[
 				User::$me->ip,
 				time(),
 				$error_type,
-			),
-			array('ip', 'log_type')
+			],
+			['ip', 'log_type'],
 		);
 
 		// If affected is 0 or 2, it was there already.
-		if (Db::$db->affected_rows() != 1)
-		{
+		if (Db::$db->affected_rows() != 1) {
 			// Spammer! You only have to wait a *few* seconds!
-			if (!$only_return_result)
-				ErrorHandler::fatalLang($error_type . '_WaitTime_broken', false, array($timeLimit));
+			if (!$only_return_result) {
+				ErrorHandler::fatalLang($error_type . '_WaitTime_broken', false, [$timeLimit]);
+			}
 
 			return true;
 		}
@@ -268,22 +267,23 @@ public static function spamProtection(string $error_type, bool $only_return_resu
 	 */
 	public static function secureDirectory(string|array $paths, bool $attachments = false): bool|array
 	{
-		$errors = array();
+		$errors = [];
 
 		// Work with arrays
 		$paths = (array) $paths;
 
-		if (empty($paths))
+		if (empty($paths)) {
 			$errors[] = 'empty_path';
+		}
 
-		if (!empty($errors))
+		if (!empty($errors)) {
 			return $errors;
+		}
 
-		foreach ($paths as $path)
-		{
-			if (!is_writable($path))
-			{
+		foreach ($paths as $path) {
+			if (!is_writable($path)) {
 				$errors[] = 'path_not_writable';
+
 				continue;
 			}
 
@@ -291,86 +291,64 @@ public static function secureDirectory(string|array $paths, bool $attachments =
 
 			// First, create the .htaccess file.
 			$contents = <<<END
-			<Files *>
-				Order Deny,Allow
-				Deny from all
-			END;
+				<Files *>
+					Order Deny,Allow
+					Deny from all
+				END;
 
-			if (empty($attachments))
-			{
+			if (empty($attachments)) {
 				$contents .= "\n" . '</Files>';
-			}
-			else
-			{
+			} else {
 				$contents .= <<<END
 
-					Allow from localhost
-				</Files>
+						Allow from localhost
+					</Files>
 
-				RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml
-				END;
+					RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml
+					END;
 			}
 
-			if (file_exists($path . '/.htaccess'))
-			{
+			if (file_exists($path . '/.htaccess')) {
 				$errors[] = 'htaccess_exists';
+
 				continue;
 			}
-			else
-			{
-				$fh = @fopen($path . '/.htaccess', 'w');
-
-				if ($fh)
-				{
-					fwrite($fh, $contents);
-					fclose($fh);
-				}
-				else
-				{
-					$errors[] = 'htaccess_cannot_create_file';
-				}
+
+			$fh = @fopen($path . '/.htaccess', 'w');
+
+			if ($fh) {
+				fwrite($fh, $contents);
+				fclose($fh);
+			} else {
+				$errors[] = 'htaccess_cannot_create_file';
 			}
 
 			// Next, the index.php file
-			if (file_exists($path . '/index.php'))
-			{
+			if (file_exists($path . '/index.php')) {
 				$errors[] = 'index-php_exists';
+
 				continue;
 			}
-			else
-			{
-				$contents = <<<END
-				<?php
 
-				/**
-				 * This file is here solely to protect your $directory_name directory.
-				 */
+			$contents = <<<END
+				<?php
 
-				// Look for Settings.php....
-				if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-				{
-					// Found it!
-					require(dirname(dirname(__FILE__)) . '/Settings.php');
-					header('location: ' . \$boardurl);
-				}
-				// Can't find it... just forget it.
+				// Try to handle it with the upper level index.php. (it should know what to do.)
+				if (file_exists(dirname(__DIR__) . '/index.php'))
+					include (dirname(__DIR__) . '/index.php');
 				else
 					exit;
 
 				?>
 				END;
 
-				$fh = @fopen($path . '/index.php', 'w');
+			$fh = @fopen($path . '/index.php', 'w');
 
-				if ($fh)
-				{
-					fwrite($fh, $contents);
-					fclose($fh);
-				}
-				else
-				{
-					$errors[] = 'index-php_cannot_create_file';
-				}
+			if ($fh) {
+				fwrite($fh, $contents);
+				fclose($fh);
+			} else {
+				$errors[] = 'index-php_cannot_create_file';
 			}
 		}
 
@@ -387,18 +365,16 @@ public static function frameOptionsHeader($override = null)
 	{
 		$option = 'SAMEORIGIN';
 
-		if (is_null($override) && !empty(Config::$modSettings['frame_security']))
-		{
+		if (is_null($override) && !empty(Config::$modSettings['frame_security'])) {
 			$option = Config::$modSettings['frame_security'];
-		}
-		elseif (in_array($override, array('SAMEORIGIN', 'DENY')))
-		{
+		} elseif (in_array($override, ['SAMEORIGIN', 'DENY'])) {
 			$option = $override;
 		}
 
 		// Don't bother setting the header if we have disabled it.
-		if ($option == 'DISABLE')
+		if ($option == 'DISABLE') {
 			return;
+		}
 
 		// Finally set it.
 		header('x-frame-options: ' . $option);
@@ -420,83 +396,72 @@ public static function frameOptionsHeader($override = null)
 	 */
 	public static function corsPolicyHeader(bool $set_header = true): void
 	{
-		if (empty(Config::$modSettings['allow_cors']) || empty($_SERVER['HTTP_ORIGIN']))
+		if (empty(Config::$modSettings['allow_cors']) || empty($_SERVER['HTTP_ORIGIN'])) {
 			return;
+		}
 
-		foreach (array('origin' => $_SERVER['HTTP_ORIGIN'], 'forumurl' => Config::$boardurl) as $var => $url)
-		{
+		foreach (['origin' => $_SERVER['HTTP_ORIGIN'], 'forumurl' => Config::$boardurl] as $var => $url) {
 			// Convert any Punycode to Unicode for the sake of comparison.
 			$$var = Url::create(trim($url), true)->validate()->toUtf8();
 		}
 
 		// The admin wants weak security... :(
-		if (!empty(Config::$modSettings['cors_domains']) && Config::$modSettings['cors_domains'] === '*')
-		{
+		if (!empty(Config::$modSettings['cors_domains']) && Config::$modSettings['cors_domains'] === '*') {
 			Utils::$context['cors_domain'] = '*';
 			Utils::$context['valid_cors_found'] = 'wildcard';
 		}
 		// Oh good, the admin cares about security. :)
-		else
-		{
+		else {
 			$i = 0;
 
 			// Build our list of allowed CORS origins.
-			$allowed_origins = array();
+			$allowed_origins = [];
 
 			// If subdomain-independent cookies are on, allow CORS requests from subdomains.
-			if (!empty(Config::$modSettings['globalCookies']) && !empty(Config::$modSettings['globalCookiesDomain']))
-			{
+			if (!empty(Config::$modSettings['globalCookies']) && !empty(Config::$modSettings['globalCookiesDomain'])) {
 				$allowed_origins[++$i] = array_merge(
 					Url::create('//*.' . trim(Config::$modSettings['globalCookiesDomain']))->parse(),
-					array('type' => 'subdomain')
+					['type' => 'subdomain'],
 				);
 			}
 
 			// Support forum_alias_urls as well, since those are supported by our login cookie.
-			if (!empty(Config::$modSettings['forum_alias_urls']))
-			{
-				foreach (explode(',', Config::$modSettings['forum_alias_urls']) as $alias)
-				{
+			if (!empty(Config::$modSettings['forum_alias_urls'])) {
+				foreach (explode(',', Config::$modSettings['forum_alias_urls']) as $alias) {
 					$allowed_origins[++$i] = array_merge(
 						Url::create((strpos($alias, '//') === false ? '//' : '') . trim($alias))->parse(),
-						array('type' => 'alias')
+						['type' => 'alias'],
 					);
 				}
 			}
 
 			// Additional CORS domains.
-			if (!empty(Config::$modSettings['cors_domains']))
-			{
-				foreach (explode(',', Config::$modSettings['cors_domains']) as $cors_domain)
-				{
+			if (!empty(Config::$modSettings['cors_domains'])) {
+				foreach (explode(',', Config::$modSettings['cors_domains']) as $cors_domain) {
 					$allowed_origins[++$i] = array_merge(
 						Url::create((strpos($cors_domain, '//') === false ? '//' : '') . trim($cors_domain))->parse(),
-						array('type' => 'additional')
+						['type' => 'additional'],
 					);
 
-					if (strpos($allowed_origins[$i]['host'], '*') === 0)
-						 $allowed_origins[$i]['type'] .= '_wildcard';
+					if (strpos($allowed_origins[$i]['host'], '*') === 0) {
+						$allowed_origins[$i]['type'] .= '_wildcard';
+					}
 				}
 			}
 
 			// Does the origin match any of our allowed domains?
-			foreach ($allowed_origins as $allowed_origin)
-			{
+			foreach ($allowed_origins as $allowed_origin) {
 				// If a specific scheme is required, it must match.
-				if (!empty($allowed_origin['scheme']) && $allowed_origin['scheme'] !== $origin->scheme)
-				{
+				if (!empty($allowed_origin['scheme']) && $allowed_origin['scheme'] !== $origin->scheme) {
 					continue;
 				}
 
 				// If a specific port is required, it must match.
-				if (!empty($allowed_origin['port']))
-				{
+				if (!empty($allowed_origin['port'])) {
 					// Automatically supply the default port for the "special" schemes.
 					// See https://url.spec.whatwg.org/#special-scheme
-					if (empty($origin->port))
-					{
-						switch ($origin->scheme)
-						{
+					if (empty($origin->port)) {
+						switch ($origin->scheme) {
 							case 'http':
 							case 'ws':
 								$origin->port = 80;
@@ -518,27 +483,26 @@ public static function corsPolicyHeader(bool $set_header = true): void
 						}
 					}
 
-					if ((int) $allowed_origin['port'] !== (int) $origin->port)
+					if ((int) $allowed_origin['port'] !== (int) $origin->port) {
 						continue;
+					}
 				}
 
 				// Wildcard can only be the first character.
-				if (strrpos($allowed_origin['host'], '*') > 0)
+				if (strrpos($allowed_origin['host'], '*') > 0) {
 					continue;
+				}
 
 				// Wildcard means allow the domain or any subdomains.
-				if (strpos($allowed_origin['host'], '*') === 0)
-				{
-					$host_regex = '(?:^|\.)' . preg_quote(ltrim($allowed_origin['host'], '*.'), '~') . '$';
+				if (strpos($allowed_origin['host'], '*') === 0) {
+					$host_regex = '(?:^|\\.)' . preg_quote(ltrim($allowed_origin['host'], '*.'), '~') . '$';
 				}
 				// No wildcard means allow the domain only.
-				else
-				{
+				else {
 					$host_regex = '^' . preg_quote($allowed_origin['host'], '~') . '$';
 				}
 
-				if (preg_match('~' . $host_regex . '~u', $origin->host))
-				{
+				if (preg_match('~' . $host_regex . '~u', $origin->host)) {
 					Utils::$context['cors_domain'] = trim($_SERVER['HTTP_ORIGIN']);
 					Utils::$context['valid_cors_found'] = $allowed_origin['type'];
 					break;
@@ -547,8 +511,7 @@ public static function corsPolicyHeader(bool $set_header = true): void
 		}
 
 		// The default is just to place the root URL of the forum into the policy.
-		if (empty(Utils::$context['cors_domain']))
-		{
+		if (empty(Utils::$context['cors_domain'])) {
 			Utils::$context['cors_domain'] = Url::create($forumurl->scheme . '://' . $forumurl->host . (!empty($forumurl->port) ? ':' . $forumurl->port : ''))->toAscii();
 
 			Utils::$context['valid_cors_found'] = 'same';
@@ -557,26 +520,26 @@ public static function corsPolicyHeader(bool $set_header = true): void
 		Utils::$context['cors_headers'] = 'X-SMF-AJAX';
 
 		// Any additional headers?
-		if (!empty(Config::$modSettings['cors_headers']))
-		{
+		if (!empty(Config::$modSettings['cors_headers'])) {
 			// Cleanup any typos.
 			$cors_headers = explode(',', Config::$modSettings['cors_headers']);
 
-			foreach ($cors_headers as &$ch)
+			foreach ($cors_headers as &$ch) {
 				$ch = str_replace(' ', '-', trim($ch));
+			}
 
 			Utils::$context['cors_headers'] .= ',' . implode(',', $cors_headers);
 		}
 
 		// Allowing Cross-Origin Resource Sharing (CORS).
-		if ($set_header && !empty(Utils::$context['valid_cors_found']) && !empty(Utils::$context['cors_domain']))
-		{
+		if ($set_header && !empty(Utils::$context['valid_cors_found']) && !empty(Utils::$context['cors_domain'])) {
 			header('Access-Control-Allow-Origin: ' . Utils::$context['cors_domain']);
 			header('Access-Control-Allow-Headers: ' . Utils::$context['cors_headers']);
 
 			// Be careful with this, you're allowing an external site to allow the browser to send cookies with this.
-			if (!empty(Config::$modSettings['allow_cors_credentials']))
+			if (!empty(Config::$modSettings['allow_cors_credentials'])) {
 				header('Access-Control-Allow-Credentials: true');
+			}
 		}
 	}
 
@@ -590,8 +553,9 @@ public static function kickGuest(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Security::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Security::exportStatic')) {
 	Security::exportStatic();
+}
 
 // Some functions have moved.
 class_exists('SMF\\SecurityToken');
diff --git a/Sources/SecurityToken.php b/Sources/SecurityToken.php
index 149910bc9d..230000141a 100644
--- a/Sources/SecurityToken.php
+++ b/Sources/SecurityToken.php
@@ -31,13 +31,13 @@ class SecurityToken extends \ArrayObject
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'create' => 'createToken',
 			'validate' => 'validateToken',
 			'clean' => 'cleanTokens',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -46,7 +46,7 @@ class SecurityToken extends \ArrayObject
 	/**
 	 * How long (in seconds) a token is good for.
 	 */
-	const EXPIRY_TIME = 10800;
+	public const EXPIRY_TIME = 10800;
 
 	/*******************
 	 * Public properties
@@ -102,7 +102,7 @@ public function __construct()
 		// This is the backward compatibility part, so that the named properties
 		// can be accessed as the numeric keys of an array by any old mods that
 		// expect that deprecated format.
-		parent::__construct(array($this->var, $this->hash, $this->time, $this->val));
+		parent::__construct([$this->var, $this->hash, $this->time, $this->val]);
 	}
 
 	/***********************
@@ -130,10 +130,10 @@ public static function create(string $action, string $type = 'post'): array
 		Utils::$context[$action . '_token_var'] = $_SESSION['token'][$type . '-' . $action]->var;
 		Utils::$context[$action . '_token'] = $_SESSION['token'][$type . '-' . $action]->val;
 
-		return array(
+		return [
 			$action . '_token_var' => $_SESSION['token'][$type . '-' . $action]->var,
 			$action . '_token' => $_SESSION['token'][$type . '-' . $action]->val,
-		);
+		];
 	}
 
 	/**
@@ -167,8 +167,7 @@ public static function validate(string $action, string $type = 'post', bool $res
 
 			// Is it recent enough?
 			&& $_SESSION['token'][$type . '-' . $action]->time + self::EXPIRY_TIME >= time()
-		)
-		{
+		) {
 			// Delete this token now.
 			unset($_SESSION['token'][$type . '-' . $action]);
 
@@ -176,8 +175,7 @@ public static function validate(string $action, string $type = 'post', bool $res
 		}
 
 		// Patrons with invalid tokens get the boot.
-		if ($reset)
-		{
+		if ($reset) {
 			// Might as well do some cleanup on this.
 			self::clean();
 
@@ -191,8 +189,9 @@ public static function validate(string $action, string $type = 'post', bool $res
 		unset($_SESSION['token'][$type . '-' . $action]);
 
 		// Randomly check if we should delete some older tokens.
-		if (mt_rand(0, 138) == 23)
+		if (mt_rand(0, 138) == 23) {
 			self::clean();
+		}
 
 		return false;
 	}
@@ -208,20 +207,21 @@ public static function validate(string $action, string $type = 'post', bool $res
 	public static function clean(bool $complete = false): void
 	{
 		// We appreciate cleaning up after yourselves.
-		if (empty($_SESSION['token']))
+		if (empty($_SESSION['token'])) {
 			return;
+		}
+
+		if ($complete) {
+			$_SESSION['token'] = [];
 
-		if ($complete)
-		{
-			$_SESSION['token'] = array();
 			return;
 		}
 
 		// Clean up tokens, trying to give enough time still.
-		foreach ($_SESSION['token'] as $key => $token)
-		{
-			if (!($token instanceof self) || $token->time + self::EXPIRY_TIME < time())
+		foreach ($_SESSION['token'] as $key => $token) {
+			if (!($token instanceof self) || $token->time + self::EXPIRY_TIME < time()) {
 				unset($_SESSION['token'][$key]);
+			}
 		}
 	}
 
@@ -252,7 +252,8 @@ protected static function getHash(string $val): string
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\SecurityToken::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\SecurityToken::exportStatic')) {
 	SecurityToken::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/ServerSideIncludes.php b/Sources/ServerSideIncludes.php
index 7d32ce4d5d..1f12c668c7 100644
--- a/Sources/ServerSideIncludes.php
+++ b/Sources/ServerSideIncludes.php
@@ -38,13 +38,50 @@ class ServerSideIncludes
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_prefix' => 'ssi_',
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
+			'shutdown' => 'ssi_shutdown',
+			'version' => 'ssi_version',
 			'fullVersion' => 'ssi_full_version',
 			'softwareYear' => 'ssi_software_year',
-		),
-	);
+			'copyright' => 'ssi_copyright',
+			'welcome' => 'ssi_welcome',
+			'menubar' => 'ssi_menubar',
+			'logout' => 'ssi_logout',
+			'recentPosts' => 'ssi_recentPosts',
+			'fetchPosts' => 'ssi_fetchPosts',
+			'queryPosts' => 'ssi_queryPosts',
+			'recentTopics' => 'ssi_recentTopics',
+			'topPoster' => 'ssi_topPoster',
+			'topBoards' => 'ssi_topBoards',
+			'topTopics' => 'ssi_topTopics',
+			'topTopicsReplies' => 'ssi_topTopicsReplies',
+			'topTopicsViews' => 'ssi_topTopicsViews',
+			'latestMember' => 'ssi_latestMember',
+			'randomMember' => 'ssi_randomMember',
+			'fetchMember' => 'ssi_fetchMember',
+			'fetchGroupMembers' => 'ssi_fetchGroupMembers',
+			'queryMembers' => 'ssi_queryMembers',
+			'boardStats' => 'ssi_boardStats',
+			'whosOnline' => 'ssi_whosOnline',
+			'logOnline' => 'ssi_logOnline',
+			'login' => 'ssi_login',
+			'topPoll' => 'ssi_topPoll',
+			'recentPoll' => 'ssi_recentPoll',
+			'showPoll' => 'ssi_showPoll',
+			'pollVote' => 'ssi_pollVote',
+			'quickSearch' => 'ssi_quickSearch',
+			'news' => 'ssi_news',
+			'todaysBirthdays' => 'ssi_todaysBirthdays',
+			'todaysHolidays' => 'ssi_todaysHolidays',
+			'todaysEvents' => 'ssi_todaysEvents',
+			'todaysCalendar' => 'ssi_todaysCalendar',
+			'boardNews' => 'ssi_boardNews',
+			'recentEvents' => 'ssi_recentEvents',
+			'checkPassword' => 'ssi_checkPassword',
+			'recentAttachments' => 'ssi_recentAttachments',
+		],
+	];
 
 	/**
 	 * @var int
@@ -61,7 +98,6 @@ class ServerSideIncludes
 	 */
 	protected static $setup_done = false;
 
-
 	/******************************************************************
 	 * Properties that allow external scripts to control SSI behaviour.
 	 ******************************************************************/
@@ -72,7 +108,7 @@ class ServerSideIncludes
 	 * Names of various global variables that external scripts can declare in
 	 * order to influence the behaviour of SSI.
 	 */
-	protected $ssi_globals = array(
+	protected $ssi_globals = [
 		'ssi_on_error_method',
 		'ssi_maintenance_off',
 		'ssi_theme',
@@ -80,7 +116,7 @@ class ServerSideIncludes
 		'ssi_gzip',
 		'ssi_ban',
 		'ssi_guest_access',
-	);
+	];
 
 	/**
 	 * @var bool|string
@@ -158,7 +194,6 @@ class ServerSideIncludes
 	 */
 	public $gzip;
 
-
 	/****************************************************************
 	 * Static methods that allow external scripts to access SMF data.
 	 * These are the interesting parts of this class.
@@ -169,15 +204,16 @@ class ServerSideIncludes
 	 *
 	 * Alias: ssi_shutdown()
 	 *
-	 * @return void
 	 */
 	public static function shutdown()
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
+		if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
 			Theme::template_footer();
+		}
 	}
 
 	/**
@@ -190,13 +226,15 @@ public static function shutdown()
 	 */
 	public static function version($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo SMF_VERSION;
-		else
+		} else {
 			return SMF_VERSION;
+		}
 	}
 
 	/**
@@ -209,13 +247,15 @@ public static function version($output_method = 'echo')
 	 */
 	public static function fullVersion($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo SMF_FULL_VERSION;
-		else
+		} else {
 			return SMF_FULL_VERSION;
+		}
 	}
 
 	/**
@@ -228,13 +268,15 @@ public static function fullVersion($output_method = 'echo')
 	 */
 	public static function softwareYear($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo SMF_SOFTWARE_YEAR;
-		else
+		} else {
 			return SMF_SOFTWARE_YEAR;
+		}
 	}
 
 	/**
@@ -247,13 +289,15 @@ public static function softwareYear($output_method = 'echo')
 	 */
 	public static function copyright($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			printf(Lang::$forum_copyright, SMF_FULL_VERSION, SMF_SOFTWARE_YEAR, Config::$scripturl);
-		else
+		} else {
 			return sprintf(Lang::$forum_copyright, SMF_FULL_VERSION, SMF_SOFTWARE_YEAR, Config::$scripturl);
+		}
 	}
 
 	/**
@@ -266,23 +310,19 @@ public static function copyright($output_method = 'echo')
 	 */
 	public static function welcome($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
-		{
-			if (User::$me->is_guest)
-			{
+		if ($output_method == 'echo') {
+			if (User::$me->is_guest) {
 				echo sprintf(Lang::$txt[Utils::$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], Utils::$context['forum_name_html_safe'], Config::$scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . Utils::JavaScriptEscape(Lang::$txt['login']) . ');', Config::$scripturl . '?action=signup');
-			}
-			else
-			{
+			} else {
 				echo Lang::$txt['hello_member'], ' <strong>', User::$me->name, '</strong>', User::$me->allowedTo('pm_read') ? ', ' . (empty(User::$me->messages) ? Lang::$txt['msg_alert_no_messages'] : ((User::$me->messages == 1 ? sprintf(Lang::$txt['msg_alert_one_message'], Config::$scripturl . '?action=pm') : sprintf(Lang::$txt['msg_alert_many_message'], Config::$scripturl . '?action=pm', User::$me->messages)) . ', ' . (User::$me->unread_messages == 1 ? Lang::$txt['msg_alert_one_new'] : sprintf(Lang::$txt['msg_alert_many_new'], User::$me->unread_messages)))) : '';
 			}
 		}
 		// Don't echo... then do what?!
-		else
-		{
+		else {
 			return User::$me;
 		}
 	}
@@ -297,14 +337,17 @@ public static function welcome($output_method = 'echo')
 	 */
 	public static function menubar($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			template_menu();
+		}
 		// What else could this do?
-		else
+		else {
 			return Utils::$context['menu_buttons'];
+		}
 	}
 
 	/**
@@ -318,22 +361,26 @@ public static function menubar($output_method = 'echo')
 	 */
 	public static function logout($redirect_to = '', $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($redirect_to != '')
+		if ($redirect_to != '') {
 			$_SESSION['logout_url'] = $redirect_to;
+		}
 
 		// Guests can't log out.
-		if (User::$me->is_guest)
+		if (User::$me->is_guest) {
 			return false;
+		}
 
 		$link = '<a href="' . Config::$scripturl . '?action=logout;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'] . '">' . Lang::$txt['logout'] . '</a>';
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo $link;
-		else
+		} else {
 			return $link;
+		}
 	}
 
 	/**
@@ -350,23 +397,22 @@ public static function logout($redirect_to = '', $output_method = 'echo')
 	 */
 	public static function recentPosts($num_recent = 8, $exclude_boards = null, $include_boards = null, $output_method = 'echo', $limit_body = true)
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// Excluding certain boards...
-		if ($exclude_boards === null && !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']))
-			$exclude_boards = array(Config::$modSettings['recycle_board']);
-		else
-			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+		if ($exclude_boards === null && !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board'])) {
+			$exclude_boards = [Config::$modSettings['recycle_board']];
+		} else {
+			$exclude_boards = empty($exclude_boards) ? [] : (is_array($exclude_boards) ? $exclude_boards : [$exclude_boards]);
+		}
 
 		// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
-		if (is_array($include_boards) || (int) $include_boards === $include_boards)
-		{
-			$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-		}
-		elseif ($include_boards != null)
-		{
-			$include_boards = array();
+		if (is_array($include_boards) || (int) $include_boards === $include_boards) {
+			$include_boards = is_array($include_boards) ? $include_boards : [$include_boards];
+		} elseif ($include_boards != null) {
+			$include_boards = [];
 		}
 
 		// Let's restrict the query boys (and girls)
@@ -379,12 +425,12 @@ public static function recentPosts($num_recent = 8, $exclude_boards = null, $inc
 			AND {query_wanna_see_board}' . (Config::$modSettings['postmod_active'] ? '
 			AND m.approved = {int:is_approved}' : '');
 
-		$query_where_params = array(
+		$query_where_params = [
 			'is_approved' => 1,
 			'include_boards' => $include_boards === null ? '' : $include_boards,
 			'exclude_boards' => empty($exclude_boards) ? '' : $exclude_boards,
 			'min_message_id' => Config::$modSettings['maxMsgID'] - (!empty(Utils::$context['min_message_posts']) ? Utils::$context['min_message_posts'] : 25) * min($num_recent, 5),
-		);
+		];
 
 		// Past to this simpleton of a function...
 		return self::queryPosts($query_where, $query_where_params, $num_recent, 'm.id_msg DESC', $output_method, $limit_body);
@@ -400,26 +446,28 @@ public static function recentPosts($num_recent = 8, $exclude_boards = null, $inc
 	 * @param string $output_method The output method. If 'echo', displays the posts, otherwise returns an array of info about them
 	 * @return void|array Displays the specified posts or returns an array of info about them, depending on output_method.
 	 */
-	public static function fetchPosts($post_ids = array(), $override_permissions = false, $output_method = 'echo')
+	public static function fetchPosts($post_ids = [], $override_permissions = false, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty($post_ids))
+		if (empty($post_ids)) {
 			return;
+		}
 
 		// Allow the user to request more than one - why not?
-		$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
+		$post_ids = is_array($post_ids) ? $post_ids : [$post_ids];
 
 		// Restrict the posts required...
 		$query_where = '
 			m.id_msg IN ({array_int:message_list})' . ($override_permissions ? '' : '
 				AND {query_wanna_see_board}') . (Config::$modSettings['postmod_active'] ? '
 				AND m.approved = {int:is_approved}' : '');
-		$query_where_params = array(
+		$query_where_params = [
 			'message_list' => $post_ids,
 			'is_approved' => 1,
-		);
+		];
 
 		// Then make the query and dump the data.
 		return self::queryPosts($query_where, $query_where_params, '', 'm.id_msg DESC', $output_method, false, $override_permissions);
@@ -439,17 +487,20 @@ public static function fetchPosts($post_ids = array(), $override_permissions = f
 	 * @param bool|false $override_permissions Whether or not to ignore permissions. If true, will show all posts regardless of whether the user can actually see them
 	 * @return void|array Displays the posts or returns an array of info about them, depending on output_method
 	 */
-	public static function queryPosts($query_where = '', $query_where_params = array(), $query_limit = 10, $query_order = 'm.id_msg DESC', $output_method = 'echo', $limit_body = false, $override_permissions = false)
+	public static function queryPosts($query_where = '', $query_where_params = [], $query_limit = 10, $query_order = 'm.id_msg DESC', $output_method = 'echo', $limit_body = false, $override_permissions = false)
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (!empty(Config::$modSettings['enable_likes']))
+		if (!empty(Config::$modSettings['enable_likes'])) {
 			Utils::$context['can_like'] = User::$me->allowedTo('likes_like');
+		}
 
 		// Find all the posts. Newer ones will have higher IDs.
-		$request = Db::$db->query('substring', '
-			SELECT
+		$request = Db::$db->query(
+			'substring',
+			'SELECT
 				m.poster_time, m.subject, m.id_topic, m.id_member, m.id_msg, m.id_board, m.likes, b.name AS board_name,
 				COALESCE(mem.real_name, m.poster_name) AS poster_name, ' . (User::$me->is_guest ? '1 AS is_read, 0 AS new_from' : '
 				COALESCE(lt.id_msg, lmr.id_msg, 0) >= m.id_msg_modified AS is_read,
@@ -467,18 +518,18 @@ public static function queryPosts($query_where = '', $query_where_params = array
 			' . (empty($query_where) ? '' : 'AND ' . $query_where) . '
 			ORDER BY ' . $query_order . '
 			' . ($query_limit == '' ? '' : 'LIMIT ' . $query_limit),
-			array_merge($query_where_params, array(
+			array_merge($query_where_params, [
 				'current_member' => User::$me->id,
 				'is_approved' => 1,
-			))
+			]),
 		);
-		$posts = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$topic = new Topic($row['id_topic'], array(
+		$posts = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$topic = new Topic($row['id_topic'], [
 				'id_board' => $row['id_board'],
 				'id_first_msg' => $row['id_msg'],
-			));
+			]);
 
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -486,24 +537,24 @@ public static function queryPosts($query_where = '', $query_where_params = array
 			Lang::censorText($row['subject']);
 			Lang::censorText($row['body']);
 
-			$preview = strip_tags(strtr($row['body'], array('<br>' => '&#10;')));
+			$preview = strip_tags(strtr($row['body'], ['<br>' => '&#10;']));
 
 			// Build the array.
-			$posts[$row['id_msg']] = array(
+			$posts[$row['id_msg']] = [
 				'id' => $row['id_msg'],
-				'board' => array(
+				'board' => [
 					'id' => $row['id_board'],
 					'name' => $row['board_name'],
 					'href' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
-					'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['board_name'] . '</a>'
-				),
+					'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['board_name'] . '</a>',
+				],
 				'topic' => $row['id_topic'],
-				'poster' => array(
+				'poster' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'href' => empty($row['id_member']) ? '' : Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>'
-				),
+					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>',
+				],
 				'subject' => $row['subject'],
 				'short_subject' => Utils::shorten($row['subject'], 25),
 				'preview' => Utils::shorten($preview, 128),
@@ -515,28 +566,31 @@ public static function queryPosts($query_where = '', $query_where_params = array
 				'new' => !empty($row['is_read']),
 				'is_new' => empty($row['is_read']),
 				'new_from' => $row['new_from'],
-			);
+			];
 
 			// Get the likes for each message.
-			if (!empty(Config::$modSettings['enable_likes']))
-				$posts[$row['id_msg']]['likes'] = array(
+			if (!empty(Config::$modSettings['enable_likes'])) {
+				$posts[$row['id_msg']]['likes'] = [
 					'count' => $row['likes'],
 					'you' => in_array($row['id_msg'], $topic->getLikedMsgs()),
 					'can_like' => !User::$me->is_guest && $row['id_member'] != User::$me->id && !empty(Utils::$context['can_like']),
-				);
+				];
+			}
 		}
 		Db::$db->free_result($request);
 
 		// If mods want to do something with this list of posts, let them do that now.
-		IntegrationHook::call('integrate_ssi_queryPosts', array(&$posts));
+		IntegrationHook::call('integrate_ssi_queryPosts', [&$posts]);
 
 		// Just return it.
-		if ($output_method != 'echo' || empty($posts))
+		if ($output_method != 'echo' || empty($posts)) {
 			return $posts;
+		}
 
 		echo '
 			<table style="border: none" class="ssi_table">';
-		foreach ($posts as $post)
+
+		foreach ($posts as $post) {
 			echo '
 				<tr>
 					<td style="text-align: right; vertical-align: top; white-space: nowrap">
@@ -551,6 +605,7 @@ public static function queryPosts($query_where = '', $query_where_params = array
 						', $post['time'], '
 					</td>
 				</tr>';
+		}
 		echo '
 			</table>';
 	}
@@ -568,32 +623,34 @@ public static function queryPosts($query_where = '', $query_where_params = array
 	 */
 	public static function recentTopics($num_recent = 8, $exclude_boards = null, $include_boards = null, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($exclude_boards === null && !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0)
-			$exclude_boards = array(Config::$modSettings['recycle_board']);
-		else
-			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+		if ($exclude_boards === null && !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0) {
+			$exclude_boards = [Config::$modSettings['recycle_board']];
+		} else {
+			$exclude_boards = empty($exclude_boards) ? [] : (is_array($exclude_boards) ? $exclude_boards : [$exclude_boards]);
+		}
 
 		// Only some boards?.
-		if (is_array($include_boards) || (int) $include_boards === $include_boards)
-		{
-			$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-		}
-		elseif ($include_boards != null)
-		{
+		if (is_array($include_boards) || (int) $include_boards === $include_boards) {
+			$include_boards = is_array($include_boards) ? $include_boards : [$include_boards];
+		} elseif ($include_boards != null) {
 			$output_method = $include_boards;
-			$include_boards = array();
+			$include_boards = [];
 		}
 
-		$icon_sources = array();
-		foreach (Utils::$context['stable_icons'] as $icon)
+		$icon_sources = [];
+
+		foreach (Utils::$context['stable_icons'] as $icon) {
 			$icon_sources[$icon] = 'images_url';
+		}
 
 		// Find all the posts in distinct topics.  Newer ones will have higher IDs.
-		$request = Db::$db->query('substring', '
-			SELECT
+		$request = Db::$db->query(
+			'substring',
+			'SELECT
 				t.id_topic, b.id_board, b.name AS board_name
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
@@ -606,27 +663,31 @@ public static function recentTopics($num_recent = 8, $exclude_boards = null, $in
 				AND ml.approved = {int:is_approved}' : '') . '
 			ORDER BY t.id_last_msg DESC
 			LIMIT ' . $num_recent,
-			array(
+			[
 				'include_boards' => empty($include_boards) ? '' : $include_boards,
 				'exclude_boards' => empty($exclude_boards) ? '' : $exclude_boards,
 				'min_message_id' => Config::$modSettings['maxMsgID'] - (!empty(Utils::$context['min_message_topics']) ? Utils::$context['min_message_topics'] : 35) * min($num_recent, 5),
 				'is_approved' => 1,
-			)
+			],
 		);
-		$topics = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$topics = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$topics[$row['id_topic']] = $row;
+		}
 		Db::$db->free_result($request);
 
 		// Did we find anything? If not, bail.
-		if (empty($topics))
-			return array();
+		if (empty($topics)) {
+			return [];
+		}
 
 		$recycle_board = !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : 0;
 
 		// Find all the posts in distinct topics.  Newer ones will have higher IDs.
-		$request = Db::$db->query('substring', '
-			SELECT
+		$request = Db::$db->query(
+			'substring',
+			'SELECT
 				ml.poster_time, mf.subject, mf.id_topic, ml.id_member, ml.id_msg, t.num_replies, t.num_views, mg.online_color, t.id_last_msg,
 				COALESCE(mem.real_name, ml.poster_name) AS poster_name, ' . (User::$me->is_guest ? '1 AS is_read, 0 AS new_from' : '
 				COALESCE(lt.id_msg, lmr.id_msg, 0) >= ml.id_msg_modified AS is_read,
@@ -640,46 +701,50 @@ public static function recentTopics($num_recent = 8, $exclude_boards = null, $in
 				LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = mem.id_group)
 			WHERE t.id_topic IN ({array_int:topic_list})
 			ORDER BY t.id_last_msg DESC',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'topic_list' => array_keys($topics),
-			)
+			],
 		);
-		$posts = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$row['body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-			if (Utils::entityStrlen($row['body']) > 128)
+		$posts = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$row['body'] = strip_tags(strtr(BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']), ['<br>' => '&#10;']));
+
+			if (Utils::entityStrlen($row['body']) > 128) {
 				$row['body'] = Utils::entitySubstr($row['body'], 0, 128) . '...';
+			}
 
 			// Censor the subject.
 			Lang::censorText($row['subject']);
 			Lang::censorText($row['body']);
 
 			// Recycled icon
-			if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'] == $recycle_board)
+			if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'] == $recycle_board) {
 				$row['icon'] = 'recycled';
+			}
 
-			if (!empty(Config::$modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
+			if (!empty(Config::$modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
 				$icon_sources[$row['icon']] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
-			elseif (!isset($icon_sources[$row['icon']]))
+			} elseif (!isset($icon_sources[$row['icon']])) {
 				$icon_sources[$row['icon']] = 'images_url';
+			}
 
 			// Build the array.
-			$posts[] = array(
-				'board' => array(
+			$posts[] = [
+				'board' => [
 					'id' => $topics[$row['id_topic']]['id_board'],
 					'name' => $topics[$row['id_topic']]['board_name'],
 					'href' => Config::$scripturl . '?board=' . $topics[$row['id_topic']]['id_board'] . '.0',
 					'link' => '<a href="' . Config::$scripturl . '?board=' . $topics[$row['id_topic']]['id_board'] . '.0">' . $topics[$row['id_topic']]['board_name'] . '</a>',
-				),
+				],
 				'topic' => $row['id_topic'],
-				'poster' => array(
+				'poster' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'href' => empty($row['id_member']) ? '' : Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>'
-				),
+					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>',
+				],
 				'subject' => $row['subject'],
 				'replies' => $row['num_replies'],
 				'views' => $row['num_views'],
@@ -694,20 +759,22 @@ public static function recentTopics($num_recent = 8, $exclude_boards = null, $in
 				'is_new' => empty($row['is_read']),
 				'new_from' => $row['new_from'],
 				'icon' => '<img src="' . Theme::$current->settings[$icon_sources[$row['icon']]] . '/post/' . $row['icon'] . '.png" style="vertical-align:middle;" alt="' . $row['icon'] . '">',
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// If mods want to do something with this list of topics, let them do that now.
-		IntegrationHook::call('integrate_ssi_recentTopics', array(&$posts));
+		IntegrationHook::call('integrate_ssi_recentTopics', [&$posts]);
 
 		// Just return it.
-		if ($output_method != 'echo' || empty($posts))
+		if ($output_method != 'echo' || empty($posts)) {
 			return $posts;
+		}
 
 		echo '
 			<table style="border: none" class="ssi_table">';
-		foreach ($posts as $post)
+
+		foreach ($posts as $post) {
 			echo '
 				<tr>
 					<td style="text-align: right; vertical-align: top; white-space: nowrap">
@@ -722,6 +789,7 @@ public static function recentTopics($num_recent = 8, $exclude_boards = null, $in
 						', $post['time'], '
 					</td>
 				</tr>';
+		}
 		echo '
 			</table>';
 	}
@@ -737,40 +805,47 @@ public static function recentTopics($num_recent = 8, $exclude_boards = null, $in
 	 */
 	public static function topPoster($topNumber = 1, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// Find the latest poster.
-		$request = Db::$db->query('', '
-			SELECT id_member, real_name, posts
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, posts
 			FROM {db_prefix}members
 			ORDER BY posts DESC
 			LIMIT ' . $topNumber,
-			array(
-			)
+			[
+			],
 		);
-		$return = array();
-		while ($row = Db::$db->fetch_assoc($request))
-			$return[] = array(
+		$return = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$return[] = [
 				'id' => $row['id_member'],
 				'name' => $row['real_name'],
 				'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
 				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
-				'posts' => $row['posts']
-			);
+				'posts' => $row['posts'],
+			];
+		}
 		Db::$db->free_result($request);
 
 		// If mods want to do something with this list of members, let them do that now.
-		IntegrationHook::call('integrate_ssi_topPoster', array(&$return));
+		IntegrationHook::call('integrate_ssi_topPoster', [&$return]);
 
 		// Just return all the top posters.
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return;
+		}
 
 		// Make a quick array to list the links in.
-		$temp_array = array();
-		foreach ($return as $member)
+		$temp_array = [];
+
+		foreach ($return as $member) {
 			$temp_array[] = $member['link'];
+		}
 
 		echo implode(', ', $temp_array);
 	}
@@ -786,12 +861,14 @@ public static function topPoster($topNumber = 1, $output_method = 'echo')
 	 */
 	public static function topBoards($num_top = 10, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// Find boards with lots of posts.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				b.name, b.num_topics, b.num_posts, b.id_board,' . (!User::$me->is_guest ? ' 1 AS is_read' : '
 				(COALESCE(lb.id_msg, 0) >= b.id_last_msg) AS is_read') . '
 			FROM {db_prefix}boards AS b
@@ -800,30 +877,33 @@ public static function topBoards($num_top = 10, $output_method = 'echo')
 				AND b.id_board != {int:recycle_board}' : '') . '
 			ORDER BY b.num_posts DESC
 			LIMIT ' . $num_top,
-			array(
+			[
 				'current_member' => User::$me->id,
 				'recycle_board' => !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : null,
-			)
+			],
 		);
-		$boards = array();
-		while ($row = Db::$db->fetch_assoc($request))
-			$boards[] = array(
+		$boards = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$boards[] = [
 				'id' => $row['id_board'],
 				'num_posts' => $row['num_posts'],
 				'num_topics' => $row['num_topics'],
 				'name' => $row['name'],
 				'new' => empty($row['is_read']),
 				'href' => Config::$scripturl . '?board=' . $row['id_board'] . '.0',
-				'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>',
+			];
+		}
 		Db::$db->free_result($request);
 
 		// If mods want to do something with this list of boards, let them do that now.
-		IntegrationHook::call('integrate_ssi_topBoards', array(&$boards));
+		IntegrationHook::call('integrate_ssi_topBoards', [&$boards]);
 
 		// If we shouldn't output or have nothing to output, just jump out.
-		if ($output_method != 'echo' || empty($boards))
+		if ($output_method != 'echo' || empty($boards)) {
 			return $boards;
+		}
 
 		echo '
 			<table class="ssi_table">
@@ -832,13 +912,15 @@ public static function topBoards($num_top = 10, $output_method = 'echo')
 					<th style="text-align: left">', Lang::$txt['board_topics'], '</th>
 					<th style="text-align: left">', Lang::$txt['posts'], '</th>
 				</tr>';
-		foreach ($boards as $sBoard)
+
+		foreach ($boards as $sBoard) {
 			echo '
 				<tr>
 					<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '" class="new_posts">' . Lang::$txt['new'] . '</a>' : '', '</td>
 					<td style="text-align: right">', Lang::numberFormat($sBoard['num_topics']), '</td>
 					<td style="text-align: right">', Lang::numberFormat($sBoard['num_posts']), '</td>
 				</tr>';
+		}
 		echo '
 			</table>';
 	}
@@ -855,34 +937,38 @@ public static function topBoards($num_top = 10, $output_method = 'echo')
 	 */
 	public static function topTopics($type = 'replies', $num_topics = 10, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (Config::$modSettings['totalMessages'] > 100000)
-		{
+		if (Config::$modSettings['totalMessages'] > 100000) {
 			// @todo Why don't we use {query(_wanna)_see_board}?
-			$request = Db::$db->query('', '
-				SELECT id_topic
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic
 				FROM {db_prefix}topics
 				WHERE num_' . ($type != 'replies' ? 'views' : 'replies') . ' != 0' . (Config::$modSettings['postmod_active'] ? '
 					AND approved = {int:is_approved}' : '') . '
 				ORDER BY num_' . ($type != 'replies' ? 'views' : 'replies') . ' DESC
 				LIMIT {int:limit}',
-				array(
+				[
 					'is_approved' => 1,
 					'limit' => $num_topics > 100 ? ($num_topics + ($num_topics / 2)) : 100,
-				)
+				],
 			);
-			$topic_ids = array();
-			while ($row = Db::$db->fetch_assoc($request))
+			$topic_ids = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$topic_ids[] = $row['id_topic'];
+			}
 			Db::$db->free_result($request);
+		} else {
+			$topic_ids = [];
 		}
-		else
-			$topic_ids = array();
 
-		$request = Db::$db->query('', '
-			SELECT m.subject, m.id_topic, t.num_views, t.num_replies
+		$request = Db::$db->query(
+			'',
+			'SELECT m.subject, m.id_topic, t.num_views, t.num_replies
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				INNER JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
@@ -892,34 +978,35 @@ public static function topTopics($type = 'replies', $num_topics = 10, $output_me
 				AND b.id_board != {int:recycle_board}' : '') . '
 			ORDER BY t.num_' . ($type != 'replies' ? 'views' : 'replies') . ' DESC
 			LIMIT {int:limit}',
-			array(
+			[
 				'topic_list' => $topic_ids,
 				'is_approved' => 1,
 				'recycle_board' => !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : null,
 				'limit' => $num_topics,
-			)
+			],
 		);
-		$topics = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$topics = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Lang::censorText($row['subject']);
 
-			$topics[] = array(
+			$topics[] = [
 				'id' => $row['id_topic'],
 				'subject' => $row['subject'],
 				'num_replies' => $row['num_replies'],
 				'num_views' => $row['num_views'],
 				'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.0',
 				'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['subject'] . '</a>',
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// If mods want to do something with this list of topics, let them do that now.
-		IntegrationHook::call('integrate_ssi_topTopics', array(&$topics, $type));
+		IntegrationHook::call('integrate_ssi_topTopics', [&$topics, $type]);
 
-		if ($output_method != 'echo' || empty($topics))
+		if ($output_method != 'echo' || empty($topics)) {
 			return $topics;
+		}
 
 		echo '
 			<table class="ssi_table">
@@ -928,7 +1015,8 @@ public static function topTopics($type = 'replies', $num_topics = 10, $output_me
 					<th style="text-align: left">', Lang::$txt['views'], '</th>
 					<th style="text-align: left">', Lang::$txt['replies'], '</th>
 				</tr>';
-		foreach ($topics as $sTopic)
+
+		foreach ($topics as $sTopic) {
 			echo '
 				<tr>
 					<td style="text-align: left">
@@ -937,6 +1025,7 @@ public static function topTopics($type = 'replies', $num_topics = 10, $output_me
 					<td style="text-align: right">', Lang::numberFormat($sTopic['num_views']), '</td>
 					<td style="text-align: right">', Lang::numberFormat($sTopic['num_replies']), '</td>
 				</tr>';
+		}
 		echo '
 			</table>';
 	}
@@ -952,8 +1041,9 @@ public static function topTopics($type = 'replies', $num_topics = 10, $output_me
 	 */
 	public static function topTopicsReplies($num_topics = 10, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		return self::topTopics('replies', $num_topics, $output_method);
 	}
@@ -969,8 +1059,9 @@ public static function topTopicsReplies($num_topics = 10, $output_method = 'echo
 	 */
 	public static function topTopicsViews($num_topics = 10, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		return self::topTopics('views', $num_topics, $output_method);
 	}
@@ -985,14 +1076,16 @@ public static function topTopicsViews($num_topics = 10, $output_method = 'echo')
 	 */
 	public static function latestMember($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo '
 		', sprintf(Lang::$txt['welcome_newest_member'], Utils::$context['common_stats']['latest_member']['link']), '<br>';
-		else
+		} else {
 			return Utils::$context['common_stats']['latest_member'];
+		}
 	}
 
 	/**
@@ -1006,12 +1099,12 @@ public static function latestMember($output_method = 'echo')
 	 */
 	public static function randomMember($random_type = '', $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// If we're looking for something to stay the same each day then seed the generator.
-		if ($random_type == 'day')
-		{
+		if ($random_type == 'day') {
 			// Set the seed to change only once per day.
 			mt_srand(floor(time() / 86400));
 		}
@@ -1023,31 +1116,31 @@ public static function randomMember($random_type = '', $output_method = 'echo')
 			id_member >= {int:selected_member}
 			AND is_activated = {int:is_activated}';
 
-		$query_where_params = array(
+		$query_where_params = [
 			'selected_member' => $member_id,
 			'is_activated' => 1,
-		);
+		];
 
 		$result = self::queryMembers($where_query, $query_where_params, 1, 'id_member ASC', $output_method);
 
 		// If we got nothing do the reverse - in case of unactivated members.
-		if (empty($result))
-		{
+		if (empty($result)) {
 			$where_query = '
 				id_member <= {int:selected_member}
 				AND is_activated = {int:is_activated}';
 
-			$query_where_params = array(
+			$query_where_params = [
 				'selected_member' => $member_id,
 				'is_activated' => 1,
-			);
+			];
 
 			$result = self::queryMembers($where_query, $query_where_params, 1, 'id_member DESC', $output_method);
 		}
 
 		// Just to be sure put the random generator back to something... random.
-		if ($random_type != '')
+		if ($random_type != '') {
 			mt_srand(time());
+		}
 
 		return $result;
 	}
@@ -1061,24 +1154,26 @@ public static function randomMember($random_type = '', $output_method = 'echo')
 	 * @param string $output_method The output method. If 'echo', displays a list of links to the members' profiles, otherwise returns an array of info about them.
 	 * @return void|array Displays links to the specified members' profiles or returns an array of info about them, depending on output_method.
 	 */
-	public static function fetchMember($member_ids = array(), $output_method = 'echo')
+	public static function fetchMember($member_ids = [], $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty($member_ids))
+		if (empty($member_ids)) {
 			return;
+		}
 
 		// Can have more than one member if you really want...
-		$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
+		$member_ids = is_array($member_ids) ? $member_ids : [$member_ids];
 
 		// Restrict it right!
 		$query_where = '
 			id_member IN ({array_int:member_list})';
 
-		$query_where_params = array(
+		$query_where_params = [
 			'member_list' => $member_ids,
-		);
+		];
 
 		// Then make the query and dump the data.
 		return self::queryMembers($query_where, $query_where_params, '', 'id_member', $output_method);
@@ -1095,20 +1190,22 @@ public static function fetchMember($member_ids = array(), $output_method = 'echo
 	 */
 	public static function fetchGroupMembers($group_id = null, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($group_id === null)
+		if ($group_id === null) {
 			return;
+		}
 
 		$query_where = '
 			id_group = {int:id_group}
 			OR id_post_group = {int:id_group}
 			OR FIND_IN_SET({int:id_group}, additional_groups) != 0';
 
-		$query_where_params = array(
+		$query_where_params = [
 			'id_group' => $group_id,
-		);
+		];
 
 		return self::queryMembers($query_where, $query_where_params, '', 'real_name', $output_method);
 	}
@@ -1126,55 +1223,63 @@ public static function fetchGroupMembers($group_id = null, $output_method = 'ech
 	 * @param string $output_method The output method. If 'echo', displays a list of members, otherwise returns an array of info about them
 	 * @return void|array Displays a list of members or returns an array of info about them, depending on output_method.
 	 */
-	public static function queryMembers($query_where = null, $query_where_params = array(), $query_limit = '', $query_order = 'id_member DESC', $output_method = 'echo')
+	public static function queryMembers($query_where = null, $query_where_params = [], $query_limit = '', $query_order = 'id_member DESC', $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($query_where === null)
+		if ($query_where === null) {
 			return;
+		}
 
 		// Fetch the members in question.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}members
 			WHERE ' . $query_where . '
 			ORDER BY ' . $query_order . '
 			' . ($query_limit == '' ? '' : 'LIMIT ' . $query_limit),
-			array_merge($query_where_params, array(
-			))
+			array_merge($query_where_params, [
+			]),
 		);
-		$members = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$members = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
+		}
 		Db::$db->free_result($request);
 
-		if (empty($members))
-			return array();
+		if (empty($members)) {
+			return [];
+		}
 
 		// If mods want to do something with this list of members, let them do that now.
-		IntegrationHook::call('integrate_ssi_queryMembers', array(&$members));
+		IntegrationHook::call('integrate_ssi_queryMembers', [&$members]);
 
 		// Load the members.
 		User::load($members);
 
 		// Draw the table!
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo '
 			<table style="border: none" class="ssi_table">';
+		}
+
+		$query_members = [];
 
-		$query_members = array();
-		foreach ($members as $member)
-		{
+		foreach ($members as $member) {
 			// Load their context data.
-			if (!isset(User::$loaded[$member]))
+			if (!isset(User::$loaded[$member])) {
 				continue;
+			}
 
 			// Store this member's information.
 			$query_members[$member] = User::$loaded[$member]->format();
 
 			// Only do something if we're echo'ing.
-			if ($output_method == 'echo')
+			if ($output_method == 'echo') {
 				echo '
 				<tr>
 					<td style="text-align: right; vertical-align: top; white-space: nowrap">
@@ -1183,12 +1288,14 @@ public static function queryMembers($query_where = null, $query_where_params = a
 						<br>', $query_members[$member]['avatar']['image'], '
 					</td>
 				</tr>';
+			}
 		}
 
 		// End the table if appropriate.
-		if ($output_method == 'echo')
+		if ($output_method == 'echo') {
 			echo '
 			</table>';
+		}
 
 		// Send back the data.
 		return $query_members;
@@ -1204,41 +1311,46 @@ public static function queryMembers($query_where = null, $query_where_params = a
 	 */
 	public static function boardStats($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (!User::$me->allowedTo('view_stats'))
+		if (!User::$me->allowedTo('view_stats')) {
 			return;
+		}
 
-		$totals = array(
+		$totals = [
 			'members' => Config::$modSettings['totalMembers'],
 			'posts' => Config::$modSettings['totalMessages'],
-			'topics' => Config::$modSettings['totalTopics']
-		);
+			'topics' => Config::$modSettings['totalTopics'],
+		];
 
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}boards',
-			array(
-			)
+			[
+			],
 		);
-		list ($totals['boards']) = Db::$db->fetch_row($result);
+		list($totals['boards']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
-		$result = Db::$db->query('', '
-			SELECT COUNT(*)
+		$result = Db::$db->query(
+			'',
+			'SELECT COUNT(*)
 			FROM {db_prefix}categories',
-			array(
-			)
+			[
+			],
 		);
-		list ($totals['categories']) = Db::$db->fetch_row($result);
+		list($totals['categories']) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
 
 		// If mods want to do something with the board stats, let them do that now.
-		IntegrationHook::call('integrate_ssi_boardStats', array(&$totals));
+		IntegrationHook::call('integrate_ssi_boardStats', [&$totals]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $totals;
+		}
 
 		echo '
 			', Lang::$txt['total_members'], ': <a href="', Config::$scripturl . '?action=mlist">', Lang::numberFormat($totals['members']), '</a><br>
@@ -1258,55 +1370,64 @@ public static function boardStats($output_method = 'echo')
 	 */
 	public static function whosOnline($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		$membersOnlineOptions = array(
+		$membersOnlineOptions = [
 			'show_hidden' => User::$me->allowedTo('moderate_forum'),
-		);
+		];
 		$return = Logging::getMembersOnlineStats($membersOnlineOptions);
 
 		// If mods want to do something with the list of who is online, let them do that now.
-		IntegrationHook::call('integrate_ssi_whosOnline', array(&$return));
+		IntegrationHook::call('integrate_ssi_whosOnline', [&$return]);
 
 		// Add some redundancy for backwards compatibility reasons.
-		if ($output_method != 'echo')
-			return $return + array(
+		if ($output_method != 'echo') {
+			return $return + [
 				'users' => $return['users_online'],
 				'guests' => $return['num_guests'],
 				'hidden' => $return['num_users_hidden'],
 				'buddies' => $return['num_buddies'],
 				'num_users' => $return['num_users_online'],
 				'total_users' => $return['num_users_online'] + $return['num_guests'],
-			);
+			];
+		}
 
 		echo '
 			', Lang::numberFormat($return['num_guests']), ' ', $return['num_guests'] == 1 ? Lang::$txt['guest'] : Lang::$txt['guests'], ', ', Lang::numberFormat($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? Lang::$txt['user'] : Lang::$txt['users'];
 
-		$bracketList = array();
-		if (!empty(User::$me->buddies))
+		$bracketList = [];
+
+		if (!empty(User::$me->buddies)) {
 			$bracketList[] = Lang::numberFormat($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? Lang::$txt['buddy'] : Lang::$txt['buddies']);
-		if (!empty($return['num_spiders']))
+		}
+
+		if (!empty($return['num_spiders'])) {
 			$bracketList[] = Lang::numberFormat($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? Lang::$txt['spider'] : Lang::$txt['spiders']);
-		if (!empty($return['num_users_hidden']))
+		}
+
+		if (!empty($return['num_users_hidden'])) {
 			$bracketList[] = Lang::numberFormat($return['num_users_hidden']) . ' ' . Lang::$txt['hidden'];
+		}
 
-		if (!empty($bracketList))
+		if (!empty($bracketList)) {
 			echo ' (' . implode(', ', $bracketList) . ')';
+		}
 
 		echo '<br>
 				', implode(', ', $return['list_users_online']);
 
 		// Showing membergroups?
-		if (!empty(Theme::$current->settings['show_group_key']) && !empty($return['online_groups']))
-		{
-			$membergroups = CacheApi::quickGet('membergroup_list', 'Group.php', 'SMF\\Group::getCachedList', array());
-
-			$groups = array();
-			foreach ($return['online_groups'] as $group)
-			{
-				if (isset($membergroups[$group['id']]))
+		if (!empty(Theme::$current->settings['show_group_key']) && !empty($return['online_groups'])) {
+			$membergroups = CacheApi::quickGet('membergroup_list', 'Group.php', 'SMF\\Group::getCachedList', []);
+
+			$groups = [];
+
+			foreach ($return['online_groups'] as $group) {
+				if (isset($membergroups[$group['id']])) {
 					$groups[] = $membergroups[$group['id']];
+				}
 			}
 
 			echo '<br>
@@ -1324,15 +1445,17 @@ public static function whosOnline($output_method = 'echo')
 	 */
 	public static function logOnline($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		User::$me->logOnline();
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return self::whosOnline($output_method);
-		else
-			self::whosOnline($output_method);
+		}
+
+		self::whosOnline($output_method);
 	}
 
 	/**
@@ -1346,14 +1469,17 @@ public static function logOnline($output_method = 'echo')
 	 */
 	public static function login($redirect_to = '', $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if ($redirect_to != '')
+		if ($redirect_to != '') {
 			$_SESSION['login_url'] = $redirect_to;
+		}
 
-		if ($output_method != 'echo' || !User::$me->is_guest)
+		if ($output_method != 'echo' || !User::$me->is_guest) {
 			return User::$me->is_guest;
+		}
 
 		// Create a login token
 		SecurityToken::create('login');
@@ -1378,7 +1504,6 @@ public static function login($redirect_to = '', $output_method = 'echo')
 					</tr>
 				</table>
 			</form>';
-
 	}
 
 	/**
@@ -1391,8 +1516,9 @@ public static function login($redirect_to = '', $output_method = 'echo')
 	 */
 	public static function topPoll($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// Just use recentPoll, no need to duplicate code...
 		return self::recentPoll(true, $output_method);
@@ -1409,54 +1535,53 @@ public static function topPoll($output_method = 'echo')
 	 */
 	public static function recentPoll($topPollInstead = false, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		$poll = Poll::load(0, ($topPollInstead ? Poll::LOAD_BY_VOTES : Poll::LOAD_BY_RECENT) | Poll::CHECK_ACCESS | Poll::CHECK_IGNORE | Poll::CHECK_LOCKED | Poll::CHECK_EXPIRY);
 
-		if (empty($poll))
-			return array();
+		if (empty($poll)) {
+			return [];
+		}
 
 		$return = $poll->format();
 
 		// If mods want to do something with this poll, let them do that now.
-		IntegrationHook::call('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
+		IntegrationHook::call('integrate_ssi_recentPoll', [&$return, $topPollInstead]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return;
+		}
 
-		if ($return['allow_vote'])
-		{
+		if ($return['allow_vote']) {
 			echo '
 				<form class="ssi_poll" action="', Config::$boardurl, '/SSI.php?ssi_function=pollVote" method="post" accept-charset="', Utils::$context['character_set'], '">
 					<strong>', $return['question'], '</strong><br>
 					', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-			foreach ($return['options'] as $option)
+			foreach ($return['options'] as $option) {
 				echo '
 					<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+			}
 
 			echo '
 					<input type="submit" value="', Lang::$txt['poll_vote'], '" class="button">
 					<input type="hidden" name="poll" value="', $return['id'], '">
 					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
 				</form>';
-		}
-		elseif ($return['allow_view_results'])
-		{
+		} elseif ($return['allow_view_results']) {
 			echo '
 				<div class="ssi_poll">
 					<strong>', $return['question'], '</strong>
 					<dl>';
 
-			foreach ($return['options'] as $option)
-			{
+			foreach ($return['options'] as $option) {
 				echo '
 						<dt>', $option['option'], '</dt>
 						<dd>';
 
-				if ($return['allow_view_results'])
-				{
+				if ($return['allow_view_results']) {
 					echo '
 							<div class="ssi_poll_bar" style="border: 1px solid #666; height: 1em">
 								<div class="ssi_poll_bar_fill" style="background: #ccf; height: 1em; width: ', $option['percent'], '%;">
@@ -1473,9 +1598,9 @@ public static function recentPoll($topPollInstead = false, $output_method = 'ech
 					</dl>', ($return['allow_view_results'] ? '
 					<strong>' . Lang::$txt['poll_total_voters'] . ': ' . $return['total_votes'] . '</strong>' : ''), '
 				</div>';
-		}
-		else
+		} else {
 			echo Lang::$txt['poll_cannot_see'];
+		}
 	}
 
 	/**
@@ -1489,59 +1614,59 @@ public static function recentPoll($topPollInstead = false, $output_method = 'ech
 	 */
 	public static function showPoll($topic = null, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		$topic = (int) ($topic ?? ($_REQUEST['ssi_topic'] ?? 0));
 
-		if (empty($topic))
-			return array();
+		if (empty($topic)) {
+			return [];
+		}
 
 		$poll = Poll::load($topic, Poll::LOAD_BY_TOPIC | Poll::CHECK_ACCESS);
 
-		if (empty($poll))
-			return array();
+		if (empty($poll)) {
+			return [];
+		}
 
 		$return = $poll->format();
 
 		// If mods want to do something with this poll, let them do that now.
-		IntegrationHook::call('integrate_ssi_showPoll', array(&$return));
+		IntegrationHook::call('integrate_ssi_showPoll', [&$return]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return;
+		}
 
-		if ($return['allow_vote'])
-		{
+		if ($return['allow_vote']) {
 			echo '
 				<form class="ssi_poll" action="', Config::$boardurl, '/SSI.php?ssi_function=pollVote" method="post" accept-charset="', Utils::$context['character_set'], '">
 					<strong>', $return['question'], '</strong><br>
 					', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-			foreach ($return['options'] as $option)
+			foreach ($return['options'] as $option) {
 				echo '
 					<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+			}
 
 			echo '
 					<input type="submit" value="', Lang::$txt['poll_vote'], '" class="button">
 					<input type="hidden" name="poll" value="', $return['id'], '">
 					<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
 				</form>';
-		}
-		elseif ($return['allow_view_results'])
-		{
+		} elseif ($return['allow_view_results']) {
 			echo '
 				<div class="ssi_poll">
 					<strong>', $return['question'], '</strong>
 					<dl>';
 
-			foreach ($return['options'] as $option)
-			{
+			foreach ($return['options'] as $option) {
 				echo '
 						<dt>', $option['option'], '</dt>
 						<dd>';
 
-				if ($return['allow_view_results'])
-				{
+				if ($return['allow_view_results']) {
 					echo '
 							<div class="ssi_poll_bar" style="border: 1px solid #666; height: 1em">
 								<div class="ssi_poll_bar_fill" style="background: #ccf; height: 1em; width: ', $option['percent'], '%;">
@@ -1558,9 +1683,9 @@ public static function showPoll($topic = null, $output_method = 'echo')
 					</dl>', ($return['allow_view_results'] ? '
 					<strong>' . Lang::$txt['poll_total_voters'] . ': ' . $return['total_votes'] . '</strong>' : ''), '
 				</div>';
-		}
-		else
+		} else {
 			echo Lang::$txt['poll_cannot_see'];
+		}
 	}
 
 	/**
@@ -1570,11 +1695,11 @@ public static function showPoll($topic = null, $output_method = 'echo')
 	 */
 	public static function pollVote()
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (!isset($_POST[Utils::$context['session_var']]) || $_POST[Utils::$context['session_var']] != User::$sc || empty($_POST['options']) || !isset($_POST['poll']))
-		{
+		if (!isset($_POST[Utils::$context['session_var']]) || $_POST[Utils::$context['session_var']] != User::$sc || empty($_POST['options']) || !isset($_POST['poll'])) {
 			echo '<!DOCTYPE html>
 	<html>
 	<head>
@@ -1584,6 +1709,7 @@ public static function pollVote()
 	</head>
 	<body>&laquo;</body>
 	</html>';
+
 			return;
 		}
 
@@ -1593,8 +1719,9 @@ public static function pollVote()
 		$_POST['poll'] = (int) $_POST['poll'];
 
 		// Check if they have already voted, or voting is locked.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				p.id_poll, p.voting_locked, p.expire_time, p.max_votes, p.guest_vote,
 				t.id_topic,
 				COALESCE(lp.id_choice, -1) AS selected
@@ -1606,66 +1733,72 @@ public static function pollVote()
 				AND {query_see_board}' . (Config::$modSettings['postmod_active'] ? '
 				AND t.approved = {int:is_approved}' : '') . '
 			LIMIT 1',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'current_poll' => $_POST['poll'],
 				'is_approved' => 1,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
+
+		if (Db::$db->num_rows($request) == 0) {
 			die;
+		}
 		$row = Db::$db->fetch_assoc($request);
 		Db::$db->free_result($request);
 
-		if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !User::$me->is_guest) || (!empty($row['expire_time']) && time() > $row['expire_time']))
+		if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !User::$me->is_guest) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
 			Utils::redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 
 		// Too many options checked?
-		if (count($_REQUEST['options']) > $row['max_votes'])
+		if (count($_REQUEST['options']) > $row['max_votes']) {
 			Utils::redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 
 		// It's a guest who has already voted?
-		if (User::$me->is_guest)
-		{
+		if (User::$me->is_guest) {
 			// Guest voting disabled?
-			if (!$row['guest_vote'])
+			if (!$row['guest_vote']) {
 				Utils::redirectexit('topic=' . $row['id_topic'] . '.0');
+			}
 			// Already voted?
-			elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
+			elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
 				Utils::redirectexit('topic=' . $row['id_topic'] . '.0');
+			}
 		}
 
-		$sOptions = array();
-		$inserts = array();
-		foreach ($_REQUEST['options'] as $id)
-		{
+		$sOptions = [];
+		$inserts = [];
+
+		foreach ($_REQUEST['options'] as $id) {
 			$id = (int) $id;
 
 			$sOptions[] = $id;
-			$inserts[] = array($_POST['poll'], User::$me->id, $id);
+			$inserts[] = [$_POST['poll'], User::$me->id, $id];
 		}
 
 		// Add their vote in to the tally.
-		Db::$db->insert('insert',
+		Db::$db->insert(
+			'insert',
 			Db::$db->prefix . 'log_polls',
-			array('id_poll' => 'int', 'id_member' => 'int', 'id_choice' => 'int'),
+			['id_poll' => 'int', 'id_member' => 'int', 'id_choice' => 'int'],
 			$inserts,
-			array('id_poll', 'id_member', 'id_choice')
+			['id_poll', 'id_member', 'id_choice'],
 		);
-		Db::$db->query('', '
-			UPDATE {db_prefix}poll_choices
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}poll_choices
 			SET votes = votes + 1
 			WHERE id_poll = {int:current_poll}
 				AND id_choice IN ({array_int:option_list})',
-			array(
+			[
 				'option_list' => $sOptions,
 				'current_poll' => $_POST['poll'],
-			)
+			],
 		);
 
 		// Track the vote if a guest.
-		if (User::$me->is_guest)
-		{
+		if (User::$me->is_guest) {
 			$_COOKIE['guest_poll_vote'] = !empty($_COOKIE['guest_poll_vote']) ? ($_COOKIE['guest_poll_vote'] . ',' . $row['id_poll']) : $row['id_poll'];
 
 			$cookie = new Cookie('guest_poll_vote', $_COOKIE['guest_poll_vote'], time() + 2500000);
@@ -1685,14 +1818,17 @@ public static function pollVote()
 	 */
 	public static function quickSearch($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (!User::$me->allowedTo('search_posts'))
+		if (!User::$me->allowedTo('search_posts')) {
 			return;
+		}
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return Config::$scripturl . '?action=search';
+		}
 
 		echo '
 			<form action="', Config::$scripturl, '?action=search2" method="post" accept-charset="', Utils::$context['character_set'], '">
@@ -1710,16 +1846,18 @@ public static function quickSearch($output_method = 'echo')
 	 */
 	public static function news($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		Utils::$context['random_news_line'] = !empty(Utils::$context['news_lines']) ? Utils::$context['news_lines'][mt_rand(0, count(Utils::$context['news_lines']) - 1)] : '';
 
 		// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in Utils::$context.
 		IntegrationHook::call('integrate_ssi_news');
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return Utils::$context['random_news_line'];
+		}
 
 		echo Utils::$context['random_news_line'];
 	}
@@ -1735,27 +1873,31 @@ public static function news($output_method = 'echo')
 	public static function todaysBirthdays($output_method = 'echo')
 	{
 
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view') || !User::$me->allowedTo('profile_view'))
+		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view') || !User::$me->allowedTo('profile_view')) {
 			return;
+		}
 
-		$eventOptions = array(
+		$eventOptions = [
 			'include_birthdays' => true,
 			'num_days_shown' => empty(Config::$modSettings['cal_days_for_index']) || Config::$modSettings['cal_days_for_index'] < 1 ? 1 : Config::$modSettings['cal_days_for_index'],
-		);
-		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', array($eventOptions));
+		];
+		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', [$eventOptions]);
 
 		// The self::todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
-		IntegrationHook::call('integrate_ssi_calendar', array(&$return, $eventOptions));
+		IntegrationHook::call('integrate_ssi_calendar', [&$return, $eventOptions]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return['calendar_birthdays'];
+		}
 
-		foreach ($return['calendar_birthdays'] as $member)
+		foreach ($return['calendar_birthdays'] as $member) {
 			echo '
 				<a href="', Config::$scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
+		}
 	}
 
 	/**
@@ -1768,23 +1910,26 @@ public static function todaysBirthdays($output_method = 'echo')
 	 */
 	public static function todaysHolidays($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view'))
+		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view')) {
 			return;
+		}
 
-		$eventOptions = array(
+		$eventOptions = [
 			'include_holidays' => true,
 			'num_days_shown' => empty(Config::$modSettings['cal_days_for_index']) || Config::$modSettings['cal_days_for_index'] < 1 ? 1 : Config::$modSettings['cal_days_for_index'],
-		);
-		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', array($eventOptions));
+		];
+		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', [$eventOptions]);
 
 		// The self::todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
-		IntegrationHook::call('integrate_ssi_calendar', array(&$return, $eventOptions));
+		IntegrationHook::call('integrate_ssi_calendar', [&$return, $eventOptions]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return['calendar_holidays'];
+		}
 
 		echo '
 			', implode(', ', $return['calendar_holidays']);
@@ -1800,29 +1945,32 @@ public static function todaysHolidays($output_method = 'echo')
 	 */
 	public static function todaysEvents($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view'))
+		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view')) {
 			return;
+		}
 
-		$eventOptions = array(
+		$eventOptions = [
 			'include_events' => true,
 			'num_days_shown' => empty(Config::$modSettings['cal_days_for_index']) || Config::$modSettings['cal_days_for_index'] < 1 ? 1 : Config::$modSettings['cal_days_for_index'],
-		);
-		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', array($eventOptions));
+		];
+		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', [$eventOptions]);
 
 		// The self::todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
-		IntegrationHook::call('integrate_ssi_calendar', array(&$return, $eventOptions));
+		IntegrationHook::call('integrate_ssi_calendar', [&$return, $eventOptions]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return['calendar_events'];
+		}
 
-		foreach ($return['calendar_events'] as $event)
-		{
-			if ($event['can_edit'])
+		foreach ($return['calendar_events'] as $event) {
+			if ($event['can_edit']) {
 				echo '
 		<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+			}
 			echo '
 		' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 		}
@@ -1838,48 +1986,55 @@ public static function todaysEvents($output_method = 'echo')
 	 */
 	public static function todaysCalendar($output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view'))
+		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view')) {
 			return;
+		}
 
-		$eventOptions = array(
+		$eventOptions = [
 			'include_birthdays' => User::$me->allowedTo('profile_view'),
 			'include_holidays' => true,
 			'include_events' => true,
 			'num_days_shown' => empty(Config::$modSettings['cal_days_for_index']) || Config::$modSettings['cal_days_for_index'] < 1 ? 1 : Config::$modSettings['cal_days_for_index'],
-		);
-		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', array($eventOptions));
+		];
+		$return = CacheApi::quickGet('calendar_index_offset_' . User::$me->time_offset, 'Actions/Calendar.php', 'SMF\\Actions\\Calendar::cache_getRecentEvents', [$eventOptions]);
 
 		// The self::todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
-		IntegrationHook::call('integrate_ssi_calendar', array(&$return, $eventOptions));
+		IntegrationHook::call('integrate_ssi_calendar', [&$return, $eventOptions]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return;
+		}
 
-		if (!empty($return['calendar_holidays']))
+		if (!empty($return['calendar_holidays'])) {
 			echo '
 				<span class="holiday">' . Lang::$txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
-		if (!empty($return['calendar_birthdays']))
-		{
+		}
+
+		if (!empty($return['calendar_birthdays'])) {
 			echo '
 				<span class="birthday">' . Lang::$txt['birthdays_upcoming'] . '</span> ';
-			foreach ($return['calendar_birthdays'] as $member)
+
+			foreach ($return['calendar_birthdays'] as $member) {
 				echo '
 				<a href="', Config::$scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
+			}
 			echo '
 				<br>';
 		}
-		if (!empty($return['calendar_events']))
-		{
+
+		if (!empty($return['calendar_events'])) {
 			echo '
 				<span class="event">' . Lang::$txt['events_upcoming'] . '</span> ';
-			foreach ($return['calendar_events'] as $event)
-			{
-				if ($event['can_edit'])
+
+			foreach ($return['calendar_events'] as $event) {
+				if ($event['can_edit']) {
 					echo '
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+				}
 				echo '
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 			}
@@ -1900,68 +2055,77 @@ public static function todaysCalendar($output_method = 'echo')
 	 */
 	public static function boardNews($board = null, $limit = null, $start = null, $length = null, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		Lang::load('Stats');
 
 		// Must be integers....
-		if ($limit === null)
+		if ($limit === null) {
 			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
-		else
+		} else {
 			$limit = (int) $limit;
+		}
 
-		if ($start === null)
+		if ($start === null) {
 			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
-		else
+		} else {
 			$start = (int) $start;
+		}
 
-		if ($board !== null)
+		if ($board !== null) {
 			$board = (int) $board;
-		elseif (isset($_GET['board']))
+		} elseif (isset($_GET['board'])) {
 			$board = (int) $_GET['board'];
+		}
 
-		if ($length === null)
+		if ($length === null) {
 			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
-		else
+		} else {
 			$length = (int) $length;
+		}
 
 		$limit = max(0, $limit);
 		$start = max(0, $start);
 
 		// Make sure guests can see this board.
-		$request = Db::$db->query('', '
-			SELECT id_board
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board
 			FROM {db_prefix}boards
 			WHERE ' . ($board === null ? '' : 'id_board = {int:current_board}
 				AND ') . 'FIND_IN_SET(-1, member_groups) != 0
 			LIMIT 1',
-			array(
+			[
 				'current_board' => $board,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
-			if ($output_method == 'echo')
+
+		if (Db::$db->num_rows($request) == 0) {
+			if ($output_method == 'echo') {
 				die(Lang::$txt['ssi_no_guests']);
-			else
-				return array();
+			}
+
+			return [];
 		}
-		list ($board) = Db::$db->fetch_row($request);
+		list($board) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		$icon_sources = array();
-		foreach (Utils::$context['stable_icons'] as $icon)
+		$icon_sources = [];
+
+		foreach (Utils::$context['stable_icons'] as $icon) {
 			$icon_sources[$icon] = 'images_url';
+		}
 
-		if (!empty(Config::$modSettings['enable_likes']))
-		{
+		if (!empty(Config::$modSettings['enable_likes'])) {
 			Utils::$context['can_like'] = User::$me->allowedTo('likes_like');
 		}
 
 		// Find the post ids.
-		$request = Db::$db->query('', '
-			SELECT t.id_first_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT t.id_first_msg
 			FROM {db_prefix}topics as t
 				LEFT JOIN {db_prefix}boards as b ON (b.id_board = t.id_board)
 			WHERE t.id_board = {int:current_board}' . (Config::$modSettings['postmod_active'] ? '
@@ -1969,22 +2133,26 @@ public static function boardNews($board = null, $limit = null, $start = null, $l
 				AND {query_see_board}
 			ORDER BY t.id_first_msg DESC
 			LIMIT ' . $start . ', ' . $limit,
-			array(
+			[
 				'current_board' => $board,
 				'is_approved' => 1,
-			)
+			],
 		);
-		$posts = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$posts = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$posts[] = $row['id_first_msg'];
+		}
 		Db::$db->free_result($request);
 
-		if (empty($posts))
-			return array();
+		if (empty($posts)) {
+			return [];
+		}
 
 		// Find the posts.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				m.icon, m.subject, m.body, COALESCE(mem.real_name, m.poster_name) AS poster_name, m.poster_time, m.likes,
 				t.num_replies, t.id_topic, m.id_member, m.smileys_enabled, m.id_msg, t.locked, t.id_last_msg, m.id_board
 			FROM {db_prefix}topics AS t
@@ -1993,56 +2161,60 @@ public static function boardNews($board = null, $limit = null, $start = null, $l
 			WHERE t.id_first_msg IN ({array_int:post_list})
 			ORDER BY t.id_first_msg DESC
 			LIMIT ' . count($posts),
-			array(
+			[
 				'post_list' => $posts,
-			)
+			],
 		);
-		$return = array();
+		$return = [];
 		$recycle_board = !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : 0;
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$topic = new Topic($row['id_topic'], array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$topic = new Topic($row['id_topic'], [
 				'id_board' => $row['id_board'],
 				'num_replies' => $row['num_replies'],
 				'locked' => $row['locked'],
 				'id_first_msg' => $row['id_msg'],
 				'id_last_msg' => $row['id_last_msg'],
-			));
+			]);
 
 			// If we want to limit the length of the post.
-			if (!empty($length) && Utils::entityStrlen($row['body']) > $length)
-			{
+			if (!empty($length) && Utils::entityStrlen($row['body']) > $length) {
 				$row['body'] = Utils::entitySubstr($row['body'], 0, $length);
 				$cutoff = false;
 
 				$last_space = strrpos($row['body'], ' ');
 				$last_open = strrpos($row['body'], '<');
 				$last_close = strrpos($row['body'], '>');
-				if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
+
+				if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
 					$cutoff = $last_open;
-				elseif (empty($last_close) || $last_close < $last_open)
+				} elseif (empty($last_close) || $last_close < $last_open) {
 					$cutoff = $last_space;
+				}
 
-				if ($cutoff !== false)
+				if ($cutoff !== false) {
 					$row['body'] = Utils::entitySubstr($row['body'], 0, $cutoff);
+				}
 				$row['body'] .= '...';
 			}
 
 			$row['body'] = BBCodeParser::load()->parse($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-			if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
+			if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
 				$row['icon'] = 'recycled';
+			}
 
 			// Check that this message icon is there...
-			if (!empty(Config::$modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
+			if (!empty(Config::$modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
 				$icon_sources[$row['icon']] = file_exists(Theme::$current->settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
-			elseif (!isset($icon_sources[$row['icon']]))
+			} elseif (!isset($icon_sources[$row['icon']])) {
 				$icon_sources[$row['icon']] = 'images_url';
+			}
 
 			Lang::censorText($row['subject']);
 			Lang::censorText($row['body']);
 
-			$return[] = array(
+			$return[] = [
 				'id' => $row['id_topic'],
 				'message_id' => $row['id_msg'],
 				'icon' => '<img src="' . Theme::$current->settings[$icon_sources[$row['icon']]] . '/post/' . $row['icon'] . '.png" alt="' . $row['icon'] . '">',
@@ -2056,37 +2228,38 @@ public static function boardNews($board = null, $limit = null, $start = null, $l
 				'comment_href' => !empty($row['locked']) ? '' : Config::$scripturl . '?action=post;topic=' . $row['id_topic'] . '.' . $row['num_replies'] . ';last_msg=' . $row['id_last_msg'],
 				'comment_link' => !empty($row['locked']) ? '' : '<a href="' . Config::$scripturl . '?action=post;topic=' . $row['id_topic'] . '.' . $row['num_replies'] . ';last_msg=' . $row['id_last_msg'] . '">' . Lang::$txt['ssi_write_comment'] . '</a>',
 				'new_comment' => !empty($row['locked']) ? '' : '<a href="' . Config::$scripturl . '?action=post;topic=' . $row['id_topic'] . '.' . $row['num_replies'] . '">' . Lang::$txt['ssi_write_comment'] . '</a>',
-				'poster' => array(
+				'poster' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'href' => !empty($row['id_member']) ? Config::$scripturl . '?action=profile;u=' . $row['id_member'] : '',
-					'link' => !empty($row['id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>' : $row['poster_name']
-				),
+					'link' => !empty($row['id_member']) ? '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>' : $row['poster_name'],
+				],
 				'locked' => !empty($row['locked']),
 				'is_last' => false,
 				// Nasty ternary for likes not messing around the "is_last" check.
-				'likes' => !empty(Config::$modSettings['enable_likes']) ? array(
+				'likes' => !empty(Config::$modSettings['enable_likes']) ? [
 					'count' => $row['likes'],
 					'you' => in_array($row['id_msg'], $topic->getLikedMsgs()),
 					'can_like' => !User::$me->is_guest && $row['id_member'] != User::$me->id && !empty(Utils::$context['can_like']),
-				) : array(),
-			);
+				] : [],
+			];
 		}
 		Db::$db->free_result($request);
 
-		if (empty($return))
+		if (empty($return)) {
 			return $return;
+		}
 
 		$return[count($return) - 1]['is_last'] = true;
 
 		// If mods want to do something with this list of posts, let them do that now.
-		IntegrationHook::call('integrate_ssi_boardNews', array(&$return));
+		IntegrationHook::call('integrate_ssi_boardNews', [&$return]);
 
-		if ($output_method != 'echo')
+		if ($output_method != 'echo') {
 			return $return;
+		}
 
-		foreach ($return as $news)
-		{
+		foreach ($return as $news) {
 			echo '
 				<div class="news_item">
 					<h3 class="news_header">
@@ -2098,24 +2271,21 @@ public static function boardNews($board = null, $limit = null, $start = null, $l
 					', $news['link'], $news['locked'] ? '' : ' | ' . $news['comment_link'], '';
 
 			// Is there any likes to show?
-			if (!empty(Config::$modSettings['enable_likes']))
-			{
+			if (!empty(Config::$modSettings['enable_likes'])) {
 				echo '
 						<ul>';
 
-				if (!empty($news['likes']['can_like']))
-				{
+				if (!empty($news['likes']['can_like'])) {
 					echo '
 							<li class="smflikebutton" id="msg_', $news['message_id'], '_likes"><a href="', Config::$scripturl, '?action=likes;ltype=msg;sa=like;like=', $news['message_id'], ';', Utils::$context['session_var'], '=', Utils::$context['session_id'], '" class="msg_like"><span class="', $news['likes']['you'] ? 'unlike' : 'like', '"></span>', $news['likes']['you'] ? Lang::$txt['unlike'] : Lang::$txt['like'], '</a></li>';
 				}
 
-				if (!empty($news['likes']['count']))
-				{
+				if (!empty($news['likes']['count'])) {
 					Utils::$context['some_likes'] = true;
 					$count = $news['likes']['count'];
 					$base = 'likes_';
-					if ($news['likes']['you'])
-					{
+
+					if ($news['likes']['you']) {
 						$base = 'you_' . $base;
 						$count--;
 					}
@@ -2133,9 +2303,10 @@ public static function boardNews($board = null, $limit = null, $start = null, $l
 			echo '
 				</div>';
 
-			if (!$news['is_last'])
+			if (!$news['is_last']) {
 				echo '
 				<hr>';
+			}
 		}
 	}
 
@@ -2150,15 +2321,18 @@ public static function boardNews($board = null, $limit = null, $start = null, $l
 	 */
 	public static function recentEvents($max_events = 7, $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
-		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view'))
+		if (empty(Config::$modSettings['cal_enabled']) || !User::$me->allowedTo('calendar_view')) {
 			return;
+		}
 
 		// Find all events which are happening in the near future that the member can see.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				cal.id_event, cal.start_date, cal.end_date, cal.title, cal.id_member, cal.id_topic,
 				cal.start_time, cal.end_time, cal.timezone, cal.location,
 				cal.id_board, t.id_first_msg, t.approved
@@ -2170,34 +2344,37 @@ public static function recentEvents($max_events = 7, $output_method = 'echo')
 				AND (cal.id_board = {int:no_board} OR {query_wanna_see_board})
 			ORDER BY cal.start_date DESC
 			LIMIT ' . $max_events,
-			array(
+			[
 				'current_date' => Time::strftime('%Y-%m-%d', time()),
 				'no_board' => 0,
-			)
+			],
 		);
-		$return = array();
-		$duplicates = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$return = [];
+		$duplicates = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-			if (!empty($duplicates[$row['title'] . $row['id_topic']]))
+			if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
 				continue;
+			}
 
 			// Censor the title.
 			Lang::censorText($row['title']);
 
-			if ($row['start_date'] < Time::strftime('%Y-%m-%d', time()))
+			if ($row['start_date'] < Time::strftime('%Y-%m-%d', time())) {
 				$date = Time::strftime('%Y-%m-%d', time());
-			else
+			} else {
 				$date = $row['start_date'];
+			}
 
 			// If the topic it is attached to is not approved then don't link it.
-			if (!empty($row['id_first_msg']) && !$row['approved'])
+			if (!empty($row['id_first_msg']) && !$row['approved']) {
 				$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+			}
 
 			$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
 
-			$return[$date][] = array(
+			$return[$date][] = [
 				'id' => $row['id_event'],
 				'title' => $row['title'],
 				'location' => $row['location'],
@@ -2211,36 +2388,40 @@ public static function recentEvents($max_events = 7, $output_method = 'echo')
 				'end_time' => !$allday ? $row['end_time'] : null,
 				'tz' => !$allday ? $row['timezone'] : null,
 				'allday' => $allday,
-				'is_last' => false
-			);
+				'is_last' => false,
+			];
 
 			// Let's not show this one again, huh?
 			$duplicates[$row['title'] . $row['id_topic']] = true;
 		}
 		Db::$db->free_result($request);
 
-		foreach ($return as $mday => $array)
+		foreach ($return as $mday => $array) {
 			$return[$mday][count($array) - 1]['is_last'] = true;
+		}
 
 		// If mods want to do something with this list of events, let them do that now.
-		IntegrationHook::call('integrate_ssi_recentEvents', array(&$return));
+		IntegrationHook::call('integrate_ssi_recentEvents', [&$return]);
 
-		if ($output_method != 'echo' || empty($return))
+		if ($output_method != 'echo' || empty($return)) {
 			return $return;
+		}
 
 		// Well the output method is echo.
 		echo '
 				<span class="event">' . Lang::$txt['events'] . '</span> ';
-		foreach ($return as $mday => $array)
-			foreach ($array as $event)
-			{
-				if ($event['can_edit'])
+
+		foreach ($return as $mday => $array) {
+			foreach ($array as $event) {
+				if ($event['can_edit']) {
 					echo '
 					<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+				}
 
 				echo '
 					' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 			}
+		}
 	}
 
 	/**
@@ -2255,23 +2436,26 @@ public static function recentEvents($max_events = 7, $output_method = 'echo')
 	 */
 	public static function checkPassword($id = null, $password = null, $is_username = false)
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// If $id is null, this was most likely called from a query string and should do nothing.
-		if ($id === null)
+		if ($id === null) {
 			return;
+		}
 
-		$request = Db::$db->query('', '
-			SELECT passwd, member_name, is_activated
+		$request = Db::$db->query(
+			'',
+			'SELECT passwd, member_name, is_activated
 			FROM {db_prefix}members
 			WHERE ' . ($is_username ? 'member_name' : 'id_member') . ' = {string:id}
 			LIMIT 1',
-			array(
+			[
 				'id' => $id,
-			)
+			],
 		);
-		list ($pass, $user, $active) = Db::$db->fetch_row($request);
+		list($pass, $user, $active) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		return Security::hashVerifyPassword($user, $password, $pass) && $active == 1;
@@ -2287,24 +2471,27 @@ public static function checkPassword($id = null, $password = null, $is_username
 	 * @param string $output_method The output method. If 'echo', displays a table with links/info, otherwise returns an array with information about the attachments
 	 * @return void|array Displays a table of attachment info or returns an array containing info about the attachments, depending on output_method.
 	 */
-	public static function recentAttachments($num_attachments = 10, $attachment_ext = array(), $output_method = 'echo')
+	public static function recentAttachments($num_attachments = 10, $attachment_ext = [], $output_method = 'echo')
 	{
-		if (!self::$setup_done)
+		if (!self::$setup_done) {
 			new self();
+		}
 
 		// We want to make sure that we only get attachments for boards that we can see *if* any.
 		$attachments_boards = User::$me->boardsAllowedTo('view_attachments');
 
 		// No boards?  Adios amigo.
-		if (empty($attachments_boards))
-			return array();
+		if (empty($attachments_boards)) {
+			return [];
+		}
 
 		// Is it an array?
 		$attachment_ext = (array) $attachment_ext;
 
 		// Lets build the query.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				att.id_attach, att.id_msg, att.filename, COALESCE(att.size, 0) AS filesize, att.downloads, mem.id_member,
 				COALESCE(mem.real_name, m.poster_name) AS poster_name, m.id_topic, m.subject, t.id_board, m.poster_time,
 				att.width, att.height' . (empty(Config::$modSettings['attachmentShowImages']) || empty(Config::$modSettings['attachmentThumbnails']) ? '' : ', COALESCE(thumb.id_attach, 0) AS id_thumb, thumb.width AS thumb_width, thumb.height AS thumb_height') . '
@@ -2313,7 +2500,7 @@ public static function recentAttachments($num_attachments = 10, $attachment_ext
 				INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 				LEFT JOIN {db_prefix}members AS mem ON (mem.id_member = m.id_member)' . (empty(Config::$modSettings['attachmentShowImages']) || empty(Config::$modSettings['attachmentThumbnails']) ? '' : '
 				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = att.id_thumb)') . '
-			WHERE att.attachment_type = 0' . ($attachments_boards === array(0) ? '' : '
+			WHERE att.attachment_type = 0' . ($attachments_boards === [0] ? '' : '
 				AND m.id_board IN ({array_int:boards_can_see})') . (!empty($attachment_ext) ? '
 				AND att.fileext IN ({array_string:attachment_ext})' : '') .
 				(!Config::$modSettings['postmod_active'] || User::$me->allowedTo('approve_posts') ? '' : '
@@ -2322,49 +2509,48 @@ public static function recentAttachments($num_attachments = 10, $attachment_ext
 				AND att.approved = {int:is_approved}') . '
 			ORDER BY att.id_attach DESC
 			LIMIT {int:num_attachments}',
-			array(
+			[
 				'boards_can_see' => $attachments_boards,
 				'attachment_ext' => $attachment_ext,
 				'num_attachments' => $num_attachments,
 				'is_approved' => 1,
-			)
+			],
 		);
 
 		// We have something.
-		$attachments = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$filename = preg_replace('~&amp;#(\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\1;', htmlspecialchars($row['filename']));
+		$attachments = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$filename = preg_replace('~&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#$1;', htmlspecialchars($row['filename']));
 
 			// Is it an image?
-			$attachments[$row['id_attach']] = array(
-				'member' => array(
+			$attachments[$row['id_attach']] = [
+				'member' => [
 					'id' => $row['id_member'],
 					'name' => $row['poster_name'],
 					'link' => empty($row['id_member']) ? $row['poster_name'] : '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['poster_name'] . '</a>',
-				),
-				'file' => array(
+				],
+				'file' => [
 					'filename' => $filename,
 					'filesize' => round($row['filesize'] / 1024, 2) . Lang::$txt['kilobyte'],
 					'downloads' => $row['downloads'],
 					'href' => Config::$scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'],
 					'link' => '<img src="' . Theme::$current->settings['images_url'] . '/icons/clip.png" alt=""> <a href="' . Config::$scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . '">' . $filename . '</a>',
 					'is_image' => !empty($row['width']) && !empty($row['height']) && !empty(Config::$modSettings['attachmentShowImages']),
-				),
-				'topic' => array(
+				],
+				'topic' => [
 					'id' => $row['id_topic'],
 					'subject' => $row['subject'],
 					'href' => Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'],
 					'link' => '<a href="' . Config::$scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>',
 					'time' => Time::create('@' . $row['poster_time'])->format(),
-				),
-			);
+				],
+			];
 
 			// Images.
-			if ($attachments[$row['id_attach']]['file']['is_image'])
-			{
+			if ($attachments[$row['id_attach']]['file']['is_image']) {
 				$id_thumb = empty($row['id_thumb']) ? $row['id_attach'] : $row['id_thumb'];
-				$attachments[$row['id_attach']]['file']['image'] = array(
+				$attachments[$row['id_attach']]['file']['image'] = [
 					'id' => $id_thumb,
 					'width' => $row['width'],
 					'height' => $row['height'],
@@ -2372,17 +2558,18 @@ public static function recentAttachments($num_attachments = 10, $attachment_ext
 					'thumb' => '<img src="' . Config::$scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $id_thumb . ';image" alt="' . $filename . '">',
 					'href' => Config::$scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $id_thumb . ';image',
 					'link' => '<a href="' . Config::$scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $row['id_attach'] . ';image"><img src="' . Config::$scripturl . '?action=dlattach;topic=' . $row['id_topic'] . '.0;attach=' . $id_thumb . ';image" alt="' . $filename . '"></a>',
-				);
+				];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// If mods want to do something with this list of attachments, let them do that now.
-		IntegrationHook::call('integrate_ssi_recentAttachments', array(&$attachments));
+		IntegrationHook::call('integrate_ssi_recentAttachments', [&$attachments]);
 
 		// So you just want an array?  Here you can have it.
-		if ($output_method == 'array' || empty($attachments))
+		if ($output_method == 'array' || empty($attachments)) {
 			return $attachments;
+		}
 
 		// Give them the default.
 		echo '
@@ -2393,7 +2580,8 @@ public static function recentAttachments($num_attachments = 10, $attachment_ext
 					<th style="text-align: left; padding: 2">', Lang::$txt['downloads'], '</th>
 					<th style="text-align: left; padding: 2">', Lang::$txt['filesize'], '</th>
 				</tr>';
-		foreach ($attachments as $attach)
+
+		foreach ($attachments as $attach) {
 			echo '
 				<tr>
 					<td>', $attach['file']['link'], '</td>
@@ -2401,11 +2589,11 @@ public static function recentAttachments($num_attachments = 10, $attachment_ext
 					<td style="text-align: center">', $attach['file']['downloads'], '</td>
 					<td>', $attach['file']['filesize'], '</td>
 				</tr>';
+		}
 		echo '
 			</table>';
 	}
 
-
 	/******************
 	 * Primary methods.
 	 ******************/
@@ -2413,29 +2601,44 @@ public static function recentAttachments($num_attachments = 10, $attachment_ext
 	/**
 	 * Constructor. Sets up stuff we need for safe use of SSI.
 	 *
-	 * @return void
 	 */
 	public function __construct()
 	{
-		foreach ($this->ssi_globals as $var)
-		{
-			if (isset($GLOBALS[$var]))
-			{
-				if ($var === 'ssi_on_error_method')
+		// SSI isn't meant to be used from within the forum,
+		// but apparently someone is doing so anyway...
+		if (defined('SMF') && SMF !== 'SSI') {
+			if (!self::$setup_done) {
+				IntegrationHook::call('integrate_SSI');
+			}
+
+			self::$setup_done = true;
+		}
+
+		// Don't do the setup steps more than once.
+		if (self::$setup_done) {
+			return;
+		}
+
+		foreach ($this->ssi_globals as $var) {
+			if (isset($GLOBALS[$var])) {
+				if ($var === 'ssi_on_error_method') {
 					self::$on_error_method = $GLOBALS[$var];
-				else
+				} else {
 					$this->{substr($var, 4)} = $GLOBALS[$var];
+				}
 			}
 		}
 
 		$this->error_reporting = error_reporting(!empty(Config::$db_show_debug) ? E_ALL : E_ALL & ~E_DEPRECATED);
 
-		if (!isset($this->gzip))
+		if (!isset($this->gzip)) {
 			$this->gzip = !empty(Config::$modSettings['enableCompressedOutput']);
+		}
 
 		// Don't do john didley if the forum's been shut down completely.
-		if (Config::$maintenance == 2 && $this->maintenance_off !== true)
+		if (Config::$maintenance == 2 && $this->maintenance_off !== true) {
 			ErrorHandler::displayMaintenanceMessage();
+		}
 
 		// Initiate the database connection and define some database functions to use.
 		Db::load();
@@ -2447,51 +2650,53 @@ public function __construct()
 		QueryString::cleanRequest();
 
 		// Seed the random generator?
-		if (empty(Config::$modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+		if (empty(Config::$modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 			Config::generateSeed();
+		}
 
 		// Check on any hacking attempts.
-		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 			die('No direct access...');
+		}
 
-		if (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $this->theme)
+		if (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $this->theme) {
 			die('No direct access...');
+		}
 
-		if (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $this->theme)
+		if (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $this->theme) {
 			die('No direct access...');
+		}
 
-		if (isset($_REQUEST['ssi_layers'], $this->layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $this->layers)
+		if (isset($_REQUEST['ssi_layers'], $this->layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $this->layers) {
 			die('No direct access...');
+		}
 
-		if (isset($_REQUEST['context']))
+		if (isset($_REQUEST['context'])) {
 			die('No direct access...');
+		}
 
 		// Gzip output? (because it must be boolean and true, this can't be hacked.)
-		if ($this->gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
+		if ($this->gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
 			ob_start('ob_gzhandler');
-		else
+		} else {
 			Config::$modSettings['enableCompressedOutput'] = '0';
+		}
 
 		// Primarily, this is to fix the URLs...
 		ob_start('SMF\\QueryString::ob_sessrewrite');
 
 		// Start the session... known to scramble SSI includes in cases...
-		if (!headers_sent())
-		{
+		if (!headers_sent()) {
 			Session::load();
-		}
-		else
-		{
-			if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
-			{
+		} else {
+			if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()])) {
 				// Make a stab at it, but ignore the E_WARNINGs generated because we can't send headers.
 				$temp = error_reporting(error_reporting() & !E_WARNING);
 				Session::load();
 				error_reporting($temp);
 			}
 
-			if (!isset($_SESSION['session_value']))
-			{
+			if (!isset($_SESSION['session_value'])) {
 				$_SESSION['session_var'] = substr(md5(Utils::randomInt() . session_id() . Utils::randomInt()), 0, rand(7, 12));
 				$_SESSION['session_value'] = md5(session_id() . Utils::randomInt());
 			}
@@ -2501,7 +2706,7 @@ public function __construct()
 		// Get rid of Board::$board_id and Topic::$topic_id... do stuff loadBoard would do.
 		Board::$board_id = null;
 		Topic::$topic_id = null;
-		Utils::$context['linktree'] = array();
+		Utils::$context['linktree'] = [];
 
 		// Load the user and their cookie, as well as their settings.
 		User::load();
@@ -2516,36 +2721,38 @@ public function __construct()
 		Theme::load((int) $this->theme);
 
 		// @todo: probably not the best place, but somewhere it should be set...
-		if (!headers_sent())
+		if (!headers_sent()) {
 			header('content-type: text/html; charset=' . (empty(Config::$modSettings['global_character_set']) ? (empty(Lang::$txt['lang_character_set']) ? 'ISO-8859-1' : Lang::$txt['lang_character_set']) : Config::$modSettings['global_character_set']));
+		}
 
 		// Take care of any banning that needs to be done.
-		if (isset($_REQUEST['ssi_ban']) || $this->ban === true)
+		if (isset($_REQUEST['ssi_ban']) || $this->ban === true) {
 			User::$me->kickIfBanned();
+		}
 
 		// Do we allow guests in here?
-		if (empty($this->guest_access) && empty(Config::$modSettings['allow_guestAccess']) && User::$me->is_guest && basename($_SERVER['PHP_SELF']) != 'SSI.php')
-		{
+		if (empty($this->guest_access) && empty(Config::$modSettings['allow_guestAccess']) && User::$me->is_guest && basename($_SERVER['PHP_SELF']) != 'SSI.php') {
 			User::kickIfGuest();
 			Utils::obExit(null, true);
 		}
 
 		// Load the stuff like the menu bar, etc.
-		if (isset($this->layers))
-		{
+		if (isset($this->layers)) {
 			Utils::$context['template_layers'] = $this->layers;
 			Theme::template_header();
-		}
-		else
+		} else {
 			Theme::setupContext();
+		}
 
 		// Make sure they didn't muss around with the settings... but only if it's not cli.
-		if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
+		if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
 			trigger_error(Lang::$txt['ssi_session_broken'], E_USER_NOTICE);
+		}
 
 		// Without visiting the forum this session variable might not be set on submit.
-		if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
+		if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
 			$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
+		}
 
 		// Have the ability to easily add functions to SSI.
 		IntegrationHook::call('integrate_SSI');
@@ -2561,15 +2768,16 @@ public function __construct()
 	public function execute()
 	{
 		// Ignore a call to ssi_* functions if we are not accessing SSI.php directly.
-		if (basename($_SERVER['SCRIPT_FILENAME']) == 'SSI.php')
-		{
+		if (basename($_SERVER['SCRIPT_FILENAME']) == 'SSI.php') {
 			// You shouldn't just access SSI.php directly by URL!!
-			if (!isset($_GET['ssi_function']))
+			if (!isset($_GET['ssi_function'])) {
 				die(sprintf(Lang::$txt['ssi_not_direct'], User::$me->is_admin ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+			}
 
 			// Call a function passed by GET.
-			if (method_exists(__CLASS__, $_GET['ssi_function']) && (!empty(Config::$modSettings['allow_guestAccess']) || !User::$me->is_guest))
-				call_user_func(array(__CLASS__, $_GET['ssi_function']));
+			if (method_exists(__CLASS__, $_GET['ssi_function']) && (!empty(Config::$modSettings['allow_guestAccess']) || !User::$me->is_guest)) {
+				call_user_func([__CLASS__, $_GET['ssi_function']]);
+			}
 
 			exit;
 		}
@@ -2584,7 +2792,8 @@ public function execute()
 }
 
 // Export public static functions to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\ServerSideIncludes::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\ServerSideIncludes::exportStatic')) {
 	ServerSideIncludes::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Session.php b/Sources/Session.php
index 963cc5507d..7312050bfa 100644
--- a/Sources/Session.php
+++ b/Sources/Session.php
@@ -33,11 +33,11 @@ class Session implements \SessionHandlerInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'load' => 'loadSession',
-		),
-	);
+		],
+	];
 
 	/****************
 	 * Public methods
@@ -77,18 +77,20 @@ public function close(): bool
 	 */
 	public function read(string $session_id): string
 	{
-		if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
+		if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
 			return '';
+		}
 
 		// Look for it in the database.
-		$result = Db::$db->query('', '
-			SELECT data
+		$result = Db::$db->query(
+			'',
+			'SELECT data
 			FROM {db_prefix}sessions
 			WHERE session_id = {string:session_id}
 			LIMIT 1',
-			array(
+			[
 				'session_id' => $session_id,
-			)
+			],
 		);
 		list($sess_data) = Db::$db->fetch_row($result);
 		Db::$db->free_result($result);
@@ -101,30 +103,33 @@ public function read(string $session_id): string
 	 *
 	 * @param string $session_id The session ID.
 	 * @param string $data The data to write to the session.
-	 * @return boolean Whether the info was successfully written.
+	 * @return bool Whether the info was successfully written.
 	 */
 	public function write(string $session_id, string $data): bool
 	{
-		if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
+		if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
 			return false;
+		}
 
-		if (empty(Db::$db_connection))
+		if (empty(Db::$db_connection)) {
 			Db::load();
+		}
 
 		// If an insert fails due to a duplicate, replace the existing session...
-		Db::$db->insert('replace',
+		Db::$db->insert(
+			'replace',
 			'{db_prefix}sessions',
-			array(
+			[
 				'session_id' => 'string',
 				'data' => 'string',
 				'last_update' => 'int',
-			),
-			array(
+			],
+			[
 				$session_id,
 				$data,
 				time(),
-			),
-			array('session_id')
+			],
+			['session_id'],
 		);
 
 		return (Db::$db->affected_rows() == 0 ? false : true);
@@ -134,20 +139,22 @@ public function write(string $session_id, string $data): bool
 	 * Destroys a session.
 	 *
 	 * @param string $session_id The session ID.
-	 * @return boolean Whether the session was successfully destroyed.
+	 * @return bool Whether the session was successfully destroyed.
 	 */
 	public function destroy(string $session_id): bool
 	{
-		if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0)
+		if (preg_match('~^[A-Za-z0-9,-]{16,64}$~', $session_id) == 0) {
 			return false;
+		}
 
 		// Just delete the row...
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}sessions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}sessions
 			WHERE session_id = {string:session_id}',
-			array(
+			[
 				'session_id' => $session_id,
-			)
+			],
 		);
 
 		return true;
@@ -163,18 +170,18 @@ public function destroy(string $session_id): bool
 	public function gc(int $max_lifetime): int|false
 	{
 		// Just set to the default or lower?  Ignore it for a higher value. (hopefully)
-		if (!empty(Config::$modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || Config::$modSettings['databaseSession_lifetime'] > $max_lifetime))
-		{
+		if (!empty(Config::$modSettings['databaseSession_lifetime']) && ($max_lifetime <= 1440 || Config::$modSettings['databaseSession_lifetime'] > $max_lifetime)) {
 			$max_lifetime = max(Config::$modSettings['databaseSession_lifetime'], 60);
 		}
 
 		// Clean up after yerself ;).
-		$session_update = Db::$db->query('', '
-			DELETE FROM {db_prefix}sessions
+		$session_update = Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}sessions
 			WHERE last_update < {int:last_update}',
-			array(
+			[
 				'last_update' => time() - $max_lifetime,
-			)
+			],
 		);
 
 		$num_deleted = Db::$db->affected_rows();
@@ -201,27 +208,24 @@ public static function load(): void
 		// Allows mods to change/add PHP settings
 		IntegrationHook::call('integrate_load_session');
 
-		if (!empty(Config::$modSettings['globalCookies']))
-		{
+		if (!empty(Config::$modSettings['globalCookies'])) {
 			$url = new Url(Config::$boardurl);
 
-			if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $url->host) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $url->host, $parts) == 1)
-			{
+			if (preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $url->host) == 0 && preg_match('~(?:[^.]+\.)?([^.]{2,}\..+)\z~i', $url->host, $parts) == 1) {
 				@ini_set('session.cookie_domain', '.' . $parts[1]);
 			}
 		}
 		// @todo Set the session cookie path?
 
 		// If it's already been started... probably best to skip this.
-		if ((ini_get('session.auto_start') == 1 && !empty(Config::$modSettings['databaseSession_enable'])) || session_id() == '')
-		{
+		if ((ini_get('session.auto_start') == 1 && !empty(Config::$modSettings['databaseSession_enable'])) || session_id() == '') {
 			// Attempt to end the already-started session.
-			if (ini_get('session.auto_start') == 1)
+			if (ini_get('session.auto_start') == 1) {
 				session_write_close();
+			}
 
 			// This is here to stop people from using bad junky PHPSESSIDs.
-			if (isset($_REQUEST[session_name()]) && preg_match('~^[A-Za-z0-9,-]{16,64}$~', $_REQUEST[session_name()]) == 0 && !isset($_COOKIE[session_name()]))
-			{
+			if (isset($_REQUEST[session_name()]) && preg_match('~^[A-Za-z0-9,-]{16,64}$~', $_REQUEST[session_name()]) == 0 && !isset($_COOKIE[session_name()])) {
 				$session_id = md5(md5('smf_sess_' . time()) . Utils::randomInt());
 				$_REQUEST[session_name()] = $session_id;
 				$_GET[session_name()] = $session_id;
@@ -229,38 +233,35 @@ public static function load(): void
 			}
 
 			// Use database sessions? (they don't work in 4.1.x!)
-			if (!empty(Config::$modSettings['databaseSession_enable']))
-			{
+			if (!empty(Config::$modSettings['databaseSession_enable'])) {
 				@ini_set('session.serialize_handler', 'php_serialize');
 
-				if (ini_get('session.serialize_handler') != 'php_serialize')
+				if (ini_get('session.serialize_handler') != 'php_serialize') {
 					@ini_set('session.serialize_handler', 'php');
+				}
 
 				session_set_save_handler(new self(), true);
 
 				@ini_set('session.gc_probability', '1');
-			}
-			elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty(Config::$modSettings['databaseSession_lifetime']))
-			{
+			} elseif (ini_get('session.gc_maxlifetime') <= 1440 && !empty(Config::$modSettings['databaseSession_lifetime'])) {
 				@ini_set('session.gc_maxlifetime', max(Config::$modSettings['databaseSession_lifetime'], 60));
 			}
 
 			// Use cache setting sessions?
-			if (empty(Config::$modSettings['databaseSession_enable']) && !empty(CacheApi::$enable) && php_sapi_name() != 'cli')
-			{
+			if (empty(Config::$modSettings['databaseSession_enable']) && !empty(CacheApi::$enable) && php_sapi_name() != 'cli') {
 				IntegrationHook::call('integrate_session_handlers');
 			}
 
 			session_start();
 
 			// Change it so the cache settings are a little looser than default.
-			if (!empty(Config::$modSettings['databaseSession_loose']))
+			if (!empty(Config::$modSettings['databaseSession_loose'])) {
 				header('cache-control: private');
+			}
 		}
 
 		// Set the randomly generated code.
-		if (!isset($_SESSION['session_var']))
-		{
+		if (!isset($_SESSION['session_var'])) {
 			$_SESSION['session_value'] = md5(session_id() . Utils::randomInt());
 
 			$_SESSION['session_var'] = substr(preg_replace('~^\d+~', '', sha1(Utils::randomInt() . session_id() . Utils::randomInt())), 0, Utils::randomInt(7, 12));
@@ -274,7 +275,7 @@ public static function load(): void
 	 */
 	public static function sessionOpen(string $path, string $name): bool
 	{
-		return (new self)->open();
+		return (new self())->open();
 	}
 
 	/**
@@ -282,7 +283,7 @@ public static function sessionOpen(string $path, string $name): bool
 	 */
 	public static function sessionClose(): bool
 	{
-		return (new self)->close();
+		return (new self())->close();
 	}
 
 	/**
@@ -290,7 +291,7 @@ public static function sessionClose(): bool
 	 */
 	public static function sessionRead(string $session_id): string
 	{
-		return (string) (new self)->read();
+		return (string) (new self())->read();
 	}
 
 	/**
@@ -298,7 +299,7 @@ public static function sessionRead(string $session_id): string
 	 */
 	public static function sessionWrite(string $session_id, string $data): bool
 	{
-		return (new self)->write();
+		return (new self())->write();
 	}
 
 	/**
@@ -306,7 +307,7 @@ public static function sessionWrite(string $session_id, string $data): bool
 	 */
 	public static function sessionDestroy(string $session_id): bool
 	{
-		return (new self)->destroy($session_id);
+		return (new self())->destroy($session_id);
 	}
 
 	/**
@@ -314,8 +315,13 @@ public static function sessionDestroy(string $session_id): bool
 	 */
 	public static function sessionGC(int $max_lifetime): int|false
 	{
-		return (new self)->gc($max_lifetime);
+		return (new self())->gc($max_lifetime);
 	}
 }
 
+// Export public static functions and properties to global namespace for backward compatibility.
+if (is_callable(__NAMESPACE__ . '\\Session::exportStatic')) {
+	Session::exportStatic();
+}
+
 ?>
\ No newline at end of file
diff --git a/Sources/Subs-Admin.php b/Sources/Subs-Admin.php
index 438b55ddb9..2ade07da70 100644
--- a/Sources/Subs-Admin.php
+++ b/Sources/Subs-Admin.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\Admin\\ACP');
 
diff --git a/Sources/Subs-Auth.php b/Sources/Subs-Auth.php
index 8657f3bc24..7cb653507c 100644
--- a/Sources/Subs-Auth.php
+++ b/Sources/Subs-Auth.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Cookie');
 class_exists('SMF\\Forum');
diff --git a/Sources/Subs-BoardIndex.php b/Sources/Subs-BoardIndex.php
index dbe5b0cae1..7119b9fcb2 100644
--- a/Sources/Subs-BoardIndex.php
+++ b/Sources/Subs-BoardIndex.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\BoardIndex');
 
diff --git a/Sources/Subs-Boards.php b/Sources/Subs-Boards.php
index a509ea7e41..fc47c03537 100644
--- a/Sources/Subs-Boards.php
+++ b/Sources/Subs-Boards.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Board');
 
diff --git a/Sources/Subs-Calendar.php b/Sources/Subs-Calendar.php
index 43b5da6402..08869cb796 100644
--- a/Sources/Subs-Calendar.php
+++ b/Sources/Subs-Calendar.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\Calendar');
 class_exists('SMF\\Event');
diff --git a/Sources/Subs-Categories.php b/Sources/Subs-Categories.php
index 3d0fdd64af..208e73355b 100644
--- a/Sources/Subs-Categories.php
+++ b/Sources/Subs-Categories.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Category');
 
diff --git a/Sources/Subs-Charset.php b/Sources/Subs-Charset.php
index 1d1dbeb2a5..a11f5431bb 100644
--- a/Sources/Subs-Charset.php
+++ b/Sources/Subs-Charset.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Unicode\\Utf8String');
 
diff --git a/Sources/Subs-Compat.php b/Sources/Subs-Compat.php
index d10d4fe7ba..11f625ac76 100644
--- a/Sources/Subs-Compat.php
+++ b/Sources/Subs-Compat.php
@@ -2,9 +2,7 @@
 
 /**
  * This file provides compatibility functions and code for older versions of
- * PHP, such as the sha1() function, missing extensions, or 64-bit vs 32-bit
- * systems. It is only included for those older versions or when the respective
- * extension or function cannot be found.
+ * SMF and PHP, such as missing extensions or 64-bit vs 32-bit systems.
  *
  * Simple Machines Forum (SMF)
  *
@@ -16,19 +14,17 @@
  * @version 3.0 Alpha 1
  */
 
-use SMF\Config;
-use SMF\Lang;
 use SMF\Punycode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /*********************************************
  * SMF\Config::$backward_compatibility support
  *********************************************/
 
-if (!empty(SMF\Config::$backward_compatibility))
-{
+if (!empty(SMF\Config::$backward_compatibility)) {
 	/*
 	 * In SMF 2.x, there was a file named Subs.php that was always loaded early in
 	 * the startup process and that contained many utility functions. Everything
@@ -65,11 +61,9 @@ class_exists('SMF\\WebFetch\\WebFetchApi');
  * a fatal error will be thrown and execution will halt. SMF expects the old
  * behaviour, so these no-op polyfills make sure that is what happens.
  */
-if (version_compare(PHP_VERSION, '8.0.0', '>='))
-{
+if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
 	// This is wrapped in a closure to keep the global namespace clean.
-	call_user_func(function()
-	{
+	call_user_func(function () {
 		/*
 		 * This array contains function names that meet the following conditions:
 		 *
@@ -81,22 +75,19 @@ class_exists('SMF\\WebFetch\\WebFetchApi');
 		 * 3. SMF can get by without them (as opposed to missing functions that
 		 *    really SHOULD cause execution to halt).
 		 */
-		$optional_funcs = array(
+		$optional_funcs = [
 			'set_time_limit',
-		);
+		];
 
-		foreach ($optional_funcs as $func)
-		{
-			if (!function_exists($func))
-			{
+		foreach ($optional_funcs as $func) {
+			if (!function_exists($func)) {
 				eval('function ' . $func . '() { trigger_error("' . $func . '() has been disabled", E_USER_WARNING); }');
 			}
 		}
 	});
 }
 
-if (!function_exists('smf_crc32'))
-{
+if (!function_exists('smf_crc32')) {
 	/**
 	 * Compatibility function.
 	 * crc32 doesn't work as expected on 64-bit functions - make our own.
@@ -109,8 +100,7 @@ function smf_crc32($number)
 	{
 		$crc = crc32($number);
 
-		if ($crc & 0x80000000)
-		{
+		if ($crc & 0x80000000) {
 			$crc ^= 0xffffffff;
 			$crc += 1;
 			$crc = -$crc;
@@ -124,283 +114,31 @@ function smf_crc32($number)
  * Polyfills, etc.
  *****************/
 
-if (!function_exists('mb_ord'))
-{
-	/**
-	 * Compatibility function.
-	 *
-	 * This is a complete polyfill.
-	 *
-	 * @param string $string A character.
-	 * @param string|null $encoding The character encoding.
-	 *     If null, the current SMF encoding will be used, falling back to UTF-8.
-	 * @return int|bool The Unicode code point of the character, or false on failure.
-	 */
-	function mb_ord($string, $encoding = null)
-	{
-		// Must have a supported encoding.
-		if (($encoding = mb_ord_chr_encoding($encoding)) === false)
-			return false;
-
-		/* Alternative approach for certain encodings.
-		 *
-		 * This is required because there are some invalid byte sequences in
-		 * these encodings for which native mb_ord() will return false, yet
-		 * mb_convert_encoding() and iconv() will nevertheless convert into
-		 * technically valid but semantically unrelated UTF-8 byte sequences.
-		 *
-		 * For these encodings, mb_encode_numericentity() always produces
-		 * either an entity with the same number that mb_ord() would produce,
-		 * or else malformed output for byte sequences where mb_ord() would
-		 * return false. This allows us to use mb_encode_numericentity() as a
-		 * (slow) alternative method for these encodings.
-		 *
-		 * Note: we cannot use mb_check_encoding() here, because it returns
-		 * false for ALL invalid byte sequences, but mb_ord() only returns false
-		 * for SOME invalid byte sequences.
+if (!function_exists('idn_to_ascii')) {
+	// This is wrapped in a closure to keep the global namespace clean.
+	call_user_func(function () {
+		/**
+		 * IDNA_* constants used as flags for the idn_to_* functions.
 		 */
-		if (in_array($encoding, array('EUC-CN', 'EUC-KR', 'ISO-2022-KR')))
-		{
-			if (!function_exists('mb_encode_numericentity'))
-				return false;
-
-			$entity = mb_encode_numericentity($string, array(0x0,0x10FFFF,0x0,0xFFFFFF), $encoding);
-
-			if (strpos($entity, '&#') !== 0)
-				return false;
-
-			return (int) trim($entity, '&#;');
-		}
-
-		// Convert to UTF-8. Return false on failure.
-		if ($encoding !== 'UTF-8')
-		{
-			$temp = false;
-
-			if (function_exists('mb_convert_encoding'))
-			{
-				$mb_substitute_character = mb_substitute_character();
-				mb_substitute_character('none');
-
-				$temp = mb_convert_encoding($string, 'UTF-8', $encoding);
-
-				mb_substitute_character($mb_substitute_character);
+		$idna_constants = [
+			'IDNA_DEFAULT' => 0,
+			'IDNA_ALLOW_UNASSIGNED' => 1,
+			'IDNA_USE_STD3_RULES' => 2,
+			'IDNA_CHECK_BIDI' => 4,
+			'IDNA_CHECK_CONTEXTJ' => 8,
+			'IDNA_NONTRANSITIONAL_TO_ASCII' => 16,
+			'IDNA_NONTRANSITIONAL_TO_UNICODE' => 32,
+			'INTL_IDNA_VARIANT_2003' => 0,
+			'INTL_IDNA_VARIANT_UTS46' => 1,
+		];
+
+		foreach ($idna_constants as $name => $value) {
+			if (!defined($name)) {
+				define($name, $value);
 			}
-
-			if ($temp === false && function_exists('iconv'))
-				$temp = iconv($encoding, 'UTF-8', $string);
-
-			if ($temp === false)
-				return false;
-
-			$string = $temp;
-		}
-
-		if (strlen($string) === 1)
-			return ord($string);
-
-		// Get the values of the individual bytes.
-		$unpacked = unpack('C*', substr($string, 0, 4));
-
-		if ($unpacked === false)
-		{
-			$ord = 0;
-		}
-		elseif ($unpacked[1] >= 0xF0)
-		{
-			$ord = ($unpacked[1] - 0xF0) << 18;
-			$ord += ($unpacked[2] - 0x80) << 12;
-			$ord += ($unpacked[3] - 0x80) << 6;
-			$ord += $unpacked[4] - 0x80;
-		}
-		elseif ($unpacked[1] >= 0xE0)
-		{
-			$ord = ($unpacked[1] - 0xE0) << 12;
-			$ord += ($unpacked[2] - 0x80) << 6;
-			$ord += $unpacked[3] - 0x80;
-		}
-		elseif ($unpacked[1] >= 0xC0)
-		{
-			$ord = ($unpacked[1] - 0xC0) << 6;
-			$ord += $unpacked[2] - 0x80;
-		}
-		else
-		{
-			$ord = $unpacked[1];
-		}
-
-		// Surrogate pairs are invalid in UTF-8.
-		if ($ord >= 0xD800 && $ord <= 0xDFFF)
-			$ord = 0;
-
-		return $ord;
-	}
-}
-
-if (!function_exists('mb_chr'))
-{
-	/**
-	 * Compatibility function.
-	 *
-	 * This is a complete polyfill.
-	 *
-	 * @param int $codepoint A Unicode codepoint value.
-	 * @param string|null $encoding The character encoding.
-	 *     If null, the current SMF encoding will be used, falling back to UTF-8.
-	 * @return string|bool The requested character, or false on failure.
-	 */
-	function mb_chr($codepoint, $encoding = null)
-	{
-		// Must have a supported encoding.
-		if (($encoding = mb_ord_chr_encoding($encoding)) === false)
-			return false;
-
-		// 0x10FFFF is the highest defined code point as of Unicode 13.0.0
-		$codepoint %= 0x110000;
-
-		if ($codepoint < 0x80)
-		{
-			$string = chr($codepoint);
 		}
-		elseif ($codepoint < 0x800)
-		{
-			$string = chr(0xC0 | $codepoint >> 6) . chr(0x80 | $codepoint & 0x3F);
-		}
-		elseif ($codepoint < 0x10000)
-		{
-			$string = chr(0xE0 | $codepoint >> 12) . chr(0x80 | $codepoint >> 6 & 0x3F) . chr(0x80 | $codepoint & 0x3F);
-		}
-		else
-		{
-			$string = chr(0xF0 | $codepoint >> 18) . chr(0x80 | $codepoint >> 12 & 0x3F) . chr(0x80 | $codepoint >> 6 & 0x3F) . chr(0x80 | $codepoint & 0x3F);
-		}
-
-		// Return in the requested encoding, or false on failure.
-		// Note: native mb_chr() always returns a character in regular UTF-8
-		// when the encoding is set to one of the UTF-8-Mobile* encodings. If
-		// that behaviour changes in the future, add version checks here.
-		if (strpos($encoding, 'UTF-8') !== 0)
-		{
-			$temp = false;
-
-			if (function_exists('mb_convert_encoding'))
-			{
-				$mb_substitute_character = mb_substitute_character();
-				mb_substitute_character('none');
-
-				$temp = mb_convert_encoding($string, $encoding, 'UTF-8');
-
-				mb_substitute_character($mb_substitute_character);
-			}
-
-			if ($temp === false && function_exists('iconv'))
-				$temp = iconv('UTF-8', $encoding, $string);
-
-			if ($temp === false)
-				return false;
-
-			$string = $temp;
-		}
-
-		return $string;
-	}
-}
-
-/**
- * Helper function for the mb_ord and mb_chr polyfills.
- *
- * Checks whether $encoding is a supported character encoding for the mb_ord
- * and mb_chr functions. If $encoding is null, the current default character
- * encoding is used. If the encoding is supported, it is returned as a string.
- * If not, false is returned.
- *
- * @param string $encoding A character encoding to check, or null for default.
- * @return string|bool The character encoding, or false if unsupported.
- */
-function mb_ord_chr_encoding($encoding = null)
-{
-	if (is_null($encoding))
-	{
-		if (isset(Config::$modSettings['global_character_set']))
-			$encoding = Config::$modSettings['global_character_set'];
-
-		elseif (isset(Lang::$txt['lang_character_set']))
-			$encoding = Lang::$txt['lang_character_set'];
-
-		elseif (function_exists('mb_internal_encoding'))
-			$encoding = mb_internal_encoding();
-
-		elseif (ini_get('default_charset') != false)
-			$encoding = ini_get('default_charset');
-
-		else
-			$encoding = 'UTF-8';
-	}
-
-	// Only some mb_string encodings are supported by mb_chr() and mb_ord().
-	$supported_encodings = array(
-		'8bit', 'UCS-4', 'UCS-4BE', 'UCS-4LE', 'UCS-2', 'UCS-2BE', 'UCS-2LE',
-		'UTF-32', 'UTF-32BE', 'UTF-32LE', 'UTF-16', 'UTF-16BE', 'UTF-16LE',
-		'UTF-8', 'ASCII', 'EUC-JP', 'SJIS', 'eucJP-win', 'EUC-JP-2004',
-		'SJIS-win', 'SJIS-Mobile#DOCOMO', 'SJIS-Mobile#KDDI',
-		'SJIS-Mobile#SOFTBANK', 'SJIS-mac', 'SJIS-2004', 'UTF-8-Mobile#DOCOMO',
-		'UTF-8-Mobile#KDDI-A', 'UTF-8-Mobile#KDDI-B', 'UTF-8-Mobile#SOFTBANK',
-		'CP932', 'CP51932', 'GB18030', 'Windows-1252', 'Windows-1254',
-		'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4', 'ISO-8859-5',
-		'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9', 'ISO-8859-10',
-		'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16', 'EUC-CN',
-		'CP936', 'HZ', 'EUC-TW', 'BIG-5', 'CP950', 'EUC-KR', 'UHC',
-		'ISO-2022-KR', 'Windows-1251', 'CP866', 'KOI8-R', 'KOI8-U', 'ArmSCII-8',
-		'CP850', 'JIS-ms',
-	);
-
-	// Found it.
-	if (in_array($encoding, $supported_encodings))
-		return $encoding;
-
-	// Gracefully handle aliases and incorrect lettercase.
-	$encoding_l = strtolower($encoding);
-	foreach ($supported_encodings as $possible_encoding)
-	{
-		$aliases = array_merge(array($possible_encoding), mb_encoding_aliases($possible_encoding));
-
-		foreach ($aliases as $alias)
-		{
-			if (strtolower($alias) === $encoding_l)
-				return $possible_encoding;
-		}
-	}
-
-	return false;
-}
-
-// This is wrapped in a closure to keep the global namespace clean.
-call_user_func(function()
-{
-	/**
-	 * IDNA_* constants used as flags for the idn_to_* functions.
-	 */
-	$idna_constants = array(
-		'IDNA_DEFAULT' => 0,
-		'IDNA_ALLOW_UNASSIGNED' => 1,
-		'IDNA_USE_STD3_RULES' => 2,
-		'IDNA_CHECK_BIDI' => 4,
-		'IDNA_CHECK_CONTEXTJ' => 8,
-		'IDNA_NONTRANSITIONAL_TO_ASCII' => 16,
-		'IDNA_NONTRANSITIONAL_TO_UNICODE' => 32,
-		'INTL_IDNA_VARIANT_2003' => 0,
-		'INTL_IDNA_VARIANT_UTS46' => 1,
-	);
-
-	foreach ($idna_constants as $name => $value)
-	{
-		if (!defined($name))
-			define($name, $value);
-	}
-});
+	});
 
-if (!function_exists('idn_to_ascii'))
-{
 	/**
 	 * Compatibility function.
 	 *
@@ -421,20 +159,21 @@ function idn_to_ascii($domain, $flags = 0, $variant = 1, &$idna_info = null)
 	{
 		static $Punycode;
 
-		if (!is_object($Punycode))
+		if (!is_object($Punycode)) {
 			$Punycode = new Punycode();
+		}
 
-		if (method_exists($Punycode, 'useStd3'))
+		if (method_exists($Punycode, 'useStd3')) {
 			$Punycode->useStd3($flags === ($flags | IDNA_USE_STD3_RULES));
-		if (method_exists($Punycode, 'useNonTransitional'))
+		}
+
+		if (method_exists($Punycode, 'useNonTransitional')) {
 			$Punycode->useNonTransitional($flags === ($flags | IDNA_NONTRANSITIONAL_TO_ASCII));
+		}
 
 		return $Punycode->encode($domain);
 	}
-}
 
-if (!function_exists('idn_to_utf8'))
-{
 	/**
 	 * Compatibility function.
 	 *
@@ -455,8 +194,9 @@ function idn_to_utf8($domain, $flags = 0, $variant = 1, &$idna_info = null)
 	{
 		static $Punycode;
 
-		if (!is_object($Punycode))
+		if (!is_object($Punycode)) {
 			$Punycode = new Punycode();
+		}
 
 		$Punycode->useStd3($flags === ($flags | IDNA_USE_STD3_RULES));
 		$Punycode->useNonTransitional($flags === ($flags | IDNA_NONTRANSITIONAL_TO_UNICODE));
@@ -465,33 +205,4 @@ function idn_to_utf8($domain, $flags = 0, $variant = 1, &$idna_info = null)
 	}
 }
 
-// Based on code by "examplehash at user dot com".
-// https://www.php.net/manual/en/function.hash-equals.php#125034
-if (!function_exists('hash_equals'))
-{
-	/**
-	 * A compatibility function for when PHP's "hash_equals" function isn't available
-	 * @param string $known_string A known hash
-	 * @param string $user_string The hash of the user string
-	 * @return bool Whether or not the two are equal
-	 */
-	function hash_equals($known_string, $user_string)
-	{
-		$known_string = (string) $known_string;
-		$user_string = (string) $user_string;
-
-		$sx = 0;
-		$sy = strlen($known_string);
-		$uy = strlen($user_string);
-		$result = $sy - $uy;
-		for ($ux = 0; $ux < $uy; $ux++)
-		{
-			$result |= ord($user_string[$ux]) ^ ord($known_string[$sx]);
-			$sx = ($sx + 1) % $sy;
-		}
-
-		return !$result;
-	}
-}
-
 ?>
\ No newline at end of file
diff --git a/Sources/Subs-Editor.php b/Sources/Subs-Editor.php
index 7861f0fdaa..5586ca37ce 100644
--- a/Sources/Subs-Editor.php
+++ b/Sources/Subs-Editor.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\BBCodeParser');
 class_exists('SMF\\Editor');
diff --git a/Sources/Subs-Graphics.php b/Sources/Subs-Graphics.php
index 7e58580a47..494fd056d6 100644
--- a/Sources/Subs-Graphics.php
+++ b/Sources/Subs-Graphics.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Profile');
 class_exists('SMF\\Graphics\\Image');
diff --git a/Sources/Subs-List.php b/Sources/Subs-List.php
index e4c6215b16..0877591794 100644
--- a/Sources/Subs-List.php
+++ b/Sources/Subs-List.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\ItemList');
 
diff --git a/Sources/Subs-Membergroups.php b/Sources/Subs-Membergroups.php
index e521ad0ef2..22b2cc906e 100644
--- a/Sources/Subs-Membergroups.php
+++ b/Sources/Subs-Membergroups.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Group');
 class_exists('SMF\\User');
diff --git a/Sources/Subs-Members.php b/Sources/Subs-Members.php
index b5e3c0b7f4..c02db8891d 100644
--- a/Sources/Subs-Members.php
+++ b/Sources/Subs-Members.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\User');
 class_exists('SMF\\Actions\\Register2');
diff --git a/Sources/Subs-MembersOnline.php b/Sources/Subs-MembersOnline.php
index 1321efa2cc..3071328cb4 100644
--- a/Sources/Subs-MembersOnline.php
+++ b/Sources/Subs-MembersOnline.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Logging');
 
diff --git a/Sources/Subs-MessageIndex.php b/Sources/Subs-MessageIndex.php
index b681fac9ce..be4d260655 100644
--- a/Sources/Subs-MessageIndex.php
+++ b/Sources/Subs-MessageIndex.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\MessageIndex');
 
diff --git a/Sources/Subs-Package.php b/Sources/Subs-Package.php
index abdb36bed2..1339749ecf 100644
--- a/Sources/Subs-Package.php
+++ b/Sources/Subs-Package.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\PackageManager\\SubsPackage');
 
diff --git a/Sources/Subs-ReportedContent.php b/Sources/Subs-ReportedContent.php
index cea1c99332..cf1b863df0 100644
--- a/Sources/Subs-ReportedContent.php
+++ b/Sources/Subs-ReportedContent.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\Moderation\\ReportedContent');
 
diff --git a/Sources/Subs-Sound.php b/Sources/Subs-Sound.php
index dd592759a8..4352c56013 100644
--- a/Sources/Subs-Sound.php
+++ b/Sources/Subs-Sound.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\Actions\\VerificationCode');
 
diff --git a/Sources/Subs-Timezones.php b/Sources/Subs-Timezones.php
index 3d34ccdec4..4c493e67f1 100644
--- a/Sources/Subs-Timezones.php
+++ b/Sources/Subs-Timezones.php
@@ -13,8 +13,9 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class_exists('SMF\\TimeZone');
 
diff --git a/Sources/Subscriptions/PayPal/Display.php b/Sources/Subscriptions/PayPal/Display.php
index 6dfc889116..4f45003e67 100644
--- a/Sources/Subscriptions/PayPal/Display.php
+++ b/Sources/Subscriptions/PayPal/Display.php
@@ -33,23 +33,23 @@ class Display
 	 */
 	public function getGatewaySettings()
 	{
-		$setting_data = array(
-			array(
+		$setting_data = [
+			[
 				'email', 'paypal_email',
 				'subtext' => Lang::$txt['paypal_email_desc'],
-				'size' => 60
-			),
-			array(
+				'size' => 60,
+			],
+			[
 				'email', 'paypal_additional_emails',
 				'subtext' => Lang::$txt['paypal_additional_emails_desc'],
-				'size' => 60
-			),
-			array(
+				'size' => 60,
+			],
+			[
 				'email', 'paypal_sandbox_email',
 				'subtext' => Lang::$txt['paypal_sandbox_email_desc'],
-				'size' => 60
-			),
-		);
+				'size' => 60,
+			],
+		];
 
 		return $setting_data;
 	}
@@ -57,7 +57,7 @@ public function getGatewaySettings()
 	/**
 	 * Is this enabled for new payments?
 	 *
-	 * @return boolean Whether this gateway is enabled (for PayPal, whether the PayPal email is set)
+	 * @return bool Whether this gateway is enabled (for PayPal, whether the PayPal email is set)
 	 */
 	public function gatewayEnabled()
 	{
@@ -79,15 +79,15 @@ public function gatewayEnabled()
 	 */
 	public function fetchGatewayFields($unique_id, $sub_data, $value, $period, $return_url)
 	{
-		$return_data = array(
+		$return_data = [
 			'form' => 'https://www.' . (!empty(Config::$modSettings['paidsubs_test']) ? 'sandbox.' : '') . 'paypal.com/cgi-bin/webscr',
 			'id' => 'paypal',
-			'hidden' => array(),
+			'hidden' => [],
 			'title' => Lang::$txt['paypal'],
 			'desc' => Lang::$txt['paid_confirm_paypal'],
 			'submit' => Lang::$txt['paid_paypal_order'],
 			'javascript' => '',
-		);
+		];
 
 		// All the standard bits.
 		$return_data['hidden']['business'] = Config::$modSettings['paypal_email'];
@@ -107,13 +107,10 @@ public function fetchGatewayFields($unique_id, $sub_data, $value, $period, $retu
 		$return_data['hidden']['lc'] = !empty(Lang::$txt['lang_paypal']) ? Lang::$txt['lang_paypal'] : 'US';
 
 		// Now stuff dependant on what we're doing.
-		if ($sub_data['flexible'])
-		{
+		if ($sub_data['flexible']) {
 			$return_data['hidden']['p3'] = 1;
 			$return_data['hidden']['t3'] = strtoupper(substr($period, 0, 1));
-		}
-		else
-		{
+		} else {
 			preg_match('~(\d*)(\w)~', $sub_data['real_length'], $match);
 			$unit = $match[1];
 			$period = $match[2];
@@ -123,7 +120,7 @@ public function fetchGatewayFields($unique_id, $sub_data, $value, $period, $retu
 		}
 
 		// If it's repeatable do some javascript to respect this idea.
-		if (!empty($sub_data['repeatable']))
+		if (!empty($sub_data['repeatable'])) {
 			$return_data['javascript'] = '
 				document.write(\'<label for="do_paypal_recur"><input type="checkbox" name="do_paypal_recur" id="do_paypal_recur" checked onclick="switchPaypalRecur();">' . Lang::$txt['paid_make_recurring'] . '</label><br>\');
 
@@ -131,6 +128,7 @@ function switchPaypalRecur()
 				{
 					document.getElementById("paypal_cmd").value = document.getElementById("do_paypal_recur").checked ? "_xclick-subscriptions" : "_xclick";
 				}';
+		}
 
 		return $return_data;
 	}
diff --git a/Sources/Subscriptions/PayPal/Payment.php b/Sources/Subscriptions/PayPal/Payment.php
index b91218ddad..bcc4d2c417 100644
--- a/Sources/Subscriptions/PayPal/Payment.php
+++ b/Sources/Subscriptions/PayPal/Payment.php
@@ -14,6 +14,7 @@
 namespace SMF\Subscriptions\PayPal;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Lang;
 
 /**
@@ -22,33 +23,38 @@
 class Payment
 {
 	/**
-	 * @var string $return_data The data to return
+	 * @var string The data to return
 	 */
 	private $return_data;
 
 	/**
 	 * This function returns true/false for whether this gateway thinks the data is intended for it.
 	 *
-	 * @return boolean Whether this gateway things the data is valid
+	 * @return bool Whether this gateway things the data is valid
 	 */
 	public function isValid()
 	{
 		// Has the user set up an email address?
-		if ((empty(Config::$modSettings['paidsubs_test']) && empty(Config::$modSettings['paypal_email'])) || (!empty(Config::$modSettings['paidsubs_test']) && empty(Config::$modSettings['paypal_sandbox_email'])))
+		if ((empty(Config::$modSettings['paidsubs_test']) && empty(Config::$modSettings['paypal_email'])) || (!empty(Config::$modSettings['paidsubs_test']) && empty(Config::$modSettings['paypal_sandbox_email']))) {
 			return false;
+		}
+
 		// Check the correct transaction types are even here.
-		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email'])))
+		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email']))) {
 			return false;
+		}
+
 		// Correct email address?
-		if (!isset($_POST['business']))
+		if (!isset($_POST['business'])) {
 			$_POST['business'] = $_POST['receiver_email'];
+		}
 
 		// Are we testing?
-		if (!empty(Config::$modSettings['paidsubs_test']) && strtolower(Config::$modSettings['paypal_sandbox_email']) != strtolower($_POST['business']) && (empty(Config::$modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower(Config::$modSettings['paypal_additional_emails'])))))
-			return false;
-		elseif (strtolower(Config::$modSettings['paypal_email']) != strtolower($_POST['business']) && (empty(Config::$modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', Config::$modSettings['paypal_additional_emails']))))
+		if (!empty(Config::$modSettings['paidsubs_test']) && strtolower(Config::$modSettings['paypal_sandbox_email']) != strtolower($_POST['business']) && (empty(Config::$modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower(Config::$modSettings['paypal_additional_emails']))))) {
 			return false;
-		return true;
+		}
+
+		return !(strtolower(Config::$modSettings['paypal_email']) != strtolower($_POST['business']) && (empty(Config::$modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', Config::$modSettings['paypal_additional_emails']))));
 	}
 
 	/**
@@ -64,19 +70,20 @@ public function isValid()
 	public function precheck()
 	{
 		// Put this to some default value.
-		if (!isset($_POST['txn_type']))
+		if (!isset($_POST['txn_type'])) {
 			$_POST['txn_type'] = '';
+		}
 
 		// Build the request string - starting with the minimum requirement.
 		$requestString = 'cmd=_notify-validate';
 
 		// Now my dear, add all the posted bits in the order we got them
-		foreach ($_POST as $k => $v)
+		foreach ($_POST as $k => $v) {
 			$requestString .= '&' . $k . '=' . urlencode($v);
+		}
 
 		// Can we use curl?
-		if (function_exists('curl_init') && $curl = curl_init((!empty(Config::$modSettings['paidsubs_test']) ? 'https://www.sandbox.' : 'https://www.') . 'paypal.com/cgi-bin/webscr'))
-		{
+		if (function_exists('curl_init') && $curl = curl_init((!empty(Config::$modSettings['paidsubs_test']) ? 'https://www.sandbox.' : 'https://www.') . 'paypal.com/cgi-bin/webscr')) {
 			// Set the post data.
 			curl_setopt($curl, CURLOPT_POST, true);
 			curl_setopt($curl, CURLOPT_POSTFIELDS, $requestString);
@@ -86,10 +93,10 @@ public function precheck()
 			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
 			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
 			curl_setopt($curl, CURLOPT_FORBID_REUSE, 1);
-			curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+			curl_setopt($curl, CURLOPT_HTTPHEADER, [
 				'Host: www.' . (!empty(Config::$modSettings['paidsubs_test']) ? 'sandbox.' : '') . 'paypal.com',
-				'Connection: close'
-			));
+				'Connection: close',
+			]);
 
 			// Fetch the data returned as a string.
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
@@ -101,8 +108,7 @@ public function precheck()
 			curl_close($curl);
 		}
 		// Otherwise good old HTTP.
-		else
-		{
+		else {
 			// Setup the headers.
 			$header = 'POST /cgi-bin/webscr HTTP/1.1' . "\r\n";
 			$header .= 'content-type: application/x-www-form-urlencoded' . "\r\n";
@@ -111,24 +117,27 @@ public function precheck()
 			$header .= 'connection: close' . "\r\n\r\n";
 
 			// Open the connection.
-			if (!empty(Config::$modSettings['paidsubs_test']))
+			if (!empty(Config::$modSettings['paidsubs_test'])) {
 				$fp = fsockopen('ssl://www.sandbox.paypal.com', 443, $errno, $errstr, 30);
-			else
+			} else {
 				$fp = fsockopen('www.paypal.com', 80, $errno, $errstr, 30);
+			}
 
 			// Did it work?
-			if (!$fp)
+			if (!$fp) {
 				generateSubscriptionError(Lang::$txt['paypal_could_not_connect']);
+			}
 
 			// Put the data to the port.
 			fputs($fp, $header . $requestString);
 
 			// Get the data back...
-			while (!feof($fp))
-			{
+			while (!feof($fp)) {
 				$this->return_data = fgets($fp, 1024);
-				if (strcmp(trim($this->return_data), 'VERIFIED') === 0)
+
+				if (strcmp(trim($this->return_data), 'VERIFIED') === 0) {
 					break;
+				}
 			}
 
 			// Clean up.
@@ -136,28 +145,35 @@ public function precheck()
 		}
 
 		// If this isn't verified then give up...
-		if (strcmp(trim($this->return_data), 'VERIFIED') !== 0)
+		if (strcmp(trim($this->return_data), 'VERIFIED') !== 0) {
 			exit;
+		}
 
 		// Check that this is intended for us.
-		if (strtolower(Config::$modSettings['paypal_email']) != strtolower($_POST['business']) && (empty(Config::$modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower(Config::$modSettings['paypal_additional_emails'])))))
+		if (strtolower(Config::$modSettings['paypal_email']) != strtolower($_POST['business']) && (empty(Config::$modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower(Config::$modSettings['paypal_additional_emails']))))) {
 			exit;
+		}
 
 		// Is this a subscription - and if so is it a secondary payment that we need to process?
 		// If so, make sure we get it in the expected format. Seems PayPal sometimes sends it without urlencoding.
-		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false)
+		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false) {
 			$_POST['item_number'] = str_replace(' ', '+', $_POST['item_number']);
-		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false))
+		}
+
+		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false)) {
 			// Calculate the subscription it relates to!
 			$this->_findSubscription();
+		}
 
 		// Verify the currency!
-		if (strtolower($_POST['mc_currency']) !== strtolower(Config::$modSettings['paid_currency_code']))
+		if (strtolower($_POST['mc_currency']) !== strtolower(Config::$modSettings['paid_currency_code'])) {
 			exit;
+		}
 
 		// Can't exist if it doesn't contain anything.
-		if (empty($_POST['item_number']))
+		if (empty($_POST['item_number'])) {
 			exit;
+		}
 
 		// Return the id_sub and id_member
 		return explode('+', $_POST['item_number']);
@@ -166,56 +182,44 @@ public function precheck()
 	/**
 	 * Is this a refund?
 	 *
-	 * @return boolean Whether this is a refund
+	 * @return bool Whether this is a refund
 	 */
 	public function isRefund()
 	{
-		if ($_POST['payment_status'] === 'Refunded' || $_POST['payment_status'] === 'Reversed' || $_POST['txn_type'] === 'Refunded' || ($_POST['txn_type'] === 'reversal' && $_POST['payment_status'] === 'Completed'))
-			return true;
-		else
-			return false;
+		return (bool) ($_POST['payment_status'] === 'Refunded' || $_POST['payment_status'] === 'Reversed' || $_POST['txn_type'] === 'Refunded' || ($_POST['txn_type'] === 'reversal' && $_POST['payment_status'] === 'Completed'));
 	}
 
 	/**
 	 * Is this a subscription?
 	 *
-	 * @return boolean Whether this is a subscription
+	 * @return bool Whether this is a subscription
 	 */
 	public function isSubscription()
 	{
-		if (substr($_POST['txn_type'], 0, 14) === 'subscr_payment' && $_POST['payment_status'] === 'Completed')
-			return true;
-		else
-			return false;
+		return (bool) (substr($_POST['txn_type'], 0, 14) === 'subscr_payment' && $_POST['payment_status'] === 'Completed');
 	}
 
 	/**
 	 * Is this a normal payment?
 	 *
-	 * @return boolean Whether this is a normal payment
+	 * @return bool Whether this is a normal payment
 	 */
 	public function isPayment()
 	{
-		if ($_POST['payment_status'] === 'Completed' && $_POST['txn_type'] === 'web_accept')
-			return true;
-		else
-			return false;
+		return (bool) ($_POST['payment_status'] === 'Completed' && $_POST['txn_type'] === 'web_accept');
 	}
 
 	/**
 	 * Is this a cancellation?
 	 *
-	 * @return boolean Whether this is a cancellation
+	 * @return bool Whether this is a cancellation
 	 */
 	public function isCancellation()
 	{
 		// subscr_cancel is sent when the user cancels, subscr_eot is sent when the subscription reaches final payment
 		// Neither require us to *do* anything as per performCancel().
 		// subscr_eot, if sent, indicates an end of payments term.
-		if (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot')
-			return true;
-		else
-			return false;
+		return (bool) (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot');
 	}
 
 	/**
@@ -240,7 +244,7 @@ public function performCancel($subscription_id, $member_id, $subscription_info)
 	 */
 	public function getCost()
 	{
-		return (isset($_POST['tax']) ? $_POST['tax'] : 0) + $_POST['mc_gross'];
+		return ($_POST['tax'] ?? 0) + $_POST['mc_gross'];
 	}
 
 	/**
@@ -252,16 +256,16 @@ public function close()
 		global $subscription_id;
 
 		// If it's a subscription record the reference.
-		if ($_POST['txn_type'] == 'subscr_payment' && !empty($_POST['subscr_id']))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_subscribed
+		if ($_POST['txn_type'] == 'subscr_payment' && !empty($_POST['subscr_id'])) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_subscribed
 				SET vendor_ref = {string:vendor_ref}
 				WHERE id_sublog = {int:current_subscription}',
-				array(
+				[
 					'current_subscription' => $subscription_id,
 					'vendor_ref' => $_POST['subscr_id'],
-				)
+				],
 			);
 		}
 	}
@@ -269,49 +273,52 @@ public function close()
 	/**
 	 * A private function to find out the subscription details.
 	 *
-	 * @access private
-	 * @return boolean|void False on failure, otherwise just sets $_POST['item_number']
+	 * @return bool|void False on failure, otherwise just sets $_POST['item_number']
 	 */
 	private function _findSubscription()
 	{
 		// Assume we have this?
-		if (empty($_POST['subscr_id']))
+		if (empty($_POST['subscr_id'])) {
 			return false;
+		}
 
 		// Do we have this in the database?
-		$request = Db::$db->query('', '
-			SELECT id_member, id_subscribe
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, id_subscribe
 			FROM {db_prefix}log_subscribed
 			WHERE vendor_ref = {string:vendor_ref}
 			LIMIT 1',
-			array(
+			[
 				'vendor_ref' => $_POST['subscr_id'],
-			)
+			],
 		);
+
 		// No joy?
-		if (Db::$db->num_rows($request) == 0)
-		{
+		if (Db::$db->num_rows($request) == 0) {
 			// Can we identify them by email?
-			if (!empty($_POST['payer_email']))
-			{
+			if (!empty($_POST['payer_email'])) {
 				Db::$db->free_result($request);
-				$request = Db::$db->query('', '
-					SELECT ls.id_member, ls.id_subscribe
+				$request = Db::$db->query(
+					'',
+					'SELECT ls.id_member, ls.id_subscribe
 					FROM {db_prefix}log_subscribed AS ls
 						INNER JOIN {db_prefix}members AS mem ON (mem.id_member = ls.id_member)
 					WHERE mem.email_address = {string:payer_email}
 					LIMIT 1',
-					array(
+					[
 						'payer_email' => $_POST['payer_email'],
-					)
+					],
 				);
-				if (Db::$db->num_rows($request) === 0)
+
+				if (Db::$db->num_rows($request) === 0) {
 					return false;
-			}
-			else
+				}
+			} else {
 				return false;
+			}
 		}
-		list ($member_id, $subscription_id) = Db::$db->fetch_row($request);
+		list($member_id, $subscription_id) = Db::$db->fetch_row($request);
 		$_POST['item_number'] = $member_id . '+' . $subscription_id;
 		Db::$db->free_result($request);
 	}
diff --git a/Sources/Subscriptions/PayPal/index.php b/Sources/Subscriptions/PayPal/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Subscriptions/PayPal/index.php
+++ b/Sources/Subscriptions/PayPal/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Subscriptions/index.php b/Sources/Subscriptions/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Subscriptions/index.php
+++ b/Sources/Subscriptions/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/TOTP/Auth.php b/Sources/TOTP/Auth.php
index da6e75e4ac..99b5576135 100644
--- a/Sources/TOTP/Auth.php
+++ b/Sources/TOTP/Auth.php
@@ -35,7 +35,7 @@ class Auth
 	/**
 	 * @var array Internal lookup table
 	 */
-	private $lookup = array();
+	private $lookup = [];
 
 	/**
 	 * @var string Initialization key
@@ -43,17 +43,17 @@ class Auth
 	private $initKey = null;
 
 	/**
-	 * @var integer Seconds between key refreshes
+	 * @var int Seconds between key refreshes
 	 */
 	private $refreshSeconds = 30;
 
 	/**
-	 * @var integer The length of codes to generate
+	 * @var int The length of codes to generate
 	 */
 	private $codeLength = 6;
 
 	/**
-	 * @var integer Range plus/minus for "window of opportunity" on allowed codes
+	 * @var int Range plus/minus for "window of opportunity" on allowed codes
 	 */
 	private $range = 2;
 
@@ -67,8 +67,7 @@ public function __construct($initKey = null)
 	{
 		$this->buildLookup();
 
-		if ($initKey !== null)
-		{
+		if ($initKey !== null) {
 			$this->setInitKey($initKey);
 		}
 	}
@@ -80,7 +79,7 @@ public function buildLookup()
 	{
 		$lookup = array_combine(
 			array_merge(range('A', 'Z'), range(2, 7)),
-			range(0, 31)
+			range(0, 31),
 		);
 		$this->setLookup($lookup);
 	}
@@ -88,7 +87,7 @@ public function buildLookup()
 	/**
 	 * Get the current "range" value
 	 *
-	 * @return integer Range value
+	 * @return int Range value
 	 */
 	public function getRange()
 	{
@@ -98,16 +97,16 @@ public function getRange()
 	/**
 	 * Set the "range" value
 	 *
-	 * @param integer $range Range value
+	 * @param int $range Range value
 	 * @return \SMF\TOTP\Auth instance
 	 */
 	public function setRange($range)
 	{
-		if (!is_numeric($range))
-		{
+		if (!is_numeric($range)) {
 			throw new \InvalidArgumentException('Invalid window range');
 		}
 		$this->range = $range;
+
 		return $this;
 	}
 
@@ -120,11 +119,11 @@ public function setRange($range)
 	 */
 	public function setInitKey($key)
 	{
-		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false)
-		{
+		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false) {
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 		$this->initKey = $key;
+
 		return $this;
 	}
 
@@ -147,11 +146,11 @@ public function getInitKey()
 	 */
 	public function setLookup($lookup)
 	{
-		if (!is_array($lookup))
-		{
+		if (!is_array($lookup)) {
 			throw new \InvalidArgumentException('Lookup value must be an array');
 		}
 		$this->lookup = $lookup;
+
 		return $this;
 	}
 
@@ -168,7 +167,7 @@ public function getLookup()
 	/**
 	 * Get the number of seconds for code refresh currently set
 	 *
-	 * @return integer Refresh in seconds
+	 * @return int Refresh in seconds
 	 */
 	public function getRefresh()
 	{
@@ -178,24 +177,24 @@ public function getRefresh()
 	/**
 	 * Set the number of seconds to refresh codes
 	 *
-	 * @param integer $seconds Seconds to refresh
+	 * @param int $seconds Seconds to refresh
 	 * @throws \InvalidArgumentException If seconds value is not numeric
 	 * @return \SMF\TOTP\Auth instance
 	 */
 	public function setRefresh($seconds)
 	{
-		if (!is_numeric($seconds))
-		{
+		if (!is_numeric($seconds)) {
 			throw new \InvalidArgumentException('Seconds must be numeric');
 		}
 		$this->refreshSeconds = $seconds;
+
 		return $this;
 	}
 
 	/**
 	 * Get the current length for generated codes
 	 *
-	 * @return integer Code length
+	 * @return int Code length
 	 */
 	public function getCodeLength()
 	{
@@ -205,12 +204,13 @@ public function getCodeLength()
 	/**
 	 * Set the length of the generated codes
 	 *
-	 * @param integer $length Code length
+	 * @param int $length Code length
 	 * @return \SMF\TOTP\Auth instance
 	 */
 	public function setCodeLength($length)
 	{
 		$this->codeLength = $length;
+
 		return $this;
 	}
 
@@ -220,14 +220,13 @@ public function setCodeLength($length)
 	 * @param string $code Code entered by user
 	 * @param string $initKey Initialization key
 	 * @param string $timestamp Timestamp for calculation
-	 * @param integer $range Seconds before/after to validate hash against
+	 * @param int $range Seconds before/after to validate hash against
 	 * @throws \InvalidArgumentException If incorrect code length
-	 * @return boolean Pass/fail of validation
+	 * @return bool Pass/fail of validation
 	 */
 	public function validateCode($code, $initKey = null, $timestamp = null, $range = null)
 	{
-		if (strlen($code) !== $this->getCodeLength())
-		{
+		if (strlen($code) !== $this->getCodeLength()) {
 			throw new \InvalidArgumentException('Incorrect code length');
 		}
 
@@ -237,13 +236,12 @@ public function validateCode($code, $initKey = null, $timestamp = null, $range =
 
 		$binary = $this->base32_decode($initKey);
 
-		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++)
-		{
-			if ($this->generateOneTime($binary, $time) == $code)
-			{
+		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++) {
+			if ($this->generateOneTime($binary, $time) == $code) {
 				return true;
 			}
 		}
+
 		return false;
 	}
 
@@ -263,7 +261,7 @@ public function generateOneTime($initKey = null, $timestamp = null)
 			'sha1',
 			pack('N*', 0) . pack('N*', $timestamp),
 			$initKey,
-			true
+			true,
 		);
 
 		return str_pad($this->truncateHash($hash), $this->getCodeLength(), '0', STR_PAD_LEFT);
@@ -273,7 +271,7 @@ public function generateOneTime($initKey = null, $timestamp = null)
 	 * Generate a code/hash
 	 *     Useful for making Initialization codes
 	 *
-	 * @param integer $length Length for the generated code
+	 * @param int $length Length for the generated code
 	 * @return string Generated code
 	 */
 	public function generateCode($length = 16)
@@ -281,8 +279,7 @@ public function generateCode($length = 16)
 		$lookup = implode('', array_keys($this->getLookup()));
 		$code = '';
 
-		for ($i = 0; $i < $length; $i++)
-		{
+		for ($i = 0; $i < $length; $i++) {
 			$code .= $lookup[Utils::randomInt(0, strlen($lookup) - 1)];
 		}
 
@@ -292,7 +289,7 @@ public function generateCode($length = 16)
 	/**
 	 * Generate the timestamp for the calculation
 	 *
-	 * @return integer Timestamp
+	 * @return int Timestamp
 	 */
 	public function generateTimestamp()
 	{
@@ -328,8 +325,7 @@ public function base32_decode($hash)
 	{
 		$lookup = $this->getLookup();
 
-		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false)
-		{
+		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false) {
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 
@@ -338,14 +334,12 @@ public function base32_decode($hash)
 		$length = 0;
 		$binary = '';
 
-		for ($i = 0; $i < strlen($hash); $i++)
-		{
+		for ($i = 0; $i < strlen($hash); $i++) {
 			$buffer = $buffer << 5;
 			$buffer += $lookup[$hash[$i]];
 			$length += 5;
 
-			if ($length >= 8)
-			{
+			if ($length >= 8) {
 				$length -= 8;
 				$binary .= chr(($buffer & (0xFF << $length)) >> $length);
 			}
@@ -364,6 +358,7 @@ public function base32_decode($hash)
 	public function getQrCodeUrl($name, $code)
 	{
 		$url = 'otpauth://totp/' . urlencode($name) . '?secret=' . $code;
+
 		return $url;
 	}
 }
diff --git a/Sources/TOTP/index.php b/Sources/TOTP/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/TOTP/index.php
+++ b/Sources/TOTP/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/TaskRunner.php b/Sources/TaskRunner.php
index 402f1e8f2b..261fe83d9d 100644
--- a/Sources/TaskRunner.php
+++ b/Sources/TaskRunner.php
@@ -45,11 +45,11 @@ class TaskRunner
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'handleError' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'calculateNextTrigger' => 'CalculateNextTrigger',
+		],
+	];
 
 	/***********
 	 * Constants
@@ -61,14 +61,14 @@ class TaskRunner
 	 * indicated here. It might turn ugly if you do. But on proper cron you can
 	 * always increase this value provided you don't go beyond max_limit.
 	 */
-	const MAX_CRON_TIME = 10;
+	public const MAX_CRON_TIME = 10;
 
 	/**
 	 * If a task fails for whatever reason it will still be marked as claimed.
 	 * This is the threshold by which if a task has not completed in this time,
 	 * the task should become available again.
 	 */
-	const MAX_CLAIM_THRESHOLD = 300;
+	public const MAX_CLAIM_THRESHOLD = 300;
 
 	/**************************
 	 * Public static properties
@@ -79,43 +79,43 @@ class TaskRunner
 	 *
 	 * Info about the classes to load for scheduled tasks.
 	 */
-	public static array $scheduled_tasks = array(
-		'daily_maintenance' => array(
+	public static array $scheduled_tasks = [
+		'daily_maintenance' => [
 			'class' => 'SMF\\Tasks\\DailyMaintenance',
-		),
-		'weekly_maintenance' => array(
+		],
+		'weekly_maintenance' => [
 			'class' => 'SMF\\Tasks\\WeekLyMaintenance',
-		),
-		'daily_digest' => array(
+		],
+		'daily_digest' => [
 			'class' => 'SMF\\Tasks\\SendDigests',
-			'data' => array('is_weekly' => 0),
-		),
-		'weekly_digest' => array(
+			'data' => ['is_weekly' => 0],
+		],
+		'weekly_digest' => [
 			'class' => 'SMF\\Tasks\\SendDigests',
-			'data' => array('is_weekly' => 1),
-		),
-		'fetchSMfiles' => array(
+			'data' => ['is_weekly' => 1],
+		],
+		'fetchSMfiles' => [
 			'class' => 'SMF\\Tasks\\FetchSMFiles',
-		),
-		'birthdayemails' => array(
+		],
+		'birthdayemails' => [
 			'class' => 'SMF\\Tasks\\Birthday_Notify',
-		),
-		'paid_subscriptions' => array(
+		],
+		'paid_subscriptions' => [
 			'class' => 'SMF\\Tasks\\PaidSubs',
-		),
-		'remove_temp_attachments' => array(
+		],
+		'remove_temp_attachments' => [
 			'class' => 'SMF\\Tasks\\RemoveTempAttachments',
-		),
-		'remove_topic_redirect' => array(
+		],
+		'remove_topic_redirect' => [
 			'class' => 'SMF\\Tasks\\RemoveTopicRedirects',
-		),
-		'remove_old_drafts' => array(
+		],
+		'remove_old_drafts' => [
 			'class' => 'SMF\\Tasks\\RemoveOldDrafts',
-		),
-		'prune_log_topics' => array(
+		],
+		'prune_log_topics' => [
 			'class' => 'SMF\\Tasks\\PruneLogTopics',
-		),
-	);
+		],
+	];
 
 	/****************
 	 * Public methods
@@ -127,31 +127,33 @@ class TaskRunner
 	public function __construct()
 	{
 		// For backward compatibility.
-		if (!defined('MAX_CRON_TIME'))
+		if (!defined('MAX_CRON_TIME')) {
 			define('MAX_CRON_TIME', self::MAX_CRON_TIME);
+		}
 
-		if (!defined('MAX_CLAIM_THRESHOLD'))
+		if (!defined('MAX_CLAIM_THRESHOLD')) {
 			define('MAX_CLAIM_THRESHOLD', self::MAX_CLAIM_THRESHOLD);
+		}
 
 		// Called from cron.php.
-		if (SMF === 'BACKGROUND')
-		{
+		if (SMF === 'BACKGROUND') {
 			define('FROM_CLI', empty($_SERVER['REQUEST_METHOD']));
 
 			// Don't do john didley if the forum's been shut down completely.
-			if (!empty(Config::$maintenance) &&  2 === Config::$maintenance)
+			if (!empty(Config::$maintenance) &&  2 === Config::$maintenance) {
 				ErrorHandler::displayMaintenanceMessage();
+			}
 
 			// Have we already turned this off? If so, exist gracefully.
 			// @todo Remove this? It's a bad idea to ever disable background tasks.
-			if (file_exists(Config::$cachedir . '/cron.lock'))
+			if (file_exists(Config::$cachedir . '/cron.lock')) {
 				$this->obExit();
+			}
 
 			Security::frameOptionsHeader();
 
 			// Before we go any further, if this is not a CLI request, we need to do some checking.
-			if (!FROM_CLI)
-			{
+			if (!FROM_CLI) {
 				// When using sub-domains with SSI and ssi_themes set, browsers will
 				// receive a "Access-Control-Allow-Origin" error. '*' is not ideal,
 				// but the best method to preventing this from occurring.
@@ -160,11 +162,10 @@ public function __construct()
 				// We will clean up $_GET shortly. But we want to this ASAP.
 				$ts = isset($_GET['ts']) ? (int) $_GET['ts'] : 0;
 
-				if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
+				if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) {
 					$this->obExit();
-			}
-			else
-			{
+				}
+			} else {
 				$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.0';
 			}
 
@@ -200,28 +201,27 @@ public function __construct()
 	public function execute(): void
 	{
 		// If we have any scheduled tasks due, add them to the queue.
-		if ((Config::$modSettings['next_task_time'] ?? 0) < time())
+		if ((Config::$modSettings['next_task_time'] ?? 0) < time()) {
 			$this->scheduleTask();
+		}
 
-		while ($task_details = $this->fetchTask())
-		{
+		while ($task_details = $this->fetchTask()) {
 			$result = $this->performTask($task_details);
 
-			if ($result)
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}background_tasks
+			if ($result) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}background_tasks
 					WHERE id_task = {int:task}',
-					array(
+					[
 						'task' => $task_details['id_task'],
-					)
+					],
 				);
 			}
 		}
 
 		// If we have time, work on the mail queue.
-		if (time() - TIME_START < ceil(self::MAX_CRON_TIME / 2) && (Config::$modSettings['mail_next_send'] ?? INF) < time())
-		{
+		if (time() - TIME_START < ceil(self::MAX_CRON_TIME / 2) && (Config::$modSettings['mail_next_send'] ?? INF) < time()) {
 			Mail::reduceQueue();
 		}
 
@@ -235,28 +235,27 @@ public function execute(): void
 	public function runOneTask(): void
 	{
 		// If we have any scheduled tasks due, add them to the queue.
-		if ((Config::$modSettings['next_task_time'] ?? 0) < time())
+		if ((Config::$modSettings['next_task_time'] ?? 0) < time()) {
 			$this->scheduleTask();
+		}
 
 		// Do we have a task to run?
-		if ($task_details = $this->fetchTask())
-		{
+		if ($task_details = $this->fetchTask()) {
 			$result = $this->performTask($task_details);
 
-			if ($result)
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}background_tasks
+			if ($result) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}background_tasks
 					WHERE id_task = {int:task}',
-					array(
+					[
 						'task' => $task_details['id_task'],
-					)
+					],
 				);
 			}
 		}
 		// What about mail to send?
-		elseif ((Config::$modSettings['mail_next_send'] ?? INF) < time())
-		{
+		elseif ((Config::$modSettings['mail_next_send'] ?? INF) < time()) {
 			Mail::reduceQueue();
 		}
 	}
@@ -269,75 +268,74 @@ public function runOneTask(): void
 	public function runScheduledTasks(array $tasks): void
 	{
 		// Actually have something passed?
-		if (!empty($tasks))
-		{
-			$task_ids = array();
-			$task_names = array();
-			$task_query = array();
-
-			foreach ($tasks as $task)
-			{
-				if (is_numeric($task))
-				{
+		if (!empty($tasks)) {
+			$task_ids = [];
+			$task_names = [];
+			$task_query = [];
+
+			foreach ($tasks as $task) {
+				if (is_numeric($task)) {
 					$task_ids[] = (int) $task;
-				}
-				else
-				{
+				} else {
 					$task_names[] = (string) $task;
 				}
 			}
 
-			if (!empty($task_ids))
+			if (!empty($task_ids)) {
 				$task_query[] = 'id_task IN ({array_int:task_ids})';
+			}
 
-			if (!empty($task_names))
+			if (!empty($task_names)) {
 				$task_query[] = 'task IN ({array_string:task_names})';
+			}
 
-			if (!empty($task_query))
+			if (!empty($task_query)) {
 				$task_query = implode(' OR ', $task_query);
+			}
 		}
 
-		if (empty($task_query))
+		if (empty($task_query)) {
 			return;
+		}
 
 		// Load up the tasks.
 		ignore_user_abort(true);
 
-		$request = Db::$db->query('', '
-			SELECT id_task, next_time, task, callable
+		$request = Db::$db->query(
+			'',
+			'SELECT id_task, next_time, task, callable
 			FROM {db_prefix}scheduled_tasks
 			WHERE ' . $task_query . '
 			LIMIT {int:limit}',
-			array(
+			[
 				'task_ids' => $task_ids,
 				'task_names' => $task_names,
 				'limit' => count($task_ids) + count($task_names),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// What kind of task are we handling?
 			// Note: keep the next_time value unchanged, because running the
 			// task manually shouldn't interfere with the normal schedule.
-			if (!empty($row['callable']))
-			{
+			if (!empty($row['callable'])) {
 				$task_details = $this->getScheduledTaskDetails($row['id_task'], $row['next_time'], $row['callable'], true);
-			}
-			elseif (!empty($row['task']))
-			{
+			} elseif (!empty($row['task'])) {
 				$task_details = $this->getScheduledTaskDetails($row['id_task'], $row['next_time'], $row['task']);
 			}
 
 			// Does the class exist?
-			if (!class_exists($task_details['task_class']))
+			if (!class_exists($task_details['task_class'])) {
 				continue;
+			}
 
 			// Load an instance of the scheduled task.
 			$bgtask = new $task_details['task_class']($task_details['task_data']);
 
 			// If the instance isn't actually a scheduled task, skip it.
-			if (!is_subclass_of($bgtask, 'SMF\\Tasks\\ScheduledTask'))
+			if (!is_subclass_of($bgtask, 'SMF\\Tasks\\ScheduledTask')) {
 				continue;
+			}
 
 			// Run the task and log that we did.
 			$bgtask->execute();
@@ -357,21 +355,22 @@ public function runScheduledTasks(array $tasks): void
 	 * @param string $error_string The error message
 	 * @param string $file The file where the error occurred
 	 * @param int $line What line of the specified file the error occurred on
-	 * @return void
 	 */
 	public static function handleError($error_level, $error_string, $file, $line): void
 	{
 		// Ignore errors that should not be logged.
-		if (error_reporting() == 0)
+		if (error_reporting() == 0) {
 			return;
+		}
 
 		$error_type = 'cron';
 
 		ErrorHandler::log($error_level . ': ' . $error_string, $error_type, $file, $line);
 
 		// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-		if ($error_level % 255 == E_ERROR)
+		if ($error_level % 255 == E_ERROR) {
 			die('No direct access...');
+		}
 	}
 
 	/**
@@ -380,94 +379,93 @@ public static function handleError($error_level, $error_string, $file, $line): v
 	 * @param string|array $tasks IDs or names of one or more scheduled tasks.
 	 * @param bool $force_update Whether to force the tasks to run now.
 	 */
-	public static function calculateNextTrigger(string|array $tasks = array(), bool $force_update = false): void
+	public static function calculateNextTrigger(string|array $tasks = [], bool $force_update = false): void
 	{
 		$tasks = (array) $tasks;
 
 		// Actually have something passed?
-		if (!empty($tasks))
-		{
-			$task_ids = array();
-			$task_names = array();
-			$task_query = array();
-
-			foreach ($tasks as $task)
-			{
-				if (is_numeric($task))
-				{
+		if (!empty($tasks)) {
+			$task_ids = [];
+			$task_names = [];
+			$task_query = [];
+
+			foreach ($tasks as $task) {
+				if (is_numeric($task)) {
 					$task_ids[] = (int) $task;
-				}
-				else
-				{
+				} else {
 					$task_names[] = (string) $task;
 				}
 			}
 
-			if (!empty($task_ids))
+			if (!empty($task_ids)) {
 				$task_query[] = 'id_task IN ({array_int:task_ids})';
+			}
 
-			if (!empty($task_names))
+			if (!empty($task_names)) {
 				$task_query[] = 'task IN ({array_string:task_names})';
+			}
 
-			if (!empty($task_query))
+			if (!empty($task_query)) {
 				$task_query = 'AND (' . implode(' OR ', $task_query) . ')';
+			}
 		}
 
-		if (empty($task_query))
+		if (empty($task_query)) {
 			$task_query = '';
+		}
 
 		$next_task_time = empty($tasks) ? time() + 86400 : Config::$modSettings['next_task_time'];
 
 		// Get the critical info for the tasks.
-		$tasks = array();
-		$request = Db::$db->query('', '
-			SELECT id_task, next_time, time_offset, time_regularity, time_unit
+		$tasks = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT id_task, next_time, time_offset, time_regularity, time_unit
 			FROM {db_prefix}scheduled_tasks
 			WHERE disabled = {int:not_disabled}
 				' . $task_query,
-			array(
+			[
 				'not_disabled' => 0,
-				'task_ids' => $task_ids ?? array(),
-				'task_names' => $task_names ?? array(),
-			)
+				'task_ids' => $task_ids ?? [],
+				'task_names' => $task_names ?? [],
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$next_time = self::getNextScheduledTime($row['time_regularity'], $row['time_unit'], $row['time_offset']);
 
 			// Only bother moving the task if it's out of place or we're forcing it!
-			if ($force_update || $next_time < $row['next_time'] || $row['next_time'] < time())
-			{
+			if ($force_update || $next_time < $row['next_time'] || $row['next_time'] < time()) {
 				$tasks[$row['id_task']] = $next_time;
-			}
-			else
-			{
+			} else {
 				$next_time = $row['next_time'];
 			}
 
 			// If this is sooner than the current next task, make this the next task.
-			if ($next_time < $next_task_time)
+			if ($next_time < $next_task_time) {
 				$next_task_time = $next_time;
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Now make the changes!
-		foreach ($tasks as $id => $time)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}scheduled_tasks
+		foreach ($tasks as $id => $time) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}scheduled_tasks
 				SET next_time = {int:next_time}
 				WHERE id_task = {int:id_task}',
-				array(
+				[
 					'next_time' => $time,
 					'id_task' => $id,
-				)
+				],
 			);
 		}
 
 		// If the next task is now different, update.
-		if (Config::$modSettings['next_task_time'] != $next_task_time)
-			Config::updateModSettings(array('next_task_time' => $next_task_time));
+		if (Config::$modSettings['next_task_time'] != $next_task_time) {
+			Config::updateModSettings(['next_task_time' => $next_task_time]);
+		}
 	}
 
 	/******************
@@ -483,58 +481,59 @@ public static function calculateNextTrigger(string|array $tasks = array(), bool
 	protected function fetchTask(): bool|array
 	{
 		// Check we haven't run over our time limit.
-		if (microtime(true) - TIME_START > self::MAX_CRON_TIME)
+		if (microtime(true) - TIME_START > self::MAX_CRON_TIME) {
 			return false;
+		}
 
 		// Try to find a task. Specifically, try to find one that hasn't been
 		// claimed previously, or failing that, a task that was claimed but
 		// failed for whatever reason and failed long enough ago. We should not
 		// care what task it is, merely that it is one in the queue; the order
 		// is irrelevant.
-		$request = Db::$db->query('', '
-			SELECT id_task, task_file, task_class, task_data, claimed_time
+		$request = Db::$db->query(
+			'',
+			'SELECT id_task, task_file, task_class, task_data, claimed_time
 			FROM {db_prefix}background_tasks
 			WHERE claimed_time < {int:claim_limit}
 			LIMIT 1',
-			array(
+			[
 				'claim_limit' => time() - self::MAX_CLAIM_THRESHOLD,
-			)
+			],
 		);
-		if ($row = Db::$db->fetch_assoc($request))
-		{
+
+		if ($row = Db::$db->fetch_assoc($request)) {
 			// We found one. Let's try and claim it immediately.
 			Db::$db->free_result($request);
-			Db::$db->query('', '
-				UPDATE {db_prefix}background_tasks
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}background_tasks
 				SET claimed_time = {int:new_claimed}
 				WHERE id_task = {int:task}
 					AND claimed_time = {int:old_claimed}',
-				array(
+				[
 					'new_claimed' => time(),
 					'task' => $row['id_task'],
 					'old_claimed' => $row['claimed_time'],
-				)
+				],
 			);
+
 			// Could we claim it? If so, return it back.
-			if (Db::$db->affected_rows() != 0)
-			{
+			if (Db::$db->affected_rows() != 0) {
 				// Update the time and go back.
 				$row['claimed_time'] = time();
+
 				return $row;
 			}
-			else
-			{
-				// Uh oh, we just missed it. Try to claim another one, and let
-				// it fall through if there aren't any.
-				return $this->fetchTask();
-			}
-		}
-		else
-		{
-			// No dice. Clean up and go home.
-			Db::$db->free_result($request);
-			return false;
+
+			// Uh oh, we just missed it. Try to claim another one, and let
+			// it fall through if there aren't any.
+			return $this->fetchTask();
 		}
+
+		// No dice. Clean up and go home.
+		Db::$db->free_result($request);
+
+		return false;
 	}
 
 	/**
@@ -547,17 +546,16 @@ protected function performTask($task_details): bool
 	{
 		// This indicates the file to load.
 		// Only needed for tasks that don't use the SMF\Tasks\ namespace.
-		if (!empty($task_details['task_file']))
-		{
-			$include = strtr(trim($task_details['task_file']), array('$boarddir' => Config::$boarddir, '$sourcedir' => Config::$sourcedir));
+		if (!empty($task_details['task_file'])) {
+			$include = strtr(trim($task_details['task_file']), ['$boarddir' => Config::$boarddir, '$sourcedir' => Config::$sourcedir]);
 
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+				require_once $include;
+			}
 		}
 
 		// All background tasks need to be classes.
-		if (empty($task_details['task_class']))
-		{
+		if (empty($task_details['task_class'])) {
 			// This would be nice to translate but the language files aren't
 			// loaded for any specific language.
 			ErrorHandler::log('Invalid background task specified: no class supplied');
@@ -567,18 +565,16 @@ protected function performTask($task_details): bool
 		}
 
 		// Normally, the class should be specified using its fully qualified name.
-		if (class_exists($task_details['task_class']) && is_subclass_of($task_details['task_class'], 'SMF\\Tasks\\BackgroundTask'))
-		{
-			$details = empty($task_details['task_data']) ? array() : Utils::jsonDecode($task_details['task_data'], true);
+		if (class_exists($task_details['task_class']) && is_subclass_of($task_details['task_class'], 'SMF\\Tasks\\BackgroundTask')) {
+			$details = empty($task_details['task_data']) ? [] : Utils::jsonDecode($task_details['task_data'], true);
 
 			$bgtask = new $task_details['task_class']($details);
 
 			$success = $bgtask->execute();
 		}
 		// Just in case a mod or something specified a task without giving the namespace.
-		elseif (class_exists('SMF\\Tasks\\' . $task_details['task_class']) && is_subclass_of('SMF\\Tasks\\' . $task_details['task_class'], 'SMF\\Tasks\\BackgroundTask'))
-		{
-			$details = empty($task_details['task_data']) ? array() : Utils::jsonDecode($task_details['task_data'], true);
+		elseif (class_exists('SMF\\Tasks\\' . $task_details['task_class']) && is_subclass_of('SMF\\Tasks\\' . $task_details['task_class'], 'SMF\\Tasks\\BackgroundTask')) {
+			$details = empty($task_details['task_data']) ? [] : Utils::jsonDecode($task_details['task_data'], true);
 
 			$task_class = 'SMF\\Tasks\\' . $task_details['task_class'];
 
@@ -587,8 +583,7 @@ protected function performTask($task_details): bool
 			$success = $bgtask->execute();
 		}
 		// Uh-oh...
-		else
-		{
+		else {
 			ErrorHandler::log('Invalid background task specified: class ' . $task_details['task_class'] . ' not found');
 
 			// So we clear it from the queue.
@@ -596,8 +591,7 @@ protected function performTask($task_details): bool
 		}
 
 		// For scheduled tasks, log it and update our next scheduled task time.
-		if (is_subclass_of($bgtask, 'SMF\\Tasks\\ScheduledTask'))
-		{
+		if (is_subclass_of($bgtask, 'SMF\\Tasks\\ScheduledTask')) {
 			$bgtask->log();
 			Tasks\ScheduledTask::updateNextTaskTime();
 		}
@@ -612,28 +606,28 @@ protected function performTask($task_details): bool
 	protected function scheduleTask(): void
 	{
 		// Select the next task to do.
-		$request = Db::$db->query('', '
-			SELECT id_task, task, next_time, time_offset, time_regularity, time_unit, callable
+		$request = Db::$db->query(
+			'',
+			'SELECT id_task, task, next_time, time_offset, time_regularity, time_unit, callable
 			FROM {db_prefix}scheduled_tasks
 			WHERE disabled = {int:not_disabled}
 				AND next_time <= {int:current_time}
 			ORDER BY next_time ASC
 			LIMIT 1',
-			array(
+			[
 				'not_disabled' => 0,
 				'current_time' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// When should this next be run?
 			$next_time = self::getNextScheduledTime($row['time_regularity'], $row['time_unit'], $row['time_offset']);
 
 			// How long in seconds is the gap?
 			$duration = $row['time_regularity'];
 
-			switch ($row['time_unit'])
-			{
+			switch ($row['time_unit']) {
 				case 'm':
 					$duration *= 60;
 					break;
@@ -655,48 +649,47 @@ protected function scheduleTask(): void
 			}
 
 			// If we were really late running this task, skip the next scheduled execution.
-			if (time() + ($duration / 2) > $next_time)
+			if (time() + ($duration / 2) > $next_time) {
 				$next_time += $duration;
+			}
 
 			// What kind of task are we handling?
-			if (!empty($row['callable']))
-			{
+			if (!empty($row['callable'])) {
 				$task_details = $this->getScheduledTaskDetails($row['id_task'], $row['callable'], true);
-			}
-			elseif (!empty($row['task']))
-			{
+			} elseif (!empty($row['task'])) {
 				$task_details = $this->getScheduledTaskDetails($row['id_task'], $row['task']);
 			}
 
 			// If we have a valid background task, queue it up.
-			if (isset($task_details['task_class']) && class_exists($task_details['task_class']))
-			{
-				Db::$db->insert('insert',
+			if (isset($task_details['task_class']) && class_exists($task_details['task_class'])) {
+				Db::$db->insert(
+					'insert',
 					'{db_prefix}background_tasks',
-					array(
+					[
 						'task_file' => 'string-255',
 						'task_class' => 'string-255',
 						'task_data' => 'string',
 						'claimed_time' => 'int',
-					),
-					array(
+					],
+					[
 						'',
 						$task_details['task_class'],
 						json_encode($task_details['task_data']),
 						0,
-					),
-					array()
+					],
+					[],
 				);
 
 				// Updates next_time for this task so that no parallel processes run it.
-				Db::$db->query('', '
-					UPDATE {db_prefix}scheduled_tasks
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}scheduled_tasks
 					SET next_time = {int:next_time}
 					WHERE id_task = {int:id_task}',
-					array(
+					[
 						'next_time' => $next_time,
 						'id_task' => $row['id_task'],
-					)
+					],
 				);
 			}
 		}
@@ -715,55 +708,49 @@ protected function scheduleTask(): void
 	protected function getScheduledTaskDetails(int $id, string $task, bool $is_callable = false): array
 	{
 		// Allow mods to easily add scheduled tasks.
-		IntegrationHook::call('integrate_scheduled_tasks', array(&self::$scheduled_tasks));
+		IntegrationHook::call('integrate_scheduled_tasks', [&self::$scheduled_tasks]);
 
-		if ($is_callable)
-		{
+		if ($is_callable) {
 			$class = 'SMF\\Tasks\\GenericScheduledTask';
-			$data = array(
+			$data = [
 				'callable' => $task,
 				'id_scheduled_task' => $id,
-			);
-		}
-		elseif (isset(self::$scheduled_tasks[$task]))
-		{
+			];
+		} elseif (isset(self::$scheduled_tasks[$task])) {
 			$class = self::$scheduled_tasks[$task]['class'];
 			$data = array_merge(
-				array(
+				[
 					'task' => $task,
 					'id_scheduled_task' => $id,
-				),
-				self::$scheduled_tasks[$task]['data'] ?? array(),
+				],
+				self::$scheduled_tasks[$task]['data'] ?? [],
 			);
-		}
-		else
-		{
+		} else {
 			$class = 'SMF\\Tasks\\' . $task;
-			$data = array(
+			$data = [
 				'task' => $task,
 				'id_scheduled_task' => $id,
-			);
+			];
 		}
 
-		return array(
+		return [
 			'task_class' => $class,
 			'task_data' => $data,
-		);
+		];
 	}
 
-
 	/* Helper functions that resemble their big brother counterparts. */
 
 	/**
 	 * Cleans up the request variables.
 	 *
-	 * @return void
 	 */
 	protected function cleanRequest(): void
 	{
 		// These keys shouldn't be set...ever.
-		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+		if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 			die('Invalid request variable.');
+		}
 
 		// Save some memory.. (since we don't use these anyway.)
 		unset(
@@ -784,15 +771,13 @@ protected function cleanRequest(): void
 	 */
 	protected function obExit(): void
 	{
-		if (FROM_CLI)
-		{
+		if (FROM_CLI) {
 			die(0);
 		}
-		else
-		{
-			header('content-type: image/gif');
-			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
-		}
+
+		header('content-type: image/gif');
+
+		die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 	}
 
 	/*************************
@@ -810,58 +795,59 @@ protected function obExit(): void
 	protected static function getNextScheduledTime(int $regularity, string $unit, int $offset): int
 	{
 		// Just in case!
-		if ($regularity == 0)
+		if ($regularity == 0) {
 			$regularity = 2;
+		}
 
 		$cur_min = date('i', time());
 
 		// If the unit is minutes only check regularity in minutes.
-		if ($unit == 'm')
-		{
+		if ($unit == 'm') {
 			$off = date('i', $offset);
 
 			// If it's now just pretend it ain't,
-			if ($off == $cur_min)
-			{
+			if ($off == $cur_min) {
 				$next_time = time() + $regularity;
-			}
-			else
-			{
+			} else {
 				// Make sure that the offset is always in the past.
 				$off = $off > $cur_min ? $off - 60 : $off;
 
-				while ($off <= $cur_min)
+				while ($off <= $cur_min) {
 					$off += $regularity;
+				}
 
 				// Now we know when the time should be!
 				$next_time = time() + 60 * ($off - $cur_min);
 			}
 		}
 		// Otherwise, work out what the offset would be with today's date.
-		else
-		{
+		else {
 			$next_time = mktime(date('H', $offset), date('i', $offset), 0, date('m'), date('d'), date('Y'));
 
 			// Make the time offset in the past!
-			if ($next_time > time())
+			if ($next_time > time()) {
 				$next_time -= 86400;
+			}
 
 			// Default we'll jump in hours.
 			$apply_offset = 3600;
 
 			// 24 hours = 1 day.
-			if ($unit == 'd')
+			if ($unit == 'd') {
 				$apply_offset = 86400;
+			}
 
 			// Otherwise a week.
-			if ($unit == 'w')
+			if ($unit == 'w') {
 				$apply_offset = 604800;
+			}
 
 			$apply_offset *= $regularity;
 
 			// Just add on the offset.
-			while ($next_time <= time())
+			while ($next_time <= time()) {
 				$next_time += $apply_offset;
+			}
 		}
 
 		return $next_time;
@@ -869,7 +855,8 @@ protected static function getNextScheduledTime(int $regularity, string $unit, in
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TaskRunner::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TaskRunner::exportStatic')) {
 	TaskRunner::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/tasks/ApprovePost_Notify.php b/Sources/Tasks/ApprovePost_Notify.php
similarity index 84%
rename from Sources/tasks/ApprovePost_Notify.php
rename to Sources/Tasks/ApprovePost_Notify.php
index 11c370bad2..333ae612fa 100644
--- a/Sources/tasks/ApprovePost_Notify.php
+++ b/Sources/Tasks/ApprovePost_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify moderators when there are posts that
@@ -42,55 +41,55 @@ public function execute()
 		$posterOptions = $this->_details['posterOptions'];
 		$type = $this->_details['type'];
 
-		$members = array();
-		$alert_rows = array();
+		$members = [];
+		$alert_rows = [];
 
 		// We need to know who can approve this post.
 		$modMembers = User::membersAllowedTo('approve_posts', $topicOptions['board']);
 
-		$request = Db::$db->query('', '
-			SELECT id_member, email_address, lngfile
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, email_address, lngfile
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $modMembers,
-			)
+			],
 		);
 
-		$watched = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$watched = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
 			$watched[$row['id_member']] = $row;
 		}
 		Db::$db->free_result($request);
 
-		if (empty($members))
+		if (empty($members)) {
 			return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = Notify::getNotifyPrefs($members, 'unapproved_post', true);
-		foreach ($watched as $member => $data)
-		{
+
+		foreach ($watched as $member => $data) {
 			$pref = !empty($prefs[$member]['unapproved_post']) ? $prefs[$member]['unapproved_post'] : 0;
 
-			if ($pref & self::RECEIVE_NOTIFY_EMAIL)
-			{
+			if ($pref & self::RECEIVE_NOTIFY_EMAIL) {
 				// Emails are a bit complicated. We have to do language stuff.
 				Theme::loadEssential();
 
-				$replacements = array(
+				$replacements = [
 					'SUBJECT' => $msgOptions['subject'],
 					'LINK' => Config::$scripturl . '?topic=' . $topicOptions['id'] . '.new#new',
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('alert_unapproved_post', $replacements, empty($data['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Config::$language : $data['lngfile']);
 				Mail::send($data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicOptions['id'], $emaildata['is_html']);
 			}
 
-			if ($pref & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$alert_rows[] = array(
+			if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+				$alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $member,
 					'id_member_started' => $posterOptions['id'],
@@ -99,19 +98,20 @@ public function execute()
 					'content_id' => $type == 'topic' ? $topicOptions['id'] : $msgOptions['id'],
 					'content_action' => 'unapproved_' . $type,
 					'is_read' => 0,
-					'extra' => Utils::jsonEncode(array(
+					'extra' => Utils::jsonEncode([
 						'topic' => $topicOptions['id'],
 						'board' => $topicOptions['board'],
 						'content_subject' => $msgOptions['subject'],
 						'content_link' => Config::$scripturl . '?topic=' . $topicOptions['id'] . '.msg' . $msgOptions['id'] . '#msg' . $msgOptions['id'],
-					)),
-				);
+					]),
+				];
 			}
 		}
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
+		if (!empty($alert_rows)) {
 			Alert::createBatch($alert_rows);
+		}
 
 		return true;
 	}
diff --git a/Sources/tasks/ApproveReply_Notify.php b/Sources/Tasks/ApproveReply_Notify.php
similarity index 83%
rename from Sources/tasks/ApproveReply_Notify.php
rename to Sources/Tasks/ApproveReply_Notify.php
index 16827f763f..35f74a43bb 100644
--- a/Sources/tasks/ApproveReply_Notify.php
+++ b/Sources/Tasks/ApproveReply_Notify.php
@@ -13,15 +13,13 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
-use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify a member when a moderator replied to
@@ -41,50 +39,49 @@ public function execute()
 		$topicOptions = $this->_details['topicOptions'];
 		$posterOptions = $this->_details['posterOptions'];
 
-		$members = array();
-		$alert_rows = array();
+		$members = [];
+		$alert_rows = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, email_address, lngfile
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, email_address, lngfile
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = t.id_member_started)
 			WHERE id_topic = {int:topic}',
-			array(
+			[
 				'topic' => $topicOptions['id'],
-			)
+			],
 		);
 
-		$watched = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$watched = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
 			$watched[$row['id_member']] = $row;
 		}
 		Db::$db->free_result($request);
 
 		$prefs = Notify::getNotifyPrefs($members, 'unapproved_reply', true);
-		foreach ($watched as $member => $data)
-		{
+
+		foreach ($watched as $member => $data) {
 			$pref = !empty($prefs[$member]['unapproved_reply']) ? $prefs[$member]['unapproved_reply'] : 0;
 
-			if ($pref & self::RECEIVE_NOTIFY_EMAIL)
-			{
+			if ($pref & self::RECEIVE_NOTIFY_EMAIL) {
 				// Emails are a bit complicated. We have to do language stuff.
 				Theme::loadEssential();
 
-				$replacements = array(
+				$replacements = [
 					'SUBJECT' => $msgOptions['subject'],
 					'LINK' => Config::$scripturl . '?topic=' . $topicOptions['id'] . '.new#new',
 					'POSTERNAME' => Utils::htmlspecialcharsDecode($posterOptions['name']),
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('alert_unapproved_reply', $replacements, empty($data['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Config::$language : $data['lngfile']);
 				Mail::send($data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicOptions['id'], $emaildata['is_html']);
 			}
 
-			if ($pref & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$alert_rows[] = array(
+			if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+				$alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $member,
 					'id_member_started' => $posterOptions['id'],
@@ -93,19 +90,20 @@ public function execute()
 					'content_id' => $topicOptions['id'],
 					'content_action' => 'unapproved_reply',
 					'is_read' => 0,
-					'extra' => Utils::jsonEncode(array(
+					'extra' => Utils::jsonEncode([
 						'topic' => $topicOptions['id'],
 						'board' => $topicOptions['board'],
 						'content_subject' => $msgOptions['subject'],
 						'content_link' => Config::$scripturl . '?topic=' . $topicOptions['id'] . '.new;topicseen#new',
-					)),
-				);
+					]),
+				];
 			}
 		}
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
+		if (!empty($alert_rows)) {
 			Alert::createBatch($alert_rows);
+		}
 
 		return true;
 	}
diff --git a/Sources/tasks/BackgroundTask.php b/Sources/Tasks/BackgroundTask.php
similarity index 80%
rename from Sources/tasks/BackgroundTask.php
rename to Sources/Tasks/BackgroundTask.php
index 3d070ddaf2..4f218e4611 100644
--- a/Sources/tasks/BackgroundTask.php
+++ b/Sources/Tasks/BackgroundTask.php
@@ -22,9 +22,9 @@ abstract class BackgroundTask
 {
 	/**
 	 * Constants for notification types.
-	*/
-	const RECEIVE_NOTIFY_EMAIL = 0x02;
-	const RECEIVE_NOTIFY_ALERT = 0x01;
+	 */
+	public const RECEIVE_NOTIFY_EMAIL = 0x02;
+	public const RECEIVE_NOTIFY_ALERT = 0x01;
 
 	/**
 	 * @var array Holds the details for the task
@@ -52,12 +52,12 @@ abstract public function execute();
 	 * Loads minimal info for the previously loaded user ids
 	 *
 	 * @param array $user_ids
-	 * @return array
 	 * @throws Exception
+	 * @return array
 	 */
-	public function getMinUserInfo($user_ids = array())
+	public function getMinUserInfo($user_ids = [])
 	{
-		$loaded_ids = array_map(fn($member) => $member->id, User::load($user_ids, User::LOAD_BY_ID, 'minimal'));
+		$loaded_ids = array_map(fn ($member) => $member->id, User::load($user_ids, User::LOAD_BY_ID, 'minimal'));
 
 		return array_intersect_key(User::$profiles, array_flip($loaded_ids));
 	}
diff --git a/Sources/tasks/Birthday_Notify.php b/Sources/Tasks/Birthday_Notify.php
similarity index 72%
rename from Sources/tasks/Birthday_Notify.php
rename to Sources/Tasks/Birthday_Notify.php
index 7d50c39ac7..3edf922aa3 100644
--- a/Sources/tasks/Birthday_Notify.php
+++ b/Sources/Tasks/Birthday_Notify.php
@@ -13,16 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Lang;
-use SMF\Msg;
 use SMF\Mail;
 use SMF\Theme;
-use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to send out "Happy Birthday" emails.
@@ -37,88 +35,84 @@ class Birthday_Notify extends ScheduledTask
 	 */
 	public function execute()
 	{
-		$greeting = isset(Config::$modSettings['birthday_email']) ? Config::$modSettings['birthday_email'] : 'happy_birthday';
+		$greeting = Config::$modSettings['birthday_email'] ?? 'happy_birthday';
 
 		// Get the month and day of today.
 		$month = date('n'); // Month without leading zeros.
 		$day = date('j'); // Day without leading zeros.
 
 		// So who are the lucky ones?  Don't include those who are banned and those who don't want them.
-		$result = Db::$db->query('', '
-			SELECT id_member, real_name, lngfile, email_address
+		$result = Db::$db->query(
+			'',
+			'SELECT id_member, real_name, lngfile, email_address
 			FROM {db_prefix}members
 			WHERE is_activated < 10
 				AND MONTH(birthdate) = {int:month}
 				AND DAYOFMONTH(birthdate) = {int:day}
 				AND YEAR(birthdate) > {int:year}
 				' . (Db::$db->title === POSTGRE_TITLE ? 'AND indexable_month_day(birthdate) = indexable_month_day({date:bdate})' : ''),
-			array(
+			[
 				'year' => 1004,
 				'month' => $month,
 				'day' => $day,
 				'bdate' => '1004-' . $month . '-' . $day, // a random leap year is here needed
-			)
+			],
 		);
 
 		// Group them by languages.
-		$birthdays = array();
+		$birthdays = [];
 
-		while ($row = Db::$db->fetch_assoc($result))
-		{
-			if (!isset($birthdays[$row['lngfile']]))
-				$birthdays[$row['lngfile']] = array();
+		while ($row = Db::$db->fetch_assoc($result)) {
+			if (!isset($birthdays[$row['lngfile']])) {
+				$birthdays[$row['lngfile']] = [];
+			}
 
-			$birthdays[$row['lngfile']][$row['id_member']] = array(
+			$birthdays[$row['lngfile']][$row['id_member']] = [
 				'name' => $row['real_name'],
-				'email' => $row['email_address']
-			);
+				'email' => $row['email_address'],
+			];
 		}
 		Db::$db->free_result($result);
 
-		if (!empty($birthdays))
-		{
+		if (!empty($birthdays)) {
 			Theme::loadEssential();
 
 			// Send out the greetings!
-			foreach ($birthdays as $lang => $members)
-			{
+			foreach ($birthdays as $lang => $members) {
 				// We need to do some shuffling to make this work properly.
 				Lang::load('EmailTemplates', $lang);
 				Lang::$txt['happy_birthday_subject'] = Lang::$txtBirthdayEmails[$greeting . '_subject'];
 				Lang::$txt['happy_birthday_body'] = Lang::$txtBirthdayEmails[$greeting . '_body'];
 
-				$prefs = Notify::getNotifyPrefs(array_keys($members), array('birthday'), true);
+				$prefs = Notify::getNotifyPrefs(array_keys($members), ['birthday'], true);
 
-				foreach ($members as $member_id => $member)
-				{
+				foreach ($members as $member_id => $member) {
 					$pref = !empty($prefs[$member_id]['birthday']) ? $prefs[$member_id]['birthday'] : 0;
 
 					// Let's load replacements ahead
-					$replacements = array(
+					$replacements = [
 						'REALNAME' => $member['name'],
-					);
+					];
 
-					if ($pref & self::RECEIVE_NOTIFY_ALERT)
-					{
+					if ($pref & self::RECEIVE_NOTIFY_ALERT) {
 						$alertdata = Mail::loadEmailTemplate('happy_birthday', $replacements, $lang, false);
 
 						// For the alerts, we need to replace \n line breaks with <br> line breaks.
 						// For space saving sake, we'll be removing extra line breaks
-						$alertdata['body'] = preg_replace("~\s*[\r\n]+\s*~", '<br>', $alertdata['body']);
+						$alertdata['body'] = preg_replace("~\\s*[\r\n]+\\s*~", '<br>', $alertdata['body']);
 
-						$alert_rows[] = array(
+						$alert_rows[] = [
 							'alert_time' => time(),
 							'id_member' => $member_id,
 							'content_type' => 'birthday',
 							'content_id' => 0,
 							'content_action' => 'msg',
 							'is_read' => 0,
-							'extra' => Utils::jsonEncode(array('happy_birthday' => $alertdata['body'])),
-						);
+							'extra' => Utils::jsonEncode(['happy_birthday' => $alertdata['body']]),
+						];
 					}
 
-					if ($pref & self::RECEIVE_NOTIFY_EMAIL)
-					{
+					if ($pref & self::RECEIVE_NOTIFY_EMAIL) {
 						$emaildata = Mail::loadEmailTemplate('happy_birthday', $replacements, $lang, false);
 
 						Mail::send($member['email'], $emaildata['subject'], $emaildata['body'], null, 'birthday', $emaildata['is_html'], 4);
@@ -130,8 +124,9 @@ public function execute()
 			Mail::addToQueue(true);
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
+			if (!empty($alert_rows)) {
 				Alert::createBatch($alert_rows);
+			}
 		}
 
 		return true;
diff --git a/Sources/tasks/Buddy_Notify.php b/Sources/Tasks/Buddy_Notify.php
similarity index 89%
rename from Sources/tasks/Buddy_Notify.php
rename to Sources/Tasks/Buddy_Notify.php
index 2139987c42..031b55aa8e 100644
--- a/Sources/tasks/Buddy_Notify.php
+++ b/Sources/Tasks/Buddy_Notify.php
@@ -13,11 +13,9 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
-use SMF\Config;
 use SMF\User;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify members when they have been added to
@@ -36,9 +34,8 @@ public function execute()
 		// Figure out if the user wants to be notified.
 		$prefs = Notify::getNotifyPrefs($this->_details['receiver_id'], 'buddy_request', true);
 
-		if ($prefs[$this->_details['receiver_id']]['buddy_request'])
-		{
-			Alert::create(array(
+		if ($prefs[$this->_details['receiver_id']]['buddy_request']) {
+			Alert::create([
 				'alert_time' => $this->_details['time'],
 				'id_member' => $this->_details['receiver_id'],
 				'id_member_started' => $this->_details['id_member'],
@@ -48,7 +45,7 @@ public function execute()
 				'content_action' => 'buddy_request',
 				'is_read' => 0,
 				'extra' => '',
-			));
+			]);
 		}
 
 		return true;
diff --git a/Sources/tasks/CreateAttachment_Notify.php b/Sources/Tasks/CreateAttachment_Notify.php
similarity index 76%
rename from Sources/tasks/CreateAttachment_Notify.php
rename to Sources/Tasks/CreateAttachment_Notify.php
index a18148321f..be63bb338f 100644
--- a/Sources/tasks/CreateAttachment_Notify.php
+++ b/Sources/Tasks/CreateAttachment_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify moderators when there are attachments
@@ -38,73 +37,76 @@ class CreateAttachment_Notify extends BackgroundTask
 	public function execute()
 	{
 		// Validate the attachment does exist and is the right approval state.
-		$request = Db::$db->query('', '
-			SELECT a.id_attach, m.id_board, m.id_msg, m.id_topic, m.id_member, m.subject
+		$request = Db::$db->query(
+			'',
+			'SELECT a.id_attach, m.id_board, m.id_msg, m.id_topic, m.id_member, m.subject
 			FROM {db_prefix}attachments AS a
 				INNER JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 			WHERE a.id_attach = {int:attachment}
 				AND a.attachment_type = {int:attachment_type}
 				AND a.approved = {int:is_approved}',
-			array(
+			[
 				'attachment' => $this->_details['id'],
 				'attachment_type' => 0,
 				'is_approved' => 0,
-			)
+			],
 		);
+
 		// Return true if either not found or invalid so that the cron runner deletes this task.
-		if (Db::$db->num_rows($request) == 0)
+		if (Db::$db->num_rows($request) == 0) {
 			return true;
-		list ($id_attach, $id_board, $id_msg, $id_topic, $id_member, $subject) = Db::$db->fetch_row($request);
+		}
+		list($id_attach, $id_board, $id_msg, $id_topic, $id_member, $subject) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// We need to know who can approve this attachment.
 		$modMembers = User::membersAllowedTo('approve_posts', $id_board);
 
-		$request = Db::$db->query('', '
-			SELECT id_member, email_address, lngfile, real_name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, email_address, lngfile, real_name
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:members})',
-			array(
-				'members' => array_merge($modMembers, array($id_member)),
-			)
+			[
+				'members' => array_merge($modMembers, [$id_member]),
+			],
 		);
 
-		$members = array();
-		$watched = array();
+		$members = [];
+		$watched = [];
 		$real_name = '';
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if ($row['id_member'] == $id_member)
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if ($row['id_member'] == $id_member) {
 				$real_name = $row['real_name'];
-			else
-			{
+			} else {
 				$members[] = $row['id_member'];
 				$watched[$row['id_member']] = $row;
 			}
 		}
 		Db::$db->free_result($request);
 
-		if (empty($members))
+		if (empty($members)) {
 			return true;
+		}
 
 		$members = array_unique($members);
 		$prefs = Notify::getNotifyPrefs($members, 'unapproved_attachment', true);
-		foreach ($watched as $member => $data)
-		{
+
+		foreach ($watched as $member => $data) {
 			$pref = !empty($prefs[$member]['unapproved_attachment']) ? $prefs[$member]['unapproved_attachment'] : 0;
 
-			if ($pref & self::RECEIVE_NOTIFY_EMAIL)
-			{
+			if ($pref & self::RECEIVE_NOTIFY_EMAIL) {
 				// Emails are a bit complicated. (That's what she said)
 				Theme::loadEssential();
 
 				$emaildata = Mail::loadEmailTemplate(
 					'unapproved_attachment',
-					array(
+					[
 						'SUBJECT' => $subject,
 						'LINK' => Config::$scripturl . '?topic=' . $id_topic . '.msg' . $id_msg . '#msg' . $id_msg,
-					),
-					empty($data['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Config::$language : $data['lngfile']
+					],
+					empty($data['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Config::$language : $data['lngfile'],
 				);
 				Mail::send(
 					$data['email_address'],
@@ -112,13 +114,12 @@ public function execute()
 					$emaildata['body'],
 					null,
 					'ma' . $id_attach,
-					$emaildata['is_html']
+					$emaildata['is_html'],
 				);
 			}
 
-			if ($pref & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$alert_rows[] = array(
+			if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+				$alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $member,
 					'id_member_started' => $id_member,
@@ -128,20 +129,21 @@ public function execute()
 					'content_action' => 'unapproved_attachment',
 					'is_read' => 0,
 					'extra' => Utils::jsonEncode(
-						array(
+						[
 							'topic' => $id_topic,
 							'board' => $id_board,
 							'content_subject' => $subject,
 							'content_link' => Config::$scripturl . '?msg=' . $id_msg,
-						)
+						],
 					),
-				);
+				];
 			}
 		}
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
+		if (!empty($alert_rows)) {
 			Alert::createBatch($alert_rows);
+		}
 
 		return true;
 	}
diff --git a/Sources/tasks/CreatePost_Notify.php b/Sources/Tasks/CreatePost_Notify.php
similarity index 72%
rename from Sources/tasks/CreatePost_Notify.php
rename to Sources/Tasks/CreatePost_Notify.php
index fc73ebffb2..a1b3c12e4a 100644
--- a/Sources/tasks/CreatePost_Notify.php
+++ b/Sources/Tasks/CreatePost_Notify.php
@@ -13,20 +13,19 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\BBCodeParser;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
-use SMF\Mentions;
-use SMF\Msg;
 use SMF\Mail;
+use SMF\Mentions;
 use SMF\TaskRunner;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify people when a new post is created that
@@ -38,51 +37,51 @@ class CreatePost_Notify extends BackgroundTask
 	/**
 	 * Constants for reply types.
 	 */
-	const NOTIFY_TYPE_REPLIES_AND_MODERATION = 1;
-	const NOTIFY_TYPE_REPLIES_AND_OWN_TOPIC_MODERATION = 2;
-	const NOTIFY_TYPE_ONLY_REPLIES = 3;
-	const NOTIFY_TYPE_NOTHING = 4;
+	public const NOTIFY_TYPE_REPLIES_AND_MODERATION = 1;
+	public const NOTIFY_TYPE_REPLIES_AND_OWN_TOPIC_MODERATION = 2;
+	public const NOTIFY_TYPE_ONLY_REPLIES = 3;
+	public const NOTIFY_TYPE_NOTHING = 4;
 
 	/**
 	 * Constants for frequencies.
 	 */
-	const FREQUENCY_NOTHING = 0;
-	const FREQUENCY_EVERYTHING = 1;
-	const FREQUENCY_FIRST_UNREAD_MSG = 2;
-	const FREQUENCY_DAILY_DIGEST = 3;
-	const FREQUENCY_WEEKLY_DIGEST = 4;
+	public const FREQUENCY_NOTHING = 0;
+	public const FREQUENCY_EVERYTHING = 1;
+	public const FREQUENCY_FIRST_UNREAD_MSG = 2;
+	public const FREQUENCY_DAILY_DIGEST = 3;
+	public const FREQUENCY_WEEKLY_DIGEST = 4;
 
 	/**
 	 * Minutes to wait before sending notifications about about mentions
 	 * and quotes in unwatched and/or edited posts.
 	 */
-	const MENTION_DELAY = 5;
+	public const MENTION_DELAY = 5;
 
 	/**
 	 * @var array Info about members to be notified.
 	 */
-	private $members = array(
+	private $members = [
 		// These three contain nested arrays of member info.
-		'mentioned' => array(),
-		'quoted' => array(),
-		'watching' => array(),
+		'mentioned' => [],
+		'quoted' => [],
+		'watching' => [],
 
 		// These ones just contain member IDs.
-		'all' => array(),
-		'emailed' => array(),
-		'alerted' => array(),
-		'done' => array(),
-	);
+		'all' => [],
+		'emailed' => [],
+		'alerted' => [],
+		'done' => [],
+	];
 
 	/**
 	 * @var array Alerts to be inserted into the alerts table.
 	 */
-	private $alert_rows = array();
+	private $alert_rows = [];
 
 	/**
 	 * @var array Members' notification and alert preferences.
 	 */
-	private $prefs = array();
+	private $prefs = [];
 
 	/**
 	 * @var int Timestamp after which email notifications should be sent about
@@ -94,8 +93,8 @@ class CreatePost_Notify extends BackgroundTask
 	 * This executes the task: loads up the info, puts the email in the queue
 	 * and inserts any alerts as needed.
 	 *
-	 * @return bool Always returns true
 	 * @throws Exception
+	 * @return bool Always returns true
 	 */
 	public function execute()
 	{
@@ -107,28 +106,33 @@ public function execute()
 		$type = &$this->_details['type'];
 
 		// Board id is required; if missing, log an error and return
-		if (!isset($topicOptions['board']))
-		{
+		if (!isset($topicOptions['board'])) {
 			Lang::load('Errors');
 			ErrorHandler::log(Lang::$txt['missing_board_id'], 'general', __FILE__, __LINE__);
+
 			return true;
 		}
 
 		// poster_time not always supplied, but used throughout
-		if (empty($msgOptions['poster_time']))
+		if (empty($msgOptions['poster_time'])) {
 			$msgOptions['poster_time'] = 0;
+		}
 
 		$this->mention_mail_time = $msgOptions['poster_time'] + self::MENTION_DELAY * 60;
 
 		// We need some more info about the quoted and mentioned members.
-		if (!empty($msgOptions['quoted_members']))
+		if (!empty($msgOptions['quoted_members'])) {
 			$this->members['quoted'] = Mentions::getMentionsByContent('quote', $msgOptions['id'], array_keys($msgOptions['quoted_members']));
-		if (!empty($msgOptions['mentioned_members']))
+		}
+
+		if (!empty($msgOptions['mentioned_members'])) {
 			$this->members['mentioned'] = Mentions::getMentionsByContent('msg', $msgOptions['id'], array_keys($msgOptions['mentioned_members']));
+		}
 
 		// Find the people interested in receiving notifications for this topic
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				ln.id_member, ln.id_board, ln.id_topic, ln.sent,
 				mem.email_address, mem.lngfile, mem.pm_ignore_list,
 				mem.id_group, mem.id_post_group, mem.additional_groups,
@@ -140,56 +144,53 @@ public function execute()
 				LEFT JOIN {db_prefix}boards AS b ON (b.id_board = ln.id_board OR b.id_board = t.id_board)
 			WHERE ln.id_member != {int:member}
 				AND (ln.id_topic = {int:topic} OR ln.id_board = {int:board})',
-			array(
+			[
 				'member' => $posterOptions['id'],
 				'topic' => $topicOptions['id'],
 				'board' => $topicOptions['board'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Skip members who aren't allowed to see this board
-			$groups = array_merge(array($row['id_group'], $row['id_post_group']), (empty($row['additional_groups']) ? array() : explode(',', $row['additional_groups'])));
+			$groups = array_merge([$row['id_group'], $row['id_post_group']], (empty($row['additional_groups']) ? [] : explode(',', $row['additional_groups'])));
 
 			$allowed_groups = explode(',', $row['member_groups']);
 
-			if (!in_array(1, $groups) && count(array_intersect($groups, $allowed_groups)) == 0)
+			if (!in_array(1, $groups) && count(array_intersect($groups, $allowed_groups)) == 0) {
 				continue;
-			else
-			{
-				$row['groups'] = $groups;
-				unset($row['id_group'], $row['id_post_group'], $row['additional_groups']);
 			}
 
+			$row['groups'] = $groups;
+			unset($row['id_group'], $row['id_post_group'], $row['additional_groups']);
+
 			$this->members['watching'][$row['id_member']] = $row;
 		}
 		Db::$db->free_result($request);
 
 		// Filter out mentioned and quoted members who can't see this board.
-		if (!empty($this->members['mentioned']) || !empty($this->members['quoted']))
-		{
+		if (!empty($this->members['mentioned']) || !empty($this->members['quoted'])) {
 			// This won't be set yet if no one is watching this board or topic.
-			if (!isset($allowed_groups))
-			{
-				$request = Db::$db->query('', '
-					SELECT member_groups
+			if (!isset($allowed_groups)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT member_groups
 					FROM {db_prefix}boards
 					WHERE id_board = {int:board}',
-					array(
+					[
 						'board' => $topicOptions['board'],
-					)
+					],
 				);
 				list($allowed_groups) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
 				$allowed_groups = explode(',', $allowed_groups);
 			}
 
-			foreach (array('mentioned', 'quoted') as $member_type)
-			{
-				foreach ($this->members[$member_type] as $member_id => $member_data)
-				{
-					if (!in_array(1, $member_data['groups']) && count(array_intersect($member_data['groups'], $allowed_groups)) == 0)
+			foreach (['mentioned', 'quoted'] as $member_type) {
+				foreach ($this->members[$member_type] as $member_id => $member_data) {
+					if (!in_array(1, $member_data['groups']) && count(array_intersect($member_data['groups'], $allowed_groups)) == 0) {
 						unset($this->members[$member_type][$member_id], $msgOptions[$member_type . '_members'][$member_id]);
+					}
 				}
 			}
 		}
@@ -198,50 +199,48 @@ public function execute()
 			return empty($member['sent']);
 		});
 
-
 		// Modified post, or dealing with delayed mention and quote notifications.
-		if ($type == 'edit' || !empty($this->_details['respawns']))
-		{
+		if ($type == 'edit' || !empty($this->_details['respawns'])) {
 			// Notifications about modified posts only go to members who were mentioned or quoted
-			$this->members['watching'] = $type == 'edit' ? array(): $unnotified;
+			$this->members['watching'] = $type == 'edit' ? [] : $unnotified;
 
 			// If this post has no quotes or mentions, just delete any obsolete alerts and bail out.
-			if (empty($this->members['quoted']) && empty($this->members['mentioned']))
-			{
+			if (empty($this->members['quoted']) && empty($this->members['mentioned'])) {
 				$this->updateAlerts($msgOptions['id']);
+
 				return true;
 			}
 
 			// Never notify about edits to ancient posts.
-			if (!empty(Config::$modSettings['oldTopicDays']) && time() > $msgOptions['poster_time'] + Config::$modSettings['oldTopicDays'] * 86400)
+			if (!empty(Config::$modSettings['oldTopicDays']) && time() > $msgOptions['poster_time'] + Config::$modSettings['oldTopicDays'] * 86400) {
 				return true;
+			}
 
 			// If editing is only allowed for a brief time, send after editing becomes disabled.
-			if (!empty(Config::$modSettings['edit_disable_time']) && Config::$modSettings['edit_disable_time'] <= self::MENTION_DELAY)
-			{
+			if (!empty(Config::$modSettings['edit_disable_time']) && Config::$modSettings['edit_disable_time'] <= self::MENTION_DELAY) {
 				$this->mention_mail_time = $msgOptions['poster_time'] + Config::$modSettings['edit_disable_time'] * 60;
 			}
 			// Otherwise, impose a delay before sending notifications about edited posts.
-			else
-			{
-				if (!empty($this->_details['respawns']))
-				{
-					$request = Db::$db->query('', '
-						SELECT modified_time
+			else {
+				if (!empty($this->_details['respawns'])) {
+					$request = Db::$db->query(
+						'',
+						'SELECT modified_time
 						FROM {db_prefix}messages
 						WHERE id_msg = {int:msg}
 						LIMIT 1',
-						array(
+						[
 							'msg' => $msgOptions['id'],
-						)
+						],
 					);
 					list($real_modified_time) = Db::$db->fetch_row($request);
 					Db::$db->free_result($request);
 
 					// If it was modified again while we weren't looking, bail out.
 					// A future instance of this task will take care of it instead.
-					if ((!empty($msgOptions['modify_time']) ? $msgOptions['modify_time'] : $msgOptions['poster_time']) < $real_modified_time)
+					if ((!empty($msgOptions['modify_time']) ? $msgOptions['modify_time'] : $msgOptions['poster_time']) < $real_modified_time) {
 						return true;
+					}
 				}
 
 				$this->mention_mail_time = (!empty($msgOptions['modify_time']) ? $msgOptions['modify_time'] : $msgOptions['poster_time']) + self::MENTION_DELAY * 60;
@@ -250,65 +249,71 @@ public function execute()
 
 		$this->members['all'] = array_unique(array_merge(array_keys($this->members['watching']), array_keys($this->members['quoted']), array_keys($this->members['mentioned'])));
 
-		if (empty($this->members['all']))
+		if (empty($this->members['all'])) {
 			return true;
+		}
 
 		$this->prefs = Notify::getNotifyPrefs($this->members['all'], '', true);
 
 		// May as well disable these, since they'll be stripped out anyway.
-		$disable = array('attach', 'img', 'iurl', 'url', 'youtube');
-		if (!empty(Config::$modSettings['disabledBBC']))
-		{
+		$disable = ['attach', 'img', 'iurl', 'url', 'youtube'];
+
+		if (!empty(Config::$modSettings['disabledBBC'])) {
 			$disabledBBC = Config::$modSettings['disabledBBC'];
 			$disable = array_unique(array_merge($disable, explode(',', Config::$modSettings['disabledBBC'])));
 		}
 		Config::$modSettings['disabledBBC'] = implode(',', $disable);
 
 		// Notify any members who were mentioned.
-		if (!empty($this->members['mentioned']))
+		if (!empty($this->members['mentioned'])) {
 			$this->handleMentionedNotifications();
+		}
 
 		// Notify any members who were quoted.
-		if (!empty($this->members['quoted']))
+		if (!empty($this->members['quoted'])) {
 			$this->handleQuoteNotifications();
+		}
 
 		// Handle rest of the notifications for watched topics and boards
-		if (!empty($this->members['watching']))
+		if (!empty($this->members['watching'])) {
 			$this->handleWatchedNotifications();
+		}
 
 		// Put this back the way we found it.
-		if (!empty($disabledBBC))
+		if (!empty($disabledBBC)) {
 			Config::$modSettings['disabledBBC'] = $disabledBBC;
+		}
 
 		// Track what we sent.
 		$members_to_log = array_intersect($this->members['emailed'], array_keys($this->members['watching']));
-		if (!empty($members_to_log))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_notify
+
+		if (!empty($members_to_log)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_notify
 				SET sent = {int:is_sent}
 				WHERE ' . ($type == 'topic' ? 'id_board = {int:board}' : 'id_topic = {int:topic}') . '
 					AND id_member IN ({array_int:members})',
-				array(
+				[
 					'topic' => $topicOptions['id'],
 					'board' => $topicOptions['board'],
 					// 'members' => $this->members['emailed'],
 					'members' => $members_to_log,
 					'is_sent' => 1,
-				)
+				],
 			);
 		}
 
 		// Insert it into the digest for daily/weekly notifications
-		if ($type != 'edit' && empty($this->_details['respawns']))
-		{
-			Db::$db->insert('',
+		if ($type != 'edit' && empty($this->_details['respawns'])) {
+			Db::$db->insert(
+				'',
 				'{db_prefix}log_digest',
-				array(
+				[
 					'id_topic' => 'int', 'id_msg' => 'int', 'note_type' => 'string', 'exclude' => 'int',
-				),
-				array($topicOptions['id'], $msgOptions['id'], $type, $posterOptions['id']),
-				array()
+				],
+				[$topicOptions['id'], $msgOptions['id'], $type, $posterOptions['id']],
+				[],
 			);
 		}
 
@@ -317,30 +322,29 @@ public function execute()
 
 		// If there is anyone still to notify via email, create a new task later.
 		$unnotified = array_diff_key($unnotified, array_flip($this->members['emailed']));
-		if (!empty($unnotified) || !empty($msgOptions['mentioned_members']) || !empty($msgOptions['quoted_members']))
-		{
+
+		if (!empty($unnotified) || !empty($msgOptions['mentioned_members']) || !empty($msgOptions['quoted_members'])) {
 			$new_details = $this->_details;
 
-			if (empty($new_details['respawns']))
+			if (empty($new_details['respawns'])) {
 				$new_details['respawns'] = 0;
+			}
 
-			if ($new_details['respawns']++ < 10)
-			{
-				Db::$db->insert('',
+			if ($new_details['respawns']++ < 10) {
+				Db::$db->insert(
+					'',
 					'{db_prefix}background_tasks',
-					array(
-						'task_file' => 'string',
+					[
 						'task_class' => 'string',
 						'task_data' => 'string',
 						'claimed_time' => 'int',
-					),
-					array(
-						'$sourcedir/tasks/CreatePost_Notify.php',
-						'SMF\Tasks\CreatePost_Notify',
+					],
+					[
+						'SMF\\Tasks\\CreatePost_Notify',
 						Utils::jsonEncode($new_details),
 						max(0, $this->mention_mail_time - TaskRunner::MAX_CLAIM_THRESHOLD),
-					),
-					array('id_task')
+					],
+					['id_task'],
 				);
 			}
 		}
@@ -351,78 +355,82 @@ public function execute()
 	private function updateAlerts($msg_id)
 	{
 		// We send alerts only on the first iteration of this task.
-		if (!empty($this->_details['respawns']))
+		if (!empty($this->_details['respawns'])) {
 			return;
+		}
 
 		// Delete alerts about any mentions and quotes that no longer exist.
-		if ($this->_details['type'] == 'edit')
-		{
-			$old_alerts = array();
+		if ($this->_details['type'] == 'edit') {
+			$old_alerts = [];
 
-			$request = Db::$db->query('', '
-				SELECT content_action, id_member
+			$request = Db::$db->query(
+				'',
+				'SELECT content_action, id_member
 				FROM {db_prefix}user_alerts
 				WHERE content_id = {int:msg_id}
 					AND content_type = {literal:msg}
 					AND (content_action = {literal:quote} OR content_action = {literal:mention})',
-				array(
+				[
 					'msg_id' => $msg_id,
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) != 0)
-			{
-				while ($row = Db::$db->fetch_assoc($request))
+
+			if (Db::$db->num_rows($request) != 0) {
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$old_alerts[$row['content_action']][$row['id_member']] = $row['id_member'];
+				}
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($old_alerts))
-			{
-				$request = Db::$db->query('', '
-					SELECT content_type, id_mentioned
+			if (!empty($old_alerts)) {
+				$request = Db::$db->query(
+					'',
+					'SELECT content_type, id_mentioned
 					FROM {db_prefix}mentions
 					WHERE content_id = {int:msg_id}
 						AND (content_type = {literal:quote} OR content_type = {literal:msg})',
-					array(
+					[
 						'msg_id' => $msg_id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$content_action = $row['content_type'] == 'quote' ? 'quote' : 'mention';
 					unset($old_alerts[$content_action][$row['id_mentioned']]);
 				}
 				Db::$db->free_result($request);
 
-				$conditions = array();
+				$conditions = [];
 
-				if (!empty($old_alerts['quote']))
+				if (!empty($old_alerts['quote'])) {
 					$conditions[] = '(content_action = {literal:quote} AND id_member IN ({array_int:members_not_quoted}))';
+				}
 
-				if (!empty($old_alerts['mention']))
+				if (!empty($old_alerts['mention'])) {
 					$conditions[] = '(content_action = {literal:mention} AND id_member IN ({array_int:members_not_mentioned}))';
+				}
 
-				if (!empty($conditions))
-				{
+				if (!empty($conditions)) {
 					Alert::deleteWhere(
-						array(
+						[
 							'content_id = {int:msg_id}',
 							'content_type = {literal:msg}',
 							implode(' OR ', $conditions),
-						),
-						array(
+						],
+						[
 							'msg_id' => $msg_id,
-							'members_not_quoted' => empty($old_alerts['quote']) ? array(0) : $old_alerts['quote'],
-							'members_not_mentioned' => empty($old_alerts['mention']) ? array(0) : $old_alerts['mention'],
-						)
+							'members_not_quoted' => empty($old_alerts['quote']) ? [0] : $old_alerts['quote'],
+							'members_not_mentioned' => empty($old_alerts['mention']) ? [0] : $old_alerts['mention'],
+						],
 					);
 				}
 			}
 		}
 
 		// Insert the new alerts.
-		if (!empty($this->alert_rows))
+		if (!empty($this->alert_rows)) {
 			Alert::createBatch($this->alert_rows);
+		}
 	}
 
 	/**
@@ -438,74 +446,83 @@ protected function handleWatchedNotifications()
 		$type = &$this->_details['type'];
 
 		$user_ids = array_keys($this->members['watching']);
-		if (!in_array($posterOptions['id'], $user_ids))
+
+		if (!in_array($posterOptions['id'], $user_ids)) {
 			$user_ids[] = $posterOptions['id'];
+		}
 		User::load($user_ids, User::LOAD_BY_ID, 'minimal');
 
-		$parsed_message = array();
-		foreach ($this->members['watching'] as $member_id => $member_data)
-		{
-			if (in_array($member_id, $this->members['done']))
+		$parsed_message = [];
+
+		foreach ($this->members['watching'] as $member_id => $member_data) {
+			if (in_array($member_id, $this->members['done'])) {
 				continue;
+			}
 
-			$frequency = isset($this->prefs[$member_id]['msg_notify_pref']) ? $this->prefs[$member_id]['msg_notify_pref'] : self::FREQUENCY_NOTHING;
+			$frequency = $this->prefs[$member_id]['msg_notify_pref'] ?? self::FREQUENCY_NOTHING;
 			$notify_types = !empty($this->prefs[$member_id]['msg_notify_type']) ? $this->prefs[$member_id]['msg_notify_type'] : self::NOTIFY_TYPE_REPLIES_AND_MODERATION;
 
 			// Don't send a notification if:
 			// 1. The watching member ignored the member who did the action.
-			if (!empty($member_data['pm_ignore_list']) && in_array($member_data['id_member_updated'], explode(',', $member_data['pm_ignore_list'])))
+			if (!empty($member_data['pm_ignore_list']) && in_array($member_data['id_member_updated'], explode(',', $member_data['pm_ignore_list']))) {
 				continue;
+			}
 
 			// 2. The watching member is not interested in moderation on this topic.
-			if (!in_array($type, array('reply', 'topic')) && ($notify_types == self::NOTIFY_TYPE_ONLY_REPLIES || ($notify_types == self::NOTIFY_TYPE_REPLIES_AND_OWN_TOPIC_MODERATION && $member_id != $member_data['id_member_started'])))
+			if (!in_array($type, ['reply', 'topic']) && ($notify_types == self::NOTIFY_TYPE_ONLY_REPLIES || ($notify_types == self::NOTIFY_TYPE_REPLIES_AND_OWN_TOPIC_MODERATION && $member_id != $member_data['id_member_started']))) {
 				continue;
+			}
 
 			// 3. This is the watching member's own post.
-			if (in_array($type, array('reply', 'topic')) && $member_id == $posterOptions['id'])
+			if (in_array($type, ['reply', 'topic']) && $member_id == $posterOptions['id']) {
 				continue;
+			}
 
 			// 4. The watching member doesn't want any notifications at all.
-			if ($notify_types == self::NOTIFY_TYPE_NOTHING)
+			if ($notify_types == self::NOTIFY_TYPE_NOTHING) {
 				continue;
+			}
 
 			// 5. The watching member doesn't want notifications until later.
-			if (in_array($frequency, array(
+			if (in_array($frequency, [
 				self::FREQUENCY_NOTHING,
 				self::FREQUENCY_DAILY_DIGEST,
-				self::FREQUENCY_WEEKLY_DIGEST)))
+				self::FREQUENCY_WEEKLY_DIGEST])) {
 				continue;
+			}
 
 			// 6. We already sent one and the watching member doesn't want more.
-			if ($frequency == self::FREQUENCY_FIRST_UNREAD_MSG && $member_data['sent'])
+			if ($frequency == self::FREQUENCY_FIRST_UNREAD_MSG && $member_data['sent']) {
 				continue;
+			}
 
 			// 7. The watching member isn't on club security's VIP list.
-			if (!empty($this->_details['members_only']) && !in_array($member_id, $this->_details['members_only']))
+			if (!empty($this->_details['members_only']) && !in_array($member_id, $this->_details['members_only'])) {
 				continue;
+			}
 
 			// Watched topic?
-			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id]))
-			{
+			if (!empty($member_data['id_topic']) && $type != 'topic' && !empty($this->prefs[$member_id])) {
 				$pref = !empty($this->prefs[$member_id]['topic_notify_' . $topicOptions['id']]) ?
 					$this->prefs[$member_id]['topic_notify_' . $topicOptions['id']] :
 					(!empty($this->prefs[$member_id]['topic_notify']) ? $this->prefs[$member_id]['topic_notify'] : 0);
 
 				$message_type = 'notification_' . $type;
 
-				if ($type == 'reply')
-				{
-					if (empty(Config::$modSettings['disallow_sendBody']) && !empty($this->prefs[$member_id]['msg_receive_body']))
+				if ($type == 'reply') {
+					if (empty(Config::$modSettings['disallow_sendBody']) && !empty($this->prefs[$member_id]['msg_receive_body'])) {
 						$message_type .= '_body';
+					}
 
-					if (!empty($frequency))
+					if (!empty($frequency)) {
 						$message_type .= '_once';
+					}
 				}
 
 				$content_type = 'topic';
 			}
 			// A new topic in a watched board then?
-			elseif ($type == 'topic')
-			{
+			elseif ($type == 'topic') {
 				$pref = !empty($this->prefs[$member_id]['board_notify_' . $topicOptions['board']]) ?
 					$this->prefs[$member_id]['board_notify_' . $topicOptions['board']] :
 					(!empty($this->prefs[$member_id]['board_notify']) ? $this->prefs[$member_id]['board_notify'] : 0);
@@ -514,21 +531,22 @@ protected function handleWatchedNotifications()
 
 				$message_type = !empty($frequency) ? 'notify_boards_once' : 'notify_boards';
 
-				if (empty(Config::$modSettings['disallow_sendBody']) && !empty($this->prefs[$member_id]['msg_receive_body']))
+				if (empty(Config::$modSettings['disallow_sendBody']) && !empty($this->prefs[$member_id]['msg_receive_body'])) {
 					$message_type .= '_body';
+				}
 			}
 
 			// If neither of the above, this might be a redundant row due to the OR clause in our SQL query, skip
-			else
+			else {
 				continue;
+			}
 
 			// Censor and parse BBC in the receiver's localization. Don't repeat unnecessarily.
 			Lang::load('index+Modifications', $member_data['lngfile'], false);
 
-			$localization = implode('|', array($member_data['lngfile'], $member_data['time_offset'], $member_data['time_format']));
+			$localization = implode('|', [$member_data['lngfile'], $member_data['time_offset'], $member_data['time_format']]);
 
-			if (empty($parsed_message[$localization]))
-			{
+			if (empty($parsed_message[$localization])) {
 				$bbcparser = new BBCodeParser();
 				$bbcparser->time_offset = $member_data['time_offset'];
 				$bbcparser->time_format = $member_data['time_format'];
@@ -541,51 +559,50 @@ protected function handleWatchedNotifications()
 				Lang::censorText($parsed_message[$localization]['body']);
 
 				$parsed_message[$localization]['subject'] = Utils::htmlspecialcharsDecode($parsed_message[$localization]['subject']);
-				$parsed_message[$localization]['body'] = trim(Utils::htmlspecialcharsDecode(strip_tags(strtr($bbcparser->parse($parsed_message[$localization]['body'], false), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#39;' => '\'', '</tr>' => "\n", '</td>' => "\t", '<hr>' => "\n---------------------------------------------------------------\n")))));
+				$parsed_message[$localization]['body'] = trim(Utils::htmlspecialcharsDecode(strip_tags(strtr($bbcparser->parse($parsed_message[$localization]['body'], false), ['<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#39;' => '\'', '</tr>' => "\n", '</td>' => "\t", '<hr>' => "\n---------------------------------------------------------------\n"]))));
 			}
 
 			// Bitwise check: Receiving a alert?
-			if ($pref & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$this->alert_rows[] = array(
+			if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+				$this->alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $member_id,
 					// Only tell sender's information for new topics and replies
-					'id_member_started' => in_array($type, array('topic', 'reply')) ? $posterOptions['id'] : 0,
-					'member_name' => in_array($type, array('topic', 'reply')) ? $posterOptions['name'] : '',
+					'id_member_started' => in_array($type, ['topic', 'reply']) ? $posterOptions['id'] : 0,
+					'member_name' => in_array($type, ['topic', 'reply']) ? $posterOptions['name'] : '',
 					'content_type' => $content_type,
 					'content_id' => $topicOptions['id'],
 					'content_action' => $type,
 					'is_read' => 0,
-					'extra' => Utils::jsonEncode(array(
+					'extra' => Utils::jsonEncode([
 						'topic' => $topicOptions['id'],
 						'board' => $topicOptions['board'],
 						'content_subject' => $parsed_message[$localization]['subject'],
-						'content_link' => Config::$scripturl . '?topic=' . $topicOptions['id'] . (in_array($type, array('reply', 'topic')) ? '.new;topicseen#new' : '.0'),
-					)),
-				);
+						'content_link' => Config::$scripturl . '?topic=' . $topicOptions['id'] . (in_array($type, ['reply', 'topic']) ? '.new;topicseen#new' : '.0'),
+					]),
+				];
 			}
 
 			// Bitwise check: Receiving a email notification?
-			if ($pref & self::RECEIVE_NOTIFY_EMAIL)
-			{
+			if ($pref & self::RECEIVE_NOTIFY_EMAIL) {
 				$itemID = $content_type == 'board' ? $topicOptions['board'] : $topicOptions['id'];
 
 				$token = Notify::createUnsubscribeToken($member_data['id_member'], $member_data['email_address'], $content_type, $itemID);
 
-				$replacements = array(
+				$replacements = [
 					'TOPICSUBJECT' => $parsed_message[$localization]['subject'],
-					'POSTERNAME' => Utils::htmlspecialcharsDecode(isset(User::$loaded[$posterOptions['id']]->name) ? User::$loaded[$posterOptions['id']]->name : $posterOptions['name']),
+					'POSTERNAME' => Utils::htmlspecialcharsDecode(User::$loaded[$posterOptions['id']]->name ?? $posterOptions['name']),
 					'TOPICLINK' => Config::$scripturl . '?topic=' . $topicOptions['id'] . '.new#new',
 					'MESSAGE' => $parsed_message[$localization]['body'],
 					'UNSUBSCRIBELINK' => Config::$scripturl . '?action=notify' . $content_type . ';' . $content_type . '=' . $itemID . ';sa=off;u=' . $member_data['id_member'] . ';token=' . $token,
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate($message_type, $replacements, $member_data['lngfile']);
 				$mail_result = Mail::send($member_data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicOptions['id'], $emaildata['is_html']);
 
-				if ($mail_result !== false)
+				if ($mail_result !== false) {
 					$this->members['emailed'][] = $member_id;
+				}
 			}
 
 			$this->members['done'][] = $member_id;
@@ -602,24 +619,25 @@ protected function handleQuoteNotifications()
 
 		User::load($posterOptions['id'], User::LOAD_BY_ID, 'minimal');
 
-		foreach ($this->members['quoted'] as $member_id => $member_data)
-		{
-			if (in_array($member_id, $this->members['done']))
+		foreach ($this->members['quoted'] as $member_id => $member_data) {
+			if (in_array($member_id, $this->members['done'])) {
 				continue;
+			}
 
-			if (!isset($this->prefs[$member_id]) || empty($this->prefs[$member_id]['msg_quote']))
+			if (!isset($this->prefs[$member_id]) || empty($this->prefs[$member_id]['msg_quote'])) {
 				continue;
-			else
-				$pref = $this->prefs[$member_id]['msg_quote'];
+			}
+
+			$pref = $this->prefs[$member_id]['msg_quote'];
 
 			// You don't need to be notified about quoting yourself.
-			if ($member_id == $posterOptions['id'])
+			if ($member_id == $posterOptions['id']) {
 				continue;
+			}
 
 			// Bitwise check: Receiving an alert?
-			if ($pref & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$this->alert_rows[] = array(
+			if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+				$this->alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $member_data['id'],
 					'id_member_started' => $posterOptions['id'],
@@ -628,33 +646,29 @@ protected function handleQuoteNotifications()
 					'content_id' => $msgOptions['id'],
 					'content_action' => 'quote',
 					'is_read' => 0,
-					'extra' => Utils::jsonEncode(array(
+					'extra' => Utils::jsonEncode([
 						'content_subject' => $msgOptions['subject'],
 						'content_link' => Config::$scripturl . '?msg=' . $msgOptions['id'],
-					)),
-				);
+					]),
+				];
 			}
 
 			// Bitwise check: Receiving a email notification?
-			if (!($pref & self::RECEIVE_NOTIFY_EMAIL))
-			{
+			if (!($pref & self::RECEIVE_NOTIFY_EMAIL)) {
 				// Don't want an email, so forget this member in any respawned tasks.
 				unset($msgOptions['quoted_members'][$member_id]);
-			}
-			elseif (TIME_START >= $this->mention_mail_time || in_array($member_id, $this->members['watching']))
-			{
-				$replacements = array(
+			} elseif (TIME_START >= $this->mention_mail_time || in_array($member_id, $this->members['watching'])) {
+				$replacements = [
 					'CONTENTSUBJECT' => $msgOptions['subject'],
-					'QUOTENAME' => Utils::htmlspecialcharsDecode(isset(User::$loaded[$posterOptions['id']]->name) ? User::$loaded[$posterOptions['id']]->name : $posterOptions['name']),
+					'QUOTENAME' => Utils::htmlspecialcharsDecode(User::$loaded[$posterOptions['id']]->name ?? $posterOptions['name']),
 					'MEMBERNAME' => $member_data['real_name'],
 					'CONTENTLINK' => Config::$scripturl . '?msg=' . $msgOptions['id'],
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('msg_quote', $replacements, empty($member_data['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $member_data['lngfile']);
 				$mail_result = Mail::send($member_data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'msg_quote_' . $msgOptions['id'], $emaildata['is_html'], 2);
 
-				if ($mail_result !== false)
-				{
+				if ($mail_result !== false) {
 					// Don't send multiple notifications about the same post.
 					$this->members['emailed'][] = $member_id;
 
@@ -674,24 +688,25 @@ protected function handleMentionedNotifications()
 	{
 		$msgOptions = &$this->_details['msgOptions'];
 
-		foreach ($this->members['mentioned'] as $member_id => $member_data)
-		{
-			if (in_array($member_id, $this->members['done']))
+		foreach ($this->members['mentioned'] as $member_id => $member_data) {
+			if (in_array($member_id, $this->members['done'])) {
 				continue;
+			}
 
-			if (empty($this->prefs[$member_id]) || empty($this->prefs[$member_id]['msg_mention']))
+			if (empty($this->prefs[$member_id]) || empty($this->prefs[$member_id]['msg_mention'])) {
 				continue;
-			else
-				$pref = $this->prefs[$member_id]['msg_mention'];
+			}
+
+			$pref = $this->prefs[$member_id]['msg_mention'];
 
 			// Mentioning yourself is silly, and we aren't going to notify you about it.
-			if ($member_id == $member_data['mentioned_by']['id'])
+			if ($member_id == $member_data['mentioned_by']['id']) {
 				continue;
+			}
 
 			// Bitwise check: Receiving an alert?
-			if ($pref & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$this->alert_rows[] = array(
+			if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+				$this->alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $member_data['id'],
 					'id_member_started' => $member_data['mentioned_by']['id'],
@@ -700,34 +715,29 @@ protected function handleMentionedNotifications()
 					'content_id' => $msgOptions['id'],
 					'content_action' => 'mention',
 					'is_read' => 0,
-					'extra' => Utils::jsonEncode(array(
+					'extra' => Utils::jsonEncode([
 						'content_subject' => $msgOptions['subject'],
 						'content_link' => Config::$scripturl . '?msg=' . $msgOptions['id'],
-					)),
-				);
+					]),
+				];
 			}
 
-
 			// Bitwise check: Receiving a email notification?
-			if (!($pref & self::RECEIVE_NOTIFY_EMAIL))
-			{
+			if (!($pref & self::RECEIVE_NOTIFY_EMAIL)) {
 				// Don't want an email, so forget this member in any respawned tasks.
 				unset($msgOptions['mentioned_members'][$member_id]);
-			}
-			elseif (TIME_START >= $this->mention_mail_time || in_array($member_id, $this->members['watching']))
-			{
-				$replacements = array(
+			} elseif (TIME_START >= $this->mention_mail_time || in_array($member_id, $this->members['watching'])) {
+				$replacements = [
 					'CONTENTSUBJECT' => $msgOptions['subject'],
 					'MENTIONNAME' => $member_data['mentioned_by']['name'],
 					'MEMBERNAME' => $member_data['real_name'],
 					'CONTENTLINK' => Config::$scripturl . '?msg=' . $msgOptions['id'],
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('msg_mention', $replacements, empty($member_data['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $member_data['lngfile']);
 				$mail_result = Mail::send($member_data['email_address'], $emaildata['subject'], $emaildata['body'], null, 'msg_mention_' . $msgOptions['id'], $emaildata['is_html'], 2);
 
-				if ($mail_result !== false)
-				{
+				if ($mail_result !== false) {
 					// Don't send multiple notifications about the same post.
 					$this->members['emailed'][] = $member_id;
 
diff --git a/Sources/tasks/DailyMaintenance.php b/Sources/Tasks/DailyMaintenance.php
similarity index 70%
rename from Sources/tasks/DailyMaintenance.php
rename to Sources/Tasks/DailyMaintenance.php
index 5bb75e40f9..bf06449b3e 100644
--- a/Sources/tasks/DailyMaintenance.php
+++ b/Sources/Tasks/DailyMaintenance.php
@@ -13,20 +13,19 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Admin\SearchEngines;
 use SMF\Alert;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\ProxyServer;
-use SMF\Actions\Admin\SearchEngines;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Does some daily cleaning up.
  */
 class DailyMaintenance extends ScheduledTask
 {
-
 	/**
 	 * This executes the task.
 	 *
@@ -38,70 +37,68 @@ public function execute()
 		CacheApi::clean();
 
 		// If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level.
-		list (, , Config::$modSettings['warning_decrement']) = explode(',', Config::$modSettings['warning_settings']);
+		list(, , Config::$modSettings['warning_decrement']) = explode(',', Config::$modSettings['warning_settings']);
 
-		if (Config::$modSettings['warning_decrement'])
-		{
-			$members = array();
+		if (Config::$modSettings['warning_decrement']) {
+			$members = [];
 
 			// Find every member who has a warning level...
-			$request = Db::$db->query('', '
-				SELECT id_member, warning
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, warning
 				FROM {db_prefix}members
 				WHERE warning > {int:no_warning}',
-				array(
+				[
 					'no_warning' => 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$members[$row['id_member']] = $row['warning'];
 			}
 			Db::$db->free_result($request);
 
 			// Have some members to check?
-			if (!empty($members))
-			{
-				$member_changes = array();
+			if (!empty($members)) {
+				$member_changes = [];
 
 				// Find out when they were last warned.
-				$request = Db::$db->query('', '
-					SELECT id_recipient, MAX(log_time) AS last_warning
+				$request = Db::$db->query(
+					'',
+					'SELECT id_recipient, MAX(log_time) AS last_warning
 					FROM {db_prefix}log_comments
 					WHERE id_recipient IN ({array_int:member_list})
 						AND comment_type = {string:warning}
 					GROUP BY id_recipient',
-					array(
+					[
 						'member_list' => array_keys($members),
 						'warning' => 'warning',
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					// More than 24 hours ago?
-					if ($row['last_warning'] <= time() - 86400)
-					{
-						$member_changes[] = array(
+					if ($row['last_warning'] <= time() - 86400) {
+						$member_changes[] = [
 							'id' => $row['id_recipient'],
 							'warning' => $members[$row['id_recipient']] >= Config::$modSettings['warning_decrement'] ? $members[$row['id_recipient']] - Config::$modSettings['warning_decrement'] : 0,
-						);
+						];
 					}
 				}
 				Db::$db->free_result($request);
 
 				// Have some members to change?
-				if (!empty($member_changes))
-				{
-					foreach ($member_changes as $change)
-					{
-						Db::$db->query('', '
-							UPDATE {db_prefix}members
+				if (!empty($member_changes)) {
+					foreach ($member_changes as $change) {
+						Db::$db->query(
+							'',
+							'UPDATE {db_prefix}members
 							SET warning = {int:warning}
 							WHERE id_member = {int:id_member}',
-							array(
+							[
 								'warning' => $change['warning'],
 								'id_member' => $change['id'],
-							)
+							],
 						);
 					}
 				}
@@ -109,45 +106,40 @@ public function execute()
 		}
 
 		// Do any spider stuff.
-		if (!empty(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] > 1)
-		{
+		if (!empty(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] > 1) {
 			SearchEngines::consolidateSpiderStats();
 		}
 
 		// Clean up some old login history information.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}member_logins
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}member_logins
 			WHERE time < {int:oldLogins}',
-			array(
+			[
 				'oldLogins' => time() - (!empty(Config::$modSettings['loginHistoryDays']) ? 60 * 60 * 24 * Config::$modSettings['loginHistoryDays'] : 2592000),
-			)
+			],
 		);
 
 		// Run Imageproxy housekeeping
-		if (!empty(Config::$image_proxy_enabled))
-		{
+		if (!empty(Config::$image_proxy_enabled)) {
 			$proxy = new ProxyServer();
 			$proxy->housekeeping();
 		}
 
 		// Delete old profile exports
-		if (!empty(Config::$modSettings['export_expiry']) && file_exists(Config::$modSettings['export_dir']) && is_dir(Config::$modSettings['export_dir']))
-		{
+		if (!empty(Config::$modSettings['export_expiry']) && file_exists(Config::$modSettings['export_dir']) && is_dir(Config::$modSettings['export_dir'])) {
 			$expiry_date = round(TIME_START - Config::$modSettings['export_expiry'] * 86400);
 			$export_files = glob(rtrim(Config::$modSettings['export_dir'], '/\\') . DIRECTORY_SEPARATOR . '*');
 
-			foreach ($export_files as $export_file)
-			{
-				if (!in_array(basename($export_file), array('index.php', '.htaccess')) && filemtime($export_file) <= $expiry_date)
-				{
+			foreach ($export_files as $export_file) {
+				if (!in_array(basename($export_file), ['index.php', '.htaccess']) && filemtime($export_file) <= $expiry_date) {
 					@unlink($export_file);
 				}
 			}
 		}
 
 		// Delete old alerts.
-		if (!empty(Config::$modSettings['alerts_auto_purge']))
-		{
+		if (!empty(Config::$modSettings['alerts_auto_purge'])) {
 			Alert::purge(-1, time() - 86400 * Config::$modSettings['alerts_auto_purge']);
 		}
 
diff --git a/Sources/tasks/EventNew_Notify.php b/Sources/Tasks/EventNew_Notify.php
similarity index 74%
rename from Sources/tasks/EventNew_Notify.php
rename to Sources/Tasks/EventNew_Notify.php
index 0855087646..932655bb86 100644
--- a/Sources/tasks/EventNew_Notify.php
+++ b/Sources/Tasks/EventNew_Notify.php
@@ -13,12 +13,10 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
-use SMF\Config;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify people that a new event has been
@@ -38,45 +36,47 @@ public function execute()
 		$members = User::membersAllowedTo('calendar_view');
 
 		// Don't alert the event creator
-		if (!empty($this->_details['sender_id']))
-			$members = array_diff($members, array($this->_details['sender_id']));
+		if (!empty($this->_details['sender_id'])) {
+			$members = array_diff($members, $this->_details['sender_id']);
+		}
 
 		// Having successfully figured this out, now let's get the preferences of everyone.
 		$prefs = Notify::getNotifyPrefs($members, 'event_new', true);
 
 		// Just before we go any further, we may not have the sender's name. Let's just quickly fix that.
 		// If a guest creates the event, we wouldn't be capturing a username or anything.
-		if (!empty($this->_details['sender_id']) && empty($this->_details['sender_name']))
-		{
+		if (!empty($this->_details['sender_id']) && empty($this->_details['sender_name'])) {
 			User::load($this->_details['sender_id'], User::LOAD_BY_ID, 'minimal');
-			if (!empty(User::$loaded[$this->_details['sender_id']]))
+
+			if (!empty(User::$loaded[$this->_details['sender_id']])) {
 				$this->_details['sender_name'] = User::$loaded[$this->_details['sender_id']]->name;
-			else
+			} else {
 				$this->_details['sender_id'] = 0;
+			}
 		}
 
 		// So now we find out who wants what.
-		$alert_bits = array(
+		$alert_bits = [
 			'alert' => self::RECEIVE_NOTIFY_ALERT,
 			'email' => self::RECEIVE_NOTIFY_EMAIL,
-		);
-		$notifies = array();
+		];
+		$notifies = [];
 
-		foreach ($prefs as $member => $pref_option)
-		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['event_new'] & $bitvalue)
+		foreach ($prefs as $member => $pref_option) {
+			foreach ($alert_bits as $type => $bitvalue) {
+				if ($pref_option['event_new'] & $bitvalue) {
 					$notifies[$type][] = $member;
+				}
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
-		if (!empty($notifies['alert']))
-		{
+		if (!empty($notifies['alert'])) {
 			// Alerts are relatively easy.
-			$insert_rows = array();
-			foreach ($notifies['alert'] as $member)
-			{
-				$insert_rows[] = array(
+			$insert_rows = [];
+
+			foreach ($notifies['alert'] as $member) {
+				$insert_rows[] = [
 					'alert_time' => $this->_details['time'],
 					'id_member' => $member,
 					'id_member_started' => $this->_details['sender_id'],
@@ -85,13 +85,13 @@ public function execute()
 					'content_id' => $this->_details['event_id'],
 					'content_action' => empty($this->_details['sender_id']) ? 'new_guest' : 'new',
 					'is_read' => 0,
-					'extra' => Db::$db->smcFunc['json_encode'](
-						array(
-							"event_id" => $this->_details['event_id'],
-							"event_title" => $this->_details['event_title']
-						)
+					'extra' => Utils::jsonEncode(
+						[
+							'event_id' => $this->_details['event_id'],
+							'event_title' => $this->_details['event_title'],
+						],
 					),
-				);
+				];
 			}
 
 			Alert::createBatch($insert_rows);
diff --git a/Sources/tasks/ExportProfileData.php b/Sources/Tasks/ExportProfileData.php
similarity index 54%
rename from Sources/tasks/ExportProfileData.php
rename to Sources/Tasks/ExportProfileData.php
index 8e3a4b3904..a5b073cc68 100644
--- a/Sources/tasks/ExportProfileData.php
+++ b/Sources/Tasks/ExportProfileData.php
@@ -13,7 +13,11 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Feed;
+use SMF\Actions\Profile\Export;
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\IntegrationHook;
 use SMF\Lang;
@@ -21,10 +25,6 @@
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Feed;
-use SMF\Actions\Profile\Export;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * @todo Find a way to throttle the export rate dynamically when dealing with
@@ -60,11 +60,11 @@ class ExportProfileData extends BackgroundTask
 	 * These strings have been broken up and concatenated to help prevent any
 	 * automatic search and replace attempts from changing them.
 	 */
-	const XML_NAMESPACES = array(
-		'smf' => 'htt'.'p:/'.'/ww'.'w.simple'.'machines.o'.'rg/xml/profile',
-		'xsl' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/XSL/Transform',
-		'html' => 'htt'.'p:/'.'/ww'.'w.w3.o'.'rg/1999/xhtml',
-	);
+	public const XML_NAMESPACES = [
+		'smf' => 'htt' . 'p:/' . '/ww' . 'w.simple' . 'machines.o' . 'rg/xml/profile',
+		'xsl' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/XSL/Transform',
+		'html' => 'htt' . 'p:/' . '/ww' . 'w.w3.o' . 'rg/1999/xhtml',
+	];
 
 	/*********************
 	 * Internal properties
@@ -73,7 +73,7 @@ class ExportProfileData extends BackgroundTask
 	/**
 	 * @var array Info to create a follow-up background task, if necessary.
 	 */
-	private array $next_task = array();
+	private array $next_task = [];
 
 	/**
 	 * @var int Used to ensure we exit long running tasks cleanly.
@@ -83,7 +83,7 @@ class ExportProfileData extends BackgroundTask
 	/**
 	 * @var array The XSLT stylesheet, broken up into logical parts.
 	 */
-	private array $xslt_stylesheet = array(
+	private array $xslt_stylesheet = [
 		// Header for the stylesheet. Default value assumes that the stylesheet
 		// will be a separate file. This will be changed at runtime if the
 		// output format is set to XML_XSLT.
@@ -92,760 +92,760 @@ class ExportProfileData extends BackgroundTask
 		// Controls output formatting and handline of special characters.
 		// Do not change this.
 		'output_control' => <<<'END'
-			<xsl:output method="html" encoding="utf-8" indent="yes"/>
-			<xsl:strip-space elements="*"/>
-		END,
+				<xsl:output method="html" encoding="utf-8" indent="yes"/>
+				<xsl:strip-space elements="*"/>
+			END,
 
 		// XSLT variables. This is set at runtime.
 		'variables' => '',
 
 		// The top-level template. Creates the shell of the HTML document.
 		'html' => <<<'END'
-			<xsl:template match="/*">
-				<xsl:text disable-output-escaping="yes">&lt;!DOCTYPE html&gt;</xsl:text>
-				<html>
-					<head>
-						<title>
-							<xsl:value-of select="@title"/>
-						</title>
-						<xsl:call-template name="css_js"/>
-					</head>
-					<body>
-						<div id="footerfix">
-							<div id="header">
-								<h1 class="forumtitle">
-									<a id="top">
-										<xsl:attribute name="href">
-											<xsl:value-of select="$scripturl"/>
-										</xsl:attribute>
-										<xsl:value-of select="@forum-name"/>
-									</a>
-								</h1>
-							</div>
-							<div id="wrapper">
-								<div id="upper_section">
-									<div id="inner_section">
-										<div id="inner_wrap">
-											<div class="user">
-												<time>
-													<xsl:attribute name="datetime">
-														<xsl:value-of select="@generated-date-UTC"/>
-													</xsl:attribute>
-													<xsl:value-of select="@generated-date-localized"/>
-												</time>
+				<xsl:template match="/*">
+					<xsl:text disable-output-escaping="yes">&lt;!DOCTYPE html&gt;</xsl:text>
+					<html>
+						<head>
+							<title>
+								<xsl:value-of select="@title"/>
+							</title>
+							<xsl:call-template name="css_js"/>
+						</head>
+						<body>
+							<div id="footerfix">
+								<div id="header">
+									<h1 class="forumtitle">
+										<a id="top">
+											<xsl:attribute name="href">
+												<xsl:value-of select="$scripturl"/>
+											</xsl:attribute>
+											<xsl:value-of select="@forum-name"/>
+										</a>
+									</h1>
+								</div>
+								<div id="wrapper">
+									<div id="upper_section">
+										<div id="inner_section">
+											<div id="inner_wrap">
+												<div class="user">
+													<time>
+														<xsl:attribute name="datetime">
+															<xsl:value-of select="@generated-date-UTC"/>
+														</xsl:attribute>
+														<xsl:value-of select="@generated-date-localized"/>
+													</time>
+												</div>
+												<hr class="clear"/>
 											</div>
-											<hr class="clear"/>
 										</div>
 									</div>
-								</div>
 
-								<xsl:call-template name="content_section"/>
+									<xsl:call-template name="content_section"/>
 
+								</div>
 							</div>
-						</div>
-						<div id="footer">
-							<div class="inner_wrap">
-								<ul>
-									<li class="floatright">
-										<a>
-											<xsl:attribute name="href">
-												<xsl:value-of select="concat($scripturl, '?action=help')"/>
-											</xsl:attribute>
-											<xsl:value-of select="$txt_help"/>
-										</a>
-										<xsl:text> | </xsl:text>
-										<a>
-											<xsl:attribute name="href">
-												<xsl:value-of select="concat($scripturl, '?action=help;sa=rules')"/>
-											</xsl:attribute>
-											<xsl:value-of select="$txt_terms_rules"/>
-										</a>
-										<xsl:text> | </xsl:text>
-										<a href="#top">
-											<xsl:value-of select="$txt_go_up"/>
-											<xsl:text> &#9650;</xsl:text>
-										</a>
-									</li>
-									<li class="copyright">
-										<xsl:value-of select="$forum_copyright" disable-output-escaping="yes"/>
-									</li>
-								</ul>
+							<div id="footer">
+								<div class="inner_wrap">
+									<ul>
+										<li class="floatright">
+											<a>
+												<xsl:attribute name="href">
+													<xsl:value-of select="concat($scripturl, '?action=help')"/>
+												</xsl:attribute>
+												<xsl:value-of select="$txt_help"/>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a>
+												<xsl:attribute name="href">
+													<xsl:value-of select="concat($scripturl, '?action=help;sa=rules')"/>
+												</xsl:attribute>
+												<xsl:value-of select="$txt_terms_rules"/>
+											</a>
+											<xsl:text> | </xsl:text>
+											<a href="#top">
+												<xsl:value-of select="$txt_go_up"/>
+												<xsl:text> &#9650;</xsl:text>
+											</a>
+										</li>
+										<li class="copyright">
+											<xsl:value-of select="$forum_copyright" disable-output-escaping="yes"/>
+										</li>
+									</ul>
+								</div>
 							</div>
-						</div>
-					</body>
-				</html>
-			</xsl:template>
-		END,
+						</body>
+					</html>
+				</xsl:template>
+			END,
 
 		// Template to show the content of the export file.
 		'content_section' => <<<'END'
-			<xsl:template name="content_section">
-				<div id="content_section">
-					<div id="main_content_section">
-
-						<div class="cat_bar">
-							<h3 class="catbg">
-								<xsl:value-of select="@title"/>
-							</h3>
-						</div>
-						<div class="information">
-							<h2 class="display_title">
-								<xsl:value-of select="@description"/>
-							</h2>
-						</div>
+				<xsl:template name="content_section">
+					<div id="content_section">
+						<div id="main_content_section">
 
-						<xsl:if test="username">
 							<div class="cat_bar">
 								<h3 class="catbg">
-									<xsl:value-of select="$txt_summary_heading"/>
+									<xsl:value-of select="@title"/>
 								</h3>
 							</div>
-							<div id="profileview" class="roundframe flow_auto noup">
-								<xsl:call-template name="summary"/>
+							<div class="information">
+								<h2 class="display_title">
+									<xsl:value-of select="@description"/>
+								</h2>
 							</div>
-						</xsl:if>
 
-						<xsl:call-template name="page_index"/>
+							<xsl:if test="username">
+								<div class="cat_bar">
+									<h3 class="catbg">
+										<xsl:value-of select="$txt_summary_heading"/>
+									</h3>
+								</div>
+								<div id="profileview" class="roundframe flow_auto noup">
+									<xsl:call-template name="summary"/>
+								</div>
+							</xsl:if>
 
-						<xsl:if test="member_post">
-							<div class="cat_bar">
-								<h3 class="catbg">
-									<xsl:value-of select="$txt_posts_heading"/>
-								</h3>
-							</div>
-							<div id="posts" class="roundframe flow_auto noup">
-								<xsl:apply-templates select="member_post" mode="posts"/>
-							</div>
-						</xsl:if>
+							<xsl:call-template name="page_index"/>
 
-						<xsl:if test="personal_message">
-							<div class="cat_bar">
-								<h3 class="catbg">
-									<xsl:value-of select="$txt_personal_messages_heading"/>
-								</h3>
-							</div>
-							<div id="personal_messages" class="roundframe flow_auto noup">
-								<xsl:apply-templates select="personal_message" mode="pms"/>
-							</div>
-						</xsl:if>
+							<xsl:if test="member_post">
+								<div class="cat_bar">
+									<h3 class="catbg">
+										<xsl:value-of select="$txt_posts_heading"/>
+									</h3>
+								</div>
+								<div id="posts" class="roundframe flow_auto noup">
+									<xsl:apply-templates select="member_post" mode="posts"/>
+								</div>
+							</xsl:if>
+
+							<xsl:if test="personal_message">
+								<div class="cat_bar">
+									<h3 class="catbg">
+										<xsl:value-of select="$txt_personal_messages_heading"/>
+									</h3>
+								</div>
+								<div id="personal_messages" class="roundframe flow_auto noup">
+									<xsl:apply-templates select="personal_message" mode="pms"/>
+								</div>
+							</xsl:if>
 
-						<xsl:call-template name="page_index"/>
+							<xsl:call-template name="page_index"/>
 
+						</div>
 					</div>
-				</div>
-			</xsl:template>
-		END,
+				</xsl:template>
+			END,
 
 		// Template for user profile summary.
 		'summary' => <<<'END'
-			<xsl:template name="summary">
-				<div id="basicinfo">
-					<div class="username clear">
-						<h4>
-							<a>
-								<xsl:attribute name="href">
-									<xsl:value-of select="link"/>
-								</xsl:attribute>
-								<xsl:value-of select="name"/>
-							</a>
-							<xsl:text> </xsl:text>
-							<span class="position">
-								<xsl:choose>
-									<xsl:when test="position">
-										<xsl:value-of select="position"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<xsl:value-of select="post_group"/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</span>
-						</h4>
+				<xsl:template name="summary">
+					<div id="basicinfo">
+						<div class="username clear">
+							<h4>
+								<a>
+									<xsl:attribute name="href">
+										<xsl:value-of select="link"/>
+									</xsl:attribute>
+									<xsl:value-of select="name"/>
+								</a>
+								<xsl:text> </xsl:text>
+								<span class="position">
+									<xsl:choose>
+										<xsl:when test="position">
+											<xsl:value-of select="position"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="post_group"/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</span>
+							</h4>
+						</div>
+						<img class="avatar">
+							<xsl:attribute name="src">
+								<xsl:value-of select="avatar"/>
+							</xsl:attribute>
+						</img>
 					</div>
-					<img class="avatar">
-						<xsl:attribute name="src">
-							<xsl:value-of select="avatar"/>
-						</xsl:attribute>
-					</img>
-				</div>
 
-				<div id="detailedinfo">
-					<dl class="settings noborder">
-						<xsl:apply-templates mode="detailedinfo"/>
-					</dl>
-				</div>
-			</xsl:template>
-		END,
+					<div id="detailedinfo">
+						<dl class="settings noborder">
+							<xsl:apply-templates mode="detailedinfo"/>
+						</dl>
+					</div>
+				</xsl:template>
+			END,
 
 		// Some helper templates for details inside the summary.
 		'detail_default' => <<<'END'
-			<xsl:template match="*" mode="detailedinfo">
-				<dt>
-					<xsl:value-of select="concat(@label, ':')"/>
-				</dt>
-				<dd>
-					<xsl:value-of select="." disable-output-escaping="yes"/>
-				</dd>
-			</xsl:template>
-		END,
+				<xsl:template match="*" mode="detailedinfo">
+					<dt>
+						<xsl:value-of select="concat(@label, ':')"/>
+					</dt>
+					<dd>
+						<xsl:value-of select="." disable-output-escaping="yes"/>
+					</dd>
+				</xsl:template>
+			END,
 
 		'detail_email' => <<<'END'
-			<xsl:template match="email" mode="detailedinfo">
-				<dt>
-					<xsl:value-of select="concat(@label, ':')"/>
-				</dt>
-				<dd>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:text>mailto:</xsl:text>
+				<xsl:template match="email" mode="detailedinfo">
+					<dt>
+						<xsl:value-of select="concat(@label, ':')"/>
+					</dt>
+					<dd>
+						<a>
+							<xsl:attribute name="href">
+								<xsl:text>mailto:</xsl:text>
+								<xsl:value-of select="."/>
+							</xsl:attribute>
 							<xsl:value-of select="."/>
-						</xsl:attribute>
-						<xsl:value-of select="."/>
-					</a>
-				</dd>
-			</xsl:template>
-		END,
+						</a>
+					</dd>
+				</xsl:template>
+			END,
 
 		'detail_website' => <<<'END'
-			<xsl:template match="website" mode="detailedinfo">
-				<dt>
-					<xsl:value-of select="concat(@label, ':')"/>
-				</dt>
-				<dd>
-					<a>
-						<xsl:attribute name="href">
-							<xsl:value-of select="link"/>
-						</xsl:attribute>
-						<xsl:value-of select="title"/>
-					</a>
-				</dd>
-			</xsl:template>
-		END,
+				<xsl:template match="website" mode="detailedinfo">
+					<dt>
+						<xsl:value-of select="concat(@label, ':')"/>
+					</dt>
+					<dd>
+						<a>
+							<xsl:attribute name="href">
+								<xsl:value-of select="link"/>
+							</xsl:attribute>
+							<xsl:value-of select="title"/>
+						</a>
+					</dd>
+				</xsl:template>
+			END,
 
 		'detail_ip' => <<<'END'
-			<xsl:template match="ip_addresses" mode="detailedinfo">
-				<dt>
-					<xsl:value-of select="concat(@label, ':')"/>
-				</dt>
-				<dd>
-					<ul class="nolist">
-						<xsl:apply-templates mode="ip_address"/>
-					</ul>
-				</dd>
-			</xsl:template>
-			<xsl:template match="*" mode="ip_address">
-				<li>
-					<xsl:value-of select="."/>
-					<xsl:if test="@label and following-sibling">
-						<xsl:text> </xsl:text>
-						<span>(<xsl:value-of select="@label"/>)</span>
-					</xsl:if>
-				</li>
-			</xsl:template>
-		END,
+				<xsl:template match="ip_addresses" mode="detailedinfo">
+					<dt>
+						<xsl:value-of select="concat(@label, ':')"/>
+					</dt>
+					<dd>
+						<ul class="nolist">
+							<xsl:apply-templates mode="ip_address"/>
+						</ul>
+					</dd>
+				</xsl:template>
+				<xsl:template match="*" mode="ip_address">
+					<li>
+						<xsl:value-of select="."/>
+						<xsl:if test="@label and following-sibling">
+							<xsl:text> </xsl:text>
+							<span>(<xsl:value-of select="@label"/>)</span>
+						</xsl:if>
+					</li>
+				</xsl:template>
+			END,
 
 		'detail_not_included' => <<<'END'
-			<xsl:template match="name|link|avatar|online|member_post|personal_message" mode="detailedinfo"/>
-		END,
+				<xsl:template match="name|link|avatar|online|member_post|personal_message" mode="detailedinfo"/>
+			END,
 
 		// Template for printing a single post.
 		'member_post' => <<<'END'
-			<xsl:template match="member_post" mode="posts">
-				<div>
-					<xsl:attribute name="id">
-						<xsl:value-of select="concat('member_post_', id)"/>
-					</xsl:attribute>
-					<xsl:attribute name="class">
-						<xsl:choose>
-							<xsl:when test="approval_status = 1">
-								<xsl:text>windowbg</xsl:text>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:text>approvebg</xsl:text>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-
-					<div class="post_wrapper">
-						<div class="poster">
-							<h4>
-								<a>
-									<xsl:attribute name="href">
-										<xsl:value-of select="poster/link"/>
-									</xsl:attribute>
-									<xsl:value-of select="poster/name"/>
-								</a>
-							</h4>
-							<ul class="user_info">
-								<xsl:if test="poster/id = $member_id">
-									<xsl:call-template name="own_user_info"/>
-								</xsl:if>
-								<li>
-									<xsl:value-of select="poster/email"/>
-								</li>
-								<li class="poster_ip">
-									<xsl:value-of select="concat(poster/ip/@label, ': ')"/>
-									<xsl:value-of select="poster/ip"/>
-								</li>
-							</ul>
-						</div>
+				<xsl:template match="member_post" mode="posts">
+					<div>
+						<xsl:attribute name="id">
+							<xsl:value-of select="concat('member_post_', id)"/>
+						</xsl:attribute>
+						<xsl:attribute name="class">
+							<xsl:choose>
+								<xsl:when test="approval_status = 1">
+									<xsl:text>windowbg</xsl:text>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:text>approvebg</xsl:text>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
 
-						<div class="postarea">
-							<div class="flow_hidden">
+						<div class="post_wrapper">
+							<div class="poster">
+								<h4>
+									<a>
+										<xsl:attribute name="href">
+											<xsl:value-of select="poster/link"/>
+										</xsl:attribute>
+										<xsl:value-of select="poster/name"/>
+									</a>
+								</h4>
+								<ul class="user_info">
+									<xsl:if test="poster/id = $member_id">
+										<xsl:call-template name="own_user_info"/>
+									</xsl:if>
+									<li>
+										<xsl:value-of select="poster/email"/>
+									</li>
+									<li class="poster_ip">
+										<xsl:value-of select="concat(poster/ip/@label, ': ')"/>
+										<xsl:value-of select="poster/ip"/>
+									</li>
+								</ul>
+							</div>
 
-								<div class="keyinfo">
-									<h5>
-										<strong>
-											<a>
-												<xsl:attribute name="href">
-													<xsl:value-of select="board/link"/>
-												</xsl:attribute>
-												<xsl:value-of select="board/name"/>
-											</a>
-											<xsl:text> / </xsl:text>
-											<a>
-												<xsl:attribute name="href">
-													<xsl:value-of select="link"/>
+							<div class="postarea">
+								<div class="flow_hidden">
+
+									<div class="keyinfo">
+										<h5>
+											<strong>
+												<a>
+													<xsl:attribute name="href">
+														<xsl:value-of select="board/link"/>
+													</xsl:attribute>
+													<xsl:value-of select="board/name"/>
+												</a>
+												<xsl:text> / </xsl:text>
+												<a>
+													<xsl:attribute name="href">
+														<xsl:value-of select="link"/>
+													</xsl:attribute>
+													<xsl:value-of select="subject"/>
+												</a>
+											</strong>
+										</h5>
+										<span class="smalltext"><xsl:value-of select="time"/></span>
+										<xsl:if test="modified_time">
+											<span class="smalltext modified floatright mvisible em">
+												<xsl:attribute name="id">
+													<xsl:value-of select="concat('modified_', id)"/>
 												</xsl:attribute>
-												<xsl:value-of select="subject"/>
-											</a>
-										</strong>
-									</h5>
-									<span class="smalltext"><xsl:value-of select="time"/></span>
-									<xsl:if test="modified_time">
-										<span class="smalltext modified floatright mvisible em">
-											<xsl:attribute name="id">
-												<xsl:value-of select="concat('modified_', id)"/>
-											</xsl:attribute>
-											<span class="lastedit">
-												<xsl:value-of select="modified_time/@label"/>
+												<span class="lastedit">
+													<xsl:value-of select="modified_time/@label"/>
+												</span>
+												<xsl:text>: </xsl:text>
+												<xsl:value-of select="modified_time"/>
+												<xsl:text>. </xsl:text>
+												<xsl:value-of select="modified_by/@label"/>
+												<xsl:text>: </xsl:text>
+												<xsl:value-of select="modified_by"/>
+												<xsl:text>. </xsl:text>
 											</span>
-											<xsl:text>: </xsl:text>
-											<xsl:value-of select="modified_time"/>
-											<xsl:text>. </xsl:text>
-											<xsl:value-of select="modified_by/@label"/>
-											<xsl:text>: </xsl:text>
-											<xsl:value-of select="modified_by"/>
-											<xsl:text>. </xsl:text>
-										</span>
-									</xsl:if>
-								</div>
-
-								<div class="post">
-									<div class="inner">
-										<xsl:value-of select="body_html" disable-output-escaping="yes"/>
+										</xsl:if>
 									</div>
-									<div class="inner monospace" style="display:none;">
-										<xsl:choose>
-											<xsl:when test="contains(body/text(), '[html]')">
-												<xsl:call-template name="bbc_html_splitter">
-													<xsl:with-param name="bbc_string" select="body/text()"/>
-												</xsl:call-template>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:value-of select="body" disable-output-escaping="yes"/>
-											</xsl:otherwise>
-										</xsl:choose>
+
+									<div class="post">
+										<div class="inner">
+											<xsl:value-of select="body_html" disable-output-escaping="yes"/>
+										</div>
+										<div class="inner monospace" style="display:none;">
+											<xsl:choose>
+												<xsl:when test="contains(body/text(), '[html]')">
+													<xsl:call-template name="bbc_html_splitter">
+														<xsl:with-param name="bbc_string" select="body/text()"/>
+													</xsl:call-template>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:value-of select="body" disable-output-escaping="yes"/>
+												</xsl:otherwise>
+											</xsl:choose>
+										</div>
 									</div>
-								</div>
 
-								<xsl:apply-templates select="attachments">
-									<xsl:with-param name="post_id" select="id"/>
-								</xsl:apply-templates>
+									<xsl:apply-templates select="attachments">
+										<xsl:with-param name="post_id" select="id"/>
+									</xsl:apply-templates>
+
+									<div class="under_message">
+										<ul class="floatleft">
+											<xsl:if test="likes > 0">
+												<li class="smflikebutton">
+													<xsl:attribute name="id">
+														<xsl:value-of select="concat('msg_', id, '_likes')"/>
+													</xsl:attribute>
+													<span><span class="main_icons like"></span> <xsl:value-of select="likes"/></span>
+												</li>
+											</xsl:if>
+										</ul>
+										<xsl:call-template name="quickbuttons">
+											<xsl:with-param name="toggle_target" select="concat('member_post_', id)"/>
+										</xsl:call-template>
+									</div>
 
-								<div class="under_message">
-									<ul class="floatleft">
-										<xsl:if test="likes > 0">
-											<li class="smflikebutton">
-												<xsl:attribute name="id">
-													<xsl:value-of select="concat('msg_', id, '_likes')"/>
-												</xsl:attribute>
-												<span><span class="main_icons like"></span> <xsl:value-of select="likes"/></span>
-											</li>
-										</xsl:if>
-									</ul>
-									<xsl:call-template name="quickbuttons">
-										<xsl:with-param name="toggle_target" select="concat('member_post_', id)"/>
-									</xsl:call-template>
 								</div>
+							</div>
 
+							<div class="moderatorbar">
+								<xsl:if test="poster/id = $member_id">
+									<xsl:call-template name="signature"/>
+								</xsl:if>
 							</div>
-						</div>
 
-						<div class="moderatorbar">
-							<xsl:if test="poster/id = $member_id">
-								<xsl:call-template name="signature"/>
-							</xsl:if>
 						</div>
-
 					</div>
-				</div>
-			</xsl:template>
-		END,
+				</xsl:template>
+			END,
 
 		// Template for printing a single PM.
 		'personal_message' => <<<'END'
-			<xsl:template match="personal_message" mode="pms">
-				<div class="windowbg">
-					<xsl:attribute name="id">
-						<xsl:value-of select="concat('personal_message_', id)"/>
-					</xsl:attribute>
-
-					<div class="post_wrapper">
-						<div class="poster">
-							<h4>
-								<a>
-									<xsl:attribute name="href">
-										<xsl:value-of select="sender/link"/>
-									</xsl:attribute>
-									<xsl:value-of select="sender/name"/>
-								</a>
-							</h4>
-							<ul class="user_info">
-								<xsl:if test="sender/id = $member_id">
-									<xsl:call-template name="own_user_info"/>
-								</xsl:if>
-							</ul>
-						</div>
-
-						<div class="postarea">
-							<div class="flow_hidden">
+				<xsl:template match="personal_message" mode="pms">
+					<div class="windowbg">
+						<xsl:attribute name="id">
+							<xsl:value-of select="concat('personal_message_', id)"/>
+						</xsl:attribute>
 
-								<div class="keyinfo">
-									<h5>
-										<xsl:attribute name="id">
-											<xsl:value-of select="concat('subject_', id)"/>
+						<div class="post_wrapper">
+							<div class="poster">
+								<h4>
+									<a>
+										<xsl:attribute name="href">
+											<xsl:value-of select="sender/link"/>
 										</xsl:attribute>
-										<xsl:value-of select="subject"/>
-									</h5>
-									<span class="smalltext">
-										<strong>
-											<xsl:value-of select="concat(recipient[1]/@label, ': ')"/>
-										</strong>
-										<xsl:apply-templates select="recipient"/>
-									</span>
-									<br/>
-									<span class="smalltext">
-										<strong>
-											<xsl:value-of select="concat(sent_date/@label, ': ')"/>
-										</strong>
-										<time>
-											<xsl:attribute name="datetime">
-												<xsl:value-of select="sent_date/@UTC"/>
+										<xsl:value-of select="sender/name"/>
+									</a>
+								</h4>
+								<ul class="user_info">
+									<xsl:if test="sender/id = $member_id">
+										<xsl:call-template name="own_user_info"/>
+									</xsl:if>
+								</ul>
+							</div>
+
+							<div class="postarea">
+								<div class="flow_hidden">
+
+									<div class="keyinfo">
+										<h5>
+											<xsl:attribute name="id">
+												<xsl:value-of select="concat('subject_', id)"/>
 											</xsl:attribute>
-											<xsl:value-of select="normalize-space(sent_date)"/>
-										</time>
-									</span>
-								</div>
+											<xsl:value-of select="subject"/>
+										</h5>
+										<span class="smalltext">
+											<strong>
+												<xsl:value-of select="concat(recipient[1]/@label, ': ')"/>
+											</strong>
+											<xsl:apply-templates select="recipient"/>
+										</span>
+										<br/>
+										<span class="smalltext">
+											<strong>
+												<xsl:value-of select="concat(sent_date/@label, ': ')"/>
+											</strong>
+											<time>
+												<xsl:attribute name="datetime">
+													<xsl:value-of select="sent_date/@UTC"/>
+												</xsl:attribute>
+												<xsl:value-of select="normalize-space(sent_date)"/>
+											</time>
+										</span>
+									</div>
 
-								<div class="post">
-									<div class="inner">
-										<xsl:value-of select="body_html" disable-output-escaping="yes"/>
+									<div class="post">
+										<div class="inner">
+											<xsl:value-of select="body_html" disable-output-escaping="yes"/>
+										</div>
+										<div class="inner monospace" style="display:none;">
+											<xsl:call-template name="bbc_html_splitter">
+												<xsl:with-param name="bbc_string" select="body/text()"/>
+											</xsl:call-template>
+										</div>
 									</div>
-									<div class="inner monospace" style="display:none;">
-										<xsl:call-template name="bbc_html_splitter">
-											<xsl:with-param name="bbc_string" select="body/text()"/>
+
+									<div class="under_message">
+										<xsl:call-template name="quickbuttons">
+											<xsl:with-param name="toggle_target" select="concat('personal_message_', id)"/>
 										</xsl:call-template>
 									</div>
-								</div>
 
-								<div class="under_message">
-									<xsl:call-template name="quickbuttons">
-										<xsl:with-param name="toggle_target" select="concat('personal_message_', id)"/>
-									</xsl:call-template>
 								</div>
+							</div>
 
+							<div class="moderatorbar">
+								<xsl:if test="sender/id = $member_id">
+									<xsl:call-template name="signature"/>
+								</xsl:if>
 							</div>
-						</div>
 
-						<div class="moderatorbar">
-							<xsl:if test="sender/id = $member_id">
-								<xsl:call-template name="signature"/>
-							</xsl:if>
 						</div>
-
 					</div>
-				</div>
-			</xsl:template>
-		END,
+				</xsl:template>
+			END,
 
 		// A couple of templates to handle attachments.
 		'attachments' => <<<'END'
-			<xsl:template match="attachments">
-				<xsl:param name="post_id"/>
-				<xsl:if test="attachment">
-					<div class="attachments">
-						<xsl:attribute name="id">
-							<xsl:value-of select="concat('msg_', $post_id, '_footer')"/>
-						</xsl:attribute>
-						<xsl:apply-templates/>
-					</div>
-				</xsl:if>
-			</xsl:template>
-			<xsl:template match="attachment">
-				<div class="attached">
-					<div class="attachments_bot">
-						<a>
-							<xsl:attribute name="href">
-								<xsl:value-of select="concat(id, ' - ', name)"/>
+				<xsl:template match="attachments">
+					<xsl:param name="post_id"/>
+					<xsl:if test="attachment">
+						<div class="attachments">
+							<xsl:attribute name="id">
+								<xsl:value-of select="concat('msg_', $post_id, '_footer')"/>
 							</xsl:attribute>
-							<img class="centericon" alt="*">
-								<xsl:attribute name="src">
-									<xsl:value-of select="concat($themeurl, '/images/icons/clip.png')"/>
+							<xsl:apply-templates/>
+						</div>
+					</xsl:if>
+				</xsl:template>
+				<xsl:template match="attachment">
+					<div class="attached">
+						<div class="attachments_bot">
+							<a>
+								<xsl:attribute name="href">
+									<xsl:value-of select="concat(id, ' - ', name)"/>
 								</xsl:attribute>
-							</img>
-							<xsl:text> </xsl:text>
-							<xsl:value-of select="name"/>
-						</a>
-						<br/>
-						<xsl:text>(</xsl:text>
-						<a class="bbc_link">
-							<xsl:attribute name="href">
-								<xsl:value-of select="concat($scripturl, '?action=profile;area=dlattach;u=', $member_id, ';attach=', id, ';t=', $dltoken)"/>
-							</xsl:attribute>
-							<xsl:value-of select="$txt_download_original"/>
-						</a>
-						<xsl:text>)</xsl:text>
-						<br/>
-						<xsl:value-of select="size/@label"/>
-						<xsl:text>: </xsl:text>
-						<xsl:value-of select="size"/>
-						<br/>
-						<xsl:value-of select="downloads/@label"/>
-						<xsl:text>: </xsl:text>
-						<xsl:value-of select="downloads"/>
+								<img class="centericon" alt="*">
+									<xsl:attribute name="src">
+										<xsl:value-of select="concat($themeurl, '/images/icons/clip.png')"/>
+									</xsl:attribute>
+								</img>
+								<xsl:text> </xsl:text>
+								<xsl:value-of select="name"/>
+							</a>
+							<br/>
+							<xsl:text>(</xsl:text>
+							<a class="bbc_link">
+								<xsl:attribute name="href">
+									<xsl:value-of select="concat($scripturl, '?action=profile;area=dlattach;u=', $member_id, ';attach=', id, ';t=', $dltoken)"/>
+								</xsl:attribute>
+								<xsl:value-of select="$txt_download_original"/>
+							</a>
+							<xsl:text>)</xsl:text>
+							<br/>
+							<xsl:value-of select="size/@label"/>
+							<xsl:text>: </xsl:text>
+							<xsl:value-of select="size"/>
+							<br/>
+							<xsl:value-of select="downloads/@label"/>
+							<xsl:text>: </xsl:text>
+							<xsl:value-of select="downloads"/>
+						</div>
 					</div>
-				</div>
-			</xsl:template>
-		END,
+				</xsl:template>
+			END,
 
 		// Helper template for printing the user's own info next to the post or personal message.
 		'own_user_info' => <<<'END'
-			<xsl:template name="own_user_info">
-				<xsl:if test="/*/avatar">
-					<li class="avatar">
-						<a>
-							<xsl:attribute name="href">
-								<xsl:value-of select="/*/link"/>
-							</xsl:attribute>
-							<img class="avatar">
-								<xsl:attribute name="src">
-									<xsl:value-of select="/*/avatar"/>
+				<xsl:template name="own_user_info">
+					<xsl:if test="/*/avatar">
+						<li class="avatar">
+							<a>
+								<xsl:attribute name="href">
+									<xsl:value-of select="/*/link"/>
 								</xsl:attribute>
-							</img>
-						</a>
+								<img class="avatar">
+									<xsl:attribute name="src">
+										<xsl:value-of select="/*/avatar"/>
+									</xsl:attribute>
+								</img>
+							</a>
+						</li>
+					</xsl:if>
+					<li class="membergroup">
+						<xsl:value-of select="/*/position"/>
 					</li>
-				</xsl:if>
-				<li class="membergroup">
-					<xsl:value-of select="/*/position"/>
-				</li>
-				<xsl:if test="/*/title">
-					<li class="title">
-						<xsl:value-of select="/*/title"/>
+					<xsl:if test="/*/title">
+						<li class="title">
+							<xsl:value-of select="/*/title"/>
+						</li>
+					</xsl:if>
+					<li class="postgroup">
+						<xsl:value-of select="/*/post_group"/>
 					</li>
-				</xsl:if>
-				<li class="postgroup">
-					<xsl:value-of select="/*/post_group"/>
-				</li>
-				<li class="postcount">
-					<xsl:value-of select="concat(/*/posts/@label, ': ')"/>
-					<xsl:value-of select="/*/posts"/>
-				</li>
-				<xsl:if test="/*/blurb">
-					<li class="blurb">
-						<xsl:value-of select="/*/blurb"/>
+					<li class="postcount">
+						<xsl:value-of select="concat(/*/posts/@label, ': ')"/>
+						<xsl:value-of select="/*/posts"/>
 					</li>
-				</xsl:if>
-			</xsl:template>
-		END,
+					<xsl:if test="/*/blurb">
+						<li class="blurb">
+							<xsl:value-of select="/*/blurb"/>
+						</li>
+					</xsl:if>
+				</xsl:template>
+			END,
 
 		// Helper template for printing the quickbuttons.
 		'quickbuttons' => <<<'END'
-			<xsl:template name="quickbuttons">
-				<xsl:param name="toggle_target"/>
-				<ul class="quickbuttons quickbuttons_post sf-js-enabled sf-arrows" style="touch-action: pan-y;">
-					<li>
-						<a>
-							<xsl:attribute name="onclick">
-								<xsl:text>$('#</xsl:text>
-								<xsl:value-of select="$toggle_target"/>
-								<xsl:text> .inner').toggle();</xsl:text>
-							</xsl:attribute>
-							<xsl:value-of select="$txt_view_source_button"/>
-						</a>
-					</li>
-				</ul>
-			</xsl:template>
-		END,
+				<xsl:template name="quickbuttons">
+					<xsl:param name="toggle_target"/>
+					<ul class="quickbuttons quickbuttons_post sf-js-enabled sf-arrows" style="touch-action: pan-y;">
+						<li>
+							<a>
+								<xsl:attribute name="onclick">
+									<xsl:text>$('#</xsl:text>
+									<xsl:value-of select="$toggle_target"/>
+									<xsl:text> .inner').toggle();</xsl:text>
+								</xsl:attribute>
+								<xsl:value-of select="$txt_view_source_button"/>
+							</a>
+						</li>
+					</ul>
+				</xsl:template>
+			END,
 
 		// Helper template for printing a signature/
 		'signature' => <<<'END'
-			<xsl:template name="signature">
-				<xsl:if test="/*/signature">
-					<div class="signature">
-						<xsl:value-of select="/*/signature" disable-output-escaping="yes"/>
-					</div>
-				</xsl:if>
-			</xsl:template>
-		END,
+				<xsl:template name="signature">
+					<xsl:if test="/*/signature">
+						<div class="signature">
+							<xsl:value-of select="/*/signature" disable-output-escaping="yes"/>
+						</div>
+					</xsl:if>
+				</xsl:template>
+			END,
 
 		// Helper template for printing a list of PM recipients.
 		'recipient' => <<<'END'
-			<xsl:template match="recipient">
-				<a>
-					<xsl:attribute name="href">
-						<xsl:value-of select="link"/>
-					</xsl:attribute>
-					<xsl:value-of select="name"/>
-				</a>
-				<xsl:choose>
-					<xsl:when test="following-sibling::recipient">
-						<xsl:text>, </xsl:text>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:text>. </xsl:text>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:template>
-		END,
+				<xsl:template match="recipient">
+					<a>
+						<xsl:attribute name="href">
+							<xsl:value-of select="link"/>
+						</xsl:attribute>
+						<xsl:value-of select="name"/>
+					</a>
+					<xsl:choose>
+						<xsl:when test="following-sibling::recipient">
+							<xsl:text>, </xsl:text>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>. </xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:template>
+			END,
 
 		// Helper template for special handling of the contents of the [html] BBCode.
 		'bbc_html' => <<<'END'
-			<xsl:template name="bbc_html_splitter">
-				<xsl:param name="bbc_string"/>
-				<xsl:param name="inside_outside" select="outside"/>
-				<xsl:choose>
-					<xsl:when test="$inside_outside = 'outside'">
-						<xsl:choose>
-							<xsl:when test="contains($bbc_string, '[html]')">
-								<xsl:variable name="following_string">
-									<xsl:value-of select="substring-after($bbc_string, '[html]')" disable-output-escaping="yes"/>
-								</xsl:variable>
-								<xsl:value-of select="substring-before($bbc_string, '[html]')" disable-output-escaping="yes"/>
-								<xsl:text>[html]</xsl:text>
-								<xsl:call-template name="bbc_html_splitter">
-									<xsl:with-param name="bbc_string" select="$following_string"/>
-									<xsl:with-param name="inside_outside" select="inside"/>
-								</xsl:call-template>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="$bbc_string" disable-output-escaping="yes"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:choose>
-							<xsl:when test="contains($bbc_string, '[/html]')">
-								<xsl:variable name="following_string">
-									<xsl:value-of select="substring-after($bbc_string, '[/html]')" disable-output-escaping="yes"/>
-								</xsl:variable>
-								<xsl:value-of select="substring-before($bbc_string, '[/html]')" disable-output-escaping="no"/>
-								<xsl:text>[/html]</xsl:text>
-								<xsl:call-template name="bbc_html_splitter">
-									<xsl:with-param name="bbc_string" select="$following_string"/>
-									<xsl:with-param name="inside_outside" select="outside"/>
-								</xsl:call-template>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="$bbc_string" disable-output-escaping="no"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:template>
-		END,
+				<xsl:template name="bbc_html_splitter">
+					<xsl:param name="bbc_string"/>
+					<xsl:param name="inside_outside" select="outside"/>
+					<xsl:choose>
+						<xsl:when test="$inside_outside = 'outside'">
+							<xsl:choose>
+								<xsl:when test="contains($bbc_string, '[html]')">
+									<xsl:variable name="following_string">
+										<xsl:value-of select="substring-after($bbc_string, '[html]')" disable-output-escaping="yes"/>
+									</xsl:variable>
+									<xsl:value-of select="substring-before($bbc_string, '[html]')" disable-output-escaping="yes"/>
+									<xsl:text>[html]</xsl:text>
+									<xsl:call-template name="bbc_html_splitter">
+										<xsl:with-param name="bbc_string" select="$following_string"/>
+										<xsl:with-param name="inside_outside" select="inside"/>
+									</xsl:call-template>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$bbc_string" disable-output-escaping="yes"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:choose>
+								<xsl:when test="contains($bbc_string, '[/html]')">
+									<xsl:variable name="following_string">
+										<xsl:value-of select="substring-after($bbc_string, '[/html]')" disable-output-escaping="yes"/>
+									</xsl:variable>
+									<xsl:value-of select="substring-before($bbc_string, '[/html]')" disable-output-escaping="no"/>
+									<xsl:text>[/html]</xsl:text>
+									<xsl:call-template name="bbc_html_splitter">
+										<xsl:with-param name="bbc_string" select="$following_string"/>
+										<xsl:with-param name="inside_outside" select="outside"/>
+									</xsl:call-template>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="$bbc_string" disable-output-escaping="no"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:template>
+			END,
 
 		// Helper templates to build a page index.
 		'page_index' => <<<'END'
-			<xsl:template name="page_index">
-				<xsl:variable name="current_page" select="/*/@page"/>
-				<xsl:variable name="prev_page" select="/*/@page - 1"/>
-				<xsl:variable name="next_page" select="/*/@page + 1"/>
+				<xsl:template name="page_index">
+					<xsl:variable name="current_page" select="/*/@page"/>
+					<xsl:variable name="prev_page" select="/*/@page - 1"/>
+					<xsl:variable name="next_page" select="/*/@page + 1"/>
 
-				<div class="pagesection">
-					<div class="pagelinks floatleft">
+					<div class="pagesection">
+						<div class="pagelinks floatleft">
 
-						<span class="pages">
-							<xsl:value-of select="$txt_pages"/>
-						</span>
+							<span class="pages">
+								<xsl:value-of select="$txt_pages"/>
+							</span>
 
-						<xsl:if test="$current_page &gt; 1">
+							<xsl:if test="$current_page &gt; 1">
+								<a class="nav_page">
+									<xsl:attribute name="href">
+										<xsl:value-of select="concat($dlfilename, '_', $prev_page, '.', $ext)"/>
+									</xsl:attribute>
+									<span class="main_icons previous_page"></span>
+								</a>
+							</xsl:if>
+
+							<xsl:call-template name="page_links"/>
+
+							<xsl:if test="$current_page &lt; $last_page">
+								<a class="nav_page">
+									<xsl:attribute name="href">
+										<xsl:value-of select="concat($dlfilename, '_', $next_page, '.', $ext)"/>
+									</xsl:attribute>
+									<span class="main_icons next_page"></span>
+								</a>
+							</xsl:if>
+						</div>
+					</div>
+				</xsl:template>
+
+				<xsl:template name="page_links">
+					<xsl:param name="page_num" select="1"/>
+					<xsl:variable name="current_page" select="/*/@page"/>
+					<xsl:variable name="prev_page" select="/*/@page - 1"/>
+					<xsl:variable name="next_page" select="/*/@page + 1"/>
+
+					<xsl:choose>
+						<xsl:when test="$page_num = $current_page">
+							<span class="current_page">
+								<xsl:value-of select="$page_num"/>
+							</span>
+						</xsl:when>
+						<xsl:when test="$page_num = 1 or $page_num = ($current_page - 1) or $page_num = ($current_page + 1) or $page_num = $last_page">
 							<a class="nav_page">
 								<xsl:attribute name="href">
-									<xsl:value-of select="concat($dlfilename, '_', $prev_page, '.', $ext)"/>
+									<xsl:value-of select="concat($dlfilename, '_', $page_num, '.', $ext)"/>
 								</xsl:attribute>
-								<span class="main_icons previous_page"></span>
+								<xsl:value-of select="$page_num"/>
 							</a>
-						</xsl:if>
-
-						<xsl:call-template name="page_links"/>
-
-						<xsl:if test="$current_page &lt; $last_page">
-							<a class="nav_page">
+						</xsl:when>
+						<xsl:when test="$page_num = 2 or $page_num = ($current_page + 2)">
+							<span class="expand_pages" onclick="$('.nav_page').removeClass('hidden'); $('.expand_pages').hide();"> ... </span>
+							<a class="nav_page hidden">
 								<xsl:attribute name="href">
-									<xsl:value-of select="concat($dlfilename, '_', $next_page, '.', $ext)"/>
+									<xsl:value-of select="concat($dlfilename, '_', $page_num, '.', $ext)"/>
 								</xsl:attribute>
-								<span class="main_icons next_page"></span>
+								<xsl:value-of select="$page_num"/>
 							</a>
-						</xsl:if>
-					</div>
-				</div>
-			</xsl:template>
-
-			<xsl:template name="page_links">
-				<xsl:param name="page_num" select="1"/>
-				<xsl:variable name="current_page" select="/*/@page"/>
-				<xsl:variable name="prev_page" select="/*/@page - 1"/>
-				<xsl:variable name="next_page" select="/*/@page + 1"/>
-
-				<xsl:choose>
-					<xsl:when test="$page_num = $current_page">
-						<span class="current_page">
-							<xsl:value-of select="$page_num"/>
-						</span>
-					</xsl:when>
-					<xsl:when test="$page_num = 1 or $page_num = ($current_page - 1) or $page_num = ($current_page + 1) or $page_num = $last_page">
-						<a class="nav_page">
-							<xsl:attribute name="href">
-								<xsl:value-of select="concat($dlfilename, '_', $page_num, '.', $ext)"/>
-							</xsl:attribute>
-							<xsl:value-of select="$page_num"/>
-						</a>
-					</xsl:when>
-					<xsl:when test="$page_num = 2 or $page_num = ($current_page + 2)">
-						<span class="expand_pages" onclick="$('.nav_page').removeClass('hidden'); $('.expand_pages').hide();"> ... </span>
-						<a class="nav_page hidden">
-							<xsl:attribute name="href">
-								<xsl:value-of select="concat($dlfilename, '_', $page_num, '.', $ext)"/>
-							</xsl:attribute>
-							<xsl:value-of select="$page_num"/>
-						</a>
-					</xsl:when>
-					<xsl:otherwise>
-						<a class="nav_page hidden">
-							<xsl:attribute name="href">
-								<xsl:value-of select="concat($dlfilename, '_', $page_num, '.', $ext)"/>
-							</xsl:attribute>
-							<xsl:value-of select="$page_num"/>
-						</a>
-					</xsl:otherwise>
-				</xsl:choose>
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="nav_page hidden">
+								<xsl:attribute name="href">
+									<xsl:value-of select="concat($dlfilename, '_', $page_num, '.', $ext)"/>
+								</xsl:attribute>
+								<xsl:value-of select="$page_num"/>
+							</a>
+						</xsl:otherwise>
+					</xsl:choose>
 
-				<xsl:text> </xsl:text>
+					<xsl:text> </xsl:text>
 
-				<xsl:if test="$page_num &lt; $last_page">
-					<xsl:call-template name="page_links">
-						<xsl:with-param name="page_num" select="$page_num + 1"/>
-					</xsl:call-template>
-				</xsl:if>
-			</xsl:template>
-		END,
+					<xsl:if test="$page_num &lt; $last_page">
+						<xsl:call-template name="page_links">
+							<xsl:with-param name="page_num" select="$page_num + 1"/>
+						</xsl:call-template>
+					</xsl:if>
+				</xsl:template>
+			END,
 
 		// Template to insert CSS and JavaScript. This is set at runtime.
 		'css_js' => '',
 
 		// End of the XSLT stylesheet.
 		'footer' => '</xsl:stylesheet>',
-	);
+	];
 
 	/**
 	 * @var string The XSLT stylesheet as a single string.
@@ -859,7 +859,7 @@ class ExportProfileData extends BackgroundTask
 	/**
 	 * @var array Temporary backup of the Config::$modSettings array
 	 */
-	private static $real_modSettings = array();
+	private static $real_modSettings = [];
 
 	/****************
 	 * Public methods
@@ -874,8 +874,9 @@ class ExportProfileData extends BackgroundTask
 	 */
 	public function execute()
 	{
-		if (!defined('EXPORTING'))
+		if (!defined('EXPORTING')) {
 			define('EXPORTING', 1);
+		}
 
 		// Avoid leaving files in an inconsistent state.
 		ignore_user_abort(true);
@@ -883,8 +884,7 @@ public function execute()
 		$this->time_limit = (ini_get('safe_mode') === false && @set_time_limit(Taskrunner::MAX_CLAIM_THRESHOLD) !== false) ? Taskrunner::MAX_CLAIM_THRESHOLD : ini_get('max_execution_time');
 
 		// This could happen if the user manually changed the URL params of the export request.
-		if ($this->_details['format'] == 'HTML' && (!class_exists('DOMDocument') || !class_exists('XSLTProcessor')))
-		{
+		if ($this->_details['format'] == 'HTML' && (!class_exists('DOMDocument') || !class_exists('XSLTProcessor'))) {
 			$export_formats = Export::getFormats();
 
 			$this->_details['format'] = 'XML_XSLT';
@@ -896,7 +896,7 @@ public function execute()
 		User::setMe($this->_details['uid']);
 
 		// For exports only, members can always see their own posts, even in boards that they can no longer access.
-		User::$me->buddies = array();
+		User::$me->buddies = [];
 		User::$me->query_see_board = '1=1';
 		User::$me->query_see_message_board = '1=1';
 		User::$me->query_see_topic_board = '1=1';
@@ -905,38 +905,35 @@ public function execute()
 		User::$me->query_wanna_see_topic_board = '1=1';
 
 		// Use some temporary integration hooks to manipulate BBC parsing during export.
-		$hook_methods = array(
-			'pre_parsebbc' => in_array($this->_details['format'], array('HTML', 'XML_XSLT')) ? 'pre_parsebbc_html' : 'pre_parsebbc_xml',
+		$hook_methods = [
+			'pre_parsebbc' => in_array($this->_details['format'], ['HTML', 'XML_XSLT']) ? 'pre_parsebbc_html' : 'pre_parsebbc_xml',
 			'post_parsebbc' => 'post_parsebbc',
 			'bbc_codes' => 'bbc_codes',
 			'post_parseAttachBBC' => 'post_parseAttachBBC',
 			'attach_bbc_validate' => 'attach_bbc_validate',
-		);
+		];
 
-		foreach ($hook_methods as $hook => $method)
+		foreach ($hook_methods as $hook => $method) {
 			IntegrationHook::add('integrate_' . $hook, __CLASS__ . '::' . $method, false);
+		}
 
 		// Perform the export.
-		if ($this->_details['format'] == 'XML')
-		{
+		if ($this->_details['format'] == 'XML') {
 			$this->exportXml();
-		}
-		elseif ($this->_details['format'] == 'HTML')
-		{
+		} elseif ($this->_details['format'] == 'HTML') {
 			$this->exportHtml();
-		}
-		elseif ($this->_details['format'] == 'XML_XSLT')
-		{
+		} elseif ($this->_details['format'] == 'XML_XSLT') {
 			$this->exportXmlXslt();
 		}
 
 		// If necessary, create a new background task to continue the export process.
-		if (!empty($this->next_task))
-		{
-			Db::$db->insert('insert', '{db_prefix}background_tasks',
-				array('task_file' => 'string-255', 'task_class' => 'string-255', 'task_data' => 'string', 'claimed_time' => 'int'),
+		if (!empty($this->next_task)) {
+			Db::$db->insert(
+				'insert',
+				'{db_prefix}background_tasks',
+				['task_file' => 'string-255', 'task_class' => 'string-255', 'task_data' => 'string', 'claimed_time' => 'int'],
 				$this->next_task,
-				array()
+				[],
 			);
 		}
 
@@ -962,8 +959,9 @@ protected function exportXml()
 		$latest = $this->_details['latest'];
 		$datatype = $this->_details['datatype'];
 
-		if (!isset($included[$datatype]['func']) || !isset($included[$datatype]['langfile']))
+		if (!isset($included[$datatype]['func']) || !isset($included[$datatype]['langfile'])) {
 			return;
+		}
 
 		// Setup.
 		$done = false;
@@ -979,16 +977,16 @@ protected function exportXml()
 		Theme::loadEssential();
 		Theme::$current->settings['actual_theme_dir'] = Theme::$current->settings['theme_dir'];
 		User::$me->language = $lang;
-		Lang::load(implode('+', array_unique(array('index', 'Modifications', 'Stats', 'Profile', $included[$datatype]['langfile']))), $lang);
+		Lang::load(implode('+', array_unique(['index', 'Modifications', 'Stats', 'Profile', $included[$datatype]['langfile']])), $lang);
 
 		// @todo Ask lawyers whether the GDPR requires us to include posts in the recycle bin.
 		$feed->query_this_board = '{query_see_message_board}' . (!empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] > 0 ? ' AND m.id_board != ' . Config::$modSettings['recycle_board'] : '');
 
 		// We need a valid export directory.
-		if (empty(Config::$modSettings['export_dir']) || !is_dir(Config::$modSettings['export_dir']) || !Utils::makeWritable(Config::$modSettings['export_dir']))
-		{
-			if (Export::createDir() === false)
+		if (empty(Config::$modSettings['export_dir']) || !is_dir(Config::$modSettings['export_dir']) || !Utils::makeWritable(Config::$modSettings['export_dir'])) {
+			if (Export::createDir() === false) {
 				return;
+			}
 		}
 
 		$export_dir_slash = Config::$modSettings['export_dir'] . DIRECTORY_SEPARATOR;
@@ -1000,65 +998,59 @@ protected function exportXml()
 		$filenum = 1;
 		$realfile = $export_dir_slash . $filenum . '_' . $idhash_ext;
 
-		while (file_exists($realfile))
+		while (file_exists($realfile)) {
 			$realfile = $export_dir_slash . ++$filenum . '_' . $idhash_ext;
+		}
 
 		$tempfile = $export_dir_slash . $idhash_ext . '.tmp';
 		$progressfile = $export_dir_slash . $idhash_ext . '.progress.json';
 
-		$feed->metadata = array(
+		$feed->metadata = [
 			'title' => sprintf(Lang::$txt['profile_of_username'], User::$me->name),
 			'desc' => Lang::sentenceList(array_map(
-				function ($datatype)
-				{
+				function ($datatype) {
 					return Lang::$txt[$datatype];
 				},
-				array_keys($included)
+				array_keys($included),
 			)),
 			'author' => Config::$mbname,
 			'source' => Config::$scripturl . '?action=profile;u=' . $uid,
-			'language' => !empty(Lang::$txt['lang_locale']) ? str_replace("_", "-", substr(Lang::$txt['lang_locale'], 0, strcspn(Lang::$txt['lang_locale'], "."))) : 'en',
+			'language' => !empty(Lang::$txt['lang_locale']) ? str_replace('_', '-', substr(Lang::$txt['lang_locale'], 0, strcspn(Lang::$txt['lang_locale'], '.'))) : 'en',
 			'self' => '', // Unused, but can't be null.
 			'page' => &$filenum,
-		);
+		];
 
 		// Some paranoid hosts disable or hamstring the disk space functions in an attempt at security via obscurity.
 		$check_diskspace = !empty(Config::$modSettings['export_min_diskspace_pct']) && function_exists('disk_free_space') && function_exists('disk_total_space') && intval(@disk_total_space(Config::$modSettings['export_dir']) >= 1440);
 		$minspace = $check_diskspace ? ceil(disk_total_space(Config::$modSettings['export_dir']) * Config::$modSettings['export_min_diskspace_pct'] / 100) : 0;
 
 		// If a necessary file is missing, we need to start over.
-		if (!file_exists($tempfile) || !file_exists($progressfile) || filesize($progressfile) == 0)
-		{
-			foreach (array_merge(array($tempfile, $progressfile), glob($export_dir_slash . '*_' . $idhash_ext)) as $fpath)
-			{
+		if (!file_exists($tempfile) || !file_exists($progressfile) || filesize($progressfile) == 0) {
+			foreach (array_merge([$tempfile, $progressfile], glob($export_dir_slash . '*_' . $idhash_ext)) as $fpath) {
 				@unlink($fpath);
 			}
 
 			$filenum = 1;
 			$realfile = $export_dir_slash . $filenum . '_' . $idhash_ext;
 
-			Feed::build('smf', array(), $feed->metadata, 'profile');
+			Feed::build('smf', [], $feed->metadata, 'profile');
 			file_put_contents($tempfile, implode('', Utils::$context['feed']), LOCK_EX);
 
 			$progress = array_fill_keys($datatypes, 0);
 			file_put_contents($progressfile, Utils::jsonEncode($progress));
-		}
-		else
-		{
+		} else {
 			$progress = Utils::jsonDecode(file_get_contents($progressfile), true);
 		}
 
 		// Get the data.
-		$xml_data = call_user_func(array($feed, $included[$datatype]['func']));
+		$xml_data = call_user_func([$feed, $included[$datatype]['func']]);
 
 		// No data retrieved? Just move on then.
-		if (empty($xml_data))
-		{
+		if (empty($xml_data)) {
 			$datatype_done = true;
 		}
 		// Basic profile data is quick and easy.
-		elseif ($datatype == 'profile')
-		{
+		elseif ($datatype == 'profile') {
 			Feed::build('smf', $xml_data, $feed->metadata, 'profile');
 			file_put_contents($tempfile, implode('', Utils::$context['feed']), LOCK_EX);
 
@@ -1071,14 +1063,12 @@ function ($datatype)
 			CacheApi::put('export_profile_basic-' . $uid, $profile_basic_items, Taskrunner::MAX_CLAIM_THRESHOLD);
 		}
 		// Posts and PMs...
-		else
-		{
+		else {
 			// We need the basic profile data in every export file.
 			$profile_basic_items = CacheApi::get('export_profile_basic-' . $uid, Taskrunner::MAX_CLAIM_THRESHOLD);
 
-			if (empty($profile_basic_items))
-			{
-				$profile_data = call_user_func(array($feed, $included['profile']['func']));
+			if (empty($profile_basic_items)) {
+				$profile_data = call_user_func([$feed, $included['profile']['func']]);
 
 				Feed::build('smf', $profile_data, $feed->metadata, 'profile');
 
@@ -1094,40 +1084,36 @@ function ($datatype)
 
 			// If the temp file has grown enormous, save it so we can start a new one.
 			clearstatcache();
-			if (file_exists($tempfile) && filesize($tempfile) >= 1024 * 1024 * 250)
-			{
+
+			if (file_exists($tempfile) && filesize($tempfile) >= 1024 * 1024 * 250) {
 				rename($tempfile, $realfile);
 				$realfile = $export_dir_slash . ++$filenum . '_' . $idhash_ext;
 
-				if (empty(Utils::$context['feed']['header']))
-					Feed::build('smf', array(), $feed->metadata, 'profile');
+				if (empty(Utils::$context['feed']['header'])) {
+					Feed::build('smf', [], $feed->metadata, 'profile');
+				}
 
-				file_put_contents($tempfile, implode('', array(Utils::$context['feed']['header'], $profile_basic_items, Utils::$context['feed']['footer'])), LOCK_EX);
+				file_put_contents($tempfile, implode('', [Utils::$context['feed']['header'], $profile_basic_items, Utils::$context['feed']['footer']]), LOCK_EX);
 
 				$prev_item_count = 0;
 			}
 
 			// Split $xml_data into reasonably sized chunks.
-			if (empty($prev_item_count))
-			{
+			if (empty($prev_item_count)) {
 				$xml_data = array_chunk($xml_data, $per_page);
-			}
-			else
-			{
+			} else {
 				$first_chunk = array_splice($xml_data, 0, $per_page - $prev_item_count);
-				$xml_data = array_merge(array($first_chunk), array_chunk($xml_data, $per_page));
+				$xml_data = array_merge([$first_chunk], array_chunk($xml_data, $per_page));
 				unset($first_chunk);
 			}
 
-			foreach ($xml_data as $chunk => $items)
-			{
+			foreach ($xml_data as $chunk => $items) {
 				unset($new_item_count, $last_id);
 
 				// Remember the last item so we know where to start next time.
 				$last_item = end($items);
 
-				if (isset($last_item['content'][0]['content']) && $last_item['content'][0]['tag'] === 'id')
-				{
+				if (isset($last_item['content'][0]['content']) && $last_item['content'][0]['tag'] === 'id') {
 					$last_id = $last_item['content'][0]['content'];
 				}
 
@@ -1135,27 +1121,22 @@ function ($datatype)
 				Feed::build('smf', $items, $feed->metadata, 'profile');
 
 				// If disk space is insufficient, pause for a day so the admin can fix it.
-				if ($check_diskspace && disk_free_space(Config::$modSettings['export_dir']) - $minspace <= strlen(implode('', Utils::$context['feed']) . ($this->stylesheet ?? '')))
-				{
+				if ($check_diskspace && disk_free_space(Config::$modSettings['export_dir']) - $minspace <= strlen(implode('', Utils::$context['feed']) . ($this->stylesheet ?? ''))) {
 					Lang::load('Errors');
 
 					ErrorHandler::log(sprintf(Lang::$txt['export_low_diskspace'], Config::$modSettings['export_min_diskspace_pct']));
 
 					$delay = 86400;
-				}
-				else
-				{
+				} else {
 					// We need a file to write to, of course.
-					if (!file_exists($tempfile))
-					{
-						file_put_contents($tempfile, implode('', array(Utils::$context['feed']['header'], $profile_basic_items, Utils::$context['feed']['footer'])), LOCK_EX);
+					if (!file_exists($tempfile)) {
+						file_put_contents($tempfile, implode('', [Utils::$context['feed']['header'], $profile_basic_items, Utils::$context['feed']['footer']]), LOCK_EX);
 					}
 
 					// Insert the new data before the feed footer.
 					$handle = fopen($tempfile, 'r+');
 
-					if (is_resource($handle))
-					{
+					if (is_resource($handle)) {
 						flock($handle, LOCK_EX);
 
 						fseek($handle, strlen(Utils::$context['feed']['footer']) * -1, SEEK_END);
@@ -1163,8 +1144,7 @@ function ($datatype)
 						$bytes_written = fwrite($handle, Utils::$context['feed']['items'] . Utils::$context['feed']['footer']);
 
 						// If we couldn't write everything, revert the changes and consider the write to have failed.
-						if ($bytes_written > 0 && $bytes_written < strlen(Utils::$context['feed']['items'] . Utils::$context['feed']['footer']))
-						{
+						if ($bytes_written > 0 && $bytes_written < strlen(Utils::$context['feed']['items'] . Utils::$context['feed']['footer'])) {
 							fseek($handle, $bytes_written * -1, SEEK_END);
 							$pointer_pos = ftell($handle);
 							ftruncate($handle, $pointer_pos);
@@ -1180,68 +1160,60 @@ function ($datatype)
 					}
 
 					// Write failed. We'll try again next time.
-					if (empty($bytes_written))
-					{
+					if (empty($bytes_written)) {
 						$delay = Taskrunner::MAX_CLAIM_THRESHOLD;
 						break;
 					}
+
 					// All went well.
-					else
-					{
-						// Track progress by ID where appropriate, and by time otherwise.
-						$progress[$datatype] = !isset($last_id) ? time() : $last_id;
-						file_put_contents($progressfile, Utils::jsonEncode($progress));
-
-						// Are we done with this datatype yet?
-						if (!isset($last_id) || (count($items) < $per_page && $last_id >= $latest[$datatype]))
-						{
-							$datatype_done = true;
-						}
+					// Track progress by ID where appropriate, and by time otherwise.
+					$progress[$datatype] = !isset($last_id) ? time() : $last_id;
+					file_put_contents($progressfile, Utils::jsonEncode($progress));
 
-						// Finished the file for this chunk, so move on to the next one.
-						if (count($items) >= $per_page - $prev_item_count)
-						{
-							rename($tempfile, $realfile);
-							$realfile = $export_dir_slash . ++$filenum . '_' . $idhash_ext;
-							$prev_item_count = $new_item_count = 0;
-						}
-						// This was the last chunk.
-						else
-						{
-							// Should we append more items to this file next time?
-							$new_item_count = isset($last_id) ? $prev_item_count + count($items) : 0;
-						}
+					// Are we done with this datatype yet?
+					if (!isset($last_id) || (count($items) < $per_page && $last_id >= $latest[$datatype])) {
+						$datatype_done = true;
+					}
+
+					// Finished the file for this chunk, so move on to the next one.
+					if (count($items) >= $per_page - $prev_item_count) {
+						rename($tempfile, $realfile);
+						$realfile = $export_dir_slash . ++$filenum . '_' . $idhash_ext;
+						$prev_item_count = $new_item_count = 0;
+					}
+					// This was the last chunk.
+					else {
+						// Should we append more items to this file next time?
+						$new_item_count = isset($last_id) ? $prev_item_count + count($items) : 0;
 					}
 				}
 			}
 		}
 
-		if (!empty($datatype_done))
-		{
+		if (!empty($datatype_done)) {
 			$datatype_key = array_search($datatype, $datatypes);
 			$done = !isset($datatypes[$datatype_key + 1]);
 
-			if (!$done)
+			if (!$done) {
 				$datatype = $datatypes[$datatype_key + 1];
+			}
 		}
 
 		// Remove the .tmp extension from the final tempfile so the system knows it's done.
-		if (!empty($done))
-		{
+		if (!empty($done)) {
 			rename($tempfile, $realfile);
 		}
 		// Oops. Apparently some sneaky monkey cancelled the export while we weren't looking.
-		elseif (!file_exists($progressfile))
-		{
+		elseif (!file_exists($progressfile)) {
 			@unlink($tempfile);
+
 			return;
 		}
 		// We have more work to do again later.
-		else
-		{
+		else {
 			$start[$datatype] = $progress[$datatype];
 
-			$new_details = array(
+			$new_details = [
 				'format' => $this->_details['format'],
 				'uid' => $uid,
 				'lang' => $lang,
@@ -1252,18 +1224,18 @@ function ($datatype)
 				'format_settings' => $this->_details['format_settings'],
 				'last_page' => $this->_details['last_page'],
 				'dlfilename' => $this->_details['dlfilename'],
-			);
+			];
 
-			if (!empty($new_item_count))
+			if (!empty($new_item_count)) {
 				$new_details['item_count'] = $new_item_count;
+			}
 
-			$this->next_task = array(__FILE__, __CLASS__, Utils::jsonEncode($new_details), time() - Taskrunner::MAX_CLAIM_THRESHOLD + $delay);
+			$this->next_task = [__FILE__, __CLASS__, Utils::jsonEncode($new_details), time() - Taskrunner::MAX_CLAIM_THRESHOLD + $delay];
 
-			if (!file_exists($tempfile))
-			{
-				Feed::build('smf', array(), $feed->metadata, 'profile');
+			if (!file_exists($tempfile)) {
+				Feed::build('smf', [], $feed->metadata, 'profile');
 
-				file_put_contents($tempfile, implode('', array(Utils::$context['feed']['header'], !empty($profile_basic_items) ? $profile_basic_items : '', Utils::$context['feed']['footer'])), LOCK_EX);
+				file_put_contents($tempfile, implode('', [Utils::$context['feed']['header'], !empty($profile_basic_items) ? $profile_basic_items : '', Utils::$context['feed']['footer']]), LOCK_EX);
 			}
 		}
 
@@ -1292,16 +1264,17 @@ protected function exportHtml()
 		$idhash = hash_hmac('sha1', $this->_details['uid'], Config::getAuthSecret());
 		$idhash_ext = $idhash . '.' . $this->_details['format_settings']['extension'];
 
-		$new_exportfiles = array();
+		$new_exportfiles = [];
 
-		foreach (glob($export_dir_slash . '*_' . $idhash_ext) as $completed_file)
-		{
-			if (file_get_contents($completed_file, false, null, 0, 6) == '<?xml ')
+		foreach (glob($export_dir_slash . '*_' . $idhash_ext) as $completed_file) {
+			if (file_get_contents($completed_file, false, null, 0, 6) == '<?xml ') {
 				$new_exportfiles[] = $completed_file;
+			}
 		}
 
-		if (empty($new_exportfiles))
+		if (empty($new_exportfiles)) {
 			return;
+		}
 
 		// Set up the XSLT processor.
 		$xslt = new DOMDocument();
@@ -1310,10 +1283,11 @@ protected function exportHtml()
 		$xsltproc->importStylesheet($xslt);
 
 		$libxml_options = 0;
-		foreach (array('LIBXML_COMPACT', 'LIBXML_PARSEHUGE', 'LIBXML_BIGLINES') as $libxml_option)
-		{
-			if (defined($libxml_option))
+
+		foreach (['LIBXML_COMPACT', 'LIBXML_PARSEHUGE', 'LIBXML_BIGLINES'] as $libxml_option) {
+			if (defined($libxml_option)) {
 				$libxml_options = $libxml_options | constant($libxml_option);
+			}
 		}
 
 		// Transform the files to HTML.
@@ -1323,10 +1297,10 @@ protected function exportHtml()
 
 		$xmldoc = new DOMDocument();
 
-		foreach ($new_exportfiles as $exportfile)
-		{
-			if (function_exists('apache_reset_timeout'))
+		foreach ($new_exportfiles as $exportfile) {
+			if (function_exists('apache_reset_timeout')) {
 				@apache_reset_timeout();
+			}
 
 			$started = microtime(true);
 			$xmldoc->load($exportfile, $libxml_options);
@@ -1336,17 +1310,15 @@ protected function exportHtml()
 			$max_transform_time = max($max_transform_time, $finished - $started);
 
 			// When deadlines loom, sometimes the best solution is procrastination.
-			if (++$i < $num_files && TIME_START + $this->time_limit < $finished + $max_transform_time * 2)
-			{
+			if (++$i < $num_files && TIME_START + $this->time_limit < $finished + $max_transform_time * 2) {
 				// After all, there's always next time.
-				if (empty($this->next_task))
-				{
+				if (empty($this->next_task)) {
 					$progressfile = $export_dir_slash . $idhash_ext . '.progress.json';
 
 					$new_details = $this->_details;
 					$new_details['start'] = Utils::jsonDecode(file_get_contents($progressfile), true);
 
-					$this->next_task = array(__FILE__, __CLASS__, Utils::jsonEncode($new_details), time() - Taskrunner::MAX_CLAIM_THRESHOLD);
+					$this->next_task = [__FILE__, __CLASS__, Utils::jsonEncode($new_details), time() - Taskrunner::MAX_CLAIM_THRESHOLD];
 				}
 
 				// So let's just relax and take a well deserved...
@@ -1376,9 +1348,8 @@ protected function exportXmlXslt()
 		$this->exportXml();
 
 		// Just in case...
-		if (empty(Utils::$context['feed']['footer']))
-		{
-			Feed::build('smf', array(), array_fill_keys(array('title', 'desc', 'source', 'self'), ''), 'profile');
+		if (empty(Utils::$context['feed']['footer'])) {
+			Feed::build('smf', [], array_fill_keys(['title', 'desc', 'source', 'self'], ''), 'profile');
 		}
 
 		// Find any completed files that don't yet have the stylesheet embedded in them.
@@ -1388,27 +1359,25 @@ protected function exportXmlXslt()
 
 		$test_length = strlen($this->stylesheet . Utils::$context['feed']['footer']);
 
-		$new_exportfiles = array();
+		$new_exportfiles = [];
 
 		clearstatcache();
-		foreach (glob($export_dir_slash . '*_' . $idhash_ext) as $completed_file)
-		{
-			if (filesize($completed_file) < $test_length || file_get_contents($completed_file, false, null, $test_length * -1) !== $this->stylesheet . Utils::$context['feed']['footer'])
-			{
+
+		foreach (glob($export_dir_slash . '*_' . $idhash_ext) as $completed_file) {
+			if (filesize($completed_file) < $test_length || file_get_contents($completed_file, false, null, $test_length * -1) !== $this->stylesheet . Utils::$context['feed']['footer']) {
 				$new_exportfiles[] = $completed_file;
 			}
 		}
 
-		if (empty($new_exportfiles))
+		if (empty($new_exportfiles)) {
 			return;
+		}
 
 		// Embedding the XSLT means writing to the file yet again.
-		foreach ($new_exportfiles as $exportfile)
-		{
+		foreach ($new_exportfiles as $exportfile) {
 			$handle = fopen($exportfile, 'r+');
 
-			if (is_resource($handle))
-			{
+			if (is_resource($handle)) {
 				flock($handle, LOCK_EX);
 
 				fseek($handle, strlen(Utils::$context['feed']['footer']) * -1, SEEK_END);
@@ -1416,8 +1385,7 @@ protected function exportXmlXslt()
 				$bytes_written = fwrite($handle, $this->stylesheet . Utils::$context['feed']['footer']);
 
 				// If we couldn't write everything, revert the changes.
-				if ($bytes_written > 0 && $bytes_written < strlen($this->stylesheet . Utils::$context['feed']['footer']))
-				{
+				if ($bytes_written > 0 && $bytes_written < strlen($this->stylesheet . Utils::$context['feed']['footer'])) {
 					fseek($handle, $bytes_written * -1, SEEK_END);
 					$pointer_pos = ftell($handle);
 					ftruncate($handle, $pointer_pos);
@@ -1438,14 +1406,14 @@ protected function exportXmlXslt()
 	 */
 	protected function buildStylesheet(): void
 	{
-		$xslt_variables = array();
+		$xslt_variables = [];
 
-		if (in_array($this->_details['format'], array('HTML', 'XML_XSLT')))
-		{
-			if (!class_exists('DOMDocument') || !class_exists('XSLTProcessor'))
+		if (in_array($this->_details['format'], ['HTML', 'XML_XSLT'])) {
+			if (!class_exists('DOMDocument') || !class_exists('XSLTProcessor')) {
 				$this->_details['format'] = 'XML_XSLT';
+			}
 
-			require_once(Config::$sourcedir . '/Actions/Profile/Export.php');
+			require_once Config::$sourcedir . '/Actions/Profile/Export.php';
 			$export_formats = get_export_formats();
 
 			Lang::load('Profile');
@@ -1471,95 +1439,91 @@ protected function buildStylesheet(): void
 			 * Keeping this in mind may spare you from some confusion and
 			 * frustration while working with XSLT.
 			 */
-			$xslt_variables = array(
-				'scripturl' => array(
+			$xslt_variables = [
+				'scripturl' => [
 					'value' => Config::$scripturl,
-				),
-				'themeurl' => array(
+				],
+				'themeurl' => [
 					'value' => Theme::$current->settings['default_theme_url'],
-				),
-				'member_id' => array(
+				],
+				'member_id' => [
 					'value' => $this->_details['uid'],
-				),
-				'last_page' => array(
+				],
+				'last_page' => [
 					'param' => true,
 					'value' => !empty(Utils::$context['export_last_page']) ? Utils::$context['export_last_page'] : 1,
 					'xpath' => true,
-				),
-				'dlfilename' => array(
+				],
+				'dlfilename' => [
 					'param' => true,
 					'value' => !empty(Utils::$context['export_dlfilename']) ? Utils::$context['export_dlfilename'] : '',
-				),
-				'ext' => array(
+				],
+				'ext' => [
 					'value' => $export_formats[$this->_details['format']]['extension'],
-				),
-				'forum_copyright' => array(
+				],
+				'forum_copyright' => [
 					'value' => sprintf(Lang::$forum_copyright, SMF_FULL_VERSION, SMF_SOFTWARE_YEAR, Config::$scripturl),
-				),
-				'txt_summary_heading' => array(
+				],
+				'txt_summary_heading' => [
 					'value' => Lang::$txt['summary'],
-				),
-				'txt_posts_heading' => array(
+				],
+				'txt_posts_heading' => [
 					'value' => Lang::$txt['posts'],
-				),
-				'txt_personal_messages_heading' => array(
+				],
+				'txt_personal_messages_heading' => [
 					'value' => Lang::$txt['personal_messages'],
-				),
-				'txt_view_source_button' => array(
+				],
+				'txt_view_source_button' => [
 					'value' => Lang::$txt['export_view_source_button'],
-				),
-				'txt_download_original' => array(
+				],
+				'txt_download_original' => [
 					'value' => Lang::$txt['export_download_original'],
-				),
-				'txt_help' => array(
+				],
+				'txt_help' => [
 					'value' => Lang::$txt['help'],
-				),
-				'txt_terms_rules' => array(
+				],
+				'txt_terms_rules' => [
 					'value' => Lang::$txt['terms_and_rules'],
-				),
-				'txt_go_up' => array(
+				],
+				'txt_go_up' => [
 					'value' => Lang::$txt['go_up'],
-				),
-				'txt_pages' => array(
+				],
+				'txt_pages' => [
 					'value' => Lang::$txt['pages'],
-				),
-			);
+				],
+			];
 
 			// Let mods adjust the XSLT variables.
-			IntegrationHook::call('integrate_export_xslt_variables', array(&$xslt_variables, $this->_details['format']));
+			IntegrationHook::call('integrate_export_xslt_variables', [&$xslt_variables, $this->_details['format']]);
 
 			$idhash = hash_hmac('sha1', $this->_details['uid'], Config::getAuthSecret());
-			$xslt_variables['dltoken'] = array(
-				'value' => hash_hmac('sha1', $idhash, Config::getAuthSecret())
-			);
+			$xslt_variables['dltoken'] = [
+				'value' => hash_hmac('sha1', $idhash, Config::getAuthSecret()),
+			];
 
-			if ($this->_details['format'] == 'XML_XSLT')
-			{
-				$this->xslt_stylesheet['header'] = "\n" . implode("\n", array(
+			if ($this->_details['format'] == 'XML_XSLT') {
+				$this->xslt_stylesheet['header'] = "\n" . implode("\n", [
 					'',
 					'<xsl:stylesheet version="1.0" xmlns:xsl="' . self::XML_NAMESPACES['xsl'] . '" xmlns:html="' . self::XML_NAMESPACES['html'] . '" xmlns:smf="' . self::XML_NAMESPACES['smf'] . '" exclude-result-prefixes="smf html" id="stylesheet">',
 					'',
 					"\t" . '<xsl:template match="xsl:stylesheet"/>',
 					"\t" . '<xsl:template match="xsl:stylesheet" mode="detailedinfo"/>',
-				));
+				]);
 			}
 
 			// Insert the XSLT variables.
-			foreach ($xslt_variables as $name => $var)
-			{
+			foreach ($xslt_variables as $name => $var) {
 				$element = !empty($var['param']) ? 'param' : 'variable';
 
-				if (!empty($this->xslt_stylesheet['variables']))
+				if (!empty($this->xslt_stylesheet['variables'])) {
 					$this->xslt_stylesheet['variables'] .= "\n";
+				}
 
 				$this->xslt_stylesheet['variables'] .= "\t" . '<xsl:' . $element . ' name="' . $name . '"';
 
-				if (isset($var['xpath']))
-				{
+				if (isset($var['xpath'])) {
 					$this->xslt_stylesheet['variables'] .= ' select="' . $var['value'] . '"/>';
-				}
-				else
-				{
+				} else {
 					$this->xslt_stylesheet['variables'] .= '>' . (!empty($var['no_cdata_parse']) ? $var['value'] : Feed::cdataParse($var['value'])) . '</xsl:' . $element . '>';
 				}
 			}
@@ -1569,87 +1533,80 @@ protected function buildStylesheet(): void
 
 			$this->loadCssJs();
 
-			if (!empty(Utils::$context['export_css_files']))
-			{
-				foreach (Utils::$context['export_css_files'] as $css_file)
-				{
+			if (!empty(Utils::$context['export_css_files'])) {
+				foreach (Utils::$context['export_css_files'] as $css_file) {
 					$url = $css_file['fileUrl'];
 
 					$this->xslt_stylesheet['css_js'] .= <<<END
 
-							<link rel="stylesheet">
-								<xsl:attribute name="href">
-									<xsl:text>$url</xsl:text>
-								</xsl:attribute>
-					END;
+								<link rel="stylesheet">
+									<xsl:attribute name="href">
+										<xsl:text>{$url}</xsl:text>
+									</xsl:attribute>
+						END;
 
-					if (!empty($css_file['options']['attributes']))
-					{
-						foreach ($css_file['options']['attributes'] as $key => $value)
-						{
-							if ($value === false)
+					if (!empty($css_file['options']['attributes'])) {
+						foreach ($css_file['options']['attributes'] as $key => $value) {
+							if ($value === false) {
 								continue;
+							}
 
 							$value = $value === true ? $key : $value;
 
 							$this->xslt_stylesheet['css_js'] .= <<<END
-										<xsl:attribute name="$key">
-											<xsl:text>$value</xsl:text>
-										</xsl:attribute>
-							END;
+											<xsl:attribute name="{$key}">
+												<xsl:text>{$value}</xsl:text>
+											</xsl:attribute>
+								END;
 						}
 					}
 
 					$this->xslt_stylesheet['css_js'] .= <<<END
 
-							</link>
-					END;
+								</link>
+						END;
 				}
 			}
 
-			if (!empty(Utils::$context['export_css_header']))
-			{
+			if (!empty(Utils::$context['export_css_header'])) {
 				$this->xslt_stylesheet['css_js'] .= "\n\t\t" . '<style><![CDATA[' . "\n" . implode("\n", Utils::$context['export_css_header']) . "\n" . ']]>' . "\n" . '</style>';
 			}
 
-			if (!empty(Utils::$context['export_javascript_vars']))
-			{
+			if (!empty(Utils::$context['export_javascript_vars'])) {
 				$this->xslt_stylesheet['css_js'] .=  "\n\t\t" . '<script><![CDATA[';
 
-				foreach (Utils::$context['export_javascript_vars'] as $var => $val)
+				foreach (Utils::$context['export_javascript_vars'] as $var => $val) {
 					$this->xslt_stylesheet['css_js'] .= "\nvar " . $var . (!empty($val) ? ' = ' . $val : '') . ';';
+				}
 
 				$this->xslt_stylesheet['css_js'] .= "\n" . ']]>' . "\n\t\t" . '</script>';
 			}
 
-			if (!empty(Utils::$context['export_javascript_files']))
-			{
-				foreach (Utils::$context['export_javascript_files'] as $js_file)
-				{
+			if (!empty(Utils::$context['export_javascript_files'])) {
+				foreach (Utils::$context['export_javascript_files'] as $js_file) {
 					$url = $js_file['fileUrl'];
 
 					$this->xslt_stylesheet['css_js'] .= <<<END
 
-							<script>
-								<xsl:attribute name="src">
-									<xsl:text>$url</xsl:text>
-								</xsl:attribute>
-					END;
+								<script>
+									<xsl:attribute name="src">
+										<xsl:text>{$url}</xsl:text>
+									</xsl:attribute>
+						END;
 
-					if (!empty($js_file['options']['attributes']))
-					{
-						foreach ($js_file['options']['attributes'] as $key => $value)
-						{
-							if ($value === false)
+					if (!empty($js_file['options']['attributes'])) {
+						foreach ($js_file['options']['attributes'] as $key => $value) {
+							if ($value === false) {
 								continue;
+							}
 
 							$value = $value === true ? $key : $value;
 
 							$this->xslt_stylesheet['css_js'] .= <<<END
-										<xsl:attribute name="$key">
-											<xsl:text>$value</xsl:text>
-										</xsl:attribute>
-							END;
+											<xsl:attribute name="{$key}">
+												<xsl:text>{$value}</xsl:text>
+											</xsl:attribute>
+								END;
 						}
 					}
 
@@ -1657,36 +1614,33 @@ protected function buildStylesheet(): void
 				}
 			}
 
-			if (!empty(Utils::$context['export_javascript_inline']['standard']))
-			{
+			if (!empty(Utils::$context['export_javascript_inline']['standard'])) {
 				$this->xslt_stylesheet['css_js'] .=  "\n\t\t" . '<script><![CDATA[' . "\n" . implode("\n", Utils::$context['export_javascript_inline']['standard']) . "\n" . ']]>' . "\n" . '</script>';
 			}
 
-			if (!empty(Utils::$context['export_javascript_inline']['defer']))
-			{
+			if (!empty(Utils::$context['export_javascript_inline']['defer'])) {
 				$this->xslt_stylesheet['css_js'] .= "\n\t\t" . '<script><![CDATA[' . "\n" . 'window.addEventListener("DOMContentLoaded", function() {';
 
 				$this->xslt_stylesheet['css_js'] .= "\n\t" . str_replace("\n", "\n\t", implode("\n", Utils::$context['export_javascript_inline']['defer']));
 
-				$this->xslt_stylesheet['css_js'] .= "\n" . '});'. "\n" . ']]>' . "\n\t\t" . '</script>';
+				$this->xslt_stylesheet['css_js'] .= "\n" . '});' . "\n" . ']]>' . "\n\t\t" . '</script>';
 			}
 
 			$this->xslt_stylesheet['css_js'] .= "\n\t" . '</xsl:template>';
 		}
 
 		// Let mods adjust the XSLT stylesheet.
-		IntegrationHook::call('integrate_export_xslt_stylesheet', array(&$this->xslt_stylesheet, $this->_details['format']));
+		IntegrationHook::call('integrate_export_xslt_stylesheet', [&$this->xslt_stylesheet, $this->_details['format']]);
 
 		$this->stylesheet = implode("\n\n", $this->xslt_stylesheet);
 
-		if ($this->_details['format'] == 'XML_XSLT')
-		{
-			$placeholders = array();
+		if ($this->_details['format'] == 'XML_XSLT') {
+			$placeholders = [];
 
-			if (preg_match_all('/<!\[CDATA\[\X*?\]\]>/u', $this->stylesheet, $matches))
-			{
-				foreach ($matches[0] as $cdata)
+			if (preg_match_all('/<!\[CDATA\[\X*?\]\]>/u', $this->stylesheet, $matches)) {
+				foreach ($matches[0] as $cdata) {
 					$placeholders[$cdata] = md5($cdata);
+				}
 			}
 
 			$this->stylesheet = strtr($this->stylesheet, $placeholders);
@@ -1703,183 +1657,182 @@ protected function buildStylesheet(): void
 	protected function loadCssJs()
 	{
 		// If we're not running a background task, we need to preserve any existing CSS and JavaScript.
-		if (SMF != 'BACKGROUND')
-		{
-			foreach (array('css_files', 'css_header', 'javascript_vars', 'javascript_files', 'javascript_inline') as $var)
-			{
-				if (isset(Utils::$context[$var]))
+		if (SMF != 'BACKGROUND') {
+			foreach (['css_files', 'css_header', 'javascript_vars', 'javascript_files', 'javascript_inline'] as $var) {
+				if (isset(Utils::$context[$var])) {
 					Utils::$context['real_' . $var] = Utils::$context[$var];
+				}
 
-				if ($var == 'javascript_inline')
-				{
-					foreach (Utils::$context[$var] as $key => $value)
-						Utils::$context[$var][$key] = array();
+				if ($var == 'javascript_inline') {
+					foreach (Utils::$context[$var] as $key => $value) {
+						Utils::$context[$var][$key] = [];
+					}
+				} else {
+					Utils::$context[$var] = [];
 				}
-				else
-					Utils::$context[$var] = array();
 			}
 		}
 		// Autoloading is unavailable for background tasks, so we have to do things the hard way...
-		else
-		{
-			if (!empty(Config::$modSettings['minimize_files']) && (!class_exists('MatthiasMullie\\Minify\\CSS') || !class_exists('MatthiasMullie\\Minify\\JS')))
-			{
+		else {
+			if (!empty(Config::$modSettings['minimize_files']) && (!class_exists('MatthiasMullie\\Minify\\CSS') || !class_exists('MatthiasMullie\\Minify\\JS'))) {
 				// Include, not require, because minimization is nice to have but not vital here.
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'Exception.php')));
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'Exceptions', 'BasicException.php')));
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'Exceptions', 'FileImportException.php')));
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'Exceptions', 'IOException.php')));
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exception.php']);
 
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'Minify.php')));
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'path-converter', 'src', 'Converter.php')));
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exceptions', 'BasicException.php']);
 
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'CSS.php')));
-				include_once(implode(DIRECTORY_SEPARATOR, array(Config::$sourcedir, 'minify', 'src', 'JS.php')));
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exceptions', 'FileImportException.php']);
 
-				if (!class_exists('MatthiasMullie\\Minify\\CSS') || !class_exists('MatthiasMullie\\Minify\\JS'))
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exceptions', 'IOException.php']);
+
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Minify.php']);
+
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'path-converter', 'src', 'Converter.php']);
+
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'CSS.php']);
+
+				include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'JS.php']);
+
+				if (!class_exists('MatthiasMullie\\Minify\\CSS') || !class_exists('MatthiasMullie\\Minify\\JS')) {
 					Config::$modSettings['minimize_files'] = false;
+				}
 			}
 		}
 
 		// Load our standard CSS files.
-		Theme::loadCSSFile('index.css', array('minimize' => true, 'order_pos' => 1), 'smf_index');
-		Theme::loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000), 'smf_responsive');
+		Theme::loadCSSFile('index.css', ['minimize' => true, 'order_pos' => 1], 'smf_index');
+		Theme::loadCSSFile('responsive.css', ['force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000], 'smf_responsive');
 
-		if (Utils::$context['right_to_left'])
-			Theme::loadCSSFile('rtl.css', array('order_pos' => 4000), 'smf_rtl');
+		if (Utils::$context['right_to_left']) {
+			Theme::loadCSSFile('rtl.css', ['order_pos' => 4000], 'smf_rtl');
+		}
 
 		// In case any mods added relevant CSS.
 		IntegrationHook::call('integrate_pre_css_output');
 
 		// This next chunk mimics some of Theme::template_css()
-		$css_to_minify = array();
-		$normal_css_files = array();
+		$css_to_minify = [];
+		$normal_css_files = [];
 
 		usort(
 			Utils::$context['css_files'],
-			function ($a, $b)
-			{
+			function ($a, $b) {
 				return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
-			}
+			},
 		);
 
-		foreach (Utils::$context['css_files'] as $css_file)
-		{
-			if (!isset($css_file['options']['minimize']))
+		foreach (Utils::$context['css_files'] as $css_file) {
+			if (!isset($css_file['options']['minimize'])) {
 				$css_file['options']['minimize'] = true;
+			}
 
-			if (!empty($css_file['options']['minimize']) && !empty(Config::$modSettings['minimize_files']))
+			if (!empty($css_file['options']['minimize']) && !empty(Config::$modSettings['minimize_files'])) {
 				$css_to_minify[] = $css_file;
-			else
+			} else {
 				$normal_css_files[] = $css_file;
+			}
 		}
 
-		$minified_css_files = !empty($css_to_minify) ? Theme::custMinify($css_to_minify, 'css') : array();
+		$minified_css_files = !empty($css_to_minify) ? Theme::custMinify($css_to_minify, 'css') : [];
+
+		Utils::$context['css_files'] = [];
 
-		Utils::$context['css_files'] = array();
-		foreach (array_merge($minified_css_files, $normal_css_files) as $css_file)
-		{
+		foreach (array_merge($minified_css_files, $normal_css_files) as $css_file) {
 			// Embed the CSS in a <style> element if possible, since exports are supposed to be standalone files.
-			if (file_exists($css_file['filePath']))
+			if (file_exists($css_file['filePath'])) {
 				Utils::$context['css_header'][] = file_get_contents($css_file['filePath']);
-
-			elseif (!empty($css_file['fileUrl']))
+			} elseif (!empty($css_file['fileUrl'])) {
 				Utils::$context['css_files'][] = $css_file;
+			}
 		}
 
 		// Next, we need to do for JavaScript what we just did for CSS.
-		Theme::loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', array('external' => true, 'seed' => false), 'smf_jquery');
+		Theme::loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', ['external' => true, 'seed' => false], 'smf_jquery');
 
 		// There might be JavaScript that we need to add in order to support custom BBC or something.
-		IntegrationHook::call('integrate_pre_javascript_output', array(false));
-		IntegrationHook::call('integrate_pre_javascript_output', array(true));
+		IntegrationHook::call('integrate_pre_javascript_output', [false]);
+		IntegrationHook::call('integrate_pre_javascript_output', [true]);
 
-		$js_to_minify = array();
-		$all_js_files = array();
+		$js_to_minify = [];
+		$all_js_files = [];
 
-		foreach (Utils::$context['javascript_files'] as $js_file)
-		{
-			if (!empty($js_file['options']['minimize']) && !empty(Config::$modSettings['minimize_files']))
-			{
-				if (!empty($js_file['options']['async']))
+		foreach (Utils::$context['javascript_files'] as $js_file) {
+			if (!empty($js_file['options']['minimize']) && !empty(Config::$modSettings['minimize_files'])) {
+				if (!empty($js_file['options']['async'])) {
 					$js_to_minify['async'][] = $js_file;
-
-				elseif (!empty($js_file['options']['defer']))
+				} elseif (!empty($js_file['options']['defer'])) {
 					$js_to_minify['defer'][] = $js_file;
-
-				else
+				} else {
 					$js_to_minify['standard'][] = $js_file;
-			}
-			else
+				}
+			} else {
 				$all_js_files[] = $js_file;
+			}
 		}
 
-		Utils::$context['javascript_files'] = array();
-		foreach ($js_to_minify as $type => $js_files)
-		{
-			if (!empty($js_files))
-			{
+		Utils::$context['javascript_files'] = [];
+
+		foreach ($js_to_minify as $type => $js_files) {
+			if (!empty($js_files)) {
 				$minified_js_files = Theme::custMinify($js_files, 'js');
 				$all_js_files = array_merge($all_js_files, $minified_js_files);
 			}
 		}
 
-		foreach ($all_js_files as $js_file)
-		{
+		foreach ($all_js_files as $js_file) {
 			// As with the CSS, embed whatever JavaScript we can.
-			if (file_exists($js_file['filePath']))
+			if (file_exists($js_file['filePath'])) {
 				Utils::$context['javascript_inline'][(!empty($js_file['options']['defer']) ? 'defer' : 'standard')][] = file_get_contents($js_file['filePath']);
-
-			elseif (!empty($js_file['fileUrl']))
+			} elseif (!empty($js_file['fileUrl'])) {
 				Utils::$context['javascript_files'][] = $js_file;
+			}
 		}
 
 		// We need to embed the smiley images, too. To save space, we store the image data in JS variables.
-		$smiley_mimetypes = array(
+		$smiley_mimetypes = [
 			'gif' => 'image/gif',
 			'png' => 'image/png',
 			'jpg' => 'image/jpeg',
 			'jpeg' => 'image/jpeg',
 			'tiff' => 'image/tiff',
 			'svg' => 'image/svg+xml',
-		);
+		];
 
-		foreach (glob(implode(DIRECTORY_SEPARATOR, array(Config::$modSettings['smileys_dir'], User::$me->smiley_set, '*.*'))) as $smiley_file)
-		{
+		foreach (glob(implode(DIRECTORY_SEPARATOR, [Config::$modSettings['smileys_dir'], User::$me->smiley_set, '*.*'])) as $smiley_file) {
 			$pathinfo = pathinfo($smiley_file);
 
-			if (!isset($smiley_mimetypes[$pathinfo['extension']]))
+			if (!isset($smiley_mimetypes[$pathinfo['extension']])) {
 				continue;
+			}
 
-			$var = implode('_', array('smf', 'smiley', $pathinfo['filename'], $pathinfo['extension']));
+			$var = implode('_', ['smf', 'smiley', $pathinfo['filename'], $pathinfo['extension']]);
 
-			if (!isset(Utils::$context['javascript_vars'][$var]))
+			if (!isset(Utils::$context['javascript_vars'][$var])) {
 				Utils::$context['javascript_vars'][$var] = '\'data:' . $smiley_mimetypes[$pathinfo['extension']] . ';base64,' . base64_encode(file_get_contents($smiley_file)) . '\'';
+			}
 		}
 
-		Utils::$context['javascript_inline']['defer'][] = implode("\n", array(
+		Utils::$context['javascript_inline']['defer'][] = implode("\n", [
 			'$("img.smiley").each(function() {',
 			'	var data_uri_var = $(this).attr("src").replace(/.*\/(\w+)\.(\w+)$/, "smf_smiley_$1_$2");',
 			'	$(this).attr("src", window[data_uri_var]);',
 			'});',
-		));
+		]);
 
 		// Now move everything to the special export version of these arrays.
-		foreach (array('css_files', 'css_header', 'javascript_vars', 'javascript_files', 'javascript_inline') as $var)
-		{
-			if (isset(Utils::$context[$var]))
+		foreach (['css_files', 'css_header', 'javascript_vars', 'javascript_files', 'javascript_inline'] as $var) {
+			if (isset(Utils::$context[$var])) {
 				Utils::$context['export_' . $var] = Utils::$context[$var];
+			}
 
 			unset(Utils::$context[$var]);
 		}
 
 		// Finally, restore the real values.
-		if (SMF !== 'BACKGROUND')
-		{
-			foreach (array('css_files', 'css_header', 'javascript_vars', 'javascript_files', 'javascript_inline') as $var)
-			{
-				if (isset(Utils::$context['real_' . $var]))
+		if (SMF !== 'BACKGROUND') {
+			foreach (['css_files', 'css_header', 'javascript_vars', 'javascript_files', 'javascript_inline'] as $var) {
+				if (isset(Utils::$context['real_' . $var])) {
 					Utils::$context[$var] = Utils::$context['real_' . $var];
+				}
 
 				unset(Utils::$context['real_' . $var]);
 			}
@@ -1896,10 +1849,11 @@ function ($a, $b)
 	 */
 	public static function add_dtd(&$xml_data, &$metadata, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $xml_format, $subaction, &$doctype)
 	{
-		if (!isset(Lang::$txt['export_open_in_browser']))
+		if (!isset(Lang::$txt['export_open_in_browser'])) {
 			Lang::load('Profile');
+		}
 
-		$doctype = implode("\n", array(
+		$doctype = implode("\n", [
 			'<!--',
 			"\t" . Lang::$txt['export_open_in_browser'],
 			'-->',
@@ -1908,7 +1862,7 @@ public static function add_dtd(&$xml_data, &$metadata, &$namespaces, &$extraFeed
 			'<!ATTLIST xsl:stylesheet',
 			'id ID #REQUIRED>',
 			']>',
-		));
+		]);
 	}
 
 	/**
@@ -1921,10 +1875,10 @@ public static function pre_parsebbc_html(&$message, &$smileys, &$cache_id, &$par
 
 		$cache_key_extras[__CLASS__] = 1;
 
-		foreach (array('smileys_url', 'attachmentThumbnails') as $var)
-		{
-			if (isset(Config::$modSettings[$var]))
+		foreach (['smileys_url', 'attachmentThumbnails'] as $var) {
+			if (isset(Config::$modSettings[$var])) {
 				self::$real_modSettings[$var] = Config::$modSettings[$var];
+			}
 		}
 
 		Config::$modSettings['smileys_url'] = '.';
@@ -1942,15 +1896,12 @@ public static function pre_parsebbc_xml(&$message, &$smileys, &$cache_id, &$pars
 
 		$smileys = false;
 
-		if (!isset(Config::$modSettings['disabledBBC']))
-		{
+		if (!isset(Config::$modSettings['disabledBBC'])) {
 			Config::$modSettings['disabledBBC'] = 'attach';
-		}
-		else
-		{
+		} else {
 			self::$real_modSettings['disabledBBC'] = Config::$modSettings['disabledBBC'];
 
-			Config::$modSettings['disabledBBC'] = implode(',', array_unique(array_merge(array_filter(explode(',', Config::$modSettings['disabledBBC'])), array('attach'))));
+			Config::$modSettings['disabledBBC'] = implode(',', array_unique(array_merge(array_filter(explode(',', Config::$modSettings['disabledBBC'])), ['attach'])));
 		}
 	}
 
@@ -1959,10 +1910,10 @@ public static function pre_parsebbc_xml(&$message, &$smileys, &$cache_id, &$pars
 	 */
 	public static function post_parsebbc(&$message, &$smileys, &$cache_id, &$parse_tags)
 	{
-		foreach (array('disabledBBC', 'smileys_url', 'attachmentThumbnails') as $var)
-		{
-			if (isset(self::$real_modSettings[$var]))
+		foreach (['disabledBBC', 'smileys_url', 'attachmentThumbnails'] as $var) {
+			if (isset(self::$real_modSettings[$var])) {
 				Config::$modSettings[$var] = self::$real_modSettings[$var];
+			}
 		}
 	}
 
@@ -1971,11 +1922,9 @@ public static function post_parsebbc(&$message, &$smileys, &$cache_id, &$parse_t
 	 */
 	public static function bbc_codes(&$codes, &$no_autolink_tags)
 	{
-		foreach ($codes as &$code)
-		{
+		foreach ($codes as &$code) {
 			// To make the "Select" link work we'd need to embed a bunch more JS. Not worth it.
-			if ($code['tag'] === 'code')
-			{
+			if ($code['tag'] === 'code') {
 				$code['content'] = preg_replace('~<a class="codeoperation\b.*?</a>~', '', $code['content']);
 			}
 		}
@@ -1988,8 +1937,7 @@ public static function post_parseAttachBBC(&$attachContext)
 	{
 		static $dltokens;
 
-		if (empty($dltokens[Utils::$context['xmlnews_uid']]))
-		{
+		if (empty($dltokens[Utils::$context['xmlnews_uid']])) {
 			$idhash = hash_hmac('sha1', Utils::$context['xmlnews_uid'], Config::getAuthSecret());
 
 			$dltokens[Utils::$context['xmlnews_uid']] = hash_hmac('sha1', $idhash, Config::getAuthSecret());
@@ -2009,64 +1957,55 @@ public static function attach_bbc_validate(&$returnContext, $currentAttachment,
 
 		$hidden_orig_link = ' <a href="' . $currentAttachment['orig_href'] . '" class="bbc_link dlattach_' . $currentAttachment['id'] . '" style="display:none; flex: 1 0 auto; margin: auto;">' . Lang::$txt['export_download_original'] . '</a>';
 
-		if ($params['{display}'] == 'link')
-		{
+		if ($params['{display}'] == 'link') {
 			$returnContext .= ' (' . $orig_link . ')';
-		}
-		elseif (!empty($currentAttachment['is_image']))
-		{
+		} elseif (!empty($currentAttachment['is_image'])) {
 			$returnContext = '<span style="display: inline-flex; justify-content: center; align-items: center; position: relative;">' . preg_replace(
-				array(
+				[
 					'thumbnail_toggle' => '~</?a\b[^>]*>~',
 					'src' => '~src="' . preg_quote($currentAttachment['href'], '~') . ';image"~',
-				),
-				array(
+				],
+				[
 					'thumbnail_toggle' => '',
 					'src' => 'src="' . $currentAttachment['href'] . '" onerror="$(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
-				),
-				$returnContext
-			) . $hidden_orig_link . '</span>' ;
-		}
-		elseif (strpos($currentAttachment['mime_type'], 'video/') === 0)
-		{
+				],
+				$returnContext,
+			) . $hidden_orig_link . '</span>';
+		} elseif (strpos($currentAttachment['mime_type'], 'video/') === 0) {
 			$returnContext = preg_replace(
-				array(
+				[
 					'src' => '~src="' . preg_quote($currentAttachment['href'], '~') . '"~',
 					'opening_tag' => '~^<div class="videocontainer"~',
 					'closing_tag' => '~</div>$~',
-				),
-				array(
+				],
+				[
 					'src' => '$0 onerror="$(this).fadeTo(0, 0.2); $(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
 					'opening_tag' => '<div class="videocontainer" style="display: flex; justify-content: center; align-items: center; position: relative;"',
 					'closing_tag' =>  $hidden_orig_link . '</div>',
-				),
-				$returnContext
+				],
+				$returnContext,
 			);
-		}
-		elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0)
-		{
+		} elseif (strpos($currentAttachment['mime_type'], 'audio/') === 0) {
 			$returnContext = '<span style="display: inline-flex; justify-content: center; align-items: center; position: relative;">' . preg_replace(
-				array(
+				[
 					'opening_tag' => '~^<audio\b~',
-				),
-				array(
+				],
+				[
 					'opening_tag' => '<audio onerror="$(this).fadeTo(0, 0); $(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"',
-				),
-				$returnContext
+				],
+				$returnContext,
 			) . $hidden_orig_link . '</span>';
-		}
-		else
-		{
+		} else {
 			$returnContext = '<span style="display: inline-flex; justify-content: center; align-items: center; position: relative;">' . preg_replace(
-				array(
+				[
 					'obj_opening' => '~^<object\b~',
 					'link' => '~<a href="' . preg_quote($currentAttachment['href'], '~') . '" class="bbc_link">([^<]*)</a>~',
-				),
-				array(
+				],
+				[
 					'obj_opening' => '<object onerror="$(this).fadeTo(0, 0.2); $(\'.dlattach_' . $currentAttachment['id'] . '\').show(); $(\'.dlattach_' . $currentAttachment['id'] . '\').css({\'position\': \'absolute\'});"~',
 					'link' => '$0 (' . $orig_link . ')',
-				),
-				$returnContext
+				],
+				$returnContext,
 			) . $hidden_orig_link . '</span>';
 		}
 	}
diff --git a/Sources/tasks/FetchSMFiles.php b/Sources/Tasks/FetchSMFiles.php
similarity index 84%
rename from Sources/tasks/FetchSMFiles.php
rename to Sources/Tasks/FetchSMFiles.php
index c42943c5b0..b0d23c04e3 100644
--- a/Sources/tasks/FetchSMFiles.php
+++ b/Sources/Tasks/FetchSMFiles.php
@@ -14,11 +14,11 @@
 namespace SMF\Tasks;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\Utils;
-use SMF\Db\DatabaseApi as Db;
 use SMF\WebFetch\WebFetchApi;
 
 /**
@@ -34,21 +34,22 @@ class FetchSMFiles extends ScheduledTask
 	public function execute()
 	{
 		// What files do we want to get?
-		$js_files = array();
+		$js_files = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_file, filename, path, parameters
+		$request = Db::$db->query(
+			'',
+			'SELECT id_file, filename, path, parameters
 			FROM {db_prefix}admin_info_files',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$js_files[$row['id_file']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$js_files[$row['id_file']] = [
 				'filename' => $row['filename'],
 				'path' => $row['path'],
 				'parameters' => sprintf($row['parameters'], Lang::$default, urlencode(Config::$modSettings['time_format']), urlencode(SMF_FULL_VERSION)),
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -56,8 +57,7 @@ public function execute()
 		Theme::loadEssential();
 		Lang::load('Errors', Lang::$default, false);
 
-		foreach ($js_files as $id_file => $file)
-		{
+		foreach ($js_files as $id_file => $file) {
 			// Create the url
 			$server = empty($file['path']) || (substr($file['path'], 0, 7) != 'http://' && substr($file['path'], 0, 8) != 'https://') ? 'https://www.simplemachines.org' : '';
 
@@ -67,8 +67,7 @@ public function execute()
 			$file_data = WebFetchApi::fetch($url);
 
 			// If we got an error - give up - the site might be down. And if we should happen to be coming from elsewhere, let's also make a note of it.
-			if ($file_data === false)
-			{
+			if ($file_data === false) {
 				Utils::$context['scheduled_errors']['fetchSMfiles'][] = sprintf(Lang::$txt['st_cannot_retrieve_file'], $url);
 
 				ErrorHandler::log(sprintf(Lang::$txt['st_cannot_retrieve_file'], $url));
@@ -77,14 +76,15 @@ public function execute()
 			}
 
 			// Save the file to the database.
-			Db::$db->query('substring', '
-				UPDATE {db_prefix}admin_info_files
+			Db::$db->query(
+				'substring',
+				'UPDATE {db_prefix}admin_info_files
 				SET data = SUBSTRING({string:file_data}, 1, 65534)
 				WHERE id_file = {int:id_file}',
-				array(
+				[
 					'id_file' => $id_file,
 					'file_data' => $file_data,
-				)
+				],
 			);
 		}
 
diff --git a/Sources/tasks/GenericScheduledTask.php b/Sources/Tasks/GenericScheduledTask.php
similarity index 100%
rename from Sources/tasks/GenericScheduledTask.php
rename to Sources/Tasks/GenericScheduledTask.php
diff --git a/Sources/tasks/GroupAct_Notify.php b/Sources/Tasks/GroupAct_Notify.php
similarity index 76%
rename from Sources/tasks/GroupAct_Notify.php
rename to Sources/Tasks/GroupAct_Notify.php
index a044214786..98b5444d6f 100644
--- a/Sources/tasks/GroupAct_Notify.php
+++ b/Sources/Tasks/GroupAct_Notify.php
@@ -13,16 +13,13 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
-use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Groups;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify a member when a group moderator has
@@ -39,28 +36,29 @@ class GroupAct_Notify extends BackgroundTask
 	public function execute()
 	{
 		// Get the details of all the members concerned...
-		$request = Db::$db->query('', '
-			SELECT lgr.id_request, lgr.id_member, lgr.id_group, mem.email_address,
+		$request = Db::$db->query(
+			'',
+			'SELECT lgr.id_request, lgr.id_member, lgr.id_group, mem.email_address,
 				mem.lngfile, mem.member_name,  mg.group_name, mg.hidden
 			FROM {db_prefix}log_group_requests AS lgr
 				INNER JOIN {db_prefix}members AS mem ON (mem.id_member = lgr.id_member)
 				INNER JOIN {db_prefix}membergroups AS mg ON (mg.id_group = lgr.id_group)
 			WHERE lgr.id_request IN ({array_int:request_list})
 			ORDER BY mem.lngfile',
-			array(
+			[
 				'request_list' => $this->_details['request_list'],
-			)
+			],
 		);
-		$affected_users = array();
-		$members = array();
-		$alert_rows = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$affected_users = [];
+		$members = [];
+		$alert_rows = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
 			$row['lngfile'] = empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Config::$language : $row['lngfile'];
 
 			// Build the required information array
-			$affected_users[$row['id_member']] = array(
+			$affected_users[$row['id_member']] = [
 				'rid' => $row['id_request'],
 				'member_id' => $row['id_member'],
 				'member_name' => $row['member_name'],
@@ -68,64 +66,60 @@ public function execute()
 				'group_name' => $row['group_name'],
 				'email' => $row['email_address'],
 				'language' => $row['lngfile'],
-			);
+			];
 		}
 		Db::$db->free_result($request);
 
 		// Ensure everyone who is online gets their changes right away.
-		Config::updateModSettings(array('settings_updated' => time()));
+		Config::updateModSettings(['settings_updated' => time()]);
 
-		if (!empty($affected_users))
-		{
-			$prefs = Notify::getNotifyPrefs($members, array('groupr_approved', 'groupr_rejected'), true);
+		if (!empty($affected_users)) {
+			$prefs = Notify::getNotifyPrefs($members, ['groupr_approved', 'groupr_rejected'], true);
 
 			// Same as for approving, kind of.
-			foreach ($affected_users as $user)
-			{
+			foreach ($affected_users as $user) {
 				$custom_reason = isset($this->_details['reason']) && isset($this->_details['reason'][$user['rid']]) ? $this->_details['reason'][$user['rid']] : '';
 
 				// They are being approved?
-				if ($this->_details['status'] == 'approve')
-				{
+				if ($this->_details['status'] == 'approve') {
 					$pref_name = 'approved';
 					$email_template_name = 'mc_group_approve';
 					$email_message_id_prefix = 'grpapp';
 				}
 
 				// Otherwise, they are getting rejected (With or without a reason).
-				else
-				{
+				else {
 					$pref_name = 'rejected';
 					$email_template_name = empty($custom_reason) ? 'mc_group_reject' : 'mc_group_reject_reason';
 					$email_message_id_prefix = 'grprej';
 				}
 
 				$pref = !empty($prefs[$user['member_id']]['groupr_' . $pref_name]) ? $prefs[$user['member_id']]['groupr_' . $pref_name] : 0;
-				if ($pref & self::RECEIVE_NOTIFY_ALERT)
-				{
-					$alert_rows[] = array(
+
+				if ($pref & self::RECEIVE_NOTIFY_ALERT) {
+					$alert_rows[] = [
 						'alert_time' => time(),
 						'id_member' => $user['member_id'],
 						'content_type' => 'groupr',
 						'content_id' => 0,
 						'content_action' => $pref_name,
 						'is_read' => 0,
-						'extra' => Utils::jsonEncode(array('group_name' => $user['group_name'], 'reason' => !empty($custom_reason) ? '<br><br>' . $custom_reason : '')),
-					);
+						'extra' => Utils::jsonEncode(['group_name' => $user['group_name'], 'reason' => !empty($custom_reason) ? '<br><br>' . $custom_reason : '']),
+					];
 				}
 
-				if ($pref & self::RECEIVE_NOTIFY_EMAIL)
-				{
+				if ($pref & self::RECEIVE_NOTIFY_EMAIL) {
 					// Emails are a bit complicated. We have to do language stuff.
 					Theme::loadEssential();
 
-					$replacements = array(
+					$replacements = [
 						'USERNAME' => $user['member_name'],
 						'GROUPNAME' => $user['group_name'],
-					);
+					];
 
-					if (!empty($custom_reason))
+					if (!empty($custom_reason)) {
 						$replacements['REASON'] = $custom_reason;
+					}
 
 					$emaildata = Mail::loadEmailTemplate($email_template_name, $replacements, $user['language']);
 
@@ -134,8 +128,9 @@ public function execute()
 			}
 
 			// Insert the alerts if any
-			if (!empty($alert_rows))
+			if (!empty($alert_rows)) {
 				Alert::createBatch($alert_rows);
+			}
 		}
 
 		return true;
diff --git a/Sources/tasks/GroupReq_Notify.php b/Sources/Tasks/GroupReq_Notify.php
similarity index 74%
rename from Sources/tasks/GroupReq_Notify.php
rename to Sources/Tasks/GroupReq_Notify.php
index 19e7ba12cb..c905ccac39 100644
--- a/Sources/tasks/GroupReq_Notify.php
+++ b/Sources/Tasks/GroupReq_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify group moderators that a member has
@@ -38,49 +37,49 @@ class GroupReq_Notify extends BackgroundTask
 	public function execute()
 	{
 		// Do we have any group moderators?
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}group_moderators
 			WHERE id_group = {int:selected_group}',
-			array(
+			[
 				'selected_group' => $this->_details['id_group'],
-			)
+			],
 		);
-		$moderators = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$moderators = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$moderators[] = $row['id_member'];
+		}
 		Db::$db->free_result($request);
 
 		// Make sure anyone who can moderate_membergroups gets notified as well
 		$moderators = array_unique(array_merge($moderators, User::membersAllowedTo('manage_membergroups')));
 
-		if (!empty($moderators))
-		{
+		if (!empty($moderators)) {
 			// Figure out who wants to be alerted/emailed about this
-			$data = array('alert' => array(), 'email' => array());
+			$data = ['alert' => [], 'email' => []];
 
 			$prefs = Notify::getNotifyPrefs($moderators, 'request_group', true);
 
 			// Bitwise comparisons are fun...
-			foreach ($moderators as $mod)
-			{
-				if (!empty($prefs[$mod]['request_group']))
-				{
-					if ($prefs[$mod]['request_group'] & 0x01)
+			foreach ($moderators as $mod) {
+				if (!empty($prefs[$mod]['request_group'])) {
+					if ($prefs[$mod]['request_group'] & 0x01) {
 						$data['alert'][] = $mod;
+					}
 
-					if ($prefs[$mod]['request_group'] & 0x02)
+					if ($prefs[$mod]['request_group'] & 0x02) {
 						$data['email'][] = $mod;
+					}
 				}
 			}
 
-			if (!empty($data['alert']))
-			{
-				$alert_rows = array();
+			if (!empty($data['alert'])) {
+				$alert_rows = [];
 
-				foreach ($data['alert'] as $group_mod)
-				{
-					$alert_rows[] = array(
+				foreach ($data['alert'] as $group_mod) {
+					$alert_rows[] = [
 						'alert_time' => $this->_details['time'],
 						'id_member' => $group_mod,
 						'id_member_started' => $this->_details['id_member'],
@@ -89,36 +88,35 @@ public function execute()
 						'content_id' => 0,
 						'content_action' => 'group_request',
 						'is_read' => 0,
-						'extra' => Utils::jsonEncode(array('group_name' => $this->_details['group_name'])),
-					);
+						'extra' => Utils::jsonEncode(['group_name' => $this->_details['group_name']]),
+					];
 				}
 
 				Alert::createBatch($alert_rows);
 			}
 
-			if (!empty($data['email']))
-			{
+			if (!empty($data['email'])) {
 				Theme::loadEssential();
 
-				$request = Db::$db->query('', '
-					SELECT id_member, email_address, lngfile, member_name, mod_prefs
+				$request = Db::$db->query(
+					'',
+					'SELECT id_member, email_address, lngfile, member_name, mod_prefs
 					FROM {db_prefix}members
 					WHERE id_member IN ({array_int:moderator_list})
 					ORDER BY lngfile',
-					array(
+					[
 						'moderator_list' => $moderators,
-					)
+					],
 				);
 
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					$replacements = array(
+				while ($row = Db::$db->fetch_assoc($request)) {
+					$replacements = [
 						'RECPNAME' => $row['member_name'],
 						'APPLYNAME' => $this->_details['member_name'],
 						'GROUPNAME' => $this->_details['group_name'],
 						'REASON' => $this->_details['reason'],
 						'MODLINK' => Config::$scripturl . '?action=moderate;area=groups;sa=requests',
-					);
+					];
 
 					$emaildata = Mail::loadEmailTemplate('request_membership', $replacements, empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Config::$language : $row['lngfile']);
 					Mail::send($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'groupreq' . $this->_details['id_group'], $emaildata['is_html'], 2);
diff --git a/Sources/tasks/Likes_Notify.php b/Sources/Tasks/Likes_Notify.php
similarity index 80%
rename from Sources/tasks/Likes_Notify.php
rename to Sources/Tasks/Likes_Notify.php
index e2793f41c9..b82dad6cb1 100644
--- a/Sources/tasks/Likes_Notify.php
+++ b/Sources/Tasks/Likes_Notify.php
@@ -13,13 +13,11 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
-use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\User;
-use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify members when something is liked.
@@ -35,58 +33,62 @@ class Likes_Notify extends BackgroundTask
 	public function execute()
 	{
 		$author = false;
+
 		// We need to figure out who the owner of this is.
-		if ($this->_details['content_type'] == 'msg')
-		{
-			$request = Db::$db->query('', '
-				SELECT mem.id_member, mem.id_group, mem.id_post_group, mem.additional_groups, b.member_groups,
+		if ($this->_details['content_type'] == 'msg') {
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.id_member, mem.id_group, mem.id_post_group, mem.additional_groups, b.member_groups,
 					mem.pm_ignore_list
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}members AS mem ON (m.id_member = mem.id_member)
 					INNER JOIN {db_prefix}boards AS b ON (m.id_board = b.id_board)
 				WHERE id_msg = {int:msg}',
-				array(
+				[
 					'msg' => $this->_details['content_id'],
-				)
+				],
 			);
-			if ($row = Db::$db->fetch_assoc($request))
-			{
+
+			if ($row = Db::$db->fetch_assoc($request)) {
 				// Before we assign the author, let's just check that the author can see the board this is in...
 				// as it'd suck to notify someone their post was liked when in a board they can't see.
 				// Use an empty array if additional_groups is blank to avoid a fringe case... (see https://github.com/SimpleMachines/SMF2.1/issues/2987)
-				$groups = array_merge(array($row['id_group'], $row['id_post_group']), (empty($row['additional_groups']) ? array() : explode(',', $row['additional_groups'])));
+				$groups = array_merge([$row['id_group'], $row['id_post_group']], (empty($row['additional_groups']) ? [] : explode(',', $row['additional_groups'])));
 				$allowed = explode(',', $row['member_groups']);
 				$ignored_members = explode(',', $row['pm_ignore_list']);
 
 				// If the user is in group 1 anywhere, they can see everything anyway.
-				if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0)
+				if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0) {
 					$author = $row['id_member'];
+				}
 			}
 			Db::$db->free_result($request);
-		}
-		else
-		{
+		} else {
 			// This isn't something we know natively how to support. Call the hooks, if they're dealing with it, return false, otherwise return the user id.
-			$hook_results = IntegrationHook::call('integrate_find_like_author', array($this->_details['content_type'], $this->_details['content_id']));
-			foreach ($hook_results as $result)
-				if (!empty($result))
-				{
+			$hook_results = IntegrationHook::call('integrate_find_like_author', [$this->_details['content_type'], $this->_details['content_id']]);
+
+			foreach ($hook_results as $result) {
+				if (!empty($result)) {
 					$author = $result;
 					break;
 				}
+			}
 		}
 
 		// If we didn't have a member... leave.
-		if (empty($author))
+		if (empty($author)) {
 			return true;
+		}
 
 		// If the person who sent the notification is the person whose content it is, do nothing.
-		if ($author == $this->_details['sender_id'])
+		if ($author == $this->_details['sender_id']) {
 			return true;
+		}
 
 		// If the person who sent the notification is on this person's ignore list, do nothing.
-		if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members))
+		if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members)) {
 			return true;
+		}
 
 		$prefs = Notify::getNotifyPrefs($author, $this->_details['content_type'] . '_like', true);
 
@@ -94,33 +96,36 @@ public function execute()
 		// As a result, the value should really just be non empty.
 
 		// Check the value. If no value or it's empty, they didn't want alerts, oh well.
-		if (empty($prefs[$author][$this->_details['content_type'] . '_like']))
+		if (empty($prefs[$author][$this->_details['content_type'] . '_like'])) {
 			return true;
+		}
 
 		// Don't spam the alerts: if there is an existing unread alert of the
 		// requested type for the target user from the sender, don't make a new one.
-		$request = Db::$db->query('', '
-			SELECT id_alert
+		$request = Db::$db->query(
+			'',
+			'SELECT id_alert
 			FROM {db_prefix}user_alerts
 			WHERE id_member = {int:id_member}
 				AND is_read = 0
 				AND content_type = {string:content_type}
 				AND content_id = {int:content_id}
 				AND content_action = {string:content_action}',
-			array(
+			[
 				'id_member' => $author,
 				'content_type' => $this->_details['content_type'],
 				'content_id' => $this->_details['content_id'],
 				'content_action' => 'like',
-			)
+			],
 		);
 
-		if (Db::$db->num_rows($request) > 0)
+		if (Db::$db->num_rows($request) > 0) {
 			return true;
+		}
 		Db::$db->free_result($request);
 
 		// Issue, update, move on.
-		Alert::create(array(
+		Alert::create([
 			'alert_time' => $this->_details['time'],
 			'id_member' => $author,
 			'id_member_started' => $this->_details['sender_id'],
@@ -129,8 +134,8 @@ public function execute()
 			'content_id' => $this->_details['content_id'],
 			'content_action' => 'like',
 			'is_read' => 0,
-			'extra' => ''
-		));
+			'extra' => '',
+		]);
 
 		return true;
 	}
diff --git a/Sources/tasks/MemberReportReply_Notify.php b/Sources/Tasks/MemberReportReply_Notify.php
similarity index 78%
rename from Sources/tasks/MemberReportReply_Notify.php
rename to Sources/Tasks/MemberReportReply_Notify.php
index b11e6044b0..9ad2b85282 100644
--- a/Sources/tasks/MemberReportReply_Notify.php
+++ b/Sources/Tasks/MemberReportReply_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify a moderator when another moderator
@@ -38,30 +37,34 @@ class MemberReportReply_Notify extends BackgroundTask
 	public function execute()
 	{
 		// Let's see. Let us, first of all, establish the list of possible people.
-		$possible_members = array();
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$possible_members = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}log_comments
 			WHERE id_notice = {int:report}
 				AND comment_type = {literal:reportc}
 				AND id_comment < {int:last_comment}',
-			array(
+			[
 				'report' => $this->_details['report_id'],
 				'last_comment' => $this->_details['comment_id'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_row($request))
+
+		while ($row = Db::$db->fetch_row($request)) {
 			$possible_members[] = $row[0];
+		}
 		Db::$db->free_result($request);
 
 		// Presumably, there are some people?
-		if (!empty($possible_members))
-		{
+		if (!empty($possible_members)) {
 			$possible_members = array_flip(array_flip($possible_members));
-			$possible_members = array_diff($possible_members, array($this->_details['sender_id']));
+			$possible_members = array_diff($possible_members, [$this->_details['sender_id']]);
 		}
-		if (empty($possible_members))
+
+		if (empty($possible_members)) {
 			return true;
+		}
 
 		// We need to know who can moderate this board - and therefore who can see this report.
 		// First up, people who have moderate_board in the board this topic was in.
@@ -71,29 +74,27 @@ public function execute()
 		$prefs = Notify::getNotifyPrefs($members, 'member_report_reply', true);
 
 		// So now we find out who wants what.
-		$alert_bits = array(
+		$alert_bits = [
 			'alert' => self::RECEIVE_NOTIFY_ALERT,
 			'email' => self::RECEIVE_NOTIFY_EMAIL,
-		);
-		$notifies = array();
+		];
+		$notifies = [];
 
-		foreach ($prefs as $member => $pref_option)
-		{
-			foreach ($alert_bits as $type => $bitvalue)
-			{
-				if ($pref_option['member_report_reply'] & $bitvalue)
+		foreach ($prefs as $member => $pref_option) {
+			foreach ($alert_bits as $type => $bitvalue) {
+				if ($pref_option['member_report_reply'] & $bitvalue) {
 					$notifies[$type][] = $member;
+				}
 			}
 		}
 
 		// Firstly, anyone who wants alerts.
-		if (!empty($notifies['alert']))
-		{
+		if (!empty($notifies['alert'])) {
 			// Alerts are relatively easy.
-			$insert_rows = array();
-			foreach ($notifies['alert'] as $member)
-			{
-				$insert_rows[] = array(
+			$insert_rows = [];
+
+			foreach ($notifies['alert'] as $member) {
+				$insert_rows[] = [
 					'alert_time' => $this->_details['time'],
 					'id_member' => $member,
 					'id_member_started' => $this->_details['sender_id'],
@@ -103,56 +104,57 @@ public function execute()
 					'content_action' => 'report_reply',
 					'is_read' => 0,
 					'extra' => Utils::jsonEncode(
-						array(
+						[
 							'report_link' => '?action=moderate;area=reportedmembers;sa=details;rid=' . $this->_details['report_id'], // We don't put Config::$scripturl in these!
 							'user_name' => $this->_details['user_name'],
-						)
+						],
 					),
-				);
+				];
 			}
 
 			Alert::createBatch($insert_rows);
 		}
 
 		// Secondly, anyone who wants emails.
-		if (!empty($notifies['email']))
-		{
+		if (!empty($notifies['email'])) {
 			// Emails are a bit complicated. We have to do language stuff.
 			Theme::loadEssential();
 
 			// First, get everyone's language and details.
-			$emails = array();
-			$request = Db::$db->query('', '
-				SELECT id_member, lngfile, email_address
+			$emails = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, lngfile, email_address
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $notifies['email'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['lngfile']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['lngfile'])) {
 					$row['lngfile'] = Config::$language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			Db::$db->free_result($request);
 
 			// Iterate through each language, load the relevant templates and set up sending.
-			foreach ($emails as $this_lang => $recipients)
-			{
-				$replacements = array(
+			foreach ($emails as $this_lang => $recipients) {
+				$replacements = [
 					'MEMBERNAME' => $this->_details['member_name'],
 					'COMMENTERNAME' => $this->_details['sender_name'],
 					'PROFILELINK' => Config::$scripturl . 'action=profile;u=' . $this->_details['user_id'],
 					'REPORTLINK' => Config::$scripturl . '?action=moderate;area=userreports;report=' . $this->_details['report_id'],
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('reply_to_user_reports', $replacements, empty(Config::$modSettings['userLanguage']) ? Config::$language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
+				foreach ($recipients as $id_member => $email_address) {
 					Mail::send($email_address, $emaildata['subject'], $emaildata['body'], null, 'urptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				}
 			}
 		}
 
diff --git a/Sources/tasks/MemberReport_Notify.php b/Sources/Tasks/MemberReport_Notify.php
similarity index 80%
rename from Sources/tasks/MemberReport_Notify.php
rename to Sources/Tasks/MemberReport_Notify.php
index 05eeba505d..567e8e80a4 100644
--- a/Sources/tasks/MemberReport_Notify.php
+++ b/Sources/Tasks/MemberReport_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify moderators when someone files a report
@@ -41,33 +40,33 @@ public function execute()
 		$members = User::membersAllowedTo('moderate_forum');
 
 		// And don't send it to them if they're the one who reported it.
-		$members = array_diff($members, array($this->_details['sender_id']));
+		$members = array_diff($members, [$this->_details['sender_id']]);
 
 		// Having successfully figured this out, now let's get the preferences of everyone.
 		$prefs = Notify::getNotifyPrefs($members, 'member_report', true);
 
 		// So now we find out who wants what.
-		$alert_bits = array(
+		$alert_bits = [
 			'alert' => self::RECEIVE_NOTIFY_ALERT,
 			'email' => self::RECEIVE_NOTIFY_EMAIL,
-		);
-		$notifies = array();
+		];
+		$notifies = [];
 
-		foreach ($prefs as $member => $pref_option)
-		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['member_report'] & $bitvalue)
+		foreach ($prefs as $member => $pref_option) {
+			foreach ($alert_bits as $type => $bitvalue) {
+				if ($pref_option['member_report'] & $bitvalue) {
 					$notifies[$type][] = $member;
+				}
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
-		if (!empty($notifies['alert']))
-		{
+		if (!empty($notifies['alert'])) {
 			// Alerts are relatively easy.
-			$insert_rows = array();
-			foreach ($notifies['alert'] as $member)
-			{
-				$insert_rows[] = array(
+			$insert_rows = [];
+
+			foreach ($notifies['alert'] as $member) {
+				$insert_rows[] = [
 					'alert_time' => $this->_details['time'],
 					'id_member' => $member,
 					'id_member_started' => $this->_details['sender_id'],
@@ -77,58 +76,59 @@ public function execute()
 					'content_action' => 'report',
 					'is_read' => 0,
 					'extra' => Utils::jsonEncode(
-						array(
+						[
 							'report_link' => '?action=moderate;area=reportedmembers;sa=details;rid=' . $this->_details['report_id'], // We don't put Config::$scripturl in these!
 							'user_name' => $this->_details['user_name'],
 							'user_id' => $this->_details['user_id'],
-						)
+						],
 					),
-				);
+				];
 			}
 
 			Alert::createBatch($insert_rows);
 		}
 
 		// Secondly, anyone who wants emails.
-		if (!empty($notifies['email']))
-		{
+		if (!empty($notifies['email'])) {
 			// Emails are a bit complicated. We have to do language stuff.
 			Theme::loadEssential();
 
 			// First, get everyone's language and details.
-			$emails = array();
-			$request = Db::$db->query('', '
-				SELECT id_member, lngfile, email_address
+			$emails = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, lngfile, email_address
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $notifies['email'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['lngfile']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['lngfile'])) {
 					$row['lngfile'] = Config::$language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			Db::$db->free_result($request);
 
 			// Iterate through each language, load the relevant templates and set up sending.
-			foreach ($emails as $this_lang => $recipients)
-			{
-				$replacements = array(
+			foreach ($emails as $this_lang => $recipients) {
+				$replacements = [
 					'MEMBERNAME' => $this->_details['user_name'],
 					'REPORTERNAME' => $this->_details['sender_name'],
 					'PROFILELINK' => Config::$scripturl . '?action=profile;u=' . $this->_details['user_id'],
 					'REPORTLINK' => Config::$scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $this->_details['report_id'],
 					'COMMENT' => $this->_details['comment'],
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('report_member_profile', $replacements, empty(Config::$modSettings['userLanguage']) ? Config::$language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
+				foreach ($recipients as $id_member => $email_address) {
 					Mail::send($email_address, $emaildata['subject'], $emaildata['body'], null, 'ureport' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}
 
diff --git a/Sources/tasks/MsgReportReply_Notify.php b/Sources/Tasks/MsgReportReply_Notify.php
similarity index 77%
rename from Sources/tasks/MsgReportReply_Notify.php
rename to Sources/Tasks/MsgReportReply_Notify.php
index becfc71d6e..2ff2df9b04 100644
--- a/Sources/tasks/MsgReportReply_Notify.php
+++ b/Sources/Tasks/MsgReportReply_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify a moderator when another moderator
@@ -38,64 +37,73 @@ class MsgReportReply_Notify extends BackgroundTask
 	public function execute()
 	{
 		// Let's see. Let us, first of all, establish the list of possible people.
-		$possible_members = array();
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$possible_members = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}log_comments
 			WHERE id_notice = {int:report}
 				AND comment_type = {literal:reportc}
 				AND id_comment < {int:last_comment}',
-			array(
+			[
 				'report' => $this->_details['report_id'],
 				'last_comment' => $this->_details['comment_id'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_row($request))
+
+		while ($row = Db::$db->fetch_row($request)) {
 			$possible_members[] = $row[0];
+		}
 		Db::$db->free_result($request);
 
 		// Presumably, there are some people?
-		if (!empty($possible_members))
-		{
+		if (!empty($possible_members)) {
 			$possible_members = array_flip(array_flip($possible_members));
-			$possible_members = array_diff($possible_members, array($this->_details['sender_id']));
+			$possible_members = array_diff($possible_members, [$this->_details['sender_id']]);
 		}
-		if (empty($possible_members))
+
+		if (empty($possible_members)) {
 			return true;
+		}
 
 		// We need to know who can moderate this board - and therefore who can see this report.
 		// First up, people who have moderate_board in the board this topic was in.
 		$members = User::membersAllowedTo('moderate_board', $this->_details['board_id']);
 
 		// Second, anyone assigned to be a moderator of this board directly.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}moderators
 			WHERE id_board = {int:current_board}',
-			array(
+			[
 				'current_board' => $this->_details['board_id'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
+		}
 		Db::$db->free_result($request);
 
 		// Thirdly, anyone assigned to be a moderator of this group as a group->board moderator.
-		$request = Db::$db->query('', '
-			SELECT mem.id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member
 			FROM {db_prefix}members AS mem, {db_prefix}moderator_groups AS bm
 			WHERE bm.id_board = {int:current_board}
 				AND(
 					mem.id_group = bm.id_group
 					OR FIND_IN_SET(bm.id_group, mem.additional_groups) != 0
 				)',
-			array(
+			[
 				'current_board' => $this->_details['board_id'],
-			)
+			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request))
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
+		}
 		Db::$db->free_result($request);
 
 		// So now we have two lists: the people who replied to a report in the past,
@@ -106,29 +114,27 @@ public function execute()
 		$prefs = Notify::getNotifyPrefs($members, 'msg_report_reply', true);
 
 		// So now we find out who wants what.
-		$alert_bits = array(
+		$alert_bits = [
 			'alert' => self::RECEIVE_NOTIFY_ALERT,
 			'email' => self::RECEIVE_NOTIFY_EMAIL,
-		);
-		$notifies = array();
+		];
+		$notifies = [];
 
-		foreach ($prefs as $member => $pref_option)
-		{
-			foreach ($alert_bits as $type => $bitvalue)
-			{
-				if ($pref_option['msg_report_reply'] & $bitvalue)
+		foreach ($prefs as $member => $pref_option) {
+			foreach ($alert_bits as $type => $bitvalue) {
+				if ($pref_option['msg_report_reply'] & $bitvalue) {
 					$notifies[$type][] = $member;
+				}
 			}
 		}
 
 		// Firstly, anyone who wants alerts.
-		if (!empty($notifies['alert']))
-		{
+		if (!empty($notifies['alert'])) {
 			// Alerts are relatively easy.
-			$insert_rows = array();
-			foreach ($notifies['alert'] as $member)
-			{
-				$insert_rows[] = array(
+			$insert_rows = [];
+
+			foreach ($notifies['alert'] as $member) {
+				$insert_rows[] = [
 					'alert_time' => $this->_details['time'],
 					'id_member' => $member,
 					'id_member_started' => $this->_details['sender_id'],
@@ -138,69 +144,71 @@ public function execute()
 					'content_action' => 'report_reply',
 					'is_read' => 0,
 					'extra' => Utils::jsonEncode(
-						array(
+						[
 							'report_link' => '?action=moderate;area=reportedposts;sa=details;rid=' . $this->_details['report_id'], // We don't put Config::$scripturl in these!
-						)
+						],
 					),
-				);
+				];
 			}
 
 			Alert::createBatch($insert_rows);
 		}
 
 		// Secondly, anyone who wants emails.
-		if (!empty($notifies['email']))
-		{
+		if (!empty($notifies['email'])) {
 			// Emails are a bit complicated. We have to do language stuff.
 			Theme::loadEssential();
 
 			// First, get everyone's language and details.
-			$emails = array();
-			$request = Db::$db->query('', '
-				SELECT id_member, lngfile, email_address
+			$emails = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, lngfile, email_address
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $notifies['email'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['lngfile']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['lngfile'])) {
 					$row['lngfile'] = Config::$language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			Db::$db->free_result($request);
 
 			// Second, get some details that might be nice for the report email.
 			// We don't bother cluttering up the tasks data for this, when it's really no bother to fetch it.
-			$request = Db::$db->query('', '
-				SELECT lr.subject, lr.membername, lr.body
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.subject, lr.membername, lr.body
 				FROM {db_prefix}log_reported AS lr
 				WHERE id_report = {int:report}',
-				array(
+				[
 					'report' => $this->_details['report_id'],
-				)
+				],
 			);
-			list ($subject, $poster_name, $comment) = Db::$db->fetch_row($request);
+			list($subject, $poster_name, $comment) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Third, iterate through each language, load the relevant templates and set up sending.
-			foreach ($emails as $this_lang => $recipients)
-			{
-				$replacements = array(
+			foreach ($emails as $this_lang => $recipients) {
+				$replacements = [
 					'TOPICSUBJECT' => $subject,
 					'POSTERNAME' => $poster_name,
 					'COMMENTERNAME' => $this->_details['sender_name'],
 					'TOPICLINK' => Config::$scripturl . '?topic=' . $this->_details['topic_id'] . '.msg' . $this->_details['msg_id'] . '#msg' . $this->_details['msg_id'],
 					'REPORTLINK' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $this->_details['report_id'],
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('reply_to_moderator', $replacements, empty(Config::$modSettings['userLanguage']) ? Config::$language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
+				foreach ($recipients as $id_member => $email_address) {
 					Mail::send($email_address, $emaildata['subject'], $emaildata['body'], null, 'rptrpy' . $this->_details['comment_id'], $emaildata['is_html'], 3);
+				}
 			}
 		}
 
diff --git a/Sources/tasks/MsgReport_Notify.php b/Sources/Tasks/MsgReport_Notify.php
similarity index 79%
rename from Sources/tasks/MsgReport_Notify.php
rename to Sources/Tasks/MsgReport_Notify.php
index 07a9741eaa..1a9a0034fd 100644
--- a/Sources/tasks/MsgReport_Notify.php
+++ b/Sources/Tasks/MsgReport_Notify.php
@@ -13,15 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify moderators when someone files a report
@@ -42,67 +41,72 @@ public function execute()
 		$members = User::membersAllowedTo('moderate_board', $this->_details['board_id']);
 
 		// Second, anyone assigned to be a moderator of this board directly.
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}moderators
 			WHERE id_board = {int:current_board}',
-			array(
+			[
 				'current_board' => $this->_details['board_id'],
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
+		}
 		Db::$db->free_result($request);
 
 		// Thirdly, anyone assigned to be a moderator of this group as a group->board moderator.
-		$request = Db::$db->query('', '
-			SELECT mem.id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member
 			FROM {db_prefix}members AS mem, {db_prefix}moderator_groups AS bm
 			WHERE bm.id_board = {int:current_board}
 				AND(
 					mem.id_group = bm.id_group
 					OR FIND_IN_SET(bm.id_group, mem.additional_groups) != 0
 				)',
-			array(
+			[
 				'current_board' => $this->_details['board_id'],
-			)
+			],
 		);
 
-		while ($row = Db::$db->fetch_assoc($request))
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$members[] = $row['id_member'];
+		}
 		Db::$db->free_result($request);
 
 		// And now weed out the duplicates.
 		$members = array_flip(array_flip($members));
 
 		// And don't send it to them if they're the one who reported it.
-		$members = array_diff($members, array($this->_details['sender_id']));
+		$members = array_diff($members, [$this->_details['sender_id']]);
 
 		// Having successfully figured this out, now let's get the preferences of everyone.
 		$prefs = Notify::getNotifyPrefs($members, 'msg_report', true);
 
 		// So now we find out who wants what.
-		$alert_bits = array(
+		$alert_bits = [
 			'alert' => self::RECEIVE_NOTIFY_ALERT,
 			'email' => self::RECEIVE_NOTIFY_EMAIL,
-		);
-		$notifies = array();
+		];
+		$notifies = [];
 
-		foreach ($prefs as $member => $pref_option)
-		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['msg_report'] & $bitvalue)
+		foreach ($prefs as $member => $pref_option) {
+			foreach ($alert_bits as $type => $bitvalue) {
+				if ($pref_option['msg_report'] & $bitvalue) {
 					$notifies[$type][] = $member;
+				}
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
-		if (!empty($notifies['alert']))
-		{
+		if (!empty($notifies['alert'])) {
 			// Alerts are relatively easy.
-			$insert_rows = array();
-			foreach ($notifies['alert'] as $member)
-			{
-				$insert_rows[] = array(
+			$insert_rows = [];
+
+			foreach ($notifies['alert'] as $member) {
+				$insert_rows[] = [
 					'alert_time' => $this->_details['time'],
 					'id_member' => $member,
 					'id_member_started' => $this->_details['sender_id'],
@@ -112,73 +116,75 @@ public function execute()
 					'content_action' => 'report',
 					'is_read' => 0,
 					'extra' => Utils::jsonEncode(
-						array(
+						[
 							'report_link' => '?action=moderate;area=reportedposts;sa=details;rid=' . $this->_details['report_id'], // We don't put Config::$scripturl in these!
-						)
+						],
 					),
-				);
+				];
 			}
 
 			Alert::createBatch($insert_rows);
 		}
 
 		// Secondly, anyone who wants emails.
-		if (!empty($notifies['email']))
-		{
+		if (!empty($notifies['email'])) {
 			// Emails are a bit complicated. We have to do language stuff.
 			Theme::loadEssential();
 
 			// First, get everyone's language and details.
-			$emails = array();
-			$request = Db::$db->query('', '
-				SELECT id_member, lngfile, email_address
+			$emails = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, lngfile, email_address
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $notifies['email'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['lngfile']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['lngfile'])) {
 					$row['lngfile'] = Config::$language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			Db::$db->free_result($request);
 
 			// Second, get some details that might be nice for the report email.
 			// We don't bother cluttering up the tasks data for this, when it's really no bother to fetch it.
-			$request = Db::$db->query('', '
-				SELECT lr.subject, lr.membername, lrc.comment
+			$request = Db::$db->query(
+				'',
+				'SELECT lr.subject, lr.membername, lrc.comment
 				FROM {db_prefix}log_reported AS lr
 					INNER JOIN {db_prefix}log_reported_comments AS lrc ON (lr.id_report = lrc.id_report)
 				WHERE lr.id_report = {int:report}
 					AND lrc.id_comment = {int:comment}',
-				array(
+				[
 					'report' => $this->_details['report_id'],
 					'comment' => $this->_details['comment_id'],
-				)
+				],
 			);
-			list ($subject, $poster_name, $comment) = Db::$db->fetch_row($request);
+			list($subject, $poster_name, $comment) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			// Third, iterate through each language, load the relevant templates and set up sending.
-			foreach ($emails as $this_lang => $recipients)
-			{
-				$replacements = array(
+			foreach ($emails as $this_lang => $recipients) {
+				$replacements = [
 					'TOPICSUBJECT' => $subject,
 					'POSTERNAME' => $poster_name,
 					'REPORTERNAME' => $this->_details['sender_name'],
 					'TOPICLINK' => Config::$scripturl . '?topic=' . $this->_details['topic_id'] . '.msg' . $this->_details['msg_id'] . '#msg' . $this->_details['msg_id'],
 					'REPORTLINK' => Config::$scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $this->_details['report_id'],
 					'COMMENT' => $comment,
-				);
+				];
 
 				$emaildata = Mail::loadEmailTemplate('report_to_moderator', $replacements, empty(Config::$modSettings['userLanguage']) ? Config::$language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
+				foreach ($recipients as $id_member => $email_address) {
 					Mail::send($email_address, $emaildata['subject'], $emaildata['body'], null, 'report' . $this->_details['report_id'], $emaildata['is_html'], 2);
+				}
 			}
 		}
 
diff --git a/Sources/tasks/PaidSubs.php b/Sources/Tasks/PaidSubs.php
similarity index 81%
rename from Sources/tasks/PaidSubs.php
rename to Sources/Tasks/PaidSubs.php
index 5d2c9408c4..c0d34a944d 100644
--- a/Sources/tasks/PaidSubs.php
+++ b/Sources/Tasks/PaidSubs.php
@@ -13,16 +13,16 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Admin\Subscriptions;
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Lang;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\Time;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Actions\Admin\Subscriptions;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Performs the standard checks on expiring/near expiring subscriptions.
@@ -37,28 +37,30 @@ class PaidSubs extends ScheduledTask
 	public function execute()
 	{
 		// Start off by checking for removed subscriptions.
-		$request = Db::$db->query('', '
-			SELECT id_subscribe, id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_subscribe, id_member
 			FROM {db_prefix}log_subscribed
 			WHERE status = {int:is_active}
 				AND end_time < {int:time_now}',
-			array(
+			[
 				'is_active' => 1,
 				'time_now' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			Subscriptions::remove($row['id_subscribe'], $row['id_member']);
 		}
 		Db::$db->free_result($request);
 
 		// Get all those about to expire that have not had a reminder sent.
-		$subs_reminded = array();
-		$members = array();
+		$subs_reminded = [];
+		$members = [];
 
-		$request = Db::$db->query('', '
-			SELECT ls.id_sublog, m.id_member, m.member_name, m.email_address, m.lngfile, s.name, ls.end_time
+		$request = Db::$db->query(
+			'',
+			'SELECT ls.id_sublog, m.id_member, m.member_name, m.email_address, m.lngfile, s.name, ls.end_time
 			FROM {db_prefix}log_subscribed AS ls
 				JOIN {db_prefix}subscriptions AS s ON (s.id_subscribe = ls.id_subscribe)
 				JOIN {db_prefix}members AS m ON (m.id_member = ls.id_member)
@@ -66,18 +68,17 @@ public function execute()
 				AND ls.reminder_sent = {int:reminder_sent}
 				AND s.reminder > {int:reminder_wanted}
 				AND ls.end_time < ({int:time_now} + s.reminder * 86400)',
-			array(
+			[
 				'is_active' => 1,
 				'reminder_sent' => 0,
 				'reminder_wanted' => 0,
 				'time_now' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// If this is the first one load the important bits.
-			if (empty($subs_reminded))
-			{
+			if (empty($subs_reminded)) {
 				// Need the below for loadLanguage to work!
 				Theme::loadEssential();
 			}
@@ -89,28 +90,25 @@ public function execute()
 
 		// Load alert preferences
 		$notifyPrefs = Notify::getNotifyPrefs(array_keys($members), 'paidsubs_expiring', true);
-		$alert_rows = array();
+		$alert_rows = [];
 
-		foreach ($members as $row)
-		{
-			$replacements = array(
+		foreach ($members as $row) {
+			$replacements = [
 				'PROFILE_LINK' => Config::$scripturl . '?action=profile;area=subscriptions;u=' . $row['id_member'],
 				'REALNAME' => $row['member_name'],
 				'SUBSCRIPTION' => $row['name'],
 				'END_DATE' => strip_tags(Time::create('@' . $row['end_time'])->format()),
-			);
+			];
 
 			$emaildata = Mail::loadEmailTemplate('paid_subscription_reminder', $replacements, empty($row['lngfile']) || empty(Config::$modSettings['userLanguage']) ? Lang::$default : $row['lngfile']);
 
 			// Send the actual email.
-			if ($notifyPrefs[$row['id_member']] & self::RECEIVE_NOTIFY_EMAIL)
-			{
+			if ($notifyPrefs[$row['id_member']] & self::RECEIVE_NOTIFY_EMAIL) {
 				Mail::send($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
 			}
 
-			if ($notifyPrefs[$row['id_member']] & self::RECEIVE_NOTIFY_ALERT)
-			{
-				$alert_rows[] = array(
+			if ($notifyPrefs[$row['id_member']] & self::RECEIVE_NOTIFY_ALERT) {
+				$alert_rows[] = [
 					'alert_time' => time(),
 					'id_member' => $row['id_member'],
 					'id_member_started' => $row['id_member'],
@@ -119,29 +117,30 @@ public function execute()
 					'content_id' => $row['id_sublog'],
 					'content_action' => 'expiring',
 					'is_read' => 0,
-					'extra' => Utils::jsonEncode(array(
+					'extra' => Utils::jsonEncode([
 						'subscription_name' => $row['name'],
 						'end_time' => $row['end_time'],
-					)),
-				);
+					]),
+				];
 			}
 		}
 
 		// Insert the alerts if any
-		if (!empty($alert_rows))
+		if (!empty($alert_rows)) {
 			Alert::createBatch($alert_rows);
+		}
 
 		// Mark the reminder as sent.
-		if (!empty($subs_reminded))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_subscribed
+		if (!empty($subs_reminded)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_subscribed
 				SET reminder_sent = {int:reminder_sent}
 				WHERE id_sublog IN ({array_int:subscription_list})',
-				array(
+				[
 					'subscription_list' => $subs_reminded,
 					'reminder_sent' => 1,
-				)
+				],
 			);
 		}
 
diff --git a/Sources/tasks/PruneLogTopics.php b/Sources/Tasks/PruneLogTopics.php
similarity index 79%
rename from Sources/tasks/PruneLogTopics.php
rename to Sources/Tasks/PruneLogTopics.php
index 4ae54fe3e0..c369b21517 100644
--- a/Sources/tasks/PruneLogTopics.php
+++ b/Sources/Tasks/PruneLogTopics.php
@@ -33,9 +33,9 @@ class PruneLogTopics extends ScheduledTask
 	public function execute()
 	{
 		// If set to zero, bypass.
-		if (empty(Config::$modSettings['mark_read_max_users']) || (empty(Config::$modSettings['mark_read_beyond']) && empty(Config::$modSettings['mark_read_delete_beyond'])))
-		{
+		if (empty(Config::$modSettings['mark_read_max_users']) || (empty(Config::$modSettings['mark_read_beyond']) && empty(Config::$modSettings['mark_read_delete_beyond']))) {
 			$this->should_log = false;
+
 			return true;
 		}
 
@@ -47,19 +47,22 @@ public function execute()
 		$max_members = Config::$modSettings['mark_read_max_users'];
 
 		// You're basically saying to just purge, so just purge.
-		if ($mark_read_cutoff < $cleanup_beyond)
+		if ($mark_read_cutoff < $cleanup_beyond) {
 			$mark_read_cutoff = $cleanup_beyond;
+		}
 
 		// Try to prevent timeouts
 		@set_time_limit(300);
 
-		if (function_exists('apache_reset_timeout'))
+		if (function_exists('apache_reset_timeout')) {
 			@apache_reset_timeout();
+		}
 
 		// Start off by finding the records in log_boards, log_topics & log_mark_read
 		// for users who haven't been around the longest...
-		$request = Db::$db->query('', '
-			SELECT lb.id_member, m.last_login
+		$request = Db::$db->query(
+			'',
+			'SELECT lb.id_member, m.last_login
 				FROM {db_prefix}members m
 				INNER JOIN
 				(
@@ -88,72 +91,68 @@ public function execute()
 				WHERE m.last_login <= {int:mrcutoff}
 			ORDER BY last_login
 			LIMIT {int:limit}',
-			array(
+			[
 				'limit' => $max_members,
 				'dcutoff' => $cleanup_beyond,
 				'mrcutoff' => $mark_read_cutoff,
 				'unwatched' => 0,
-			)
+			],
 		);
 		$members = Db::$db->fetch_all($request);
 		Db::$db->free_result($request);
 
 		// Nothing to do?
-		if (empty($members))
-		{
+		if (empty($members)) {
 			return true;
 		}
 
 		// Determine action based on last_login...
-		$purge_members = array();
-		$mark_read_members = array();
+		$purge_members = [];
+		$mark_read_members = [];
 
-		foreach($members as $member)
-		{
-			if ($member['last_login'] <= $cleanup_beyond)
-			{
+		foreach($members as $member) {
+			if ($member['last_login'] <= $cleanup_beyond) {
 				$purge_members[] = $member['id_member'];
-			}
-			elseif ($member['last_login'] <= $mark_read_cutoff)
-			{
+			} elseif ($member['last_login'] <= $mark_read_cutoff) {
 				$mark_read_members[] = $member['id_member'];
 			}
 		}
 
-		if (!empty($purge_members) && !empty(Config::$modSettings['mark_read_delete_beyond']))
-		{
+		if (!empty($purge_members) && !empty(Config::$modSettings['mark_read_delete_beyond'])) {
 			// Delete rows from log_boards.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_boards
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_boards
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $purge_members,
-				)
+				],
 			);
 			// Delete rows from log_mark_read.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_mark_read
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_mark_read
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $purge_members,
-				)
+				],
 			);
 
 			// Delete rows from log_topics.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_topics
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_topics
 				WHERE id_member IN ({array_int:members})
 					AND unwatched = {int:unwatched}',
-				array(
+				[
 					'members' => $purge_members,
 					'unwatched' => 0,
-				)
+				],
 			);
 		}
 
 		// Nothing left to do?
-		if (empty($mark_read_members) || empty(Config::$modSettings['mark_read_beyond']))
-		{
+		if (empty($mark_read_members) || empty(Config::$modSettings['mark_read_beyond'])) {
 			return true;
 		}
 
@@ -161,8 +160,9 @@ public function execute()
 		// Get board info for each member from log_topics.
 		// Note this user may have read many topics on that board, but we just
 		// want one row each, and the ID of the last message read in each board.
-		$result = Db::$db->query('', '
-			SELECT lt.id_member, t.id_board, MAX(lt.id_msg) AS id_last_message
+		$result = Db::$db->query(
+			'',
+			'SELECT lt.id_member, t.id_board, MAX(lt.id_msg) AS id_last_message
 			FROM {db_prefix}topics t
 			INNER JOIN
 			(
@@ -171,33 +171,34 @@ public function execute()
 				WHERE id_member IN ({array_int:members})
 			) lt ON t.id_topic = lt.id_topic
 			GROUP BY lt.id_member, t.id_board',
-			array(
+			[
 				'members' => $mark_read_members,
-			)
+			],
 		);
 		$boards = Db::$db->fetch_all($result);
 		Db::$db->free_result($result);
 
 		// Create one SQL statement for this set of inserts.
-		if (!empty($boards))
-		{
-			Db::$db->insert('replace',
+		if (!empty($boards)) {
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_mark_read',
-				array('id_member' => 'int', 'id_board' => 'int', 'id_msg' => 'int'),
+				['id_member' => 'int', 'id_board' => 'int', 'id_msg' => 'int'],
 				$boards,
-				array('id_member', 'id_board')
+				['id_member', 'id_board'],
 			);
 		}
 
 		// Finally, delete this set's rows from log_topics.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_topics
 			WHERE id_member IN ({array_int:members})
 				AND unwatched = {int:unwatched}',
-			array(
+			[
 				'members' => $mark_read_members,
 				'unwatched' => 0,
-			)
+			],
 		);
 
 		return true;
diff --git a/Sources/tasks/Register_Notify.php b/Sources/Tasks/Register_Notify.php
similarity index 78%
rename from Sources/tasks/Register_Notify.php
rename to Sources/Tasks/Register_Notify.php
index c60cb49c5f..d1e0a3bda7 100644
--- a/Sources/tasks/Register_Notify.php
+++ b/Sources/Tasks/Register_Notify.php
@@ -13,14 +13,13 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Alert;
 use SMF\Config;
-use SMF\Msg;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\User;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * This class contains code used to notify people when a new member new signs up.
@@ -42,27 +41,27 @@ public function execute()
 		$prefs = Notify::getNotifyPrefs($members, 'member_register', true);
 
 		// So now we find out who wants what.
-		$alert_bits = array(
+		$alert_bits = [
 			'alert' => self::RECEIVE_NOTIFY_ALERT,
 			'email' => self::RECEIVE_NOTIFY_EMAIL,
-		);
-		$notifies = array();
+		];
+		$notifies = [];
 
-		foreach ($prefs as $member => $pref_option)
-		{
-			foreach ($alert_bits as $type => $bitvalue)
-				if ($pref_option['member_register'] & $bitvalue)
+		foreach ($prefs as $member => $pref_option) {
+			foreach ($alert_bits as $type => $bitvalue) {
+				if ($pref_option['member_register'] & $bitvalue) {
 					$notifies[$type][] = $member;
+				}
+			}
 		}
 
 		// Firstly, anyone who wants alerts.
-		if (!empty($notifies['alert']))
-		{
+		if (!empty($notifies['alert'])) {
 			// Alerts are relatively easy.
-			$insert_rows = array();
-			foreach ($notifies['alert'] as $member)
-			{
-				$insert_rows[] = array(
+			$insert_rows = [];
+
+			foreach ($notifies['alert'] as $member) {
+				$insert_rows[] = [
 					'alert_time' => $this->_details['time'],
 					'id_member' => $member,
 					'id_member_started' => $this->_details['new_member_id'],
@@ -72,48 +71,47 @@ public function execute()
 					'content_action' => 'register_' . $this->_details['notify_type'],
 					'is_read' => 0,
 					'extra' => '',
-				);
+				];
 			}
 
 			Alert::createBatch($insert_rows);
 		}
 
 		// Secondly, anyone who wants emails.
-		if (!empty($notifies['email']))
-		{
+		if (!empty($notifies['email'])) {
 			// Emails are a bit complicated. We have to do language stuff.
 			Theme::loadEssential();
 
 			// First, get everyone's language and details.
-			$emails = array();
-			$request = Db::$db->query('', '
-				SELECT id_member, lngfile, email_address
+			$emails = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_member, lngfile, email_address
 				FROM {db_prefix}members
 				WHERE id_member IN ({array_int:members})',
-				array(
+				[
 					'members' => $notifies['email'],
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['lngfile']))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['lngfile'])) {
 					$row['lngfile'] = Config::$language;
+				}
 				$emails[$row['lngfile']][$row['id_member']] = $row['email_address'];
 			}
 			Db::$db->free_result($request);
 
 			// Second, iterate through each language, load the relevant templates and set up sending.
-			foreach ($emails as $this_lang => $recipients)
-			{
-				$replacements = array(
+			foreach ($emails as $this_lang => $recipients) {
+				$replacements = [
 					'USERNAME' => $this->_details['new_member_name'],
-					'PROFILELINK' => Config::$scripturl . '?action=profile;u=' . $this->_details['new_member_id']
-				);
+					'PROFILELINK' => Config::$scripturl . '?action=profile;u=' . $this->_details['new_member_id'],
+				];
 				$emailtype = 'admin_notify';
 
 				// If they need to be approved add more info...
-				if ($this->_details['notify_type'] == 'approval')
-				{
+				if ($this->_details['notify_type'] == 'approval') {
 					$replacements['APPROVALLINK'] = Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve';
 					$emailtype .= '_approval';
 				}
@@ -121,8 +119,9 @@ public function execute()
 				$emaildata = Mail::loadEmailTemplate($emailtype, $replacements, empty(Config::$modSettings['userLanguage']) ? Config::$language : $this_lang);
 
 				// And do the actual sending...
-				foreach ($recipients as $id_member => $email_address)
+				foreach ($recipients as $id_member => $email_address) {
 					Mail::send($email_address, $emaildata['subject'], $emaildata['body'], null, 'newmember' . $this->_details['new_member_id'], $emaildata['is_html'], 0);
+				}
 			}
 		}
 
diff --git a/Sources/tasks/RemoveOldDrafts.php b/Sources/Tasks/RemoveOldDrafts.php
similarity index 82%
rename from Sources/tasks/RemoveOldDrafts.php
rename to Sources/Tasks/RemoveOldDrafts.php
index 9a03f41225..3df2267690 100644
--- a/Sources/tasks/RemoveOldDrafts.php
+++ b/Sources/Tasks/RemoveOldDrafts.php
@@ -14,9 +14,9 @@
 namespace SMF\Tasks;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Draft;
 use SMF\Theme;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Check for old drafts and remove them.
@@ -30,35 +30,37 @@ class RemoveOldDrafts extends ScheduledTask
 	 */
 	public function execute()
 	{
-		if (empty(Config::$modSettings['drafts_keep_days']))
-		{
+		if (empty(Config::$modSettings['drafts_keep_days'])) {
 			$this->should_log = false;
+
 			return true;
 		}
 
-		$drafts = array();
+		$drafts = [];
 
 		// We need this for language items.
 		Theme::loadEssential();
 
 		// Find all of the old drafts.
-		$request = Db::$db->query('', '
-			SELECT id_draft
+		$request = Db::$db->query(
+			'',
+			'SELECT id_draft
 			FROM {db_prefix}user_drafts
 			WHERE poster_time <= {int:poster_time_old}',
-			array(
+			[
 				'poster_time_old' => time() - (86400 * Config::$modSettings['drafts_keep_days']),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_row($request))
-		{
+
+		while ($row = Db::$db->fetch_row($request)) {
 			$drafts[] = (int) $row[0];
 		}
 		Db::$db->free_result($request);
 
 		// If we have old ones, remove them.
-		if (count($drafts) > 0)
+		if (count($drafts) > 0) {
 			Draft::delete($drafts, false);
+		}
 
 		return true;
 	}
diff --git a/Sources/tasks/RemoveTempAttachments.php b/Sources/Tasks/RemoveTempAttachments.php
similarity index 77%
rename from Sources/tasks/RemoveTempAttachments.php
rename to Sources/Tasks/RemoveTempAttachments.php
index 1444e8e4c0..20ea48d771 100644
--- a/Sources/tasks/RemoveTempAttachments.php
+++ b/Sources/Tasks/RemoveTempAttachments.php
@@ -14,6 +14,7 @@
 namespace SMF\Tasks;
 
 use SMF\Config;
+use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Theme;
 use SMF\Utils;
@@ -31,27 +32,21 @@ class RemoveTempAttachments extends ScheduledTask
 	public function execute()
 	{
 		// We need to know where this thing is going.
-		if (!empty(Config::$modSettings['currentAttachmentUploadDir']))
-		{
-			if (!is_array(Config::$modSettings['attachmentUploadDir']))
-			{
+		if (!empty(Config::$modSettings['currentAttachmentUploadDir'])) {
+			if (!is_array(Config::$modSettings['attachmentUploadDir'])) {
 				Config::$modSettings['attachmentUploadDir'] = Utils::jsonDecode(Config::$modSettings['attachmentUploadDir'], true);
 			}
 
 			// Just use the current path for temp files.
 			$attach_dirs = Config::$modSettings['attachmentUploadDir'];
-		}
-		else
-		{
-			$attach_dirs = array(Config::$modSettings['attachmentUploadDir']);
+		} else {
+			$attach_dirs = [Config::$modSettings['attachmentUploadDir']];
 		}
 
-		foreach ($attach_dirs as $attach_dir)
-		{
+		foreach ($attach_dirs as $attach_dir) {
 			$dir = @opendir($attach_dir);
 
-			if (!$dir)
-			{
+			if (!$dir) {
 				Theme::loadEssential();
 				Lang::load('Post');
 
@@ -62,16 +57,16 @@ public function execute()
 				return true;
 			}
 
-			while ($file = readdir($dir))
-			{
-				if ($file == '.' || $file == '..')
+			while ($file = readdir($dir)) {
+				if ($file == '.' || $file == '..') {
 					continue;
+				}
 
-				if (strpos($file, 'post_tmp_') !== false)
-				{
+				if (strpos($file, 'post_tmp_') !== false) {
 					// Temp file is more than 5 hours old!
-					if (filemtime($attach_dir . '/' . $file) < time() - 18000)
+					if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
 						@unlink($attach_dir . '/' . $file);
+					}
 				}
 			}
 
diff --git a/Sources/tasks/RemoveTopicRedirects.php b/Sources/Tasks/RemoveTopicRedirects.php
similarity index 83%
rename from Sources/tasks/RemoveTopicRedirects.php
rename to Sources/Tasks/RemoveTopicRedirects.php
index 7c24590bd2..970eb8e285 100644
--- a/Sources/tasks/RemoveTopicRedirects.php
+++ b/Sources/Tasks/RemoveTopicRedirects.php
@@ -13,8 +13,7 @@
 
 namespace SMF\Tasks;
 
-use SMF\Config;
-use SMF\Lang;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Theme;
 use SMF\Topic;
 
@@ -30,30 +29,32 @@ class RemoveTopicRedirects extends ScheduledTask
 	 */
 	public function execute()
 	{
-		$topics = array();
+		$topics = [];
 
 		// We will need this for language files.
 		Theme::loadEssential();
 
 		// Find all of the old moved topic notices that were set to expire.
-		$request = Db::$db->query('', '
-			SELECT id_topic
+		$request = Db::$db->query(
+			'',
+			'SELECT id_topic
 			FROM {db_prefix}topics
 			WHERE redirect_expires <= {int:redirect_expires}
 				AND redirect_expires <> 0',
-			array(
+			[
 				'redirect_expires' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_row($request))
-		{
+
+		while ($row = Db::$db->fetch_row($request)) {
 			$topics[] = $row[0];
 		}
 		Db::$db->free_result($request);
 
 		// Zap, you're gone.
-		if (count($topics) > 0)
+		if (count($topics) > 0) {
 			Topic::remove($topics, false, true);
+		}
 
 		return true;
 	}
diff --git a/Sources/tasks/ScheduledTask.php b/Sources/Tasks/ScheduledTask.php
similarity index 85%
rename from Sources/tasks/ScheduledTask.php
rename to Sources/Tasks/ScheduledTask.php
index c1d3a7bae9..ceabe34615 100644
--- a/Sources/tasks/ScheduledTask.php
+++ b/Sources/Tasks/ScheduledTask.php
@@ -41,22 +41,24 @@ abstract class ScheduledTask extends BackgroundTask
 	 */
 	public function log(): void
 	{
-		if (!$this->should_log || !isset($this->_details['id_scheduled_task']))
+		if (!$this->should_log || !isset($this->_details['id_scheduled_task'])) {
 			return;
+		}
 
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}log_scheduled_tasks',
-			array(
+			[
 				'id_task' => 'int',
 				'time_run' => 'int',
 				'time_taken' => 'float',
-			),
-			array(
+			],
+			[
 				$this->_details['id_scheduled_task'],
 				time(),
 				round(microtime(true) - TIME_START, 3),
-			),
-			array()
+			],
+			[],
 		);
 	}
 
@@ -66,28 +68,27 @@ public function log(): void
 	public static function updateNextTaskTime(): void
 	{
 		// Get the next timestamp right.
-		$request = Db::$db->query('', '
-			SELECT next_time
+		$request = Db::$db->query(
+			'',
+			'SELECT next_time
 			FROM {db_prefix}scheduled_tasks
 			WHERE disabled = {int:not_disabled}
 			ORDER BY next_time ASC
 			LIMIT 1',
-			array(
+			[
 				'not_disabled' => 0,
-			)
+			],
 		);
+
 		// No new task scheduled yet?
-		if (Db::$db->num_rows($request) === 0)
-		{
+		if (Db::$db->num_rows($request) === 0) {
 			$next_task_time = time() + 86400;
-		}
-		else
-		{
+		} else {
 			list($next_task_time) = Db::$db->fetch_row($request);
 		}
 		Db::$db->free_result($request);
 
-		Config::updateModSettings(array('next_task_time' => $next_task_time));
+		Config::updateModSettings(['next_task_time' => $next_task_time]);
 	}
 }
 
diff --git a/Sources/tasks/SendDigests.php b/Sources/Tasks/SendDigests.php
similarity index 70%
rename from Sources/tasks/SendDigests.php
rename to Sources/Tasks/SendDigests.php
index c62d725a2b..e51704d7e3 100644
--- a/Sources/tasks/SendDigests.php
+++ b/Sources/Tasks/SendDigests.php
@@ -13,14 +13,14 @@
 
 namespace SMF\Tasks;
 
+use SMF\Actions\Notify;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Lang;
 use SMF\Mail;
 use SMF\Theme;
 use SMF\Utils;
-use SMF\Actions\Notify;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Send out a daily or weekly email of all subscribed topics.
@@ -39,32 +39,32 @@ public function execute()
 		$is_weekly = !empty($this->_details['is_weekly']) ? 1 : 0;
 
 		// Right - get all the notification data FIRST.
-		$members = array();
-		$langs = array();
-		$notify = array();
+		$members = [];
+		$langs = [];
+		$notify = [];
 
-		$request = Db::$db->query('', '
-			SELECT ln.id_topic, COALESCE(t.id_board, ln.id_board) AS id_board, mem.email_address, mem.member_name,
+		$request = Db::$db->query(
+			'',
+			'SELECT ln.id_topic, COALESCE(t.id_board, ln.id_board) AS id_board, mem.email_address, mem.member_name,
 				mem.lngfile, mem.id_member
 			FROM {db_prefix}log_notify AS ln
 				JOIN {db_prefix}members AS mem ON (mem.id_member = ln.id_member)
 				LEFT JOIN {db_prefix}topics AS t ON (ln.id_topic != {int:empty_topic} AND t.id_topic = ln.id_topic)
 			WHERE mem.is_activated = {int:is_activated}',
-			array(
+			[
 				'empty_topic' => 0,
 				'is_activated' => 1,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset($members[$row['id_member']]))
-			{
-				$members[$row['id_member']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset($members[$row['id_member']])) {
+				$members[$row['id_member']] = [
 					'email' => $row['email_address'],
 					'name' => $row['member_name'],
 					'id' => $row['id_member'],
 					'lang' => $row['lngfile'],
-				);
+				];
 
 				$langs[$row['lngfile']] = $row['lngfile'];
 			}
@@ -72,43 +72,44 @@ public function execute()
 			// Store this useful data!
 			$boards[$row['id_board']] = $row['id_board'];
 
-			if ($row['id_topic'])
-			{
+			if ($row['id_topic']) {
 				$notify['topics'][$row['id_topic']][] = $row['id_member'];
-			}
-			else
-			{
+			} else {
 				$notify['boards'][$row['id_board']][] = $row['id_member'];
 			}
 		}
 		Db::$db->free_result($request);
 
-		if (empty($boards))
+		if (empty($boards)) {
 			return true;
+		}
 
 		// Just get the board names.
-		$request = Db::$db->query('', '
-			SELECT id_board, name
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, name
 			FROM {db_prefix}boards
 			WHERE id_board IN ({array_int:board_list})',
-			array(
+			[
 				'board_list' => $boards,
-			)
+			],
 		);
-		$boards = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+		$boards = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$boards[$row['id_board']] = $row['name'];
 		}
 		Db::$db->free_result($request);
 
-		if (empty($boards))
+		if (empty($boards)) {
 			return true;
+		}
 
 		// Get the actual topics...
-		$types = array();
-		$request = Db::$db->query('', '
-			SELECT ld.note_type, t.id_topic, t.id_board, t.id_member_started, m.id_msg, m.subject,
+		$types = [];
+		$request = Db::$db->query(
+			'',
+			'SELECT ld.note_type, t.id_topic, t.id_board, t.id_member_started, m.id_msg, m.subject,
 				b.name AS board_name
 			FROM {db_prefix}log_digest AS ld
 				JOIN {db_prefix}topics AS t ON (t.id_topic = ld.id_topic
@@ -116,83 +117,71 @@ public function execute()
 				JOIN {db_prefix}messages AS m ON (m.id_msg = t.id_first_msg)
 				JOIN {db_prefix}boards AS b ON (b.id_board = t.id_board)
 			WHERE ' . ($is_weekly ? 'ld.daily != {int:daily_value}' : 'ld.daily IN (0, 2)'),
-			array(
+			[
 				'board_list' => array_keys($boards),
 				'daily_value' => 2,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset($types[$row['note_type']][$row['id_board']]))
-			{
-				$types[$row['note_type']][$row['id_board']] = array(
-					'lines' => array(),
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset($types[$row['note_type']][$row['id_board']])) {
+				$types[$row['note_type']][$row['id_board']] = [
+					'lines' => [],
 					'name' => $row['board_name'],
 					'id' => $row['id_board'],
-				);
+				];
 			}
 
-			if ($row['note_type'] == 'reply')
-			{
-				if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				{
+			if ($row['note_type'] == 'reply') {
+				if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
 					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
-				}
-				else
-				{
-					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+				} else {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = [
 						'id' => $row['id_topic'],
 						'subject' => Utils::htmlspecialcharsDecode($row['subject']),
 						'count' => 1,
-					);
+					];
 				}
-			}
-			elseif ($row['note_type'] == 'topic')
-			{
-				if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				{
-					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			} elseif ($row['note_type'] == 'topic') {
+				if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = [
 						'id' => $row['id_topic'],
 						'subject' => Utils::htmlspecialcharsDecode($row['subject']),
-					);
+					];
 				}
-			}
-			elseif (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-			{
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			} elseif (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = [
 					'id' => $row['id_topic'],
 					'subject' => Utils::htmlspecialcharsDecode($row['subject']),
 					'starter' => $row['id_member_started'],
-				);
+				];
 			}
 
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array();
+			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = [];
 
-			if (!empty($notify['topics'][$row['id_topic']]))
-			{
+			if (!empty($notify['topics'][$row['id_topic']])) {
 				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
 			}
 
-			if (!empty($notify['boards'][$row['id_board']]))
-			{
+			if (!empty($notify['boards'][$row['id_board']])) {
 				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
 			}
 		}
 		Db::$db->free_result($request);
 
-		if (empty($types))
+		if (empty($types)) {
 			return true;
+		}
 
 		// Let's load all the languages into a cache thingy.
-		$langtxt = array();
+		$langtxt = [];
 
-		foreach ($langs as $lang)
-		{
+		foreach ($langs as $lang) {
 			Lang::load('Post', $lang);
 			Lang::load('index', $lang);
 			Lang::load('EmailTemplates', $lang);
 
-			$langtxt[$lang] = array(
+			$langtxt[$lang] = [
 				'subject' => Lang::$txt['digest_subject_' . ($is_weekly ? 'weekly' : 'daily')],
 				'char_set' => Lang::$txt['lang_character_set'],
 				'intro' => sprintf(Lang::$txt['digest_intro_' . ($is_weekly ? 'weekly' : 'daily')], Config::$mbname),
@@ -210,26 +199,24 @@ public function execute()
 				'merge' => Lang::$txt['digest_mod_act_merge'],
 				'split' => Lang::$txt['digest_mod_act_split'],
 				'bye' => sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name']),
-			);
+			];
 
-			IntegrationHook::call('integrate_daily_digest_lang', array(&$langtxt, $lang));
+			IntegrationHook::call('integrate_daily_digest_lang', [&$langtxt, $lang]);
 		}
 
 		// The preferred way...
-		$prefs = Notify::getNotifyPrefs(array_keys($members), array('msg_notify_type', 'msg_notify_pref'), true);
+		$prefs = Notify::getNotifyPrefs(array_keys($members), ['msg_notify_type', 'msg_notify_pref'], true);
 
 		// Right - send out the silly things - this will take quite some space!
-		$members_sent = array();
+		$members_sent = [];
 
-		foreach ($members as $mid => $member)
-		{
-			$frequency = isset($prefs[$mid]['msg_notify_pref']) ? $prefs[$mid]['msg_notify_pref'] : 0;
+		foreach ($members as $mid => $member) {
+			$frequency = $prefs[$mid]['msg_notify_pref'] ?? 0;
 
 			$notify_types = !empty($prefs[$mid]['msg_notify_type']) ? $prefs[$mid]['msg_notify_type'] : 1;
 
 			// Did they not elect to choose this?
-			if ($frequency < 3 || $frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4)
-			{
+			if ($frequency < 3 || $frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4) {
 				continue;
 			}
 
@@ -237,25 +224,20 @@ public function execute()
 			Utils::$context['character_set'] = empty(Config::$modSettings['global_character_set']) ? $langtxt[$lang]['char_set'] : Config::$modSettings['global_character_set'];
 
 			// Do the start stuff!
-			$email = array(
+			$email = [
 				'subject' => Config::$mbname . ' - ' . $langtxt[$lang]['subject'],
 				'body' => $member['name'] . ',' . "\n\n" . $langtxt[$lang]['intro'] . "\n" . Config::$scripturl . '?action=profile;area=notification;u=' . $member['id'] . "\n",
 				'email' => $member['email'],
-			);
+			];
 
 			// All new topics?
-			if (isset($types['topic']))
-			{
+			if (isset($types['topic'])) {
 				$titled = false;
 
-				foreach ($types['topic'] as $id => $board)
-				{
-					foreach ($board['lines'] as $topic)
-					{
-						if (in_array($mid, $topic['members']))
-						{
-							if (!$titled)
-							{
+				foreach ($types['topic'] as $id => $board) {
+					foreach ($board['lines'] as $topic) {
+						if (in_array($mid, $topic['members'])) {
+							if (!$titled) {
 								$email['body'] .= "\n" . $langtxt[$lang]['new_topics'] . ':' . "\n" . '-----------------------------------------------';
 								$titled = true;
 							}
@@ -265,23 +247,19 @@ public function execute()
 					}
 				}
 
-				if ($titled)
+				if ($titled) {
 					$email['body'] .= "\n";
+				}
 			}
 
 			// What about replies?
-			if (isset($types['reply']))
-			{
+			if (isset($types['reply'])) {
 				$titled = false;
 
-				foreach ($types['reply'] as $id => $board)
-				{
-					foreach ($board['lines'] as $topic)
-					{
-						if (in_array($mid, $topic['members']))
-						{
-							if (!$titled)
-							{
+				foreach ($types['reply'] as $id => $board) {
+					foreach ($board['lines'] as $topic) {
+						if (in_array($mid, $topic['members'])) {
+							if (!$titled) {
 								$email['body'] .= "\n" . $langtxt[$lang]['new_replies'] . ':' . "\n" . '-----------------------------------------------';
 								$titled = true;
 							}
@@ -291,28 +269,24 @@ public function execute()
 					}
 				}
 
-				if ($titled)
+				if ($titled) {
 					$email['body'] .= "\n";
+				}
 			}
 
 			// Finally, moderation actions!
-			if ($notify_types < 3)
-			{
+			if ($notify_types < 3) {
 				$titled = false;
 
-				foreach ($types as $note_type => $type)
-				{
-					if ($note_type == 'topic' || $note_type == 'reply')
+				foreach ($types as $note_type => $type) {
+					if ($note_type == 'topic' || $note_type == 'reply') {
 						continue;
+					}
 
-					foreach ($type as $id => $board)
-					{
-						foreach ($board['lines'] as $topic)
-						{
-							if (in_array($mid, $topic['members']))
-							{
-								if (!$titled)
-								{
+					foreach ($type as $id => $board) {
+						foreach ($board['lines'] as $topic) {
+							if (in_array($mid, $topic['members'])) {
+								if (!$titled) {
 									$email['body'] .= "\n" . $langtxt[$lang]['mod_actions'] . ':' . "\n" . '-----------------------------------------------';
 									$titled = true;
 								}
@@ -324,10 +298,11 @@ public function execute()
 				}
 			}
 
-			IntegrationHook::call('integrate_daily_digest_email', array(&$email, $types, $notify_types, $langtxt));
+			IntegrationHook::call('integrate_daily_digest_email', [&$email, $types, $notify_types, $langtxt]);
 
-			if ($titled)
+			if ($titled) {
 				$email['body'] .= "\n";
+			}
 
 			// Then just say our goodbyes!
 			$email['body'] .= "\n\n" . sprintf(Lang::$txt['regards_team'], Utils::$context['forum_name']);
@@ -339,59 +314,60 @@ public function execute()
 		}
 
 		// Clean up...
-		if ($is_weekly)
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_digest
+		if ($is_weekly) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_digest
 				WHERE daily != {int:not_daily}',
-				array(
+				[
 					'not_daily' => 0,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_digest
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_digest
 				SET daily = {int:daily_value}
 				WHERE daily = {int:not_daily}',
-				array(
+				[
 					'daily_value' => 2,
 					'not_daily' => 0,
-				)
+				],
 			);
-		}
-		else
-		{
+		} else {
 			// Clear any only weekly ones, and stop us from sending daily again.
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_digest
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_digest
 				WHERE daily = {int:daily_value}',
-				array(
+				[
 					'daily_value' => 2,
-				)
+				],
 			);
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_digest
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_digest
 				SET daily = {int:both_value}
 				WHERE daily = {int:no_value}',
-				array(
+				[
 					'both_value' => 1,
 					'no_value' => 0,
-				)
+				],
 			);
 		}
 
 		// Just in case the member changes their settings mark this as sent.
-		if (!empty($members_sent))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_notify
+		if (!empty($members_sent)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_notify
 				SET sent = {int:is_sent}
 				WHERE id_member IN ({array_int:member_list})',
-				array(
+				[
 					'member_list' => $members_sent,
 					'is_sent' => 1,
-				)
+				],
 			);
 		}
 
diff --git a/Sources/tasks/UpdateTldRegex.php b/Sources/Tasks/UpdateTldRegex.php
similarity index 99%
rename from Sources/tasks/UpdateTldRegex.php
rename to Sources/Tasks/UpdateTldRegex.php
index a591784129..69b0cb72e8 100644
--- a/Sources/tasks/UpdateTldRegex.php
+++ b/Sources/Tasks/UpdateTldRegex.php
@@ -29,6 +29,7 @@ class UpdateTldRegex extends BackgroundTask
 	public function execute()
 	{
 		Url::setTldRegex(true);
+
 		return true;
 	}
 }
diff --git a/Sources/tasks/UpdateUnicode.php b/Sources/Tasks/UpdateUnicode.php
similarity index 69%
rename from Sources/tasks/UpdateUnicode.php
rename to Sources/Tasks/UpdateUnicode.php
index bd1b6317f2..ede0ae9a19 100644
--- a/Sources/tasks/UpdateUnicode.php
+++ b/Sources/Tasks/UpdateUnicode.php
@@ -14,11 +14,11 @@
 namespace SMF\Tasks;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\TaskRunner;
 use SMF\Utils;
-use SMF\DatabaseApi as Db;
 use SMF\WebFetch\WebFetchApi;
 
 /**
@@ -29,8 +29,8 @@ class UpdateUnicode extends BackgroundTask
 	/**
 	 * URLs where we can fetch the Unicode data files.
 	 */
-	const DATA_URL_UCD = 'https://unicode.org/Public/UCD/latest/ucd';
-	const DATA_URL_IDNA = 'https://www.unicode.org/Public/idna/latest';
+	public const DATA_URL_UCD = 'https://unicode.org/Public/UCD/latest/ucd';
+	public const DATA_URL_IDNA = 'https://www.unicode.org/Public/idna/latest';
 
 	/**
 	 * @var string The latest official release of the Unicode Character Database.
@@ -55,194 +55,194 @@ class UpdateUnicode extends BackgroundTask
 	/**
 	 * @var array Key-value pairs of character decompositions.
 	 */
-	private $full_decomposition_maps = array();
+	private $full_decomposition_maps = [];
 
 	/**
 	 * @var array Character properties used during normalization.
 	 */
-	private $derived_normalization_props = array();
+	private $derived_normalization_props = [];
 
 	/**
 	 * @var array Assorted info about Unicode characters.
 	 */
-	private $char_data = array();
+	private $char_data = [];
 
 	/**
 	 * @var array Statistical info about character scripts (e.g. Latin, Greek, Cyrillic, etc.)
 	 */
-	private $script_stats = array();
+	private $script_stats = [];
 
 	/**
 	 * @var array Tracks associations between character scripts' short and long names.
 	 */
-	private $script_aliases = array();
+	private $script_aliases = [];
 
 	/**
 	 * @var array Info about functions to build in SMF's Unicode data files.
 	 */
-	private $funcs = array(
-		array(
+	private $funcs = [
+		[
 			'file' => 'Metadata.php',
-			'regex' => '/if \(!defined\(\'SMF_UNICODE_VERSION\'\)\)\n\tdefine\(\'SMF_UNICODE_VERSION\', \'\d+(\.\d+)*\'\);/',
-			'data' => array(
+			'regex' => '/if \(!defined\(\'SMF_UNICODE_VERSION\'\)\)(?:\s*{)?\n\tdefine\(\'SMF_UNICODE_VERSION\', \'\d+(\.\d+)*\'\);(?:\n})?/',
+			'data' => [
 				// 0.0.0.0 will be replaced with correct value at runtime.
-				"if (!defined('SMF_UNICODE_VERSION'))\n\tdefine('SMF_UNICODE_VERSION', '0.0.0.0');",
-			),
-		),
-		'utf8_normalize_d_maps' => array(
+				"if (!defined('SMF_UNICODE_VERSION')) {\n\tdefine('SMF_UNICODE_VERSION', '0.0.0.0');\n}",
+			],
+		],
+		'utf8_normalize_d_maps' => [
 			'file' => 'DecompositionCanonical.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_normalize_d.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_normalize_d.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Canonical Decomposition maps for Unicode normalization.',
-			),
-			'data' => array(),
-		),
-		'utf8_normalize_kd_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_normalize_kd_maps' => [
 			'file' => 'DecompositionCompatibility.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_normalize_kd.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_normalize_kd.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Compatibility Decomposition maps for Unicode normalization.',
-			),
-			'data' => array(),
-		),
-		'utf8_compose_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_compose_maps' => [
 			'file' => 'Composition.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_compose.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_compose.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Composition maps for Unicode normalization.',
-			),
-			'data' => array(),
-		),
-		'utf8_combining_classes' => array(
+			],
+			'data' => [],
+		],
+		'utf8_combining_classes' => [
 			'file' => 'CombiningClasses.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'int',
-			'desc' => array('Helper function for utf8_normalize_d.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_normalize_d.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Combining Class data for Unicode normalization.',
-			),
-			'data' => array(),
-		),
-		'utf8_strtolower_simple_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_strtolower_simple_maps' => [
 			'file' => 'CaseLower.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_strtolower.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_strtolower.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Uppercase to lowercase maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_strtolower_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_strtolower_maps' => [
 			'file' => 'CaseLower.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_strtolower.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_strtolower.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Uppercase to lowercase maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_strtoupper_simple_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_strtoupper_simple_maps' => [
 			'file' => 'CaseUpper.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_strtoupper.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_strtoupper.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Lowercase to uppercase maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_strtoupper_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_strtoupper_maps' => [
 			'file' => 'CaseUpper.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_strtoupper.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_strtoupper.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Lowercase to uppercase maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_titlecase_simple_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_titlecase_simple_maps' => [
 			'file' => 'CaseTitle.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_convert_case.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_convert_case.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Simple title case maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_titlecase_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_titlecase_maps' => [
 			'file' => 'CaseTitle.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_convert_case.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_convert_case.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Full title case maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_casefold_simple_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_casefold_simple_maps' => [
 			'file' => 'CaseFold.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_casefold.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_casefold.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Casefolding maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_casefold_maps' => array(
+			],
+			'data' => [],
+		],
+		'utf8_casefold_maps' => [
 			'file' => 'CaseFold.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_casefold.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_casefold.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Casefolding maps.',
-			),
-			'data' => array(),
-		),
-		'utf8_default_ignorables' => array(
+			],
+			'data' => [],
+		],
+		'utf8_default_ignorables' => [
 			'file' => 'DefaultIgnorables.php',
 			'key_type' => 'int',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for utf8_normalize_kc_casefold.'),
-			'return' => array(
+			'desc' => ['Helper function for utf8_normalize_kc_casefold.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Characters with the \'Default_Ignorable_Code_Point\' property.',
-			),
-			'data' => array(),
-		),
-		'utf8_regex_properties' => array(
+			],
+			'data' => [],
+		],
+		'utf8_regex_properties' => [
 			'file' => 'RegularExpressions.php',
 			'key_type' => 'string',
 			'val_type' => 'string',
-			'propfiles' => array(
+			'propfiles' => [
 				'DerivedCoreProperties.txt',
 				'PropList.txt',
 				'emoji/emoji-data.txt',
 				'extracted/DerivedGeneralCategory.txt',
-			),
-			'props' => array(
+			],
+			'props' => [
 				'Bidi_Control',
 				'Case_Ignorable',
 				'Cn',
@@ -253,8 +253,8 @@ class UpdateUnicode extends BackgroundTask
 				'Join_Control',
 				'Regional_Indicator',
 				'Variation_Selector',
-			),
-			'desc' => array(
+			],
+			'desc' => [
 				'Helper function for utf8_sanitize_invisibles and utf8_convert_case.',
 				'',
 				'Character class lists compiled from:',
@@ -262,130 +262,130 @@ class UpdateUnicode extends BackgroundTask
 				'https://unicode.org/Public/UNIDATA/PropList.txt',
 				'https://unicode.org/Public/UNIDATA/emoji/emoji-data.txt',
 				'https://unicode.org/Public/UNIDATA/extracted/DerivedGeneralCategory.txt',
-			),
-			'return' => array(
+			],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Character classes for various Unicode properties.',
-			),
-			'data' => array(),
-		),
-		'utf8_regex_variation_selectors' => array(
+			],
+			'data' => [],
+		],
+		'utf8_regex_variation_selectors' => [
 			'file' => 'RegularExpressions.php',
 			'key_type' => 'string',
 			'val_type' => 'string',
-			'desc' => array(
+			'desc' => [
 				'Helper function for utf8_sanitize_invisibles.',
 				'',
 				'Character class lists compiled from:',
 				'https://unicode.org/Public/UNIDATA/StandardizedVariants.txt',
 				'https://unicode.org/Public/UNIDATA/emoji/emoji-variation-sequences.txt',
-			),
-			'return' => array(
+			],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Character classes for filtering variation selectors.',
-			),
-			'data' => array(),
-		),
-		'utf8_regex_joining_type' => array(
+			],
+			'data' => [],
+		],
+		'utf8_regex_joining_type' => [
 			'file' => 'RegularExpressions.php',
 			'key_type' => 'string',
 			'val_type' => 'string',
-			'desc' => array(
+			'desc' => [
 				'Helper function for utf8_sanitize_invisibles.',
 				'',
 				'Character class lists compiled from:',
 				'https://unicode.org/Public/UNIDATA/extracted/DerivedJoiningType.txt',
-			),
-			'return' => array(
+			],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Character classes for joining characters in certain scripts.',
-			),
-			'data' => array(),
-		),
-		'utf8_regex_indic' => array(
+			],
+			'data' => [],
+		],
+		'utf8_regex_indic' => [
 			'file' => 'RegularExpressions.php',
 			'key_type' => 'string',
 			'val_type' => 'string',
-			'desc' => array(
+			'desc' => [
 				'Helper function for utf8_sanitize_invisibles.',
 				'',
 				'Character class lists compiled from:',
 				'https://unicode.org/Public/UNIDATA/extracted/DerivedCombiningClass.txt',
 				'https://unicode.org/Public/UNIDATA/IndicSyllabicCategory.txt',
-			),
-			'return' => array(
+			],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Character classes for Indic scripts that use viramas.',
-			),
-			'data' => array(),
-		),
-		'utf8_regex_quick_check' => array(
+			],
+			'data' => [],
+		],
+		'utf8_regex_quick_check' => [
 			'file' => 'QuickCheck.php',
 			'key_type' => 'string',
 			'val_type' => 'string',
-			'desc' => array(
+			'desc' => [
 				'Helper function for utf8_is_normalized.',
 				'',
 				'Character class lists compiled from:',
 				'https://unicode.org/Public/UNIDATA/extracted/DerivedNormalizationProps.txt',
-			),
-			'return' => array(
+			],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Character classes for disallowed characters in normalization forms.',
-			),
-			'data' => array(),
-		),
-		'idna_maps' => array(
+			],
+			'data' => [],
+		],
+		'idna_maps' => [
 			'file' => 'Idna.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for idn_to_* polyfills.'),
-			'return' => array(
+			'desc' => ['Helper function for idn_to_* polyfills.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Character maps for IDNA processing.',
-			),
-			'data' => array(),
-		),
-		'idna_maps_deviation' => array(
+			],
+			'data' => [],
+		],
+		'idna_maps_deviation' => [
 			'file' => 'Idna.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for idn_to_* polyfills.'),
-			'return' => array(
+			'desc' => ['Helper function for idn_to_* polyfills.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => '"Deviation" character maps for IDNA processing.',
-			),
-			'data' => array(),
-		),
-		'idna_maps_not_std3' => array(
+			],
+			'data' => [],
+		],
+		'idna_maps_not_std3' => [
 			'file' => 'Idna.php',
 			'key_type' => 'hexchar',
 			'val_type' => 'hexchar',
-			'desc' => array('Helper function for idn_to_* polyfills.'),
-			'return' => array(
+			'desc' => ['Helper function for idn_to_* polyfills.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Non-STD3 character maps for IDNA processing.',
-			),
-			'data' => array(),
-		),
-		'idna_regex' => array(
+			],
+			'data' => [],
+		],
+		'idna_regex' => [
 			'file' => 'Idna.php',
 			'key_type' => 'string',
 			'val_type' => 'string',
-			'desc' => array('Helper function for idn_to_* polyfills.'),
-			'return' => array(
+			'desc' => ['Helper function for idn_to_* polyfills.'],
+			'return' => [
 				'type' => 'array',
 				'desc' => 'Regular expressions useful for IDNA processing.',
-			),
-			'data' => array(),
-		),
-	);
+			],
+			'data' => [],
+		],
+	];
 
 	/**
 	 * @var array Files to fetch from unicode.org.
 	 */
-	private $prefetch = array(
-		self::DATA_URL_UCD => array(
+	private $prefetch = [
+		self::DATA_URL_UCD => [
 			'CaseFolding.txt',
 			'DerivedAge.txt',
 			'DerivedCoreProperties.txt',
@@ -402,11 +402,11 @@ class UpdateUnicode extends BackgroundTask
 			'emoji/emoji-variation-sequences.txt',
 			'extracted/DerivedGeneralCategory.txt',
 			'extracted/DerivedJoiningType.txt',
-		),
-		self::DATA_URL_IDNA => array(
+		],
+		self::DATA_URL_IDNA => [
 			'IdnaMappingTable.txt',
-		),
-	);
+		],
+	];
 
 	/**
 	 * This executes the task.
@@ -423,13 +423,14 @@ public function execute()
 		// We need a temporary directory to hold our files while we work on them.
 		$this->make_temp_dir();
 
-		if (empty($this->temp_dir))
+		if (empty($this->temp_dir)) {
 			return true;
+		}
 
 		// Do we even need to update?
-		if (!$this->should_update())
-		{
+		if (!$this->should_update()) {
 			$this->deltree($this->temp_dir);
+
 			return true;
 		}
 
@@ -437,51 +438,47 @@ public function execute()
 
 		$this->time_limit = (empty(ini_get('max_execution_time')) || @set_time_limit(TaskRunner::MAX_CLAIM_THRESHOLD) !== false) ? TaskRunner::MAX_CLAIM_THRESHOLD : ini_get('max_execution_time');
 
-		foreach ($this->funcs as $func_name => &$func_info)
-		{
-			$file_paths['final'] = implode(DIRECTORY_SEPARATOR, array($this->unicodedir, $func_info['file']));
+		foreach ($this->funcs as $func_name => &$func_info) {
+			$file_paths['final'] = implode(DIRECTORY_SEPARATOR, [$this->unicodedir, $func_info['file']]);
 
-			if (!file_exists($file_paths['final']))
+			if (!file_exists($file_paths['final'])) {
 				touch($file_paths['final']);
+			}
 
-			if (!is_file($file_paths['final']) || !Utils::makeWritable($file_paths['final']))
-			{
+			if (!is_file($file_paths['final']) || !Utils::makeWritable($file_paths['final'])) {
 				Lang::load('Errors');
 				ErrorHandler::log(sprintf(Lang::$txt['unicode_update_failed'], $this->unicodedir));
+
 				return true;
 			}
 
-			$file_paths['temp'] = implode(DIRECTORY_SEPARATOR, array($this->temp_dir, $func_info['file']));
+			$file_paths['temp'] = implode(DIRECTORY_SEPARATOR, [$this->temp_dir, $func_info['file']]);
 
-			if (!file_exists($file_paths['temp']))
+			if (!file_exists($file_paths['temp'])) {
 				touch($file_paths['temp']);
+			}
 
-			if (!is_file($file_paths['temp']) || !Utils::makeWritable($file_paths['temp']))
-			{
+			if (!is_file($file_paths['temp']) || !Utils::makeWritable($file_paths['temp'])) {
 				Lang::load('Errors');
 				ErrorHandler::log(sprintf(Lang::$txt['unicode_update_failed'], $this->temp_dir));
+
 				return true;
 			}
 
 			$file_contents['temp'] = file_get_contents($file_paths['temp']);
 
-			if (empty($file_contents['temp']) || strpos($file_contents['temp'], 'namespace SMF\\Unicode;') === false)
-			{
+			if (empty($file_contents['temp']) || strpos($file_contents['temp'], 'namespace SMF\\Unicode;') === false) {
 				file_put_contents($file_paths['temp'], $this->smf_file_header());
-			}
-			elseif (substr($file_contents['temp'], -2) === '?' . '>')
-			{
+			} elseif (substr($file_contents['temp'], -2) === '?' . '>') {
 				file_put_contents($file_paths['temp'], substr($file_contents['temp'], 0, -2));
 			}
 		}
 
 		// Prefetch the files in case the network is slow.
-		foreach ($this->prefetch as $data_url => $files)
-		{
+		foreach ($this->prefetch as $data_url => $files) {
 			$max_fetch_time = 0;
 
-			foreach ($files as $filename)
-			{
+			foreach ($files as $filename) {
 				$fetch_start = microtime(true);
 
 				$local_file = $this->fetch_unicode_file($filename, $data_url);
@@ -489,23 +486,21 @@ public function execute()
 				$max_fetch_time = max($max_fetch_time, microtime(true) - $fetch_start);
 
 				// If prefetch is taking a really long time, pause and try again later.
-				if ($local_file === false || microtime(true) - TIME_START >= $this->time_limit - $max_fetch_time)
-				{
-					Db::$db->insert('',
+				if ($local_file === false || microtime(true) - TIME_START >= $this->time_limit - $max_fetch_time) {
+					Db::$db->insert(
+						'',
 						'{db_prefix}background_tasks',
-						array(
-							'task_file' => 'string',
+						[
 							'task_class' => 'string',
 							'task_data' => 'string',
 							'claimed_time' => 'int',
-						),
-						array(
-							'$sourcedir/tasks/UpdateUnicode.php',
-							'Update_Unicode',
+						],
+						[
+							'SMF\\Tasks\\Update_Unicode',
 							'',
 							time() - MAX_CLAIM_THRESHOLD,
-						),
-						array('id_task')
+						],
+						['id_task'],
 					);
 
 					return true;
@@ -524,7 +519,7 @@ public function execute()
 		$success = $this->process_casing_data() & $success;
 		$success = $this->finalize_decomposition_forms() & $success;
 
-		$this->full_decomposition_maps = array();
+		$this->full_decomposition_maps = [];
 
 		$this->export_funcs_to_file();
 
@@ -533,7 +528,7 @@ public function execute()
 		 ***********************************/
 		$success = $this->build_quick_check() & $success;
 
-		$this->derived_normalization_props = array();
+		$this->derived_normalization_props = [];
 
 		$success = $this->build_regex_properties() & $success;
 		$success = $this->build_regex_variation_selectors() & $success;
@@ -555,17 +550,16 @@ public function execute()
 		/*******************
 		 * Part 5: Wrapup. *
 		 *******************/
-		if ($success)
-		{
-			$done_files = array();
+		if ($success) {
+			$done_files = [];
 
-			foreach ($this->funcs as $func_name => $func_info)
-			{
+			foreach ($this->funcs as $func_name => $func_info) {
 				$file_paths['temp'] = $this->temp_dir . DIRECTORY_SEPARATOR . $func_info['file'];
 				$file_paths['real'] = $this->unicodedir . DIRECTORY_SEPARATOR . $func_info['file'];
 
-				if (in_array($file_paths['temp'], $done_files))
+				if (in_array($file_paths['temp'], $done_files)) {
 					continue;
+				}
 
 				// Add closing PHP tag to the temp file.
 				file_put_contents($file_paths['temp'], '?' . '>', FILE_APPEND);
@@ -573,18 +567,17 @@ public function execute()
 				$done_files[] = $file_paths['temp'];
 
 				// Only move if the file has changed, discounting the license block.
-				foreach (array('temp', 'real') as $f)
-				{
-					if (file_exists($file_paths[$f]))
-					{
+				foreach (['temp', 'real'] as $f) {
+					if (file_exists($file_paths[$f])) {
 						$file_contents[$f] = preg_replace('~/\*\*.*?@package\h+SMF\b.*?\*/~s', '', file_get_contents($file_paths[$f]));
-					}
-					else
+					} else {
 						$file_contents[$f] = '';
+					}
 				}
 
-				if ($file_contents['temp'] !== $file_contents['real'])
+				if ($file_contents['temp'] !== $file_contents['real']) {
 					rename($file_paths['temp'], $file_paths['real']);
+				}
 			}
 		}
 
@@ -601,16 +594,17 @@ public function execute()
 	 */
 	private function make_temp_dir()
 	{
-		if (empty($this->temp_dir))
-		{
+		if (empty($this->temp_dir)) {
 			$this->temp_dir = rtrim(Config::getTempDir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'Unicode';
 
-			if (!is_dir($this->temp_dir))
+			if (!is_dir($this->temp_dir)) {
 				@mkdir($this->temp_dir);
+			}
 
 			// Needs to be a writable directory.
-			if (!is_dir($this->temp_dir) || !Utils::makeWritable($this->temp_dir))
+			if (!is_dir($this->temp_dir) || !Utils::makeWritable($this->temp_dir)) {
 				$this->temp_dir = null;
+			}
 		}
 	}
 
@@ -627,11 +621,10 @@ private function make_temp_dir()
 	private function fetch_unicode_file($filename, $data_url)
 	{
 		$filename = ltrim($filename, '\\/');
-		$file_url_name = strtr($filename, array('\\' => '/'));
-		$file_local_name = strtr($filename, array('\\' => DIRECTORY_SEPARATOR, '/' => DIRECTORY_SEPARATOR));
+		$file_url_name = strtr($filename, ['\\' => '/']);
+		$file_local_name = strtr($filename, ['\\' => DIRECTORY_SEPARATOR, '/' => DIRECTORY_SEPARATOR]);
 
-		switch ($data_url)
-		{
+		switch ($data_url) {
 			case self::DATA_URL_IDNA:
 				$sub_dir = 'idna';
 				break;
@@ -641,23 +634,25 @@ private function fetch_unicode_file($filename, $data_url)
 				break;
 		}
 
-		$local_file = implode(DIRECTORY_SEPARATOR, array($this->temp_dir, $sub_dir, $file_local_name));
+		$local_file = implode(DIRECTORY_SEPARATOR, [$this->temp_dir, $sub_dir, $file_local_name]);
 
-		if (file_exists($local_file))
+		if (file_exists($local_file)) {
 			return $local_file;
+		}
 
-		if (!file_exists(dirname($local_file)))
-		{
+		if (!file_exists(dirname($local_file))) {
 			@mkdir(dirname($local_file), 0777, true);
 
-			if (!is_dir(dirname($local_file)))
+			if (!is_dir(dirname($local_file))) {
 				return false;
+			}
 		}
 
 		$file_contents = WebFetchApi::fetch($data_url . '/' . $file_url_name);
 
-		if (empty($file_contents))
+		if (empty($file_contents)) {
 			return false;
+		}
 
 		file_put_contents($local_file, $file_contents);
 
@@ -672,25 +667,29 @@ private function fetch_unicode_file($filename, $data_url)
 	private function deltree($dir_path)
 	{
 		// For safety.
-		if (strpos($dir_path, $this->temp_dir) !== 0)
+		if (strpos($dir_path, $this->temp_dir) !== 0) {
 			return;
+		}
 
 		$dir = new \DirectoryIterator($dir_path);
 
-		$to_delete = array();
-		foreach ($dir as $fileinfo)
-		{
-			if ($fileinfo->isDot())
+		$to_delete = [];
+
+		foreach ($dir as $fileinfo) {
+			if ($fileinfo->isDot()) {
 				continue;
+			}
 
-			if ($fileinfo->isDir())
+			if ($fileinfo->isDir()) {
 				$this->deltree($fileinfo->getPathname());
-			else
+			} else {
 				$to_delete[] = $fileinfo->getPathname();
+			}
 		}
 
-		foreach ($to_delete as $pathname)
+		foreach ($to_delete as $pathname) {
 			unlink($pathname);
+		}
 
 		rmdir($dir_path);
 	}
@@ -704,33 +703,37 @@ private function smf_file_header()
 	{
 		static $file_template;
 
-		if (!empty($file_template))
+		if (!empty($file_template)) {
 			return $file_template;
+		}
 
 		$settings_defs = Config::getSettingsDefs();
 
 		$license_block = '';
 
 		$keep_line = true;
-		foreach (explode("\n", $settings_defs[0]['text']) as $line)
-		{
-			if (strpos($line, 'SMF') !== false || strpos($line, 'Simple Machines') !== false)
+
+		foreach (explode("\n", $settings_defs[0]['text']) as $line) {
+			if (strpos($line, 'SMF') !== false || strpos($line, 'Simple Machines') !== false) {
 				$keep_line = true;
+			}
 
-			if ($keep_line)
+			if ($keep_line) {
 				$license_block .= $line . "\n";
+			}
 
-			if ($line === '/**')
+			if ($line === '/**') {
 				$keep_line = false;
+			}
 		}
 
-		$file_template = implode("\n\n", array(
+		$file_template = implode("\n\n", [
 			'<' . '?php',
 			trim($license_block),
 			'namespace SMF\\Unicode;',
-			"if (!defined('SMF'))\n\tdie('No direct access...');",
+			"if (!defined('SMF')) {\n\tdie('No direct access...');\n}",
 			'',
-		));
+		]);
 
 		return $file_template;
 	}
@@ -738,12 +741,12 @@ private function smf_file_header()
 	/**
 	 * Updates Unicode data functions in their designated files.
 	 */
-	function export_funcs_to_file()
+	public function export_funcs_to_file()
 	{
-		foreach ($this->funcs as $func_name => $func_info)
-		{
-			if (empty($func_info['data']))
+		foreach ($this->funcs as $func_name => $func_info) {
+			if (empty($func_info['data'])) {
 				continue;
+			}
 
 			$temp_file_path = $this->temp_dir . '/' . $func_info['file'];
 
@@ -751,18 +754,16 @@ function export_funcs_to_file()
 
 			$file_contents = file_get_contents($temp_file_path);
 
-			if (preg_match($func_regex, $file_contents))
-			{
+			if (preg_match($func_regex, $file_contents)) {
 				file_put_contents($temp_file_path, preg_replace($func_regex, $func_code, $file_contents));
-			}
-			else
-			{
+			} else {
 				file_put_contents($temp_file_path, $func_code . "\n\n", FILE_APPEND);
 			}
 
 			// Free up some memory.
-			if ($func_name != 'utf8_combining_classes')
+			if ($func_name != 'utf8_combining_classes') {
 				unset($this->funcs[$func_name]['data']);
+			}
 		}
 	}
 
@@ -779,57 +780,54 @@ function export_funcs_to_file()
 	private function get_function_code_and_regex($func_name)
 	{
 		// No function name means data is raw code.
-		if (!is_string($func_name))
-		{
+		if (!is_string($func_name)) {
 			$func_code = implode("\n\n", $this->funcs[$func_name]['data']);
-			$func_regex = isset($this->funcs[$func_name]['regex']) ? $this->funcs[$func_name]['regex'] : '/' . preg_quote($func_code, '/') . '/';
-		}
-		else
-		{
+			$func_regex = $this->funcs[$func_name]['regex'] ?? '/' . preg_quote($func_code, '/') . '/';
+		} else {
 			// The regex to look for this function in the existing file content.
-			$func_regex = "/(\/\*([^*]|\*(?!\/))*\*\/\n)?function $func_name\(\)\n{.+?\n}/s";
+			$func_regex = '~(/\*([^*]|\*(?!/))*\*/\n)?function ' . $func_name . '\(\)\n{.+?\n}~s';
 
 			// The PHPDoc comment for this function.
 			$func_code = '/**' . implode("\n * ", array_merge(
-				array(''),
+				[''],
 				$this->funcs[$func_name]['desc'],
-				array(
+				[
 					'',
 					'Developers: Do not update the data in this function manually. Instead,',
 					'run "php -f other/update_unicode_data.php" on the command line.',
-				),
-				empty($this->funcs[$func_name]['return']) ? array() : array(
+				],
+				empty($this->funcs[$func_name]['return']) ? [] : [
 					'',
-					'@return ' . implode(' ', $this->funcs[$func_name]['return'])
-				)
+					'@return ' . implode(' ', $this->funcs[$func_name]['return']),
+				],
 			)) . "\n */\n";
 
 			// The code for this function.
-			$func_code .= implode("\n", array(
+			$func_code .= implode("\n", [
 				'function ' . $func_name . '()',
 				'{',
-				"\t" . 'return array(',
+				"\t" . 'return [',
 				'',
-			));
+			]);
 
 			$this->build_func_array(
 				$func_code,
 				$this->funcs[$func_name]['data'],
 				$this->funcs[$func_name]['key_type'],
-				$this->funcs[$func_name]['val_type']
+				$this->funcs[$func_name]['val_type'],
 			);
 
-			$func_code .= implode("\n", array(
-				"\t" . ');',
+			$func_code .= implode("\n", [
+				"\t" . '];',
 				'}',
-			));
+			]);
 		}
 
 		// Some final tidying.
-		$func_code = str_replace('\\\\x', '\x', $func_code);
+		$func_code = str_replace('""', "''", $func_code);
 		$func_code = preg_replace('/\h+$/m', '', $func_code);
 
-		return array($func_code, $func_regex);
+		return [$func_code, $func_regex];
 	}
 
 	/**
@@ -844,73 +842,57 @@ private function build_func_array(&$func_code, $data, $key_type, $val_type)
 	{
 		static $indent = 2;
 
-		foreach ($data as $key => $value)
-		{
+		foreach ($data as $key => $value) {
 			$func_code .= str_repeat("\t", $indent);
 
-			if ($key_type == 'hexchar')
-			{
+			if ($key_type == 'hexchar') {
 				$func_code .= '"';
 
-				$key = mb_decode_numericentity(str_replace(' ', '', $key), array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
+				$key = mb_decode_numericentity(str_replace(' ', '', $key), [0, 0x10FFFF, 0, 0xFFFFFF], 'UTF-8');
 
-				foreach (unpack('C*', $key) as $byte_value)
-				{
-					$func_code .= '\x' . strtoupper(dechex($byte_value));
+				foreach (unpack('C*', $key) as $byte_value) {
+					$func_code .= '\\x' . strtoupper(dechex($byte_value));
 				}
 
 				$func_code .= '" => ';
-			}
-			elseif ($key_type == 'string' && !is_int($key))
-			{
+			} elseif ($key_type == 'string' && !is_int($key)) {
 				$func_code .= var_export($key, true) . ' => ';
 			}
 
-			if (is_array($value))
-			{
-				if ($val_type == 'string' && count($value) === count($value, COUNT_RECURSIVE))
-				{
+			if (is_array($value)) {
+				if ($val_type == 'string' && count($value) === count($value, COUNT_RECURSIVE)) {
 					$nextline = "\n" . str_repeat("\t", $indent + 1);
 
 					$func_code = rtrim($func_code);
 
 					$func_code .= $nextline . implode(' .' . $nextline, array_map(
-						function ($v)
-						{
+						function ($v) {
 							return var_export($v, true);
 						},
-						$value
+						$value,
 					));
-				}
-				else
-				{
-					$func_code .= 'array(' . "\n";
+				} else {
+					$func_code .= '[' . "\n";
 
 					$indent++;
 					$this->build_func_array($func_code, $value, $key_type, $val_type);
 					$indent--;
 
-					$func_code .= str_repeat("\t", $indent) . ')';
+					$func_code .= str_repeat("\t", $indent) . ']';
 				}
-			}
-			elseif ($val_type == 'hexchar')
-			{
+			} elseif ($val_type == 'hexchar') {
 				$func_code .= '"';
 
-				$value = mb_decode_numericentity(str_replace(' ', '', $value), array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
-				foreach (unpack('C*', $value) as $byte_value)
-				{
-					$func_code .= '\x' . strtoupper(dechex($byte_value));
+				$value = mb_decode_numericentity(str_replace(' ', '', $value), [0, 0x10FFFF, 0, 0xFFFFFF], 'UTF-8');
+
+				foreach (unpack('C*', $value) as $byte_value) {
+					$func_code .= '\\x' . strtoupper(dechex($byte_value));
 				}
 
 				$func_code .= '"';
-			}
-			elseif ($val_type == 'string')
-			{
+			} elseif ($val_type == 'string') {
 				$func_code .= var_export($value, true);
-			}
-			else
-			{
+			} else {
 				$func_code .= $value;
 			}
 
@@ -928,12 +910,14 @@ private function should_update()
 		$this->lookup_ucd_version();
 
 		// We can't do anything if lookup failed.
-		if (empty($this->ucd_version))
+		if (empty($this->ucd_version)) {
 			return false;
+		}
 
 		// If this file is missing, force an update.
-		if (!@include_once($this->unicodedir . DIRECTORY_SEPARATOR . 'Metadata.php'))
+		if (!@include_once($this->unicodedir . DIRECTORY_SEPARATOR . 'Metadata.php')) {
 			return true;
+		}
 
 		return version_compare($this->ucd_version, SMF_UNICODE_VERSION, '>=');
 	}
@@ -943,28 +927,28 @@ private function should_update()
 	 */
 	private function lookup_ucd_version()
 	{
-		if (!empty($this->ucd_version))
+		if (!empty($this->ucd_version)) {
 			return true;
+		}
 
 		$local_file = $this->fetch_unicode_file('ReadMe.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
 		preg_match('/Version\s+(\d+(?:\.\d+)*)/', file_get_contents($local_file), $matches);
 
-		if (empty($matches[1]))
+		if (empty($matches[1])) {
 			return false;
+		}
 
 		$this->ucd_version = implode('.', array_pad(explode('.', $matches[1]), 4, '0'));
 
 		// Update this while we are at it.
-		foreach ($this->funcs as $func_name => &$func_info)
-		{
-			if ($func_info['file'] === 'Metadata.php')
-			{
+		foreach ($this->funcs as $func_name => &$func_info) {
+			if ($func_info['file'] === 'Metadata.php') {
 				$func_info['data'][0] = str_replace('0.0.0.0', $this->ucd_version, $func_info['data'][0]);
-
 				break;
 			}
 		}
@@ -980,37 +964,31 @@ private function process_derived_normalization_props()
 	{
 		$local_file = $this->fetch_unicode_file('DerivedNormalizationProps.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
-			if (!isset($this->derived_normalization_props[$fields[1]]))
-			{
-				$this->derived_normalization_props[$fields[1]] = array();
+			if (!isset($this->derived_normalization_props[$fields[1]])) {
+				$this->derived_normalization_props[$fields[1]] = [];
 			}
 
-			if (strpos($fields[0], '..') === false)
-			{
-				$entities = array('&#x' . $fields[0] . ';');
-			}
-			else
-			{
-				$entities = array();
+			if (strpos($fields[0], '..') === false) {
+				$entities = ['&#x' . $fields[0] . ';'];
+			} else {
+				$entities = [];
 
 				list($start, $end) = explode('..', $fields[0]);
 
@@ -1018,28 +996,23 @@ private function process_derived_normalization_props()
 				$ord_e = hexdec($end);
 
 				$ord = $ord_s;
-				while ($ord <= $ord_e)
-				{
+
+				while ($ord <= $ord_e) {
 					$entities[] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 				}
 			}
 
 			$value = '';
-			if (!isset($fields[2]))
-			{
+
+			if (!isset($fields[2])) {
 				$value = 'SAME';
-			}
-			elseif (in_array($fields[1], array('FC_NFKC', 'NFKC_CF')))
-			{
+			} elseif (in_array($fields[1], ['FC_NFKC', 'NFKC_CF'])) {
 				$value = trim($fields[2]) !== '' ? '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';' : '';
-			}
-			else
-			{
+			} else {
 				$value = $fields[2];
 			}
 
-			foreach ($entities as $entity)
-			{
+			foreach ($entities as $entity) {
 				$this->derived_normalization_props[$fields[1]][$entity] = $value === 'SAME' ? $entity : $value;
 			}
 		}
@@ -1056,46 +1029,40 @@ private function process_main_unicode_data()
 	{
 		$local_file = $this->fetch_unicode_file('UnicodeData.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
-			if (!empty($fields[3]))
-			{
+			if (!empty($fields[3])) {
 				$this->funcs['utf8_combining_classes']['data']['&#x' . $fields[0] . ';'] = $fields[3];
 			}
 
 			// Uppercase maps.
-			if ($fields[12] !== '')
-			{
+			if ($fields[12] !== '') {
 				$this->funcs['utf8_strtoupper_simple_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . $fields[12] . ';';
 			}
 
 			// Lowercase maps.
-			if ($fields[13] !== '')
-			{
+			if ($fields[13] !== '') {
 				$this->funcs['utf8_strtolower_simple_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . $fields[13] . ';';
 			}
 
 			// Titlecase maps, where different from uppercase maps.
-			if ($fields[14] !== '' && $fields[14] !== $fields[12])
-			{
+			if ($fields[14] !== '' && $fields[14] !== $fields[12]) {
 				$this->funcs['utf8_titlecase_simple_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . $fields[14] . ';';
 			}
 
 			// Remember this character's general category for later.
 			$this->char_data['&#x' . $fields[0] . ';']['General_Category'] = $fields[2];
 
-			if ($fields[5] === '')
-			{
+			if ($fields[5] === '') {
 				continue;
 			}
 
@@ -1103,8 +1070,7 @@ private function process_main_unicode_data()
 			$this->full_decomposition_maps['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim(strip_tags($fields[5]))) . ';';
 
 			// Just the canonical decompositions.
-			if (strpos($fields[5], '<') === false)
-			{
+			if (strpos($fields[5], '<') === false) {
 				$this->funcs['utf8_normalize_d_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', $fields[5]) . ';';
 			}
 		}
@@ -1126,36 +1092,32 @@ private function process_casing_data()
 		// Deal with the special casing data.
 		$local_file = $this->fetch_unicode_file('SpecialCasing.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
 			// Unconditional mappings.
 			// Note: conditional mappings need to be handled by more complex code.
-			if (empty($fields[4]))
-			{
+			if (empty($fields[4])) {
 				$this->funcs['utf8_strtolower_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[1])) . ';';
 
 				$this->funcs['utf8_strtoupper_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[3])) . ';';
 
 				// Titlecase only where different from uppercase.
-				if ($fields[3] !== $fields[2])
-				{
+				if ($fields[3] !== $fields[2]) {
 					$this->funcs['utf8_titlecase_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';';
 				}
 			}
@@ -1168,34 +1130,32 @@ private function process_casing_data()
 		// Deal with the case folding data.
 		$local_file = $this->fetch_unicode_file('CaseFolding.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
 			// Full casefolding.
-			if (in_array($fields[1], array('C', 'F')))
-			{
+			if (in_array($fields[1], ['C', 'F'])) {
 				$this->funcs['utf8_casefold_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';';
 			}
 
 			// Simple casefolding.
-			if (in_array($fields[1], array('C', 'S')))
+			if (in_array($fields[1], ['C', 'S'])) {
 				$this->funcs['utf8_casefold_simple_maps']['data']['&#x' . $fields[0] . ';'] = '&#x' . str_replace(' ', '; &#x', trim($fields[2])) . ';';
+			}
 		}
 
 		return true;
@@ -1212,17 +1172,15 @@ private function finalize_decomposition_forms()
 		// Iterate until we reach the final decomposition forms.
 		// First we do the compatibility decomposition forms.
 		$changed = true;
-		while ($changed)
-		{
-			$temp = array();
-			foreach ($this->full_decomposition_maps as $composed => $decomposed)
-			{
+
+		while ($changed) {
+			$temp = [];
+
+			foreach ($this->full_decomposition_maps as $composed => $decomposed) {
 				$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
 
-				foreach ($parts as $partnum => $hex)
-				{
-					if (isset($this->full_decomposition_maps[$hex]))
-					{
+				foreach ($parts as $partnum => $hex) {
+					if (isset($this->full_decomposition_maps[$hex])) {
 						$parts[$partnum] = $this->full_decomposition_maps[$hex];
 					}
 				}
@@ -1241,22 +1199,19 @@ private function finalize_decomposition_forms()
 		// Same as above, but using only canonical decompositions.
 		$changed = true;
 		$iteration = 0;
-		while ($changed)
-		{
-			$temp = array();
-			foreach ($this->funcs['utf8_normalize_d_maps']['data'] as $composed => $decomposed)
-			{
-				if ($iteration === 0 && !in_array($composed, $this->derived_normalization_props['Full_Composition_Exclusion']))
-				{
+
+		while ($changed) {
+			$temp = [];
+
+			foreach ($this->funcs['utf8_normalize_d_maps']['data'] as $composed => $decomposed) {
+				if ($iteration === 0 && !in_array($composed, $this->derived_normalization_props['Full_Composition_Exclusion'])) {
 					$this->funcs['utf8_compose_maps']['data'][$decomposed] = $composed;
 				}
 
 				$parts = strpos($decomposed, ' ') !== false ? explode(' ', $decomposed) : (array) $decomposed;
 
-				foreach ($parts as $partnum => $hex)
-				{
-					if (isset($this->funcs['utf8_normalize_d_maps']['data'][$hex]))
-					{
+				foreach ($parts as $partnum => $hex) {
+					if (isset($this->funcs['utf8_normalize_d_maps']['data'][$hex])) {
 						$parts[$partnum] = $this->funcs['utf8_normalize_d_maps']['data'][$hex];
 					}
 				}
@@ -1284,45 +1239,37 @@ private function finalize_decomposition_forms()
 	 */
 	private function build_quick_check()
 	{
-		foreach (array('NFC_QC', 'NFKC_QC', 'NFD_QC', 'NFKD_QC', 'Changes_When_NFKC_Casefolded') as $prop)
-		{
-			$current_range = array('start' => null, 'end' => null);
-			foreach ($this->derived_normalization_props[$prop] as $entity => $nm)
-			{
+		foreach (['NFC_QC', 'NFKC_QC', 'NFD_QC', 'NFKD_QC', 'Changes_When_NFKC_Casefolded'] as $prop) {
+			$current_range = ['start' => null, 'end' => null];
+
+			foreach ($this->derived_normalization_props[$prop] as $entity => $nm) {
 				$range_string = '';
 
 				$ord = hexdec(trim($entity, '&#x;'));
 
-				if (!isset($current_range['start']))
-				{
+				if (!isset($current_range['start'])) {
 					$current_range['start'] = $ord;
 				}
 
-				if (!isset($current_range['end']) || $ord == $current_range['end'] + 1)
-				{
+				if (!isset($current_range['end']) || $ord == $current_range['end'] + 1) {
 					$current_range['end'] = $ord;
-				}
-				else
-				{
+				} else {
 					$range_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-					if ($current_range['start'] != $current_range['end'])
-					{
+					if ($current_range['start'] != $current_range['end']) {
 						$range_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
 					}
 
-					$current_range = array('start' => $ord, 'end' => $ord);
+					$current_range = ['start' => $ord, 'end' => $ord];
 
 					$this->funcs['utf8_regex_quick_check']['data'][$prop][] = $range_string;
 				}
 			}
 
-			if (isset($current_range['start']))
-			{
+			if (isset($current_range['start'])) {
 				$range_string = '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-				if ($current_range['start'] != $current_range['end'])
-				{
+				if ($current_range['start'] != $current_range['end']) {
 					$range_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
 				}
 
@@ -1338,59 +1285,50 @@ private function build_quick_check()
 	 */
 	private function build_regex_properties()
 	{
-		foreach ($this->funcs['utf8_regex_properties']['propfiles'] as $filename)
-		{
+		foreach ($this->funcs['utf8_regex_properties']['propfiles'] as $filename) {
 			$local_file = $this->fetch_unicode_file($filename, self::DATA_URL_UCD);
 
-			if (empty($local_file))
+			if (empty($local_file)) {
 				return false;
+			}
 
-			foreach (file($local_file) as $line)
-			{
+			foreach (file($local_file) as $line) {
 				$line = substr($line, 0, strcspn($line, '#'));
 
-				if (strpos($line, ';') === false)
-				{
+				if (strpos($line, ';') === false) {
 					continue;
 				}
 
 				$fields = explode(';', $line);
 
-				foreach ($fields as $key => $value)
-				{
+				foreach ($fields as $key => $value) {
 					$fields[$key] = trim($value);
 				}
 
-				if (in_array($fields[1], $this->funcs['utf8_regex_properties']['props']))
-				{
-					if (!isset($this->funcs['utf8_regex_properties']['data'][$fields[1]]))
-					{
-						$this->funcs['utf8_regex_properties']['data'][$fields[1]] = array();
+				if (in_array($fields[1], $this->funcs['utf8_regex_properties']['props'])) {
+					if (!isset($this->funcs['utf8_regex_properties']['data'][$fields[1]])) {
+						$this->funcs['utf8_regex_properties']['data'][$fields[1]] = [];
 					}
 
 					$this->funcs['utf8_regex_properties']['data'][$fields[1]][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
 				}
 
 				// We also track 'Default_Ignorable_Code_Point' property in a separate array.
-				if ($fields[1] !== 'Default_Ignorable_Code_Point')
-				{
+				if ($fields[1] !== 'Default_Ignorable_Code_Point') {
 					continue;
 				}
 
-				if (strpos($fields[0], '..') === false)
-				{
+				if (strpos($fields[0], '..') === false) {
 					$this->funcs['utf8_default_ignorables']['data'][] = '&#x' . $fields[0] . ';';
-				}
-				else
-				{
+				} else {
 					list($start, $end) = explode('..', $fields[0]);
 
 					$ord_s = hexdec($start);
 					$ord_e = hexdec($end);
 
 					$ord = $ord_s;
-					while ($ord <= $ord_e)
-					{
+
+					while ($ord <= $ord_e) {
 						$this->funcs['utf8_default_ignorables']['data'][] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 					}
 				}
@@ -1407,28 +1345,25 @@ private function build_regex_properties()
 	 */
 	private function build_regex_variation_selectors()
 	{
-		$files = array('StandardizedVariants.txt', 'emoji/emoji-variation-sequences.txt');
+		$files = ['StandardizedVariants.txt', 'emoji/emoji-variation-sequences.txt'];
 
-		foreach ($files as $filename)
-		{
+		foreach ($files as $filename) {
 			$local_file = $this->fetch_unicode_file($filename, self::DATA_URL_UCD);
 
-			if (empty($local_file))
+			if (empty($local_file)) {
 				return false;
+			}
 
-			foreach (file($local_file) as $line)
-			{
+			foreach (file($local_file) as $line) {
 				$line = substr($line, 0, strcspn($line, '#'));
 
-				if (strpos($line, ';') === false)
-				{
+				if (strpos($line, ';') === false) {
 					continue;
 				}
 
 				$fields = explode(';', $line);
 
-				foreach ($fields as $key => $value)
-				{
+				foreach ($fields as $key => $value) {
 					$fields[$key] = trim($value);
 				}
 
@@ -1438,55 +1373,47 @@ private function build_regex_variation_selectors()
 			}
 		}
 
-		foreach ($this->funcs['utf8_regex_variation_selectors']['data'] as $variation_selector => $ords)
-		{
+		foreach ($this->funcs['utf8_regex_variation_selectors']['data'] as $variation_selector => $ords) {
 			$class_string = '';
 
-			$current_range = array('start' => null, 'end' => null);
-			foreach ($ords as $ord)
-			{
-				if (!isset($current_range['start']))
-				{
+			$current_range = ['start' => null, 'end' => null];
+
+			foreach ($ords as $ord) {
+				if (!isset($current_range['start'])) {
 					$current_range['start'] = $ord;
 				}
 
-				if (!isset($current_range['end']) || $ord == $current_range['end'] + 1)
-				{
+				if (!isset($current_range['end']) || $ord == $current_range['end'] + 1) {
 					$current_range['end'] = $ord;
+
 					continue;
 				}
-				else
-				{
-					$class_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-					if ($current_range['start'] != $current_range['end'])
-					{
-						$class_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
-					}
+				$class_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-					$current_range = array('start' => $ord, 'end' => $ord);
+				if ($current_range['start'] != $current_range['end']) {
+					$class_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
 				}
+
+				$current_range = ['start' => $ord, 'end' => $ord];
 			}
 
-			if (isset($current_range['start']))
-			{
+			if (isset($current_range['start'])) {
 				$class_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-				if ($current_range['start'] != $current_range['end'])
-				{
+				if ($current_range['start'] != $current_range['end']) {
 					$class_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
 				}
 			}
 
 			// As of Unicode 14.0, \x{FE0E} and \x{FE0F} work with identical ranges of base characters.
-			if (($identical = array_search($class_string, $this->funcs['utf8_regex_variation_selectors']['data'])) !== false)
-			{
+			if (($identical = array_search($class_string, $this->funcs['utf8_regex_variation_selectors']['data'])) !== false) {
 				unset(
 					$this->funcs['utf8_regex_variation_selectors']['data'][$identical],
 					$this->funcs['utf8_regex_variation_selectors']['data'][$variation_selector]
 				);
 
-				$compound_selector = array($identical, $variation_selector);
+				$compound_selector = [$identical, $variation_selector];
 				sort($compound_selector);
 
 				$variation_selector = implode('', $compound_selector);
@@ -1495,9 +1422,8 @@ private function build_regex_variation_selectors()
 			$this->funcs['utf8_regex_variation_selectors']['data'][$variation_selector] = $class_string;
 		}
 
-		foreach ($this->funcs['utf8_regex_variation_selectors']['data'] as $variation_selector => $class_string)
-		{
-			$this->funcs['utf8_regex_variation_selectors']['data'][$variation_selector] = preg_split('/(?<=})(?=\\\x{)/', $class_string);
+		foreach ($this->funcs['utf8_regex_variation_selectors']['data'] as $variation_selector => $class_string) {
+			$this->funcs['utf8_regex_variation_selectors']['data'][$variation_selector] = array_unique(preg_split('/(?<=})(?=\\\x{)/', $class_string));
 		}
 
 		krsort($this->funcs['utf8_regex_variation_selectors']['data']);
@@ -1512,27 +1438,24 @@ private function build_script_stats()
 	{
 		$local_file = $this->fetch_unicode_file('PropertyValueAliases.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
-			if ($fields[0] !== 'sc')
-			{
+			if ($fields[0] !== 'sc') {
 				continue;
 			}
 
@@ -1541,44 +1464,38 @@ private function build_script_stats()
 
 		$local_file = $this->fetch_unicode_file('Scripts.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
-			if (in_array($fields[1], array('Common', 'Inherited')))
-			{
+			if (in_array($fields[1], ['Common', 'Inherited'])) {
 				continue;
 			}
 
-			if (strpos($fields[0], '..') === false)
-			{
+			if (strpos($fields[0], '..') === false) {
 				$this->char_data['&#x' . $fields[0] . ';']['scripts'][] = $fields[1];
-			}
-			else
-			{
+			} else {
 				list($start, $end) = explode('..', $fields[0]);
 
 				$ord_s = hexdec($start);
 				$ord_e = hexdec($end);
 
 				$ord = $ord_s;
-				while ($ord <= $ord_e)
-				{
+
+				while ($ord <= $ord_e) {
 					$this->char_data['&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';']['scripts'][] = $fields[1];
 				}
 			}
@@ -1586,53 +1503,45 @@ private function build_script_stats()
 
 		$local_file = $this->fetch_unicode_file('ScriptExtensions.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
-			$char_scripts = array();
-			foreach (explode(' ', $fields[1]) as $alias)
-			{
-				if (!in_array($this->script_aliases[$alias], array('Common', 'Inherited')))
-				{
+			$char_scripts = [];
+
+			foreach (explode(' ', $fields[1]) as $alias) {
+				if (!in_array($this->script_aliases[$alias], ['Common', 'Inherited'])) {
 					$char_scripts[] = $this->script_aliases[$alias];
 				}
 			}
 
-			if (strpos($fields[0], '..') === false)
-			{
-				foreach ($char_scripts as $char_script)
-				{
+			if (strpos($fields[0], '..') === false) {
+				foreach ($char_scripts as $char_script) {
 					$this->char_data['&#x' . $fields[0] . ';']['scripts'][] = $char_script;
 				}
-			}
-			else
-			{
+			} else {
 				list($start, $end) = explode('..', $fields[0]);
 
 				$ord_s = hexdec($start);
 				$ord_e = hexdec($end);
 
 				$ord = $ord_s;
-				while ($ord <= $ord_e)
-				{
-					foreach ($char_scripts as $char_script)
-					{
+
+				while ($ord <= $ord_e) {
+					foreach ($char_scripts as $char_script) {
 						$this->char_data['&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';']['scripts'][] = $char_script;
 					}
 				}
@@ -1641,76 +1550,61 @@ private function build_script_stats()
 
 		$local_file = $this->fetch_unicode_file('DerivedAge.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
 			$fields[1] = (float) $fields[1];
 
-			if (strpos($fields[0], '..') === false)
-			{
+			if (strpos($fields[0], '..') === false) {
 				$entity = '&#x' . $fields[0] . ';';
 
-				if (empty($this->char_data[$entity]['scripts']))
-				{
+				if (empty($this->char_data[$entity]['scripts'])) {
 					continue;
 				}
 
-				foreach ($this->char_data[$entity]['scripts'] as $char_script)
-				{
-					if (!isset($this->script_stats[$char_script]))
-					{
+				foreach ($this->char_data[$entity]['scripts'] as $char_script) {
+					if (!isset($this->script_stats[$char_script])) {
 						$this->script_stats[$char_script]['age'] = (float) $fields[1];
 						$this->script_stats[$char_script]['count'] = 1;
-					}
-					else
-					{
+					} else {
 						$this->script_stats[$char_script]['age'] = min((float) $fields[1], $this->script_stats[$char_script]['age']);
 						$this->script_stats[$char_script]['count']++;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				list($start, $end) = explode('..', $fields[0]);
 
 				$ord_s = hexdec($start);
 				$ord_e = hexdec($end);
 
 				$ord = $ord_s;
-				while ($ord <= $ord_e)
-				{
+
+				while ($ord <= $ord_e) {
 					$entity = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 
-					if (empty($this->char_data[$entity]['scripts']))
-					{
+					if (empty($this->char_data[$entity]['scripts'])) {
 						continue;
 					}
 
-					foreach ($this->char_data[$entity]['scripts'] as $char_script)
-					{
-						if (!isset($this->script_stats[$char_script]))
-						{
+					foreach ($this->char_data[$entity]['scripts'] as $char_script) {
+						if (!isset($this->script_stats[$char_script])) {
 							$this->script_stats[$char_script]['age'] = $fields[1];
 							$this->script_stats[$char_script]['count'] = 1;
-						}
-						else
-						{
+						} else {
 							$this->script_stats[$char_script]['age'] = min($fields[1], $this->script_stats[$char_script]['age']);
 							$this->script_stats[$char_script]['count']++;
 						}
@@ -1730,27 +1624,24 @@ private function build_regex_joining_type()
 	{
 		$local_file = $this->fetch_unicode_file('extracted/DerivedJoiningType.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
-			switch ($fields[1])
-			{
+			switch ($fields[1]) {
 				case 'C':
 					$joining_type = 'Join_Causing';
 					break;
@@ -1776,58 +1667,48 @@ private function build_regex_joining_type()
 					break;
 			}
 
-			if (!isset($joining_type))
-			{
+			if (!isset($joining_type)) {
 				continue;
 			}
 
 			$entity = '&#x' . substr($fields[0], 0, strcspn($fields[0], '.')) . ';';
 
-			if (empty($this->char_data[$entity]['scripts']))
-			{
+			if (empty($this->char_data[$entity]['scripts'])) {
 				continue;
 			}
 
-			foreach ($this->char_data[$entity]['scripts'] as $char_script)
-			{
-				if (!isset($this->funcs['utf8_regex_joining_type']['data'][$char_script]['stats']))
-				{
+			foreach ($this->char_data[$entity]['scripts'] as $char_script) {
+				if (!isset($this->funcs['utf8_regex_joining_type']['data'][$char_script]['stats'])) {
 					$this->funcs['utf8_regex_joining_type']['data'][$char_script]['stats'] = $this->script_stats[$char_script];
 				}
 
-				if (!isset($this->funcs['utf8_regex_joining_type']['data'][$char_script][$joining_type]))
-				{
-					$this->funcs['utf8_regex_joining_type']['data'][$char_script][$joining_type] = array();
+				if (!isset($this->funcs['utf8_regex_joining_type']['data'][$char_script][$joining_type])) {
+					$this->funcs['utf8_regex_joining_type']['data'][$char_script][$joining_type] = [];
 				}
 
 				$this->funcs['utf8_regex_joining_type']['data'][$char_script][$joining_type][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
 			}
 		}
 		// This sort works decently well to ensure widely used scripts are ranked before rare scripts.
-		uasort($this->funcs['utf8_regex_joining_type']['data'], function ($a, $b)
-		{
-			if ($a['stats']['age'] == $b['stats']['age'])
-			{
+		uasort($this->funcs['utf8_regex_joining_type']['data'], function ($a, $b) {
+			if ($a['stats']['age'] == $b['stats']['age']) {
 				return $b['stats']['count'] - $a['stats']['count'];
 			}
-			else
-			{
-				return $a['stats']['age'] - $b['stats']['age'];
-			}
+
+			return $a['stats']['age'] - $b['stats']['age'];
 		});
-		foreach ($this->funcs['utf8_regex_joining_type']['data'] as $char_script => $joining_types)
-		{
+
+		foreach ($this->funcs['utf8_regex_joining_type']['data'] as $char_script => &$joining_types) {
 			unset($this->funcs['utf8_regex_joining_type']['data'][$char_script]['stats'], $joining_types['stats']);
 
 			// If the only joining type in this script is transparent, we don't care about it.
-			if (array_keys($joining_types) === array('Transparent'))
-			{
+			if (array_keys($joining_types) === ['Transparent']) {
 				unset($this->funcs['utf8_regex_joining_type']['data'][$char_script]);
+
 				continue;
 			}
 
-			foreach ($joining_types as $joining_type => $value)
-			{
+			foreach ($joining_types as $joining_type => &$value) {
 				sort($value);
 			}
 		}
@@ -1843,165 +1724,139 @@ private function build_regex_indic()
 	{
 		$local_file = $this->fetch_unicode_file('IndicSyllabicCategory.txt', self::DATA_URL_UCD);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = trim($value);
 			}
 
 			$insc = $fields[1];
 
-			if (!in_array($insc, array('Virama', 'Vowel_Dependent')))
-			{
+			if (!in_array($insc, ['Virama', 'Vowel_Dependent'])) {
 				continue;
 			}
 
 			$char_scripts = $this->char_data['&#x' . substr($fields[0], 0, strcspn($fields[0], '.')) . ';']['scripts'];
 
-			if (empty($char_scripts))
-			{
+			if (empty($char_scripts)) {
 				continue;
 			}
 
-			foreach ($char_scripts as $char_script)
-			{
-				if (!isset($this->funcs['utf8_regex_indic']['data'][$char_script]['stats']))
-				{
+			foreach ($char_scripts as $char_script) {
+				if (!isset($this->funcs['utf8_regex_indic']['data'][$char_script]['stats'])) {
 					$this->funcs['utf8_regex_indic']['data'][$char_script]['stats'] = $this->script_stats[$char_script];
 				}
 
-				if (!isset($this->funcs['utf8_regex_indic']['data'][$char_script][$insc]))
-				{
-					$this->funcs['utf8_regex_indic']['data'][$char_script][$insc] = array();
+				if (!isset($this->funcs['utf8_regex_indic']['data'][$char_script][$insc])) {
+					$this->funcs['utf8_regex_indic']['data'][$char_script][$insc] = [];
 				}
 
 				$this->funcs['utf8_regex_indic']['data'][$char_script][$insc][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
 			}
 		}
 		// Again, sort commonly used scripts before rare scripts.
-		uasort($this->funcs['utf8_regex_indic']['data'], function ($a, $b)
-		{
-			if ($a['stats']['age'] == $b['stats']['age'])
-			{
+		uasort($this->funcs['utf8_regex_indic']['data'], function ($a, $b) {
+			if ($a['stats']['age'] == $b['stats']['age']) {
 				return $b['stats']['count'] - $a['stats']['count'];
 			}
-			else
-			{
-				return $a['stats']['age'] - $b['stats']['age'];
-			}
+
+			return $a['stats']['age'] - $b['stats']['age'];
 		});
+
 		// We only want scripts with viramas.
-		foreach ($this->funcs['utf8_regex_indic']['data'] as $char_script => $inscs)
-		{
+		foreach ($this->funcs['utf8_regex_indic']['data'] as $char_script => $inscs) {
 			unset($this->funcs['utf8_regex_indic']['data'][$char_script]['stats'], $inscs['stats']);
 
-			if (!isset($inscs['Virama']))
-			{
+			if (!isset($inscs['Virama'])) {
 				unset($this->funcs['utf8_regex_indic']['data'][$char_script]);
+
 				continue;
 			}
 		}
+
 		// Now add some more classes that we need for each script.
-		foreach ($this->char_data as $entity => $info)
-		{
-			if (empty($info['scripts']))
-			{
+		foreach ($this->char_data as $entity => $info) {
+			if (empty($info['scripts'])) {
 				continue;
 			}
 
 			$ord = hexdec(trim($entity, '&#x;'));
 
-			foreach ($info['scripts'] as $char_script)
-			{
-				if (!isset($this->funcs['utf8_regex_indic']['data'][$char_script]))
-				{
+			foreach ($info['scripts'] as $char_script) {
+				if (!isset($this->funcs['utf8_regex_indic']['data'][$char_script])) {
 					continue;
 				}
 
 				$this->funcs['utf8_regex_indic']['data'][$char_script]['All'][] = $ord;
 
-				if (empty($info['General_Category']))
-				{
+				if (empty($info['General_Category'])) {
 					continue;
 				}
-				elseif ($info['General_Category'] == 'Mn')
-				{
+
+				if ($info['General_Category'] == 'Mn') {
 					$this->funcs['utf8_regex_indic']['data'][$char_script]['Nonspacing_Mark'][] = $ord;
 
-					if (!empty($this->funcs['utf8_combining_classes']['data'][$entity]))
-					{
+					if (!empty($this->funcs['utf8_combining_classes']['data'][$entity])) {
 						$this->funcs['utf8_regex_indic']['data'][$char_script]['Nonspacing_Combining_Mark'][] = $ord;
 					}
-				}
-				elseif (substr($info['General_Category'], 0, 1) == 'L')
-				{
+				} elseif (substr($info['General_Category'], 0, 1) == 'L') {
 					$this->funcs['utf8_regex_indic']['data'][$char_script]['Letter'][] = $ord;
 				}
 			}
 		}
-		foreach ($this->funcs['utf8_regex_indic']['data'] as $char_script => $inscs)
-		{
-			foreach ($inscs as $insc => $value)
-			{
+
+		foreach ($this->funcs['utf8_regex_indic']['data'] as $char_script => $inscs) {
+			foreach ($inscs as $insc => $value) {
 				sort($value);
 
-				if (!in_array($insc, array('All', 'Letter', 'Nonspacing_Mark', 'Nonspacing_Combining_Mark')))
-				{
+				if (!in_array($insc, ['All', 'Letter', 'Nonspacing_Mark', 'Nonspacing_Combining_Mark'])) {
 					continue;
 				}
 
 				$class_string = '';
 
-				$current_range = array('start' => null, 'end' => null);
-				foreach ($value as $ord)
-				{
-					if (!isset($current_range['start']))
-					{
+				$current_range = ['start' => null, 'end' => null];
+
+				foreach ($value as $ord) {
+					if (!isset($current_range['start'])) {
 						$current_range['start'] = $ord;
 					}
 
-					if (!isset($current_range['end']) || $ord == $current_range['end'] + 1)
-					{
+					if (!isset($current_range['end']) || $ord == $current_range['end'] + 1) {
 						$current_range['end'] = $ord;
+
 						continue;
 					}
-					else
-					{
-						$class_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-						if ($current_range['start'] != $current_range['end'])
-						{
-							$class_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
-						}
+					$class_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-						$current_range = array('start' => $ord, 'end' => $ord);
+					if ($current_range['start'] != $current_range['end']) {
+						$class_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
 					}
+
+					$current_range = ['start' => $ord, 'end' => $ord];
 				}
 
-				if (isset($current_range['start']))
-				{
+				if (isset($current_range['start'])) {
 					$class_string .= '\\x{' . strtoupper(sprintf('%04s', dechex($current_range['start']))) . '}';
 
-					if ($current_range['start'] != $current_range['end'])
-					{
+					if ($current_range['start'] != $current_range['end']) {
 						$class_string .= '-\\x{' . strtoupper(sprintf('%04s', dechex($current_range['end']))) . '}';
 					}
 				}
 
-				$this->funcs['utf8_regex_indic']['data'][$char_script][$insc] = preg_split('/(?<=})(?=\\\x{)/', $class_string);
+				$this->funcs['utf8_regex_indic']['data'][$char_script][$insc] = array_unique(preg_split('/(?<=})(?=\\\x{)/', $class_string));
 			}
 
 			ksort($this->funcs['utf8_regex_indic']['data'][$char_script]);
@@ -2017,32 +1872,27 @@ private function build_idna()
 	{
 		$local_file = $this->fetch_unicode_file('IdnaMappingTable.txt', self::DATA_URL_IDNA);
 
-		if (empty($local_file))
+		if (empty($local_file)) {
 			return false;
+		}
 
-		foreach (file($local_file) as $line)
-		{
+		foreach (file($local_file) as $line) {
 			$line = substr($line, 0, strcspn($line, '#'));
 
-			if (strpos($line, ';') === false)
-			{
+			if (strpos($line, ';') === false) {
 				continue;
 			}
 
 			$fields = explode(';', $line);
 
-			foreach ($fields as $key => $value)
-			{
+			foreach ($fields as $key => $value) {
 				$fields[$key] = preg_replace('/\b(0(?!\b))+/', '', trim($value));
 			}
 
-			if (strpos($fields[0], '..') === false)
-			{
-				$entities = array('&#x' . $fields[0] . ';');
-			}
-			else
-			{
-				$entities = array();
+			if (strpos($fields[0], '..') === false) {
+				$entities = ['&#x' . $fields[0] . ';'];
+			} else {
+				$entities = [];
 
 				list($start, $end) = explode('..', $fields[0]);
 
@@ -2050,44 +1900,37 @@ private function build_idna()
 				$ord_e = hexdec($end);
 
 				$ord = $ord_s;
-				while ($ord <= $ord_e)
-				{
+
+				while ($ord <= $ord_e) {
 					$entities[] = '&#x' . strtoupper(sprintf('%04s', dechex($ord++))) . ';';
 				}
 			}
 
-			if ($fields[1] === 'mapped')
-			{
-				foreach ($entities as $entity)
+			if ($fields[1] === 'mapped') {
+				foreach ($entities as $entity) {
 					$this->funcs['idna_maps']['data'][$entity] = $fields[2] === '' ? '' : '&#x' . str_replace(' ', '; &#x', $fields[2]) . ';';
-			}
-			elseif ($fields[1] === 'deviation')
-			{
-				foreach ($entities as $entity)
+				}
+			} elseif ($fields[1] === 'deviation') {
+				foreach ($entities as $entity) {
 					$this->funcs['idna_maps_deviation']['data'][$entity] = $fields[2] === '' ? '' : '&#x' . str_replace(' ', '; &#x', $fields[2]) . ';';
+				}
 
 				$this->funcs['idna_regex']['data']['deviation'][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
-			}
-			elseif ($fields[1] === 'ignored')
-			{
+			} elseif ($fields[1] === 'ignored') {
 				$this->funcs['idna_regex']['data']['ignored'][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
-			}
-			elseif ($fields[1] === 'disallowed')
-			{
-				if (in_array('&#xD800;', $entities))
+			} elseif ($fields[1] === 'disallowed') {
+				if (in_array('&#xD800;', $entities)) {
 					continue;
+				}
 
 				$this->funcs['idna_regex']['data']['disallowed'][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
-			}
-			elseif ($fields[1] === 'disallowed_STD3_mapped')
-			{
-				foreach ($entities as $entity)
+			} elseif ($fields[1] === 'disallowed_STD3_mapped') {
+				foreach ($entities as $entity) {
 					$this->funcs['idna_maps_not_std3']['data'][$entity] = $fields[2] === '' ? '' : '&#x' . str_replace(' ', '; &#x', $fields[2]) . ';';
+				}
 
 				$this->funcs['idna_regex']['data']['disallowed_std3'][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
-			}
-			elseif ($fields[1] === 'disallowed_STD3_valid')
-			{
+			} elseif ($fields[1] === 'disallowed_STD3_valid') {
 				$this->funcs['idna_regex']['data']['disallowed_std3'][] = '\\x{' . str_replace('..', '}-\\x{', $fields[0]) . '}';
 			}
 		}
diff --git a/Sources/tasks/WeeklyMaintenance.php b/Sources/Tasks/WeeklyMaintenance.php
similarity index 72%
rename from Sources/tasks/WeeklyMaintenance.php
rename to Sources/Tasks/WeeklyMaintenance.php
index aa0455b7a2..a0b79159aa 100644
--- a/Sources/tasks/WeeklyMaintenance.php
+++ b/Sources/Tasks/WeeklyMaintenance.php
@@ -13,11 +13,11 @@
 
 namespace SMF\Tasks;
 
+use SMF\Cache\CacheApi;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\Theme;
-use SMF\Cache\CacheApi;
-use SMF\Db\DatabaseApi as Db;
 
 /**
  * Does some weekly maintenance.
@@ -32,7 +32,7 @@ class WeeklyMaintenance extends ScheduledTask
 	public function execute()
 	{
 		// Delete some settings that needn't be set if they are otherwise empty.
-		$emptySettings = array(
+		$emptySettings = [
 			'warning_mute',
 			'warning_moderate',
 			'warning_watch',
@@ -49,221 +49,224 @@ public function execute()
 			'search_enable_captcha',
 			'search_floodcontrol_time',
 			'show_spider_online',
-		);
+		];
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}settings
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}settings
 			WHERE variable IN ({array_string:setting_list})
 				AND (value = {string:zero_value} OR value = {string:blank_value})',
-			array(
+			[
 				'zero_value' => '0',
 				'blank_value' => '',
 				'setting_list' => $emptySettings,
-			)
+			],
 		);
 
 		// Some settings we never want to keep; they are just there for temporary purposes.
-		$deleteAnywaySettings = array(
+		$deleteAnywaySettings = [
 			'attachment_full_notified',
-		);
+		];
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}settings
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}settings
 			WHERE variable IN ({array_string:setting_list})',
-			array(
+			[
 				'setting_list' => $deleteAnywaySettings,
-			)
+			],
 		);
 
 		// Ok should we prune the logs?
-		if (!empty(Config::$modSettings['pruningOptions']) && strpos(Config::$modSettings['pruningOptions'], ',') !== false)
-		{
+		if (!empty(Config::$modSettings['pruningOptions']) && strpos(Config::$modSettings['pruningOptions'], ',') !== false) {
 			list(Config::$modSettings['pruneErrorLog'], Config::$modSettings['pruneModLog'], Config::$modSettings['pruneBanLog'], Config::$modSettings['pruneReportLog'], Config::$modSettings['pruneScheduledTaskLog'], Config::$modSettings['pruneSpiderHitLog']) = explode(',', Config::$modSettings['pruningOptions']);
 
-			if (!empty(Config::$modSettings['pruneErrorLog']))
-			{
+			if (!empty(Config::$modSettings['pruneErrorLog'])) {
 				// Figure out when our cutoff time is. 1 day = 86400 seconds.
 				$t = time() - Config::$modSettings['pruneErrorLog'] * 86400;
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_errors
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_errors
 					WHERE log_time < {int:log_time}',
-					array(
+					[
 						'log_time' => $t,
-					)
+					],
 				);
 			}
 
-			if (!empty(Config::$modSettings['pruneModLog']))
-			{
+			if (!empty(Config::$modSettings['pruneModLog'])) {
 				// Figure out when our cutoff time is. 1 day = 86400 seconds.
 				$t = time() - Config::$modSettings['pruneModLog'] * 86400;
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_actions
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_actions
 					WHERE log_time < {int:log_time}
 						AND id_log = {int:moderation_log}',
-					array(
+					[
 						'log_time' => $t,
 						'moderation_log' => 1,
-					)
+					],
 				);
 			}
 
-			if (!empty(Config::$modSettings['pruneBanLog']))
-			{
+			if (!empty(Config::$modSettings['pruneBanLog'])) {
 				// Figure out when our cutoff time is. 1 day = 86400 seconds.
 				$t = time() - Config::$modSettings['pruneBanLog'] * 86400;
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_banned
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_banned
 					WHERE log_time < {int:log_time}',
-					array(
+					[
 						'log_time' => $t,
-					)
+					],
 				);
 			}
 
-			if (!empty(Config::$modSettings['pruneReportLog']))
-			{
+			if (!empty(Config::$modSettings['pruneReportLog'])) {
 				// Figure out when our cutoff time is. 1 day = 86400 seconds.
 				$t = time() - Config::$modSettings['pruneReportLog'] * 86400;
 
 				// This one is more complex then the other logs.
 				// First we need to figure out which reports are too old.
-				$reports = array();
+				$reports = [];
 
-				$result = Db::$db->query('', '
-					SELECT id_report
+				$result = Db::$db->query(
+					'',
+					'SELECT id_report
 					FROM {db_prefix}log_reported
 					WHERE time_started < {int:time_started}
 						AND closed = {int:closed}
 						AND ignore_all = {int:not_ignored}',
-					array(
+					[
 						'time_started' => $t,
 						'closed' => 1,
 						'not_ignored' => 0,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_row($result))
-				{
+
+				while ($row = Db::$db->fetch_row($result)) {
 					$reports[] = $row[0];
 				}
 				Db::$db->free_result($result);
 
-				if (!empty($reports))
-				{
+				if (!empty($reports)) {
 					// Now delete the reports...
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}log_reported
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}log_reported
 						WHERE id_report IN ({array_int:report_list})',
-						array(
+						[
 							'report_list' => $reports,
-						)
+						],
 					);
 
 					// And delete the comments for those reports...
-					Db::$db->query('', '
-						DELETE FROM {db_prefix}log_reported_comments
+					Db::$db->query(
+						'',
+						'DELETE FROM {db_prefix}log_reported_comments
 						WHERE id_report IN ({array_int:report_list})',
-						array(
+						[
 							'report_list' => $reports,
-						)
+						],
 					);
 				}
 			}
 
-			if (!empty(Config::$modSettings['pruneScheduledTaskLog']))
-			{
+			if (!empty(Config::$modSettings['pruneScheduledTaskLog'])) {
 				// Figure out when our cutoff time is. 1 day = 86400 seconds.
 				$t = time() - Config::$modSettings['pruneScheduledTaskLog'] * 86400;
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_scheduled_tasks
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_scheduled_tasks
 					WHERE time_run < {int:time_run}',
-					array(
+					[
 						'time_run' => $t,
-					)
+					],
 				);
 			}
 
-			if (!empty(Config::$modSettings['pruneSpiderHitLog']))
-			{
+			if (!empty(Config::$modSettings['pruneSpiderHitLog'])) {
 				// Figure out when our cutoff time is. 1 day = 86400 seconds.
 				$t = time() - Config::$modSettings['pruneSpiderHitLog'] * 86400;
 
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_spider_hits
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_spider_hits
 					WHERE log_time < {int:log_time}',
-					array(
+					[
 						'log_time' => $t,
-					)
+					],
 				);
 			}
 		}
 
 		// Get rid of any paid subscriptions that were never actioned.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_subscribed
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_subscribed
 			WHERE end_time = {int:no_end_time}
 				AND status = {int:not_active}
 				AND start_time < {int:start_time}
 				AND payments_pending < {int:payments_pending}',
-			array(
+			[
 				'no_end_time' => 0,
 				'not_active' => 0,
 				'start_time' => time() - 60,
 				'payments_pending' => 1,
-			)
+			],
 		);
 
 		// Some OS's don't seem to clean out their sessions.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}sessions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}sessions
 			WHERE last_update < {int:last_update}',
-			array(
+			[
 				'last_update' => time() - 86400,
-			)
+			],
 		);
 
 		// Update the regex of top level domains with the IANA's latest official list.
-		Db::$db->insert('insert',
+		Db::$db->insert(
+			'insert',
 			'{db_prefix}background_tasks',
-			array(
-				'task_file' => 'string-255',
+			[
 				'task_class' => 'string-255',
 				'task_data' => 'string',
 				'claimed_time' => 'int',
-			),
-			array(
-				'$sourcedir/tasks/UpdateTldRegex.php',
+			],
+			[
 				'SMF\\Tasks\\UpdateTldRegex',
 				'',
 				0,
-			),
-			array()
+			],
+			[],
 		);
 
 		// Ensure Unicode data files are up to date
-		Db::$db->insert('insert',
+		Db::$db->insert(
+			'insert',
 			'{db_prefix}background_tasks',
-			array(
-				'task_file' => 'string-255',
+			[
 				'task_class' => 'string-255',
 				'task_data' => 'string',
-				'claimed_time' => 'int'),
-			array(
-				'$sourcedir/tasks/UpdateUnicode.php',
+				'claimed_time' => 'int'],
+			[
 				'SMF\\Tasks\\UpdateUnicode',
 				'',
-				0
-			),
-			array()
+				0,
+			],
+			[],
 		);
 
 		// Run Cache housekeeping
-		if (!empty(CacheApi::$enable) && !empty(CacheApi::$loadedApi))
+		if (!empty(CacheApi::$enable) && !empty(CacheApi::$loadedApi)) {
 			CacheApi::$loadedApi->housekeeping();
+		}
 
 		// Prevent stale minimized CSS and JavaScript from cluttering up the theme directories.
 		Theme::deleteAllMinified();
diff --git a/Sources/Tasks/index.php b/Sources/Tasks/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Sources/Tasks/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Sources/Theme.php b/Sources/Theme.php
index d4dbb61fbc..4edd4ec9b9 100644
--- a/Sources/Theme.php
+++ b/Sources/Theme.php
@@ -41,17 +41,35 @@ class Theme
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
+	private static $backcompat = [
 		// Public static methods not listed here will keep the same name when
 		// exported to global namespace.
-		'func_names' => array(
+		'func_names' => [
 			'load' => 'loadTheme',
 			'loadEssential' => 'loadEssentialThemeData',
+			'loadTemplate' => 'loadTemplate',
+			'loadSubTemplate' => 'loadSubTemplate',
+			'loadCSSFile' => 'loadCSSFile',
+			'addInlineCss' => 'addInlineCss',
+			'loadJavaScriptFile' => 'loadJavaScriptFile',
+			'addJavaScriptVar' => 'addJavaScriptVar',
+			'addInlineJavaScript' => 'addInlineJavaScript',
 			'setupContext' => 'setupThemeContext',
+			'setupMenuContext' => 'setupMenuContext',
+			'template_header' => 'template_header',
 			'copyright' => 'theme_copyright',
+			'template_footer' => 'template_footer',
+			'template_javascript' => 'template_javascript',
+			'template_css' => 'template_css',
+			'custMinify' => 'custMinify',
+			'deleteAllMinified' => 'deleteAllMinified',
+			'setJavaScript' => 'SetJavaScript',
+			'wrapAction' => 'WrapAction',
+			'dispatch' => 'dispatch',
+			'pickTheme' => 'PickTheme',
 			'createButton' => 'create_button',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -69,14 +87,14 @@ class Theme
 	 *
 	 * This theme's admin-configurable settings.
 	 */
-	public array $settings = array();
+	public array $settings = [];
 
 	/**
 	 * @var array
 	 *
 	 * This theme's user-configurable settings.
 	 */
-	public array $options = array();
+	public array $options = [];
 
 	/**
 	 * @var array
@@ -84,28 +102,28 @@ class Theme
 	 * Actions that can be accessed without accepting to the registration
 	 * agreement and privacy policy.
 	 */
-	public array $agreement_actions = array(
+	public array $agreement_actions = [
 		'agreement' => true,
 		'acceptagreement' => true,
 		'login2' => true,
 		'logintfa' => true,
 		'logout' => true,
-		'pm' => array('sa' => array('popup')),
-		'profile' => array('area' => array('popup', 'alerts_popup')),
+		'pm' => ['sa' => ['popup']],
+		'profile' => ['area' => ['popup', 'alerts_popup']],
 		'xmlhttp' => true,
 		'.xml' => true,
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Actions that do not require loading the index template.
 	 */
-	public array $simpleActions = array(
+	public array $simpleActions = [
 		'findmember',
 		'helpadmin',
 		'printpage',
-	);
+	];
 
 	/**
 	 * @var array
@@ -113,9 +131,9 @@ class Theme
 	 * Areas that do not require loading the index template.
 	 * Parent action => array of areas
 	 */
-	public array $simpleAreas = array(
-		'profile' => array('popup', 'alerts_popup',),
-	);
+	public array $simpleAreas = [
+		'profile' => ['popup', 'alerts_popup'],
+	];
 
 	/**
 	 * @var array
@@ -123,27 +141,27 @@ class Theme
 	 * Subactions that do not require loading the index template.
 	 * Parent action => array of subactions
 	 */
-	public array $simpleSubActions = array(
-		'pm' => array('popup',),
-		'signup' => array('usernamecheck'),
-	);
+	public array $simpleSubActions = [
+		'pm' => ['popup'],
+		'signup' => ['usernamecheck'],
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Extra URL params that ask for XML output instead of HTML.
 	 */
-	public array $extraParams = array(
+	public array $extraParams = [
 		'preview',
 		'splitjs',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Actions that specifically use XML output.
 	 */
-	public array $xmlActions = array(
+	public array $xmlActions = [
 		'quotefast',
 		'jsmodify',
 		'xmlhttp',
@@ -152,7 +170,7 @@ class Theme
 		'stats',
 		'notifytopic',
 		'notifyboard',
-	);
+	];
 
 	/**************************
 	 * Public static properties
@@ -163,7 +181,7 @@ class Theme
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static $loaded = array();
+	public static $loaded = [];
 
 	/**
 	 * @var object
@@ -177,7 +195,7 @@ class Theme
 	 *
 	 * Theme variables that cannot be changed by users.
 	 */
-	public static array $reservedVars = array(
+	public static array $reservedVars = [
 		'actual_theme_url',
 		'actual_images_url',
 		'base_theme_dir',
@@ -195,7 +213,7 @@ class Theme
 		'theme_templates',
 		'theme_url',
 		'name',
-	);
+	];
 
 	/***********************
 	 * Public static methods
@@ -209,81 +227,72 @@ class Theme
 	 */
 	public static function load($id = 0, $initialize = true)
 	{
-		if (empty($id))
-		{
+		if (empty($id)) {
 			// The theme was specified by the board.
-			if (!empty(Board::$info->theme))
-			{
+			if (!empty(Board::$info->theme)) {
 				$id = Board::$info->theme;
 			}
 			// The theme is the forum's default.
-			else
-			{
+			else {
 				$id = Config::$modSettings['theme_guests'];
 			}
 
 			// Sometimes the user can choose their own theme.
-			if (!empty(Config::$modSettings['theme_allow']) || User::$me->allowedTo('admin_forum'))
-			{
+			if (!empty(Config::$modSettings['theme_allow']) || User::$me->allowedTo('admin_forum')) {
 				// The theme was specified by REQUEST.
-				if (!empty($_REQUEST['theme']) && (User::$me->allowedTo('admin_forum') || in_array($_REQUEST['theme'], explode(',', Config::$modSettings['knownThemes']))))
-				{
+				if (!empty($_REQUEST['theme']) && (User::$me->allowedTo('admin_forum') || in_array($_REQUEST['theme'], explode(',', Config::$modSettings['knownThemes'])))) {
 					$id = (int) $_REQUEST['theme'];
 					$_SESSION['id_theme'] = $id;
 				}
 				// The theme was specified by REQUEST... previously.
-				elseif (!empty($_SESSION['id_theme']))
-				{
+				elseif (!empty($_SESSION['id_theme'])) {
 					$id = (int) $_SESSION['id_theme'];
 				}
 				// The theme is just the user's choice. (might use ?board=1;theme=0 to force board theme.)
-				elseif (!empty(User::$me->theme))
-				{
+				elseif (!empty(User::$me->theme)) {
 					$id = User::$me->theme;
 				}
 			}
 
 			// Verify the id_theme... no foul play.
 			// Always allow the board specific theme, if they are overriding.
-			if (!empty(Board::$info->theme) && Board::$info->override_theme)
-			{
+			if (!empty(Board::$info->theme) && Board::$info->override_theme) {
 				$id = Board::$info->theme;
-			}
-			elseif (!empty(Config::$modSettings['enableThemes']))
-			{
+			} elseif (!empty(Config::$modSettings['enableThemes'])) {
 				$themes = explode(',', Config::$modSettings['enableThemes']);
 
-				if (!in_array($id, $themes))
-				{
+				if (!in_array($id, $themes)) {
 					$id = Config::$modSettings['theme_guests'];
-				}
-				else
-				{
+				} else {
 					$id = (int) $id;
 				}
 			}
 		}
 
 		// Allow mod authors the option to override the theme id for custom page themes
-		IntegrationHook::call('integrate_pre_load_theme', array(&$id));
+		IntegrationHook::call('integrate_pre_load_theme', [&$id]);
 
 		// If not already loaded, load it now.
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::$loaded[$id] = new self($id, empty(User::$me->id) ? -1 : User::$me->id);
+		}
 
 		// Set the current theme to the requested one.
 		self::$current = self::$loaded[$id];
 
 		// For backward compatibility.
-		$GLOBALS['settings'] = &self::$current->settings;
-		$GLOBALS['options']  = &self::$current->options;
+		if (!empty(Config::$backward_compatibility)) {
+			$GLOBALS['settings'] = &self::$current->settings;
+			$GLOBALS['options']  = &self::$current->options;
+		}
 
 		// Ensure that SMF\Lang knows that it should use this theme's langauge files.
 		Lang::addDirs();
 
 		// Initializing sets up a bunch more stuff.
-		if (!empty($initialize))
+		if (!empty($initialize)) {
 			self::$current->initialize();
+		}
 
 		// Return the requested theme.
 		return self::$loaded[$id];
@@ -300,19 +309,16 @@ public static function loadEssential()
 		self::$current = self::$loaded[$id] = new self($id, 0);
 
 		// Check we have some directories set up.
-		if (empty(self::$current->settings['template_dirs']))
-		{
-			self::$current->settings['template_dirs'] = array(self::$current->settings['theme_dir']);
+		if (empty(self::$current->settings['template_dirs'])) {
+			self::$current->settings['template_dirs'] = [self::$current->settings['theme_dir']];
 
 			// Based on theme (if there is one).
-			if (!empty(self::$current->settings['base_theme_dir']))
-			{
+			if (!empty(self::$current->settings['base_theme_dir'])) {
 				self::$current->settings['template_dirs'][] = self::$current->settings['base_theme_dir'];
 			}
 
 			// Lastly the default theme.
-			if (self::$current->settings['theme_dir'] != self::$current->settings['default_theme_dir'])
-			{
+			if (self::$current->settings['theme_dir'] != self::$current->settings['default_theme_dir']) {
 				self::$current->settings['template_dirs'][] = self::$current->settings['default_theme_dir'];
 			}
 		}
@@ -348,54 +354,52 @@ public static function loadEssential()
 	 * @param string $template_name The name of the template to load
 	 * @param array|string $style_sheets The name of a single stylesheet or an array of names of stylesheets to load
 	 * @param bool $fatal If true, dies with an error message if the template cannot be found
-	 * @return boolean Whether or not the template was loaded
+	 * @return bool Whether or not the template was loaded
 	 */
-	public static function loadTemplate($template_name, $style_sheets = array(), $fatal = true)
+	public static function loadTemplate($template_name, $style_sheets = [], $fatal = true)
 	{
 		// Do any style sheets first, cause we're easy with those.
-		if (!empty($style_sheets))
-		{
-			if (!is_array($style_sheets))
-				$style_sheets = array($style_sheets);
+		if (!empty($style_sheets)) {
+			if (!is_array($style_sheets)) {
+				$style_sheets = [$style_sheets];
+			}
 
-			foreach ($style_sheets as $sheet)
-				self::loadCSSFile($sheet . '.css', array(), $sheet);
+			foreach ($style_sheets as $sheet) {
+				self::loadCSSFile($sheet . '.css', [], $sheet);
+			}
 		}
 
 		// No template to load?
-		if ($template_name === false)
+		if ($template_name === false) {
 			return true;
+		}
 
 		$loaded = false;
-		foreach (self::$current->settings['template_dirs'] as $template_dir)
-		{
-			if (file_exists($template_dir . '/' . $template_name . '.template.php'))
-			{
+
+		foreach (self::$current->settings['template_dirs'] as $template_dir) {
+			if (file_exists($template_dir . '/' . $template_name . '.template.php')) {
 				$loaded = true;
 				self::templateInclude($template_dir . '/' . $template_name . '.template.php', true);
 				break;
 			}
 		}
 
-		if ($loaded)
-		{
-			if (Config::$db_show_debug === true)
-			{
+		if ($loaded) {
+			if (Config::$db_show_debug === true) {
 				Utils::$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
 			}
 
 			// If they have specified an initialization function for this template, go ahead and call it now.
-			if (function_exists('template_' . $template_name . '_init'))
+			if (function_exists('template_' . $template_name . '_init')) {
 				call_user_func('template_' . $template_name . '_init');
+			}
 		}
 		// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
-		elseif (!file_exists(self::$current->settings['default_theme_dir']) && file_exists(Config::$boarddir . '/Themes/default'))
-		{
+		elseif (!file_exists(self::$current->settings['default_theme_dir']) && file_exists(Config::$boarddir . '/Themes/default')) {
 			self::$current->settings['default_theme_dir'] = Config::$boarddir . '/Themes/default';
 			self::$current->settings['template_dirs'][] = self::$current->settings['default_theme_dir'];
 
-			if (!empty(User::$me->is_admin) && !isset($_GET['th']))
-			{
+			if (!empty(User::$me->is_admin) && !isset($_GET['th'])) {
 				Lang::load('Errors');
 				echo '
 	<div class="alert errorbox">
@@ -406,16 +410,11 @@ public static function loadTemplate($template_name, $style_sheets = array(), $fa
 			self::loadTemplate($template_name);
 		}
 		// Cause an error otherwise.
-		elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal)
-		{
-			ErrorHandler::fatalLang('theme_template_error', 'template', array((string) $template_name));
-		}
-		elseif ($fatal)
-		{
-			die(ErrorHandler::log(sprintf(isset(Lang::$txt['theme_template_error']) ? Lang::$txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
-		}
-		else
-		{
+		elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal) {
+			ErrorHandler::fatalLang('theme_template_error', 'template', [(string) $template_name]);
+		} elseif ($fatal) {
+			die(ErrorHandler::log(sprintf(Lang::$txt['theme_template_error'] ?? 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
+		} else {
 			return false;
 		}
 	}
@@ -436,28 +435,23 @@ public static function loadTemplate($template_name, $style_sheets = array(), $fa
 	 */
 	public static function loadSubTemplate($sub_template_name, $fatal = false)
 	{
-		if (Config::$db_show_debug === true)
+		if (Config::$db_show_debug === true) {
 			Utils::$context['debug']['sub_templates'][] = $sub_template_name;
+		}
 
 		// Figure out what the template function is named.
 		$theme_function = 'template_' . $sub_template_name;
 
-		if (function_exists($theme_function))
-		{
+		if (function_exists($theme_function)) {
 			$theme_function();
-		}
-		elseif ($fatal === false)
-		{
-			ErrorHandler::fatalLang('theme_template_error', 'template', array((string) $sub_template_name));
-		}
-		elseif ($fatal !== 'ignore')
-		{
-			die(ErrorHandler::log(sprintf(isset(Lang::$txt['theme_template_error']) ? Lang::$txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+		} elseif ($fatal === false) {
+			ErrorHandler::fatalLang('theme_template_error', 'template', [(string) $sub_template_name]);
+		} elseif ($fatal !== 'ignore') {
+			die(ErrorHandler::log(sprintf(Lang::$txt['theme_template_error'] ?? 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
 		}
 
 		// Are we showing debugging for templates?  Just make sure not to do it before the doctype...
-		if (User::$me->allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, array('init', 'main_below')) && ob_get_length() > 0 && !isset($_REQUEST['xml']))
-		{
+		if (User::$me->allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, ['init', 'main_below']) && ob_get_length() > 0 && !isset($_REQUEST['xml'])) {
 			echo "\n" . '<div class="noticebox">---- ', $sub_template_name, ' ends ----</div>';
 		}
 	}
@@ -498,21 +492,22 @@ public static function loadSubTemplate($sub_template_name, $fatal = false)
 	 *
 	 * @param string $id An ID to stick on the end of the filename for caching purposes
 	 */
-	public static function loadCSSFile($fileName, $params = array(), $id = '')
+	public static function loadCSSFile($fileName, $params = [], $id = '')
 	{
-		if (empty(Utils::$context['css_files_order']))
-			Utils::$context['css_files_order'] = array();
+		if (empty(Utils::$context['css_files_order'])) {
+			Utils::$context['css_files_order'] = [];
+		}
 
 		$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
 			(array_key_exists('browser_cache', Utils::$context) ? Utils::$context['browser_cache'] : '') :
 			(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
-		$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
+		$params['force_current'] = $params['force_current'] ?? false;
 		$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
-		$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : true;
-		$params['external'] = isset($params['external']) ? $params['external'] : false;
-		$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
+		$params['minimize'] = $params['minimize'] ?? true;
+		$params['external'] = $params['external'] ?? false;
+		$params['validate'] = $params['validate'] ?? true;
 		$params['order_pos'] = isset($params['order_pos']) ? (int) $params['order_pos'] : 3000;
-		$params['attributes'] = isset($params['attributes']) ? $params['attributes'] : array();
+		$params['attributes'] = $params['attributes'] ?? [];
 
 		// Account for shorthand like admin.css?alp21 filenames
 		$id = (empty($id) ? strtr(str_replace('.css', '', basename($fileName)), '?', '_') : $id) . '_css';
@@ -520,33 +515,25 @@ public static function loadCSSFile($fileName, $params = array(), $id = '')
 		$fileName = str_replace(pathinfo($fileName, PATHINFO_EXTENSION), strtok(pathinfo($fileName, PATHINFO_EXTENSION), '?'), $fileName);
 
 		// Is this a local file?
-		if (empty($params['external']))
-		{
+		if (empty($params['external'])) {
 			// Are we validating the the file exists?
-			if (!empty($params['validate']) && ($mtime = @filemtime(self::$current->settings[$themeRef . '_dir'] . '/css/' . $fileName)) === false)
-			{
+			if (!empty($params['validate']) && ($mtime = @filemtime(self::$current->settings[$themeRef . '_dir'] . '/css/' . $fileName)) === false) {
 				// Maybe the default theme has it?
-				if ($themeRef === 'theme' && !$params['force_current'] && ($mtime = @filemtime(self::$current->settings['default_theme_dir'] . '/css/' . $fileName) !== false))
-				{
+				if ($themeRef === 'theme' && !$params['force_current'] && ($mtime = @filemtime(self::$current->settings['default_theme_dir'] . '/css/' . $fileName) !== false)) {
 					$fileUrl = self::$current->settings['default_theme_url'] . '/css/' . $fileName;
 					$filePath = self::$current->settings['default_theme_dir'] . '/css/' . $fileName;
-				}
-				else
-				{
+				} else {
 					$fileUrl = false;
 					$filePath = false;
 				}
-			}
-			else
-			{
+			} else {
 				$fileUrl = self::$current->settings[$themeRef . '_url'] . '/css/' . $fileName;
 				$filePath = self::$current->settings[$themeRef . '_dir'] . '/css/' . $fileName;
 				$mtime = @filemtime($filePath);
 			}
 		}
 		// An external file doesn't have a filepath. Mock one for simplicity.
-		else
-		{
+		else {
 			$fileUrl = $fileName;
 			$filePath = $fileName;
 
@@ -558,22 +545,24 @@ public static function loadCSSFile($fileName, $params = array(), $id = '')
 		$mtime = empty($mtime) ? 0 : $mtime;
 
 		// Add it to the array for use in the template
-		if (!empty($fileName) && !empty($fileUrl))
-		{
+		if (!empty($fileName) && !empty($fileUrl)) {
 			// Find a free number/position
-			while (isset(Utils::$context['css_files_order'][$params['order_pos']]))
+			while (isset(Utils::$context['css_files_order'][$params['order_pos']])) {
 				$params['order_pos']++;
+			}
 
 			Utils::$context['css_files_order'][$params['order_pos']] = $id;
 
-			Utils::$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params, 'mtime' => $mtime);
+			Utils::$context['css_files'][$id] = ['fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params, 'mtime' => $mtime];
 		}
 
-		if (!empty(Utils::$context['right_to_left']) && !empty($params['rtl']))
-			self::loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
+		if (!empty(Utils::$context['right_to_left']) && !empty($params['rtl'])) {
+			self::loadCSSFile($params['rtl'], array_diff_key($params, ['rtl' => 0]));
+		}
 
-		if ($mtime > Config::$modSettings['browser_cache'])
-			Config::updateModSettings(array('browser_cache' => $mtime));
+		if ($mtime > Config::$modSettings['browser_cache']) {
+			Config::updateModSettings(['browser_cache' => $mtime]);
+		}
 	}
 
 	/**
@@ -592,8 +581,9 @@ public static function loadCSSFile($fileName, $params = array(), $id = '')
 	public static function addInlineCss($css)
 	{
 		// Gotta add something...
-		if (empty($css))
+		if (empty($css)) {
 			return false;
+		}
 
 		Utils::$context['css_header'][] = $css;
 	}
@@ -633,52 +623,44 @@ public static function addInlineCss($css)
 	 *
 	 * @param string $id An ID to append to the filename.
 	 */
-	public static function loadJavaScriptFile($fileName, $params = array(), $id = '')
+	public static function loadJavaScriptFile($fileName, $params = [], $id = '')
 	{
 		$params['seed'] = (!array_key_exists('seed', $params) || (array_key_exists('seed', $params) && $params['seed'] === true)) ?
 			(array_key_exists('browser_cache', Utils::$context) ? Utils::$context['browser_cache'] : '') :
 			(is_string($params['seed']) ? '?' . ltrim($params['seed'], '?') : '');
-		$params['force_current'] = isset($params['force_current']) ? $params['force_current'] : false;
+		$params['force_current'] = $params['force_current'] ?? false;
 		$themeRef = !empty($params['default_theme']) ? 'default_theme' : 'theme';
-		$params['async'] = isset($params['async']) ? $params['async'] : false;
-		$params['defer'] = isset($params['defer']) ? $params['defer'] : false;
-		$params['minimize'] = isset($params['minimize']) ? $params['minimize'] : false;
-		$params['external'] = isset($params['external']) ? $params['external'] : false;
-		$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
-		$params['attributes'] = isset($params['attributes']) ? $params['attributes'] : array();
+		$params['async'] = $params['async'] ?? false;
+		$params['defer'] = $params['defer'] ?? false;
+		$params['minimize'] = $params['minimize'] ?? false;
+		$params['external'] = $params['external'] ?? false;
+		$params['validate'] = $params['validate'] ?? true;
+		$params['attributes'] = $params['attributes'] ?? [];
 
 		// Account for shorthand like admin.js?alp21 filenames
 		$id = (empty($id) ? strtr(str_replace('.js', '', basename($fileName)), '?', '_') : $id) . '_js';
 		$fileName = str_replace(pathinfo($fileName, PATHINFO_EXTENSION), strtok(pathinfo($fileName, PATHINFO_EXTENSION), '?'), $fileName);
 
 		// Is this a local file?
-		if (empty($params['external']))
-		{
+		if (empty($params['external'])) {
 			// Are we validating it exists on disk?
-			if (!empty($params['validate']) && ($mtime = @filemtime(self::$current->settings[$themeRef . '_dir'] . '/scripts/' . $fileName)) === false)
-			{
+			if (!empty($params['validate']) && ($mtime = @filemtime(self::$current->settings[$themeRef . '_dir'] . '/scripts/' . $fileName)) === false) {
 				// Can't find it in this theme, how about the default?
-				if ($themeRef === 'theme' && !$params['force_current'] && ($mtime = @filemtime(self::$current->settings['default_theme_dir'] . '/scripts/' . $fileName)) !== false)
-				{
+				if ($themeRef === 'theme' && !$params['force_current'] && ($mtime = @filemtime(self::$current->settings['default_theme_dir'] . '/scripts/' . $fileName)) !== false) {
 					$fileUrl = self::$current->settings['default_theme_url'] . '/scripts/' . $fileName;
 					$filePath = self::$current->settings['default_theme_dir'] . '/scripts/' . $fileName;
-				}
-				else
-				{
+				} else {
 					$fileUrl = false;
 					$filePath = false;
 				}
-			}
-			else
-			{
+			} else {
 				$fileUrl = self::$current->settings[$themeRef . '_url'] . '/scripts/' . $fileName;
 				$filePath = self::$current->settings[$themeRef . '_dir'] . '/scripts/' . $fileName;
 				$mtime = @filemtime($filePath);
 			}
 		}
 		// An external file doesn't have a filepath. Mock one for simplicity.
-		else
-		{
+		else {
 			$fileUrl = $fileName;
 			$filePath = $fileName;
 
@@ -690,13 +672,13 @@ public static function loadJavaScriptFile($fileName, $params = array(), $id = ''
 		$mtime = empty($mtime) ? 0 : $mtime;
 
 		// Add it to the array for use in the template
-		if (!empty($fileName) && !empty($fileUrl))
-		{
-			Utils::$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params, 'mtime' => $mtime);
+		if (!empty($fileName) && !empty($fileUrl)) {
+			Utils::$context['javascript_files'][$id] = ['fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params, 'mtime' => $mtime];
 		}
 
-		if ($mtime > Config::$modSettings['browser_cache'])
-			Config::updateModSettings(array('browser_cache' => $mtime));
+		if ($mtime > Config::$modSettings['browser_cache']) {
+			Config::updateModSettings(['browser_cache' => $mtime]);
+		}
 	}
 
 	/**
@@ -712,14 +694,13 @@ public static function loadJavaScriptFile($fileName, $params = array(), $id = ''
 	public static function addJavaScriptVar($key, $value, $escape = false)
 	{
 		// Variable name must be a valid string.
-		if (!is_string($key) || $key === '' || is_numeric($key))
+		if (!is_string($key) || $key === '' || is_numeric($key)) {
 			return;
+		}
 
 		// Take care of escaping the value for JavaScript?
-		if (!empty($escape))
-		{
-			switch (gettype($value))
-			{
+		if (!empty($escape)) {
+			switch (gettype($value)) {
 				// Illegal.
 				case 'resource':
 					break;
@@ -731,14 +712,14 @@ public static function addJavaScriptVar($key, $value, $escape = false)
 
 				// Apply Utils::JavaScriptEscape() to any strings in the array.
 				case 'array':
-					$replacements = array();
+					$replacements = [];
 					array_walk_recursive(
 						$value,
-						function($v, $k) use (&$replacements)
-						{
-							if (is_string($v))
+						function ($v, $k) use (&$replacements) {
+							if (is_string($v)) {
 								$replacements[json_encode($v)] = Utils::JavaScriptEscape($v, true);
-						}
+							}
+						},
 					);
 					$value = strtr(json_encode($value), $replacements);
 					break;
@@ -755,8 +736,9 @@ function($v, $k) use (&$replacements)
 
 		// At this point, value should contain suitably escaped JavaScript code.
 		// If it obviously doesn't, declare the var with an undefined value.
-		if (!is_string($value) && !is_numeric($value))
+		if (!is_string($value) && !is_numeric($value)) {
 			$value = null;
+		}
 
 		Utils::$context['javascript_vars'][$key] = $value;
 	}
@@ -779,8 +761,9 @@ function($v, $k) use (&$replacements)
 	 */
 	public static function addInlineJavaScript($javascript, $defer = false)
 	{
-		if (empty($javascript))
+		if (empty($javascript)) {
 			return false;
+		}
 
 		Utils::$context['javascript_inline'][($defer === true ? 'defer' : 'standard')][] = $javascript;
 	}
@@ -796,59 +779,51 @@ public static function setupContext($forceload = false)
 
 		// Under SSI this function can be called more then once.  That can cause some problems.
 		// So only run the function once unless we are forced to run it again.
-		if ($loaded && !$forceload)
+		if ($loaded && !$forceload) {
 			return;
+		}
 
 		$loaded = true;
 
 		Utils::$context['in_maintenance'] = !empty(Config::$maintenance);
 		Utils::$context['current_time'] = Time::create('now')->format(null, false);
 		Utils::$context['current_action'] = isset($_GET['action']) ? Utils::htmlspecialchars($_GET['action']) : '';
-		Utils::$context['random_news_line'] = array();
+		Utils::$context['random_news_line'] = [];
 
 		// Get some news...
 		Utils::$context['news_lines'] = array_filter(explode("\n", str_replace("\r", '', trim(addslashes(Config::$modSettings['news'])))));
 
-		for ($i = 0, $n = count(Utils::$context['news_lines']); $i < $n; $i++)
-		{
-			if (trim(Utils::$context['news_lines'][$i]) == '')
+		for ($i = 0, $n = count(Utils::$context['news_lines']); $i < $n; $i++) {
+			if (trim(Utils::$context['news_lines'][$i]) == '') {
 				continue;
+			}
 
 			// Clean it up for presentation ;).
 			Utils::$context['news_lines'][$i] = BBCodeParser::load()->parse(stripslashes(trim(Utils::$context['news_lines'][$i])), true, 'news' . $i);
 		}
 
-		if (!empty(Utils::$context['news_lines']) && (!empty(Config::$modSettings['allow_guestAccess']) || User::$me->is_logged))
-		{
+		if (!empty(Utils::$context['news_lines']) && (!empty(Config::$modSettings['allow_guestAccess']) || User::$me->is_logged)) {
 			Utils::$context['random_news_line'] = Utils::$context['news_lines'][mt_rand(0, count(Utils::$context['news_lines']) - 1)];
 		}
 
-		if (!User::$me->is_guest)
-		{
+		if (!User::$me->is_guest) {
 			// Personal message popup...
-			if (User::$me->unread_messages > (isset($_SESSION['unread_messages']) ? $_SESSION['unread_messages'] : 0))
-			{
+			if (User::$me->unread_messages > ($_SESSION['unread_messages'] ?? 0)) {
 				User::$me->popup_messages = true;
-			}
-			else
-			{
+			} else {
 				User::$me->popup_messages = false;
 			}
 
 			$_SESSION['unread_messages'] = User::$me->unread_messages;
 
-			if (User::$me->allowedTo('moderate_forum'))
-			{
+			if (User::$me->allowedTo('moderate_forum')) {
 				Utils::$context['unapproved_members'] = !empty(Config::$modSettings['unapprovedMembers']) ? Config::$modSettings['unapprovedMembers'] : 0;
 			}
-		}
-		else
-		{
+		} else {
 			User::$me->popup_messages = false;
 
 			// If we've upgraded recently, go easy on the passwords.
-			if (!empty(Config::$modSettings['disableHashTime']) && (Config::$modSettings['disableHashTime'] == 1 || time() < Config::$modSettings['disableHashTime']))
-			{
+			if (!empty(Config::$modSettings['disableHashTime']) && (Config::$modSettings['disableHashTime'] == 1 || time() < Config::$modSettings['disableHashTime'])) {
 				Utils::$context['disable_login_hashing'] = true;
 			}
 		}
@@ -863,8 +838,7 @@ public static function setupContext($forceload = false)
 		Utils::$context['show_pm_popup'] = User::$me->popup_messages && !empty(self::$current->options['popup_messages']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'pm');
 
 		// 2.1+: Add the PM popup here instead. Theme authors can still override it simply by editing/removing the 'fPmPopup' in the array.
-		if (Utils::$context['show_pm_popup'])
-		{
+		if (Utils::$context['show_pm_popup']) {
 			self::addInlineJavaScript('
 			jQuery(document).ready(function($) {
 				new smc_Popup({
@@ -880,74 +854,67 @@ public static function setupContext($forceload = false)
 		var smf_you_sure =' . Utils::JavaScriptEscape(Lang::$txt['quickmod_confirm']) . ';');
 
 		// Now add the capping code for avatars.
-		if (!empty(Config::$modSettings['avatar_max_width_external']) && !empty(Config::$modSettings['avatar_max_height_external']) && !empty(Config::$modSettings['avatar_action_too_large']) && Config::$modSettings['avatar_action_too_large'] == 'option_css_resize')
-		{
+		if (!empty(Config::$modSettings['avatar_max_width_external']) && !empty(Config::$modSettings['avatar_max_height_external']) && !empty(Config::$modSettings['avatar_action_too_large']) && Config::$modSettings['avatar_action_too_large'] == 'option_css_resize') {
 			self::addInlineCss("\n\t" . 'img.avatar { max-width: ' . Config::$modSettings['avatar_max_width_external'] . 'px !important; max-height: ' . Config::$modSettings['avatar_max_height_external'] . 'px !important; }');
 		}
 
 		// Add max image limits
-		if (!empty(Config::$modSettings['max_image_width']))
-		{
+		if (!empty(Config::$modSettings['max_image_width'])) {
 			self::addInlineCss("\n\t" . '.postarea .bbc_img, .list_posts .bbc_img, .post .inner .bbc_img, form#reported_posts .bbc_img, #preview_body .bbc_img { max-width: min(100%,' . Config::$modSettings['max_image_width'] . 'px); }');
 		}
 
-		if (!empty(Config::$modSettings['max_image_height']))
-		{
+		if (!empty(Config::$modSettings['max_image_height'])) {
 			self::addInlineCss("\n\t" . '.postarea .bbc_img, .list_posts .bbc_img, .post .inner .bbc_img, form#reported_posts .bbc_img, #preview_body .bbc_img { max-height: ' . Config::$modSettings['max_image_height'] . 'px; }');
 		}
 
-		Utils::$context['common_stats'] = array(
+		Utils::$context['common_stats'] = [
 			'total_posts' => Lang::numberFormat(Config::$modSettings['totalMessages']),
 			'total_topics' => Lang::numberFormat(Config::$modSettings['totalTopics']),
 			'total_members' => Lang::numberFormat(Config::$modSettings['totalMembers']),
-			'latest_member' => array(
+			'latest_member' => [
 				'id' => Config::$modSettings['latestMember'],
 				'name' => Config::$modSettings['latestRealName'],
 				'href' => Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember'],
 				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . Config::$modSettings['latestMember'] . '">' . Config::$modSettings['latestRealName'] . '</a>',
-			),
-		);
+			],
+		];
 
 		Utils::$context['common_stats']['boardindex_total_posts'] = sprintf(Lang::$txt['boardindex_total_posts'], Utils::$context['common_stats']['total_posts'], Utils::$context['common_stats']['total_topics'], Utils::$context['common_stats']['total_members']);
 
-		if (empty(self::$current->settings['theme_version']))
+		if (empty(self::$current->settings['theme_version'])) {
 			self::addJavaScriptVar('smf_scripturl', '"' . Config::$scripturl . '"');
+		}
 
-		if (!isset(Utils::$context['page_title']))
+		if (!isset(Utils::$context['page_title'])) {
 			Utils::$context['page_title'] = '';
+		}
 
 		// Set some specific vars.
 		Utils::$context['page_title_html_safe'] = Utils::htmlspecialchars(html_entity_decode(Utils::$context['page_title'])) . (!empty(Utils::$context['current_page']) ? ' - ' . Lang::$txt['page'] . ' ' . (Utils::$context['current_page'] + 1) : '');
 		Utils::$context['meta_keywords'] = !empty(Config::$modSettings['meta_keywords']) ? Utils::htmlspecialchars(Config::$modSettings['meta_keywords']) : '';
 
 		// Content related meta tags, including Open Graph
-		Utils::$context['meta_tags'][] = array('property' => 'og:site_name', 'content' => Utils::$context['forum_name']);
-		Utils::$context['meta_tags'][] = array('property' => 'og:title', 'content' => Utils::$context['page_title_html_safe']);
+		Utils::$context['meta_tags'][] = ['property' => 'og:site_name', 'content' => Utils::$context['forum_name']];
+		Utils::$context['meta_tags'][] = ['property' => 'og:title', 'content' => Utils::$context['page_title_html_safe']];
 
-		if (!empty(Utils::$context['meta_keywords']))
-		{
-			Utils::$context['meta_tags'][] = array('name' => 'keywords', 'content' => Utils::$context['meta_keywords']);
+		if (!empty(Utils::$context['meta_keywords'])) {
+			Utils::$context['meta_tags'][] = ['name' => 'keywords', 'content' => Utils::$context['meta_keywords']];
 		}
 
-		if (!empty(Utils::$context['canonical_url']))
-		{
-			Utils::$context['meta_tags'][] = array('property' => 'og:url', 'content' => Utils::$context['canonical_url']);
+		if (!empty(Utils::$context['canonical_url'])) {
+			Utils::$context['meta_tags'][] = ['property' => 'og:url', 'content' => Utils::$context['canonical_url']];
 		}
 
-		if (!empty(self::$current->settings['og_image']))
-		{
-			Utils::$context['meta_tags'][] = array('property' => 'og:image', 'content' => self::$current->settings['og_image']);
+		if (!empty(self::$current->settings['og_image'])) {
+			Utils::$context['meta_tags'][] = ['property' => 'og:image', 'content' => self::$current->settings['og_image']];
 		}
 
-		if (!empty(Utils::$context['meta_description']))
-		{
-			Utils::$context['meta_tags'][] = array('property' => 'og:description', 'content' => Utils::$context['meta_description']);
-			Utils::$context['meta_tags'][] = array('name' => 'description', 'content' => Utils::$context['meta_description']);
-		}
-		else
-		{
-			Utils::$context['meta_tags'][] = array('property' => 'og:description', 'content' => Utils::$context['page_title_html_safe']);
-			Utils::$context['meta_tags'][] = array('name' => 'description', 'content' => Utils::$context['page_title_html_safe']);
+		if (!empty(Utils::$context['meta_description'])) {
+			Utils::$context['meta_tags'][] = ['property' => 'og:description', 'content' => Utils::$context['meta_description']];
+			Utils::$context['meta_tags'][] = ['name' => 'description', 'content' => Utils::$context['meta_description']];
+		} else {
+			Utils::$context['meta_tags'][] = ['property' => 'og:description', 'content' => Utils::$context['page_title_html_safe']];
+			Utils::$context['meta_tags'][] = ['name' => 'description', 'content' => Utils::$context['page_title_html_safe']];
 		}
 
 		IntegrationHook::call('integrate_theme_context');
@@ -962,7 +929,7 @@ public static function setupMenuContext()
 	{
 		// Set up the menu privileges.
 		Utils::$context['allow_search'] = !empty(Config::$modSettings['allow_guestAccess']) ? User::$me->allowedTo('search_posts') : (!User::$me->is_guest && User::$me->allowedTo('search_posts'));
-		Utils::$context['allow_admin'] = User::$me->allowedTo(array('admin_forum', 'manage_boards', 'manage_permissions', 'moderate_forum', 'manage_membergroups', 'manage_bans', 'send_mail', 'edit_news', 'manage_attachments', 'manage_smileys'));
+		Utils::$context['allow_admin'] = User::$me->allowedTo(['admin_forum', 'manage_boards', 'manage_permissions', 'moderate_forum', 'manage_membergroups', 'manage_bans', 'send_mail', 'edit_news', 'manage_attachments', 'manage_smileys']);
 
 		Utils::$context['allow_memberlist'] = User::$me->allowedTo('view_mlist');
 		Utils::$context['allow_calendar'] = User::$me->allowedTo('calendar_view') && !empty(Config::$modSettings['cal_enabled']);
@@ -972,246 +939,232 @@ public static function setupMenuContext()
 		$cacheTime = Config::$modSettings['lastActive'] * 60;
 
 		// Initial "can you post an event in the calendar" option - but this might have been set in the calendar already.
-		if (!isset(Utils::$context['allow_calendar_event']))
-		{
+		if (!isset(Utils::$context['allow_calendar_event'])) {
 			Utils::$context['allow_calendar_event'] = Utils::$context['allow_calendar'] && User::$me->allowedTo('calendar_post');
 
 			// If you don't allow events not linked to posts and you're not an admin, we have more work to do...
-			if (Utils::$context['allow_calendar'] && Utils::$context['allow_calendar_event'] && empty(Config::$modSettings['cal_allow_unlinked']) && !User::$me->is_admin)
-			{
+			if (Utils::$context['allow_calendar'] && Utils::$context['allow_calendar_event'] && empty(Config::$modSettings['cal_allow_unlinked']) && !User::$me->is_admin) {
 				$boards_can_post = User::$me->boardsAllowedTo('post_new');
 				Utils::$context['allow_calendar_event'] &= !empty($boards_can_post);
 			}
 		}
 
 		// There is some menu stuff we need to do if we're coming at this from a non-guest perspective.
-		if (!User::$me->is_guest)
-		{
+		if (!User::$me->is_guest) {
 			self::addInlineJavaScript("\n\t" . 'var user_menus = new smc_PopupMenu();' . "\n\t" . 'user_menus.add("profile", "' . Config::$scripturl . '?action=profile;area=popup");' . "\n\t" . 'user_menus.add("alerts", "' . Config::$scripturl . '?action=profile;area=alerts_popup;u=' . User::$me->id . '");', true);
 
-			if (Utils::$context['allow_pm'])
-			{
+			if (Utils::$context['allow_pm']) {
 				self::addInlineJavaScript("\n\t" . 'user_menus.add("pm", "' . Config::$scripturl . '?action=pm;sa=popup");', true);
 			}
 
-			if (!empty(Config::$modSettings['enable_ajax_alerts']))
-			{
+			if (!empty(Config::$modSettings['enable_ajax_alerts'])) {
 				$timeout = Notify::getNotifyPrefs(User::$me->id, 'alert_timeout', true);
 				$timeout = empty($timeout) ? 10000 : $timeout[User::$me->id]['alert_timeout'] * 1000;
 
 				self::addInlineJavaScript("\n\t" . 'var new_alert_title = "' . Utils::$context['forum_name_html_safe'] . '";' . "\n\t" . 'var alert_timeout = ' . $timeout . ';');
 
-				self::loadJavaScriptFile('alerts.js', array('minimize' => true), 'smf_alerts');
+				self::loadJavaScriptFile('alerts.js', ['minimize' => true], 'smf_alerts');
 			}
 		}
 
 		// All the buttons we can possibly want and then some.
 		// Try pulling the final list of buttons from cache first.
-		if (($menu_buttons = CacheApi::get('menu_buttons-' . implode('_', User::$me->groups) . '-' . User::$me->language, $cacheTime)) === null || time() - $cacheTime <= Config::$modSettings['settings_updated'])
-		{
-			$buttons = array(
-				'home' => array(
+		if (($menu_buttons = CacheApi::get('menu_buttons-' . implode('_', User::$me->groups) . '-' . User::$me->language, $cacheTime)) === null || time() - $cacheTime <= Config::$modSettings['settings_updated']) {
+			$buttons = [
+				'home' => [
 					'title' => Lang::$txt['home'],
 					'href' => Config::$scripturl,
 					'show' => true,
-					'sub_buttons' => array(
-					),
+					'sub_buttons' => [
+					],
 					'is_last' => Utils::$context['right_to_left'],
-				),
-				'search' => array(
+				],
+				'search' => [
 					'title' => Lang::$txt['search'],
 					'href' => Config::$scripturl . '?action=search',
 					'show' => Utils::$context['allow_search'],
-					'sub_buttons' => array(
-					),
-				),
-				'admin' => array(
+					'sub_buttons' => [
+					],
+				],
+				'admin' => [
 					'title' => Lang::$txt['admin'],
 					'href' => Config::$scripturl . '?action=admin',
 					'show' => Utils::$context['allow_admin'],
-					'sub_buttons' => array(
-						'featuresettings' => array(
+					'sub_buttons' => [
+						'featuresettings' => [
 							'title' => Lang::$txt['modSettings_title'],
 							'href' => Config::$scripturl . '?action=admin;area=featuresettings',
 							'show' => User::$me->allowedTo('admin_forum'),
-						),
-						'packages' => array(
+						],
+						'packages' => [
 							'title' => Lang::$txt['package'],
 							'href' => Config::$scripturl . '?action=admin;area=packages',
 							'show' => User::$me->allowedTo('admin_forum'),
-						),
-						'errorlog' => array(
+						],
+						'errorlog' => [
 							'title' => Lang::$txt['errorlog'],
 							'href' => Config::$scripturl . '?action=admin;area=logs;sa=errorlog;desc',
 							'show' => User::$me->allowedTo('admin_forum') && !empty(Config::$modSettings['enableErrorLogging']),
-						),
-						'permissions' => array(
+						],
+						'permissions' => [
 							'title' => Lang::$txt['edit_permissions'],
 							'href' => Config::$scripturl . '?action=admin;area=permissions',
 							'show' => User::$me->allowedTo('manage_permissions'),
-						),
-						'memberapprove' => array(
+						],
+						'memberapprove' => [
 							'title' => Lang::$txt['approve_members_waiting'],
 							'href' => Config::$scripturl . '?action=admin;area=viewmembers;sa=browse;type=approve',
 							'show' => !empty(Utils::$context['unapproved_members']),
 							'is_last' => true,
-						),
-					),
-				),
-				'moderate' => array(
+						],
+					],
+				],
+				'moderate' => [
 					'title' => Lang::$txt['moderate'],
 					'href' => Config::$scripturl . '?action=moderate',
 					'show' => Utils::$context['allow_moderation_center'],
-					'sub_buttons' => array(
-						'modlog' => array(
+					'sub_buttons' => [
+						'modlog' => [
 							'title' => Lang::$txt['modlog_view'],
 							'href' => Config::$scripturl . '?action=moderate;area=modlog',
 							'show' => !empty(Config::$modSettings['modlog_enabled']) && !empty(User::$me->mod_cache) && User::$me->mod_cache['bq'] != '0=1',
-						),
-						'poststopics' => array(
+						],
+						'poststopics' => [
 							'title' => Lang::$txt['mc_unapproved_poststopics'],
 							'href' => Config::$scripturl . '?action=moderate;area=postmod;sa=posts',
 							'show' => Config::$modSettings['postmod_active'] && !empty(User::$me->mod_cache['ap']),
-						),
-						'attachments' => array(
+						],
+						'attachments' => [
 							'title' => Lang::$txt['mc_unapproved_attachments'],
 							'href' => Config::$scripturl . '?action=moderate;area=attachmod;sa=attachments',
 							'show' => Config::$modSettings['postmod_active'] && !empty(User::$me->mod_cache['ap']),
-						),
-						'reports' => array(
+						],
+						'reports' => [
 							'title' => Lang::$txt['mc_reported_posts'],
 							'href' => Config::$scripturl . '?action=moderate;area=reportedposts',
 							'show' => !empty(User::$me->mod_cache) && User::$me->mod_cache['bq'] != '0=1',
-						),
-						'reported_members' => array(
+						],
+						'reported_members' => [
 							'title' => Lang::$txt['mc_reported_members'],
 							'href' => Config::$scripturl . '?action=moderate;area=reportedmembers',
 							'show' => User::$me->allowedTo('moderate_forum'),
 							'is_last' => true,
-						)
-					),
-				),
-				'calendar' => array(
+						],
+					],
+				],
+				'calendar' => [
 					'title' => Lang::$txt['calendar'],
 					'href' => Config::$scripturl . '?action=calendar',
 					'show' => Utils::$context['allow_calendar'],
-					'sub_buttons' => array(
-						'view' => array(
+					'sub_buttons' => [
+						'view' => [
 							'title' => Lang::$txt['calendar_menu'],
 							'href' => Config::$scripturl . '?action=calendar',
 							'show' => Utils::$context['allow_calendar_event'],
-						),
-						'post' => array(
+						],
+						'post' => [
 							'title' => Lang::$txt['calendar_post_event'],
 							'href' => Config::$scripturl . '?action=calendar;sa=post',
 							'show' => Utils::$context['allow_calendar_event'],
 							'is_last' => true,
-						),
-					),
-				),
-				'mlist' => array(
+						],
+					],
+				],
+				'mlist' => [
 					'title' => Lang::$txt['members_title'],
 					'href' => Config::$scripturl . '?action=mlist',
 					'show' => Utils::$context['allow_memberlist'],
-					'sub_buttons' => array(
-						'mlist_view' => array(
+					'sub_buttons' => [
+						'mlist_view' => [
 							'title' => Lang::$txt['mlist_menu_view'],
 							'href' => Config::$scripturl . '?action=mlist',
 							'show' => true,
-						),
-						'mlist_search' => array(
+						],
+						'mlist_search' => [
 							'title' => Lang::$txt['mlist_search'],
 							'href' => Config::$scripturl . '?action=mlist;sa=search',
 							'show' => true,
 							'is_last' => true,
-						),
-					),
+						],
+					],
 					'is_last' => !Utils::$context['right_to_left'] && empty(self::$current->settings['login_main_menu']),
-				),
+				],
 				// Theme authors: If you want the login and register buttons to appear in
 				// the main forum menu on your theme, set Theme::$current->settings['login_main_menu'] to
 				// true in your theme's template_init() function in index.template.php.
-				'login' => array(
+				'login' => [
 					'title' => Lang::$txt['login'],
 					'href' => Config::$scripturl . '?action=login',
 					'onclick' => 'return reqOverlayDiv(this.href, ' . Utils::JavaScriptEscape(Lang::$txt['login']) . ', \'login\');',
 					'show' => User::$me->is_guest && !empty(self::$current->settings['login_main_menu']),
-					'sub_buttons' => array(
-					),
+					'sub_buttons' => [
+					],
 					'is_last' => !Utils::$context['right_to_left'],
-				),
-				'logout' => array(
+				],
+				'logout' => [
 					'title' => Lang::$txt['logout'],
 					'href' => Config::$scripturl . '?action=logout;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id'],
 					'show' => !User::$me->is_guest && !empty(self::$current->settings['login_main_menu']),
-					'sub_buttons' => array(
-					),
+					'sub_buttons' => [
+					],
 					'is_last' => !Utils::$context['right_to_left'],
-				),
-				'signup' => array(
+				],
+				'signup' => [
 					'title' => Lang::$txt['register'],
 					'href' => Config::$scripturl . '?action=signup',
 					'icon' => 'regcenter',
 					'show' => User::$me->is_guest && Utils::$context['can_register'] && !empty(self::$current->settings['login_main_menu']),
-					'sub_buttons' => array(
-					),
+					'sub_buttons' => [
+					],
 					'is_last' => !Utils::$context['right_to_left'],
-				),
-			);
+				],
+			];
 
 			// Allow editing menu buttons easily.
-			IntegrationHook::call('integrate_menu_buttons', array(&$buttons));
+			IntegrationHook::call('integrate_menu_buttons', [&$buttons]);
 
 			// Now we put the buttons in the context so the theme can use them.
-			$menu_buttons = array();
-			foreach ($buttons as $act => $button)
-			{
-				if (!empty($button['show']))
-				{
+			$menu_buttons = [];
+
+			foreach ($buttons as $act => $button) {
+				if (!empty($button['show'])) {
 					$button['active_button'] = false;
 
 					// Make sure the last button truly is the last button.
-					if (!empty($button['is_last']))
-					{
-						if (isset($last_button))
+					if (!empty($button['is_last'])) {
+						if (isset($last_button)) {
 							unset($menu_buttons[$last_button]['is_last']);
+						}
 
 						$last_button = $act;
 					}
 
 					// Go through the sub buttons if there are any.
-					if (!empty($button['sub_buttons']))
-						foreach ($button['sub_buttons'] as $key => $subbutton)
-						{
-							if (empty($subbutton['show']))
+					if (!empty($button['sub_buttons'])) {
+						foreach ($button['sub_buttons'] as $key => $subbutton) {
+							if (empty($subbutton['show'])) {
 								unset($button['sub_buttons'][$key]);
+							}
 
 							// 2nd level sub buttons next...
-							if (!empty($subbutton['sub_buttons']))
-							{
-								foreach ($subbutton['sub_buttons'] as $key2 => $sub_button2)
-								{
-									if (empty($sub_button2['show']))
+							if (!empty($subbutton['sub_buttons'])) {
+								foreach ($subbutton['sub_buttons'] as $key2 => $sub_button2) {
+									if (empty($sub_button2['show'])) {
 										unset($button['sub_buttons'][$key]['sub_buttons'][$key2]);
+									}
 								}
 							}
 						}
+					}
 
 					// Does this button have its own icon?
-					if (isset($button['icon']) && file_exists(self::$current->settings['theme_dir'] . '/images/' . $button['icon']))
-					{
+					if (isset($button['icon']) && file_exists(self::$current->settings['theme_dir'] . '/images/' . $button['icon'])) {
 						$button['icon'] = '<img src="' . self::$current->settings['images_url'] . '/' . $button['icon'] . '" alt="">';
-					}
-					elseif (isset($button['icon']) && file_exists(self::$current->settings['default_theme_dir'] . '/images/' . $button['icon']))
-					{
+					} elseif (isset($button['icon']) && file_exists(self::$current->settings['default_theme_dir'] . '/images/' . $button['icon'])) {
 						$button['icon'] = '<img src="' . self::$current->settings['default_images_url'] . '/' . $button['icon'] . '" alt="">';
-					}
-					elseif (isset($button['icon']))
-					{
+					} elseif (isset($button['icon'])) {
 						$button['icon'] = '<span class="main_icons ' . $button['icon'] . '"></span>';
-					}
-					else
-					{
+					} else {
 						$button['icon'] = '<span class="main_icons ' . $act . '"></span>';
 					}
 
@@ -1219,8 +1172,7 @@ public static function setupMenuContext()
 				}
 			}
 
-			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2)
-			{
+			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2) {
 				CacheApi::put('menu_buttons-' . implode('_', User::$me->groups) . '-' . User::$me->language, $menu_buttons, $cacheTime);
 			}
 		}
@@ -1228,8 +1180,7 @@ public static function setupMenuContext()
 		Utils::$context['menu_buttons'] = $menu_buttons;
 
 		// Logging out requires the session id in the url.
-		if (isset(Utils::$context['menu_buttons']['logout']))
-		{
+		if (isset(Utils::$context['menu_buttons']['logout'])) {
 			Utils::$context['menu_buttons']['logout']['href'] = sprintf(Utils::$context['menu_buttons']['logout']['href'], Utils::$context['session_var'], Utils::$context['session_id']);
 		}
 
@@ -1237,40 +1188,26 @@ public static function setupMenuContext()
 		// Default to home.
 		$current_action = 'home';
 
-		if (isset(Utils::$context['menu_buttons'][Utils::$context['current_action']]))
-		{
+		if (isset(Utils::$context['menu_buttons'][Utils::$context['current_action']])) {
 			$current_action = Utils::$context['current_action'];
-		}
-		elseif (Utils::$context['current_action'] == 'search2')
-		{
+		} elseif (Utils::$context['current_action'] == 'search2') {
 			$current_action = 'search';
-		}
-		elseif (Utils::$context['current_action'] == 'theme')
-		{
+		} elseif (Utils::$context['current_action'] == 'theme') {
 			$current_action = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? 'profile' : 'admin';
-		}
-		elseif (Utils::$context['current_action'] == 'signup2')
-		{
+		} elseif (Utils::$context['current_action'] == 'signup2') {
 			$current_action = 'signup';
-		}
-		elseif (Utils::$context['current_action'] == 'login2' || (User::$me->is_guest && Utils::$context['current_action'] == 'reminder'))
-		{
+		} elseif (Utils::$context['current_action'] == 'login2' || (User::$me->is_guest && Utils::$context['current_action'] == 'reminder')) {
 			$current_action = 'login';
-		}
-		elseif (Utils::$context['current_action'] == 'groups' && Utils::$context['allow_moderation_center'] && User::$me->mod_cache['gq'] != '0=1')
-		{
+		} elseif (Utils::$context['current_action'] == 'groups' && Utils::$context['allow_moderation_center'] && User::$me->mod_cache['gq'] != '0=1') {
 			$current_action = 'moderate';
 		}
 
 		// There are certain exceptions to the above where we don't want anything on the menu highlighted.
-		if (Utils::$context['current_action'] == 'profile' && !empty(User::$me->is_owner))
-		{
+		if (Utils::$context['current_action'] == 'profile' && !empty(User::$me->is_owner)) {
 			$current_action = !empty($_GET['area']) && $_GET['area'] == 'showalerts' ? 'self_alerts' : 'self_profile';
 
 			Utils::$context[$current_action] = true;
-		}
-		elseif (Utils::$context['current_action'] == 'pm')
-		{
+		} elseif (Utils::$context['current_action'] == 'pm') {
 			$current_action = 'self_pm';
 			Utils::$context['self_pm'] = true;
 		}
@@ -1278,63 +1215,57 @@ public static function setupMenuContext()
 		Utils::$context['total_mod_reports'] = 0;
 		Utils::$context['total_admin_reports'] = 0;
 
-		if (!empty(User::$me->mod_cache) && User::$me->mod_cache['bq'] != '0=1' && !empty(Utils::$context['open_mod_reports']) && !empty(Utils::$context['menu_buttons']['moderate']['sub_buttons']['reports']))
-		{
+		if (!empty(User::$me->mod_cache) && User::$me->mod_cache['bq'] != '0=1' && !empty(Utils::$context['open_mod_reports']) && !empty(Utils::$context['menu_buttons']['moderate']['sub_buttons']['reports'])) {
 			Utils::$context['total_mod_reports'] = Utils::$context['open_mod_reports'];
 			Utils::$context['menu_buttons']['moderate']['sub_buttons']['reports']['amt'] = Utils::$context['open_mod_reports'];
 		}
 
 		// Show how many errors there are
-		if (!empty(Utils::$context['menu_buttons']['admin']['sub_buttons']['errorlog']))
-		{
+		if (!empty(Utils::$context['menu_buttons']['admin']['sub_buttons']['errorlog'])) {
 			// Get an error count, if necessary
-			if (!isset(Utils::$context['num_errors']))
-			{
-				$query = Db::$db->query('', '
-					SELECT COUNT(*)
+			if (!isset(Utils::$context['num_errors'])) {
+				$query = Db::$db->query(
+					'',
+					'SELECT COUNT(*)
 					FROM {db_prefix}log_errors',
-					array()
+					[],
 				);
 				list(Utils::$context['num_errors']) = Db::$db->fetch_row($query);
 				Db::$db->free_result($query);
 			}
 
-			if (!empty(Utils::$context['num_errors']))
-			{
+			if (!empty(Utils::$context['num_errors'])) {
 				Utils::$context['total_admin_reports'] += Utils::$context['num_errors'];
 				Utils::$context['menu_buttons']['admin']['sub_buttons']['errorlog']['amt'] = Utils::$context['num_errors'];
 			}
 		}
 
 		// Show number of reported members
-		if (!empty(Utils::$context['open_member_reports']) && !empty(Utils::$context['menu_buttons']['moderate']['sub_buttons']['reported_members']))
-		{
+		if (!empty(Utils::$context['open_member_reports']) && !empty(Utils::$context['menu_buttons']['moderate']['sub_buttons']['reported_members'])) {
 			Utils::$context['total_mod_reports'] += Utils::$context['open_member_reports'];
 			Utils::$context['menu_buttons']['moderate']['sub_buttons']['reported_members']['amt'] = Utils::$context['open_member_reports'];
 		}
 
-		if (!empty(Utils::$context['unapproved_members']) && !empty(Utils::$context['menu_buttons']['admin']))
-		{
+		if (!empty(Utils::$context['unapproved_members']) && !empty(Utils::$context['menu_buttons']['admin'])) {
 			Utils::$context['menu_buttons']['admin']['sub_buttons']['memberapprove']['amt'] = Utils::$context['unapproved_members'];
 			Utils::$context['total_admin_reports'] += Utils::$context['unapproved_members'];
 		}
 
-		if (Utils::$context['total_admin_reports'] > 0 && !empty(Utils::$context['menu_buttons']['admin']))
-		{
+		if (Utils::$context['total_admin_reports'] > 0 && !empty(Utils::$context['menu_buttons']['admin'])) {
 			Utils::$context['menu_buttons']['admin']['amt'] = Utils::$context['total_admin_reports'];
 		}
 
 		// Do we have any open reports?
-		if (Utils::$context['total_mod_reports'] > 0 && !empty(Utils::$context['menu_buttons']['moderate']))
-		{
+		if (Utils::$context['total_mod_reports'] > 0 && !empty(Utils::$context['menu_buttons']['moderate'])) {
 			Utils::$context['menu_buttons']['moderate']['amt'] = Utils::$context['total_mod_reports'];
 		}
 
 		// Not all actions are simple.
-		IntegrationHook::call('integrate_current_action', array(&$current_action));
+		IntegrationHook::call('integrate_current_action', [&$current_action]);
 
-		if (isset(Utils::$context['menu_buttons'][$current_action]))
+		if (isset(Utils::$context['menu_buttons'][$current_action])) {
 			Utils::$context['menu_buttons'][$current_action]['active_button'] = true;
+		}
 	}
 
 	/**
@@ -1345,18 +1276,14 @@ public static function template_header()
 		self::setupContext();
 
 		// Print stuff to prevent caching of pages (except on attachment errors, etc.)
-		if (empty(Utils::$context['no_last_modified']))
-		{
+		if (empty(Utils::$context['no_last_modified'])) {
 			header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
 			header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
 			// Are we debugging the template/html content?
-			if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !BrowserDetector::isBrowser('ie'))
-			{
+			if (!isset($_REQUEST['xml']) && isset($_GET['debug']) && !BrowserDetector::isBrowser('ie')) {
 				header('content-type: application/xhtml+xml');
-			}
-			elseif (!isset($_REQUEST['xml']))
-			{
+			} elseif (!isset($_REQUEST['xml'])) {
 				header('content-type: text/html; charset=' . (empty(Utils::$context['character_set']) ? 'ISO-8859-1' : Utils::$context['character_set']));
 			}
 		}
@@ -1364,50 +1291,45 @@ public static function template_header()
 		header('content-type: text/' . (isset($_REQUEST['xml']) ? 'xml' : 'html') . '; charset=' . (empty(Utils::$context['character_set']) ? 'ISO-8859-1' : Utils::$context['character_set']));
 
 		// We need to splice this in after the body layer, or after the main layer for older stuff.
-		if (Utils::$context['in_maintenance'] && User::$me->is_admin)
-		{
+		if (Utils::$context['in_maintenance'] && User::$me->is_admin) {
 			$position = array_search('body', Utils::$context['template_layers']);
 
-			if ($position === false)
+			if ($position === false) {
 				$position = array_search('main', Utils::$context['template_layers']);
+			}
 
-			if ($position !== false)
-			{
+			if ($position !== false) {
 				$before = array_slice(Utils::$context['template_layers'], 0, $position + 1);
 				$after = array_slice(Utils::$context['template_layers'], $position + 1);
-				Utils::$context['template_layers'] = array_merge($before, array('maint_warning'), $after);
+				Utils::$context['template_layers'] = array_merge($before, ['maint_warning'], $after);
 			}
 		}
 
 		$checked_securityFiles = false;
 		$showed_banned = false;
-		foreach (Utils::$context['template_layers'] as $layer)
-		{
+
+		foreach (Utils::$context['template_layers'] as $layer) {
 			self::loadSubTemplate($layer . '_above', true);
 
 			// May seem contrived, but this is done in case the body and main layer aren't there...
-			if (in_array($layer, array('body', 'main')) && User::$me->allowedTo('admin_forum') && !User::$me->is_guest && !$checked_securityFiles)
-			{
+			if (in_array($layer, ['body', 'main']) && User::$me->allowedTo('admin_forum') && !User::$me->is_guest && !$checked_securityFiles) {
 				$checked_securityFiles = true;
 
-				$securityFiles = array('install.php', 'upgrade.php', 'convert.php', 'repair_paths.php', 'repair_settings.php', 'Settings.php~', 'Settings_bak.php~');
+				$securityFiles = ['install.php', 'upgrade.php', 'convert.php', 'repair_paths.php', 'repair_settings.php', 'Settings.php~', 'Settings_bak.php~'];
 
 				// Add your own files.
-				IntegrationHook::call('integrate_security_files', array(&$securityFiles));
+				IntegrationHook::call('integrate_security_files', [&$securityFiles]);
 
-				foreach ($securityFiles as $i => $securityFile)
-				{
-					if (!file_exists(Config::$boarddir . '/' . $securityFile))
+				foreach ($securityFiles as $i => $securityFile) {
+					if (!file_exists(Config::$boarddir . '/' . $securityFile)) {
 						unset($securityFiles[$i]);
+					}
 				}
 
 				// We are already checking so many files...just few more doesn't make any difference! :P
-				if (!empty(Config::$modSettings['currentAttachmentUploadDir']))
-				{
+				if (!empty(Config::$modSettings['currentAttachmentUploadDir'])) {
 					$path = Config::$modSettings['attachmentUploadDir'][Config::$modSettings['currentAttachmentUploadDir']];
-				}
-				else
-				{
+				} else {
 					$path = Config::$modSettings['attachmentUploadDir'];
 				}
 
@@ -1415,12 +1337,14 @@ public static function template_header()
 				Security::secureDirectory(Config::$cachedir);
 
 				// If agreement is enabled, at least the english version shall exist
-				if (!empty(Config::$modSettings['requireAgreement']))
+				if (!empty(Config::$modSettings['requireAgreement'])) {
 					$agreement = !file_exists(Config::$boarddir . '/agreement.txt');
+				}
 
 				// If privacy policy is enabled, at least the default language version shall exist
-				if (!empty(Config::$modSettings['requirePolicyAgreement']))
+				if (!empty(Config::$modSettings['requirePolicyAgreement'])) {
 					$policy_agreement = empty(Config::$modSettings['policy_' . Lang::$default]);
+				}
 
 				if (
 					!empty($securityFiles)
@@ -1430,39 +1354,42 @@ public static function template_header()
 					)
 					|| !empty($agreement)
 					|| !empty($policy_agreement)
-					|| !empty(Utils::$context['auth_secret_missing']))
-				{
+					|| !empty(Utils::$context['auth_secret_missing'])) {
 					echo '
 			<div class="errorbox">
 				<p class="alert">!!</p>
 				<h3>', empty($securityFiles) && empty(Utils::$context['auth_secret_missing']) ? Lang::$txt['generic_warning'] : Lang::$txt['security_risk'], '</h3>
 				<p>';
 
-					foreach ($securityFiles as $securityFile)
-					{
+					foreach ($securityFiles as $securityFile) {
 						echo '
 					', Lang::$txt['not_removed'], '<strong>', $securityFile, '</strong>!<br>';
 
-						if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~')
+						if ($securityFile == 'Settings.php~' || $securityFile == 'Settings_bak.php~') {
 							echo '
 					', sprintf(Lang::$txt['not_removed_extra'], $securityFile, substr($securityFile, 0, -1)), '<br>';
+						}
 					}
 
-					if (!empty(CacheApi::$enable) && !is_writable(Config::$cachedir))
+					if (!empty(CacheApi::$enable) && !is_writable(Config::$cachedir)) {
 						echo '
 					<strong>', Lang::$txt['cache_writable'], '</strong><br>';
+					}
 
-					if (!empty($agreement))
+					if (!empty($agreement)) {
 						echo '
 					<strong>', Lang::$txt['agreement_missing'], '</strong><br>';
+					}
 
-					if (!empty($policy_agreement))
+					if (!empty($policy_agreement)) {
 						echo '
 					<strong>', Lang::$txt['policy_agreement_missing'], '</strong><br>';
+					}
 
-					if (!empty(Utils::$context['auth_secret_missing']))
+					if (!empty(Utils::$context['auth_secret_missing'])) {
 						echo '
 					<strong>', Lang::$txt['auth_secret_missing'], '</strong><br>';
+					}
 
 					echo '
 				</p>
@@ -1470,26 +1397,21 @@ public static function template_header()
 				}
 			}
 			// If the user is banned from posting inform them of it.
-			elseif (in_array($layer, array('main', 'body')) && isset($_SESSION['ban']['cannot_post']) && !$showed_banned)
-			{
+			elseif (in_array($layer, ['main', 'body']) && isset($_SESSION['ban']['cannot_post']) && !$showed_banned) {
 				$showed_banned = true;
 				echo '
 					<div class="windowbg alert" style="margin: 2ex; padding: 2ex; border: 2px dashed red;">
 						', sprintf(Lang::$txt['you_are_post_banned'], User::$me->is_guest ? Lang::$txt['guest_title'] : User::$me->name);
 
-				if (!empty($_SESSION['ban']['cannot_post']['reason']))
-				{
+				if (!empty($_SESSION['ban']['cannot_post']['reason'])) {
 					echo '
 						<div style="padding-left: 4ex; padding-top: 1ex;">', $_SESSION['ban']['cannot_post']['reason'], '</div>';
 				}
 
-				if (!empty($_SESSION['ban']['expire_time']))
-				{
+				if (!empty($_SESSION['ban']['expire_time'])) {
 					echo '
 						<div>', sprintf(Lang::$txt['your_ban_expires'], Time::create('@' . $_SESSION['ban']['expire_time'])->format(null, false)), '</div>';
-				}
-				else
-				{
+				} else {
 					echo '
 						<div>', Lang::$txt['your_ban_expires_never'], '</div>';
 				}
@@ -1506,8 +1428,9 @@ public static function template_header()
 	public static function copyright()
 	{
 		// Don't display copyright for things like SSI.
-		if (SMF !== 1)
+		if (SMF !== 1) {
 			return;
+		}
 
 		// Put in the version...
 		printf(Lang::$forum_copyright, SMF_FULL_VERSION, SMF_SOFTWARE_YEAR, Config::$scripturl);
@@ -1523,10 +1446,10 @@ public static function template_footer()
 		Utils::$context['load_time'] = round(microtime(true) - TIME_START, 3);
 		Utils::$context['load_queries'] = Db::$count;
 
-		if (!empty(Utils::$context['template_layers']) && is_array(Utils::$context['template_layers']))
-		{
-			foreach (array_reverse(Utils::$context['template_layers']) as $layer)
+		if (!empty(Utils::$context['template_layers']) && is_array(Utils::$context['template_layers'])) {
+			foreach (array_reverse(Utils::$context['template_layers']) as $layer) {
 				self::loadSubTemplate($layer . '_below', true);
+			}
 		}
 	}
 
@@ -1539,26 +1462,26 @@ public static function template_footer()
 	public static function template_javascript($do_deferred = false)
 	{
 		// Use this hook to minify/optimize Javascript files and vars
-		IntegrationHook::call('integrate_pre_javascript_output', array(&$do_deferred));
+		IntegrationHook::call('integrate_pre_javascript_output', [&$do_deferred]);
 
-		$toMinify = array(
-			'standard' => array(),
-			'defer' => array(),
-			'async' => array(),
-		);
+		$toMinify = [
+			'standard' => [],
+			'defer' => [],
+			'async' => [],
+		];
 
 		// Output the declared Javascript variables.
-		if (!empty(Utils::$context['javascript_vars']) && !$do_deferred)
-		{
+		if (!empty(Utils::$context['javascript_vars']) && !$do_deferred) {
 			echo "\n\t<script>";
 
-			foreach (Utils::$context['javascript_vars'] as $key => $value)
-			{
-				if (!is_string($key) || is_numeric($key))
+			foreach (Utils::$context['javascript_vars'] as $key => $value) {
+				if (!is_string($key) || is_numeric($key)) {
 					continue;
+				}
 
-				if (!is_string($value) && !is_numeric($value))
+				if (!is_string($value) && !is_numeric($value)) {
 					$value = null;
+				}
 
 				echo "\n\t\t", 'var ', $key, isset($value) ? ' = ' . $value : '', ';';
 			}
@@ -1568,51 +1491,36 @@ public static function template_javascript($do_deferred = false)
 
 		// In the dark days before HTML5, deferred JS files needed to be loaded at the end of the body.
 		// Now we load them in the head and use 'async' and/or 'defer' attributes. Much better performance.
-		if (!$do_deferred)
-		{
+		if (!$do_deferred) {
 			// While we have JavaScript files to place in the template.
-			foreach (Utils::$context['javascript_files'] as $id => $js_file)
-			{
+			foreach (Utils::$context['javascript_files'] as $id => $js_file) {
 				// Last minute call! allow theme authors to disable single files.
-				if (!empty(self::$current->settings['disable_files']) && in_array($id, self::$current->settings['disable_files']))
-				{
+				if (!empty(self::$current->settings['disable_files']) && in_array($id, self::$current->settings['disable_files'])) {
 					continue;
 				}
 
 				// By default files don't get minimized unless the file explicitly says so!
-				if (!empty($js_file['options']['minimize']) && !empty(Config::$modSettings['minimize_files']))
-				{
-					if (!empty($js_file['options']['async']))
-					{
+				if (!empty($js_file['options']['minimize']) && !empty(Config::$modSettings['minimize_files'])) {
+					if (!empty($js_file['options']['async'])) {
 						$toMinify['async'][] = $js_file;
-					}
-					elseif (!empty($js_file['options']['defer']))
-					{
+					} elseif (!empty($js_file['options']['defer'])) {
 						$toMinify['defer'][] = $js_file;
-					}
-					else
-					{
+					} else {
 						$toMinify['standard'][] = $js_file;
 					}
 
 					// Grab a random seed.
-					if (!isset($minSeed) && isset($js_file['options']['seed']))
+					if (!isset($minSeed) && isset($js_file['options']['seed'])) {
 						$minSeed = $js_file['options']['seed'];
-				}
-				else
-				{
-					echo "\n\t" . '<script src="', $js_file['fileUrl'], isset($js_file['options']['seed']) ? $js_file['options']['seed'] : '', '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '';
+					}
+				} else {
+					echo "\n\t" . '<script src="', $js_file['fileUrl'], $js_file['options']['seed'] ?? '', '"', !empty($js_file['options']['async']) ? ' async' : '', !empty($js_file['options']['defer']) ? ' defer' : '';
 
-					if (!empty($js_file['options']['attributes']))
-					{
-						foreach ($js_file['options']['attributes'] as $key => $value)
-						{
-							if (is_bool($value))
-							{
+					if (!empty($js_file['options']['attributes'])) {
+						foreach ($js_file['options']['attributes'] as $key => $value) {
+							if (is_bool($value)) {
 								echo !empty($value) ? ' ' . $key : '';
-							}
-							else
-							{
+							} else {
 								echo ' ', $key, '="', $value, '"';
 							}
 						}
@@ -1622,16 +1530,13 @@ public static function template_javascript($do_deferred = false)
 				}
 			}
 
-			foreach ($toMinify as $js_files)
-			{
-				if (!empty($js_files))
-				{
+			foreach ($toMinify as $js_files) {
+				if (!empty($js_files)) {
 					$result = self::custMinify($js_files, 'js');
 
-					$minSuccessful = array_keys($result) === array('smf_minified');
+					$minSuccessful = array_keys($result) === ['smf_minified'];
 
-					foreach ($result as $minFile)
-					{
+					foreach ($result as $minFile) {
 						echo "\n\t" . '<script src="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '"', !empty($minFile['options']['async']) ? ' async' : '', !empty($minFile['options']['defer']) ? ' defer' : '', '></script>';
 					}
 				}
@@ -1639,26 +1544,25 @@ public static function template_javascript($do_deferred = false)
 		}
 
 		// Inline JavaScript - Actually useful some times!
-		if (!empty(Utils::$context['javascript_inline']))
-		{
-			if (!empty(Utils::$context['javascript_inline']['defer']) && $do_deferred)
-			{
+		if (!empty(Utils::$context['javascript_inline'])) {
+			if (!empty(Utils::$context['javascript_inline']['defer']) && $do_deferred) {
 				echo "\n" . '<script>';
 				echo "\n" . 'window.addEventListener("DOMContentLoaded", function() {';
 
-				foreach (Utils::$context['javascript_inline']['defer'] as $js_code)
+				foreach (Utils::$context['javascript_inline']['defer'] as $js_code) {
 					echo "\n\t" . trim($js_code);
+				}
 
 				echo "\n" . '});';
 				echo "\n" . '</script>';
 			}
 
-			if (!empty(Utils::$context['javascript_inline']['standard']) && !$do_deferred)
-			{
+			if (!empty(Utils::$context['javascript_inline']['standard']) && !$do_deferred) {
 				echo "\n\t" . '<script>';
 
-				foreach (Utils::$context['javascript_inline']['standard'] as $js_code)
+				foreach (Utils::$context['javascript_inline']['standard'] as $js_code) {
 					echo "\n\t\t" . trim($js_code);
+				}
 
 				echo "\n\t" . '</script>';
 			}
@@ -1673,74 +1577,62 @@ public static function template_css()
 		// Use this hook to minify/optimize CSS files
 		IntegrationHook::call('integrate_pre_css_output');
 
-		$toMinify = array();
-		$normal = array();
+		$toMinify = [];
+		$normal = [];
 
 		uasort(
 			Utils::$context['css_files'],
-			function ($a, $b)
-			{
+			function ($a, $b) {
 				return $a['options']['order_pos'] < $b['options']['order_pos'] ? -1 : ($a['options']['order_pos'] > $b['options']['order_pos'] ? 1 : 0);
-			}
+			},
 		);
 
-		foreach (Utils::$context['css_files'] as $id => $file)
-		{
+		foreach (Utils::$context['css_files'] as $id => $file) {
 			// Last minute call! allow theme authors to disable single files.
-			if (!empty(self::$current->settings['disable_files']) && in_array($id, self::$current->settings['disable_files']))
-			{
+			if (!empty(self::$current->settings['disable_files']) && in_array($id, self::$current->settings['disable_files'])) {
 				continue;
 			}
 
 			// Files are minimized unless they explicitly opt out.
-			if (!isset($file['options']['minimize']))
+			if (!isset($file['options']['minimize'])) {
 				$file['options']['minimize'] = true;
+			}
 
-			if (!empty($file['options']['minimize']) && !empty(Config::$modSettings['minimize_files']) && !isset($_REQUEST['normalcss']))
-			{
+			if (!empty($file['options']['minimize']) && !empty(Config::$modSettings['minimize_files']) && !isset($_REQUEST['normalcss'])) {
 				$toMinify[] = $file;
 
 				// Grab a random seed.
-				if (!isset($minSeed) && isset($file['options']['seed']))
+				if (!isset($minSeed) && isset($file['options']['seed'])) {
 					$minSeed = $file['options']['seed'];
-			}
-			else
-			{
-				$normal[] = array(
-					'url' => $file['fileUrl'] . (isset($file['options']['seed']) ? $file['options']['seed'] : ''),
-					'attributes' => !empty($file['options']['attributes']) ? $file['options']['attributes'] : array()
-				);
+				}
+			} else {
+				$normal[] = [
+					'url' => $file['fileUrl'] . ($file['options']['seed'] ?? ''),
+					'attributes' => !empty($file['options']['attributes']) ? $file['options']['attributes'] : [],
+				];
 			}
 		}
 
-		if (!empty($toMinify))
-		{
+		if (!empty($toMinify)) {
 			$result = self::custMinify($toMinify, 'css');
 
-			$minSuccessful = array_keys($result) === array('smf_minified');
+			$minSuccessful = array_keys($result) === ['smf_minified'];
 
-			foreach ($result as $minFile)
-			{
+			foreach ($result as $minFile) {
 				echo "\n\t" . '<link rel="stylesheet" href="', $minFile['fileUrl'], $minSuccessful && isset($minSeed) ? $minSeed : '', '">';
 			}
 		}
 
 		// Print the rest after the minified files.
-		if (!empty($normal))
-			foreach ($normal as $nf)
-			{
+		if (!empty($normal)) {
+			foreach ($normal as $nf) {
 				echo "\n\t" . '<link rel="stylesheet" href="', $nf['url'], '"';
 
-				if (!empty($nf['attributes']))
-				{
-					foreach ($nf['attributes'] as $key => $value)
-					{
-						if (is_bool($value))
-						{
+				if (!empty($nf['attributes'])) {
+					foreach ($nf['attributes'] as $key => $value) {
+						if (is_bool($value)) {
 							echo !empty($value) ? ' ' . $key : '';
-						}
-						else
-						{
+						} else {
 							echo ' ', $key, '="', $value, '"';
 						}
 					}
@@ -1748,22 +1640,23 @@ function ($a, $b)
 
 				echo '>';
 			}
+		}
 
-		if (Config::$db_show_debug === true)
-		{
+		if (Config::$db_show_debug === true) {
 			// Try to keep only what's useful.
-			$repl = array(Config::$boardurl . '/Themes/' => '', Config::$boardurl . '/' => '');
+			$repl = [Config::$boardurl . '/Themes/' => '', Config::$boardurl . '/' => ''];
 
-			foreach (Utils::$context['css_files'] as $file)
+			foreach (Utils::$context['css_files'] as $file) {
 				Utils::$context['debug']['sheets'][] = strtr($file['fileName'], $repl);
+			}
 		}
 
-		if (!empty(Utils::$context['css_header']))
-		{
+		if (!empty(Utils::$context['css_header'])) {
 			echo "\n\t" . '<style>';
 
-			foreach (Utils::$context['css_header'] as $css)
+			foreach (Utils::$context['css_header'] as $css) {
 				echo "\n\t" . trim($css);
+			}
 
 			echo "\n\t" . '</style>';
 		}
@@ -1779,36 +1672,37 @@ function ($a, $b)
 	 */
 	public static function custMinify($data, $type)
 	{
-		$types = array('css', 'js');
+		$types = ['css', 'js'];
 		$type = !empty($type) && in_array($type, $types) ? $type : false;
-		$data = is_array($data) ? $data : array();
+		$data = is_array($data) ? $data : [];
 
-		if (empty($type) || empty($data))
+		if (empty($type) || empty($data)) {
 			return $data;
+		}
 
 		// Different pages include different files, so we use a hash to label the different combinations
 		$hash = md5(implode(' ', array_map(
-			function($file)
-			{
+			function ($file) {
 				return $file['filePath'] . '-' . $file['mtime'];
 			},
-			$data
+			$data,
 		)));
 
 		// Is this a deferred or asynchronous JavaScript file?
 		$async = $type === 'js';
 		$defer = $type === 'js';
-		if ($type === 'js')
-		{
-			foreach ($data as $id => $file)
-			{
+
+		if ($type === 'js') {
+			foreach ($data as $id => $file) {
 				// A minified script should only be loaded asynchronously if all its components wanted to be.
-				if (empty($file['options']['async']))
+				if (empty($file['options']['async'])) {
 					$async = false;
+				}
 
 				// A minified script should only be deferred if all its components wanted to be.
-				if (empty($file['options']['defer']))
+				if (empty($file['options']['defer'])) {
 					$defer = false;
+				}
 			}
 		}
 
@@ -1817,18 +1711,17 @@ function($file)
 		$already_exists = file_exists($minified_file);
 
 		// Already done?
-		if ($already_exists)
-		{
-			return array('smf_minified' => array(
+		if ($already_exists) {
+			return ['smf_minified' => [
 				'fileUrl' => self::$current->settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($minified_file),
 				'filePath' => $minified_file,
 				'fileName' => basename($minified_file),
-				'options' => array('async' => !empty($async), 'defer' => !empty($defer)),
-			));
+				'options' => ['async' => !empty($async), 'defer' => !empty($defer)],
+			]];
 		}
+
 		// File has to exist. If it doesn't, try to create it.
-		elseif (@fopen($minified_file, 'w') === false || !Utils::makeWritable($minified_file))
-		{
+		if (@fopen($minified_file, 'w') === false || !Utils::makeWritable($minified_file)) {
 			Lang::load('Errors');
 			ErrorHandler::log(sprintf(Lang::$txt['file_not_created'], $minified_file), 'general');
 
@@ -1841,13 +1734,11 @@ function($file)
 
 		$minifier = new $classType();
 
-		foreach ($data as $id => $file)
-		{
+		foreach ($data as $id => $file) {
 			$toAdd = !empty($file['filePath']) && file_exists($file['filePath']) ? $file['filePath'] : false;
 
 			// The file couldn't be located so it won't be added. Log this error.
-			if (empty($toAdd))
-			{
+			if (empty($toAdd)) {
 				Lang::load('Errors');
 				ErrorHandler::log(sprintf(Lang::$txt['file_minimize_fail'], !empty($file['fileName']) ? $file['fileName'] : $id), 'general');
 
@@ -1864,8 +1755,7 @@ function($file)
 		clearstatcache();
 
 		// Minify process failed.
-		if (!filesize($minified_file))
-		{
+		if (!filesize($minified_file)) {
 			Lang::load('Errors');
 			ErrorHandler::log(sprintf(Lang::$txt['file_not_created'], $minified_file), 'general');
 
@@ -1873,12 +1763,12 @@ function($file)
 			return $data;
 		}
 
-		return array('smf_minified' => array(
+		return ['smf_minified' => [
 			'fileUrl' => self::$current->settings['theme_url'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/' . basename($minified_file),
 			'filePath' => $minified_file,
 			'fileName' => basename($minified_file),
-			'options' => array('async' => $async, 'defer' => $defer),
-		));
+			'options' => ['async' => $async, 'defer' => $defer],
+		]];
 	}
 
 	/**
@@ -1886,32 +1776,29 @@ function($file)
 	 */
 	public static function deleteAllMinified()
 	{
-		$not_deleted = array();
+		$not_deleted = [];
 		$most_recent = 0;
 
 		// Kinda sucks that we need to do another query to get all the theme dirs, but c'est la vie.
-		$request = Db::$db->query('', '
-			SELECT id_theme AS id, value AS dir
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme AS id, value AS dir
 			FROM {db_prefix}themes
 			WHERE variable = {string:var}',
-			array(
+			[
 				'var' => 'theme_dir',
-			)
+			],
 		);
-		while ($theme = Db::$db->fetch_assoc($request))
-		{
-			foreach (array('css', 'js') as $type)
-			{
-				foreach (glob(rtrim($theme['dir'], '/') . '/' . ($type == 'css' ? 'css' : 'scripts') . '/*.' . $type) as $filename)
-				{
+
+		while ($theme = Db::$db->fetch_assoc($request)) {
+			foreach (['css', 'js'] as $type) {
+				foreach (glob(rtrim($theme['dir'], '/') . '/' . ($type == 'css' ? 'css' : 'scripts') . '/*.' . $type) as $filename) {
 					// We want to find the most recent mtime of non-minified files
-					if (strpos(pathinfo($filename, PATHINFO_BASENAME), 'minified') === false)
-					{
+					if (strpos(pathinfo($filename, PATHINFO_BASENAME), 'minified') === false) {
 						$most_recent = max($most_recent, (int) @filemtime($filename));
 					}
 					// Try to delete minified files. Add them to our error list if that fails.
-					elseif (!@unlink($filename))
-					{
+					elseif (!@unlink($filename)) {
 						$not_deleted[] = $filename;
 					}
 				}
@@ -1920,12 +1807,12 @@ public static function deleteAllMinified()
 		Db::$db->free_result($request);
 
 		// This setting tracks the most recent modification time of any of our CSS and JS files
-		if ($most_recent != Config::$modSettings['browser_cache'])
-			Config::updateModSettings(array('browser_cache' => $most_recent));
+		if ($most_recent != Config::$modSettings['browser_cache']) {
+			Config::updateModSettings(['browser_cache' => $most_recent]);
+		}
 
 		// If any of the files could not be deleted, log an error about it.
-		if (!empty($not_deleted))
-		{
+		if (!empty($not_deleted)) {
 			Lang::load('Errors');
 			ErrorHandler::log(sprintf(Lang::$txt['unlink_minimized_fail'], implode('<br>', $not_deleted)), 'general');
 		}
@@ -1945,24 +1832,27 @@ public static function setJavaScript()
 		// Check the session id.
 		User::$me->checkSession('get');
 
-		if (!isset(self::$current))
+		if (!isset(self::$current)) {
 			self::load();
+		}
 
 		// This good-for-nothing pixel is being used to keep the session alive.
-		if (empty($_GET['var']) || !isset($_GET['val']))
+		if (empty($_GET['var']) || !isset($_GET['val'])) {
 			Utils::redirectexit(self::$current->settings['images_url'] . '/blank.png');
+		}
 
 		// Sorry, guests can't go any further than this.
-		if (User::$me->is_guest || User::$me->id == 0)
+		if (User::$me->is_guest || User::$me->id == 0) {
 			Utils::obExit(false);
+		}
 
 		// Can't change reserved vars.
-		if (in_array(strtolower($_GET['var']), self::$reservedVars))
+		if (in_array(strtolower($_GET['var']), self::$reservedVars)) {
 			Utils::redirectexit(self::$current->settings['images_url'] . '/blank.png');
+		}
 
 		// Use a specific theme?
-		if (isset($_GET['th']) || isset($_GET['id']))
-		{
+		if (isset($_GET['th']) || isset($_GET['id'])) {
 			// Invalidate the current themes cache too.
 			CacheApi::put('theme_settings-' . self::$current->settings['theme_id'] . ':' . User::$me->id, null, 60);
 
@@ -1970,24 +1860,25 @@ public static function setJavaScript()
 		}
 
 		// If this is the admin preferences the passed value will just be an element of it.
-		if ($_GET['var'] == 'admin_preferences')
-		{
-			self::$current->options['admin_preferences'] = !empty(self::$current->options['admin_preferences']) ? Utils::jsonDecode(self::$current->options['admin_preferences'], true) : array();
+		if ($_GET['var'] == 'admin_preferences') {
+			self::$current->options['admin_preferences'] = !empty(self::$current->options['admin_preferences']) ? Utils::jsonDecode(self::$current->options['admin_preferences'], true) : [];
 
 			// New thingy...
-			if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5)
+			if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5) {
 				self::$current->options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+			}
 
 			// Change the value to be something nice,
 			$_GET['val'] = Utils::jsonEncode(self::$current->options['admin_preferences']);
 		}
 
 		// Update the option.
-		Db::$db->insert('replace',
+		Db::$db->insert(
+			'replace',
 			'{db_prefix}themes',
-			array('id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
-			array(self::$current->settings['theme_id'], User::$me->id, $_GET['var'], is_array($_GET['val']) ? implode(',', $_GET['val']) : $_GET['val']),
-			array('id_theme', 'id_member', 'variable')
+			['id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
+			[self::$current->settings['theme_id'], User::$me->id, $_GET['var'], is_array($_GET['val']) ? implode(',', $_GET['val']) : $_GET['val']],
+			['id_theme', 'id_member', 'variable'],
 		);
 
 		CacheApi::put('theme_settings-' . self::$current->settings['theme_id'] . ':' . User::$me->id, null, 60);
@@ -2009,24 +1900,24 @@ public static function setJavaScript()
 	public static function wrapAction()
 	{
 		// Load any necessary template(s)?
-		if (isset(self::$current->settings['catch_action']['template']))
-		{
+		if (isset(self::$current->settings['catch_action']['template'])) {
 			// Load both the template and language file. (but don't fret if the language file isn't there...)
 			self::loadTemplate(self::$current->settings['catch_action']['template']);
 			Lang::load(self::$current->settings['catch_action']['template'], '', false);
 		}
 
 		// Any special layers?
-		if (isset(self::$current->settings['catch_action']['layers']))
+		if (isset(self::$current->settings['catch_action']['layers'])) {
 			Utils::$context['template_layers'] = self::$current->settings['catch_action']['layers'];
+		}
 
 		// Any function to call?
-		if (isset(self::$current->settings['catch_action']['function']))
-		{
+		if (isset(self::$current->settings['catch_action']['function'])) {
 			$hook = self::$current->settings['catch_action']['function'];
 
-			if (!isset(self::$current->settings['catch_action']['filename']))
+			if (!isset(self::$current->settings['catch_action']['filename'])) {
 				self::$current->settings['catch_action']['filename'] = '';
+			}
 
 			IntegrationHook::add('integrate_wrap_action', $hook, false, self::$current->settings['catch_action']['filename'], false);
 
@@ -2034,8 +1925,9 @@ public static function wrapAction()
 		}
 
 		// And finally, the main sub template ;).
-		if (isset(self::$current->settings['catch_action']['sub_template']))
+		if (isset(self::$current->settings['catch_action']['sub_template'])) {
 			Utils::$context['sub_template'] = self::$current->settings['catch_action']['sub_template'];
+		}
 	}
 
 	/**
@@ -2044,8 +1936,7 @@ public static function wrapAction()
 	public static function dispatch()
 	{
 		// If any sub-action besides 'pick' was requested, redirect to admin.
-		if (!isset($_REQUEST['sa']) || $_REQUEST['sa'] !== 'pick')
-		{
+		if (!isset($_REQUEST['sa']) || $_REQUEST['sa'] !== 'pick') {
 			Utils::redirectexit('action=admin;area=theme' . (isset($_REQUEST['sa']) ? ';sa=' . $_REQUEST['sa'] : '') . (isset($_REQUEST['u']) ? ';u=' . $_REQUEST['u'] : ''));
 		}
 
@@ -2065,18 +1956,15 @@ public static function pickTheme()
 		$_REQUEST['u'] = !isset($_REQUEST['u']) ? User::$me->id : (int) $_REQUEST['u'];
 
 		// Only admins can change default values.
-		if (in_array($_REQUEST['u'], array(-1, 0)))
-		{
+		if (in_array($_REQUEST['u'], [-1, 0])) {
 			User::$me->isAllowedTo('admin_forum');
 		}
 		// Is the ability to change themes enabled overall?
-		elseif (empty(Config::$modSettings['theme_allow']))
-		{
+		elseif (empty(Config::$modSettings['theme_allow'])) {
 			Utils::redirectexit('action=profile;area=theme;u=' . $_REQUEST['u']);
 		}
 		// Does the current user have permission to change themes for the specified user?
-		else
-		{
+		else {
 			User::$me->isAllowedTo('profile_extra' . ($_REQUEST['u'] === User::$me->id ? '_own' : '_any'));
 		}
 
@@ -2086,58 +1974,57 @@ public static function pickTheme()
 		self::loadTemplate('Themes');
 
 		// Build the link tree.
-		Utils::$context['linktree'][] = array(
+		Utils::$context['linktree'][] = [
 			'url' => Config::$scripturl . '?action=theme;sa=pick;u=' . $_REQUEST['u'],
 			'name' => Lang::$txt['theme_pick'],
-		);
+		];
 		Utils::$context['default_theme_id'] = Config::$modSettings['theme_default'];
 		$_SESSION['id_theme'] = 0;
 
 		// Have we made a decision, or are we just browsing?
-		if (isset($_POST['save']))
-		{
+		if (isset($_POST['save'])) {
 			User::$me->checkSession();
 			SecurityToken::validate('pick-th');
 
 			$id_theme = (int) key($_POST['save']);
 
-			if (isset($_POST['vrt'][$id_theme]))
+			if (isset($_POST['vrt'][$id_theme])) {
 				$variant = $_POST['vrt'][$id_theme];
+			}
 
 			// -1 means we are setting the forum's default theme.
-			if ($_REQUEST['u'] === -1)
-			{
-				Config::updateModSettings(array('theme_guests' => $id_theme));
-				Utils::redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+			if ($_REQUEST['u'] === -1) {
+				Config::updateModSettings(['theme_guests' => $id_theme]);
+				Utils::redirectexit('action=admin;area=theme;sa=admin;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 			}
 			// 0 means we are resetting everyone's theme.
-			elseif ($_REQUEST['u'] === 0)
-			{
-				User::updateMemberData(null, array('id_theme' => $id_theme));
-				Utils::redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+			elseif ($_REQUEST['u'] === 0) {
+				User::updateMemberData(null, ['id_theme' => $id_theme]);
+				Utils::redirectexit('action=admin;area=theme;sa=admin;' . Utils::$context['session_var'] . '=' . Utils::$context['session_id']);
 			}
 			// Setting a particular user's theme.
-			elseif (self::canPickTheme($_REQUEST['u'], $id_theme))
-			{
+			elseif (self::canPickTheme($_REQUEST['u'], $id_theme)) {
 				// An identifier of zero means that the user wants the forum default theme.
-				User::updateMemberData($_REQUEST['u'], array('id_theme' => $id_theme));
+				User::updateMemberData($_REQUEST['u'], ['id_theme' => $id_theme]);
 
-				if (!empty($variant))
-				{
+				if (!empty($variant)) {
 					// Set the identifier to the forum default.
-					if (isset($id_theme) && $id_theme == 0)
+					if (isset($id_theme) && $id_theme == 0) {
 						$id_theme = Config::$modSettings['theme_guests'];
+					}
 
-					Db::$db->insert('replace',
+					Db::$db->insert(
+						'replace',
 						'{db_prefix}themes',
-						array('id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
-						array($id_theme, $_REQUEST['u'], 'theme_variant', $variant),
-						array('id_theme', 'id_member', 'variable')
+						['id_theme' => 'int', 'id_member' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'],
+						[$id_theme, $_REQUEST['u'], 'theme_variant', $variant],
+						['id_theme', 'id_member', 'variable'],
 					);
 					CacheApi::put('theme_settings-' . $id_theme . ':' . $_REQUEST['u'], null, 90);
 
-					if (User::$me->id == $_REQUEST['u'])
+					if (User::$me->id == $_REQUEST['u']) {
 						$_SESSION['id_variant'] = 0;
+					}
 				}
 
 				Utils::redirectexit('action=profile;area=theme;u=' . $_REQUEST['u']);
@@ -2147,54 +2034,51 @@ public static function pickTheme()
 		// Figure out who the member of the minute is, and what theme they've chosen.
 		Utils::$context['current_member'] = $_REQUEST['u'];
 
-		if (Utils::$context['current_member'] === User::$me->id)
-		{
+		if (Utils::$context['current_member'] === User::$me->id) {
 			Utils::$context['current_theme'] = User::$me->theme;
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT id_theme
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_theme
 				FROM {db_prefix}members
 				WHERE id_member = {int:current_member}
 				LIMIT 1',
-				array(
+				[
 					'current_member' => Utils::$context['current_member'],
-				)
+				],
 			);
 			list(Utils::$context['current_theme']) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// Get the theme name and descriptions.
-		Utils::$context['available_themes'] = array();
+		Utils::$context['available_themes'] = [];
 
-		if (!empty(Config::$modSettings['knownThemes']))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_theme, variable, value
+		if (!empty(Config::$modSettings['knownThemes'])) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_theme, variable, value
 				FROM {db_prefix}themes
 				WHERE variable IN ({literal:name}, {literal:theme_url}, {literal:theme_dir}, {literal:images_url}, {literal:disable_user_variant})' . (!User::$me->allowedTo('admin_forum') ? '
 					AND id_theme IN ({array_int:known_themes})' : '') . '
 					AND id_theme != {int:default_theme}
 					AND id_member = {int:no_member}
 					AND id_theme IN ({array_int:enable_themes})',
-				array(
+				[
 					'default_theme' => 0,
 					'no_member' => 0,
 					'known_themes' => explode(',', Config::$modSettings['knownThemes']),
 					'enable_themes' => explode(',', Config::$modSettings['enableThemes']),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (!isset(Utils::$context['available_themes'][$row['id_theme']]))
-				{
-					Utils::$context['available_themes'][$row['id_theme']] = array(
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (!isset(Utils::$context['available_themes'][$row['id_theme']])) {
+					Utils::$context['available_themes'][$row['id_theme']] = [
 						'id' => $row['id_theme'],
 						'selected' => Utils::$context['current_theme'] == $row['id_theme'],
-						'num_users' => 0
-					);
+						'num_users' => 0,
+					];
 				}
 				Utils::$context['available_themes'][$row['id_theme']][$row['variable']] = $row['value'];
 			}
@@ -2202,66 +2086,59 @@ public static function pickTheme()
 		}
 
 		// Okay, this is a complicated problem: the default theme is 1, but they aren't allowed to access 1!
-		if (!isset(Utils::$context['available_themes'][Config::$modSettings['theme_guests']]))
-		{
-			Utils::$context['available_themes'][0] = array(
-				'num_users' => 0
-			);
+		if (!isset(Utils::$context['available_themes'][Config::$modSettings['theme_guests']])) {
+			Utils::$context['available_themes'][0] = [
+				'num_users' => 0,
+			];
 			$guest_theme = 0;
-		}
-		else
-		{
+		} else {
 			$guest_theme = Config::$modSettings['theme_guests'];
 		}
 
-		$request = Db::$db->query('', '
-			SELECT id_theme, COUNT(*) AS the_count
+		$request = Db::$db->query(
+			'',
+			'SELECT id_theme, COUNT(*) AS the_count
 			FROM {db_prefix}members
 			GROUP BY id_theme
 			ORDER BY id_theme DESC',
-			array(
-			)
+			[
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			// Figure out which theme it is they are REALLY using.
-			if (!empty(Config::$modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', Config::$modSettings['knownThemes'])))
-			{
+			if (!empty(Config::$modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', Config::$modSettings['knownThemes']))) {
 				$row['id_theme'] = $guest_theme;
-			}
-			elseif (empty(Config::$modSettings['theme_allow']))
-			{
+			} elseif (empty(Config::$modSettings['theme_allow'])) {
 				$row['id_theme'] = $guest_theme;
 			}
 
-			if (isset(Utils::$context['available_themes'][$row['id_theme']]))
-			{
+			if (isset(Utils::$context['available_themes'][$row['id_theme']])) {
 				Utils::$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
-			}
-			else
-			{
+			} else {
 				Utils::$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// Get any member variant preferences.
-		$variant_preferences = array();
-		if (Utils::$context['current_member'] > 0)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_theme, value
+		$variant_preferences = [];
+
+		if (Utils::$context['current_member'] > 0) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_theme, value
 				FROM {db_prefix}themes
 				WHERE variable = {string:theme_variant}
 					AND id_member IN ({array_int:id_member})
 				ORDER BY id_member ASC',
-				array(
+				[
 					'theme_variant' => 'theme_variant',
-					'id_member' => isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? array(-1, Utils::$context['current_member']) : array(-1),
-				)
+					'id_member' => isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? [-1, Utils::$context['current_member']] : [-1],
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$variant_preferences[$row['id_theme']] = $row['value'];
 			}
 			Db::$db->free_result($request);
@@ -2269,69 +2146,66 @@ public static function pickTheme()
 
 		// Save the setting first.
 		$current_images_url = self::$current->settings['images_url'];
-		$current_theme_variants = !empty(self::$current->settings['theme_variants']) ? self::$current->settings['theme_variants'] : array();
+		$current_theme_variants = !empty(self::$current->settings['theme_variants']) ? self::$current->settings['theme_variants'] : [];
 
 		$current_lang_dirs = Lang::$dirs;
 		$current_thumbnail = Lang::$txt['theme_thumbnail_href'];
 		$current_description = Lang::$txt['theme_description'];
 
-		foreach (Utils::$context['available_themes'] as $id_theme => $theme_data)
-		{
+		foreach (Utils::$context['available_themes'] as $id_theme => $theme_data) {
 			// Don't try to load the forum or board default theme's data... it doesn't have any!
-			if ($id_theme == 0)
+			if ($id_theme == 0) {
 				continue;
+			}
 
 			// The thumbnail needs the correct path.
 			self::$current->settings['images_url'] = &$theme_data['images_url'];
 
-			Lang::addDirs(array($theme_data['theme_dir'] . '/languages'));
+			Lang::addDirs([$theme_data['theme_dir'] . '/languages']);
 			Lang::load('Settings', '', false, true);
 
-			if (empty(Lang::$txt['theme_thumbnail_href']))
+			if (empty(Lang::$txt['theme_thumbnail_href'])) {
 				Lang::$txt['theme_thumbnail_href'] = $theme_data['images_url'] . '/thumbnail.png';
+			}
 
-			if (empty(Lang::$txt['theme_description']))
+			if (empty(Lang::$txt['theme_description'])) {
 				Lang::$txt['theme_description'] = '';
+			}
 
 			Utils::$context['available_themes'][$id_theme]['thumbnail_href'] = sprintf(Lang::$txt['theme_thumbnail_href'], self::$current->settings['images_url']);
 
 			Utils::$context['available_themes'][$id_theme]['description'] = Lang::$txt['theme_description'];
 
 			// Are there any variants?
-			Utils::$context['available_themes'][$id_theme]['variants'] = array();
+			Utils::$context['available_themes'][$id_theme]['variants'] = [];
 
-			if (file_exists($theme_data['theme_dir'] . '/index.template.php') && (empty($theme_data['disable_user_variant']) || User::$me->allowedTo('admin_forum')))
-			{
+			if (file_exists($theme_data['theme_dir'] . '/index.template.php') && (empty($theme_data['disable_user_variant']) || User::$me->allowedTo('admin_forum'))) {
 				$file_contents = implode('', file($theme_data['theme_dir'] . '/index.template.php'));
 
-				if (preg_match('~((?:SMF\\\\)?Theme::\$current(?:->|_)|\$)settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches))
-				{
-					self::$current->settings['theme_variants'] = array();
+				if (preg_match('~((?:SMF\\\\)?Theme::\$current(?:->|_)|\$)settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
+					self::$current->settings['theme_variants'] = [];
 
 					// Fill settings up.
-					eval(($matches[1] === '$' ? 'global $settings; ' : '') . $matches[0]);
+					eval(($matches[1] === '$' ? 'global $settings; ' : 'use SMF\\Theme; ') . $matches[0]);
 
-					if (!empty(self::$current->settings['theme_variants']))
-					{
-						foreach (self::$current->settings['theme_variants'] as $variant)
-						{
-							Utils::$context['available_themes'][$id_theme]['variants'][$variant] = array(
-								'label' => isset(Lang::$txt['variant_' . $variant]) ? Lang::$txt['variant_' . $variant] : $variant,
+					if (!empty(self::$current->settings['theme_variants'])) {
+						foreach (self::$current->settings['theme_variants'] as $variant) {
+							Utils::$context['available_themes'][$id_theme]['variants'][$variant] = [
+								'label' => Lang::$txt['variant_' . $variant] ?? $variant,
 								'thumbnail' => file_exists($theme_data['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? $theme_data['images_url'] . '/thumbnail_' . $variant . '.png' : (file_exists($theme_data['theme_dir'] . '/images/thumbnail.png') ? $theme_data['images_url'] . '/thumbnail.png' : ''),
-							);
+							];
 						}
 
-						Utils::$context['available_themes'][$id_theme]['selected_variant'] = isset($_GET['vrt']) ? $_GET['vrt'] : (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty(self::$current->settings['default_variant']) ? self::$current->settings['default_variant'] : self::$current->settings['theme_variants'][0]));
+						Utils::$context['available_themes'][$id_theme]['selected_variant'] = $_GET['vrt'] ?? (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty(self::$current->settings['default_variant']) ? self::$current->settings['default_variant'] : self::$current->settings['theme_variants'][0]));
 
-						if (!isset(Utils::$context['available_themes'][$id_theme]['variants'][Utils::$context['available_themes'][$id_theme]['selected_variant']]['thumbnail']))
-						{
+						if (!isset(Utils::$context['available_themes'][$id_theme]['variants'][Utils::$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'])) {
 							Utils::$context['available_themes'][$id_theme]['selected_variant'] = self::$current->settings['theme_variants'][0];
 						}
 
 						Utils::$context['available_themes'][$id_theme]['thumbnail_href'] = Utils::$context['available_themes'][$id_theme]['variants'][Utils::$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'];
 
 						// Allow themes to override the text.
-						Utils::$context['available_themes'][$id_theme]['pick_label'] = isset(Lang::$txt['variant_pick']) ? Lang::$txt['variant_pick'] : Lang::$txt['theme_pick_variant'];
+						Utils::$context['available_themes'][$id_theme]['pick_label'] = Lang::$txt['variant_pick'] ?? Lang::$txt['theme_pick_variant'];
 					}
 				}
 			}
@@ -2345,22 +2219,19 @@ public static function pickTheme()
 		self::addJavaScriptVar(
 			'oThemeVariants',
 			Utils::jsonEncode(array_map(
-				function($theme)
-				{
+				function ($theme) {
 					return $theme['variants'];
 				},
-				Utils::$context['available_themes']
-			))
+				Utils::$context['available_themes'],
+			)),
 		);
-		self::loadJavaScriptFile('profile.js', array('defer' => false, 'minimize' => true), 'smf_profile');
+		self::loadJavaScriptFile('profile.js', ['defer' => false, 'minimize' => true], 'smf_profile');
 		self::$current->settings['images_url'] = $current_images_url;
 		self::$current->settings['theme_variants'] = $current_theme_variants;
 
 		// As long as we're not doing the default theme...
-		if ($_REQUEST['u'] >= 0)
-		{
-			if ($guest_theme != 0)
-			{
+		if ($_REQUEST['u'] >= 0) {
+			if ($guest_theme != 0) {
 				Utils::$context['available_themes'][0] = Utils::$context['available_themes'][$guest_theme];
 			}
 
@@ -2388,21 +2259,22 @@ function($theme)
 	 * @param string $label The Lang::$txt string to use as the label.
 	 * @param string $custom Custom text/html to add to the img tag. Only when
 	 *    using an actual image.
-	 * @param boolean $force_use Whether to override template_create_button and
+	 * @param bool $force_use Whether to override template_create_button and
 	 *    use this instead.
 	 * @return string The HTML to display the button.
 	 */
 	public static function createButton($name, $alt, $label = '', $custom = '', $force_use = false)
 	{
 		// Does the current loaded theme have this and we are not forcing the usage of this function?
-		if (function_exists('template_create_button') && !$force_use)
+		if (function_exists('template_create_button') && !$force_use) {
 			return template_create_button($name, $alt, $label = '', $custom = '');
+		}
 
-		if (!Theme::$current->settings['use_image_buttons'])
+		if (!Theme::$current->settings['use_image_buttons']) {
 			return Lang::$txt[$alt];
+		}
 
-		if (!empty(Theme::$current->settings['use_buttons']))
-		{
+		if (!empty(Theme::$current->settings['use_buttons'])) {
 			return '<span class="main_icons ' . $name . '" alt="' . Lang::$txt[$alt] . '"></span>' . ($label != '' ? '&nbsp;<strong>' . Lang::$txt[$label] . '</strong>' : '');
 		}
 
@@ -2423,88 +2295,78 @@ protected function __construct($id = 0, $member = -1)
 	{
 		$this->id = $id;
 
-		if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2 && ($temp = CacheApi::get('theme_settings-' . $this->id . ':' . $member, 60)) != null && time() - 60 > Config::$modSettings['settings_updated'])
-		{
+		if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2 && ($temp = CacheApi::get('theme_settings-' . $this->id . ':' . $member, 60)) != null && time() - 60 > Config::$modSettings['settings_updated']) {
 			$themeData = $temp;
 			$flag = true;
-		}
-		elseif (($temp = CacheApi::get('theme_settings-' . $this->id, 90)) != null && time() - 60 > Config::$modSettings['settings_updated'])
-		{
+		} elseif (($temp = CacheApi::get('theme_settings-' . $this->id, 90)) != null && time() - 60 > Config::$modSettings['settings_updated']) {
 			$themeData = $temp;
 
 			// If $member is 0 or -1, we might already have everything we need.
-			if (array_key_exists($member, $themeData))
-			{
+			if (array_key_exists($member, $themeData)) {
 				$flag = !empty($themeData[0]) && !empty($themeData[-1]);
 			}
 			// Nothing cached for this member.
-			else
-			{
-				$themeData[$member] = array();
+			else {
+				$themeData[$member] = [];
 			}
-		}
-		else
-		{
-			$themeData = array(-1 => array(), 0 => array());
+		} else {
+			$themeData = [-1 => [], 0 => []];
 
-			if (!array_key_exists($member, $themeData))
-				$themeData[$member] = array();
+			if (!array_key_exists($member, $themeData)) {
+				$themeData[$member] = [];
+			}
 		}
 
-		if (empty($flag))
-		{
+		if (empty($flag)) {
 			// Load variables from the current or default theme, global or this user's.
-			$result = Db::$db->query('', '
-				SELECT variable, value, id_member, id_theme
+			$result = Db::$db->query(
+				'',
+				'SELECT variable, value, id_member, id_theme
 				FROM {db_prefix}themes
 				WHERE id_member' . (empty($themeData[0]) ? ' IN ({array_int:members})' : ' = {int:id_member}') . '
 					AND id_theme' . ($this->id == 1 ? ' = {int:id_theme}' : ' IN ({array_int:themes})') . '
 				ORDER BY id_theme asc',
-				array(
+				[
 					'id_theme' => $this->id,
 					'id_member' => $member,
-					'themes' => array_unique(array(1, $this->id)),
-					'members' => array_unique(array(-1, 0, $member)),
-				)
+					'themes' => array_unique([1, $this->id]),
+					'members' => array_unique([-1, 0, $member]),
+				],
 			);
+
 			// Pick between $this->settings and $this->options depending on whose data it is.
-			foreach (Db::$db->fetch_all($result) as $row)
-			{
+			foreach (Db::$db->fetch_all($result) as $row) {
 				// There are just things we shouldn't be able to change as members.
-				if ($row['id_member'] != 0 && in_array($row['variable'], self::$reservedVars))
+				if ($row['id_member'] != 0 && in_array($row['variable'], self::$reservedVars)) {
 					continue;
+				}
 
 				// If this is the theme_dir of the default theme, store it.
-				if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
-				{
+				if (in_array($row['variable'], ['theme_dir', 'theme_url', 'images_url']) && $row['id_theme'] == '1' && empty($row['id_member'])) {
 					$themeData[0]['default_' . $row['variable']] = $row['value'];
 				}
 
 				// If this isn't set yet, is a theme option, or is not the default theme..
-				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
-				{
+				if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1') {
 					$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
 				}
 			}
 			Db::$db->free_result($result);
 
-			if (!empty($themeData[-1]))
-			{
-				foreach ($themeData[-1] as $k => $v)
-				{
-					if (!isset($themeData[$member][$k]))
+			if (!empty($themeData[-1])) {
+				foreach ($themeData[-1] as $k => $v) {
+					if (!isset($themeData[$member][$k])) {
 						$themeData[$member][$k] = $v;
+					}
 				}
 			}
 
-			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2)
-			{
+			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2) {
 				CacheApi::put('theme_settings-' . $this->id . ':' . $member, $themeData, 60);
 			}
 			// Only if we didn't already load that part of the cache...
-			elseif (!isset($temp))
-			{
-				CacheApi::put('theme_settings-' . $this->id, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+			elseif (!isset($temp)) {
+				CacheApi::put('theme_settings-' . $this->id, [-1 => $themeData[-1], 0 => $themeData[0]], 90);
 			}
 		}
 
@@ -2517,18 +2379,20 @@ protected function __construct($id = 0, $member = -1)
 		$this->settings['actual_images_url'] = $this->settings['images_url'];
 		$this->settings['actual_theme_dir'] = $this->settings['theme_dir'];
 
-		$this->settings['template_dirs'] = array();
+		$this->settings['template_dirs'] = [];
 
 		// This theme first.
 		$this->settings['template_dirs'][] = $this->settings['theme_dir'];
 
 		// Based on theme (if there is one).
-		if (!empty($this->settings['base_theme_dir']))
+		if (!empty($this->settings['base_theme_dir'])) {
 			$this->settings['template_dirs'][] = $this->settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($this->settings['theme_dir'] != $this->settings['default_theme_dir'])
+		if ($this->settings['theme_dir'] != $this->settings['default_theme_dir']) {
 			$this->settings['template_dirs'][] = $this->settings['default_theme_dir'];
+		}
 	}
 
 	/**
@@ -2542,29 +2406,36 @@ protected function initialize()
 		$this->fixUrl();
 
 		// Create User::$me if it is missing (e.g., an error very early in the login process).
-		if (!isset(User::$me))
+		if (!isset(User::$me)) {
 			User::load();
+		}
 
 		$this->fixSmileySet();
 
 		// Some basic information...
-		if (!isset(Utils::$context['html_headers']))
+		if (!isset(Utils::$context['html_headers'])) {
 			Utils::$context['html_headers'] = '';
+		}
 
-		if (!isset(Utils::$context['javascript_files']))
-			Utils::$context['javascript_files'] = array();
+		if (!isset(Utils::$context['javascript_files'])) {
+			Utils::$context['javascript_files'] = [];
+		}
 
-		if (!isset(Utils::$context['css_files']))
-			Utils::$context['css_files'] = array();
+		if (!isset(Utils::$context['css_files'])) {
+			Utils::$context['css_files'] = [];
+		}
 
-		if (!isset(Utils::$context['css_header']))
-			Utils::$context['css_header'] = array();
+		if (!isset(Utils::$context['css_header'])) {
+			Utils::$context['css_header'] = [];
+		}
 
-		if (!isset(Utils::$context['javascript_inline']))
-			Utils::$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
+		if (!isset(Utils::$context['javascript_inline'])) {
+			Utils::$context['javascript_inline'] = ['standard' => [], 'defer' => []];
+		}
 
-		if (!isset(Utils::$context['javascript_vars']))
-			Utils::$context['javascript_vars'] = array();
+		if (!isset(Utils::$context['javascript_vars'])) {
+			Utils::$context['javascript_vars'] = [];
+		}
 
 		Utils::$context['login_url'] = Config::$scripturl . '?action=login2';
 		Utils::$context['menu_separator'] = !empty($this->settings['use_image_buttons']) ? ' ' : ' | ';
@@ -2574,11 +2445,12 @@ protected function initialize()
 		Utils::$context['forum_name_html_safe'] = Utils::htmlspecialchars(Utils::$context['forum_name']);
 		Utils::$context['header_logo_url_html_safe'] = empty($this->settings['header_logo_url']) ? '' : Utils::htmlspecialchars($this->settings['header_logo_url']);
 		Utils::$context['current_action'] = isset($_REQUEST['action']) ? Utils::htmlspecialchars($_REQUEST['action']) : null;
-		Utils::$context['current_subaction'] = isset($_REQUEST['sa']) ? $_REQUEST['sa'] : null;
+		Utils::$context['current_subaction'] = $_REQUEST['sa'] ?? null;
 		Utils::$context['can_register'] = empty(Config::$modSettings['registration_method']) || Config::$modSettings['registration_method'] != 3;
 
-		if (isset(Config::$modSettings['load_average']))
+		if (isset(Config::$modSettings['load_average'])) {
 			Utils::$context['load_average'] = Config::$modSettings['load_average'];
+		}
 
 		// Detect the browser. This is separated out because it's also used in attachment downloads
 		BrowserDetector::call();
@@ -2586,20 +2458,23 @@ protected function initialize()
 		$this->loadTemplatesAndLangFiles();
 
 		// Allow overriding the forum's default time/number formats.
-		if (empty(User::$profiles[User::$me->id]['time_format']) && !empty(Lang::$txt['time_format']))
+		if (empty(User::$profiles[User::$me->id]['time_format']) && !empty(Lang::$txt['time_format'])) {
 			User::$me->time_format = Lang::$txt['time_format'];
+		}
 
 		// Set the character set from the template.
 		Utils::$context['character_set'] = empty(Config::$modSettings['global_character_set']) ? Lang::$txt['lang_character_set'] : Config::$modSettings['global_character_set'];
 		Utils::$context['right_to_left'] = !empty(Lang::$txt['lang_rtl']);
 
 		// Guests may still need a name.
-		if (User::$me->is_guest && empty(User::$me->name))
+		if (User::$me->is_guest && empty(User::$me->name)) {
 			User::$me->name = Lang::$txt['guest_title'];
+		}
 
 		// Any theme-related strings that need to be loaded?
-		if (!empty($this->settings['require_theme_strings']))
+		if (!empty($this->settings['require_theme_strings'])) {
 			Lang::load('ThemeStrings', '', false);
+		}
 
 		// Make a special URL for the language.
 		$this->settings['lang_images_url'] = $this->settings['images_url'] . '/' . (!empty(Lang::$txt['image_lang']) ? Lang::$txt['image_lang'] : User::$me->language);
@@ -2615,16 +2490,15 @@ protected function initialize()
 		$this->setupLinktree();
 
 		// Any files to include at this point?
-		if (!empty(Config::$modSettings['integrate_theme_include']))
-		{
+		if (!empty(Config::$modSettings['integrate_theme_include'])) {
 			$theme_includes = explode(',', Config::$modSettings['integrate_theme_include']);
 
-			foreach ($theme_includes as $include)
-			{
-				$include = strtr(trim($include), array('$boarddir' => Config::$boarddir, '$sourcedir' => Config::$sourcedir, '$themedir' => $this->settings['theme_dir']));
+			foreach ($theme_includes as $include) {
+				$include = strtr(trim($include), ['$boarddir' => Config::$boarddir, '$sourcedir' => Config::$sourcedir, '$themedir' => $this->settings['theme_dir']]);
 
-				if (file_exists($include))
-					require_once($include);
+				if (file_exists($include)) {
+					require_once $include;
+				}
 			}
 		}
 
@@ -2649,14 +2523,14 @@ protected function requireAgreement()
 		// 4a. View or accept the agreement and/or policy
 		// 4b. Login or logout
 		// 4c. Get a feed (RSS, ATOM, etc.)
-		if (!empty(User::$me->id) && empty(User::$me->is_admin) && SMF != 'SSI' && !isset($_REQUEST['xml']) && !QueryString::isFilteredRequest($this->agreement_actions, 'action'))
-		{
+		if (!empty(User::$me->id) && empty(User::$me->is_admin) && SMF != 'SSI' && !isset($_REQUEST['xml']) && !QueryString::isFilteredRequest($this->agreement_actions, 'action')) {
 			$can_accept_agreement = !empty(Config::$modSettings['requireAgreement']) && Agreement::canRequireAgreement();
 
 			$can_accept_privacy_policy = !empty(Config::$modSettings['requirePolicyAgreement']) && Agreement::canRequirePrivacyPolicy();
 
-			if ($can_accept_agreement || $can_accept_privacy_policy)
+			if ($can_accept_agreement || $can_accept_privacy_policy) {
 				Utils::redirectexit('action=agreement');
+			}
 		}
 	}
 
@@ -2665,16 +2539,14 @@ protected function requireAgreement()
 	 */
 	protected function sslRedirect()
 	{
-		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) &&
-			!Config::httpsOn() && SMF != 'SSI')
-		{
-			if (isset($_GET['sslRedirect']))
-			{
+		if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance)
+			&& !Config::httpsOn() && SMF != 'SSI') {
+			if (isset($_GET['sslRedirect'])) {
 				Lang::load('Errors');
 				ErrorHandler::fatalLang('login_ssl_required', false);
 			}
 
-			Utils::redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')) . (strpos($_SERVER['REQUEST_URL'], '?') > 0 ? ';' : '?') . 'sslRedirect');
+			Utils::redirectexit(strtr($_SERVER['REQUEST_URL'], ['http://' => 'https://']) . (strpos($_SERVER['REQUEST_URL'], '?') > 0 ? ';' : '?') . 'sslRedirect');
 		}
 	}
 
@@ -2684,94 +2556,84 @@ protected function sslRedirect()
 	protected function fixUrl()
 	{
 		// Check to see if they're accessing it from the wrong place.
-		if (isset($_SERVER['HTTP_HOST']) || isset($_SERVER['SERVER_NAME']))
-		{
+		if (isset($_SERVER['HTTP_HOST']) || isset($_SERVER['SERVER_NAME'])) {
 			$detected_url = Config::httpsOn() ? 'https://' : 'http://';
 
 			$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
 
 			$temp = preg_replace('~/' . basename(Config::$scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
 
-			if ($temp != '/')
+			if ($temp != '/') {
 				$detected_url .= $temp;
+			}
 		}
 
-		if (isset($detected_url) && $detected_url != Config::$boardurl)
-		{
+		if (isset($detected_url) && $detected_url != Config::$boardurl) {
 			// Try #1 - check if it's in a list of alias addresses.
-			if (!empty(Config::$modSettings['forum_alias_urls']))
-			{
+			if (!empty(Config::$modSettings['forum_alias_urls'])) {
 				$aliases = explode(',', Config::$modSettings['forum_alias_urls']);
 
-				foreach ($aliases as $alias)
-				{
+				foreach ($aliases as $alias) {
 					// Rip off all the boring parts, spaces, etc.
-					if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
-					{
+					if ($detected_url == trim($alias) || strtr($detected_url, ['http://' => '', 'https://' => '']) == trim($alias)) {
 						$do_fix = true;
 					}
 				}
 			}
 
 			// Hmm... check #2 - is it just different by a www?  Send them to the correct place!!
-			if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == Config::$boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI')
-			{
+			if (empty($do_fix) && strtr($detected_url, ['://' => '://www.']) == Config::$boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI') {
 				// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
-				if (empty($_GET))
-				{
+				if (empty($_GET)) {
 					Utils::redirectexit('wwwRedirect');
-				}
-				else
-				{
+				} else {
 					$k = key($_GET);
 					$v = current($_GET);
 
-					if ($k != 'wwwRedirect')
+					if ($k != 'wwwRedirect') {
 						Utils::redirectexit('wwwRedirect;' . $k . '=' . $v);
+					}
 				}
 			}
 
 			// #3 is just a check for SSL...
-			if (strtr($detected_url, array('https://' => 'http://')) == Config::$boardurl)
+			if (strtr($detected_url, ['https://' => 'http://']) == Config::$boardurl) {
 				$do_fix = true;
+			}
 
 			// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
-			if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1)
-			{
+			if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1) {
 				// Caching is good ;).
 				$oldurl = Config::$boardurl;
 
 				// Fix Config::$boardurl and Config::$scripturl.
 				Config::$boardurl = $detected_url;
-				Config::$scripturl = strtr(Config::$scripturl, array($oldurl => Config::$boardurl));
-				$_SERVER['REQUEST_URL'] = strtr($_SERVER['REQUEST_URL'], array($oldurl => Config::$boardurl));
+				Config::$scripturl = strtr(Config::$scripturl, [$oldurl => Config::$boardurl]);
+				$_SERVER['REQUEST_URL'] = strtr($_SERVER['REQUEST_URL'], [$oldurl => Config::$boardurl]);
 
 				// Fix the theme urls...
-				$this->settings['theme_url'] = strtr($this->settings['theme_url'], array($oldurl => Config::$boardurl));
-				$this->settings['default_theme_url'] = strtr($this->settings['default_theme_url'], array($oldurl => Config::$boardurl));
-				$this->settings['actual_theme_url'] = strtr($this->settings['actual_theme_url'], array($oldurl => Config::$boardurl));
-				$this->settings['images_url'] = strtr($this->settings['images_url'], array($oldurl => Config::$boardurl));
-				$this->settings['default_images_url'] = strtr($this->settings['default_images_url'], array($oldurl => Config::$boardurl));
-				$this->settings['actual_images_url'] = strtr($this->settings['actual_images_url'], array($oldurl => Config::$boardurl));
+				$this->settings['theme_url'] = strtr($this->settings['theme_url'], [$oldurl => Config::$boardurl]);
+				$this->settings['default_theme_url'] = strtr($this->settings['default_theme_url'], [$oldurl => Config::$boardurl]);
+				$this->settings['actual_theme_url'] = strtr($this->settings['actual_theme_url'], [$oldurl => Config::$boardurl]);
+				$this->settings['images_url'] = strtr($this->settings['images_url'], [$oldurl => Config::$boardurl]);
+				$this->settings['default_images_url'] = strtr($this->settings['default_images_url'], [$oldurl => Config::$boardurl]);
+				$this->settings['actual_images_url'] = strtr($this->settings['actual_images_url'], [$oldurl => Config::$boardurl]);
 
 				// And just a few mod settings :).
-				Config::$modSettings['smileys_url'] = strtr(Config::$modSettings['smileys_url'], array($oldurl => Config::$boardurl));
-				Config::$modSettings['avatar_url'] = strtr(Config::$modSettings['avatar_url'], array($oldurl => Config::$boardurl));
-				Config::$modSettings['custom_avatar_url'] = strtr(Config::$modSettings['custom_avatar_url'], array($oldurl => Config::$boardurl));
+				Config::$modSettings['smileys_url'] = strtr(Config::$modSettings['smileys_url'], [$oldurl => Config::$boardurl]);
+				Config::$modSettings['avatar_url'] = strtr(Config::$modSettings['avatar_url'], [$oldurl => Config::$boardurl]);
+				Config::$modSettings['custom_avatar_url'] = strtr(Config::$modSettings['custom_avatar_url'], [$oldurl => Config::$boardurl]);
 
 				// Clean up after Board::load().
-				if (isset(Board::$info->moderators))
-				{
-					foreach (Board::$info->moderators as $k => $dummy)
-					{
-						Board::$info->moderators[$k]['href'] = strtr($dummy['href'], array($oldurl => Config::$boardurl));
-						Board::$info->moderators[$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . Config::$boardurl));
+				if (isset(Board::$info->moderators)) {
+					foreach (Board::$info->moderators as $k => $dummy) {
+						Board::$info->moderators[$k]['href'] = strtr($dummy['href'], [$oldurl => Config::$boardurl]);
+						Board::$info->moderators[$k]['link'] = strtr($dummy['link'], ['"' . $oldurl => '"' . Config::$boardurl]);
 					}
 				}
 
-				foreach (Utils::$context['linktree'] as $k => $dummy)
-				{
-					Utils::$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => Config::$boardurl));
+				foreach (Utils::$context['linktree'] as $k => $dummy) {
+					Utils::$context['linktree'][$k]['url'] = strtr($dummy['url'], [$oldurl => Config::$boardurl]);
 				}
 			}
 		}
@@ -2784,8 +2646,7 @@ protected function fixSmileySet()
 	{
 		$smiley_sets_known = explode(',', Config::$modSettings['smiley_sets_known']);
 
-		if (empty(Config::$modSettings['smiley_sets_enable']) || (User::$me->smiley_set != 'none' && !in_array(User::$me->smiley_set, $smiley_sets_known)))
-		{
+		if (empty(Config::$modSettings['smiley_sets_enable']) || (User::$me->smiley_set != 'none' && !in_array(User::$me->smiley_set, $smiley_sets_known))) {
 			User::$me->smiley_set = !empty($this->settings['smiley_sets_default']) ? $this->settings['smiley_sets_default'] : Config::$modSettings['smiley_sets_default'];
 		}
 	}
@@ -2798,13 +2659,13 @@ protected function loadTemplatesAndLangFiles()
 		// This allows sticking some HTML on the page output - useful for controls.
 		Utils::$context['insert_after_template'] = '';
 
-		IntegrationHook::call('integrate_simple_actions', array(&$this->simpleActions, &$this->simpleAreas, &$this->simpleSubActions, &$this->extraParams, &$this->xmlActions));
+		IntegrationHook::call('integrate_simple_actions', [&$this->simpleActions, &$this->simpleAreas, &$this->simpleSubActions, &$this->extraParams, &$this->xmlActions]);
 
 		Utils::$context['simple_action'] = (
 			in_array(Utils::$context['current_action'], $this->simpleActions)
 			|| (
-				isset($this->simpleAreas[Utils::$context['current_action']])
-				&& isset($_REQUEST['area'])
+				isset($this->simpleAreas[Utils::$context['current_action']], $_REQUEST['area'])
+
 				&& in_array($_REQUEST['area'], $this->simpleAreas[Utils::$context['current_action']])
 			)
 			|| (
@@ -2815,55 +2676,46 @@ protected function loadTemplatesAndLangFiles()
 
 		// See if there is any extra param to check.
 		$requiresXML = false;
-		foreach ($this->extraParams as $key => $extra)
-		{
-			if (isset($_REQUEST[$extra]))
+
+		foreach ($this->extraParams as $key => $extra) {
+			if (isset($_REQUEST[$extra])) {
 				$requiresXML = true;
+			}
 		}
 
 		// Output is fully XML, so no need for the index template.
-		if (isset($_REQUEST['xml']) && (in_array(Utils::$context['current_action'], $this->xmlActions) || $requiresXML))
-		{
+		if (isset($_REQUEST['xml']) && (in_array(Utils::$context['current_action'], $this->xmlActions) || $requiresXML)) {
 			Lang::load('index+Modifications');
 			self::loadTemplate('Xml');
-			Utils::$context['template_layers'] = array();
+			Utils::$context['template_layers'] = [];
 		}
 
 		// These actions don't require the index template at all.
-		elseif (!empty(Utils::$context['simple_action']))
-		{
+		elseif (!empty(Utils::$context['simple_action'])) {
 			Lang::load('index+Modifications');
-			Utils::$context['template_layers'] = array();
-		}
-
-		else
-		{
+			Utils::$context['template_layers'] = [];
+		} else {
 			// Custom templates to load, or just default?
-			if (isset($this->settings['theme_templates']))
-			{
+			if (isset($this->settings['theme_templates'])) {
 				$templates = explode(',', $this->settings['theme_templates']);
-			}
-			else
-			{
-				$templates = array('index');
+			} else {
+				$templates = ['index'];
 			}
 
 			// Load each template...
-			foreach ($templates as $template)
+			foreach ($templates as $template) {
 				self::loadTemplate($template);
+			}
 
 			// ...and attempt to load their associated language files.
-			$required_files = implode('+', array_merge($templates, array('Modifications')));
+			$required_files = implode('+', array_merge($templates, ['Modifications']));
 			Lang::load($required_files, '', false);
 
 			// Custom template layers?
-			if (isset($this->settings['theme_layers']))
-			{
+			if (isset($this->settings['theme_layers'])) {
 				Utils::$context['template_layers'] = explode(',', $this->settings['theme_layers']);
-			}
-			else
-			{
-				Utils::$context['template_layers'] = array('html', 'body');
+			} else {
+				Utils::$context['template_layers'] = ['html', 'body'];
 			}
 		}
 
@@ -2877,13 +2729,14 @@ protected function loadTemplatesAndLangFiles()
 	protected function loadCss()
 	{
 		// And of course, let's load the default CSS file.
-		self::loadCSSFile('index.css', array('minimize' => true, 'order_pos' => 1), 'smf_index');
+		self::loadCSSFile('index.css', ['minimize' => true, 'order_pos' => 1], 'smf_index');
 
 		// Here is my luvly Responsive CSS
-		self::loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000), 'smf_responsive');
+		self::loadCSSFile('responsive.css', ['force_current' => false, 'validate' => true, 'minimize' => true, 'order_pos' => 9000], 'smf_responsive');
 
-		if (Utils::$context['right_to_left'])
-			self::loadCSSFile('rtl.css', array('order_pos' => 4000), 'smf_rtl');
+		if (Utils::$context['right_to_left']) {
+			self::loadCSSFile('rtl.css', ['order_pos' => 4000], 'smf_rtl');
+		}
 	}
 
 	/**
@@ -2895,21 +2748,19 @@ protected function loadVariant()
 		Utils::$context['theme_variant'] = '';
 		Utils::$context['theme_variant_url'] = '';
 
-		if (!empty($this->settings['theme_variants']))
-		{
+		if (!empty($this->settings['theme_variants'])) {
 			// Overriding - for previews and that ilk.
-			if (!empty($_REQUEST['variant']))
+			if (!empty($_REQUEST['variant'])) {
 				$_SESSION['id_variant'] = $_REQUEST['variant'];
+			}
 
 			// User selection?
-			if (empty($this->settings['disable_user_variant']) || User::$me->allowedTo('admin_forum'))
-			{
+			if (empty($this->settings['disable_user_variant']) || User::$me->allowedTo('admin_forum')) {
 				Utils::$context['theme_variant'] = !empty($_SESSION['id_variant']) && in_array($_SESSION['id_variant'], $this->settings['theme_variants']) ? $_SESSION['id_variant'] : (!empty($this->options['theme_variant']) && in_array($this->options['theme_variant'], $this->settings['theme_variants']) ? $this->options['theme_variant'] : '');
 			}
 
 			// If not a user variant, select the default.
-			if (Utils::$context['theme_variant'] == '' || !in_array(Utils::$context['theme_variant'], $this->settings['theme_variants']))
-			{
+			if (Utils::$context['theme_variant'] == '' || !in_array(Utils::$context['theme_variant'], $this->settings['theme_variants'])) {
 				Utils::$context['theme_variant'] = !empty($this->settings['default_variant']) && in_array($this->settings['default_variant'], $this->settings['theme_variants']) ? $this->settings['default_variant'] : $this->settings['theme_variants'][0];
 			}
 
@@ -2917,13 +2768,11 @@ protected function loadVariant()
 			Utils::$context['theme_variant'] = '_' . Utils::$context['theme_variant'];
 			Utils::$context['theme_variant_url'] = Utils::$context['theme_variant'] . '/';
 
-			if (!empty(Utils::$context['theme_variant']))
-			{
-				self::loadCSSFile('index' . Utils::$context['theme_variant'] . '.css', array('order_pos' => 300), 'smf_index' . Utils::$context['theme_variant']);
+			if (!empty(Utils::$context['theme_variant'])) {
+				self::loadCSSFile('index' . Utils::$context['theme_variant'] . '.css', ['order_pos' => 300], 'smf_index' . Utils::$context['theme_variant']);
 
-				if (Utils::$context['right_to_left'])
-				{
-					self::loadCSSFile('rtl' . Utils::$context['theme_variant'] . '.css', array('order_pos' => 4200), 'smf_rtl' . Utils::$context['theme_variant']);
+				if (Utils::$context['right_to_left']) {
+					self::loadCSSFile('rtl' . Utils::$context['theme_variant'] . '.css', ['order_pos' => 4200], 'smf_rtl' . Utils::$context['theme_variant']);
 				}
 			}
 		}
@@ -2935,7 +2784,7 @@ protected function loadVariant()
 	protected function loadJavaScript()
 	{
 		// Default JS variables for use in every theme
-		Utils::$context['javascript_vars'] = array(
+		Utils::$context['javascript_vars'] = [
 			'smf_theme_url' => '"' . $this->settings['theme_url'] . '"',
 			'smf_default_theme_url' => '"' . $this->settings['default_theme_url'] . '"',
 			'smf_images_url' => '"' . $this->settings['images_url'] . '"',
@@ -2958,63 +2807,56 @@ protected function loadJavaScript()
 			'smf_expandAlt' => Utils::JavaScriptEscape(Lang::$txt['show']),
 			'smf_quote_expand' => !empty(Config::$modSettings['quote_expand']) ? Config::$modSettings['quote_expand'] : 'false',
 			'allow_xhjr_credentials' => !empty(Config::$modSettings['allow_cors_credentials']) ? 'true' : 'false',
-		);
+		];
 
 		// Add the JQuery library to the list of files to load.
-		$jQueryUrls = array (
-			'cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/'. JQUERY_VERSION . '/jquery.min.js',
-			'jquery_cdn' => 'https://code.jquery.com/jquery-'. JQUERY_VERSION . '.min.js',
-			'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-'. JQUERY_VERSION . '.min.js'
-		);
-
-		if (isset(Config::$modSettings['jquery_source']) && array_key_exists(Config::$modSettings['jquery_source'], $jQueryUrls))
-		{
-			self::loadJavaScriptFile($jQueryUrls[Config::$modSettings['jquery_source']], array('external' => true, 'seed' => false), 'smf_jquery');
-		}
-		elseif (isset(Config::$modSettings['jquery_source']) && Config::$modSettings['jquery_source'] == 'local')
-		{
-			self::loadJavaScriptFile('jquery-' . JQUERY_VERSION . '.min.js', array('seed' => false), 'smf_jquery');
-		}
-		elseif (isset(Config::$modSettings['jquery_source'], Config::$modSettings['jquery_custom']) && Config::$modSettings['jquery_source'] == 'custom')
-		{
-			self::loadJavaScriptFile(Config::$modSettings['jquery_custom'], array('external' => true, 'seed' => false), 'smf_jquery');
+		$jQueryUrls =  [
+			'cdn' => 'https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js',
+			'jquery_cdn' => 'https://code.jquery.com/jquery-' . JQUERY_VERSION . '.min.js',
+			'microsoft_cdn' => 'https://ajax.aspnetcdn.com/ajax/jQuery/jquery-' . JQUERY_VERSION . '.min.js',
+		];
+
+		if (isset(Config::$modSettings['jquery_source']) && array_key_exists(Config::$modSettings['jquery_source'], $jQueryUrls)) {
+			self::loadJavaScriptFile($jQueryUrls[Config::$modSettings['jquery_source']], ['external' => true, 'seed' => false], 'smf_jquery');
+		} elseif (isset(Config::$modSettings['jquery_source']) && Config::$modSettings['jquery_source'] == 'local') {
+			self::loadJavaScriptFile('jquery-' . JQUERY_VERSION . '.min.js', ['seed' => false], 'smf_jquery');
+		} elseif (isset(Config::$modSettings['jquery_source'], Config::$modSettings['jquery_custom']) && Config::$modSettings['jquery_source'] == 'custom') {
+			self::loadJavaScriptFile(Config::$modSettings['jquery_custom'], ['external' => true, 'seed' => false], 'smf_jquery');
 		}
 		// Fall back to the forum default
-		else
-		{
-			self::loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', array('external' => true, 'seed' => false), 'smf_jquery');
+		else {
+			self::loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/' . JQUERY_VERSION . '/jquery.min.js', ['external' => true, 'seed' => false], 'smf_jquery');
 		}
 
 		// Queue our JQuery plugins!
-		self::loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
+		self::loadJavaScriptFile('smf_jquery_plugins.js', ['minimize' => true], 'smf_jquery_plugins');
 
-		if (!User::$me->is_guest)
-		{
-			self::loadJavaScriptFile('jquery.custom-scrollbar.js', array('minimize' => true), 'smf_jquery_scrollbar');
-			self::loadCSSFile('jquery.custom-scrollbar.css', array('force_current' => false, 'validate' => true), 'smf_scrollbar');
+		if (!User::$me->is_guest) {
+			self::loadJavaScriptFile('jquery.custom-scrollbar.js', ['minimize' => true], 'smf_jquery_scrollbar');
+			self::loadCSSFile('jquery.custom-scrollbar.css', ['force_current' => false, 'validate' => true], 'smf_scrollbar');
 		}
 
 		// script.js and theme.js, always required, so always add them! Makes index.template.php cleaner and all.
-		self::loadJavaScriptFile('script.js', array('defer' => false, 'minimize' => true), 'smf_script');
-		self::loadJavaScriptFile('theme.js', array('minimize' => true), 'smf_theme');
+		self::loadJavaScriptFile('script.js', ['defer' => false, 'minimize' => true], 'smf_script');
+		self::loadJavaScriptFile('theme.js', ['minimize' => true], 'smf_theme');
 
 		// And we should probably trigger the cron too.
-		if (empty(Config::$modSettings['cron_is_real_cron']))
-		{
+		if (empty(Config::$modSettings['cron_is_real_cron'])) {
 			$ts = time();
 			$ts -= $ts % 15;
 			$escaped_boardurl = Utils::JavaScriptEscape(Config::$boardurl);
 			self::addInlineJavaScript(<<<END
-				function triggerCron()
-				{
-					$.get($escaped_boardurl + "/cron.php?ts=$ts");
-				}
-				window.setTimeout(triggerCron, 1);
-			END, true);
+					function triggerCron()
+					{
+						$.get({$escaped_boardurl} + "/cron.php?ts={$ts}");
+					}
+					window.setTimeout(triggerCron, 1);
+				END, true);
 
 			// Robots won't normally trigger cron.php, so for them run the tasks directly.
-			if (BrowserDetector::isBrowser('possibly_robot'))
+			if (BrowserDetector::isBrowser('possibly_robot')) {
 				(new TaskRunner())->runOneTask();
+			}
 		}
 	}
 
@@ -3024,19 +2866,18 @@ function triggerCron()
 	protected function setupLinktree()
 	{
 		// Note that if we're dealing with certain very early errors (e.g., login) the linktree might not be set yet...
-		if (empty(Utils::$context['linktree']))
-			Utils::$context['linktree'] = array();
+		if (empty(Utils::$context['linktree'])) {
+			Utils::$context['linktree'] = [];
+		}
 
-		array_unshift(Utils::$context['linktree'], array(
+		array_unshift(Utils::$context['linktree'], [
 			'url' => Config::$scripturl,
-			'name' => Utils::$context['forum_name_html_safe']
-		));
+			'name' => Utils::$context['forum_name_html_safe'],
+		]);
 
 		// Filter out the restricted boards from the linktree.
-		if (!User::$me->is_admin && !empty(Board::$info->id))
-		{
-			foreach (Utils::$context['linktree'] as $k => $element)
-			{
+		if (!User::$me->is_admin && !empty(Board::$info->id)) {
+			foreach (Utils::$context['linktree'] as $k => $element) {
 				if (
 					!empty($element['groups'])
 					&& (
@@ -3046,8 +2887,7 @@ protected function setupLinktree()
 							&& count(array_intersect(User::$me->groups, $element['deny_groups'])) != 0
 						)
 					)
-				)
-				{
+				) {
 					Utils::$context['linktree'][$k]['name'] = Lang::$txt['restricted_board'];
 					Utils::$context['linktree'][$k]['extra_before'] = '<i>';
 					Utils::$context['linktree'][$k]['extra_after'] = '</i>';
@@ -3090,9 +2930,9 @@ protected static function canPickTheme($id_member, $id_theme)
 					&& in_array(
 						$id_theme,
 						array_merge(
-							array(0),
-							explode(',', Config::$modSettings['knownThemes'])
-						)
+							[0],
+							explode(',', Config::$modSettings['knownThemes']),
+						),
 					)
 				)
 			);
@@ -3110,52 +2950,46 @@ protected static function canPickTheme($id_member, $id_theme)
 	 */
 	protected static function templateInclude($filename, $once = false)
 	{
-		static $templates = array();
+		static $templates = [];
 
 		// We want to be able to figure out any errors...
 		@ini_set('track_errors', '1');
 
 		// Don't include the file more than once, if $once is true.
-		if ($once && in_array($filename, $templates))
+		if ($once && in_array($filename, $templates)) {
 			return;
+		}
 
 		// Add this file to the include list, whether $once is true or not.
 		$templates[] = $filename;
 
 		$file_found = file_exists($filename);
 
-		if ($once && $file_found)
-		{
-			require_once($filename);
-		}
-		elseif ($file_found)
-		{
-			require($filename);
+		if ($once && $file_found) {
+			require_once $filename;
+		} elseif ($file_found) {
+			require $filename;
 		}
 
-		if ($file_found !== true)
-		{
+		if ($file_found !== true) {
 			ob_end_clean();
 
-			if (!empty(Config::$modSettings['enableCompressedOutput']))
-			{
+			if (!empty(Config::$modSettings['enableCompressedOutput'])) {
 				@ob_start('ob_gzhandler');
-			}
-			else
-			{
+			} else {
 				ob_start();
 			}
 
-			if (isset($_GET['debug']))
+			if (isset($_GET['debug'])) {
 				header('content-type: application/xhtml+xml; charset=' . (empty(Utils::$context['character_set']) ? 'ISO-8859-1' : Utils::$context['character_set']));
+			}
 
 			// Don't cache error pages!!
 			header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
 			header('last-modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 			header('cache-control: no-cache');
 
-			if (!isset(Lang::$txt['template_parse_error']))
-			{
+			if (!isset(Lang::$txt['template_parse_error'])) {
 				Lang::$txt['template_parse_error'] = 'Template Parse Error!';
 				Lang::$txt['template_parse_error_message'] = 'It seems something has gone sour on the forum with the template system.  This problem should only be temporary, so please come back later and try again.  If you continue to see this message, please contact the administrator.<br><br>You can also try <a href="javascript:location.reload();">refreshing this page</a>.';
 				Lang::$txt['template_parse_error_details'] = 'There was a problem loading the <pre><strong>%1$s</strong></pre> template or language file.  Please check the syntax and try again - remember, single quotes (<pre>\'</pre>) often have to be escaped with a slash (<pre>\\</pre>).  To see more specific error information from PHP, try <a href="%2$s%1$s" class="extern">accessing the file directly</a>.<br><br>You may want to try to <a href="javascript:location.reload();">refresh this page</a> or <a href="%3$s?theme=1">use the default theme</a>.';
@@ -3165,73 +2999,65 @@ protected static function templateInclude($filename, $once = false)
 			// First, let's get the doctype and language information out of the way.
 			echo '<!DOCTYPE html>' . "\n" . '<html', !empty(Utils::$context['right_to_left']) ? ' dir="rtl"' : '', '>' . "\n\t" . '<head>';
 
-			if (isset(Utils::$context['character_set']))
-			{
+			if (isset(Utils::$context['character_set'])) {
 				echo "\n\t\t" . '<meta charset="', Utils::$context['character_set'], '">';
 			}
 
-			if (!empty(Config::$maintenance) && !User::$me->allowedTo('admin_forum'))
-			{
-				echo "\n\t\t" . '<title>', Config::$mtitle, '</title>' . "\n\t" . '</head>' . "\n\t" . '<body>'. "\n\t\t" . '<h3>', Config::$mtitle, '</h3>' . "\n\t\t", Config::$mmessage, "\n\t" . '</body>' . "\n" . '</html>';
-			}
-			elseif (!User::$me->allowedTo('admin_forum'))
-			{
+			if (!empty(Config::$maintenance) && !User::$me->allowedTo('admin_forum')) {
+				echo "\n\t\t" . '<title>', Config::$mtitle, '</title>' . "\n\t" . '</head>' . "\n\t" . '<body>' . "\n\t\t" . '<h3>', Config::$mtitle, '</h3>' . "\n\t\t", Config::$mmessage, "\n\t" . '</body>' . "\n" . '</html>';
+			} elseif (!User::$me->allowedTo('admin_forum')) {
 				echo "\n\t" . '<title>', Lang::$txt['template_parse_error'], '</title>' . "\n\t" . '</head>' . "\n\t" . '<body>' . "\n\t\t" . '<h3>', Lang::$txt['template_parse_error'], '</h3>' . "\n\t\t", Lang::$txt['template_parse_error_message'], "\n\t" . '</body>' . "\n" . '</html>';
-			}
-			else
-			{
-				$error = WebFetchApi::fetch(Config::$boardurl . strtr($filename, array(Config::$boarddir => '', strtr(Config::$boarddir, '\\', '/') => '')));
+			} else {
+				$error = WebFetchApi::fetch(Config::$boardurl . strtr($filename, [Config::$boarddir => '', strtr(Config::$boarddir, '\\', '/') => '']));
 
 				$error_array = error_get_last();
 
-				if (empty($error) && ini_get('track_errors') && !empty($error_array))
+				if (empty($error) && ini_get('track_errors') && !empty($error_array)) {
 					$error = $error_array['message'];
+				}
 
-				if (empty($error))
+				if (empty($error)) {
 					$error = Lang::$txt['template_parse_errmsg'];
+				}
 
-				$error = strtr($error, array('<b>' => '<strong>', '</b>' => '</strong>'));
+				$error = strtr($error, ['<b>' => '<strong>', '</b>' => '</strong>']);
 
 				echo "\n\t\t" . '<title>', Lang::$txt['template_parse_error'], '</title>' . "\n\t" . '</head>';
 
 				echo "\n\t" . '<body>' . "\n\t" . '<h3>', Lang::$txt['template_parse_error'], '</h3>' . "\n\t";
 
-				echo sprintf(Lang::$txt['template_parse_error_details'], strtr($filename, array(Config::$boarddir => '', strtr(Config::$boarddir, '\\', '/') => '')), Config::$boardurl, Config::$scripturl);
+				echo sprintf(Lang::$txt['template_parse_error_details'], strtr($filename, [Config::$boarddir => '', strtr(Config::$boarddir, '\\', '/') => '']), Config::$boardurl, Config::$scripturl);
 
-				if (!empty($error))
-				{
-					echo "\n\t\t" . '<hr>' . "\n\t\t" . '<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . Config::$boarddir => '<strong>...', '<strong>' . strtr(Config::$boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
+				if (!empty($error)) {
+					echo "\n\t\t" . '<hr>' . "\n\t\t" . '<div style="margin: 0 20px;"><pre>', strtr(strtr($error, ['<strong>' . Config::$boarddir => '<strong>...', '<strong>' . strtr(Config::$boarddir, '\\', '/') => '<strong>...']), '\\', '/'), '</pre></div>';
 				}
 
 				// I know, I know... this is VERY COMPLICATED.  Still, it's good.
-				if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
-				{
+				if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0) {
 					$data = file($filename);
 					$data2 = BBCodeParser::highlightPhpCode(implode('', $data));
-					$data2 = preg_split('~\<br( /)?\>~', $data2);
+					$data2 = preg_split('~\\<br( /)?\\>~', $data2);
 
 					// Fix the PHP code stuff...
-					if (!BrowserDetector::isBrowser('gecko'))
-					{
+					if (!BrowserDetector::isBrowser('gecko')) {
 						$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
-					}
-					else
-					{
+					} else {
 						$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
 					}
 
 					// Now we get to work around a bug in PHP where it doesn't escape <br>s!
 					$j = -1;
-					foreach ($data as $line)
-					{
+
+					foreach ($data as $line) {
 						$j++;
 
-						if (substr_count($line, '<br>') == 0)
+						if (substr_count($line, '<br>') == 0) {
 							continue;
+						}
 
 						$n = substr_count($line, '<br>');
-						for ($i = 0; $i < $n; $i++)
-						{
+
+						for ($i = 0; $i < $n; $i++) {
 							$data2[$j] .= '&lt;br /&gt;' . $data2[$j + $i + 1];
 							unset($data2[$j + $i + 1]);
 						}
@@ -3245,52 +3071,40 @@ protected static function templateInclude($filename, $once = false)
 					// Figure out what the color coding was before...
 					$line = max($match[1] - 9, 1);
 					$last_line = '';
-					for ($line2 = $line - 1; $line2 > 1; $line2--)
-					{
-						if (strpos($data2[$line2], '<') !== false)
-						{
-							if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0)
-								$last_line = $color_match[1];
 
+					for ($line2 = $line - 1; $line2 > 1; $line2--) {
+						if (strpos($data2[$line2], '<') !== false) {
+							if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0) {
+								$last_line = $color_match[1];
+							}
 							break;
 						}
 					}
 
 					// Show the relevant lines...
-					for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++)
-					{
-						if ($line == $match[1])
-						{
+					for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++) {
+						if ($line == $match[1]) {
 							echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
 						}
 
 						echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
 
-						if (isset($data2[$line]) && $data2[$line] != '')
-						{
+						if (isset($data2[$line]) && $data2[$line] != '') {
 							echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
 						}
 
-						if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
-						{
+						if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0) {
 							$last_line = $color_match[1];
 							echo '</', substr($last_line, 1, 4), '>';
-						}
-						elseif ($last_line != '' && strpos($data2[$line], '<') !== false)
-						{
+						} elseif ($last_line != '' && strpos($data2[$line], '<') !== false) {
 							$last_line = '';
-						}
-						elseif ($last_line != '' && $data2[$line] != '')
-						{
+						} elseif ($last_line != '' && $data2[$line] != '') {
 							echo '</', substr($last_line, 1, 4), '>';
 						}
 
-						if ($line == $match[1])
-						{
+						if ($line == $match[1]) {
 							echo '</pre></div><pre style="margin: 0;">';
-						}
-						else
-						{
+						} else {
 							echo "\n";
 						}
 					}
@@ -3304,11 +3118,11 @@ protected static function templateInclude($filename, $once = false)
 			die;
 		}
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Theme::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Theme::exportStatic')) {
 	Theme::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Time.php b/Sources/Time.php
index d75ef03dff..c528ea43e7 100644
--- a/Sources/Time.php
+++ b/Sources/Time.php
@@ -18,25 +18,24 @@
  */
 class Time extends \DateTime implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
+			'create' => 'create',
 			'strftime' => 'smf_strftime',
 			'gmstrftime' => 'smf_gmstrftime',
 			'getDateOrTimeFormat' => 'get_date_or_time_format',
-			'getDateFormat' => false,
-			'getTimeFormat' => false,
-			'getShortDateFormat' => false,
-			'getShortTimeFormat' => false,
+			'timeformat' => 'timeformat',
 			'forumTime' => 'forum_time',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -53,7 +52,7 @@ class Time extends \DateTime implements \ArrayAccess
 	 * library, but in this class its output will always use ISO 8601 format.
 	 * This is due to the lack of locale support in the base DateTime class.
 	 */
-	const FORMAT_EQUIVALENTS = array(
+	public const FORMAT_EQUIVALENTS = [
 		// Day
 		'a' => 'D', // Complex: prefer Lang::$txt strings if available.
 		'A' => 'l', // Complex: prefer Lang::$txt strings if available.
@@ -94,7 +93,7 @@ class Time extends \DateTime implements \ArrayAccess
 		'n' => "\n",
 		't' => "\t",
 		'%' => '%',
-	);
+	];
 
 	/**
 	 * Makes life easier when translating strftime format to DateTime format.
@@ -105,7 +104,7 @@ class Time extends \DateTime implements \ArrayAccess
 	 * library, but in this class their output will always use ISO 8601 format.
 	 * This is due to the lack of locale support in the base DateTime class.
 	 */
-	const FORMAT_SHORT_FORMS = array(
+	public const FORMAT_SHORT_FORMS = [
 		'%h' => '%b',
 		'%r' => '%I:%M:%S %p',
 		'%R' => '%H:%M',
@@ -114,12 +113,12 @@ class Time extends \DateTime implements \ArrayAccess
 		'%D' => '%m/%d/%y',
 		'%F' => '%Y-%m-%d',
 		'%x' => '%Y-%m-%d',
-	);
+	];
 
 	/**
 	 * A regular expression to match all known strftime format specifiers.
 	 */
-	const REGEX_STRFTIME = '%([ABCDFGHIMPRSTUVWXYZabcdeghjklmnprstuwxyz%])';
+	public const REGEX_STRFTIME = '%([ABCDFGHIMPRSTUVWXYZabcdeghjklmnprstuwxyz%])';
 
 	/****************************
 	 * Internal static properties
@@ -158,7 +157,7 @@ class Time extends \DateTime implements \ArrayAccess
 	 *
 	 * Processed date and time format strings.
 	 */
-	protected static array $formats = array();
+	protected static array $formats = [];
 
 	/**
 	 * @var array
@@ -193,13 +192,15 @@ class Time extends \DateTime implements \ArrayAccess
 	 *    as a \DateTimeZone object or as a time zone identifier string.
 	 *    Defaults to the current user's time zone.
 	 */
-	public function __construct(string $datetime = 'now', \DateTimeZone|string $timezone = null)
+	public function __construct(string $datetime = 'now', \DateTimeZone|string|null $timezone = null)
 	{
-		if (!isset(self::$user_tz))
+		if (!isset(self::$user_tz)) {
 			self::$user_tz = new \DateTimeZone(User::getTimezone());
+		}
 
-		if (is_string($timezone) && ($timezone = @timezone_open($timezone)) === false)
+		if (is_string($timezone) && ($timezone = @timezone_open($timezone)) === false) {
 			unset($timezone);
+		}
 
 		parent::__construct($datetime, $timezone ?? self::$user_tz);
 
@@ -216,8 +217,7 @@ public function __construct(string $datetime = 'now', \DateTimeZone|string $time
 	 */
 	public function __set(string $prop, $value): void
 	{
-		switch ($prop)
-		{
+		switch ($prop) {
 			case 'datetime':
 			case 'date':
 			case 'time':
@@ -238,7 +238,7 @@ public function __set(string $prop, $value): void
 				$this->setDate(
 					(int) $value,
 					$this->format('m', false, false),
-					$this->format('d', false, false)
+					$this->format('d', false, false),
 				);
 				break;
 
@@ -246,7 +246,7 @@ public function __set(string $prop, $value): void
 				$this->setDate(
 					$this->format('Y', false, false),
 					(int) $value,
-					$this->format('d', false, false)
+					$this->format('d', false, false),
 				);
 				break;
 
@@ -254,7 +254,7 @@ public function __set(string $prop, $value): void
 				$this->setDate(
 					$this->format('Y', false, false),
 					$this->format('m', false, false),
-					(int) $value
+					(int) $value,
 				);
 				break;
 
@@ -262,7 +262,7 @@ public function __set(string $prop, $value): void
 				$this->setTime(
 					(int) $value,
 					$this->format('i', false, false),
-					$this->format('s', false, false)
+					$this->format('s', false, false),
 				);
 				break;
 
@@ -270,7 +270,7 @@ public function __set(string $prop, $value): void
 				$this->setTime(
 					$this->format('H', false, false),
 					(int) $value,
-					$this->format('s', false, false)
+					$this->format('s', false, false),
 				);
 				break;
 
@@ -278,7 +278,7 @@ public function __set(string $prop, $value): void
 				$this->setTime(
 					$this->format('H', false, false),
 					$this->format('i', false, false),
-					(int) $value
+					(int) $value,
 				);
 				break;
 
@@ -296,8 +296,9 @@ public function __set(string $prop, $value): void
 			case 'tz':
 			case 'tzid':
 			case 'timezone':
-				if (in_array($value, timezone_identifiers_list(\DateTimeZone::ALL_WITH_BC)))
+				if (in_array($value, timezone_identifiers_list(\DateTimeZone::ALL_WITH_BC))) {
 					$this->setTimezone(timezone_open($value));
+				}
 				break;
 
 			// Read only.
@@ -317,8 +318,7 @@ public function __set(string $prop, $value): void
 	 */
 	public function __get(string $prop): mixed
 	{
-		switch ($prop)
-		{
+		switch ($prop) {
 			case 'datetime':
 				$value = $this->format('Y-m-d H:i:s', false, false);
 				break;
@@ -404,8 +404,7 @@ public function __get(string $prop): mixed
 	 */
 	public function __isset(string $prop): bool
 	{
-		switch ($prop)
-		{
+		switch ($prop) {
 			case 'datetime':
 			case 'date':
 			case 'time':
@@ -455,15 +454,17 @@ public function __isset(string $prop): bool
 	 *    detect the format type automatically.
 	 * @return string The formatted date and time.
 	 */
-	public function format(?string $format = null, bool $relative = null, bool $strftime = null): string
+	public function format(?string $format = null, ?bool $relative = null, ?bool $strftime = null): string
 	{
 		// If given no format, assume $relative is true.
-		if (!isset($relative))
+		if (!isset($relative)) {
 			$relative = !isset($format);
+		}
 
 		// If were we explicitly told not to use strftime format, save ourselves some work.
-		if (isset($format) && !$relative && $strftime === false)
+		if (isset($format) && !$relative && $strftime === false) {
 			return date_format($this, $format);
+		}
 
 		// We need some sort of format.
 		$format = $format ?? User::$me->time_format ?? Config::$modSettings['time_format'] ?? '%F %k:%M';
@@ -472,32 +473,30 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 		$strftime = $strftime ?? self::isStrftimeFormat($format);
 
 		// A few substitutions to make life easier.
-		if ($strftime)
+		if ($strftime) {
 			$format = strtr($format, self::FORMAT_SHORT_FORMS);
+		}
 
 		// Today and Yesterday?
 		$prefix = '';
 
-		if ($relative && Config::$modSettings['todayMod'] >= 1)
-		{
+		if ($relative && Config::$modSettings['todayMod'] >= 1) {
 			$tzid = date_format($this, 'e');
 
-			if (!isset(self::$today[$tzid]))
+			if (!isset(self::$today[$tzid])) {
 				self::$today[$tzid] = strtotime('today ' . $tzid);
+			}
 
 			// Tomorrow? We don't support the future. ;)
-			if ($this->getTimestamp() >= self::$today[$tzid] + 86400)
-			{
+			if ($this->getTimestamp() >= self::$today[$tzid] + 86400) {
 				$prefix = '';
 			}
 			// Today.
-			elseif ($this->getTimestamp() >= self::$today[$tzid])
-			{
+			elseif ($this->getTimestamp() >= self::$today[$tzid]) {
 				$prefix = Lang::$txt['today'] ?? '';
 			}
 			// Yesterday.
-			elseif (Config::$modSettings['todayMod'] > 1 && $this->getTimestamp() >= self::$today[$tzid] - 86400)
-			{
+			elseif (Config::$modSettings['todayMod'] > 1 && $this->getTimestamp() >= self::$today[$tzid] - 86400) {
 				$prefix = Lang::$txt['yesterday'] ?? '';
 			}
 		}
@@ -505,22 +504,22 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 		$format = !empty($prefix) ? self::getTimeFormat($format) : $format;
 
 		// If we aren't using strftime format, things are easy.
-		if (!$strftime)
+		if (!$strftime) {
 			return $prefix . date_format($this, $format);
+		}
 
 		// Translate from strftime format to DateTime format.
 		$parts = preg_split('/' . self::REGEX_STRFTIME . '/', $format, 0, PREG_SPLIT_DELIM_CAPTURE);
 
-		$placeholders = array();
+		$placeholders = [];
 		$complex = false;
 
-		for ($i = 0; $i < count($parts); $i++)
-		{
+		for ($i = 0; $i < count($parts); $i++) {
 			// Parts that are not strftime formats.
-			if ($i % 2 === 0 || !isset(self::FORMAT_EQUIVALENTS[$parts[$i]]))
-			{
-				if ($parts[$i] === '')
+			if ($i % 2 === 0 || !isset(self::FORMAT_EQUIVALENTS[$parts[$i]])) {
+				if ($parts[$i] === '') {
 					continue;
+				}
 
 				$placeholder = "\xEE\x84\x80" . $i . "\xEE\x84\x81";
 
@@ -528,17 +527,14 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 				$parts[$i] = $placeholder;
 			}
 			// Parts that need localized strings.
-			elseif (in_array($parts[$i], array('a', 'A', 'b', 'B')))
-			{
-				switch ($parts[$i])
-				{
+			elseif (in_array($parts[$i], ['a', 'A', 'b', 'B'])) {
+				switch ($parts[$i]) {
 					case 'a':
 						$min = 0;
 						$max = 6;
 						$key = 'days_short';
 						$f = 'w';
 						$placeholder_end = "\xEE\x84\x83";
-
 						break;
 
 					case 'A':
@@ -547,7 +543,6 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 						$key = 'days';
 						$f = 'w';
 						$placeholder_end = "\xEE\x84\x82";
-
 						break;
 
 					case 'b':
@@ -556,7 +551,6 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 						$key = 'months_short';
 						$f = 'n';
 						$placeholder_end = "\xEE\x84\x85";
-
 						break;
 
 					case 'B':
@@ -565,7 +559,6 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 						$key = 'months';
 						$f = 'n';
 						$placeholder_end = "\xEE\x84\x84";
-
 						break;
 				}
 
@@ -574,30 +567,25 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 				// Check whether Lang::$txt contains all expected strings.
 				// If not, use English default.
 				$txt_strings_exist = true;
-				for ($num = $min; $num <= $max; $num++)
-				{
-					if (!isset(Lang::$txt[$key][$num]))
-					{
+
+				for ($num = $min; $num <= $max; $num++) {
+					if (!isset(Lang::$txt[$key][$num])) {
 						$txt_strings_exist = false;
 						break;
 					}
-					else
-					{
-						$placeholders[str_replace($f, $num, $placeholder)] = Lang::$txt[$key][$num];
-					}
+
+					$placeholders[str_replace($f, $num, $placeholder)] = Lang::$txt[$key][$num];
 				}
 
 				$parts[$i] = $txt_strings_exist ? $placeholder : self::FORMAT_EQUIVALENTS[$parts[$i]];
-			}
-			elseif (in_array($parts[$i], array('p', 'P')))
-			{
-				if (!isset(Lang::$txt['time_am']) || !isset(Lang::$txt['time_pm']))
+			} elseif (in_array($parts[$i], ['p', 'P'])) {
+				if (!isset(Lang::$txt['time_am']) || !isset(Lang::$txt['time_pm'])) {
 					continue;
+				}
 
 				$placeholder = "\xEE\x84\x90" . self::FORMAT_EQUIVALENTS[$parts[$i]] . "\xEE\x84\x91";
 
-				switch ($parts[$i])
-				{
+				switch ($parts[$i]) {
 					// Upper case.
 					case 'p':
 						$placeholders[str_replace(self::FORMAT_EQUIVALENTS[$parts[$i]], 'AM', $placeholder)] = Utils::strtoupper(Lang::$txt['time_am']);
@@ -614,12 +602,10 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 				$parts[$i] = $placeholder;
 			}
 			// Parts that will need further processing.
-			elseif (in_array($parts[$i], array('j', 'C', 'U', 'W', 'G', 'g', 'e', 'l')))
-			{
+			elseif (in_array($parts[$i], ['j', 'C', 'U', 'W', 'G', 'g', 'e', 'l'])) {
 				$complex = true;
 
-				switch ($parts[$i])
-				{
+				switch ($parts[$i]) {
 					case 'j':
 						$placeholder_end = "\xEE\x84\xA1";
 						break;
@@ -649,8 +635,7 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 				$parts[$i] = "\xEE\x84\xA0" . self::FORMAT_EQUIVALENTS[$parts[$i]] . $placeholder_end;
 			}
 			// Parts with simple equivalents.
-			else
-			{
+			else {
 				$parts[$i] = self::FORMAT_EQUIVALENTS[$parts[$i]];
 			}
 		}
@@ -659,14 +644,11 @@ public function format(?string $format = null, bool $relative = null, bool $strf
 		$result = strtr(date_format($this, implode('', $parts)), $placeholders);
 
 		// Deal with the complicated ones.
-		if ($complex)
-		{
+		if ($complex) {
 			$result = preg_replace_callback(
 				'/\xEE\x84\xA0([\d_]+)(\xEE\x84(?:[\xA1-\xAF]))/',
-				function ($matches)
-				{
-					switch ($matches[2])
-					{
+				function ($matches) {
+					switch ($matches[2]) {
 						// %j
 						case "\xEE\x84\xA1":
 							$replacement = sprintf('%03d', (int) $matches[1] + 1);
@@ -706,7 +688,7 @@ function ($matches)
 
 					return $replacement;
 				},
-				$result
+				$result,
 			);
 		}
 
@@ -728,7 +710,7 @@ function ($matches)
 	 *    as a \DateTimeZone object or as a time zone identifier string.
 	 *    Defaults to the current user's time zone.
 	 */
-	public static function create(string $datetime = 'now', \DateTimeZone|string $timezone = null): object
+	public static function create(string $datetime = 'now', \DateTimeZone|string|null $timezone = null): object
 	{
 		return new self($datetime, $timezone);
 	}
@@ -743,14 +725,16 @@ public static function create(string $datetime = 'now', \DateTimeZone|string $ti
 	 *     If null, uses default time zone.
 	 * @return string The formatted date and time.
 	 */
-	public static function strftime(string $format, int $timestamp = null, string $tzid = null): string
+	public static function strftime(string $format, ?int $timestamp = null, ?string $tzid = null): string
 	{
 		// Set default values as necessary.
-		if (!isset($timestamp))
+		if (!isset($timestamp)) {
 			$timestamp = time();
+		}
 
-		if (!isset($tzid))
+		if (!isset($tzid)) {
 			$tzid = date_default_timezone_get();
+		}
 
 		$date = new self('@' . $timestamp);
 		$date->setTimezone(new \DateTimeZone($tzid));
@@ -768,7 +752,7 @@ public static function strftime(string $format, int $timestamp = null, string $t
 	 *     If null, defaults to the current time.
 	 * @return string The formatted date and time.
 	 */
-	public static function gmstrftime(string $format, int $timestamp = null): string
+	public static function gmstrftime(string $format, ?int $timestamp = null): string
 	{
 		return self::strftime($format, $timestamp, 'UTC');
 	}
@@ -786,7 +770,7 @@ public static function gmstrftime(string $format, int $timestamp = null): string
 	 *    detect the format type automatically.
 	 * @return string A strftime format or DateTime format string.
 	 */
-	public static function getDateFormat(string $format = '', bool $strftime = null): string
+	public static function getDateFormat(string $format = '', ?bool $strftime = null): string
 	{
 		return self::getDateOrTimeFormat('date', $format, $strftime);
 	}
@@ -804,7 +788,7 @@ public static function getDateFormat(string $format = '', bool $strftime = null)
 	 *    detect the format type automatically.
 	 * @return string A strftime format or DateTime format string.
 	 */
-	public static function getTimeFormat(string $format = '', bool $strftime = null): string
+	public static function getTimeFormat(string $format = '', ?bool $strftime = null): string
 	{
 		return self::getDateOrTimeFormat('time', $format, $strftime);
 	}
@@ -822,17 +806,17 @@ public static function getTimeFormat(string $format = '', bool $strftime = null)
 	 *    detect the format type automatically.
 	 * @return string A strftime format or DateTime format string.
 	 */
-	public static function getShortDateFormat(string $format = '', bool $strftime = null): string
+	public static function getShortDateFormat(string $format = '', ?bool $strftime = null): string
 	{
-		if (isset(self::$short_date_format) && $format === '')
+		if (isset(self::$short_date_format) && $format === '') {
 			return self::$short_date_format;
+		}
 
 		$date_format = self::getDateFormat($format, $strftime);
 		$strftime = $strftime ?? self::isStrftimeFormat($date_format);
 
-		if ($strftime)
-		{
-			$substitutions = array(
+		if ($strftime) {
+			$substitutions = [
 				'%Y' => '',
 				'%y' => '',
 				'%G' => '',
@@ -842,25 +826,24 @@ public static function getShortDateFormat(string $format = '', bool $strftime =
 				'%c' => '%m-%d',
 				'%F' => '%m-%d',
 				'%x' => '%m-%d',
-			);
+			];
 
 			$date_format = strtr($date_format, $substitutions);
 
-			$date_format = Utils::normalizeSpaces($date_format, true, true, array('replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true));
+			$date_format = Utils::normalizeSpaces($date_format, true, true, ['replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true]);
 
 			$date_format = preg_replace('/^([\p{Z}\p{C}]|[^%\P{P}])*|[\p{Z}\p{C}\p{P}]*$/u', '', $date_format);
-		}
-		else
-		{
+		} else {
 			$date_format = preg_replace('/(?<!\\\\)[LoXxYy]/', '', $date_format);
 
-			$date_format = Utils::normalizeSpaces($date_format, true, true, array('replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true));
+			$date_format = Utils::normalizeSpaces($date_format, true, true, ['replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true]);
 
 			$date_format = preg_replace('/^[\p{Z}\p{C}\p{P}]*|[\p{Z}\p{C}\p{P}]*$/u', '', $date_format);
 		}
 
-		if ($format === '')
+		if ($format === '') {
 			self::$short_date_format = $date_format;
+		}
 
 		return $date_format;
 	}
@@ -878,58 +861,57 @@ public static function getShortDateFormat(string $format = '', bool $strftime =
 	 *    detect the format type automatically.
 	 * @return string A strftime format or DateTime format string.
 	 */
-	public static function getShortTimeFormat(string $format = '', bool $strftime = null): string
+	public static function getShortTimeFormat(string $format = '', ?bool $strftime = null): string
 	{
-		if (isset(self::$short_time_format) && $format === '')
+		if (isset(self::$short_time_format) && $format === '') {
 			return self::$short_time_format;
+		}
 
 		$time_format = self::getTimeFormat($format, $strftime);
 		$strftime = $strftime ?? self::isStrftimeFormat($time_format);
 
-		if ($strftime)
-		{
-			$substitutions = array(
+		if ($strftime) {
+			$substitutions = [
 				'%I' => '%l',
 				'%H' => '%k',
 				'%S' => '',
 				'%r' => '%l:%M %p',
 				'%R' => '%k:%M',
 				'%T' => '%l:%M',
-			);
+			];
 
 			$time_format = strtr($time_format, $substitutions);
 
-			$time_format = Utils::normalizeSpaces($time_format, true, true, array('replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true));
+			$time_format = Utils::normalizeSpaces($time_format, true, true, ['replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true]);
 
 			$time_format = preg_replace('/:(?=\p{Z}|$|%[pPzZ])/u', '', $time_format);
 
 			$time_format = preg_replace('/^([\p{Z}\p{C}]|[^%\P{P}])*|[\p{Z}\p{C}\p{P}]*$/u', '', $time_format);
-		}
-		else
-		{
-			$substitutions = array(
+		} else {
+			$substitutions = [
 				'H' => 'G',
 				'h' => 'g',
 				's' => '',
 				'u' => '',
 				'v' => '',
-			);
+			];
 
 			$time_format = preg_replace_callback(
 				'/(?<!\\\\)[' . implode('', array_keys($substitutions)) . ']/',
-				fn($m) => $substitutions[$m],
-				$time_format
+				fn ($m) => $substitutions[$m],
+				$time_format,
 			);
 
-			$time_format = Utils::normalizeSpaces($time_format, true, true, array('replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true));
+			$time_format = Utils::normalizeSpaces($time_format, true, true, ['replace_tabs' => true, 'collapse_hspace' => true, 'no_breaks' => true]);
 
 			$time_format = preg_replace('/:(?=\p{Z}|$|[aAeOPpTZ])/u', '', $time_format);
 
 			$time_format = preg_replace('/^[\p{Z}\p{C}\p{P}]*|[\p{Z}\p{C}\p{P}]*$/u', '', $time_format);
 		}
 
-		if ($format === '')
+		if ($format === '') {
 			self::$short_time_format = $time_format;
+		}
 
 		return $time_format;
 	}
@@ -946,11 +928,10 @@ public static function getShortTimeFormat(string $format = '', bool $strftime =
 	 *    detect the format type automatically. Ignored if $format is empty.
 	 * @return string A strftime format or DateTime format string.
 	 */
-	public static function getDateOrTimeFormat(string $type = '', string $format = '', bool $strftime = null): string
+	public static function getDateOrTimeFormat(string $type = '', string $format = '', ?bool $strftime = null): string
 	{
 		// If the format is empty, fall back to defaults.
-		if ($format === '')
-		{
+		if ($format === '') {
 			$strftime = null;
 
 			$format = !empty(User::$me->time_format) ? User::$me->time_format : (!empty(Config::$modSettings['time_format']) ? Config::$modSettings['time_format'] : '%F %k:%M');
@@ -958,8 +939,9 @@ public static function getDateOrTimeFormat(string $type = '', string $format = '
 
 		$strftime = $strftime ?? self::isStrftimeFormat($format);
 
-		if ($strftime)
+		if ($strftime) {
 			return self::strftimePartialFormat($type, strtr($format, self::FORMAT_SHORT_FORMS));
+		}
 
 		return self::datetimePartialFormat($type, $format);
 	}
@@ -978,7 +960,7 @@ public static function getDateOrTimeFormat(string $type = '', string $format = '
 	 *    be used.
 	 * @return string A formatted time string
 	 */
-	public static function timeformat(int $log_time, bool|string $show_today = true, string $tzid = null): string
+	public static function timeformat(int $log_time, bool|string $show_today = true, ?string $tzid = null): string
 	{
 		// For backward compatibility, replace empty values with the user's time
 		// zone and replace anything invalid with the forum's default time zone.
@@ -1020,12 +1002,12 @@ protected static function strftimePartialFormat(string $type, string $format): s
 		$orig_format = $format;
 
 		// Have we already done this?
-		if (isset(self::$formats[$orig_format][$type]))
+		if (isset(self::$formats[$orig_format][$type])) {
 			return self::$formats[$orig_format][$type];
+		}
 
-		if ($type === 'date')
-		{
-			$specifications = array(
+		if ($type === 'date') {
+			$specifications = [
 				// Day
 				'%a' => '%a', '%A' => '%A', '%e' => '%e', '%d' => '%d',
 				'%j' => '%j', '%u' => '%u', '%w' => '%w',
@@ -1045,13 +1027,11 @@ protected static function strftimePartialFormat(string $type, string $format): s
 				'%x' => '%x',
 				// Miscellaneous
 				'%n' => '', '%t' => '', '%%' => '%%',
-			);
+			];
 
 			$default_format = '%F';
-		}
-		elseif ($type === 'time')
-		{
-			$specifications = array(
+		} elseif ($type === 'time') {
+			$specifications = [
 				// Day
 				'%a' => '', '%A' => '', '%e' => '', '%d' => '', '%j' => '',
 				'%u' => '', '%w' => '',
@@ -1070,13 +1050,12 @@ protected static function strftimePartialFormat(string $type, string $format): s
 				'%c' => '%X', '%D' => '', '%F' => '', '%s' => '%s', '%x' => '',
 				// Miscellaneous
 				'%n' => '', '%t' => '', '%%' => '%%',
-			);
+			];
 
 			$default_format = '%k:%M';
 		}
 		// Invalid type requests just get the full format string.
-		else
-		{
+		else {
 			return $format;
 		}
 
@@ -1088,12 +1067,12 @@ protected static function strftimePartialFormat(string $type, string $format): s
 		$format = strtr($format, $wanted);
 
 		// Next, strip out any specifications and literal text that we don't want.
-		$format_parts = preg_split('~%[' . (strtr(implode('', $unwanted), array('%' => ''))) . ']~u', $format);
+		$format_parts = preg_split('~%[' . (strtr(implode('', $unwanted), ['%' => ''])) . ']~u', $format);
 
-		foreach ($format_parts as $p => $f)
-		{
-			if (strpos($f, '%') === false)
+		foreach ($format_parts as $p => $f) {
+			if (strpos($f, '%') === false) {
 				unset($format_parts[$p]);
+			}
 		}
 
 		$format = implode('', $format_parts);
@@ -1101,7 +1080,7 @@ protected static function strftimePartialFormat(string $type, string $format): s
 		// Finally, strip out any unwanted leftovers.
 		// For info on the charcter classes used here, see https://www.php.net/manual/en/regexp.reference.unicode.php and https://www.regular-expressions.info/unicode.html
 		$format = preg_replace(
-			array(
+			[
 				// Anything that isn't a specification, punctuation mark, or whitespace.
 				'~(?<!%)\p{L}|[^\p{L}\p{P}\p{Z}]~u',
 				// Repeated punctuation marks (except %), possibly separated by whitespace.
@@ -1113,21 +1092,22 @@ protected static function strftimePartialFormat(string $type, string $format): s
 				'~^\p{Z}*(?' . '>([\p{Pd}\p{Pe}\p{Pf}\p{Pc}]|[^%\P{Po}])\p{Z}*)*~u',
 				// Runs of horizontal whitespace.
 				'~\p{Z}+~',
-			),
-			array(
+			],
+			[
 				'',
 				'$1',
 				'$1$2',
 				'',
 				'',
 				' ',
-			),
-			$format
+			],
+			$format,
 		);
 
 		// Gotta have something...
-		if (empty($format))
+		if (empty($format)) {
 			$format = $default_format;
+		}
 
 		// Remember what we've done.
 		self::$formats[$orig_format][$type] = trim($format);
@@ -1148,12 +1128,12 @@ protected static function datetimePartialFormat(string $type, string $format): s
 		$orig_format = $format;
 
 		// Have we already done this?
-		if (isset(self::$formats[$orig_format][$type]))
+		if (isset(self::$formats[$orig_format][$type])) {
 			return self::$formats[$orig_format][$type];
+		}
 
-		if ($type === 'date')
-		{
-			$specifications = array(
+		if ($type === 'date') {
+			$specifications = [
 				// Day
 				'd' => 'd', 'D' => 'D', 'j' => 'j', 'l' => 'l', 'N' => 'N',
 				'S' => 'S', 'w' => 'w', 'z' => 'z',
@@ -1173,13 +1153,11 @@ protected static function datetimePartialFormat(string $type, string $format): s
 				'T' => '', 'Z' => '',
 				// Time and Date Stamps
 				'c' => 'Y-m-d', 'r' => 'D, d M Y', 'U' => 'U',
-			);
+			];
 
 			$default_format = 'Y-m-d';
-		}
-		elseif ($type === 'time')
-		{
-			$specifications = array(
+		} elseif ($type === 'time') {
+			$specifications = [
 				// Day
 				'd' => '', 'D' => '', 'j' => '', 'l' => '', 'N' => '',
 				'S' => '', 'w' => '', 'z' => '',
@@ -1199,13 +1177,12 @@ protected static function datetimePartialFormat(string $type, string $format): s
 				'T' => 'T', 'Z' => 'Z',
 				// Time and Date Stamps
 				'c' => 'H:i:sP', 'r' => 'H:i:s O', 'U' => 'U',
-			);
+			];
 
 			$default_format = 'G:i';
 		}
 		// Invalid type requests just get the full format string.
-		else
-		{
+		else {
 			return $format;
 		}
 
@@ -1216,14 +1193,14 @@ protected static function datetimePartialFormat(string $type, string $format): s
 		// Make any necessary substitutions in the format.
 		$format = preg_replace_callback(
 			'/(?<!\\\\)[' . implode('', array_keys($specifications)) . ']/',
-			fn($m) => $specifications[$m],
-			$format
+			fn ($m) => $specifications[$m],
+			$format,
 		);
 
 		// Finally, strip out any unwanted leftovers.
 		// For info on the charcter classes used here, see https://www.php.net/manual/en/regexp.reference.unicode.php and https://www.regular-expressions.info/unicode.html
 		$format = preg_replace(
-			array(
+			[
 				// Anything that isn't a specification, punctuation mark, or whitespace.
 				'~\\\\\p{L}|[^\p{L}\p{P}\p{Z}]~u',
 				// Repeated punctuation marks, possibly separated by whitespace.
@@ -1235,21 +1212,22 @@ protected static function datetimePartialFormat(string $type, string $format): s
 				'~^\p{Z}*(?' . '>(\p{P})\p{Z}*)*~u',
 				// Runs of horizontal whitespace.
 				'~\p{Z}+~',
-			),
-			array(
+			],
+			[
 				'',
 				'$1',
 				'$1$2',
 				'',
 				'',
 				' ',
-			),
-			$format
+			],
+			$format,
 		);
 
 		// Gotta have something...
-		if (empty($format))
+		if (empty($format)) {
 			$format = $default_format;
+		}
 
 		// Remember what we've done.
 		self::$formats[$orig_format][$type] = trim($format);
@@ -1270,7 +1248,8 @@ protected static function isStrftimeFormat(string $format): bool
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Time::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Time::exportStatic')) {
 	Time::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/TimeZone.php b/Sources/TimeZone.php
index c3feebd085..e4eddfee6b 100644
--- a/Sources/TimeZone.php
+++ b/Sources/TimeZone.php
@@ -25,12 +25,15 @@ class TimeZone extends \DateTimeZone
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_underscores' => true,
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'list' => 'smf_list_timezones',
-		),
-	);
+			'getTzidMetazones' => 'get_tzid_metazones',
+			'getSortedTzidsForCountry' => 'get_sorted_tzids_for_country',
+			'getTzidFallbacks' => 'get_tzid_fallbacks',
+			'validateIsoCountryCodes' => 'validate_iso_country_codes',
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -39,17 +42,17 @@ class TimeZone extends \DateTimeZone
 	/**
 	 * Never uses DST.
 	 */
-	const DST_NEVER = 0;
+	public const DST_NEVER = 0;
 
 	/**
 	 * Uses DST for some parts of the year, and not for other parts.
 	 */
-	const DST_SWITCHES = 1;
+	public const DST_SWITCHES = 1;
 
 	/**
 	 * Uses DST throughout the entire year.
 	 */
-	const DST_ALWAYS = 2;
+	public const DST_ALWAYS = 2;
 
 	/**************************
 	 * Public static properties
@@ -57,23 +60,23 @@ class TimeZone extends \DateTimeZone
 
 	/**
 	 * @var array
-	 * 
+	 *
 	 * This array lists a series of representative time zones and their
 	 * corresponding "meta-zone" labels.
-	 * 
+	 *
 	 * The term "representative" here means that a given time zone can
 	 * represent others that use exactly the same rules for DST
 	 * transitions, UTC offsets, and abbreviations. For example,
 	 * Europe/Berlin can be representative for Europe/Rome,
 	 * Europe/Paris, etc., because these cities all use exactly the
 	 * same time zone rules and values.
-	 * 
+	 *
 	 * Meta-zone labels are the user friendly strings shown to the end
 	 * user, e.g. "Mountain Standard Time". The values of this array
 	 * are keys of strings defined in Timezones.{language}.php, which
 	 * in turn are sprintf format strings used to generate the final
 	 * label text.
-	 * 
+	 *
 	 * Sometimes several representative time zones will map onto the
 	 * same meta-zone label. This usually happens when there are
 	 * different rules for Daylight Saving time in locations that are
@@ -81,14 +84,14 @@ class TimeZone extends \DateTimeZone
 	 * America/Phoenix map to North_America_Mountain, but the ultimate
 	 * output will be 'Mountain Time (MST/MDT)' for America/Denver vs.
 	 * 'Mountain Standard Time (MST)' for America/Phoenix.
-	 * 
+	 *
 	 * If you are adding a new meta-zone to this list because the TZDB
 	 * added a new time zone that doesn't fit any existing meta-zone,
 	 * please also add a fallback in the get_tzid_fallbacks() function.
 	 * This helps support SMF installs on servers using outdated
 	 * versions of the TZDB.
 	 */
-	public static array $metazones = array(
+	public static array $metazones = [
 		// No DST
 		'Africa/Abidjan' => 'GMT',
 
@@ -586,11 +589,11 @@ class TimeZone extends \DateTimeZone
 
 		// No DST
 		'Pacific/Wallis' => 'Pacific_Wallis',
-	);
+	];
 
 	/**
 	 * @var array
-	 * 
+	 *
 	 * This array lists all the individual time zones in each country,
 	 * sorted by population (as reported in statistics available on
 	 * Wikipedia in November 2020). Sorting this way enables us to
@@ -598,42 +601,42 @@ class TimeZone extends \DateTimeZone
 	 * represent all others that share its DST transition rules and values.
 	 * For example, this ensures that New York will be preferred over
 	 * random small towns in Indiana.
-	 * 
+	 *
 	 * If future versions of the time zone database add new time zone
 	 * identifiers beyond those included here, they should be added to this
 	 * list as appropriate. However, SMF will gracefully handle unexpected
 	 * new time zones, so nothing will break in the meantime.
 	 */
-	public static array $sorted_tzids = array(
+	public static array $sorted_tzids = [
 		// '??' means international.
-		'??' => array(
+		'??' => [
 			'UTC',
-		),
-		'AD' => array(
+		],
+		'AD' => [
 			'Europe/Andorra',
-		),
-		'AE' => array(
+		],
+		'AE' => [
 			'Asia/Dubai',
-		),
-		'AF' => array(
+		],
+		'AF' => [
 			'Asia/Kabul',
-		),
-		'AG' => array(
+		],
+		'AG' => [
 			'America/Antigua',
-		),
-		'AI' => array(
+		],
+		'AI' => [
 			'America/Anguilla',
-		),
-		'AL' => array(
+		],
+		'AL' => [
 			'Europe/Tirane',
-		),
-		'AM' => array(
+		],
+		'AM' => [
 			'Asia/Yerevan',
-		),
-		'AO' => array(
+		],
+		'AO' => [
 			'Africa/Luanda',
-		),
-		'AQ' => array(
+		],
+		'AQ' => [
 			// Sorted based on summer population.
 			'Antarctica/McMurdo',
 			'Antarctica/Casey',
@@ -645,8 +648,8 @@ class TimeZone extends \DateTimeZone
 			'Antarctica/Troll',
 			'Antarctica/DumontDUrville',
 			'Antarctica/Vostok',
-		),
-		'AR' => array(
+		],
+		'AR' => [
 			'America/Argentina/Buenos_Aires',
 			'America/Argentina/Cordoba',
 			'America/Argentina/Tucuman',
@@ -659,14 +662,14 @@ class TimeZone extends \DateTimeZone
 			'America/Argentina/San_Juan',
 			'America/Argentina/Rio_Gallegos',
 			'America/Argentina/Ushuaia',
-		),
-		'AS' => array(
+		],
+		'AS' => [
 			'Pacific/Pago_Pago',
-		),
-		'AT' => array(
+		],
+		'AT' => [
 			'Europe/Vienna',
-		),
-		'AU' => array(
+		],
+		'AU' => [
 			'Australia/Sydney',
 			'Australia/Melbourne',
 			'Australia/Brisbane',
@@ -680,59 +683,59 @@ class TimeZone extends \DateTimeZone
 			'Australia/Eucla',
 			'Australia/Lindeman',
 			'Antarctica/Macquarie',
-		),
-		'AW' => array(
+		],
+		'AW' => [
 			'America/Aruba',
-		),
-		'AX' => array(
+		],
+		'AX' => [
 			'Europe/Mariehamn',
-		),
-		'AZ' => array(
+		],
+		'AZ' => [
 			'Asia/Baku',
-		),
-		'BA' => array(
+		],
+		'BA' => [
 			'Europe/Sarajevo',
-		),
-		'BB' => array(
+		],
+		'BB' => [
 			'America/Barbados',
-		),
-		'BD' => array(
+		],
+		'BD' => [
 			'Asia/Dhaka',
-		),
-		'BE' => array(
+		],
+		'BE' => [
 			'Europe/Brussels',
-		),
-		'BF' => array(
+		],
+		'BF' => [
 			'Africa/Ouagadougou',
-		),
-		'BG' => array(
+		],
+		'BG' => [
 			'Europe/Sofia',
-		),
-		'BH' => array(
+		],
+		'BH' => [
 			'Asia/Bahrain',
-		),
-		'BI' => array(
+		],
+		'BI' => [
 			'Africa/Bujumbura',
-		),
-		'BJ' => array(
+		],
+		'BJ' => [
 			'Africa/Porto-Novo',
-		),
-		'BL' => array(
+		],
+		'BL' => [
 			'America/St_Barthelemy',
-		),
-		'BM' => array(
+		],
+		'BM' => [
 			'Atlantic/Bermuda',
-		),
-		'BN' => array(
+		],
+		'BN' => [
 			'Asia/Brunei',
-		),
-		'BO' => array(
+		],
+		'BO' => [
 			'America/La_Paz',
-		),
-		'BQ' => array(
+		],
+		'BQ' => [
 			'America/Kralendijk',
-		),
-		'BR' => array(
+		],
+		'BR' => [
 			'America/Sao_Paulo',
 			'America/Bahia',
 			'America/Fortaleza',
@@ -749,23 +752,23 @@ class TimeZone extends \DateTimeZone
 			'America/Araguaina',
 			'America/Eirunepe',
 			'America/Noronha',
-		),
-		'BS' => array(
+		],
+		'BS' => [
 			'America/Nassau',
-		),
-		'BT' => array(
+		],
+		'BT' => [
 			'Asia/Thimphu',
-		),
-		'BW' => array(
+		],
+		'BW' => [
 			'Africa/Gaborone',
-		),
-		'BY' => array(
+		],
+		'BY' => [
 			'Europe/Minsk',
-		),
-		'BZ' => array(
+		],
+		'BZ' => [
 			'America/Belize',
-		),
-		'CA' => array(
+		],
+		'CA' => [
 			'America/Toronto',
 			'America/Vancouver',
 			'America/Edmonton',
@@ -794,283 +797,283 @@ class TimeZone extends \DateTimeZone
 			'America/Blanc-Sablon',
 			'America/Rainy_River',
 			'America/Resolute',
-		),
-		'CC' => array(
+		],
+		'CC' => [
 			'Indian/Cocos',
-		),
-		'CD' => array(
+		],
+		'CD' => [
 			'Africa/Kinshasa',
 			'Africa/Lubumbashi',
-		),
-		'CF' => array(
+		],
+		'CF' => [
 			'Africa/Bangui',
-		),
-		'CG' => array(
+		],
+		'CG' => [
 			'Africa/Brazzaville',
-		),
-		'CH' => array(
+		],
+		'CH' => [
 			'Europe/Zurich',
-		),
-		'CI' => array(
+		],
+		'CI' => [
 			'Africa/Abidjan',
-		),
-		'CK' => array(
+		],
+		'CK' => [
 			'Pacific/Rarotonga',
-		),
-		'CL' => array(
+		],
+		'CL' => [
 			'America/Santiago',
 			'America/Punta_Arenas',
 			'Pacific/Easter',
-		),
-		'CM' => array(
+		],
+		'CM' => [
 			'Africa/Douala',
-		),
-		'CN' => array(
+		],
+		'CN' => [
 			'Asia/Shanghai',
 			'Asia/Urumqi',
-		),
-		'CO' => array(
+		],
+		'CO' => [
 			'America/Bogota',
-		),
-		'CR' => array(
+		],
+		'CR' => [
 			'America/Costa_Rica',
-		),
-		'CU' => array(
+		],
+		'CU' => [
 			'America/Havana',
-		),
-		'CV' => array(
+		],
+		'CV' => [
 			'Atlantic/Cape_Verde',
-		),
-		'CW' => array(
+		],
+		'CW' => [
 			'America/Curacao',
-		),
-		'CX' => array(
+		],
+		'CX' => [
 			'Indian/Christmas',
-		),
-		'CY' => array(
+		],
+		'CY' => [
 			'Asia/Nicosia',
 			'Asia/Famagusta',
-		),
-		'CZ' => array(
+		],
+		'CZ' => [
 			'Europe/Prague',
-		),
-		'DE' => array(
+		],
+		'DE' => [
 			'Europe/Berlin',
 			'Europe/Busingen',
-		),
-		'DJ' => array(
+		],
+		'DJ' => [
 			'Africa/Djibouti',
-		),
-		'DK' => array(
+		],
+		'DK' => [
 			'Europe/Copenhagen',
-		),
-		'DM' => array(
+		],
+		'DM' => [
 			'America/Dominica',
-		),
-		'DO' => array(
+		],
+		'DO' => [
 			'America/Santo_Domingo',
-		),
-		'DZ' => array(
+		],
+		'DZ' => [
 			'Africa/Algiers',
-		),
-		'EC' => array(
+		],
+		'EC' => [
 			'America/Guayaquil',
 			'Pacific/Galapagos',
-		),
-		'EE' => array(
+		],
+		'EE' => [
 			'Europe/Tallinn',
-		),
-		'EG' => array(
+		],
+		'EG' => [
 			'Africa/Cairo',
-		),
-		'EH' => array(
+		],
+		'EH' => [
 			'Africa/El_Aaiun',
-		),
-		'ER' => array(
+		],
+		'ER' => [
 			'Africa/Asmara',
-		),
-		'ES' => array(
+		],
+		'ES' => [
 			'Europe/Madrid',
 			'Atlantic/Canary',
 			'Africa/Ceuta',
-		),
-		'ET' => array(
+		],
+		'ET' => [
 			'Africa/Addis_Ababa',
-		),
-		'FI' => array(
+		],
+		'FI' => [
 			'Europe/Helsinki',
-		),
-		'FJ' => array(
+		],
+		'FJ' => [
 			'Pacific/Fiji',
-		),
-		'FK' => array(
+		],
+		'FK' => [
 			'Atlantic/Stanley',
-		),
-		'FM' => array(
+		],
+		'FM' => [
 			'Pacific/Chuuk',
 			'Pacific/Kosrae',
 			'Pacific/Pohnpei',
-		),
-		'FO' => array(
+		],
+		'FO' => [
 			'Atlantic/Faroe',
-		),
-		'FR' => array(
+		],
+		'FR' => [
 			'Europe/Paris',
-		),
-		'GA' => array(
+		],
+		'GA' => [
 			'Africa/Libreville',
-		),
-		'GB' => array(
+		],
+		'GB' => [
 			'Europe/London',
-		),
-		'GD' => array(
+		],
+		'GD' => [
 			'America/Grenada',
-		),
-		'GE' => array(
+		],
+		'GE' => [
 			'Asia/Tbilisi',
-		),
-		'GF' => array(
+		],
+		'GF' => [
 			'America/Cayenne',
-		),
-		'GG' => array(
+		],
+		'GG' => [
 			'Europe/Guernsey',
-		),
-		'GH' => array(
+		],
+		'GH' => [
 			'Africa/Accra',
-		),
-		'GI' => array(
+		],
+		'GI' => [
 			'Europe/Gibraltar',
-		),
-		'GL' => array(
+		],
+		'GL' => [
 			'America/Nuuk',
 			'America/Thule',
 			'America/Scoresbysund',
 			'America/Danmarkshavn',
-		),
-		'GM' => array(
+		],
+		'GM' => [
 			'Africa/Banjul',
-		),
-		'GN' => array(
+		],
+		'GN' => [
 			'Africa/Conakry',
-		),
-		'GP' => array(
+		],
+		'GP' => [
 			'America/Guadeloupe',
-		),
-		'GQ' => array(
+		],
+		'GQ' => [
 			'Africa/Malabo',
-		),
-		'GR' => array(
+		],
+		'GR' => [
 			'Europe/Athens',
-		),
-		'GS' => array(
+		],
+		'GS' => [
 			'Atlantic/South_Georgia',
-		),
-		'GT' => array(
+		],
+		'GT' => [
 			'America/Guatemala',
-		),
-		'GU' => array(
+		],
+		'GU' => [
 			'Pacific/Guam',
-		),
-		'GW' => array(
+		],
+		'GW' => [
 			'Africa/Bissau',
-		),
-		'GY' => array(
+		],
+		'GY' => [
 			'America/Guyana',
-		),
-		'HK' => array(
+		],
+		'HK' => [
 			'Asia/Hong_Kong',
-		),
-		'HN' => array(
+		],
+		'HN' => [
 			'America/Tegucigalpa',
-		),
-		'HR' => array(
+		],
+		'HR' => [
 			'Europe/Zagreb',
-		),
-		'HT' => array(
+		],
+		'HT' => [
 			'America/Port-au-Prince',
-		),
-		'HU' => array(
+		],
+		'HU' => [
 			'Europe/Budapest',
-		),
-		'ID' => array(
+		],
+		'ID' => [
 			'Asia/Jakarta',
 			'Asia/Makassar',
 			'Asia/Pontianak',
 			'Asia/Jayapura',
-		),
-		'IE' => array(
+		],
+		'IE' => [
 			'Europe/Dublin',
-		),
-		'IL' => array(
+		],
+		'IL' => [
 			'Asia/Jerusalem',
-		),
-		'IM' => array(
+		],
+		'IM' => [
 			'Europe/Isle_of_Man',
-		),
-		'IN' => array(
+		],
+		'IN' => [
 			'Asia/Kolkata',
-		),
-		'IO' => array(
+		],
+		'IO' => [
 			'Indian/Chagos',
-		),
-		'IQ' => array(
+		],
+		'IQ' => [
 			'Asia/Baghdad',
-		),
-		'IR' => array(
+		],
+		'IR' => [
 			'Asia/Tehran',
-		),
-		'IS' => array(
+		],
+		'IS' => [
 			'Atlantic/Reykjavik',
-		),
-		'IT' => array(
+		],
+		'IT' => [
 			'Europe/Rome',
-		),
-		'JE' => array(
+		],
+		'JE' => [
 			'Europe/Jersey',
-		),
-		'JM' => array(
+		],
+		'JM' => [
 			'America/Jamaica',
-		),
-		'JO' => array(
+		],
+		'JO' => [
 			'Asia/Amman',
-		),
-		'JP' => array(
+		],
+		'JP' => [
 			'Asia/Tokyo',
-		),
-		'KE' => array(
+		],
+		'KE' => [
 			'Africa/Nairobi',
-		),
-		'KG' => array(
+		],
+		'KG' => [
 			'Asia/Bishkek',
-		),
-		'KH' => array(
+		],
+		'KH' => [
 			'Asia/Phnom_Penh',
-		),
-		'KI' => array(
+		],
+		'KI' => [
 			'Pacific/Tarawa',
 			'Pacific/Kiritimati',
 			'Pacific/Kanton',
 			'Pacific/Enderbury',
-		),
-		'KM' => array(
+		],
+		'KM' => [
 			'Indian/Comoro',
-		),
-		'KN' => array(
+		],
+		'KN' => [
 			'America/St_Kitts',
-		),
-		'KP' => array(
+		],
+		'KP' => [
 			'Asia/Pyongyang',
-		),
-		'KR' => array(
+		],
+		'KR' => [
 			'Asia/Seoul',
-		),
-		'KW' => array(
+		],
+		'KW' => [
 			'Asia/Kuwait',
-		),
-		'KY' => array(
+		],
+		'KY' => [
 			'America/Cayman',
-		),
-		'KZ' => array(
+		],
+		'KZ' => [
 			'Asia/Almaty',
 			'Asia/Aqtobe',
 			'Asia/Atyrau',
@@ -1078,104 +1081,104 @@ class TimeZone extends \DateTimeZone
 			'Asia/Qyzylorda',
 			'Asia/Aqtau',
 			'Asia/Oral',
-		),
-		'LA' => array(
+		],
+		'LA' => [
 			'Asia/Vientiane',
-		),
-		'LB' => array(
+		],
+		'LB' => [
 			'Asia/Beirut',
-		),
-		'LC' => array(
+		],
+		'LC' => [
 			'America/St_Lucia',
-		),
-		'LI' => array(
+		],
+		'LI' => [
 			'Europe/Vaduz',
-		),
-		'LK' => array(
+		],
+		'LK' => [
 			'Asia/Colombo',
-		),
-		'LR' => array(
+		],
+		'LR' => [
 			'Africa/Monrovia',
-		),
-		'LS' => array(
+		],
+		'LS' => [
 			'Africa/Maseru',
-		),
-		'LT' => array(
+		],
+		'LT' => [
 			'Europe/Vilnius',
-		),
-		'LU' => array(
+		],
+		'LU' => [
 			'Europe/Luxembourg',
-		),
-		'LV' => array(
+		],
+		'LV' => [
 			'Europe/Riga',
-		),
-		'LY' => array(
+		],
+		'LY' => [
 			'Africa/Tripoli',
-		),
-		'MA' => array(
+		],
+		'MA' => [
 			'Africa/Casablanca',
-		),
-		'MC' => array(
+		],
+		'MC' => [
 			'Europe/Monaco',
-		),
-		'MD' => array(
+		],
+		'MD' => [
 			'Europe/Chisinau',
-		),
-		'ME' => array(
+		],
+		'ME' => [
 			'Europe/Podgorica',
-		),
-		'MF' => array(
+		],
+		'MF' => [
 			'America/Marigot',
-		),
-		'MG' => array(
+		],
+		'MG' => [
 			'Indian/Antananarivo',
-		),
-		'MH' => array(
+		],
+		'MH' => [
 			'Pacific/Majuro',
 			'Pacific/Kwajalein',
-		),
-		'MK' => array(
+		],
+		'MK' => [
 			'Europe/Skopje',
-		),
-		'ML' => array(
+		],
+		'ML' => [
 			'Africa/Bamako',
-		),
-		'MM' => array(
+		],
+		'MM' => [
 			'Asia/Yangon',
-		),
-		'MN' => array(
+		],
+		'MN' => [
 			'Asia/Ulaanbaatar',
 			'Asia/Choibalsan',
 			'Asia/Hovd',
-		),
-		'MO' => array(
+		],
+		'MO' => [
 			'Asia/Macau',
-		),
-		'MP' => array(
+		],
+		'MP' => [
 			'Pacific/Saipan',
-		),
-		'MQ' => array(
+		],
+		'MQ' => [
 			'America/Martinique',
-		),
-		'MR' => array(
+		],
+		'MR' => [
 			'Africa/Nouakchott',
-		),
-		'MS' => array(
+		],
+		'MS' => [
 			'America/Montserrat',
-		),
-		'MT' => array(
+		],
+		'MT' => [
 			'Europe/Malta',
-		),
-		'MU' => array(
+		],
+		'MU' => [
 			'Indian/Mauritius',
-		),
-		'MV' => array(
+		],
+		'MV' => [
 			'Indian/Maldives',
-		),
-		'MW' => array(
+		],
+		'MW' => [
 			'Africa/Blantyre',
-		),
-		'MX' => array(
+		],
+		'MX' => [
 			'America/Mexico_City',
 			'America/Tijuana',
 			'America/Monterrey',
@@ -1188,115 +1191,115 @@ class TimeZone extends \DateTimeZone
 			'America/Mazatlan',
 			'America/Bahia_Banderas',
 			'America/Ojinaga',
-		),
-		'MY' => array(
+		],
+		'MY' => [
 			'Asia/Kuala_Lumpur',
 			'Asia/Kuching',
-		),
-		'MZ' => array(
+		],
+		'MZ' => [
 			'Africa/Maputo',
-		),
-		'NA' => array(
+		],
+		'NA' => [
 			'Africa/Windhoek',
-		),
-		'NC' => array(
+		],
+		'NC' => [
 			'Pacific/Noumea',
-		),
-		'NE' => array(
+		],
+		'NE' => [
 			'Africa/Niamey',
-		),
-		'NF' => array(
+		],
+		'NF' => [
 			'Pacific/Norfolk',
-		),
-		'NG' => array(
+		],
+		'NG' => [
 			'Africa/Lagos',
-		),
-		'NI' => array(
+		],
+		'NI' => [
 			'America/Managua',
-		),
-		'NL' => array(
+		],
+		'NL' => [
 			'Europe/Amsterdam',
-		),
-		'NO' => array(
+		],
+		'NO' => [
 			'Europe/Oslo',
-		),
-		'NP' => array(
+		],
+		'NP' => [
 			'Asia/Kathmandu',
-		),
-		'NR' => array(
+		],
+		'NR' => [
 			'Pacific/Nauru',
-		),
-		'NU' => array(
+		],
+		'NU' => [
 			'Pacific/Niue',
-		),
-		'NZ' => array(
+		],
+		'NZ' => [
 			'Pacific/Auckland',
 			'Pacific/Chatham',
-		),
-		'OM' => array(
+		],
+		'OM' => [
 			'Asia/Muscat',
-		),
-		'PA' => array(
+		],
+		'PA' => [
 			'America/Panama',
-		),
-		'PE' => array(
+		],
+		'PE' => [
 			'America/Lima',
-		),
-		'PF' => array(
+		],
+		'PF' => [
 			'Pacific/Tahiti',
 			'Pacific/Marquesas',
 			'Pacific/Gambier',
-		),
-		'PG' => array(
+		],
+		'PG' => [
 			'Pacific/Port_Moresby',
 			'Pacific/Bougainville',
-		),
-		'PH' => array(
+		],
+		'PH' => [
 			'Asia/Manila',
-		),
-		'PK' => array(
+		],
+		'PK' => [
 			'Asia/Karachi',
-		),
-		'PL' => array(
+		],
+		'PL' => [
 			'Europe/Warsaw',
-		),
-		'PM' => array(
+		],
+		'PM' => [
 			'America/Miquelon',
-		),
-		'PN' => array(
+		],
+		'PN' => [
 			'Pacific/Pitcairn',
-		),
-		'PR' => array(
+		],
+		'PR' => [
 			'America/Puerto_Rico',
-		),
-		'PS' => array(
+		],
+		'PS' => [
 			'Asia/Gaza',
 			'Asia/Hebron',
-		),
-		'PT' => array(
+		],
+		'PT' => [
 			'Europe/Lisbon',
 			'Atlantic/Madeira',
 			'Atlantic/Azores',
-		),
-		'PW' => array(
+		],
+		'PW' => [
 			'Pacific/Palau',
-		),
-		'PY' => array(
+		],
+		'PY' => [
 			'America/Asuncion',
-		),
-		'QA' => array(
+		],
+		'QA' => [
 			'Asia/Qatar',
-		),
-		'RE' => array(
+		],
+		'RE' => [
 			'Indian/Reunion',
-		),
-		'RO' => array(
+		],
+		'RO' => [
 			'Europe/Bucharest',
-		),
-		'RS' => array(
+		],
+		'RS' => [
 			'Europe/Belgrade',
-		),
-		'RU' => array(
+		],
+		'RU' => [
 			'Europe/Moscow',
 			'Asia/Novosibirsk',
 			'Asia/Yekaterinburg',
@@ -1323,135 +1326,135 @@ class TimeZone extends \DateTimeZone
 			'Asia/Khandyga',
 			'Asia/Ust-Nera',
 			'Asia/Srednekolymsk',
-		),
-		'RW' => array(
+		],
+		'RW' => [
 			'Africa/Kigali',
-		),
-		'SA' => array(
+		],
+		'SA' => [
 			'Asia/Riyadh',
-		),
-		'SB' => array(
+		],
+		'SB' => [
 			'Pacific/Guadalcanal',
-		),
-		'SC' => array(
+		],
+		'SC' => [
 			'Indian/Mahe',
-		),
-		'SD' => array(
+		],
+		'SD' => [
 			'Africa/Khartoum',
-		),
-		'SE' => array(
+		],
+		'SE' => [
 			'Europe/Stockholm',
-		),
-		'SG' => array(
+		],
+		'SG' => [
 			'Asia/Singapore',
-		),
-		'SH' => array(
+		],
+		'SH' => [
 			'Atlantic/St_Helena',
-		),
-		'SI' => array(
+		],
+		'SI' => [
 			'Europe/Ljubljana',
-		),
-		'SJ' => array(
+		],
+		'SJ' => [
 			'Arctic/Longyearbyen',
-		),
-		'SK' => array(
+		],
+		'SK' => [
 			'Europe/Bratislava',
-		),
-		'SL' => array(
+		],
+		'SL' => [
 			'Africa/Freetown',
-		),
-		'SM' => array(
+		],
+		'SM' => [
 			'Europe/San_Marino',
-		),
-		'SN' => array(
+		],
+		'SN' => [
 			'Africa/Dakar',
-		),
-		'SO' => array(
+		],
+		'SO' => [
 			'Africa/Mogadishu',
-		),
-		'SR' => array(
+		],
+		'SR' => [
 			'America/Paramaribo',
-		),
-		'SS' => array(
+		],
+		'SS' => [
 			'Africa/Juba',
-		),
-		'ST' => array(
+		],
+		'ST' => [
 			'Africa/Sao_Tome',
-		),
-		'SV' => array(
+		],
+		'SV' => [
 			'America/El_Salvador',
-		),
-		'SX' => array(
+		],
+		'SX' => [
 			'America/Lower_Princes',
-		),
-		'SY' => array(
+		],
+		'SY' => [
 			'Asia/Damascus',
-		),
-		'SZ' => array(
+		],
+		'SZ' => [
 			'Africa/Mbabane',
-		),
-		'TC' => array(
+		],
+		'TC' => [
 			'America/Grand_Turk',
-		),
-		'TD' => array(
+		],
+		'TD' => [
 			'Africa/Ndjamena',
-		),
-		'TF' => array(
+		],
+		'TF' => [
 			'Indian/Kerguelen',
-		),
-		'TG' => array(
+		],
+		'TG' => [
 			'Africa/Lome',
-		),
-		'TH' => array(
+		],
+		'TH' => [
 			'Asia/Bangkok',
-		),
-		'TJ' => array(
+		],
+		'TJ' => [
 			'Asia/Dushanbe',
-		),
-		'TK' => array(
+		],
+		'TK' => [
 			'Pacific/Fakaofo',
-		),
-		'TL' => array(
+		],
+		'TL' => [
 			'Asia/Dili',
-		),
-		'TM' => array(
+		],
+		'TM' => [
 			'Asia/Ashgabat',
-		),
-		'TN' => array(
+		],
+		'TN' => [
 			'Africa/Tunis',
-		),
-		'TO' => array(
+		],
+		'TO' => [
 			'Pacific/Tongatapu',
-		),
-		'TR' => array(
+		],
+		'TR' => [
 			'Europe/Istanbul',
-		),
-		'TT' => array(
+		],
+		'TT' => [
 			'America/Port_of_Spain',
-		),
-		'TV' => array(
+		],
+		'TV' => [
 			'Pacific/Funafuti',
-		),
-		'TW' => array(
+		],
+		'TW' => [
 			'Asia/Taipei',
-		),
-		'TZ' => array(
+		],
+		'TZ' => [
 			'Africa/Dar_es_Salaam',
-		),
-		'UA' => array(
+		],
+		'UA' => [
 			'Europe/Kyiv',
 			'Europe/Zaporozhye',
 			'Europe/Simferopol',
 			'Europe/Uzhgorod',
-		),
-		'UG' => array(
+		],
+		'UG' => [
 			'Africa/Kampala',
-		),
-		'UM' => array(
+		],
+		'UM' => [
 			'Pacific/Midway',
 			'Pacific/Wake',
-		),
-		'US' => array(
+		],
+		'US' => [
 			'America/New_York',
 			'America/Los_Angeles',
 			'America/Chicago',
@@ -1481,121 +1484,121 @@ class TimeZone extends \DateTimeZone
 			'America/Yakutat',
 			'America/North_Dakota/Center',
 			'America/Adak',
-		),
-		'UY' => array(
+		],
+		'UY' => [
 			'America/Montevideo',
-		),
-		'UZ' => array(
+		],
+		'UZ' => [
 			'Asia/Tashkent',
 			'Asia/Samarkand',
-		),
-		'VA' => array(
+		],
+		'VA' => [
 			'Europe/Vatican',
-		),
-		'VC' => array(
+		],
+		'VC' => [
 			'America/St_Vincent',
-		),
-		'VE' => array(
+		],
+		'VE' => [
 			'America/Caracas',
-		),
-		'VG' => array(
+		],
+		'VG' => [
 			'America/Tortola',
-		),
-		'VI' => array(
+		],
+		'VI' => [
 			'America/St_Thomas',
-		),
-		'VN' => array(
+		],
+		'VN' => [
 			'Asia/Ho_Chi_Minh',
-		),
-		'VU' => array(
+		],
+		'VU' => [
 			'Pacific/Efate',
-		),
-		'WF' => array(
+		],
+		'WF' => [
 			'Pacific/Wallis',
-		),
-		'WS' => array(
+		],
+		'WS' => [
 			'Pacific/Apia',
-		),
-		'YE' => array(
+		],
+		'YE' => [
 			'Asia/Aden',
-		),
-		'YT' => array(
+		],
+		'YT' => [
 			'Indian/Mayotte',
-		),
-		'ZA' => array(
+		],
+		'ZA' => [
 			'Africa/Johannesburg',
-		),
-		'ZM' => array(
+		],
+		'ZM' => [
 			'Africa/Lusaka',
-		),
-		'ZW' => array(
+		],
+		'ZW' => [
 			'Africa/Harare',
-		),
-	);
+		],
+	];
 
 	/**
 	 * @var array
-	 * 
+	 *
 	 * Time zone fallbacks to use when PHP has an outdated copy of the time zone
 	 * database.
-	 * 
+	 *
 	 * 'ts' is the timestamp when the substitution first becomes valid.
 	 * 'tzid' is the alternative time zone identifier to use.
 	 */
-	public static array $fallbacks = array(
+	public static array $fallbacks = [
 		/*
 		 * 1. Simple renames.
 		 *
 		 * PHP_INT_MIN because these are valid for all dates.
 		 */
-		'Asia/Kolkata' => array(
-			array(
+		'Asia/Kolkata' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Asia/Calcutta',
-			),
-		),
-		'Pacific/Chuuk' => array(
-			array(
+			],
+		],
+		'Pacific/Chuuk' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Pacific/Truk',
-			),
-		),
-		'Pacific/Kanton' => array(
-			array(
+			],
+		],
+		'Pacific/Kanton' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Pacific/Enderbury',
-			),
-		),
-		'Pacific/Pohnpei' => array(
-			array(
+			],
+		],
+		'Pacific/Pohnpei' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Pacific/Ponape',
-			),
-		),
-		'Asia/Yangon' => array(
-			array(
+			],
+		],
+		'Asia/Yangon' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Asia/Rangoon',
-			),
-		),
-		'America/Nuuk' => array(
-			array(
+			],
+		],
+		'America/Nuuk' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'America/Godthab',
-			),
-		),
-		'Europe/Busingen' => array(
-			array(
+			],
+		],
+		'Europe/Busingen' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Europe/Zurich',
-			),
-		),
-		'Europe/Kyiv' => array(
-			array(
+			],
+		],
+		'Europe/Kyiv' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Europe/Kiev',
-			),
-		),
+			],
+		],
 
 		/*
 		 * 2. Newly created time zones.
@@ -1608,408 +1611,408 @@ class TimeZone extends \DateTimeZone
 		// The same as Tasmania, except it stayed on DST all year in 2010.
 		// Australia/Tasmania is an otherwise unused backward compatibility
 		// link to Australia/Hobart, so we can borrow it here without conflict.
-		'Antarctica/Macquarie' => array(
-			array(
+		'Antarctica/Macquarie' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => 'Australia/Tasmania',
-			),
-			array(
+			],
+			[
 				'ts' => '2010-04-03T16:00:00+0000',
 				'tzid' => 'Etc/GMT-11',
-			),
-			array(
+			],
+			[
 				'ts' => '2011-04-07T17:00:00+0000',
 				'tzid' => 'Australia/Tasmania',
-			),
-		),
+			],
+		],
 
 		// Added in version 2013a.
-		'Asia/Khandyga' => array(
-			array(
+		'Asia/Khandyga' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1919-12-14T14:57:47+0000',
 				'tzid' => 'Etc/GMT-8',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T16:00:00+0000',
 				'tzid' => 'Asia/Yakutsk',
-			),
-			array(
+			],
+			[
 				'ts' => '2003-12-31T15:00:00+0000',
 				'tzid' => 'Asia/Vladivostok',
-			),
-			array(
+			],
+			[
 				'ts' => '2011-09-12T13:00:00+0000',
 				'tzid' => 'Asia/Yakutsk',
-			),
-		),
+			],
+		],
 
 		// Added in version 2013a.
-		'Asia/Ust-Nera' => array(
-			array(
+		'Asia/Ust-Nera' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1919-12-14T14:27:06+0000',
 				'tzid' => 'Etc/GMT-8',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T16:00:00+0000',
 				'tzid' => 'Asia/Yakutsk',
-			),
-			array(
+			],
+			[
 				'ts' => '1981-03-31T15:00:00+0000',
 				'tzid' => 'Asia/Magadan',
-			),
-			array(
+			],
+			[
 				'ts' => '2011-09-12T12:00:00+0000',
 				'tzid' => 'Asia/Vladivostok',
-			),
-		),
+			],
+		],
 
 		// Created in version 2014b.
 		// This place uses two hours for DST. No substitutes are possible.
-		'Antarctica/Troll' => array(
-			array(
+		'Antarctica/Troll' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-		),
+			],
+		],
 
 		// Diverged from Asia/Yakustsk in version 2014f.
-		'Asia/Chita' => array(
-			array(
+		'Asia/Chita' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1919-12-14T16:26:08+0000',
 				'tzid' => 'Asia/Yakutsk',
-			),
-			array(
+			],
+			[
 				'ts' => '2014-10-25T16:00:00+0000',
 				'tzid' => 'Etc/GMT-8',
-			),
-			array(
+			],
+			[
 				'ts' => '2016-03-26T18:00:00+0000',
 				'tzid' => 'Asia/Yakutsk',
-			),
-		),
+			],
+		],
 
 		// Diverged from Asia/Magadan in version 2014f.
-		'Asia/Srednekolymsk' => array(
-			array(
+		'Asia/Srednekolymsk' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1924-05-01T13:45:08+0000',
 				'tzid' => 'Etc/GMT-10',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T14:00:00+0000',
 				'tzid' => 'Asia/Magadan',
-			),
-			array(
+			],
+			[
 				'ts' => '2014-10-25T14:00:00+0000',
 				'tzid' => 'Etc/GMT-11',
-			),
-		),
+			],
+		],
 
 		// Diverged from Pacific/Port_Moresby in version 2014i.
-		'Pacific/Bougainville' => array(
-			array(
+		'Pacific/Bougainville' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
+			],
 			// Pacific/Yap is an unused link to Pacific/Port_Moresby.
-			array(
+			[
 				'ts' => '1879-12-31T14:11:20+0000',
 				'tzid' => 'Pacific/Yap',
-			),
+			],
 			// Apparently this was different for a while in World War II.
-			array(
+			[
 				'ts' => '1942-06-30T14:00:00+0000',
 				'tzid' => 'Singapore',
-			),
-			array(
+			],
+			[
 				'ts' => '1945-08-20T15:00:00+0000',
 				'tzid' => 'Pacific/Yap',
-			),
+			],
 			// For dates after divergence, it is the same as Pacific/Kosrae.
 			// If this ever ceases to be true, add another entry.
-			array(
+			[
 				'ts' => '2014-12-27T16:00:00+0000',
 				'tzid' => 'Pacific/Kosrae',
-			),
-		),
+			],
+		],
 
 		// Added in version 2015g.
-		'America/Fort_Nelson' => array(
-			array(
+		'America/Fort_Nelson' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1884-01-01T08:12:28+0000',
 				'tzid' => 'Canada/Pacific',
-			),
-			array(
+			],
+			[
 				'ts' => '1946-01-01T08:00:00+0000',
 				'tzid' => 'Etc/GMT+8',
-			),
-			array(
+			],
+			[
 				'ts' => '1947-01-01T08:00:00+0000',
 				'tzid' => 'Canada/Pacific',
-			),
-			array(
+			],
+			[
 				'ts' => '2015-03-08T10:00:00+0000',
 				'tzid' => 'MST',
-			),
-		),
+			],
+		],
 
 		// Created in version 2016b.
-		'Europe/Astrakhan' => array(
-			array(
+		'Europe/Astrakhan' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1935-01-26T20:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-			array(
+			],
+			[
 				'ts' => '1989-03-25T22:00:00+0000',
 				'tzid' => 'Europe/Volgograd',
-			),
-			array(
+			],
+			[
 				'ts' => '2016-03-26T23:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-		),
+			],
+		],
 
 		// Created in version 2016b.
-		'Europe/Ulyanovsk' => array(
-			array(
+		'Europe/Ulyanovsk' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1935-01-26T20:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-			array(
+			],
+			[
 				'ts' => '1989-03-25T22:00:00+0000',
 				'tzid' => 'W-SU',
-			),
-			array(
+			],
+			[
 				'ts' => '2016-03-26T23:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-		),
+			],
+		],
 
 		// Created in version 2016b.
-		'Asia/Barnaul' => array(
-			array(
+		'Asia/Barnaul' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1919-12-09T18:25:00+0000',
 				'tzid' => 'Etc/GMT-6',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T18:00:00+0000',
 				'tzid' => 'Asia/Novokuznetsk',
-			),
-			array(
+			],
+			[
 				'ts' => '1995-05-27T16:00:00+0000',
 				'tzid' => 'Asia/Novosibirsk',
-			),
-			array(
+			],
+			[
 				'ts' => '2016-03-26T20:00:00+0000',
 				'tzid' => 'Asia/Novokuznetsk',
-			),
-		),
+			],
+		],
 
 		// Created in version 2016b.
-		'Asia/Tomsk' => array(
-			array(
+		'Asia/Tomsk' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1919-12-21T18:20:09+0000',
 				'tzid' => 'Asia/Novosibirsk',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T18:00:00+0000',
 				'tzid' => 'Asia/Novokuznetsk',
-			),
-			array(
+			],
+			[
 				'ts' => '2002-04-30T19:00:00+0000',
 				'tzid' => 'Asia/Novosibirsk',
-			),
-			array(
+			],
+			[
 				'ts' => '2016-05-28T20:00:00+0000',
 				'tzid' => 'Asia/Novokuznetsk',
-			),
-		),
+			],
+		],
 
 		// Created in version 2016d.
-		'Europe/Kirov' => array(
-			array(
+		'Europe/Kirov' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1935-01-26T20:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-			array(
+			],
+			[
 				'ts' => '1989-03-25T22:00:00+0000',
 				'tzid' => 'Europe/Volgograd',
-			),
-			array(
+			],
+			[
 				'ts' => '1992-03-28T22:00:00+0000',
 				'tzid' => 'W-SU',
-			),
-		),
+			],
+		],
 
 		// Diverged from Asia/Nicosia in version 2016i.
-		'Asia/Famagusta' => array(
-			array(
+		'Asia/Famagusta' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
+			],
 			// Europe/Nicosia is an otherwise unused link to Asia/Nicosia.
-			array(
+			[
 				'ts' => '1921-11-13T21:46:32+0000',
 				'tzid' => 'Europe/Nicosia',
-			),
+			],
 			// Became same as Europe/Istanbul.
 			// Turkey is an otherwise unused link to Europe/Istanbul.
-			array(
+			[
 				'ts' => '2016-09-07T21:00:00+0000',
 				'tzid' => 'Turkey',
-			),
+			],
 			// Became same as Asia/Nicosia again.
-			array(
+			[
 				'ts' => '2017-10-29T01:00:00+0000',
 				'tzid' => 'Europe/Nicosia',
-			),
-		),
+			],
+		],
 
 		// Created in version 2016j.
-		'Asia/Atyrau' => array(
-			array(
+		'Asia/Atyrau' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1924-05-01T20:32:16+0000',
 				'tzid' => 'Etc/GMT-3',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T21:00:00+0000',
 				'tzid' => 'Asia/Aqtau',
-			),
-			array(
+			],
+			[
 				'ts' => '1981-09-30T19:00:00+0000',
 				'tzid' => 'Asia/Aqtobe',
-			),
-			array(
+			],
+			[
 				'tz' => '1999-03-27T21:00:00+0000',
-				'tzid' => 'Etc/GMT-5'
-			),
-		),
+				'tzid' => 'Etc/GMT-5',
+			],
+		],
 
 		// Diverged from Europe/Volgograd in version 2016j.
-		'Europe/Saratov' => array(
-			array(
+		'Europe/Saratov' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1935-01-26T20:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-			array(
+			],
+			[
 				'ts' => '1988-03-26T22:00:00+0000',
 				'tzid' => 'Europe/Volgograd',
-			),
-			array(
+			],
+			[
 				'ts' => '2016-12-03T23:00:00+0000',
 				'tzid' => 'Europe/Samara',
-			),
-		),
+			],
+		],
 
 		// Diverged from America/Santiago in version 2017a.
-		'America/Punta_Arenas' => array(
-			array(
+		'America/Punta_Arenas' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
+			],
 			// Chile/Continental is an otherwise unused link to America/Santiago.
-			array(
+			[
 				'ts' => '1890-01-01T04:43:40+0000',
 				'tzid' => 'Chile/Continental',
-			),
-			array(
+			],
+			[
 				'ts' => '1942-08-01T05:00:00+0000',
 				'tzid' => 'Etc/GMT+4',
-			),
-			array(
+			],
+			[
 				'ts' => '1946-08-29T04:00:00+0000',
 				'tzid' => 'Chile/Continental',
-			),
+			],
 			// America/Mendoza is an otherwise unused link to America/Argentina/Mendoza.
-			array(
+			[
 				'ts' => '2016-12-04T03:00:00+0000',
 				'tzid' => 'America/Mendoza',
-			),
-		),
+			],
+		],
 
 		// Diverged from Asia/Qyzylorda in version 2018h.
-		'Asia/Qostanay' => array(
-			array(
+		'Asia/Qostanay' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1924-05-01T19:45:32+0000',
 				'tzid' => 'Asia/Qyzylorda',
-			),
-			array(
+			],
+			[
 				'ts' => '1930-06-20T20:00:00+0000',
 				'tzid' => 'Asia/Aqtobe',
-			),
-			array(
+			],
+			[
 				'ts' => '2004-10-30T21:00:00+0000',
 				'tzid' => 'Asia/Almaty',
-			),
-		),
+			],
+		],
 
 		// Diverged from America/Ojinaga in version 2022g.
-		'America/Ciudad_Juarez' => array(
-			array(
+		'America/Ciudad_Juarez' => [
+			[
 				'ts' => PHP_INT_MIN,
 				'tzid' => '',
-			),
-			array(
+			],
+			[
 				'ts' => '1922-01-01T07:00:00+0000',
 				'tzid' => 'America/Ojinaga',
-			),
-			array(
+			],
+			[
 				'ts' => '2022-11-30T06:00:00+0000',
 				'tzid' => 'America/Denver',
-			),
-		),
-	);
+			],
+		],
+	];
 
 	/****************************
 	 * Internal static properties
@@ -2023,7 +2026,7 @@ class TimeZone extends \DateTimeZone
 	 *
 	 * Built by self::list()
 	 */
-	protected static $timezones_when = array();
+	protected static $timezones_when = [];
 
 	/**
 	 * @var array
@@ -2033,7 +2036,7 @@ class TimeZone extends \DateTimeZone
 	 *
 	 * Built by self::prioritizeTzids()
 	 */
-	protected static array $prioritized_tzids = array();
+	protected static array $prioritized_tzids = [];
 
 	/**
 	 * @var array
@@ -2043,7 +2046,7 @@ class TimeZone extends \DateTimeZone
 	 *
 	 * Built by self::getTimeRange()
 	 */
-	protected static array $ranges = array();
+	protected static array $ranges = [];
 
 	/**
 	 * @var array
@@ -2053,7 +2056,7 @@ class TimeZone extends \DateTimeZone
 	 *
 	 * Built by self::buildMetaZoneTransitions()
 	 */
-	protected static array $metazone_transitions = array();
+	protected static array $metazone_transitions = [];
 
 	/****************
 	 * Public methods
@@ -2071,12 +2074,14 @@ public function getLabel(): string
 	{
 		Lang::load('Timezones');
 
-		if (!empty(Lang::$txt[$this->getName()]))
+		if (!empty(Lang::$txt[$this->getName()])) {
 			return Lang::$txt[$this->getName()];
+		}
 
 		// If there's no $txt string, just guess based on the tzid's name.
 		$tzid_parts = explode('/', $this->getName());
-		return str_replace(array('St_', '_'), array('St. ', ' '), array_pop($tzid_parts));
+
+		return str_replace(['St_', '_'], ['St. ', ' '], array_pop($tzid_parts));
 	}
 
 	/**
@@ -2091,17 +2096,18 @@ public function getAbbreviations(int|string $when = 'now'): array
 	{
 		list($when, $later) = self::getTimeRange($when);
 
-		$abbrs = array();
+		$abbrs = [];
 
-		foreach ($this->getTransitions($when, $later) as $transition)
+		foreach ($this->getTransitions($when, $later) as $transition) {
 			$abbrs[] = $transition['abbr'];
+		}
 
 		return $abbrs;
 	}
 
 	/**
 	 * Returns the "meta-zone" for this time zone at the given timestamp.
-	 * 
+	 *
 	 * @param string $when The date/time we are interested in.
 	 *    May be a Unix timestamp or any string that strtotime() can understand.
 	 *    Defaults to 'now'.
@@ -2111,20 +2117,21 @@ public function getMetaZone(int|string $when = 'now'): string
 	{
 		list($when, $later) = self::getTimeRange($when);
 
-		if (empty(self::$metazone_transitions[$when]))
+		if (empty(self::$metazone_transitions[$when])) {
 			self::buildMetaZoneTransitions($when);
+		}
 
 		$tzkey = serialize($this->getTransitions($when, $later));
 
-		if (isset(self::$metazone_transitions[$when][$tzkey]))
+		if (isset(self::$metazone_transitions[$when][$tzkey])) {
 			return self::$metazone_transitions[$when][$tzkey];
+		}
 
 		// Doesn't match any existing metazone. Can we build a custom one?
 		$tzgeo = $this->getLocation();
 		$country_tzids = self::getSortedTzidsForCountry($tzgeo['country_code']);
 
-		if (count($country_tzids) === 1)
-		{
+		if (count($country_tzids) === 1) {
 			Lang::load('Timezones');
 
 			Lang::$tztxt[$tzgeo['country_code']] = sprintf(Lang::$tztxt['generic_timezone'], Lang::$txt['iso3166'][$tzgeo['country_code']], '%1$s');
@@ -2166,11 +2173,13 @@ public function getDstType(int|string $when = 'now'): int
 
 		$tzinfo = $this->getTransitions($when, $later);
 
-		if (count($tzinfo) > 1)
+		if (count($tzinfo) > 1) {
 			return self::DST_SWITCHES;
+		}
 
-		if ($tzinfo[0]['isdst'])
+		if ($tzinfo[0]['isdst']) {
 			return self::DST_ALWAYS;
+		}
 
 		return self::DST_NEVER;
 	}
@@ -2190,10 +2199,10 @@ public function getStandardOffset(int|string $when = 'now'): int
 
 		$tzinfo = $this->getTransitions($when, $later);
 
-		foreach ($tzinfo as $transition)
-		{
-			if (!$transition['isdst'])
+		foreach ($tzinfo as $transition) {
+			if (!$transition['isdst']) {
 				return $transition['offset'];
+			}
 		}
 
 		// If it uses DST all the time, just return the first offset.
@@ -2217,8 +2226,9 @@ public static function list(int|string $when = 'now'): array
 		list($when, $later) = self::getTimeRange($when);
 
 		// No point doing this over if we already did it once.
-		if (isset(self::$timezones_when[$when]))
+		if (isset(self::$timezones_when[$when])) {
 			return self::$timezones_when[$when];
+		}
 
 		// Load up any custom time zone descriptions we might have
 		Lang::load('Timezones');
@@ -2229,18 +2239,17 @@ public static function list(int|string $when = 'now'): array
 		self::prioritizeTzids();
 
 		// Idea here is to get exactly one representative identifier for each and every unique set of time zone rules.
-		$zones = array();
-		$dst_types = array();
-		$labels = array();
-		$offsets = array();
-
-		foreach (self::$prioritized_tzids as $priority_level => $tzids)
-		{
-			foreach ($tzids as $tzid)
-			{
+		$zones = [];
+		$dst_types = [];
+		$labels = [];
+		$offsets = [];
+
+		foreach (self::$prioritized_tzids as $priority_level => $tzids) {
+			foreach ($tzids as $tzid) {
 				// We don't want UTC right now.
-				if ($tzid == 'UTC')
+				if ($tzid == 'UTC') {
 					continue;
+				}
 
 				$tz = new self($tzid);
 
@@ -2248,16 +2257,16 @@ public static function list(int|string $when = 'now'): array
 				$tzkey = serialize($tzinfo);
 
 				// Don't overwrite our preferred tzids
-				if (empty($zones[$tzkey]['tzid']))
-				{
+				if (empty($zones[$tzkey]['tzid'])) {
 					$zones[$tzkey]['tzid'] = $tzid;
 					$zones[$tzkey]['dst_type'] = $tz->getDstType();
 					$zones[$tzkey]['abbrs'] = $tz->getAbbreviations($when);
 
 					$metazone_label = $tz->getMetaZoneLabel();
 
-					if (!empty($metazone_label))
+					if (!empty($metazone_label)) {
 						$zones[$tzkey]['metazone'] = $metazone_label;
+					}
 				}
 
 				$zones[$tzkey]['locations'][] = $tz->getLabel();
@@ -2266,8 +2275,7 @@ public static function list(int|string $when = 'now'): array
 				$offsets[$tzkey] = $tzinfo[0]['offset'];
 				$std_offsets[$tzkey] = $tz->getStandardOffset($when);
 
-				switch ($tz->getDstType())
-				{
+				switch ($tz->getDstType()) {
 					case self::DST_SWITCHES:
 						$dst_types[$tzkey] = 'c';
 						break;
@@ -2291,19 +2299,17 @@ public static function list(int|string $when = 'now'): array
 		$date_when = date_create('@' . $when);
 
 		// Build the final array of formatted values
-		$priority_timezones = array();
-		$timezones = array();
-		foreach ($zones as $tzkey => $tzvalue)
-		{
+		$priority_timezones = [];
+		$timezones = [];
+
+		foreach ($zones as $tzkey => $tzvalue) {
 			date_timezone_set($date_when, timezone_open($tzvalue['tzid']));
 
 			// Use the human friendly time zone name, if there is one.
 			$desc = '';
 
-			if (!empty($tzvalue['metazone']))
-			{
-				switch ($tzvalue['dst_type'])
-				{
+			if (!empty($tzvalue['metazone'])) {
+				switch ($tzvalue['dst_type']) {
 					case 0:
 						$desc = sprintf($tzvalue['metazone'], Lang::$tztxt['daylight_saving_time_false']);
 						break;
@@ -2318,48 +2324,44 @@ public static function list(int|string $when = 'now'): array
 				}
 			}
 			// Otherwise, use the list of locations (max 5, so things don't get silly)
-			else
-			{
+			else {
 				$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . Lang::$txt['etc'] : '');
 			}
 
 			// We don't want abbreviations like '+03' or '-11'.
 			$abbrs = array_filter(
 				$tzvalue['abbrs'],
-				function ($abbr)
-				{
+				function ($abbr) {
 					return !strspn($abbr, '+-');
-				}
+				},
 			);
-			$abbrs = count($abbrs) == count($tzvalue['abbrs']) ? array_unique($abbrs) : array();
+			$abbrs = count($abbrs) == count($tzvalue['abbrs']) ? array_unique($abbrs) : [];
 
 			// Show the UTC offset and abbreviation(s).
 			$desc = '[UTC' . date_format($date_when, 'P') . '] - ' . str_replace('  ', ' ', $desc) . (!empty($abbrs) ? ' (' . implode('/', $abbrs) . ')' : '');
 
-			if (in_array($tzvalue['tzid'], self::$prioritized_tzids['high']))
-			{
+			if (in_array($tzvalue['tzid'], self::$prioritized_tzids['high'])) {
 				$priority_timezones[$tzvalue['tzid']] = $desc;
-			}
-			else
-			{
+			} else {
 				$timezones[$tzvalue['tzid']] = $desc;
 			}
 		}
 
-		if (!empty($priority_timezones))
+		if (!empty($priority_timezones)) {
 			$priority_timezones[] = '-----';
+		}
 
 		$timezones = array_merge(
 			$priority_timezones,
-			array('UTC' => 'UTC' . (!empty(Lang::$tztxt['UTC']) ? ' - ' . Lang::$tztxt['UTC'] : ''), '-----'),
-			$timezones
+			['UTC' => 'UTC' . (!empty(Lang::$tztxt['UTC']) ? ' - ' . Lang::$tztxt['UTC'] : ''), '-----'],
+			$timezones,
 		);
 
 		self::$timezones_when[$when] = $timezones;
 
 		return self::$timezones_when[$when];
 	}
-	
+
 	/**
 	 * Returns an array that instructs SMF how to map specific time zones
 	 * (e.g. "America/Denver") onto the user-friendly "meta-zone" labels that
@@ -2376,20 +2378,19 @@ public static function getTzidMetazones(int|string $when = 'now'): array
 
 		list($when, $later) = self::getTimeRange($when);
 
-		IntegrationHook::call('integrate_metazones', array(&self::$metazones, $when));
+		IntegrationHook::call('integrate_metazones', [&self::$metazones, $when]);
 
 		// Fallbacks in case the server has an old version of the TZDB.
 		$tzid_fallbacks = self::getTzidFallbacks(array_keys(self::$metazones), $when);
 
-		foreach ($tzid_fallbacks as $orig_tzid => $alt_tzid)
-		{
+		foreach ($tzid_fallbacks as $orig_tzid => $alt_tzid) {
 			// Skip any that are unchanged.
-			if ($orig_tzid == $alt_tzid)
+			if ($orig_tzid == $alt_tzid) {
 				continue;
+			}
 
 			// Use fallback where possible.
-			if (!empty($alt_tzid) && empty(self::$metazones[$alt_tzid]))
-			{
+			if (!empty($alt_tzid) && empty(self::$metazones[$alt_tzid])) {
 				self::$metazones[$alt_tzid] = self::$metazones[$orig_tzid];
 				Lang::$txt[$alt_tzid] = Lang::$txt[$orig_tzid];
 			}
@@ -2413,7 +2414,7 @@ public static function getTzidMetazones(int|string $when = 'now'): array
 	 */
 	public static function getSortedTzidsForCountry(string $country_code, int|string $when = 'now'): array
 	{
-		static $country_tzids = array();
+		static $country_tzids = [];
 
 		list($when, $later) = self::getTimeRange($when);
 
@@ -2421,11 +2422,10 @@ public static function getSortedTzidsForCountry(string $country_code, int|string
 		$country_code = strtoupper(trim($country_code));
 
 		// Avoid unnecessary repetition.
-		if (!isset($country_tzids[$country_code]))
-		{
-			IntegrationHook::call('integrate_country_timezones', array(&self::$sorted_tzids, $country_code, $when));
+		if (!isset($country_tzids[$country_code])) {
+			IntegrationHook::call('integrate_country_timezones', [&self::$sorted_tzids, $country_code, $when]);
 
-			$country_tzids[$country_code] = isset(self::$sorted_tzids[$country_code]) ? self::$sorted_tzids[$country_code] : array();
+			$country_tzids[$country_code] = self::$sorted_tzids[$country_code] ?? [];
 
 			// If something goes wrong, we want an empty array, not false.
 			$recognized_country_tzids = array_filter((array) @timezone_identifiers_list(\DateTimeZone::PER_COUNTRY, $country_code));
@@ -2473,46 +2473,43 @@ public static function getTzidFallbacks(array $tzids, int|string $when = 'now'):
 
 		$missing = array_diff($tzids, timezone_identifiers_list(\DateTimeZone::ALL_WITH_BC));
 
-		IntegrationHook::call('integrate_timezone_fallbacks', array(&self::$fallbacks, &$missing, $tzids, $when));
+		IntegrationHook::call('integrate_timezone_fallbacks', [&self::$fallbacks, &$missing, $tzids, $when]);
 
-		$replacements = array();
+		$replacements = [];
 
-		foreach ($tzids as $tzid)
-		{
+		foreach ($tzids as $tzid) {
 			// Not missing.
-			if (!in_array($tzid, $missing))
-			{
+			if (!in_array($tzid, $missing)) {
 				$replacements[$tzid] = $tzid;
 			}
 			// Missing and we have no fallback.
-			elseif (empty(self::$fallbacks[$tzid]))
-			{
+			elseif (empty(self::$fallbacks[$tzid])) {
 				$replacements[$tzid] = '';
 			}
 			// Missing, but we have a fallback.
-			else
-			{
-				foreach (self::$fallbacks[$tzid] as &$alt)
+			else {
+				foreach (self::$fallbacks[$tzid] as &$alt) {
 					$alt['ts'] = is_int($alt['ts']) ? $alt['ts'] : strtotime($alt['ts']);
+				}
 
-				usort(self::$fallbacks[$tzid], fn($a, $b) => $a['ts'] > $b['ts']);
+				usort(self::$fallbacks[$tzid], fn ($a, $b) => $a['ts'] > $b['ts']);
 
-				foreach (self::$fallbacks[$tzid] as $alt)
-				{
-					if ($when < $alt['ts'])
+				foreach (self::$fallbacks[$tzid] as $alt) {
+					if ($when < $alt['ts']) {
 						break;
+					}
 
 					$replacements[$tzid] = $alt['tzid'];
 				}
 
 				// Replacement is already in use.
-				if (in_array($alt['tzid'], $replacements) || (in_array($alt['tzid'], $tzids) && strpos($alt['tzid'], 'Etc/') === false))
-				{
+				if (in_array($alt['tzid'], $replacements) || (in_array($alt['tzid'], $tzids) && strpos($alt['tzid'], 'Etc/') === false)) {
 					$replacements[$tzid] = '';
 				}
 
-				if (empty($replacements[$tzid]))
+				if (empty($replacements[$tzid])) {
 					$replacements[$tzid] = '';
+				}
 			}
 		}
 
@@ -2528,17 +2525,13 @@ public static function getTzidFallbacks(array $tzids, int|string $when = 'now'):
 	 */
 	public static function validateIsoCountryCodes(array|string $country_codes, bool $as_csv = false): array|string
 	{
-		if (is_string($country_codes))
-		{
+		if (is_string($country_codes)) {
 			$country_codes = explode(',', $country_codes);
-		}
-		else
-		{
+		} else {
 			$country_codes = array_map('strval', (array) $country_codes);
 		}
 
-		foreach ($country_codes as $key => $country_code)
-		{
+		foreach ($country_codes as $key => $country_code) {
 			$country_code = strtoupper(trim($country_code));
 
 			$country_tzids = strlen($country_code) !== 2 ? null : @timezone_identifiers_list(\DateTimeZone::PER_COUNTRY, $country_code);
@@ -2548,8 +2541,9 @@ public static function validateIsoCountryCodes(array|string $country_codes, bool
 
 		$country_codes = array_filter($country_codes);
 
-		if (!empty($as_csv))
+		if (!empty($as_csv)) {
 			$country_codes = implode(',', $country_codes);
+		}
 
 		return $country_codes;
 	}
@@ -2569,26 +2563,24 @@ public static function validateIsoCountryCodes(array|string $country_codes, bool
 	 */
 	protected static function getTimeRange(int|string $when = 'now'): array
 	{
-		if (isset(self::$ranges[$when]))
+		if (isset(self::$ranges[$when])) {
 			return self::$ranges[$when];
+		}
 
 		// Parseable datetime string?
-		if (is_int($timestamp = strtotime($when)))
-		{
+		if (is_int($timestamp = strtotime($when))) {
 			$start = $timestamp;
 		}
 		// A Unix timestamp?
-		elseif (is_numeric($when))
-		{
+		elseif (is_numeric($when)) {
 			$start = intval($when);
 		}
 		// Invalid value? Just get current Unix timestamp.
-		else
-		{
+		else {
 			$start = time();
 		}
 
-		self::$ranges[$when] = array($start, strtotime('@' . $start . ' + 1 year'));
+		self::$ranges[$when] = [$start, strtotime('@' . $start . ' + 1 year')];
 
 		return self::$ranges[$when];
 	}
@@ -2602,28 +2594,30 @@ protected static function getTimeRange(int|string $when = 'now'): array
 	protected static function prioritizeTzids(): void
 	{
 		// No need to do this twice.
-		if (!empty(self::$prioritized_tzids))
+		if (!empty(self::$prioritized_tzids)) {
 			return;
+		}
 
 		// Should we put time zones from certain countries at the top of the list?
-		$priority_countries = !empty(Config::$modSettings['timezone_priority_countries']) ? explode(',', Config::$modSettings['timezone_priority_countries']) : array();
+		$priority_countries = !empty(Config::$modSettings['timezone_priority_countries']) ? explode(',', Config::$modSettings['timezone_priority_countries']) : [];
 
-		$high_priority_tzids = array();
-		foreach ($priority_countries as $country)
-		{
+		$high_priority_tzids = [];
+
+		foreach ($priority_countries as $country) {
 			$country_tzids = self::getSortedTzidsForCountry($country);
 
-			if (!empty($country_tzids))
+			if (!empty($country_tzids)) {
 				$high_priority_tzids = array_merge($high_priority_tzids, $country_tzids);
+			}
 		}
 
 		// Antarctic research stations should be listed last, unless you're running a penguin forum
-		$low_priority_tzids = !in_array('AQ', $priority_countries) ? timezone_identifiers_list(parent::ANTARCTICA) : array();
+		$low_priority_tzids = !in_array('AQ', $priority_countries) ? timezone_identifiers_list(parent::ANTARCTICA) : [];
 
 		$normal_priority_tzids = array_diff(array_unique(array_merge(array_keys(self::getTzidMetazones()), timezone_identifiers_list())), $high_priority_tzids, $low_priority_tzids);
 
 		// Put them in order of importance.
-		self::$prioritized_tzids = array('high' => $high_priority_tzids, 'normal' => $normal_priority_tzids, 'low' => $low_priority_tzids);
+		self::$prioritized_tzids = ['high' => $high_priority_tzids, 'normal' => $normal_priority_tzids, 'low' => $low_priority_tzids];
 	}
 
 	/**
@@ -2640,12 +2634,12 @@ protected static function buildMetaZoneTransitions(int|string $when = 'now'): vo
 
 		self::getTzidMetazones($when);
 
-		foreach (self::$metazones as $tzid => $label)
-		{
+		foreach (self::$metazones as $tzid => $label) {
 			$tz = @timezone_open($tzid);
 
-			if ($tz == null)
+			if ($tz == null) {
 				continue;
+			}
 
 			self::$metazone_transitions[$when][serialize($tz->getTransitions($when, $later))] = $label;
 		}
@@ -2653,7 +2647,8 @@ protected static function buildMetaZoneTransitions(int|string $when = 'now'): vo
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\TimeZone::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\TimeZone::exportStatic')) {
 	TimeZone::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Topic.php b/Sources/Topic.php
index 207c47ce1d..7db89053e1 100644
--- a/Sources/Topic.php
+++ b/Sources/Topic.php
@@ -13,8 +13,8 @@
 
 namespace SMF;
 
-use SMF\Actions\Notify;
 use SMF\Actions\Moderation\ReportedContent;
+use SMF\Actions\Notify;
 use SMF\Cache\CacheApi;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Search\SearchApi;
@@ -27,25 +27,27 @@
  */
 class Topic implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'lock' => 'LockTopic',
+			'sticky' => 'Sticky',
 			'approve' => 'approveTopics',
 			'move' => 'moveTopics',
 			'remove' => 'removeTopics',
-		),
-		'prop_names' => array(
+			'prepareLikesContext' => 'prepareLikesContext',
+		],
+		'prop_names' => [
 			'topic_id' => 'topic',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -262,7 +264,7 @@ class Topic implements \ArrayAccess
 	 *
 	 * The current user's notification preferences regarding this topic.
 	 */
-	public array $notify_prefs = array();
+	public array $notify_prefs = [];
 
 	/**
 	 * @var array
@@ -272,7 +274,7 @@ class Topic implements \ArrayAccess
 	 * "Contextual" here means "suitable for use in Utils::$context."
 	 * Examples include can_move, can_lock, etc.
 	 */
-	public array $permissions = array();
+	public array $permissions = [];
 
 	/**************************
 	 * Public static properties
@@ -297,7 +299,7 @@ class Topic implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static $loaded = array();
+	public static $loaded = [];
 
 	/*********************
 	 * Internal properties
@@ -308,13 +310,13 @@ class Topic implements \ArrayAccess
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_topic' => 'id',
 		'locked' => 'is_locked',
 		'approved' => 'is_approved',
 		'topic_started_name' => 'started_name',
 		'topic_started_time' => 'started_time',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -326,7 +328,7 @@ class Topic implements \ArrayAccess
 	 * Common permissions to check for this topic.
 	 * Used by Topic::doPermissions();
 	 */
-	protected static array $common_permissions = array(
+	protected static array $common_permissions = [
 		'can_approve' => 'approve_posts',
 		'can_ban' => 'manage_bans',
 		'can_sticky' => 'make_sticky',
@@ -340,7 +342,7 @@ class Topic implements \ArrayAccess
 		'can_restore_topic' => 'move_any',
 		'can_restore_msg' => 'move_any',
 		'can_like' => 'likes_like',
-	);
+	];
 
 	/**
 	 * @var array
@@ -348,7 +350,7 @@ class Topic implements \ArrayAccess
 	 * Permissions with _any/_own versions.  $context[YYY] => ZZZ_any/_own.
 	 * Used by Topic::doPermissions();
 	 */
-	protected static array $anyown_permissions = array(
+	protected static array $anyown_permissions = [
 		'can_move' => 'move',
 		'can_lock' => 'lock',
 		'can_delete' => 'remove',
@@ -356,7 +358,7 @@ class Topic implements \ArrayAccess
 		'can_remove_poll' => 'poll_remove',
 		'can_reply' => 'post_reply',
 		'can_reply_unapproved' => 'post_unapproved_replies',
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -369,7 +371,7 @@ class Topic implements \ArrayAccess
 	 * @param array $props Properties to set for this topic.
 	 * @return object An instance of this class.
 	 */
-	public function __construct(int $id, array $props = array())
+	public function __construct(int $id, array $props = [])
 	{
 		self::$loaded[$id] = $this;
 		$this->id = $id;
@@ -385,12 +387,9 @@ public function __construct(int $id, array $props = array())
 	public function __set(string $prop, $value): void
 	{
 		// Special case for num_replies and real_num_replies.
-		if ($prop === 'num_replies' && !isset($this->real_num_replies))
-		{
+		if ($prop === 'num_replies' && !isset($this->real_num_replies)) {
 			$this->real_num_replies = $value;
-		}
-		elseif ($prop === 'real_num_replies' && !isset($this->num_replies))
-		{
+		} elseif ($prop === 'real_num_replies' && !isset($this->num_replies)) {
 			$this->num_replies = $value;
 		}
 
@@ -406,29 +405,28 @@ public function __set(string $prop, $value): void
 	 */
 	public function doPermissions(): array
 	{
-		if (!empty($this->permissions))
+		if (!empty($this->permissions)) {
 			return $this->permissions;
+		}
 
-		foreach (self::$common_permissions as $contextual => $perm)
+		foreach (self::$common_permissions as $contextual => $perm) {
 			$this->permissions[$contextual] = User::$me->allowedTo($perm);
+		}
 
-		foreach (self::$anyown_permissions as $contextual => $perm)
-		{
+		foreach (self::$anyown_permissions as $contextual => $perm) {
 			$this->permissions[$contextual] = User::$me->allowedTo($perm . '_any') || (User::$me->started && User::$me->allowedTo($perm . '_own'));
 		}
 
-		if (!User::$me->is_admin && $this->permissions['can_move'] && !Config::$modSettings['topic_move_any'])
-		{
+		if (!User::$me->is_admin && $this->permissions['can_move'] && !Config::$modSettings['topic_move_any']) {
 			// We'll use this in a minute
-			$boards_allowed = array_diff(User::$me->boardsAllowedTo('post_new'), array(Board::$info->id));
+			$boards_allowed = array_diff(User::$me->boardsAllowedTo('post_new'), [Board::$info->id]);
 
 			// You can't move this unless you have permission to start new topics on at least one other board.
 			$this->permissions['can_move'] = count($boards_allowed) > 1;
 		}
 
 		// If a topic is locked, you can't remove it unless it's yours and you locked it or you can lock_any
-		if ($this->is_locked)
-		{
+		if ($this->is_locked) {
 			$this->permissions['can_delete'] &= (($this->is_locked == 1 && User::$me->started) || User::$me->allowedTo('lock_any'));
 		}
 
@@ -478,18 +476,17 @@ public function doPermissions(): array
 	 */
 	public function getNotificationPrefs(): array
 	{
-		if (!empty(User::$me->id))
-		{
-			$prefs = Notify::getNotifyPrefs(User::$me->id, array('topic_notify', 'topic_notify_' . $this->id, 'msg_auto_notify'), true);
+		if (!empty(User::$me->id)) {
+			$prefs = Notify::getNotifyPrefs(User::$me->id, ['topic_notify', 'topic_notify_' . $this->id, 'msg_auto_notify'], true);
 
 			// Only pay attention to Utils::$context['is_marked_notify'] if it is set.
-			$pref = !empty($prefs[User::$me->id]) && (!isset(Utils::$context['is_marked_notify']) || Utils::$context['is_marked_notify'] == true) ? $prefs[User::$me->id] : array();
+			$pref = !empty($prefs[User::$me->id]) && (!isset(Utils::$context['is_marked_notify']) || Utils::$context['is_marked_notify'] == true) ? $prefs[User::$me->id] : [];
 
-			$this->notify_prefs = array(
+			$this->notify_prefs = [
 				'is_custom' => isset($pref['topic_notify_' . $this->id]),
 				'pref' => $pref['topic_notify_' . $this->id] ?? ($pref['topic_notify'] ?? 0),
 				'msg_auto_notify' => $pref['msg_auto_notify'] ?? false,
-			);
+			];
 		}
 
 		return $this->notify_prefs;
@@ -503,30 +500,31 @@ public function getNotificationPrefs(): array
 	 */
 	public function getLikedMsgs(): array
 	{
-		if (User::$me->is_guest)
-			return array();
+		if (User::$me->is_guest) {
+			return [];
+		}
 
 		$cache_key = 'likes_topic_' . $this->id . '_' . User::$me->id;
 		$ttl = 180;
 
-		if (($liked_messages = CacheApi::get($cache_key, $ttl)) === null)
-		{
-			$liked_messages = array();
+		if (($liked_messages = CacheApi::get($cache_key, $ttl)) === null) {
+			$liked_messages = [];
 
-			$request = Db::$db->query('', '
-				SELECT content_id
+			$request = Db::$db->query(
+				'',
+				'SELECT content_id
 				FROM {db_prefix}user_likes AS l
 					INNER JOIN {db_prefix}messages AS m ON (l.content_id = m.id_msg)
 				WHERE l.id_member = {int:current_user}
 					AND l.content_type = {literal:msg}
 					AND m.id_topic = {int:topic}',
-				array(
+				[
 					'current_user' => User::$me->id,
 					'topic' => $this->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$liked_messages[] = (int) $row['content_id'];
 			}
 			Db::$db->free_result($request);
@@ -549,22 +547,22 @@ public function getLikedMsgs(): array
 	 */
 	public static function load(?int $id = null)
 	{
-		if (!isset($id))
-		{
-			if (empty(self::$topic_id))
+		if (!isset($id)) {
+			if (empty(self::$topic_id)) {
 				ErrorHandler::fatalLang('not_a_topic', false, 404);
+			}
 
 			$id = self::$topic_id;
 		}
 
-		if (!isset(self::$loaded[$id]))
-		{
+		if (!isset(self::$loaded[$id])) {
 			new self($id);
 
 			self::$loaded[$id]->loadTopicInfo();
 
-			if (!empty(self::$topic_id) && $id === self::$topic_id)
+			if (!empty(self::$topic_id) && $id === self::$topic_id) {
 				self::$info = self::$loaded[$id];
+			}
 		}
 
 		return self::$loaded[$id];
@@ -583,20 +581,22 @@ public static function load(?int $id = null)
 	public static function lock(): void
 	{
 		// Just quit if there's no topic to lock.
-		if (empty(self::$topic_id))
+		if (empty(self::$topic_id)) {
 			ErrorHandler::fatalLang('not_a_topic', false);
+		}
 
 		User::$me->checkSession('get');
 
 		// Find out who started the topic - in case User Topic Locking is enabled.
-		$request = Db::$db->query('', '
-			SELECT id_member_started, locked
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member_started, locked
 			FROM {db_prefix}topics
 			WHERE id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => self::$topic_id,
-			)
+			],
 		);
 		list($starter, $locked) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
@@ -604,61 +604,51 @@ public static function lock(): void
 		// Can you lock topics here, mister?
 		$user_lock = !User::$me->allowedTo('lock_any');
 
-		if ($user_lock && $starter == User::$me->id)
-		{
+		if ($user_lock && $starter == User::$me->id) {
 			User::$me->isAllowedTo('lock_own');
-		}
-		else
-		{
+		} else {
 			User::$me->isAllowedTo('lock_any');
 		}
 
 		// Another moderator got the job done first?
-		if (isset($_GET['sa']) && $_GET['sa'] == 'unlock' && $locked == '0')
-		{
+		if (isset($_GET['sa']) && $_GET['sa'] == 'unlock' && $locked == '0') {
 			ErrorHandler::fatalLang('error_topic_locked_already', false);
-		}
-		elseif (isset($_GET['sa']) && $_GET['sa'] == 'lock' && ($locked == '1' || $locked == '2'))
-		{
+		} elseif (isset($_GET['sa']) && $_GET['sa'] == 'lock' && ($locked == '1' || $locked == '2')) {
 			ErrorHandler::fatalLang('error_topic_unlocked_already', false);
 		}
 
 		// Locking with high privileges.
-		if ($locked == '0' && !$user_lock)
-		{
+		if ($locked == '0' && !$user_lock) {
 			$locked = '1';
 		}
 		// Locking with low privileges.
-		elseif ($locked == '0')
-		{
+		elseif ($locked == '0') {
 			$locked = '2';
 		}
 		// Unlocking - make sure you don't unlock what you can't.
-		elseif ($locked == '2' || ($locked == '1' && !$user_lock))
-		{
+		elseif ($locked == '2' || ($locked == '1' && !$user_lock)) {
 			$locked = '0';
 		}
 		// You cannot unlock this!
-		else
-		{
+		else {
 			ErrorHandler::fatalLang('locked_by_admin', 'user');
 		}
 
 		// Actually lock the topic in the database with the new value.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET locked = {int:locked}
 			WHERE id_topic = {int:current_topic}',
-			array(
+			[
 				'current_topic' => self::$topic_id,
 				'locked' => $locked,
-			)
+			],
 		);
 
 		// If they are allowed a "moderator" permission, log it in the moderator log.
-		if (!$user_lock)
-		{
-			Logging::logAction($locked ? 'lock' : 'unlock', array('topic' => self::$topic_id, 'board' => Board::$info->id));
+		if (!$user_lock) {
+			Logging::logAction($locked ? 'lock' : 'unlock', ['topic' => self::$topic_id, 'board' => Board::$info->id]);
 		}
 
 		// Notify people that this topic has been locked?
@@ -684,51 +674,52 @@ public static function sticky(): void
 		User::$me->isAllowedTo('make_sticky');
 
 		// You can't sticky a board or something!
-		if (empty(self::$topic_id))
+		if (empty(self::$topic_id)) {
 			ErrorHandler::fatalLang('not_a_topic', false);
+		}
 
 		User::$me->checkSession('get');
 
 		// Is this topic already stickied, or no?
-		$request = Db::$db->query('', '
-			SELECT is_sticky
+		$request = Db::$db->query(
+			'',
+			'SELECT is_sticky
 			FROM {db_prefix}topics
 			WHERE id_topic = {int:current_topic}
 			LIMIT 1',
-			array(
+			[
 				'current_topic' => self::$topic_id,
-			)
+			],
 		);
 		list($is_sticky) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
 		// Another moderator got the job done first?
-		if (isset($_GET['sa']) && $_GET['sa'] == 'nonsticky' && $is_sticky == '0')
-		{
+		if (isset($_GET['sa']) && $_GET['sa'] == 'nonsticky' && $is_sticky == '0') {
 			ErrorHandler::fatalLang('error_topic_nonsticky_already', false);
-		}
-		elseif (isset($_GET['sa']) && $_GET['sa'] == 'sticky' && $is_sticky == '1')
-		{
+		} elseif (isset($_GET['sa']) && $_GET['sa'] == 'sticky' && $is_sticky == '1') {
 			ErrorHandler::fatalLang('error_topic_sticky_already', false);
 		}
 
 		// Toggle the sticky value.... pretty simple ;).
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET is_sticky = {int:is_sticky}
 			WHERE id_topic = {int:current_topic}',
-			array(
+			[
 				'current_topic' => self::$topic_id,
 				'is_sticky' => empty($is_sticky) ? 1 : 0,
-			)
+			],
 		);
 
 		// Log this sticky action - always a moderator thing.
-		Logging::logAction(empty($is_sticky) ? 'sticky' : 'unsticky', array('topic' => self::$topic_id, 'board' => Board::$info->id));
+		Logging::logAction(empty($is_sticky) ? 'sticky' : 'unsticky', ['topic' => self::$topic_id, 'board' => Board::$info->id]);
 
 		// Notify people that this topic has been stickied?
-		if (empty($is_sticky))
+		if (empty($is_sticky)) {
 			Mail::sendNotifications(self::$topic_id, 'sticky');
+		}
 
 		// Take them back to the now stickied topic.
 		Utils::redirectexit('topic=' . self::$topic_id . '.' . $_REQUEST['start'] . ';moderate');
@@ -743,28 +734,33 @@ public static function sticky(): void
 	 */
 	public static function approve($topics, $approve = true)
 	{
-		if (!is_array($topics))
-			$topics = array($topics);
+		if (!is_array($topics)) {
+			$topics = [$topics];
+		}
 
-		if (empty($topics))
+		if (empty($topics)) {
 			return false;
+		}
 
 		$approve_type = $approve ? 0 : 1;
 
 		// Just get the messages to be approved and pass through...
-		$request = Db::$db->query('', '
-			SELECT id_first_msg
+		$request = Db::$db->query(
+			'',
+			'SELECT id_first_msg
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:topic_list})
 				AND approved = {int:approve_type}',
-			array(
+			[
 				'topic_list' => $topics,
 				'approve_type' => $approve_type,
-			)
+			],
 		);
-		$msgs = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$msgs = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$msgs[] = $row['id_first_msg'];
+		}
 		Db::$db->free_result($request);
 
 		return Msg::approve($msgs, $approve);
@@ -782,18 +778,21 @@ public static function approve($topics, $approve = true)
 	public static function move($topics, $toBoard)
 	{
 		// Empty array?
-		if (empty($topics))
+		if (empty($topics)) {
 			return;
+		}
 
 		// Only a single topic.
-		if (is_numeric($topics))
-			$topics = array($topics);
+		if (is_numeric($topics)) {
+			$topics = [$topics];
+		}
 
-		$fromBoards = array();
+		$fromBoards = [];
 
 		// Destination board empty or equal to 0?
-		if (empty($toBoard))
+		if (empty($toBoard)) {
 			return;
+		}
 
 		// Are we moving to the recycle board?
 		$isRecycleDest = !empty(Config::$modSettings['recycle_enable']) && Config::$modSettings['recycle_board'] == $toBoard;
@@ -801,91 +800,96 @@ public static function move($topics, $toBoard)
 		// Callback for search APIs to do their thing
 		$searchAPI = SearchApi::load();
 
-		if ($searchAPI->supportsMethod('topicsMoved'))
+		if ($searchAPI->supportsMethod('topicsMoved')) {
 			$searchAPI->topicsMoved($topics, $toBoard);
+		}
 
 		// Determine the source boards...
-		$request = Db::$db->query('', '
-			SELECT id_board, approved, COUNT(*) AS num_topics, SUM(unapproved_posts) AS unapproved_posts,
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, approved, COUNT(*) AS num_topics, SUM(unapproved_posts) AS unapproved_posts,
 				SUM(num_replies) AS num_replies
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:topics})
 			GROUP BY id_board, approved',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
+
 		// Num of rows = 0 -> no topics found. Num of rows > 1 -> topics are on multiple boards.
-		if (Db::$db->num_rows($request) == 0)
+		if (Db::$db->num_rows($request) == 0) {
 			return;
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset($fromBoards[$row['id_board']]['num_posts']))
-			{
-				$fromBoards[$row['id_board']] = array(
+		}
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset($fromBoards[$row['id_board']]['num_posts'])) {
+				$fromBoards[$row['id_board']] = [
 					'num_posts' => 0,
 					'num_topics' => 0,
 					'unapproved_posts' => 0,
 					'unapproved_topics' => 0,
-					'id_board' => $row['id_board']
-				);
+					'id_board' => $row['id_board'],
+				];
 			}
 			// Posts = (num_replies + 1) for each approved topic.
 			$fromBoards[$row['id_board']]['num_posts'] += $row['num_replies'] + ($row['approved'] ? $row['num_topics'] : 0);
 			$fromBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 			// Add the topics to the right type.
-			if ($row['approved'])
+			if ($row['approved']) {
 				$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-			else
+			} else {
 				$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+			}
 		}
 		Db::$db->free_result($request);
 
 		// Move over the mark_read data. (because it may be read and now not by some!)
 		$SaveAServer = max(0, Config::$modSettings['maxMsgID'] - 50000);
-		$request = Db::$db->query('', '
-			SELECT lmr.id_member, lmr.id_msg, t.id_topic, COALESCE(lt.unwatched, 0) AS unwatched
+		$request = Db::$db->query(
+			'',
+			'SELECT lmr.id_member, lmr.id_msg, t.id_topic, COALESCE(lt.unwatched, 0) AS unwatched
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board
 					AND lmr.id_msg > t.id_first_msg AND lmr.id_msg > {int:protect_lmr_msg})
 				LEFT JOIN {db_prefix}log_topics AS lt ON (lt.id_topic = t.id_topic AND lt.id_member = lmr.id_member)
 			WHERE t.id_topic IN ({array_int:topics})
 				AND lmr.id_msg > COALESCE(lt.id_msg, 0)',
-			array(
+			[
 				'protect_lmr_msg' => $SaveAServer,
 				'topics' => $topics,
-			)
+			],
 		);
-		$log_topics = array();
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$log_topics[] = array($row['id_topic'], $row['id_member'], $row['id_msg'], (is_null($row['unwatched']) ? 0 : $row['unwatched']));
+		$log_topics = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$log_topics[] = [$row['id_topic'], $row['id_member'], $row['id_msg'], (is_null($row['unwatched']) ? 0 : $row['unwatched'])];
 
 			// Prevent queries from getting too big. Taking some steam off.
-			if (count($log_topics) > 500)
-			{
-				Db::$db->insert('replace',
+			if (count($log_topics) > 500) {
+				Db::$db->insert(
+					'replace',
 					'{db_prefix}log_topics',
-					array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
+					['id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'],
 					$log_topics,
-					array('id_topic', 'id_member')
+					['id_topic', 'id_member'],
 				);
 
-				$log_topics = array();
+				$log_topics = [];
 			}
 		}
 		Db::$db->free_result($request);
 
 		// Now that we have all the topics that *should* be marked read, and by which members...
-		if (!empty($log_topics))
-		{
+		if (!empty($log_topics)) {
 			// Insert that information into the database!
-			Db::$db->insert('replace',
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_topics',
-				array('id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'),
+				['id_topic' => 'int', 'id_member' => 'int', 'id_msg' => 'int', 'unwatched' => 'int'],
 				$log_topics,
-				array('id_topic', 'id_member')
+				['id_topic', 'id_member'],
 			);
 		}
 
@@ -894,31 +898,33 @@ public static function move($topics, $toBoard)
 		$totalPosts = 0;
 		$totalUnapprovedTopics = 0;
 		$totalUnapprovedPosts = 0;
-		foreach ($fromBoards as $stats)
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}boards
+
+		foreach ($fromBoards as $stats) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}boards
 				SET
 					num_posts = CASE WHEN {int:num_posts} > num_posts THEN 0 ELSE num_posts - {int:num_posts} END,
 					num_topics = CASE WHEN {int:num_topics} > num_topics THEN 0 ELSE num_topics - {int:num_topics} END,
 					unapproved_posts = CASE WHEN {int:unapproved_posts} > unapproved_posts THEN 0 ELSE unapproved_posts - {int:unapproved_posts} END,
 					unapproved_topics = CASE WHEN {int:unapproved_topics} > unapproved_topics THEN 0 ELSE unapproved_topics - {int:unapproved_topics} END
 				WHERE id_board = {int:id_board}',
-				array(
+				[
 					'id_board' => $stats['id_board'],
 					'num_posts' => $stats['num_posts'],
 					'num_topics' => $stats['num_topics'],
 					'unapproved_posts' => $stats['unapproved_posts'],
 					'unapproved_topics' => $stats['unapproved_topics'],
-				)
+				],
 			);
 			$totalTopics += $stats['num_topics'];
 			$totalPosts += $stats['num_posts'];
 			$totalUnapprovedTopics += $stats['unapproved_topics'];
 			$totalUnapprovedPosts += $stats['unapproved_posts'];
 		}
-		Db::$db->query('', '
-			UPDATE {db_prefix}boards
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}boards
 			SET
 				num_topics = num_topics + {int:total_topics},
 				num_posts = num_posts + {int:total_posts},' . ($isRecycleDest ? '
@@ -926,165 +932,180 @@ public static function move($topics, $toBoard)
 				unapproved_posts = unapproved_posts + {int:total_unapproved_posts},
 				unapproved_topics = unapproved_topics + {int:total_unapproved_topics}') . '
 			WHERE id_board = {int:id_board}',
-			array(
+			[
 				'id_board' => $toBoard,
 				'total_topics' => $totalTopics,
 				'total_posts' => $totalPosts,
 				'total_unapproved_topics' => $totalUnapprovedTopics,
 				'total_unapproved_posts' => $totalUnapprovedPosts,
 				'no_unapproved' => 0,
-			)
+			],
 		);
 
 		// Move the topic.  Done.  :P
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_board = {int:id_board}' . ($isRecycleDest ? ',
 				unapproved_posts = {int:no_unapproved}, approved = {int:is_approved}' : '') . '
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'id_board' => $toBoard,
 				'topics' => $topics,
 				'is_approved' => 1,
 				'no_unapproved' => 0,
-			)
+			],
 		);
 
 		// If this was going to the recycle bin, check what messages are being recycled, and remove them from the queue.
-		if ($isRecycleDest && ($totalUnapprovedTopics || $totalUnapprovedPosts))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_msg
+		if ($isRecycleDest && ($totalUnapprovedTopics || $totalUnapprovedPosts)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg
 				FROM {db_prefix}messages
 				WHERE id_topic IN ({array_int:topics})
 					AND approved = {int:not_approved}',
-				array(
+				[
 					'topics' => $topics,
 					'not_approved' => 0,
-				)
+				],
 			);
-			$approval_msgs = array();
-			while ($row = Db::$db->fetch_assoc($request))
+			$approval_msgs = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$approval_msgs[] = $row['id_msg'];
+			}
 
 			Db::$db->free_result($request);
 
 			// Empty the approval queue for these, as we're going to approve them next.
-			if (!empty($approval_msgs))
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}approval_queue
+			if (!empty($approval_msgs)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}approval_queue
 					WHERE id_msg IN ({array_int:message_list})
 						AND id_attach = {int:id_attach}',
-					array(
+					[
 						'message_list' => $approval_msgs,
 						'id_attach' => 0,
-					)
+					],
 				);
+			}
 
 			// Get all the current max and mins.
-			$request = Db::$db->query('', '
-				SELECT id_topic, id_first_msg, id_last_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, id_first_msg, id_last_msg
 				FROM {db_prefix}topics
 				WHERE id_topic IN ({array_int:topics})',
-				array(
+				[
 					'topics' => $topics,
-				)
+				],
 			);
-			$topicMaxMin = array();
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				$topicMaxMin[$row['id_topic']] = array(
+			$topicMaxMin = [];
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				$topicMaxMin[$row['id_topic']] = [
 					'min' => $row['id_first_msg'],
 					'max' => $row['id_last_msg'],
-				);
+				];
 			}
 			Db::$db->free_result($request);
 
 			// Check the MAX and MIN are correct.
-			$request = Db::$db->query('', '
-				SELECT id_topic, MIN(id_msg) AS first_msg, MAX(id_msg) AS last_msg
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, MIN(id_msg) AS first_msg, MAX(id_msg) AS last_msg
 				FROM {db_prefix}messages
 				WHERE id_topic IN ({array_int:topics})
 				GROUP BY id_topic',
-				array(
+				[
 					'topics' => $topics,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				// If not, update.
-				if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max'])
-					Db::$db->query('', '
-						UPDATE {db_prefix}topics
+				if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max']) {
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}topics
 						SET id_first_msg = {int:first_msg}, id_last_msg = {int:last_msg}
 						WHERE id_topic = {int:selected_topic}',
-						array(
+						[
 							'first_msg' => $row['first_msg'],
 							'last_msg' => $row['last_msg'],
 							'selected_topic' => $row['id_topic'],
-						)
+						],
 					);
+				}
 			}
 			Db::$db->free_result($request);
 		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_board = {int:id_board}' . ($isRecycleDest ? ',approved = {int:is_approved}' : '') . '
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'id_board' => $toBoard,
 				'topics' => $topics,
 				'is_approved' => 1,
-			)
+			],
 		);
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_reported
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_reported
 			SET id_board = {int:id_board}
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'id_board' => $toBoard,
 				'topics' => $topics,
-			)
+			],
 		);
-		Db::$db->query('', '
-			UPDATE {db_prefix}calendar
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}calendar
 			SET id_board = {int:id_board}
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'id_board' => $toBoard,
 				'topics' => $topics,
-			)
+			],
 		);
 
 		// Mark target board as seen, if it was already marked as seen before.
-		$request = Db::$db->query('', '
-			SELECT (COALESCE(lb.id_msg, 0) >= b.id_msg_updated) AS isSeen
+		$request = Db::$db->query(
+			'',
+			'SELECT (COALESCE(lb.id_msg, 0) >= b.id_msg_updated) AS isSeen
 			FROM {db_prefix}boards AS b
 				LEFT JOIN {db_prefix}log_boards AS lb ON (lb.id_board = b.id_board AND lb.id_member = {int:current_member})
 			WHERE b.id_board = {int:id_board}',
-			array(
+			[
 				'current_member' => User::$me->id,
 				'id_board' => $toBoard,
-			)
+			],
 		);
-		list ($isSeen) = Db::$db->fetch_row($request);
+		list($isSeen) = Db::$db->fetch_row($request);
 		Db::$db->free_result($request);
 
-		if (!empty($isSeen) && !User::$me->is_guest)
-		{
-			Db::$db->insert('replace',
+		if (!empty($isSeen) && !User::$me->is_guest) {
+			Db::$db->insert(
+				'replace',
 				'{db_prefix}log_boards',
-				array('id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'),
-				array($toBoard, User::$me->id, Config::$modSettings['maxMsgID']),
-				array('id_board', 'id_member')
+				['id_board' => 'int', 'id_member' => 'int', 'id_msg' => 'int'],
+				[$toBoard, User::$me->id, Config::$modSettings['maxMsgID']],
+				['id_board', 'id_member'],
 			);
 		}
 
 		// Update the cache?
-		if (!empty(CacheApi::$enable) && CacheApi::$enable >= 3)
-			foreach ($topics as $topic_id)
+		if (!empty(CacheApi::$enable) && CacheApi::$enable >= 3) {
+			foreach ($topics as $topic_id) {
 				CacheApi::put('topic_board-' . $topic_id, null, 120);
+			}
+		}
 
 		$updates = array_keys($fromBoards);
 		$updates[] = $toBoard;
@@ -1094,9 +1115,9 @@ public static function move($topics, $toBoard)
 		// Update 'em pesky stats.
 		Logging::updateStats('topic');
 		Logging::updateStats('message');
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 	}
 
 	/**
@@ -1110,22 +1131,25 @@ public static function move($topics, $toBoard)
 	public static function remove($topics, $decreasePostCount = true, $ignoreRecycling = false, $updateBoardCount = true)
 	{
 		// Nothing to do?
-		if (empty($topics))
+		if (empty($topics)) {
 			return;
+		}
+
 		// Only a single topic.
-		if (is_numeric($topics))
-			$topics = array($topics);
+		if (is_numeric($topics)) {
+			$topics = [$topics];
+		}
 
 		$recycle_board = !empty(Config::$modSettings['recycle_enable']) && !empty(Config::$modSettings['recycle_board']) ? (int) Config::$modSettings['recycle_board'] : 0;
 
 		// Do something before?
-		IntegrationHook::call('integrate_remove_topics_before', array($topics, $recycle_board));
+		IntegrationHook::call('integrate_remove_topics_before', [$topics, $recycle_board]);
 
 		// Decrease the post counts.
-		if ($decreasePostCount)
-		{
-			$requestMembers = Db::$db->query('', '
-				SELECT m.id_member, COUNT(*) AS posts
+		if ($decreasePostCount) {
+			$requestMembers = Db::$db->query(
+				'',
+				'SELECT m.id_member, COUNT(*) AS posts
 				FROM {db_prefix}messages AS m
 					INNER JOIN {db_prefix}boards AS b ON (b.id_board = m.id_board)
 				WHERE m.id_topic IN ({array_int:topics})' . (!empty($recycle_board) ? '
@@ -1133,57 +1157,60 @@ public static function remove($topics, $decreasePostCount = true, $ignoreRecycli
 					AND b.count_posts = {int:do_count_posts}
 					AND m.approved = {int:is_approved}
 				GROUP BY m.id_member',
-				array(
+				[
 					'do_count_posts' => 0,
 					'recycled_board' => $recycle_board,
 					'topics' => $topics,
 					'is_approved' => 1,
-				)
+				],
 			);
-			if (Db::$db->num_rows($requestMembers) > 0)
-			{
-				while ($rowMembers = Db::$db->fetch_assoc($requestMembers))
-					User::updateMemberData($rowMembers['id_member'], array('posts' => 'posts - ' . $rowMembers['posts']));
+
+			if (Db::$db->num_rows($requestMembers) > 0) {
+				while ($rowMembers = Db::$db->fetch_assoc($requestMembers)) {
+					User::updateMemberData($rowMembers['id_member'], ['posts' => 'posts - ' . $rowMembers['posts']]);
+				}
 			}
 			Db::$db->free_result($requestMembers);
 		}
 
 		// Recycle topics that aren't in the recycle board...
-		if (!empty($recycle_board) && !$ignoreRecycling)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_topic, id_board, unapproved_posts, approved
+		if (!empty($recycle_board) && !$ignoreRecycling) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_topic, id_board, unapproved_posts, approved
 				FROM {db_prefix}topics
 				WHERE id_topic IN ({array_int:topics})
 					AND id_board != {int:recycle_board}
 				LIMIT {int:limit}',
-				array(
+				[
 					'recycle_board' => $recycle_board,
 					'topics' => $topics,
 					'limit' => count($topics),
-				)
+				],
 			);
-			if (Db::$db->num_rows($request) > 0)
-			{
+
+			if (Db::$db->num_rows($request) > 0) {
 				// Get topics that will be recycled.
-				$recycleTopics = array();
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					if (function_exists('apache_reset_timeout'))
+				$recycleTopics = [];
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					if (function_exists('apache_reset_timeout')) {
 						@apache_reset_timeout();
+					}
 
 					$recycleTopics[] = $row['id_topic'];
 
 					// Set the id_previous_board for this topic - and make it not sticky.
-					Db::$db->query('', '
-						UPDATE {db_prefix}topics
+					Db::$db->query(
+						'',
+						'UPDATE {db_prefix}topics
 						SET id_previous_board = {int:id_previous_board}, is_sticky = {int:not_sticky}
 						WHERE id_topic = {int:id_topic}',
-						array(
+						[
 							'id_previous_board' => $row['id_board'],
 							'id_topic' => $row['id_topic'],
 							'not_sticky' => 0,
-						)
+						],
 					);
 				}
 				Db::$db->free_result($request);
@@ -1192,171 +1219,181 @@ public static function remove($topics, $decreasePostCount = true, $ignoreRecycli
 				self::move($recycleTopics, Config::$modSettings['recycle_board']);
 
 				// Close reports that are being recycled.
-				require_once(Config::$sourcedir . '/Actions/Moderation/Main.php');
+				require_once Config::$sourcedir . '/Actions/Moderation/Main.php';
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}log_reported
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}log_reported
 					SET closed = {int:is_closed}
 					WHERE id_topic IN ({array_int:recycle_topics})',
-					array(
+					[
 						'recycle_topics' => $recycleTopics,
 						'is_closed' => 1,
-					)
+					],
 				);
 
-				Config::updateModSettings(array('last_mod_report_action' => time()));
+				Config::updateModSettings(['last_mod_report_action' => time()]);
 
 				ReportedContent::recountOpenReports('posts');
 
 				// Topics that were recycled don't need to be deleted, so subtract them.
 				$topics = array_diff($topics, $recycleTopics);
-			}
-			else
+			} else {
 				Db::$db->free_result($request);
+			}
 		}
 
 		// Still topics left to delete?
-		if (empty($topics))
+		if (empty($topics)) {
 			return;
+		}
 
 		// Callback for search APIs to do their thing
 		$searchAPI = SearchApi::load();
 
-		if ($searchAPI->supportsMethod('topicsRemoved'))
+		if ($searchAPI->supportsMethod('topicsRemoved')) {
 			$searchAPI->topicsRemoved($topics);
+		}
 
-		$adjustBoards = array();
+		$adjustBoards = [];
 
 		// Find out how many posts we are deleting.
-		$request = Db::$db->query('', '
-			SELECT id_board, approved, COUNT(*) AS num_topics, SUM(unapproved_posts) AS unapproved_posts,
+		$request = Db::$db->query(
+			'',
+			'SELECT id_board, approved, COUNT(*) AS num_topics, SUM(unapproved_posts) AS unapproved_posts,
 				SUM(num_replies) AS num_replies
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:topics})
 			GROUP BY id_board, approved',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!isset($adjustBoards[$row['id_board']]['num_posts']))
-			{
-				$adjustBoards[$row['id_board']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!isset($adjustBoards[$row['id_board']]['num_posts'])) {
+				$adjustBoards[$row['id_board']] = [
 					'num_posts' => 0,
 					'num_topics' => 0,
 					'unapproved_posts' => 0,
 					'unapproved_topics' => 0,
-					'id_board' => $row['id_board']
-				);
+					'id_board' => $row['id_board'],
+				];
 			}
 			// Posts = (num_replies + 1) for each approved topic.
 			$adjustBoards[$row['id_board']]['num_posts'] += $row['num_replies'] + ($row['approved'] ? $row['num_topics'] : 0);
 			$adjustBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 			// Add the topics to the right type.
-			if ($row['approved'])
+			if ($row['approved']) {
 				$adjustBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-			else
+			} else {
 				$adjustBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+			}
 		}
 		Db::$db->free_result($request);
 
-		if ($updateBoardCount)
-		{
+		if ($updateBoardCount) {
 			// Decrease the posts/topics...
-			foreach ($adjustBoards as $stats)
-			{
-				if (function_exists('apache_reset_timeout'))
+			foreach ($adjustBoards as $stats) {
+				if (function_exists('apache_reset_timeout')) {
 					@apache_reset_timeout();
+				}
 
-				Db::$db->query('', '
-					UPDATE {db_prefix}boards
+				Db::$db->query(
+					'',
+					'UPDATE {db_prefix}boards
 					SET
 						num_posts = CASE WHEN {int:num_posts} > num_posts THEN 0 ELSE num_posts - {int:num_posts} END,
 						num_topics = CASE WHEN {int:num_topics} > num_topics THEN 0 ELSE num_topics - {int:num_topics} END,
 						unapproved_posts = CASE WHEN {int:unapproved_posts} > unapproved_posts THEN 0 ELSE unapproved_posts - {int:unapproved_posts} END,
 						unapproved_topics = CASE WHEN {int:unapproved_topics} > unapproved_topics THEN 0 ELSE unapproved_topics - {int:unapproved_topics} END
 					WHERE id_board = {int:id_board}',
-					array(
+					[
 						'id_board' => $stats['id_board'],
 						'num_posts' => $stats['num_posts'],
 						'num_topics' => $stats['num_topics'],
 						'unapproved_posts' => $stats['unapproved_posts'],
 						'unapproved_topics' => $stats['unapproved_topics'],
-					)
+					],
 				);
 			}
 		}
 		// Remove Polls.
-		$request = Db::$db->query('', '
-			SELECT id_poll
+		$request = Db::$db->query(
+			'',
+			'SELECT id_poll
 			FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:topics})
 				AND id_poll > {int:no_poll}
 			LIMIT {int:limit}',
-			array(
+			[
 				'no_poll' => 0,
 				'topics' => $topics,
 				'limit' => count($topics),
-			)
+			],
 		);
-		$polls = array();
-		while ($row = Db::$db->fetch_assoc($request))
+		$polls = [];
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			$polls[] = $row['id_poll'];
+		}
 		Db::$db->free_result($request);
 
-		if (!empty($polls))
-		{
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}polls
+		if (!empty($polls)) {
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}polls
 				WHERE id_poll IN ({array_int:polls})',
-				array(
+				[
 					'polls' => $polls,
-				)
+				],
 			);
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}poll_choices
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}poll_choices
 				WHERE id_poll IN ({array_int:polls})',
-				array(
+				[
 					'polls' => $polls,
-				)
+				],
 			);
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_polls
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_polls
 				WHERE id_poll IN ({array_int:polls})',
-				array(
+				[
 					'polls' => $polls,
-				)
+				],
 			);
 		}
 
 		// Get rid of the attachment, if it exists.
-		$attachmentQuery = array(
+		$attachmentQuery = [
 			'attachment_type' => 0,
 			'id_topic' => $topics,
-		);
+		];
 		Attachment::remove($attachmentQuery, 'messages');
 
 		// Delete possible search index entries.
-		if (!empty(Config::$modSettings['search_custom_index_config']))
-		{
+		if (!empty(Config::$modSettings['search_custom_index_config'])) {
 			$customIndexSettings = Utils::jsonDecode(Config::$modSettings['search_custom_index_config'], true);
 
-			$words = array();
-			$messages = array();
-			$request = Db::$db->query('', '
-				SELECT id_msg, body
+			$words = [];
+			$messages = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT id_msg, body
 				FROM {db_prefix}messages
 				WHERE id_topic IN ({array_int:topics})',
-				array(
+				[
 					'topics' => $topics,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (function_exists('apache_reset_timeout'))
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (function_exists('apache_reset_timeout')) {
 					@apache_reset_timeout();
+				}
 
 				$words = array_merge($words, Utils::text2words($row['body'], $customIndexSettings['bytes_per_word'], true));
 				$messages[] = $row['id_msg'];
@@ -1364,82 +1401,92 @@ public static function remove($topics, $decreasePostCount = true, $ignoreRecycli
 			Db::$db->free_result($request);
 			$words = array_unique($words);
 
-			if (!empty($words) && !empty($messages))
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_search_words
+			if (!empty($words) && !empty($messages)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_search_words
 					WHERE id_word IN ({array_int:word_list})
 						AND id_msg IN ({array_int:message_list})',
-					array(
+					[
 						'word_list' => $words,
 						'message_list' => $messages,
-					)
+					],
 				);
+			}
 		}
 
 		// Delete anything related to the topic.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}messages
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}messages
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}calendar
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}calendar
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_topics
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_notify
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_notify
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}topics
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_search_subjects
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_search_subjects
 			WHERE id_topic IN ({array_int:topics})',
-			array(
+			[
 				'topics' => $topics,
-			)
+			],
 		);
 
 		// Maybe there's a mod that wants to delete topic related data of its own
-		IntegrationHook::call('integrate_remove_topics', array($topics));
+		IntegrationHook::call('integrate_remove_topics', [$topics]);
 
 		// Update the totals...
 		Logging::updateStats('message');
 		Logging::updateStats('topic');
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
+
+		$updates = [];
 
-		$updates = array();
-		foreach ($adjustBoards as $stats)
+		foreach ($adjustBoards as $stats) {
 			$updates[] = $stats['id_board'];
+		}
 		Msg::updateLastMessages($updates);
 	}
 
 	/**
 	 * Backward compatibility wrapper for the getLikedMsgs method.
 	 *
-	 * @param integer $topic The topic ID to fetch the info from.
+	 * @param int $topic The topic ID to fetch the info from.
 	 * @return array An array of IDs of messages in the specified topic that the current user likes
 	 */
 	public static function prepareLikesContext(int $topic): array
@@ -1456,36 +1503,34 @@ public static function prepareLikesContext(int $topic): array
 	 */
 	protected function loadTopicInfo(): void
 	{
-		if (empty($this->id))
+		if (empty($this->id)) {
 			ErrorHandler::fatalLang('not_a_topic', false, 404);
+		}
 
 		// Basic stuff we always want.
-		$topic_selects = array(
+		$topic_selects = [
 			't.*',
 			'ms.subject',
 			'ms.poster_time AS started_timestamp',
 			'COALESCE(mem.real_name, ms.poster_name) AS started_name',
 			'ml.poster_time AS updated_timestamp',
 			'COALESCE(meml.real_name, ml.poster_name) AS updated_name',
-		);
-		$topic_joins = array(
+		];
+		$topic_joins = [
 			'INNER JOIN {db_prefix}messages AS ms ON (ms.id_msg = t.id_first_msg)',
 			'INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)',
 			'LEFT JOIN {db_prefix}members AS mem on (mem.id_member = t.id_member_started)',
 			'LEFT JOIN {db_prefix}members AS meml on (meml.id_member = t.id_member_updated)',
-		);
-		$topic_parameters = array(
+		];
+		$topic_parameters = [
 			'current_topic' => $this->id,
 			'current_member' => User::$me->id ?? 0,
-		);
+		];
 
 		// What's new to this user?
-		if (User::$me->is_guest)
-		{
+		if (User::$me->is_guest) {
 			$topic_selects[] = 't.id_last_msg + 1 AS new_from';
-		}
-		else
-		{
+		} else {
 			$topic_selects[] = 'COALESCE(lt.id_msg, lmr.id_msg, -1) + 1 AS new_from';
 			$topic_selects[] = 'COALESCE(lt.unwatched, 0) as unwatched';
 
@@ -1493,22 +1538,23 @@ protected function loadTopicInfo(): void
 			$topic_joins[] = 'LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})';
 		}
 
-		IntegrationHook::call('integrate_display_topic', array(&$topic_selects, &$topic_joins, &$topic_parameters));
+		IntegrationHook::call('integrate_display_topic', [&$topic_selects, &$topic_joins, &$topic_parameters]);
 
 		// @todo Why isn't this cached?
 		// @todo if we get id_board in this query and cache it, we can save a query on posting
 		// Get all the important topic info.
-		$request = Db::$db->query('', '
-			SELECT
+		$request = Db::$db->query(
+			'',
+			'SELECT
 				' . implode(', ', $topic_selects) . '
 			FROM {db_prefix}topics AS t
 				' . implode("\n\t\t\t\t", $topic_joins) . '
 			WHERE t.id_topic = {int:current_topic}
 			LIMIT 1',
-			$topic_parameters
+			$topic_parameters,
 		);
-		if (Db::$db->num_rows($request) == 0)
-		{
+
+		if (Db::$db->num_rows($request) == 0) {
 			ErrorHandler::fatalLang('not_a_topic', false, 404);
 		}
 		$this->set(Db::$db->fetch_assoc($request));
@@ -1525,30 +1571,26 @@ protected function loadTopicInfo(): void
 		$this->real_num_replies = $this->num_replies + (Config::$modSettings['postmod_active'] && User::$me->allowedTo('approve_posts') ? $this->unapproved_posts - ($this->is_approved ? 0 : 1) : 0);
 
 		// If this topic has unapproved posts, we need to work out how many posts the user can see, for page indexing.
-		if (Config::$modSettings['postmod_active'] && $this->unapproved_posts && !User::$me->is_guest && !User::$me->allowedTo('approve_posts'))
-		{
-			$request = Db::$db->query('', '
-				SELECT COUNT(id_member) AS my_unapproved_posts
+		if (Config::$modSettings['postmod_active'] && $this->unapproved_posts && !User::$me->is_guest && !User::$me->allowedTo('approve_posts')) {
+			$request = Db::$db->query(
+				'',
+				'SELECT COUNT(id_member) AS my_unapproved_posts
 				FROM {db_prefix}messages
 				WHERE id_topic = {int:current_topic}
 					AND id_member = {int:current_member}
 					AND approved = 0',
-				array(
+				[
 					'current_topic' => Topic::$topic_id,
 					'current_member' => User::$me->id,
-				)
+				],
 			);
 			list($myUnapprovedPosts) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 
 			$this->total_visible_posts = $this->num_replies + $myUnapprovedPosts + ($this->is_approved ? 1 : 0);
-		}
-		elseif (User::$me->is_guest)
-		{
+		} elseif (User::$me->is_guest) {
 			$this->total_visible_posts = $this->num_replies + ($this->is_approved ? 1 : 0);
-		}
-		else
-		{
+		} else {
 			$this->total_visible_posts = $this->num_replies + $this->unapproved_posts + ($this->is_approved ? 1 : 0);
 		}
 
@@ -1558,7 +1600,8 @@ protected function loadTopicInfo(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Topic::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Topic::exportStatic')) {
 	Topic::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/CaseFold.php b/Sources/Unicode/CaseFold.php
index 24d097936e..0b1527024c 100644
--- a/Sources/Unicode/CaseFold.php
+++ b/Sources/Unicode/CaseFold.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_casefold.
@@ -26,7 +27,7 @@
  */
 function utf8_casefold_simple_maps()
 {
-	return array(
+	return [
 		"\x41" => "\x61",
 		"\x42" => "\x62",
 		"\x43" => "\x63",
@@ -815,10 +816,12 @@ function utf8_casefold_simple_maps()
 		"\xE1\xBF\x8A" => "\xE1\xBD\xB4",
 		"\xE1\xBF\x8B" => "\xE1\xBD\xB5",
 		"\xE1\xBF\x8C" => "\xE1\xBF\x83",
+		"\xE1\xBF\x93" => "\xCE\x90",
 		"\xE1\xBF\x98" => "\xE1\xBF\x90",
 		"\xE1\xBF\x99" => "\xE1\xBF\x91",
 		"\xE1\xBF\x9A" => "\xE1\xBD\xB6",
 		"\xE1\xBF\x9B" => "\xE1\xBD\xB7",
+		"\xE1\xBF\xA3" => "\xCE\xB0",
 		"\xE1\xBF\xA8" => "\xE1\xBF\xA0",
 		"\xE1\xBF\xA9" => "\xE1\xBF\xA1",
 		"\xE1\xBF\xAA" => "\xE1\xBD\xBA",
@@ -1195,6 +1198,7 @@ function utf8_casefold_simple_maps()
 		"\xEA\xAE\xBD" => "\xE1\x8F\xAD",
 		"\xEA\xAE\xBE" => "\xE1\x8F\xAE",
 		"\xEA\xAE\xBF" => "\xE1\x8F\xAF",
+		"\xEF\xAC\x85" => "\xEF\xAC\x86",
 		"\xEF\xBC\xA1" => "\xEF\xBD\x81",
 		"\xEF\xBC\xA2" => "\xEF\xBD\x82",
 		"\xEF\xBC\xA3" => "\xEF\xBD\x83",
@@ -1481,7 +1485,7 @@ function utf8_casefold_simple_maps()
 		"\xF0\x9E\xA4\x9F" => "\xF0\x9E\xA5\x81",
 		"\xF0\x9E\xA4\xA0" => "\xF0\x9E\xA5\x82",
 		"\xF0\x9E\xA4\xA1" => "\xF0\x9E\xA5\x83",
-	);
+	];
 }
 
 /**
@@ -1494,7 +1498,7 @@ function utf8_casefold_simple_maps()
  */
 function utf8_casefold_maps()
 {
-	return array(
+	return [
 		"\x41" => "\x61",
 		"\x42" => "\x62",
 		"\x43" => "\x63",
@@ -3025,7 +3029,7 @@ function utf8_casefold_maps()
 		"\xF0\x9E\xA4\x9F" => "\xF0\x9E\xA5\x81",
 		"\xF0\x9E\xA4\xA0" => "\xF0\x9E\xA5\x82",
 		"\xF0\x9E\xA4\xA1" => "\xF0\x9E\xA5\x83",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/CaseLower.php b/Sources/Unicode/CaseLower.php
index 3fddddcabb..3a2e849d90 100644
--- a/Sources/Unicode/CaseLower.php
+++ b/Sources/Unicode/CaseLower.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_strtolower.
@@ -26,7 +27,7 @@
  */
 function utf8_strtolower_simple_maps()
 {
-	return array(
+	return [
 		"\x41" => "\x61",
 		"\x42" => "\x62",
 		"\x43" => "\x63",
@@ -1460,7 +1461,7 @@ function utf8_strtolower_simple_maps()
 		"\xF0\x9E\xA4\x9F" => "\xF0\x9E\xA5\x81",
 		"\xF0\x9E\xA4\xA0" => "\xF0\x9E\xA5\x82",
 		"\xF0\x9E\xA4\xA1" => "\xF0\x9E\xA5\x83",
-	);
+	];
 }
 
 /**
@@ -1473,7 +1474,7 @@ function utf8_strtolower_simple_maps()
  */
 function utf8_strtolower_maps()
 {
-	return array(
+	return [
 		"\x41" => "\x61",
 		"\x42" => "\x62",
 		"\x43" => "\x63",
@@ -2982,7 +2983,7 @@ function utf8_strtolower_maps()
 		"\xEF\xBC\xB8" => "\xEF\xBD\x98",
 		"\xEF\xBC\xB9" => "\xEF\xBD\x99",
 		"\xEF\xBC\xBA" => "\xEF\xBD\x9A",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/CaseTitle.php b/Sources/Unicode/CaseTitle.php
index 5f3797efcc..7e3e751dab 100644
--- a/Sources/Unicode/CaseTitle.php
+++ b/Sources/Unicode/CaseTitle.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_convert_case.
@@ -26,7 +27,7 @@
  */
 function utf8_titlecase_simple_maps()
 {
-	return array(
+	return [
 		"\xC7\x84" => "\xC7\x85",
 		"\xC7\x85" => "\xC7\x85",
 		"\xC7\x86" => "\xC7\x85",
@@ -85,7 +86,7 @@ function utf8_titlecase_simple_maps()
 		"\xE1\x83\xBD" => "\xE1\x83\xBD",
 		"\xE1\x83\xBE" => "\xE1\x83\xBE",
 		"\xE1\x83\xBF" => "\xE1\x83\xBF",
-	);
+	];
 }
 
 /**
@@ -98,7 +99,7 @@ function utf8_titlecase_simple_maps()
  */
 function utf8_titlecase_maps()
 {
-	return array(
+	return [
 		"\xC3\x9F" => "\x53\x73",
 		"\xC7\x84" => "\xC7\x85",
 		"\xC7\x85" => "\xC7\x85",
@@ -234,7 +235,7 @@ function utf8_titlecase_maps()
 		"\xEF\xAC\x95" => "\xD5\x84\xD5\xAB",
 		"\xEF\xAC\x96" => "\xD5\x8E\xD5\xB6",
 		"\xEF\xAC\x97" => "\xD5\x84\xD5\xAD",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/CaseUpper.php b/Sources/Unicode/CaseUpper.php
index 497b7e615e..f1b0d92111 100644
--- a/Sources/Unicode/CaseUpper.php
+++ b/Sources/Unicode/CaseUpper.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_strtoupper.
@@ -26,7 +27,7 @@
  */
 function utf8_strtoupper_simple_maps()
 {
-	return array(
+	return [
 		"\x61" => "\x41",
 		"\x62" => "\x42",
 		"\x63" => "\x43",
@@ -1477,7 +1478,7 @@ function utf8_strtoupper_simple_maps()
 		"\xF0\x9E\xA5\x81" => "\xF0\x9E\xA4\x9F",
 		"\xF0\x9E\xA5\x82" => "\xF0\x9E\xA4\xA0",
 		"\xF0\x9E\xA5\x83" => "\xF0\x9E\xA4\xA1",
-	);
+	];
 }
 
 /**
@@ -1490,7 +1491,7 @@ function utf8_strtoupper_simple_maps()
  */
 function utf8_strtoupper_maps()
 {
-	return array(
+	return [
 		"\x61" => "\x41",
 		"\x62" => "\x42",
 		"\x63" => "\x43",
@@ -3017,7 +3018,7 @@ function utf8_strtoupper_maps()
 		"\xEF\xBD\x98" => "\xEF\xBC\xB8",
 		"\xEF\xBD\x99" => "\xEF\xBC\xB9",
 		"\xEF\xBD\x9A" => "\xEF\xBC\xBA",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/CombiningClasses.php b/Sources/Unicode/CombiningClasses.php
index ce39963faa..234a120796 100644
--- a/Sources/Unicode/CombiningClasses.php
+++ b/Sources/Unicode/CombiningClasses.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_normalize_d.
@@ -26,7 +27,7 @@
  */
 function utf8_combining_classes()
 {
-	return array(
+	return [
 		"\xCC\x80" => 230,
 		"\xCC\x81" => 230,
 		"\xCC\x82" => 230,
@@ -949,7 +950,7 @@ function utf8_combining_classes()
 		"\xF0\x9E\xA5\x88" => 230,
 		"\xF0\x9E\xA5\x89" => 230,
 		"\xF0\x9E\xA5\x8A" => 7,
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/Composition.php b/Sources/Unicode/Composition.php
index bfb4c1111c..6f725f8a9a 100644
--- a/Sources/Unicode/Composition.php
+++ b/Sources/Unicode/Composition.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_compose.
@@ -26,7 +27,7 @@
  */
 function utf8_compose_maps()
 {
-	return array(
+	return [
 		"\x41\xCC\x80" => "\xC3\x80",
 		"\x41\xCC\x81" => "\xC3\x81",
 		"\x41\xCC\x82" => "\xC3\x82",
@@ -968,7 +969,7 @@ function utf8_compose_maps()
 		"\xF0\x91\x96\xB8\xF0\x91\x96\xAF" => "\xF0\x91\x96\xBA",
 		"\xF0\x91\x96\xB9\xF0\x91\x96\xAF" => "\xF0\x91\x96\xBB",
 		"\xF0\x91\xA4\xB5\xF0\x91\xA4\xB0" => "\xF0\x91\xA4\xB8",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/DecompositionCanonical.php b/Sources/Unicode/DecompositionCanonical.php
index 3442d102ce..bdd73b6870 100644
--- a/Sources/Unicode/DecompositionCanonical.php
+++ b/Sources/Unicode/DecompositionCanonical.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_normalize_d.
@@ -26,7 +27,7 @@
  */
 function utf8_normalize_d_maps()
 {
-	return array(
+	return [
 		"\xC3\x80" => "\x41\xCC\x80",
 		"\xC3\x81" => "\x41\xCC\x81",
 		"\xC3\x82" => "\x41\xCC\x82",
@@ -2088,7 +2089,7 @@ function utf8_normalize_d_maps()
 		"\xF0\xAF\xA8\x9B" => "\xE9\xBC\x96",
 		"\xF0\xAF\xA8\x9C" => "\xE9\xBC\xBB",
 		"\xF0\xAF\xA8\x9D" => "\xF0\xAA\x98\x80",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/DecompositionCompatibility.php b/Sources/Unicode/DecompositionCompatibility.php
index 468e78d2d7..d5f254388e 100644
--- a/Sources/Unicode/DecompositionCompatibility.php
+++ b/Sources/Unicode/DecompositionCompatibility.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_normalize_kd.
@@ -26,7 +27,7 @@
  */
 function utf8_normalize_kd_maps()
 {
-	return array(
+	return [
 		"\xC2\xA0" => "\x20",
 		"\xC2\xA8" => "\x20\xCC\x88",
 		"\xC2\xAA" => "\x61",
@@ -3839,7 +3840,7 @@ function utf8_normalize_kd_maps()
 		"\xF0\x9F\xAF\xB7" => "\x37",
 		"\xF0\x9F\xAF\xB8" => "\x38",
 		"\xF0\x9F\xAF\xB9" => "\x39",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/DefaultIgnorables.php b/Sources/Unicode/DefaultIgnorables.php
index 0b998a4d7c..7505ef82e6 100644
--- a/Sources/Unicode/DefaultIgnorables.php
+++ b/Sources/Unicode/DefaultIgnorables.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_normalize_kc_casefold.
@@ -26,7 +27,7 @@
  */
 function utf8_default_ignorables()
 {
-	return array(
+	return [
 		"\xC2\xAD",
 		"\xCD\x8F",
 		"\xD8\x9C",
@@ -4201,7 +4202,7 @@ function utf8_default_ignorables()
 		"\xF3\xA0\xBF\xBD",
 		"\xF3\xA0\xBF\xBE",
 		"\xF3\xA0\xBF\xBF",
-	);
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/Idna.php b/Sources/Unicode/Idna.php
index 5535d743f6..ee6f2d4efa 100644
--- a/Sources/Unicode/Idna.php
+++ b/Sources/Unicode/Idna.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for idn_to_* polyfills.
@@ -26,7 +27,7 @@
  */
 function idna_maps()
 {
-	return array(
+	return [
 		"\x41" => "\x61",
 		"\x42" => "\x62",
 		"\x43" => "\x63",
@@ -831,7 +832,7 @@ function idna_maps()
 		"\xE1\xBA\x94" => "\xE1\xBA\x95",
 		"\xE1\xBA\x9A" => "\x61\xCA\xBE",
 		"\xE1\xBA\x9B" => "\xE1\xB9\xA1",
-		"\xE1\xBA\x9E" => "\x73\x73",
+		"\xE1\xBA\x9E" => "\xC3\x9F",
 		"\xE1\xBA\xA0" => "\xE1\xBA\xA1",
 		"\xE1\xBA\xA2" => "\xE1\xBA\xA3",
 		"\xE1\xBA\xA4" => "\xE1\xBA\xA5",
@@ -5962,7 +5963,7 @@ function idna_maps()
 		"\xF0\xAF\xA8\x9B" => "\xE9\xBC\x96",
 		"\xF0\xAF\xA8\x9C" => "\xE9\xBC\xBB",
 		"\xF0\xAF\xA8\x9D" => "\xF0\xAA\x98\x80",
-	);
+	];
 }
 
 /**
@@ -5975,12 +5976,12 @@ function idna_maps()
  */
 function idna_maps_deviation()
 {
-	return array(
+	return [
 		"\xC3\x9F" => "\x73\x73",
 		"\xCF\x82" => "\xCF\x83",
-		"\xE2\x80\x8C" => "",
-		"\xE2\x80\x8D" => "",
-	);
+		"\xE2\x80\x8C" => '',
+		"\xE2\x80\x8D" => '',
+	];
 }
 
 /**
@@ -5993,7 +5994,7 @@ function idna_maps_deviation()
  */
 function idna_maps_not_std3()
 {
-	return array(
+	return [
 		"\xC2\xA0" => "\x20",
 		"\xC2\xA8" => "\x20\xCC\x88",
 		"\xC2\xAF" => "\x20\xCC\x84",
@@ -6298,7 +6299,7 @@ function idna_maps_not_std3()
 		"\xF0\x9F\x84\xA7" => "\x28\x78\x29",
 		"\xF0\x9F\x84\xA8" => "\x28\x79\x29",
 		"\xF0\x9F\x84\xA9" => "\x28\x7A\x29",
-	);
+	];
 }
 
 /**
@@ -6311,1107 +6312,1107 @@ function idna_maps_not_std3()
  */
 function idna_regex()
 {
-	return array(
+	return [
 		'disallowed_std3' =>
-			'\x{0}-\x{2C}' .
-			'\x{2F}' .
-			'\x{3A}-\x{40}' .
-			'\x{5B}-\x{60}' .
-			'\x{7B}-\x{7F}' .
-			'\x{A0}' .
-			'\x{A8}' .
-			'\x{AF}' .
-			'\x{B4}' .
-			'\x{B8}' .
-			'\x{2D8}' .
-			'\x{2D9}' .
-			'\x{2DA}' .
-			'\x{2DB}' .
-			'\x{2DC}' .
-			'\x{2DD}' .
-			'\x{37A}' .
-			'\x{37E}' .
-			'\x{384}' .
-			'\x{385}' .
-			'\x{1FBD}' .
-			'\x{1FBF}' .
-			'\x{1FC0}' .
-			'\x{1FC1}' .
-			'\x{1FCD}' .
-			'\x{1FCE}' .
-			'\x{1FCF}' .
-			'\x{1FDD}' .
-			'\x{1FDE}' .
-			'\x{1FDF}' .
-			'\x{1FED}' .
-			'\x{1FEE}' .
-			'\x{1FEF}' .
-			'\x{1FFD}' .
-			'\x{1FFE}' .
-			'\x{2000}-\x{200A}' .
-			'\x{2017}' .
-			'\x{202F}' .
-			'\x{203C}' .
-			'\x{203E}' .
-			'\x{2047}' .
-			'\x{2048}' .
-			'\x{2049}' .
-			'\x{205F}' .
-			'\x{207A}' .
-			'\x{207C}' .
-			'\x{207D}' .
-			'\x{207E}' .
-			'\x{208A}' .
-			'\x{208C}' .
-			'\x{208D}' .
-			'\x{208E}' .
-			'\x{2100}' .
-			'\x{2101}' .
-			'\x{2105}' .
-			'\x{2106}' .
-			'\x{2260}' .
-			'\x{226E}-\x{226F}' .
-			'\x{2474}' .
-			'\x{2475}' .
-			'\x{2476}' .
-			'\x{2477}' .
-			'\x{2478}' .
-			'\x{2479}' .
-			'\x{247A}' .
-			'\x{247B}' .
-			'\x{247C}' .
-			'\x{247D}' .
-			'\x{247E}' .
-			'\x{247F}' .
-			'\x{2480}' .
-			'\x{2481}' .
-			'\x{2482}' .
-			'\x{2483}' .
-			'\x{2484}' .
-			'\x{2485}' .
-			'\x{2486}' .
-			'\x{2487}' .
-			'\x{249C}' .
-			'\x{249D}' .
-			'\x{249E}' .
-			'\x{249F}' .
-			'\x{24A0}' .
-			'\x{24A1}' .
-			'\x{24A2}' .
-			'\x{24A3}' .
-			'\x{24A4}' .
-			'\x{24A5}' .
-			'\x{24A6}' .
-			'\x{24A7}' .
-			'\x{24A8}' .
-			'\x{24A9}' .
-			'\x{24AA}' .
-			'\x{24AB}' .
-			'\x{24AC}' .
-			'\x{24AD}' .
-			'\x{24AE}' .
-			'\x{24AF}' .
-			'\x{24B0}' .
-			'\x{24B1}' .
-			'\x{24B2}' .
-			'\x{24B3}' .
-			'\x{24B4}' .
-			'\x{24B5}' .
-			'\x{2A74}' .
-			'\x{2A75}' .
-			'\x{2A76}' .
-			'\x{3000}' .
-			'\x{309B}' .
-			'\x{309C}' .
-			'\x{3200}' .
-			'\x{3201}' .
-			'\x{3202}' .
-			'\x{3203}' .
-			'\x{3204}' .
-			'\x{3205}' .
-			'\x{3206}' .
-			'\x{3207}' .
-			'\x{3208}' .
-			'\x{3209}' .
-			'\x{320A}' .
-			'\x{320B}' .
-			'\x{320C}' .
-			'\x{320D}' .
-			'\x{320E}' .
-			'\x{320F}' .
-			'\x{3210}' .
-			'\x{3211}' .
-			'\x{3212}' .
-			'\x{3213}' .
-			'\x{3214}' .
-			'\x{3215}' .
-			'\x{3216}' .
-			'\x{3217}' .
-			'\x{3218}' .
-			'\x{3219}' .
-			'\x{321A}' .
-			'\x{321B}' .
-			'\x{321C}' .
-			'\x{321D}' .
-			'\x{321E}' .
-			'\x{3220}' .
-			'\x{3221}' .
-			'\x{3222}' .
-			'\x{3223}' .
-			'\x{3224}' .
-			'\x{3225}' .
-			'\x{3226}' .
-			'\x{3227}' .
-			'\x{3228}' .
-			'\x{3229}' .
-			'\x{322A}' .
-			'\x{322B}' .
-			'\x{322C}' .
-			'\x{322D}' .
-			'\x{322E}' .
-			'\x{322F}' .
-			'\x{3230}' .
-			'\x{3231}' .
-			'\x{3232}' .
-			'\x{3233}' .
-			'\x{3234}' .
-			'\x{3235}' .
-			'\x{3236}' .
-			'\x{3237}' .
-			'\x{3238}' .
-			'\x{3239}' .
-			'\x{323A}' .
-			'\x{323B}' .
-			'\x{323C}' .
-			'\x{323D}' .
-			'\x{323E}' .
-			'\x{323F}' .
-			'\x{3240}' .
-			'\x{3241}' .
-			'\x{3242}' .
-			'\x{3243}' .
-			'\x{FB29}' .
-			'\x{FC5E}' .
-			'\x{FC5F}' .
-			'\x{FC60}' .
-			'\x{FC61}' .
-			'\x{FC62}' .
-			'\x{FC63}' .
-			'\x{FDFA}' .
-			'\x{FDFB}' .
-			'\x{FE10}' .
-			'\x{FE13}' .
-			'\x{FE14}' .
-			'\x{FE15}' .
-			'\x{FE16}' .
-			'\x{FE33}-\x{FE34}' .
-			'\x{FE35}' .
-			'\x{FE36}' .
-			'\x{FE37}' .
-			'\x{FE38}' .
-			'\x{FE47}' .
-			'\x{FE48}' .
-			'\x{FE49}-\x{FE4C}' .
-			'\x{FE4D}-\x{FE4F}' .
-			'\x{FE50}' .
-			'\x{FE54}' .
-			'\x{FE55}' .
-			'\x{FE56}' .
-			'\x{FE57}' .
-			'\x{FE59}' .
-			'\x{FE5A}' .
-			'\x{FE5B}' .
-			'\x{FE5C}' .
-			'\x{FE5F}' .
-			'\x{FE60}' .
-			'\x{FE61}' .
-			'\x{FE62}' .
-			'\x{FE64}' .
-			'\x{FE65}' .
-			'\x{FE66}' .
-			'\x{FE68}' .
-			'\x{FE69}' .
-			'\x{FE6A}' .
-			'\x{FE6B}' .
-			'\x{FE70}' .
-			'\x{FE72}' .
-			'\x{FE74}' .
-			'\x{FE76}' .
-			'\x{FE78}' .
-			'\x{FE7A}' .
-			'\x{FE7C}' .
-			'\x{FE7E}' .
-			'\x{FF01}' .
-			'\x{FF02}' .
-			'\x{FF03}' .
-			'\x{FF04}' .
-			'\x{FF05}' .
-			'\x{FF06}' .
-			'\x{FF07}' .
-			'\x{FF08}' .
-			'\x{FF09}' .
-			'\x{FF0A}' .
-			'\x{FF0B}' .
-			'\x{FF0C}' .
-			'\x{FF0F}' .
-			'\x{FF1A}' .
-			'\x{FF1B}' .
-			'\x{FF1C}' .
-			'\x{FF1D}' .
-			'\x{FF1E}' .
-			'\x{FF1F}' .
-			'\x{FF20}' .
-			'\x{FF3B}' .
-			'\x{FF3C}' .
-			'\x{FF3D}' .
-			'\x{FF3E}' .
-			'\x{FF3F}' .
-			'\x{FF40}' .
-			'\x{FF5B}' .
-			'\x{FF5C}' .
-			'\x{FF5D}' .
-			'\x{FF5E}' .
-			'\x{FFE3}' .
-			'\x{1F101}' .
-			'\x{1F102}' .
-			'\x{1F103}' .
-			'\x{1F104}' .
-			'\x{1F105}' .
-			'\x{1F106}' .
-			'\x{1F107}' .
-			'\x{1F108}' .
-			'\x{1F109}' .
-			'\x{1F10A}' .
-			'\x{1F110}' .
-			'\x{1F111}' .
-			'\x{1F112}' .
-			'\x{1F113}' .
-			'\x{1F114}' .
-			'\x{1F115}' .
-			'\x{1F116}' .
-			'\x{1F117}' .
-			'\x{1F118}' .
-			'\x{1F119}' .
-			'\x{1F11A}' .
-			'\x{1F11B}' .
-			'\x{1F11C}' .
-			'\x{1F11D}' .
-			'\x{1F11E}' .
-			'\x{1F11F}' .
-			'\x{1F120}' .
-			'\x{1F121}' .
-			'\x{1F122}' .
-			'\x{1F123}' .
-			'\x{1F124}' .
-			'\x{1F125}' .
-			'\x{1F126}' .
-			'\x{1F127}' .
-			'\x{1F128}' .
-			'\x{1F129}',
+			'\\x{0}-\\x{2C}' .
+			'\\x{2F}' .
+			'\\x{3A}-\\x{40}' .
+			'\\x{5B}-\\x{60}' .
+			'\\x{7B}-\\x{7F}' .
+			'\\x{A0}' .
+			'\\x{A8}' .
+			'\\x{AF}' .
+			'\\x{B4}' .
+			'\\x{B8}' .
+			'\\x{2D8}' .
+			'\\x{2D9}' .
+			'\\x{2DA}' .
+			'\\x{2DB}' .
+			'\\x{2DC}' .
+			'\\x{2DD}' .
+			'\\x{37A}' .
+			'\\x{37E}' .
+			'\\x{384}' .
+			'\\x{385}' .
+			'\\x{1FBD}' .
+			'\\x{1FBF}' .
+			'\\x{1FC0}' .
+			'\\x{1FC1}' .
+			'\\x{1FCD}' .
+			'\\x{1FCE}' .
+			'\\x{1FCF}' .
+			'\\x{1FDD}' .
+			'\\x{1FDE}' .
+			'\\x{1FDF}' .
+			'\\x{1FED}' .
+			'\\x{1FEE}' .
+			'\\x{1FEF}' .
+			'\\x{1FFD}' .
+			'\\x{1FFE}' .
+			'\\x{2000}-\\x{200A}' .
+			'\\x{2017}' .
+			'\\x{202F}' .
+			'\\x{203C}' .
+			'\\x{203E}' .
+			'\\x{2047}' .
+			'\\x{2048}' .
+			'\\x{2049}' .
+			'\\x{205F}' .
+			'\\x{207A}' .
+			'\\x{207C}' .
+			'\\x{207D}' .
+			'\\x{207E}' .
+			'\\x{208A}' .
+			'\\x{208C}' .
+			'\\x{208D}' .
+			'\\x{208E}' .
+			'\\x{2100}' .
+			'\\x{2101}' .
+			'\\x{2105}' .
+			'\\x{2106}' .
+			'\\x{2474}' .
+			'\\x{2475}' .
+			'\\x{2476}' .
+			'\\x{2477}' .
+			'\\x{2478}' .
+			'\\x{2479}' .
+			'\\x{247A}' .
+			'\\x{247B}' .
+			'\\x{247C}' .
+			'\\x{247D}' .
+			'\\x{247E}' .
+			'\\x{247F}' .
+			'\\x{2480}' .
+			'\\x{2481}' .
+			'\\x{2482}' .
+			'\\x{2483}' .
+			'\\x{2484}' .
+			'\\x{2485}' .
+			'\\x{2486}' .
+			'\\x{2487}' .
+			'\\x{249C}' .
+			'\\x{249D}' .
+			'\\x{249E}' .
+			'\\x{249F}' .
+			'\\x{24A0}' .
+			'\\x{24A1}' .
+			'\\x{24A2}' .
+			'\\x{24A3}' .
+			'\\x{24A4}' .
+			'\\x{24A5}' .
+			'\\x{24A6}' .
+			'\\x{24A7}' .
+			'\\x{24A8}' .
+			'\\x{24A9}' .
+			'\\x{24AA}' .
+			'\\x{24AB}' .
+			'\\x{24AC}' .
+			'\\x{24AD}' .
+			'\\x{24AE}' .
+			'\\x{24AF}' .
+			'\\x{24B0}' .
+			'\\x{24B1}' .
+			'\\x{24B2}' .
+			'\\x{24B3}' .
+			'\\x{24B4}' .
+			'\\x{24B5}' .
+			'\\x{2A74}' .
+			'\\x{2A75}' .
+			'\\x{2A76}' .
+			'\\x{3000}' .
+			'\\x{309B}' .
+			'\\x{309C}' .
+			'\\x{3200}' .
+			'\\x{3201}' .
+			'\\x{3202}' .
+			'\\x{3203}' .
+			'\\x{3204}' .
+			'\\x{3205}' .
+			'\\x{3206}' .
+			'\\x{3207}' .
+			'\\x{3208}' .
+			'\\x{3209}' .
+			'\\x{320A}' .
+			'\\x{320B}' .
+			'\\x{320C}' .
+			'\\x{320D}' .
+			'\\x{320E}' .
+			'\\x{320F}' .
+			'\\x{3210}' .
+			'\\x{3211}' .
+			'\\x{3212}' .
+			'\\x{3213}' .
+			'\\x{3214}' .
+			'\\x{3215}' .
+			'\\x{3216}' .
+			'\\x{3217}' .
+			'\\x{3218}' .
+			'\\x{3219}' .
+			'\\x{321A}' .
+			'\\x{321B}' .
+			'\\x{321C}' .
+			'\\x{321D}' .
+			'\\x{321E}' .
+			'\\x{3220}' .
+			'\\x{3221}' .
+			'\\x{3222}' .
+			'\\x{3223}' .
+			'\\x{3224}' .
+			'\\x{3225}' .
+			'\\x{3226}' .
+			'\\x{3227}' .
+			'\\x{3228}' .
+			'\\x{3229}' .
+			'\\x{322A}' .
+			'\\x{322B}' .
+			'\\x{322C}' .
+			'\\x{322D}' .
+			'\\x{322E}' .
+			'\\x{322F}' .
+			'\\x{3230}' .
+			'\\x{3231}' .
+			'\\x{3232}' .
+			'\\x{3233}' .
+			'\\x{3234}' .
+			'\\x{3235}' .
+			'\\x{3236}' .
+			'\\x{3237}' .
+			'\\x{3238}' .
+			'\\x{3239}' .
+			'\\x{323A}' .
+			'\\x{323B}' .
+			'\\x{323C}' .
+			'\\x{323D}' .
+			'\\x{323E}' .
+			'\\x{323F}' .
+			'\\x{3240}' .
+			'\\x{3241}' .
+			'\\x{3242}' .
+			'\\x{3243}' .
+			'\\x{FB29}' .
+			'\\x{FC5E}' .
+			'\\x{FC5F}' .
+			'\\x{FC60}' .
+			'\\x{FC61}' .
+			'\\x{FC62}' .
+			'\\x{FC63}' .
+			'\\x{FDFA}' .
+			'\\x{FDFB}' .
+			'\\x{FE10}' .
+			'\\x{FE13}' .
+			'\\x{FE14}' .
+			'\\x{FE15}' .
+			'\\x{FE16}' .
+			'\\x{FE33}-\\x{FE34}' .
+			'\\x{FE35}' .
+			'\\x{FE36}' .
+			'\\x{FE37}' .
+			'\\x{FE38}' .
+			'\\x{FE47}' .
+			'\\x{FE48}' .
+			'\\x{FE49}-\\x{FE4C}' .
+			'\\x{FE4D}-\\x{FE4F}' .
+			'\\x{FE50}' .
+			'\\x{FE54}' .
+			'\\x{FE55}' .
+			'\\x{FE56}' .
+			'\\x{FE57}' .
+			'\\x{FE59}' .
+			'\\x{FE5A}' .
+			'\\x{FE5B}' .
+			'\\x{FE5C}' .
+			'\\x{FE5F}' .
+			'\\x{FE60}' .
+			'\\x{FE61}' .
+			'\\x{FE62}' .
+			'\\x{FE64}' .
+			'\\x{FE65}' .
+			'\\x{FE66}' .
+			'\\x{FE68}' .
+			'\\x{FE69}' .
+			'\\x{FE6A}' .
+			'\\x{FE6B}' .
+			'\\x{FE70}' .
+			'\\x{FE72}' .
+			'\\x{FE74}' .
+			'\\x{FE76}' .
+			'\\x{FE78}' .
+			'\\x{FE7A}' .
+			'\\x{FE7C}' .
+			'\\x{FE7E}' .
+			'\\x{FF01}' .
+			'\\x{FF02}' .
+			'\\x{FF03}' .
+			'\\x{FF04}' .
+			'\\x{FF05}' .
+			'\\x{FF06}' .
+			'\\x{FF07}' .
+			'\\x{FF08}' .
+			'\\x{FF09}' .
+			'\\x{FF0A}' .
+			'\\x{FF0B}' .
+			'\\x{FF0C}' .
+			'\\x{FF0F}' .
+			'\\x{FF1A}' .
+			'\\x{FF1B}' .
+			'\\x{FF1C}' .
+			'\\x{FF1D}' .
+			'\\x{FF1E}' .
+			'\\x{FF1F}' .
+			'\\x{FF20}' .
+			'\\x{FF3B}' .
+			'\\x{FF3C}' .
+			'\\x{FF3D}' .
+			'\\x{FF3E}' .
+			'\\x{FF3F}' .
+			'\\x{FF40}' .
+			'\\x{FF5B}' .
+			'\\x{FF5C}' .
+			'\\x{FF5D}' .
+			'\\x{FF5E}' .
+			'\\x{FFE3}' .
+			'\\x{1F101}' .
+			'\\x{1F102}' .
+			'\\x{1F103}' .
+			'\\x{1F104}' .
+			'\\x{1F105}' .
+			'\\x{1F106}' .
+			'\\x{1F107}' .
+			'\\x{1F108}' .
+			'\\x{1F109}' .
+			'\\x{1F10A}' .
+			'\\x{1F110}' .
+			'\\x{1F111}' .
+			'\\x{1F112}' .
+			'\\x{1F113}' .
+			'\\x{1F114}' .
+			'\\x{1F115}' .
+			'\\x{1F116}' .
+			'\\x{1F117}' .
+			'\\x{1F118}' .
+			'\\x{1F119}' .
+			'\\x{1F11A}' .
+			'\\x{1F11B}' .
+			'\\x{1F11C}' .
+			'\\x{1F11D}' .
+			'\\x{1F11E}' .
+			'\\x{1F11F}' .
+			'\\x{1F120}' .
+			'\\x{1F121}' .
+			'\\x{1F122}' .
+			'\\x{1F123}' .
+			'\\x{1F124}' .
+			'\\x{1F125}' .
+			'\\x{1F126}' .
+			'\\x{1F127}' .
+			'\\x{1F128}' .
+			'\\x{1F129}',
 		'disallowed' =>
-			'\x{80}-\x{9F}' .
-			'\x{378}-\x{379}' .
-			'\x{380}-\x{383}' .
-			'\x{38B}' .
-			'\x{38D}' .
-			'\x{3A2}' .
-			'\x{4C0}' .
-			'\x{530}' .
-			'\x{557}-\x{558}' .
-			'\x{58B}-\x{58C}' .
-			'\x{590}' .
-			'\x{5C8}-\x{5CF}' .
-			'\x{5EB}-\x{5EE}' .
-			'\x{5F5}-\x{5FF}' .
-			'\x{600}-\x{603}' .
-			'\x{604}' .
-			'\x{605}' .
-			'\x{61C}' .
-			'\x{6DD}' .
-			'\x{70E}' .
-			'\x{70F}' .
-			'\x{74B}-\x{74C}' .
-			'\x{7B2}-\x{7BF}' .
-			'\x{7FB}-\x{7FC}' .
-			'\x{82E}-\x{82F}' .
-			'\x{83F}' .
-			'\x{85C}-\x{85D}' .
-			'\x{85F}' .
-			'\x{86B}-\x{86F}' .
-			'\x{88F}' .
-			'\x{890}-\x{891}' .
-			'\x{892}-\x{897}' .
-			'\x{8E2}' .
-			'\x{984}' .
-			'\x{98D}-\x{98E}' .
-			'\x{991}-\x{992}' .
-			'\x{9A9}' .
-			'\x{9B1}' .
-			'\x{9B3}-\x{9B5}' .
-			'\x{9BA}-\x{9BB}' .
-			'\x{9C5}-\x{9C6}' .
-			'\x{9C9}-\x{9CA}' .
-			'\x{9CF}-\x{9D6}' .
-			'\x{9D8}-\x{9DB}' .
-			'\x{9DE}' .
-			'\x{9E4}-\x{9E5}' .
-			'\x{9FF}-\x{A00}' .
-			'\x{A04}' .
-			'\x{A0B}-\x{A0E}' .
-			'\x{A11}-\x{A12}' .
-			'\x{A29}' .
-			'\x{A31}' .
-			'\x{A34}' .
-			'\x{A37}' .
-			'\x{A3A}-\x{A3B}' .
-			'\x{A3D}' .
-			'\x{A43}-\x{A46}' .
-			'\x{A49}-\x{A4A}' .
-			'\x{A4E}-\x{A50}' .
-			'\x{A52}-\x{A58}' .
-			'\x{A5D}' .
-			'\x{A5F}-\x{A65}' .
-			'\x{A77}-\x{A80}' .
-			'\x{A84}' .
-			'\x{A8E}' .
-			'\x{A92}' .
-			'\x{AA9}' .
-			'\x{AB1}' .
-			'\x{AB4}' .
-			'\x{ABA}-\x{ABB}' .
-			'\x{AC6}' .
-			'\x{ACA}' .
-			'\x{ACE}-\x{ACF}' .
-			'\x{AD1}-\x{ADF}' .
-			'\x{AE4}-\x{AE5}' .
-			'\x{AF2}-\x{AF8}' .
-			'\x{B00}' .
-			'\x{B04}' .
-			'\x{B0D}-\x{B0E}' .
-			'\x{B11}-\x{B12}' .
-			'\x{B29}' .
-			'\x{B31}' .
-			'\x{B34}' .
-			'\x{B3A}-\x{B3B}' .
-			'\x{B45}-\x{B46}' .
-			'\x{B49}-\x{B4A}' .
-			'\x{B4E}-\x{B54}' .
-			'\x{B58}-\x{B5B}' .
-			'\x{B5E}' .
-			'\x{B64}-\x{B65}' .
-			'\x{B78}-\x{B81}' .
-			'\x{B84}' .
-			'\x{B8B}-\x{B8D}' .
-			'\x{B91}' .
-			'\x{B96}-\x{B98}' .
-			'\x{B9B}' .
-			'\x{B9D}' .
-			'\x{BA0}-\x{BA2}' .
-			'\x{BA5}-\x{BA7}' .
-			'\x{BAB}-\x{BAD}' .
-			'\x{BBA}-\x{BBD}' .
-			'\x{BC3}-\x{BC5}' .
-			'\x{BC9}' .
-			'\x{BCE}-\x{BCF}' .
-			'\x{BD1}-\x{BD6}' .
-			'\x{BD8}-\x{BE5}' .
-			'\x{BFB}-\x{BFF}' .
-			'\x{C0D}' .
-			'\x{C11}' .
-			'\x{C29}' .
-			'\x{C3A}-\x{C3B}' .
-			'\x{C45}' .
-			'\x{C49}' .
-			'\x{C4E}-\x{C54}' .
-			'\x{C57}' .
-			'\x{C5B}-\x{C5C}' .
-			'\x{C5E}-\x{C5F}' .
-			'\x{C64}-\x{C65}' .
-			'\x{C70}-\x{C76}' .
-			'\x{C8D}' .
-			'\x{C91}' .
-			'\x{CA9}' .
-			'\x{CB4}' .
-			'\x{CBA}-\x{CBB}' .
-			'\x{CC5}' .
-			'\x{CC9}' .
-			'\x{CCE}-\x{CD4}' .
-			'\x{CD7}-\x{CDC}' .
-			'\x{CDF}' .
-			'\x{CE4}-\x{CE5}' .
-			'\x{CF0}' .
-			'\x{CF4}-\x{CFF}' .
-			'\x{D0D}' .
-			'\x{D11}' .
-			'\x{D45}' .
-			'\x{D49}' .
-			'\x{D50}-\x{D53}' .
-			'\x{D64}-\x{D65}' .
-			'\x{D80}' .
-			'\x{D84}' .
-			'\x{D97}-\x{D99}' .
-			'\x{DB2}' .
-			'\x{DBC}' .
-			'\x{DBE}-\x{DBF}' .
-			'\x{DC7}-\x{DC9}' .
-			'\x{DCB}-\x{DCE}' .
-			'\x{DD5}' .
-			'\x{DD7}' .
-			'\x{DE0}-\x{DE5}' .
-			'\x{DF0}-\x{DF1}' .
-			'\x{DF5}-\x{E00}' .
-			'\x{E3B}-\x{E3E}' .
-			'\x{E5C}-\x{E80}' .
-			'\x{E83}' .
-			'\x{E85}' .
-			'\x{E8B}' .
-			'\x{EA4}' .
-			'\x{EA6}' .
-			'\x{EBE}-\x{EBF}' .
-			'\x{EC5}' .
-			'\x{EC7}' .
-			'\x{ECF}' .
-			'\x{EDA}-\x{EDB}' .
-			'\x{EE0}-\x{EFF}' .
-			'\x{F48}' .
-			'\x{F6D}-\x{F70}' .
-			'\x{F98}' .
-			'\x{FBD}' .
-			'\x{FCD}' .
-			'\x{FDB}-\x{FFF}' .
-			'\x{10A0}-\x{10C5}' .
-			'\x{10C6}' .
-			'\x{10C8}-\x{10CC}' .
-			'\x{10CE}-\x{10CF}' .
-			'\x{115F}-\x{1160}' .
-			'\x{1249}' .
-			'\x{124E}-\x{124F}' .
-			'\x{1257}' .
-			'\x{1259}' .
-			'\x{125E}-\x{125F}' .
-			'\x{1289}' .
-			'\x{128E}-\x{128F}' .
-			'\x{12B1}' .
-			'\x{12B6}-\x{12B7}' .
-			'\x{12BF}' .
-			'\x{12C1}' .
-			'\x{12C6}-\x{12C7}' .
-			'\x{12D7}' .
-			'\x{1311}' .
-			'\x{1316}-\x{1317}' .
-			'\x{135B}-\x{135C}' .
-			'\x{137D}-\x{137F}' .
-			'\x{139A}-\x{139F}' .
-			'\x{13F6}-\x{13F7}' .
-			'\x{13FE}-\x{13FF}' .
-			'\x{1680}' .
-			'\x{169D}-\x{169F}' .
-			'\x{16F9}-\x{16FF}' .
-			'\x{1716}-\x{171E}' .
-			'\x{1737}-\x{173F}' .
-			'\x{1754}-\x{175F}' .
-			'\x{176D}' .
-			'\x{1771}' .
-			'\x{1774}-\x{177F}' .
-			'\x{17B4}-\x{17B5}' .
-			'\x{17DE}-\x{17DF}' .
-			'\x{17EA}-\x{17EF}' .
-			'\x{17FA}-\x{17FF}' .
-			'\x{1806}' .
-			'\x{180E}' .
-			'\x{181A}-\x{181F}' .
-			'\x{1879}-\x{187F}' .
-			'\x{18AB}-\x{18AF}' .
-			'\x{18F6}-\x{18FF}' .
-			'\x{191F}' .
-			'\x{192C}-\x{192F}' .
-			'\x{193C}-\x{193F}' .
-			'\x{1941}-\x{1943}' .
-			'\x{196E}-\x{196F}' .
-			'\x{1975}-\x{197F}' .
-			'\x{19AC}-\x{19AF}' .
-			'\x{19CA}-\x{19CF}' .
-			'\x{19DB}-\x{19DD}' .
-			'\x{1A1C}-\x{1A1D}' .
-			'\x{1A5F}' .
-			'\x{1A7D}-\x{1A7E}' .
-			'\x{1A8A}-\x{1A8F}' .
-			'\x{1A9A}-\x{1A9F}' .
-			'\x{1AAE}-\x{1AAF}' .
-			'\x{1ACF}-\x{1AFF}' .
-			'\x{1B4D}-\x{1B4F}' .
-			'\x{1B7F}' .
-			'\x{1BF4}-\x{1BFB}' .
-			'\x{1C38}-\x{1C3A}' .
-			'\x{1C4A}-\x{1C4C}' .
-			'\x{1C89}-\x{1C8F}' .
-			'\x{1CBB}-\x{1CBC}' .
-			'\x{1CC8}-\x{1CCF}' .
-			'\x{1CFB}-\x{1CFF}' .
-			'\x{1F16}-\x{1F17}' .
-			'\x{1F1E}-\x{1F1F}' .
-			'\x{1F46}-\x{1F47}' .
-			'\x{1F4E}-\x{1F4F}' .
-			'\x{1F58}' .
-			'\x{1F5A}' .
-			'\x{1F5C}' .
-			'\x{1F5E}' .
-			'\x{1F7E}-\x{1F7F}' .
-			'\x{1FB5}' .
-			'\x{1FC5}' .
-			'\x{1FD4}-\x{1FD5}' .
-			'\x{1FDC}' .
-			'\x{1FF0}-\x{1FF1}' .
-			'\x{1FF5}' .
-			'\x{1FFF}' .
-			'\x{200E}-\x{200F}' .
-			'\x{2024}-\x{2026}' .
-			'\x{2028}-\x{202E}' .
-			'\x{2061}-\x{2063}' .
-			'\x{2065}' .
-			'\x{2066}-\x{2069}' .
-			'\x{206A}-\x{206F}' .
-			'\x{2072}-\x{2073}' .
-			'\x{208F}' .
-			'\x{209D}-\x{209F}' .
-			'\x{20C1}-\x{20CF}' .
-			'\x{20F1}-\x{20FF}' .
-			'\x{2132}' .
-			'\x{2183}' .
-			'\x{218C}-\x{218F}' .
-			'\x{2427}-\x{243F}' .
-			'\x{244B}-\x{245F}' .
-			'\x{2488}-\x{249B}' .
-			'\x{2B74}-\x{2B75}' .
-			'\x{2B96}' .
-			'\x{2CF4}-\x{2CF8}' .
-			'\x{2D26}' .
-			'\x{2D28}-\x{2D2C}' .
-			'\x{2D2E}-\x{2D2F}' .
-			'\x{2D68}-\x{2D6E}' .
-			'\x{2D71}-\x{2D7E}' .
-			'\x{2D97}-\x{2D9F}' .
-			'\x{2DA7}' .
-			'\x{2DAF}' .
-			'\x{2DB7}' .
-			'\x{2DBF}' .
-			'\x{2DC7}' .
-			'\x{2DCF}' .
-			'\x{2DD7}' .
-			'\x{2DDF}' .
-			'\x{2E5E}-\x{2E7F}' .
-			'\x{2E9A}' .
-			'\x{2EF4}-\x{2EFF}' .
-			'\x{2FD6}-\x{2FEF}' .
-			'\x{2FF0}-\x{2FFB}' .
-			'\x{2FFC}-\x{2FFF}' .
-			'\x{3040}' .
-			'\x{3097}-\x{3098}' .
-			'\x{3100}-\x{3104}' .
-			'\x{3130}' .
-			'\x{3164}' .
-			'\x{318F}' .
-			'\x{31E4}-\x{31EF}' .
-			'\x{321F}' .
-			'\x{33C2}' .
-			'\x{33C7}' .
-			'\x{33D8}' .
-			'\x{A48D}-\x{A48F}' .
-			'\x{A4C7}-\x{A4CF}' .
-			'\x{A62C}-\x{A63F}' .
-			'\x{A6F8}-\x{A6FF}' .
-			'\x{A7CB}-\x{A7CF}' .
-			'\x{A7D2}' .
-			'\x{A7D4}' .
-			'\x{A7DA}-\x{A7F1}' .
-			'\x{A82D}-\x{A82F}' .
-			'\x{A83A}-\x{A83F}' .
-			'\x{A878}-\x{A87F}' .
-			'\x{A8C6}-\x{A8CD}' .
-			'\x{A8DA}-\x{A8DF}' .
-			'\x{A954}-\x{A95E}' .
-			'\x{A97D}-\x{A97F}' .
-			'\x{A9CE}' .
-			'\x{A9DA}-\x{A9DD}' .
-			'\x{A9FF}' .
-			'\x{AA37}-\x{AA3F}' .
-			'\x{AA4E}-\x{AA4F}' .
-			'\x{AA5A}-\x{AA5B}' .
-			'\x{AAC3}-\x{AADA}' .
-			'\x{AAF7}-\x{AB00}' .
-			'\x{AB07}-\x{AB08}' .
-			'\x{AB0F}-\x{AB10}' .
-			'\x{AB17}-\x{AB1F}' .
-			'\x{AB27}' .
-			'\x{AB2F}' .
-			'\x{AB6C}-\x{AB6F}' .
-			'\x{ABEE}-\x{ABEF}' .
-			'\x{ABFA}-\x{ABFF}' .
-			'\x{D7A4}-\x{D7AF}' .
-			'\x{D7C7}-\x{D7CA}' .
-			'\x{D7FC}-\x{D7FF}' .
-			'\x{E000}-\x{F8FF}' .
-			'\x{FA6E}-\x{FA6F}' .
-			'\x{FADA}-\x{FAFF}' .
-			'\x{FB07}-\x{FB12}' .
-			'\x{FB18}-\x{FB1C}' .
-			'\x{FB37}' .
-			'\x{FB3D}' .
-			'\x{FB3F}' .
-			'\x{FB42}' .
-			'\x{FB45}' .
-			'\x{FBC3}-\x{FBD2}' .
-			'\x{FD90}-\x{FD91}' .
-			'\x{FDC8}-\x{FDCE}' .
-			'\x{FDD0}-\x{FDEF}' .
-			'\x{FE12}' .
-			'\x{FE19}' .
-			'\x{FE1A}-\x{FE1F}' .
-			'\x{FE30}' .
-			'\x{FE52}' .
-			'\x{FE53}' .
-			'\x{FE67}' .
-			'\x{FE6C}-\x{FE6F}' .
-			'\x{FE75}' .
-			'\x{FEFD}-\x{FEFE}' .
-			'\x{FF00}' .
-			'\x{FFA0}' .
-			'\x{FFBF}-\x{FFC1}' .
-			'\x{FFC8}-\x{FFC9}' .
-			'\x{FFD0}-\x{FFD1}' .
-			'\x{FFD8}-\x{FFD9}' .
-			'\x{FFDD}-\x{FFDF}' .
-			'\x{FFE7}' .
-			'\x{FFEF}-\x{FFF8}' .
-			'\x{FFF9}-\x{FFFB}' .
-			'\x{FFFC}' .
-			'\x{FFFD}' .
-			'\x{FFFE}-\x{FFFF}' .
-			'\x{1000C}' .
-			'\x{10027}' .
-			'\x{1003B}' .
-			'\x{1003E}' .
-			'\x{1004E}-\x{1004F}' .
-			'\x{1005E}-\x{1007F}' .
-			'\x{100FB}-\x{100FF}' .
-			'\x{10103}-\x{10106}' .
-			'\x{10134}-\x{10136}' .
-			'\x{1018F}' .
-			'\x{1019D}-\x{1019F}' .
-			'\x{101A1}-\x{101CF}' .
-			'\x{101FE}-\x{1027F}' .
-			'\x{1029D}-\x{1029F}' .
-			'\x{102D1}-\x{102DF}' .
-			'\x{102FC}-\x{102FF}' .
-			'\x{10324}-\x{1032C}' .
-			'\x{1034B}-\x{1034F}' .
-			'\x{1037B}-\x{1037F}' .
-			'\x{1039E}' .
-			'\x{103C4}-\x{103C7}' .
-			'\x{103D6}-\x{103FF}' .
-			'\x{1049E}-\x{1049F}' .
-			'\x{104AA}-\x{104AF}' .
-			'\x{104D4}-\x{104D7}' .
-			'\x{104FC}-\x{104FF}' .
-			'\x{10528}-\x{1052F}' .
-			'\x{10564}-\x{1056E}' .
-			'\x{1057B}' .
-			'\x{1058B}' .
-			'\x{10593}' .
-			'\x{10596}' .
-			'\x{105A2}' .
-			'\x{105B2}' .
-			'\x{105BA}' .
-			'\x{105BD}-\x{105FF}' .
-			'\x{10737}-\x{1073F}' .
-			'\x{10756}-\x{1075F}' .
-			'\x{10768}-\x{1077F}' .
-			'\x{10786}' .
-			'\x{107B1}' .
-			'\x{107BB}-\x{107FF}' .
-			'\x{10806}-\x{10807}' .
-			'\x{10809}' .
-			'\x{10836}' .
-			'\x{10839}-\x{1083B}' .
-			'\x{1083D}-\x{1083E}' .
-			'\x{10856}' .
-			'\x{1089F}-\x{108A6}' .
-			'\x{108B0}-\x{108DF}' .
-			'\x{108F3}' .
-			'\x{108F6}-\x{108FA}' .
-			'\x{1091C}-\x{1091E}' .
-			'\x{1093A}-\x{1093E}' .
-			'\x{10940}-\x{1097F}' .
-			'\x{109B8}-\x{109BB}' .
-			'\x{109D0}-\x{109D1}' .
-			'\x{10A04}' .
-			'\x{10A07}-\x{10A0B}' .
-			'\x{10A14}' .
-			'\x{10A18}' .
-			'\x{10A36}-\x{10A37}' .
-			'\x{10A3B}-\x{10A3E}' .
-			'\x{10A49}-\x{10A4F}' .
-			'\x{10A59}-\x{10A5F}' .
-			'\x{10AA0}-\x{10ABF}' .
-			'\x{10AE7}-\x{10AEA}' .
-			'\x{10AF7}-\x{10AFF}' .
-			'\x{10B36}-\x{10B38}' .
-			'\x{10B56}-\x{10B57}' .
-			'\x{10B73}-\x{10B77}' .
-			'\x{10B92}-\x{10B98}' .
-			'\x{10B9D}-\x{10BA8}' .
-			'\x{10BB0}-\x{10BFF}' .
-			'\x{10C49}-\x{10C7F}' .
-			'\x{10CB3}-\x{10CBF}' .
-			'\x{10CF3}-\x{10CF9}' .
-			'\x{10D28}-\x{10D2F}' .
-			'\x{10D3A}-\x{10E5F}' .
-			'\x{10E7F}' .
-			'\x{10EAA}' .
-			'\x{10EAE}-\x{10EAF}' .
-			'\x{10EB2}-\x{10EFC}' .
-			'\x{10F28}-\x{10F2F}' .
-			'\x{10F5A}-\x{10F6F}' .
-			'\x{10F8A}-\x{10FAF}' .
-			'\x{10FCC}-\x{10FDF}' .
-			'\x{10FF7}-\x{10FFF}' .
-			'\x{1104E}-\x{11051}' .
-			'\x{11076}-\x{1107E}' .
-			'\x{110BD}' .
-			'\x{110C3}-\x{110CC}' .
-			'\x{110CD}' .
-			'\x{110CE}-\x{110CF}' .
-			'\x{110E9}-\x{110EF}' .
-			'\x{110FA}-\x{110FF}' .
-			'\x{11135}' .
-			'\x{11148}-\x{1114F}' .
-			'\x{11177}-\x{1117F}' .
-			'\x{111E0}' .
-			'\x{111F5}-\x{111FF}' .
-			'\x{11212}' .
-			'\x{11242}-\x{1127F}' .
-			'\x{11287}' .
-			'\x{11289}' .
-			'\x{1128E}' .
-			'\x{1129E}' .
-			'\x{112AA}-\x{112AF}' .
-			'\x{112EB}-\x{112EF}' .
-			'\x{112FA}-\x{112FF}' .
-			'\x{11304}' .
-			'\x{1130D}-\x{1130E}' .
-			'\x{11311}-\x{11312}' .
-			'\x{11329}' .
-			'\x{11331}' .
-			'\x{11334}' .
-			'\x{1133A}' .
-			'\x{11345}-\x{11346}' .
-			'\x{11349}-\x{1134A}' .
-			'\x{1134E}-\x{1134F}' .
-			'\x{11351}-\x{11356}' .
-			'\x{11358}-\x{1135C}' .
-			'\x{11364}-\x{11365}' .
-			'\x{1136D}-\x{1136F}' .
-			'\x{11375}-\x{113FF}' .
-			'\x{1145C}' .
-			'\x{11462}-\x{1147F}' .
-			'\x{114C8}-\x{114CF}' .
-			'\x{114DA}-\x{1157F}' .
-			'\x{115B6}-\x{115B7}' .
-			'\x{115DE}-\x{115FF}' .
-			'\x{11645}-\x{1164F}' .
-			'\x{1165A}-\x{1165F}' .
-			'\x{1166D}-\x{1167F}' .
-			'\x{116BA}-\x{116BF}' .
-			'\x{116CA}-\x{116FF}' .
-			'\x{1171B}-\x{1171C}' .
-			'\x{1172C}-\x{1172F}' .
-			'\x{11747}-\x{117FF}' .
-			'\x{1183C}-\x{1189F}' .
-			'\x{118F3}-\x{118FE}' .
-			'\x{11907}-\x{11908}' .
-			'\x{1190A}-\x{1190B}' .
-			'\x{11914}' .
-			'\x{11917}' .
-			'\x{11936}' .
-			'\x{11939}-\x{1193A}' .
-			'\x{11947}-\x{1194F}' .
-			'\x{1195A}-\x{1199F}' .
-			'\x{119A8}-\x{119A9}' .
-			'\x{119D8}-\x{119D9}' .
-			'\x{119E5}-\x{119FF}' .
-			'\x{11A48}-\x{11A4F}' .
-			'\x{11AA3}-\x{11AAF}' .
-			'\x{11AF9}-\x{11AFF}' .
-			'\x{11B0A}-\x{11BFF}' .
-			'\x{11C09}' .
-			'\x{11C37}' .
-			'\x{11C46}-\x{11C4F}' .
-			'\x{11C6D}-\x{11C6F}' .
-			'\x{11C90}-\x{11C91}' .
-			'\x{11CA8}' .
-			'\x{11CB7}-\x{11CFF}' .
-			'\x{11D07}' .
-			'\x{11D0A}' .
-			'\x{11D37}-\x{11D39}' .
-			'\x{11D3B}' .
-			'\x{11D3E}' .
-			'\x{11D48}-\x{11D4F}' .
-			'\x{11D5A}-\x{11D5F}' .
-			'\x{11D66}' .
-			'\x{11D69}' .
-			'\x{11D8F}' .
-			'\x{11D92}' .
-			'\x{11D99}-\x{11D9F}' .
-			'\x{11DAA}-\x{11EDF}' .
-			'\x{11EF9}-\x{11EFF}' .
-			'\x{11F11}' .
-			'\x{11F3B}-\x{11F3D}' .
-			'\x{11F5A}-\x{11FAF}' .
-			'\x{11FB1}-\x{11FBF}' .
-			'\x{11FF2}-\x{11FFE}' .
-			'\x{1239A}-\x{123FF}' .
-			'\x{1246F}' .
-			'\x{12475}-\x{1247F}' .
-			'\x{12544}-\x{12F8F}' .
-			'\x{12FF3}-\x{12FFF}' .
-			'\x{13430}-\x{13438}' .
-			'\x{13439}-\x{1343F}' .
-			'\x{13456}-\x{143FF}' .
-			'\x{14647}-\x{167FF}' .
-			'\x{16A39}-\x{16A3F}' .
-			'\x{16A5F}' .
-			'\x{16A6A}-\x{16A6D}' .
-			'\x{16ABF}' .
-			'\x{16ACA}-\x{16ACF}' .
-			'\x{16AEE}-\x{16AEF}' .
-			'\x{16AF6}-\x{16AFF}' .
-			'\x{16B46}-\x{16B4F}' .
-			'\x{16B5A}' .
-			'\x{16B62}' .
-			'\x{16B78}-\x{16B7C}' .
-			'\x{16B90}-\x{16E3F}' .
-			'\x{16E9B}-\x{16EFF}' .
-			'\x{16F4B}-\x{16F4E}' .
-			'\x{16F88}-\x{16F8E}' .
-			'\x{16FA0}-\x{16FDF}' .
-			'\x{16FE5}-\x{16FEF}' .
-			'\x{16FF2}-\x{16FFF}' .
-			'\x{187F8}-\x{187FF}' .
-			'\x{18CD6}-\x{18CFF}' .
-			'\x{18D09}-\x{1AFEF}' .
-			'\x{1AFF4}' .
-			'\x{1AFFC}' .
-			'\x{1AFFF}' .
-			'\x{1B123}-\x{1B131}' .
-			'\x{1B133}-\x{1B14F}' .
-			'\x{1B153}-\x{1B154}' .
-			'\x{1B156}-\x{1B163}' .
-			'\x{1B168}-\x{1B16F}' .
-			'\x{1B2FC}-\x{1BBFF}' .
-			'\x{1BC6B}-\x{1BC6F}' .
-			'\x{1BC7D}-\x{1BC7F}' .
-			'\x{1BC89}-\x{1BC8F}' .
-			'\x{1BC9A}-\x{1BC9B}' .
-			'\x{1BCA4}-\x{1CEFF}' .
-			'\x{1CF2E}-\x{1CF2F}' .
-			'\x{1CF47}-\x{1CF4F}' .
-			'\x{1CFC4}-\x{1CFFF}' .
-			'\x{1D0F6}-\x{1D0FF}' .
-			'\x{1D127}-\x{1D128}' .
-			'\x{1D173}-\x{1D17A}' .
-			'\x{1D1EB}-\x{1D1FF}' .
-			'\x{1D246}-\x{1D2BF}' .
-			'\x{1D2D4}-\x{1D2DF}' .
-			'\x{1D2F4}-\x{1D2FF}' .
-			'\x{1D357}-\x{1D35F}' .
-			'\x{1D379}-\x{1D3FF}' .
-			'\x{1D455}' .
-			'\x{1D49D}' .
-			'\x{1D4A0}-\x{1D4A1}' .
-			'\x{1D4A3}-\x{1D4A4}' .
-			'\x{1D4A7}-\x{1D4A8}' .
-			'\x{1D4AD}' .
-			'\x{1D4BA}' .
-			'\x{1D4BC}' .
-			'\x{1D4C4}' .
-			'\x{1D506}' .
-			'\x{1D50B}-\x{1D50C}' .
-			'\x{1D515}' .
-			'\x{1D51D}' .
-			'\x{1D53A}' .
-			'\x{1D53F}' .
-			'\x{1D545}' .
-			'\x{1D547}-\x{1D549}' .
-			'\x{1D551}' .
-			'\x{1D6A6}-\x{1D6A7}' .
-			'\x{1D7CC}-\x{1D7CD}' .
-			'\x{1DA8C}-\x{1DA9A}' .
-			'\x{1DAA0}' .
-			'\x{1DAB0}-\x{1DEFF}' .
-			'\x{1DF1F}-\x{1DF24}' .
-			'\x{1DF2B}-\x{1DFFF}' .
-			'\x{1E007}' .
-			'\x{1E019}-\x{1E01A}' .
-			'\x{1E022}' .
-			'\x{1E025}' .
-			'\x{1E02B}-\x{1E02F}' .
-			'\x{1E06E}-\x{1E08E}' .
-			'\x{1E090}-\x{1E0FF}' .
-			'\x{1E12D}-\x{1E12F}' .
-			'\x{1E13E}-\x{1E13F}' .
-			'\x{1E14A}-\x{1E14D}' .
-			'\x{1E150}-\x{1E28F}' .
-			'\x{1E2AF}-\x{1E2BF}' .
-			'\x{1E2FA}-\x{1E2FE}' .
-			'\x{1E300}-\x{1E4CF}' .
-			'\x{1E4FA}-\x{1E7DF}' .
-			'\x{1E7E7}' .
-			'\x{1E7EC}' .
-			'\x{1E7EF}' .
-			'\x{1E7FF}' .
-			'\x{1E8C5}-\x{1E8C6}' .
-			'\x{1E8D7}-\x{1E8FF}' .
-			'\x{1E94C}-\x{1E94F}' .
-			'\x{1E95A}-\x{1E95D}' .
-			'\x{1E960}-\x{1EC70}' .
-			'\x{1ECB5}-\x{1ED00}' .
-			'\x{1ED3E}-\x{1EDFF}' .
-			'\x{1EE04}' .
-			'\x{1EE20}' .
-			'\x{1EE23}' .
-			'\x{1EE25}-\x{1EE26}' .
-			'\x{1EE28}' .
-			'\x{1EE33}' .
-			'\x{1EE38}' .
-			'\x{1EE3A}' .
-			'\x{1EE3C}-\x{1EE41}' .
-			'\x{1EE43}-\x{1EE46}' .
-			'\x{1EE48}' .
-			'\x{1EE4A}' .
-			'\x{1EE4C}' .
-			'\x{1EE50}' .
-			'\x{1EE53}' .
-			'\x{1EE55}-\x{1EE56}' .
-			'\x{1EE58}' .
-			'\x{1EE5A}' .
-			'\x{1EE5C}' .
-			'\x{1EE5E}' .
-			'\x{1EE60}' .
-			'\x{1EE63}' .
-			'\x{1EE65}-\x{1EE66}' .
-			'\x{1EE6B}' .
-			'\x{1EE73}' .
-			'\x{1EE78}' .
-			'\x{1EE7D}' .
-			'\x{1EE7F}' .
-			'\x{1EE8A}' .
-			'\x{1EE9C}-\x{1EEA0}' .
-			'\x{1EEA4}' .
-			'\x{1EEAA}' .
-			'\x{1EEBC}-\x{1EEEF}' .
-			'\x{1EEF2}-\x{1EFFF}' .
-			'\x{1F02C}-\x{1F02F}' .
-			'\x{1F094}-\x{1F09F}' .
-			'\x{1F0AF}-\x{1F0B0}' .
-			'\x{1F0C0}' .
-			'\x{1F0D0}' .
-			'\x{1F0F6}-\x{1F0FF}' .
-			'\x{1F100}' .
-			'\x{1F1AE}-\x{1F1E5}' .
-			'\x{1F203}-\x{1F20F}' .
-			'\x{1F23C}-\x{1F23F}' .
-			'\x{1F249}-\x{1F24F}' .
-			'\x{1F252}-\x{1F25F}' .
-			'\x{1F266}-\x{1F2FF}' .
-			'\x{1F6D8}-\x{1F6DB}' .
-			'\x{1F6ED}-\x{1F6EF}' .
-			'\x{1F6FD}-\x{1F6FF}' .
-			'\x{1F777}-\x{1F77A}' .
-			'\x{1F7DA}-\x{1F7DF}' .
-			'\x{1F7EC}-\x{1F7EF}' .
-			'\x{1F7F1}-\x{1F7FF}' .
-			'\x{1F80C}-\x{1F80F}' .
-			'\x{1F848}-\x{1F84F}' .
-			'\x{1F85A}-\x{1F85F}' .
-			'\x{1F888}-\x{1F88F}' .
-			'\x{1F8AE}-\x{1F8AF}' .
-			'\x{1F8B2}-\x{1F8FF}' .
-			'\x{1FA54}-\x{1FA5F}' .
-			'\x{1FA6E}-\x{1FA6F}' .
-			'\x{1FA7D}-\x{1FA7F}' .
-			'\x{1FA89}-\x{1FA8F}' .
-			'\x{1FABE}' .
-			'\x{1FAC6}-\x{1FACD}' .
-			'\x{1FADC}-\x{1FADF}' .
-			'\x{1FAE9}-\x{1FAEF}' .
-			'\x{1FAF9}-\x{1FAFF}' .
-			'\x{1FB93}' .
-			'\x{1FBCB}-\x{1FBEF}' .
-			'\x{1FBFA}-\x{1FFFD}' .
-			'\x{1FFFE}-\x{1FFFF}' .
-			'\x{2A6E0}-\x{2A6FF}' .
-			'\x{2B73A}-\x{2B73F}' .
-			'\x{2B81E}-\x{2B81F}' .
-			'\x{2CEA2}-\x{2CEAF}' .
-			'\x{2EBE1}-\x{2F7FF}' .
-			'\x{2F868}' .
-			'\x{2F874}' .
-			'\x{2F91F}' .
-			'\x{2F95F}' .
-			'\x{2F9BF}' .
-			'\x{2FA1E}-\x{2FFFD}' .
-			'\x{2FFFE}-\x{2FFFF}' .
-			'\x{3134B}-\x{3134F}' .
-			'\x{323B0}-\x{3FFFD}' .
-			'\x{3FFFE}-\x{3FFFF}' .
-			'\x{40000}-\x{4FFFD}' .
-			'\x{4FFFE}-\x{4FFFF}' .
-			'\x{50000}-\x{5FFFD}' .
-			'\x{5FFFE}-\x{5FFFF}' .
-			'\x{60000}-\x{6FFFD}' .
-			'\x{6FFFE}-\x{6FFFF}' .
-			'\x{70000}-\x{7FFFD}' .
-			'\x{7FFFE}-\x{7FFFF}' .
-			'\x{80000}-\x{8FFFD}' .
-			'\x{8FFFE}-\x{8FFFF}' .
-			'\x{90000}-\x{9FFFD}' .
-			'\x{9FFFE}-\x{9FFFF}' .
-			'\x{A0000}-\x{AFFFD}' .
-			'\x{AFFFE}-\x{AFFFF}' .
-			'\x{B0000}-\x{BFFFD}' .
-			'\x{BFFFE}-\x{BFFFF}' .
-			'\x{C0000}-\x{CFFFD}' .
-			'\x{CFFFE}-\x{CFFFF}' .
-			'\x{D0000}-\x{DFFFD}' .
-			'\x{DFFFE}-\x{DFFFF}' .
-			'\x{E0000}' .
-			'\x{E0001}' .
-			'\x{E0002}-\x{E001F}' .
-			'\x{E0020}-\x{E007F}' .
-			'\x{E0080}-\x{E00FF}' .
-			'\x{E01F0}-\x{EFFFD}' .
-			'\x{EFFFE}-\x{EFFFF}' .
-			'\x{F0000}-\x{FFFFD}' .
-			'\x{FFFFE}-\x{FFFFF}' .
-			'\x{100000}-\x{10FFFD}' .
-			'\x{10FFFE}-\x{10FFFF}',
+			'\\x{80}-\\x{9F}' .
+			'\\x{378}-\\x{379}' .
+			'\\x{380}-\\x{383}' .
+			'\\x{38B}' .
+			'\\x{38D}' .
+			'\\x{3A2}' .
+			'\\x{4C0}' .
+			'\\x{530}' .
+			'\\x{557}-\\x{558}' .
+			'\\x{58B}-\\x{58C}' .
+			'\\x{590}' .
+			'\\x{5C8}-\\x{5CF}' .
+			'\\x{5EB}-\\x{5EE}' .
+			'\\x{5F5}-\\x{5FF}' .
+			'\\x{600}-\\x{603}' .
+			'\\x{604}' .
+			'\\x{605}' .
+			'\\x{61C}' .
+			'\\x{6DD}' .
+			'\\x{70E}' .
+			'\\x{70F}' .
+			'\\x{74B}-\\x{74C}' .
+			'\\x{7B2}-\\x{7BF}' .
+			'\\x{7FB}-\\x{7FC}' .
+			'\\x{82E}-\\x{82F}' .
+			'\\x{83F}' .
+			'\\x{85C}-\\x{85D}' .
+			'\\x{85F}' .
+			'\\x{86B}-\\x{86F}' .
+			'\\x{88F}' .
+			'\\x{890}-\\x{891}' .
+			'\\x{892}-\\x{897}' .
+			'\\x{8E2}' .
+			'\\x{984}' .
+			'\\x{98D}-\\x{98E}' .
+			'\\x{991}-\\x{992}' .
+			'\\x{9A9}' .
+			'\\x{9B1}' .
+			'\\x{9B3}-\\x{9B5}' .
+			'\\x{9BA}-\\x{9BB}' .
+			'\\x{9C5}-\\x{9C6}' .
+			'\\x{9C9}-\\x{9CA}' .
+			'\\x{9CF}-\\x{9D6}' .
+			'\\x{9D8}-\\x{9DB}' .
+			'\\x{9DE}' .
+			'\\x{9E4}-\\x{9E5}' .
+			'\\x{9FF}-\\x{A00}' .
+			'\\x{A04}' .
+			'\\x{A0B}-\\x{A0E}' .
+			'\\x{A11}-\\x{A12}' .
+			'\\x{A29}' .
+			'\\x{A31}' .
+			'\\x{A34}' .
+			'\\x{A37}' .
+			'\\x{A3A}-\\x{A3B}' .
+			'\\x{A3D}' .
+			'\\x{A43}-\\x{A46}' .
+			'\\x{A49}-\\x{A4A}' .
+			'\\x{A4E}-\\x{A50}' .
+			'\\x{A52}-\\x{A58}' .
+			'\\x{A5D}' .
+			'\\x{A5F}-\\x{A65}' .
+			'\\x{A77}-\\x{A80}' .
+			'\\x{A84}' .
+			'\\x{A8E}' .
+			'\\x{A92}' .
+			'\\x{AA9}' .
+			'\\x{AB1}' .
+			'\\x{AB4}' .
+			'\\x{ABA}-\\x{ABB}' .
+			'\\x{AC6}' .
+			'\\x{ACA}' .
+			'\\x{ACE}-\\x{ACF}' .
+			'\\x{AD1}-\\x{ADF}' .
+			'\\x{AE4}-\\x{AE5}' .
+			'\\x{AF2}-\\x{AF8}' .
+			'\\x{B00}' .
+			'\\x{B04}' .
+			'\\x{B0D}-\\x{B0E}' .
+			'\\x{B11}-\\x{B12}' .
+			'\\x{B29}' .
+			'\\x{B31}' .
+			'\\x{B34}' .
+			'\\x{B3A}-\\x{B3B}' .
+			'\\x{B45}-\\x{B46}' .
+			'\\x{B49}-\\x{B4A}' .
+			'\\x{B4E}-\\x{B54}' .
+			'\\x{B58}-\\x{B5B}' .
+			'\\x{B5E}' .
+			'\\x{B64}-\\x{B65}' .
+			'\\x{B78}-\\x{B81}' .
+			'\\x{B84}' .
+			'\\x{B8B}-\\x{B8D}' .
+			'\\x{B91}' .
+			'\\x{B96}-\\x{B98}' .
+			'\\x{B9B}' .
+			'\\x{B9D}' .
+			'\\x{BA0}-\\x{BA2}' .
+			'\\x{BA5}-\\x{BA7}' .
+			'\\x{BAB}-\\x{BAD}' .
+			'\\x{BBA}-\\x{BBD}' .
+			'\\x{BC3}-\\x{BC5}' .
+			'\\x{BC9}' .
+			'\\x{BCE}-\\x{BCF}' .
+			'\\x{BD1}-\\x{BD6}' .
+			'\\x{BD8}-\\x{BE5}' .
+			'\\x{BFB}-\\x{BFF}' .
+			'\\x{C0D}' .
+			'\\x{C11}' .
+			'\\x{C29}' .
+			'\\x{C3A}-\\x{C3B}' .
+			'\\x{C45}' .
+			'\\x{C49}' .
+			'\\x{C4E}-\\x{C54}' .
+			'\\x{C57}' .
+			'\\x{C5B}-\\x{C5C}' .
+			'\\x{C5E}-\\x{C5F}' .
+			'\\x{C64}-\\x{C65}' .
+			'\\x{C70}-\\x{C76}' .
+			'\\x{C8D}' .
+			'\\x{C91}' .
+			'\\x{CA9}' .
+			'\\x{CB4}' .
+			'\\x{CBA}-\\x{CBB}' .
+			'\\x{CC5}' .
+			'\\x{CC9}' .
+			'\\x{CCE}-\\x{CD4}' .
+			'\\x{CD7}-\\x{CDC}' .
+			'\\x{CDF}' .
+			'\\x{CE4}-\\x{CE5}' .
+			'\\x{CF0}' .
+			'\\x{CF4}-\\x{CFF}' .
+			'\\x{D0D}' .
+			'\\x{D11}' .
+			'\\x{D45}' .
+			'\\x{D49}' .
+			'\\x{D50}-\\x{D53}' .
+			'\\x{D64}-\\x{D65}' .
+			'\\x{D80}' .
+			'\\x{D84}' .
+			'\\x{D97}-\\x{D99}' .
+			'\\x{DB2}' .
+			'\\x{DBC}' .
+			'\\x{DBE}-\\x{DBF}' .
+			'\\x{DC7}-\\x{DC9}' .
+			'\\x{DCB}-\\x{DCE}' .
+			'\\x{DD5}' .
+			'\\x{DD7}' .
+			'\\x{DE0}-\\x{DE5}' .
+			'\\x{DF0}-\\x{DF1}' .
+			'\\x{DF5}-\\x{E00}' .
+			'\\x{E3B}-\\x{E3E}' .
+			'\\x{E5C}-\\x{E80}' .
+			'\\x{E83}' .
+			'\\x{E85}' .
+			'\\x{E8B}' .
+			'\\x{EA4}' .
+			'\\x{EA6}' .
+			'\\x{EBE}-\\x{EBF}' .
+			'\\x{EC5}' .
+			'\\x{EC7}' .
+			'\\x{ECF}' .
+			'\\x{EDA}-\\x{EDB}' .
+			'\\x{EE0}-\\x{EFF}' .
+			'\\x{F48}' .
+			'\\x{F6D}-\\x{F70}' .
+			'\\x{F98}' .
+			'\\x{FBD}' .
+			'\\x{FCD}' .
+			'\\x{FDB}-\\x{FFF}' .
+			'\\x{10A0}-\\x{10C5}' .
+			'\\x{10C6}' .
+			'\\x{10C8}-\\x{10CC}' .
+			'\\x{10CE}-\\x{10CF}' .
+			'\\x{115F}-\\x{1160}' .
+			'\\x{1249}' .
+			'\\x{124E}-\\x{124F}' .
+			'\\x{1257}' .
+			'\\x{1259}' .
+			'\\x{125E}-\\x{125F}' .
+			'\\x{1289}' .
+			'\\x{128E}-\\x{128F}' .
+			'\\x{12B1}' .
+			'\\x{12B6}-\\x{12B7}' .
+			'\\x{12BF}' .
+			'\\x{12C1}' .
+			'\\x{12C6}-\\x{12C7}' .
+			'\\x{12D7}' .
+			'\\x{1311}' .
+			'\\x{1316}-\\x{1317}' .
+			'\\x{135B}-\\x{135C}' .
+			'\\x{137D}-\\x{137F}' .
+			'\\x{139A}-\\x{139F}' .
+			'\\x{13F6}-\\x{13F7}' .
+			'\\x{13FE}-\\x{13FF}' .
+			'\\x{1680}' .
+			'\\x{169D}-\\x{169F}' .
+			'\\x{16F9}-\\x{16FF}' .
+			'\\x{1716}-\\x{171E}' .
+			'\\x{1737}-\\x{173F}' .
+			'\\x{1754}-\\x{175F}' .
+			'\\x{176D}' .
+			'\\x{1771}' .
+			'\\x{1774}-\\x{177F}' .
+			'\\x{17B4}-\\x{17B5}' .
+			'\\x{17DE}-\\x{17DF}' .
+			'\\x{17EA}-\\x{17EF}' .
+			'\\x{17FA}-\\x{17FF}' .
+			'\\x{1806}' .
+			'\\x{180E}' .
+			'\\x{181A}-\\x{181F}' .
+			'\\x{1879}-\\x{187F}' .
+			'\\x{18AB}-\\x{18AF}' .
+			'\\x{18F6}-\\x{18FF}' .
+			'\\x{191F}' .
+			'\\x{192C}-\\x{192F}' .
+			'\\x{193C}-\\x{193F}' .
+			'\\x{1941}-\\x{1943}' .
+			'\\x{196E}-\\x{196F}' .
+			'\\x{1975}-\\x{197F}' .
+			'\\x{19AC}-\\x{19AF}' .
+			'\\x{19CA}-\\x{19CF}' .
+			'\\x{19DB}-\\x{19DD}' .
+			'\\x{1A1C}-\\x{1A1D}' .
+			'\\x{1A5F}' .
+			'\\x{1A7D}-\\x{1A7E}' .
+			'\\x{1A8A}-\\x{1A8F}' .
+			'\\x{1A9A}-\\x{1A9F}' .
+			'\\x{1AAE}-\\x{1AAF}' .
+			'\\x{1ACF}-\\x{1AFF}' .
+			'\\x{1B4D}-\\x{1B4F}' .
+			'\\x{1B7F}' .
+			'\\x{1BF4}-\\x{1BFB}' .
+			'\\x{1C38}-\\x{1C3A}' .
+			'\\x{1C4A}-\\x{1C4C}' .
+			'\\x{1C89}-\\x{1C8F}' .
+			'\\x{1CBB}-\\x{1CBC}' .
+			'\\x{1CC8}-\\x{1CCF}' .
+			'\\x{1CFB}-\\x{1CFF}' .
+			'\\x{1F16}-\\x{1F17}' .
+			'\\x{1F1E}-\\x{1F1F}' .
+			'\\x{1F46}-\\x{1F47}' .
+			'\\x{1F4E}-\\x{1F4F}' .
+			'\\x{1F58}' .
+			'\\x{1F5A}' .
+			'\\x{1F5C}' .
+			'\\x{1F5E}' .
+			'\\x{1F7E}-\\x{1F7F}' .
+			'\\x{1FB5}' .
+			'\\x{1FC5}' .
+			'\\x{1FD4}-\\x{1FD5}' .
+			'\\x{1FDC}' .
+			'\\x{1FF0}-\\x{1FF1}' .
+			'\\x{1FF5}' .
+			'\\x{1FFF}' .
+			'\\x{200E}-\\x{200F}' .
+			'\\x{2024}-\\x{2026}' .
+			'\\x{2028}-\\x{202E}' .
+			'\\x{2061}-\\x{2063}' .
+			'\\x{2065}' .
+			'\\x{2066}-\\x{2069}' .
+			'\\x{206A}-\\x{206F}' .
+			'\\x{2072}-\\x{2073}' .
+			'\\x{208F}' .
+			'\\x{209D}-\\x{209F}' .
+			'\\x{20C1}-\\x{20CF}' .
+			'\\x{20F1}-\\x{20FF}' .
+			'\\x{2132}' .
+			'\\x{2183}' .
+			'\\x{218C}-\\x{218F}' .
+			'\\x{2427}-\\x{243F}' .
+			'\\x{244B}-\\x{245F}' .
+			'\\x{2488}-\\x{249B}' .
+			'\\x{2B74}-\\x{2B75}' .
+			'\\x{2B96}' .
+			'\\x{2CF4}-\\x{2CF8}' .
+			'\\x{2D26}' .
+			'\\x{2D28}-\\x{2D2C}' .
+			'\\x{2D2E}-\\x{2D2F}' .
+			'\\x{2D68}-\\x{2D6E}' .
+			'\\x{2D71}-\\x{2D7E}' .
+			'\\x{2D97}-\\x{2D9F}' .
+			'\\x{2DA7}' .
+			'\\x{2DAF}' .
+			'\\x{2DB7}' .
+			'\\x{2DBF}' .
+			'\\x{2DC7}' .
+			'\\x{2DCF}' .
+			'\\x{2DD7}' .
+			'\\x{2DDF}' .
+			'\\x{2E5E}-\\x{2E7F}' .
+			'\\x{2E9A}' .
+			'\\x{2EF4}-\\x{2EFF}' .
+			'\\x{2FD6}-\\x{2FEF}' .
+			'\\x{2FF0}-\\x{2FFB}' .
+			'\\x{2FFC}-\\x{2FFF}' .
+			'\\x{3040}' .
+			'\\x{3097}-\\x{3098}' .
+			'\\x{3100}-\\x{3104}' .
+			'\\x{3130}' .
+			'\\x{3164}' .
+			'\\x{318F}' .
+			'\\x{31E4}-\\x{31EE}' .
+			'\\x{31EF}' .
+			'\\x{321F}' .
+			'\\x{33C2}' .
+			'\\x{33C7}' .
+			'\\x{33D8}' .
+			'\\x{A48D}-\\x{A48F}' .
+			'\\x{A4C7}-\\x{A4CF}' .
+			'\\x{A62C}-\\x{A63F}' .
+			'\\x{A6F8}-\\x{A6FF}' .
+			'\\x{A7CB}-\\x{A7CF}' .
+			'\\x{A7D2}' .
+			'\\x{A7D4}' .
+			'\\x{A7DA}-\\x{A7F1}' .
+			'\\x{A82D}-\\x{A82F}' .
+			'\\x{A83A}-\\x{A83F}' .
+			'\\x{A878}-\\x{A87F}' .
+			'\\x{A8C6}-\\x{A8CD}' .
+			'\\x{A8DA}-\\x{A8DF}' .
+			'\\x{A954}-\\x{A95E}' .
+			'\\x{A97D}-\\x{A97F}' .
+			'\\x{A9CE}' .
+			'\\x{A9DA}-\\x{A9DD}' .
+			'\\x{A9FF}' .
+			'\\x{AA37}-\\x{AA3F}' .
+			'\\x{AA4E}-\\x{AA4F}' .
+			'\\x{AA5A}-\\x{AA5B}' .
+			'\\x{AAC3}-\\x{AADA}' .
+			'\\x{AAF7}-\\x{AB00}' .
+			'\\x{AB07}-\\x{AB08}' .
+			'\\x{AB0F}-\\x{AB10}' .
+			'\\x{AB17}-\\x{AB1F}' .
+			'\\x{AB27}' .
+			'\\x{AB2F}' .
+			'\\x{AB6C}-\\x{AB6F}' .
+			'\\x{ABEE}-\\x{ABEF}' .
+			'\\x{ABFA}-\\x{ABFF}' .
+			'\\x{D7A4}-\\x{D7AF}' .
+			'\\x{D7C7}-\\x{D7CA}' .
+			'\\x{D7FC}-\\x{D7FF}' .
+			'\\x{E000}-\\x{F8FF}' .
+			'\\x{FA6E}-\\x{FA6F}' .
+			'\\x{FADA}-\\x{FAFF}' .
+			'\\x{FB07}-\\x{FB12}' .
+			'\\x{FB18}-\\x{FB1C}' .
+			'\\x{FB37}' .
+			'\\x{FB3D}' .
+			'\\x{FB3F}' .
+			'\\x{FB42}' .
+			'\\x{FB45}' .
+			'\\x{FBC3}-\\x{FBD2}' .
+			'\\x{FD90}-\\x{FD91}' .
+			'\\x{FDC8}-\\x{FDCE}' .
+			'\\x{FDD0}-\\x{FDEF}' .
+			'\\x{FE12}' .
+			'\\x{FE19}' .
+			'\\x{FE1A}-\\x{FE1F}' .
+			'\\x{FE30}' .
+			'\\x{FE52}' .
+			'\\x{FE53}' .
+			'\\x{FE67}' .
+			'\\x{FE6C}-\\x{FE6F}' .
+			'\\x{FE75}' .
+			'\\x{FEFD}-\\x{FEFE}' .
+			'\\x{FF00}' .
+			'\\x{FFA0}' .
+			'\\x{FFBF}-\\x{FFC1}' .
+			'\\x{FFC8}-\\x{FFC9}' .
+			'\\x{FFD0}-\\x{FFD1}' .
+			'\\x{FFD8}-\\x{FFD9}' .
+			'\\x{FFDD}-\\x{FFDF}' .
+			'\\x{FFE7}' .
+			'\\x{FFEF}-\\x{FFF8}' .
+			'\\x{FFF9}-\\x{FFFB}' .
+			'\\x{FFFC}' .
+			'\\x{FFFD}' .
+			'\\x{FFFE}-\\x{FFFF}' .
+			'\\x{1000C}' .
+			'\\x{10027}' .
+			'\\x{1003B}' .
+			'\\x{1003E}' .
+			'\\x{1004E}-\\x{1004F}' .
+			'\\x{1005E}-\\x{1007F}' .
+			'\\x{100FB}-\\x{100FF}' .
+			'\\x{10103}-\\x{10106}' .
+			'\\x{10134}-\\x{10136}' .
+			'\\x{1018F}' .
+			'\\x{1019D}-\\x{1019F}' .
+			'\\x{101A1}-\\x{101CF}' .
+			'\\x{101FE}-\\x{1027F}' .
+			'\\x{1029D}-\\x{1029F}' .
+			'\\x{102D1}-\\x{102DF}' .
+			'\\x{102FC}-\\x{102FF}' .
+			'\\x{10324}-\\x{1032C}' .
+			'\\x{1034B}-\\x{1034F}' .
+			'\\x{1037B}-\\x{1037F}' .
+			'\\x{1039E}' .
+			'\\x{103C4}-\\x{103C7}' .
+			'\\x{103D6}-\\x{103FF}' .
+			'\\x{1049E}-\\x{1049F}' .
+			'\\x{104AA}-\\x{104AF}' .
+			'\\x{104D4}-\\x{104D7}' .
+			'\\x{104FC}-\\x{104FF}' .
+			'\\x{10528}-\\x{1052F}' .
+			'\\x{10564}-\\x{1056E}' .
+			'\\x{1057B}' .
+			'\\x{1058B}' .
+			'\\x{10593}' .
+			'\\x{10596}' .
+			'\\x{105A2}' .
+			'\\x{105B2}' .
+			'\\x{105BA}' .
+			'\\x{105BD}-\\x{105FF}' .
+			'\\x{10737}-\\x{1073F}' .
+			'\\x{10756}-\\x{1075F}' .
+			'\\x{10768}-\\x{1077F}' .
+			'\\x{10786}' .
+			'\\x{107B1}' .
+			'\\x{107BB}-\\x{107FF}' .
+			'\\x{10806}-\\x{10807}' .
+			'\\x{10809}' .
+			'\\x{10836}' .
+			'\\x{10839}-\\x{1083B}' .
+			'\\x{1083D}-\\x{1083E}' .
+			'\\x{10856}' .
+			'\\x{1089F}-\\x{108A6}' .
+			'\\x{108B0}-\\x{108DF}' .
+			'\\x{108F3}' .
+			'\\x{108F6}-\\x{108FA}' .
+			'\\x{1091C}-\\x{1091E}' .
+			'\\x{1093A}-\\x{1093E}' .
+			'\\x{10940}-\\x{1097F}' .
+			'\\x{109B8}-\\x{109BB}' .
+			'\\x{109D0}-\\x{109D1}' .
+			'\\x{10A04}' .
+			'\\x{10A07}-\\x{10A0B}' .
+			'\\x{10A14}' .
+			'\\x{10A18}' .
+			'\\x{10A36}-\\x{10A37}' .
+			'\\x{10A3B}-\\x{10A3E}' .
+			'\\x{10A49}-\\x{10A4F}' .
+			'\\x{10A59}-\\x{10A5F}' .
+			'\\x{10AA0}-\\x{10ABF}' .
+			'\\x{10AE7}-\\x{10AEA}' .
+			'\\x{10AF7}-\\x{10AFF}' .
+			'\\x{10B36}-\\x{10B38}' .
+			'\\x{10B56}-\\x{10B57}' .
+			'\\x{10B73}-\\x{10B77}' .
+			'\\x{10B92}-\\x{10B98}' .
+			'\\x{10B9D}-\\x{10BA8}' .
+			'\\x{10BB0}-\\x{10BFF}' .
+			'\\x{10C49}-\\x{10C7F}' .
+			'\\x{10CB3}-\\x{10CBF}' .
+			'\\x{10CF3}-\\x{10CF9}' .
+			'\\x{10D28}-\\x{10D2F}' .
+			'\\x{10D3A}-\\x{10E5F}' .
+			'\\x{10E7F}' .
+			'\\x{10EAA}' .
+			'\\x{10EAE}-\\x{10EAF}' .
+			'\\x{10EB2}-\\x{10EFC}' .
+			'\\x{10F28}-\\x{10F2F}' .
+			'\\x{10F5A}-\\x{10F6F}' .
+			'\\x{10F8A}-\\x{10FAF}' .
+			'\\x{10FCC}-\\x{10FDF}' .
+			'\\x{10FF7}-\\x{10FFF}' .
+			'\\x{1104E}-\\x{11051}' .
+			'\\x{11076}-\\x{1107E}' .
+			'\\x{110BD}' .
+			'\\x{110C3}-\\x{110CC}' .
+			'\\x{110CD}' .
+			'\\x{110CE}-\\x{110CF}' .
+			'\\x{110E9}-\\x{110EF}' .
+			'\\x{110FA}-\\x{110FF}' .
+			'\\x{11135}' .
+			'\\x{11148}-\\x{1114F}' .
+			'\\x{11177}-\\x{1117F}' .
+			'\\x{111E0}' .
+			'\\x{111F5}-\\x{111FF}' .
+			'\\x{11212}' .
+			'\\x{11242}-\\x{1127F}' .
+			'\\x{11287}' .
+			'\\x{11289}' .
+			'\\x{1128E}' .
+			'\\x{1129E}' .
+			'\\x{112AA}-\\x{112AF}' .
+			'\\x{112EB}-\\x{112EF}' .
+			'\\x{112FA}-\\x{112FF}' .
+			'\\x{11304}' .
+			'\\x{1130D}-\\x{1130E}' .
+			'\\x{11311}-\\x{11312}' .
+			'\\x{11329}' .
+			'\\x{11331}' .
+			'\\x{11334}' .
+			'\\x{1133A}' .
+			'\\x{11345}-\\x{11346}' .
+			'\\x{11349}-\\x{1134A}' .
+			'\\x{1134E}-\\x{1134F}' .
+			'\\x{11351}-\\x{11356}' .
+			'\\x{11358}-\\x{1135C}' .
+			'\\x{11364}-\\x{11365}' .
+			'\\x{1136D}-\\x{1136F}' .
+			'\\x{11375}-\\x{113FF}' .
+			'\\x{1145C}' .
+			'\\x{11462}-\\x{1147F}' .
+			'\\x{114C8}-\\x{114CF}' .
+			'\\x{114DA}-\\x{1157F}' .
+			'\\x{115B6}-\\x{115B7}' .
+			'\\x{115DE}-\\x{115FF}' .
+			'\\x{11645}-\\x{1164F}' .
+			'\\x{1165A}-\\x{1165F}' .
+			'\\x{1166D}-\\x{1167F}' .
+			'\\x{116BA}-\\x{116BF}' .
+			'\\x{116CA}-\\x{116FF}' .
+			'\\x{1171B}-\\x{1171C}' .
+			'\\x{1172C}-\\x{1172F}' .
+			'\\x{11747}-\\x{117FF}' .
+			'\\x{1183C}-\\x{1189F}' .
+			'\\x{118F3}-\\x{118FE}' .
+			'\\x{11907}-\\x{11908}' .
+			'\\x{1190A}-\\x{1190B}' .
+			'\\x{11914}' .
+			'\\x{11917}' .
+			'\\x{11936}' .
+			'\\x{11939}-\\x{1193A}' .
+			'\\x{11947}-\\x{1194F}' .
+			'\\x{1195A}-\\x{1199F}' .
+			'\\x{119A8}-\\x{119A9}' .
+			'\\x{119D8}-\\x{119D9}' .
+			'\\x{119E5}-\\x{119FF}' .
+			'\\x{11A48}-\\x{11A4F}' .
+			'\\x{11AA3}-\\x{11AAF}' .
+			'\\x{11AF9}-\\x{11AFF}' .
+			'\\x{11B0A}-\\x{11BFF}' .
+			'\\x{11C09}' .
+			'\\x{11C37}' .
+			'\\x{11C46}-\\x{11C4F}' .
+			'\\x{11C6D}-\\x{11C6F}' .
+			'\\x{11C90}-\\x{11C91}' .
+			'\\x{11CA8}' .
+			'\\x{11CB7}-\\x{11CFF}' .
+			'\\x{11D07}' .
+			'\\x{11D0A}' .
+			'\\x{11D37}-\\x{11D39}' .
+			'\\x{11D3B}' .
+			'\\x{11D3E}' .
+			'\\x{11D48}-\\x{11D4F}' .
+			'\\x{11D5A}-\\x{11D5F}' .
+			'\\x{11D66}' .
+			'\\x{11D69}' .
+			'\\x{11D8F}' .
+			'\\x{11D92}' .
+			'\\x{11D99}-\\x{11D9F}' .
+			'\\x{11DAA}-\\x{11EDF}' .
+			'\\x{11EF9}-\\x{11EFF}' .
+			'\\x{11F11}' .
+			'\\x{11F3B}-\\x{11F3D}' .
+			'\\x{11F5A}-\\x{11FAF}' .
+			'\\x{11FB1}-\\x{11FBF}' .
+			'\\x{11FF2}-\\x{11FFE}' .
+			'\\x{1239A}-\\x{123FF}' .
+			'\\x{1246F}' .
+			'\\x{12475}-\\x{1247F}' .
+			'\\x{12544}-\\x{12F8F}' .
+			'\\x{12FF3}-\\x{12FFF}' .
+			'\\x{13430}-\\x{13438}' .
+			'\\x{13439}-\\x{1343F}' .
+			'\\x{13456}-\\x{143FF}' .
+			'\\x{14647}-\\x{167FF}' .
+			'\\x{16A39}-\\x{16A3F}' .
+			'\\x{16A5F}' .
+			'\\x{16A6A}-\\x{16A6D}' .
+			'\\x{16ABF}' .
+			'\\x{16ACA}-\\x{16ACF}' .
+			'\\x{16AEE}-\\x{16AEF}' .
+			'\\x{16AF6}-\\x{16AFF}' .
+			'\\x{16B46}-\\x{16B4F}' .
+			'\\x{16B5A}' .
+			'\\x{16B62}' .
+			'\\x{16B78}-\\x{16B7C}' .
+			'\\x{16B90}-\\x{16E3F}' .
+			'\\x{16E9B}-\\x{16EFF}' .
+			'\\x{16F4B}-\\x{16F4E}' .
+			'\\x{16F88}-\\x{16F8E}' .
+			'\\x{16FA0}-\\x{16FDF}' .
+			'\\x{16FE5}-\\x{16FEF}' .
+			'\\x{16FF2}-\\x{16FFF}' .
+			'\\x{187F8}-\\x{187FF}' .
+			'\\x{18CD6}-\\x{18CFF}' .
+			'\\x{18D09}-\\x{1AFEF}' .
+			'\\x{1AFF4}' .
+			'\\x{1AFFC}' .
+			'\\x{1AFFF}' .
+			'\\x{1B123}-\\x{1B131}' .
+			'\\x{1B133}-\\x{1B14F}' .
+			'\\x{1B153}-\\x{1B154}' .
+			'\\x{1B156}-\\x{1B163}' .
+			'\\x{1B168}-\\x{1B16F}' .
+			'\\x{1B2FC}-\\x{1BBFF}' .
+			'\\x{1BC6B}-\\x{1BC6F}' .
+			'\\x{1BC7D}-\\x{1BC7F}' .
+			'\\x{1BC89}-\\x{1BC8F}' .
+			'\\x{1BC9A}-\\x{1BC9B}' .
+			'\\x{1BCA4}-\\x{1CEFF}' .
+			'\\x{1CF2E}-\\x{1CF2F}' .
+			'\\x{1CF47}-\\x{1CF4F}' .
+			'\\x{1CFC4}-\\x{1CFFF}' .
+			'\\x{1D0F6}-\\x{1D0FF}' .
+			'\\x{1D127}-\\x{1D128}' .
+			'\\x{1D173}-\\x{1D17A}' .
+			'\\x{1D1EB}-\\x{1D1FF}' .
+			'\\x{1D246}-\\x{1D2BF}' .
+			'\\x{1D2D4}-\\x{1D2DF}' .
+			'\\x{1D2F4}-\\x{1D2FF}' .
+			'\\x{1D357}-\\x{1D35F}' .
+			'\\x{1D379}-\\x{1D3FF}' .
+			'\\x{1D455}' .
+			'\\x{1D49D}' .
+			'\\x{1D4A0}-\\x{1D4A1}' .
+			'\\x{1D4A3}-\\x{1D4A4}' .
+			'\\x{1D4A7}-\\x{1D4A8}' .
+			'\\x{1D4AD}' .
+			'\\x{1D4BA}' .
+			'\\x{1D4BC}' .
+			'\\x{1D4C4}' .
+			'\\x{1D506}' .
+			'\\x{1D50B}-\\x{1D50C}' .
+			'\\x{1D515}' .
+			'\\x{1D51D}' .
+			'\\x{1D53A}' .
+			'\\x{1D53F}' .
+			'\\x{1D545}' .
+			'\\x{1D547}-\\x{1D549}' .
+			'\\x{1D551}' .
+			'\\x{1D6A6}-\\x{1D6A7}' .
+			'\\x{1D7CC}-\\x{1D7CD}' .
+			'\\x{1DA8C}-\\x{1DA9A}' .
+			'\\x{1DAA0}' .
+			'\\x{1DAB0}-\\x{1DEFF}' .
+			'\\x{1DF1F}-\\x{1DF24}' .
+			'\\x{1DF2B}-\\x{1DFFF}' .
+			'\\x{1E007}' .
+			'\\x{1E019}-\\x{1E01A}' .
+			'\\x{1E022}' .
+			'\\x{1E025}' .
+			'\\x{1E02B}-\\x{1E02F}' .
+			'\\x{1E06E}-\\x{1E08E}' .
+			'\\x{1E090}-\\x{1E0FF}' .
+			'\\x{1E12D}-\\x{1E12F}' .
+			'\\x{1E13E}-\\x{1E13F}' .
+			'\\x{1E14A}-\\x{1E14D}' .
+			'\\x{1E150}-\\x{1E28F}' .
+			'\\x{1E2AF}-\\x{1E2BF}' .
+			'\\x{1E2FA}-\\x{1E2FE}' .
+			'\\x{1E300}-\\x{1E4CF}' .
+			'\\x{1E4FA}-\\x{1E7DF}' .
+			'\\x{1E7E7}' .
+			'\\x{1E7EC}' .
+			'\\x{1E7EF}' .
+			'\\x{1E7FF}' .
+			'\\x{1E8C5}-\\x{1E8C6}' .
+			'\\x{1E8D7}-\\x{1E8FF}' .
+			'\\x{1E94C}-\\x{1E94F}' .
+			'\\x{1E95A}-\\x{1E95D}' .
+			'\\x{1E960}-\\x{1EC70}' .
+			'\\x{1ECB5}-\\x{1ED00}' .
+			'\\x{1ED3E}-\\x{1EDFF}' .
+			'\\x{1EE04}' .
+			'\\x{1EE20}' .
+			'\\x{1EE23}' .
+			'\\x{1EE25}-\\x{1EE26}' .
+			'\\x{1EE28}' .
+			'\\x{1EE33}' .
+			'\\x{1EE38}' .
+			'\\x{1EE3A}' .
+			'\\x{1EE3C}-\\x{1EE41}' .
+			'\\x{1EE43}-\\x{1EE46}' .
+			'\\x{1EE48}' .
+			'\\x{1EE4A}' .
+			'\\x{1EE4C}' .
+			'\\x{1EE50}' .
+			'\\x{1EE53}' .
+			'\\x{1EE55}-\\x{1EE56}' .
+			'\\x{1EE58}' .
+			'\\x{1EE5A}' .
+			'\\x{1EE5C}' .
+			'\\x{1EE5E}' .
+			'\\x{1EE60}' .
+			'\\x{1EE63}' .
+			'\\x{1EE65}-\\x{1EE66}' .
+			'\\x{1EE6B}' .
+			'\\x{1EE73}' .
+			'\\x{1EE78}' .
+			'\\x{1EE7D}' .
+			'\\x{1EE7F}' .
+			'\\x{1EE8A}' .
+			'\\x{1EE9C}-\\x{1EEA0}' .
+			'\\x{1EEA4}' .
+			'\\x{1EEAA}' .
+			'\\x{1EEBC}-\\x{1EEEF}' .
+			'\\x{1EEF2}-\\x{1EFFF}' .
+			'\\x{1F02C}-\\x{1F02F}' .
+			'\\x{1F094}-\\x{1F09F}' .
+			'\\x{1F0AF}-\\x{1F0B0}' .
+			'\\x{1F0C0}' .
+			'\\x{1F0D0}' .
+			'\\x{1F0F6}-\\x{1F0FF}' .
+			'\\x{1F100}' .
+			'\\x{1F1AE}-\\x{1F1E5}' .
+			'\\x{1F203}-\\x{1F20F}' .
+			'\\x{1F23C}-\\x{1F23F}' .
+			'\\x{1F249}-\\x{1F24F}' .
+			'\\x{1F252}-\\x{1F25F}' .
+			'\\x{1F266}-\\x{1F2FF}' .
+			'\\x{1F6D8}-\\x{1F6DB}' .
+			'\\x{1F6ED}-\\x{1F6EF}' .
+			'\\x{1F6FD}-\\x{1F6FF}' .
+			'\\x{1F777}-\\x{1F77A}' .
+			'\\x{1F7DA}-\\x{1F7DF}' .
+			'\\x{1F7EC}-\\x{1F7EF}' .
+			'\\x{1F7F1}-\\x{1F7FF}' .
+			'\\x{1F80C}-\\x{1F80F}' .
+			'\\x{1F848}-\\x{1F84F}' .
+			'\\x{1F85A}-\\x{1F85F}' .
+			'\\x{1F888}-\\x{1F88F}' .
+			'\\x{1F8AE}-\\x{1F8AF}' .
+			'\\x{1F8B2}-\\x{1F8FF}' .
+			'\\x{1FA54}-\\x{1FA5F}' .
+			'\\x{1FA6E}-\\x{1FA6F}' .
+			'\\x{1FA7D}-\\x{1FA7F}' .
+			'\\x{1FA89}-\\x{1FA8F}' .
+			'\\x{1FABE}' .
+			'\\x{1FAC6}-\\x{1FACD}' .
+			'\\x{1FADC}-\\x{1FADF}' .
+			'\\x{1FAE9}-\\x{1FAEF}' .
+			'\\x{1FAF9}-\\x{1FAFF}' .
+			'\\x{1FB93}' .
+			'\\x{1FBCB}-\\x{1FBEF}' .
+			'\\x{1FBFA}-\\x{1FFFD}' .
+			'\\x{1FFFE}-\\x{1FFFF}' .
+			'\\x{2A6E0}-\\x{2A6FF}' .
+			'\\x{2B73A}-\\x{2B73F}' .
+			'\\x{2B81E}-\\x{2B81F}' .
+			'\\x{2CEA2}-\\x{2CEAF}' .
+			'\\x{2EBE1}-\\x{2EBEF}' .
+			'\\x{2EE5E}-\\x{2F7FF}' .
+			'\\x{2F868}' .
+			'\\x{2F874}' .
+			'\\x{2F91F}' .
+			'\\x{2F95F}' .
+			'\\x{2F9BF}' .
+			'\\x{2FA1E}-\\x{2FFFD}' .
+			'\\x{2FFFE}-\\x{2FFFF}' .
+			'\\x{3134B}-\\x{3134F}' .
+			'\\x{323B0}-\\x{3FFFD}' .
+			'\\x{3FFFE}-\\x{3FFFF}' .
+			'\\x{40000}-\\x{4FFFD}' .
+			'\\x{4FFFE}-\\x{4FFFF}' .
+			'\\x{50000}-\\x{5FFFD}' .
+			'\\x{5FFFE}-\\x{5FFFF}' .
+			'\\x{60000}-\\x{6FFFD}' .
+			'\\x{6FFFE}-\\x{6FFFF}' .
+			'\\x{70000}-\\x{7FFFD}' .
+			'\\x{7FFFE}-\\x{7FFFF}' .
+			'\\x{80000}-\\x{8FFFD}' .
+			'\\x{8FFFE}-\\x{8FFFF}' .
+			'\\x{90000}-\\x{9FFFD}' .
+			'\\x{9FFFE}-\\x{9FFFF}' .
+			'\\x{A0000}-\\x{AFFFD}' .
+			'\\x{AFFFE}-\\x{AFFFF}' .
+			'\\x{B0000}-\\x{BFFFD}' .
+			'\\x{BFFFE}-\\x{BFFFF}' .
+			'\\x{C0000}-\\x{CFFFD}' .
+			'\\x{CFFFE}-\\x{CFFFF}' .
+			'\\x{D0000}-\\x{DFFFD}' .
+			'\\x{DFFFE}-\\x{DFFFF}' .
+			'\\x{E0000}' .
+			'\\x{E0001}' .
+			'\\x{E0002}-\\x{E001F}' .
+			'\\x{E0020}-\\x{E007F}' .
+			'\\x{E0080}-\\x{E00FF}' .
+			'\\x{E01F0}-\\x{EFFFD}' .
+			'\\x{EFFFE}-\\x{EFFFF}' .
+			'\\x{F0000}-\\x{FFFFD}' .
+			'\\x{FFFFE}-\\x{FFFFF}' .
+			'\\x{100000}-\\x{10FFFD}' .
+			'\\x{10FFFE}-\\x{10FFFF}',
 		'ignored' =>
-			'\x{AD}' .
-			'\x{34F}' .
-			'\x{180B}-\x{180D}' .
-			'\x{180F}' .
-			'\x{200B}' .
-			'\x{2060}' .
-			'\x{2064}' .
-			'\x{FE00}-\x{FE0F}' .
-			'\x{FEFF}' .
-			'\x{1BCA0}-\x{1BCA3}' .
-			'\x{E0100}-\x{E01EF}',
+			'\\x{AD}' .
+			'\\x{34F}' .
+			'\\x{180B}-\\x{180D}' .
+			'\\x{180F}' .
+			'\\x{200B}' .
+			'\\x{2060}' .
+			'\\x{2064}' .
+			'\\x{FE00}-\\x{FE0F}' .
+			'\\x{FEFF}' .
+			'\\x{1BCA0}-\\x{1BCA3}' .
+			'\\x{E0100}-\\x{E01EF}',
 		'deviation' =>
-			'\x{DF}' .
-			'\x{3C2}' .
-			'\x{200C}-\x{200D}',
-	);
+			'\\x{DF}' .
+			'\\x{3C2}' .
+			'\\x{200C}-\\x{200D}',
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/Metadata.php b/Sources/Unicode/Metadata.php
index 2ccf662812..8a6bd100c4 100644
--- a/Sources/Unicode/Metadata.php
+++ b/Sources/Unicode/Metadata.php
@@ -13,10 +13,12 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
-if (!defined('SMF_UNICODE_VERSION'))
-	define('SMF_UNICODE_VERSION', '15.0.0.0');
+if (!defined('SMF_UNICODE_VERSION')) {
+	define('SMF_UNICODE_VERSION', '15.1.0.0');
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/QuickCheck.php b/Sources/Unicode/QuickCheck.php
index 7eecce5b8b..33fb2d5250 100644
--- a/Sources/Unicode/QuickCheck.php
+++ b/Sources/Unicode/QuickCheck.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_is_normalized.
@@ -29,1893 +30,1893 @@
  */
 function utf8_regex_quick_check()
 {
-	return array(
+	return [
 		'NFC_QC' =>
-			'\x{0340}-\x{0341}' .
-			'\x{0343}-\x{0344}' .
-			'\x{0374}' .
-			'\x{037E}' .
-			'\x{0387}' .
-			'\x{0958}-\x{095F}' .
-			'\x{09DC}-\x{09DD}' .
-			'\x{09DF}' .
-			'\x{0A33}' .
-			'\x{0A36}' .
-			'\x{0A59}-\x{0A5B}' .
-			'\x{0A5E}' .
-			'\x{0B5C}-\x{0B5D}' .
-			'\x{0F43}' .
-			'\x{0F4D}' .
-			'\x{0F52}' .
-			'\x{0F57}' .
-			'\x{0F5C}' .
-			'\x{0F69}' .
-			'\x{0F73}' .
-			'\x{0F75}-\x{0F76}' .
-			'\x{0F78}' .
-			'\x{0F81}' .
-			'\x{0F93}' .
-			'\x{0F9D}' .
-			'\x{0FA2}' .
-			'\x{0FA7}' .
-			'\x{0FAC}' .
-			'\x{0FB9}' .
-			'\x{1F71}' .
-			'\x{1F73}' .
-			'\x{1F75}' .
-			'\x{1F77}' .
-			'\x{1F79}' .
-			'\x{1F7B}' .
-			'\x{1F7D}' .
-			'\x{1FBB}' .
-			'\x{1FBE}' .
-			'\x{1FC9}' .
-			'\x{1FCB}' .
-			'\x{1FD3}' .
-			'\x{1FDB}' .
-			'\x{1FE3}' .
-			'\x{1FEB}' .
-			'\x{1FEE}-\x{1FEF}' .
-			'\x{1FF9}' .
-			'\x{1FFB}' .
-			'\x{1FFD}' .
-			'\x{2000}-\x{2001}' .
-			'\x{2126}' .
-			'\x{212A}-\x{212B}' .
-			'\x{2329}-\x{232A}' .
-			'\x{2ADC}' .
-			'\x{F900}-\x{FA0D}' .
-			'\x{FA10}' .
-			'\x{FA12}' .
-			'\x{FA15}-\x{FA1E}' .
-			'\x{FA20}' .
-			'\x{FA22}' .
-			'\x{FA25}-\x{FA26}' .
-			'\x{FA2A}-\x{FA6D}' .
-			'\x{FA70}-\x{FAD9}' .
-			'\x{FB1D}' .
-			'\x{FB1F}' .
-			'\x{FB2A}-\x{FB36}' .
-			'\x{FB38}-\x{FB3C}' .
-			'\x{FB3E}' .
-			'\x{FB40}-\x{FB41}' .
-			'\x{FB43}-\x{FB44}' .
-			'\x{FB46}-\x{FB4E}' .
-			'\x{1D15E}-\x{1D164}' .
-			'\x{1D1BB}-\x{1D1C0}' .
-			'\x{2F800}-\x{2FA1D}' .
-			'\x{0300}-\x{0304}' .
-			'\x{0306}-\x{030C}' .
-			'\x{030F}' .
-			'\x{0311}' .
-			'\x{0313}-\x{0314}' .
-			'\x{031B}' .
-			'\x{0323}-\x{0328}' .
-			'\x{032D}-\x{032E}' .
-			'\x{0330}-\x{0331}' .
-			'\x{0338}' .
-			'\x{0342}' .
-			'\x{0345}' .
-			'\x{0653}-\x{0655}' .
-			'\x{093C}' .
-			'\x{09BE}' .
-			'\x{09D7}' .
-			'\x{0B3E}' .
-			'\x{0B56}-\x{0B57}' .
-			'\x{0BBE}' .
-			'\x{0BD7}' .
-			'\x{0C56}' .
-			'\x{0CC2}' .
-			'\x{0CD5}-\x{0CD6}' .
-			'\x{0D3E}' .
-			'\x{0D57}' .
-			'\x{0DCA}' .
-			'\x{0DCF}' .
-			'\x{0DDF}' .
-			'\x{102E}' .
-			'\x{1161}-\x{1175}' .
-			'\x{11A8}-\x{11C2}' .
-			'\x{1B35}' .
-			'\x{3099}-\x{309A}' .
-			'\x{110BA}' .
-			'\x{11127}' .
-			'\x{1133E}' .
-			'\x{11357}' .
-			'\x{114B0}' .
-			'\x{114BA}' .
-			'\x{114BD}' .
-			'\x{115AF}' .
-			'\x{11930}',
+			'\\x{0340}-\\x{0341}' .
+			'\\x{0343}-\\x{0344}' .
+			'\\x{0374}' .
+			'\\x{037E}' .
+			'\\x{0387}' .
+			'\\x{0958}-\\x{095F}' .
+			'\\x{09DC}-\\x{09DD}' .
+			'\\x{09DF}' .
+			'\\x{0A33}' .
+			'\\x{0A36}' .
+			'\\x{0A59}-\\x{0A5B}' .
+			'\\x{0A5E}' .
+			'\\x{0B5C}-\\x{0B5D}' .
+			'\\x{0F43}' .
+			'\\x{0F4D}' .
+			'\\x{0F52}' .
+			'\\x{0F57}' .
+			'\\x{0F5C}' .
+			'\\x{0F69}' .
+			'\\x{0F73}' .
+			'\\x{0F75}-\\x{0F76}' .
+			'\\x{0F78}' .
+			'\\x{0F81}' .
+			'\\x{0F93}' .
+			'\\x{0F9D}' .
+			'\\x{0FA2}' .
+			'\\x{0FA7}' .
+			'\\x{0FAC}' .
+			'\\x{0FB9}' .
+			'\\x{1F71}' .
+			'\\x{1F73}' .
+			'\\x{1F75}' .
+			'\\x{1F77}' .
+			'\\x{1F79}' .
+			'\\x{1F7B}' .
+			'\\x{1F7D}' .
+			'\\x{1FBB}' .
+			'\\x{1FBE}' .
+			'\\x{1FC9}' .
+			'\\x{1FCB}' .
+			'\\x{1FD3}' .
+			'\\x{1FDB}' .
+			'\\x{1FE3}' .
+			'\\x{1FEB}' .
+			'\\x{1FEE}-\\x{1FEF}' .
+			'\\x{1FF9}' .
+			'\\x{1FFB}' .
+			'\\x{1FFD}' .
+			'\\x{2000}-\\x{2001}' .
+			'\\x{2126}' .
+			'\\x{212A}-\\x{212B}' .
+			'\\x{2329}-\\x{232A}' .
+			'\\x{2ADC}' .
+			'\\x{F900}-\\x{FA0D}' .
+			'\\x{FA10}' .
+			'\\x{FA12}' .
+			'\\x{FA15}-\\x{FA1E}' .
+			'\\x{FA20}' .
+			'\\x{FA22}' .
+			'\\x{FA25}-\\x{FA26}' .
+			'\\x{FA2A}-\\x{FA6D}' .
+			'\\x{FA70}-\\x{FAD9}' .
+			'\\x{FB1D}' .
+			'\\x{FB1F}' .
+			'\\x{FB2A}-\\x{FB36}' .
+			'\\x{FB38}-\\x{FB3C}' .
+			'\\x{FB3E}' .
+			'\\x{FB40}-\\x{FB41}' .
+			'\\x{FB43}-\\x{FB44}' .
+			'\\x{FB46}-\\x{FB4E}' .
+			'\\x{1D15E}-\\x{1D164}' .
+			'\\x{1D1BB}-\\x{1D1C0}' .
+			'\\x{2F800}-\\x{2FA1D}' .
+			'\\x{0300}-\\x{0304}' .
+			'\\x{0306}-\\x{030C}' .
+			'\\x{030F}' .
+			'\\x{0311}' .
+			'\\x{0313}-\\x{0314}' .
+			'\\x{031B}' .
+			'\\x{0323}-\\x{0328}' .
+			'\\x{032D}-\\x{032E}' .
+			'\\x{0330}-\\x{0331}' .
+			'\\x{0338}' .
+			'\\x{0342}' .
+			'\\x{0345}' .
+			'\\x{0653}-\\x{0655}' .
+			'\\x{093C}' .
+			'\\x{09BE}' .
+			'\\x{09D7}' .
+			'\\x{0B3E}' .
+			'\\x{0B56}-\\x{0B57}' .
+			'\\x{0BBE}' .
+			'\\x{0BD7}' .
+			'\\x{0C56}' .
+			'\\x{0CC2}' .
+			'\\x{0CD5}-\\x{0CD6}' .
+			'\\x{0D3E}' .
+			'\\x{0D57}' .
+			'\\x{0DCA}' .
+			'\\x{0DCF}' .
+			'\\x{0DDF}' .
+			'\\x{102E}' .
+			'\\x{1161}-\\x{1175}' .
+			'\\x{11A8}-\\x{11C2}' .
+			'\\x{1B35}' .
+			'\\x{3099}-\\x{309A}' .
+			'\\x{110BA}' .
+			'\\x{11127}' .
+			'\\x{1133E}' .
+			'\\x{11357}' .
+			'\\x{114B0}' .
+			'\\x{114BA}' .
+			'\\x{114BD}' .
+			'\\x{115AF}' .
+			'\\x{11930}',
 		'NFKC_QC' =>
-			'\x{00A0}' .
-			'\x{00A8}' .
-			'\x{00AA}' .
-			'\x{00AF}' .
-			'\x{00B2}-\x{00B5}' .
-			'\x{00B8}-\x{00BA}' .
-			'\x{00BC}-\x{00BE}' .
-			'\x{0132}-\x{0133}' .
-			'\x{013F}-\x{0140}' .
-			'\x{0149}' .
-			'\x{017F}' .
-			'\x{01C4}-\x{01CC}' .
-			'\x{01F1}-\x{01F3}' .
-			'\x{02B0}-\x{02B8}' .
-			'\x{02D8}-\x{02DD}' .
-			'\x{02E0}-\x{02E4}' .
-			'\x{0340}-\x{0341}' .
-			'\x{0343}-\x{0344}' .
-			'\x{0374}' .
-			'\x{037A}' .
-			'\x{037E}' .
-			'\x{0384}-\x{0385}' .
-			'\x{0387}' .
-			'\x{03D0}-\x{03D6}' .
-			'\x{03F0}-\x{03F2}' .
-			'\x{03F4}-\x{03F5}' .
-			'\x{03F9}' .
-			'\x{0587}' .
-			'\x{0675}-\x{0678}' .
-			'\x{0958}-\x{095F}' .
-			'\x{09DC}-\x{09DD}' .
-			'\x{09DF}' .
-			'\x{0A33}' .
-			'\x{0A36}' .
-			'\x{0A59}-\x{0A5B}' .
-			'\x{0A5E}' .
-			'\x{0B5C}-\x{0B5D}' .
-			'\x{0E33}' .
-			'\x{0EB3}' .
-			'\x{0EDC}-\x{0EDD}' .
-			'\x{0F0C}' .
-			'\x{0F43}' .
-			'\x{0F4D}' .
-			'\x{0F52}' .
-			'\x{0F57}' .
-			'\x{0F5C}' .
-			'\x{0F69}' .
-			'\x{0F73}' .
-			'\x{0F75}-\x{0F79}' .
-			'\x{0F81}' .
-			'\x{0F93}' .
-			'\x{0F9D}' .
-			'\x{0FA2}' .
-			'\x{0FA7}' .
-			'\x{0FAC}' .
-			'\x{0FB9}' .
-			'\x{10FC}' .
-			'\x{1D2C}-\x{1D2E}' .
-			'\x{1D30}-\x{1D3A}' .
-			'\x{1D3C}-\x{1D4D}' .
-			'\x{1D4F}-\x{1D6A}' .
-			'\x{1D78}' .
-			'\x{1D9B}-\x{1DBF}' .
-			'\x{1E9A}-\x{1E9B}' .
-			'\x{1F71}' .
-			'\x{1F73}' .
-			'\x{1F75}' .
-			'\x{1F77}' .
-			'\x{1F79}' .
-			'\x{1F7B}' .
-			'\x{1F7D}' .
-			'\x{1FBB}' .
-			'\x{1FBD}-\x{1FC1}' .
-			'\x{1FC9}' .
-			'\x{1FCB}' .
-			'\x{1FCD}-\x{1FCF}' .
-			'\x{1FD3}' .
-			'\x{1FDB}' .
-			'\x{1FDD}-\x{1FDF}' .
-			'\x{1FE3}' .
-			'\x{1FEB}' .
-			'\x{1FED}-\x{1FEF}' .
-			'\x{1FF9}' .
-			'\x{1FFB}' .
-			'\x{1FFD}-\x{1FFE}' .
-			'\x{2000}-\x{200A}' .
-			'\x{2011}' .
-			'\x{2017}' .
-			'\x{2024}-\x{2026}' .
-			'\x{202F}' .
-			'\x{2033}-\x{2034}' .
-			'\x{2036}-\x{2037}' .
-			'\x{203C}' .
-			'\x{203E}' .
-			'\x{2047}-\x{2049}' .
-			'\x{2057}' .
-			'\x{205F}' .
-			'\x{2070}-\x{2071}' .
-			'\x{2074}-\x{208E}' .
-			'\x{2090}-\x{209C}' .
-			'\x{20A8}' .
-			'\x{2100}-\x{2103}' .
-			'\x{2105}-\x{2107}' .
-			'\x{2109}-\x{2113}' .
-			'\x{2115}-\x{2116}' .
-			'\x{2119}-\x{211D}' .
-			'\x{2120}-\x{2122}' .
-			'\x{2124}' .
-			'\x{2126}' .
-			'\x{2128}' .
-			'\x{212A}-\x{212D}' .
-			'\x{212F}-\x{2131}' .
-			'\x{2133}-\x{2139}' .
-			'\x{213B}-\x{2140}' .
-			'\x{2145}-\x{2149}' .
-			'\x{2150}-\x{217F}' .
-			'\x{2189}' .
-			'\x{222C}-\x{222D}' .
-			'\x{222F}-\x{2230}' .
-			'\x{2329}-\x{232A}' .
-			'\x{2460}-\x{24EA}' .
-			'\x{2A0C}' .
-			'\x{2A74}-\x{2A76}' .
-			'\x{2ADC}' .
-			'\x{2C7C}-\x{2C7D}' .
-			'\x{2D6F}' .
-			'\x{2E9F}' .
-			'\x{2EF3}' .
-			'\x{2F00}-\x{2FD5}' .
-			'\x{3000}' .
-			'\x{3036}' .
-			'\x{3038}-\x{303A}' .
-			'\x{309B}-\x{309C}' .
-			'\x{309F}' .
-			'\x{30FF}' .
-			'\x{3131}-\x{318E}' .
-			'\x{3192}-\x{319F}' .
-			'\x{3200}-\x{321E}' .
-			'\x{3220}-\x{3247}' .
-			'\x{3250}-\x{327E}' .
-			'\x{3280}-\x{33FF}' .
-			'\x{A69C}-\x{A69D}' .
-			'\x{A770}' .
-			'\x{A7F2}-\x{A7F4}' .
-			'\x{A7F8}-\x{A7F9}' .
-			'\x{AB5C}-\x{AB5F}' .
-			'\x{AB69}' .
-			'\x{F900}-\x{FA0D}' .
-			'\x{FA10}' .
-			'\x{FA12}' .
-			'\x{FA15}-\x{FA1E}' .
-			'\x{FA20}' .
-			'\x{FA22}' .
-			'\x{FA25}-\x{FA26}' .
-			'\x{FA2A}-\x{FA6D}' .
-			'\x{FA70}-\x{FAD9}' .
-			'\x{FB00}-\x{FB06}' .
-			'\x{FB13}-\x{FB17}' .
-			'\x{FB1D}' .
-			'\x{FB1F}-\x{FB36}' .
-			'\x{FB38}-\x{FB3C}' .
-			'\x{FB3E}' .
-			'\x{FB40}-\x{FB41}' .
-			'\x{FB43}-\x{FB44}' .
-			'\x{FB46}-\x{FBB1}' .
-			'\x{FBD3}-\x{FD3D}' .
-			'\x{FD50}-\x{FD8F}' .
-			'\x{FD92}-\x{FDC7}' .
-			'\x{FDF0}-\x{FDFC}' .
-			'\x{FE10}-\x{FE19}' .
-			'\x{FE30}-\x{FE44}' .
-			'\x{FE47}-\x{FE52}' .
-			'\x{FE54}-\x{FE66}' .
-			'\x{FE68}-\x{FE6B}' .
-			'\x{FE70}-\x{FE72}' .
-			'\x{FE74}' .
-			'\x{FE76}-\x{FEFC}' .
-			'\x{FF01}-\x{FFBE}' .
-			'\x{FFC2}-\x{FFC7}' .
-			'\x{FFCA}-\x{FFCF}' .
-			'\x{FFD2}-\x{FFD7}' .
-			'\x{FFDA}-\x{FFDC}' .
-			'\x{FFE0}-\x{FFE6}' .
-			'\x{FFE8}-\x{FFEE}' .
-			'\x{10781}-\x{10785}' .
-			'\x{10787}-\x{107B0}' .
-			'\x{107B2}-\x{107BA}' .
-			'\x{1D15E}-\x{1D164}' .
-			'\x{1D1BB}-\x{1D1C0}' .
-			'\x{1D400}-\x{1D454}' .
-			'\x{1D456}-\x{1D49C}' .
-			'\x{1D49E}-\x{1D49F}' .
-			'\x{1D4A2}' .
-			'\x{1D4A5}-\x{1D4A6}' .
-			'\x{1D4A9}-\x{1D4AC}' .
-			'\x{1D4AE}-\x{1D4B9}' .
-			'\x{1D4BB}' .
-			'\x{1D4BD}-\x{1D4C3}' .
-			'\x{1D4C5}-\x{1D505}' .
-			'\x{1D507}-\x{1D50A}' .
-			'\x{1D50D}-\x{1D514}' .
-			'\x{1D516}-\x{1D51C}' .
-			'\x{1D51E}-\x{1D539}' .
-			'\x{1D53B}-\x{1D53E}' .
-			'\x{1D540}-\x{1D544}' .
-			'\x{1D546}' .
-			'\x{1D54A}-\x{1D550}' .
-			'\x{1D552}-\x{1D6A5}' .
-			'\x{1D6A8}-\x{1D7CB}' .
-			'\x{1D7CE}-\x{1D7FF}' .
-			'\x{1E030}-\x{1E06D}' .
-			'\x{1EE00}-\x{1EE03}' .
-			'\x{1EE05}-\x{1EE1F}' .
-			'\x{1EE21}-\x{1EE22}' .
-			'\x{1EE24}' .
-			'\x{1EE27}' .
-			'\x{1EE29}-\x{1EE32}' .
-			'\x{1EE34}-\x{1EE37}' .
-			'\x{1EE39}' .
-			'\x{1EE3B}' .
-			'\x{1EE42}' .
-			'\x{1EE47}' .
-			'\x{1EE49}' .
-			'\x{1EE4B}' .
-			'\x{1EE4D}-\x{1EE4F}' .
-			'\x{1EE51}-\x{1EE52}' .
-			'\x{1EE54}' .
-			'\x{1EE57}' .
-			'\x{1EE59}' .
-			'\x{1EE5B}' .
-			'\x{1EE5D}' .
-			'\x{1EE5F}' .
-			'\x{1EE61}-\x{1EE62}' .
-			'\x{1EE64}' .
-			'\x{1EE67}-\x{1EE6A}' .
-			'\x{1EE6C}-\x{1EE72}' .
-			'\x{1EE74}-\x{1EE77}' .
-			'\x{1EE79}-\x{1EE7C}' .
-			'\x{1EE7E}' .
-			'\x{1EE80}-\x{1EE89}' .
-			'\x{1EE8B}-\x{1EE9B}' .
-			'\x{1EEA1}-\x{1EEA3}' .
-			'\x{1EEA5}-\x{1EEA9}' .
-			'\x{1EEAB}-\x{1EEBB}' .
-			'\x{1F100}-\x{1F10A}' .
-			'\x{1F110}-\x{1F12E}' .
-			'\x{1F130}-\x{1F14F}' .
-			'\x{1F16A}-\x{1F16C}' .
-			'\x{1F190}' .
-			'\x{1F200}-\x{1F202}' .
-			'\x{1F210}-\x{1F23B}' .
-			'\x{1F240}-\x{1F248}' .
-			'\x{1F250}-\x{1F251}' .
-			'\x{1FBF0}-\x{1FBF9}' .
-			'\x{2F800}-\x{2FA1D}' .
-			'\x{0300}-\x{0304}' .
-			'\x{0306}-\x{030C}' .
-			'\x{030F}' .
-			'\x{0311}' .
-			'\x{0313}-\x{0314}' .
-			'\x{031B}' .
-			'\x{0323}-\x{0328}' .
-			'\x{032D}-\x{032E}' .
-			'\x{0330}-\x{0331}' .
-			'\x{0338}' .
-			'\x{0342}' .
-			'\x{0345}' .
-			'\x{0653}-\x{0655}' .
-			'\x{093C}' .
-			'\x{09BE}' .
-			'\x{09D7}' .
-			'\x{0B3E}' .
-			'\x{0B56}-\x{0B57}' .
-			'\x{0BBE}' .
-			'\x{0BD7}' .
-			'\x{0C56}' .
-			'\x{0CC2}' .
-			'\x{0CD5}-\x{0CD6}' .
-			'\x{0D3E}' .
-			'\x{0D57}' .
-			'\x{0DCA}' .
-			'\x{0DCF}' .
-			'\x{0DDF}' .
-			'\x{102E}' .
-			'\x{1161}-\x{1175}' .
-			'\x{11A8}-\x{11C2}' .
-			'\x{1B35}' .
-			'\x{3099}-\x{309A}' .
-			'\x{110BA}' .
-			'\x{11127}' .
-			'\x{1133E}' .
-			'\x{11357}' .
-			'\x{114B0}' .
-			'\x{114BA}' .
-			'\x{114BD}' .
-			'\x{115AF}' .
-			'\x{11930}',
+			'\\x{00A0}' .
+			'\\x{00A8}' .
+			'\\x{00AA}' .
+			'\\x{00AF}' .
+			'\\x{00B2}-\\x{00B5}' .
+			'\\x{00B8}-\\x{00BA}' .
+			'\\x{00BC}-\\x{00BE}' .
+			'\\x{0132}-\\x{0133}' .
+			'\\x{013F}-\\x{0140}' .
+			'\\x{0149}' .
+			'\\x{017F}' .
+			'\\x{01C4}-\\x{01CC}' .
+			'\\x{01F1}-\\x{01F3}' .
+			'\\x{02B0}-\\x{02B8}' .
+			'\\x{02D8}-\\x{02DD}' .
+			'\\x{02E0}-\\x{02E4}' .
+			'\\x{0340}-\\x{0341}' .
+			'\\x{0343}-\\x{0344}' .
+			'\\x{0374}' .
+			'\\x{037A}' .
+			'\\x{037E}' .
+			'\\x{0384}-\\x{0385}' .
+			'\\x{0387}' .
+			'\\x{03D0}-\\x{03D6}' .
+			'\\x{03F0}-\\x{03F2}' .
+			'\\x{03F4}-\\x{03F5}' .
+			'\\x{03F9}' .
+			'\\x{0587}' .
+			'\\x{0675}-\\x{0678}' .
+			'\\x{0958}-\\x{095F}' .
+			'\\x{09DC}-\\x{09DD}' .
+			'\\x{09DF}' .
+			'\\x{0A33}' .
+			'\\x{0A36}' .
+			'\\x{0A59}-\\x{0A5B}' .
+			'\\x{0A5E}' .
+			'\\x{0B5C}-\\x{0B5D}' .
+			'\\x{0E33}' .
+			'\\x{0EB3}' .
+			'\\x{0EDC}-\\x{0EDD}' .
+			'\\x{0F0C}' .
+			'\\x{0F43}' .
+			'\\x{0F4D}' .
+			'\\x{0F52}' .
+			'\\x{0F57}' .
+			'\\x{0F5C}' .
+			'\\x{0F69}' .
+			'\\x{0F73}' .
+			'\\x{0F75}-\\x{0F79}' .
+			'\\x{0F81}' .
+			'\\x{0F93}' .
+			'\\x{0F9D}' .
+			'\\x{0FA2}' .
+			'\\x{0FA7}' .
+			'\\x{0FAC}' .
+			'\\x{0FB9}' .
+			'\\x{10FC}' .
+			'\\x{1D2C}-\\x{1D2E}' .
+			'\\x{1D30}-\\x{1D3A}' .
+			'\\x{1D3C}-\\x{1D4D}' .
+			'\\x{1D4F}-\\x{1D6A}' .
+			'\\x{1D78}' .
+			'\\x{1D9B}-\\x{1DBF}' .
+			'\\x{1E9A}-\\x{1E9B}' .
+			'\\x{1F71}' .
+			'\\x{1F73}' .
+			'\\x{1F75}' .
+			'\\x{1F77}' .
+			'\\x{1F79}' .
+			'\\x{1F7B}' .
+			'\\x{1F7D}' .
+			'\\x{1FBB}' .
+			'\\x{1FBD}-\\x{1FC1}' .
+			'\\x{1FC9}' .
+			'\\x{1FCB}' .
+			'\\x{1FCD}-\\x{1FCF}' .
+			'\\x{1FD3}' .
+			'\\x{1FDB}' .
+			'\\x{1FDD}-\\x{1FDF}' .
+			'\\x{1FE3}' .
+			'\\x{1FEB}' .
+			'\\x{1FED}-\\x{1FEF}' .
+			'\\x{1FF9}' .
+			'\\x{1FFB}' .
+			'\\x{1FFD}-\\x{1FFE}' .
+			'\\x{2000}-\\x{200A}' .
+			'\\x{2011}' .
+			'\\x{2017}' .
+			'\\x{2024}-\\x{2026}' .
+			'\\x{202F}' .
+			'\\x{2033}-\\x{2034}' .
+			'\\x{2036}-\\x{2037}' .
+			'\\x{203C}' .
+			'\\x{203E}' .
+			'\\x{2047}-\\x{2049}' .
+			'\\x{2057}' .
+			'\\x{205F}' .
+			'\\x{2070}-\\x{2071}' .
+			'\\x{2074}-\\x{208E}' .
+			'\\x{2090}-\\x{209C}' .
+			'\\x{20A8}' .
+			'\\x{2100}-\\x{2103}' .
+			'\\x{2105}-\\x{2107}' .
+			'\\x{2109}-\\x{2113}' .
+			'\\x{2115}-\\x{2116}' .
+			'\\x{2119}-\\x{211D}' .
+			'\\x{2120}-\\x{2122}' .
+			'\\x{2124}' .
+			'\\x{2126}' .
+			'\\x{2128}' .
+			'\\x{212A}-\\x{212D}' .
+			'\\x{212F}-\\x{2131}' .
+			'\\x{2133}-\\x{2139}' .
+			'\\x{213B}-\\x{2140}' .
+			'\\x{2145}-\\x{2149}' .
+			'\\x{2150}-\\x{217F}' .
+			'\\x{2189}' .
+			'\\x{222C}-\\x{222D}' .
+			'\\x{222F}-\\x{2230}' .
+			'\\x{2329}-\\x{232A}' .
+			'\\x{2460}-\\x{24EA}' .
+			'\\x{2A0C}' .
+			'\\x{2A74}-\\x{2A76}' .
+			'\\x{2ADC}' .
+			'\\x{2C7C}-\\x{2C7D}' .
+			'\\x{2D6F}' .
+			'\\x{2E9F}' .
+			'\\x{2EF3}' .
+			'\\x{2F00}-\\x{2FD5}' .
+			'\\x{3000}' .
+			'\\x{3036}' .
+			'\\x{3038}-\\x{303A}' .
+			'\\x{309B}-\\x{309C}' .
+			'\\x{309F}' .
+			'\\x{30FF}' .
+			'\\x{3131}-\\x{318E}' .
+			'\\x{3192}-\\x{319F}' .
+			'\\x{3200}-\\x{321E}' .
+			'\\x{3220}-\\x{3247}' .
+			'\\x{3250}-\\x{327E}' .
+			'\\x{3280}-\\x{33FF}' .
+			'\\x{A69C}-\\x{A69D}' .
+			'\\x{A770}' .
+			'\\x{A7F2}-\\x{A7F4}' .
+			'\\x{A7F8}-\\x{A7F9}' .
+			'\\x{AB5C}-\\x{AB5F}' .
+			'\\x{AB69}' .
+			'\\x{F900}-\\x{FA0D}' .
+			'\\x{FA10}' .
+			'\\x{FA12}' .
+			'\\x{FA15}-\\x{FA1E}' .
+			'\\x{FA20}' .
+			'\\x{FA22}' .
+			'\\x{FA25}-\\x{FA26}' .
+			'\\x{FA2A}-\\x{FA6D}' .
+			'\\x{FA70}-\\x{FAD9}' .
+			'\\x{FB00}-\\x{FB06}' .
+			'\\x{FB13}-\\x{FB17}' .
+			'\\x{FB1D}' .
+			'\\x{FB1F}-\\x{FB36}' .
+			'\\x{FB38}-\\x{FB3C}' .
+			'\\x{FB3E}' .
+			'\\x{FB40}-\\x{FB41}' .
+			'\\x{FB43}-\\x{FB44}' .
+			'\\x{FB46}-\\x{FBB1}' .
+			'\\x{FBD3}-\\x{FD3D}' .
+			'\\x{FD50}-\\x{FD8F}' .
+			'\\x{FD92}-\\x{FDC7}' .
+			'\\x{FDF0}-\\x{FDFC}' .
+			'\\x{FE10}-\\x{FE19}' .
+			'\\x{FE30}-\\x{FE44}' .
+			'\\x{FE47}-\\x{FE52}' .
+			'\\x{FE54}-\\x{FE66}' .
+			'\\x{FE68}-\\x{FE6B}' .
+			'\\x{FE70}-\\x{FE72}' .
+			'\\x{FE74}' .
+			'\\x{FE76}-\\x{FEFC}' .
+			'\\x{FF01}-\\x{FFBE}' .
+			'\\x{FFC2}-\\x{FFC7}' .
+			'\\x{FFCA}-\\x{FFCF}' .
+			'\\x{FFD2}-\\x{FFD7}' .
+			'\\x{FFDA}-\\x{FFDC}' .
+			'\\x{FFE0}-\\x{FFE6}' .
+			'\\x{FFE8}-\\x{FFEE}' .
+			'\\x{10781}-\\x{10785}' .
+			'\\x{10787}-\\x{107B0}' .
+			'\\x{107B2}-\\x{107BA}' .
+			'\\x{1D15E}-\\x{1D164}' .
+			'\\x{1D1BB}-\\x{1D1C0}' .
+			'\\x{1D400}-\\x{1D454}' .
+			'\\x{1D456}-\\x{1D49C}' .
+			'\\x{1D49E}-\\x{1D49F}' .
+			'\\x{1D4A2}' .
+			'\\x{1D4A5}-\\x{1D4A6}' .
+			'\\x{1D4A9}-\\x{1D4AC}' .
+			'\\x{1D4AE}-\\x{1D4B9}' .
+			'\\x{1D4BB}' .
+			'\\x{1D4BD}-\\x{1D4C3}' .
+			'\\x{1D4C5}-\\x{1D505}' .
+			'\\x{1D507}-\\x{1D50A}' .
+			'\\x{1D50D}-\\x{1D514}' .
+			'\\x{1D516}-\\x{1D51C}' .
+			'\\x{1D51E}-\\x{1D539}' .
+			'\\x{1D53B}-\\x{1D53E}' .
+			'\\x{1D540}-\\x{1D544}' .
+			'\\x{1D546}' .
+			'\\x{1D54A}-\\x{1D550}' .
+			'\\x{1D552}-\\x{1D6A5}' .
+			'\\x{1D6A8}-\\x{1D7CB}' .
+			'\\x{1D7CE}-\\x{1D7FF}' .
+			'\\x{1E030}-\\x{1E06D}' .
+			'\\x{1EE00}-\\x{1EE03}' .
+			'\\x{1EE05}-\\x{1EE1F}' .
+			'\\x{1EE21}-\\x{1EE22}' .
+			'\\x{1EE24}' .
+			'\\x{1EE27}' .
+			'\\x{1EE29}-\\x{1EE32}' .
+			'\\x{1EE34}-\\x{1EE37}' .
+			'\\x{1EE39}' .
+			'\\x{1EE3B}' .
+			'\\x{1EE42}' .
+			'\\x{1EE47}' .
+			'\\x{1EE49}' .
+			'\\x{1EE4B}' .
+			'\\x{1EE4D}-\\x{1EE4F}' .
+			'\\x{1EE51}-\\x{1EE52}' .
+			'\\x{1EE54}' .
+			'\\x{1EE57}' .
+			'\\x{1EE59}' .
+			'\\x{1EE5B}' .
+			'\\x{1EE5D}' .
+			'\\x{1EE5F}' .
+			'\\x{1EE61}-\\x{1EE62}' .
+			'\\x{1EE64}' .
+			'\\x{1EE67}-\\x{1EE6A}' .
+			'\\x{1EE6C}-\\x{1EE72}' .
+			'\\x{1EE74}-\\x{1EE77}' .
+			'\\x{1EE79}-\\x{1EE7C}' .
+			'\\x{1EE7E}' .
+			'\\x{1EE80}-\\x{1EE89}' .
+			'\\x{1EE8B}-\\x{1EE9B}' .
+			'\\x{1EEA1}-\\x{1EEA3}' .
+			'\\x{1EEA5}-\\x{1EEA9}' .
+			'\\x{1EEAB}-\\x{1EEBB}' .
+			'\\x{1F100}-\\x{1F10A}' .
+			'\\x{1F110}-\\x{1F12E}' .
+			'\\x{1F130}-\\x{1F14F}' .
+			'\\x{1F16A}-\\x{1F16C}' .
+			'\\x{1F190}' .
+			'\\x{1F200}-\\x{1F202}' .
+			'\\x{1F210}-\\x{1F23B}' .
+			'\\x{1F240}-\\x{1F248}' .
+			'\\x{1F250}-\\x{1F251}' .
+			'\\x{1FBF0}-\\x{1FBF9}' .
+			'\\x{2F800}-\\x{2FA1D}' .
+			'\\x{0300}-\\x{0304}' .
+			'\\x{0306}-\\x{030C}' .
+			'\\x{030F}' .
+			'\\x{0311}' .
+			'\\x{0313}-\\x{0314}' .
+			'\\x{031B}' .
+			'\\x{0323}-\\x{0328}' .
+			'\\x{032D}-\\x{032E}' .
+			'\\x{0330}-\\x{0331}' .
+			'\\x{0338}' .
+			'\\x{0342}' .
+			'\\x{0345}' .
+			'\\x{0653}-\\x{0655}' .
+			'\\x{093C}' .
+			'\\x{09BE}' .
+			'\\x{09D7}' .
+			'\\x{0B3E}' .
+			'\\x{0B56}-\\x{0B57}' .
+			'\\x{0BBE}' .
+			'\\x{0BD7}' .
+			'\\x{0C56}' .
+			'\\x{0CC2}' .
+			'\\x{0CD5}-\\x{0CD6}' .
+			'\\x{0D3E}' .
+			'\\x{0D57}' .
+			'\\x{0DCA}' .
+			'\\x{0DCF}' .
+			'\\x{0DDF}' .
+			'\\x{102E}' .
+			'\\x{1161}-\\x{1175}' .
+			'\\x{11A8}-\\x{11C2}' .
+			'\\x{1B35}' .
+			'\\x{3099}-\\x{309A}' .
+			'\\x{110BA}' .
+			'\\x{11127}' .
+			'\\x{1133E}' .
+			'\\x{11357}' .
+			'\\x{114B0}' .
+			'\\x{114BA}' .
+			'\\x{114BD}' .
+			'\\x{115AF}' .
+			'\\x{11930}',
 		'NFD_QC' =>
-			'\x{00C0}-\x{00C5}' .
-			'\x{00C7}-\x{00CF}' .
-			'\x{00D1}-\x{00D6}' .
-			'\x{00D9}-\x{00DD}' .
-			'\x{00E0}-\x{00E5}' .
-			'\x{00E7}-\x{00EF}' .
-			'\x{00F1}-\x{00F6}' .
-			'\x{00F9}-\x{00FD}' .
-			'\x{00FF}-\x{010F}' .
-			'\x{0112}-\x{0125}' .
-			'\x{0128}-\x{0130}' .
-			'\x{0134}-\x{0137}' .
-			'\x{0139}-\x{013E}' .
-			'\x{0143}-\x{0148}' .
-			'\x{014C}-\x{0151}' .
-			'\x{0154}-\x{0165}' .
-			'\x{0168}-\x{017E}' .
-			'\x{01A0}-\x{01A1}' .
-			'\x{01AF}-\x{01B0}' .
-			'\x{01CD}-\x{01DC}' .
-			'\x{01DE}-\x{01E3}' .
-			'\x{01E6}-\x{01F0}' .
-			'\x{01F4}-\x{01F5}' .
-			'\x{01F8}-\x{021B}' .
-			'\x{021E}-\x{021F}' .
-			'\x{0226}-\x{0233}' .
-			'\x{0340}-\x{0341}' .
-			'\x{0343}-\x{0344}' .
-			'\x{0374}' .
-			'\x{037E}' .
-			'\x{0385}-\x{038A}' .
-			'\x{038C}' .
-			'\x{038E}-\x{0390}' .
-			'\x{03AA}-\x{03B0}' .
-			'\x{03CA}-\x{03CE}' .
-			'\x{03D3}-\x{03D4}' .
-			'\x{0400}-\x{0401}' .
-			'\x{0403}' .
-			'\x{0407}' .
-			'\x{040C}-\x{040E}' .
-			'\x{0419}' .
-			'\x{0439}' .
-			'\x{0450}-\x{0451}' .
-			'\x{0453}' .
-			'\x{0457}' .
-			'\x{045C}-\x{045E}' .
-			'\x{0476}-\x{0477}' .
-			'\x{04C1}-\x{04C2}' .
-			'\x{04D0}-\x{04D3}' .
-			'\x{04D6}-\x{04D7}' .
-			'\x{04DA}-\x{04DF}' .
-			'\x{04E2}-\x{04E7}' .
-			'\x{04EA}-\x{04F5}' .
-			'\x{04F8}-\x{04F9}' .
-			'\x{0622}-\x{0626}' .
-			'\x{06C0}' .
-			'\x{06C2}' .
-			'\x{06D3}' .
-			'\x{0929}' .
-			'\x{0931}' .
-			'\x{0934}' .
-			'\x{0958}-\x{095F}' .
-			'\x{09CB}-\x{09CC}' .
-			'\x{09DC}-\x{09DD}' .
-			'\x{09DF}' .
-			'\x{0A33}' .
-			'\x{0A36}' .
-			'\x{0A59}-\x{0A5B}' .
-			'\x{0A5E}' .
-			'\x{0B48}' .
-			'\x{0B4B}-\x{0B4C}' .
-			'\x{0B5C}-\x{0B5D}' .
-			'\x{0B94}' .
-			'\x{0BCA}-\x{0BCC}' .
-			'\x{0C48}' .
-			'\x{0CC0}' .
-			'\x{0CC7}-\x{0CC8}' .
-			'\x{0CCA}-\x{0CCB}' .
-			'\x{0D4A}-\x{0D4C}' .
-			'\x{0DDA}' .
-			'\x{0DDC}-\x{0DDE}' .
-			'\x{0F43}' .
-			'\x{0F4D}' .
-			'\x{0F52}' .
-			'\x{0F57}' .
-			'\x{0F5C}' .
-			'\x{0F69}' .
-			'\x{0F73}' .
-			'\x{0F75}-\x{0F76}' .
-			'\x{0F78}' .
-			'\x{0F81}' .
-			'\x{0F93}' .
-			'\x{0F9D}' .
-			'\x{0FA2}' .
-			'\x{0FA7}' .
-			'\x{0FAC}' .
-			'\x{0FB9}' .
-			'\x{1026}' .
-			'\x{1B06}' .
-			'\x{1B08}' .
-			'\x{1B0A}' .
-			'\x{1B0C}' .
-			'\x{1B0E}' .
-			'\x{1B12}' .
-			'\x{1B3B}' .
-			'\x{1B3D}' .
-			'\x{1B40}-\x{1B41}' .
-			'\x{1B43}' .
-			'\x{1E00}-\x{1E99}' .
-			'\x{1E9B}' .
-			'\x{1EA0}-\x{1EF9}' .
-			'\x{1F00}-\x{1F15}' .
-			'\x{1F18}-\x{1F1D}' .
-			'\x{1F20}-\x{1F45}' .
-			'\x{1F48}-\x{1F4D}' .
-			'\x{1F50}-\x{1F57}' .
-			'\x{1F59}' .
-			'\x{1F5B}' .
-			'\x{1F5D}' .
-			'\x{1F5F}-\x{1F7D}' .
-			'\x{1F80}-\x{1FB4}' .
-			'\x{1FB6}-\x{1FBC}' .
-			'\x{1FBE}' .
-			'\x{1FC1}-\x{1FC4}' .
-			'\x{1FC6}-\x{1FD3}' .
-			'\x{1FD6}-\x{1FDB}' .
-			'\x{1FDD}-\x{1FEF}' .
-			'\x{1FF2}-\x{1FF4}' .
-			'\x{1FF6}-\x{1FFD}' .
-			'\x{2000}-\x{2001}' .
-			'\x{2126}' .
-			'\x{212A}-\x{212B}' .
-			'\x{219A}-\x{219B}' .
-			'\x{21AE}' .
-			'\x{21CD}-\x{21CF}' .
-			'\x{2204}' .
-			'\x{2209}' .
-			'\x{220C}' .
-			'\x{2224}' .
-			'\x{2226}' .
-			'\x{2241}' .
-			'\x{2244}' .
-			'\x{2247}' .
-			'\x{2249}' .
-			'\x{2260}' .
-			'\x{2262}' .
-			'\x{226D}-\x{2271}' .
-			'\x{2274}-\x{2275}' .
-			'\x{2278}-\x{2279}' .
-			'\x{2280}-\x{2281}' .
-			'\x{2284}-\x{2285}' .
-			'\x{2288}-\x{2289}' .
-			'\x{22AC}-\x{22AF}' .
-			'\x{22E0}-\x{22E3}' .
-			'\x{22EA}-\x{22ED}' .
-			'\x{2329}-\x{232A}' .
-			'\x{2ADC}' .
-			'\x{304C}' .
-			'\x{304E}' .
-			'\x{3050}' .
-			'\x{3052}' .
-			'\x{3054}' .
-			'\x{3056}' .
-			'\x{3058}' .
-			'\x{305A}' .
-			'\x{305C}' .
-			'\x{305E}' .
-			'\x{3060}' .
-			'\x{3062}' .
-			'\x{3065}' .
-			'\x{3067}' .
-			'\x{3069}' .
-			'\x{3070}-\x{3071}' .
-			'\x{3073}-\x{3074}' .
-			'\x{3076}-\x{3077}' .
-			'\x{3079}-\x{307A}' .
-			'\x{307C}-\x{307D}' .
-			'\x{3094}' .
-			'\x{309E}' .
-			'\x{30AC}' .
-			'\x{30AE}' .
-			'\x{30B0}' .
-			'\x{30B2}' .
-			'\x{30B4}' .
-			'\x{30B6}' .
-			'\x{30B8}' .
-			'\x{30BA}' .
-			'\x{30BC}' .
-			'\x{30BE}' .
-			'\x{30C0}' .
-			'\x{30C2}' .
-			'\x{30C5}' .
-			'\x{30C7}' .
-			'\x{30C9}' .
-			'\x{30D0}-\x{30D1}' .
-			'\x{30D3}-\x{30D4}' .
-			'\x{30D6}-\x{30D7}' .
-			'\x{30D9}-\x{30DA}' .
-			'\x{30DC}-\x{30DD}' .
-			'\x{30F4}' .
-			'\x{30F7}-\x{30FA}' .
-			'\x{30FE}' .
-			'\x{AC00}-\x{D7A3}' .
-			'\x{F900}-\x{FA0D}' .
-			'\x{FA10}' .
-			'\x{FA12}' .
-			'\x{FA15}-\x{FA1E}' .
-			'\x{FA20}' .
-			'\x{FA22}' .
-			'\x{FA25}-\x{FA26}' .
-			'\x{FA2A}-\x{FA6D}' .
-			'\x{FA70}-\x{FAD9}' .
-			'\x{FB1D}' .
-			'\x{FB1F}' .
-			'\x{FB2A}-\x{FB36}' .
-			'\x{FB38}-\x{FB3C}' .
-			'\x{FB3E}' .
-			'\x{FB40}-\x{FB41}' .
-			'\x{FB43}-\x{FB44}' .
-			'\x{FB46}-\x{FB4E}' .
-			'\x{1109A}' .
-			'\x{1109C}' .
-			'\x{110AB}' .
-			'\x{1112E}-\x{1112F}' .
-			'\x{1134B}-\x{1134C}' .
-			'\x{114BB}-\x{114BC}' .
-			'\x{114BE}' .
-			'\x{115BA}-\x{115BB}' .
-			'\x{11938}' .
-			'\x{1D15E}-\x{1D164}' .
-			'\x{1D1BB}-\x{1D1C0}' .
-			'\x{2F800}-\x{2FA1D}',
+			'\\x{00C0}-\\x{00C5}' .
+			'\\x{00C7}-\\x{00CF}' .
+			'\\x{00D1}-\\x{00D6}' .
+			'\\x{00D9}-\\x{00DD}' .
+			'\\x{00E0}-\\x{00E5}' .
+			'\\x{00E7}-\\x{00EF}' .
+			'\\x{00F1}-\\x{00F6}' .
+			'\\x{00F9}-\\x{00FD}' .
+			'\\x{00FF}-\\x{010F}' .
+			'\\x{0112}-\\x{0125}' .
+			'\\x{0128}-\\x{0130}' .
+			'\\x{0134}-\\x{0137}' .
+			'\\x{0139}-\\x{013E}' .
+			'\\x{0143}-\\x{0148}' .
+			'\\x{014C}-\\x{0151}' .
+			'\\x{0154}-\\x{0165}' .
+			'\\x{0168}-\\x{017E}' .
+			'\\x{01A0}-\\x{01A1}' .
+			'\\x{01AF}-\\x{01B0}' .
+			'\\x{01CD}-\\x{01DC}' .
+			'\\x{01DE}-\\x{01E3}' .
+			'\\x{01E6}-\\x{01F0}' .
+			'\\x{01F4}-\\x{01F5}' .
+			'\\x{01F8}-\\x{021B}' .
+			'\\x{021E}-\\x{021F}' .
+			'\\x{0226}-\\x{0233}' .
+			'\\x{0340}-\\x{0341}' .
+			'\\x{0343}-\\x{0344}' .
+			'\\x{0374}' .
+			'\\x{037E}' .
+			'\\x{0385}-\\x{038A}' .
+			'\\x{038C}' .
+			'\\x{038E}-\\x{0390}' .
+			'\\x{03AA}-\\x{03B0}' .
+			'\\x{03CA}-\\x{03CE}' .
+			'\\x{03D3}-\\x{03D4}' .
+			'\\x{0400}-\\x{0401}' .
+			'\\x{0403}' .
+			'\\x{0407}' .
+			'\\x{040C}-\\x{040E}' .
+			'\\x{0419}' .
+			'\\x{0439}' .
+			'\\x{0450}-\\x{0451}' .
+			'\\x{0453}' .
+			'\\x{0457}' .
+			'\\x{045C}-\\x{045E}' .
+			'\\x{0476}-\\x{0477}' .
+			'\\x{04C1}-\\x{04C2}' .
+			'\\x{04D0}-\\x{04D3}' .
+			'\\x{04D6}-\\x{04D7}' .
+			'\\x{04DA}-\\x{04DF}' .
+			'\\x{04E2}-\\x{04E7}' .
+			'\\x{04EA}-\\x{04F5}' .
+			'\\x{04F8}-\\x{04F9}' .
+			'\\x{0622}-\\x{0626}' .
+			'\\x{06C0}' .
+			'\\x{06C2}' .
+			'\\x{06D3}' .
+			'\\x{0929}' .
+			'\\x{0931}' .
+			'\\x{0934}' .
+			'\\x{0958}-\\x{095F}' .
+			'\\x{09CB}-\\x{09CC}' .
+			'\\x{09DC}-\\x{09DD}' .
+			'\\x{09DF}' .
+			'\\x{0A33}' .
+			'\\x{0A36}' .
+			'\\x{0A59}-\\x{0A5B}' .
+			'\\x{0A5E}' .
+			'\\x{0B48}' .
+			'\\x{0B4B}-\\x{0B4C}' .
+			'\\x{0B5C}-\\x{0B5D}' .
+			'\\x{0B94}' .
+			'\\x{0BCA}-\\x{0BCC}' .
+			'\\x{0C48}' .
+			'\\x{0CC0}' .
+			'\\x{0CC7}-\\x{0CC8}' .
+			'\\x{0CCA}-\\x{0CCB}' .
+			'\\x{0D4A}-\\x{0D4C}' .
+			'\\x{0DDA}' .
+			'\\x{0DDC}-\\x{0DDE}' .
+			'\\x{0F43}' .
+			'\\x{0F4D}' .
+			'\\x{0F52}' .
+			'\\x{0F57}' .
+			'\\x{0F5C}' .
+			'\\x{0F69}' .
+			'\\x{0F73}' .
+			'\\x{0F75}-\\x{0F76}' .
+			'\\x{0F78}' .
+			'\\x{0F81}' .
+			'\\x{0F93}' .
+			'\\x{0F9D}' .
+			'\\x{0FA2}' .
+			'\\x{0FA7}' .
+			'\\x{0FAC}' .
+			'\\x{0FB9}' .
+			'\\x{1026}' .
+			'\\x{1B06}' .
+			'\\x{1B08}' .
+			'\\x{1B0A}' .
+			'\\x{1B0C}' .
+			'\\x{1B0E}' .
+			'\\x{1B12}' .
+			'\\x{1B3B}' .
+			'\\x{1B3D}' .
+			'\\x{1B40}-\\x{1B41}' .
+			'\\x{1B43}' .
+			'\\x{1E00}-\\x{1E99}' .
+			'\\x{1E9B}' .
+			'\\x{1EA0}-\\x{1EF9}' .
+			'\\x{1F00}-\\x{1F15}' .
+			'\\x{1F18}-\\x{1F1D}' .
+			'\\x{1F20}-\\x{1F45}' .
+			'\\x{1F48}-\\x{1F4D}' .
+			'\\x{1F50}-\\x{1F57}' .
+			'\\x{1F59}' .
+			'\\x{1F5B}' .
+			'\\x{1F5D}' .
+			'\\x{1F5F}-\\x{1F7D}' .
+			'\\x{1F80}-\\x{1FB4}' .
+			'\\x{1FB6}-\\x{1FBC}' .
+			'\\x{1FBE}' .
+			'\\x{1FC1}-\\x{1FC4}' .
+			'\\x{1FC6}-\\x{1FD3}' .
+			'\\x{1FD6}-\\x{1FDB}' .
+			'\\x{1FDD}-\\x{1FEF}' .
+			'\\x{1FF2}-\\x{1FF4}' .
+			'\\x{1FF6}-\\x{1FFD}' .
+			'\\x{2000}-\\x{2001}' .
+			'\\x{2126}' .
+			'\\x{212A}-\\x{212B}' .
+			'\\x{219A}-\\x{219B}' .
+			'\\x{21AE}' .
+			'\\x{21CD}-\\x{21CF}' .
+			'\\x{2204}' .
+			'\\x{2209}' .
+			'\\x{220C}' .
+			'\\x{2224}' .
+			'\\x{2226}' .
+			'\\x{2241}' .
+			'\\x{2244}' .
+			'\\x{2247}' .
+			'\\x{2249}' .
+			'\\x{2260}' .
+			'\\x{2262}' .
+			'\\x{226D}-\\x{2271}' .
+			'\\x{2274}-\\x{2275}' .
+			'\\x{2278}-\\x{2279}' .
+			'\\x{2280}-\\x{2281}' .
+			'\\x{2284}-\\x{2285}' .
+			'\\x{2288}-\\x{2289}' .
+			'\\x{22AC}-\\x{22AF}' .
+			'\\x{22E0}-\\x{22E3}' .
+			'\\x{22EA}-\\x{22ED}' .
+			'\\x{2329}-\\x{232A}' .
+			'\\x{2ADC}' .
+			'\\x{304C}' .
+			'\\x{304E}' .
+			'\\x{3050}' .
+			'\\x{3052}' .
+			'\\x{3054}' .
+			'\\x{3056}' .
+			'\\x{3058}' .
+			'\\x{305A}' .
+			'\\x{305C}' .
+			'\\x{305E}' .
+			'\\x{3060}' .
+			'\\x{3062}' .
+			'\\x{3065}' .
+			'\\x{3067}' .
+			'\\x{3069}' .
+			'\\x{3070}-\\x{3071}' .
+			'\\x{3073}-\\x{3074}' .
+			'\\x{3076}-\\x{3077}' .
+			'\\x{3079}-\\x{307A}' .
+			'\\x{307C}-\\x{307D}' .
+			'\\x{3094}' .
+			'\\x{309E}' .
+			'\\x{30AC}' .
+			'\\x{30AE}' .
+			'\\x{30B0}' .
+			'\\x{30B2}' .
+			'\\x{30B4}' .
+			'\\x{30B6}' .
+			'\\x{30B8}' .
+			'\\x{30BA}' .
+			'\\x{30BC}' .
+			'\\x{30BE}' .
+			'\\x{30C0}' .
+			'\\x{30C2}' .
+			'\\x{30C5}' .
+			'\\x{30C7}' .
+			'\\x{30C9}' .
+			'\\x{30D0}-\\x{30D1}' .
+			'\\x{30D3}-\\x{30D4}' .
+			'\\x{30D6}-\\x{30D7}' .
+			'\\x{30D9}-\\x{30DA}' .
+			'\\x{30DC}-\\x{30DD}' .
+			'\\x{30F4}' .
+			'\\x{30F7}-\\x{30FA}' .
+			'\\x{30FE}' .
+			'\\x{AC00}-\\x{D7A3}' .
+			'\\x{F900}-\\x{FA0D}' .
+			'\\x{FA10}' .
+			'\\x{FA12}' .
+			'\\x{FA15}-\\x{FA1E}' .
+			'\\x{FA20}' .
+			'\\x{FA22}' .
+			'\\x{FA25}-\\x{FA26}' .
+			'\\x{FA2A}-\\x{FA6D}' .
+			'\\x{FA70}-\\x{FAD9}' .
+			'\\x{FB1D}' .
+			'\\x{FB1F}' .
+			'\\x{FB2A}-\\x{FB36}' .
+			'\\x{FB38}-\\x{FB3C}' .
+			'\\x{FB3E}' .
+			'\\x{FB40}-\\x{FB41}' .
+			'\\x{FB43}-\\x{FB44}' .
+			'\\x{FB46}-\\x{FB4E}' .
+			'\\x{1109A}' .
+			'\\x{1109C}' .
+			'\\x{110AB}' .
+			'\\x{1112E}-\\x{1112F}' .
+			'\\x{1134B}-\\x{1134C}' .
+			'\\x{114BB}-\\x{114BC}' .
+			'\\x{114BE}' .
+			'\\x{115BA}-\\x{115BB}' .
+			'\\x{11938}' .
+			'\\x{1D15E}-\\x{1D164}' .
+			'\\x{1D1BB}-\\x{1D1C0}' .
+			'\\x{2F800}-\\x{2FA1D}',
 		'NFKD_QC' =>
-			'\x{00A0}' .
-			'\x{00A8}' .
-			'\x{00AA}' .
-			'\x{00AF}' .
-			'\x{00B2}-\x{00B5}' .
-			'\x{00B8}-\x{00BA}' .
-			'\x{00BC}-\x{00BE}' .
-			'\x{00C0}-\x{00C5}' .
-			'\x{00C7}-\x{00CF}' .
-			'\x{00D1}-\x{00D6}' .
-			'\x{00D9}-\x{00DD}' .
-			'\x{00E0}-\x{00E5}' .
-			'\x{00E7}-\x{00EF}' .
-			'\x{00F1}-\x{00F6}' .
-			'\x{00F9}-\x{00FD}' .
-			'\x{00FF}-\x{010F}' .
-			'\x{0112}-\x{0125}' .
-			'\x{0128}-\x{0130}' .
-			'\x{0132}-\x{0137}' .
-			'\x{0139}-\x{0140}' .
-			'\x{0143}-\x{0149}' .
-			'\x{014C}-\x{0151}' .
-			'\x{0154}-\x{0165}' .
-			'\x{0168}-\x{017F}' .
-			'\x{01A0}-\x{01A1}' .
-			'\x{01AF}-\x{01B0}' .
-			'\x{01C4}-\x{01DC}' .
-			'\x{01DE}-\x{01E3}' .
-			'\x{01E6}-\x{01F5}' .
-			'\x{01F8}-\x{021B}' .
-			'\x{021E}-\x{021F}' .
-			'\x{0226}-\x{0233}' .
-			'\x{02B0}-\x{02B8}' .
-			'\x{02D8}-\x{02DD}' .
-			'\x{02E0}-\x{02E4}' .
-			'\x{0340}-\x{0341}' .
-			'\x{0343}-\x{0344}' .
-			'\x{0374}' .
-			'\x{037A}' .
-			'\x{037E}' .
-			'\x{0384}-\x{038A}' .
-			'\x{038C}' .
-			'\x{038E}-\x{0390}' .
-			'\x{03AA}-\x{03B0}' .
-			'\x{03CA}-\x{03CE}' .
-			'\x{03D0}-\x{03D6}' .
-			'\x{03F0}-\x{03F2}' .
-			'\x{03F4}-\x{03F5}' .
-			'\x{03F9}' .
-			'\x{0400}-\x{0401}' .
-			'\x{0403}' .
-			'\x{0407}' .
-			'\x{040C}-\x{040E}' .
-			'\x{0419}' .
-			'\x{0439}' .
-			'\x{0450}-\x{0451}' .
-			'\x{0453}' .
-			'\x{0457}' .
-			'\x{045C}-\x{045E}' .
-			'\x{0476}-\x{0477}' .
-			'\x{04C1}-\x{04C2}' .
-			'\x{04D0}-\x{04D3}' .
-			'\x{04D6}-\x{04D7}' .
-			'\x{04DA}-\x{04DF}' .
-			'\x{04E2}-\x{04E7}' .
-			'\x{04EA}-\x{04F5}' .
-			'\x{04F8}-\x{04F9}' .
-			'\x{0587}' .
-			'\x{0622}-\x{0626}' .
-			'\x{0675}-\x{0678}' .
-			'\x{06C0}' .
-			'\x{06C2}' .
-			'\x{06D3}' .
-			'\x{0929}' .
-			'\x{0931}' .
-			'\x{0934}' .
-			'\x{0958}-\x{095F}' .
-			'\x{09CB}-\x{09CC}' .
-			'\x{09DC}-\x{09DD}' .
-			'\x{09DF}' .
-			'\x{0A33}' .
-			'\x{0A36}' .
-			'\x{0A59}-\x{0A5B}' .
-			'\x{0A5E}' .
-			'\x{0B48}' .
-			'\x{0B4B}-\x{0B4C}' .
-			'\x{0B5C}-\x{0B5D}' .
-			'\x{0B94}' .
-			'\x{0BCA}-\x{0BCC}' .
-			'\x{0C48}' .
-			'\x{0CC0}' .
-			'\x{0CC7}-\x{0CC8}' .
-			'\x{0CCA}-\x{0CCB}' .
-			'\x{0D4A}-\x{0D4C}' .
-			'\x{0DDA}' .
-			'\x{0DDC}-\x{0DDE}' .
-			'\x{0E33}' .
-			'\x{0EB3}' .
-			'\x{0EDC}-\x{0EDD}' .
-			'\x{0F0C}' .
-			'\x{0F43}' .
-			'\x{0F4D}' .
-			'\x{0F52}' .
-			'\x{0F57}' .
-			'\x{0F5C}' .
-			'\x{0F69}' .
-			'\x{0F73}' .
-			'\x{0F75}-\x{0F79}' .
-			'\x{0F81}' .
-			'\x{0F93}' .
-			'\x{0F9D}' .
-			'\x{0FA2}' .
-			'\x{0FA7}' .
-			'\x{0FAC}' .
-			'\x{0FB9}' .
-			'\x{1026}' .
-			'\x{10FC}' .
-			'\x{1B06}' .
-			'\x{1B08}' .
-			'\x{1B0A}' .
-			'\x{1B0C}' .
-			'\x{1B0E}' .
-			'\x{1B12}' .
-			'\x{1B3B}' .
-			'\x{1B3D}' .
-			'\x{1B40}-\x{1B41}' .
-			'\x{1B43}' .
-			'\x{1D2C}-\x{1D2E}' .
-			'\x{1D30}-\x{1D3A}' .
-			'\x{1D3C}-\x{1D4D}' .
-			'\x{1D4F}-\x{1D6A}' .
-			'\x{1D78}' .
-			'\x{1D9B}-\x{1DBF}' .
-			'\x{1E00}-\x{1E9B}' .
-			'\x{1EA0}-\x{1EF9}' .
-			'\x{1F00}-\x{1F15}' .
-			'\x{1F18}-\x{1F1D}' .
-			'\x{1F20}-\x{1F45}' .
-			'\x{1F48}-\x{1F4D}' .
-			'\x{1F50}-\x{1F57}' .
-			'\x{1F59}' .
-			'\x{1F5B}' .
-			'\x{1F5D}' .
-			'\x{1F5F}-\x{1F7D}' .
-			'\x{1F80}-\x{1FB4}' .
-			'\x{1FB6}-\x{1FC4}' .
-			'\x{1FC6}-\x{1FD3}' .
-			'\x{1FD6}-\x{1FDB}' .
-			'\x{1FDD}-\x{1FEF}' .
-			'\x{1FF2}-\x{1FF4}' .
-			'\x{1FF6}-\x{1FFE}' .
-			'\x{2000}-\x{200A}' .
-			'\x{2011}' .
-			'\x{2017}' .
-			'\x{2024}-\x{2026}' .
-			'\x{202F}' .
-			'\x{2033}-\x{2034}' .
-			'\x{2036}-\x{2037}' .
-			'\x{203C}' .
-			'\x{203E}' .
-			'\x{2047}-\x{2049}' .
-			'\x{2057}' .
-			'\x{205F}' .
-			'\x{2070}-\x{2071}' .
-			'\x{2074}-\x{208E}' .
-			'\x{2090}-\x{209C}' .
-			'\x{20A8}' .
-			'\x{2100}-\x{2103}' .
-			'\x{2105}-\x{2107}' .
-			'\x{2109}-\x{2113}' .
-			'\x{2115}-\x{2116}' .
-			'\x{2119}-\x{211D}' .
-			'\x{2120}-\x{2122}' .
-			'\x{2124}' .
-			'\x{2126}' .
-			'\x{2128}' .
-			'\x{212A}-\x{212D}' .
-			'\x{212F}-\x{2131}' .
-			'\x{2133}-\x{2139}' .
-			'\x{213B}-\x{2140}' .
-			'\x{2145}-\x{2149}' .
-			'\x{2150}-\x{217F}' .
-			'\x{2189}' .
-			'\x{219A}-\x{219B}' .
-			'\x{21AE}' .
-			'\x{21CD}-\x{21CF}' .
-			'\x{2204}' .
-			'\x{2209}' .
-			'\x{220C}' .
-			'\x{2224}' .
-			'\x{2226}' .
-			'\x{222C}-\x{222D}' .
-			'\x{222F}-\x{2230}' .
-			'\x{2241}' .
-			'\x{2244}' .
-			'\x{2247}' .
-			'\x{2249}' .
-			'\x{2260}' .
-			'\x{2262}' .
-			'\x{226D}-\x{2271}' .
-			'\x{2274}-\x{2275}' .
-			'\x{2278}-\x{2279}' .
-			'\x{2280}-\x{2281}' .
-			'\x{2284}-\x{2285}' .
-			'\x{2288}-\x{2289}' .
-			'\x{22AC}-\x{22AF}' .
-			'\x{22E0}-\x{22E3}' .
-			'\x{22EA}-\x{22ED}' .
-			'\x{2329}-\x{232A}' .
-			'\x{2460}-\x{24EA}' .
-			'\x{2A0C}' .
-			'\x{2A74}-\x{2A76}' .
-			'\x{2ADC}' .
-			'\x{2C7C}-\x{2C7D}' .
-			'\x{2D6F}' .
-			'\x{2E9F}' .
-			'\x{2EF3}' .
-			'\x{2F00}-\x{2FD5}' .
-			'\x{3000}' .
-			'\x{3036}' .
-			'\x{3038}-\x{303A}' .
-			'\x{304C}' .
-			'\x{304E}' .
-			'\x{3050}' .
-			'\x{3052}' .
-			'\x{3054}' .
-			'\x{3056}' .
-			'\x{3058}' .
-			'\x{305A}' .
-			'\x{305C}' .
-			'\x{305E}' .
-			'\x{3060}' .
-			'\x{3062}' .
-			'\x{3065}' .
-			'\x{3067}' .
-			'\x{3069}' .
-			'\x{3070}-\x{3071}' .
-			'\x{3073}-\x{3074}' .
-			'\x{3076}-\x{3077}' .
-			'\x{3079}-\x{307A}' .
-			'\x{307C}-\x{307D}' .
-			'\x{3094}' .
-			'\x{309B}-\x{309C}' .
-			'\x{309E}-\x{309F}' .
-			'\x{30AC}' .
-			'\x{30AE}' .
-			'\x{30B0}' .
-			'\x{30B2}' .
-			'\x{30B4}' .
-			'\x{30B6}' .
-			'\x{30B8}' .
-			'\x{30BA}' .
-			'\x{30BC}' .
-			'\x{30BE}' .
-			'\x{30C0}' .
-			'\x{30C2}' .
-			'\x{30C5}' .
-			'\x{30C7}' .
-			'\x{30C9}' .
-			'\x{30D0}-\x{30D1}' .
-			'\x{30D3}-\x{30D4}' .
-			'\x{30D6}-\x{30D7}' .
-			'\x{30D9}-\x{30DA}' .
-			'\x{30DC}-\x{30DD}' .
-			'\x{30F4}' .
-			'\x{30F7}-\x{30FA}' .
-			'\x{30FE}-\x{30FF}' .
-			'\x{3131}-\x{318E}' .
-			'\x{3192}-\x{319F}' .
-			'\x{3200}-\x{321E}' .
-			'\x{3220}-\x{3247}' .
-			'\x{3250}-\x{327E}' .
-			'\x{3280}-\x{33FF}' .
-			'\x{A69C}-\x{A69D}' .
-			'\x{A770}' .
-			'\x{A7F2}-\x{A7F4}' .
-			'\x{A7F8}-\x{A7F9}' .
-			'\x{AB5C}-\x{AB5F}' .
-			'\x{AB69}' .
-			'\x{AC00}-\x{D7A3}' .
-			'\x{F900}-\x{FA0D}' .
-			'\x{FA10}' .
-			'\x{FA12}' .
-			'\x{FA15}-\x{FA1E}' .
-			'\x{FA20}' .
-			'\x{FA22}' .
-			'\x{FA25}-\x{FA26}' .
-			'\x{FA2A}-\x{FA6D}' .
-			'\x{FA70}-\x{FAD9}' .
-			'\x{FB00}-\x{FB06}' .
-			'\x{FB13}-\x{FB17}' .
-			'\x{FB1D}' .
-			'\x{FB1F}-\x{FB36}' .
-			'\x{FB38}-\x{FB3C}' .
-			'\x{FB3E}' .
-			'\x{FB40}-\x{FB41}' .
-			'\x{FB43}-\x{FB44}' .
-			'\x{FB46}-\x{FBB1}' .
-			'\x{FBD3}-\x{FD3D}' .
-			'\x{FD50}-\x{FD8F}' .
-			'\x{FD92}-\x{FDC7}' .
-			'\x{FDF0}-\x{FDFC}' .
-			'\x{FE10}-\x{FE19}' .
-			'\x{FE30}-\x{FE44}' .
-			'\x{FE47}-\x{FE52}' .
-			'\x{FE54}-\x{FE66}' .
-			'\x{FE68}-\x{FE6B}' .
-			'\x{FE70}-\x{FE72}' .
-			'\x{FE74}' .
-			'\x{FE76}-\x{FEFC}' .
-			'\x{FF01}-\x{FFBE}' .
-			'\x{FFC2}-\x{FFC7}' .
-			'\x{FFCA}-\x{FFCF}' .
-			'\x{FFD2}-\x{FFD7}' .
-			'\x{FFDA}-\x{FFDC}' .
-			'\x{FFE0}-\x{FFE6}' .
-			'\x{FFE8}-\x{FFEE}' .
-			'\x{10781}-\x{10785}' .
-			'\x{10787}-\x{107B0}' .
-			'\x{107B2}-\x{107BA}' .
-			'\x{1109A}' .
-			'\x{1109C}' .
-			'\x{110AB}' .
-			'\x{1112E}-\x{1112F}' .
-			'\x{1134B}-\x{1134C}' .
-			'\x{114BB}-\x{114BC}' .
-			'\x{114BE}' .
-			'\x{115BA}-\x{115BB}' .
-			'\x{11938}' .
-			'\x{1D15E}-\x{1D164}' .
-			'\x{1D1BB}-\x{1D1C0}' .
-			'\x{1D400}-\x{1D454}' .
-			'\x{1D456}-\x{1D49C}' .
-			'\x{1D49E}-\x{1D49F}' .
-			'\x{1D4A2}' .
-			'\x{1D4A5}-\x{1D4A6}' .
-			'\x{1D4A9}-\x{1D4AC}' .
-			'\x{1D4AE}-\x{1D4B9}' .
-			'\x{1D4BB}' .
-			'\x{1D4BD}-\x{1D4C3}' .
-			'\x{1D4C5}-\x{1D505}' .
-			'\x{1D507}-\x{1D50A}' .
-			'\x{1D50D}-\x{1D514}' .
-			'\x{1D516}-\x{1D51C}' .
-			'\x{1D51E}-\x{1D539}' .
-			'\x{1D53B}-\x{1D53E}' .
-			'\x{1D540}-\x{1D544}' .
-			'\x{1D546}' .
-			'\x{1D54A}-\x{1D550}' .
-			'\x{1D552}-\x{1D6A5}' .
-			'\x{1D6A8}-\x{1D7CB}' .
-			'\x{1D7CE}-\x{1D7FF}' .
-			'\x{1E030}-\x{1E06D}' .
-			'\x{1EE00}-\x{1EE03}' .
-			'\x{1EE05}-\x{1EE1F}' .
-			'\x{1EE21}-\x{1EE22}' .
-			'\x{1EE24}' .
-			'\x{1EE27}' .
-			'\x{1EE29}-\x{1EE32}' .
-			'\x{1EE34}-\x{1EE37}' .
-			'\x{1EE39}' .
-			'\x{1EE3B}' .
-			'\x{1EE42}' .
-			'\x{1EE47}' .
-			'\x{1EE49}' .
-			'\x{1EE4B}' .
-			'\x{1EE4D}-\x{1EE4F}' .
-			'\x{1EE51}-\x{1EE52}' .
-			'\x{1EE54}' .
-			'\x{1EE57}' .
-			'\x{1EE59}' .
-			'\x{1EE5B}' .
-			'\x{1EE5D}' .
-			'\x{1EE5F}' .
-			'\x{1EE61}-\x{1EE62}' .
-			'\x{1EE64}' .
-			'\x{1EE67}-\x{1EE6A}' .
-			'\x{1EE6C}-\x{1EE72}' .
-			'\x{1EE74}-\x{1EE77}' .
-			'\x{1EE79}-\x{1EE7C}' .
-			'\x{1EE7E}' .
-			'\x{1EE80}-\x{1EE89}' .
-			'\x{1EE8B}-\x{1EE9B}' .
-			'\x{1EEA1}-\x{1EEA3}' .
-			'\x{1EEA5}-\x{1EEA9}' .
-			'\x{1EEAB}-\x{1EEBB}' .
-			'\x{1F100}-\x{1F10A}' .
-			'\x{1F110}-\x{1F12E}' .
-			'\x{1F130}-\x{1F14F}' .
-			'\x{1F16A}-\x{1F16C}' .
-			'\x{1F190}' .
-			'\x{1F200}-\x{1F202}' .
-			'\x{1F210}-\x{1F23B}' .
-			'\x{1F240}-\x{1F248}' .
-			'\x{1F250}-\x{1F251}' .
-			'\x{1FBF0}-\x{1FBF9}' .
-			'\x{2F800}-\x{2FA1D}',
+			'\\x{00A0}' .
+			'\\x{00A8}' .
+			'\\x{00AA}' .
+			'\\x{00AF}' .
+			'\\x{00B2}-\\x{00B5}' .
+			'\\x{00B8}-\\x{00BA}' .
+			'\\x{00BC}-\\x{00BE}' .
+			'\\x{00C0}-\\x{00C5}' .
+			'\\x{00C7}-\\x{00CF}' .
+			'\\x{00D1}-\\x{00D6}' .
+			'\\x{00D9}-\\x{00DD}' .
+			'\\x{00E0}-\\x{00E5}' .
+			'\\x{00E7}-\\x{00EF}' .
+			'\\x{00F1}-\\x{00F6}' .
+			'\\x{00F9}-\\x{00FD}' .
+			'\\x{00FF}-\\x{010F}' .
+			'\\x{0112}-\\x{0125}' .
+			'\\x{0128}-\\x{0130}' .
+			'\\x{0132}-\\x{0137}' .
+			'\\x{0139}-\\x{0140}' .
+			'\\x{0143}-\\x{0149}' .
+			'\\x{014C}-\\x{0151}' .
+			'\\x{0154}-\\x{0165}' .
+			'\\x{0168}-\\x{017F}' .
+			'\\x{01A0}-\\x{01A1}' .
+			'\\x{01AF}-\\x{01B0}' .
+			'\\x{01C4}-\\x{01DC}' .
+			'\\x{01DE}-\\x{01E3}' .
+			'\\x{01E6}-\\x{01F5}' .
+			'\\x{01F8}-\\x{021B}' .
+			'\\x{021E}-\\x{021F}' .
+			'\\x{0226}-\\x{0233}' .
+			'\\x{02B0}-\\x{02B8}' .
+			'\\x{02D8}-\\x{02DD}' .
+			'\\x{02E0}-\\x{02E4}' .
+			'\\x{0340}-\\x{0341}' .
+			'\\x{0343}-\\x{0344}' .
+			'\\x{0374}' .
+			'\\x{037A}' .
+			'\\x{037E}' .
+			'\\x{0384}-\\x{038A}' .
+			'\\x{038C}' .
+			'\\x{038E}-\\x{0390}' .
+			'\\x{03AA}-\\x{03B0}' .
+			'\\x{03CA}-\\x{03CE}' .
+			'\\x{03D0}-\\x{03D6}' .
+			'\\x{03F0}-\\x{03F2}' .
+			'\\x{03F4}-\\x{03F5}' .
+			'\\x{03F9}' .
+			'\\x{0400}-\\x{0401}' .
+			'\\x{0403}' .
+			'\\x{0407}' .
+			'\\x{040C}-\\x{040E}' .
+			'\\x{0419}' .
+			'\\x{0439}' .
+			'\\x{0450}-\\x{0451}' .
+			'\\x{0453}' .
+			'\\x{0457}' .
+			'\\x{045C}-\\x{045E}' .
+			'\\x{0476}-\\x{0477}' .
+			'\\x{04C1}-\\x{04C2}' .
+			'\\x{04D0}-\\x{04D3}' .
+			'\\x{04D6}-\\x{04D7}' .
+			'\\x{04DA}-\\x{04DF}' .
+			'\\x{04E2}-\\x{04E7}' .
+			'\\x{04EA}-\\x{04F5}' .
+			'\\x{04F8}-\\x{04F9}' .
+			'\\x{0587}' .
+			'\\x{0622}-\\x{0626}' .
+			'\\x{0675}-\\x{0678}' .
+			'\\x{06C0}' .
+			'\\x{06C2}' .
+			'\\x{06D3}' .
+			'\\x{0929}' .
+			'\\x{0931}' .
+			'\\x{0934}' .
+			'\\x{0958}-\\x{095F}' .
+			'\\x{09CB}-\\x{09CC}' .
+			'\\x{09DC}-\\x{09DD}' .
+			'\\x{09DF}' .
+			'\\x{0A33}' .
+			'\\x{0A36}' .
+			'\\x{0A59}-\\x{0A5B}' .
+			'\\x{0A5E}' .
+			'\\x{0B48}' .
+			'\\x{0B4B}-\\x{0B4C}' .
+			'\\x{0B5C}-\\x{0B5D}' .
+			'\\x{0B94}' .
+			'\\x{0BCA}-\\x{0BCC}' .
+			'\\x{0C48}' .
+			'\\x{0CC0}' .
+			'\\x{0CC7}-\\x{0CC8}' .
+			'\\x{0CCA}-\\x{0CCB}' .
+			'\\x{0D4A}-\\x{0D4C}' .
+			'\\x{0DDA}' .
+			'\\x{0DDC}-\\x{0DDE}' .
+			'\\x{0E33}' .
+			'\\x{0EB3}' .
+			'\\x{0EDC}-\\x{0EDD}' .
+			'\\x{0F0C}' .
+			'\\x{0F43}' .
+			'\\x{0F4D}' .
+			'\\x{0F52}' .
+			'\\x{0F57}' .
+			'\\x{0F5C}' .
+			'\\x{0F69}' .
+			'\\x{0F73}' .
+			'\\x{0F75}-\\x{0F79}' .
+			'\\x{0F81}' .
+			'\\x{0F93}' .
+			'\\x{0F9D}' .
+			'\\x{0FA2}' .
+			'\\x{0FA7}' .
+			'\\x{0FAC}' .
+			'\\x{0FB9}' .
+			'\\x{1026}' .
+			'\\x{10FC}' .
+			'\\x{1B06}' .
+			'\\x{1B08}' .
+			'\\x{1B0A}' .
+			'\\x{1B0C}' .
+			'\\x{1B0E}' .
+			'\\x{1B12}' .
+			'\\x{1B3B}' .
+			'\\x{1B3D}' .
+			'\\x{1B40}-\\x{1B41}' .
+			'\\x{1B43}' .
+			'\\x{1D2C}-\\x{1D2E}' .
+			'\\x{1D30}-\\x{1D3A}' .
+			'\\x{1D3C}-\\x{1D4D}' .
+			'\\x{1D4F}-\\x{1D6A}' .
+			'\\x{1D78}' .
+			'\\x{1D9B}-\\x{1DBF}' .
+			'\\x{1E00}-\\x{1E9B}' .
+			'\\x{1EA0}-\\x{1EF9}' .
+			'\\x{1F00}-\\x{1F15}' .
+			'\\x{1F18}-\\x{1F1D}' .
+			'\\x{1F20}-\\x{1F45}' .
+			'\\x{1F48}-\\x{1F4D}' .
+			'\\x{1F50}-\\x{1F57}' .
+			'\\x{1F59}' .
+			'\\x{1F5B}' .
+			'\\x{1F5D}' .
+			'\\x{1F5F}-\\x{1F7D}' .
+			'\\x{1F80}-\\x{1FB4}' .
+			'\\x{1FB6}-\\x{1FC4}' .
+			'\\x{1FC6}-\\x{1FD3}' .
+			'\\x{1FD6}-\\x{1FDB}' .
+			'\\x{1FDD}-\\x{1FEF}' .
+			'\\x{1FF2}-\\x{1FF4}' .
+			'\\x{1FF6}-\\x{1FFE}' .
+			'\\x{2000}-\\x{200A}' .
+			'\\x{2011}' .
+			'\\x{2017}' .
+			'\\x{2024}-\\x{2026}' .
+			'\\x{202F}' .
+			'\\x{2033}-\\x{2034}' .
+			'\\x{2036}-\\x{2037}' .
+			'\\x{203C}' .
+			'\\x{203E}' .
+			'\\x{2047}-\\x{2049}' .
+			'\\x{2057}' .
+			'\\x{205F}' .
+			'\\x{2070}-\\x{2071}' .
+			'\\x{2074}-\\x{208E}' .
+			'\\x{2090}-\\x{209C}' .
+			'\\x{20A8}' .
+			'\\x{2100}-\\x{2103}' .
+			'\\x{2105}-\\x{2107}' .
+			'\\x{2109}-\\x{2113}' .
+			'\\x{2115}-\\x{2116}' .
+			'\\x{2119}-\\x{211D}' .
+			'\\x{2120}-\\x{2122}' .
+			'\\x{2124}' .
+			'\\x{2126}' .
+			'\\x{2128}' .
+			'\\x{212A}-\\x{212D}' .
+			'\\x{212F}-\\x{2131}' .
+			'\\x{2133}-\\x{2139}' .
+			'\\x{213B}-\\x{2140}' .
+			'\\x{2145}-\\x{2149}' .
+			'\\x{2150}-\\x{217F}' .
+			'\\x{2189}' .
+			'\\x{219A}-\\x{219B}' .
+			'\\x{21AE}' .
+			'\\x{21CD}-\\x{21CF}' .
+			'\\x{2204}' .
+			'\\x{2209}' .
+			'\\x{220C}' .
+			'\\x{2224}' .
+			'\\x{2226}' .
+			'\\x{222C}-\\x{222D}' .
+			'\\x{222F}-\\x{2230}' .
+			'\\x{2241}' .
+			'\\x{2244}' .
+			'\\x{2247}' .
+			'\\x{2249}' .
+			'\\x{2260}' .
+			'\\x{2262}' .
+			'\\x{226D}-\\x{2271}' .
+			'\\x{2274}-\\x{2275}' .
+			'\\x{2278}-\\x{2279}' .
+			'\\x{2280}-\\x{2281}' .
+			'\\x{2284}-\\x{2285}' .
+			'\\x{2288}-\\x{2289}' .
+			'\\x{22AC}-\\x{22AF}' .
+			'\\x{22E0}-\\x{22E3}' .
+			'\\x{22EA}-\\x{22ED}' .
+			'\\x{2329}-\\x{232A}' .
+			'\\x{2460}-\\x{24EA}' .
+			'\\x{2A0C}' .
+			'\\x{2A74}-\\x{2A76}' .
+			'\\x{2ADC}' .
+			'\\x{2C7C}-\\x{2C7D}' .
+			'\\x{2D6F}' .
+			'\\x{2E9F}' .
+			'\\x{2EF3}' .
+			'\\x{2F00}-\\x{2FD5}' .
+			'\\x{3000}' .
+			'\\x{3036}' .
+			'\\x{3038}-\\x{303A}' .
+			'\\x{304C}' .
+			'\\x{304E}' .
+			'\\x{3050}' .
+			'\\x{3052}' .
+			'\\x{3054}' .
+			'\\x{3056}' .
+			'\\x{3058}' .
+			'\\x{305A}' .
+			'\\x{305C}' .
+			'\\x{305E}' .
+			'\\x{3060}' .
+			'\\x{3062}' .
+			'\\x{3065}' .
+			'\\x{3067}' .
+			'\\x{3069}' .
+			'\\x{3070}-\\x{3071}' .
+			'\\x{3073}-\\x{3074}' .
+			'\\x{3076}-\\x{3077}' .
+			'\\x{3079}-\\x{307A}' .
+			'\\x{307C}-\\x{307D}' .
+			'\\x{3094}' .
+			'\\x{309B}-\\x{309C}' .
+			'\\x{309E}-\\x{309F}' .
+			'\\x{30AC}' .
+			'\\x{30AE}' .
+			'\\x{30B0}' .
+			'\\x{30B2}' .
+			'\\x{30B4}' .
+			'\\x{30B6}' .
+			'\\x{30B8}' .
+			'\\x{30BA}' .
+			'\\x{30BC}' .
+			'\\x{30BE}' .
+			'\\x{30C0}' .
+			'\\x{30C2}' .
+			'\\x{30C5}' .
+			'\\x{30C7}' .
+			'\\x{30C9}' .
+			'\\x{30D0}-\\x{30D1}' .
+			'\\x{30D3}-\\x{30D4}' .
+			'\\x{30D6}-\\x{30D7}' .
+			'\\x{30D9}-\\x{30DA}' .
+			'\\x{30DC}-\\x{30DD}' .
+			'\\x{30F4}' .
+			'\\x{30F7}-\\x{30FA}' .
+			'\\x{30FE}-\\x{30FF}' .
+			'\\x{3131}-\\x{318E}' .
+			'\\x{3192}-\\x{319F}' .
+			'\\x{3200}-\\x{321E}' .
+			'\\x{3220}-\\x{3247}' .
+			'\\x{3250}-\\x{327E}' .
+			'\\x{3280}-\\x{33FF}' .
+			'\\x{A69C}-\\x{A69D}' .
+			'\\x{A770}' .
+			'\\x{A7F2}-\\x{A7F4}' .
+			'\\x{A7F8}-\\x{A7F9}' .
+			'\\x{AB5C}-\\x{AB5F}' .
+			'\\x{AB69}' .
+			'\\x{AC00}-\\x{D7A3}' .
+			'\\x{F900}-\\x{FA0D}' .
+			'\\x{FA10}' .
+			'\\x{FA12}' .
+			'\\x{FA15}-\\x{FA1E}' .
+			'\\x{FA20}' .
+			'\\x{FA22}' .
+			'\\x{FA25}-\\x{FA26}' .
+			'\\x{FA2A}-\\x{FA6D}' .
+			'\\x{FA70}-\\x{FAD9}' .
+			'\\x{FB00}-\\x{FB06}' .
+			'\\x{FB13}-\\x{FB17}' .
+			'\\x{FB1D}' .
+			'\\x{FB1F}-\\x{FB36}' .
+			'\\x{FB38}-\\x{FB3C}' .
+			'\\x{FB3E}' .
+			'\\x{FB40}-\\x{FB41}' .
+			'\\x{FB43}-\\x{FB44}' .
+			'\\x{FB46}-\\x{FBB1}' .
+			'\\x{FBD3}-\\x{FD3D}' .
+			'\\x{FD50}-\\x{FD8F}' .
+			'\\x{FD92}-\\x{FDC7}' .
+			'\\x{FDF0}-\\x{FDFC}' .
+			'\\x{FE10}-\\x{FE19}' .
+			'\\x{FE30}-\\x{FE44}' .
+			'\\x{FE47}-\\x{FE52}' .
+			'\\x{FE54}-\\x{FE66}' .
+			'\\x{FE68}-\\x{FE6B}' .
+			'\\x{FE70}-\\x{FE72}' .
+			'\\x{FE74}' .
+			'\\x{FE76}-\\x{FEFC}' .
+			'\\x{FF01}-\\x{FFBE}' .
+			'\\x{FFC2}-\\x{FFC7}' .
+			'\\x{FFCA}-\\x{FFCF}' .
+			'\\x{FFD2}-\\x{FFD7}' .
+			'\\x{FFDA}-\\x{FFDC}' .
+			'\\x{FFE0}-\\x{FFE6}' .
+			'\\x{FFE8}-\\x{FFEE}' .
+			'\\x{10781}-\\x{10785}' .
+			'\\x{10787}-\\x{107B0}' .
+			'\\x{107B2}-\\x{107BA}' .
+			'\\x{1109A}' .
+			'\\x{1109C}' .
+			'\\x{110AB}' .
+			'\\x{1112E}-\\x{1112F}' .
+			'\\x{1134B}-\\x{1134C}' .
+			'\\x{114BB}-\\x{114BC}' .
+			'\\x{114BE}' .
+			'\\x{115BA}-\\x{115BB}' .
+			'\\x{11938}' .
+			'\\x{1D15E}-\\x{1D164}' .
+			'\\x{1D1BB}-\\x{1D1C0}' .
+			'\\x{1D400}-\\x{1D454}' .
+			'\\x{1D456}-\\x{1D49C}' .
+			'\\x{1D49E}-\\x{1D49F}' .
+			'\\x{1D4A2}' .
+			'\\x{1D4A5}-\\x{1D4A6}' .
+			'\\x{1D4A9}-\\x{1D4AC}' .
+			'\\x{1D4AE}-\\x{1D4B9}' .
+			'\\x{1D4BB}' .
+			'\\x{1D4BD}-\\x{1D4C3}' .
+			'\\x{1D4C5}-\\x{1D505}' .
+			'\\x{1D507}-\\x{1D50A}' .
+			'\\x{1D50D}-\\x{1D514}' .
+			'\\x{1D516}-\\x{1D51C}' .
+			'\\x{1D51E}-\\x{1D539}' .
+			'\\x{1D53B}-\\x{1D53E}' .
+			'\\x{1D540}-\\x{1D544}' .
+			'\\x{1D546}' .
+			'\\x{1D54A}-\\x{1D550}' .
+			'\\x{1D552}-\\x{1D6A5}' .
+			'\\x{1D6A8}-\\x{1D7CB}' .
+			'\\x{1D7CE}-\\x{1D7FF}' .
+			'\\x{1E030}-\\x{1E06D}' .
+			'\\x{1EE00}-\\x{1EE03}' .
+			'\\x{1EE05}-\\x{1EE1F}' .
+			'\\x{1EE21}-\\x{1EE22}' .
+			'\\x{1EE24}' .
+			'\\x{1EE27}' .
+			'\\x{1EE29}-\\x{1EE32}' .
+			'\\x{1EE34}-\\x{1EE37}' .
+			'\\x{1EE39}' .
+			'\\x{1EE3B}' .
+			'\\x{1EE42}' .
+			'\\x{1EE47}' .
+			'\\x{1EE49}' .
+			'\\x{1EE4B}' .
+			'\\x{1EE4D}-\\x{1EE4F}' .
+			'\\x{1EE51}-\\x{1EE52}' .
+			'\\x{1EE54}' .
+			'\\x{1EE57}' .
+			'\\x{1EE59}' .
+			'\\x{1EE5B}' .
+			'\\x{1EE5D}' .
+			'\\x{1EE5F}' .
+			'\\x{1EE61}-\\x{1EE62}' .
+			'\\x{1EE64}' .
+			'\\x{1EE67}-\\x{1EE6A}' .
+			'\\x{1EE6C}-\\x{1EE72}' .
+			'\\x{1EE74}-\\x{1EE77}' .
+			'\\x{1EE79}-\\x{1EE7C}' .
+			'\\x{1EE7E}' .
+			'\\x{1EE80}-\\x{1EE89}' .
+			'\\x{1EE8B}-\\x{1EE9B}' .
+			'\\x{1EEA1}-\\x{1EEA3}' .
+			'\\x{1EEA5}-\\x{1EEA9}' .
+			'\\x{1EEAB}-\\x{1EEBB}' .
+			'\\x{1F100}-\\x{1F10A}' .
+			'\\x{1F110}-\\x{1F12E}' .
+			'\\x{1F130}-\\x{1F14F}' .
+			'\\x{1F16A}-\\x{1F16C}' .
+			'\\x{1F190}' .
+			'\\x{1F200}-\\x{1F202}' .
+			'\\x{1F210}-\\x{1F23B}' .
+			'\\x{1F240}-\\x{1F248}' .
+			'\\x{1F250}-\\x{1F251}' .
+			'\\x{1FBF0}-\\x{1FBF9}' .
+			'\\x{2F800}-\\x{2FA1D}',
 		'Changes_When_NFKC_Casefolded' =>
-			'\x{0041}-\x{005A}' .
-			'\x{00A0}' .
-			'\x{00A8}' .
-			'\x{00AA}' .
-			'\x{00AD}' .
-			'\x{00AF}' .
-			'\x{00B2}-\x{00B5}' .
-			'\x{00B8}-\x{00BA}' .
-			'\x{00BC}-\x{00BE}' .
-			'\x{00C0}-\x{00D6}' .
-			'\x{00D8}-\x{00DF}' .
-			'\x{0100}' .
-			'\x{0102}' .
-			'\x{0104}' .
-			'\x{0106}' .
-			'\x{0108}' .
-			'\x{010A}' .
-			'\x{010C}' .
-			'\x{010E}' .
-			'\x{0110}' .
-			'\x{0112}' .
-			'\x{0114}' .
-			'\x{0116}' .
-			'\x{0118}' .
-			'\x{011A}' .
-			'\x{011C}' .
-			'\x{011E}' .
-			'\x{0120}' .
-			'\x{0122}' .
-			'\x{0124}' .
-			'\x{0126}' .
-			'\x{0128}' .
-			'\x{012A}' .
-			'\x{012C}' .
-			'\x{012E}' .
-			'\x{0130}' .
-			'\x{0132}-\x{0134}' .
-			'\x{0136}' .
-			'\x{0139}' .
-			'\x{013B}' .
-			'\x{013D}' .
-			'\x{013F}-\x{0141}' .
-			'\x{0143}' .
-			'\x{0145}' .
-			'\x{0147}' .
-			'\x{0149}-\x{014A}' .
-			'\x{014C}' .
-			'\x{014E}' .
-			'\x{0150}' .
-			'\x{0152}' .
-			'\x{0154}' .
-			'\x{0156}' .
-			'\x{0158}' .
-			'\x{015A}' .
-			'\x{015C}' .
-			'\x{015E}' .
-			'\x{0160}' .
-			'\x{0162}' .
-			'\x{0164}' .
-			'\x{0166}' .
-			'\x{0168}' .
-			'\x{016A}' .
-			'\x{016C}' .
-			'\x{016E}' .
-			'\x{0170}' .
-			'\x{0172}' .
-			'\x{0174}' .
-			'\x{0176}' .
-			'\x{0178}-\x{0179}' .
-			'\x{017B}' .
-			'\x{017D}' .
-			'\x{017F}' .
-			'\x{0181}-\x{0182}' .
-			'\x{0184}' .
-			'\x{0186}-\x{0187}' .
-			'\x{0189}-\x{018B}' .
-			'\x{018E}-\x{0191}' .
-			'\x{0193}-\x{0194}' .
-			'\x{0196}-\x{0198}' .
-			'\x{019C}-\x{019D}' .
-			'\x{019F}-\x{01A0}' .
-			'\x{01A2}' .
-			'\x{01A4}' .
-			'\x{01A6}-\x{01A7}' .
-			'\x{01A9}' .
-			'\x{01AC}' .
-			'\x{01AE}-\x{01AF}' .
-			'\x{01B1}-\x{01B3}' .
-			'\x{01B5}' .
-			'\x{01B7}-\x{01B8}' .
-			'\x{01BC}' .
-			'\x{01C4}-\x{01CD}' .
-			'\x{01CF}' .
-			'\x{01D1}' .
-			'\x{01D3}' .
-			'\x{01D5}' .
-			'\x{01D7}' .
-			'\x{01D9}' .
-			'\x{01DB}' .
-			'\x{01DE}' .
-			'\x{01E0}' .
-			'\x{01E2}' .
-			'\x{01E4}' .
-			'\x{01E6}' .
-			'\x{01E8}' .
-			'\x{01EA}' .
-			'\x{01EC}' .
-			'\x{01EE}' .
-			'\x{01F1}-\x{01F4}' .
-			'\x{01F6}-\x{01F8}' .
-			'\x{01FA}' .
-			'\x{01FC}' .
-			'\x{01FE}' .
-			'\x{0200}' .
-			'\x{0202}' .
-			'\x{0204}' .
-			'\x{0206}' .
-			'\x{0208}' .
-			'\x{020A}' .
-			'\x{020C}' .
-			'\x{020E}' .
-			'\x{0210}' .
-			'\x{0212}' .
-			'\x{0214}' .
-			'\x{0216}' .
-			'\x{0218}' .
-			'\x{021A}' .
-			'\x{021C}' .
-			'\x{021E}' .
-			'\x{0220}' .
-			'\x{0222}' .
-			'\x{0224}' .
-			'\x{0226}' .
-			'\x{0228}' .
-			'\x{022A}' .
-			'\x{022C}' .
-			'\x{022E}' .
-			'\x{0230}' .
-			'\x{0232}' .
-			'\x{023A}-\x{023B}' .
-			'\x{023D}-\x{023E}' .
-			'\x{0241}' .
-			'\x{0243}-\x{0246}' .
-			'\x{0248}' .
-			'\x{024A}' .
-			'\x{024C}' .
-			'\x{024E}' .
-			'\x{02B0}-\x{02B8}' .
-			'\x{02D8}-\x{02DD}' .
-			'\x{02E0}-\x{02E4}' .
-			'\x{0340}-\x{0341}' .
-			'\x{0343}-\x{0345}' .
-			'\x{034F}' .
-			'\x{0370}' .
-			'\x{0372}' .
-			'\x{0374}' .
-			'\x{0376}' .
-			'\x{037A}' .
-			'\x{037E}-\x{037F}' .
-			'\x{0384}-\x{038A}' .
-			'\x{038C}' .
-			'\x{038E}-\x{038F}' .
-			'\x{0391}-\x{03A1}' .
-			'\x{03A3}-\x{03AB}' .
-			'\x{03C2}' .
-			'\x{03CF}-\x{03D6}' .
-			'\x{03D8}' .
-			'\x{03DA}' .
-			'\x{03DC}' .
-			'\x{03DE}' .
-			'\x{03E0}' .
-			'\x{03E2}' .
-			'\x{03E4}' .
-			'\x{03E6}' .
-			'\x{03E8}' .
-			'\x{03EA}' .
-			'\x{03EC}' .
-			'\x{03EE}' .
-			'\x{03F0}-\x{03F2}' .
-			'\x{03F4}-\x{03F5}' .
-			'\x{03F7}' .
-			'\x{03F9}-\x{03FA}' .
-			'\x{03FD}-\x{042F}' .
-			'\x{0460}' .
-			'\x{0462}' .
-			'\x{0464}' .
-			'\x{0466}' .
-			'\x{0468}' .
-			'\x{046A}' .
-			'\x{046C}' .
-			'\x{046E}' .
-			'\x{0470}' .
-			'\x{0472}' .
-			'\x{0474}' .
-			'\x{0476}' .
-			'\x{0478}' .
-			'\x{047A}' .
-			'\x{047C}' .
-			'\x{047E}' .
-			'\x{0480}' .
-			'\x{048A}' .
-			'\x{048C}' .
-			'\x{048E}' .
-			'\x{0490}' .
-			'\x{0492}' .
-			'\x{0494}' .
-			'\x{0496}' .
-			'\x{0498}' .
-			'\x{049A}' .
-			'\x{049C}' .
-			'\x{049E}' .
-			'\x{04A0}' .
-			'\x{04A2}' .
-			'\x{04A4}' .
-			'\x{04A6}' .
-			'\x{04A8}' .
-			'\x{04AA}' .
-			'\x{04AC}' .
-			'\x{04AE}' .
-			'\x{04B0}' .
-			'\x{04B2}' .
-			'\x{04B4}' .
-			'\x{04B6}' .
-			'\x{04B8}' .
-			'\x{04BA}' .
-			'\x{04BC}' .
-			'\x{04BE}' .
-			'\x{04C0}-\x{04C1}' .
-			'\x{04C3}' .
-			'\x{04C5}' .
-			'\x{04C7}' .
-			'\x{04C9}' .
-			'\x{04CB}' .
-			'\x{04CD}' .
-			'\x{04D0}' .
-			'\x{04D2}' .
-			'\x{04D4}' .
-			'\x{04D6}' .
-			'\x{04D8}' .
-			'\x{04DA}' .
-			'\x{04DC}' .
-			'\x{04DE}' .
-			'\x{04E0}' .
-			'\x{04E2}' .
-			'\x{04E4}' .
-			'\x{04E6}' .
-			'\x{04E8}' .
-			'\x{04EA}' .
-			'\x{04EC}' .
-			'\x{04EE}' .
-			'\x{04F0}' .
-			'\x{04F2}' .
-			'\x{04F4}' .
-			'\x{04F6}' .
-			'\x{04F8}' .
-			'\x{04FA}' .
-			'\x{04FC}' .
-			'\x{04FE}' .
-			'\x{0500}' .
-			'\x{0502}' .
-			'\x{0504}' .
-			'\x{0506}' .
-			'\x{0508}' .
-			'\x{050A}' .
-			'\x{050C}' .
-			'\x{050E}' .
-			'\x{0510}' .
-			'\x{0512}' .
-			'\x{0514}' .
-			'\x{0516}' .
-			'\x{0518}' .
-			'\x{051A}' .
-			'\x{051C}' .
-			'\x{051E}' .
-			'\x{0520}' .
-			'\x{0522}' .
-			'\x{0524}' .
-			'\x{0526}' .
-			'\x{0528}' .
-			'\x{052A}' .
-			'\x{052C}' .
-			'\x{052E}' .
-			'\x{0531}-\x{0556}' .
-			'\x{0587}' .
-			'\x{061C}' .
-			'\x{0675}-\x{0678}' .
-			'\x{0958}-\x{095F}' .
-			'\x{09DC}-\x{09DD}' .
-			'\x{09DF}' .
-			'\x{0A33}' .
-			'\x{0A36}' .
-			'\x{0A59}-\x{0A5B}' .
-			'\x{0A5E}' .
-			'\x{0B5C}-\x{0B5D}' .
-			'\x{0E33}' .
-			'\x{0EB3}' .
-			'\x{0EDC}-\x{0EDD}' .
-			'\x{0F0C}' .
-			'\x{0F43}' .
-			'\x{0F4D}' .
-			'\x{0F52}' .
-			'\x{0F57}' .
-			'\x{0F5C}' .
-			'\x{0F69}' .
-			'\x{0F73}' .
-			'\x{0F75}-\x{0F79}' .
-			'\x{0F81}' .
-			'\x{0F93}' .
-			'\x{0F9D}' .
-			'\x{0FA2}' .
-			'\x{0FA7}' .
-			'\x{0FAC}' .
-			'\x{0FB9}' .
-			'\x{10A0}-\x{10C5}' .
-			'\x{10C7}' .
-			'\x{10CD}' .
-			'\x{10FC}' .
-			'\x{115F}-\x{1160}' .
-			'\x{13F8}-\x{13FD}' .
-			'\x{17B4}-\x{17B5}' .
-			'\x{180B}-\x{180F}' .
-			'\x{1C80}-\x{1C88}' .
-			'\x{1C90}-\x{1CBA}' .
-			'\x{1CBD}-\x{1CBF}' .
-			'\x{1D2C}-\x{1D2E}' .
-			'\x{1D30}-\x{1D3A}' .
-			'\x{1D3C}-\x{1D4D}' .
-			'\x{1D4F}-\x{1D6A}' .
-			'\x{1D78}' .
-			'\x{1D9B}-\x{1DBF}' .
-			'\x{1E00}' .
-			'\x{1E02}' .
-			'\x{1E04}' .
-			'\x{1E06}' .
-			'\x{1E08}' .
-			'\x{1E0A}' .
-			'\x{1E0C}' .
-			'\x{1E0E}' .
-			'\x{1E10}' .
-			'\x{1E12}' .
-			'\x{1E14}' .
-			'\x{1E16}' .
-			'\x{1E18}' .
-			'\x{1E1A}' .
-			'\x{1E1C}' .
-			'\x{1E1E}' .
-			'\x{1E20}' .
-			'\x{1E22}' .
-			'\x{1E24}' .
-			'\x{1E26}' .
-			'\x{1E28}' .
-			'\x{1E2A}' .
-			'\x{1E2C}' .
-			'\x{1E2E}' .
-			'\x{1E30}' .
-			'\x{1E32}' .
-			'\x{1E34}' .
-			'\x{1E36}' .
-			'\x{1E38}' .
-			'\x{1E3A}' .
-			'\x{1E3C}' .
-			'\x{1E3E}' .
-			'\x{1E40}' .
-			'\x{1E42}' .
-			'\x{1E44}' .
-			'\x{1E46}' .
-			'\x{1E48}' .
-			'\x{1E4A}' .
-			'\x{1E4C}' .
-			'\x{1E4E}' .
-			'\x{1E50}' .
-			'\x{1E52}' .
-			'\x{1E54}' .
-			'\x{1E56}' .
-			'\x{1E58}' .
-			'\x{1E5A}' .
-			'\x{1E5C}' .
-			'\x{1E5E}' .
-			'\x{1E60}' .
-			'\x{1E62}' .
-			'\x{1E64}' .
-			'\x{1E66}' .
-			'\x{1E68}' .
-			'\x{1E6A}' .
-			'\x{1E6C}' .
-			'\x{1E6E}' .
-			'\x{1E70}' .
-			'\x{1E72}' .
-			'\x{1E74}' .
-			'\x{1E76}' .
-			'\x{1E78}' .
-			'\x{1E7A}' .
-			'\x{1E7C}' .
-			'\x{1E7E}' .
-			'\x{1E80}' .
-			'\x{1E82}' .
-			'\x{1E84}' .
-			'\x{1E86}' .
-			'\x{1E88}' .
-			'\x{1E8A}' .
-			'\x{1E8C}' .
-			'\x{1E8E}' .
-			'\x{1E90}' .
-			'\x{1E92}' .
-			'\x{1E94}' .
-			'\x{1E9A}-\x{1E9B}' .
-			'\x{1E9E}' .
-			'\x{1EA0}' .
-			'\x{1EA2}' .
-			'\x{1EA4}' .
-			'\x{1EA6}' .
-			'\x{1EA8}' .
-			'\x{1EAA}' .
-			'\x{1EAC}' .
-			'\x{1EAE}' .
-			'\x{1EB0}' .
-			'\x{1EB2}' .
-			'\x{1EB4}' .
-			'\x{1EB6}' .
-			'\x{1EB8}' .
-			'\x{1EBA}' .
-			'\x{1EBC}' .
-			'\x{1EBE}' .
-			'\x{1EC0}' .
-			'\x{1EC2}' .
-			'\x{1EC4}' .
-			'\x{1EC6}' .
-			'\x{1EC8}' .
-			'\x{1ECA}' .
-			'\x{1ECC}' .
-			'\x{1ECE}' .
-			'\x{1ED0}' .
-			'\x{1ED2}' .
-			'\x{1ED4}' .
-			'\x{1ED6}' .
-			'\x{1ED8}' .
-			'\x{1EDA}' .
-			'\x{1EDC}' .
-			'\x{1EDE}' .
-			'\x{1EE0}' .
-			'\x{1EE2}' .
-			'\x{1EE4}' .
-			'\x{1EE6}' .
-			'\x{1EE8}' .
-			'\x{1EEA}' .
-			'\x{1EEC}' .
-			'\x{1EEE}' .
-			'\x{1EF0}' .
-			'\x{1EF2}' .
-			'\x{1EF4}' .
-			'\x{1EF6}' .
-			'\x{1EF8}' .
-			'\x{1EFA}' .
-			'\x{1EFC}' .
-			'\x{1EFE}' .
-			'\x{1F08}-\x{1F0F}' .
-			'\x{1F18}-\x{1F1D}' .
-			'\x{1F28}-\x{1F2F}' .
-			'\x{1F38}-\x{1F3F}' .
-			'\x{1F48}-\x{1F4D}' .
-			'\x{1F59}' .
-			'\x{1F5B}' .
-			'\x{1F5D}' .
-			'\x{1F5F}' .
-			'\x{1F68}-\x{1F6F}' .
-			'\x{1F71}' .
-			'\x{1F73}' .
-			'\x{1F75}' .
-			'\x{1F77}' .
-			'\x{1F79}' .
-			'\x{1F7B}' .
-			'\x{1F7D}' .
-			'\x{1F80}-\x{1FAF}' .
-			'\x{1FB2}-\x{1FB4}' .
-			'\x{1FB7}-\x{1FC4}' .
-			'\x{1FC7}-\x{1FCF}' .
-			'\x{1FD3}' .
-			'\x{1FD8}-\x{1FDB}' .
-			'\x{1FDD}-\x{1FDF}' .
-			'\x{1FE3}' .
-			'\x{1FE8}-\x{1FEF}' .
-			'\x{1FF2}-\x{1FF4}' .
-			'\x{1FF7}-\x{1FFE}' .
-			'\x{2000}-\x{200F}' .
-			'\x{2011}' .
-			'\x{2017}' .
-			'\x{2024}-\x{2026}' .
-			'\x{202A}-\x{202F}' .
-			'\x{2033}-\x{2034}' .
-			'\x{2036}-\x{2037}' .
-			'\x{203C}' .
-			'\x{203E}' .
-			'\x{2047}-\x{2049}' .
-			'\x{2057}' .
-			'\x{205F}-\x{2071}' .
-			'\x{2074}-\x{208E}' .
-			'\x{2090}-\x{209C}' .
-			'\x{20A8}' .
-			'\x{2100}-\x{2103}' .
-			'\x{2105}-\x{2107}' .
-			'\x{2109}-\x{2113}' .
-			'\x{2115}-\x{2116}' .
-			'\x{2119}-\x{211D}' .
-			'\x{2120}-\x{2122}' .
-			'\x{2124}' .
-			'\x{2126}' .
-			'\x{2128}' .
-			'\x{212A}-\x{212D}' .
-			'\x{212F}-\x{2139}' .
-			'\x{213B}-\x{2140}' .
-			'\x{2145}-\x{2149}' .
-			'\x{2150}-\x{217F}' .
-			'\x{2183}' .
-			'\x{2189}' .
-			'\x{222C}-\x{222D}' .
-			'\x{222F}-\x{2230}' .
-			'\x{2329}-\x{232A}' .
-			'\x{2460}-\x{24EA}' .
-			'\x{2A0C}' .
-			'\x{2A74}-\x{2A76}' .
-			'\x{2ADC}' .
-			'\x{2C00}-\x{2C2F}' .
-			'\x{2C60}' .
-			'\x{2C62}-\x{2C64}' .
-			'\x{2C67}' .
-			'\x{2C69}' .
-			'\x{2C6B}' .
-			'\x{2C6D}-\x{2C70}' .
-			'\x{2C72}' .
-			'\x{2C75}' .
-			'\x{2C7C}-\x{2C80}' .
-			'\x{2C82}' .
-			'\x{2C84}' .
-			'\x{2C86}' .
-			'\x{2C88}' .
-			'\x{2C8A}' .
-			'\x{2C8C}' .
-			'\x{2C8E}' .
-			'\x{2C90}' .
-			'\x{2C92}' .
-			'\x{2C94}' .
-			'\x{2C96}' .
-			'\x{2C98}' .
-			'\x{2C9A}' .
-			'\x{2C9C}' .
-			'\x{2C9E}' .
-			'\x{2CA0}' .
-			'\x{2CA2}' .
-			'\x{2CA4}' .
-			'\x{2CA6}' .
-			'\x{2CA8}' .
-			'\x{2CAA}' .
-			'\x{2CAC}' .
-			'\x{2CAE}' .
-			'\x{2CB0}' .
-			'\x{2CB2}' .
-			'\x{2CB4}' .
-			'\x{2CB6}' .
-			'\x{2CB8}' .
-			'\x{2CBA}' .
-			'\x{2CBC}' .
-			'\x{2CBE}' .
-			'\x{2CC0}' .
-			'\x{2CC2}' .
-			'\x{2CC4}' .
-			'\x{2CC6}' .
-			'\x{2CC8}' .
-			'\x{2CCA}' .
-			'\x{2CCC}' .
-			'\x{2CCE}' .
-			'\x{2CD0}' .
-			'\x{2CD2}' .
-			'\x{2CD4}' .
-			'\x{2CD6}' .
-			'\x{2CD8}' .
-			'\x{2CDA}' .
-			'\x{2CDC}' .
-			'\x{2CDE}' .
-			'\x{2CE0}' .
-			'\x{2CE2}' .
-			'\x{2CEB}' .
-			'\x{2CED}' .
-			'\x{2CF2}' .
-			'\x{2D6F}' .
-			'\x{2E9F}' .
-			'\x{2EF3}' .
-			'\x{2F00}-\x{2FD5}' .
-			'\x{3000}' .
-			'\x{3036}' .
-			'\x{3038}-\x{303A}' .
-			'\x{309B}-\x{309C}' .
-			'\x{309F}' .
-			'\x{30FF}' .
-			'\x{3131}-\x{318E}' .
-			'\x{3192}-\x{319F}' .
-			'\x{3200}-\x{321E}' .
-			'\x{3220}-\x{3247}' .
-			'\x{3250}-\x{327E}' .
-			'\x{3280}-\x{33FF}' .
-			'\x{A640}' .
-			'\x{A642}' .
-			'\x{A644}' .
-			'\x{A646}' .
-			'\x{A648}' .
-			'\x{A64A}' .
-			'\x{A64C}' .
-			'\x{A64E}' .
-			'\x{A650}' .
-			'\x{A652}' .
-			'\x{A654}' .
-			'\x{A656}' .
-			'\x{A658}' .
-			'\x{A65A}' .
-			'\x{A65C}' .
-			'\x{A65E}' .
-			'\x{A660}' .
-			'\x{A662}' .
-			'\x{A664}' .
-			'\x{A666}' .
-			'\x{A668}' .
-			'\x{A66A}' .
-			'\x{A66C}' .
-			'\x{A680}' .
-			'\x{A682}' .
-			'\x{A684}' .
-			'\x{A686}' .
-			'\x{A688}' .
-			'\x{A68A}' .
-			'\x{A68C}' .
-			'\x{A68E}' .
-			'\x{A690}' .
-			'\x{A692}' .
-			'\x{A694}' .
-			'\x{A696}' .
-			'\x{A698}' .
-			'\x{A69A}' .
-			'\x{A69C}-\x{A69D}' .
-			'\x{A722}' .
-			'\x{A724}' .
-			'\x{A726}' .
-			'\x{A728}' .
-			'\x{A72A}' .
-			'\x{A72C}' .
-			'\x{A72E}' .
-			'\x{A732}' .
-			'\x{A734}' .
-			'\x{A736}' .
-			'\x{A738}' .
-			'\x{A73A}' .
-			'\x{A73C}' .
-			'\x{A73E}' .
-			'\x{A740}' .
-			'\x{A742}' .
-			'\x{A744}' .
-			'\x{A746}' .
-			'\x{A748}' .
-			'\x{A74A}' .
-			'\x{A74C}' .
-			'\x{A74E}' .
-			'\x{A750}' .
-			'\x{A752}' .
-			'\x{A754}' .
-			'\x{A756}' .
-			'\x{A758}' .
-			'\x{A75A}' .
-			'\x{A75C}' .
-			'\x{A75E}' .
-			'\x{A760}' .
-			'\x{A762}' .
-			'\x{A764}' .
-			'\x{A766}' .
-			'\x{A768}' .
-			'\x{A76A}' .
-			'\x{A76C}' .
-			'\x{A76E}' .
-			'\x{A770}' .
-			'\x{A779}' .
-			'\x{A77B}' .
-			'\x{A77D}-\x{A77E}' .
-			'\x{A780}' .
-			'\x{A782}' .
-			'\x{A784}' .
-			'\x{A786}' .
-			'\x{A78B}' .
-			'\x{A78D}' .
-			'\x{A790}' .
-			'\x{A792}' .
-			'\x{A796}' .
-			'\x{A798}' .
-			'\x{A79A}' .
-			'\x{A79C}' .
-			'\x{A79E}' .
-			'\x{A7A0}' .
-			'\x{A7A2}' .
-			'\x{A7A4}' .
-			'\x{A7A6}' .
-			'\x{A7A8}' .
-			'\x{A7AA}-\x{A7AE}' .
-			'\x{A7B0}-\x{A7B4}' .
-			'\x{A7B6}' .
-			'\x{A7B8}' .
-			'\x{A7BA}' .
-			'\x{A7BC}' .
-			'\x{A7BE}' .
-			'\x{A7C0}' .
-			'\x{A7C2}' .
-			'\x{A7C4}-\x{A7C7}' .
-			'\x{A7C9}' .
-			'\x{A7D0}' .
-			'\x{A7D6}' .
-			'\x{A7D8}' .
-			'\x{A7F2}-\x{A7F5}' .
-			'\x{A7F8}-\x{A7F9}' .
-			'\x{AB5C}-\x{AB5F}' .
-			'\x{AB69}' .
-			'\x{AB70}-\x{ABBF}' .
-			'\x{F900}-\x{FA0D}' .
-			'\x{FA10}' .
-			'\x{FA12}' .
-			'\x{FA15}-\x{FA1E}' .
-			'\x{FA20}' .
-			'\x{FA22}' .
-			'\x{FA25}-\x{FA26}' .
-			'\x{FA2A}-\x{FA6D}' .
-			'\x{FA70}-\x{FAD9}' .
-			'\x{FB00}-\x{FB06}' .
-			'\x{FB13}-\x{FB17}' .
-			'\x{FB1D}' .
-			'\x{FB1F}-\x{FB36}' .
-			'\x{FB38}-\x{FB3C}' .
-			'\x{FB3E}' .
-			'\x{FB40}-\x{FB41}' .
-			'\x{FB43}-\x{FB44}' .
-			'\x{FB46}-\x{FBB1}' .
-			'\x{FBD3}-\x{FD3D}' .
-			'\x{FD50}-\x{FD8F}' .
-			'\x{FD92}-\x{FDC7}' .
-			'\x{FDF0}-\x{FDFC}' .
-			'\x{FE00}-\x{FE19}' .
-			'\x{FE30}-\x{FE44}' .
-			'\x{FE47}-\x{FE52}' .
-			'\x{FE54}-\x{FE66}' .
-			'\x{FE68}-\x{FE6B}' .
-			'\x{FE70}-\x{FE72}' .
-			'\x{FE74}' .
-			'\x{FE76}-\x{FEFC}' .
-			'\x{FEFF}' .
-			'\x{FF01}-\x{FFBE}' .
-			'\x{FFC2}-\x{FFC7}' .
-			'\x{FFCA}-\x{FFCF}' .
-			'\x{FFD2}-\x{FFD7}' .
-			'\x{FFDA}-\x{FFDC}' .
-			'\x{FFE0}-\x{FFE6}' .
-			'\x{FFE8}-\x{FFEE}' .
-			'\x{FFF0}-\x{FFF8}' .
-			'\x{10400}-\x{10427}' .
-			'\x{104B0}-\x{104D3}' .
-			'\x{10570}-\x{1057A}' .
-			'\x{1057C}-\x{1058A}' .
-			'\x{1058C}-\x{10592}' .
-			'\x{10594}-\x{10595}' .
-			'\x{10781}-\x{10785}' .
-			'\x{10787}-\x{107B0}' .
-			'\x{107B2}-\x{107BA}' .
-			'\x{10C80}-\x{10CB2}' .
-			'\x{118A0}-\x{118BF}' .
-			'\x{16E40}-\x{16E5F}' .
-			'\x{1BCA0}-\x{1BCA3}' .
-			'\x{1D15E}-\x{1D164}' .
-			'\x{1D173}-\x{1D17A}' .
-			'\x{1D1BB}-\x{1D1C0}' .
-			'\x{1D400}-\x{1D454}' .
-			'\x{1D456}-\x{1D49C}' .
-			'\x{1D49E}-\x{1D49F}' .
-			'\x{1D4A2}' .
-			'\x{1D4A5}-\x{1D4A6}' .
-			'\x{1D4A9}-\x{1D4AC}' .
-			'\x{1D4AE}-\x{1D4B9}' .
-			'\x{1D4BB}' .
-			'\x{1D4BD}-\x{1D4C3}' .
-			'\x{1D4C5}-\x{1D505}' .
-			'\x{1D507}-\x{1D50A}' .
-			'\x{1D50D}-\x{1D514}' .
-			'\x{1D516}-\x{1D51C}' .
-			'\x{1D51E}-\x{1D539}' .
-			'\x{1D53B}-\x{1D53E}' .
-			'\x{1D540}-\x{1D544}' .
-			'\x{1D546}' .
-			'\x{1D54A}-\x{1D550}' .
-			'\x{1D552}-\x{1D6A5}' .
-			'\x{1D6A8}-\x{1D7CB}' .
-			'\x{1D7CE}-\x{1D7FF}' .
-			'\x{1E030}-\x{1E06D}' .
-			'\x{1E900}-\x{1E921}' .
-			'\x{1EE00}-\x{1EE03}' .
-			'\x{1EE05}-\x{1EE1F}' .
-			'\x{1EE21}-\x{1EE22}' .
-			'\x{1EE24}' .
-			'\x{1EE27}' .
-			'\x{1EE29}-\x{1EE32}' .
-			'\x{1EE34}-\x{1EE37}' .
-			'\x{1EE39}' .
-			'\x{1EE3B}' .
-			'\x{1EE42}' .
-			'\x{1EE47}' .
-			'\x{1EE49}' .
-			'\x{1EE4B}' .
-			'\x{1EE4D}-\x{1EE4F}' .
-			'\x{1EE51}-\x{1EE52}' .
-			'\x{1EE54}' .
-			'\x{1EE57}' .
-			'\x{1EE59}' .
-			'\x{1EE5B}' .
-			'\x{1EE5D}' .
-			'\x{1EE5F}' .
-			'\x{1EE61}-\x{1EE62}' .
-			'\x{1EE64}' .
-			'\x{1EE67}-\x{1EE6A}' .
-			'\x{1EE6C}-\x{1EE72}' .
-			'\x{1EE74}-\x{1EE77}' .
-			'\x{1EE79}-\x{1EE7C}' .
-			'\x{1EE7E}' .
-			'\x{1EE80}-\x{1EE89}' .
-			'\x{1EE8B}-\x{1EE9B}' .
-			'\x{1EEA1}-\x{1EEA3}' .
-			'\x{1EEA5}-\x{1EEA9}' .
-			'\x{1EEAB}-\x{1EEBB}' .
-			'\x{1F100}-\x{1F10A}' .
-			'\x{1F110}-\x{1F12E}' .
-			'\x{1F130}-\x{1F14F}' .
-			'\x{1F16A}-\x{1F16C}' .
-			'\x{1F190}' .
-			'\x{1F200}-\x{1F202}' .
-			'\x{1F210}-\x{1F23B}' .
-			'\x{1F240}-\x{1F248}' .
-			'\x{1F250}-\x{1F251}' .
-			'\x{1FBF0}-\x{1FBF9}' .
-			'\x{2F800}-\x{2FA1D}' .
-			'\x{E0000}-\x{E0FFF}',
-	);
+			'\\x{0041}-\\x{005A}' .
+			'\\x{00A0}' .
+			'\\x{00A8}' .
+			'\\x{00AA}' .
+			'\\x{00AD}' .
+			'\\x{00AF}' .
+			'\\x{00B2}-\\x{00B5}' .
+			'\\x{00B8}-\\x{00BA}' .
+			'\\x{00BC}-\\x{00BE}' .
+			'\\x{00C0}-\\x{00D6}' .
+			'\\x{00D8}-\\x{00DF}' .
+			'\\x{0100}' .
+			'\\x{0102}' .
+			'\\x{0104}' .
+			'\\x{0106}' .
+			'\\x{0108}' .
+			'\\x{010A}' .
+			'\\x{010C}' .
+			'\\x{010E}' .
+			'\\x{0110}' .
+			'\\x{0112}' .
+			'\\x{0114}' .
+			'\\x{0116}' .
+			'\\x{0118}' .
+			'\\x{011A}' .
+			'\\x{011C}' .
+			'\\x{011E}' .
+			'\\x{0120}' .
+			'\\x{0122}' .
+			'\\x{0124}' .
+			'\\x{0126}' .
+			'\\x{0128}' .
+			'\\x{012A}' .
+			'\\x{012C}' .
+			'\\x{012E}' .
+			'\\x{0130}' .
+			'\\x{0132}-\\x{0134}' .
+			'\\x{0136}' .
+			'\\x{0139}' .
+			'\\x{013B}' .
+			'\\x{013D}' .
+			'\\x{013F}-\\x{0141}' .
+			'\\x{0143}' .
+			'\\x{0145}' .
+			'\\x{0147}' .
+			'\\x{0149}-\\x{014A}' .
+			'\\x{014C}' .
+			'\\x{014E}' .
+			'\\x{0150}' .
+			'\\x{0152}' .
+			'\\x{0154}' .
+			'\\x{0156}' .
+			'\\x{0158}' .
+			'\\x{015A}' .
+			'\\x{015C}' .
+			'\\x{015E}' .
+			'\\x{0160}' .
+			'\\x{0162}' .
+			'\\x{0164}' .
+			'\\x{0166}' .
+			'\\x{0168}' .
+			'\\x{016A}' .
+			'\\x{016C}' .
+			'\\x{016E}' .
+			'\\x{0170}' .
+			'\\x{0172}' .
+			'\\x{0174}' .
+			'\\x{0176}' .
+			'\\x{0178}-\\x{0179}' .
+			'\\x{017B}' .
+			'\\x{017D}' .
+			'\\x{017F}' .
+			'\\x{0181}-\\x{0182}' .
+			'\\x{0184}' .
+			'\\x{0186}-\\x{0187}' .
+			'\\x{0189}-\\x{018B}' .
+			'\\x{018E}-\\x{0191}' .
+			'\\x{0193}-\\x{0194}' .
+			'\\x{0196}-\\x{0198}' .
+			'\\x{019C}-\\x{019D}' .
+			'\\x{019F}-\\x{01A0}' .
+			'\\x{01A2}' .
+			'\\x{01A4}' .
+			'\\x{01A6}-\\x{01A7}' .
+			'\\x{01A9}' .
+			'\\x{01AC}' .
+			'\\x{01AE}-\\x{01AF}' .
+			'\\x{01B1}-\\x{01B3}' .
+			'\\x{01B5}' .
+			'\\x{01B7}-\\x{01B8}' .
+			'\\x{01BC}' .
+			'\\x{01C4}-\\x{01CD}' .
+			'\\x{01CF}' .
+			'\\x{01D1}' .
+			'\\x{01D3}' .
+			'\\x{01D5}' .
+			'\\x{01D7}' .
+			'\\x{01D9}' .
+			'\\x{01DB}' .
+			'\\x{01DE}' .
+			'\\x{01E0}' .
+			'\\x{01E2}' .
+			'\\x{01E4}' .
+			'\\x{01E6}' .
+			'\\x{01E8}' .
+			'\\x{01EA}' .
+			'\\x{01EC}' .
+			'\\x{01EE}' .
+			'\\x{01F1}-\\x{01F4}' .
+			'\\x{01F6}-\\x{01F8}' .
+			'\\x{01FA}' .
+			'\\x{01FC}' .
+			'\\x{01FE}' .
+			'\\x{0200}' .
+			'\\x{0202}' .
+			'\\x{0204}' .
+			'\\x{0206}' .
+			'\\x{0208}' .
+			'\\x{020A}' .
+			'\\x{020C}' .
+			'\\x{020E}' .
+			'\\x{0210}' .
+			'\\x{0212}' .
+			'\\x{0214}' .
+			'\\x{0216}' .
+			'\\x{0218}' .
+			'\\x{021A}' .
+			'\\x{021C}' .
+			'\\x{021E}' .
+			'\\x{0220}' .
+			'\\x{0222}' .
+			'\\x{0224}' .
+			'\\x{0226}' .
+			'\\x{0228}' .
+			'\\x{022A}' .
+			'\\x{022C}' .
+			'\\x{022E}' .
+			'\\x{0230}' .
+			'\\x{0232}' .
+			'\\x{023A}-\\x{023B}' .
+			'\\x{023D}-\\x{023E}' .
+			'\\x{0241}' .
+			'\\x{0243}-\\x{0246}' .
+			'\\x{0248}' .
+			'\\x{024A}' .
+			'\\x{024C}' .
+			'\\x{024E}' .
+			'\\x{02B0}-\\x{02B8}' .
+			'\\x{02D8}-\\x{02DD}' .
+			'\\x{02E0}-\\x{02E4}' .
+			'\\x{0340}-\\x{0341}' .
+			'\\x{0343}-\\x{0345}' .
+			'\\x{034F}' .
+			'\\x{0370}' .
+			'\\x{0372}' .
+			'\\x{0374}' .
+			'\\x{0376}' .
+			'\\x{037A}' .
+			'\\x{037E}-\\x{037F}' .
+			'\\x{0384}-\\x{038A}' .
+			'\\x{038C}' .
+			'\\x{038E}-\\x{038F}' .
+			'\\x{0391}-\\x{03A1}' .
+			'\\x{03A3}-\\x{03AB}' .
+			'\\x{03C2}' .
+			'\\x{03CF}-\\x{03D6}' .
+			'\\x{03D8}' .
+			'\\x{03DA}' .
+			'\\x{03DC}' .
+			'\\x{03DE}' .
+			'\\x{03E0}' .
+			'\\x{03E2}' .
+			'\\x{03E4}' .
+			'\\x{03E6}' .
+			'\\x{03E8}' .
+			'\\x{03EA}' .
+			'\\x{03EC}' .
+			'\\x{03EE}' .
+			'\\x{03F0}-\\x{03F2}' .
+			'\\x{03F4}-\\x{03F5}' .
+			'\\x{03F7}' .
+			'\\x{03F9}-\\x{03FA}' .
+			'\\x{03FD}-\\x{042F}' .
+			'\\x{0460}' .
+			'\\x{0462}' .
+			'\\x{0464}' .
+			'\\x{0466}' .
+			'\\x{0468}' .
+			'\\x{046A}' .
+			'\\x{046C}' .
+			'\\x{046E}' .
+			'\\x{0470}' .
+			'\\x{0472}' .
+			'\\x{0474}' .
+			'\\x{0476}' .
+			'\\x{0478}' .
+			'\\x{047A}' .
+			'\\x{047C}' .
+			'\\x{047E}' .
+			'\\x{0480}' .
+			'\\x{048A}' .
+			'\\x{048C}' .
+			'\\x{048E}' .
+			'\\x{0490}' .
+			'\\x{0492}' .
+			'\\x{0494}' .
+			'\\x{0496}' .
+			'\\x{0498}' .
+			'\\x{049A}' .
+			'\\x{049C}' .
+			'\\x{049E}' .
+			'\\x{04A0}' .
+			'\\x{04A2}' .
+			'\\x{04A4}' .
+			'\\x{04A6}' .
+			'\\x{04A8}' .
+			'\\x{04AA}' .
+			'\\x{04AC}' .
+			'\\x{04AE}' .
+			'\\x{04B0}' .
+			'\\x{04B2}' .
+			'\\x{04B4}' .
+			'\\x{04B6}' .
+			'\\x{04B8}' .
+			'\\x{04BA}' .
+			'\\x{04BC}' .
+			'\\x{04BE}' .
+			'\\x{04C0}-\\x{04C1}' .
+			'\\x{04C3}' .
+			'\\x{04C5}' .
+			'\\x{04C7}' .
+			'\\x{04C9}' .
+			'\\x{04CB}' .
+			'\\x{04CD}' .
+			'\\x{04D0}' .
+			'\\x{04D2}' .
+			'\\x{04D4}' .
+			'\\x{04D6}' .
+			'\\x{04D8}' .
+			'\\x{04DA}' .
+			'\\x{04DC}' .
+			'\\x{04DE}' .
+			'\\x{04E0}' .
+			'\\x{04E2}' .
+			'\\x{04E4}' .
+			'\\x{04E6}' .
+			'\\x{04E8}' .
+			'\\x{04EA}' .
+			'\\x{04EC}' .
+			'\\x{04EE}' .
+			'\\x{04F0}' .
+			'\\x{04F2}' .
+			'\\x{04F4}' .
+			'\\x{04F6}' .
+			'\\x{04F8}' .
+			'\\x{04FA}' .
+			'\\x{04FC}' .
+			'\\x{04FE}' .
+			'\\x{0500}' .
+			'\\x{0502}' .
+			'\\x{0504}' .
+			'\\x{0506}' .
+			'\\x{0508}' .
+			'\\x{050A}' .
+			'\\x{050C}' .
+			'\\x{050E}' .
+			'\\x{0510}' .
+			'\\x{0512}' .
+			'\\x{0514}' .
+			'\\x{0516}' .
+			'\\x{0518}' .
+			'\\x{051A}' .
+			'\\x{051C}' .
+			'\\x{051E}' .
+			'\\x{0520}' .
+			'\\x{0522}' .
+			'\\x{0524}' .
+			'\\x{0526}' .
+			'\\x{0528}' .
+			'\\x{052A}' .
+			'\\x{052C}' .
+			'\\x{052E}' .
+			'\\x{0531}-\\x{0556}' .
+			'\\x{0587}' .
+			'\\x{061C}' .
+			'\\x{0675}-\\x{0678}' .
+			'\\x{0958}-\\x{095F}' .
+			'\\x{09DC}-\\x{09DD}' .
+			'\\x{09DF}' .
+			'\\x{0A33}' .
+			'\\x{0A36}' .
+			'\\x{0A59}-\\x{0A5B}' .
+			'\\x{0A5E}' .
+			'\\x{0B5C}-\\x{0B5D}' .
+			'\\x{0E33}' .
+			'\\x{0EB3}' .
+			'\\x{0EDC}-\\x{0EDD}' .
+			'\\x{0F0C}' .
+			'\\x{0F43}' .
+			'\\x{0F4D}' .
+			'\\x{0F52}' .
+			'\\x{0F57}' .
+			'\\x{0F5C}' .
+			'\\x{0F69}' .
+			'\\x{0F73}' .
+			'\\x{0F75}-\\x{0F79}' .
+			'\\x{0F81}' .
+			'\\x{0F93}' .
+			'\\x{0F9D}' .
+			'\\x{0FA2}' .
+			'\\x{0FA7}' .
+			'\\x{0FAC}' .
+			'\\x{0FB9}' .
+			'\\x{10A0}-\\x{10C5}' .
+			'\\x{10C7}' .
+			'\\x{10CD}' .
+			'\\x{10FC}' .
+			'\\x{115F}-\\x{1160}' .
+			'\\x{13F8}-\\x{13FD}' .
+			'\\x{17B4}-\\x{17B5}' .
+			'\\x{180B}-\\x{180F}' .
+			'\\x{1C80}-\\x{1C88}' .
+			'\\x{1C90}-\\x{1CBA}' .
+			'\\x{1CBD}-\\x{1CBF}' .
+			'\\x{1D2C}-\\x{1D2E}' .
+			'\\x{1D30}-\\x{1D3A}' .
+			'\\x{1D3C}-\\x{1D4D}' .
+			'\\x{1D4F}-\\x{1D6A}' .
+			'\\x{1D78}' .
+			'\\x{1D9B}-\\x{1DBF}' .
+			'\\x{1E00}' .
+			'\\x{1E02}' .
+			'\\x{1E04}' .
+			'\\x{1E06}' .
+			'\\x{1E08}' .
+			'\\x{1E0A}' .
+			'\\x{1E0C}' .
+			'\\x{1E0E}' .
+			'\\x{1E10}' .
+			'\\x{1E12}' .
+			'\\x{1E14}' .
+			'\\x{1E16}' .
+			'\\x{1E18}' .
+			'\\x{1E1A}' .
+			'\\x{1E1C}' .
+			'\\x{1E1E}' .
+			'\\x{1E20}' .
+			'\\x{1E22}' .
+			'\\x{1E24}' .
+			'\\x{1E26}' .
+			'\\x{1E28}' .
+			'\\x{1E2A}' .
+			'\\x{1E2C}' .
+			'\\x{1E2E}' .
+			'\\x{1E30}' .
+			'\\x{1E32}' .
+			'\\x{1E34}' .
+			'\\x{1E36}' .
+			'\\x{1E38}' .
+			'\\x{1E3A}' .
+			'\\x{1E3C}' .
+			'\\x{1E3E}' .
+			'\\x{1E40}' .
+			'\\x{1E42}' .
+			'\\x{1E44}' .
+			'\\x{1E46}' .
+			'\\x{1E48}' .
+			'\\x{1E4A}' .
+			'\\x{1E4C}' .
+			'\\x{1E4E}' .
+			'\\x{1E50}' .
+			'\\x{1E52}' .
+			'\\x{1E54}' .
+			'\\x{1E56}' .
+			'\\x{1E58}' .
+			'\\x{1E5A}' .
+			'\\x{1E5C}' .
+			'\\x{1E5E}' .
+			'\\x{1E60}' .
+			'\\x{1E62}' .
+			'\\x{1E64}' .
+			'\\x{1E66}' .
+			'\\x{1E68}' .
+			'\\x{1E6A}' .
+			'\\x{1E6C}' .
+			'\\x{1E6E}' .
+			'\\x{1E70}' .
+			'\\x{1E72}' .
+			'\\x{1E74}' .
+			'\\x{1E76}' .
+			'\\x{1E78}' .
+			'\\x{1E7A}' .
+			'\\x{1E7C}' .
+			'\\x{1E7E}' .
+			'\\x{1E80}' .
+			'\\x{1E82}' .
+			'\\x{1E84}' .
+			'\\x{1E86}' .
+			'\\x{1E88}' .
+			'\\x{1E8A}' .
+			'\\x{1E8C}' .
+			'\\x{1E8E}' .
+			'\\x{1E90}' .
+			'\\x{1E92}' .
+			'\\x{1E94}' .
+			'\\x{1E9A}-\\x{1E9B}' .
+			'\\x{1E9E}' .
+			'\\x{1EA0}' .
+			'\\x{1EA2}' .
+			'\\x{1EA4}' .
+			'\\x{1EA6}' .
+			'\\x{1EA8}' .
+			'\\x{1EAA}' .
+			'\\x{1EAC}' .
+			'\\x{1EAE}' .
+			'\\x{1EB0}' .
+			'\\x{1EB2}' .
+			'\\x{1EB4}' .
+			'\\x{1EB6}' .
+			'\\x{1EB8}' .
+			'\\x{1EBA}' .
+			'\\x{1EBC}' .
+			'\\x{1EBE}' .
+			'\\x{1EC0}' .
+			'\\x{1EC2}' .
+			'\\x{1EC4}' .
+			'\\x{1EC6}' .
+			'\\x{1EC8}' .
+			'\\x{1ECA}' .
+			'\\x{1ECC}' .
+			'\\x{1ECE}' .
+			'\\x{1ED0}' .
+			'\\x{1ED2}' .
+			'\\x{1ED4}' .
+			'\\x{1ED6}' .
+			'\\x{1ED8}' .
+			'\\x{1EDA}' .
+			'\\x{1EDC}' .
+			'\\x{1EDE}' .
+			'\\x{1EE0}' .
+			'\\x{1EE2}' .
+			'\\x{1EE4}' .
+			'\\x{1EE6}' .
+			'\\x{1EE8}' .
+			'\\x{1EEA}' .
+			'\\x{1EEC}' .
+			'\\x{1EEE}' .
+			'\\x{1EF0}' .
+			'\\x{1EF2}' .
+			'\\x{1EF4}' .
+			'\\x{1EF6}' .
+			'\\x{1EF8}' .
+			'\\x{1EFA}' .
+			'\\x{1EFC}' .
+			'\\x{1EFE}' .
+			'\\x{1F08}-\\x{1F0F}' .
+			'\\x{1F18}-\\x{1F1D}' .
+			'\\x{1F28}-\\x{1F2F}' .
+			'\\x{1F38}-\\x{1F3F}' .
+			'\\x{1F48}-\\x{1F4D}' .
+			'\\x{1F59}' .
+			'\\x{1F5B}' .
+			'\\x{1F5D}' .
+			'\\x{1F5F}' .
+			'\\x{1F68}-\\x{1F6F}' .
+			'\\x{1F71}' .
+			'\\x{1F73}' .
+			'\\x{1F75}' .
+			'\\x{1F77}' .
+			'\\x{1F79}' .
+			'\\x{1F7B}' .
+			'\\x{1F7D}' .
+			'\\x{1F80}-\\x{1FAF}' .
+			'\\x{1FB2}-\\x{1FB4}' .
+			'\\x{1FB7}-\\x{1FC4}' .
+			'\\x{1FC7}-\\x{1FCF}' .
+			'\\x{1FD3}' .
+			'\\x{1FD8}-\\x{1FDB}' .
+			'\\x{1FDD}-\\x{1FDF}' .
+			'\\x{1FE3}' .
+			'\\x{1FE8}-\\x{1FEF}' .
+			'\\x{1FF2}-\\x{1FF4}' .
+			'\\x{1FF7}-\\x{1FFE}' .
+			'\\x{2000}-\\x{200F}' .
+			'\\x{2011}' .
+			'\\x{2017}' .
+			'\\x{2024}-\\x{2026}' .
+			'\\x{202A}-\\x{202F}' .
+			'\\x{2033}-\\x{2034}' .
+			'\\x{2036}-\\x{2037}' .
+			'\\x{203C}' .
+			'\\x{203E}' .
+			'\\x{2047}-\\x{2049}' .
+			'\\x{2057}' .
+			'\\x{205F}-\\x{2071}' .
+			'\\x{2074}-\\x{208E}' .
+			'\\x{2090}-\\x{209C}' .
+			'\\x{20A8}' .
+			'\\x{2100}-\\x{2103}' .
+			'\\x{2105}-\\x{2107}' .
+			'\\x{2109}-\\x{2113}' .
+			'\\x{2115}-\\x{2116}' .
+			'\\x{2119}-\\x{211D}' .
+			'\\x{2120}-\\x{2122}' .
+			'\\x{2124}' .
+			'\\x{2126}' .
+			'\\x{2128}' .
+			'\\x{212A}-\\x{212D}' .
+			'\\x{212F}-\\x{2139}' .
+			'\\x{213B}-\\x{2140}' .
+			'\\x{2145}-\\x{2149}' .
+			'\\x{2150}-\\x{217F}' .
+			'\\x{2183}' .
+			'\\x{2189}' .
+			'\\x{222C}-\\x{222D}' .
+			'\\x{222F}-\\x{2230}' .
+			'\\x{2329}-\\x{232A}' .
+			'\\x{2460}-\\x{24EA}' .
+			'\\x{2A0C}' .
+			'\\x{2A74}-\\x{2A76}' .
+			'\\x{2ADC}' .
+			'\\x{2C00}-\\x{2C2F}' .
+			'\\x{2C60}' .
+			'\\x{2C62}-\\x{2C64}' .
+			'\\x{2C67}' .
+			'\\x{2C69}' .
+			'\\x{2C6B}' .
+			'\\x{2C6D}-\\x{2C70}' .
+			'\\x{2C72}' .
+			'\\x{2C75}' .
+			'\\x{2C7C}-\\x{2C80}' .
+			'\\x{2C82}' .
+			'\\x{2C84}' .
+			'\\x{2C86}' .
+			'\\x{2C88}' .
+			'\\x{2C8A}' .
+			'\\x{2C8C}' .
+			'\\x{2C8E}' .
+			'\\x{2C90}' .
+			'\\x{2C92}' .
+			'\\x{2C94}' .
+			'\\x{2C96}' .
+			'\\x{2C98}' .
+			'\\x{2C9A}' .
+			'\\x{2C9C}' .
+			'\\x{2C9E}' .
+			'\\x{2CA0}' .
+			'\\x{2CA2}' .
+			'\\x{2CA4}' .
+			'\\x{2CA6}' .
+			'\\x{2CA8}' .
+			'\\x{2CAA}' .
+			'\\x{2CAC}' .
+			'\\x{2CAE}' .
+			'\\x{2CB0}' .
+			'\\x{2CB2}' .
+			'\\x{2CB4}' .
+			'\\x{2CB6}' .
+			'\\x{2CB8}' .
+			'\\x{2CBA}' .
+			'\\x{2CBC}' .
+			'\\x{2CBE}' .
+			'\\x{2CC0}' .
+			'\\x{2CC2}' .
+			'\\x{2CC4}' .
+			'\\x{2CC6}' .
+			'\\x{2CC8}' .
+			'\\x{2CCA}' .
+			'\\x{2CCC}' .
+			'\\x{2CCE}' .
+			'\\x{2CD0}' .
+			'\\x{2CD2}' .
+			'\\x{2CD4}' .
+			'\\x{2CD6}' .
+			'\\x{2CD8}' .
+			'\\x{2CDA}' .
+			'\\x{2CDC}' .
+			'\\x{2CDE}' .
+			'\\x{2CE0}' .
+			'\\x{2CE2}' .
+			'\\x{2CEB}' .
+			'\\x{2CED}' .
+			'\\x{2CF2}' .
+			'\\x{2D6F}' .
+			'\\x{2E9F}' .
+			'\\x{2EF3}' .
+			'\\x{2F00}-\\x{2FD5}' .
+			'\\x{3000}' .
+			'\\x{3036}' .
+			'\\x{3038}-\\x{303A}' .
+			'\\x{309B}-\\x{309C}' .
+			'\\x{309F}' .
+			'\\x{30FF}' .
+			'\\x{3131}-\\x{318E}' .
+			'\\x{3192}-\\x{319F}' .
+			'\\x{3200}-\\x{321E}' .
+			'\\x{3220}-\\x{3247}' .
+			'\\x{3250}-\\x{327E}' .
+			'\\x{3280}-\\x{33FF}' .
+			'\\x{A640}' .
+			'\\x{A642}' .
+			'\\x{A644}' .
+			'\\x{A646}' .
+			'\\x{A648}' .
+			'\\x{A64A}' .
+			'\\x{A64C}' .
+			'\\x{A64E}' .
+			'\\x{A650}' .
+			'\\x{A652}' .
+			'\\x{A654}' .
+			'\\x{A656}' .
+			'\\x{A658}' .
+			'\\x{A65A}' .
+			'\\x{A65C}' .
+			'\\x{A65E}' .
+			'\\x{A660}' .
+			'\\x{A662}' .
+			'\\x{A664}' .
+			'\\x{A666}' .
+			'\\x{A668}' .
+			'\\x{A66A}' .
+			'\\x{A66C}' .
+			'\\x{A680}' .
+			'\\x{A682}' .
+			'\\x{A684}' .
+			'\\x{A686}' .
+			'\\x{A688}' .
+			'\\x{A68A}' .
+			'\\x{A68C}' .
+			'\\x{A68E}' .
+			'\\x{A690}' .
+			'\\x{A692}' .
+			'\\x{A694}' .
+			'\\x{A696}' .
+			'\\x{A698}' .
+			'\\x{A69A}' .
+			'\\x{A69C}-\\x{A69D}' .
+			'\\x{A722}' .
+			'\\x{A724}' .
+			'\\x{A726}' .
+			'\\x{A728}' .
+			'\\x{A72A}' .
+			'\\x{A72C}' .
+			'\\x{A72E}' .
+			'\\x{A732}' .
+			'\\x{A734}' .
+			'\\x{A736}' .
+			'\\x{A738}' .
+			'\\x{A73A}' .
+			'\\x{A73C}' .
+			'\\x{A73E}' .
+			'\\x{A740}' .
+			'\\x{A742}' .
+			'\\x{A744}' .
+			'\\x{A746}' .
+			'\\x{A748}' .
+			'\\x{A74A}' .
+			'\\x{A74C}' .
+			'\\x{A74E}' .
+			'\\x{A750}' .
+			'\\x{A752}' .
+			'\\x{A754}' .
+			'\\x{A756}' .
+			'\\x{A758}' .
+			'\\x{A75A}' .
+			'\\x{A75C}' .
+			'\\x{A75E}' .
+			'\\x{A760}' .
+			'\\x{A762}' .
+			'\\x{A764}' .
+			'\\x{A766}' .
+			'\\x{A768}' .
+			'\\x{A76A}' .
+			'\\x{A76C}' .
+			'\\x{A76E}' .
+			'\\x{A770}' .
+			'\\x{A779}' .
+			'\\x{A77B}' .
+			'\\x{A77D}-\\x{A77E}' .
+			'\\x{A780}' .
+			'\\x{A782}' .
+			'\\x{A784}' .
+			'\\x{A786}' .
+			'\\x{A78B}' .
+			'\\x{A78D}' .
+			'\\x{A790}' .
+			'\\x{A792}' .
+			'\\x{A796}' .
+			'\\x{A798}' .
+			'\\x{A79A}' .
+			'\\x{A79C}' .
+			'\\x{A79E}' .
+			'\\x{A7A0}' .
+			'\\x{A7A2}' .
+			'\\x{A7A4}' .
+			'\\x{A7A6}' .
+			'\\x{A7A8}' .
+			'\\x{A7AA}-\\x{A7AE}' .
+			'\\x{A7B0}-\\x{A7B4}' .
+			'\\x{A7B6}' .
+			'\\x{A7B8}' .
+			'\\x{A7BA}' .
+			'\\x{A7BC}' .
+			'\\x{A7BE}' .
+			'\\x{A7C0}' .
+			'\\x{A7C2}' .
+			'\\x{A7C4}-\\x{A7C7}' .
+			'\\x{A7C9}' .
+			'\\x{A7D0}' .
+			'\\x{A7D6}' .
+			'\\x{A7D8}' .
+			'\\x{A7F2}-\\x{A7F5}' .
+			'\\x{A7F8}-\\x{A7F9}' .
+			'\\x{AB5C}-\\x{AB5F}' .
+			'\\x{AB69}' .
+			'\\x{AB70}-\\x{ABBF}' .
+			'\\x{F900}-\\x{FA0D}' .
+			'\\x{FA10}' .
+			'\\x{FA12}' .
+			'\\x{FA15}-\\x{FA1E}' .
+			'\\x{FA20}' .
+			'\\x{FA22}' .
+			'\\x{FA25}-\\x{FA26}' .
+			'\\x{FA2A}-\\x{FA6D}' .
+			'\\x{FA70}-\\x{FAD9}' .
+			'\\x{FB00}-\\x{FB06}' .
+			'\\x{FB13}-\\x{FB17}' .
+			'\\x{FB1D}' .
+			'\\x{FB1F}-\\x{FB36}' .
+			'\\x{FB38}-\\x{FB3C}' .
+			'\\x{FB3E}' .
+			'\\x{FB40}-\\x{FB41}' .
+			'\\x{FB43}-\\x{FB44}' .
+			'\\x{FB46}-\\x{FBB1}' .
+			'\\x{FBD3}-\\x{FD3D}' .
+			'\\x{FD50}-\\x{FD8F}' .
+			'\\x{FD92}-\\x{FDC7}' .
+			'\\x{FDF0}-\\x{FDFC}' .
+			'\\x{FE00}-\\x{FE19}' .
+			'\\x{FE30}-\\x{FE44}' .
+			'\\x{FE47}-\\x{FE52}' .
+			'\\x{FE54}-\\x{FE66}' .
+			'\\x{FE68}-\\x{FE6B}' .
+			'\\x{FE70}-\\x{FE72}' .
+			'\\x{FE74}' .
+			'\\x{FE76}-\\x{FEFC}' .
+			'\\x{FEFF}' .
+			'\\x{FF01}-\\x{FFBE}' .
+			'\\x{FFC2}-\\x{FFC7}' .
+			'\\x{FFCA}-\\x{FFCF}' .
+			'\\x{FFD2}-\\x{FFD7}' .
+			'\\x{FFDA}-\\x{FFDC}' .
+			'\\x{FFE0}-\\x{FFE6}' .
+			'\\x{FFE8}-\\x{FFEE}' .
+			'\\x{FFF0}-\\x{FFF8}' .
+			'\\x{10400}-\\x{10427}' .
+			'\\x{104B0}-\\x{104D3}' .
+			'\\x{10570}-\\x{1057A}' .
+			'\\x{1057C}-\\x{1058A}' .
+			'\\x{1058C}-\\x{10592}' .
+			'\\x{10594}-\\x{10595}' .
+			'\\x{10781}-\\x{10785}' .
+			'\\x{10787}-\\x{107B0}' .
+			'\\x{107B2}-\\x{107BA}' .
+			'\\x{10C80}-\\x{10CB2}' .
+			'\\x{118A0}-\\x{118BF}' .
+			'\\x{16E40}-\\x{16E5F}' .
+			'\\x{1BCA0}-\\x{1BCA3}' .
+			'\\x{1D15E}-\\x{1D164}' .
+			'\\x{1D173}-\\x{1D17A}' .
+			'\\x{1D1BB}-\\x{1D1C0}' .
+			'\\x{1D400}-\\x{1D454}' .
+			'\\x{1D456}-\\x{1D49C}' .
+			'\\x{1D49E}-\\x{1D49F}' .
+			'\\x{1D4A2}' .
+			'\\x{1D4A5}-\\x{1D4A6}' .
+			'\\x{1D4A9}-\\x{1D4AC}' .
+			'\\x{1D4AE}-\\x{1D4B9}' .
+			'\\x{1D4BB}' .
+			'\\x{1D4BD}-\\x{1D4C3}' .
+			'\\x{1D4C5}-\\x{1D505}' .
+			'\\x{1D507}-\\x{1D50A}' .
+			'\\x{1D50D}-\\x{1D514}' .
+			'\\x{1D516}-\\x{1D51C}' .
+			'\\x{1D51E}-\\x{1D539}' .
+			'\\x{1D53B}-\\x{1D53E}' .
+			'\\x{1D540}-\\x{1D544}' .
+			'\\x{1D546}' .
+			'\\x{1D54A}-\\x{1D550}' .
+			'\\x{1D552}-\\x{1D6A5}' .
+			'\\x{1D6A8}-\\x{1D7CB}' .
+			'\\x{1D7CE}-\\x{1D7FF}' .
+			'\\x{1E030}-\\x{1E06D}' .
+			'\\x{1E900}-\\x{1E921}' .
+			'\\x{1EE00}-\\x{1EE03}' .
+			'\\x{1EE05}-\\x{1EE1F}' .
+			'\\x{1EE21}-\\x{1EE22}' .
+			'\\x{1EE24}' .
+			'\\x{1EE27}' .
+			'\\x{1EE29}-\\x{1EE32}' .
+			'\\x{1EE34}-\\x{1EE37}' .
+			'\\x{1EE39}' .
+			'\\x{1EE3B}' .
+			'\\x{1EE42}' .
+			'\\x{1EE47}' .
+			'\\x{1EE49}' .
+			'\\x{1EE4B}' .
+			'\\x{1EE4D}-\\x{1EE4F}' .
+			'\\x{1EE51}-\\x{1EE52}' .
+			'\\x{1EE54}' .
+			'\\x{1EE57}' .
+			'\\x{1EE59}' .
+			'\\x{1EE5B}' .
+			'\\x{1EE5D}' .
+			'\\x{1EE5F}' .
+			'\\x{1EE61}-\\x{1EE62}' .
+			'\\x{1EE64}' .
+			'\\x{1EE67}-\\x{1EE6A}' .
+			'\\x{1EE6C}-\\x{1EE72}' .
+			'\\x{1EE74}-\\x{1EE77}' .
+			'\\x{1EE79}-\\x{1EE7C}' .
+			'\\x{1EE7E}' .
+			'\\x{1EE80}-\\x{1EE89}' .
+			'\\x{1EE8B}-\\x{1EE9B}' .
+			'\\x{1EEA1}-\\x{1EEA3}' .
+			'\\x{1EEA5}-\\x{1EEA9}' .
+			'\\x{1EEAB}-\\x{1EEBB}' .
+			'\\x{1F100}-\\x{1F10A}' .
+			'\\x{1F110}-\\x{1F12E}' .
+			'\\x{1F130}-\\x{1F14F}' .
+			'\\x{1F16A}-\\x{1F16C}' .
+			'\\x{1F190}' .
+			'\\x{1F200}-\\x{1F202}' .
+			'\\x{1F210}-\\x{1F23B}' .
+			'\\x{1F240}-\\x{1F248}' .
+			'\\x{1F250}-\\x{1F251}' .
+			'\\x{1FBF0}-\\x{1FBF9}' .
+			'\\x{2F800}-\\x{2FA1D}' .
+			'\\x{E0000}-\\x{E0FFF}',
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/RegularExpressions.php b/Sources/Unicode/RegularExpressions.php
index a34987d6f0..554001e610 100644
--- a/Sources/Unicode/RegularExpressions.php
+++ b/Sources/Unicode/RegularExpressions.php
@@ -13,8 +13,9 @@
 
 namespace SMF\Unicode;
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Helper function for utf8_sanitize_invisibles and utf8_convert_case.
@@ -32,1679 +33,1680 @@
  */
 function utf8_regex_properties()
 {
-	return array(
+	return [
 		'Bidi_Control' =>
-			'\x{061C}' .
-			'\x{200E}-\x{200F}' .
-			'\x{202A}-\x{202E}' .
-			'\x{2066}-\x{2069}',
+			'\\x{061C}' .
+			'\\x{200E}-\\x{200F}' .
+			'\\x{202A}-\\x{202E}' .
+			'\\x{2066}-\\x{2069}',
 		'Case_Ignorable' =>
-			'\x{0027}' .
-			'\x{002E}' .
-			'\x{003A}' .
-			'\x{005E}' .
-			'\x{0060}' .
-			'\x{00A8}' .
-			'\x{00AD}' .
-			'\x{00AF}' .
-			'\x{00B4}' .
-			'\x{00B7}' .
-			'\x{00B8}' .
-			'\x{02B0}-\x{02C1}' .
-			'\x{02C2}-\x{02C5}' .
-			'\x{02C6}-\x{02D1}' .
-			'\x{02D2}-\x{02DF}' .
-			'\x{02E0}-\x{02E4}' .
-			'\x{02E5}-\x{02EB}' .
-			'\x{02EC}' .
-			'\x{02ED}' .
-			'\x{02EE}' .
-			'\x{02EF}-\x{02FF}' .
-			'\x{0300}-\x{036F}' .
-			'\x{0374}' .
-			'\x{0375}' .
-			'\x{037A}' .
-			'\x{0384}-\x{0385}' .
-			'\x{0387}' .
-			'\x{0483}-\x{0487}' .
-			'\x{0488}-\x{0489}' .
-			'\x{0559}' .
-			'\x{055F}' .
-			'\x{0591}-\x{05BD}' .
-			'\x{05BF}' .
-			'\x{05C1}-\x{05C2}' .
-			'\x{05C4}-\x{05C5}' .
-			'\x{05C7}' .
-			'\x{05F4}' .
-			'\x{0600}-\x{0605}' .
-			'\x{0610}-\x{061A}' .
-			'\x{061C}' .
-			'\x{0640}' .
-			'\x{064B}-\x{065F}' .
-			'\x{0670}' .
-			'\x{06D6}-\x{06DC}' .
-			'\x{06DD}' .
-			'\x{06DF}-\x{06E4}' .
-			'\x{06E5}-\x{06E6}' .
-			'\x{06E7}-\x{06E8}' .
-			'\x{06EA}-\x{06ED}' .
-			'\x{070F}' .
-			'\x{0711}' .
-			'\x{0730}-\x{074A}' .
-			'\x{07A6}-\x{07B0}' .
-			'\x{07EB}-\x{07F3}' .
-			'\x{07F4}-\x{07F5}' .
-			'\x{07FA}' .
-			'\x{07FD}' .
-			'\x{0816}-\x{0819}' .
-			'\x{081A}' .
-			'\x{081B}-\x{0823}' .
-			'\x{0824}' .
-			'\x{0825}-\x{0827}' .
-			'\x{0828}' .
-			'\x{0829}-\x{082D}' .
-			'\x{0859}-\x{085B}' .
-			'\x{0888}' .
-			'\x{0890}-\x{0891}' .
-			'\x{0898}-\x{089F}' .
-			'\x{08C9}' .
-			'\x{08CA}-\x{08E1}' .
-			'\x{08E2}' .
-			'\x{08E3}-\x{0902}' .
-			'\x{093A}' .
-			'\x{093C}' .
-			'\x{0941}-\x{0948}' .
-			'\x{094D}' .
-			'\x{0951}-\x{0957}' .
-			'\x{0962}-\x{0963}' .
-			'\x{0971}' .
-			'\x{0981}' .
-			'\x{09BC}' .
-			'\x{09C1}-\x{09C4}' .
-			'\x{09CD}' .
-			'\x{09E2}-\x{09E3}' .
-			'\x{09FE}' .
-			'\x{0A01}-\x{0A02}' .
-			'\x{0A3C}' .
-			'\x{0A41}-\x{0A42}' .
-			'\x{0A47}-\x{0A48}' .
-			'\x{0A4B}-\x{0A4D}' .
-			'\x{0A51}' .
-			'\x{0A70}-\x{0A71}' .
-			'\x{0A75}' .
-			'\x{0A81}-\x{0A82}' .
-			'\x{0ABC}' .
-			'\x{0AC1}-\x{0AC5}' .
-			'\x{0AC7}-\x{0AC8}' .
-			'\x{0ACD}' .
-			'\x{0AE2}-\x{0AE3}' .
-			'\x{0AFA}-\x{0AFF}' .
-			'\x{0B01}' .
-			'\x{0B3C}' .
-			'\x{0B3F}' .
-			'\x{0B41}-\x{0B44}' .
-			'\x{0B4D}' .
-			'\x{0B55}-\x{0B56}' .
-			'\x{0B62}-\x{0B63}' .
-			'\x{0B82}' .
-			'\x{0BC0}' .
-			'\x{0BCD}' .
-			'\x{0C00}' .
-			'\x{0C04}' .
-			'\x{0C3C}' .
-			'\x{0C3E}-\x{0C40}' .
-			'\x{0C46}-\x{0C48}' .
-			'\x{0C4A}-\x{0C4D}' .
-			'\x{0C55}-\x{0C56}' .
-			'\x{0C62}-\x{0C63}' .
-			'\x{0C81}' .
-			'\x{0CBC}' .
-			'\x{0CBF}' .
-			'\x{0CC6}' .
-			'\x{0CCC}-\x{0CCD}' .
-			'\x{0CE2}-\x{0CE3}' .
-			'\x{0D00}-\x{0D01}' .
-			'\x{0D3B}-\x{0D3C}' .
-			'\x{0D41}-\x{0D44}' .
-			'\x{0D4D}' .
-			'\x{0D62}-\x{0D63}' .
-			'\x{0D81}' .
-			'\x{0DCA}' .
-			'\x{0DD2}-\x{0DD4}' .
-			'\x{0DD6}' .
-			'\x{0E31}' .
-			'\x{0E34}-\x{0E3A}' .
-			'\x{0E46}' .
-			'\x{0E47}-\x{0E4E}' .
-			'\x{0EB1}' .
-			'\x{0EB4}-\x{0EBC}' .
-			'\x{0EC6}' .
-			'\x{0EC8}-\x{0ECE}' .
-			'\x{0F18}-\x{0F19}' .
-			'\x{0F35}' .
-			'\x{0F37}' .
-			'\x{0F39}' .
-			'\x{0F71}-\x{0F7E}' .
-			'\x{0F80}-\x{0F84}' .
-			'\x{0F86}-\x{0F87}' .
-			'\x{0F8D}-\x{0F97}' .
-			'\x{0F99}-\x{0FBC}' .
-			'\x{0FC6}' .
-			'\x{102D}-\x{1030}' .
-			'\x{1032}-\x{1037}' .
-			'\x{1039}-\x{103A}' .
-			'\x{103D}-\x{103E}' .
-			'\x{1058}-\x{1059}' .
-			'\x{105E}-\x{1060}' .
-			'\x{1071}-\x{1074}' .
-			'\x{1082}' .
-			'\x{1085}-\x{1086}' .
-			'\x{108D}' .
-			'\x{109D}' .
-			'\x{10FC}' .
-			'\x{135D}-\x{135F}' .
-			'\x{1712}-\x{1714}' .
-			'\x{1732}-\x{1733}' .
-			'\x{1752}-\x{1753}' .
-			'\x{1772}-\x{1773}' .
-			'\x{17B4}-\x{17B5}' .
-			'\x{17B7}-\x{17BD}' .
-			'\x{17C6}' .
-			'\x{17C9}-\x{17D3}' .
-			'\x{17D7}' .
-			'\x{17DD}' .
-			'\x{180B}-\x{180D}' .
-			'\x{180E}' .
-			'\x{180F}' .
-			'\x{1843}' .
-			'\x{1885}-\x{1886}' .
-			'\x{18A9}' .
-			'\x{1920}-\x{1922}' .
-			'\x{1927}-\x{1928}' .
-			'\x{1932}' .
-			'\x{1939}-\x{193B}' .
-			'\x{1A17}-\x{1A18}' .
-			'\x{1A1B}' .
-			'\x{1A56}' .
-			'\x{1A58}-\x{1A5E}' .
-			'\x{1A60}' .
-			'\x{1A62}' .
-			'\x{1A65}-\x{1A6C}' .
-			'\x{1A73}-\x{1A7C}' .
-			'\x{1A7F}' .
-			'\x{1AA7}' .
-			'\x{1AB0}-\x{1ABD}' .
-			'\x{1ABE}' .
-			'\x{1ABF}-\x{1ACE}' .
-			'\x{1B00}-\x{1B03}' .
-			'\x{1B34}' .
-			'\x{1B36}-\x{1B3A}' .
-			'\x{1B3C}' .
-			'\x{1B42}' .
-			'\x{1B6B}-\x{1B73}' .
-			'\x{1B80}-\x{1B81}' .
-			'\x{1BA2}-\x{1BA5}' .
-			'\x{1BA8}-\x{1BA9}' .
-			'\x{1BAB}-\x{1BAD}' .
-			'\x{1BE6}' .
-			'\x{1BE8}-\x{1BE9}' .
-			'\x{1BED}' .
-			'\x{1BEF}-\x{1BF1}' .
-			'\x{1C2C}-\x{1C33}' .
-			'\x{1C36}-\x{1C37}' .
-			'\x{1C78}-\x{1C7D}' .
-			'\x{1CD0}-\x{1CD2}' .
-			'\x{1CD4}-\x{1CE0}' .
-			'\x{1CE2}-\x{1CE8}' .
-			'\x{1CED}' .
-			'\x{1CF4}' .
-			'\x{1CF8}-\x{1CF9}' .
-			'\x{1D2C}-\x{1D6A}' .
-			'\x{1D78}' .
-			'\x{1D9B}-\x{1DBF}' .
-			'\x{1DC0}-\x{1DFF}' .
-			'\x{1FBD}' .
-			'\x{1FBF}-\x{1FC1}' .
-			'\x{1FCD}-\x{1FCF}' .
-			'\x{1FDD}-\x{1FDF}' .
-			'\x{1FED}-\x{1FEF}' .
-			'\x{1FFD}-\x{1FFE}' .
-			'\x{200B}-\x{200F}' .
-			'\x{2018}' .
-			'\x{2019}' .
-			'\x{2024}' .
-			'\x{2027}' .
-			'\x{202A}-\x{202E}' .
-			'\x{2060}-\x{2064}' .
-			'\x{2066}-\x{206F}' .
-			'\x{2071}' .
-			'\x{207F}' .
-			'\x{2090}-\x{209C}' .
-			'\x{20D0}-\x{20DC}' .
-			'\x{20DD}-\x{20E0}' .
-			'\x{20E1}' .
-			'\x{20E2}-\x{20E4}' .
-			'\x{20E5}-\x{20F0}' .
-			'\x{2C7C}-\x{2C7D}' .
-			'\x{2CEF}-\x{2CF1}' .
-			'\x{2D6F}' .
-			'\x{2D7F}' .
-			'\x{2DE0}-\x{2DFF}' .
-			'\x{2E2F}' .
-			'\x{3005}' .
-			'\x{302A}-\x{302D}' .
-			'\x{3031}-\x{3035}' .
-			'\x{303B}' .
-			'\x{3099}-\x{309A}' .
-			'\x{309B}-\x{309C}' .
-			'\x{309D}-\x{309E}' .
-			'\x{30FC}-\x{30FE}' .
-			'\x{A015}' .
-			'\x{A4F8}-\x{A4FD}' .
-			'\x{A60C}' .
-			'\x{A66F}' .
-			'\x{A670}-\x{A672}' .
-			'\x{A674}-\x{A67D}' .
-			'\x{A67F}' .
-			'\x{A69C}-\x{A69D}' .
-			'\x{A69E}-\x{A69F}' .
-			'\x{A6F0}-\x{A6F1}' .
-			'\x{A700}-\x{A716}' .
-			'\x{A717}-\x{A71F}' .
-			'\x{A720}-\x{A721}' .
-			'\x{A770}' .
-			'\x{A788}' .
-			'\x{A789}-\x{A78A}' .
-			'\x{A7F2}-\x{A7F4}' .
-			'\x{A7F8}-\x{A7F9}' .
-			'\x{A802}' .
-			'\x{A806}' .
-			'\x{A80B}' .
-			'\x{A825}-\x{A826}' .
-			'\x{A82C}' .
-			'\x{A8C4}-\x{A8C5}' .
-			'\x{A8E0}-\x{A8F1}' .
-			'\x{A8FF}' .
-			'\x{A926}-\x{A92D}' .
-			'\x{A947}-\x{A951}' .
-			'\x{A980}-\x{A982}' .
-			'\x{A9B3}' .
-			'\x{A9B6}-\x{A9B9}' .
-			'\x{A9BC}-\x{A9BD}' .
-			'\x{A9CF}' .
-			'\x{A9E5}' .
-			'\x{A9E6}' .
-			'\x{AA29}-\x{AA2E}' .
-			'\x{AA31}-\x{AA32}' .
-			'\x{AA35}-\x{AA36}' .
-			'\x{AA43}' .
-			'\x{AA4C}' .
-			'\x{AA70}' .
-			'\x{AA7C}' .
-			'\x{AAB0}' .
-			'\x{AAB2}-\x{AAB4}' .
-			'\x{AAB7}-\x{AAB8}' .
-			'\x{AABE}-\x{AABF}' .
-			'\x{AAC1}' .
-			'\x{AADD}' .
-			'\x{AAEC}-\x{AAED}' .
-			'\x{AAF3}-\x{AAF4}' .
-			'\x{AAF6}' .
-			'\x{AB5B}' .
-			'\x{AB5C}-\x{AB5F}' .
-			'\x{AB69}' .
-			'\x{AB6A}-\x{AB6B}' .
-			'\x{ABE5}' .
-			'\x{ABE8}' .
-			'\x{ABED}' .
-			'\x{FB1E}' .
-			'\x{FBB2}-\x{FBC2}' .
-			'\x{FE00}-\x{FE0F}' .
-			'\x{FE13}' .
-			'\x{FE20}-\x{FE2F}' .
-			'\x{FE52}' .
-			'\x{FE55}' .
-			'\x{FEFF}' .
-			'\x{FF07}' .
-			'\x{FF0E}' .
-			'\x{FF1A}' .
-			'\x{FF3E}' .
-			'\x{FF40}' .
-			'\x{FF70}' .
-			'\x{FF9E}-\x{FF9F}' .
-			'\x{FFE3}' .
-			'\x{FFF9}-\x{FFFB}' .
-			'\x{101FD}' .
-			'\x{102E0}' .
-			'\x{10376}-\x{1037A}' .
-			'\x{10780}-\x{10785}' .
-			'\x{10787}-\x{107B0}' .
-			'\x{107B2}-\x{107BA}' .
-			'\x{10A01}-\x{10A03}' .
-			'\x{10A05}-\x{10A06}' .
-			'\x{10A0C}-\x{10A0F}' .
-			'\x{10A38}-\x{10A3A}' .
-			'\x{10A3F}' .
-			'\x{10AE5}-\x{10AE6}' .
-			'\x{10D24}-\x{10D27}' .
-			'\x{10EAB}-\x{10EAC}' .
-			'\x{10EFD}-\x{10EFF}' .
-			'\x{10F46}-\x{10F50}' .
-			'\x{10F82}-\x{10F85}' .
-			'\x{11001}' .
-			'\x{11038}-\x{11046}' .
-			'\x{11070}' .
-			'\x{11073}-\x{11074}' .
-			'\x{1107F}-\x{11081}' .
-			'\x{110B3}-\x{110B6}' .
-			'\x{110B9}-\x{110BA}' .
-			'\x{110BD}' .
-			'\x{110C2}' .
-			'\x{110CD}' .
-			'\x{11100}-\x{11102}' .
-			'\x{11127}-\x{1112B}' .
-			'\x{1112D}-\x{11134}' .
-			'\x{11173}' .
-			'\x{11180}-\x{11181}' .
-			'\x{111B6}-\x{111BE}' .
-			'\x{111C9}-\x{111CC}' .
-			'\x{111CF}' .
-			'\x{1122F}-\x{11231}' .
-			'\x{11234}' .
-			'\x{11236}-\x{11237}' .
-			'\x{1123E}' .
-			'\x{11241}' .
-			'\x{112DF}' .
-			'\x{112E3}-\x{112EA}' .
-			'\x{11300}-\x{11301}' .
-			'\x{1133B}-\x{1133C}' .
-			'\x{11340}' .
-			'\x{11366}-\x{1136C}' .
-			'\x{11370}-\x{11374}' .
-			'\x{11438}-\x{1143F}' .
-			'\x{11442}-\x{11444}' .
-			'\x{11446}' .
-			'\x{1145E}' .
-			'\x{114B3}-\x{114B8}' .
-			'\x{114BA}' .
-			'\x{114BF}-\x{114C0}' .
-			'\x{114C2}-\x{114C3}' .
-			'\x{115B2}-\x{115B5}' .
-			'\x{115BC}-\x{115BD}' .
-			'\x{115BF}-\x{115C0}' .
-			'\x{115DC}-\x{115DD}' .
-			'\x{11633}-\x{1163A}' .
-			'\x{1163D}' .
-			'\x{1163F}-\x{11640}' .
-			'\x{116AB}' .
-			'\x{116AD}' .
-			'\x{116B0}-\x{116B5}' .
-			'\x{116B7}' .
-			'\x{1171D}-\x{1171F}' .
-			'\x{11722}-\x{11725}' .
-			'\x{11727}-\x{1172B}' .
-			'\x{1182F}-\x{11837}' .
-			'\x{11839}-\x{1183A}' .
-			'\x{1193B}-\x{1193C}' .
-			'\x{1193E}' .
-			'\x{11943}' .
-			'\x{119D4}-\x{119D7}' .
-			'\x{119DA}-\x{119DB}' .
-			'\x{119E0}' .
-			'\x{11A01}-\x{11A0A}' .
-			'\x{11A33}-\x{11A38}' .
-			'\x{11A3B}-\x{11A3E}' .
-			'\x{11A47}' .
-			'\x{11A51}-\x{11A56}' .
-			'\x{11A59}-\x{11A5B}' .
-			'\x{11A8A}-\x{11A96}' .
-			'\x{11A98}-\x{11A99}' .
-			'\x{11C30}-\x{11C36}' .
-			'\x{11C38}-\x{11C3D}' .
-			'\x{11C3F}' .
-			'\x{11C92}-\x{11CA7}' .
-			'\x{11CAA}-\x{11CB0}' .
-			'\x{11CB2}-\x{11CB3}' .
-			'\x{11CB5}-\x{11CB6}' .
-			'\x{11D31}-\x{11D36}' .
-			'\x{11D3A}' .
-			'\x{11D3C}-\x{11D3D}' .
-			'\x{11D3F}-\x{11D45}' .
-			'\x{11D47}' .
-			'\x{11D90}-\x{11D91}' .
-			'\x{11D95}' .
-			'\x{11D97}' .
-			'\x{11EF3}-\x{11EF4}' .
-			'\x{11F00}-\x{11F01}' .
-			'\x{11F36}-\x{11F3A}' .
-			'\x{11F40}' .
-			'\x{11F42}' .
-			'\x{13430}-\x{1343F}' .
-			'\x{13440}' .
-			'\x{13447}-\x{13455}' .
-			'\x{16AF0}-\x{16AF4}' .
-			'\x{16B30}-\x{16B36}' .
-			'\x{16B40}-\x{16B43}' .
-			'\x{16F4F}' .
-			'\x{16F8F}-\x{16F92}' .
-			'\x{16F93}-\x{16F9F}' .
-			'\x{16FE0}-\x{16FE1}' .
-			'\x{16FE3}' .
-			'\x{16FE4}' .
-			'\x{1AFF0}-\x{1AFF3}' .
-			'\x{1AFF5}-\x{1AFFB}' .
-			'\x{1AFFD}-\x{1AFFE}' .
-			'\x{1BC9D}-\x{1BC9E}' .
-			'\x{1BCA0}-\x{1BCA3}' .
-			'\x{1CF00}-\x{1CF2D}' .
-			'\x{1CF30}-\x{1CF46}' .
-			'\x{1D167}-\x{1D169}' .
-			'\x{1D173}-\x{1D17A}' .
-			'\x{1D17B}-\x{1D182}' .
-			'\x{1D185}-\x{1D18B}' .
-			'\x{1D1AA}-\x{1D1AD}' .
-			'\x{1D242}-\x{1D244}' .
-			'\x{1DA00}-\x{1DA36}' .
-			'\x{1DA3B}-\x{1DA6C}' .
-			'\x{1DA75}' .
-			'\x{1DA84}' .
-			'\x{1DA9B}-\x{1DA9F}' .
-			'\x{1DAA1}-\x{1DAAF}' .
-			'\x{1E000}-\x{1E006}' .
-			'\x{1E008}-\x{1E018}' .
-			'\x{1E01B}-\x{1E021}' .
-			'\x{1E023}-\x{1E024}' .
-			'\x{1E026}-\x{1E02A}' .
-			'\x{1E030}-\x{1E06D}' .
-			'\x{1E08F}' .
-			'\x{1E130}-\x{1E136}' .
-			'\x{1E137}-\x{1E13D}' .
-			'\x{1E2AE}' .
-			'\x{1E2EC}-\x{1E2EF}' .
-			'\x{1E4EB}' .
-			'\x{1E4EC}-\x{1E4EF}' .
-			'\x{1E8D0}-\x{1E8D6}' .
-			'\x{1E944}-\x{1E94A}' .
-			'\x{1E94B}' .
-			'\x{1F3FB}-\x{1F3FF}' .
-			'\x{E0001}' .
-			'\x{E0020}-\x{E007F}' .
-			'\x{E0100}-\x{E01EF}',
+			'\\x{0027}' .
+			'\\x{002E}' .
+			'\\x{003A}' .
+			'\\x{005E}' .
+			'\\x{0060}' .
+			'\\x{00A8}' .
+			'\\x{00AD}' .
+			'\\x{00AF}' .
+			'\\x{00B4}' .
+			'\\x{00B7}' .
+			'\\x{00B8}' .
+			'\\x{02B0}-\\x{02C1}' .
+			'\\x{02C2}-\\x{02C5}' .
+			'\\x{02C6}-\\x{02D1}' .
+			'\\x{02D2}-\\x{02DF}' .
+			'\\x{02E0}-\\x{02E4}' .
+			'\\x{02E5}-\\x{02EB}' .
+			'\\x{02EC}' .
+			'\\x{02ED}' .
+			'\\x{02EE}' .
+			'\\x{02EF}-\\x{02FF}' .
+			'\\x{0300}-\\x{036F}' .
+			'\\x{0374}' .
+			'\\x{0375}' .
+			'\\x{037A}' .
+			'\\x{0384}-\\x{0385}' .
+			'\\x{0387}' .
+			'\\x{0483}-\\x{0487}' .
+			'\\x{0488}-\\x{0489}' .
+			'\\x{0559}' .
+			'\\x{055F}' .
+			'\\x{0591}-\\x{05BD}' .
+			'\\x{05BF}' .
+			'\\x{05C1}-\\x{05C2}' .
+			'\\x{05C4}-\\x{05C5}' .
+			'\\x{05C7}' .
+			'\\x{05F4}' .
+			'\\x{0600}-\\x{0605}' .
+			'\\x{0610}-\\x{061A}' .
+			'\\x{061C}' .
+			'\\x{0640}' .
+			'\\x{064B}-\\x{065F}' .
+			'\\x{0670}' .
+			'\\x{06D6}-\\x{06DC}' .
+			'\\x{06DD}' .
+			'\\x{06DF}-\\x{06E4}' .
+			'\\x{06E5}-\\x{06E6}' .
+			'\\x{06E7}-\\x{06E8}' .
+			'\\x{06EA}-\\x{06ED}' .
+			'\\x{070F}' .
+			'\\x{0711}' .
+			'\\x{0730}-\\x{074A}' .
+			'\\x{07A6}-\\x{07B0}' .
+			'\\x{07EB}-\\x{07F3}' .
+			'\\x{07F4}-\\x{07F5}' .
+			'\\x{07FA}' .
+			'\\x{07FD}' .
+			'\\x{0816}-\\x{0819}' .
+			'\\x{081A}' .
+			'\\x{081B}-\\x{0823}' .
+			'\\x{0824}' .
+			'\\x{0825}-\\x{0827}' .
+			'\\x{0828}' .
+			'\\x{0829}-\\x{082D}' .
+			'\\x{0859}-\\x{085B}' .
+			'\\x{0888}' .
+			'\\x{0890}-\\x{0891}' .
+			'\\x{0898}-\\x{089F}' .
+			'\\x{08C9}' .
+			'\\x{08CA}-\\x{08E1}' .
+			'\\x{08E2}' .
+			'\\x{08E3}-\\x{0902}' .
+			'\\x{093A}' .
+			'\\x{093C}' .
+			'\\x{0941}-\\x{0948}' .
+			'\\x{094D}' .
+			'\\x{0951}-\\x{0957}' .
+			'\\x{0962}-\\x{0963}' .
+			'\\x{0971}' .
+			'\\x{0981}' .
+			'\\x{09BC}' .
+			'\\x{09C1}-\\x{09C4}' .
+			'\\x{09CD}' .
+			'\\x{09E2}-\\x{09E3}' .
+			'\\x{09FE}' .
+			'\\x{0A01}-\\x{0A02}' .
+			'\\x{0A3C}' .
+			'\\x{0A41}-\\x{0A42}' .
+			'\\x{0A47}-\\x{0A48}' .
+			'\\x{0A4B}-\\x{0A4D}' .
+			'\\x{0A51}' .
+			'\\x{0A70}-\\x{0A71}' .
+			'\\x{0A75}' .
+			'\\x{0A81}-\\x{0A82}' .
+			'\\x{0ABC}' .
+			'\\x{0AC1}-\\x{0AC5}' .
+			'\\x{0AC7}-\\x{0AC8}' .
+			'\\x{0ACD}' .
+			'\\x{0AE2}-\\x{0AE3}' .
+			'\\x{0AFA}-\\x{0AFF}' .
+			'\\x{0B01}' .
+			'\\x{0B3C}' .
+			'\\x{0B3F}' .
+			'\\x{0B41}-\\x{0B44}' .
+			'\\x{0B4D}' .
+			'\\x{0B55}-\\x{0B56}' .
+			'\\x{0B62}-\\x{0B63}' .
+			'\\x{0B82}' .
+			'\\x{0BC0}' .
+			'\\x{0BCD}' .
+			'\\x{0C00}' .
+			'\\x{0C04}' .
+			'\\x{0C3C}' .
+			'\\x{0C3E}-\\x{0C40}' .
+			'\\x{0C46}-\\x{0C48}' .
+			'\\x{0C4A}-\\x{0C4D}' .
+			'\\x{0C55}-\\x{0C56}' .
+			'\\x{0C62}-\\x{0C63}' .
+			'\\x{0C81}' .
+			'\\x{0CBC}' .
+			'\\x{0CBF}' .
+			'\\x{0CC6}' .
+			'\\x{0CCC}-\\x{0CCD}' .
+			'\\x{0CE2}-\\x{0CE3}' .
+			'\\x{0D00}-\\x{0D01}' .
+			'\\x{0D3B}-\\x{0D3C}' .
+			'\\x{0D41}-\\x{0D44}' .
+			'\\x{0D4D}' .
+			'\\x{0D62}-\\x{0D63}' .
+			'\\x{0D81}' .
+			'\\x{0DCA}' .
+			'\\x{0DD2}-\\x{0DD4}' .
+			'\\x{0DD6}' .
+			'\\x{0E31}' .
+			'\\x{0E34}-\\x{0E3A}' .
+			'\\x{0E46}' .
+			'\\x{0E47}-\\x{0E4E}' .
+			'\\x{0EB1}' .
+			'\\x{0EB4}-\\x{0EBC}' .
+			'\\x{0EC6}' .
+			'\\x{0EC8}-\\x{0ECE}' .
+			'\\x{0F18}-\\x{0F19}' .
+			'\\x{0F35}' .
+			'\\x{0F37}' .
+			'\\x{0F39}' .
+			'\\x{0F71}-\\x{0F7E}' .
+			'\\x{0F80}-\\x{0F84}' .
+			'\\x{0F86}-\\x{0F87}' .
+			'\\x{0F8D}-\\x{0F97}' .
+			'\\x{0F99}-\\x{0FBC}' .
+			'\\x{0FC6}' .
+			'\\x{102D}-\\x{1030}' .
+			'\\x{1032}-\\x{1037}' .
+			'\\x{1039}-\\x{103A}' .
+			'\\x{103D}-\\x{103E}' .
+			'\\x{1058}-\\x{1059}' .
+			'\\x{105E}-\\x{1060}' .
+			'\\x{1071}-\\x{1074}' .
+			'\\x{1082}' .
+			'\\x{1085}-\\x{1086}' .
+			'\\x{108D}' .
+			'\\x{109D}' .
+			'\\x{10FC}' .
+			'\\x{135D}-\\x{135F}' .
+			'\\x{1712}-\\x{1714}' .
+			'\\x{1732}-\\x{1733}' .
+			'\\x{1752}-\\x{1753}' .
+			'\\x{1772}-\\x{1773}' .
+			'\\x{17B4}-\\x{17B5}' .
+			'\\x{17B7}-\\x{17BD}' .
+			'\\x{17C6}' .
+			'\\x{17C9}-\\x{17D3}' .
+			'\\x{17D7}' .
+			'\\x{17DD}' .
+			'\\x{180B}-\\x{180D}' .
+			'\\x{180E}' .
+			'\\x{180F}' .
+			'\\x{1843}' .
+			'\\x{1885}-\\x{1886}' .
+			'\\x{18A9}' .
+			'\\x{1920}-\\x{1922}' .
+			'\\x{1927}-\\x{1928}' .
+			'\\x{1932}' .
+			'\\x{1939}-\\x{193B}' .
+			'\\x{1A17}-\\x{1A18}' .
+			'\\x{1A1B}' .
+			'\\x{1A56}' .
+			'\\x{1A58}-\\x{1A5E}' .
+			'\\x{1A60}' .
+			'\\x{1A62}' .
+			'\\x{1A65}-\\x{1A6C}' .
+			'\\x{1A73}-\\x{1A7C}' .
+			'\\x{1A7F}' .
+			'\\x{1AA7}' .
+			'\\x{1AB0}-\\x{1ABD}' .
+			'\\x{1ABE}' .
+			'\\x{1ABF}-\\x{1ACE}' .
+			'\\x{1B00}-\\x{1B03}' .
+			'\\x{1B34}' .
+			'\\x{1B36}-\\x{1B3A}' .
+			'\\x{1B3C}' .
+			'\\x{1B42}' .
+			'\\x{1B6B}-\\x{1B73}' .
+			'\\x{1B80}-\\x{1B81}' .
+			'\\x{1BA2}-\\x{1BA5}' .
+			'\\x{1BA8}-\\x{1BA9}' .
+			'\\x{1BAB}-\\x{1BAD}' .
+			'\\x{1BE6}' .
+			'\\x{1BE8}-\\x{1BE9}' .
+			'\\x{1BED}' .
+			'\\x{1BEF}-\\x{1BF1}' .
+			'\\x{1C2C}-\\x{1C33}' .
+			'\\x{1C36}-\\x{1C37}' .
+			'\\x{1C78}-\\x{1C7D}' .
+			'\\x{1CD0}-\\x{1CD2}' .
+			'\\x{1CD4}-\\x{1CE0}' .
+			'\\x{1CE2}-\\x{1CE8}' .
+			'\\x{1CED}' .
+			'\\x{1CF4}' .
+			'\\x{1CF8}-\\x{1CF9}' .
+			'\\x{1D2C}-\\x{1D6A}' .
+			'\\x{1D78}' .
+			'\\x{1D9B}-\\x{1DBF}' .
+			'\\x{1DC0}-\\x{1DFF}' .
+			'\\x{1FBD}' .
+			'\\x{1FBF}-\\x{1FC1}' .
+			'\\x{1FCD}-\\x{1FCF}' .
+			'\\x{1FDD}-\\x{1FDF}' .
+			'\\x{1FED}-\\x{1FEF}' .
+			'\\x{1FFD}-\\x{1FFE}' .
+			'\\x{200B}-\\x{200F}' .
+			'\\x{2018}' .
+			'\\x{2019}' .
+			'\\x{2024}' .
+			'\\x{2027}' .
+			'\\x{202A}-\\x{202E}' .
+			'\\x{2060}-\\x{2064}' .
+			'\\x{2066}-\\x{206F}' .
+			'\\x{2071}' .
+			'\\x{207F}' .
+			'\\x{2090}-\\x{209C}' .
+			'\\x{20D0}-\\x{20DC}' .
+			'\\x{20DD}-\\x{20E0}' .
+			'\\x{20E1}' .
+			'\\x{20E2}-\\x{20E4}' .
+			'\\x{20E5}-\\x{20F0}' .
+			'\\x{2C7C}-\\x{2C7D}' .
+			'\\x{2CEF}-\\x{2CF1}' .
+			'\\x{2D6F}' .
+			'\\x{2D7F}' .
+			'\\x{2DE0}-\\x{2DFF}' .
+			'\\x{2E2F}' .
+			'\\x{3005}' .
+			'\\x{302A}-\\x{302D}' .
+			'\\x{3031}-\\x{3035}' .
+			'\\x{303B}' .
+			'\\x{3099}-\\x{309A}' .
+			'\\x{309B}-\\x{309C}' .
+			'\\x{309D}-\\x{309E}' .
+			'\\x{30FC}-\\x{30FE}' .
+			'\\x{A015}' .
+			'\\x{A4F8}-\\x{A4FD}' .
+			'\\x{A60C}' .
+			'\\x{A66F}' .
+			'\\x{A670}-\\x{A672}' .
+			'\\x{A674}-\\x{A67D}' .
+			'\\x{A67F}' .
+			'\\x{A69C}-\\x{A69D}' .
+			'\\x{A69E}-\\x{A69F}' .
+			'\\x{A6F0}-\\x{A6F1}' .
+			'\\x{A700}-\\x{A716}' .
+			'\\x{A717}-\\x{A71F}' .
+			'\\x{A720}-\\x{A721}' .
+			'\\x{A770}' .
+			'\\x{A788}' .
+			'\\x{A789}-\\x{A78A}' .
+			'\\x{A7F2}-\\x{A7F4}' .
+			'\\x{A7F8}-\\x{A7F9}' .
+			'\\x{A802}' .
+			'\\x{A806}' .
+			'\\x{A80B}' .
+			'\\x{A825}-\\x{A826}' .
+			'\\x{A82C}' .
+			'\\x{A8C4}-\\x{A8C5}' .
+			'\\x{A8E0}-\\x{A8F1}' .
+			'\\x{A8FF}' .
+			'\\x{A926}-\\x{A92D}' .
+			'\\x{A947}-\\x{A951}' .
+			'\\x{A980}-\\x{A982}' .
+			'\\x{A9B3}' .
+			'\\x{A9B6}-\\x{A9B9}' .
+			'\\x{A9BC}-\\x{A9BD}' .
+			'\\x{A9CF}' .
+			'\\x{A9E5}' .
+			'\\x{A9E6}' .
+			'\\x{AA29}-\\x{AA2E}' .
+			'\\x{AA31}-\\x{AA32}' .
+			'\\x{AA35}-\\x{AA36}' .
+			'\\x{AA43}' .
+			'\\x{AA4C}' .
+			'\\x{AA70}' .
+			'\\x{AA7C}' .
+			'\\x{AAB0}' .
+			'\\x{AAB2}-\\x{AAB4}' .
+			'\\x{AAB7}-\\x{AAB8}' .
+			'\\x{AABE}-\\x{AABF}' .
+			'\\x{AAC1}' .
+			'\\x{AADD}' .
+			'\\x{AAEC}-\\x{AAED}' .
+			'\\x{AAF3}-\\x{AAF4}' .
+			'\\x{AAF6}' .
+			'\\x{AB5B}' .
+			'\\x{AB5C}-\\x{AB5F}' .
+			'\\x{AB69}' .
+			'\\x{AB6A}-\\x{AB6B}' .
+			'\\x{ABE5}' .
+			'\\x{ABE8}' .
+			'\\x{ABED}' .
+			'\\x{FB1E}' .
+			'\\x{FBB2}-\\x{FBC2}' .
+			'\\x{FE00}-\\x{FE0F}' .
+			'\\x{FE13}' .
+			'\\x{FE20}-\\x{FE2F}' .
+			'\\x{FE52}' .
+			'\\x{FE55}' .
+			'\\x{FEFF}' .
+			'\\x{FF07}' .
+			'\\x{FF0E}' .
+			'\\x{FF1A}' .
+			'\\x{FF3E}' .
+			'\\x{FF40}' .
+			'\\x{FF70}' .
+			'\\x{FF9E}-\\x{FF9F}' .
+			'\\x{FFE3}' .
+			'\\x{FFF9}-\\x{FFFB}' .
+			'\\x{101FD}' .
+			'\\x{102E0}' .
+			'\\x{10376}-\\x{1037A}' .
+			'\\x{10780}-\\x{10785}' .
+			'\\x{10787}-\\x{107B0}' .
+			'\\x{107B2}-\\x{107BA}' .
+			'\\x{10A01}-\\x{10A03}' .
+			'\\x{10A05}-\\x{10A06}' .
+			'\\x{10A0C}-\\x{10A0F}' .
+			'\\x{10A38}-\\x{10A3A}' .
+			'\\x{10A3F}' .
+			'\\x{10AE5}-\\x{10AE6}' .
+			'\\x{10D24}-\\x{10D27}' .
+			'\\x{10EAB}-\\x{10EAC}' .
+			'\\x{10EFD}-\\x{10EFF}' .
+			'\\x{10F46}-\\x{10F50}' .
+			'\\x{10F82}-\\x{10F85}' .
+			'\\x{11001}' .
+			'\\x{11038}-\\x{11046}' .
+			'\\x{11070}' .
+			'\\x{11073}-\\x{11074}' .
+			'\\x{1107F}-\\x{11081}' .
+			'\\x{110B3}-\\x{110B6}' .
+			'\\x{110B9}-\\x{110BA}' .
+			'\\x{110BD}' .
+			'\\x{110C2}' .
+			'\\x{110CD}' .
+			'\\x{11100}-\\x{11102}' .
+			'\\x{11127}-\\x{1112B}' .
+			'\\x{1112D}-\\x{11134}' .
+			'\\x{11173}' .
+			'\\x{11180}-\\x{11181}' .
+			'\\x{111B6}-\\x{111BE}' .
+			'\\x{111C9}-\\x{111CC}' .
+			'\\x{111CF}' .
+			'\\x{1122F}-\\x{11231}' .
+			'\\x{11234}' .
+			'\\x{11236}-\\x{11237}' .
+			'\\x{1123E}' .
+			'\\x{11241}' .
+			'\\x{112DF}' .
+			'\\x{112E3}-\\x{112EA}' .
+			'\\x{11300}-\\x{11301}' .
+			'\\x{1133B}-\\x{1133C}' .
+			'\\x{11340}' .
+			'\\x{11366}-\\x{1136C}' .
+			'\\x{11370}-\\x{11374}' .
+			'\\x{11438}-\\x{1143F}' .
+			'\\x{11442}-\\x{11444}' .
+			'\\x{11446}' .
+			'\\x{1145E}' .
+			'\\x{114B3}-\\x{114B8}' .
+			'\\x{114BA}' .
+			'\\x{114BF}-\\x{114C0}' .
+			'\\x{114C2}-\\x{114C3}' .
+			'\\x{115B2}-\\x{115B5}' .
+			'\\x{115BC}-\\x{115BD}' .
+			'\\x{115BF}-\\x{115C0}' .
+			'\\x{115DC}-\\x{115DD}' .
+			'\\x{11633}-\\x{1163A}' .
+			'\\x{1163D}' .
+			'\\x{1163F}-\\x{11640}' .
+			'\\x{116AB}' .
+			'\\x{116AD}' .
+			'\\x{116B0}-\\x{116B5}' .
+			'\\x{116B7}' .
+			'\\x{1171D}-\\x{1171F}' .
+			'\\x{11722}-\\x{11725}' .
+			'\\x{11727}-\\x{1172B}' .
+			'\\x{1182F}-\\x{11837}' .
+			'\\x{11839}-\\x{1183A}' .
+			'\\x{1193B}-\\x{1193C}' .
+			'\\x{1193E}' .
+			'\\x{11943}' .
+			'\\x{119D4}-\\x{119D7}' .
+			'\\x{119DA}-\\x{119DB}' .
+			'\\x{119E0}' .
+			'\\x{11A01}-\\x{11A0A}' .
+			'\\x{11A33}-\\x{11A38}' .
+			'\\x{11A3B}-\\x{11A3E}' .
+			'\\x{11A47}' .
+			'\\x{11A51}-\\x{11A56}' .
+			'\\x{11A59}-\\x{11A5B}' .
+			'\\x{11A8A}-\\x{11A96}' .
+			'\\x{11A98}-\\x{11A99}' .
+			'\\x{11C30}-\\x{11C36}' .
+			'\\x{11C38}-\\x{11C3D}' .
+			'\\x{11C3F}' .
+			'\\x{11C92}-\\x{11CA7}' .
+			'\\x{11CAA}-\\x{11CB0}' .
+			'\\x{11CB2}-\\x{11CB3}' .
+			'\\x{11CB5}-\\x{11CB6}' .
+			'\\x{11D31}-\\x{11D36}' .
+			'\\x{11D3A}' .
+			'\\x{11D3C}-\\x{11D3D}' .
+			'\\x{11D3F}-\\x{11D45}' .
+			'\\x{11D47}' .
+			'\\x{11D90}-\\x{11D91}' .
+			'\\x{11D95}' .
+			'\\x{11D97}' .
+			'\\x{11EF3}-\\x{11EF4}' .
+			'\\x{11F00}-\\x{11F01}' .
+			'\\x{11F36}-\\x{11F3A}' .
+			'\\x{11F40}' .
+			'\\x{11F42}' .
+			'\\x{13430}-\\x{1343F}' .
+			'\\x{13440}' .
+			'\\x{13447}-\\x{13455}' .
+			'\\x{16AF0}-\\x{16AF4}' .
+			'\\x{16B30}-\\x{16B36}' .
+			'\\x{16B40}-\\x{16B43}' .
+			'\\x{16F4F}' .
+			'\\x{16F8F}-\\x{16F92}' .
+			'\\x{16F93}-\\x{16F9F}' .
+			'\\x{16FE0}-\\x{16FE1}' .
+			'\\x{16FE3}' .
+			'\\x{16FE4}' .
+			'\\x{1AFF0}-\\x{1AFF3}' .
+			'\\x{1AFF5}-\\x{1AFFB}' .
+			'\\x{1AFFD}-\\x{1AFFE}' .
+			'\\x{1BC9D}-\\x{1BC9E}' .
+			'\\x{1BCA0}-\\x{1BCA3}' .
+			'\\x{1CF00}-\\x{1CF2D}' .
+			'\\x{1CF30}-\\x{1CF46}' .
+			'\\x{1D167}-\\x{1D169}' .
+			'\\x{1D173}-\\x{1D17A}' .
+			'\\x{1D17B}-\\x{1D182}' .
+			'\\x{1D185}-\\x{1D18B}' .
+			'\\x{1D1AA}-\\x{1D1AD}' .
+			'\\x{1D242}-\\x{1D244}' .
+			'\\x{1DA00}-\\x{1DA36}' .
+			'\\x{1DA3B}-\\x{1DA6C}' .
+			'\\x{1DA75}' .
+			'\\x{1DA84}' .
+			'\\x{1DA9B}-\\x{1DA9F}' .
+			'\\x{1DAA1}-\\x{1DAAF}' .
+			'\\x{1E000}-\\x{1E006}' .
+			'\\x{1E008}-\\x{1E018}' .
+			'\\x{1E01B}-\\x{1E021}' .
+			'\\x{1E023}-\\x{1E024}' .
+			'\\x{1E026}-\\x{1E02A}' .
+			'\\x{1E030}-\\x{1E06D}' .
+			'\\x{1E08F}' .
+			'\\x{1E130}-\\x{1E136}' .
+			'\\x{1E137}-\\x{1E13D}' .
+			'\\x{1E2AE}' .
+			'\\x{1E2EC}-\\x{1E2EF}' .
+			'\\x{1E4EB}' .
+			'\\x{1E4EC}-\\x{1E4EF}' .
+			'\\x{1E8D0}-\\x{1E8D6}' .
+			'\\x{1E944}-\\x{1E94A}' .
+			'\\x{1E94B}' .
+			'\\x{1F3FB}-\\x{1F3FF}' .
+			'\\x{E0001}' .
+			'\\x{E0020}-\\x{E007F}' .
+			'\\x{E0100}-\\x{E01EF}',
 		'Cn' =>
-			'\x{0378}-\x{0379}' .
-			'\x{0380}-\x{0383}' .
-			'\x{038B}' .
-			'\x{038D}' .
-			'\x{03A2}' .
-			'\x{0530}' .
-			'\x{0557}-\x{0558}' .
-			'\x{058B}-\x{058C}' .
-			'\x{0590}' .
-			'\x{05C8}-\x{05CF}' .
-			'\x{05EB}-\x{05EE}' .
-			'\x{05F5}-\x{05FF}' .
-			'\x{070E}' .
-			'\x{074B}-\x{074C}' .
-			'\x{07B2}-\x{07BF}' .
-			'\x{07FB}-\x{07FC}' .
-			'\x{082E}-\x{082F}' .
-			'\x{083F}' .
-			'\x{085C}-\x{085D}' .
-			'\x{085F}' .
-			'\x{086B}-\x{086F}' .
-			'\x{088F}' .
-			'\x{0892}-\x{0897}' .
-			'\x{0984}' .
-			'\x{098D}-\x{098E}' .
-			'\x{0991}-\x{0992}' .
-			'\x{09A9}' .
-			'\x{09B1}' .
-			'\x{09B3}-\x{09B5}' .
-			'\x{09BA}-\x{09BB}' .
-			'\x{09C5}-\x{09C6}' .
-			'\x{09C9}-\x{09CA}' .
-			'\x{09CF}-\x{09D6}' .
-			'\x{09D8}-\x{09DB}' .
-			'\x{09DE}' .
-			'\x{09E4}-\x{09E5}' .
-			'\x{09FF}-\x{0A00}' .
-			'\x{0A04}' .
-			'\x{0A0B}-\x{0A0E}' .
-			'\x{0A11}-\x{0A12}' .
-			'\x{0A29}' .
-			'\x{0A31}' .
-			'\x{0A34}' .
-			'\x{0A37}' .
-			'\x{0A3A}-\x{0A3B}' .
-			'\x{0A3D}' .
-			'\x{0A43}-\x{0A46}' .
-			'\x{0A49}-\x{0A4A}' .
-			'\x{0A4E}-\x{0A50}' .
-			'\x{0A52}-\x{0A58}' .
-			'\x{0A5D}' .
-			'\x{0A5F}-\x{0A65}' .
-			'\x{0A77}-\x{0A80}' .
-			'\x{0A84}' .
-			'\x{0A8E}' .
-			'\x{0A92}' .
-			'\x{0AA9}' .
-			'\x{0AB1}' .
-			'\x{0AB4}' .
-			'\x{0ABA}-\x{0ABB}' .
-			'\x{0AC6}' .
-			'\x{0ACA}' .
-			'\x{0ACE}-\x{0ACF}' .
-			'\x{0AD1}-\x{0ADF}' .
-			'\x{0AE4}-\x{0AE5}' .
-			'\x{0AF2}-\x{0AF8}' .
-			'\x{0B00}' .
-			'\x{0B04}' .
-			'\x{0B0D}-\x{0B0E}' .
-			'\x{0B11}-\x{0B12}' .
-			'\x{0B29}' .
-			'\x{0B31}' .
-			'\x{0B34}' .
-			'\x{0B3A}-\x{0B3B}' .
-			'\x{0B45}-\x{0B46}' .
-			'\x{0B49}-\x{0B4A}' .
-			'\x{0B4E}-\x{0B54}' .
-			'\x{0B58}-\x{0B5B}' .
-			'\x{0B5E}' .
-			'\x{0B64}-\x{0B65}' .
-			'\x{0B78}-\x{0B81}' .
-			'\x{0B84}' .
-			'\x{0B8B}-\x{0B8D}' .
-			'\x{0B91}' .
-			'\x{0B96}-\x{0B98}' .
-			'\x{0B9B}' .
-			'\x{0B9D}' .
-			'\x{0BA0}-\x{0BA2}' .
-			'\x{0BA5}-\x{0BA7}' .
-			'\x{0BAB}-\x{0BAD}' .
-			'\x{0BBA}-\x{0BBD}' .
-			'\x{0BC3}-\x{0BC5}' .
-			'\x{0BC9}' .
-			'\x{0BCE}-\x{0BCF}' .
-			'\x{0BD1}-\x{0BD6}' .
-			'\x{0BD8}-\x{0BE5}' .
-			'\x{0BFB}-\x{0BFF}' .
-			'\x{0C0D}' .
-			'\x{0C11}' .
-			'\x{0C29}' .
-			'\x{0C3A}-\x{0C3B}' .
-			'\x{0C45}' .
-			'\x{0C49}' .
-			'\x{0C4E}-\x{0C54}' .
-			'\x{0C57}' .
-			'\x{0C5B}-\x{0C5C}' .
-			'\x{0C5E}-\x{0C5F}' .
-			'\x{0C64}-\x{0C65}' .
-			'\x{0C70}-\x{0C76}' .
-			'\x{0C8D}' .
-			'\x{0C91}' .
-			'\x{0CA9}' .
-			'\x{0CB4}' .
-			'\x{0CBA}-\x{0CBB}' .
-			'\x{0CC5}' .
-			'\x{0CC9}' .
-			'\x{0CCE}-\x{0CD4}' .
-			'\x{0CD7}-\x{0CDC}' .
-			'\x{0CDF}' .
-			'\x{0CE4}-\x{0CE5}' .
-			'\x{0CF0}' .
-			'\x{0CF4}-\x{0CFF}' .
-			'\x{0D0D}' .
-			'\x{0D11}' .
-			'\x{0D45}' .
-			'\x{0D49}' .
-			'\x{0D50}-\x{0D53}' .
-			'\x{0D64}-\x{0D65}' .
-			'\x{0D80}' .
-			'\x{0D84}' .
-			'\x{0D97}-\x{0D99}' .
-			'\x{0DB2}' .
-			'\x{0DBC}' .
-			'\x{0DBE}-\x{0DBF}' .
-			'\x{0DC7}-\x{0DC9}' .
-			'\x{0DCB}-\x{0DCE}' .
-			'\x{0DD5}' .
-			'\x{0DD7}' .
-			'\x{0DE0}-\x{0DE5}' .
-			'\x{0DF0}-\x{0DF1}' .
-			'\x{0DF5}-\x{0E00}' .
-			'\x{0E3B}-\x{0E3E}' .
-			'\x{0E5C}-\x{0E80}' .
-			'\x{0E83}' .
-			'\x{0E85}' .
-			'\x{0E8B}' .
-			'\x{0EA4}' .
-			'\x{0EA6}' .
-			'\x{0EBE}-\x{0EBF}' .
-			'\x{0EC5}' .
-			'\x{0EC7}' .
-			'\x{0ECF}' .
-			'\x{0EDA}-\x{0EDB}' .
-			'\x{0EE0}-\x{0EFF}' .
-			'\x{0F48}' .
-			'\x{0F6D}-\x{0F70}' .
-			'\x{0F98}' .
-			'\x{0FBD}' .
-			'\x{0FCD}' .
-			'\x{0FDB}-\x{0FFF}' .
-			'\x{10C6}' .
-			'\x{10C8}-\x{10CC}' .
-			'\x{10CE}-\x{10CF}' .
-			'\x{1249}' .
-			'\x{124E}-\x{124F}' .
-			'\x{1257}' .
-			'\x{1259}' .
-			'\x{125E}-\x{125F}' .
-			'\x{1289}' .
-			'\x{128E}-\x{128F}' .
-			'\x{12B1}' .
-			'\x{12B6}-\x{12B7}' .
-			'\x{12BF}' .
-			'\x{12C1}' .
-			'\x{12C6}-\x{12C7}' .
-			'\x{12D7}' .
-			'\x{1311}' .
-			'\x{1316}-\x{1317}' .
-			'\x{135B}-\x{135C}' .
-			'\x{137D}-\x{137F}' .
-			'\x{139A}-\x{139F}' .
-			'\x{13F6}-\x{13F7}' .
-			'\x{13FE}-\x{13FF}' .
-			'\x{169D}-\x{169F}' .
-			'\x{16F9}-\x{16FF}' .
-			'\x{1716}-\x{171E}' .
-			'\x{1737}-\x{173F}' .
-			'\x{1754}-\x{175F}' .
-			'\x{176D}' .
-			'\x{1771}' .
-			'\x{1774}-\x{177F}' .
-			'\x{17DE}-\x{17DF}' .
-			'\x{17EA}-\x{17EF}' .
-			'\x{17FA}-\x{17FF}' .
-			'\x{181A}-\x{181F}' .
-			'\x{1879}-\x{187F}' .
-			'\x{18AB}-\x{18AF}' .
-			'\x{18F6}-\x{18FF}' .
-			'\x{191F}' .
-			'\x{192C}-\x{192F}' .
-			'\x{193C}-\x{193F}' .
-			'\x{1941}-\x{1943}' .
-			'\x{196E}-\x{196F}' .
-			'\x{1975}-\x{197F}' .
-			'\x{19AC}-\x{19AF}' .
-			'\x{19CA}-\x{19CF}' .
-			'\x{19DB}-\x{19DD}' .
-			'\x{1A1C}-\x{1A1D}' .
-			'\x{1A5F}' .
-			'\x{1A7D}-\x{1A7E}' .
-			'\x{1A8A}-\x{1A8F}' .
-			'\x{1A9A}-\x{1A9F}' .
-			'\x{1AAE}-\x{1AAF}' .
-			'\x{1ACF}-\x{1AFF}' .
-			'\x{1B4D}-\x{1B4F}' .
-			'\x{1B7F}' .
-			'\x{1BF4}-\x{1BFB}' .
-			'\x{1C38}-\x{1C3A}' .
-			'\x{1C4A}-\x{1C4C}' .
-			'\x{1C89}-\x{1C8F}' .
-			'\x{1CBB}-\x{1CBC}' .
-			'\x{1CC8}-\x{1CCF}' .
-			'\x{1CFB}-\x{1CFF}' .
-			'\x{1F16}-\x{1F17}' .
-			'\x{1F1E}-\x{1F1F}' .
-			'\x{1F46}-\x{1F47}' .
-			'\x{1F4E}-\x{1F4F}' .
-			'\x{1F58}' .
-			'\x{1F5A}' .
-			'\x{1F5C}' .
-			'\x{1F5E}' .
-			'\x{1F7E}-\x{1F7F}' .
-			'\x{1FB5}' .
-			'\x{1FC5}' .
-			'\x{1FD4}-\x{1FD5}' .
-			'\x{1FDC}' .
-			'\x{1FF0}-\x{1FF1}' .
-			'\x{1FF5}' .
-			'\x{1FFF}' .
-			'\x{2065}' .
-			'\x{2072}-\x{2073}' .
-			'\x{208F}' .
-			'\x{209D}-\x{209F}' .
-			'\x{20C1}-\x{20CF}' .
-			'\x{20F1}-\x{20FF}' .
-			'\x{218C}-\x{218F}' .
-			'\x{2427}-\x{243F}' .
-			'\x{244B}-\x{245F}' .
-			'\x{2B74}-\x{2B75}' .
-			'\x{2B96}' .
-			'\x{2CF4}-\x{2CF8}' .
-			'\x{2D26}' .
-			'\x{2D28}-\x{2D2C}' .
-			'\x{2D2E}-\x{2D2F}' .
-			'\x{2D68}-\x{2D6E}' .
-			'\x{2D71}-\x{2D7E}' .
-			'\x{2D97}-\x{2D9F}' .
-			'\x{2DA7}' .
-			'\x{2DAF}' .
-			'\x{2DB7}' .
-			'\x{2DBF}' .
-			'\x{2DC7}' .
-			'\x{2DCF}' .
-			'\x{2DD7}' .
-			'\x{2DDF}' .
-			'\x{2E5E}-\x{2E7F}' .
-			'\x{2E9A}' .
-			'\x{2EF4}-\x{2EFF}' .
-			'\x{2FD6}-\x{2FEF}' .
-			'\x{2FFC}-\x{2FFF}' .
-			'\x{3040}' .
-			'\x{3097}-\x{3098}' .
-			'\x{3100}-\x{3104}' .
-			'\x{3130}' .
-			'\x{318F}' .
-			'\x{31E4}-\x{31EF}' .
-			'\x{321F}' .
-			'\x{A48D}-\x{A48F}' .
-			'\x{A4C7}-\x{A4CF}' .
-			'\x{A62C}-\x{A63F}' .
-			'\x{A6F8}-\x{A6FF}' .
-			'\x{A7CB}-\x{A7CF}' .
-			'\x{A7D2}' .
-			'\x{A7D4}' .
-			'\x{A7DA}-\x{A7F1}' .
-			'\x{A82D}-\x{A82F}' .
-			'\x{A83A}-\x{A83F}' .
-			'\x{A878}-\x{A87F}' .
-			'\x{A8C6}-\x{A8CD}' .
-			'\x{A8DA}-\x{A8DF}' .
-			'\x{A954}-\x{A95E}' .
-			'\x{A97D}-\x{A97F}' .
-			'\x{A9CE}' .
-			'\x{A9DA}-\x{A9DD}' .
-			'\x{A9FF}' .
-			'\x{AA37}-\x{AA3F}' .
-			'\x{AA4E}-\x{AA4F}' .
-			'\x{AA5A}-\x{AA5B}' .
-			'\x{AAC3}-\x{AADA}' .
-			'\x{AAF7}-\x{AB00}' .
-			'\x{AB07}-\x{AB08}' .
-			'\x{AB0F}-\x{AB10}' .
-			'\x{AB17}-\x{AB1F}' .
-			'\x{AB27}' .
-			'\x{AB2F}' .
-			'\x{AB6C}-\x{AB6F}' .
-			'\x{ABEE}-\x{ABEF}' .
-			'\x{ABFA}-\x{ABFF}' .
-			'\x{D7A4}-\x{D7AF}' .
-			'\x{D7C7}-\x{D7CA}' .
-			'\x{D7FC}-\x{D7FF}' .
-			'\x{FA6E}-\x{FA6F}' .
-			'\x{FADA}-\x{FAFF}' .
-			'\x{FB07}-\x{FB12}' .
-			'\x{FB18}-\x{FB1C}' .
-			'\x{FB37}' .
-			'\x{FB3D}' .
-			'\x{FB3F}' .
-			'\x{FB42}' .
-			'\x{FB45}' .
-			'\x{FBC3}-\x{FBD2}' .
-			'\x{FD90}-\x{FD91}' .
-			'\x{FDC8}-\x{FDCE}' .
-			'\x{FDD0}-\x{FDEF}' .
-			'\x{FE1A}-\x{FE1F}' .
-			'\x{FE53}' .
-			'\x{FE67}' .
-			'\x{FE6C}-\x{FE6F}' .
-			'\x{FE75}' .
-			'\x{FEFD}-\x{FEFE}' .
-			'\x{FF00}' .
-			'\x{FFBF}-\x{FFC1}' .
-			'\x{FFC8}-\x{FFC9}' .
-			'\x{FFD0}-\x{FFD1}' .
-			'\x{FFD8}-\x{FFD9}' .
-			'\x{FFDD}-\x{FFDF}' .
-			'\x{FFE7}' .
-			'\x{FFEF}-\x{FFF8}' .
-			'\x{FFFE}-\x{FFFF}' .
-			'\x{1000C}' .
-			'\x{10027}' .
-			'\x{1003B}' .
-			'\x{1003E}' .
-			'\x{1004E}-\x{1004F}' .
-			'\x{1005E}-\x{1007F}' .
-			'\x{100FB}-\x{100FF}' .
-			'\x{10103}-\x{10106}' .
-			'\x{10134}-\x{10136}' .
-			'\x{1018F}' .
-			'\x{1019D}-\x{1019F}' .
-			'\x{101A1}-\x{101CF}' .
-			'\x{101FE}-\x{1027F}' .
-			'\x{1029D}-\x{1029F}' .
-			'\x{102D1}-\x{102DF}' .
-			'\x{102FC}-\x{102FF}' .
-			'\x{10324}-\x{1032C}' .
-			'\x{1034B}-\x{1034F}' .
-			'\x{1037B}-\x{1037F}' .
-			'\x{1039E}' .
-			'\x{103C4}-\x{103C7}' .
-			'\x{103D6}-\x{103FF}' .
-			'\x{1049E}-\x{1049F}' .
-			'\x{104AA}-\x{104AF}' .
-			'\x{104D4}-\x{104D7}' .
-			'\x{104FC}-\x{104FF}' .
-			'\x{10528}-\x{1052F}' .
-			'\x{10564}-\x{1056E}' .
-			'\x{1057B}' .
-			'\x{1058B}' .
-			'\x{10593}' .
-			'\x{10596}' .
-			'\x{105A2}' .
-			'\x{105B2}' .
-			'\x{105BA}' .
-			'\x{105BD}-\x{105FF}' .
-			'\x{10737}-\x{1073F}' .
-			'\x{10756}-\x{1075F}' .
-			'\x{10768}-\x{1077F}' .
-			'\x{10786}' .
-			'\x{107B1}' .
-			'\x{107BB}-\x{107FF}' .
-			'\x{10806}-\x{10807}' .
-			'\x{10809}' .
-			'\x{10836}' .
-			'\x{10839}-\x{1083B}' .
-			'\x{1083D}-\x{1083E}' .
-			'\x{10856}' .
-			'\x{1089F}-\x{108A6}' .
-			'\x{108B0}-\x{108DF}' .
-			'\x{108F3}' .
-			'\x{108F6}-\x{108FA}' .
-			'\x{1091C}-\x{1091E}' .
-			'\x{1093A}-\x{1093E}' .
-			'\x{10940}-\x{1097F}' .
-			'\x{109B8}-\x{109BB}' .
-			'\x{109D0}-\x{109D1}' .
-			'\x{10A04}' .
-			'\x{10A07}-\x{10A0B}' .
-			'\x{10A14}' .
-			'\x{10A18}' .
-			'\x{10A36}-\x{10A37}' .
-			'\x{10A3B}-\x{10A3E}' .
-			'\x{10A49}-\x{10A4F}' .
-			'\x{10A59}-\x{10A5F}' .
-			'\x{10AA0}-\x{10ABF}' .
-			'\x{10AE7}-\x{10AEA}' .
-			'\x{10AF7}-\x{10AFF}' .
-			'\x{10B36}-\x{10B38}' .
-			'\x{10B56}-\x{10B57}' .
-			'\x{10B73}-\x{10B77}' .
-			'\x{10B92}-\x{10B98}' .
-			'\x{10B9D}-\x{10BA8}' .
-			'\x{10BB0}-\x{10BFF}' .
-			'\x{10C49}-\x{10C7F}' .
-			'\x{10CB3}-\x{10CBF}' .
-			'\x{10CF3}-\x{10CF9}' .
-			'\x{10D28}-\x{10D2F}' .
-			'\x{10D3A}-\x{10E5F}' .
-			'\x{10E7F}' .
-			'\x{10EAA}' .
-			'\x{10EAE}-\x{10EAF}' .
-			'\x{10EB2}-\x{10EFC}' .
-			'\x{10F28}-\x{10F2F}' .
-			'\x{10F5A}-\x{10F6F}' .
-			'\x{10F8A}-\x{10FAF}' .
-			'\x{10FCC}-\x{10FDF}' .
-			'\x{10FF7}-\x{10FFF}' .
-			'\x{1104E}-\x{11051}' .
-			'\x{11076}-\x{1107E}' .
-			'\x{110C3}-\x{110CC}' .
-			'\x{110CE}-\x{110CF}' .
-			'\x{110E9}-\x{110EF}' .
-			'\x{110FA}-\x{110FF}' .
-			'\x{11135}' .
-			'\x{11148}-\x{1114F}' .
-			'\x{11177}-\x{1117F}' .
-			'\x{111E0}' .
-			'\x{111F5}-\x{111FF}' .
-			'\x{11212}' .
-			'\x{11242}-\x{1127F}' .
-			'\x{11287}' .
-			'\x{11289}' .
-			'\x{1128E}' .
-			'\x{1129E}' .
-			'\x{112AA}-\x{112AF}' .
-			'\x{112EB}-\x{112EF}' .
-			'\x{112FA}-\x{112FF}' .
-			'\x{11304}' .
-			'\x{1130D}-\x{1130E}' .
-			'\x{11311}-\x{11312}' .
-			'\x{11329}' .
-			'\x{11331}' .
-			'\x{11334}' .
-			'\x{1133A}' .
-			'\x{11345}-\x{11346}' .
-			'\x{11349}-\x{1134A}' .
-			'\x{1134E}-\x{1134F}' .
-			'\x{11351}-\x{11356}' .
-			'\x{11358}-\x{1135C}' .
-			'\x{11364}-\x{11365}' .
-			'\x{1136D}-\x{1136F}' .
-			'\x{11375}-\x{113FF}' .
-			'\x{1145C}' .
-			'\x{11462}-\x{1147F}' .
-			'\x{114C8}-\x{114CF}' .
-			'\x{114DA}-\x{1157F}' .
-			'\x{115B6}-\x{115B7}' .
-			'\x{115DE}-\x{115FF}' .
-			'\x{11645}-\x{1164F}' .
-			'\x{1165A}-\x{1165F}' .
-			'\x{1166D}-\x{1167F}' .
-			'\x{116BA}-\x{116BF}' .
-			'\x{116CA}-\x{116FF}' .
-			'\x{1171B}-\x{1171C}' .
-			'\x{1172C}-\x{1172F}' .
-			'\x{11747}-\x{117FF}' .
-			'\x{1183C}-\x{1189F}' .
-			'\x{118F3}-\x{118FE}' .
-			'\x{11907}-\x{11908}' .
-			'\x{1190A}-\x{1190B}' .
-			'\x{11914}' .
-			'\x{11917}' .
-			'\x{11936}' .
-			'\x{11939}-\x{1193A}' .
-			'\x{11947}-\x{1194F}' .
-			'\x{1195A}-\x{1199F}' .
-			'\x{119A8}-\x{119A9}' .
-			'\x{119D8}-\x{119D9}' .
-			'\x{119E5}-\x{119FF}' .
-			'\x{11A48}-\x{11A4F}' .
-			'\x{11AA3}-\x{11AAF}' .
-			'\x{11AF9}-\x{11AFF}' .
-			'\x{11B0A}-\x{11BFF}' .
-			'\x{11C09}' .
-			'\x{11C37}' .
-			'\x{11C46}-\x{11C4F}' .
-			'\x{11C6D}-\x{11C6F}' .
-			'\x{11C90}-\x{11C91}' .
-			'\x{11CA8}' .
-			'\x{11CB7}-\x{11CFF}' .
-			'\x{11D07}' .
-			'\x{11D0A}' .
-			'\x{11D37}-\x{11D39}' .
-			'\x{11D3B}' .
-			'\x{11D3E}' .
-			'\x{11D48}-\x{11D4F}' .
-			'\x{11D5A}-\x{11D5F}' .
-			'\x{11D66}' .
-			'\x{11D69}' .
-			'\x{11D8F}' .
-			'\x{11D92}' .
-			'\x{11D99}-\x{11D9F}' .
-			'\x{11DAA}-\x{11EDF}' .
-			'\x{11EF9}-\x{11EFF}' .
-			'\x{11F11}' .
-			'\x{11F3B}-\x{11F3D}' .
-			'\x{11F5A}-\x{11FAF}' .
-			'\x{11FB1}-\x{11FBF}' .
-			'\x{11FF2}-\x{11FFE}' .
-			'\x{1239A}-\x{123FF}' .
-			'\x{1246F}' .
-			'\x{12475}-\x{1247F}' .
-			'\x{12544}-\x{12F8F}' .
-			'\x{12FF3}-\x{12FFF}' .
-			'\x{13456}-\x{143FF}' .
-			'\x{14647}-\x{167FF}' .
-			'\x{16A39}-\x{16A3F}' .
-			'\x{16A5F}' .
-			'\x{16A6A}-\x{16A6D}' .
-			'\x{16ABF}' .
-			'\x{16ACA}-\x{16ACF}' .
-			'\x{16AEE}-\x{16AEF}' .
-			'\x{16AF6}-\x{16AFF}' .
-			'\x{16B46}-\x{16B4F}' .
-			'\x{16B5A}' .
-			'\x{16B62}' .
-			'\x{16B78}-\x{16B7C}' .
-			'\x{16B90}-\x{16E3F}' .
-			'\x{16E9B}-\x{16EFF}' .
-			'\x{16F4B}-\x{16F4E}' .
-			'\x{16F88}-\x{16F8E}' .
-			'\x{16FA0}-\x{16FDF}' .
-			'\x{16FE5}-\x{16FEF}' .
-			'\x{16FF2}-\x{16FFF}' .
-			'\x{187F8}-\x{187FF}' .
-			'\x{18CD6}-\x{18CFF}' .
-			'\x{18D09}-\x{1AFEF}' .
-			'\x{1AFF4}' .
-			'\x{1AFFC}' .
-			'\x{1AFFF}' .
-			'\x{1B123}-\x{1B131}' .
-			'\x{1B133}-\x{1B14F}' .
-			'\x{1B153}-\x{1B154}' .
-			'\x{1B156}-\x{1B163}' .
-			'\x{1B168}-\x{1B16F}' .
-			'\x{1B2FC}-\x{1BBFF}' .
-			'\x{1BC6B}-\x{1BC6F}' .
-			'\x{1BC7D}-\x{1BC7F}' .
-			'\x{1BC89}-\x{1BC8F}' .
-			'\x{1BC9A}-\x{1BC9B}' .
-			'\x{1BCA4}-\x{1CEFF}' .
-			'\x{1CF2E}-\x{1CF2F}' .
-			'\x{1CF47}-\x{1CF4F}' .
-			'\x{1CFC4}-\x{1CFFF}' .
-			'\x{1D0F6}-\x{1D0FF}' .
-			'\x{1D127}-\x{1D128}' .
-			'\x{1D1EB}-\x{1D1FF}' .
-			'\x{1D246}-\x{1D2BF}' .
-			'\x{1D2D4}-\x{1D2DF}' .
-			'\x{1D2F4}-\x{1D2FF}' .
-			'\x{1D357}-\x{1D35F}' .
-			'\x{1D379}-\x{1D3FF}' .
-			'\x{1D455}' .
-			'\x{1D49D}' .
-			'\x{1D4A0}-\x{1D4A1}' .
-			'\x{1D4A3}-\x{1D4A4}' .
-			'\x{1D4A7}-\x{1D4A8}' .
-			'\x{1D4AD}' .
-			'\x{1D4BA}' .
-			'\x{1D4BC}' .
-			'\x{1D4C4}' .
-			'\x{1D506}' .
-			'\x{1D50B}-\x{1D50C}' .
-			'\x{1D515}' .
-			'\x{1D51D}' .
-			'\x{1D53A}' .
-			'\x{1D53F}' .
-			'\x{1D545}' .
-			'\x{1D547}-\x{1D549}' .
-			'\x{1D551}' .
-			'\x{1D6A6}-\x{1D6A7}' .
-			'\x{1D7CC}-\x{1D7CD}' .
-			'\x{1DA8C}-\x{1DA9A}' .
-			'\x{1DAA0}' .
-			'\x{1DAB0}-\x{1DEFF}' .
-			'\x{1DF1F}-\x{1DF24}' .
-			'\x{1DF2B}-\x{1DFFF}' .
-			'\x{1E007}' .
-			'\x{1E019}-\x{1E01A}' .
-			'\x{1E022}' .
-			'\x{1E025}' .
-			'\x{1E02B}-\x{1E02F}' .
-			'\x{1E06E}-\x{1E08E}' .
-			'\x{1E090}-\x{1E0FF}' .
-			'\x{1E12D}-\x{1E12F}' .
-			'\x{1E13E}-\x{1E13F}' .
-			'\x{1E14A}-\x{1E14D}' .
-			'\x{1E150}-\x{1E28F}' .
-			'\x{1E2AF}-\x{1E2BF}' .
-			'\x{1E2FA}-\x{1E2FE}' .
-			'\x{1E300}-\x{1E4CF}' .
-			'\x{1E4FA}-\x{1E7DF}' .
-			'\x{1E7E7}' .
-			'\x{1E7EC}' .
-			'\x{1E7EF}' .
-			'\x{1E7FF}' .
-			'\x{1E8C5}-\x{1E8C6}' .
-			'\x{1E8D7}-\x{1E8FF}' .
-			'\x{1E94C}-\x{1E94F}' .
-			'\x{1E95A}-\x{1E95D}' .
-			'\x{1E960}-\x{1EC70}' .
-			'\x{1ECB5}-\x{1ED00}' .
-			'\x{1ED3E}-\x{1EDFF}' .
-			'\x{1EE04}' .
-			'\x{1EE20}' .
-			'\x{1EE23}' .
-			'\x{1EE25}-\x{1EE26}' .
-			'\x{1EE28}' .
-			'\x{1EE33}' .
-			'\x{1EE38}' .
-			'\x{1EE3A}' .
-			'\x{1EE3C}-\x{1EE41}' .
-			'\x{1EE43}-\x{1EE46}' .
-			'\x{1EE48}' .
-			'\x{1EE4A}' .
-			'\x{1EE4C}' .
-			'\x{1EE50}' .
-			'\x{1EE53}' .
-			'\x{1EE55}-\x{1EE56}' .
-			'\x{1EE58}' .
-			'\x{1EE5A}' .
-			'\x{1EE5C}' .
-			'\x{1EE5E}' .
-			'\x{1EE60}' .
-			'\x{1EE63}' .
-			'\x{1EE65}-\x{1EE66}' .
-			'\x{1EE6B}' .
-			'\x{1EE73}' .
-			'\x{1EE78}' .
-			'\x{1EE7D}' .
-			'\x{1EE7F}' .
-			'\x{1EE8A}' .
-			'\x{1EE9C}-\x{1EEA0}' .
-			'\x{1EEA4}' .
-			'\x{1EEAA}' .
-			'\x{1EEBC}-\x{1EEEF}' .
-			'\x{1EEF2}-\x{1EFFF}' .
-			'\x{1F02C}-\x{1F02F}' .
-			'\x{1F094}-\x{1F09F}' .
-			'\x{1F0AF}-\x{1F0B0}' .
-			'\x{1F0C0}' .
-			'\x{1F0D0}' .
-			'\x{1F0F6}-\x{1F0FF}' .
-			'\x{1F1AE}-\x{1F1E5}' .
-			'\x{1F203}-\x{1F20F}' .
-			'\x{1F23C}-\x{1F23F}' .
-			'\x{1F249}-\x{1F24F}' .
-			'\x{1F252}-\x{1F25F}' .
-			'\x{1F266}-\x{1F2FF}' .
-			'\x{1F6D8}-\x{1F6DB}' .
-			'\x{1F6ED}-\x{1F6EF}' .
-			'\x{1F6FD}-\x{1F6FF}' .
-			'\x{1F777}-\x{1F77A}' .
-			'\x{1F7DA}-\x{1F7DF}' .
-			'\x{1F7EC}-\x{1F7EF}' .
-			'\x{1F7F1}-\x{1F7FF}' .
-			'\x{1F80C}-\x{1F80F}' .
-			'\x{1F848}-\x{1F84F}' .
-			'\x{1F85A}-\x{1F85F}' .
-			'\x{1F888}-\x{1F88F}' .
-			'\x{1F8AE}-\x{1F8AF}' .
-			'\x{1F8B2}-\x{1F8FF}' .
-			'\x{1FA54}-\x{1FA5F}' .
-			'\x{1FA6E}-\x{1FA6F}' .
-			'\x{1FA7D}-\x{1FA7F}' .
-			'\x{1FA89}-\x{1FA8F}' .
-			'\x{1FABE}' .
-			'\x{1FAC6}-\x{1FACD}' .
-			'\x{1FADC}-\x{1FADF}' .
-			'\x{1FAE9}-\x{1FAEF}' .
-			'\x{1FAF9}-\x{1FAFF}' .
-			'\x{1FB93}' .
-			'\x{1FBCB}-\x{1FBEF}' .
-			'\x{1FBFA}-\x{1FFFF}' .
-			'\x{2A6E0}-\x{2A6FF}' .
-			'\x{2B73A}-\x{2B73F}' .
-			'\x{2B81E}-\x{2B81F}' .
-			'\x{2CEA2}-\x{2CEAF}' .
-			'\x{2EBE1}-\x{2F7FF}' .
-			'\x{2FA1E}-\x{2FFFF}' .
-			'\x{3134B}-\x{3134F}' .
-			'\x{323B0}-\x{E0000}' .
-			'\x{E0002}-\x{E001F}' .
-			'\x{E0080}-\x{E00FF}' .
-			'\x{E01F0}-\x{EFFFF}' .
-			'\x{FFFFE}-\x{FFFFF}' .
-			'\x{10FFFE}-\x{10FFFF}',
+			'\\x{0378}-\\x{0379}' .
+			'\\x{0380}-\\x{0383}' .
+			'\\x{038B}' .
+			'\\x{038D}' .
+			'\\x{03A2}' .
+			'\\x{0530}' .
+			'\\x{0557}-\\x{0558}' .
+			'\\x{058B}-\\x{058C}' .
+			'\\x{0590}' .
+			'\\x{05C8}-\\x{05CF}' .
+			'\\x{05EB}-\\x{05EE}' .
+			'\\x{05F5}-\\x{05FF}' .
+			'\\x{070E}' .
+			'\\x{074B}-\\x{074C}' .
+			'\\x{07B2}-\\x{07BF}' .
+			'\\x{07FB}-\\x{07FC}' .
+			'\\x{082E}-\\x{082F}' .
+			'\\x{083F}' .
+			'\\x{085C}-\\x{085D}' .
+			'\\x{085F}' .
+			'\\x{086B}-\\x{086F}' .
+			'\\x{088F}' .
+			'\\x{0892}-\\x{0897}' .
+			'\\x{0984}' .
+			'\\x{098D}-\\x{098E}' .
+			'\\x{0991}-\\x{0992}' .
+			'\\x{09A9}' .
+			'\\x{09B1}' .
+			'\\x{09B3}-\\x{09B5}' .
+			'\\x{09BA}-\\x{09BB}' .
+			'\\x{09C5}-\\x{09C6}' .
+			'\\x{09C9}-\\x{09CA}' .
+			'\\x{09CF}-\\x{09D6}' .
+			'\\x{09D8}-\\x{09DB}' .
+			'\\x{09DE}' .
+			'\\x{09E4}-\\x{09E5}' .
+			'\\x{09FF}-\\x{0A00}' .
+			'\\x{0A04}' .
+			'\\x{0A0B}-\\x{0A0E}' .
+			'\\x{0A11}-\\x{0A12}' .
+			'\\x{0A29}' .
+			'\\x{0A31}' .
+			'\\x{0A34}' .
+			'\\x{0A37}' .
+			'\\x{0A3A}-\\x{0A3B}' .
+			'\\x{0A3D}' .
+			'\\x{0A43}-\\x{0A46}' .
+			'\\x{0A49}-\\x{0A4A}' .
+			'\\x{0A4E}-\\x{0A50}' .
+			'\\x{0A52}-\\x{0A58}' .
+			'\\x{0A5D}' .
+			'\\x{0A5F}-\\x{0A65}' .
+			'\\x{0A77}-\\x{0A80}' .
+			'\\x{0A84}' .
+			'\\x{0A8E}' .
+			'\\x{0A92}' .
+			'\\x{0AA9}' .
+			'\\x{0AB1}' .
+			'\\x{0AB4}' .
+			'\\x{0ABA}-\\x{0ABB}' .
+			'\\x{0AC6}' .
+			'\\x{0ACA}' .
+			'\\x{0ACE}-\\x{0ACF}' .
+			'\\x{0AD1}-\\x{0ADF}' .
+			'\\x{0AE4}-\\x{0AE5}' .
+			'\\x{0AF2}-\\x{0AF8}' .
+			'\\x{0B00}' .
+			'\\x{0B04}' .
+			'\\x{0B0D}-\\x{0B0E}' .
+			'\\x{0B11}-\\x{0B12}' .
+			'\\x{0B29}' .
+			'\\x{0B31}' .
+			'\\x{0B34}' .
+			'\\x{0B3A}-\\x{0B3B}' .
+			'\\x{0B45}-\\x{0B46}' .
+			'\\x{0B49}-\\x{0B4A}' .
+			'\\x{0B4E}-\\x{0B54}' .
+			'\\x{0B58}-\\x{0B5B}' .
+			'\\x{0B5E}' .
+			'\\x{0B64}-\\x{0B65}' .
+			'\\x{0B78}-\\x{0B81}' .
+			'\\x{0B84}' .
+			'\\x{0B8B}-\\x{0B8D}' .
+			'\\x{0B91}' .
+			'\\x{0B96}-\\x{0B98}' .
+			'\\x{0B9B}' .
+			'\\x{0B9D}' .
+			'\\x{0BA0}-\\x{0BA2}' .
+			'\\x{0BA5}-\\x{0BA7}' .
+			'\\x{0BAB}-\\x{0BAD}' .
+			'\\x{0BBA}-\\x{0BBD}' .
+			'\\x{0BC3}-\\x{0BC5}' .
+			'\\x{0BC9}' .
+			'\\x{0BCE}-\\x{0BCF}' .
+			'\\x{0BD1}-\\x{0BD6}' .
+			'\\x{0BD8}-\\x{0BE5}' .
+			'\\x{0BFB}-\\x{0BFF}' .
+			'\\x{0C0D}' .
+			'\\x{0C11}' .
+			'\\x{0C29}' .
+			'\\x{0C3A}-\\x{0C3B}' .
+			'\\x{0C45}' .
+			'\\x{0C49}' .
+			'\\x{0C4E}-\\x{0C54}' .
+			'\\x{0C57}' .
+			'\\x{0C5B}-\\x{0C5C}' .
+			'\\x{0C5E}-\\x{0C5F}' .
+			'\\x{0C64}-\\x{0C65}' .
+			'\\x{0C70}-\\x{0C76}' .
+			'\\x{0C8D}' .
+			'\\x{0C91}' .
+			'\\x{0CA9}' .
+			'\\x{0CB4}' .
+			'\\x{0CBA}-\\x{0CBB}' .
+			'\\x{0CC5}' .
+			'\\x{0CC9}' .
+			'\\x{0CCE}-\\x{0CD4}' .
+			'\\x{0CD7}-\\x{0CDC}' .
+			'\\x{0CDF}' .
+			'\\x{0CE4}-\\x{0CE5}' .
+			'\\x{0CF0}' .
+			'\\x{0CF4}-\\x{0CFF}' .
+			'\\x{0D0D}' .
+			'\\x{0D11}' .
+			'\\x{0D45}' .
+			'\\x{0D49}' .
+			'\\x{0D50}-\\x{0D53}' .
+			'\\x{0D64}-\\x{0D65}' .
+			'\\x{0D80}' .
+			'\\x{0D84}' .
+			'\\x{0D97}-\\x{0D99}' .
+			'\\x{0DB2}' .
+			'\\x{0DBC}' .
+			'\\x{0DBE}-\\x{0DBF}' .
+			'\\x{0DC7}-\\x{0DC9}' .
+			'\\x{0DCB}-\\x{0DCE}' .
+			'\\x{0DD5}' .
+			'\\x{0DD7}' .
+			'\\x{0DE0}-\\x{0DE5}' .
+			'\\x{0DF0}-\\x{0DF1}' .
+			'\\x{0DF5}-\\x{0E00}' .
+			'\\x{0E3B}-\\x{0E3E}' .
+			'\\x{0E5C}-\\x{0E80}' .
+			'\\x{0E83}' .
+			'\\x{0E85}' .
+			'\\x{0E8B}' .
+			'\\x{0EA4}' .
+			'\\x{0EA6}' .
+			'\\x{0EBE}-\\x{0EBF}' .
+			'\\x{0EC5}' .
+			'\\x{0EC7}' .
+			'\\x{0ECF}' .
+			'\\x{0EDA}-\\x{0EDB}' .
+			'\\x{0EE0}-\\x{0EFF}' .
+			'\\x{0F48}' .
+			'\\x{0F6D}-\\x{0F70}' .
+			'\\x{0F98}' .
+			'\\x{0FBD}' .
+			'\\x{0FCD}' .
+			'\\x{0FDB}-\\x{0FFF}' .
+			'\\x{10C6}' .
+			'\\x{10C8}-\\x{10CC}' .
+			'\\x{10CE}-\\x{10CF}' .
+			'\\x{1249}' .
+			'\\x{124E}-\\x{124F}' .
+			'\\x{1257}' .
+			'\\x{1259}' .
+			'\\x{125E}-\\x{125F}' .
+			'\\x{1289}' .
+			'\\x{128E}-\\x{128F}' .
+			'\\x{12B1}' .
+			'\\x{12B6}-\\x{12B7}' .
+			'\\x{12BF}' .
+			'\\x{12C1}' .
+			'\\x{12C6}-\\x{12C7}' .
+			'\\x{12D7}' .
+			'\\x{1311}' .
+			'\\x{1316}-\\x{1317}' .
+			'\\x{135B}-\\x{135C}' .
+			'\\x{137D}-\\x{137F}' .
+			'\\x{139A}-\\x{139F}' .
+			'\\x{13F6}-\\x{13F7}' .
+			'\\x{13FE}-\\x{13FF}' .
+			'\\x{169D}-\\x{169F}' .
+			'\\x{16F9}-\\x{16FF}' .
+			'\\x{1716}-\\x{171E}' .
+			'\\x{1737}-\\x{173F}' .
+			'\\x{1754}-\\x{175F}' .
+			'\\x{176D}' .
+			'\\x{1771}' .
+			'\\x{1774}-\\x{177F}' .
+			'\\x{17DE}-\\x{17DF}' .
+			'\\x{17EA}-\\x{17EF}' .
+			'\\x{17FA}-\\x{17FF}' .
+			'\\x{181A}-\\x{181F}' .
+			'\\x{1879}-\\x{187F}' .
+			'\\x{18AB}-\\x{18AF}' .
+			'\\x{18F6}-\\x{18FF}' .
+			'\\x{191F}' .
+			'\\x{192C}-\\x{192F}' .
+			'\\x{193C}-\\x{193F}' .
+			'\\x{1941}-\\x{1943}' .
+			'\\x{196E}-\\x{196F}' .
+			'\\x{1975}-\\x{197F}' .
+			'\\x{19AC}-\\x{19AF}' .
+			'\\x{19CA}-\\x{19CF}' .
+			'\\x{19DB}-\\x{19DD}' .
+			'\\x{1A1C}-\\x{1A1D}' .
+			'\\x{1A5F}' .
+			'\\x{1A7D}-\\x{1A7E}' .
+			'\\x{1A8A}-\\x{1A8F}' .
+			'\\x{1A9A}-\\x{1A9F}' .
+			'\\x{1AAE}-\\x{1AAF}' .
+			'\\x{1ACF}-\\x{1AFF}' .
+			'\\x{1B4D}-\\x{1B4F}' .
+			'\\x{1B7F}' .
+			'\\x{1BF4}-\\x{1BFB}' .
+			'\\x{1C38}-\\x{1C3A}' .
+			'\\x{1C4A}-\\x{1C4C}' .
+			'\\x{1C89}-\\x{1C8F}' .
+			'\\x{1CBB}-\\x{1CBC}' .
+			'\\x{1CC8}-\\x{1CCF}' .
+			'\\x{1CFB}-\\x{1CFF}' .
+			'\\x{1F16}-\\x{1F17}' .
+			'\\x{1F1E}-\\x{1F1F}' .
+			'\\x{1F46}-\\x{1F47}' .
+			'\\x{1F4E}-\\x{1F4F}' .
+			'\\x{1F58}' .
+			'\\x{1F5A}' .
+			'\\x{1F5C}' .
+			'\\x{1F5E}' .
+			'\\x{1F7E}-\\x{1F7F}' .
+			'\\x{1FB5}' .
+			'\\x{1FC5}' .
+			'\\x{1FD4}-\\x{1FD5}' .
+			'\\x{1FDC}' .
+			'\\x{1FF0}-\\x{1FF1}' .
+			'\\x{1FF5}' .
+			'\\x{1FFF}' .
+			'\\x{2065}' .
+			'\\x{2072}-\\x{2073}' .
+			'\\x{208F}' .
+			'\\x{209D}-\\x{209F}' .
+			'\\x{20C1}-\\x{20CF}' .
+			'\\x{20F1}-\\x{20FF}' .
+			'\\x{218C}-\\x{218F}' .
+			'\\x{2427}-\\x{243F}' .
+			'\\x{244B}-\\x{245F}' .
+			'\\x{2B74}-\\x{2B75}' .
+			'\\x{2B96}' .
+			'\\x{2CF4}-\\x{2CF8}' .
+			'\\x{2D26}' .
+			'\\x{2D28}-\\x{2D2C}' .
+			'\\x{2D2E}-\\x{2D2F}' .
+			'\\x{2D68}-\\x{2D6E}' .
+			'\\x{2D71}-\\x{2D7E}' .
+			'\\x{2D97}-\\x{2D9F}' .
+			'\\x{2DA7}' .
+			'\\x{2DAF}' .
+			'\\x{2DB7}' .
+			'\\x{2DBF}' .
+			'\\x{2DC7}' .
+			'\\x{2DCF}' .
+			'\\x{2DD7}' .
+			'\\x{2DDF}' .
+			'\\x{2E5E}-\\x{2E7F}' .
+			'\\x{2E9A}' .
+			'\\x{2EF4}-\\x{2EFF}' .
+			'\\x{2FD6}-\\x{2FEF}' .
+			'\\x{3040}' .
+			'\\x{3097}-\\x{3098}' .
+			'\\x{3100}-\\x{3104}' .
+			'\\x{3130}' .
+			'\\x{318F}' .
+			'\\x{31E4}-\\x{31EE}' .
+			'\\x{321F}' .
+			'\\x{A48D}-\\x{A48F}' .
+			'\\x{A4C7}-\\x{A4CF}' .
+			'\\x{A62C}-\\x{A63F}' .
+			'\\x{A6F8}-\\x{A6FF}' .
+			'\\x{A7CB}-\\x{A7CF}' .
+			'\\x{A7D2}' .
+			'\\x{A7D4}' .
+			'\\x{A7DA}-\\x{A7F1}' .
+			'\\x{A82D}-\\x{A82F}' .
+			'\\x{A83A}-\\x{A83F}' .
+			'\\x{A878}-\\x{A87F}' .
+			'\\x{A8C6}-\\x{A8CD}' .
+			'\\x{A8DA}-\\x{A8DF}' .
+			'\\x{A954}-\\x{A95E}' .
+			'\\x{A97D}-\\x{A97F}' .
+			'\\x{A9CE}' .
+			'\\x{A9DA}-\\x{A9DD}' .
+			'\\x{A9FF}' .
+			'\\x{AA37}-\\x{AA3F}' .
+			'\\x{AA4E}-\\x{AA4F}' .
+			'\\x{AA5A}-\\x{AA5B}' .
+			'\\x{AAC3}-\\x{AADA}' .
+			'\\x{AAF7}-\\x{AB00}' .
+			'\\x{AB07}-\\x{AB08}' .
+			'\\x{AB0F}-\\x{AB10}' .
+			'\\x{AB17}-\\x{AB1F}' .
+			'\\x{AB27}' .
+			'\\x{AB2F}' .
+			'\\x{AB6C}-\\x{AB6F}' .
+			'\\x{ABEE}-\\x{ABEF}' .
+			'\\x{ABFA}-\\x{ABFF}' .
+			'\\x{D7A4}-\\x{D7AF}' .
+			'\\x{D7C7}-\\x{D7CA}' .
+			'\\x{D7FC}-\\x{D7FF}' .
+			'\\x{FA6E}-\\x{FA6F}' .
+			'\\x{FADA}-\\x{FAFF}' .
+			'\\x{FB07}-\\x{FB12}' .
+			'\\x{FB18}-\\x{FB1C}' .
+			'\\x{FB37}' .
+			'\\x{FB3D}' .
+			'\\x{FB3F}' .
+			'\\x{FB42}' .
+			'\\x{FB45}' .
+			'\\x{FBC3}-\\x{FBD2}' .
+			'\\x{FD90}-\\x{FD91}' .
+			'\\x{FDC8}-\\x{FDCE}' .
+			'\\x{FDD0}-\\x{FDEF}' .
+			'\\x{FE1A}-\\x{FE1F}' .
+			'\\x{FE53}' .
+			'\\x{FE67}' .
+			'\\x{FE6C}-\\x{FE6F}' .
+			'\\x{FE75}' .
+			'\\x{FEFD}-\\x{FEFE}' .
+			'\\x{FF00}' .
+			'\\x{FFBF}-\\x{FFC1}' .
+			'\\x{FFC8}-\\x{FFC9}' .
+			'\\x{FFD0}-\\x{FFD1}' .
+			'\\x{FFD8}-\\x{FFD9}' .
+			'\\x{FFDD}-\\x{FFDF}' .
+			'\\x{FFE7}' .
+			'\\x{FFEF}-\\x{FFF8}' .
+			'\\x{FFFE}-\\x{FFFF}' .
+			'\\x{1000C}' .
+			'\\x{10027}' .
+			'\\x{1003B}' .
+			'\\x{1003E}' .
+			'\\x{1004E}-\\x{1004F}' .
+			'\\x{1005E}-\\x{1007F}' .
+			'\\x{100FB}-\\x{100FF}' .
+			'\\x{10103}-\\x{10106}' .
+			'\\x{10134}-\\x{10136}' .
+			'\\x{1018F}' .
+			'\\x{1019D}-\\x{1019F}' .
+			'\\x{101A1}-\\x{101CF}' .
+			'\\x{101FE}-\\x{1027F}' .
+			'\\x{1029D}-\\x{1029F}' .
+			'\\x{102D1}-\\x{102DF}' .
+			'\\x{102FC}-\\x{102FF}' .
+			'\\x{10324}-\\x{1032C}' .
+			'\\x{1034B}-\\x{1034F}' .
+			'\\x{1037B}-\\x{1037F}' .
+			'\\x{1039E}' .
+			'\\x{103C4}-\\x{103C7}' .
+			'\\x{103D6}-\\x{103FF}' .
+			'\\x{1049E}-\\x{1049F}' .
+			'\\x{104AA}-\\x{104AF}' .
+			'\\x{104D4}-\\x{104D7}' .
+			'\\x{104FC}-\\x{104FF}' .
+			'\\x{10528}-\\x{1052F}' .
+			'\\x{10564}-\\x{1056E}' .
+			'\\x{1057B}' .
+			'\\x{1058B}' .
+			'\\x{10593}' .
+			'\\x{10596}' .
+			'\\x{105A2}' .
+			'\\x{105B2}' .
+			'\\x{105BA}' .
+			'\\x{105BD}-\\x{105FF}' .
+			'\\x{10737}-\\x{1073F}' .
+			'\\x{10756}-\\x{1075F}' .
+			'\\x{10768}-\\x{1077F}' .
+			'\\x{10786}' .
+			'\\x{107B1}' .
+			'\\x{107BB}-\\x{107FF}' .
+			'\\x{10806}-\\x{10807}' .
+			'\\x{10809}' .
+			'\\x{10836}' .
+			'\\x{10839}-\\x{1083B}' .
+			'\\x{1083D}-\\x{1083E}' .
+			'\\x{10856}' .
+			'\\x{1089F}-\\x{108A6}' .
+			'\\x{108B0}-\\x{108DF}' .
+			'\\x{108F3}' .
+			'\\x{108F6}-\\x{108FA}' .
+			'\\x{1091C}-\\x{1091E}' .
+			'\\x{1093A}-\\x{1093E}' .
+			'\\x{10940}-\\x{1097F}' .
+			'\\x{109B8}-\\x{109BB}' .
+			'\\x{109D0}-\\x{109D1}' .
+			'\\x{10A04}' .
+			'\\x{10A07}-\\x{10A0B}' .
+			'\\x{10A14}' .
+			'\\x{10A18}' .
+			'\\x{10A36}-\\x{10A37}' .
+			'\\x{10A3B}-\\x{10A3E}' .
+			'\\x{10A49}-\\x{10A4F}' .
+			'\\x{10A59}-\\x{10A5F}' .
+			'\\x{10AA0}-\\x{10ABF}' .
+			'\\x{10AE7}-\\x{10AEA}' .
+			'\\x{10AF7}-\\x{10AFF}' .
+			'\\x{10B36}-\\x{10B38}' .
+			'\\x{10B56}-\\x{10B57}' .
+			'\\x{10B73}-\\x{10B77}' .
+			'\\x{10B92}-\\x{10B98}' .
+			'\\x{10B9D}-\\x{10BA8}' .
+			'\\x{10BB0}-\\x{10BFF}' .
+			'\\x{10C49}-\\x{10C7F}' .
+			'\\x{10CB3}-\\x{10CBF}' .
+			'\\x{10CF3}-\\x{10CF9}' .
+			'\\x{10D28}-\\x{10D2F}' .
+			'\\x{10D3A}-\\x{10E5F}' .
+			'\\x{10E7F}' .
+			'\\x{10EAA}' .
+			'\\x{10EAE}-\\x{10EAF}' .
+			'\\x{10EB2}-\\x{10EFC}' .
+			'\\x{10F28}-\\x{10F2F}' .
+			'\\x{10F5A}-\\x{10F6F}' .
+			'\\x{10F8A}-\\x{10FAF}' .
+			'\\x{10FCC}-\\x{10FDF}' .
+			'\\x{10FF7}-\\x{10FFF}' .
+			'\\x{1104E}-\\x{11051}' .
+			'\\x{11076}-\\x{1107E}' .
+			'\\x{110C3}-\\x{110CC}' .
+			'\\x{110CE}-\\x{110CF}' .
+			'\\x{110E9}-\\x{110EF}' .
+			'\\x{110FA}-\\x{110FF}' .
+			'\\x{11135}' .
+			'\\x{11148}-\\x{1114F}' .
+			'\\x{11177}-\\x{1117F}' .
+			'\\x{111E0}' .
+			'\\x{111F5}-\\x{111FF}' .
+			'\\x{11212}' .
+			'\\x{11242}-\\x{1127F}' .
+			'\\x{11287}' .
+			'\\x{11289}' .
+			'\\x{1128E}' .
+			'\\x{1129E}' .
+			'\\x{112AA}-\\x{112AF}' .
+			'\\x{112EB}-\\x{112EF}' .
+			'\\x{112FA}-\\x{112FF}' .
+			'\\x{11304}' .
+			'\\x{1130D}-\\x{1130E}' .
+			'\\x{11311}-\\x{11312}' .
+			'\\x{11329}' .
+			'\\x{11331}' .
+			'\\x{11334}' .
+			'\\x{1133A}' .
+			'\\x{11345}-\\x{11346}' .
+			'\\x{11349}-\\x{1134A}' .
+			'\\x{1134E}-\\x{1134F}' .
+			'\\x{11351}-\\x{11356}' .
+			'\\x{11358}-\\x{1135C}' .
+			'\\x{11364}-\\x{11365}' .
+			'\\x{1136D}-\\x{1136F}' .
+			'\\x{11375}-\\x{113FF}' .
+			'\\x{1145C}' .
+			'\\x{11462}-\\x{1147F}' .
+			'\\x{114C8}-\\x{114CF}' .
+			'\\x{114DA}-\\x{1157F}' .
+			'\\x{115B6}-\\x{115B7}' .
+			'\\x{115DE}-\\x{115FF}' .
+			'\\x{11645}-\\x{1164F}' .
+			'\\x{1165A}-\\x{1165F}' .
+			'\\x{1166D}-\\x{1167F}' .
+			'\\x{116BA}-\\x{116BF}' .
+			'\\x{116CA}-\\x{116FF}' .
+			'\\x{1171B}-\\x{1171C}' .
+			'\\x{1172C}-\\x{1172F}' .
+			'\\x{11747}-\\x{117FF}' .
+			'\\x{1183C}-\\x{1189F}' .
+			'\\x{118F3}-\\x{118FE}' .
+			'\\x{11907}-\\x{11908}' .
+			'\\x{1190A}-\\x{1190B}' .
+			'\\x{11914}' .
+			'\\x{11917}' .
+			'\\x{11936}' .
+			'\\x{11939}-\\x{1193A}' .
+			'\\x{11947}-\\x{1194F}' .
+			'\\x{1195A}-\\x{1199F}' .
+			'\\x{119A8}-\\x{119A9}' .
+			'\\x{119D8}-\\x{119D9}' .
+			'\\x{119E5}-\\x{119FF}' .
+			'\\x{11A48}-\\x{11A4F}' .
+			'\\x{11AA3}-\\x{11AAF}' .
+			'\\x{11AF9}-\\x{11AFF}' .
+			'\\x{11B0A}-\\x{11BFF}' .
+			'\\x{11C09}' .
+			'\\x{11C37}' .
+			'\\x{11C46}-\\x{11C4F}' .
+			'\\x{11C6D}-\\x{11C6F}' .
+			'\\x{11C90}-\\x{11C91}' .
+			'\\x{11CA8}' .
+			'\\x{11CB7}-\\x{11CFF}' .
+			'\\x{11D07}' .
+			'\\x{11D0A}' .
+			'\\x{11D37}-\\x{11D39}' .
+			'\\x{11D3B}' .
+			'\\x{11D3E}' .
+			'\\x{11D48}-\\x{11D4F}' .
+			'\\x{11D5A}-\\x{11D5F}' .
+			'\\x{11D66}' .
+			'\\x{11D69}' .
+			'\\x{11D8F}' .
+			'\\x{11D92}' .
+			'\\x{11D99}-\\x{11D9F}' .
+			'\\x{11DAA}-\\x{11EDF}' .
+			'\\x{11EF9}-\\x{11EFF}' .
+			'\\x{11F11}' .
+			'\\x{11F3B}-\\x{11F3D}' .
+			'\\x{11F5A}-\\x{11FAF}' .
+			'\\x{11FB1}-\\x{11FBF}' .
+			'\\x{11FF2}-\\x{11FFE}' .
+			'\\x{1239A}-\\x{123FF}' .
+			'\\x{1246F}' .
+			'\\x{12475}-\\x{1247F}' .
+			'\\x{12544}-\\x{12F8F}' .
+			'\\x{12FF3}-\\x{12FFF}' .
+			'\\x{13456}-\\x{143FF}' .
+			'\\x{14647}-\\x{167FF}' .
+			'\\x{16A39}-\\x{16A3F}' .
+			'\\x{16A5F}' .
+			'\\x{16A6A}-\\x{16A6D}' .
+			'\\x{16ABF}' .
+			'\\x{16ACA}-\\x{16ACF}' .
+			'\\x{16AEE}-\\x{16AEF}' .
+			'\\x{16AF6}-\\x{16AFF}' .
+			'\\x{16B46}-\\x{16B4F}' .
+			'\\x{16B5A}' .
+			'\\x{16B62}' .
+			'\\x{16B78}-\\x{16B7C}' .
+			'\\x{16B90}-\\x{16E3F}' .
+			'\\x{16E9B}-\\x{16EFF}' .
+			'\\x{16F4B}-\\x{16F4E}' .
+			'\\x{16F88}-\\x{16F8E}' .
+			'\\x{16FA0}-\\x{16FDF}' .
+			'\\x{16FE5}-\\x{16FEF}' .
+			'\\x{16FF2}-\\x{16FFF}' .
+			'\\x{187F8}-\\x{187FF}' .
+			'\\x{18CD6}-\\x{18CFF}' .
+			'\\x{18D09}-\\x{1AFEF}' .
+			'\\x{1AFF4}' .
+			'\\x{1AFFC}' .
+			'\\x{1AFFF}' .
+			'\\x{1B123}-\\x{1B131}' .
+			'\\x{1B133}-\\x{1B14F}' .
+			'\\x{1B153}-\\x{1B154}' .
+			'\\x{1B156}-\\x{1B163}' .
+			'\\x{1B168}-\\x{1B16F}' .
+			'\\x{1B2FC}-\\x{1BBFF}' .
+			'\\x{1BC6B}-\\x{1BC6F}' .
+			'\\x{1BC7D}-\\x{1BC7F}' .
+			'\\x{1BC89}-\\x{1BC8F}' .
+			'\\x{1BC9A}-\\x{1BC9B}' .
+			'\\x{1BCA4}-\\x{1CEFF}' .
+			'\\x{1CF2E}-\\x{1CF2F}' .
+			'\\x{1CF47}-\\x{1CF4F}' .
+			'\\x{1CFC4}-\\x{1CFFF}' .
+			'\\x{1D0F6}-\\x{1D0FF}' .
+			'\\x{1D127}-\\x{1D128}' .
+			'\\x{1D1EB}-\\x{1D1FF}' .
+			'\\x{1D246}-\\x{1D2BF}' .
+			'\\x{1D2D4}-\\x{1D2DF}' .
+			'\\x{1D2F4}-\\x{1D2FF}' .
+			'\\x{1D357}-\\x{1D35F}' .
+			'\\x{1D379}-\\x{1D3FF}' .
+			'\\x{1D455}' .
+			'\\x{1D49D}' .
+			'\\x{1D4A0}-\\x{1D4A1}' .
+			'\\x{1D4A3}-\\x{1D4A4}' .
+			'\\x{1D4A7}-\\x{1D4A8}' .
+			'\\x{1D4AD}' .
+			'\\x{1D4BA}' .
+			'\\x{1D4BC}' .
+			'\\x{1D4C4}' .
+			'\\x{1D506}' .
+			'\\x{1D50B}-\\x{1D50C}' .
+			'\\x{1D515}' .
+			'\\x{1D51D}' .
+			'\\x{1D53A}' .
+			'\\x{1D53F}' .
+			'\\x{1D545}' .
+			'\\x{1D547}-\\x{1D549}' .
+			'\\x{1D551}' .
+			'\\x{1D6A6}-\\x{1D6A7}' .
+			'\\x{1D7CC}-\\x{1D7CD}' .
+			'\\x{1DA8C}-\\x{1DA9A}' .
+			'\\x{1DAA0}' .
+			'\\x{1DAB0}-\\x{1DEFF}' .
+			'\\x{1DF1F}-\\x{1DF24}' .
+			'\\x{1DF2B}-\\x{1DFFF}' .
+			'\\x{1E007}' .
+			'\\x{1E019}-\\x{1E01A}' .
+			'\\x{1E022}' .
+			'\\x{1E025}' .
+			'\\x{1E02B}-\\x{1E02F}' .
+			'\\x{1E06E}-\\x{1E08E}' .
+			'\\x{1E090}-\\x{1E0FF}' .
+			'\\x{1E12D}-\\x{1E12F}' .
+			'\\x{1E13E}-\\x{1E13F}' .
+			'\\x{1E14A}-\\x{1E14D}' .
+			'\\x{1E150}-\\x{1E28F}' .
+			'\\x{1E2AF}-\\x{1E2BF}' .
+			'\\x{1E2FA}-\\x{1E2FE}' .
+			'\\x{1E300}-\\x{1E4CF}' .
+			'\\x{1E4FA}-\\x{1E7DF}' .
+			'\\x{1E7E7}' .
+			'\\x{1E7EC}' .
+			'\\x{1E7EF}' .
+			'\\x{1E7FF}' .
+			'\\x{1E8C5}-\\x{1E8C6}' .
+			'\\x{1E8D7}-\\x{1E8FF}' .
+			'\\x{1E94C}-\\x{1E94F}' .
+			'\\x{1E95A}-\\x{1E95D}' .
+			'\\x{1E960}-\\x{1EC70}' .
+			'\\x{1ECB5}-\\x{1ED00}' .
+			'\\x{1ED3E}-\\x{1EDFF}' .
+			'\\x{1EE04}' .
+			'\\x{1EE20}' .
+			'\\x{1EE23}' .
+			'\\x{1EE25}-\\x{1EE26}' .
+			'\\x{1EE28}' .
+			'\\x{1EE33}' .
+			'\\x{1EE38}' .
+			'\\x{1EE3A}' .
+			'\\x{1EE3C}-\\x{1EE41}' .
+			'\\x{1EE43}-\\x{1EE46}' .
+			'\\x{1EE48}' .
+			'\\x{1EE4A}' .
+			'\\x{1EE4C}' .
+			'\\x{1EE50}' .
+			'\\x{1EE53}' .
+			'\\x{1EE55}-\\x{1EE56}' .
+			'\\x{1EE58}' .
+			'\\x{1EE5A}' .
+			'\\x{1EE5C}' .
+			'\\x{1EE5E}' .
+			'\\x{1EE60}' .
+			'\\x{1EE63}' .
+			'\\x{1EE65}-\\x{1EE66}' .
+			'\\x{1EE6B}' .
+			'\\x{1EE73}' .
+			'\\x{1EE78}' .
+			'\\x{1EE7D}' .
+			'\\x{1EE7F}' .
+			'\\x{1EE8A}' .
+			'\\x{1EE9C}-\\x{1EEA0}' .
+			'\\x{1EEA4}' .
+			'\\x{1EEAA}' .
+			'\\x{1EEBC}-\\x{1EEEF}' .
+			'\\x{1EEF2}-\\x{1EFFF}' .
+			'\\x{1F02C}-\\x{1F02F}' .
+			'\\x{1F094}-\\x{1F09F}' .
+			'\\x{1F0AF}-\\x{1F0B0}' .
+			'\\x{1F0C0}' .
+			'\\x{1F0D0}' .
+			'\\x{1F0F6}-\\x{1F0FF}' .
+			'\\x{1F1AE}-\\x{1F1E5}' .
+			'\\x{1F203}-\\x{1F20F}' .
+			'\\x{1F23C}-\\x{1F23F}' .
+			'\\x{1F249}-\\x{1F24F}' .
+			'\\x{1F252}-\\x{1F25F}' .
+			'\\x{1F266}-\\x{1F2FF}' .
+			'\\x{1F6D8}-\\x{1F6DB}' .
+			'\\x{1F6ED}-\\x{1F6EF}' .
+			'\\x{1F6FD}-\\x{1F6FF}' .
+			'\\x{1F777}-\\x{1F77A}' .
+			'\\x{1F7DA}-\\x{1F7DF}' .
+			'\\x{1F7EC}-\\x{1F7EF}' .
+			'\\x{1F7F1}-\\x{1F7FF}' .
+			'\\x{1F80C}-\\x{1F80F}' .
+			'\\x{1F848}-\\x{1F84F}' .
+			'\\x{1F85A}-\\x{1F85F}' .
+			'\\x{1F888}-\\x{1F88F}' .
+			'\\x{1F8AE}-\\x{1F8AF}' .
+			'\\x{1F8B2}-\\x{1F8FF}' .
+			'\\x{1FA54}-\\x{1FA5F}' .
+			'\\x{1FA6E}-\\x{1FA6F}' .
+			'\\x{1FA7D}-\\x{1FA7F}' .
+			'\\x{1FA89}-\\x{1FA8F}' .
+			'\\x{1FABE}' .
+			'\\x{1FAC6}-\\x{1FACD}' .
+			'\\x{1FADC}-\\x{1FADF}' .
+			'\\x{1FAE9}-\\x{1FAEF}' .
+			'\\x{1FAF9}-\\x{1FAFF}' .
+			'\\x{1FB93}' .
+			'\\x{1FBCB}-\\x{1FBEF}' .
+			'\\x{1FBFA}-\\x{1FFFF}' .
+			'\\x{2A6E0}-\\x{2A6FF}' .
+			'\\x{2B73A}-\\x{2B73F}' .
+			'\\x{2B81E}-\\x{2B81F}' .
+			'\\x{2CEA2}-\\x{2CEAF}' .
+			'\\x{2EBE1}-\\x{2EBEF}' .
+			'\\x{2EE5E}-\\x{2F7FF}' .
+			'\\x{2FA1E}-\\x{2FFFF}' .
+			'\\x{3134B}-\\x{3134F}' .
+			'\\x{323B0}-\\x{E0000}' .
+			'\\x{E0002}-\\x{E001F}' .
+			'\\x{E0080}-\\x{E00FF}' .
+			'\\x{E01F0}-\\x{EFFFF}' .
+			'\\x{FFFFE}-\\x{FFFFF}' .
+			'\\x{10FFFE}-\\x{10FFFF}',
 		'Default_Ignorable_Code_Point' =>
-			'\x{00AD}' .
-			'\x{034F}' .
-			'\x{061C}' .
-			'\x{115F}-\x{1160}' .
-			'\x{17B4}-\x{17B5}' .
-			'\x{180B}-\x{180D}' .
-			'\x{180E}' .
-			'\x{180F}' .
-			'\x{200B}-\x{200F}' .
-			'\x{202A}-\x{202E}' .
-			'\x{2060}-\x{2064}' .
-			'\x{2065}' .
-			'\x{2066}-\x{206F}' .
-			'\x{3164}' .
-			'\x{FE00}-\x{FE0F}' .
-			'\x{FEFF}' .
-			'\x{FFA0}' .
-			'\x{FFF0}-\x{FFF8}' .
-			'\x{1BCA0}-\x{1BCA3}' .
-			'\x{1D173}-\x{1D17A}' .
-			'\x{E0000}' .
-			'\x{E0001}' .
-			'\x{E0002}-\x{E001F}' .
-			'\x{E0020}-\x{E007F}' .
-			'\x{E0080}-\x{E00FF}' .
-			'\x{E0100}-\x{E01EF}' .
-			'\x{E01F0}-\x{E0FFF}',
+			'\\x{00AD}' .
+			'\\x{034F}' .
+			'\\x{061C}' .
+			'\\x{115F}-\\x{1160}' .
+			'\\x{17B4}-\\x{17B5}' .
+			'\\x{180B}-\\x{180D}' .
+			'\\x{180E}' .
+			'\\x{180F}' .
+			'\\x{200B}-\\x{200F}' .
+			'\\x{202A}-\\x{202E}' .
+			'\\x{2060}-\\x{2064}' .
+			'\\x{2065}' .
+			'\\x{2066}-\\x{206F}' .
+			'\\x{3164}' .
+			'\\x{FE00}-\\x{FE0F}' .
+			'\\x{FEFF}' .
+			'\\x{FFA0}' .
+			'\\x{FFF0}-\\x{FFF8}' .
+			'\\x{1BCA0}-\\x{1BCA3}' .
+			'\\x{1D173}-\\x{1D17A}' .
+			'\\x{E0000}' .
+			'\\x{E0001}' .
+			'\\x{E0002}-\\x{E001F}' .
+			'\\x{E0020}-\\x{E007F}' .
+			'\\x{E0080}-\\x{E00FF}' .
+			'\\x{E0100}-\\x{E01EF}' .
+			'\\x{E01F0}-\\x{E0FFF}',
 		'Emoji' =>
-			'\x{0023}' .
-			'\x{002A}' .
-			'\x{0030}-\x{0039}' .
-			'\x{00A9}' .
-			'\x{00AE}' .
-			'\x{203C}' .
-			'\x{2049}' .
-			'\x{2122}' .
-			'\x{2139}' .
-			'\x{2194}-\x{2199}' .
-			'\x{21A9}-\x{21AA}' .
-			'\x{231A}-\x{231B}' .
-			'\x{2328}' .
-			'\x{23CF}' .
-			'\x{23E9}-\x{23EC}' .
-			'\x{23ED}-\x{23EE}' .
-			'\x{23EF}' .
-			'\x{23F0}' .
-			'\x{23F1}-\x{23F2}' .
-			'\x{23F3}' .
-			'\x{23F8}-\x{23FA}' .
-			'\x{24C2}' .
-			'\x{25AA}-\x{25AB}' .
-			'\x{25B6}' .
-			'\x{25C0}' .
-			'\x{25FB}-\x{25FE}' .
-			'\x{2600}-\x{2601}' .
-			'\x{2602}-\x{2603}' .
-			'\x{2604}' .
-			'\x{260E}' .
-			'\x{2611}' .
-			'\x{2614}-\x{2615}' .
-			'\x{2618}' .
-			'\x{261D}' .
-			'\x{2620}' .
-			'\x{2622}-\x{2623}' .
-			'\x{2626}' .
-			'\x{262A}' .
-			'\x{262E}' .
-			'\x{262F}' .
-			'\x{2638}-\x{2639}' .
-			'\x{263A}' .
-			'\x{2640}' .
-			'\x{2642}' .
-			'\x{2648}-\x{2653}' .
-			'\x{265F}' .
-			'\x{2660}' .
-			'\x{2663}' .
-			'\x{2665}-\x{2666}' .
-			'\x{2668}' .
-			'\x{267B}' .
-			'\x{267E}' .
-			'\x{267F}' .
-			'\x{2692}' .
-			'\x{2693}' .
-			'\x{2694}' .
-			'\x{2695}' .
-			'\x{2696}-\x{2697}' .
-			'\x{2699}' .
-			'\x{269B}-\x{269C}' .
-			'\x{26A0}-\x{26A1}' .
-			'\x{26A7}' .
-			'\x{26AA}-\x{26AB}' .
-			'\x{26B0}-\x{26B1}' .
-			'\x{26BD}-\x{26BE}' .
-			'\x{26C4}-\x{26C5}' .
-			'\x{26C8}' .
-			'\x{26CE}' .
-			'\x{26CF}' .
-			'\x{26D1}' .
-			'\x{26D3}' .
-			'\x{26D4}' .
-			'\x{26E9}' .
-			'\x{26EA}' .
-			'\x{26F0}-\x{26F1}' .
-			'\x{26F2}-\x{26F3}' .
-			'\x{26F4}' .
-			'\x{26F5}' .
-			'\x{26F7}-\x{26F9}' .
-			'\x{26FA}' .
-			'\x{26FD}' .
-			'\x{2702}' .
-			'\x{2705}' .
-			'\x{2708}-\x{270C}' .
-			'\x{270D}' .
-			'\x{270F}' .
-			'\x{2712}' .
-			'\x{2714}' .
-			'\x{2716}' .
-			'\x{271D}' .
-			'\x{2721}' .
-			'\x{2728}' .
-			'\x{2733}-\x{2734}' .
-			'\x{2744}' .
-			'\x{2747}' .
-			'\x{274C}' .
-			'\x{274E}' .
-			'\x{2753}-\x{2755}' .
-			'\x{2757}' .
-			'\x{2763}' .
-			'\x{2764}' .
-			'\x{2795}-\x{2797}' .
-			'\x{27A1}' .
-			'\x{27B0}' .
-			'\x{27BF}' .
-			'\x{2934}-\x{2935}' .
-			'\x{2B05}-\x{2B07}' .
-			'\x{2B1B}-\x{2B1C}' .
-			'\x{2B50}' .
-			'\x{2B55}' .
-			'\x{3030}' .
-			'\x{303D}' .
-			'\x{3297}' .
-			'\x{3299}' .
-			'\x{1F004}' .
-			'\x{1F0CF}' .
-			'\x{1F170}-\x{1F171}' .
-			'\x{1F17E}-\x{1F17F}' .
-			'\x{1F18E}' .
-			'\x{1F191}-\x{1F19A}' .
-			'\x{1F1E6}-\x{1F1FF}' .
-			'\x{1F201}-\x{1F202}' .
-			'\x{1F21A}' .
-			'\x{1F22F}' .
-			'\x{1F232}-\x{1F23A}' .
-			'\x{1F250}-\x{1F251}' .
-			'\x{1F300}-\x{1F30C}' .
-			'\x{1F30D}-\x{1F30E}' .
-			'\x{1F30F}' .
-			'\x{1F310}' .
-			'\x{1F311}' .
-			'\x{1F312}' .
-			'\x{1F313}-\x{1F315}' .
-			'\x{1F316}-\x{1F318}' .
-			'\x{1F319}' .
-			'\x{1F31A}' .
-			'\x{1F31B}' .
-			'\x{1F31C}' .
-			'\x{1F31D}-\x{1F31E}' .
-			'\x{1F31F}-\x{1F320}' .
-			'\x{1F321}' .
-			'\x{1F324}-\x{1F32C}' .
-			'\x{1F32D}-\x{1F32F}' .
-			'\x{1F330}-\x{1F331}' .
-			'\x{1F332}-\x{1F333}' .
-			'\x{1F334}-\x{1F335}' .
-			'\x{1F336}' .
-			'\x{1F337}-\x{1F34A}' .
-			'\x{1F34B}' .
-			'\x{1F34C}-\x{1F34F}' .
-			'\x{1F350}' .
-			'\x{1F351}-\x{1F37B}' .
-			'\x{1F37C}' .
-			'\x{1F37D}' .
-			'\x{1F37E}-\x{1F37F}' .
-			'\x{1F380}-\x{1F393}' .
-			'\x{1F396}-\x{1F397}' .
-			'\x{1F399}-\x{1F39B}' .
-			'\x{1F39E}-\x{1F39F}' .
-			'\x{1F3A0}-\x{1F3C4}' .
-			'\x{1F3C5}' .
-			'\x{1F3C6}' .
-			'\x{1F3C7}' .
-			'\x{1F3C8}' .
-			'\x{1F3C9}' .
-			'\x{1F3CA}' .
-			'\x{1F3CB}-\x{1F3CE}' .
-			'\x{1F3CF}-\x{1F3D3}' .
-			'\x{1F3D4}-\x{1F3DF}' .
-			'\x{1F3E0}-\x{1F3E3}' .
-			'\x{1F3E4}' .
-			'\x{1F3E5}-\x{1F3F0}' .
-			'\x{1F3F3}' .
-			'\x{1F3F4}' .
-			'\x{1F3F5}' .
-			'\x{1F3F7}' .
-			'\x{1F3F8}-\x{1F407}' .
-			'\x{1F408}' .
-			'\x{1F409}-\x{1F40B}' .
-			'\x{1F40C}-\x{1F40E}' .
-			'\x{1F40F}-\x{1F410}' .
-			'\x{1F411}-\x{1F412}' .
-			'\x{1F413}' .
-			'\x{1F414}' .
-			'\x{1F415}' .
-			'\x{1F416}' .
-			'\x{1F417}-\x{1F429}' .
-			'\x{1F42A}' .
-			'\x{1F42B}-\x{1F43E}' .
-			'\x{1F43F}' .
-			'\x{1F440}' .
-			'\x{1F441}' .
-			'\x{1F442}-\x{1F464}' .
-			'\x{1F465}' .
-			'\x{1F466}-\x{1F46B}' .
-			'\x{1F46C}-\x{1F46D}' .
-			'\x{1F46E}-\x{1F4AC}' .
-			'\x{1F4AD}' .
-			'\x{1F4AE}-\x{1F4B5}' .
-			'\x{1F4B6}-\x{1F4B7}' .
-			'\x{1F4B8}-\x{1F4EB}' .
-			'\x{1F4EC}-\x{1F4ED}' .
-			'\x{1F4EE}' .
-			'\x{1F4EF}' .
-			'\x{1F4F0}-\x{1F4F4}' .
-			'\x{1F4F5}' .
-			'\x{1F4F6}-\x{1F4F7}' .
-			'\x{1F4F8}' .
-			'\x{1F4F9}-\x{1F4FC}' .
-			'\x{1F4FD}' .
-			'\x{1F4FF}-\x{1F502}' .
-			'\x{1F503}' .
-			'\x{1F504}-\x{1F507}' .
-			'\x{1F508}' .
-			'\x{1F509}' .
-			'\x{1F50A}-\x{1F514}' .
-			'\x{1F515}' .
-			'\x{1F516}-\x{1F52B}' .
-			'\x{1F52C}-\x{1F52D}' .
-			'\x{1F52E}-\x{1F53D}' .
-			'\x{1F549}-\x{1F54A}' .
-			'\x{1F54B}-\x{1F54E}' .
-			'\x{1F550}-\x{1F55B}' .
-			'\x{1F55C}-\x{1F567}' .
-			'\x{1F56F}-\x{1F570}' .
-			'\x{1F573}-\x{1F579}' .
-			'\x{1F57A}' .
-			'\x{1F587}' .
-			'\x{1F58A}-\x{1F58D}' .
-			'\x{1F590}' .
-			'\x{1F595}-\x{1F596}' .
-			'\x{1F5A4}' .
-			'\x{1F5A5}' .
-			'\x{1F5A8}' .
-			'\x{1F5B1}-\x{1F5B2}' .
-			'\x{1F5BC}' .
-			'\x{1F5C2}-\x{1F5C4}' .
-			'\x{1F5D1}-\x{1F5D3}' .
-			'\x{1F5DC}-\x{1F5DE}' .
-			'\x{1F5E1}' .
-			'\x{1F5E3}' .
-			'\x{1F5E8}' .
-			'\x{1F5EF}' .
-			'\x{1F5F3}' .
-			'\x{1F5FA}' .
-			'\x{1F5FB}-\x{1F5FF}' .
-			'\x{1F600}' .
-			'\x{1F601}-\x{1F606}' .
-			'\x{1F607}-\x{1F608}' .
-			'\x{1F609}-\x{1F60D}' .
-			'\x{1F60E}' .
-			'\x{1F60F}' .
-			'\x{1F610}' .
-			'\x{1F611}' .
-			'\x{1F612}-\x{1F614}' .
-			'\x{1F615}' .
-			'\x{1F616}' .
-			'\x{1F617}' .
-			'\x{1F618}' .
-			'\x{1F619}' .
-			'\x{1F61A}' .
-			'\x{1F61B}' .
-			'\x{1F61C}-\x{1F61E}' .
-			'\x{1F61F}' .
-			'\x{1F620}-\x{1F625}' .
-			'\x{1F626}-\x{1F627}' .
-			'\x{1F628}-\x{1F62B}' .
-			'\x{1F62C}' .
-			'\x{1F62D}' .
-			'\x{1F62E}-\x{1F62F}' .
-			'\x{1F630}-\x{1F633}' .
-			'\x{1F634}' .
-			'\x{1F635}' .
-			'\x{1F636}' .
-			'\x{1F637}-\x{1F640}' .
-			'\x{1F641}-\x{1F644}' .
-			'\x{1F645}-\x{1F64F}' .
-			'\x{1F680}' .
-			'\x{1F681}-\x{1F682}' .
-			'\x{1F683}-\x{1F685}' .
-			'\x{1F686}' .
-			'\x{1F687}' .
-			'\x{1F688}' .
-			'\x{1F689}' .
-			'\x{1F68A}-\x{1F68B}' .
-			'\x{1F68C}' .
-			'\x{1F68D}' .
-			'\x{1F68E}' .
-			'\x{1F68F}' .
-			'\x{1F690}' .
-			'\x{1F691}-\x{1F693}' .
-			'\x{1F694}' .
-			'\x{1F695}' .
-			'\x{1F696}' .
-			'\x{1F697}' .
-			'\x{1F698}' .
-			'\x{1F699}-\x{1F69A}' .
-			'\x{1F69B}-\x{1F6A1}' .
-			'\x{1F6A2}' .
-			'\x{1F6A3}' .
-			'\x{1F6A4}-\x{1F6A5}' .
-			'\x{1F6A6}' .
-			'\x{1F6A7}-\x{1F6AD}' .
-			'\x{1F6AE}-\x{1F6B1}' .
-			'\x{1F6B2}' .
-			'\x{1F6B3}-\x{1F6B5}' .
-			'\x{1F6B6}' .
-			'\x{1F6B7}-\x{1F6B8}' .
-			'\x{1F6B9}-\x{1F6BE}' .
-			'\x{1F6BF}' .
-			'\x{1F6C0}' .
-			'\x{1F6C1}-\x{1F6C5}' .
-			'\x{1F6CB}' .
-			'\x{1F6CC}' .
-			'\x{1F6CD}-\x{1F6CF}' .
-			'\x{1F6D0}' .
-			'\x{1F6D1}-\x{1F6D2}' .
-			'\x{1F6D5}' .
-			'\x{1F6D6}-\x{1F6D7}' .
-			'\x{1F6DC}' .
-			'\x{1F6DD}-\x{1F6DF}' .
-			'\x{1F6E0}-\x{1F6E5}' .
-			'\x{1F6E9}' .
-			'\x{1F6EB}-\x{1F6EC}' .
-			'\x{1F6F0}' .
-			'\x{1F6F3}' .
-			'\x{1F6F4}-\x{1F6F6}' .
-			'\x{1F6F7}-\x{1F6F8}' .
-			'\x{1F6F9}' .
-			'\x{1F6FA}' .
-			'\x{1F6FB}-\x{1F6FC}' .
-			'\x{1F7E0}-\x{1F7EB}' .
-			'\x{1F7F0}' .
-			'\x{1F90C}' .
-			'\x{1F90D}-\x{1F90F}' .
-			'\x{1F910}-\x{1F918}' .
-			'\x{1F919}-\x{1F91E}' .
-			'\x{1F91F}' .
-			'\x{1F920}-\x{1F927}' .
-			'\x{1F928}-\x{1F92F}' .
-			'\x{1F930}' .
-			'\x{1F931}-\x{1F932}' .
-			'\x{1F933}-\x{1F93A}' .
-			'\x{1F93C}-\x{1F93E}' .
-			'\x{1F93F}' .
-			'\x{1F940}-\x{1F945}' .
-			'\x{1F947}-\x{1F94B}' .
-			'\x{1F94C}' .
-			'\x{1F94D}-\x{1F94F}' .
-			'\x{1F950}-\x{1F95E}' .
-			'\x{1F95F}-\x{1F96B}' .
-			'\x{1F96C}-\x{1F970}' .
-			'\x{1F971}' .
-			'\x{1F972}' .
-			'\x{1F973}-\x{1F976}' .
-			'\x{1F977}-\x{1F978}' .
-			'\x{1F979}' .
-			'\x{1F97A}' .
-			'\x{1F97B}' .
-			'\x{1F97C}-\x{1F97F}' .
-			'\x{1F980}-\x{1F984}' .
-			'\x{1F985}-\x{1F991}' .
-			'\x{1F992}-\x{1F997}' .
-			'\x{1F998}-\x{1F9A2}' .
-			'\x{1F9A3}-\x{1F9A4}' .
-			'\x{1F9A5}-\x{1F9AA}' .
-			'\x{1F9AB}-\x{1F9AD}' .
-			'\x{1F9AE}-\x{1F9AF}' .
-			'\x{1F9B0}-\x{1F9B9}' .
-			'\x{1F9BA}-\x{1F9BF}' .
-			'\x{1F9C0}' .
-			'\x{1F9C1}-\x{1F9C2}' .
-			'\x{1F9C3}-\x{1F9CA}' .
-			'\x{1F9CB}' .
-			'\x{1F9CC}' .
-			'\x{1F9CD}-\x{1F9CF}' .
-			'\x{1F9D0}-\x{1F9E6}' .
-			'\x{1F9E7}-\x{1F9FF}' .
-			'\x{1FA70}-\x{1FA73}' .
-			'\x{1FA74}' .
-			'\x{1FA75}-\x{1FA77}' .
-			'\x{1FA78}-\x{1FA7A}' .
-			'\x{1FA7B}-\x{1FA7C}' .
-			'\x{1FA80}-\x{1FA82}' .
-			'\x{1FA83}-\x{1FA86}' .
-			'\x{1FA87}-\x{1FA88}' .
-			'\x{1FA90}-\x{1FA95}' .
-			'\x{1FA96}-\x{1FAA8}' .
-			'\x{1FAA9}-\x{1FAAC}' .
-			'\x{1FAAD}-\x{1FAAF}' .
-			'\x{1FAB0}-\x{1FAB6}' .
-			'\x{1FAB7}-\x{1FABA}' .
-			'\x{1FABB}-\x{1FABD}' .
-			'\x{1FABF}' .
-			'\x{1FAC0}-\x{1FAC2}' .
-			'\x{1FAC3}-\x{1FAC5}' .
-			'\x{1FACE}-\x{1FACF}' .
-			'\x{1FAD0}-\x{1FAD6}' .
-			'\x{1FAD7}-\x{1FAD9}' .
-			'\x{1FADA}-\x{1FADB}' .
-			'\x{1FAE0}-\x{1FAE7}' .
-			'\x{1FAE8}' .
-			'\x{1FAF0}-\x{1FAF6}' .
-			'\x{1FAF7}-\x{1FAF8}',
+			'\\x{0023}' .
+			'\\x{002A}' .
+			'\\x{0030}-\\x{0039}' .
+			'\\x{00A9}' .
+			'\\x{00AE}' .
+			'\\x{203C}' .
+			'\\x{2049}' .
+			'\\x{2122}' .
+			'\\x{2139}' .
+			'\\x{2194}-\\x{2199}' .
+			'\\x{21A9}-\\x{21AA}' .
+			'\\x{231A}-\\x{231B}' .
+			'\\x{2328}' .
+			'\\x{23CF}' .
+			'\\x{23E9}-\\x{23EC}' .
+			'\\x{23ED}-\\x{23EE}' .
+			'\\x{23EF}' .
+			'\\x{23F0}' .
+			'\\x{23F1}-\\x{23F2}' .
+			'\\x{23F3}' .
+			'\\x{23F8}-\\x{23FA}' .
+			'\\x{24C2}' .
+			'\\x{25AA}-\\x{25AB}' .
+			'\\x{25B6}' .
+			'\\x{25C0}' .
+			'\\x{25FB}-\\x{25FE}' .
+			'\\x{2600}-\\x{2601}' .
+			'\\x{2602}-\\x{2603}' .
+			'\\x{2604}' .
+			'\\x{260E}' .
+			'\\x{2611}' .
+			'\\x{2614}-\\x{2615}' .
+			'\\x{2618}' .
+			'\\x{261D}' .
+			'\\x{2620}' .
+			'\\x{2622}-\\x{2623}' .
+			'\\x{2626}' .
+			'\\x{262A}' .
+			'\\x{262E}' .
+			'\\x{262F}' .
+			'\\x{2638}-\\x{2639}' .
+			'\\x{263A}' .
+			'\\x{2640}' .
+			'\\x{2642}' .
+			'\\x{2648}-\\x{2653}' .
+			'\\x{265F}' .
+			'\\x{2660}' .
+			'\\x{2663}' .
+			'\\x{2665}-\\x{2666}' .
+			'\\x{2668}' .
+			'\\x{267B}' .
+			'\\x{267E}' .
+			'\\x{267F}' .
+			'\\x{2692}' .
+			'\\x{2693}' .
+			'\\x{2694}' .
+			'\\x{2695}' .
+			'\\x{2696}-\\x{2697}' .
+			'\\x{2699}' .
+			'\\x{269B}-\\x{269C}' .
+			'\\x{26A0}-\\x{26A1}' .
+			'\\x{26A7}' .
+			'\\x{26AA}-\\x{26AB}' .
+			'\\x{26B0}-\\x{26B1}' .
+			'\\x{26BD}-\\x{26BE}' .
+			'\\x{26C4}-\\x{26C5}' .
+			'\\x{26C8}' .
+			'\\x{26CE}' .
+			'\\x{26CF}' .
+			'\\x{26D1}' .
+			'\\x{26D3}' .
+			'\\x{26D4}' .
+			'\\x{26E9}' .
+			'\\x{26EA}' .
+			'\\x{26F0}-\\x{26F1}' .
+			'\\x{26F2}-\\x{26F3}' .
+			'\\x{26F4}' .
+			'\\x{26F5}' .
+			'\\x{26F7}-\\x{26F9}' .
+			'\\x{26FA}' .
+			'\\x{26FD}' .
+			'\\x{2702}' .
+			'\\x{2705}' .
+			'\\x{2708}-\\x{270C}' .
+			'\\x{270D}' .
+			'\\x{270F}' .
+			'\\x{2712}' .
+			'\\x{2714}' .
+			'\\x{2716}' .
+			'\\x{271D}' .
+			'\\x{2721}' .
+			'\\x{2728}' .
+			'\\x{2733}-\\x{2734}' .
+			'\\x{2744}' .
+			'\\x{2747}' .
+			'\\x{274C}' .
+			'\\x{274E}' .
+			'\\x{2753}-\\x{2755}' .
+			'\\x{2757}' .
+			'\\x{2763}' .
+			'\\x{2764}' .
+			'\\x{2795}-\\x{2797}' .
+			'\\x{27A1}' .
+			'\\x{27B0}' .
+			'\\x{27BF}' .
+			'\\x{2934}-\\x{2935}' .
+			'\\x{2B05}-\\x{2B07}' .
+			'\\x{2B1B}-\\x{2B1C}' .
+			'\\x{2B50}' .
+			'\\x{2B55}' .
+			'\\x{3030}' .
+			'\\x{303D}' .
+			'\\x{3297}' .
+			'\\x{3299}' .
+			'\\x{1F004}' .
+			'\\x{1F0CF}' .
+			'\\x{1F170}-\\x{1F171}' .
+			'\\x{1F17E}-\\x{1F17F}' .
+			'\\x{1F18E}' .
+			'\\x{1F191}-\\x{1F19A}' .
+			'\\x{1F1E6}-\\x{1F1FF}' .
+			'\\x{1F201}-\\x{1F202}' .
+			'\\x{1F21A}' .
+			'\\x{1F22F}' .
+			'\\x{1F232}-\\x{1F23A}' .
+			'\\x{1F250}-\\x{1F251}' .
+			'\\x{1F300}-\\x{1F30C}' .
+			'\\x{1F30D}-\\x{1F30E}' .
+			'\\x{1F30F}' .
+			'\\x{1F310}' .
+			'\\x{1F311}' .
+			'\\x{1F312}' .
+			'\\x{1F313}-\\x{1F315}' .
+			'\\x{1F316}-\\x{1F318}' .
+			'\\x{1F319}' .
+			'\\x{1F31A}' .
+			'\\x{1F31B}' .
+			'\\x{1F31C}' .
+			'\\x{1F31D}-\\x{1F31E}' .
+			'\\x{1F31F}-\\x{1F320}' .
+			'\\x{1F321}' .
+			'\\x{1F324}-\\x{1F32C}' .
+			'\\x{1F32D}-\\x{1F32F}' .
+			'\\x{1F330}-\\x{1F331}' .
+			'\\x{1F332}-\\x{1F333}' .
+			'\\x{1F334}-\\x{1F335}' .
+			'\\x{1F336}' .
+			'\\x{1F337}-\\x{1F34A}' .
+			'\\x{1F34B}' .
+			'\\x{1F34C}-\\x{1F34F}' .
+			'\\x{1F350}' .
+			'\\x{1F351}-\\x{1F37B}' .
+			'\\x{1F37C}' .
+			'\\x{1F37D}' .
+			'\\x{1F37E}-\\x{1F37F}' .
+			'\\x{1F380}-\\x{1F393}' .
+			'\\x{1F396}-\\x{1F397}' .
+			'\\x{1F399}-\\x{1F39B}' .
+			'\\x{1F39E}-\\x{1F39F}' .
+			'\\x{1F3A0}-\\x{1F3C4}' .
+			'\\x{1F3C5}' .
+			'\\x{1F3C6}' .
+			'\\x{1F3C7}' .
+			'\\x{1F3C8}' .
+			'\\x{1F3C9}' .
+			'\\x{1F3CA}' .
+			'\\x{1F3CB}-\\x{1F3CE}' .
+			'\\x{1F3CF}-\\x{1F3D3}' .
+			'\\x{1F3D4}-\\x{1F3DF}' .
+			'\\x{1F3E0}-\\x{1F3E3}' .
+			'\\x{1F3E4}' .
+			'\\x{1F3E5}-\\x{1F3F0}' .
+			'\\x{1F3F3}' .
+			'\\x{1F3F4}' .
+			'\\x{1F3F5}' .
+			'\\x{1F3F7}' .
+			'\\x{1F3F8}-\\x{1F407}' .
+			'\\x{1F408}' .
+			'\\x{1F409}-\\x{1F40B}' .
+			'\\x{1F40C}-\\x{1F40E}' .
+			'\\x{1F40F}-\\x{1F410}' .
+			'\\x{1F411}-\\x{1F412}' .
+			'\\x{1F413}' .
+			'\\x{1F414}' .
+			'\\x{1F415}' .
+			'\\x{1F416}' .
+			'\\x{1F417}-\\x{1F429}' .
+			'\\x{1F42A}' .
+			'\\x{1F42B}-\\x{1F43E}' .
+			'\\x{1F43F}' .
+			'\\x{1F440}' .
+			'\\x{1F441}' .
+			'\\x{1F442}-\\x{1F464}' .
+			'\\x{1F465}' .
+			'\\x{1F466}-\\x{1F46B}' .
+			'\\x{1F46C}-\\x{1F46D}' .
+			'\\x{1F46E}-\\x{1F4AC}' .
+			'\\x{1F4AD}' .
+			'\\x{1F4AE}-\\x{1F4B5}' .
+			'\\x{1F4B6}-\\x{1F4B7}' .
+			'\\x{1F4B8}-\\x{1F4EB}' .
+			'\\x{1F4EC}-\\x{1F4ED}' .
+			'\\x{1F4EE}' .
+			'\\x{1F4EF}' .
+			'\\x{1F4F0}-\\x{1F4F4}' .
+			'\\x{1F4F5}' .
+			'\\x{1F4F6}-\\x{1F4F7}' .
+			'\\x{1F4F8}' .
+			'\\x{1F4F9}-\\x{1F4FC}' .
+			'\\x{1F4FD}' .
+			'\\x{1F4FF}-\\x{1F502}' .
+			'\\x{1F503}' .
+			'\\x{1F504}-\\x{1F507}' .
+			'\\x{1F508}' .
+			'\\x{1F509}' .
+			'\\x{1F50A}-\\x{1F514}' .
+			'\\x{1F515}' .
+			'\\x{1F516}-\\x{1F52B}' .
+			'\\x{1F52C}-\\x{1F52D}' .
+			'\\x{1F52E}-\\x{1F53D}' .
+			'\\x{1F549}-\\x{1F54A}' .
+			'\\x{1F54B}-\\x{1F54E}' .
+			'\\x{1F550}-\\x{1F55B}' .
+			'\\x{1F55C}-\\x{1F567}' .
+			'\\x{1F56F}-\\x{1F570}' .
+			'\\x{1F573}-\\x{1F579}' .
+			'\\x{1F57A}' .
+			'\\x{1F587}' .
+			'\\x{1F58A}-\\x{1F58D}' .
+			'\\x{1F590}' .
+			'\\x{1F595}-\\x{1F596}' .
+			'\\x{1F5A4}' .
+			'\\x{1F5A5}' .
+			'\\x{1F5A8}' .
+			'\\x{1F5B1}-\\x{1F5B2}' .
+			'\\x{1F5BC}' .
+			'\\x{1F5C2}-\\x{1F5C4}' .
+			'\\x{1F5D1}-\\x{1F5D3}' .
+			'\\x{1F5DC}-\\x{1F5DE}' .
+			'\\x{1F5E1}' .
+			'\\x{1F5E3}' .
+			'\\x{1F5E8}' .
+			'\\x{1F5EF}' .
+			'\\x{1F5F3}' .
+			'\\x{1F5FA}' .
+			'\\x{1F5FB}-\\x{1F5FF}' .
+			'\\x{1F600}' .
+			'\\x{1F601}-\\x{1F606}' .
+			'\\x{1F607}-\\x{1F608}' .
+			'\\x{1F609}-\\x{1F60D}' .
+			'\\x{1F60E}' .
+			'\\x{1F60F}' .
+			'\\x{1F610}' .
+			'\\x{1F611}' .
+			'\\x{1F612}-\\x{1F614}' .
+			'\\x{1F615}' .
+			'\\x{1F616}' .
+			'\\x{1F617}' .
+			'\\x{1F618}' .
+			'\\x{1F619}' .
+			'\\x{1F61A}' .
+			'\\x{1F61B}' .
+			'\\x{1F61C}-\\x{1F61E}' .
+			'\\x{1F61F}' .
+			'\\x{1F620}-\\x{1F625}' .
+			'\\x{1F626}-\\x{1F627}' .
+			'\\x{1F628}-\\x{1F62B}' .
+			'\\x{1F62C}' .
+			'\\x{1F62D}' .
+			'\\x{1F62E}-\\x{1F62F}' .
+			'\\x{1F630}-\\x{1F633}' .
+			'\\x{1F634}' .
+			'\\x{1F635}' .
+			'\\x{1F636}' .
+			'\\x{1F637}-\\x{1F640}' .
+			'\\x{1F641}-\\x{1F644}' .
+			'\\x{1F645}-\\x{1F64F}' .
+			'\\x{1F680}' .
+			'\\x{1F681}-\\x{1F682}' .
+			'\\x{1F683}-\\x{1F685}' .
+			'\\x{1F686}' .
+			'\\x{1F687}' .
+			'\\x{1F688}' .
+			'\\x{1F689}' .
+			'\\x{1F68A}-\\x{1F68B}' .
+			'\\x{1F68C}' .
+			'\\x{1F68D}' .
+			'\\x{1F68E}' .
+			'\\x{1F68F}' .
+			'\\x{1F690}' .
+			'\\x{1F691}-\\x{1F693}' .
+			'\\x{1F694}' .
+			'\\x{1F695}' .
+			'\\x{1F696}' .
+			'\\x{1F697}' .
+			'\\x{1F698}' .
+			'\\x{1F699}-\\x{1F69A}' .
+			'\\x{1F69B}-\\x{1F6A1}' .
+			'\\x{1F6A2}' .
+			'\\x{1F6A3}' .
+			'\\x{1F6A4}-\\x{1F6A5}' .
+			'\\x{1F6A6}' .
+			'\\x{1F6A7}-\\x{1F6AD}' .
+			'\\x{1F6AE}-\\x{1F6B1}' .
+			'\\x{1F6B2}' .
+			'\\x{1F6B3}-\\x{1F6B5}' .
+			'\\x{1F6B6}' .
+			'\\x{1F6B7}-\\x{1F6B8}' .
+			'\\x{1F6B9}-\\x{1F6BE}' .
+			'\\x{1F6BF}' .
+			'\\x{1F6C0}' .
+			'\\x{1F6C1}-\\x{1F6C5}' .
+			'\\x{1F6CB}' .
+			'\\x{1F6CC}' .
+			'\\x{1F6CD}-\\x{1F6CF}' .
+			'\\x{1F6D0}' .
+			'\\x{1F6D1}-\\x{1F6D2}' .
+			'\\x{1F6D5}' .
+			'\\x{1F6D6}-\\x{1F6D7}' .
+			'\\x{1F6DC}' .
+			'\\x{1F6DD}-\\x{1F6DF}' .
+			'\\x{1F6E0}-\\x{1F6E5}' .
+			'\\x{1F6E9}' .
+			'\\x{1F6EB}-\\x{1F6EC}' .
+			'\\x{1F6F0}' .
+			'\\x{1F6F3}' .
+			'\\x{1F6F4}-\\x{1F6F6}' .
+			'\\x{1F6F7}-\\x{1F6F8}' .
+			'\\x{1F6F9}' .
+			'\\x{1F6FA}' .
+			'\\x{1F6FB}-\\x{1F6FC}' .
+			'\\x{1F7E0}-\\x{1F7EB}' .
+			'\\x{1F7F0}' .
+			'\\x{1F90C}' .
+			'\\x{1F90D}-\\x{1F90F}' .
+			'\\x{1F910}-\\x{1F918}' .
+			'\\x{1F919}-\\x{1F91E}' .
+			'\\x{1F91F}' .
+			'\\x{1F920}-\\x{1F927}' .
+			'\\x{1F928}-\\x{1F92F}' .
+			'\\x{1F930}' .
+			'\\x{1F931}-\\x{1F932}' .
+			'\\x{1F933}-\\x{1F93A}' .
+			'\\x{1F93C}-\\x{1F93E}' .
+			'\\x{1F93F}' .
+			'\\x{1F940}-\\x{1F945}' .
+			'\\x{1F947}-\\x{1F94B}' .
+			'\\x{1F94C}' .
+			'\\x{1F94D}-\\x{1F94F}' .
+			'\\x{1F950}-\\x{1F95E}' .
+			'\\x{1F95F}-\\x{1F96B}' .
+			'\\x{1F96C}-\\x{1F970}' .
+			'\\x{1F971}' .
+			'\\x{1F972}' .
+			'\\x{1F973}-\\x{1F976}' .
+			'\\x{1F977}-\\x{1F978}' .
+			'\\x{1F979}' .
+			'\\x{1F97A}' .
+			'\\x{1F97B}' .
+			'\\x{1F97C}-\\x{1F97F}' .
+			'\\x{1F980}-\\x{1F984}' .
+			'\\x{1F985}-\\x{1F991}' .
+			'\\x{1F992}-\\x{1F997}' .
+			'\\x{1F998}-\\x{1F9A2}' .
+			'\\x{1F9A3}-\\x{1F9A4}' .
+			'\\x{1F9A5}-\\x{1F9AA}' .
+			'\\x{1F9AB}-\\x{1F9AD}' .
+			'\\x{1F9AE}-\\x{1F9AF}' .
+			'\\x{1F9B0}-\\x{1F9B9}' .
+			'\\x{1F9BA}-\\x{1F9BF}' .
+			'\\x{1F9C0}' .
+			'\\x{1F9C1}-\\x{1F9C2}' .
+			'\\x{1F9C3}-\\x{1F9CA}' .
+			'\\x{1F9CB}' .
+			'\\x{1F9CC}' .
+			'\\x{1F9CD}-\\x{1F9CF}' .
+			'\\x{1F9D0}-\\x{1F9E6}' .
+			'\\x{1F9E7}-\\x{1F9FF}' .
+			'\\x{1FA70}-\\x{1FA73}' .
+			'\\x{1FA74}' .
+			'\\x{1FA75}-\\x{1FA77}' .
+			'\\x{1FA78}-\\x{1FA7A}' .
+			'\\x{1FA7B}-\\x{1FA7C}' .
+			'\\x{1FA80}-\\x{1FA82}' .
+			'\\x{1FA83}-\\x{1FA86}' .
+			'\\x{1FA87}-\\x{1FA88}' .
+			'\\x{1FA90}-\\x{1FA95}' .
+			'\\x{1FA96}-\\x{1FAA8}' .
+			'\\x{1FAA9}-\\x{1FAAC}' .
+			'\\x{1FAAD}-\\x{1FAAF}' .
+			'\\x{1FAB0}-\\x{1FAB6}' .
+			'\\x{1FAB7}-\\x{1FABA}' .
+			'\\x{1FABB}-\\x{1FABD}' .
+			'\\x{1FABF}' .
+			'\\x{1FAC0}-\\x{1FAC2}' .
+			'\\x{1FAC3}-\\x{1FAC5}' .
+			'\\x{1FACE}-\\x{1FACF}' .
+			'\\x{1FAD0}-\\x{1FAD6}' .
+			'\\x{1FAD7}-\\x{1FAD9}' .
+			'\\x{1FADA}-\\x{1FADB}' .
+			'\\x{1FAE0}-\\x{1FAE7}' .
+			'\\x{1FAE8}' .
+			'\\x{1FAF0}-\\x{1FAF6}' .
+			'\\x{1FAF7}-\\x{1FAF8}',
 		'Emoji_Modifier' =>
-			'\x{1F3FB}-\x{1F3FF}',
+			'\\x{1F3FB}-\\x{1F3FF}',
 		'Ideographic' =>
-			'\x{3006}' .
-			'\x{3007}' .
-			'\x{3021}-\x{3029}' .
-			'\x{3038}-\x{303A}' .
-			'\x{3400}-\x{4DBF}' .
-			'\x{4E00}-\x{9FFF}' .
-			'\x{F900}-\x{FA6D}' .
-			'\x{FA70}-\x{FAD9}' .
-			'\x{16FE4}' .
-			'\x{17000}-\x{187F7}' .
-			'\x{18800}-\x{18CD5}' .
-			'\x{18D00}-\x{18D08}' .
-			'\x{1B170}-\x{1B2FB}' .
-			'\x{20000}-\x{2A6DF}' .
-			'\x{2A700}-\x{2B739}' .
-			'\x{2B740}-\x{2B81D}' .
-			'\x{2B820}-\x{2CEA1}' .
-			'\x{2CEB0}-\x{2EBE0}' .
-			'\x{2F800}-\x{2FA1D}' .
-			'\x{30000}-\x{3134A}' .
-			'\x{31350}-\x{323AF}',
+			'\\x{3006}' .
+			'\\x{3007}' .
+			'\\x{3021}-\\x{3029}' .
+			'\\x{3038}-\\x{303A}' .
+			'\\x{3400}-\\x{4DBF}' .
+			'\\x{4E00}-\\x{9FFF}' .
+			'\\x{F900}-\\x{FA6D}' .
+			'\\x{FA70}-\\x{FAD9}' .
+			'\\x{16FE4}' .
+			'\\x{17000}-\\x{187F7}' .
+			'\\x{18800}-\\x{18CD5}' .
+			'\\x{18D00}-\\x{18D08}' .
+			'\\x{1B170}-\\x{1B2FB}' .
+			'\\x{20000}-\\x{2A6DF}' .
+			'\\x{2A700}-\\x{2B739}' .
+			'\\x{2B740}-\\x{2B81D}' .
+			'\\x{2B820}-\\x{2CEA1}' .
+			'\\x{2CEB0}-\\x{2EBE0}' .
+			'\\x{2EBF0}-\\x{2EE5D}' .
+			'\\x{2F800}-\\x{2FA1D}' .
+			'\\x{30000}-\\x{3134A}' .
+			'\\x{31350}-\\x{323AF}',
 		'Join_Control' =>
-			'\x{200C}-\x{200D}',
+			'\\x{200C}-\\x{200D}',
 		'Regional_Indicator' =>
-			'\x{1F1E6}-\x{1F1FF}',
+			'\\x{1F1E6}-\\x{1F1FF}',
 		'Variation_Selector' =>
-			'\x{180B}-\x{180D}' .
-			'\x{180F}' .
-			'\x{FE00}-\x{FE0F}' .
-			'\x{E0100}-\x{E01EF}',
-	);
+			'\\x{180B}-\\x{180D}' .
+			'\\x{180F}' .
+			'\\x{FE00}-\\x{FE0F}' .
+			'\\x{E0100}-\\x{E01EF}',
+	];
 }
 
 /**
@@ -1721,1345 +1723,1349 @@ function utf8_regex_properties()
  */
 function utf8_regex_variation_selectors()
 {
-	return array(
-		'\x{FE0E}\x{FE0F}' =>
-			'\x{0023}' .
-			'\x{002A}' .
-			'\x{0030}-\x{0039}' .
-			'\x{00A9}' .
-			'\x{00AE}' .
-			'\x{203C}' .
-			'\x{2049}' .
-			'\x{2122}' .
-			'\x{2139}' .
-			'\x{2194}-\x{2199}' .
-			'\x{21A9}-\x{21AA}' .
-			'\x{231A}-\x{231B}' .
-			'\x{2328}' .
-			'\x{23CF}' .
-			'\x{23E9}-\x{23EA}' .
-			'\x{23ED}-\x{23EF}' .
-			'\x{23F1}-\x{23F3}' .
-			'\x{23F8}-\x{23FA}' .
-			'\x{24C2}' .
-			'\x{25AA}-\x{25AB}' .
-			'\x{25B6}' .
-			'\x{25C0}' .
-			'\x{25FB}-\x{25FE}' .
-			'\x{2600}-\x{2604}' .
-			'\x{260E}' .
-			'\x{2611}' .
-			'\x{2614}-\x{2615}' .
-			'\x{2618}' .
-			'\x{261D}' .
-			'\x{2620}' .
-			'\x{2622}-\x{2623}' .
-			'\x{2626}' .
-			'\x{262A}' .
-			'\x{262E}-\x{262F}' .
-			'\x{2638}-\x{263A}' .
-			'\x{2640}' .
-			'\x{2642}' .
-			'\x{2648}-\x{2653}' .
-			'\x{265F}-\x{2660}' .
-			'\x{2663}' .
-			'\x{2665}-\x{2666}' .
-			'\x{2668}' .
-			'\x{267B}' .
-			'\x{267E}-\x{267F}' .
-			'\x{2692}-\x{2697}' .
-			'\x{2699}' .
-			'\x{269B}-\x{269C}' .
-			'\x{26A0}-\x{26A1}' .
-			'\x{26A7}' .
-			'\x{26AA}-\x{26AB}' .
-			'\x{26B0}-\x{26B1}' .
-			'\x{26BD}-\x{26BE}' .
-			'\x{26C4}-\x{26C5}' .
-			'\x{26C8}' .
-			'\x{26CF}' .
-			'\x{26D1}' .
-			'\x{26D3}-\x{26D4}' .
-			'\x{26E9}-\x{26EA}' .
-			'\x{26F0}-\x{26F5}' .
-			'\x{26F7}-\x{26FA}' .
-			'\x{26FD}' .
-			'\x{2702}' .
-			'\x{2708}-\x{2709}' .
-			'\x{270C}-\x{270D}' .
-			'\x{270F}' .
-			'\x{2712}' .
-			'\x{2714}' .
-			'\x{2716}' .
-			'\x{271D}' .
-			'\x{2721}' .
-			'\x{2733}-\x{2734}' .
-			'\x{2744}' .
-			'\x{2747}' .
-			'\x{2753}' .
-			'\x{2757}' .
-			'\x{2763}-\x{2764}' .
-			'\x{27A1}' .
-			'\x{2934}-\x{2935}' .
-			'\x{2B05}-\x{2B07}' .
-			'\x{2B1B}-\x{2B1C}' .
-			'\x{2B50}' .
-			'\x{2B55}' .
-			'\x{3030}' .
-			'\x{303D}' .
-			'\x{3297}' .
-			'\x{3299}' .
-			'\x{1F004}' .
-			'\x{1F170}-\x{1F171}' .
-			'\x{1F17E}-\x{1F17F}' .
-			'\x{1F202}' .
-			'\x{1F21A}' .
-			'\x{1F22F}' .
-			'\x{1F237}' .
-			'\x{1F30D}-\x{1F30F}' .
-			'\x{1F315}' .
-			'\x{1F31C}' .
-			'\x{1F321}' .
-			'\x{1F324}-\x{1F32C}' .
-			'\x{1F336}' .
-			'\x{1F378}' .
-			'\x{1F37D}' .
-			'\x{1F393}' .
-			'\x{1F396}-\x{1F397}' .
-			'\x{1F399}-\x{1F39B}' .
-			'\x{1F39E}-\x{1F39F}' .
-			'\x{1F3A7}' .
-			'\x{1F3AC}-\x{1F3AE}' .
-			'\x{1F3C2}' .
-			'\x{1F3C4}' .
-			'\x{1F3C6}' .
-			'\x{1F3CA}-\x{1F3CE}' .
-			'\x{1F3D4}-\x{1F3E0}' .
-			'\x{1F3ED}' .
-			'\x{1F3F3}' .
-			'\x{1F3F5}' .
-			'\x{1F3F7}' .
-			'\x{1F408}' .
-			'\x{1F415}' .
-			'\x{1F41F}' .
-			'\x{1F426}' .
-			'\x{1F43F}' .
-			'\x{1F441}-\x{1F442}' .
-			'\x{1F446}-\x{1F449}' .
-			'\x{1F44D}-\x{1F44E}' .
-			'\x{1F453}' .
-			'\x{1F46A}' .
-			'\x{1F47D}' .
-			'\x{1F4A3}' .
-			'\x{1F4B0}' .
-			'\x{1F4B3}' .
-			'\x{1F4BB}' .
-			'\x{1F4BF}' .
-			'\x{1F4CB}' .
-			'\x{1F4DA}' .
-			'\x{1F4DF}' .
-			'\x{1F4E4}-\x{1F4E6}' .
-			'\x{1F4EA}-\x{1F4ED}' .
-			'\x{1F4F7}' .
-			'\x{1F4F9}-\x{1F4FB}' .
-			'\x{1F4FD}' .
-			'\x{1F508}' .
-			'\x{1F50D}' .
-			'\x{1F512}-\x{1F513}' .
-			'\x{1F549}-\x{1F54A}' .
-			'\x{1F550}-\x{1F567}' .
-			'\x{1F56F}-\x{1F570}' .
-			'\x{1F573}-\x{1F579}' .
-			'\x{1F587}' .
-			'\x{1F58A}-\x{1F58D}' .
-			'\x{1F590}' .
-			'\x{1F5A5}' .
-			'\x{1F5A8}' .
-			'\x{1F5B1}-\x{1F5B2}' .
-			'\x{1F5BC}' .
-			'\x{1F5C2}-\x{1F5C4}' .
-			'\x{1F5D1}-\x{1F5D3}' .
-			'\x{1F5DC}-\x{1F5DE}' .
-			'\x{1F5E1}' .
-			'\x{1F5E3}' .
-			'\x{1F5E8}' .
-			'\x{1F5EF}' .
-			'\x{1F5F3}' .
-			'\x{1F5FA}' .
-			'\x{1F610}' .
-			'\x{1F687}' .
-			'\x{1F68D}' .
-			'\x{1F691}' .
-			'\x{1F694}' .
-			'\x{1F698}' .
-			'\x{1F6AD}' .
-			'\x{1F6B2}' .
-			'\x{1F6B9}-\x{1F6BA}' .
-			'\x{1F6BC}' .
-			'\x{1F6CB}' .
-			'\x{1F6CD}-\x{1F6CF}' .
-			'\x{1F6E0}-\x{1F6E5}' .
-			'\x{1F6E9}' .
-			'\x{1F6F0}' .
-			'\x{1F6F3}',
-		'\x{FE02}' =>
-			'\x{13117}' .
-			'\x{13139}' .
-			'\x{13183}' .
-			'\x{131A0}' .
-			'\x{131BA}' .
-			'\x{131EE}' .
-			'\x{13216}' .
-			'\x{1327B}' .
-			'\x{132A4}' .
-			'\x{132E7}' .
-			'\x{132E9}' .
-			'\x{132F8}' .
-			'\x{132FD}' .
-			'\x{13302}-\x{13303}' .
-			'\x{13310}-\x{13314}' .
-			'\x{1331C}' .
-			'\x{13321}' .
-			'\x{13331}' .
-			'\x{1334A}' .
-			'\x{13361}' .
-			'\x{13373}' .
-			'\x{1337D}' .
-			'\x{13385}' .
-			'\x{133AF}-\x{133B0}' .
-			'\x{133BF}' .
-			'\x{133DD}' .
-			'\x{13419}' .
-			'\x{1342C}' .
-			'\x{1342E}' .
-			'\x{537F}' .
-			'\x{5BE7}' .
-			'\x{618E}' .
-			'\x{61F2}' .
-			'\x{6717}' .
-			'\x{6A02}' .
-			'\x{6BBA}' .
-			'\x{6D41}' .
-			'\x{7DF4}' .
-			'\x{8005}' .
-			'\x{980B}' .
-			'\x{9F9C}',
-		'\x{FE01}' =>
-			'\x{1D49C}' .
-			'\x{212C}' .
-			'\x{1D49E}-\x{1D49F}' .
-			'\x{2130}-\x{2131}' .
-			'\x{1D4A2}' .
-			'\x{210B}' .
-			'\x{2110}' .
-			'\x{1D4A5}-\x{1D4A6}' .
-			'\x{2112}' .
-			'\x{2133}' .
-			'\x{1D4A9}-\x{1D4AC}' .
-			'\x{211B}' .
-			'\x{1D4AE}-\x{1D4B5}' .
-			'\x{3001}-\x{3002}' .
-			'\x{FF01}' .
-			'\x{FF0C}' .
-			'\x{FF0E}' .
-			'\x{FF1A}-\x{FF1B}' .
-			'\x{FF1F}' .
-			'\x{13093}' .
-			'\x{130A9}' .
-			'\x{13187}' .
-			'\x{131B1}' .
-			'\x{131EE}' .
-			'\x{131F8}-\x{131FA}' .
-			'\x{13257}' .
-			'\x{1327F}' .
-			'\x{132A4}' .
-			'\x{13308}' .
-			'\x{13312}-\x{13314}' .
-			'\x{1331B}' .
-			'\x{13321}-\x{13322}' .
-			'\x{13331}' .
-			'\x{13419}' .
-			'\x{3B9D}' .
-			'\x{3EB8}' .
-			'\x{4039}' .
-			'\x{4FAE}' .
-			'\x{50E7}' .
-			'\x{514D}' .
-			'\x{51B5}' .
-			'\x{5207}' .
-			'\x{52C7}' .
-			'\x{52C9}' .
-			'\x{52E4}' .
-			'\x{52FA}' .
-			'\x{5317}' .
-			'\x{5351}' .
-			'\x{537F}' .
-			'\x{5584}' .
-			'\x{5599}' .
-			'\x{559D}' .
-			'\x{5606}' .
-			'\x{585A}' .
-			'\x{5B3E}' .
-			'\x{5BE7}' .
-			'\x{5C6E}' .
-			'\x{5ECA}' .
-			'\x{5F22}' .
-			'\x{6094}' .
-			'\x{614C}' .
-			'\x{614E}' .
-			'\x{618E}' .
-			'\x{61F2}' .
-			'\x{61F6}' .
-			'\x{654F}' .
-			'\x{6674}' .
-			'\x{6691}' .
-			'\x{6717}' .
-			'\x{671B}' .
-			'\x{6885}' .
-			'\x{6A02}' .
-			'\x{6BBA}' .
-			'\x{6D41}' .
-			'\x{6D77}' .
-			'\x{6ECB}' .
-			'\x{6F22}' .
-			'\x{701E}' .
-			'\x{716E}' .
-			'\x{7235}' .
-			'\x{732A}' .
-			'\x{7387}' .
-			'\x{7471}' .
-			'\x{7570}' .
-			'\x{76CA}' .
-			'\x{76F4}' .
-			'\x{771F}' .
-			'\x{774A}' .
-			'\x{788C}' .
-			'\x{78CC}' .
-			'\x{7956}' .
-			'\x{798F}' .
-			'\x{7A40}' .
-			'\x{7BC0}' .
-			'\x{7DF4}' .
-			'\x{8005}' .
-			'\x{8201}' .
-			'\x{8279}' .
-			'\x{82E5}' .
-			'\x{8457}' .
-			'\x{865C}' .
-			'\x{8779}' .
-			'\x{8996}' .
-			'\x{8AAA}' .
-			'\x{8AED}' .
-			'\x{8AF8}' .
-			'\x{8AFE}' .
-			'\x{8B01}' .
-			'\x{8B39}' .
-			'\x{8B8A}' .
-			'\x{8D08}' .
-			'\x{8F38}' .
-			'\x{9038}' .
-			'\x{96E3}' .
-			'\x{9756}' .
-			'\x{97FF}' .
-			'\x{980B}' .
-			'\x{983B}' .
-			'\x{9B12}' .
-			'\x{9F9C}' .
-			'\x{22331}' .
-			'\x{25AA7}',
-		'\x{FE00}' =>
-			'\x{0030}' .
-			'\x{2205}' .
-			'\x{2229}-\x{222A}' .
-			'\x{2268}-\x{2269}' .
-			'\x{2272}-\x{2273}' .
-			'\x{228A}-\x{228B}' .
-			'\x{2293}-\x{2295}' .
-			'\x{2297}' .
-			'\x{229C}' .
-			'\x{22DA}-\x{22DB}' .
-			'\x{2A3C}-\x{2A3D}' .
-			'\x{2A9D}-\x{2A9E}' .
-			'\x{2AAC}-\x{2AAD}' .
-			'\x{2ACB}-\x{2ACC}' .
-			'\x{FF10}' .
-			'\x{1D49C}' .
-			'\x{212C}' .
-			'\x{1D49E}-\x{1D49F}' .
-			'\x{2130}-\x{2131}' .
-			'\x{1D4A2}' .
-			'\x{210B}' .
-			'\x{2110}' .
-			'\x{1D4A5}-\x{1D4A6}' .
-			'\x{2112}' .
-			'\x{2133}' .
-			'\x{1D4A9}-\x{1D4AC}' .
-			'\x{211B}' .
-			'\x{1D4AE}-\x{1D4B5}' .
-			'\x{3001}-\x{3002}' .
-			'\x{FF01}' .
-			'\x{FF0C}' .
-			'\x{FF0E}' .
-			'\x{FF1A}-\x{FF1B}' .
-			'\x{FF1F}' .
-			'\x{1000}' .
-			'\x{1002}' .
-			'\x{1004}' .
-			'\x{1010}-\x{1011}' .
-			'\x{1015}' .
-			'\x{1019}-\x{101A}' .
-			'\x{101C}-\x{101D}' .
-			'\x{1022}' .
-			'\x{1031}' .
-			'\x{1075}' .
-			'\x{1078}' .
-			'\x{107A}' .
-			'\x{1080}' .
-			'\x{AA60}-\x{AA66}' .
-			'\x{AA6B}-\x{AA6C}' .
-			'\x{AA6F}' .
-			'\x{AA7A}' .
-			'\x{A856}' .
-			'\x{A85C}' .
-			'\x{A85E}-\x{A860}' .
-			'\x{A868}' .
-			'\x{10AC5}-\x{10AC6}' .
-			'\x{10AD6}-\x{10AD7}' .
-			'\x{10AE1}' .
-			'\x{13091}-\x{13092}' .
-			'\x{1310F}' .
-			'\x{1311C}' .
-			'\x{13121}' .
-			'\x{13127}' .
-			'\x{13139}' .
-			'\x{131A0}' .
-			'\x{131B1}' .
-			'\x{131B8}-\x{131B9}' .
-			'\x{131CB}' .
-			'\x{131F9}-\x{131FA}' .
-			'\x{1327F}' .
-			'\x{13285}' .
-			'\x{1328C}' .
-			'\x{132AA}' .
-			'\x{132CB}' .
-			'\x{132DC}' .
-			'\x{132E7}' .
-			'\x{13307}' .
-			'\x{1331B}' .
-			'\x{13322}' .
-			'\x{1333B}-\x{1333C}' .
-			'\x{13377}-\x{13378}' .
-			'\x{13399}-\x{1339A}' .
-			'\x{133D3}' .
-			'\x{133F2}' .
-			'\x{133F5}-\x{133F6}' .
-			'\x{13403}' .
-			'\x{13416}' .
-			'\x{13419}-\x{1341A}' .
-			'\x{13423}' .
-			'\x{13443}-\x{13446}' .
-			'\x{349E}' .
-			'\x{34B9}' .
-			'\x{34BB}' .
-			'\x{34DF}' .
-			'\x{3515}' .
-			'\x{36EE}' .
-			'\x{36FC}' .
-			'\x{3781}' .
-			'\x{382F}' .
-			'\x{3862}' .
-			'\x{387C}' .
-			'\x{38C7}' .
-			'\x{38E3}' .
-			'\x{391C}' .
-			'\x{393A}' .
-			'\x{3A2E}' .
-			'\x{3A6C}' .
-			'\x{3AE4}' .
-			'\x{3B08}' .
-			'\x{3B19}' .
-			'\x{3B49}' .
-			'\x{3B9D}' .
-			'\x{3C18}' .
-			'\x{3C4E}' .
-			'\x{3D33}' .
-			'\x{3D96}' .
-			'\x{3EAC}' .
-			'\x{3EB8}' .
-			'\x{3F1B}' .
-			'\x{3FFC}' .
-			'\x{4008}' .
-			'\x{4018}' .
-			'\x{4039}' .
-			'\x{4046}' .
-			'\x{4096}' .
-			'\x{40E3}' .
-			'\x{412F}' .
-			'\x{4202}' .
-			'\x{4227}' .
-			'\x{42A0}' .
-			'\x{4301}' .
-			'\x{4334}' .
-			'\x{4359}' .
-			'\x{43D5}' .
-			'\x{43D9}' .
-			'\x{440B}' .
-			'\x{446B}' .
-			'\x{452B}' .
-			'\x{455D}' .
-			'\x{4561}' .
-			'\x{456B}' .
-			'\x{45D7}' .
-			'\x{45F9}' .
-			'\x{4635}' .
-			'\x{46BE}' .
-			'\x{46C7}' .
-			'\x{4995}' .
-			'\x{49E6}' .
-			'\x{4A6E}' .
-			'\x{4A76}' .
-			'\x{4AB2}' .
-			'\x{4B33}' .
-			'\x{4BCE}' .
-			'\x{4CCE}' .
-			'\x{4CED}' .
-			'\x{4CF8}' .
-			'\x{4D56}' .
-			'\x{4E0D}' .
-			'\x{4E26}' .
-			'\x{4E32}' .
-			'\x{4E38}-\x{4E39}' .
-			'\x{4E3D}' .
-			'\x{4E41}' .
-			'\x{4E82}' .
-			'\x{4E86}' .
-			'\x{4EAE}' .
-			'\x{4EC0}' .
-			'\x{4ECC}' .
-			'\x{4EE4}' .
-			'\x{4F60}' .
-			'\x{4F80}' .
-			'\x{4F86}' .
-			'\x{4F8B}' .
-			'\x{4FAE}' .
-			'\x{4FBB}' .
-			'\x{4FBF}' .
-			'\x{5002}' .
-			'\x{502B}' .
-			'\x{507A}' .
-			'\x{5099}' .
-			'\x{50CF}' .
-			'\x{50DA}' .
-			'\x{50E7}' .
-			'\x{5140}' .
-			'\x{5145}' .
-			'\x{514D}' .
-			'\x{5154}' .
-			'\x{5164}' .
-			'\x{5167}-\x{5169}' .
-			'\x{516D}' .
-			'\x{5177}' .
-			'\x{5180}' .
-			'\x{518D}' .
-			'\x{5192}' .
-			'\x{5195}' .
-			'\x{5197}' .
-			'\x{51A4}' .
-			'\x{51AC}' .
-			'\x{51B5}' .
-			'\x{51B7}' .
-			'\x{51C9}' .
-			'\x{51CC}' .
-			'\x{51DC}' .
-			'\x{51DE}' .
-			'\x{51F5}' .
-			'\x{5203}' .
-			'\x{5207}' .
-			'\x{5217}' .
-			'\x{5229}' .
-			'\x{523A}-\x{523B}' .
-			'\x{5246}' .
-			'\x{5272}' .
-			'\x{5277}' .
-			'\x{5289}' .
-			'\x{529B}' .
-			'\x{52A3}' .
-			'\x{52B3}' .
-			'\x{52C7}' .
-			'\x{52C9}' .
-			'\x{52D2}' .
-			'\x{52DE}' .
-			'\x{52E4}' .
-			'\x{52F5}' .
-			'\x{52FA}' .
-			'\x{5305}-\x{5306}' .
-			'\x{5317}' .
-			'\x{533F}' .
-			'\x{5349}' .
-			'\x{5351}' .
-			'\x{535A}' .
-			'\x{5373}' .
-			'\x{5375}' .
-			'\x{537D}' .
-			'\x{537F}' .
-			'\x{53C3}' .
-			'\x{53CA}' .
-			'\x{53DF}' .
-			'\x{53E5}' .
-			'\x{53EB}' .
-			'\x{53F1}' .
-			'\x{5406}' .
-			'\x{540F}' .
-			'\x{541D}' .
-			'\x{5438}' .
-			'\x{5442}' .
-			'\x{5448}' .
-			'\x{5468}' .
-			'\x{549E}' .
-			'\x{54A2}' .
-			'\x{54BD}' .
-			'\x{54F6}' .
-			'\x{5510}' .
-			'\x{5553}' .
-			'\x{5555}' .
-			'\x{5563}' .
-			'\x{5584}' .
-			'\x{5587}' .
-			'\x{5599}' .
-			'\x{559D}' .
-			'\x{55AB}' .
-			'\x{55B3}' .
-			'\x{55C0}' .
-			'\x{55C2}' .
-			'\x{55E2}' .
-			'\x{5606}' .
-			'\x{5651}' .
-			'\x{5668}' .
-			'\x{5674}' .
-			'\x{56F9}' .
-			'\x{5716}-\x{5717}' .
-			'\x{578B}' .
-			'\x{57CE}' .
-			'\x{57F4}' .
-			'\x{580D}' .
-			'\x{5831}-\x{5832}' .
-			'\x{5840}' .
-			'\x{585A}' .
-			'\x{585E}' .
-			'\x{58A8}' .
-			'\x{58AC}' .
-			'\x{58B3}' .
-			'\x{58D8}' .
-			'\x{58DF}' .
-			'\x{58EE}' .
-			'\x{58F2}' .
-			'\x{58F7}' .
-			'\x{5906}' .
-			'\x{591A}' .
-			'\x{5922}' .
-			'\x{5944}' .
-			'\x{5948}' .
-			'\x{5951}' .
-			'\x{5954}' .
-			'\x{5962}' .
-			'\x{5973}' .
-			'\x{59D8}' .
-			'\x{59EC}' .
-			'\x{5A1B}' .
-			'\x{5A27}' .
-			'\x{5A62}' .
-			'\x{5A66}' .
-			'\x{5AB5}' .
-			'\x{5B08}' .
-			'\x{5B28}' .
-			'\x{5B3E}' .
-			'\x{5B85}' .
-			'\x{5BC3}' .
-			'\x{5BD8}' .
-			'\x{5BE7}' .
-			'\x{5BEE}' .
-			'\x{5BF3}' .
-			'\x{5BFF}' .
-			'\x{5C06}' .
-			'\x{5C22}' .
-			'\x{5C3F}' .
-			'\x{5C60}' .
-			'\x{5C62}' .
-			'\x{5C64}-\x{5C65}' .
-			'\x{5C6E}' .
-			'\x{5C8D}' .
-			'\x{5CC0}' .
-			'\x{5D19}' .
-			'\x{5D43}' .
-			'\x{5D50}' .
-			'\x{5D6B}' .
-			'\x{5D6E}' .
-			'\x{5D7C}' .
-			'\x{5DB2}' .
-			'\x{5DBA}' .
-			'\x{5DE1}-\x{5DE2}' .
-			'\x{5DFD}' .
-			'\x{5E28}' .
-			'\x{5E3D}' .
-			'\x{5E69}' .
-			'\x{5E74}' .
-			'\x{5EA6}' .
-			'\x{5EB0}' .
-			'\x{5EB3}' .
-			'\x{5EB6}' .
-			'\x{5EC9}-\x{5ECA}' .
-			'\x{5ED2}-\x{5ED3}' .
-			'\x{5ED9}' .
-			'\x{5EEC}' .
-			'\x{5EFE}' .
-			'\x{5F04}' .
-			'\x{5F22}' .
-			'\x{5F53}' .
-			'\x{5F62}' .
-			'\x{5F69}' .
-			'\x{5F6B}' .
-			'\x{5F8B}' .
-			'\x{5F9A}' .
-			'\x{5FA9}' .
-			'\x{5FAD}' .
-			'\x{5FCD}' .
-			'\x{5FD7}' .
-			'\x{5FF5}' .
-			'\x{5FF9}' .
-			'\x{6012}' .
-			'\x{601C}' .
-			'\x{6075}' .
-			'\x{6081}' .
-			'\x{6094}' .
-			'\x{60C7}' .
-			'\x{60D8}' .
-			'\x{60E1}' .
-			'\x{6108}' .
-			'\x{6144}' .
-			'\x{6148}' .
-			'\x{614C}' .
-			'\x{614E}' .
-			'\x{6160}' .
-			'\x{6168}' .
-			'\x{617A}' .
-			'\x{618E}' .
-			'\x{6190}' .
-			'\x{61A4}' .
-			'\x{61AF}' .
-			'\x{61B2}' .
-			'\x{61DE}' .
-			'\x{61F2}' .
-			'\x{61F6}' .
-			'\x{6200}' .
-			'\x{6210}' .
-			'\x{621B}' .
-			'\x{622E}' .
-			'\x{6234}' .
-			'\x{625D}' .
-			'\x{62B1}' .
-			'\x{62C9}' .
-			'\x{62CF}' .
-			'\x{62D3}-\x{62D4}' .
-			'\x{62FC}' .
-			'\x{62FE}' .
-			'\x{633D}' .
-			'\x{6350}' .
-			'\x{6368}' .
-			'\x{637B}' .
-			'\x{6383}' .
-			'\x{63A0}' .
-			'\x{63A9}' .
-			'\x{63C4}-\x{63C5}' .
-			'\x{63E4}' .
-			'\x{641C}' .
-			'\x{6422}' .
-			'\x{6452}' .
-			'\x{6469}' .
-			'\x{6477}' .
-			'\x{647E}' .
-			'\x{649A}' .
-			'\x{649D}' .
-			'\x{64C4}' .
-			'\x{654F}' .
-			'\x{6556}' .
-			'\x{656C}' .
-			'\x{6578}' .
-			'\x{6599}' .
-			'\x{65C5}' .
-			'\x{65E2}-\x{65E3}' .
-			'\x{6613}' .
-			'\x{6649}' .
-			'\x{6674}' .
-			'\x{6688}' .
-			'\x{6691}' .
-			'\x{669C}' .
-			'\x{66B4}' .
-			'\x{66C6}' .
-			'\x{66F4}' .
-			'\x{66F8}' .
-			'\x{6700}' .
-			'\x{6717}' .
-			'\x{671B}' .
-			'\x{6721}' .
-			'\x{674E}' .
-			'\x{6753}' .
-			'\x{6756}' .
-			'\x{675E}' .
-			'\x{677B}' .
-			'\x{6785}' .
-			'\x{6797}' .
-			'\x{67F3}' .
-			'\x{67FA}' .
-			'\x{6817}' .
-			'\x{681F}' .
-			'\x{6852}' .
-			'\x{6881}' .
-			'\x{6885}' .
-			'\x{688E}' .
-			'\x{68A8}' .
-			'\x{6914}' .
-			'\x{6942}' .
-			'\x{69A3}' .
-			'\x{69EA}' .
-			'\x{6A02}' .
-			'\x{6A13}' .
-			'\x{6AA8}' .
-			'\x{6AD3}' .
-			'\x{6ADB}' .
-			'\x{6B04}' .
-			'\x{6B21}' .
-			'\x{6B54}' .
-			'\x{6B72}' .
-			'\x{6B77}' .
-			'\x{6B79}' .
-			'\x{6B9F}' .
-			'\x{6BAE}' .
-			'\x{6BBA}-\x{6BBB}' .
-			'\x{6C4E}' .
-			'\x{6C67}' .
-			'\x{6C88}' .
-			'\x{6CBF}' .
-			'\x{6CCC}-\x{6CCD}' .
-			'\x{6CE5}' .
-			'\x{6D16}' .
-			'\x{6D1B}' .
-			'\x{6D1E}' .
-			'\x{6D34}' .
-			'\x{6D3E}' .
-			'\x{6D41}' .
-			'\x{6D69}-\x{6D6A}' .
-			'\x{6D77}-\x{6D78}' .
-			'\x{6D85}' .
-			'\x{6DCB}' .
-			'\x{6DDA}' .
-			'\x{6DEA}' .
-			'\x{6DF9}' .
-			'\x{6E1A}' .
-			'\x{6E2F}' .
-			'\x{6E6E}' .
-			'\x{6E9C}' .
-			'\x{6EBA}' .
-			'\x{6EC7}' .
-			'\x{6ECB}' .
-			'\x{6ED1}' .
-			'\x{6EDB}' .
-			'\x{6F0F}' .
-			'\x{6F22}-\x{6F23}' .
-			'\x{6F6E}' .
-			'\x{6FC6}' .
-			'\x{6FEB}' .
-			'\x{6FFE}' .
-			'\x{701B}' .
-			'\x{701E}' .
-			'\x{7039}' .
-			'\x{704A}' .
-			'\x{7070}' .
-			'\x{7077}' .
-			'\x{707D}' .
-			'\x{7099}' .
-			'\x{70AD}' .
-			'\x{70C8}' .
-			'\x{70D9}' .
-			'\x{7145}' .
-			'\x{7149}' .
-			'\x{716E}' .
-			'\x{719C}' .
-			'\x{71CE}' .
-			'\x{71D0}' .
-			'\x{7210}' .
-			'\x{721B}' .
-			'\x{7228}' .
-			'\x{722B}' .
-			'\x{7235}' .
-			'\x{7250}' .
-			'\x{7262}' .
-			'\x{7280}' .
-			'\x{7295}' .
-			'\x{72AF}' .
-			'\x{72C0}' .
-			'\x{72FC}' .
-			'\x{732A}' .
-			'\x{7375}' .
-			'\x{737A}' .
-			'\x{7387}' .
-			'\x{738B}' .
-			'\x{73A5}' .
-			'\x{73B2}' .
-			'\x{73DE}' .
-			'\x{7406}' .
-			'\x{7409}' .
-			'\x{7422}' .
-			'\x{7447}' .
-			'\x{745C}' .
-			'\x{7469}' .
-			'\x{7471}' .
-			'\x{7485}' .
-			'\x{7489}' .
-			'\x{7498}' .
-			'\x{74CA}' .
-			'\x{7506}' .
-			'\x{7524}' .
-			'\x{753B}' .
-			'\x{753E}' .
-			'\x{7559}' .
-			'\x{7565}' .
-			'\x{7570}' .
-			'\x{75E2}' .
-			'\x{7610}' .
-			'\x{761D}' .
-			'\x{761F}' .
-			'\x{7642}' .
-			'\x{7669}' .
-			'\x{76CA}' .
-			'\x{76DB}' .
-			'\x{76E7}' .
-			'\x{76F4}' .
-			'\x{7701}' .
-			'\x{771E}-\x{771F}' .
-			'\x{7740}' .
-			'\x{774A}' .
-			'\x{778B}' .
-			'\x{77A7}' .
-			'\x{784E}' .
-			'\x{786B}' .
-			'\x{788C}' .
-			'\x{7891}' .
-			'\x{78CA}' .
-			'\x{78CC}' .
-			'\x{78FB}' .
-			'\x{792A}' .
-			'\x{793C}' .
-			'\x{793E}' .
-			'\x{7948}-\x{7949}' .
-			'\x{7950}' .
-			'\x{7956}' .
-			'\x{795D}-\x{795E}' .
-			'\x{7965}' .
-			'\x{797F}' .
-			'\x{798D}-\x{798F}' .
-			'\x{79AE}' .
-			'\x{79CA}' .
-			'\x{79EB}' .
-			'\x{7A1C}' .
-			'\x{7A40}' .
-			'\x{7A4A}' .
-			'\x{7A4F}' .
-			'\x{7A81}' .
-			'\x{7AB1}' .
-			'\x{7ACB}' .
-			'\x{7AEE}' .
-			'\x{7B20}' .
-			'\x{7BC0}' .
-			'\x{7BC6}' .
-			'\x{7BC9}' .
-			'\x{7C3E}' .
-			'\x{7C60}' .
-			'\x{7C7B}' .
-			'\x{7C92}' .
-			'\x{7CBE}' .
-			'\x{7CD2}' .
-			'\x{7CD6}' .
-			'\x{7CE3}' .
-			'\x{7CE7}-\x{7CE8}' .
-			'\x{7D00}' .
-			'\x{7D10}' .
-			'\x{7D22}' .
-			'\x{7D2F}' .
-			'\x{7D5B}' .
-			'\x{7D63}' .
-			'\x{7DA0}' .
-			'\x{7DBE}' .
-			'\x{7DC7}' .
-			'\x{7DF4}' .
-			'\x{7E02}' .
-			'\x{7E09}' .
-			'\x{7E37}' .
-			'\x{7E41}' .
-			'\x{7E45}' .
-			'\x{7F3E}' .
-			'\x{7F72}' .
-			'\x{7F79}-\x{7F7A}' .
-			'\x{7F85}' .
-			'\x{7F95}' .
-			'\x{7F9A}' .
-			'\x{7FBD}' .
-			'\x{7FFA}' .
-			'\x{8001}' .
-			'\x{8005}' .
-			'\x{8046}' .
-			'\x{8060}' .
-			'\x{806F}-\x{8070}' .
-			'\x{807E}' .
-			'\x{808B}' .
-			'\x{80AD}' .
-			'\x{80B2}' .
-			'\x{8103}' .
-			'\x{813E}' .
-			'\x{81D8}' .
-			'\x{81E8}' .
-			'\x{81ED}' .
-			'\x{8201}' .
-			'\x{8204}' .
-			'\x{8218}' .
-			'\x{826F}' .
-			'\x{8279}' .
-			'\x{828B}' .
-			'\x{8291}' .
-			'\x{829D}' .
-			'\x{82B1}' .
-			'\x{82B3}' .
-			'\x{82BD}' .
-			'\x{82E5}-\x{82E6}' .
-			'\x{831D}' .
-			'\x{8323}' .
-			'\x{8336}' .
-			'\x{8352}-\x{8353}' .
-			'\x{8363}' .
-			'\x{83AD}' .
-			'\x{83BD}' .
-			'\x{83C9}-\x{83CA}' .
-			'\x{83CC}' .
-			'\x{83DC}' .
-			'\x{83E7}' .
-			'\x{83EF}' .
-			'\x{83F1}' .
-			'\x{843D}' .
-			'\x{8449}' .
-			'\x{8457}' .
-			'\x{84EE}' .
-			'\x{84F1}' .
-			'\x{84F3}' .
-			'\x{84FC}' .
-			'\x{8516}' .
-			'\x{8564}' .
-			'\x{85CD}' .
-			'\x{85FA}' .
-			'\x{8606}' .
-			'\x{8612}' .
-			'\x{862D}' .
-			'\x{863F}' .
-			'\x{8650}' .
-			'\x{865C}' .
-			'\x{8667}' .
-			'\x{8669}' .
-			'\x{8688}' .
-			'\x{86A9}' .
-			'\x{86E2}' .
-			'\x{870E}' .
-			'\x{8728}' .
-			'\x{876B}' .
-			'\x{8779}' .
-			'\x{8786}' .
-			'\x{87BA}' .
-			'\x{87E1}' .
-			'\x{8801}' .
-			'\x{881F}' .
-			'\x{884C}' .
-			'\x{8860}' .
-			'\x{8863}' .
-			'\x{88C2}' .
-			'\x{88CF}' .
-			'\x{88D7}' .
-			'\x{88DE}' .
-			'\x{88E1}' .
-			'\x{88F8}' .
-			'\x{88FA}' .
-			'\x{8910}' .
-			'\x{8941}' .
-			'\x{8964}' .
-			'\x{8986}' .
-			'\x{898B}' .
-			'\x{8996}' .
-			'\x{8AA0}' .
-			'\x{8AAA}' .
-			'\x{8ABF}' .
-			'\x{8ACB}' .
-			'\x{8AD2}' .
-			'\x{8AD6}' .
-			'\x{8AED}' .
-			'\x{8AF8}' .
-			'\x{8AFE}' .
-			'\x{8B01}' .
-			'\x{8B39}' .
-			'\x{8B58}' .
-			'\x{8B80}' .
-			'\x{8B8A}' .
-			'\x{8C48}' .
-			'\x{8C55}' .
-			'\x{8CAB}' .
-			'\x{8CC1}-\x{8CC2}' .
-			'\x{8CC8}' .
-			'\x{8CD3}' .
-			'\x{8D08}' .
-			'\x{8D1B}' .
-			'\x{8D77}' .
-			'\x{8DBC}' .
-			'\x{8DCB}' .
-			'\x{8DEF}-\x{8DF0}' .
-			'\x{8ECA}' .
-			'\x{8ED4}' .
-			'\x{8F26}' .
-			'\x{8F2A}' .
-			'\x{8F38}' .
-			'\x{8F3B}' .
-			'\x{8F62}' .
-			'\x{8F9E}' .
-			'\x{8FB0}' .
-			'\x{8FB6}' .
-			'\x{9023}' .
-			'\x{9038}' .
-			'\x{9072}' .
-			'\x{907C}' .
-			'\x{908F}' .
-			'\x{9094}' .
-			'\x{90CE}' .
-			'\x{90DE}' .
-			'\x{90F1}' .
-			'\x{90FD}' .
-			'\x{9111}' .
-			'\x{911B}' .
-			'\x{916A}' .
-			'\x{9199}' .
-			'\x{91B4}' .
-			'\x{91CC}' .
-			'\x{91CF}' .
-			'\x{91D1}' .
-			'\x{9234}' .
-			'\x{9238}' .
-			'\x{9276}' .
-			'\x{927C}' .
-			'\x{92D7}-\x{92D8}' .
-			'\x{9304}' .
-			'\x{934A}' .
-			'\x{93F9}' .
-			'\x{9415}' .
-			'\x{958B}' .
-			'\x{95AD}' .
-			'\x{95B7}' .
-			'\x{962E}' .
-			'\x{964B}' .
-			'\x{964D}' .
-			'\x{9675}' .
-			'\x{9678}' .
-			'\x{967C}' .
-			'\x{9686}' .
-			'\x{96A3}' .
-			'\x{96B7}-\x{96B8}' .
-			'\x{96C3}' .
-			'\x{96E2}-\x{96E3}' .
-			'\x{96F6}-\x{96F7}' .
-			'\x{9723}' .
-			'\x{9732}' .
-			'\x{9748}' .
-			'\x{9756}' .
-			'\x{97DB}' .
-			'\x{97E0}' .
-			'\x{97FF}' .
-			'\x{980B}' .
-			'\x{9818}' .
-			'\x{9829}' .
-			'\x{983B}' .
-			'\x{985E}' .
-			'\x{98E2}' .
-			'\x{98EF}' .
-			'\x{98FC}' .
-			'\x{9928}-\x{9929}' .
-			'\x{99A7}' .
-			'\x{99C2}' .
-			'\x{99F1}' .
-			'\x{99FE}' .
-			'\x{9A6A}' .
-			'\x{9B12}' .
-			'\x{9B6F}' .
-			'\x{9C40}' .
-			'\x{9C57}' .
-			'\x{9CFD}' .
-			'\x{9D67}' .
-			'\x{9DB4}' .
-			'\x{9DFA}' .
-			'\x{9E1E}' .
-			'\x{9E7F}' .
-			'\x{9E97}' .
-			'\x{9E9F}' .
-			'\x{9EBB}' .
-			'\x{9ECE}' .
-			'\x{9EF9}' .
-			'\x{9EFE}' .
-			'\x{9F05}' .
-			'\x{9F0F}' .
-			'\x{9F16}' .
-			'\x{9F3B}' .
-			'\x{9F43}' .
-			'\x{9F8D}-\x{9F8E}' .
-			'\x{9F9C}' .
-			'\x{20122}' .
-			'\x{2051C}' .
-			'\x{20525}' .
-			'\x{2054B}' .
-			'\x{2063A}' .
-			'\x{20804}' .
-			'\x{208DE}' .
-			'\x{20A2C}' .
-			'\x{20B63}' .
-			'\x{214E4}' .
-			'\x{216A8}' .
-			'\x{216EA}' .
-			'\x{219C8}' .
-			'\x{21B18}' .
-			'\x{21D0B}' .
-			'\x{21DE4}' .
-			'\x{21DE6}' .
-			'\x{22183}' .
-			'\x{2219F}' .
-			'\x{22331}' .
-			'\x{226D4}' .
-			'\x{22844}' .
-			'\x{2284A}' .
-			'\x{22B0C}' .
-			'\x{22BF1}' .
-			'\x{2300A}' .
-			'\x{232B8}' .
-			'\x{2335F}' .
-			'\x{23393}' .
-			'\x{2339C}' .
-			'\x{233C3}' .
-			'\x{233D5}' .
-			'\x{2346D}' .
-			'\x{236A3}' .
-			'\x{238A7}' .
-			'\x{23A8D}' .
-			'\x{23AFA}' .
-			'\x{23CBC}' .
-			'\x{23D1E}' .
-			'\x{23ED1}' .
-			'\x{23F5E}' .
-			'\x{23F8E}' .
-			'\x{24263}' .
-			'\x{242EE}' .
-			'\x{243AB}' .
-			'\x{24608}' .
-			'\x{24735}' .
-			'\x{24814}' .
-			'\x{24C36}' .
-			'\x{24C92}' .
-			'\x{24FA1}' .
-			'\x{24FB8}' .
-			'\x{25044}' .
-			'\x{250F2}-\x{250F3}' .
-			'\x{25119}' .
-			'\x{25133}' .
-			'\x{25249}' .
-			'\x{2541D}' .
-			'\x{25626}' .
-			'\x{2569A}' .
-			'\x{256C5}' .
-			'\x{2597C}' .
-			'\x{25AA7}' .
-			'\x{25BAB}' .
-			'\x{25C80}' .
-			'\x{25CD0}' .
-			'\x{25F86}' .
-			'\x{261DA}' .
-			'\x{26228}' .
-			'\x{26247}' .
-			'\x{262D9}' .
-			'\x{2633E}' .
-			'\x{264DA}' .
-			'\x{26523}' .
-			'\x{265A8}' .
-			'\x{267A7}' .
-			'\x{267B5}' .
-			'\x{26B3C}' .
-			'\x{26C36}' .
-			'\x{26CD5}' .
-			'\x{26D6B}' .
-			'\x{26F2C}' .
-			'\x{26FB1}' .
-			'\x{270D2}' .
-			'\x{273CA}' .
-			'\x{27667}' .
-			'\x{278AE}' .
-			'\x{27966}' .
-			'\x{27CA8}' .
-			'\x{27ED3}' .
-			'\x{27F2F}' .
-			'\x{285D2}' .
-			'\x{285ED}' .
-			'\x{2872E}' .
-			'\x{28BFA}' .
-			'\x{28D77}' .
-			'\x{29145}' .
-			'\x{291DF}' .
-			'\x{2921A}' .
-			'\x{2940A}' .
-			'\x{29496}' .
-			'\x{295B6}' .
-			'\x{29B30}' .
-			'\x{2A0CE}' .
-			'\x{2A105}' .
-			'\x{2A20E}' .
-			'\x{2A291}' .
-			'\x{2A392}' .
-			'\x{2A600}',
-		'\x{180D}' =>
-			'\x{1828}' .
-			'\x{182C}-\x{182D}' .
-			'\x{1873}-\x{1874}' .
-			'\x{1887}',
-		'\x{180C}' =>
-			'\x{1820}' .
-			'\x{1825}-\x{1826}' .
-			'\x{1828}' .
-			'\x{182C}-\x{182D}' .
-			'\x{1830}' .
-			'\x{1836}' .
-			'\x{1847}' .
-			'\x{185E}' .
-			'\x{1868}' .
-			'\x{1873}-\x{1874}' .
-			'\x{1887}',
-		'\x{180B}' =>
-			'\x{1820}-\x{1826}' .
-			'\x{1828}' .
-			'\x{182A}' .
-			'\x{182C}-\x{182D}' .
-			'\x{1830}' .
-			'\x{1832}-\x{1833}' .
-			'\x{1835}-\x{1836}' .
-			'\x{1838}' .
-			'\x{1844}-\x{1849}' .
-			'\x{184D}-\x{184E}' .
-			'\x{185D}-\x{185E}' .
-			'\x{1860}' .
-			'\x{1863}' .
-			'\x{1868}-\x{1869}' .
-			'\x{186F}' .
-			'\x{1873}-\x{1874}' .
-			'\x{1876}' .
-			'\x{1880}-\x{1881}' .
-			'\x{1887}-\x{1888}' .
-			'\x{188A}',
-	);
+	return [
+		'\\x{FE0E}\\x{FE0F}' =>
+			'\\x{0023}' .
+			'\\x{002A}' .
+			'\\x{0030}-\\x{0039}' .
+			'\\x{00A9}' .
+			'\\x{00AE}' .
+			'\\x{203C}' .
+			'\\x{2049}' .
+			'\\x{2122}' .
+			'\\x{2139}' .
+			'\\x{2194}-\\x{2199}' .
+			'\\x{21A9}-\\x{21AA}' .
+			'\\x{231A}-\\x{231B}' .
+			'\\x{2328}' .
+			'\\x{23CF}' .
+			'\\x{23E9}-\\x{23F3}' .
+			'\\x{23F8}-\\x{23FA}' .
+			'\\x{24C2}' .
+			'\\x{25AA}-\\x{25AB}' .
+			'\\x{25B6}' .
+			'\\x{25C0}' .
+			'\\x{25FB}-\\x{25FE}' .
+			'\\x{2600}-\\x{2604}' .
+			'\\x{260E}' .
+			'\\x{2611}' .
+			'\\x{2614}-\\x{2615}' .
+			'\\x{2618}' .
+			'\\x{261D}' .
+			'\\x{2620}' .
+			'\\x{2622}-\\x{2623}' .
+			'\\x{2626}' .
+			'\\x{262A}' .
+			'\\x{262E}-\\x{262F}' .
+			'\\x{2638}-\\x{263A}' .
+			'\\x{2640}' .
+			'\\x{2642}' .
+			'\\x{2648}-\\x{2653}' .
+			'\\x{265F}-\\x{2660}' .
+			'\\x{2663}' .
+			'\\x{2665}-\\x{2666}' .
+			'\\x{2668}' .
+			'\\x{267B}' .
+			'\\x{267E}-\\x{267F}' .
+			'\\x{2692}-\\x{2697}' .
+			'\\x{2699}' .
+			'\\x{269B}-\\x{269C}' .
+			'\\x{26A0}-\\x{26A1}' .
+			'\\x{26A7}' .
+			'\\x{26AA}-\\x{26AB}' .
+			'\\x{26B0}-\\x{26B1}' .
+			'\\x{26BD}-\\x{26BE}' .
+			'\\x{26C4}-\\x{26C5}' .
+			'\\x{26C8}' .
+			'\\x{26CE}-\\x{26CF}' .
+			'\\x{26D1}' .
+			'\\x{26D3}-\\x{26D4}' .
+			'\\x{26E9}-\\x{26EA}' .
+			'\\x{26F0}-\\x{26F5}' .
+			'\\x{26F7}-\\x{26FA}' .
+			'\\x{26FD}' .
+			'\\x{2702}' .
+			'\\x{2705}' .
+			'\\x{2708}-\\x{270D}' .
+			'\\x{270F}' .
+			'\\x{2712}' .
+			'\\x{2714}' .
+			'\\x{2716}' .
+			'\\x{271D}' .
+			'\\x{2721}' .
+			'\\x{2728}' .
+			'\\x{2733}-\\x{2734}' .
+			'\\x{2744}' .
+			'\\x{2747}' .
+			'\\x{274C}' .
+			'\\x{274E}' .
+			'\\x{2753}-\\x{2755}' .
+			'\\x{2757}' .
+			'\\x{2763}-\\x{2764}' .
+			'\\x{2795}-\\x{2797}' .
+			'\\x{27A1}' .
+			'\\x{27B0}' .
+			'\\x{27BF}' .
+			'\\x{2934}-\\x{2935}' .
+			'\\x{2B05}-\\x{2B07}' .
+			'\\x{2B1B}-\\x{2B1C}' .
+			'\\x{2B50}' .
+			'\\x{2B55}' .
+			'\\x{3030}' .
+			'\\x{303D}' .
+			'\\x{3297}' .
+			'\\x{3299}' .
+			'\\x{1F004}' .
+			'\\x{1F170}-\\x{1F171}' .
+			'\\x{1F17E}-\\x{1F17F}' .
+			'\\x{1F202}' .
+			'\\x{1F21A}' .
+			'\\x{1F22F}' .
+			'\\x{1F237}' .
+			'\\x{1F30D}-\\x{1F30F}' .
+			'\\x{1F315}' .
+			'\\x{1F31C}' .
+			'\\x{1F321}' .
+			'\\x{1F324}-\\x{1F32C}' .
+			'\\x{1F336}' .
+			'\\x{1F378}' .
+			'\\x{1F37D}' .
+			'\\x{1F393}' .
+			'\\x{1F396}-\\x{1F397}' .
+			'\\x{1F399}-\\x{1F39B}' .
+			'\\x{1F39E}-\\x{1F39F}' .
+			'\\x{1F3A7}' .
+			'\\x{1F3AC}-\\x{1F3AE}' .
+			'\\x{1F3C2}' .
+			'\\x{1F3C4}' .
+			'\\x{1F3C6}' .
+			'\\x{1F3CA}-\\x{1F3CE}' .
+			'\\x{1F3D4}-\\x{1F3E0}' .
+			'\\x{1F3ED}' .
+			'\\x{1F3F3}' .
+			'\\x{1F3F5}' .
+			'\\x{1F3F7}' .
+			'\\x{1F408}' .
+			'\\x{1F415}' .
+			'\\x{1F41F}' .
+			'\\x{1F426}' .
+			'\\x{1F43F}' .
+			'\\x{1F441}-\\x{1F442}' .
+			'\\x{1F446}-\\x{1F449}' .
+			'\\x{1F44D}-\\x{1F44E}' .
+			'\\x{1F453}' .
+			'\\x{1F46A}' .
+			'\\x{1F47D}' .
+			'\\x{1F4A3}' .
+			'\\x{1F4B0}' .
+			'\\x{1F4B3}' .
+			'\\x{1F4BB}' .
+			'\\x{1F4BF}' .
+			'\\x{1F4CB}' .
+			'\\x{1F4DA}' .
+			'\\x{1F4DF}' .
+			'\\x{1F4E4}-\\x{1F4E6}' .
+			'\\x{1F4EA}-\\x{1F4ED}' .
+			'\\x{1F4F7}' .
+			'\\x{1F4F9}-\\x{1F4FB}' .
+			'\\x{1F4FD}' .
+			'\\x{1F508}' .
+			'\\x{1F50D}' .
+			'\\x{1F512}-\\x{1F513}' .
+			'\\x{1F549}-\\x{1F54A}' .
+			'\\x{1F550}-\\x{1F567}' .
+			'\\x{1F56F}-\\x{1F570}' .
+			'\\x{1F573}-\\x{1F579}' .
+			'\\x{1F587}' .
+			'\\x{1F58A}-\\x{1F58D}' .
+			'\\x{1F590}' .
+			'\\x{1F5A5}' .
+			'\\x{1F5A8}' .
+			'\\x{1F5B1}-\\x{1F5B2}' .
+			'\\x{1F5BC}' .
+			'\\x{1F5C2}-\\x{1F5C4}' .
+			'\\x{1F5D1}-\\x{1F5D3}' .
+			'\\x{1F5DC}-\\x{1F5DE}' .
+			'\\x{1F5E1}' .
+			'\\x{1F5E3}' .
+			'\\x{1F5E8}' .
+			'\\x{1F5EF}' .
+			'\\x{1F5F3}' .
+			'\\x{1F5FA}' .
+			'\\x{1F610}' .
+			'\\x{1F687}' .
+			'\\x{1F68D}' .
+			'\\x{1F691}' .
+			'\\x{1F694}' .
+			'\\x{1F698}' .
+			'\\x{1F6AD}' .
+			'\\x{1F6B2}' .
+			'\\x{1F6B9}-\\x{1F6BA}' .
+			'\\x{1F6BC}' .
+			'\\x{1F6CB}' .
+			'\\x{1F6CD}-\\x{1F6CF}' .
+			'\\x{1F6E0}-\\x{1F6E5}' .
+			'\\x{1F6E9}' .
+			'\\x{1F6F0}' .
+			'\\x{1F6F3}',
+		'\\x{FE02}' =>
+			'\\x{13117}' .
+			'\\x{13139}' .
+			'\\x{13183}' .
+			'\\x{131A0}' .
+			'\\x{131BA}' .
+			'\\x{131EE}' .
+			'\\x{13216}' .
+			'\\x{1327B}' .
+			'\\x{132A4}' .
+			'\\x{132E7}' .
+			'\\x{132E9}' .
+			'\\x{132F8}' .
+			'\\x{132FD}' .
+			'\\x{13302}-\\x{13303}' .
+			'\\x{13310}-\\x{13314}' .
+			'\\x{1331C}' .
+			'\\x{13321}' .
+			'\\x{13331}' .
+			'\\x{1334A}' .
+			'\\x{13361}' .
+			'\\x{13373}' .
+			'\\x{1337D}' .
+			'\\x{13385}' .
+			'\\x{133AF}-\\x{133B0}' .
+			'\\x{133BF}' .
+			'\\x{133DD}' .
+			'\\x{13419}' .
+			'\\x{1342C}' .
+			'\\x{1342E}' .
+			'\\x{537F}' .
+			'\\x{5BE7}' .
+			'\\x{618E}' .
+			'\\x{61F2}' .
+			'\\x{6717}' .
+			'\\x{6A02}' .
+			'\\x{6BBA}' .
+			'\\x{6D41}' .
+			'\\x{7DF4}' .
+			'\\x{8005}' .
+			'\\x{980B}' .
+			'\\x{9F9C}',
+		'\\x{FE01}' =>
+			'\\x{1D49C}' .
+			'\\x{212C}' .
+			'\\x{1D49E}-\\x{1D49F}' .
+			'\\x{2130}-\\x{2131}' .
+			'\\x{1D4A2}' .
+			'\\x{210B}' .
+			'\\x{2110}' .
+			'\\x{1D4A5}-\\x{1D4A6}' .
+			'\\x{2112}' .
+			'\\x{2133}' .
+			'\\x{1D4A9}-\\x{1D4AC}' .
+			'\\x{211B}' .
+			'\\x{1D4AE}-\\x{1D4B5}' .
+			'\\x{3001}-\\x{3002}' .
+			'\\x{FF01}' .
+			'\\x{FF0C}' .
+			'\\x{FF0E}' .
+			'\\x{FF1A}-\\x{FF1B}' .
+			'\\x{FF1F}' .
+			'\\x{13093}' .
+			'\\x{130A9}' .
+			'\\x{13187}' .
+			'\\x{131B1}' .
+			'\\x{131EE}' .
+			'\\x{131F8}-\\x{131FA}' .
+			'\\x{13257}' .
+			'\\x{1327F}' .
+			'\\x{132A4}' .
+			'\\x{13308}' .
+			'\\x{13312}-\\x{13314}' .
+			'\\x{1331B}' .
+			'\\x{13321}-\\x{13322}' .
+			'\\x{13331}' .
+			'\\x{13419}' .
+			'\\x{3B9D}' .
+			'\\x{3EB8}' .
+			'\\x{4039}' .
+			'\\x{4FAE}' .
+			'\\x{50E7}' .
+			'\\x{514D}' .
+			'\\x{51B5}' .
+			'\\x{5207}' .
+			'\\x{52C7}' .
+			'\\x{52C9}' .
+			'\\x{52E4}' .
+			'\\x{52FA}' .
+			'\\x{5317}' .
+			'\\x{5351}' .
+			'\\x{537F}' .
+			'\\x{5584}' .
+			'\\x{5599}' .
+			'\\x{559D}' .
+			'\\x{5606}' .
+			'\\x{585A}' .
+			'\\x{5B3E}' .
+			'\\x{5BE7}' .
+			'\\x{5C6E}' .
+			'\\x{5ECA}' .
+			'\\x{5F22}' .
+			'\\x{6094}' .
+			'\\x{614C}' .
+			'\\x{614E}' .
+			'\\x{618E}' .
+			'\\x{61F2}' .
+			'\\x{61F6}' .
+			'\\x{654F}' .
+			'\\x{6674}' .
+			'\\x{6691}' .
+			'\\x{6717}' .
+			'\\x{671B}' .
+			'\\x{6885}' .
+			'\\x{6A02}' .
+			'\\x{6BBA}' .
+			'\\x{6D41}' .
+			'\\x{6D77}' .
+			'\\x{6ECB}' .
+			'\\x{6F22}' .
+			'\\x{701E}' .
+			'\\x{716E}' .
+			'\\x{7235}' .
+			'\\x{732A}' .
+			'\\x{7387}' .
+			'\\x{7471}' .
+			'\\x{7570}' .
+			'\\x{76CA}' .
+			'\\x{76F4}' .
+			'\\x{771F}' .
+			'\\x{774A}' .
+			'\\x{788C}' .
+			'\\x{78CC}' .
+			'\\x{7956}' .
+			'\\x{798F}' .
+			'\\x{7A40}' .
+			'\\x{7BC0}' .
+			'\\x{7DF4}' .
+			'\\x{8005}' .
+			'\\x{8201}' .
+			'\\x{8279}' .
+			'\\x{82E5}' .
+			'\\x{8457}' .
+			'\\x{865C}' .
+			'\\x{8779}' .
+			'\\x{8996}' .
+			'\\x{8AAA}' .
+			'\\x{8AED}' .
+			'\\x{8AF8}' .
+			'\\x{8AFE}' .
+			'\\x{8B01}' .
+			'\\x{8B39}' .
+			'\\x{8B8A}' .
+			'\\x{8D08}' .
+			'\\x{8F38}' .
+			'\\x{9038}' .
+			'\\x{96E3}' .
+			'\\x{9756}' .
+			'\\x{97FF}' .
+			'\\x{980B}' .
+			'\\x{983B}' .
+			'\\x{9B12}' .
+			'\\x{9F9C}' .
+			'\\x{22331}' .
+			'\\x{25AA7}',
+		'\\x{FE00}' =>
+			'\\x{0030}' .
+			'\\x{2205}' .
+			'\\x{2229}-\\x{222A}' .
+			'\\x{2268}-\\x{2269}' .
+			'\\x{2272}-\\x{2273}' .
+			'\\x{228A}-\\x{228B}' .
+			'\\x{2293}-\\x{2295}' .
+			'\\x{2297}' .
+			'\\x{229C}' .
+			'\\x{22DA}-\\x{22DB}' .
+			'\\x{2A3C}-\\x{2A3D}' .
+			'\\x{2A9D}-\\x{2A9E}' .
+			'\\x{2AAC}-\\x{2AAD}' .
+			'\\x{2ACB}-\\x{2ACC}' .
+			'\\x{FF10}' .
+			'\\x{1D49C}' .
+			'\\x{212C}' .
+			'\\x{1D49E}-\\x{1D49F}' .
+			'\\x{2130}-\\x{2131}' .
+			'\\x{1D4A2}' .
+			'\\x{210B}' .
+			'\\x{2110}' .
+			'\\x{1D4A5}-\\x{1D4A6}' .
+			'\\x{2112}' .
+			'\\x{2133}' .
+			'\\x{1D4A9}-\\x{1D4AC}' .
+			'\\x{211B}' .
+			'\\x{1D4AE}-\\x{1D4B5}' .
+			'\\x{3001}-\\x{3002}' .
+			'\\x{FF01}' .
+			'\\x{FF0C}' .
+			'\\x{FF0E}' .
+			'\\x{FF1A}-\\x{FF1B}' .
+			'\\x{FF1F}' .
+			'\\x{1000}' .
+			'\\x{1002}' .
+			'\\x{1004}' .
+			'\\x{1010}-\\x{1011}' .
+			'\\x{1015}' .
+			'\\x{1019}-\\x{101A}' .
+			'\\x{101C}-\\x{101D}' .
+			'\\x{1022}' .
+			'\\x{1031}' .
+			'\\x{1075}' .
+			'\\x{1078}' .
+			'\\x{107A}' .
+			'\\x{1080}' .
+			'\\x{AA60}-\\x{AA66}' .
+			'\\x{AA6B}-\\x{AA6C}' .
+			'\\x{AA6F}' .
+			'\\x{AA7A}' .
+			'\\x{A856}' .
+			'\\x{A85C}' .
+			'\\x{A85E}-\\x{A860}' .
+			'\\x{A868}' .
+			'\\x{10AC5}-\\x{10AC6}' .
+			'\\x{10AD6}-\\x{10AD7}' .
+			'\\x{10AE1}' .
+			'\\x{13091}-\\x{13092}' .
+			'\\x{1310F}' .
+			'\\x{1311C}' .
+			'\\x{13121}' .
+			'\\x{13127}' .
+			'\\x{13139}' .
+			'\\x{131A0}' .
+			'\\x{131B1}' .
+			'\\x{131B8}-\\x{131B9}' .
+			'\\x{131CB}' .
+			'\\x{131F9}-\\x{131FA}' .
+			'\\x{1327F}' .
+			'\\x{13285}' .
+			'\\x{1328C}' .
+			'\\x{132AA}' .
+			'\\x{132CB}' .
+			'\\x{132DC}' .
+			'\\x{132E7}' .
+			'\\x{13307}' .
+			'\\x{1331B}' .
+			'\\x{13322}' .
+			'\\x{1333B}-\\x{1333C}' .
+			'\\x{13377}-\\x{13378}' .
+			'\\x{13399}-\\x{1339A}' .
+			'\\x{133D3}' .
+			'\\x{133F2}' .
+			'\\x{133F5}-\\x{133F6}' .
+			'\\x{13403}' .
+			'\\x{13416}' .
+			'\\x{13419}-\\x{1341A}' .
+			'\\x{13423}' .
+			'\\x{13443}-\\x{13446}' .
+			'\\x{349E}' .
+			'\\x{34B9}' .
+			'\\x{34BB}' .
+			'\\x{34DF}' .
+			'\\x{3515}' .
+			'\\x{36EE}' .
+			'\\x{36FC}' .
+			'\\x{3781}' .
+			'\\x{382F}' .
+			'\\x{3862}' .
+			'\\x{387C}' .
+			'\\x{38C7}' .
+			'\\x{38E3}' .
+			'\\x{391C}' .
+			'\\x{393A}' .
+			'\\x{3A2E}' .
+			'\\x{3A6C}' .
+			'\\x{3AE4}' .
+			'\\x{3B08}' .
+			'\\x{3B19}' .
+			'\\x{3B49}' .
+			'\\x{3B9D}' .
+			'\\x{3C18}' .
+			'\\x{3C4E}' .
+			'\\x{3D33}' .
+			'\\x{3D96}' .
+			'\\x{3EAC}' .
+			'\\x{3EB8}' .
+			'\\x{3F1B}' .
+			'\\x{3FFC}' .
+			'\\x{4008}' .
+			'\\x{4018}' .
+			'\\x{4039}' .
+			'\\x{4046}' .
+			'\\x{4096}' .
+			'\\x{40E3}' .
+			'\\x{412F}' .
+			'\\x{4202}' .
+			'\\x{4227}' .
+			'\\x{42A0}' .
+			'\\x{4301}' .
+			'\\x{4334}' .
+			'\\x{4359}' .
+			'\\x{43D5}' .
+			'\\x{43D9}' .
+			'\\x{440B}' .
+			'\\x{446B}' .
+			'\\x{452B}' .
+			'\\x{455D}' .
+			'\\x{4561}' .
+			'\\x{456B}' .
+			'\\x{45D7}' .
+			'\\x{45F9}' .
+			'\\x{4635}' .
+			'\\x{46BE}' .
+			'\\x{46C7}' .
+			'\\x{4995}' .
+			'\\x{49E6}' .
+			'\\x{4A6E}' .
+			'\\x{4A76}' .
+			'\\x{4AB2}' .
+			'\\x{4B33}' .
+			'\\x{4BCE}' .
+			'\\x{4CCE}' .
+			'\\x{4CED}' .
+			'\\x{4CF8}' .
+			'\\x{4D56}' .
+			'\\x{4E0D}' .
+			'\\x{4E26}' .
+			'\\x{4E32}' .
+			'\\x{4E38}-\\x{4E39}' .
+			'\\x{4E3D}' .
+			'\\x{4E41}' .
+			'\\x{4E82}' .
+			'\\x{4E86}' .
+			'\\x{4EAE}' .
+			'\\x{4EC0}' .
+			'\\x{4ECC}' .
+			'\\x{4EE4}' .
+			'\\x{4F60}' .
+			'\\x{4F80}' .
+			'\\x{4F86}' .
+			'\\x{4F8B}' .
+			'\\x{4FAE}' .
+			'\\x{4FBB}' .
+			'\\x{4FBF}' .
+			'\\x{5002}' .
+			'\\x{502B}' .
+			'\\x{507A}' .
+			'\\x{5099}' .
+			'\\x{50CF}' .
+			'\\x{50DA}' .
+			'\\x{50E7}' .
+			'\\x{5140}' .
+			'\\x{5145}' .
+			'\\x{514D}' .
+			'\\x{5154}' .
+			'\\x{5164}' .
+			'\\x{5167}-\\x{5169}' .
+			'\\x{516D}' .
+			'\\x{5177}' .
+			'\\x{5180}' .
+			'\\x{518D}' .
+			'\\x{5192}' .
+			'\\x{5195}' .
+			'\\x{5197}' .
+			'\\x{51A4}' .
+			'\\x{51AC}' .
+			'\\x{51B5}' .
+			'\\x{51B7}' .
+			'\\x{51C9}' .
+			'\\x{51CC}' .
+			'\\x{51DC}' .
+			'\\x{51DE}' .
+			'\\x{51F5}' .
+			'\\x{5203}' .
+			'\\x{5207}' .
+			'\\x{5217}' .
+			'\\x{5229}' .
+			'\\x{523A}-\\x{523B}' .
+			'\\x{5246}' .
+			'\\x{5272}' .
+			'\\x{5277}' .
+			'\\x{5289}' .
+			'\\x{529B}' .
+			'\\x{52A3}' .
+			'\\x{52B3}' .
+			'\\x{52C7}' .
+			'\\x{52C9}' .
+			'\\x{52D2}' .
+			'\\x{52DE}' .
+			'\\x{52E4}' .
+			'\\x{52F5}' .
+			'\\x{52FA}' .
+			'\\x{5305}-\\x{5306}' .
+			'\\x{5317}' .
+			'\\x{533F}' .
+			'\\x{5349}' .
+			'\\x{5351}' .
+			'\\x{535A}' .
+			'\\x{5373}' .
+			'\\x{5375}' .
+			'\\x{537D}' .
+			'\\x{537F}' .
+			'\\x{53C3}' .
+			'\\x{53CA}' .
+			'\\x{53DF}' .
+			'\\x{53E5}' .
+			'\\x{53EB}' .
+			'\\x{53F1}' .
+			'\\x{5406}' .
+			'\\x{540F}' .
+			'\\x{541D}' .
+			'\\x{5438}' .
+			'\\x{5442}' .
+			'\\x{5448}' .
+			'\\x{5468}' .
+			'\\x{549E}' .
+			'\\x{54A2}' .
+			'\\x{54BD}' .
+			'\\x{54F6}' .
+			'\\x{5510}' .
+			'\\x{5553}' .
+			'\\x{5555}' .
+			'\\x{5563}' .
+			'\\x{5584}' .
+			'\\x{5587}' .
+			'\\x{5599}' .
+			'\\x{559D}' .
+			'\\x{55AB}' .
+			'\\x{55B3}' .
+			'\\x{55C0}' .
+			'\\x{55C2}' .
+			'\\x{55E2}' .
+			'\\x{5606}' .
+			'\\x{5651}' .
+			'\\x{5668}' .
+			'\\x{5674}' .
+			'\\x{56F9}' .
+			'\\x{5716}-\\x{5717}' .
+			'\\x{578B}' .
+			'\\x{57CE}' .
+			'\\x{57F4}' .
+			'\\x{580D}' .
+			'\\x{5831}-\\x{5832}' .
+			'\\x{5840}' .
+			'\\x{585A}' .
+			'\\x{585E}' .
+			'\\x{58A8}' .
+			'\\x{58AC}' .
+			'\\x{58B3}' .
+			'\\x{58D8}' .
+			'\\x{58DF}' .
+			'\\x{58EE}' .
+			'\\x{58F2}' .
+			'\\x{58F7}' .
+			'\\x{5906}' .
+			'\\x{591A}' .
+			'\\x{5922}' .
+			'\\x{5944}' .
+			'\\x{5948}' .
+			'\\x{5951}' .
+			'\\x{5954}' .
+			'\\x{5962}' .
+			'\\x{5973}' .
+			'\\x{59D8}' .
+			'\\x{59EC}' .
+			'\\x{5A1B}' .
+			'\\x{5A27}' .
+			'\\x{5A62}' .
+			'\\x{5A66}' .
+			'\\x{5AB5}' .
+			'\\x{5B08}' .
+			'\\x{5B28}' .
+			'\\x{5B3E}' .
+			'\\x{5B85}' .
+			'\\x{5BC3}' .
+			'\\x{5BD8}' .
+			'\\x{5BE7}' .
+			'\\x{5BEE}' .
+			'\\x{5BF3}' .
+			'\\x{5BFF}' .
+			'\\x{5C06}' .
+			'\\x{5C22}' .
+			'\\x{5C3F}' .
+			'\\x{5C60}' .
+			'\\x{5C62}' .
+			'\\x{5C64}-\\x{5C65}' .
+			'\\x{5C6E}' .
+			'\\x{5C8D}' .
+			'\\x{5CC0}' .
+			'\\x{5D19}' .
+			'\\x{5D43}' .
+			'\\x{5D50}' .
+			'\\x{5D6B}' .
+			'\\x{5D6E}' .
+			'\\x{5D7C}' .
+			'\\x{5DB2}' .
+			'\\x{5DBA}' .
+			'\\x{5DE1}-\\x{5DE2}' .
+			'\\x{5DFD}' .
+			'\\x{5E28}' .
+			'\\x{5E3D}' .
+			'\\x{5E69}' .
+			'\\x{5E74}' .
+			'\\x{5EA6}' .
+			'\\x{5EB0}' .
+			'\\x{5EB3}' .
+			'\\x{5EB6}' .
+			'\\x{5EC9}-\\x{5ECA}' .
+			'\\x{5ED2}-\\x{5ED3}' .
+			'\\x{5ED9}' .
+			'\\x{5EEC}' .
+			'\\x{5EFE}' .
+			'\\x{5F04}' .
+			'\\x{5F22}' .
+			'\\x{5F53}' .
+			'\\x{5F62}' .
+			'\\x{5F69}' .
+			'\\x{5F6B}' .
+			'\\x{5F8B}' .
+			'\\x{5F9A}' .
+			'\\x{5FA9}' .
+			'\\x{5FAD}' .
+			'\\x{5FCD}' .
+			'\\x{5FD7}' .
+			'\\x{5FF5}' .
+			'\\x{5FF9}' .
+			'\\x{6012}' .
+			'\\x{601C}' .
+			'\\x{6075}' .
+			'\\x{6081}' .
+			'\\x{6094}' .
+			'\\x{60C7}' .
+			'\\x{60D8}' .
+			'\\x{60E1}' .
+			'\\x{6108}' .
+			'\\x{6144}' .
+			'\\x{6148}' .
+			'\\x{614C}' .
+			'\\x{614E}' .
+			'\\x{6160}' .
+			'\\x{6168}' .
+			'\\x{617A}' .
+			'\\x{618E}' .
+			'\\x{6190}' .
+			'\\x{61A4}' .
+			'\\x{61AF}' .
+			'\\x{61B2}' .
+			'\\x{61DE}' .
+			'\\x{61F2}' .
+			'\\x{61F6}' .
+			'\\x{6200}' .
+			'\\x{6210}' .
+			'\\x{621B}' .
+			'\\x{622E}' .
+			'\\x{6234}' .
+			'\\x{625D}' .
+			'\\x{62B1}' .
+			'\\x{62C9}' .
+			'\\x{62CF}' .
+			'\\x{62D3}-\\x{62D4}' .
+			'\\x{62FC}' .
+			'\\x{62FE}' .
+			'\\x{633D}' .
+			'\\x{6350}' .
+			'\\x{6368}' .
+			'\\x{637B}' .
+			'\\x{6383}' .
+			'\\x{63A0}' .
+			'\\x{63A9}' .
+			'\\x{63C4}-\\x{63C5}' .
+			'\\x{63E4}' .
+			'\\x{641C}' .
+			'\\x{6422}' .
+			'\\x{6452}' .
+			'\\x{6469}' .
+			'\\x{6477}' .
+			'\\x{647E}' .
+			'\\x{649A}' .
+			'\\x{649D}' .
+			'\\x{64C4}' .
+			'\\x{654F}' .
+			'\\x{6556}' .
+			'\\x{656C}' .
+			'\\x{6578}' .
+			'\\x{6599}' .
+			'\\x{65C5}' .
+			'\\x{65E2}-\\x{65E3}' .
+			'\\x{6613}' .
+			'\\x{6649}' .
+			'\\x{6674}' .
+			'\\x{6688}' .
+			'\\x{6691}' .
+			'\\x{669C}' .
+			'\\x{66B4}' .
+			'\\x{66C6}' .
+			'\\x{66F4}' .
+			'\\x{66F8}' .
+			'\\x{6700}' .
+			'\\x{6717}' .
+			'\\x{671B}' .
+			'\\x{6721}' .
+			'\\x{674E}' .
+			'\\x{6753}' .
+			'\\x{6756}' .
+			'\\x{675E}' .
+			'\\x{677B}' .
+			'\\x{6785}' .
+			'\\x{6797}' .
+			'\\x{67F3}' .
+			'\\x{67FA}' .
+			'\\x{6817}' .
+			'\\x{681F}' .
+			'\\x{6852}' .
+			'\\x{6881}' .
+			'\\x{6885}' .
+			'\\x{688E}' .
+			'\\x{68A8}' .
+			'\\x{6914}' .
+			'\\x{6942}' .
+			'\\x{69A3}' .
+			'\\x{69EA}' .
+			'\\x{6A02}' .
+			'\\x{6A13}' .
+			'\\x{6AA8}' .
+			'\\x{6AD3}' .
+			'\\x{6ADB}' .
+			'\\x{6B04}' .
+			'\\x{6B21}' .
+			'\\x{6B54}' .
+			'\\x{6B72}' .
+			'\\x{6B77}' .
+			'\\x{6B79}' .
+			'\\x{6B9F}' .
+			'\\x{6BAE}' .
+			'\\x{6BBA}-\\x{6BBB}' .
+			'\\x{6C4E}' .
+			'\\x{6C67}' .
+			'\\x{6C88}' .
+			'\\x{6CBF}' .
+			'\\x{6CCC}-\\x{6CCD}' .
+			'\\x{6CE5}' .
+			'\\x{6D16}' .
+			'\\x{6D1B}' .
+			'\\x{6D1E}' .
+			'\\x{6D34}' .
+			'\\x{6D3E}' .
+			'\\x{6D41}' .
+			'\\x{6D69}-\\x{6D6A}' .
+			'\\x{6D77}-\\x{6D78}' .
+			'\\x{6D85}' .
+			'\\x{6DCB}' .
+			'\\x{6DDA}' .
+			'\\x{6DEA}' .
+			'\\x{6DF9}' .
+			'\\x{6E1A}' .
+			'\\x{6E2F}' .
+			'\\x{6E6E}' .
+			'\\x{6E9C}' .
+			'\\x{6EBA}' .
+			'\\x{6EC7}' .
+			'\\x{6ECB}' .
+			'\\x{6ED1}' .
+			'\\x{6EDB}' .
+			'\\x{6F0F}' .
+			'\\x{6F22}-\\x{6F23}' .
+			'\\x{6F6E}' .
+			'\\x{6FC6}' .
+			'\\x{6FEB}' .
+			'\\x{6FFE}' .
+			'\\x{701B}' .
+			'\\x{701E}' .
+			'\\x{7039}' .
+			'\\x{704A}' .
+			'\\x{7070}' .
+			'\\x{7077}' .
+			'\\x{707D}' .
+			'\\x{7099}' .
+			'\\x{70AD}' .
+			'\\x{70C8}' .
+			'\\x{70D9}' .
+			'\\x{7145}' .
+			'\\x{7149}' .
+			'\\x{716E}' .
+			'\\x{719C}' .
+			'\\x{71CE}' .
+			'\\x{71D0}' .
+			'\\x{7210}' .
+			'\\x{721B}' .
+			'\\x{7228}' .
+			'\\x{722B}' .
+			'\\x{7235}' .
+			'\\x{7250}' .
+			'\\x{7262}' .
+			'\\x{7280}' .
+			'\\x{7295}' .
+			'\\x{72AF}' .
+			'\\x{72C0}' .
+			'\\x{72FC}' .
+			'\\x{732A}' .
+			'\\x{7375}' .
+			'\\x{737A}' .
+			'\\x{7387}' .
+			'\\x{738B}' .
+			'\\x{73A5}' .
+			'\\x{73B2}' .
+			'\\x{73DE}' .
+			'\\x{7406}' .
+			'\\x{7409}' .
+			'\\x{7422}' .
+			'\\x{7447}' .
+			'\\x{745C}' .
+			'\\x{7469}' .
+			'\\x{7471}' .
+			'\\x{7485}' .
+			'\\x{7489}' .
+			'\\x{7498}' .
+			'\\x{74CA}' .
+			'\\x{7506}' .
+			'\\x{7524}' .
+			'\\x{753B}' .
+			'\\x{753E}' .
+			'\\x{7559}' .
+			'\\x{7565}' .
+			'\\x{7570}' .
+			'\\x{75E2}' .
+			'\\x{7610}' .
+			'\\x{761D}' .
+			'\\x{761F}' .
+			'\\x{7642}' .
+			'\\x{7669}' .
+			'\\x{76CA}' .
+			'\\x{76DB}' .
+			'\\x{76E7}' .
+			'\\x{76F4}' .
+			'\\x{7701}' .
+			'\\x{771E}-\\x{771F}' .
+			'\\x{7740}' .
+			'\\x{774A}' .
+			'\\x{778B}' .
+			'\\x{77A7}' .
+			'\\x{784E}' .
+			'\\x{786B}' .
+			'\\x{788C}' .
+			'\\x{7891}' .
+			'\\x{78CA}' .
+			'\\x{78CC}' .
+			'\\x{78FB}' .
+			'\\x{792A}' .
+			'\\x{793C}' .
+			'\\x{793E}' .
+			'\\x{7948}-\\x{7949}' .
+			'\\x{7950}' .
+			'\\x{7956}' .
+			'\\x{795D}-\\x{795E}' .
+			'\\x{7965}' .
+			'\\x{797F}' .
+			'\\x{798D}-\\x{798F}' .
+			'\\x{79AE}' .
+			'\\x{79CA}' .
+			'\\x{79EB}' .
+			'\\x{7A1C}' .
+			'\\x{7A40}' .
+			'\\x{7A4A}' .
+			'\\x{7A4F}' .
+			'\\x{7A81}' .
+			'\\x{7AB1}' .
+			'\\x{7ACB}' .
+			'\\x{7AEE}' .
+			'\\x{7B20}' .
+			'\\x{7BC0}' .
+			'\\x{7BC6}' .
+			'\\x{7BC9}' .
+			'\\x{7C3E}' .
+			'\\x{7C60}' .
+			'\\x{7C7B}' .
+			'\\x{7C92}' .
+			'\\x{7CBE}' .
+			'\\x{7CD2}' .
+			'\\x{7CD6}' .
+			'\\x{7CE3}' .
+			'\\x{7CE7}-\\x{7CE8}' .
+			'\\x{7D00}' .
+			'\\x{7D10}' .
+			'\\x{7D22}' .
+			'\\x{7D2F}' .
+			'\\x{7D5B}' .
+			'\\x{7D63}' .
+			'\\x{7DA0}' .
+			'\\x{7DBE}' .
+			'\\x{7DC7}' .
+			'\\x{7DF4}' .
+			'\\x{7E02}' .
+			'\\x{7E09}' .
+			'\\x{7E37}' .
+			'\\x{7E41}' .
+			'\\x{7E45}' .
+			'\\x{7F3E}' .
+			'\\x{7F72}' .
+			'\\x{7F79}-\\x{7F7A}' .
+			'\\x{7F85}' .
+			'\\x{7F95}' .
+			'\\x{7F9A}' .
+			'\\x{7FBD}' .
+			'\\x{7FFA}' .
+			'\\x{8001}' .
+			'\\x{8005}' .
+			'\\x{8046}' .
+			'\\x{8060}' .
+			'\\x{806F}-\\x{8070}' .
+			'\\x{807E}' .
+			'\\x{808B}' .
+			'\\x{80AD}' .
+			'\\x{80B2}' .
+			'\\x{8103}' .
+			'\\x{813E}' .
+			'\\x{81D8}' .
+			'\\x{81E8}' .
+			'\\x{81ED}' .
+			'\\x{8201}' .
+			'\\x{8204}' .
+			'\\x{8218}' .
+			'\\x{826F}' .
+			'\\x{8279}' .
+			'\\x{828B}' .
+			'\\x{8291}' .
+			'\\x{829D}' .
+			'\\x{82B1}' .
+			'\\x{82B3}' .
+			'\\x{82BD}' .
+			'\\x{82E5}-\\x{82E6}' .
+			'\\x{831D}' .
+			'\\x{8323}' .
+			'\\x{8336}' .
+			'\\x{8352}-\\x{8353}' .
+			'\\x{8363}' .
+			'\\x{83AD}' .
+			'\\x{83BD}' .
+			'\\x{83C9}-\\x{83CA}' .
+			'\\x{83CC}' .
+			'\\x{83DC}' .
+			'\\x{83E7}' .
+			'\\x{83EF}' .
+			'\\x{83F1}' .
+			'\\x{843D}' .
+			'\\x{8449}' .
+			'\\x{8457}' .
+			'\\x{84EE}' .
+			'\\x{84F1}' .
+			'\\x{84F3}' .
+			'\\x{84FC}' .
+			'\\x{8516}' .
+			'\\x{8564}' .
+			'\\x{85CD}' .
+			'\\x{85FA}' .
+			'\\x{8606}' .
+			'\\x{8612}' .
+			'\\x{862D}' .
+			'\\x{863F}' .
+			'\\x{8650}' .
+			'\\x{865C}' .
+			'\\x{8667}' .
+			'\\x{8669}' .
+			'\\x{8688}' .
+			'\\x{86A9}' .
+			'\\x{86E2}' .
+			'\\x{870E}' .
+			'\\x{8728}' .
+			'\\x{876B}' .
+			'\\x{8779}' .
+			'\\x{8786}' .
+			'\\x{87BA}' .
+			'\\x{87E1}' .
+			'\\x{8801}' .
+			'\\x{881F}' .
+			'\\x{884C}' .
+			'\\x{8860}' .
+			'\\x{8863}' .
+			'\\x{88C2}' .
+			'\\x{88CF}' .
+			'\\x{88D7}' .
+			'\\x{88DE}' .
+			'\\x{88E1}' .
+			'\\x{88F8}' .
+			'\\x{88FA}' .
+			'\\x{8910}' .
+			'\\x{8941}' .
+			'\\x{8964}' .
+			'\\x{8986}' .
+			'\\x{898B}' .
+			'\\x{8996}' .
+			'\\x{8AA0}' .
+			'\\x{8AAA}' .
+			'\\x{8ABF}' .
+			'\\x{8ACB}' .
+			'\\x{8AD2}' .
+			'\\x{8AD6}' .
+			'\\x{8AED}' .
+			'\\x{8AF8}' .
+			'\\x{8AFE}' .
+			'\\x{8B01}' .
+			'\\x{8B39}' .
+			'\\x{8B58}' .
+			'\\x{8B80}' .
+			'\\x{8B8A}' .
+			'\\x{8C48}' .
+			'\\x{8C55}' .
+			'\\x{8CAB}' .
+			'\\x{8CC1}-\\x{8CC2}' .
+			'\\x{8CC8}' .
+			'\\x{8CD3}' .
+			'\\x{8D08}' .
+			'\\x{8D1B}' .
+			'\\x{8D77}' .
+			'\\x{8DBC}' .
+			'\\x{8DCB}' .
+			'\\x{8DEF}-\\x{8DF0}' .
+			'\\x{8ECA}' .
+			'\\x{8ED4}' .
+			'\\x{8F26}' .
+			'\\x{8F2A}' .
+			'\\x{8F38}' .
+			'\\x{8F3B}' .
+			'\\x{8F62}' .
+			'\\x{8F9E}' .
+			'\\x{8FB0}' .
+			'\\x{8FB6}' .
+			'\\x{9023}' .
+			'\\x{9038}' .
+			'\\x{9072}' .
+			'\\x{907C}' .
+			'\\x{908F}' .
+			'\\x{9094}' .
+			'\\x{90CE}' .
+			'\\x{90DE}' .
+			'\\x{90F1}' .
+			'\\x{90FD}' .
+			'\\x{9111}' .
+			'\\x{911B}' .
+			'\\x{916A}' .
+			'\\x{9199}' .
+			'\\x{91B4}' .
+			'\\x{91CC}' .
+			'\\x{91CF}' .
+			'\\x{91D1}' .
+			'\\x{9234}' .
+			'\\x{9238}' .
+			'\\x{9276}' .
+			'\\x{927C}' .
+			'\\x{92D7}-\\x{92D8}' .
+			'\\x{9304}' .
+			'\\x{934A}' .
+			'\\x{93F9}' .
+			'\\x{9415}' .
+			'\\x{958B}' .
+			'\\x{95AD}' .
+			'\\x{95B7}' .
+			'\\x{962E}' .
+			'\\x{964B}' .
+			'\\x{964D}' .
+			'\\x{9675}' .
+			'\\x{9678}' .
+			'\\x{967C}' .
+			'\\x{9686}' .
+			'\\x{96A3}' .
+			'\\x{96B7}-\\x{96B8}' .
+			'\\x{96C3}' .
+			'\\x{96E2}-\\x{96E3}' .
+			'\\x{96F6}-\\x{96F7}' .
+			'\\x{9723}' .
+			'\\x{9732}' .
+			'\\x{9748}' .
+			'\\x{9756}' .
+			'\\x{97DB}' .
+			'\\x{97E0}' .
+			'\\x{97FF}' .
+			'\\x{980B}' .
+			'\\x{9818}' .
+			'\\x{9829}' .
+			'\\x{983B}' .
+			'\\x{985E}' .
+			'\\x{98E2}' .
+			'\\x{98EF}' .
+			'\\x{98FC}' .
+			'\\x{9928}-\\x{9929}' .
+			'\\x{99A7}' .
+			'\\x{99C2}' .
+			'\\x{99F1}' .
+			'\\x{99FE}' .
+			'\\x{9A6A}' .
+			'\\x{9B12}' .
+			'\\x{9B6F}' .
+			'\\x{9C40}' .
+			'\\x{9C57}' .
+			'\\x{9CFD}' .
+			'\\x{9D67}' .
+			'\\x{9DB4}' .
+			'\\x{9DFA}' .
+			'\\x{9E1E}' .
+			'\\x{9E7F}' .
+			'\\x{9E97}' .
+			'\\x{9E9F}' .
+			'\\x{9EBB}' .
+			'\\x{9ECE}' .
+			'\\x{9EF9}' .
+			'\\x{9EFE}' .
+			'\\x{9F05}' .
+			'\\x{9F0F}' .
+			'\\x{9F16}' .
+			'\\x{9F3B}' .
+			'\\x{9F43}' .
+			'\\x{9F8D}-\\x{9F8E}' .
+			'\\x{9F9C}' .
+			'\\x{20122}' .
+			'\\x{2051C}' .
+			'\\x{20525}' .
+			'\\x{2054B}' .
+			'\\x{2063A}' .
+			'\\x{20804}' .
+			'\\x{208DE}' .
+			'\\x{20A2C}' .
+			'\\x{20B63}' .
+			'\\x{214E4}' .
+			'\\x{216A8}' .
+			'\\x{216EA}' .
+			'\\x{219C8}' .
+			'\\x{21B18}' .
+			'\\x{21D0B}' .
+			'\\x{21DE4}' .
+			'\\x{21DE6}' .
+			'\\x{22183}' .
+			'\\x{2219F}' .
+			'\\x{22331}' .
+			'\\x{226D4}' .
+			'\\x{22844}' .
+			'\\x{2284A}' .
+			'\\x{22B0C}' .
+			'\\x{22BF1}' .
+			'\\x{2300A}' .
+			'\\x{232B8}' .
+			'\\x{2335F}' .
+			'\\x{23393}' .
+			'\\x{2339C}' .
+			'\\x{233C3}' .
+			'\\x{233D5}' .
+			'\\x{2346D}' .
+			'\\x{236A3}' .
+			'\\x{238A7}' .
+			'\\x{23A8D}' .
+			'\\x{23AFA}' .
+			'\\x{23CBC}' .
+			'\\x{23D1E}' .
+			'\\x{23ED1}' .
+			'\\x{23F5E}' .
+			'\\x{23F8E}' .
+			'\\x{24263}' .
+			'\\x{242EE}' .
+			'\\x{243AB}' .
+			'\\x{24608}' .
+			'\\x{24735}' .
+			'\\x{24814}' .
+			'\\x{24C36}' .
+			'\\x{24C92}' .
+			'\\x{24FA1}' .
+			'\\x{24FB8}' .
+			'\\x{25044}' .
+			'\\x{250F2}-\\x{250F3}' .
+			'\\x{25119}' .
+			'\\x{25133}' .
+			'\\x{25249}' .
+			'\\x{2541D}' .
+			'\\x{25626}' .
+			'\\x{2569A}' .
+			'\\x{256C5}' .
+			'\\x{2597C}' .
+			'\\x{25AA7}' .
+			'\\x{25BAB}' .
+			'\\x{25C80}' .
+			'\\x{25CD0}' .
+			'\\x{25F86}' .
+			'\\x{261DA}' .
+			'\\x{26228}' .
+			'\\x{26247}' .
+			'\\x{262D9}' .
+			'\\x{2633E}' .
+			'\\x{264DA}' .
+			'\\x{26523}' .
+			'\\x{265A8}' .
+			'\\x{267A7}' .
+			'\\x{267B5}' .
+			'\\x{26B3C}' .
+			'\\x{26C36}' .
+			'\\x{26CD5}' .
+			'\\x{26D6B}' .
+			'\\x{26F2C}' .
+			'\\x{26FB1}' .
+			'\\x{270D2}' .
+			'\\x{273CA}' .
+			'\\x{27667}' .
+			'\\x{278AE}' .
+			'\\x{27966}' .
+			'\\x{27CA8}' .
+			'\\x{27ED3}' .
+			'\\x{27F2F}' .
+			'\\x{285D2}' .
+			'\\x{285ED}' .
+			'\\x{2872E}' .
+			'\\x{28BFA}' .
+			'\\x{28D77}' .
+			'\\x{29145}' .
+			'\\x{291DF}' .
+			'\\x{2921A}' .
+			'\\x{2940A}' .
+			'\\x{29496}' .
+			'\\x{295B6}' .
+			'\\x{29B30}' .
+			'\\x{2A0CE}' .
+			'\\x{2A105}' .
+			'\\x{2A20E}' .
+			'\\x{2A291}' .
+			'\\x{2A392}' .
+			'\\x{2A600}',
+		'\\x{180D}' =>
+			'\\x{1828}' .
+			'\\x{182C}-\\x{182D}' .
+			'\\x{1873}-\\x{1874}' .
+			'\\x{1887}',
+		'\\x{180C}' =>
+			'\\x{1820}' .
+			'\\x{1825}-\\x{1826}' .
+			'\\x{1828}' .
+			'\\x{182C}-\\x{182D}' .
+			'\\x{1830}' .
+			'\\x{1836}' .
+			'\\x{1847}' .
+			'\\x{185E}' .
+			'\\x{1868}' .
+			'\\x{1873}-\\x{1874}' .
+			'\\x{1887}',
+		'\\x{180B}' =>
+			'\\x{1820}-\\x{1826}' .
+			'\\x{1828}' .
+			'\\x{182A}' .
+			'\\x{182C}-\\x{182D}' .
+			'\\x{1830}' .
+			'\\x{1832}-\\x{1833}' .
+			'\\x{1835}-\\x{1836}' .
+			'\\x{1838}' .
+			'\\x{1844}-\\x{1849}' .
+			'\\x{184D}-\\x{184E}' .
+			'\\x{185D}-\\x{185E}' .
+			'\\x{1860}' .
+			'\\x{1863}' .
+			'\\x{1868}-\\x{1869}' .
+			'\\x{186F}' .
+			'\\x{1873}-\\x{1874}' .
+			'\\x{1876}' .
+			'\\x{1880}-\\x{1881}' .
+			'\\x{1887}-\\x{1888}' .
+			'\\x{188A}',
+	];
 }
 
 /**
@@ -3075,282 +3081,283 @@ function utf8_regex_variation_selectors()
  */
 function utf8_regex_joining_type()
 {
-	return array(
-		'Arabic' => array(
+	return [
+		'Arabic' => [
 			'Join_Causing' =>
-				'\x{0640}' .
-				'\x{0883}-\x{0885}',
+				'\\x{0640}' .
+				'\\x{0883}-\\x{0885}',
 			'Dual_Joining' =>
-				'\x{0620}' .
-				'\x{0626}' .
-				'\x{0628}' .
-				'\x{062A}-\x{062E}' .
-				'\x{0633}-\x{063F}' .
-				'\x{0641}-\x{0647}' .
-				'\x{0649}-\x{064A}' .
-				'\x{066E}-\x{066F}' .
-				'\x{0678}-\x{0687}' .
-				'\x{069A}-\x{06BF}' .
-				'\x{06C1}-\x{06C2}' .
-				'\x{06CC}' .
-				'\x{06CE}' .
-				'\x{06D0}-\x{06D1}' .
-				'\x{06FA}-\x{06FC}' .
-				'\x{06FF}' .
-				'\x{075C}-\x{076A}' .
-				'\x{076D}-\x{0770}' .
-				'\x{0772}' .
-				'\x{0775}-\x{0777}' .
-				'\x{077A}-\x{077F}' .
-				'\x{0886}' .
-				'\x{0889}-\x{088D}' .
-				'\x{08A0}-\x{08A9}' .
-				'\x{08AF}-\x{08B0}' .
-				'\x{08B3}-\x{08B8}' .
-				'\x{08BA}-\x{08C8}',
+				'\\x{0620}' .
+				'\\x{0626}' .
+				'\\x{0628}' .
+				'\\x{062A}-\\x{062E}' .
+				'\\x{0633}-\\x{063F}' .
+				'\\x{0641}-\\x{0647}' .
+				'\\x{0649}-\\x{064A}' .
+				'\\x{066E}-\\x{066F}' .
+				'\\x{0678}-\\x{0687}' .
+				'\\x{069A}-\\x{06BF}' .
+				'\\x{06C1}-\\x{06C2}' .
+				'\\x{06CC}' .
+				'\\x{06CE}' .
+				'\\x{06D0}-\\x{06D1}' .
+				'\\x{06FA}-\\x{06FC}' .
+				'\\x{06FF}' .
+				'\\x{075C}-\\x{076A}' .
+				'\\x{076D}-\\x{0770}' .
+				'\\x{0772}' .
+				'\\x{0775}-\\x{0777}' .
+				'\\x{077A}-\\x{077F}' .
+				'\\x{0886}' .
+				'\\x{0889}-\\x{088D}' .
+				'\\x{08A0}-\\x{08A9}' .
+				'\\x{08AF}-\\x{08B0}' .
+				'\\x{08B3}-\\x{08B8}' .
+				'\\x{08BA}-\\x{08C8}',
 			'Right_Joining' =>
-				'\x{0622}-\x{0625}' .
-				'\x{0627}' .
-				'\x{0629}' .
-				'\x{062F}-\x{0632}' .
-				'\x{0648}' .
-				'\x{0671}-\x{0673}' .
-				'\x{0675}-\x{0677}' .
-				'\x{0688}-\x{0699}' .
-				'\x{06C0}' .
-				'\x{06C3}-\x{06CB}' .
-				'\x{06CD}' .
-				'\x{06CF}' .
-				'\x{06D2}-\x{06D3}' .
-				'\x{06D5}' .
-				'\x{06EE}-\x{06EF}' .
-				'\x{0759}-\x{075B}' .
-				'\x{076B}-\x{076C}' .
-				'\x{0771}' .
-				'\x{0773}-\x{0774}' .
-				'\x{0778}-\x{0779}' .
-				'\x{0870}-\x{0882}' .
-				'\x{088E}' .
-				'\x{08AA}-\x{08AC}' .
-				'\x{08AE}' .
-				'\x{08B1}-\x{08B2}' .
-				'\x{08B9}',
+				'\\x{0622}-\\x{0625}' .
+				'\\x{0627}' .
+				'\\x{0629}' .
+				'\\x{062F}-\\x{0632}' .
+				'\\x{0648}' .
+				'\\x{0671}-\\x{0673}' .
+				'\\x{0675}-\\x{0677}' .
+				'\\x{0688}-\\x{0699}' .
+				'\\x{06C0}' .
+				'\\x{06C3}-\\x{06CB}' .
+				'\\x{06CD}' .
+				'\\x{06CF}' .
+				'\\x{06D2}-\\x{06D3}' .
+				'\\x{06D5}' .
+				'\\x{06EE}-\\x{06EF}' .
+				'\\x{0759}-\\x{075B}' .
+				'\\x{076B}-\\x{076C}' .
+				'\\x{0771}' .
+				'\\x{0773}-\\x{0774}' .
+				'\\x{0778}-\\x{0779}' .
+				'\\x{0870}-\\x{0882}' .
+				'\\x{088E}' .
+				'\\x{08AA}-\\x{08AC}' .
+				'\\x{08AE}' .
+				'\\x{08B1}-\\x{08B2}' .
+				'\\x{08B9}',
 			'Transparent' =>
-				'\x{0610}-\x{061A}' .
-				'\x{061C}' .
-				'\x{061C}' .
-				'\x{064B}-\x{065F}' .
-				'\x{0670}' .
-				'\x{06D6}-\x{06DC}' .
-				'\x{06DF}-\x{06E4}' .
-				'\x{06E7}-\x{06E8}' .
-				'\x{06EA}-\x{06ED}' .
-				'\x{0898}-\x{089F}' .
-				'\x{08CA}-\x{08E1}' .
-				'\x{08E3}-\x{0902}' .
-				'\x{102E0}' .
-				'\x{10EFD}-\x{10EFF}',
-		),
-		'Syriac' => array(
+				'\\x{0610}-\\x{061A}' .
+				'\\x{061C}' .
+				'\\x{061C}' .
+				'\\x{064B}-\\x{065F}' .
+				'\\x{0670}' .
+				'\\x{06D6}-\\x{06DC}' .
+				'\\x{06DF}-\\x{06E4}' .
+				'\\x{06E7}-\\x{06E8}' .
+				'\\x{06EA}-\\x{06ED}' .
+				'\\x{0898}-\\x{089F}' .
+				'\\x{08CA}-\\x{08E1}' .
+				'\\x{08E3}-\\x{0902}' .
+				'\\x{102E0}' .
+				'\\x{10EFD}-\\x{10EFF}',
+		],
+		'Syriac' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{0712}-\x{0714}' .
-				'\x{071A}-\x{071D}' .
-				'\x{071F}-\x{0727}' .
-				'\x{0729}' .
-				'\x{072B}' .
-				'\x{072D}-\x{072E}' .
-				'\x{074E}-\x{0758}' .
-				'\x{0860}' .
-				'\x{0862}-\x{0865}' .
-				'\x{0868}',
+				'\\x{0712}-\\x{0714}' .
+				'\\x{071A}-\\x{071D}' .
+				'\\x{071F}-\\x{0727}' .
+				'\\x{0729}' .
+				'\\x{072B}' .
+				'\\x{072D}-\\x{072E}' .
+				'\\x{074E}-\\x{0758}' .
+				'\\x{0860}' .
+				'\\x{0862}-\\x{0865}' .
+				'\\x{0868}',
 			'Right_Joining' =>
-				'\x{0710}' .
-				'\x{0715}-\x{0719}' .
-				'\x{071E}' .
-				'\x{0728}' .
-				'\x{072A}' .
-				'\x{072C}' .
-				'\x{072F}' .
-				'\x{074D}' .
-				'\x{0867}' .
-				'\x{0869}-\x{086A}',
+				'\\x{0710}' .
+				'\\x{0715}-\\x{0719}' .
+				'\\x{071E}' .
+				'\\x{0728}' .
+				'\\x{072A}' .
+				'\\x{072C}' .
+				'\\x{072F}' .
+				'\\x{074D}' .
+				'\\x{0867}' .
+				'\\x{0869}-\\x{086A}',
 			'Transparent' =>
-				'\x{061C}' .
-				'\x{0670}' .
-				'\x{070F}' .
-				'\x{0711}' .
-				'\x{0730}-\x{074A}',
-		),
-		'Adlam' => array(
-			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{061C}' .
+				'\\x{0670}' .
+				'\\x{070F}' .
+				'\\x{0711}' .
+				'\\x{0730}-\\x{074A}',
+		],
+		'Tirhuta' => [
 			'Dual_Joining' =>
-				'\x{1E900}-\x{1E943}',
+				'\\x{A840}-\\x{A871}' .
+				'\\x{A840}-\\x{A871}',
 			'Transparent' =>
-				'\x{1E944}-\x{1E94A}' .
-				'\x{1E94B}',
-		),
-		'Tirhuta' => array(
+				'\\x{0951}-\\x{0957}' .
+				'\\x{114B3}-\\x{114B8}' .
+				'\\x{114BA}' .
+				'\\x{114BF}-\\x{114C0}' .
+				'\\x{114C2}-\\x{114C3}',
+		],
+		'Adlam' => [
+			'Join_Causing' =>
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{A840}-\x{A871}',
+				'\\x{1E900}-\\x{1E943}',
 			'Transparent' =>
-				'\x{0951}-\x{0957}' .
-				'\x{114B3}-\x{114B8}' .
-				'\x{114BA}' .
-				'\x{114BF}-\x{114C0}' .
-				'\x{114C2}-\x{114C3}',
-		),
-		'Nko' => array(
+				'\\x{1E944}-\\x{1E94A}' .
+				'\\x{1E94B}',
+		],
+		'Nko' => [
 			'Join_Causing' =>
-				'\x{07FA}',
+				'\\x{07FA}',
 			'Dual_Joining' =>
-				'\x{07CA}-\x{07EA}',
+				'\\x{07CA}-\\x{07EA}',
 			'Transparent' =>
-				'\x{07EB}-\x{07F3}' .
-				'\x{07FD}',
-		),
-		'Hanifi_Rohingya' => array(
+				'\\x{07EB}-\\x{07F3}' .
+				'\\x{07FD}',
+		],
+		'Hanifi_Rohingya' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{10D01}-\x{10D21}' .
-				'\x{10D23}',
+				'\\x{10D01}-\\x{10D21}' .
+				'\\x{10D23}',
 			'Right_Joining' =>
-				'\x{10D22}',
+				'\\x{10D22}',
 			'Left_Joining' =>
-				'\x{10D00}',
+				'\\x{10D00}',
 			'Transparent' =>
-				'\x{10D24}-\x{10D27}',
-		),
-		'Manichaean' => array(
+				'\\x{10D24}-\\x{10D27}',
+		],
+		'Manichaean' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{10AC0}-\x{10AC4}' .
-				'\x{10AD3}-\x{10AD6}' .
-				'\x{10AD8}-\x{10ADC}' .
-				'\x{10ADE}-\x{10AE0}' .
-				'\x{10AEB}-\x{10AEE}',
+				'\\x{10AC0}-\\x{10AC4}' .
+				'\\x{10AD3}-\\x{10AD6}' .
+				'\\x{10AD8}-\\x{10ADC}' .
+				'\\x{10ADE}-\\x{10AE0}' .
+				'\\x{10AEB}-\\x{10AEE}',
 			'Right_Joining' =>
-				'\x{10AC5}' .
-				'\x{10AC7}' .
-				'\x{10AC9}-\x{10ACA}' .
-				'\x{10ACE}-\x{10AD2}' .
-				'\x{10ADD}' .
-				'\x{10AE1}' .
-				'\x{10AE4}' .
-				'\x{10AEF}',
+				'\\x{10AC5}' .
+				'\\x{10AC7}' .
+				'\\x{10AC9}-\\x{10ACA}' .
+				'\\x{10ACE}-\\x{10AD2}' .
+				'\\x{10ADD}' .
+				'\\x{10AE1}' .
+				'\\x{10AE4}' .
+				'\\x{10AEF}',
 			'Left_Joining' =>
-				'\x{10ACD}' .
-				'\x{10AD7}',
+				'\\x{10ACD}' .
+				'\\x{10AD7}',
 			'Transparent' =>
-				'\x{10AE5}-\x{10AE6}',
-		),
-		'Sogdian' => array(
+				'\\x{10AE5}-\\x{10AE6}',
+		],
+		'Sogdian' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{10F30}-\x{10F32}' .
-				'\x{10F34}-\x{10F44}' .
-				'\x{10F51}-\x{10F53}',
+				'\\x{10F30}-\\x{10F32}' .
+				'\\x{10F34}-\\x{10F44}' .
+				'\\x{10F51}-\\x{10F53}',
 			'Right_Joining' =>
-				'\x{10F33}' .
-				'\x{10F54}',
+				'\\x{10F33}' .
+				'\\x{10F54}',
 			'Transparent' =>
-				'\x{10F46}-\x{10F50}',
-		),
-		'Mandaic' => array(
+				'\\x{10F46}-\\x{10F50}',
+		],
+		'Mandaic' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{0841}-\x{0845}' .
-				'\x{0848}' .
-				'\x{084A}-\x{0853}' .
-				'\x{0855}',
+				'\\x{0841}-\\x{0845}' .
+				'\\x{0848}' .
+				'\\x{084A}-\\x{0853}' .
+				'\\x{0855}',
 			'Right_Joining' =>
-				'\x{0840}' .
-				'\x{0846}-\x{0847}' .
-				'\x{0849}' .
-				'\x{0854}' .
-				'\x{0856}-\x{0858}',
+				'\\x{0840}' .
+				'\\x{0846}-\\x{0847}' .
+				'\\x{0849}' .
+				'\\x{0854}' .
+				'\\x{0856}-\\x{0858}',
 			'Transparent' =>
-				'\x{0859}-\x{085B}',
-		),
-		'Psalter_Pahlavi' => array(
+				'\\x{0859}-\\x{085B}',
+		],
+		'Psalter_Pahlavi' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{10B80}' .
-				'\x{10B82}' .
-				'\x{10B86}-\x{10B88}' .
-				'\x{10B8A}-\x{10B8B}' .
-				'\x{10B8D}' .
-				'\x{10B90}' .
-				'\x{10BAD}-\x{10BAE}',
+				'\\x{10B80}' .
+				'\\x{10B82}' .
+				'\\x{10B86}-\\x{10B88}' .
+				'\\x{10B8A}-\\x{10B8B}' .
+				'\\x{10B8D}' .
+				'\\x{10B90}' .
+				'\\x{10BAD}-\\x{10BAE}',
 			'Right_Joining' =>
-				'\x{10B81}' .
-				'\x{10B83}-\x{10B85}' .
-				'\x{10B89}' .
-				'\x{10B8C}' .
-				'\x{10B8E}-\x{10B8F}' .
-				'\x{10B91}' .
-				'\x{10BA9}-\x{10BAC}',
-		),
-		'Old_Uyghur' => array(
+				'\\x{10B81}' .
+				'\\x{10B83}-\\x{10B85}' .
+				'\\x{10B89}' .
+				'\\x{10B8C}' .
+				'\\x{10B8E}-\\x{10B8F}' .
+				'\\x{10B91}' .
+				'\\x{10BA9}-\\x{10BAC}',
+		],
+		'Old_Uyghur' => [
 			'Join_Causing' =>
-				'\x{0640}',
+				'\\x{0640}',
 			'Dual_Joining' =>
-				'\x{10F70}-\x{10F73}' .
-				'\x{10F76}-\x{10F81}',
+				'\\x{10F70}-\\x{10F73}' .
+				'\\x{10F76}-\\x{10F81}',
 			'Right_Joining' =>
-				'\x{10F74}-\x{10F75}',
+				'\\x{10F74}-\\x{10F75}',
 			'Transparent' =>
-				'\x{10F82}-\x{10F85}',
-		),
-		'Mongolian' => array(
+				'\\x{10F82}-\\x{10F85}',
+		],
+		'Mongolian' => [
 			'Join_Causing' =>
-				'\x{180A}',
+				'\\x{180A}',
 			'Dual_Joining' =>
-				'\x{1807}' .
-				'\x{1820}-\x{1842}' .
-				'\x{1843}' .
-				'\x{1844}-\x{1878}' .
-				'\x{1887}-\x{18A8}' .
-				'\x{18AA}',
+				'\\x{1807}' .
+				'\\x{1820}-\\x{1842}' .
+				'\\x{1843}' .
+				'\\x{1844}-\\x{1878}' .
+				'\\x{1887}-\\x{18A8}' .
+				'\\x{18AA}',
 			'Transparent' =>
-				'\x{180B}-\x{180D}' .
-				'\x{180F}' .
-				'\x{1885}-\x{1886}' .
-				'\x{18A9}',
-		),
-		'Phags_Pa' => array(
+				'\\x{180B}-\\x{180D}' .
+				'\\x{180F}' .
+				'\\x{1885}-\\x{1886}' .
+				'\\x{18A9}',
+		],
+		'Phags_Pa' => [
 			'Dual_Joining' =>
-				'\x{A840}-\x{A871}',
+				'\\x{A840}-\\x{A871}',
 			'Left_Joining' =>
-				'\x{A872}',
-		),
-		'Chorasmian' => array(
+				'\\x{A872}',
+		],
+		'Chorasmian' => [
 			'Dual_Joining' =>
-				'\x{10FB0}' .
-				'\x{10FB2}-\x{10FB3}' .
-				'\x{10FB8}' .
-				'\x{10FBB}-\x{10FBC}' .
-				'\x{10FBE}-\x{10FBF}' .
-				'\x{10FC1}' .
-				'\x{10FC4}' .
-				'\x{10FCA}',
+				'\\x{10FB0}' .
+				'\\x{10FB2}-\\x{10FB3}' .
+				'\\x{10FB8}' .
+				'\\x{10FBB}-\\x{10FBC}' .
+				'\\x{10FBE}-\\x{10FBF}' .
+				'\\x{10FC1}' .
+				'\\x{10FC4}' .
+				'\\x{10FCA}',
 			'Right_Joining' =>
-				'\x{10FB4}-\x{10FB6}' .
-				'\x{10FB9}-\x{10FBA}' .
-				'\x{10FBD}' .
-				'\x{10FC2}-\x{10FC3}' .
-				'\x{10FC9}',
+				'\\x{10FB4}-\\x{10FB6}' .
+				'\\x{10FB9}-\\x{10FBA}' .
+				'\\x{10FBD}' .
+				'\\x{10FC2}-\\x{10FC3}' .
+				'\\x{10FC9}',
 			'Left_Joining' =>
-				'\x{10FCB}',
-		),
-	);
+				'\\x{10FCB}',
+		],
+	];
 }
 
 /**
@@ -3367,1160 +3374,1167 @@ function utf8_regex_joining_type()
  */
 function utf8_regex_indic()
 {
-	return array(
-		'Devanagari' => array(
+	return [
+		'Devanagari' => [
 			'All' =>
-				'\x{0900}-\x{0952}' .
-				'\x{0955}-\x{0966}' .
-				'\x{0966}-\x{096A}' .
-				'\x{096A}-\x{096E}' .
-				'\x{096E}-\x{097F}' .
-				'\x{1CD0}-\x{1CD4}' .
-				'\x{1CD6}-\x{1CDC}' .
-				'\x{1CDE}-\x{1CF4}' .
-				'\x{1CF6}' .
-				'\x{1CF8}' .
-				'\x{20F0}' .
-				'\x{A830}' .
-				'\x{A833}' .
-				'\x{A836}' .
-				'\x{A838}-\x{A839}' .
-				'\x{A8E0}-\x{A8F1}' .
-				'\x{A8F1}-\x{A8F3}' .
-				'\x{A8F3}-\x{A8FF}' .
-				'\x{11B00}-\x{11B09}',
+				'\\x{0900}-\\x{0952}' .
+				'\\x{0955}-\\x{0966}' .
+				'\\x{0966}-\\x{096A}' .
+				'\\x{096A}-\\x{096E}' .
+				'\\x{096E}-\\x{097F}' .
+				'\\x{1CD0}-\\x{1CD4}' .
+				'\\x{1CD6}-\\x{1CDC}' .
+				'\\x{1CDE}-\\x{1CF4}' .
+				'\\x{1CF6}' .
+				'\\x{1CF8}' .
+				'\\x{20F0}' .
+				'\\x{A830}' .
+				'\\x{A833}' .
+				'\\x{A836}' .
+				'\\x{A838}-\\x{A839}' .
+				'\\x{A8E0}-\\x{A8F1}' .
+				'\\x{A8F1}-\\x{A8F3}' .
+				'\\x{A8F3}-\\x{A8FF}' .
+				'\\x{11B00}-\\x{11B09}',
 			'Letter' =>
-				'\x{0904}-\x{0939}' .
-				'\x{093D}' .
-				'\x{0950}' .
-				'\x{0958}-\x{0961}' .
-				'\x{0971}-\x{097F}' .
-				'\x{1CE9}-\x{1CEC}' .
-				'\x{1CEE}-\x{1CF3}' .
-				'\x{1CF6}' .
-				'\x{A8F2}-\x{A8F3}' .
-				'\x{A8F3}-\x{A8F7}' .
-				'\x{A8FB}' .
-				'\x{A8FD}-\x{A8FE}',
+				'\\x{0904}-\\x{0939}' .
+				'\\x{093D}' .
+				'\\x{0950}' .
+				'\\x{0958}-\\x{0961}' .
+				'\\x{0971}-\\x{097F}' .
+				'\\x{1CE9}-\\x{1CEC}' .
+				'\\x{1CEE}-\\x{1CF3}' .
+				'\\x{1CF6}' .
+				'\\x{A8F2}-\\x{A8F3}' .
+				'\\x{A8F3}-\\x{A8F7}' .
+				'\\x{A8FB}' .
+				'\\x{A8FD}-\\x{A8FE}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{093C}' .
-				'\x{094D}' .
-				'\x{0951}-\x{0952}' .
-				'\x{1CD0}-\x{1CD2}' .
-				'\x{1CD4}' .
-				'\x{1CD6}-\x{1CDC}' .
-				'\x{1CDE}-\x{1CE0}' .
-				'\x{1CE2}-\x{1CE8}' .
-				'\x{1CED}' .
-				'\x{1CF4}' .
-				'\x{1CF8}' .
-				'\x{20F0}' .
-				'\x{A8E0}-\x{A8F1}' .
-				'\x{A8F1}',
+				'\\x{093C}' .
+				'\\x{094D}' .
+				'\\x{0951}-\\x{0952}' .
+				'\\x{1CD0}-\\x{1CD2}' .
+				'\\x{1CD4}' .
+				'\\x{1CD6}-\\x{1CDC}' .
+				'\\x{1CDE}-\\x{1CE0}' .
+				'\\x{1CE2}-\\x{1CE8}' .
+				'\\x{1CED}' .
+				'\\x{1CF4}' .
+				'\\x{1CF8}' .
+				'\\x{20F0}' .
+				'\\x{A8E0}-\\x{A8F1}' .
+				'\\x{A8F1}',
 			'Nonspacing_Mark' =>
-				'\x{0900}-\x{0902}' .
-				'\x{093A}' .
-				'\x{093C}' .
-				'\x{0941}-\x{0948}' .
-				'\x{094D}' .
-				'\x{0951}-\x{0952}' .
-				'\x{0955}-\x{0957}' .
-				'\x{0962}-\x{0963}' .
-				'\x{1CD0}-\x{1CD2}' .
-				'\x{1CD4}' .
-				'\x{1CD6}-\x{1CDC}' .
-				'\x{1CDE}-\x{1CE0}' .
-				'\x{1CE2}-\x{1CE8}' .
-				'\x{1CED}' .
-				'\x{1CF4}' .
-				'\x{1CF8}' .
-				'\x{20F0}' .
-				'\x{A8E0}-\x{A8F1}' .
-				'\x{A8F1}' .
-				'\x{A8FF}',
+				'\\x{0900}-\\x{0902}' .
+				'\\x{093A}' .
+				'\\x{093C}' .
+				'\\x{0941}-\\x{0948}' .
+				'\\x{094D}' .
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0955}-\\x{0957}' .
+				'\\x{0962}-\\x{0963}' .
+				'\\x{1CD0}-\\x{1CD2}' .
+				'\\x{1CD4}' .
+				'\\x{1CD6}-\\x{1CDC}' .
+				'\\x{1CDE}-\\x{1CE0}' .
+				'\\x{1CE2}-\\x{1CE8}' .
+				'\\x{1CED}' .
+				'\\x{1CF4}' .
+				'\\x{1CF8}' .
+				'\\x{20F0}' .
+				'\\x{A8E0}-\\x{A8F1}' .
+				'\\x{A8F1}' .
+				'\\x{A8FF}',
 			'Virama' =>
-				'\x{094D}',
+				'\\x{094D}',
 			'Vowel_Dependent' =>
-				'\x{093A}' .
-				'\x{093B}' .
-				'\x{093E}-\x{0940}' .
-				'\x{0941}-\x{0948}' .
-				'\x{0949}-\x{094C}' .
-				'\x{094E}-\x{094F}' .
-				'\x{0955}-\x{0957}' .
-				'\x{0962}-\x{0963}' .
-				'\x{A8FF}',
-		),
-		'Tamil' => array(
+				'\\x{093A}' .
+				'\\x{093B}' .
+				'\\x{093E}-\\x{0940}' .
+				'\\x{0941}-\\x{0948}' .
+				'\\x{0949}-\\x{094C}' .
+				'\\x{094E}-\\x{094F}' .
+				'\\x{0955}-\\x{0957}' .
+				'\\x{0962}-\\x{0963}' .
+				'\\x{A8FF}',
+		],
+		'Tamil' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0B82}-\x{0B83}' .
-				'\x{0B85}-\x{0B8A}' .
-				'\x{0B8E}-\x{0B90}' .
-				'\x{0B92}-\x{0B95}' .
-				'\x{0B99}-\x{0B9A}' .
-				'\x{0B9C}' .
-				'\x{0B9E}-\x{0B9F}' .
-				'\x{0BA3}-\x{0BA4}' .
-				'\x{0BA8}-\x{0BAA}' .
-				'\x{0BAE}-\x{0BB9}' .
-				'\x{0BBE}-\x{0BC2}' .
-				'\x{0BC6}-\x{0BC8}' .
-				'\x{0BCA}-\x{0BCD}' .
-				'\x{0BD0}' .
-				'\x{0BD7}' .
-				'\x{0BE6}-\x{0BE7}' .
-				'\x{0BE7}-\x{0BE9}' .
-				'\x{0BE9}-\x{0BEB}' .
-				'\x{0BEB}-\x{0BED}' .
-				'\x{0BED}-\x{0BEF}' .
-				'\x{0BEF}-\x{0BF1}' .
-				'\x{0BF1}-\x{0BF3}' .
-				'\x{0BF3}' .
-				'\x{0BF3}-\x{0BFA}' .
-				'\x{1CDA}' .
-				'\x{A8F3}' .
-				'\x{11301}' .
-				'\x{11303}' .
-				'\x{1133C}' .
-				'\x{11FC0}-\x{11FD1}' .
-				'\x{11FD1}-\x{11FD3}' .
-				'\x{11FD3}-\x{11FF1}' .
-				'\x{11FFF}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0B82}-\\x{0B83}' .
+				'\\x{0B85}-\\x{0B8A}' .
+				'\\x{0B8E}-\\x{0B90}' .
+				'\\x{0B92}-\\x{0B95}' .
+				'\\x{0B99}-\\x{0B9A}' .
+				'\\x{0B9C}' .
+				'\\x{0B9E}-\\x{0B9F}' .
+				'\\x{0BA3}-\\x{0BA4}' .
+				'\\x{0BA8}-\\x{0BAA}' .
+				'\\x{0BAE}-\\x{0BB9}' .
+				'\\x{0BBE}-\\x{0BC2}' .
+				'\\x{0BC6}-\\x{0BC8}' .
+				'\\x{0BCA}-\\x{0BCD}' .
+				'\\x{0BD0}' .
+				'\\x{0BD7}' .
+				'\\x{0BE6}-\\x{0BE7}' .
+				'\\x{0BE7}-\\x{0BE9}' .
+				'\\x{0BE9}-\\x{0BEB}' .
+				'\\x{0BEB}-\\x{0BED}' .
+				'\\x{0BED}-\\x{0BEF}' .
+				'\\x{0BEF}-\\x{0BF1}' .
+				'\\x{0BF1}-\\x{0BF3}' .
+				'\\x{0BF3}' .
+				'\\x{0BF3}-\\x{0BFA}' .
+				'\\x{1CDA}' .
+				'\\x{A8F3}' .
+				'\\x{11301}' .
+				'\\x{11303}' .
+				'\\x{1133C}' .
+				'\\x{11FC0}-\\x{11FD1}' .
+				'\\x{11FD1}-\\x{11FD3}' .
+				'\\x{11FD3}-\\x{11FF1}' .
+				'\\x{11FFF}',
 			'Letter' =>
-				'\x{0B83}' .
-				'\x{0B85}-\x{0B8A}' .
-				'\x{0B8E}-\x{0B90}' .
-				'\x{0B92}-\x{0B95}' .
-				'\x{0B99}-\x{0B9A}' .
-				'\x{0B9C}' .
-				'\x{0B9E}-\x{0B9F}' .
-				'\x{0BA3}-\x{0BA4}' .
-				'\x{0BA8}-\x{0BAA}' .
-				'\x{0BAE}-\x{0BB9}' .
-				'\x{0BD0}' .
-				'\x{A8F3}',
+				'\\x{0B83}' .
+				'\\x{0B85}-\\x{0B8A}' .
+				'\\x{0B8E}-\\x{0B90}' .
+				'\\x{0B92}-\\x{0B95}' .
+				'\\x{0B99}-\\x{0B9A}' .
+				'\\x{0B9C}' .
+				'\\x{0B9E}-\\x{0B9F}' .
+				'\\x{0BA3}-\\x{0BA4}' .
+				'\\x{0BA8}-\\x{0BAA}' .
+				'\\x{0BAE}-\\x{0BB9}' .
+				'\\x{0BD0}' .
+				'\\x{A8F3}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0BCD}' .
-				'\x{1CDA}' .
-				'\x{1133C}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0BCD}' .
+				'\\x{1CDA}' .
+				'\\x{1133C}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0B82}' .
-				'\x{0BC0}' .
-				'\x{0BCD}' .
-				'\x{1CDA}' .
-				'\x{11301}' .
-				'\x{1133C}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0B82}' .
+				'\\x{0BC0}' .
+				'\\x{0BCD}' .
+				'\\x{1CDA}' .
+				'\\x{11301}' .
+				'\\x{1133C}',
 			'Virama' =>
-				'\x{0BCD}',
+				'\\x{0BCD}',
 			'Vowel_Dependent' =>
-				'\x{0BBE}-\x{0BBF}' .
-				'\x{0BC0}' .
-				'\x{0BC1}-\x{0BC2}' .
-				'\x{0BC6}-\x{0BC8}' .
-				'\x{0BCA}-\x{0BCC}' .
-				'\x{0BD7}',
-		),
-		'Malayalam' => array(
+				'\\x{0BBE}-\\x{0BBF}' .
+				'\\x{0BC0}' .
+				'\\x{0BC1}-\\x{0BC2}' .
+				'\\x{0BC6}-\\x{0BC8}' .
+				'\\x{0BCA}-\\x{0BCC}' .
+				'\\x{0BD7}',
+		],
+		'Malayalam' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0D00}-\x{0D0C}' .
-				'\x{0D0E}-\x{0D10}' .
-				'\x{0D12}-\x{0D44}' .
-				'\x{0D46}-\x{0D48}' .
-				'\x{0D4A}-\x{0D4F}' .
-				'\x{0D54}-\x{0D63}' .
-				'\x{0D66}-\x{0D7F}' .
-				'\x{1CDA}' .
-				'\x{A838}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0D00}-\\x{0D0C}' .
+				'\\x{0D0E}-\\x{0D10}' .
+				'\\x{0D12}-\\x{0D44}' .
+				'\\x{0D46}-\\x{0D48}' .
+				'\\x{0D4A}-\\x{0D4F}' .
+				'\\x{0D54}-\\x{0D63}' .
+				'\\x{0D66}-\\x{0D7F}' .
+				'\\x{1CDA}' .
+				'\\x{1CF2}' .
+				'\\x{A838}',
 			'Letter' =>
-				'\x{0D04}-\x{0D0C}' .
-				'\x{0D0E}-\x{0D10}' .
-				'\x{0D12}-\x{0D3A}' .
-				'\x{0D3D}' .
-				'\x{0D4E}' .
-				'\x{0D54}-\x{0D56}' .
-				'\x{0D5F}-\x{0D61}' .
-				'\x{0D7A}-\x{0D7F}',
+				'\\x{0D04}-\\x{0D0C}' .
+				'\\x{0D0E}-\\x{0D10}' .
+				'\\x{0D12}-\\x{0D3A}' .
+				'\\x{0D3D}' .
+				'\\x{0D4E}' .
+				'\\x{0D54}-\\x{0D56}' .
+				'\\x{0D5F}-\\x{0D61}' .
+				'\\x{0D7A}-\\x{0D7F}' .
+				'\\x{1CF2}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0D3B}-\x{0D3C}' .
-				'\x{0D4D}' .
-				'\x{1CDA}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0D3B}-\\x{0D3C}' .
+				'\\x{0D4D}' .
+				'\\x{1CDA}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0D00}-\x{0D01}' .
-				'\x{0D3B}-\x{0D3C}' .
-				'\x{0D41}-\x{0D44}' .
-				'\x{0D4D}' .
-				'\x{0D62}-\x{0D63}' .
-				'\x{1CDA}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0D00}-\\x{0D01}' .
+				'\\x{0D3B}-\\x{0D3C}' .
+				'\\x{0D41}-\\x{0D44}' .
+				'\\x{0D4D}' .
+				'\\x{0D62}-\\x{0D63}' .
+				'\\x{1CDA}',
 			'Virama' =>
-				'\x{0D4D}',
+				'\\x{0D4D}',
 			'Vowel_Dependent' =>
-				'\x{0D3E}-\x{0D40}' .
-				'\x{0D41}-\x{0D44}' .
-				'\x{0D46}-\x{0D48}' .
-				'\x{0D4A}-\x{0D4C}' .
-				'\x{0D57}' .
-				'\x{0D62}-\x{0D63}',
-		),
-		'Bengali' => array(
+				'\\x{0D3E}-\\x{0D40}' .
+				'\\x{0D41}-\\x{0D44}' .
+				'\\x{0D46}-\\x{0D48}' .
+				'\\x{0D4A}-\\x{0D4C}' .
+				'\\x{0D57}' .
+				'\\x{0D62}-\\x{0D63}',
+		],
+		'Bengali' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0980}-\x{0983}' .
-				'\x{0985}-\x{098C}' .
-				'\x{098F}-\x{0990}' .
-				'\x{0993}-\x{09A8}' .
-				'\x{09AA}-\x{09B0}' .
-				'\x{09B2}' .
-				'\x{09B6}-\x{09B9}' .
-				'\x{09BC}-\x{09C4}' .
-				'\x{09C7}-\x{09C8}' .
-				'\x{09CB}-\x{09CE}' .
-				'\x{09D7}' .
-				'\x{09DC}-\x{09DD}' .
-				'\x{09DF}-\x{09E3}' .
-				'\x{09E6}' .
-				'\x{09E6}-\x{09E9}' .
-				'\x{09E9}-\x{09EC}' .
-				'\x{09EC}-\x{09EF}' .
-				'\x{09EF}-\x{09FE}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CD5}' .
-				'\x{1CD8}' .
-				'\x{1CE1}' .
-				'\x{1CEA}' .
-				'\x{1CED}' .
-				'\x{1CF2}' .
-				'\x{1CF5}' .
-				'\x{1CF7}' .
-				'\x{A8F1}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0980}-\\x{0983}' .
+				'\\x{0985}-\\x{098C}' .
+				'\\x{098F}-\\x{0990}' .
+				'\\x{0993}-\\x{09A8}' .
+				'\\x{09AA}-\\x{09B0}' .
+				'\\x{09B2}' .
+				'\\x{09B6}-\\x{09B9}' .
+				'\\x{09BC}-\\x{09C4}' .
+				'\\x{09C7}-\\x{09C8}' .
+				'\\x{09CB}-\\x{09CE}' .
+				'\\x{09D7}' .
+				'\\x{09DC}-\\x{09DD}' .
+				'\\x{09DF}-\\x{09E3}' .
+				'\\x{09E6}' .
+				'\\x{09E6}-\\x{09E9}' .
+				'\\x{09E9}-\\x{09EC}' .
+				'\\x{09EC}-\\x{09EF}' .
+				'\\x{09EF}-\\x{09FE}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CD5}' .
+				'\\x{1CD8}' .
+				'\\x{1CE1}' .
+				'\\x{1CEA}' .
+				'\\x{1CED}' .
+				'\\x{1CF2}' .
+				'\\x{1CF5}' .
+				'\\x{1CF7}' .
+				'\\x{A8F1}',
 			'Letter' =>
-				'\x{0980}' .
-				'\x{0985}-\x{098C}' .
-				'\x{098F}-\x{0990}' .
-				'\x{0993}-\x{09A8}' .
-				'\x{09AA}-\x{09B0}' .
-				'\x{09B2}' .
-				'\x{09B6}-\x{09B9}' .
-				'\x{09BD}' .
-				'\x{09CE}' .
-				'\x{09DC}-\x{09DD}' .
-				'\x{09DF}-\x{09E1}' .
-				'\x{09F0}-\x{09F1}' .
-				'\x{09FC}' .
-				'\x{1CEA}' .
-				'\x{1CF2}' .
-				'\x{1CF5}',
+				'\\x{0980}' .
+				'\\x{0985}-\\x{098C}' .
+				'\\x{098F}-\\x{0990}' .
+				'\\x{0993}-\\x{09A8}' .
+				'\\x{09AA}-\\x{09B0}' .
+				'\\x{09B2}' .
+				'\\x{09B6}-\\x{09B9}' .
+				'\\x{09BD}' .
+				'\\x{09CE}' .
+				'\\x{09DC}-\\x{09DD}' .
+				'\\x{09DF}-\\x{09E1}' .
+				'\\x{09F0}-\\x{09F1}' .
+				'\\x{09FC}' .
+				'\\x{1CEA}' .
+				'\\x{1CF2}' .
+				'\\x{1CF5}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{09BC}' .
-				'\x{09CD}' .
-				'\x{09FE}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CD5}' .
-				'\x{1CD8}' .
-				'\x{1CED}' .
-				'\x{A8F1}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{09BC}' .
+				'\\x{09CD}' .
+				'\\x{09FE}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CD5}' .
+				'\\x{1CD8}' .
+				'\\x{1CED}' .
+				'\\x{A8F1}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0981}' .
-				'\x{09BC}' .
-				'\x{09C1}-\x{09C4}' .
-				'\x{09CD}' .
-				'\x{09E2}-\x{09E3}' .
-				'\x{09FE}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CD5}' .
-				'\x{1CD8}' .
-				'\x{1CED}' .
-				'\x{A8F1}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0981}' .
+				'\\x{09BC}' .
+				'\\x{09C1}-\\x{09C4}' .
+				'\\x{09CD}' .
+				'\\x{09E2}-\\x{09E3}' .
+				'\\x{09FE}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CD5}' .
+				'\\x{1CD8}' .
+				'\\x{1CED}' .
+				'\\x{A8F1}',
 			'Virama' =>
-				'\x{09CD}',
+				'\\x{09CD}',
 			'Vowel_Dependent' =>
-				'\x{09BE}-\x{09C0}' .
-				'\x{09C1}-\x{09C4}' .
-				'\x{09C7}-\x{09C8}' .
-				'\x{09CB}-\x{09CC}' .
-				'\x{09D7}' .
-				'\x{09E2}-\x{09E3}',
-		),
-		'Sinhala' => array(
+				'\\x{09BE}-\\x{09C0}' .
+				'\\x{09C1}-\\x{09C4}' .
+				'\\x{09C7}-\\x{09C8}' .
+				'\\x{09CB}-\\x{09CC}' .
+				'\\x{09D7}' .
+				'\\x{09E2}-\\x{09E3}',
+		],
+		'Sinhala' => [
 			'All' =>
-				'\x{0964}-\x{0965}' .
-				'\x{0D81}-\x{0D83}' .
-				'\x{0D85}-\x{0D96}' .
-				'\x{0D9A}-\x{0DB1}' .
-				'\x{0DB3}-\x{0DBB}' .
-				'\x{0DBD}' .
-				'\x{0DC0}-\x{0DC6}' .
-				'\x{0DCA}' .
-				'\x{0DCF}-\x{0DD4}' .
-				'\x{0DD6}' .
-				'\x{0DD8}-\x{0DDF}' .
-				'\x{0DE6}-\x{0DEF}' .
-				'\x{0DF2}-\x{0DF4}' .
-				'\x{111E1}-\x{111F4}',
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0D81}-\\x{0D83}' .
+				'\\x{0D85}-\\x{0D96}' .
+				'\\x{0D9A}-\\x{0DB1}' .
+				'\\x{0DB3}-\\x{0DBB}' .
+				'\\x{0DBD}' .
+				'\\x{0DC0}-\\x{0DC6}' .
+				'\\x{0DCA}' .
+				'\\x{0DCF}-\\x{0DD4}' .
+				'\\x{0DD6}' .
+				'\\x{0DD8}-\\x{0DDF}' .
+				'\\x{0DE6}-\\x{0DEF}' .
+				'\\x{0DF2}-\\x{0DF4}' .
+				'\\x{1CF2}' .
+				'\\x{111E1}-\\x{111F4}',
 			'Letter' =>
-				'\x{0D85}-\x{0D96}' .
-				'\x{0D9A}-\x{0DB1}' .
-				'\x{0DB3}-\x{0DBB}' .
-				'\x{0DBD}' .
-				'\x{0DC0}-\x{0DC6}',
+				'\\x{0D85}-\\x{0D96}' .
+				'\\x{0D9A}-\\x{0DB1}' .
+				'\\x{0DB3}-\\x{0DBB}' .
+				'\\x{0DBD}' .
+				'\\x{0DC0}-\\x{0DC6}' .
+				'\\x{1CF2}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0DCA}',
+				'\\x{0DCA}',
 			'Nonspacing_Mark' =>
-				'\x{0D81}' .
-				'\x{0DCA}' .
-				'\x{0DD2}-\x{0DD4}' .
-				'\x{0DD6}',
+				'\\x{0D81}' .
+				'\\x{0DCA}' .
+				'\\x{0DD2}-\\x{0DD4}' .
+				'\\x{0DD6}',
 			'Virama' =>
-				'\x{0DCA}',
+				'\\x{0DCA}',
 			'Vowel_Dependent' =>
-				'\x{0DCF}-\x{0DD1}' .
-				'\x{0DD2}-\x{0DD4}' .
-				'\x{0DD6}' .
-				'\x{0DD8}-\x{0DDF}' .
-				'\x{0DF2}-\x{0DF3}',
-		),
-		'Grantha' => array(
+				'\\x{0DCF}-\\x{0DD1}' .
+				'\\x{0DD2}-\\x{0DD4}' .
+				'\\x{0DD6}' .
+				'\\x{0DD8}-\\x{0DDF}' .
+				'\\x{0DF2}-\\x{0DF3}',
+		],
+		'Grantha' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0BE6}' .
-				'\x{0BE8}' .
-				'\x{0BEA}' .
-				'\x{0BEC}' .
-				'\x{0BEE}' .
-				'\x{0BF0}' .
-				'\x{0BF2}-\x{0BF3}' .
-				'\x{1CD0}' .
-				'\x{1CD2}-\x{1CD3}' .
-				'\x{1CF2}-\x{1CF4}' .
-				'\x{1CF9}' .
-				'\x{20F0}' .
-				'\x{11300}-\x{11301}' .
-				'\x{11301}-\x{11303}' .
-				'\x{11303}' .
-				'\x{11305}-\x{1130C}' .
-				'\x{1130F}-\x{11310}' .
-				'\x{11313}-\x{11328}' .
-				'\x{1132A}-\x{11330}' .
-				'\x{11332}-\x{11333}' .
-				'\x{11335}-\x{11339}' .
-				'\x{1133B}-\x{11344}' .
-				'\x{11347}-\x{11348}' .
-				'\x{1134B}-\x{1134D}' .
-				'\x{11350}' .
-				'\x{11357}' .
-				'\x{1135D}-\x{11363}' .
-				'\x{11366}-\x{1136C}' .
-				'\x{11370}-\x{11374}' .
-				'\x{11FD0}' .
-				'\x{11FD3}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0BE6}' .
+				'\\x{0BE8}' .
+				'\\x{0BEA}' .
+				'\\x{0BEC}' .
+				'\\x{0BEE}' .
+				'\\x{0BF0}' .
+				'\\x{0BF2}-\\x{0BF3}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}-\\x{1CD3}' .
+				'\\x{1CF2}-\\x{1CF4}' .
+				'\\x{1CF9}' .
+				'\\x{20F0}' .
+				'\\x{11300}-\\x{11301}' .
+				'\\x{11301}-\\x{11303}' .
+				'\\x{11303}' .
+				'\\x{11305}-\\x{1130C}' .
+				'\\x{1130F}-\\x{11310}' .
+				'\\x{11313}-\\x{11328}' .
+				'\\x{1132A}-\\x{11330}' .
+				'\\x{11332}-\\x{11333}' .
+				'\\x{11335}-\\x{11339}' .
+				'\\x{1133B}-\\x{11344}' .
+				'\\x{11347}-\\x{11348}' .
+				'\\x{1134B}-\\x{1134D}' .
+				'\\x{11350}' .
+				'\\x{11357}' .
+				'\\x{1135D}-\\x{11363}' .
+				'\\x{11366}-\\x{1136C}' .
+				'\\x{11370}-\\x{11374}' .
+				'\\x{11FD0}' .
+				'\\x{11FD3}',
 			'Letter' =>
-				'\x{1CF2}-\x{1CF3}' .
-				'\x{11305}-\x{1130C}' .
-				'\x{1130F}-\x{11310}' .
-				'\x{11313}-\x{11328}' .
-				'\x{1132A}-\x{11330}' .
-				'\x{11332}-\x{11333}' .
-				'\x{11335}-\x{11339}' .
-				'\x{1133D}' .
-				'\x{11350}' .
-				'\x{1135D}-\x{11361}',
+				'\\x{1CF2}-\\x{1CF3}' .
+				'\\x{11305}-\\x{1130C}' .
+				'\\x{1130F}-\\x{11310}' .
+				'\\x{11313}-\\x{11328}' .
+				'\\x{1132A}-\\x{11330}' .
+				'\\x{11332}-\\x{11333}' .
+				'\\x{11335}-\\x{11339}' .
+				'\\x{1133D}' .
+				'\\x{11350}' .
+				'\\x{1135D}-\\x{11361}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CF4}' .
-				'\x{1CF9}' .
-				'\x{20F0}' .
-				'\x{1133B}-\x{1133C}' .
-				'\x{11366}-\x{1136C}' .
-				'\x{11370}-\x{11374}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CF4}' .
+				'\\x{1CF9}' .
+				'\\x{20F0}' .
+				'\\x{1133B}-\\x{1133C}' .
+				'\\x{11366}-\\x{1136C}' .
+				'\\x{11370}-\\x{11374}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CF4}' .
-				'\x{1CF9}' .
-				'\x{20F0}' .
-				'\x{11300}-\x{11301}' .
-				'\x{11301}' .
-				'\x{1133B}-\x{1133C}' .
-				'\x{11340}' .
-				'\x{11366}-\x{1136C}' .
-				'\x{11370}-\x{11374}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CF4}' .
+				'\\x{1CF9}' .
+				'\\x{20F0}' .
+				'\\x{11300}-\\x{11301}' .
+				'\\x{11301}' .
+				'\\x{1133B}-\\x{1133C}' .
+				'\\x{11340}' .
+				'\\x{11366}-\\x{1136C}' .
+				'\\x{11370}-\\x{11374}',
 			'Virama' =>
-				'\x{1134D}',
+				'\\x{1134D}',
 			'Vowel_Dependent' =>
-				'\x{1133E}-\x{1133F}' .
-				'\x{11340}' .
-				'\x{11341}-\x{11344}' .
-				'\x{11347}-\x{11348}' .
-				'\x{1134B}-\x{1134C}' .
-				'\x{11357}' .
-				'\x{11362}-\x{11363}',
-		),
-		'Kannada' => array(
+				'\\x{1133E}-\\x{1133F}' .
+				'\\x{11340}' .
+				'\\x{11341}-\\x{11344}' .
+				'\\x{11347}-\\x{11348}' .
+				'\\x{1134B}-\\x{1134C}' .
+				'\\x{11357}' .
+				'\\x{11362}-\\x{11363}',
+		],
+		'Kannada' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0C80}-\x{0C8C}' .
-				'\x{0C8E}-\x{0C90}' .
-				'\x{0C92}-\x{0CA8}' .
-				'\x{0CAA}-\x{0CB3}' .
-				'\x{0CB5}-\x{0CB9}' .
-				'\x{0CBC}-\x{0CC4}' .
-				'\x{0CC6}-\x{0CC8}' .
-				'\x{0CCA}-\x{0CCD}' .
-				'\x{0CD5}-\x{0CD6}' .
-				'\x{0CDD}-\x{0CDE}' .
-				'\x{0CE0}-\x{0CE3}' .
-				'\x{0CE6}' .
-				'\x{0CE6}-\x{0CE8}' .
-				'\x{0CE8}-\x{0CEA}' .
-				'\x{0CEA}-\x{0CEC}' .
-				'\x{0CEC}-\x{0CEE}' .
-				'\x{0CEE}-\x{0CEF}' .
-				'\x{0CF1}-\x{0CF3}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CDA}' .
-				'\x{1CF2}' .
-				'\x{1CF4}' .
-				'\x{A835}' .
-				'\x{A838}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0C80}-\\x{0C8C}' .
+				'\\x{0C8E}-\\x{0C90}' .
+				'\\x{0C92}-\\x{0CA8}' .
+				'\\x{0CAA}-\\x{0CB3}' .
+				'\\x{0CB5}-\\x{0CB9}' .
+				'\\x{0CBC}-\\x{0CC4}' .
+				'\\x{0CC6}-\\x{0CC8}' .
+				'\\x{0CCA}-\\x{0CCD}' .
+				'\\x{0CD5}-\\x{0CD6}' .
+				'\\x{0CDD}-\\x{0CDE}' .
+				'\\x{0CE0}-\\x{0CE3}' .
+				'\\x{0CE6}' .
+				'\\x{0CE6}-\\x{0CE8}' .
+				'\\x{0CE8}-\\x{0CEA}' .
+				'\\x{0CEA}-\\x{0CEC}' .
+				'\\x{0CEC}-\\x{0CEE}' .
+				'\\x{0CEE}-\\x{0CEF}' .
+				'\\x{0CF1}-\\x{0CF3}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CDA}' .
+				'\\x{1CF2}' .
+				'\\x{1CF4}' .
+				'\\x{A835}' .
+				'\\x{A838}',
 			'Letter' =>
-				'\x{0C80}' .
-				'\x{0C85}-\x{0C8C}' .
-				'\x{0C8E}-\x{0C90}' .
-				'\x{0C92}-\x{0CA8}' .
-				'\x{0CAA}-\x{0CB3}' .
-				'\x{0CB5}-\x{0CB9}' .
-				'\x{0CBD}' .
-				'\x{0CDD}-\x{0CDE}' .
-				'\x{0CE0}-\x{0CE1}' .
-				'\x{0CF1}-\x{0CF2}' .
-				'\x{1CF2}',
+				'\\x{0C80}' .
+				'\\x{0C85}-\\x{0C8C}' .
+				'\\x{0C8E}-\\x{0C90}' .
+				'\\x{0C92}-\\x{0CA8}' .
+				'\\x{0CAA}-\\x{0CB3}' .
+				'\\x{0CB5}-\\x{0CB9}' .
+				'\\x{0CBD}' .
+				'\\x{0CDD}-\\x{0CDE}' .
+				'\\x{0CE0}-\\x{0CE1}' .
+				'\\x{0CF1}-\\x{0CF2}' .
+				'\\x{1CF2}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0CBC}' .
-				'\x{0CCD}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CDA}' .
-				'\x{1CF4}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0CBC}' .
+				'\\x{0CCD}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CDA}' .
+				'\\x{1CF4}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0C81}' .
-				'\x{0CBC}' .
-				'\x{0CBF}' .
-				'\x{0CC6}' .
-				'\x{0CCC}-\x{0CCD}' .
-				'\x{0CE2}-\x{0CE3}' .
-				'\x{1CD0}' .
-				'\x{1CD2}' .
-				'\x{1CDA}' .
-				'\x{1CF4}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0C81}' .
+				'\\x{0CBC}' .
+				'\\x{0CBF}' .
+				'\\x{0CC6}' .
+				'\\x{0CCC}-\\x{0CCD}' .
+				'\\x{0CE2}-\\x{0CE3}' .
+				'\\x{1CD0}' .
+				'\\x{1CD2}' .
+				'\\x{1CDA}' .
+				'\\x{1CF4}',
 			'Virama' =>
-				'\x{0CCD}',
+				'\\x{0CCD}',
 			'Vowel_Dependent' =>
-				'\x{0CBE}' .
-				'\x{0CBF}' .
-				'\x{0CC0}-\x{0CC4}' .
-				'\x{0CC6}' .
-				'\x{0CC7}-\x{0CC8}' .
-				'\x{0CCA}-\x{0CCB}' .
-				'\x{0CCC}' .
-				'\x{0CD5}-\x{0CD6}' .
-				'\x{0CE2}-\x{0CE3}',
-		),
-		'Telugu' => array(
+				'\\x{0CBE}' .
+				'\\x{0CBF}' .
+				'\\x{0CC0}-\\x{0CC4}' .
+				'\\x{0CC6}' .
+				'\\x{0CC7}-\\x{0CC8}' .
+				'\\x{0CCA}-\\x{0CCB}' .
+				'\\x{0CCC}' .
+				'\\x{0CD5}-\\x{0CD6}' .
+				'\\x{0CE2}-\\x{0CE3}',
+		],
+		'Telugu' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0C00}-\x{0C0C}' .
-				'\x{0C0E}-\x{0C10}' .
-				'\x{0C12}-\x{0C28}' .
-				'\x{0C2A}-\x{0C39}' .
-				'\x{0C3C}-\x{0C44}' .
-				'\x{0C46}-\x{0C48}' .
-				'\x{0C4A}-\x{0C4D}' .
-				'\x{0C55}-\x{0C56}' .
-				'\x{0C58}-\x{0C5A}' .
-				'\x{0C5D}' .
-				'\x{0C60}-\x{0C63}' .
-				'\x{0C66}-\x{0C6F}' .
-				'\x{0C77}-\x{0C7F}' .
-				'\x{1CDA}' .
-				'\x{1CF2}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0C00}-\\x{0C0C}' .
+				'\\x{0C0E}-\\x{0C10}' .
+				'\\x{0C12}-\\x{0C28}' .
+				'\\x{0C2A}-\\x{0C39}' .
+				'\\x{0C3C}-\\x{0C44}' .
+				'\\x{0C46}-\\x{0C48}' .
+				'\\x{0C4A}-\\x{0C4D}' .
+				'\\x{0C55}-\\x{0C56}' .
+				'\\x{0C58}-\\x{0C5A}' .
+				'\\x{0C5D}' .
+				'\\x{0C60}-\\x{0C63}' .
+				'\\x{0C66}-\\x{0C6F}' .
+				'\\x{0C77}-\\x{0C7F}' .
+				'\\x{1CDA}' .
+				'\\x{1CF2}',
 			'Letter' =>
-				'\x{0C05}-\x{0C0C}' .
-				'\x{0C0E}-\x{0C10}' .
-				'\x{0C12}-\x{0C28}' .
-				'\x{0C2A}-\x{0C39}' .
-				'\x{0C3D}' .
-				'\x{0C58}-\x{0C5A}' .
-				'\x{0C5D}' .
-				'\x{0C60}-\x{0C61}' .
-				'\x{1CF2}',
+				'\\x{0C05}-\\x{0C0C}' .
+				'\\x{0C0E}-\\x{0C10}' .
+				'\\x{0C12}-\\x{0C28}' .
+				'\\x{0C2A}-\\x{0C39}' .
+				'\\x{0C3D}' .
+				'\\x{0C58}-\\x{0C5A}' .
+				'\\x{0C5D}' .
+				'\\x{0C60}-\\x{0C61}' .
+				'\\x{1CF2}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0C3C}' .
-				'\x{0C4D}' .
-				'\x{0C55}-\x{0C56}' .
-				'\x{1CDA}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0C3C}' .
+				'\\x{0C4D}' .
+				'\\x{0C55}-\\x{0C56}' .
+				'\\x{1CDA}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0C00}' .
-				'\x{0C04}' .
-				'\x{0C3C}' .
-				'\x{0C3E}-\x{0C40}' .
-				'\x{0C46}-\x{0C48}' .
-				'\x{0C4A}-\x{0C4D}' .
-				'\x{0C55}-\x{0C56}' .
-				'\x{0C62}-\x{0C63}' .
-				'\x{1CDA}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0C00}' .
+				'\\x{0C04}' .
+				'\\x{0C3C}' .
+				'\\x{0C3E}-\\x{0C40}' .
+				'\\x{0C46}-\\x{0C48}' .
+				'\\x{0C4A}-\\x{0C4D}' .
+				'\\x{0C55}-\\x{0C56}' .
+				'\\x{0C62}-\\x{0C63}' .
+				'\\x{1CDA}',
 			'Virama' =>
-				'\x{0C4D}',
+				'\\x{0C4D}',
 			'Vowel_Dependent' =>
-				'\x{0C3E}-\x{0C40}' .
-				'\x{0C41}-\x{0C44}' .
-				'\x{0C46}-\x{0C48}' .
-				'\x{0C4A}-\x{0C4C}' .
-				'\x{0C55}-\x{0C56}' .
-				'\x{0C62}-\x{0C63}',
-		),
-		'Gujarati' => array(
+				'\\x{0C3E}-\\x{0C40}' .
+				'\\x{0C41}-\\x{0C44}' .
+				'\\x{0C46}-\\x{0C48}' .
+				'\\x{0C4A}-\\x{0C4C}' .
+				'\\x{0C55}-\\x{0C56}' .
+				'\\x{0C62}-\\x{0C63}',
+		],
+		'Gujarati' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0A81}-\x{0A83}' .
-				'\x{0A85}-\x{0A8D}' .
-				'\x{0A8F}-\x{0A91}' .
-				'\x{0A93}-\x{0AA8}' .
-				'\x{0AAA}-\x{0AB0}' .
-				'\x{0AB2}-\x{0AB3}' .
-				'\x{0AB5}-\x{0AB9}' .
-				'\x{0ABC}-\x{0AC5}' .
-				'\x{0AC7}-\x{0AC9}' .
-				'\x{0ACB}-\x{0ACD}' .
-				'\x{0AD0}' .
-				'\x{0AE0}-\x{0AE3}' .
-				'\x{0AE6}' .
-				'\x{0AE6}-\x{0AE8}' .
-				'\x{0AE8}-\x{0AEA}' .
-				'\x{0AEA}-\x{0AEC}' .
-				'\x{0AEC}-\x{0AEE}' .
-				'\x{0AEE}-\x{0AF1}' .
-				'\x{0AF9}-\x{0AFF}' .
-				'\x{A832}' .
-				'\x{A835}' .
-				'\x{A838}' .
-				'\x{A838}-\x{A839}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0A81}-\\x{0A83}' .
+				'\\x{0A85}-\\x{0A8D}' .
+				'\\x{0A8F}-\\x{0A91}' .
+				'\\x{0A93}-\\x{0AA8}' .
+				'\\x{0AAA}-\\x{0AB0}' .
+				'\\x{0AB2}-\\x{0AB3}' .
+				'\\x{0AB5}-\\x{0AB9}' .
+				'\\x{0ABC}-\\x{0AC5}' .
+				'\\x{0AC7}-\\x{0AC9}' .
+				'\\x{0ACB}-\\x{0ACD}' .
+				'\\x{0AD0}' .
+				'\\x{0AE0}-\\x{0AE3}' .
+				'\\x{0AE6}' .
+				'\\x{0AE6}-\\x{0AE8}' .
+				'\\x{0AE8}-\\x{0AEA}' .
+				'\\x{0AEA}-\\x{0AEC}' .
+				'\\x{0AEC}-\\x{0AEE}' .
+				'\\x{0AEE}-\\x{0AF1}' .
+				'\\x{0AF9}-\\x{0AFF}' .
+				'\\x{A832}' .
+				'\\x{A835}' .
+				'\\x{A838}' .
+				'\\x{A838}-\\x{A839}',
 			'Letter' =>
-				'\x{0A85}-\x{0A8D}' .
-				'\x{0A8F}-\x{0A91}' .
-				'\x{0A93}-\x{0AA8}' .
-				'\x{0AAA}-\x{0AB0}' .
-				'\x{0AB2}-\x{0AB3}' .
-				'\x{0AB5}-\x{0AB9}' .
-				'\x{0ABD}' .
-				'\x{0AD0}' .
-				'\x{0AE0}-\x{0AE1}' .
-				'\x{0AF9}',
+				'\\x{0A85}-\\x{0A8D}' .
+				'\\x{0A8F}-\\x{0A91}' .
+				'\\x{0A93}-\\x{0AA8}' .
+				'\\x{0AAA}-\\x{0AB0}' .
+				'\\x{0AB2}-\\x{0AB3}' .
+				'\\x{0AB5}-\\x{0AB9}' .
+				'\\x{0ABD}' .
+				'\\x{0AD0}' .
+				'\\x{0AE0}-\\x{0AE1}' .
+				'\\x{0AF9}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0ABC}' .
-				'\x{0ACD}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0ABC}' .
+				'\\x{0ACD}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0A81}-\x{0A82}' .
-				'\x{0ABC}' .
-				'\x{0AC1}-\x{0AC5}' .
-				'\x{0AC7}-\x{0AC8}' .
-				'\x{0ACD}' .
-				'\x{0AE2}-\x{0AE3}' .
-				'\x{0AFA}-\x{0AFF}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0A81}-\\x{0A82}' .
+				'\\x{0ABC}' .
+				'\\x{0AC1}-\\x{0AC5}' .
+				'\\x{0AC7}-\\x{0AC8}' .
+				'\\x{0ACD}' .
+				'\\x{0AE2}-\\x{0AE3}' .
+				'\\x{0AFA}-\\x{0AFF}',
 			'Virama' =>
-				'\x{0ACD}',
+				'\\x{0ACD}',
 			'Vowel_Dependent' =>
-				'\x{0ABE}-\x{0AC0}' .
-				'\x{0AC1}-\x{0AC5}' .
-				'\x{0AC7}-\x{0AC8}' .
-				'\x{0AC9}' .
-				'\x{0ACB}-\x{0ACC}' .
-				'\x{0AE2}-\x{0AE3}',
-		),
-		'Sharada' => array(
+				'\\x{0ABE}-\\x{0AC0}' .
+				'\\x{0AC1}-\\x{0AC5}' .
+				'\\x{0AC7}-\\x{0AC8}' .
+				'\\x{0AC9}' .
+				'\\x{0ACB}-\\x{0ACC}' .
+				'\\x{0AE2}-\\x{0AE3}',
+		],
+		'Sharada' => [
 			'All' =>
-				'\x{0951}' .
-				'\x{1CD7}' .
-				'\x{1CD9}' .
-				'\x{1CDD}' .
-				'\x{1CE0}' .
-				'\x{11180}-\x{111DF}',
+				'\\x{0951}' .
+				'\\x{1CD7}' .
+				'\\x{1CD9}' .
+				'\\x{1CDD}' .
+				'\\x{1CE0}' .
+				'\\x{A838}' .
+				'\\x{A83B}' .
+				'\\x{A83D}' .
+				'\\x{11180}-\\x{111DF}',
 			'Letter' =>
-				'\x{11183}-\x{111B2}' .
-				'\x{111C1}-\x{111C4}' .
-				'\x{111DA}' .
-				'\x{111DC}',
+				'\\x{11183}-\\x{111B2}' .
+				'\\x{111C1}-\\x{111C4}' .
+				'\\x{111DA}' .
+				'\\x{111DC}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}' .
-				'\x{1CD7}' .
-				'\x{1CD9}' .
-				'\x{1CDD}' .
-				'\x{1CE0}' .
-				'\x{111CA}',
+				'\\x{0951}' .
+				'\\x{1CD7}' .
+				'\\x{1CD9}' .
+				'\\x{1CDD}' .
+				'\\x{1CE0}' .
+				'\\x{111CA}',
 			'Nonspacing_Mark' =>
-				'\x{0951}' .
-				'\x{1CD7}' .
-				'\x{1CD9}' .
-				'\x{1CDD}' .
-				'\x{1CE0}' .
-				'\x{11180}-\x{11181}' .
-				'\x{111B6}-\x{111BE}' .
-				'\x{111C9}-\x{111CC}' .
-				'\x{111CF}',
+				'\\x{0951}' .
+				'\\x{1CD7}' .
+				'\\x{1CD9}' .
+				'\\x{1CDD}' .
+				'\\x{1CE0}' .
+				'\\x{11180}-\\x{11181}' .
+				'\\x{111B6}-\\x{111BE}' .
+				'\\x{111C9}-\\x{111CC}' .
+				'\\x{111CF}',
 			'Virama' =>
-				'\x{111C0}',
+				'\\x{111C0}',
 			'Vowel_Dependent' =>
-				'\x{111B3}-\x{111B5}' .
-				'\x{111B6}-\x{111BE}' .
-				'\x{111BF}' .
-				'\x{111CB}-\x{111CC}' .
-				'\x{111CE}',
-		),
-		'Oriya' => array(
+				'\\x{111B3}-\\x{111B5}' .
+				'\\x{111B6}-\\x{111BE}' .
+				'\\x{111BF}' .
+				'\\x{111CB}-\\x{111CC}' .
+				'\\x{111CE}',
+		],
+		'Oriya' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0B01}-\x{0B03}' .
-				'\x{0B05}-\x{0B0C}' .
-				'\x{0B0F}-\x{0B10}' .
-				'\x{0B13}-\x{0B28}' .
-				'\x{0B2A}-\x{0B30}' .
-				'\x{0B32}-\x{0B33}' .
-				'\x{0B35}-\x{0B39}' .
-				'\x{0B3C}-\x{0B44}' .
-				'\x{0B47}-\x{0B48}' .
-				'\x{0B4B}-\x{0B4D}' .
-				'\x{0B55}-\x{0B57}' .
-				'\x{0B5C}-\x{0B5D}' .
-				'\x{0B5F}-\x{0B63}' .
-				'\x{0B66}-\x{0B77}' .
-				'\x{1CDA}' .
-				'\x{1CF2}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0B01}-\\x{0B03}' .
+				'\\x{0B05}-\\x{0B0C}' .
+				'\\x{0B0F}-\\x{0B10}' .
+				'\\x{0B13}-\\x{0B28}' .
+				'\\x{0B2A}-\\x{0B30}' .
+				'\\x{0B32}-\\x{0B33}' .
+				'\\x{0B35}-\\x{0B39}' .
+				'\\x{0B3C}-\\x{0B44}' .
+				'\\x{0B47}-\\x{0B48}' .
+				'\\x{0B4B}-\\x{0B4D}' .
+				'\\x{0B55}-\\x{0B57}' .
+				'\\x{0B5C}-\\x{0B5D}' .
+				'\\x{0B5F}-\\x{0B63}' .
+				'\\x{0B66}-\\x{0B77}' .
+				'\\x{1CDA}' .
+				'\\x{1CF2}',
 			'Letter' =>
-				'\x{0B05}-\x{0B0C}' .
-				'\x{0B0F}-\x{0B10}' .
-				'\x{0B13}-\x{0B28}' .
-				'\x{0B2A}-\x{0B30}' .
-				'\x{0B32}-\x{0B33}' .
-				'\x{0B35}-\x{0B39}' .
-				'\x{0B3D}' .
-				'\x{0B5C}-\x{0B5D}' .
-				'\x{0B5F}-\x{0B61}' .
-				'\x{0B71}' .
-				'\x{1CF2}',
+				'\\x{0B05}-\\x{0B0C}' .
+				'\\x{0B0F}-\\x{0B10}' .
+				'\\x{0B13}-\\x{0B28}' .
+				'\\x{0B2A}-\\x{0B30}' .
+				'\\x{0B32}-\\x{0B33}' .
+				'\\x{0B35}-\\x{0B39}' .
+				'\\x{0B3D}' .
+				'\\x{0B5C}-\\x{0B5D}' .
+				'\\x{0B5F}-\\x{0B61}' .
+				'\\x{0B71}' .
+				'\\x{1CF2}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0B3C}' .
-				'\x{0B4D}' .
-				'\x{1CDA}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0B3C}' .
+				'\\x{0B4D}' .
+				'\\x{1CDA}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0B01}' .
-				'\x{0B3C}' .
-				'\x{0B3F}' .
-				'\x{0B41}-\x{0B44}' .
-				'\x{0B4D}' .
-				'\x{0B55}-\x{0B56}' .
-				'\x{0B62}-\x{0B63}' .
-				'\x{1CDA}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0B01}' .
+				'\\x{0B3C}' .
+				'\\x{0B3F}' .
+				'\\x{0B41}-\\x{0B44}' .
+				'\\x{0B4D}' .
+				'\\x{0B55}-\\x{0B56}' .
+				'\\x{0B62}-\\x{0B63}' .
+				'\\x{1CDA}',
 			'Virama' =>
-				'\x{0B4D}',
+				'\\x{0B4D}',
 			'Vowel_Dependent' =>
-				'\x{0B3E}' .
-				'\x{0B3F}' .
-				'\x{0B40}' .
-				'\x{0B41}-\x{0B44}' .
-				'\x{0B47}-\x{0B48}' .
-				'\x{0B4B}-\x{0B4C}' .
-				'\x{0B55}-\x{0B56}' .
-				'\x{0B57}' .
-				'\x{0B62}-\x{0B63}',
-		),
-		'Gurmukhi' => array(
+				'\\x{0B3E}' .
+				'\\x{0B3F}' .
+				'\\x{0B40}' .
+				'\\x{0B41}-\\x{0B44}' .
+				'\\x{0B47}-\\x{0B48}' .
+				'\\x{0B4B}-\\x{0B4C}' .
+				'\\x{0B55}-\\x{0B56}' .
+				'\\x{0B57}' .
+				'\\x{0B62}-\\x{0B63}',
+		],
+		'Gurmukhi' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{0A01}-\x{0A03}' .
-				'\x{0A05}-\x{0A0A}' .
-				'\x{0A0F}-\x{0A10}' .
-				'\x{0A13}-\x{0A28}' .
-				'\x{0A2A}-\x{0A30}' .
-				'\x{0A32}-\x{0A33}' .
-				'\x{0A35}-\x{0A36}' .
-				'\x{0A38}-\x{0A39}' .
-				'\x{0A3C}' .
-				'\x{0A3E}-\x{0A42}' .
-				'\x{0A47}-\x{0A48}' .
-				'\x{0A4B}-\x{0A4D}' .
-				'\x{0A51}' .
-				'\x{0A59}-\x{0A5C}' .
-				'\x{0A5E}' .
-				'\x{0A66}' .
-				'\x{0A66}-\x{0A68}' .
-				'\x{0A68}-\x{0A6A}' .
-				'\x{0A6A}-\x{0A6C}' .
-				'\x{0A6C}-\x{0A6E}' .
-				'\x{0A6E}-\x{0A76}' .
-				'\x{A833}' .
-				'\x{A836}' .
-				'\x{A838}-\x{A839}' .
-				'\x{A839}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0A01}-\\x{0A03}' .
+				'\\x{0A05}-\\x{0A0A}' .
+				'\\x{0A0F}-\\x{0A10}' .
+				'\\x{0A13}-\\x{0A28}' .
+				'\\x{0A2A}-\\x{0A30}' .
+				'\\x{0A32}-\\x{0A33}' .
+				'\\x{0A35}-\\x{0A36}' .
+				'\\x{0A38}-\\x{0A39}' .
+				'\\x{0A3C}' .
+				'\\x{0A3E}-\\x{0A42}' .
+				'\\x{0A47}-\\x{0A48}' .
+				'\\x{0A4B}-\\x{0A4D}' .
+				'\\x{0A51}' .
+				'\\x{0A59}-\\x{0A5C}' .
+				'\\x{0A5E}' .
+				'\\x{0A66}' .
+				'\\x{0A66}-\\x{0A68}' .
+				'\\x{0A68}-\\x{0A6A}' .
+				'\\x{0A6A}-\\x{0A6C}' .
+				'\\x{0A6C}-\\x{0A6E}' .
+				'\\x{0A6E}-\\x{0A76}' .
+				'\\x{A833}' .
+				'\\x{A836}' .
+				'\\x{A838}-\\x{A839}' .
+				'\\x{A839}',
 			'Letter' =>
-				'\x{0A05}-\x{0A0A}' .
-				'\x{0A0F}-\x{0A10}' .
-				'\x{0A13}-\x{0A28}' .
-				'\x{0A2A}-\x{0A30}' .
-				'\x{0A32}-\x{0A33}' .
-				'\x{0A35}-\x{0A36}' .
-				'\x{0A38}-\x{0A39}' .
-				'\x{0A59}-\x{0A5C}' .
-				'\x{0A5E}' .
-				'\x{0A72}-\x{0A74}',
+				'\\x{0A05}-\\x{0A0A}' .
+				'\\x{0A0F}-\\x{0A10}' .
+				'\\x{0A13}-\\x{0A28}' .
+				'\\x{0A2A}-\\x{0A30}' .
+				'\\x{0A32}-\\x{0A33}' .
+				'\\x{0A35}-\\x{0A36}' .
+				'\\x{0A38}-\\x{0A39}' .
+				'\\x{0A59}-\\x{0A5C}' .
+				'\\x{0A5E}' .
+				'\\x{0A72}-\\x{0A74}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0A3C}' .
-				'\x{0A4D}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0A3C}' .
+				'\\x{0A4D}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0A01}-\x{0A02}' .
-				'\x{0A3C}' .
-				'\x{0A41}-\x{0A42}' .
-				'\x{0A47}-\x{0A48}' .
-				'\x{0A4B}-\x{0A4D}' .
-				'\x{0A51}' .
-				'\x{0A70}-\x{0A71}' .
-				'\x{0A75}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0A01}-\\x{0A02}' .
+				'\\x{0A3C}' .
+				'\\x{0A41}-\\x{0A42}' .
+				'\\x{0A47}-\\x{0A48}' .
+				'\\x{0A4B}-\\x{0A4D}' .
+				'\\x{0A51}' .
+				'\\x{0A70}-\\x{0A71}' .
+				'\\x{0A75}',
 			'Virama' =>
-				'\x{0A4D}',
+				'\\x{0A4D}',
 			'Vowel_Dependent' =>
-				'\x{0A3E}-\x{0A40}' .
-				'\x{0A41}-\x{0A42}' .
-				'\x{0A47}-\x{0A48}' .
-				'\x{0A4B}-\x{0A4C}',
-		),
-		'Tirhuta' => array(
+				'\\x{0A3E}-\\x{0A40}' .
+				'\\x{0A41}-\\x{0A42}' .
+				'\\x{0A47}-\\x{0A48}' .
+				'\\x{0A4B}-\\x{0A4C}',
+		],
+		'Tirhuta' => [
 			'All' =>
-				'\x{0951}-\x{0952}' .
-				'\x{0964}-\x{0965}' .
-				'\x{1CF2}' .
-				'\x{A838}-\x{A839}' .
-				'\x{A83D}' .
-				'\x{A83F}-\x{A840}' .
-				'\x{11480}-\x{114C7}' .
-				'\x{114D0}-\x{114D9}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{0964}-\\x{0965}' .
+				'\\x{1CF2}' .
+				'\\x{A838}-\\x{A839}' .
+				'\\x{A83E}' .
+				'\\x{A840}' .
+				'\\x{11480}-\\x{114C7}' .
+				'\\x{114D0}-\\x{114D9}',
 			'Letter' =>
-				'\x{1CF2}' .
-				'\x{A840}' .
-				'\x{11480}-\x{114AF}' .
-				'\x{114C4}-\x{114C5}' .
-				'\x{114C7}',
+				'\\x{1CF2}' .
+				'\\x{A840}' .
+				'\\x{11480}-\\x{114AF}' .
+				'\\x{114C4}-\\x{114C5}' .
+				'\\x{114C7}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{114C2}-\x{114C3}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{114C2}-\\x{114C3}',
 			'Nonspacing_Mark' =>
-				'\x{0951}-\x{0952}' .
-				'\x{114B3}-\x{114B8}' .
-				'\x{114BA}' .
-				'\x{114BF}-\x{114C0}' .
-				'\x{114C2}-\x{114C3}',
+				'\\x{0951}-\\x{0952}' .
+				'\\x{114B3}-\\x{114B8}' .
+				'\\x{114BA}' .
+				'\\x{114BF}-\\x{114C0}' .
+				'\\x{114C2}-\\x{114C3}',
 			'Virama' =>
-				'\x{114C2}',
+				'\\x{114C2}',
 			'Vowel_Dependent' =>
-				'\x{114B0}-\x{114B2}' .
-				'\x{114B3}-\x{114B8}' .
-				'\x{114B9}' .
-				'\x{114BA}' .
-				'\x{114BB}-\x{114BE}',
-		),
-		'Kaithi' => array(
+				'\\x{114B0}-\\x{114B2}' .
+				'\\x{114B3}-\\x{114B8}' .
+				'\\x{114B9}' .
+				'\\x{114BA}' .
+				'\\x{114BB}-\\x{114BE}',
+		],
+		'Kaithi' => [
 			'All' =>
-				'\x{0968}' .
-				'\x{096C}' .
-				'\x{0970}' .
-				'\x{A836}' .
-				'\x{A838}-\x{A839}' .
-				'\x{A839}' .
-				'\x{A83B}' .
-				'\x{11080}-\x{110C2}' .
-				'\x{110CD}',
+				'\\x{0968}' .
+				'\\x{096C}' .
+				'\\x{0970}' .
+				'\\x{A836}' .
+				'\\x{A838}-\\x{A839}' .
+				'\\x{A839}' .
+				'\\x{A83B}' .
+				'\\x{11080}-\\x{110C2}' .
+				'\\x{110CD}',
 			'Letter' =>
-				'\x{11083}-\x{110AF}',
+				'\\x{11083}-\\x{110AF}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{110B9}-\x{110BA}',
+				'\\x{110B9}-\\x{110BA}',
 			'Nonspacing_Mark' =>
-				'\x{11080}-\x{11081}' .
-				'\x{110B3}-\x{110B6}' .
-				'\x{110B9}-\x{110BA}' .
-				'\x{110C2}',
+				'\\x{11080}-\\x{11081}' .
+				'\\x{110B3}-\\x{110B6}' .
+				'\\x{110B9}-\\x{110BA}' .
+				'\\x{110C2}',
 			'Virama' =>
-				'\x{110B9}',
+				'\\x{110B9}',
 			'Vowel_Dependent' =>
-				'\x{110B0}-\x{110B2}' .
-				'\x{110B3}-\x{110B6}' .
-				'\x{110B7}-\x{110B8}' .
-				'\x{110C2}',
-		),
-		'Nandinagari' => array(
+				'\\x{110B0}-\\x{110B2}' .
+				'\\x{110B3}-\\x{110B6}' .
+				'\\x{110B7}-\\x{110B8}' .
+				'\\x{110C2}',
+		],
+		'Nandinagari' => [
 			'All' =>
-				'\x{0964}-\x{0965}' .
-				'\x{0CE7}' .
-				'\x{0CE9}' .
-				'\x{0CEB}' .
-				'\x{0CED}' .
-				'\x{0CEF}' .
-				'\x{1CE9}' .
-				'\x{1CF2}' .
-				'\x{1CFA}' .
-				'\x{A83A}' .
-				'\x{A83C}' .
-				'\x{119A0}-\x{119A7}' .
-				'\x{119AA}-\x{119D7}' .
-				'\x{119DA}-\x{119E4}',
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0CE7}' .
+				'\\x{0CE9}' .
+				'\\x{0CEB}' .
+				'\\x{0CED}' .
+				'\\x{0CEF}' .
+				'\\x{1CE9}' .
+				'\\x{1CF2}' .
+				'\\x{1CFA}' .
+				'\\x{A83A}' .
+				'\\x{A83C}' .
+				'\\x{119A0}-\\x{119A7}' .
+				'\\x{119AA}-\\x{119D7}' .
+				'\\x{119DA}-\\x{119E4}',
 			'Letter' =>
-				'\x{1CE9}' .
-				'\x{1CF2}' .
-				'\x{1CFA}' .
-				'\x{119A0}-\x{119A7}' .
-				'\x{119AA}-\x{119D0}' .
-				'\x{119E1}' .
-				'\x{119E3}',
+				'\\x{1CE9}' .
+				'\\x{1CF2}' .
+				'\\x{1CFA}' .
+				'\\x{119A0}-\\x{119A7}' .
+				'\\x{119AA}-\\x{119D0}' .
+				'\\x{119E1}' .
+				'\\x{119E3}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{119E0}',
+				'\\x{119E0}',
 			'Nonspacing_Mark' =>
-				'\x{119D4}-\x{119D7}' .
-				'\x{119DA}-\x{119DB}' .
-				'\x{119E0}',
+				'\\x{119D4}-\\x{119D7}' .
+				'\\x{119DA}-\\x{119DB}' .
+				'\\x{119E0}',
 			'Virama' =>
-				'\x{119E0}',
+				'\\x{119E0}',
 			'Vowel_Dependent' =>
-				'\x{119D1}-\x{119D3}' .
-				'\x{119D4}-\x{119D7}' .
-				'\x{119DA}-\x{119DB}' .
-				'\x{119DC}-\x{119DD}' .
-				'\x{119E4}',
-		),
-		'Khojki' => array(
+				'\\x{119D1}-\\x{119D3}' .
+				'\\x{119D4}-\\x{119D7}' .
+				'\\x{119DA}-\\x{119DB}' .
+				'\\x{119DC}-\\x{119DD}' .
+				'\\x{119E4}',
+		],
+		'Khojki' => [
 			'All' =>
-				'\x{0AE7}' .
-				'\x{0AE9}' .
-				'\x{0AEB}' .
-				'\x{0AED}' .
-				'\x{0AEF}' .
-				'\x{A834}' .
-				'\x{A837}-\x{A83A}' .
-				'\x{11200}-\x{11211}' .
-				'\x{11213}-\x{11241}',
+				'\\x{0AE7}' .
+				'\\x{0AE9}' .
+				'\\x{0AEB}' .
+				'\\x{0AED}' .
+				'\\x{0AEF}' .
+				'\\x{A834}' .
+				'\\x{A837}-\\x{A83A}' .
+				'\\x{11200}-\\x{11211}' .
+				'\\x{11213}-\\x{11241}',
 			'Letter' =>
-				'\x{11200}-\x{11211}' .
-				'\x{11213}-\x{1122B}' .
-				'\x{1123F}-\x{11240}',
+				'\\x{11200}-\\x{11211}' .
+				'\\x{11213}-\\x{1122B}' .
+				'\\x{1123F}-\\x{11240}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{11236}',
+				'\\x{11236}',
 			'Nonspacing_Mark' =>
-				'\x{1122F}-\x{11231}' .
-				'\x{11234}' .
-				'\x{11236}-\x{11237}' .
-				'\x{1123E}' .
-				'\x{11241}',
+				'\\x{1122F}-\\x{11231}' .
+				'\\x{11234}' .
+				'\\x{11236}-\\x{11237}' .
+				'\\x{1123E}' .
+				'\\x{11241}',
 			'Virama' =>
-				'\x{11235}',
+				'\\x{11235}',
 			'Vowel_Dependent' =>
-				'\x{1122C}-\x{1122E}' .
-				'\x{1122F}-\x{11231}' .
-				'\x{11232}-\x{11233}' .
-				'\x{11241}',
-		),
-		'Takri' => array(
+				'\\x{1122C}-\\x{1122E}' .
+				'\\x{1122F}-\\x{11231}' .
+				'\\x{11232}-\\x{11233}' .
+				'\\x{11241}',
+		],
+		'Takri' => [
 			'All' =>
-				'\x{0964}-\x{0965}' .
-				'\x{A838}-\x{A839}' .
-				'\x{A83C}' .
-				'\x{A83E}-\x{A83F}' .
-				'\x{11680}-\x{116B9}' .
-				'\x{116C0}-\x{116C9}',
+				'\\x{0964}-\\x{0965}' .
+				'\\x{A838}-\\x{A839}' .
+				'\\x{A83D}' .
+				'\\x{A83F}' .
+				'\\x{11680}-\\x{116B9}' .
+				'\\x{116C0}-\\x{116C9}',
 			'Letter' =>
-				'\x{11680}-\x{116AA}' .
-				'\x{116B8}',
+				'\\x{11680}-\\x{116AA}' .
+				'\\x{116B8}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{116B7}',
+				'\\x{116B7}',
 			'Nonspacing_Mark' =>
-				'\x{116AB}' .
-				'\x{116AD}' .
-				'\x{116B0}-\x{116B5}' .
-				'\x{116B7}',
+				'\\x{116AB}' .
+				'\\x{116AD}' .
+				'\\x{116B0}-\\x{116B5}' .
+				'\\x{116B7}',
 			'Virama' =>
-				'\x{116B6}',
+				'\\x{116B6}',
 			'Vowel_Dependent' =>
-				'\x{116AD}' .
-				'\x{116AE}-\x{116AF}' .
-				'\x{116B0}-\x{116B5}',
-		),
-		'Dogra' => array(
+				'\\x{116AD}' .
+				'\\x{116AE}-\\x{116AF}' .
+				'\\x{116B0}-\\x{116B5}',
+		],
+		'Dogra' => [
 			'All' =>
-				'\x{0964}-\x{0965}' .
-				'\x{0967}' .
-				'\x{096B}' .
-				'\x{096F}' .
-				'\x{A831}' .
-				'\x{A834}' .
-				'\x{A837}-\x{A839}' .
-				'\x{11800}-\x{1183B}',
+				'\\x{0964}-\\x{0965}' .
+				'\\x{0967}' .
+				'\\x{096B}' .
+				'\\x{096F}' .
+				'\\x{A831}' .
+				'\\x{A834}' .
+				'\\x{A837}-\\x{A839}' .
+				'\\x{11800}-\\x{1183B}',
 			'Letter' =>
-				'\x{11800}-\x{1182B}',
+				'\\x{11800}-\\x{1182B}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{11839}-\x{1183A}',
+				'\\x{11839}-\\x{1183A}',
 			'Nonspacing_Mark' =>
-				'\x{1182F}-\x{11837}' .
-				'\x{11839}-\x{1183A}',
+				'\\x{1182F}-\\x{11837}' .
+				'\\x{11839}-\\x{1183A}',
 			'Virama' =>
-				'\x{11839}',
+				'\\x{11839}',
 			'Vowel_Dependent' =>
-				'\x{1182C}-\x{1182E}' .
-				'\x{1182F}-\x{11836}',
-		),
-		'Syloti_Nagri' => array(
+				'\\x{1182C}-\\x{1182E}' .
+				'\\x{1182F}-\\x{11836}',
+		],
+		'Syloti_Nagri' => [
 			'All' =>
-				'\x{0964}-\x{0965}' .
-				'\x{09E8}' .
-				'\x{09EB}' .
-				'\x{09EE}' .
-				'\x{09F1}' .
-				'\x{A800}-\x{A82C}',
+				'\\x{0964}-\\x{0965}' .
+				'\\x{09E8}' .
+				'\\x{09EB}' .
+				'\\x{09EE}' .
+				'\\x{09F1}' .
+				'\\x{A800}-\\x{A82C}',
 			'Letter' =>
-				'\x{09F1}' .
-				'\x{A800}-\x{A801}' .
-				'\x{A803}-\x{A805}' .
-				'\x{A807}-\x{A80A}' .
-				'\x{A80C}-\x{A822}',
+				'\\x{09F1}' .
+				'\\x{A800}-\\x{A801}' .
+				'\\x{A803}-\\x{A805}' .
+				'\\x{A807}-\\x{A80A}' .
+				'\\x{A80C}-\\x{A822}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{A806}' .
-				'\x{A82C}',
+				'\\x{A806}' .
+				'\\x{A82C}',
 			'Nonspacing_Mark' =>
-				'\x{A802}' .
-				'\x{A806}' .
-				'\x{A80B}' .
-				'\x{A825}-\x{A826}' .
-				'\x{A82C}',
+				'\\x{A802}' .
+				'\\x{A806}' .
+				'\\x{A80B}' .
+				'\\x{A825}-\\x{A826}' .
+				'\\x{A82C}',
 			'Virama' =>
-				'\x{A806}',
+				'\\x{A806}',
 			'Vowel_Dependent' =>
-				'\x{A802}' .
-				'\x{A823}-\x{A824}' .
-				'\x{A825}-\x{A826}' .
-				'\x{A827}',
-		),
-		'Balinese' => array(
+				'\\x{A802}' .
+				'\\x{A823}-\\x{A824}' .
+				'\\x{A825}-\\x{A826}' .
+				'\\x{A827}',
+		],
+		'Balinese' => [
 			'All' =>
-				'\x{1B00}-\x{1B4C}' .
-				'\x{1B50}-\x{1B7E}',
+				'\\x{1B00}-\\x{1B4C}' .
+				'\\x{1B50}-\\x{1B7E}',
 			'Letter' =>
-				'\x{1B05}-\x{1B33}' .
-				'\x{1B45}-\x{1B4C}',
+				'\\x{1B05}-\\x{1B33}' .
+				'\\x{1B45}-\\x{1B4C}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{1B34}' .
-				'\x{1B6B}-\x{1B73}',
+				'\\x{1B34}' .
+				'\\x{1B6B}-\\x{1B73}',
 			'Nonspacing_Mark' =>
-				'\x{1B00}-\x{1B03}' .
-				'\x{1B34}' .
-				'\x{1B36}-\x{1B3A}' .
-				'\x{1B3C}' .
-				'\x{1B42}' .
-				'\x{1B6B}-\x{1B73}',
+				'\\x{1B00}-\\x{1B03}' .
+				'\\x{1B34}' .
+				'\\x{1B36}-\\x{1B3A}' .
+				'\\x{1B3C}' .
+				'\\x{1B42}' .
+				'\\x{1B6B}-\\x{1B73}',
 			'Virama' =>
-				'\x{1B44}',
+				'\\x{1B44}',
 			'Vowel_Dependent' =>
-				'\x{1B35}' .
-				'\x{1B36}-\x{1B3A}' .
-				'\x{1B3B}' .
-				'\x{1B3C}' .
-				'\x{1B3D}-\x{1B41}' .
-				'\x{1B42}' .
-				'\x{1B43}',
-		),
-		'Saurashtra' => array(
+				'\\x{1B35}' .
+				'\\x{1B36}-\\x{1B3A}' .
+				'\\x{1B3B}' .
+				'\\x{1B3C}' .
+				'\\x{1B3D}-\\x{1B41}' .
+				'\\x{1B42}' .
+				'\\x{1B43}',
+		],
+		'Saurashtra' => [
 			'All' =>
-				'\x{A880}-\x{A8C5}' .
-				'\x{A8CE}-\x{A8D9}',
+				'\\x{A880}-\\x{A8C5}' .
+				'\\x{A8CE}-\\x{A8D9}',
 			'Letter' =>
-				'\x{A882}-\x{A8B3}',
+				'\\x{A882}-\\x{A8B3}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{A8C4}',
+				'\\x{A8C4}',
 			'Nonspacing_Mark' =>
-				'\x{A8C4}-\x{A8C5}',
+				'\\x{A8C4}-\\x{A8C5}',
 			'Virama' =>
-				'\x{A8C4}',
+				'\\x{A8C4}',
 			'Vowel_Dependent' =>
-				'\x{A8B5}-\x{A8C3}',
-		),
-		'Javanese' => array(
+				'\\x{A8B5}-\\x{A8C3}',
+		],
+		'Javanese' => [
 			'All' =>
-				'\x{A980}-\x{A9CD}' .
-				'\x{A9CF}-\x{A9D9}' .
-				'\x{A9DE}-\x{A9DF}',
+				'\\x{A980}-\\x{A9CD}' .
+				'\\x{A9CF}-\\x{A9D9}' .
+				'\\x{A9DE}-\\x{A9DF}',
 			'Letter' =>
-				'\x{A984}-\x{A9B2}' .
-				'\x{A9CF}',
+				'\\x{A984}-\\x{A9B2}' .
+				'\\x{A9CF}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{A9B3}',
+				'\\x{A9B3}',
 			'Nonspacing_Mark' =>
-				'\x{A980}-\x{A982}' .
-				'\x{A9B3}' .
-				'\x{A9B6}-\x{A9B9}' .
-				'\x{A9BC}-\x{A9BD}',
+				'\\x{A980}-\\x{A982}' .
+				'\\x{A9B3}' .
+				'\\x{A9B6}-\\x{A9B9}' .
+				'\\x{A9BC}-\\x{A9BD}',
 			'Virama' =>
-				'\x{A9C0}',
+				'\\x{A9C0}',
 			'Vowel_Dependent' =>
-				'\x{A9B4}-\x{A9B5}' .
-				'\x{A9B6}-\x{A9B9}' .
-				'\x{A9BA}-\x{A9BB}' .
-				'\x{A9BC}',
-		),
-		'Brahmi' => array(
+				'\\x{A9B4}-\\x{A9B5}' .
+				'\\x{A9B6}-\\x{A9B9}' .
+				'\\x{A9BA}-\\x{A9BB}' .
+				'\\x{A9BC}',
+		],
+		'Brahmi' => [
 			'All' =>
-				'\x{11000}-\x{1104D}' .
-				'\x{11052}-\x{11075}' .
-				'\x{1107F}',
+				'\\x{11000}-\\x{1104D}' .
+				'\\x{11052}-\\x{11075}' .
+				'\\x{1107F}',
 			'Letter' =>
-				'\x{11003}-\x{11037}' .
-				'\x{11071}-\x{11072}' .
-				'\x{11075}',
+				'\\x{11003}-\\x{11037}' .
+				'\\x{11071}-\\x{11072}' .
+				'\\x{11075}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{11046}' .
-				'\x{11070}' .
-				'\x{1107F}',
+				'\\x{11046}' .
+				'\\x{11070}' .
+				'\\x{1107F}',
 			'Nonspacing_Mark' =>
-				'\x{11001}' .
-				'\x{11038}-\x{11046}' .
-				'\x{11070}' .
-				'\x{11073}-\x{11074}' .
-				'\x{1107F}',
+				'\\x{11001}' .
+				'\\x{11038}-\\x{11046}' .
+				'\\x{11070}' .
+				'\\x{11073}-\\x{11074}' .
+				'\\x{1107F}',
 			'Virama' =>
-				'\x{11046}',
+				'\\x{11046}',
 			'Vowel_Dependent' =>
-				'\x{11038}-\x{11045}' .
-				'\x{11073}-\x{11074}',
-		),
-		'Modi' => array(
+				'\\x{11038}-\\x{11045}' .
+				'\\x{11073}-\\x{11074}',
+		],
+		'Modi' => [
 			'All' =>
-				'\x{A838}-\x{A839}' .
-				'\x{A839}' .
-				'\x{A83B}' .
-				'\x{A83D}' .
-				'\x{11600}-\x{11644}' .
-				'\x{11650}-\x{11659}',
+				'\\x{A838}-\\x{A839}' .
+				'\\x{A839}' .
+				'\\x{A83B}' .
+				'\\x{A83D}' .
+				'\\x{11600}-\\x{11644}' .
+				'\\x{11650}-\\x{11659}',
 			'Letter' =>
-				'\x{11600}-\x{1162F}' .
-				'\x{11644}',
+				'\\x{11600}-\\x{1162F}' .
+				'\\x{11644}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{1163F}',
+				'\\x{1163F}',
 			'Nonspacing_Mark' =>
-				'\x{11633}-\x{1163A}' .
-				'\x{1163D}' .
-				'\x{1163F}-\x{11640}',
+				'\\x{11633}-\\x{1163A}' .
+				'\\x{1163D}' .
+				'\\x{1163F}-\\x{11640}',
 			'Virama' =>
-				'\x{1163F}',
+				'\\x{1163F}',
 			'Vowel_Dependent' =>
-				'\x{11630}-\x{11632}' .
-				'\x{11633}-\x{1163A}' .
-				'\x{1163B}-\x{1163C}' .
-				'\x{11640}',
-		),
-		'Siddham' => array(
+				'\\x{11630}-\\x{11632}' .
+				'\\x{11633}-\\x{1163A}' .
+				'\\x{1163B}-\\x{1163C}' .
+				'\\x{11640}',
+		],
+		'Siddham' => [
 			'All' =>
-				'\x{11580}-\x{115B5}' .
-				'\x{115B8}-\x{115DD}',
+				'\\x{11580}-\\x{115B5}' .
+				'\\x{115B8}-\\x{115DD}',
 			'Letter' =>
-				'\x{11580}-\x{115AE}' .
-				'\x{115D8}-\x{115DB}',
+				'\\x{11580}-\\x{115AE}' .
+				'\\x{115D8}-\\x{115DB}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{115BF}-\x{115C0}',
+				'\\x{115BF}-\\x{115C0}',
 			'Nonspacing_Mark' =>
-				'\x{115B2}-\x{115B5}' .
-				'\x{115BC}-\x{115BD}' .
-				'\x{115BF}-\x{115C0}' .
-				'\x{115DC}-\x{115DD}',
+				'\\x{115B2}-\\x{115B5}' .
+				'\\x{115BC}-\\x{115BD}' .
+				'\\x{115BF}-\\x{115C0}' .
+				'\\x{115DC}-\\x{115DD}',
 			'Virama' =>
-				'\x{115BF}',
+				'\\x{115BF}',
 			'Vowel_Dependent' =>
-				'\x{115AF}-\x{115B1}' .
-				'\x{115B2}-\x{115B5}' .
-				'\x{115B8}-\x{115BB}' .
-				'\x{115DC}-\x{115DD}',
-		),
-		'Newa' => array(
+				'\\x{115AF}-\\x{115B1}' .
+				'\\x{115B2}-\\x{115B5}' .
+				'\\x{115B8}-\\x{115BB}' .
+				'\\x{115DC}-\\x{115DD}',
+		],
+		'Newa' => [
 			'All' =>
-				'\x{11400}-\x{1145B}' .
-				'\x{1145D}-\x{11461}',
+				'\\x{11400}-\\x{1145B}' .
+				'\\x{1145D}-\\x{11461}',
 			'Letter' =>
-				'\x{11400}-\x{11434}' .
-				'\x{11447}-\x{1144A}' .
-				'\x{1145F}-\x{11461}',
+				'\\x{11400}-\\x{11434}' .
+				'\\x{11447}-\\x{1144A}' .
+				'\\x{1145F}-\\x{11461}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{11442}' .
-				'\x{11446}' .
-				'\x{1145E}',
+				'\\x{11442}' .
+				'\\x{11446}' .
+				'\\x{1145E}',
 			'Nonspacing_Mark' =>
-				'\x{11438}-\x{1143F}' .
-				'\x{11442}-\x{11444}' .
-				'\x{11446}' .
-				'\x{1145E}',
+				'\\x{11438}-\\x{1143F}' .
+				'\\x{11442}-\\x{11444}' .
+				'\\x{11446}' .
+				'\\x{1145E}',
 			'Virama' =>
-				'\x{11442}',
+				'\\x{11442}',
 			'Vowel_Dependent' =>
-				'\x{11435}-\x{11437}' .
-				'\x{11438}-\x{1143F}' .
-				'\x{11440}-\x{11441}',
-		),
-		'Bhaiksuki' => array(
+				'\\x{11435}-\\x{11437}' .
+				'\\x{11438}-\\x{1143F}' .
+				'\\x{11440}-\\x{11441}',
+		],
+		'Bhaiksuki' => [
 			'All' =>
-				'\x{11C00}-\x{11C08}' .
-				'\x{11C0A}-\x{11C36}' .
-				'\x{11C38}-\x{11C45}' .
-				'\x{11C50}-\x{11C6C}',
+				'\\x{11C00}-\\x{11C08}' .
+				'\\x{11C0A}-\\x{11C36}' .
+				'\\x{11C38}-\\x{11C45}' .
+				'\\x{11C50}-\\x{11C6C}',
 			'Letter' =>
-				'\x{11C00}-\x{11C08}' .
-				'\x{11C0A}-\x{11C2E}' .
-				'\x{11C40}',
+				'\\x{11C00}-\\x{11C08}' .
+				'\\x{11C0A}-\\x{11C2E}' .
+				'\\x{11C40}',
 			'Nonspacing_Combining_Mark' =>
-				'\x{11C3F}',
+				'\\x{11C3F}',
 			'Nonspacing_Mark' =>
-				'\x{11C30}-\x{11C36}' .
-				'\x{11C38}-\x{11C3D}' .
-				'\x{11C3F}',
+				'\\x{11C30}-\\x{11C36}' .
+				'\\x{11C38}-\\x{11C3D}' .
+				'\\x{11C3F}',
 			'Virama' =>
-				'\x{11C3F}',
+				'\\x{11C3F}',
 			'Vowel_Dependent' =>
-				'\x{11C2F}' .
-				'\x{11C30}-\x{11C36}' .
-				'\x{11C38}-\x{11C3B}',
-		),
-	);
+				'\\x{11C2F}' .
+				'\\x{11C30}-\\x{11C36}' .
+				'\\x{11C38}-\\x{11C3B}',
+		],
+	];
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/Utf8String.php b/Sources/Unicode/Utf8String.php
index bd2f68bc16..216f4e0854 100644
--- a/Sources/Unicode/Utf8String.php
+++ b/Sources/Unicode/Utf8String.php
@@ -35,13 +35,23 @@ class Utf8String implements \Stringable
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'create' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'decompose' => 'utf8_decompose',
 			'compose' => 'utf8_compose',
-		),
-	);
+			'utf8_strtolower' => 'utf8_strtolower',
+			'utf8_strtoupper' => 'utf8_strtoupper',
+			'utf8_casefold' => 'utf8_casefold',
+			'utf8_convert_case' => 'utf8_convert_case',
+			'utf8_normalize_d' => 'utf8_normalize_d',
+			'utf8_normalize_kd' => 'utf8_normalize_kd',
+			'utf8_normalize_c' => 'utf8_normalize_c',
+			'utf8_normalize_kc' => 'utf8_normalize_kc',
+			'utf8_normalize_kc_casefold' => 'utf8_normalize_kc_casefold',
+			'utf8_is_normalized' => 'utf8_is_normalized',
+			'utf8_sanitize_invisibles' => 'utf8_sanitize_invisibles',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -85,16 +95,15 @@ class Utf8String implements \Stringable
 	 *    this string. If null, assumes the language currently in use by SMF
 	 *    (meaning the user's language, falling back to the forum's default).
 	 */
-	public function __construct(string $string, string $language = null)
+	public function __construct(string $string, ?string $language = null)
 	{
 		$this->string = $string;
 
 		$this->language = substr($language ?? User::$me->language ?? Lang::$default ?? Config::$language ?? Lang::$txt['lang_locale'] ?? '', 0, 2);
 
 		// Can we use the intl extension's Normalizer class?
-		if (!isset(self::$use_intl_normalizer))
-		{
-			require_once(__DIR__ . '/Metadata.php');
+		if (!isset(self::$use_intl_normalizer)) {
+			require_once __DIR__ . '/Metadata.php';
 
 			self::$use_intl_normalizer = extension_loaded('intl') && version_compare(implode('.', \IntlChar::getUnicodeVersion()), SMF_UNICODE_VERSION, '>=');
 		}
@@ -149,37 +158,33 @@ public function __toString(): string
 	public function convertCase(string $case, bool $simple = false): object
 	{
 		// The main case conversion logic
-		if (in_array($case, array('upper', 'lower', 'fold')))
-		{
+		if (in_array($case, ['upper', 'lower', 'fold'])) {
 			$chars = preg_split('/(.)/su', $this->string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-			if ($chars === false)
-			{
+			if ($chars === false) {
 				unset($this->string);
+
 				return $this;
 			}
 
-			switch ($case)
-			{
+			switch ($case) {
 				case 'upper':
-					require_once(__DIR__ . '/CaseUpper.php');
-
+					require_once __DIR__ . '/CaseUpper.php';
 					$substitutions = $simple ? utf8_strtoupper_simple_maps() : utf8_strtoupper_maps();
 
 					// Turkish & Azeri conditional casing, part 1.
-					if (in_array($this->language, array('tr', 'az')))
+					if (in_array($this->language, ['tr', 'az'])) {
 						$substitutions['i'] = 'İ';
+					}
 
 					break;
 
 				case 'lower':
-					require_once(__DIR__ . '/CaseLower.php');
-
+					require_once __DIR__ . '/CaseLower.php';
 					$substitutions = $simple ? utf8_strtolower_simple_maps() : utf8_strtolower_maps();
 
 					// Turkish & Azeri conditional casing, part 1.
-					if (in_array($this->language, array('tr', 'az')))
-					{
+					if (in_array($this->language, ['tr', 'az'])) {
 						$substitutions['İ'] = 'i';
 						$substitutions['I' . "\xCC\x87"] = 'i';
 						$substitutions['I'] = 'ı';
@@ -188,36 +193,35 @@ public function convertCase(string $case, bool $simple = false): object
 					break;
 
 				case 'fold':
-					require_once(__DIR__ . '/CaseFold.php');
-
+					require_once __DIR__ . '/CaseFold.php';
 					$substitutions = $simple ? utf8_casefold_simple_maps() : utf8_casefold_maps();
-
 					break;
 			}
 
-			foreach ($chars as &$char)
-				$char = isset($substitutions[$char]) ? $substitutions[$char] : $char;
+			foreach ($chars as &$char) {
+				$char = $substitutions[$char] ?? $char;
+			}
 
 			$this->string = implode('', $chars);
-		}
-		elseif (in_array($case, array('title', 'ucfirst', 'ucwords')))
-		{
-			require_once(__DIR__ . '/RegularExpressions.php');
-			require_once(__DIR__ . '/CaseUpper.php');
-			require_once(__DIR__ . '/CaseTitle.php');
+		} elseif (in_array($case, ['title', 'ucfirst', 'ucwords'])) {
+			require_once __DIR__ . '/RegularExpressions.php';
+
+			require_once __DIR__ . '/CaseUpper.php';
+
+			require_once __DIR__ . '/CaseTitle.php';
 
 			$prop_classes = utf8_regex_properties();
 
 			$upper = $simple ? utf8_strtoupper_simple_maps() : utf8_strtoupper_maps();
 
 			// Turkish & Azeri conditional casing, part 1.
-			if (in_array($this->language, array('tr', 'az')))
+			if (in_array($this->language, ['tr', 'az'])) {
 				$upper['i'] = 'İ';
+			}
 
 			$title = array_merge($upper, $simple ? utf8_titlecase_simple_maps() : utf8_titlecase_maps());
 
-			switch ($case)
-			{
+			switch ($case) {
 				case 'title':
 					$this->convertCase($this->string, 'lower', $simple);
 					$regex = '/(?:^|[^\w' . $prop_classes['Case_Ignorable'] . '])\K(\p{L})/u';
@@ -234,33 +238,32 @@ public function convertCase(string $case, bool $simple = false): object
 
 			$this->string = preg_replace_callback(
 				$regex,
-				function($matches) use ($upper, $title)
-				{
+				function ($matches) use ($upper, $title) {
 					// If second letter is uppercase, use uppercase for first letter.
 					// Otherwise, use titlecase for first letter.
 					$case = !empty($matches['upper']) ? 'upper' : 'title';
 
-					$matches[1] = isset($$case[$matches[1]]) ? $$case[$matches[1]] : $matches[1];
+					$matches[1] = $$case[$matches[1]] ?? $matches[1];
 
 					return $matches[1];
 				},
-				$this->string
+				$this->string,
 			);
 		}
 
 		// If casefolding, we're done.
-		if ($case === 'fold')
+		if ($case === 'fold') {
 			return $this;
+		}
 
 		// Handle conditional casing situations...
-		$substitutions = array();
-		$replacements = array();
+		$substitutions = [];
+		$replacements = [];
 
 		// Greek conditional casing, part 1: Fix lowercase sigma.
 		// Note that this rule doesn't depend on $txt['lang_locale'].
-		if ($case !== 'upper' && strpos($this->string, 'ς') !== false || strpos($this->string, 'σ') !== false)
-		{
-			require_once($sourcedir . '/Unicode/RegularExpressions.php');
+		if ($case !== 'upper' && strpos($this->string, 'ς') !== false || strpos($this->string, 'σ') !== false) {
+			require_once $sourcedir . '/Unicode/RegularExpressions.php';
 
 			$prop_classes = utf8_regex_properties();
 
@@ -272,10 +275,9 @@ function($matches) use ($upper, $title)
 		}
 
 		// Greek conditional casing, part 2: No accents on uppercase strings.
-		if ($this->language === 'el' && $case === 'upper')
-		{
+		if ($this->language === 'el' && $case === 'upper') {
 			// Composed forms.
-			$substitutions += array(
+			$substitutions += [
 				'Ά' => 'Α', 'Ἀ' => 'Α', 'Ἁ' => 'Α', 'Ὰ' => 'Α', 'Ᾰ' => 'Α',
 				'Ᾱ' => 'Α', 'Α' => 'Α', 'Α' => 'Α', 'Ἂ' => 'Α', 'Ἃ' => 'Α',
 				'Ἄ' => 'Α', 'Ἅ' => 'Α', 'Ἆ' => 'Α', 'Ἇ' => 'Α', 'Ὰ' => 'Α',
@@ -301,10 +303,10 @@ function($matches) use ($upper, $title)
 				'Ὦ' => 'Ω', 'Ὧ' => 'Ω', 'Ὠ' => 'Ω', 'Ὡ' => 'Ω', 'Ώ' => 'Ω',
 				'Ω' => 'Ω', 'Ὢ' => 'Ω', 'Ὣ' => 'Ω', 'Ὤ' => 'Ω', 'Ὥ' => 'Ω',
 				'Ὦ' => 'Ω', 'Ὧ' => 'Ω',
-			);
+			];
 
 			// Individual Greek diacritics.
-			$substitutions += array(
+			$substitutions += [
 				"\xCC\x80" => '', "\xCC\x81" => '', "\xCC\x84" => '',
 				"\xCC\x86" => '', "\xCC\x88" => '', "\xCC\x93" => '',
 				"\xCC\x94" => '', "\xCD\x82" => '', "\xCD\x83" => '',
@@ -315,45 +317,44 @@ function($matches) use ($upper, $title)
 				"\xE1\xBF\x8F" => '', "\xE1\xBF\x9D" => '', "\xE1\xBF\x9E" => '',
 				"\xE1\xBF\x9F" => '', "\xE1\xBF\xAD" => '', "\xE1\xBF\xAE" => '',
 				"\xE1\xBF\xAF" => '', "\xE1\xBF\xBD" => '', "\xE1\xBF\xBE" => '',
-			);
+			];
 		}
 
 		// Turkish & Azeri conditional casing, part 2.
-		if ($case !== 'upper' && in_array($this->language, array('tr', 'az')))
-		{
+		if ($case !== 'upper' && in_array($this->language, ['tr', 'az'])) {
 			// Remove unnecessary "COMBINING DOT ABOVE" after i
 			$substitutions['i' . "\xCC\x87"] = 'i';
 		}
 
 		// Lithuanian conditional casing.
-		if ($this->language === 'lt')
-		{
+		if ($this->language === 'lt') {
 			// Force a dot above lowercase i and j with accents by inserting
 			// the "COMBINING DOT ABOVE" character.
 			// Note: some fonts handle this incorrectly and show two dots,
 			// but that's a bug in those fonts and cannot be fixed here.
-			if ($case !== 'upper')
-			{
+			if ($case !== 'upper') {
 				$replacements['/(i\x{328}?|\x{12F}|j)([\x{300}\x{301}\x{303}])/u'] = '$1' . "\xCC\x87" . '$2';
 			}
 
 			// Remove "COMBINING DOT ABOVE" after uppercase I and J.
-			if ($case !== 'lower')
+			if ($case !== 'lower') {
 				$replacements['/(I\x{328}?|\x{12E}|J)\x{307}/u'] = '$1';
+			}
 		}
 
 		// Dutch has a special titlecase rule.
-		if ($this->language === 'nl' && $case === 'title')
-		{
+		if ($this->language === 'nl' && $case === 'title') {
 			$replacements['/\bIj/u'] = 'IJ';
 		}
 
 		// Now perform whatever conditional casing fixes we need.
-		if (!empty($substitutions))
+		if (!empty($substitutions)) {
 			$this->string = strtr($this->string, $substitutions);
+		}
 
-		if (!empty($replacements))
+		if (!empty($replacements)) {
 			$this->string = preg_replace(array_keys($replacements), $replacements, $this->string);
+		}
 
 		return $this;
 	}
@@ -369,8 +370,7 @@ function($matches) use ($upper, $title)
 	 */
 	public function normalize(string $form = 'c'): object
 	{
-		switch ($form)
-		{
+		switch ($form) {
 			case 'd':
 				return $this->normalizeD();
 
@@ -388,6 +388,7 @@ public function normalize(string $form = 'c'): object
 
 			default:
 				unset($this->string);
+
 				return $this;
 		}
 	}
@@ -401,10 +402,8 @@ public function normalize(string $form = 'c'): object
 	public function isNormalized(string $form): bool
 	{
 		// Can we use the intl extension?
-		if (self::$use_intl_normalizer)
-		{
-			switch ($form)
-			{
+		if (self::$use_intl_normalizer) {
+			switch ($form) {
 				case 'd':
 					$form = \Normalizer::FORM_D;
 					break;
@@ -433,8 +432,7 @@ public function isNormalized(string $form): bool
 		}
 
 		// Check whether string contains characters that are disallowed in this form.
-		switch ($form)
-		{
+		switch ($form) {
 			case 'd':
 				$prop = 'NFD_QC';
 				break;
@@ -459,11 +457,12 @@ public function isNormalized(string $form): bool
 				return false;
 		}
 
-		require_once(__DIR__ . '/QuickCheck.php');
+		require_once __DIR__ . '/QuickCheck.php';
 		$qc = utf8_regex_quick_check();
 
-		if (preg_match('/[' . $qc[$prop] . ']/u', $this->string))
+		if (preg_match('/[' . $qc[$prop] . ']/u', $this->string)) {
 			return false;
+		}
 
 		// Check whether all combining marks are in canonical order.
 		// Note: Because PCRE's Unicode data might be outdated compared to ours,
@@ -471,9 +470,8 @@ public function isNormalized(string $form): bool
 		// That means the more thorough checks will occasionally be performed on
 		// strings that don't need them, but building and running a perfect regex
 		// would be more expensive in the vast majority of cases, so meh.
-		if (preg_match_all('/([\p{M}\p{Cn}])/u', $this->string, $matches, PREG_OFFSET_CAPTURE))
-		{
-			require_once(__DIR__ . '/CombiningClasses.php');
+		if (preg_match_all('/([\p{M}\p{Cn}])/u', $this->string, $matches, PREG_OFFSET_CAPTURE)) {
+			require_once __DIR__ . '/CombiningClasses.php';
 
 			$combining_classes = utf8_combining_classes();
 
@@ -481,15 +479,15 @@ public function isNormalized(string $form): bool
 			$last_len = 0;
 			$last_ccc = 0;
 
-			foreach ($matches[1] as $match)
-			{
+			foreach ($matches[1] as $match) {
 				$char = $match[0];
 				$pos = $match[1];
-				$ccc = isset($combining_classes[$char]) ? $combining_classes[$char] : 0;
+				$ccc = $combining_classes[$char] ?? 0;
 
 				// Not in canonical order, so return false.
-				if ($pos === $last_pos + $last_len && $ccc > 0 && $last_ccc > $ccc)
+				if ($pos === $last_pos + $last_len && $ccc > 0 && $last_ccc > $ccc) {
 					return false;
+				}
 
 				$last_pos = $pos;
 				$last_len = strlen($char);
@@ -524,7 +522,7 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 		$level = min(max((int) $level, 0), 2);
 		$substitute = (string) $substitute;
 
-		require_once(__DIR__ . '/RegularExpressions.php');
+		require_once __DIR__ . '/RegularExpressions.php';
 		$prop_classes = utf8_regex_properties();
 
 		// We never want non-whitespace control characters
@@ -538,7 +536,7 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 		$disallowed[] = '[\p{Co}' . $prop_classes['Cn'] . ']';
 
 		// Several more things we never want:
-		$disallowed[] = '[' . implode('', array(
+		$disallowed[] = '[' . implode('', [
 			// Soft Hyphen.
 			'\x{AD}',
 			// Khmer Vowel Inherent AQ and Khmer Vowel Inherent AA.
@@ -553,12 +551,11 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 			'\x{FEFF}',
 			// Annotation characters and Object Replacement Character.
 			'\x{FFF9}-\x{FFFC}',
-		)) . ']';
+		]) . ']';
 
-		switch ($level)
-		{
+		switch ($level) {
 			case 2:
-				$disallowed[] = '[' . implode('', array(
+				$disallowed[] = '[' . implode('', [
 					// Combining Grapheme Character.
 					'\x{34F}',
 					// Zero Width Non-Joiner.
@@ -569,12 +566,12 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 					$prop_classes['Variation_Selector'],
 					// Tag characters.
 					'\x{E0000}-\x{E007F}',
-				)) . ']';
+				]) . ']';
 
 				// no break
 
 			case 1:
-				$disallowed[] = '[' . implode('', array(
+				$disallowed[] = '[' . implode('', [
 					// Zero Width Space.
 					'\x{200B}',
 					// Word Joiner.
@@ -590,7 +587,7 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 					'\x{1BCA0}-\x{1BCA3}',
 					// Musical formatting characters.
 					'\x{1D173}-\x{1D17A}',
-				)) . ']';
+				]) . ']';
 
 				break;
 
@@ -622,8 +619,7 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 				break;
 		}
 
-		if ($level < 2)
-		{
+		if ($level < 2) {
 			/*
 				Combining Grapheme Character has two uses: to override standard
 				search and collation behaviours, which we never want to allow, and
@@ -641,22 +637,20 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 		$this->string = preg_replace('/' . implode('|', $disallowed) . '/u', $substitute, $this->string);
 
 		// Are we done yet?
-		if (!preg_match('/[' . $prop_classes['Join_Control'] . $prop_classes['Regional_Indicator'] . $prop_classes['Emoji'] . $prop_classes['Variation_Selector'] . ']/u', $this->string))
-		{
+		if (!preg_match('/[' . $prop_classes['Join_Control'] . $prop_classes['Regional_Indicator'] . $prop_classes['Emoji'] . $prop_classes['Variation_Selector'] . ']/u', $this->string)) {
 			return $this;
 		}
 
 		// String must be in Normalization Form C for the following checks to work.
 		$this->normalize('c');
 
-		$placeholders = array();
+		$placeholders = [];
 
 		// Use placeholders to preserve known emoji from further processing.
 		$this->preserveEmoji($placeholders);
 
 		// Get rid of any unsanctioned variation selectors.
-		if (preg_match('/[' . $prop_classes['Variation_Selector'] . ']/u', $this->string))
-		{
+		if (preg_match('/[' . $prop_classes['Variation_Selector'] . ']/u', $this->string)) {
 			// Use placeholders to preserve sanctioned variation selectors, and
 			// remove the rest.
 			$this->sanitizeVariationSelectors($placeholders, $substitute);
@@ -664,8 +658,7 @@ public function sanitizeInvisibles(int $level, string $substitute): object
 
 		// Join controls are only allowed inside words in special circumstances.
 		// See https://unicode.org/reports/tr31/#Layout_and_Format_Control_Characters
-		if (preg_match('/[' . $prop_classes['Join_Control'] . ']/u', $this->string))
-		{
+		if (preg_match('/[' . $prop_classes['Join_Control'] . ']/u', $this->string)) {
 			// Use placeholders to preserve allowed join controls, and remove
 			// the rest.
 			$this->sanitizeJoinControls($placeholders, $level, $substitute);
@@ -703,18 +696,17 @@ public function extractWords(int $level): array
 		$this->sanitizeInvisibles($level, ' ');
 
 		// Normalize the whitespace.
-		$this->string = \SMF\Utils::normalizeSpaces($this->string, true, true, array('replace_tabs' => true, 'collapse_hspace' => true));
+		$this->string = \SMF\Utils::normalizeSpaces($this->string, true, true, ['replace_tabs' => true, 'collapse_hspace' => true]);
 
 		// Preserve emoji characters, variation selectors, and join controls.
-		$placeholders = array();
+		$placeholders = [];
 		$this->preserveEmoji($placeholders);
 		$this->sanitizeVariationSelectors($placeholders, ' ');
 		$this->sanitizeJoinControls($placeholders, $level, ' ');
 
 		// Remove the private use characters that delimit the placeholders
 		// so that they don't interfere with the word splitting.
-		foreach ($placeholders as $key => $placeholder)
-		{
+		foreach ($placeholders as $key => $placeholder) {
 			$simple_placeholder = sha1($placeholder);
 			$this->string = str_replace($placeholder, $simple_placeholder, $this->string);
 			$placeholders[$key] = $simple_placeholder;
@@ -722,19 +714,17 @@ public function extractWords(int $level): array
 
 		// Split into words, with Unicode awareness.
 		// Prefer IntlBreakIterator if it is available.
-		if (class_exists('IntlBreakIterator'))
-		{
+		if (class_exists('IntlBreakIterator')) {
 			$break_iterator = \IntlBreakIterator::createWordInstance();
 			$break_iterator->setText($this->string);
 			$parts_interator = $break_iterator->getPartsIterator();
 
-			$words = array();
+			$words = [];
 
-			foreach ($parts_interator as $word)
+			foreach ($parts_interator as $word) {
 				$words[] = $word;
-		}
-		else
-		{
+			}
+		} else {
 			/*
 			 * This is a sad, weak substitute for the IntlBreakIterator.
 			 * It works well enough for European languages, but it fails badly
@@ -746,18 +736,18 @@ public function extractWords(int $level): array
 			$words = preg_split('/(?<![\p{L}\p{M}\p{N}_])(?=[\p{L}\p{M}\p{N}_])|(?<=[\p{L}\p{M}\p{N}_])(?![\p{L}\p{M}\p{N}_])/su', $this->string);
 		}
 
-		foreach ($words as $key => $word)
-		{
+		foreach ($words as $key => $word) {
 			$word = trim($word);
 
-			if (preg_replace('/\W/u', '', $word) === '')
-			{
+			if (preg_replace('/\W/u', '', $word) === '') {
 				unset($words[$key]);
+
 				continue;
 			}
 
-			if (!empty($placeholders))
+			if (!empty($placeholders)) {
 				$word = strtr($word, array_flip($placeholders));
+			}
 
 			$words[$key] = $word;
 		}
@@ -782,7 +772,7 @@ public function extractWords(int $level): array
 	 *    this string.
 	 * @return object An instance of this class.
 	 */
-	public static function create(string $string, string $language = null): object
+	public static function create(string $string, ?string $language = null): object
 	{
 		return new self($string, $language);
 	}
@@ -797,31 +787,31 @@ public static function create(string $string, string $language = null): object
 	 */
 	public static function decompose(array $chars, bool $compatibility = false): array
 	{
-		if (!empty($compatibility))
-		{
-			require_once(__DIR__ . '/DecompositionCompatibility.php');
+		if (!empty($compatibility)) {
+			require_once __DIR__ . '/DecompositionCompatibility.php';
 
 			$substitutions = utf8_normalize_kd_maps();
 
-			foreach ($chars as &$char)
-				$char = isset($substitutions[$char]) ? $substitutions[$char] : $char;
+			foreach ($chars as &$char) {
+				$char = $substitutions[$char] ?? $char;
+			}
 		}
 
-		require_once(__DIR__ . '/DecompositionCanonical.php');
-		require_once(__DIR__ . '/CombiningClasses.php');
+		require_once __DIR__ . '/DecompositionCanonical.php';
+
+		require_once __DIR__ . '/CombiningClasses.php';
 
 		$substitutions = utf8_normalize_d_maps();
 		$combining_classes = utf8_combining_classes();
 
 		// Replace characters with decomposed forms.
-		for ($i=0; $i < count($chars); $i++)
-		{
+		for ($i = 0; $i < count($chars); $i++) {
 			// Hangul characters.
 			// See "Hangul Syllable Decomposition" in the Unicode standard, ch. 3.12.
-			if ($chars[$i] >= "\xEA\xB0\x80" && $chars[$i] <= "\xED\x9E\xA3")
-			{
-				if (!function_exists('mb_ord'))
-					require_once(Config::$sourcedir . '/Subs-Compat.php');
+			if ($chars[$i] >= "\xEA\xB0\x80" && $chars[$i] <= "\xED\x9E\xA3") {
+				if (!function_exists('mb_ord')) {
+					require_once Config::$sourcedir . '/Subs-Compat.php';
+				}
 
 				$s = mb_ord($chars[$i]);
 				$sindex = $s - 0xAC00;
@@ -829,31 +819,32 @@ public static function decompose(array $chars, bool $compatibility = false): arr
 				$v = (int) (0x1161 + ($sindex % (21 * 28)) / 28);
 				$t = $sindex % 28;
 
-				$chars[$i] = implode('', array(mb_chr($l), mb_chr($v), $t ? mb_chr(0x11A7 + $t) : ''));
+				$chars[$i] = implode('', [mb_chr($l), mb_chr($v), $t ? mb_chr(0x11A7 + $t) : '']);
 			}
 			// Everything else.
-			elseif (isset($substitutions[$chars[$i]]))
+			elseif (isset($substitutions[$chars[$i]])) {
 				$chars[$i] = $substitutions[$chars[$i]];
+			}
 		}
 
 		// Must re-split the string before sorting.
 		$chars = preg_split('/(.)/su', implode('', $chars), 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		// Sort characters into canonical order.
-		for ($i = 1; $i < count($chars); $i++)
-		{
-			if (empty($combining_classes[$chars[$i]]) || empty($combining_classes[$chars[$i - 1]]))
+		for ($i = 1; $i < count($chars); $i++) {
+			if (empty($combining_classes[$chars[$i]]) || empty($combining_classes[$chars[$i - 1]])) {
 				continue;
+			}
 
-			if ($combining_classes[$chars[$i - 1]] > $combining_classes[$chars[$i]])
-			{
+			if ($combining_classes[$chars[$i - 1]] > $combining_classes[$chars[$i]]) {
 				$temp = $chars[$i];
 				$chars[$i] = $chars[$i - 1];
-				$chars[$i -1] = $temp;
+				$chars[$i - 1] = $temp;
 
 				// Backtrack and check again.
-				if ($i > 1)
+				if ($i > 1) {
 					$i -= 2;
+				}
 			}
 		}
 
@@ -868,24 +859,25 @@ public static function decompose(array $chars, bool $compatibility = false): arr
 	 */
 	public static function compose(array $chars): array
 	{
-		require_once(__DIR__ . '/Composition.php');
-		require_once(__DIR__ . '/CombiningClasses.php');
+		require_once __DIR__ . '/Composition.php';
+
+		require_once __DIR__ . '/CombiningClasses.php';
 
 		$substitutions = utf8_compose_maps();
 		$combining_classes = utf8_combining_classes();
 
-		for ($c = 0; $c < count($chars); $c++)
-		{
+		for ($c = 0; $c < count($chars); $c++) {
 			// Singleton replacements.
-			if (isset($substitutions[$chars[$c]]))
+			if (isset($substitutions[$chars[$c]])) {
 				$chars[$c] = $substitutions[$chars[$c]];
+			}
 
 			// Hangul characters.
 			// See "Hangul Syllable Composition" in the Unicode standard, ch. 3.12.
-			if ($chars[$c] >= "\xE1\x84\x80" && $chars[$c] <= "\xE1\x84\x92" && isset($chars[$c + 1]) && $chars[$c + 1] >= "\xE1\x85\xA1" && $chars[$c + 1] <= "\xE1\x85\xB5")
-			{
-				if (!function_exists('mb_ord'))
-					require_once(Config::$sourcedir . '/Subs-Compat.php');
+			if ($chars[$c] >= "\xE1\x84\x80" && $chars[$c] <= "\xE1\x84\x92" && isset($chars[$c + 1]) && $chars[$c + 1] >= "\xE1\x85\xA1" && $chars[$c + 1] <= "\xE1\x85\xB5") {
+				if (!function_exists('mb_ord')) {
+					require_once Config::$sourcedir . '/Subs-Compat.php';
+				}
 
 				$l_part = $chars[$c];
 				$v_part = $chars[$c + 1];
@@ -897,8 +889,7 @@ public static function compose(array $chars): array
 				$lv_index = $l_index * 588 + $v_index * 28;
 				$s = 0xAC00 + $lv_index;
 
-				if (isset($chars[$c + 2]) && $chars[$c + 2] >= "\xE1\x86\xA8" && $chars[$c + 2] <= "\xE1\x87\x82")
-				{
+				if (isset($chars[$c + 2]) && $chars[$c + 2] >= "\xE1\x86\xA8" && $chars[$c + 2] <= "\xE1\x87\x82") {
 					$t_part = $chars[$c + 2];
 					$t_index = mb_ord($t_part) - 0x11A7;
 					$s += $t_index;
@@ -907,24 +898,25 @@ public static function compose(array $chars): array
 				$chars[$c] = mb_chr($s);
 				$chars[++$c] = null;
 
-				if (isset($t_part))
+				if (isset($t_part)) {
 					$chars[++$c] = null;
+				}
 
 				continue;
 			}
 
-			if ($c > 0)
-			{
-				$ccc = isset($combining_classes[$chars[$c]]) ? $combining_classes[$chars[$c]] : 0;
+			if ($c > 0) {
+				$ccc = $combining_classes[$chars[$c]] ?? 0;
 
 				// Find the preceding starter character.
 				$l = $c - 1;
-				while ($l > 0 && (!isset($chars[$l]) || (!empty($combining_classes[$chars[$l]]) && $combining_classes[$chars[$l]] < $ccc)))
+
+				while ($l > 0 && (!isset($chars[$l]) || (!empty($combining_classes[$chars[$l]]) && $combining_classes[$chars[$l]] < $ccc))) {
 					$l--;
+				}
 
 				// Is there a composed form for this combination?
-				if (isset($substitutions[$chars[$l] . $chars[$c]]))
-				{
+				if (isset($substitutions[$chars[$l] . $chars[$c]])) {
 					// Replace the starter character with the composed character.
 					$chars[$l] = $substitutions[$chars[$l] . $chars[$c]];
 
@@ -1094,20 +1086,21 @@ public static function utf8_sanitize_invisibles(string $string, int $level, stri
 	 */
 	protected function normalizeD(): object
 	{
-		if ($this->isNormalized('d'))
+		if ($this->isNormalized('d')) {
 			return $this;
+		}
 
-		if (self::$use_intl_normalizer)
-		{
+		if (self::$use_intl_normalizer) {
 			$this->string = \Normalizer::normalize($this->string, \Normalizer::FORM_D);
+
 			return $this;
 		}
 
 		$chars = preg_split('/(.)/su', $this->string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		if ($chars === false)
-		{
+		if ($chars === false) {
 			unset($this->string);
+
 			return $this;
 		}
 
@@ -1125,20 +1118,21 @@ protected function normalizeD(): object
 	 */
 	protected function normalizeKD(): object
 	{
-		if ($this->isNormalized('kd'))
+		if ($this->isNormalized('kd')) {
 			return $this;
+		}
 
-		if (self::$use_intl_normalizer)
-		{
+		if (self::$use_intl_normalizer) {
 			$this->string = \Normalizer::normalize($this->string, \Normalizer::FORM_KD);
+
 			return $this;
 		}
 
 		$chars = preg_split('/(.)/su', $this->string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		if ($chars === false)
-		{
+		if ($chars === false) {
 			unset($this->string);
+
 			return $this;
 		}
 
@@ -1156,20 +1150,21 @@ protected function normalizeKD(): object
 	 */
 	protected function normalizeC(): object
 	{
-		if ($this->isNormalized('c'))
+		if ($this->isNormalized('c')) {
 			return $this;
+		}
 
-		if (self::$use_intl_normalizer)
-		{
+		if (self::$use_intl_normalizer) {
 			$this->string = \Normalizer::normalize($this->string, \Normalizer::FORM_C);
+
 			return $this;
 		}
 
 		$chars = preg_split('/(.)/su', $this->string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		if ($chars === false)
-		{
+		if ($chars === false) {
 			unset($this->string);
+
 			return $this;
 		}
 
@@ -1187,20 +1182,21 @@ protected function normalizeC(): object
 	 */
 	protected function normalizeKC(): object
 	{
-		if ($this->isNormalized('kc'))
+		if ($this->isNormalized('kc')) {
 			return $this;
+		}
 
-		if (self::$use_intl_normalizer)
-		{
+		if (self::$use_intl_normalizer) {
 			$this->string = \Normalizer::normalize($this->string, \Normalizer::FORM_KC);
+
 			return $this;
 		}
 
 		$chars = preg_split('/(.)/su', $this->string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		if ($chars === false)
-		{
+		if ($chars === false) {
 			unset($this->string);
+
 			return $this;
 		}
 
@@ -1219,39 +1215,37 @@ protected function normalizeKC(): object
 	 */
 	protected function normalizeKCFold(): object
 	{
-		if ($this->isNormalized($this->string, 'kc_casefold'))
+		if ($this->isNormalized($this->string, 'kc_casefold')) {
 			return $this;
+		}
 
-		if (self::$use_intl_normalizer)
-		{
+		if (self::$use_intl_normalizer) {
 			$this->string = \Normalizer::normalize($this->string, \Normalizer::FORM_KC_CF);
+
 			return $this;
 		}
 
 		$chars = preg_split('/(.)/su', $this->string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		if ($chars === false)
-		{
+		if ($chars === false) {
 			unset($this->string);
+
 			return $this;
 		}
 
 		$chars = self::decompose($chars, true);
 
-		require_once(__DIR__ . '/CaseFold.php');
-		require_once(__DIR__ . '/DefaultIgnorables.php');
+		require_once __DIR__ . '/CaseFold.php';
+
+		require_once __DIR__ . '/DefaultIgnorables.php';
 
 		$substitutions = utf8_casefold_maps();
 		$ignorables = array_flip(utf8_default_ignorables());
 
-		foreach ($chars as &$char)
-		{
-			if (isset($substitutions[$char]))
-			{
+		foreach ($chars as &$char) {
+			if (isset($substitutions[$char])) {
 				$char = $substitutions[$char];
-			}
-			elseif (isset($ignorables[$char]))
-			{
+			} elseif (isset($ignorables[$char])) {
 				$char = '';
 			}
 		}
@@ -1272,7 +1266,7 @@ protected function normalizeKCFold(): object
 	 */
 	protected function preserveEmoji(array &$placeholders): void
 	{
-		require_once(__DIR__ . '/RegularExpressions.php');
+		require_once __DIR__ . '/RegularExpressions.php';
 		$prop_classes = utf8_regex_properties();
 
 		// Regex source is https://unicode.org/reports/tr51/#EBNF_and_Regex
@@ -1305,19 +1299,20 @@ protected function preserveEmoji(array &$placeholders): void
 				')?' .
 			')*' .
 			'/u',
-			function ($matches) use (&$placeholders)
-			{
+			function ($matches) use (&$placeholders) {
 				// Skip lone ASCII characters that are not actually part of an
 				// emoji sequence. This can happen because the digits 0-9 and
 				// the '*' and '#' characters are the base characters for the
 				// "Emoji_Keycap_Sequence" emojis.
-				if (strlen($matches[0]) === 1)
+				if (strlen($matches[0]) === 1) {
 					return $matches[0];
+				}
 
 				$placeholders[$matches[0]] = "\xEE\xB3\x9B" . md5($matches[0]) . "\xEE\xB3\x9C";
+
 				return $placeholders[$matches[0]];
 			},
-			$this->string
+			$this->string,
 		);
 	}
 
@@ -1337,23 +1332,24 @@ function ($matches) use (&$placeholders)
 	 */
 	protected function sanitizeVariationSelectors(array &$placeholders, string $substitute): void
 	{
-		require_once(__DIR__ . '/RegularExpressions.php');
+		require_once __DIR__ . '/RegularExpressions.php';
 		$prop_classes = utf8_regex_properties();
 
-		$patterns = array('/[' . $prop_classes['Ideographic'] . '][\x{E0100}-\x{E01EF}]/u');
+		$patterns = ['/[' . $prop_classes['Ideographic'] . '][\x{E0100}-\x{E01EF}]/u'];
 
-		foreach (utf8_regex_variation_selectors() as $variation_selector => $allowed_base_chars)
+		foreach (utf8_regex_variation_selectors() as $variation_selector => $allowed_base_chars) {
 			$patterns[] = '/[' . $allowed_base_chars . '][' . $variation_selector . ']/u';
+		}
 
 		// Use placeholders for sanctioned variation selectors.
 		$this->string = preg_replace_callback(
 			$patterns,
-			function ($matches) use (&$placeholders)
-			{
+			function ($matches) use (&$placeholders) {
 				$placeholders[$matches[0]] = "\xEE\xB3\x9B" . md5($matches[0]) . "\xEE\xB3\x9C";
+
 				return $placeholders[$matches[0]];
 			},
-			$this->string
+			$this->string,
 		);
 
 		// Remove any unsanctioned variation selectors.
@@ -1375,7 +1371,7 @@ function ($matches) use (&$placeholders)
 	 */
 	protected function sanitizeJoinControls(array &$placeholders, int $level, string $substitute): void
 	{
-		require_once(__DIR__ . '/RegularExpressions.php');
+		require_once __DIR__ . '/RegularExpressions.php';
 
 		// Zero Width Non-Joiner (U+200C)
 		$zwnj = "\xE2\x80\x8C";
@@ -1387,27 +1383,25 @@ protected function sanitizeJoinControls(array &$placeholders, int $level, string
 		$placeholders[$zwj] = "\xEE\x80\x8D";
 
 		// When not in strict mode, allow ZWJ at word boundaries.
-		if ($level === 0)
+		if ($level === 0) {
 			$this->string = preg_replace('/\b\x{200D}|\x{200D}\b/u', $placeholders[$zwj], $this->string);
+		}
 
 		// Tests for Zero Width Joiner and Zero Width Non-Joiner.
 		$joining_type_classes = utf8_regex_joining_type();
 		$indic_classes = utf8_regex_indic();
 
-		foreach (array_merge($joining_type_classes, $indic_classes) as $script => $classes)
-		{
+		foreach (array_merge($joining_type_classes, $indic_classes) as $script => $classes) {
 			// Cursive scripts like Arabic use ZWNJ in certain contexts.
 			// For these scripts, use test A1 for allowing ZWNJ.
 			// https://unicode.org/reports/tr31/#A1
-			if (isset($joining_type_classes[$script]))
-			{
+			if (isset($joining_type_classes[$script])) {
 				$t = !empty($classes['Transparent']) ? '[' . $classes['Transparent'] . ']*' : '';
 
 				$lj = !empty($classes['Left_Joining']) ? $classes['Left_Joining'] : '';
 				$rj = !empty($classes['Right_Joining']) ? $classes['Right_Joining'] : '';
 
-				if (!empty($classes['Dual_Joining']))
-				{
+				if (!empty($classes['Dual_Joining'])) {
 					$lj .= $classes['Dual_Joining'];
 					$rj .= $classes['Dual_Joining'];
 				}
@@ -1421,8 +1415,7 @@ protected function sanitizeJoinControls(array &$placeholders, int $level, string
 			// For these scripts, use tests A2 and B for allowing ZWNJ and ZWJ.
 			// https://unicode.org/reports/tr31/#A2
 			// https://unicode.org/reports/tr31/#B
-			else
-			{
+			else {
 				// A letter that is part of this particular script.
 				$letter = '[' . $classes['Letter'] . ']';
 
@@ -1446,25 +1439,26 @@ protected function sanitizeJoinControls(array &$placeholders, int $level, string
 			// Do the thing.
 			$this->string = preg_replace_callback(
 				'/' . $pattern . '/u',
-				function ($matches) use ($placeholders)
-				{
+				function ($matches) use ($placeholders) {
 					return strtr($matches[0], $placeholders);
 				},
-				$this->string
+				$this->string,
 			);
 
 			// Did we catch 'em all?
-			if (strpos($this->string, $zwnj) === false && strpos($this->string, $zwj) === false)
+			if (strpos($this->string, $zwnj) === false && strpos($this->string, $zwj) === false) {
 				break;
+			}
 		}
 
 		// Apart from the exceptions above, ZWNJ and ZWJ are not allowed.
-		$this->string = str_replace(array($zwj, $zwnj), $substitute, $this->string);
+		$this->string = str_replace([$zwj, $zwnj], $substitute, $this->string);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Utf8String::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Utf8String::exportStatic')) {
 	Utf8String::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Unicode/index.php b/Sources/Unicode/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/Unicode/index.php
+++ b/Sources/Unicode/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/Url.php b/Sources/Url.php
index 896682a6ad..903715c26b 100644
--- a/Sources/Url.php
+++ b/Sources/Url.php
@@ -33,12 +33,19 @@ class Url implements \Stringable
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_underscores' => true,
-		'func_names' => array(
-			'create' => false,
-		),
-	);
+	private static $backcompat = [
+		'func_names' => [
+			'setTldRegex' => 'set_tld_regex',
+			'parseIri' => 'parse_iri',
+			'validateIri' => 'validate_iri',
+			'sanitizeIri' => 'sanitize_iri',
+			'normalizeIri' => 'normalize_iri',
+			'iriToUrl' => 'iri_to_url',
+			'urlToIri' => 'url_to_iri',
+			'getProxiedUrl' => 'get_proxied_url',
+			'sslCertFound' => 'ssl_cert_found',
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -126,7 +133,7 @@ class Url implements \Stringable
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @param string $url The URL or IRI.
 	 * @param bool $normalize Whether to normalize the URL during construction.
 	 *    Default: false.
@@ -134,15 +141,12 @@ class Url implements \Stringable
 	public function __construct(string $url, bool $normalize = false)
 	{
 		$this->url = $url;
-		
+
 		// Clean it up?
-		if ($normalize)
-		{
+		if ($normalize) {
 			// normalize() will call parse() for us.
 			$this->normalize();
-		}
-		else
-		{
+		} else {
 			$this->parse();
 		}
 
@@ -160,29 +164,28 @@ public function __toString(): string
 	/**
 	 * Converts an IRI (a URL with international characters) into an ASCII URL.
 	 *
-	 * Uses Punycode to encode any non-ASCII characters in the domain name, and 
+	 * Uses Punycode to encode any non-ASCII characters in the domain name, and
 	 * uses standard URL encoding on the rest.
-	 * 
+	 *
 	 * @return object A reference to this object for method chaining.
 	 */
 	public function toAscii(): object
 	{
 		// Nothing to do if it is already ASCII.
-		if ($this->is_ascii)
+		if ($this->is_ascii) {
 			return $this;
+		}
 
-		if (!empty($this->host))
-		{
-			if (!function_exists('idn_to_ascii'))
-				require_once(Config::$sourcedir . '/Subs-Compat.php');
+		if (!empty($this->host)) {
+			if (!function_exists('idn_to_ascii')) {
+				require_once Config::$sourcedir . '/Subs-Compat.php';
+			}
 
 			// Convert the host using the Punycode algorithm
 			$encoded_host = idn_to_ascii($this->host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
 
 			$pos = strpos($this->url, $this->host);
-		}
-		else
-		{
+		} else {
 			$encoded_host = '';
 			$pos = 0;
 		}
@@ -191,13 +194,13 @@ public function toAscii(): object
 		$after_host = substr($this->url, $pos + strlen($this->host ?? ''));
 
 		// Encode any disallowed characters in the rest of the URL
-		$unescaped = array(
+		$unescaped = [
 			'%21' => '!', '%23' => '#', '%24' => '$', '%26' => '&',
 			'%27' => "'", '%28' => '(', '%29' => ')', '%2A' => '*',
 			'%2B' => '+', '%2C' => ',', '%2F' => '/', '%3A' => ':',
 			'%3B' => ';', '%3D' => '=', '%3F' => '?', '%40' => '@',
 			'%25' => '%',
-		);
+		];
 
 		$before_host = strtr(rawurlencode($before_host), $unescaped);
 		$after_host = strtr(rawurlencode($after_host), $unescaped);
@@ -215,28 +218,25 @@ public function toAscii(): object
 	 *
 	 * Decodes any Punycode encoded characters in the domain name, then uses
 	 * standard URL decoding on the rest.
-	 * 
+	 *
 	 * @return object A reference to this object for method chaining.
 	 */
 	public function toUtf8(): object
 	{
 		// Bail out if we can be sure that it contains no international characters, encoded or otherwise.
-		if ($this->is_ascii && strpos($this->host ?? '', 'xn--') === false && strpos($this->url, '%') === false)
-		{
+		if ($this->is_ascii && strpos($this->host ?? '', 'xn--') === false && strpos($this->url, '%') === false) {
 			return $this;
 		}
 
-		if (!empty($this->host))
-		{
-			if (!function_exists('idn_to_utf8'))
-				require_once(Config::$sourcedir . '/Subs-Compat.php');
+		if (!empty($this->host)) {
+			if (!function_exists('idn_to_utf8')) {
+				require_once Config::$sourcedir . '/Subs-Compat.php';
+			}
 
 			// Decode the domain from Punycode.
 			$decoded_host = idn_to_utf8($this->host, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
 			$pos = strpos($this->url, $this->host);
-		}
-		else
-		{
+		} else {
 			$decoded_host = '';
 			$pos = 0;
 		}
@@ -245,13 +245,13 @@ public function toUtf8(): object
 		$after_host = substr($this->url, $pos + strlen($this->host ?? ''));
 
 		// Decode the rest of the URL, but preserve escaped URL syntax characters.
-		$double_escaped = array(
+		$double_escaped = [
 			'%21' => '%2521', '%23' => '%2523', '%24' => '%2524', '%26' => '%2526',
 			'%27' => '%2527', '%28' => '%2528', '%29' => '%2529', '%2A' => '%252A',
 			'%2B' => '%252B', '%2C' => '%252C', '%2F' => '%252F', '%3A' => '%253A',
 			'%3B' => '%253B', '%3D' => '%253D', '%3F' => '%253F', '%40' => '%2540',
 			'%25' => '%2525',
-		);
+		];
 
 		$before_host = rawurldecode(strtr($before_host, $double_escaped));
 		$after_host = rawurldecode(strtr($after_host, $double_escaped));
@@ -278,13 +278,10 @@ public function normalize(): object
 
 		$this->sanitize();
 
-		if (!empty($this->host))
-		{
+		if (!empty($this->host)) {
 			$normalized_host = Utils::normalize($this->host, 'kc_casefold');
 			$pos = strpos($this->url, $this->host);
-		}
-		else
-		{
+		} else {
 			$normalized_host = '';
 			$pos = 0;
 		}
@@ -313,11 +310,10 @@ public function sanitize(): object
 		// Also encode '%' in order to preserve anything that is already percent-encoded.
 		$url = preg_replace_callback(
 			'~[^\x00-\x7F\pZ\pC]|%~u',
-			function($matches)
-			{
+			function ($matches) {
 				return rawurlencode($matches[0]);
 			},
-			$this->url
+			$this->url,
 		);
 
 		// Perform normal sanitization
@@ -346,8 +342,9 @@ public function isValid(int $flags = 0): bool
 	{
 		$ascii_url = $this->is_ascii ? $this->url : (string) (clone $this)->toAscii();
 
-		if (strpos($ascii_url, '//') === 0)
+		if (strpos($ascii_url, '//') === 0) {
 			$ascii_url = 'http:' . $ascii_url;
+		}
 
 		return filter_var($ascii_url, FILTER_VALIDATE_URL, $flags) !== false;
 	}
@@ -360,8 +357,7 @@ public function isValid(int $flags = 0): bool
 	 */
 	public function validate(int $flags = 0): object
 	{
-		if (!$this->isValid($flags))
-		{
+		if (!$this->isValid($flags)) {
 			$this->url = '';
 			$this->parse();
 		}
@@ -380,27 +376,25 @@ public function parse(int $component = -1): mixed
 	{
 		$url = preg_replace_callback(
 			'~[^\x00-\x7F\pZ\pC]|%~u',
-			function($matches)
-			{
+			function ($matches) {
 				return rawurlencode($matches[0]);
 			},
-			$this->url
+			$this->url,
 		);
 
 		$parsed = parse_url($url);
 
-		foreach (array('scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment') as $prop)
-		{
+		foreach (['scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment'] as $prop) {
 			// Clear out any old value.
 			unset($this->{$prop});
 
 			// Set the new value, if any.
-			if (isset($parsed[$prop]))
+			if (isset($parsed[$prop])) {
 				$this->{$prop} = rawurldecode($parsed[$prop]);
+			}
 		}
 
-		switch ($component)
-		{
+		switch ($component) {
 			case PHP_URL_SCHEME:
 				return $this->scheme ?? null;
 
@@ -445,30 +439,28 @@ public function proxied(): object
 		$proxied = clone $this;
 
 		// Only use the proxy if enabled, and never for robots.
-		if (empty(Config::$image_proxy_enabled) || !empty(User::$me->possibly_robot))
-		{
+		if (empty(Config::$image_proxy_enabled) || !empty(User::$me->possibly_robot)) {
 			return $proxied;
 		}
 
 		// Don't bother with HTTPS URLs, schemeless URLs, or obviously invalid URLs.
-		if (empty($parsed->scheme) || empty($parsed->host) || empty($parsed->path) || $parsed->scheme === 'https')
-		{
+		if (empty($parsed->scheme) || empty($parsed->host) || empty($parsed->path) || $parsed->scheme === 'https') {
 			return $proxied;
 		}
 
 		// We don't need to proxy our own resources.
-		if ($parsed->host === Url::create(Config::$boardurl)->host)
-		{
-			$proxied->url = strtr($this->url, array('http://' => 'https://'));
+		if ($parsed->host === Url::create(Config::$boardurl)->host) {
+			$proxied->url = strtr($this->url, ['http://' => 'https://']);
+
 			return $proxied;
 		}
 
 		// By default, use SMF's own image proxy script.
-		$proxied->url = strtr(Config::$boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($proxied->url) . '&hash=' . hash_hmac('sha1', $proxied->url, Config::$image_proxy_secret);
+		$proxied->url = strtr(Config::$boardurl, ['http://' => 'https://']) . '/proxy.php?request=' . urlencode($proxied->url) . '&hash=' . hash_hmac('sha1', $proxied->url, Config::$image_proxy_secret);
 
 		// Allow mods to easily implement an alternative proxy.
 		// MOD AUTHORS: To add settings UI for your proxy, use the integrate_general_settings hook.
-		IntegrationHook::call('integrate_proxy', array($this->url, &$proxied->url));
+		IntegrationHook::call('integrate_proxy', [$this->url, &$proxied->url]);
 
 		return $proxied;
 	}
@@ -481,27 +473,27 @@ public function proxied(): object
 	public function hasSSL(): bool
 	{
 		// This check won't work without OpenSSL
-		if (!extension_loaded('openssl'))
+		if (!extension_loaded('openssl')) {
 			return true;
+		}
 
 		// First, strip the subfolder from the passed url, if any
 		$ssl_url = 'ssl://' . $this->host . ':443';
 
 		// Next, check the ssl stream context for certificate info
-		$ssloptions = array(
+		$ssloptions = [
 			'capture_peer_cert' => true,
 			'verify_peer' => true,
 			'allow_self_signed' => true,
-		);
+		];
 
 		$result = false;
 
-		$stream_context = stream_context_create(array('ssl' => $ssloptions));
+		$stream_context = stream_context_create(['ssl' => $ssloptions]);
 
 		$stream = @stream_socket_client($ssl_url, $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $stream_context);
 
-		if ($stream !== false)
-		{
+		if ($stream !== false) {
 			$params = stream_context_get_params($stream);
 			$result = isset($params['options']['ssl']['peer_certificate']) ? true : false;
 		}
@@ -523,21 +515,21 @@ public function redirectsToHttps(): bool
 
 		$headers = @get_headers($http_url);
 
-		if ($headers === false)
+		if ($headers === false) {
 			return false;
+		}
 
 		// Now to see if it came back HTTPS.
 		// First check for a redirect status code in first row (301, 302, 307).
-		if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false)
-		{
+		if (strstr($headers[0], '301') === false && strstr($headers[0], '302') === false && strstr($headers[0], '307') === false) {
 			return false;
 		}
 
 		// Search for the location entry to confirm HTTPS.
-		foreach ($headers as $header)
-		{
-			if (stristr($header, 'Location: https://') !== false)
+		foreach ($headers as $header) {
+			if (stristr($header, 'Location: https://') !== false) {
 				return true;
+			}
 		}
 
 		return false;
@@ -583,12 +575,12 @@ public static function setTldRegex(bool $update = false): void
 		static $done = false;
 
 		// If we don't need to do anything, don't
-		if (!$update && $done)
+		if (!$update && $done) {
 			return;
+		}
 
 		// Should we get a new copy of the official list of TLDs?
-		if ($update)
-		{
+		if ($update) {
 			$tlds = WebFetchApi::fetch('https://data.iana.org/TLD/tlds-alpha-by-domain.txt');
 			$tlds_md5 = WebFetchApi::fetch('https://data.iana.org/TLD/tlds-alpha-by-domain.txt.md5');
 
@@ -601,47 +593,46 @@ public static function setTldRegex(bool $update = false): void
 			 * wait until the next regularly scheduled update to see if
 			 * civilization has been restored.
 			 */
-			if ($tlds === false || $tlds_md5 === false)
+			if ($tlds === false || $tlds_md5 === false) {
 				$postapocalypticNightmare = true;
+			}
 
 			// Make sure nothing went horribly wrong along the way.
-			if (md5($tlds) != substr($tlds_md5, 0, 32))
-				$tlds = array();
+			if (md5($tlds) != substr($tlds_md5, 0, 32)) {
+				$tlds = [];
+			}
 		}
 		// If we aren't updating and the regex is valid, we're done
-		elseif (!empty(Config::$modSettings['tld_regex']) && @preg_match('~' . Config::$modSettings['tld_regex'] . '~', '') !== false)
-		{
+		elseif (!empty(Config::$modSettings['tld_regex']) && @preg_match('~' . Config::$modSettings['tld_regex'] . '~', '') !== false) {
 			$done = true;
+
 			return;
 		}
 
 		// If we successfully got an update, process the list into an array
-		if (!empty($tlds))
-		{
+		if (!empty($tlds)) {
 			// Clean $tlds and convert it to an array
 			$tlds = array_filter(
 				explode("\n", strtolower($tlds)),
-				function($line)
-				{
+				function ($line) {
 					$line = trim($line);
-					if (empty($line) || strlen($line) != strspn($line, 'abcdefghijklmnopqrstuvwxyz0123456789-'))
-						return false;
-					else
-						return true;
-				}
+
+					return !(empty($line) || strlen($line) != strspn($line, 'abcdefghijklmnopqrstuvwxyz0123456789-'));
+				},
 			);
 
 			// Convert Punycode to Unicode
-			if (!function_exists('idn_to_utf8'))
-				require_once(Config::$sourcedir . '/Subs-Compat.php');
+			if (!function_exists('idn_to_utf8')) {
+				require_once Config::$sourcedir . '/Subs-Compat.php';
+			}
 
-			foreach ($tlds as &$tld)
+			foreach ($tlds as &$tld) {
 				$tld = idn_to_utf8($tld, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
+			}
 		}
 		// Otherwise, use the 2012 list of gTLDs and ccTLDs for now and schedule a background update
-		else
-		{
-			$tlds = array('com', 'net', 'org', 'edu', 'gov', 'mil', 'aero', 'asia', 'biz',
+		else {
+			$tlds = ['com', 'net', 'org', 'edu', 'gov', 'mil', 'aero', 'asia', 'biz',
 				'cat', 'coop', 'info', 'int', 'jobs', 'mobi', 'museum', 'name', 'post',
 				'pro', 'tel', 'travel', 'xxx', 'ac', 'ad', 'ae', 'af', 'ag', 'ai', 'al',
 				'am', 'ao', 'aq', 'ar', 'as', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd',
@@ -663,27 +654,37 @@ function($line)
 				'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tr', 'tt', 'tv', 'tw', 'tz', 'ua',
 				'ug', 'uk', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf',
 				'ws', 'ye', 'yt', 'za', 'zm', 'zw',
-			);
+			];
 
 			// Schedule a background update, unless civilization has collapsed and/or we are having connectivity issues.
-			if (empty($postapocalypticNightmare))
-			{
-				Db::$db->insert('insert', '{db_prefix}background_tasks',
-					array('task_file' => 'string-255', 'task_class' => 'string-255', 'task_data' => 'string', 'claimed_time' => 'int'),
-					array('$sourcedir/tasks/UpdateTldRegex.php', 'SMF\Tasks\UpdateTldRegex', '', 0), array()
+			if (empty($postapocalypticNightmare)) {
+				Db::$db->insert(
+					'insert',
+					'{db_prefix}background_tasks',
+					[
+						'task_class' => 'string-255',
+						'task_data' => 'string',
+						'claimed_time' => 'int',
+					],
+					[
+						'SMF\\Tasks\\UpdateTldRegex',
+						'',
+						0,
+					],
+					[],
 				);
 			}
 		}
 
 		// Tack on some "special use domain names" that aren't in DNS but may possibly resolve.
 		// See https://www.iana.org/assignments/special-use-domain-names/ for more info.
-		$tlds = array_merge($tlds, array('local', 'onion', 'test'));
+		$tlds = array_merge($tlds, ['local', 'onion', 'test']);
 
 		// Get an optimized regex to match all the TLDs
 		$tld_regex = Utils::buildRegex($tlds);
 
 		// Remember the new regex in Config::$modSettings
-		Config::updateModSettings(array('tld_regex' => $tld_regex));
+		Config::updateModSettings(['tld_regex' => $tld_regex]);
 
 		// Redundant repetition is redundant
 		$done = true;
@@ -804,7 +805,7 @@ public static function sslCertFound(string $url): bool
 	 * @param string $url The URL to check.
 	 * @return bool Whether a redirect to HTTPS was found.
 	 */
-	function httpsRedirectActive(string $url):  bool
+	public function httpsRedirectActive(string $url): bool
 	{
 		$url = new self($url);
 
@@ -823,11 +824,11 @@ protected function checkIfAscii(): void
 	{
 		$this->is_ascii = mb_check_encoding($this->url, 'ASCII');
 	}
-
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Url::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Url::exportStatic')) {
 	Url::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/User.php b/Sources/User.php
index a0781a06ae..6acca8b9e3 100644
--- a/Sources/User.php
+++ b/Sources/User.php
@@ -13,8 +13,8 @@
 
 namespace SMF;
 
-use SMF\Actions\Login2;
 use SMF\Actions\Admin\ACP;
+use SMF\Actions\Login2;
 use SMF\Actions\Moderation\ReportedContent;
 use SMF\Cache\CacheApi;
 use SMF\Db\DatabaseApi as Db;
@@ -64,47 +64,61 @@
  */
 class User implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'reload' => false,
-			'setMe' => false,
-			'setModerators' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'buildQueryBoard' => 'build_query_board',
 			'setAvatarData' => 'set_avatar_data',
+			'updateMemberData' => 'updateMemberData',
 			'getTimezone' => 'getUserTimezone',
 			'delete' => 'deleteMembers',
+			'validatePassword' => 'validatePassword',
+			'validateUsername' => 'validateUsername',
+			'isReservedName' => 'isReservedName',
+			'isBannedEmail' => 'isBannedEmail',
 			'find' => 'findMembers',
+			'membersAllowedTo' => 'membersAllowedTo',
+			'groupsAllowedTo' => 'groupsAllowedTo',
+			'getGroupsWithPermissions' => 'getGroupsWithPermissions',
+			'generateValidationCode' => 'generateValidationCode',
+			'logSpider' => 'logSpider',
+			'loadMemberData' => 'loadMemberData',
+			'loadUserSettings' => 'loadUserSettings',
 			'loadMyPermissions' => 'loadPermissions',
-			'setCurProfile' => false,
+			'loadMemberContext' => 'loadMemberContext',
+			'is_not_guest' => 'is_not_guest',
+			'is_not_banned' => 'is_not_banned',
+			'banPermissions' => 'banPermissions',
+			'log_ban' => 'log_ban',
 			'sessionValidate' => 'validateSession',
 			'sessionCheck' => 'checkSession',
 			'hasPermission' => 'allowedTo',
 			'mustHavePermission' => 'isAllowedTo',
 			'hasPermissionInBoards' => 'boardsAllowedTo',
-		),
-		'prop_names' => array(
+		],
+		'prop_names' => [
 			'profiles' => 'user_profile',
 			'settings' => 'user_settings',
 			'info' => 'user_info',
+			'sc' => 'sc',
 			'memberContext' => 'memberContext',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
 	 *****************/
 
-	const LOAD_BY_ID = 0;
-	const LOAD_BY_NAME = 1;
-	const LOAD_BY_EMAIL = 2;
+	public const LOAD_BY_ID = 0;
+	public const LOAD_BY_NAME = 1;
+	public const LOAD_BY_EMAIL = 2;
 
 	/*******************
 	 * Public properties
@@ -206,14 +220,14 @@ class User implements \ArrayAccess
 	 *
 	 * IDs of any additional groups this user belongs to.
 	 */
-	public array $additional_groups = array();
+	public array $additional_groups = [];
 
 	/**
 	 * @var array
 	 *
 	 * IDs of all the groups this user belongs to.
 	 */
-	public array $groups = array();
+	public array $groups = [];
 
 	/**
 	 * @var bool
@@ -389,10 +403,10 @@ class User implements \ArrayAccess
 	 *
 	 * Info about the user's website.
 	 */
-	public array $website = array(
+	public array $website = [
 		'url' => null,
 		'title' => null,
-	);
+	];
 
 	/**
 	 * @var int
@@ -406,7 +420,7 @@ class User implements \ArrayAccess
 	 *
 	 * The user's theme options.
 	 */
-	public array $options = array();
+	public array $options = [];
 
 	/**
 	 * @var string
@@ -420,14 +434,14 @@ class User implements \ArrayAccess
 	 *
 	 * IDs of users on this user's buddy list.
 	 */
-	public array $buddies = array();
+	public array $buddies = [];
 
 	/**
 	 * @var array
 	 *
 	 * IDs of users that this user is ignoring.
 	 */
-	public array $ignoreusers = array();
+	public array $ignoreusers = [];
 
 	/**
 	 * @var int
@@ -476,7 +490,7 @@ class User implements \ArrayAccess
 	 *
 	 * IDs of boards that this user is ignoring.
 	 */
-	public array $ignoreboards = array();
+	public array $ignoreboards = [];
 
 	/**
 	 * @var string
@@ -531,7 +545,7 @@ class User implements \ArrayAccess
 	 *
 	 * Info about the user's avatar.
 	 */
-	public array $avatar = array(
+	public array $avatar = [
 		'original_url' => null,
 		'url' => null,
 		'href' => null,
@@ -542,14 +556,14 @@ class User implements \ArrayAccess
 		'width' => null,
 		'height' => null,
 		'image' => null,
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Permssions that this user has been granted.
 	 */
-	public array $permissions = array();
+	public array $permissions = [];
 
 	/**
 	 * @var int
@@ -563,7 +577,7 @@ class User implements \ArrayAccess
 	 *
 	 * Moderator access info.
 	 */
-	public array $mod_cache = array();
+	public array $mod_cache = [];
 
 	/**
 	 * @var string
@@ -634,7 +648,7 @@ class User implements \ArrayAccess
 	 *
 	 * Formatted versions of this user's properties, suitable for display.
 	 */
-	public array $formatted = array();
+	public array $formatted = [];
 
 	/**************************
 	 * Public static properties
@@ -645,7 +659,7 @@ class User implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var object
@@ -672,14 +686,14 @@ class User implements \ArrayAccess
 	 * "Session check" value for the current user.
 	 * Set by Session::load(). Used by checkSession().
 	 */
-	public static string $sc;
+	public static $sc;
 
 	/**
 	 * @var array
 	 *
 	 * Basic data from the database about all loaded users.
 	 */
-	public static array $profiles = array();
+	public static array $profiles = [];
 
 	/**
 	 * @var array
@@ -713,7 +727,7 @@ class User implements \ArrayAccess
 	 *
 	 * Fields in the member table that take integers.
 	 */
-	public static array $knownInts = array(
+	public static array $knownInts = [
 		'alerts',
 		'date_registered',
 		'gender',
@@ -732,23 +746,23 @@ class User implements \ArrayAccess
 		'total_time_logged_in',
 		'unread_messages',
 		'warning',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Fields in the member table that take floats.
 	 */
-	public static array $knownFloats = array(
+	public static array $knownFloats = [
 		'time_offset',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Names of variables to pass to the integrate_change_member_data hook.
 	 */
-	public static array $integration_vars = array(
+	public static array $integration_vars = [
 		'avatar',
 		'birthdate',
 		'email_address',
@@ -763,14 +777,14 @@ class User implements \ArrayAccess
 		'timezone',
 		'website_title',
 		'website_url',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Permissions to deny to users who are banned from posting.
 	 */
-	public static array $post_ban_permissions = array(
+	public static array $post_ban_permissions = [
 		'admin_forum',
 		'calendar_edit_any',
 		'calendar_edit_own',
@@ -820,26 +834,26 @@ class User implements \ArrayAccess
 		'remove_own',
 		'send_mail',
 		'split_any',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Permissions to change for users with a high warning level.
 	 */
-	public static array $warn_permissions = array(
+	public static array $warn_permissions = [
 		'post_new' => 'post_unapproved_topics',
 		'post_reply_own' => 'post_unapproved_replies_own',
 		'post_reply_any' => 'post_unapproved_replies_any',
 		'post_attachment' => 'post_unapproved_attachments',
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Permissions that should only be given to highly trusted members.
 	 */
-	public static array $heavy_permissions = array(
+	public static array $heavy_permissions = [
 		'admin_forum',
 		'manage_attachments',
 		'manage_smileys',
@@ -849,7 +863,7 @@ class User implements \ArrayAccess
 		'manage_bans',
 		'manage_membergroups',
 		'manage_permissions',
-	);
+	];
 
 	/*********************
 	 * Internal properties
@@ -881,14 +895,14 @@ class User implements \ArrayAccess
 	 *
 	 * Cache for the allowedTo() method.
 	 */
-	private array $perm_cache = array();
+	private array $perm_cache = [];
 
 	/**
 	 * @var array
 	 *
 	 * Alternate names for some object properties.
 	 */
-	protected array $prop_aliases = array(
+	protected array $prop_aliases = [
 		'id_member' => 'id',
 		'member_name' => 'username',
 		'real_name' => 'name',
@@ -916,7 +930,7 @@ class User implements \ArrayAccess
 
 		// Initial exclamation mark means inverse of the property.
 		'is_logged' => '!is_guest',
-	);
+	];
 
 	/****************************
 	 * Internal static properties
@@ -927,12 +941,12 @@ class User implements \ArrayAccess
 	 *
 	 * Maps names of dataset levels to numeric values.
 	 */
-	protected static array $dataset_levels = array(
+	protected static array $dataset_levels = [
 		'minimal' => 0,
 		'basic' => 1,
 		'normal' => 2,
 		'profile' => 3,
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -946,8 +960,7 @@ class User implements \ArrayAccess
 	 */
 	public function __set(string $prop, mixed $value): void
 	{
-		if (in_array($this->prop_aliases[$prop] ?? $prop, array('additional_groups', 'buddies', 'ignoreusers', 'ignoreboards')) && is_string($value))
-		{
+		if (in_array($this->prop_aliases[$prop] ?? $prop, ['additional_groups', 'buddies', 'ignoreusers', 'ignoreboards']) && is_string($value)) {
 			$prop = $this->prop_aliases[$prop] ?? $prop;
 			$value = array_map('intval', array_filter(explode(',', $value), 'strlen'));
 		}
@@ -960,42 +973,41 @@ public function __set(string $prop, mixed $value): void
 	 */
 	public function loadPermissions(): void
 	{
-		if ($this->is_admin)
-		{
+		if ($this->is_admin) {
 			$this->can_mod = true;
 			$this->can_manage_boards = true;
 
 			$this->adjustPermissions();
+
 			return;
 		}
 
-		if (!empty(CacheApi::$enable))
-		{
+		if (!empty(CacheApi::$enable)) {
 			$cache_groups = $this->groups;
 			asort($cache_groups);
 			$cache_groups = implode(',', $cache_groups);
 
 			// If it's a spider then cache it separately.
-			if ($this->possibly_robot)
+			if ($this->possibly_robot) {
 				$cache_groups .= '-spider';
+			}
 
 			if (
 				CacheApi::$enable >= 2
 				&& !empty(Board::$info->id)
 				&& ($temp = CacheApi::get('permissions:' . $cache_groups . ':' . Board::$info->id, 240)) != null
 				&& time() - 240 > Config::$modSettings['settings_updated']
-			)
-			{
+			) {
 				list($this->permissions) = $temp;
 				$this->adjustPermissions();
 
 				return;
 			}
-			elseif (
+
+			if (
 				($temp = CacheApi::get('permissions:' . $cache_groups, 240)) != null
 				&& time() - 240 > Config::$modSettings['settings_updated']
-			)
-			{
+			) {
 				list($this->permissions, $removals) = $temp;
 			}
 		}
@@ -1003,66 +1015,60 @@ public function loadPermissions(): void
 		// If it is detected as a robot, and we are restricting permissions as a special group - then implement this.
 		$spider_restrict = $this->possibly_robot && !empty(Config::$modSettings['spider_group']) ? ' OR (id_group = {int:spider_group} AND add_deny = 0)' : '';
 
-		if (empty($this->permissions))
-		{
+		if (empty($this->permissions)) {
 			// Get the general permissions.
-			$removals = array();
-			$request = Db::$db->query('', '
-				SELECT permission, add_deny
+			$removals = [];
+			$request = Db::$db->query(
+				'',
+				'SELECT permission, add_deny
 				FROM {db_prefix}permissions
 				WHERE id_group IN ({array_int:member_groups})
 					' . $spider_restrict,
-				array(
+				[
 					'member_groups' => $this->groups,
 					'spider_group' => !empty(Config::$modSettings['spider_group']) ? Config::$modSettings['spider_group'] : 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['add_deny']))
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['add_deny'])) {
 					$removals[] = $row['permission'];
-				}
-				else
-				{
+				} else {
 					$this->permissions[] = $row['permission'];
 				}
 			}
 			Db::$db->free_result($request);
 
-			if (isset($cache_groups))
-			{
-				CacheApi::put('permissions:' . $cache_groups, array($this->permissions, $removals), 240);
+			if (isset($cache_groups)) {
+				CacheApi::put('permissions:' . $cache_groups, [$this->permissions, $removals], 240);
 			}
 		}
 
 		// Get the board permissions.
-		if (!empty(Board::$info->id))
-		{
+		if (!empty(Board::$info->id)) {
 			// Make sure the board (if any) has been loaded by Board::load().
-			if (!isset(Board::$info->profile))
+			if (!isset(Board::$info->profile)) {
 				ErrorHandler::fatalLang('no_board');
+			}
 
-			$request = Db::$db->query('', '
-				SELECT permission, add_deny
+			$request = Db::$db->query(
+				'',
+				'SELECT permission, add_deny
 				FROM {db_prefix}board_permissions
 				WHERE (id_group IN ({array_int:member_groups})
 					' . $spider_restrict . ')
 					AND id_profile = {int:id_profile}',
-				array(
+				[
 					'member_groups' => $this->groups,
 					'id_profile' => Board::$info->profile,
 					'spider_group' => !empty(Config::$modSettings['spider_group']) ? Config::$modSettings['spider_group'] : 0,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
-				if (empty($row['add_deny']))
-				{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
+				if (empty($row['add_deny'])) {
 					$removals[] = $row['permission'];
-				}
-				else
-				{
+				} else {
 					$this->permissions[] = $row['permission'];
 				}
 			}
@@ -1070,28 +1076,22 @@ public function loadPermissions(): void
 		}
 
 		// Remove all the permissions they shouldn't have ;).
-		if (!empty(Config::$modSettings['permission_enable_deny']))
-		{
+		if (!empty(Config::$modSettings['permission_enable_deny'])) {
 			$this->permissions = array_diff($this->permissions, $removals);
 		}
 
-		if (isset($cache_groups) && !empty(Board::$info->id) && CacheApi::$enable >= 2)
-		{
-			CacheApi::put('permissions:' . $cache_groups . ':' . Board::$info->id, array($this->permissions, null), 240);
+		if (isset($cache_groups) && !empty(Board::$info->id) && CacheApi::$enable >= 2) {
+			CacheApi::put('permissions:' . $cache_groups . ':' . Board::$info->id, [$this->permissions, null], 240);
 		}
 
 		// Banned?  Watch, don't touch..
 		$this->adjustPermissions();
 
 		// Load the mod cache so we can know what additional boards they should see, but no sense in doing it for guests
-		if (!$this->is_guest && $this->id === self::$my_id)
-		{
-			if (!isset($_SESSION['mc']) || $_SESSION['mc']['time'] <= Config::$modSettings['settings_updated'])
-			{
+		if (!$this->is_guest && $this->id === self::$my_id) {
+			if (!isset($_SESSION['mc']) || $_SESSION['mc']['time'] <= Config::$modSettings['settings_updated']) {
 				$this->rebuildModCache();
-			}
-			else
-			{
+			} else {
 				$this->mod_cache = $_SESSION['mc'];
 			}
 
@@ -1102,8 +1102,9 @@ public function loadPermissions(): void
 			// And now some backwards compatibility stuff for mods and whatnot that aren't expecting the new permissions.
 			$this->permissions[] = 'profile_view_own';
 
-			if (in_array('profile_view', $this->permissions))
+			if (in_array('profile_view', $this->permissions)) {
 				$this->permissions[] = 'profile_view_any';
+			}
 
 			// A user can mod if they have permission to see the mod center, or they are a board/group/approval moderator.
 			$this->can_mod = in_array('access_mod_center', $this->permissions) || ($this->mod_cache['gq'] ?? '0=1') != '0=1' || ($this->mod_cache['bq'] ?? '0=1') != '0=1' || (Config::$modSettings['postmod_active'] && !empty($this->mod_cache['ap']));
@@ -1119,21 +1120,21 @@ public function loadPermissions(): void
 	 */
 	public function format(bool $display_custom_fields = false): array
 	{
-		static $loadedLanguages = array();
+		static $loadedLanguages = [];
 
 		Lang::load('index+Modifications');
 
-		if (empty(Config::$modSettings['displayFields']))
+		if (empty(Config::$modSettings['displayFields'])) {
 			$display_custom_fields = false;
+		}
 
 		// If this user's data is already loaded, skip it.
-		if (!empty($this->formatted) && $this->custom_fields_displayed >= $display_custom_fields)
-		{
+		if (!empty($this->formatted) && $this->custom_fields_displayed >= $display_custom_fields) {
 			return $this->formatted;
 		}
 
 		// The minimal values.
-		$this->formatted = array(
+		$this->formatted = [
 			'id' => $this->id,
 			'username' => $this->is_guest ? Lang::$txt['guest_title'] : $this->username,
 			'name' => $this->is_guest ? Lang::$txt['guest_title'] : $this->name,
@@ -1143,29 +1144,29 @@ public function format(bool $display_custom_fields = false): array
 			'show_email' => !User::$me->is_guest && (User::$me->id == $this->id || User::$me->allowedTo('moderate_forum')),
 			'registered' => empty($this->date_registered) ? Lang::$txt['not_applicable'] : Time::create('@' . $this->date_registered)->format(),
 			'registered_timestamp' => $this->date_registered,
-		);
+		];
 
 		// Basic, normal, and profile want the avatar.
-		if (in_array($this->dataset, array('basic', 'normal', 'profile')))
+		if (in_array($this->dataset, ['basic', 'normal', 'profile'])) {
 			$this->formatted['avatar'] = $this->avatar;
+		}
 
 		// Normal and profile want lots more data.
-		if (in_array($this->dataset, array('normal', 'profile')))
-		{
+		if (in_array($this->dataset, ['normal', 'profile'])) {
 			// Go the extra mile and load the user's native language name.
-			if (empty($loadedLanguages))
+			if (empty($loadedLanguages)) {
 				$loadedLanguages = Lang::get(true);
+			}
 
 			// We need a little fallback for the membergroup icons. If the image
 			// doesn't exist in the current theme, fall back to default theme.
 			$group_icon_url = '';
 
-			if (isset($this->icons[1]))
-			{
-				foreach (array('actual_theme_dir' => 'images_url', 'default_theme_dir' => 'default_images_url') as $dir => $url)
-				{
-					if (file_exists(Theme::$current->settings[$dir] . '/images/membericons/' . $this->icons[1]))
+			if (isset($this->icons[1])) {
+				foreach (['actual_theme_dir' => 'images_url', 'default_theme_dir' => 'default_images_url'] as $dir => $url) {
+					if (file_exists(Theme::$current->settings[$dir] . '/images/membericons/' . $this->icons[1])) {
 						$group_icon_url = Theme::$current->settings[$url] . '/membericons/' . $this->icons[1];
+					}
 				}
 			}
 
@@ -1173,7 +1174,7 @@ public function format(bool $display_custom_fields = false): array
 			$is_visibly_online = (!empty($this->show_online) || User::$me->allowedTo('moderate_forum')) && $this->is_online > 0;
 
 			// Now append all the rest of the data.
-			$this->formatted += array(
+			$this->formatted += [
 				'username_color' => '<span ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->username . '</span>',
 				'name_color' => '<span ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->name . '</span>',
 				'link_color' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id . '" title="' . sprintf(Lang::$txt['view_profile_of_username'], $this->name) . '" ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->name . '</a>',
@@ -1191,15 +1192,15 @@ public function format(bool $display_custom_fields = false): array
 				'last_login_timestamp' => empty($this->last_login) ? 0 : $this->last_login,
 				'ip' => Utils::htmlspecialchars($this->ip),
 				'ip2' => Utils::htmlspecialchars($this->ip2),
-				'online' => array(
+				'online' => [
 					'is_online' => $is_visibly_online,
 					'text' => Utils::htmlspecialchars(Lang::$txt[$is_visibly_online ? 'online' : 'offline']),
 					'member_online_text' => sprintf(Lang::$txt[$is_visibly_online ? 'member_is_online' : 'member_is_offline'], Utils::htmlspecialchars($this->name)),
 					'href' => Config::$scripturl . '?action=pm;sa=send;u=' . $this->id,
 					'link' => '<a href="' . Config::$scripturl . '?action=pm;sa=send;u=' . $this->id . '">' . Lang::$txt[$is_visibly_online ? 'online' : 'offline'] . '</a>',
 					'label' => Lang::$txt[$is_visibly_online ? 'online' : 'offline'],
-				),
-				'language' => !empty($loadedLanguages[$this->language]) && !empty($loadedLanguages[$this->language]['name']) ? $loadedLanguages[$this->language]['name'] : Utils::ucwords(strtr($this->language, array('_' => ' ', '-utf8' => ''))),
+				],
+				'language' => !empty($loadedLanguages[$this->language]) && !empty($loadedLanguages[$this->language]['name']) ? $loadedLanguages[$this->language]['name'] : Utils::ucwords(strtr($this->language, ['_' => ' ', '-utf8' => ''])),
 				'is_activated' => $this->is_activated % 10 == 1,
 				'is_banned' => $this->is_banned,
 				'options' => $this->options,
@@ -1218,86 +1219,78 @@ public function format(bool $display_custom_fields = false): array
 				'warning' => $this->warning,
 				'warning_status' => !empty(Config::$modSettings['warning_mute']) && Config::$modSettings['warning_mute'] <= $this->warning ? 'mute' : (!empty(Config::$modSettings['warning_moderate']) && Config::$modSettings['warning_moderate'] <= $this->warning ? 'moderate' : (!empty(Config::$modSettings['warning_watch']) && Config::$modSettings['warning_watch'] <= $this->warning ? 'watch' : '')),
 				'local_time' => Time::create('now', $this->timezone)->format(null, false),
-				'custom_fields' => array(),
-			);
+				'custom_fields' => [],
+			];
 
 			Lang::censorText($this->formatted['blurb']);
 			Lang::censorText($this->formatted['signature']);
 
-			$this->formatted['signature'] = BBCodeParser::load()->parse(str_replace(array("\n", "\r"), array('<br>', ''), $this->formatted['signature']), true, 'sig' . $this->id, BBCodeParser::getSigTags());
+			$this->formatted['signature'] = BBCodeParser::load()->parse(str_replace(["\n", "\r"], ['<br>', ''], $this->formatted['signature']), true, 'sig' . $this->id, BBCodeParser::getSigTags());
 		}
 
 		// Are we also loading the member's custom fields?
-		if ($display_custom_fields)
-		{
-			$this->formatted['custom_fields'] = array();
+		if ($display_custom_fields) {
+			$this->formatted['custom_fields'] = [];
 
-			if (!isset(Utils::$context['display_fields']))
-			{
+			if (!isset(Utils::$context['display_fields'])) {
 				Utils::$context['display_fields'] = Utils::jsonDecode(Config::$modSettings['displayFields'], true);
 			}
 
-			foreach (Utils::$context['display_fields'] as $custom)
-			{
-				if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($this->options[$custom['col_name']]))
-				{
+			foreach (Utils::$context['display_fields'] as $custom) {
+				if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($this->options[$custom['col_name']])) {
 					continue;
 				}
 
 				$value = $this->options[$custom['col_name']];
 
-				$fieldOptions = array();
+				$fieldOptions = [];
 				$currentKey = 0;
 
 				// Create a key => value array for multiple options fields
-				if (!empty($custom['options']))
-				{
-					foreach ($custom['options'] as $k => $v)
-					{
+				if (!empty($custom['options'])) {
+					foreach ($custom['options'] as $k => $v) {
 						$fieldOptions[] = $v;
 
-						if (empty($currentKey))
+						if (empty($currentKey)) {
 							$currentKey = $v == $value ? $k : 0;
+						}
 					}
 				}
 
 				// BBC?
-				if ($custom['bbc'])
-				{
+				if ($custom['bbc']) {
 					$value = BBCodeParser::load()->parse($value);
 				}
 				// ... or checkbox?
-				elseif (isset($custom['type']) && $custom['type'] == 'check')
-				{
+				elseif (isset($custom['type']) && $custom['type'] == 'check') {
 					$value = $value ? Lang::$txt['yes'] : Lang::$txt['no'];
 				}
 
 				// Enclosing the user input within some other text?
 				$simple_value = $value;
 
-				if (!empty($custom['enclose']))
-				{
-					$value = strtr($custom['enclose'], array(
+				if (!empty($custom['enclose'])) {
+					$value = strtr($custom['enclose'], [
 						'{SCRIPTURL}' => Config::$scripturl,
 						'{IMAGES_URL}' => Theme::$current->settings['images_url'],
 						'{DEFAULT_IMAGES_URL}' => Theme::$current->settings['default_images_url'],
 						'{INPUT}' => Lang::tokenTxtReplace($value),
 						'{KEY}' => $currentKey,
-					));
+					]);
 				}
 
-				$this->formatted['custom_fields'][] = array(
+				$this->formatted['custom_fields'][] = [
 					'title' => Lang::tokenTxtReplace(!empty($custom['title']) ? $custom['title'] : $custom['col_name']),
 					'col_name' => Lang::tokenTxtReplace($custom['col_name']),
 					'value' => Utils::htmlspecialcharsDecode(Lang::tokenTxtReplace($value)),
 					'simple' => Lang::tokenTxtReplace($simple_value),
 					'raw' => $this->options[$custom['col_name']],
 					'placement' => !empty($custom['placement']) ? $custom['placement'] : 0,
-				);
+				];
 			}
 		}
 
-		IntegrationHook::call('integrate_member_context', array(&$this->formatted, $this->id, $display_custom_fields));
+		IntegrationHook::call('integrate_member_context', [&$this->formatted, $this->id, $display_custom_fields]);
 
 		$this->custom_fields_displayed = !empty($this->custom_fields_displayed) | $display_custom_fields;
 
@@ -1315,16 +1308,13 @@ public function format(bool $display_custom_fields = false): array
 	public function logOnline(bool $force = false): void
 	{
 		// If we are showing who is viewing a topic, let's see if we are, and force an update if so - to make it accurate.
-		if (!empty(Theme::$current->settings['display_who_viewing']) && (Topic::$topic_id || Board::$info->id))
-		{
+		if (!empty(Theme::$current->settings['display_who_viewing']) && (!empty(Topic::$topic_id) || !empty(Board::$info->id))) {
 			// Take the opposite approach!
 			$force = true;
 
 			// Don't update for every page - this isn't wholly accurate but who cares.
-			if (Topic::$topic_id)
-			{
-				if (isset($_SESSION['last_topic_id']) && $_SESSION['last_topic_id'] == Topic::$topic_id)
-				{
+			if (!empty(Topic::$topic_id)) {
+				if (isset($_SESSION['last_topic_id']) && $_SESSION['last_topic_id'] == Topic::$topic_id) {
 					$force = false;
 				}
 
@@ -1333,29 +1323,28 @@ public function logOnline(bool $force = false): void
 		}
 
 		// Are they a spider we should be tracking? Mode = 1 gets tracked on its spider check...
-		if (!empty($this->possibly_robot) && !empty(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] > 1)
-		{
+		if (!empty($this->possibly_robot) && !empty(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] > 1) {
 			self::logSpider();
 		}
 
 		// Don't mark them as online more than every so often.
-		if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= (time() - 8) && !$force)
+		if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= (time() - 8) && !$force) {
 			return;
+		}
 
-		if (!empty(Config::$modSettings['who_enabled']))
-		{
+		if (!empty(Config::$modSettings['who_enabled'])) {
 			// In the case of a dlattach action, session_var may not be set.
-			if (!isset(Utils::$context['session_var']))
+			if (!isset(Utils::$context['session_var'])) {
 				Utils::$context['session_var'] = $_SESSION['session_var'];
+			}
 
 			// Sometimes folks mess with USER_AGENT and $_GET, so we do this to
 			// prevent 'data too long' errors.
 			$num_elements = count($_GET, COUNT_RECURSIVE) + 1;
 			$max_length = 2048;
 
-			do
-			{
-				$encoded_get = $_GET + array('USER_AGENT' => mb_substr($_SERVER['HTTP_USER_AGENT'], 0, 128));
+			do {
+				$encoded_get = $_GET + ['USER_AGENT' => mb_substr($_SERVER['HTTP_USER_AGENT'], 0, 128)];
 
 				unset($encoded_get['sesc'], $encoded_get[Utils::$context['session_var']]);
 
@@ -1364,11 +1353,8 @@ public function logOnline(bool $force = false): void
 
 				// If too long, reduce $max_length by one byte per element and try again.
 				$max_length -= $num_elements;
-			}
-			while (strlen($encoded_get) > 2048);
-		}
-		else
-		{
+			} while (strlen($encoded_get) > 2048);
+		} else {
 			$encoded_get = '';
 		}
 
@@ -1379,65 +1365,64 @@ public function logOnline(bool $force = false): void
 		$do_delete = CacheApi::get('log_online-update', 30) < time() - 30;
 
 		// If the last click wasn't a long time ago, and there was a last click...
-		if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= time() - Config::$modSettings['lastActive'] * 20)
-		{
-			if ($do_delete)
-			{
-				Db::$db->query('delete_log_online_interval', '
-					DELETE FROM {db_prefix}log_online
+		if (!empty($_SESSION['log_time']) && $_SESSION['log_time'] >= time() - Config::$modSettings['lastActive'] * 20) {
+			if ($do_delete) {
+				Db::$db->query(
+					'delete_log_online_interval',
+					'DELETE FROM {db_prefix}log_online
 					WHERE log_time < {int:log_time}
 						AND session != {string:session}',
-					array(
+					[
 						'log_time' => time() - Config::$modSettings['lastActive'] * 60,
 						'session' => $session_id,
-					)
+					],
 				);
 
 				// Cache when we did it last.
 				CacheApi::put('log_online-update', time(), 30);
 			}
 
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_online
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_online
 				SET log_time = {int:log_time}, ip = {inet:ip}, url = {string:url}
 				WHERE session = {string:session}',
-				array(
+				[
 					'log_time' => time(),
 					'ip' => $this->ip,
 					'url' => $encoded_get,
 					'session' => $session_id,
-				)
+				],
 			);
 
 			// Guess it got deleted.
-			if (Db::$db->affected_rows() == 0)
+			if (Db::$db->affected_rows() == 0) {
 				$_SESSION['log_time'] = 0;
-		}
-		else
-		{
+			}
+		} else {
 			$_SESSION['log_time'] = 0;
 		}
 
 		// Otherwise, we have to delete and insert.
-		if (empty($_SESSION['log_time']))
-		{
-			if ($do_delete || !empty($this->id))
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_online
+		if (empty($_SESSION['log_time'])) {
+			if ($do_delete || !empty($this->id)) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_online
 					WHERE ' . ($do_delete ? 'log_time < {int:log_time}' : '') . ($do_delete && !empty($this->id) ? ' OR ' : '') . (empty($this->id) ? '' : 'id_member = {int:current_member}'),
-					array(
+					[
 						'current_member' => $this->id,
 						'log_time' => time() - Config::$modSettings['lastActive'] * 60,
-					)
+					],
 				);
 			}
 
-			Db::$db->insert($do_delete ? 'ignore' : 'replace',
+			Db::$db->insert(
+				$do_delete ? 'ignore' : 'replace',
 				'{db_prefix}log_online',
-				array('session' => 'string', 'id_member' => 'int', 'id_spider' => 'int', 'log_time' => 'int', 'ip' => 'inet', 'url' => 'string'),
-				array($session_id, $this->id, empty($_SESSION['id_robot']) ? 0 : $_SESSION['id_robot'], time(), $this->ip, $encoded_get),
-				array('session')
+				['session' => 'string', 'id_member' => 'int', 'id_spider' => 'int', 'log_time' => 'int', 'ip' => 'inet', 'url' => 'string'],
+				[$session_id, $this->id, empty($_SESSION['id_robot']) ? 0 : $_SESSION['id_robot'], time(), $this->ip, $encoded_get],
+				['session'],
 			);
 		}
 
@@ -1445,8 +1430,9 @@ public function logOnline(bool $force = false): void
 		$_SESSION['log_time'] = time();
 
 		// Well, they are online now.
-		if (empty($_SESSION['timeOnlineUpdated']))
+		if (empty($_SESSION['timeOnlineUpdated'])) {
 			$_SESSION['timeOnlineUpdated'] = time();
+		}
 
 		// Set their login time, if not already done within the last minute.
 		if (
@@ -1455,20 +1441,21 @@ public function logOnline(bool $force = false): void
 			&& $this->last_login < time() - 60
 			&& (
 				!isset($_REQUEST['action'])
-				|| !in_array($_REQUEST['action'], array('.xml', 'login2', 'logintfa'))
+				|| !in_array($_REQUEST['action'], ['.xml', 'login2', 'logintfa'])
 			)
-		)
-		{
+		) {
 			// Don't count longer than 15 minutes.
-			if (time() - $_SESSION['timeOnlineUpdated'] > 60 * 15)
+			if (time() - $_SESSION['timeOnlineUpdated'] > 60 * 15) {
 				$_SESSION['timeOnlineUpdated'] = time();
+			}
 
 			$this->total_time_logged_in += (time() - $_SESSION['timeOnlineUpdated']);
 
-			self::updateMemberData($this->id, array('last_login' => time(), 'member_ip' => $this->ip, 'member_ip2' => $_SERVER['BAN_CHECK_IP'], 'total_time_logged_in' => $this->total_time_logged_in));
+			self::updateMemberData($this->id, ['last_login' => time(), 'member_ip' => $this->ip, 'member_ip2' => $_SERVER['BAN_CHECK_IP'], 'total_time_logged_in' => $this->total_time_logged_in]);
 
-			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2)
+			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2) {
 				CacheApi::put('user_settings-' . $this->id, self::$profiles[$this->id], 60);
+			}
 
 			$_SESSION['timeOnlineUpdated'] = time();
 		}
@@ -1484,36 +1471,34 @@ public function logOnline(bool $force = false): void
 	 */
 	public function rebuildModCache(): void
 	{
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return;
+		}
 
 		// What groups can they moderate?
 		$group_query = $this->allowedTo('manage_membergroups') ? '1=1' : '0=1';
 
-		if ($group_query == '0=1' && !$this->is_guest)
-		{
-			$groups = array();
+		if ($group_query == '0=1' && !$this->is_guest) {
+			$groups = [];
 
-			$request = Db::$db->query('', '
-				SELECT id_group
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group
 				FROM {db_prefix}group_moderators
 				WHERE id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => $this->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$groups[] = $row['id_group'];
 			}
 			Db::$db->free_result($request);
 
-			if (empty($groups))
-			{
+			if (empty($groups)) {
 				$group_query = '0=1';
-			}
-			else
-			{
+			} else {
 				$group_query = 'id_group IN (' . implode(',', $groups) . ')';
 			}
 		}
@@ -1521,50 +1506,47 @@ public function rebuildModCache(): void
 		// Then, same again, just the boards this time!
 		$board_query = $this->allowedTo('moderate_forum') ? '1=1' : '0=1';
 
-		if ($board_query == '0=1' && !$this->is_guest)
-		{
+		if ($board_query == '0=1' && !$this->is_guest) {
 			$boards = $this->boardsAllowedTo('moderate_board', true);
 
-			if (empty($boards))
-			{
+			if (empty($boards)) {
 				$board_query = '0=1';
-			}
-			else
-			{
+			} else {
 				$board_query = 'id_board IN (' . implode(',', $boards) . ')';
 			}
 		}
 
 		// What boards are they the moderator of?
-		$boards_mod = array();
+		$boards_mod = [];
 
-		if (!$this->is_guest)
-		{
-			$request = Db::$db->query('', '
-				SELECT id_board
+		if (!$this->is_guest) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board
 				FROM {db_prefix}moderators
 				WHERE id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => $this->id,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards_mod[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
 
 			// Can any of the groups they're in moderate any of the boards?
-			$request = Db::$db->query('', '
-				SELECT id_board
+			$request = Db::$db->query(
+				'',
+				'SELECT id_board
 				FROM {db_prefix}moderator_groups
 				WHERE id_group IN({array_int:groups})',
-				array(
+				[
 					'groups' => $this->groups,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$boards_mod[] = $row['id_board'];
 			}
 			Db::$db->free_result($request);
@@ -1575,7 +1557,7 @@ public function rebuildModCache(): void
 
 		$mod_query = empty($boards_mod) ? '0=1' : 'b.id_board IN (' . implode(',', $boards_mod) . ')';
 
-		$_SESSION['mc'] = array(
+		$_SESSION['mc'] = [
 			'time' => time(),
 			// This looks a bit funny but protects against the login redirect.
 			'id' => $this->id && $this->name ? $this->id : 0,
@@ -1585,7 +1567,7 @@ public function rebuildModCache(): void
 			'ap' => $this->boardsAllowedTo('approve_posts'),
 			'mb' => $boards_mod,
 			'mq' => $mod_query,
-		);
+		];
 
 		IntegrationHook::call('integrate_mod_cache');
 
@@ -1608,37 +1590,41 @@ public function rebuildModCache(): void
 	public function kickIfGuest(?string $message = null, bool $log = true): void
 	{
 		// This only applies to the current user.
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return;
+		}
 
 		// Luckily, this person isn't a guest.
-		if (!$this->is_guest)
+		if (!$this->is_guest) {
 			return;
+		}
 
 		// Log what they were trying to do that didn't work.
-		if ($log)
-		{
-			if (!empty(Config::$modSettings['who_enabled']))
+		if ($log) {
+			if (!empty(Config::$modSettings['who_enabled'])) {
 				$_GET['error'] = 'guest_login';
+			}
 
 			$this->logOnline(true);
 		}
 
 		// Just die.
-		if (isset($_REQUEST['xml']))
+		if (isset($_REQUEST['xml'])) {
 			Utils::obExit(false);
+		}
 
 		// We need the theme if we're going to show anything.
-		if (SMF != 'SSI' && empty(Utils::$context['theme_loaded']))
+		if (SMF != 'SSI' && empty(Utils::$context['theme_loaded'])) {
 			Theme::load();
+		}
 
 		// Never redirect to an attachment
-		if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false)
+		if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) {
 			$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+		}
 
 		// Apparently we're not in a position to handle this now. Let's go to a safer location.
-		if (empty(Utils::$context['template_layers']))
-		{
+		if (empty(Utils::$context['template_layers'])) {
 			$_SESSION['login_url'] = Config::$scripturl . '?' . $_SERVER['QUERY_STRING'];
 			Utils::redirectexit('action=login');
 		}
@@ -1673,12 +1659,14 @@ public function kickIfGuest(?string $message = null, bool $log = true): void
 	public function kickIfBanned(bool $force_check = false): void
 	{
 		// This only applies to the current user.
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return;
+		}
 
 		// You cannot be banned if you are an admin.
-		if ($this->is_admin)
+		if ($this->is_admin) {
 			return;
+		}
 
 		// Only check the ban every so often. (to reduce load.)
 		if (
@@ -1693,38 +1681,35 @@ public function kickIfBanned(bool $force_check = false): void
 				isset($this->email, $_SESSION['ban']['email'])
 				&& $_SESSION['ban']['email'] != $this->email
 			)
-		)
-		{
+		) {
 			// Innocent until proven guilty.  (but we know you are! :P)
-			$_SESSION['ban'] = array(
+			$_SESSION['ban'] = [
 				'last_checked' => time(),
 				'id_member' => $this->id,
 				'ip' => $this->ip,
 				'ip2' => $this->ip2,
 				'email' => $this->email,
-			);
+			];
 
-			$ban_query = array();
-			$ban_query_vars = array('current_time' => time());
+			$ban_query = [];
+			$ban_query_vars = ['current_time' => time()];
 			$flag_is_activated = false;
 
 			// Check both IP addresses.
-			foreach (array('ip', 'ip2') as $ip_number)
-			{
-				if ($ip_number == 'ip2' && $this->ip2 == $this->ip)
+			foreach (['ip', 'ip2'] as $ip_number) {
+				if ($ip_number == 'ip2' && $this->ip2 == $this->ip) {
 					continue;
+				}
 
 				$ban_query[] = ' {inet:' . $ip_number . '} BETWEEN bi.ip_low and bi.ip_high';
 				$ban_query_vars[$ip_number] = $this->{$ip_number};
 
 				// IP was valid, maybe there's also a hostname...
-				if (empty(Config::$modSettings['disableHostnameLookup']) && $this->{$ip_number} != 'unknown')
-				{
+				if (empty(Config::$modSettings['disableHostnameLookup']) && $this->{$ip_number} != 'unknown') {
 					$ip = new IP($this->{$ip_number});
 					$hostname = $ip->getHost();
 
-					if (strlen($hostname) > 0)
-					{
+					if (strlen($hostname) > 0) {
 						$ban_query[] = '({string:hostname' . $ip_number . '} LIKE bi.hostname)';
 						$ban_query_vars['hostname' . $ip_number] = $hostname;
 					}
@@ -1732,45 +1717,41 @@ public function kickIfBanned(bool $force_check = false): void
 			}
 
 			// Is their email address banned?
-			if (strlen($this->email) != 0)
-			{
+			if (strlen($this->email) != 0) {
 				$ban_query[] = '({string:email} LIKE bi.email_address)';
 				$ban_query_vars['email'] = $this->email;
 			}
 
 			// How about this user?
-			if (!$this->is_guest && !empty($this->id))
-			{
+			if (!$this->is_guest && !empty($this->id)) {
 				$ban_query[] = 'bi.id_member = {int:id_member}';
 				$ban_query_vars['id_member'] = $this->id;
 			}
 
 			// Check the ban, if there's information.
-			if (!empty($ban_query))
-			{
-				$restrictions = array(
+			if (!empty($ban_query)) {
+				$restrictions = [
 					'cannot_access',
 					'cannot_login',
 					'cannot_post',
 					'cannot_register',
-				);
+				];
 
 				// Store every type of ban that applies to you in your session.
-				$request = Db::$db->query('', '
-					SELECT bi.id_ban, bi.email_address, bi.id_member, bg.cannot_access, bg.cannot_register,
+				$request = Db::$db->query(
+					'',
+					'SELECT bi.id_ban, bi.email_address, bi.id_member, bg.cannot_access, bg.cannot_register,
 						bg.cannot_post, bg.cannot_login, bg.reason, COALESCE(bg.expire_time, 0) AS expire_time
 					FROM {db_prefix}ban_items AS bi
 						INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group AND (bg.expire_time IS NULL OR bg.expire_time > {int:current_time}))
 					WHERE
 						(' . implode(' OR ', $ban_query) . ')',
-					$ban_query_vars
+					$ban_query_vars,
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
-					foreach ($restrictions as $restriction)
-					{
-						if (!empty($row[$restriction]))
-						{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
+					foreach ($restrictions as $restriction) {
+						if (!empty($row[$restriction])) {
 							$_SESSION['ban'][$restriction]['reason'] = $row['reason'];
 							$_SESSION['ban'][$restriction]['ids'][] = $row['id_ban'];
 
@@ -1783,8 +1764,7 @@ public function kickIfBanned(bool $force_check = false): void
 										|| $row['expire_time'] > $_SESSION['ban']['expire_time']
 									)
 								)
-							)
-							{
+							) {
 								$_SESSION['ban']['expire_time'] = $row['expire_time'];
 							}
 
@@ -1795,8 +1775,7 @@ public function kickIfBanned(bool $force_check = false): void
 									$row['id_member'] == $this->id
 									|| $row['email_address'] == $this->email
 								)
-							)
-							{
+							) {
 								$flag_is_activated = true;
 							}
 						}
@@ -1806,12 +1785,11 @@ public function kickIfBanned(bool $force_check = false): void
 			}
 
 			// Mark the cannot_access and cannot_post bans as being 'hit'.
-			if (isset($_SESSION['ban']['cannot_access'], $_SESSION['ban']['cannot_post'], $_SESSION['ban']['cannot_login']))
-			{
+			if (isset($_SESSION['ban']['cannot_access'], $_SESSION['ban']['cannot_post'], $_SESSION['ban']['cannot_login'])) {
 				$this->logBan(array_merge(
-					isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(),
-					isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(),
-					isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()
+					isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : [],
+					isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : [],
+					isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : [],
 				));
 			}
 
@@ -1828,37 +1806,37 @@ public function kickIfBanned(bool $force_check = false): void
 						&& $flag_is_activated
 					)
 				)
-			)
-			{
+			) {
 				Bans::updateBanMembers();
 			}
 		}
 
 		// Hey, I know you! You're ehm...
-		if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[Config::$cookiename . '_']))
-		{
+		if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[Config::$cookiename . '_'])) {
 			$bans = explode(',', $_COOKIE[Config::$cookiename . '_']);
 
-			foreach ($bans as $key => $value)
+			foreach ($bans as $key => $value) {
 				$bans[$key] = (int) $value;
+			}
 
-			$request = Db::$db->query('', '
-				SELECT bi.id_ban, bg.reason, COALESCE(bg.expire_time, 0) AS expire_time
+			$request = Db::$db->query(
+				'',
+				'SELECT bi.id_ban, bg.reason, COALESCE(bg.expire_time, 0) AS expire_time
 				FROM {db_prefix}ban_items AS bi
 					INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group)
 				WHERE bi.id_ban IN ({array_int:ban_list})
 					AND (bg.expire_time IS NULL OR bg.expire_time > {int:current_time})
 					AND bg.cannot_access = {int:cannot_access}
 				LIMIT {int:limit}',
-				array(
+				[
 					'cannot_access' => 1,
 					'ban_list' => $bans,
 					'current_time' => time(),
 					'limit' => count($bans),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$_SESSION['ban']['cannot_access']['ids'][] = $row['id_ban'];
 				$_SESSION['ban']['cannot_access']['reason'] = $row['reason'];
 				$_SESSION['ban']['expire_time'] = $row['expire_time'];
@@ -1866,30 +1844,29 @@ public function kickIfBanned(bool $force_check = false): void
 			Db::$db->free_result($request);
 
 			// My mistake. Next time better.
-			if (!isset($_SESSION['ban']['cannot_access']))
-			{
-				$cookie = new Cookie(Config::$cookiename . '_', array(), time() - 3600);
+			if (!isset($_SESSION['ban']['cannot_access'])) {
+				$cookie = new Cookie(Config::$cookiename . '_', [], time() - 3600);
 				$cookie->set();
 			}
 		}
 
 		// If you're fully banned, it's end of the story for you.
-		if (isset($_SESSION['ban']['cannot_access']))
-		{
+		if (isset($_SESSION['ban']['cannot_access'])) {
 			// We don't wanna see you!
-			if (!$this->is_guest)
-			{
-				Db::$db->query('', '
-					DELETE FROM {db_prefix}log_online
+			if (!$this->is_guest) {
+				Db::$db->query(
+					'',
+					'DELETE FROM {db_prefix}log_online
 					WHERE id_member = {int:current_member}',
-					array(
+					[
 						'current_member' => $this->id,
-					)
+					],
 				);
 			}
 
-			if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach')
+			if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'dlattach') {
 				die();
+			}
 
 			// 'Log' the user out.  Can't have any funny business... (save the name!)
 			$old_name = isset($this->name) && $this->name != '' ? $this->name : Lang::$txt['guest_title'];
@@ -1914,15 +1891,15 @@ public function kickIfBanned(bool $force_check = false): void
 			trigger_error('No direct access...', E_USER_ERROR);
 		}
 		// You're not allowed to log in but yet you are. Let's fix that.
-		elseif (isset($_SESSION['ban']['cannot_login']) && !$this->is_guest)
-		{
+		elseif (isset($_SESSION['ban']['cannot_login']) && !$this->is_guest) {
 			// We don't wanna see you!
-			Db::$db->query('', '
-				DELETE FROM {db_prefix}log_online
+			Db::$db->query(
+				'',
+				'DELETE FROM {db_prefix}log_online
 				WHERE id_member = {int:current_member}',
-				array(
+				[
 					'current_member' => $this->id,
-				)
+				],
 			);
 
 			// 'Log' the user out.  Can't have any funny business... (save the name!)
@@ -1941,8 +1918,9 @@ public function kickIfBanned(bool $force_check = false): void
 		}
 
 		// Fix up the banning permissions.
-		if (isset($this->permissions))
+		if (isset($this->permissions)) {
 			$this->adjustPermissions();
+		}
 	}
 
 	/**
@@ -1954,43 +1932,46 @@ public function kickIfBanned(bool $force_check = false): void
 	 * @param string $email The email address associated with the user that
 	 *    triggered this hit. If not set, uses the current user's email address.
 	 */
-	public function logBan(array $ban_ids = array(), string $email = null): void
+	public function logBan(array $ban_ids = [], ?string $email = null): void
 	{
 		// This only applies to the current user.
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return;
+		}
 
 		// Don't log web accelerators, it's very confusing...
-		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
+		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
 			return;
+		}
 
-		Db::$db->insert('',
+		Db::$db->insert(
+			'',
 			'{db_prefix}log_banned',
-			array(
+			[
 				'id_member' => 'int',
 				'ip' => 'inet',
 				'email' => 'string',
 				'log_time' => 'int',
-			),
-			array(
+			],
+			[
 				$this->id,
 				$this->ip,
 				$email ?? $this->email,
 				time(),
-			),
-			array('id_ban_log')
+			],
+			['id_ban_log'],
 		);
 
 		// One extra point for these bans.
-		if (!empty($ban_ids))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}ban_items
+		if (!empty($ban_ids)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}ban_items
 				SET hits = hits + 1
 				WHERE id_ban IN ({array_int:ban_ids})',
-				array(
+				[
 					'ban_ids' => $ban_ids,
-				)
+				],
 			);
 		}
 	}
@@ -2004,35 +1985,29 @@ public function logBan(array $ban_ids = array(), string $email = null): void
 	public function adjustPermissions(): void
 	{
 		// This only applies to the current user.
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return;
+		}
 
 		// Somehow they got here, at least take away all permissions...
-		if (isset($_SESSION['ban']['cannot_access']))
-		{
-			$this->permissions = array();
+		if (isset($_SESSION['ban']['cannot_access'])) {
+			$this->permissions = [];
 		}
 		// Okay, well, you can watch, but don't touch a thing.
-		elseif (isset($_SESSION['ban']['cannot_post']) || (!empty(Config::$modSettings['warning_mute']) && Config::$modSettings['warning_mute'] <= $this->warning))
-		{
-			IntegrationHook::call('integrate_post_ban_permissions', array(&self::$post_ban_permissions));
+		elseif (isset($_SESSION['ban']['cannot_post']) || (!empty(Config::$modSettings['warning_mute']) && Config::$modSettings['warning_mute'] <= $this->warning)) {
+			IntegrationHook::call('integrate_post_ban_permissions', [&self::$post_ban_permissions]);
 
 			$this->permissions = array_diff($this->permissions, self::$post_ban_permissions);
 		}
 		// Are they absolutely under moderation?
-		elseif (!empty(Config::$modSettings['warning_moderate']) && Config::$modSettings['warning_moderate'] <= $this->warning)
-		{
+		elseif (!empty(Config::$modSettings['warning_moderate']) && Config::$modSettings['warning_moderate'] <= $this->warning) {
 			// Work out what permissions should change...
-			IntegrationHook::call('integrate_warn_permissions', array(&self::$warn_permissions));
+			IntegrationHook::call('integrate_warn_permissions', [&self::$warn_permissions]);
 
-			foreach (self::$warn_permissions as $old => $new)
-			{
-				if (!in_array($old, $this->permissions))
-				{
+			foreach (self::$warn_permissions as $old => $new) {
+				if (!in_array($old, $this->permissions)) {
 					unset(self::$warn_permissions[$old]);
-				}
-				else
-				{
+				} else {
 					$this->permissions[] = $new;
 				}
 			}
@@ -2042,28 +2017,20 @@ public function adjustPermissions(): void
 
 		// @todo Find a better place to call this? Needs to be after permissions loaded!
 		// Finally, some bits we cache in the session because it saves queries.
-		if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > Config::$modSettings['settings_updated'] && $_SESSION['mc']['id'] == $this->id)
-		{
+		if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > Config::$modSettings['settings_updated'] && $_SESSION['mc']['id'] == $this->id) {
 			$this->mod_cache = $_SESSION['mc'];
-		}
-		else
-		{
+		} else {
 			$this->rebuildModCache();
 		}
 
 		// Now that we have the mod cache taken care of lets setup a cache for the number of mod reports still open
-		if (isset($_SESSION['rc']['reports']) && isset($_SESSION['rc']['member_reports']) && $_SESSION['rc']['time'] > Config::$modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $this->id)
-		{
+		if (isset($_SESSION['rc']['reports'], $_SESSION['rc']['member_reports'])   && $_SESSION['rc']['time'] > Config::$modSettings['last_mod_report_action'] && $_SESSION['rc']['id'] == $this->id) {
 			Utils::$context['open_mod_reports'] = $_SESSION['rc']['reports'];
 			Utils::$context['open_member_reports'] = $_SESSION['rc']['member_reports'];
-		}
-		elseif ($_SESSION['mc']['bq'] != '0=1')
-		{
+		} elseif ($_SESSION['mc']['bq'] != '0=1') {
 			Utils::$context['open_mod_reports'] = ReportedContent::recountOpenReports('posts');
 			Utils::$context['open_member_reports'] = ReportedContent::recountOpenReports('members');
-		}
-		else
-		{
+		} else {
 			Utils::$context['open_mod_reports'] = 0;
 			Utils::$context['open_member_reports'] = 0;
 		}
@@ -2085,29 +2052,28 @@ public function adjustPermissions(): void
 	 * @return string|null Returns 'session_verify_fail' if verification failed,
 	 *    or null if it passed.
 	 */
-	public function validateSession(string $type = 'admin', bool $force = false): string|null
+	public function validateSession(string $type = 'admin', bool $force = false): ?string
 	{
 		// This only applies to the current user.
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return null;
+		}
 
 		// We don't care if the option is off, because guests should NEVER get past here.
 		$this->kickIfGuest();
 
 		// Validate what type of session check this is.
-		$types = array();
-		IntegrationHook::call('integrate_validateSession', array(&$types));
+		$types = [];
+		IntegrationHook::call('integrate_validateSession', [&$types]);
 		$type = in_array($type, $types) || $type == 'moderate' ? $type : 'admin';
 
 		// If we're using XML give an additional ten minutes grace as an admin
 		// can't log on in XML mode.
 		$refreshTime = isset($_GET['xml']) ? 4200 : 3600;
 
-		if (empty($force))
-		{
+		if (empty($force)) {
 			// Is the security option off?
-			if (!empty(Config::$modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')]))
-			{
+			if (!empty(Config::$modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) {
 				return null;
 			}
 
@@ -2121,28 +2087,24 @@ public function validateSession(string $type = 'admin', bool $force = false): st
 					!empty($_SESSION['admin_time'])
 					&& $_SESSION['admin_time'] + $refreshTime >= time()
 				)
-			)
-			{
+			) {
 				return null;
 			}
 		}
 
 		// Posting the password... check it.
-		if (isset($_POST[$type . '_pass']))
-		{
+		if (isset($_POST[$type . '_pass'])) {
 			// Check to ensure we're forcing SSL for authentication
-			if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn())
-			{
+			if (!empty(Config::$modSettings['force_ssl']) && empty(Config::$maintenance) && !Config::httpsOn()) {
 				ErrorHandler::fatalLang('login_ssl_required');
 			}
 
 			$this->checkSession();
 
-			$good_password = in_array(true, IntegrationHook::call('integrate_verify_password', array($this->username, $_POST[$type . '_pass'], false)), true);
+			$good_password = in_array(true, IntegrationHook::call('integrate_verify_password', [$this->username, $_POST[$type . '_pass'], false]), true);
 
 			// Password correct?
-			if ($good_password || Security::hashVerifyPassword($this->username, $_POST[$type . '_pass'], $this->passwd))
-			{
+			if ($good_password || Security::hashVerifyPassword($this->username, $_POST[$type . '_pass'], $this->passwd)) {
 				$_SESSION[$type . '_time'] = time();
 
 				unset($_SESSION['request_referer']);
@@ -2152,18 +2114,16 @@ public function validateSession(string $type = 'admin', bool $force = false): st
 		}
 
 		// Better be sure to remember the real referer
-		if (empty($_SESSION['request_referer']))
-		{
-			$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @Url::create($_SERVER['HTTP_REFERER'])->parse() : array();
-		}
-		elseif (empty($_POST))
-		{
+		if (empty($_SESSION['request_referer'])) {
+			$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @Url::create($_SERVER['HTTP_REFERER'])->parse() : [];
+		} elseif (empty($_POST)) {
 			unset($_SESSION['request_referer']);
 		}
 
 		// Need to type in a password for that, man.
-		if (!isset($_GET['xml']))
+		if (!isset($_GET['xml'])) {
 			ACP::adminLogin($type);
+		}
 
 		return 'session_verify_fail';
 	}
@@ -2190,46 +2150,45 @@ public function validateSession(string $type = 'admin', bool $force = false): st
 	public function checkSession(string $type = 'post', string $from_action = '', bool $is_fatal = true): string
 	{
 		// Is it in as $_POST['sc']?
-		if ($type == 'post')
-		{
+		if ($type == 'post') {
 			$check = $_POST[$_SESSION['session_var']] ?? (empty(Config::$modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null);
 
-			if ($check !== User::$sc)
+			if ($check !== User::$sc) {
 				$error = 'session_timeout';
+			}
 		}
 		// How about $_GET['sesc']?
-		elseif ($type == 'get')
-		{
+		elseif ($type == 'get') {
 			$check = $_GET[$_SESSION['session_var']] ?? (empty(Config::$modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null);
 
-			if ($check !== User::$sc)
+			if ($check !== User::$sc) {
 				$error = 'session_verify_fail';
+			}
 		}
 		// Or can it be in either?
-		elseif ($type == 'request')
-		{
+		elseif ($type == 'request') {
 			$check = $_GET[$_SESSION['session_var']] ?? (empty(Config::$modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : ($_POST[$_SESSION['session_var']] ?? (empty(Config::$modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null)));
 
-			if ($check !== User::$sc)
+			if ($check !== User::$sc) {
 				$error = 'session_verify_fail';
+			}
 		}
 
 		// Verify that they aren't changing user agents on us - that could be bad.
-		if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty(Config::$modSettings['disableCheckUA']))
-		{
+		if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty(Config::$modSettings['disableCheckUA'])) {
 			$error = 'session_verify_fail';
 		}
 
 		// Make sure a page with session check requirement is not being prefetched.
-		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		{
+		if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
 			ob_end_clean();
 			Utils::sendHttpStatus(403);
+
 			die;
 		}
 
 		// Check the referring site - it should be the same server at least!
-		$referrer = $_SESSION['request_referer'] ?? (isset($_SERVER['HTTP_REFERER']) ? @Url::create($_SERVER['HTTP_REFERER'])->parse() : array());
+		$referrer = $_SESSION['request_referer'] ?? (isset($_SERVER['HTTP_REFERER']) ? @Url::create($_SERVER['HTTP_REFERER'])->parse() : []);
 
 		// Check the refer but if we have CORS enabled and it came from a trusted source, we can skip this check.
 		if (
@@ -2237,32 +2196,30 @@ public function checkSession(string $type = 'post', string $from_action = '', bo
 			&& (
 				empty(Config::$modSettings['allow_cors'])
 				|| empty(Utils::$context['valid_cors_found'])
-				|| !in_array(Utils::$context['valid_cors_found'], array('same', 'subdomain'))
+				|| !in_array(Utils::$context['valid_cors_found'], ['same', 'subdomain'])
 			)
-		)
-		{
-			if (strpos($_SERVER['HTTP_HOST'], ':') !== false)
-			{
+		) {
+			if (strpos($_SERVER['HTTP_HOST'], ':') !== false) {
 				$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
-			}
-			else
-			{
+			} else {
 				$real_host = $_SERVER['HTTP_HOST'];
 			}
 
 			$board_host = Url::create(Config::$boardurl)->host;
 
 			// Are global cookies on?  If so, let's check them ;).
-			if (!empty(Config::$modSettings['globalCookies']))
-			{
-				if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $board_host, $parts))
+			if (!empty(Config::$modSettings['globalCookies'])) {
+				if (preg_match('~(?:[^.]+\.)?([^.]{3,}\..+)\z~i', $board_host, $parts)) {
 					$board_host = $parts[1];
+				}
 
-				if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts))
+				if (preg_match('~(?:[^.]+\.)?([^.]{3,}\.+)\z~i', $referrer['host'], $parts)) {
 					$referrer['host'] = $parts[1];
+				}
 
-				if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts))
+				if (preg_match('~(?:[^.]+\.)?([^.]{3,}\.+)\z~i', $real_host, $parts)) {
 					$real_host = $parts[1];
+				}
 			}
 
 			// Okay: referrer must either match parsed_url or real_host.
@@ -2270,8 +2227,7 @@ public function checkSession(string $type = 'post', string $from_action = '', bo
 				isset($board_host)
 				&& strtolower($referrer['host']) != strtolower($board_host)
 				&& strtolower($referrer['host']) != strtolower($real_host)
-			)
-			{
+			) {
 				$error = 'verify_url_fail';
 				$log_error = true;
 			}
@@ -2284,38 +2240,36 @@ public function checkSession(string $type = 'post', string $from_action = '', bo
 				!isset($_SESSION['old_url'])
 				|| !preg_match('~[?;&]action=' . $from_action . '([;&]|$)~', $_SESSION['old_url'])
 			)
-		)
-		{
+		) {
 			$error = 'verify_url_fail';
 			$log_error = true;
 		}
 
-		if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker')
-		{
+		if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') {
 			ErrorHandler::fatal('Sound the alarm!  It\'s a hacker!  Close the castle gates!!', false);
 		}
 
 		// Everything is ok, return an empty string.
-		if (!isset($error))
+		if (!isset($error)) {
 			return '';
+		}
 
 		// A non-fatal session error occurred.
 		// Return the error to the calling function.
-		if (!$is_fatal)
+		if (!$is_fatal) {
 			return $error;
+		}
 
 		// A fatal session error occurred.
 		// Show the error and die
-		if (isset($_GET['xml']))
-		{
+		if (isset($_GET['xml'])) {
 			ob_end_clean();
 			Utils::sendHttpStatus(403, 'Forbidden - Session timeout');
+
 			die;
 		}
-		else
-		{
-			ErrorHandler::fatalLang($error, isset($log_error) ? 'user' : false);
-		}
+
+		ErrorHandler::fatalLang($error, isset($log_error) ? 'user' : false);
 
 		// We really should never fall through here, for very important reasons.  Let's make sure.
 		trigger_error('No direct access...', E_USER_ERROR);
@@ -2339,39 +2293,42 @@ public function checkSession(string $type = 'post', string $from_action = '', bo
 	 *    instead of all the passed boards.
 	 * @return bool Whether the user has the specified permission.
 	 */
-	public function allowedTo(string|array $permission, int|array $boards = null, bool $any = false): bool
+	public function allowedTo(string|array $permission, int|array|null $boards = null, bool $any = false): bool
 	{
 		// You're always allowed to do nothing. (Unless you're a working man, MR. LAZY :P!)
-		if (empty($permission))
+		if (empty($permission)) {
 			return true;
+		}
 
 		// Administrators are supermen :P.
-		if ($this->is_admin)
+		if ($this->is_admin) {
 			return true;
+		}
 
 		// Let's ensure this is an array.
 		$permission = (array) $permission;
 
 		// Are we checking the _current_ board, or some other boards?
-		if ($boards === null || $boards === array())
-		{
+		if ($boards === null || $boards === []) {
 			$user_permissions = (array) $this->permissions;
 
 			// Allow temporary overrides for general permissions?
-			IntegrationHook::call('integrate_allowed_to_general', array(&$user_permissions, $permission));
+			IntegrationHook::call('integrate_allowed_to_general', [&$user_permissions, $permission]);
 
-			return array_intersect($permission, $user_permissions) != array();
+			return array_intersect($permission, $user_permissions) != [];
 		}
 
 		$boards = (array) $boards;
 
 		$cache_key = hash('md5', $this->id . '-' . implode(',', $permission) . '-' . implode(',', $boards) . '-' . (int) $any);
 
-		if (isset($this->perm_cache[$cache_key]))
+		if (isset($this->perm_cache[$cache_key])) {
 			return $this->perm_cache[$cache_key];
+		}
 
-		$request = Db::$db->query('', '
-			SELECT MIN(bp.add_deny) AS add_deny
+		$request = Db::$db->query(
+			'',
+			'SELECT MIN(bp.add_deny) AS add_deny
 			FROM {db_prefix}boards AS b
 				INNER JOIN {db_prefix}board_permissions AS bp ON (bp.id_profile = b.id_profile)
 				LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_board = b.id_board AND mods.id_member = {int:current_member})
@@ -2381,42 +2338,38 @@ public function allowedTo(string|array $permission, int|array $boards = null, bo
 				AND bp.permission IN ({array_string:permission_list})
 				AND (mods.id_member IS NOT NULL OR modgs.id_group IS NOT NULL OR bp.id_group != {int:moderator_group})
 			GROUP BY b.id_board',
-			array(
+			[
 				'current_member' => $this->id,
 				'board_list' => $boards,
 				'group_list' => $this->groups,
 				'moderator_group' => 3,
 				'permission_list' => $permission,
-			)
+			],
 		);
-		if ($any)
-		{
+
+		if ($any) {
 			$result = false;
 
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$result = !empty($row['add_deny']);
 
-				if ($result == true)
+				if ($result == true) {
 					break;
+				}
 			}
 			Db::$db->free_result($request);
 
 			$return = $result;
 		}
 		// Make sure they can do it on all of the boards.
-		elseif (Db::$db->num_rows($request) != count($boards))
-		{
+		elseif (Db::$db->num_rows($request) != count($boards)) {
 			Db::$db->free_result($request);
 
 			$return = false;
-		}
-		else
-		{
+		} else {
 			$result = true;
 
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$result &= !empty($row['add_deny']);
 			}
 			Db::$db->free_result($request);
@@ -2425,7 +2378,7 @@ public function allowedTo(string|array $permission, int|array $boards = null, bo
 		}
 
 		// Allow temporary overrides for board permissions?
-		IntegrationHook::call('integrate_allowed_to_board', array(&$return, $permission, $boards, $any));
+		IntegrationHook::call('integrate_allowed_to_board', [&$return, $permission, $boards, $any]);
 
 		$this->perm_cache[$cache_key] = $return;
 
@@ -2456,27 +2409,26 @@ public function allowedTo(string|array $permission, int|array $boards = null, bo
 	 * @param bool $any Whether to check for permission on at least one board
 	 *    instead of all the passed boards.
 	 */
-	public function isAllowedTo(string|array $permission, int|array $boards = null, bool $any = false): void
+	public function isAllowedTo(string|array $permission, int|array|null $boards = null, bool $any = false): void
 	{
 		// This only applies to the current user.
-		if ($this->id !== User::$my_id)
+		if ($this->id !== User::$my_id) {
 			return;
+		}
 
 		// Make it an array, even if a string was passed.
 		$permission = (array) $permission;
 		$boards = (array) $boards;
 
-		IntegrationHook::call('integrate_heavy_permissions_session', array(&self::$heavy_permissions));
+		IntegrationHook::call('integrate_heavy_permissions_session', [&self::$heavy_permissions]);
 
 		// Check the permission and return an error...
-		if (!$this->allowedTo($permission, $boards, $any))
-		{
+		if (!$this->allowedTo($permission, $boards, $any)) {
 			// Pick the last array entry as the permission shown as the error.
 			$error_permission = array_shift($permission);
 
 			// If they are a guest, show a login. (because the error might be gone if they do!)
-			if ($this->is_guest)
-			{
+			if ($this->is_guest) {
 				Lang::load('Errors');
 				$this->kickIfGuest(Lang::$txt['cannot_' . $error_permission]);
 			}
@@ -2496,8 +2448,9 @@ public function isAllowedTo(string|array $permission, int|array $boards = null,
 		// If you're doing something on behalf of some "heavy" permissions,
 		// validate your session. (Take out the heavy permissions, and if you
 		// can't do anything but those, you need a validated session.)
-		if (!$this->allowedTo(array_diff($permission, self::$heavy_permissions), $boards))
+		if (!$this->allowedTo(array_diff($permission, self::$heavy_permissions), $boards)) {
 			$this->validateSession();
+		}
 	}
 
 	/**
@@ -2523,33 +2476,31 @@ public function isAllowedTo(string|array $permission, int|array $boards = null,
 	 */
 	public function boardsAllowedTo(string|array $permissions, bool $check_access = true, bool $simple = true): array
 	{
-		$boards = array();
-		$deny_boards = array();
+		$boards = [];
+		$deny_boards = [];
 
 		// Arrays are nice, most of the time.
 		$permissions = (array) $permissions;
 
 		// Administrators are all powerful.
-		if ($this->is_admin)
-		{
-			if ($simple)
-			{
-				return array(0);
+		if ($this->is_admin) {
+			if ($simple) {
+				return [0];
 			}
-			else
-			{
-				foreach ($permissions as $permission)
-					$boards[$permission] = array(0);
 
-				return $boards;
+			foreach ($permissions as $permission) {
+				$boards[$permission] = [0];
 			}
+
+			return $boards;
 		}
 
 		// All groups the user is in except 'moderator'.
-		$groups = array_diff($this->groups, array(3));
+		$groups = array_diff($this->groups, [3]);
 
-		$request = Db::$db->query('', '
-			SELECT b.id_board, bp.add_deny' . ($simple ? '' : ', bp.permission') . '
+		$request = Db::$db->query(
+			'',
+			'SELECT b.id_board, bp.add_deny' . ($simple ? '' : ', bp.permission') . '
 			FROM {db_prefix}board_permissions AS bp
 				INNER JOIN {db_prefix}boards AS b ON (b.id_profile = bp.id_profile)
 				LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_board = b.id_board AND mods.id_member = {int:current_member})
@@ -2558,57 +2509,41 @@ public function boardsAllowedTo(string|array $permissions, bool $check_access =
 				AND bp.permission IN ({array_string:permissions})
 				AND (mods.id_member IS NOT NULL OR modgs.id_group IS NOT NULL OR bp.id_group != {int:moderator_group})' .
 				($check_access ? ' AND {query_see_board}' : ''),
-			array(
+			[
 				'current_member' => $this->id,
 				'group_list' => $groups,
 				'moderator_group' => 3,
 				'permissions' => $permissions,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if ($simple)
-			{
-				if (empty($row['add_deny']))
-				{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if ($simple) {
+				if (empty($row['add_deny'])) {
 					$deny_boards[] = $row['id_board'];
-				}
-				else
-				{
+				} else {
 					$boards[] = $row['id_board'];
 				}
-			}
-			else
-			{
-				if (empty($row['add_deny']))
-				{
+			} else {
+				if (empty($row['add_deny'])) {
 					$deny_boards[$row['permission']][] = $row['id_board'];
-				}
-				else
-				{
+				} else {
 					$boards[$row['permission']][] = $row['id_board'];
 				}
 			}
 		}
 		Db::$db->free_result($request);
 
-		if ($simple)
-		{
+		if ($simple) {
 			$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
-		}
-		else
-		{
-			foreach ($permissions as $permission)
-			{
+		} else {
+			foreach ($permissions as $permission) {
 				// Never had it to start with.
-				if (empty($boards[$permission]))
-				{
-					$boards[$permission] = array();
-				}
-				else
-				{
+				if (empty($boards[$permission])) {
+					$boards[$permission] = [];
+				} else {
 					// Or it may have been removed.
-					$deny_boards[$permission] = isset($deny_boards[$permission]) ? $deny_boards[$permission] : array();
+					$deny_boards[$permission] = $deny_boards[$permission] ?? [];
 
 					$boards[$permission] = array_unique(array_values(array_diff($boards[$permission], $deny_boards[$permission])));
 				}
@@ -2616,7 +2551,7 @@ public function boardsAllowedTo(string|array $permissions, bool $check_access =
 		}
 
 		// Maybe a mod needs to tweak the list of allowed boards on the fly?
-		IntegrationHook::call('integrate_boards_allowed_to', array(&$boards, $deny_boards, $permissions, $check_access, $simple));
+		IntegrationHook::call('integrate_boards_allowed_to', [&$boards, $deny_boards, $permissions, $check_access, $simple]);
 
 		return $boards;
 	}
@@ -2635,33 +2570,28 @@ public function boardsAllowedTo(string|array $permissions, bool $check_access =
 	 *    'basic', 'minimal'. Leave null for a dynamically determined default.
 	 * @return array Instances of this class for the loaded users.
 	 */
-	public static function load($users = array(), int $type = self::LOAD_BY_ID, string $dataset = null): array
+	public static function load($users = [], int $type = self::LOAD_BY_ID, ?string $dataset = null): array
 	{
 		$users = (array) $users;
 
-		$loaded = array();
+		$loaded = [];
 
 		// No ID? Just get the current user.
-		if ($users === array())
-		{
-			if (!isset(self::$me))
+		if ($users === []) {
+			if (!isset(self::$me)) {
 				$loaded[] = new self(null, $dataset);
-		}
-		else
-		{
+			}
+		} else {
 			$dataset = $dataset ?? 'normal';
 
 			// Load members.
-			foreach (($loaded_ids = self::loadUserData((array) $users, $type, $dataset)) as $id)
-			{
+			foreach (($loaded_ids = self::loadUserData((array) $users, $type, $dataset)) as $id) {
 				// Not yet loaded.
-				if (!isset(self::$loaded[$id]))
-				{
+				if (!isset(self::$loaded[$id])) {
 					new self($id, $dataset);
 				}
 				// Already loaded, so just update the properties.
-				elseif (self::$dataset_levels[self::$loaded[$id]->dataset] < self::$dataset_levels[$dataset])
-				{
+				elseif (self::$dataset_levels[self::$loaded[$id]->dataset] < self::$dataset_levels[$dataset]) {
 					self::$loaded[$id]->setProperties();
 				}
 
@@ -2680,12 +2610,13 @@ public static function load($users = array(), int $type = self::LOAD_BY_ID, stri
 	 *    'basic', 'minimal'. Leave null for a dynamically determined default.
 	 * @return array The ids of the loaded members.
 	 */
-	public static function reload($users = array(), string $dataset = null): array
+	public static function reload($users = [], ?string $dataset = null): array
 	{
 		$users = (array) $users;
 
-		foreach ($users as $id)
+		foreach ($users as $id) {
 			unset(self::$loaded[$id], self::$profiles[$id]);
+		}
 
 		return self::load($users, self::LOAD_BY_ID, $dataset);
 	}
@@ -2697,8 +2628,9 @@ public static function reload($users = array(), string $dataset = null): array
 	 */
 	public static function setMe(int $id): void
 	{
-		if (!isset(self::$loaded[$id]))
-			self::load(array($id));
+		if (!isset(self::$loaded[$id])) {
+			self::load([$id]);
+		}
 
 		self::$my_id = $id;
 		self::$me = self::$loaded[$id];
@@ -2712,16 +2644,16 @@ public static function setMe(int $id): void
 	 */
 	public static function setModerators(): void
 	{
-		if (isset(Board::$info) && ($moderator_group_info = CacheApi::get('moderator_group_info', 480)) == null)
-		{
-			$request = Db::$db->query('', '
-				SELECT group_name, online_color, icons
+		if (isset(Board::$info) && ($moderator_group_info = CacheApi::get('moderator_group_info', 480)) == null) {
+			$request = Db::$db->query(
+				'',
+				'SELECT group_name, online_color, icons
 				FROM {db_prefix}membergroups
 				WHERE id_group = {int:moderator_group}
 				LIMIT 1',
-				array(
+				[
 					'moderator_group' => 3,
-				)
+				],
 			);
 			$moderator_group_info = Db::$db->fetch_assoc($request);
 			Db::$db->free_result($request);
@@ -2729,13 +2661,14 @@ public static function setModerators(): void
 			CacheApi::put('moderator_group_info', $moderator_group_info, 480);
 		}
 
-		foreach (self::$profiles as $id => &$profile)
-		{
-			if (empty($id))
+		foreach (self::$profiles as $id => &$profile) {
+			if (empty($id)) {
 				continue;
+			}
 
-			if (!isset(self::$loaded[$id]))
+			if (!isset(self::$loaded[$id])) {
 				new self($id);
+			}
 
 			$user = self::$loaded[$id];
 
@@ -2743,34 +2676,39 @@ public static function setModerators(): void
 			$profile['is_mod'] = in_array(2, $user->groups);
 
 			// Can't do much else without a board.
-			if (!isset(Board::$info))
+			if (!isset(Board::$info)) {
 				continue;
+			}
 
-			if (!empty(Board::$info->moderators))
+			if (!empty(Board::$info->moderators)) {
 				$profile['is_mod'] |= isset(Board::$info->moderators[$id]);
+			}
 
-			if (!empty(Board::$info->moderator_groups))
-			{
-				$profile['is_mod'] |= array_intersect($user->groups, array_keys(Board::$info->moderator_groups)) !== array();
+			if (!empty(Board::$info->moderator_groups)) {
+				$profile['is_mod'] |= array_intersect($user->groups, array_keys(Board::$info->moderator_groups)) !== [];
 			}
 
 			// By popular demand, don't show admins or global moderators as moderators.
-			if ($profile['is_mod'] && $user->group_id != 1 && $user->group_id != 2)
+			if ($profile['is_mod'] && $user->group_id != 1 && $user->group_id != 2) {
 				$profile['member_group'] = $moderator_group_info['group_name'];
+			}
 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
-			if ($profile['is_mod'] && !empty($moderator_group_info['icons']))
+			if ($profile['is_mod'] && !empty($moderator_group_info['icons'])) {
 				$profile['icons'] = $moderator_group_info['icons'];
+			}
 
-			if ($profile['is_mod'] && !empty($moderator_group_info['online_color']))
+			if ($profile['is_mod'] && !empty($moderator_group_info['online_color'])) {
 				$profile['member_group_color'] = $moderator_group_info['online_color'];
+			}
 
 			// Update object properties.
 			$user->setProperties();
 
 			// Add this user to the moderators group if they're not already an admin or moderator.
-			if ($user->is_mod && array_intersect(array(1, 2, 3), $user->groups) === array())
+			if ($user->is_mod && array_intersect([1, 2, 3], $user->groups) === []) {
 				$user->groups[] = 3;
+			}
 		}
 	}
 
@@ -2791,43 +2729,36 @@ public static function setModerators(): void
 	 */
 	public static function buildQueryBoard(int $id): array
 	{
-		$query_part = array();
+		$query_part = [];
 
-		if (isset(self::$loaded[$id]))
-		{
+		if (isset(self::$loaded[$id])) {
 			$groups = self::$loaded[$id]->groups;
 			$can_see_all_boards = self::$loaded[$id]->is_admin || self::$loaded[$id]->can_manage_boards;
 			$ignoreboards = !empty(self::$loaded[$id]->ignoreboards) ? self::$loaded[$id]->ignoreboards : null;
-		}
-		elseif ($id === 0)
-		{
-			$groups = array(-1);
+		} elseif ($id === 0) {
+			$groups = [-1];
 			$can_see_all_boards = false;
-			$ignoreboards = array();
-		}
-		else
-		{
-			$request = Db::$db->query('', '
-				SELECT mem.ignore_boards, mem.id_group, mem.additional_groups, mem.id_post_group
+			$ignoreboards = [];
+		} else {
+			$request = Db::$db->query(
+				'',
+				'SELECT mem.ignore_boards, mem.id_group, mem.additional_groups, mem.id_post_group
 				FROM {db_prefix}members AS mem
 				WHERE mem.id_member = {int:id_member}
 				LIMIT 1',
-				array(
+				[
 					'id_member' => $id,
-				)
+				],
 			);
 
 			$row = Db::$db->fetch_assoc($request);
 
-			if (empty($row['additional_groups']))
-			{
-				$groups = array($row['id_group'], $row['id_post_group']);
-			}
-			else
-			{
+			if (empty($row['additional_groups'])) {
+				$groups = [$row['id_group'], $row['id_post_group']];
+			} else {
 				$groups = array_merge(
-					array($row['id_group'], $row['id_post_group']),
-					explode(',', $row['additional_groups'])
+					[$row['id_group'], $row['id_post_group']],
+					explode(',', $row['additional_groups']),
 				);
 			}
 
@@ -2836,33 +2767,30 @@ public static function buildQueryBoard(int $id): array
 
 			$can_see_all_boards = in_array(1, $groups) || (!empty(Config::$modSettings['board_manager_groups']) && count(array_intersect($groups, explode(',', Config::$modSettings['board_manager_groups']))) > 0);
 
-			$ignoreboards = !empty($row['ignore_boards']) && !empty(Config::$modSettings['allow_ignore_boards']) ? explode(',', $row['ignore_boards']) : array();
+			$ignoreboards = !empty($row['ignore_boards']) && !empty(Config::$modSettings['allow_ignore_boards']) ? explode(',', $row['ignore_boards']) : [];
 		}
 
 		// Just build this here, it makes it easier to change/use - administrators can see all boards.
-		if ($can_see_all_boards)
-		{
+		if ($can_see_all_boards) {
 			$query_part['query_see_board'] = '1=1';
 		}
 		// Otherwise only the boards that can be accessed by the groups this user belongs to.
-		else
-		{
+		else {
 			$query_part['query_see_board'] = '
 				EXISTS (
 					SELECT bpv.id_board
 					FROM ' . Db::$db->prefix . 'board_permissions_view AS bpv
-					WHERE bpv.id_group IN ('. implode(',', $groups) .')
+					WHERE bpv.id_group IN (' . implode(',', $groups) . ')
 						AND bpv.deny = 0
 						AND bpv.id_board = b.id_board
 				)';
 
-			if (!empty(Config::$modSettings['deny_boards_access']))
-			{
+			if (!empty(Config::$modSettings['deny_boards_access'])) {
 				$query_part['query_see_board'] .= '
 				AND NOT EXISTS (
 					SELECT bpv.id_board
 					FROM ' . Db::$db->prefix . 'board_permissions_view AS bpv
-					WHERE bpv.id_group IN ( '. implode(',', $groups) .')
+					WHERE bpv.id_group IN ( ' . implode(',', $groups) . ')
 						AND bpv.deny = 1
 						AND bpv.id_board = b.id_board
 				)';
@@ -2876,15 +2804,13 @@ public static function buildQueryBoard(int $id): array
 		// This will take the place of query_see_boards in certain spots, so it better include the boards they can see also
 
 		// If they aren't ignoring any boards then they want to see all the boards they can see
-		if (empty($ignoreboards))
-		{
+		if (empty($ignoreboards)) {
 			$query_part['query_wanna_see_board'] = $query_part['query_see_board'];
 			$query_part['query_wanna_see_message_board'] = $query_part['query_see_message_board'];
 			$query_part['query_wanna_see_topic_board'] = $query_part['query_see_topic_board'];
 		}
 		// Ok I guess they don't want to see all the boards
-		else
-		{
+		else {
 			$query_part['query_wanna_see_board'] = '(' . $query_part['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
 			$query_part['query_wanna_see_message_board'] = '(' . $query_part['query_see_message_board'] . ' AND m.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
 			$query_part['query_wanna_see_topic_board'] = '(' . $query_part['query_see_topic_board'] . ' AND t.id_board NOT IN (' . implode(',', $ignoreboards) . '))';
@@ -2904,86 +2830,71 @@ public static function buildQueryBoard(int $id): array
 	 * @param array $data An array of raw info.
 	 * @return array An array of avatar data.
 	 */
-	public static function setAvatarData(array $data = array()): array
+	public static function setAvatarData(array $data = []): array
 	{
 		// Come on!
-		if (empty($data))
-			return array();
+		if (empty($data)) {
+			return [];
+		}
 
 		// Set a nice default var.
 		$image = '';
 
 		// Gravatar has been set as mandatory!
-		if (!empty(Config::$modSettings['gravatarEnabled']) && !empty(Config::$modSettings['gravatarOverride']))
-		{
-			if (!empty(Config::$modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://'))
-			{
+		if (!empty(Config::$modSettings['gravatarEnabled']) && !empty(Config::$modSettings['gravatarOverride'])) {
+			if (!empty(Config::$modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://')) {
 				$image = self::getGravatarUrl(Utils::entitySubstr($data['avatar'], 11));
-			}
-			elseif (!empty($data['email']))
-			{
+			} elseif (!empty($data['email'])) {
 				$image = self::getGravatarUrl($data['email']);
 			}
 		}
 		// Look if the user has a gravatar field or has set an external url as avatar.
-		else
-		{
+		else {
 			// So it's stored in the member table?
-			if (!empty($data['avatar']))
-			{
+			if (!empty($data['avatar'])) {
 				// Gravatar.
-				if (stristr($data['avatar'], 'gravatar://'))
-				{
-					if ($data['avatar'] == 'gravatar://')
-					{
+				if (stristr($data['avatar'], 'gravatar://')) {
+					if ($data['avatar'] == 'gravatar://') {
 						$image = self::getGravatarUrl($data['email']);
-					}
-					elseif (!empty(Config::$modSettings['gravatarAllowExtraEmail']))
-					{
+					} elseif (!empty(Config::$modSettings['gravatarAllowExtraEmail'])) {
 						$image = self::getGravatarUrl(Utils::entitySubstr($data['avatar'], 11));
 					}
 				}
 				// External url.
-				else
-				{
+				else {
 					$url = new Url($data['avatar']);
 					$image = $url->scheme !== null ? $url->proxied() : Config::$modSettings['avatar_url'] . '/' . $data['avatar'];
 				}
 			}
 			// Perhaps this user has an attachment as avatar...
-			elseif (!empty($data['filename']))
-			{
+			elseif (!empty($data['filename'])) {
 				$image = Config::$modSettings['custom_avatar_url'] . '/' . $data['filename'];
 			}
 			// Right... no avatar... use our default image.
-			else
-			{
+			else {
 				$image = Config::$modSettings['avatar_url'] . '/default.png';
 			}
 		}
 
-		IntegrationHook::call('integrate_set_avatar_data', array(&$image, &$data));
+		IntegrationHook::call('integrate_set_avatar_data', [&$image, &$data]);
 
 		// At this point in time $image has to be filled unless you chose to force gravatar and the user doesn't have the needed data to retrieve it... thus a check for !empty() is still needed.
-		if (!empty($image))
-		{
-			return array(
+		if (!empty($image)) {
+			return [
 				'name' => !empty($data['avatar']) ? $data['avatar'] : '',
 				'image' => '<img class="avatar" src="' . $image . '" alt="">',
 				'href' => $image,
 				'url' => $image,
-			);
+			];
 		}
+
 		// Fallback to make life easier for everyone...
-		else
-		{
-			return array(
-				'name' => '',
-				'image' => '',
-				'href' => '',
-				'url' => '',
-			);
-		}
+		return [
+			'name' => '',
+			'image' => '',
+			'href' => '',
+			'url' => '',
+		];
 	}
 
 	/**
@@ -3013,84 +2924,71 @@ public static function setAvatarData(array $data = array()): array
 	public static function updateMemberData($members, array $data): void
 	{
 		// An empty array means there's nobody to update.
-		if ($members === array())
+		if ($members === []) {
 			return;
+		}
 
 		// For loaded members, update the loaded objects with the new data.
-		foreach ((array) ($members ?? array_keys(User::$loaded)) as $member)
-		{
-			if (!isset(User::$loaded[$member]))
+		foreach ((array) ($members ?? array_keys(User::$loaded)) as $member) {
+			if (!isset(User::$loaded[$member])) {
 				continue;
+			}
 
-			foreach ($data as $var => $val)
-			{
-				if ($var === 'alerts' && ($val === '+' || $val === '-'))
-				{
+			foreach ($data as $var => $val) {
+				if ($var === 'alerts' && ($val === '+' || $val === '-')) {
 					$val = Alert::count($member, true);
-				}
-				elseif (in_array($var, self::$knownInts) && ($val === '+' || $val === '-'))
-				{
+				} elseif (in_array($var, self::$knownInts) && ($val === '+' || $val === '-')) {
 					$val = User::$loaded[$member]->{$var} + ($val === '+' ? 1 : -1);
 				}
 
-				if (in_array($var, array('posts', 'instant_messages', 'unread_messages')))
+				if (in_array($var, ['posts', 'instant_messages', 'unread_messages'])) {
 					$val = max(0, $val);
+				}
 
-				User::$loaded[$member]->set(array($var, $val));
+				User::$loaded[$member]->set([$var, $val]);
 			}
 		}
 
-		$parameters = array();
+		$parameters = [];
 
-		if (is_array($members))
-		{
+		if (is_array($members)) {
 			$condition = 'id_member IN ({array_int:members})';
 			$parameters['members'] = $members;
-		}
-		elseif ($members === null)
-		{
+		} elseif ($members === null) {
 			$condition = '1=1';
-		}
-		else
-		{
+		} else {
 			$condition = 'id_member = {int:member}';
 			$parameters['member'] = $members;
 		}
 
-		if (!empty(Config::$modSettings['integrate_change_member_data']))
-		{
+		if (!empty(Config::$modSettings['integrate_change_member_data'])) {
 			$vars_to_integrate = array_intersect(self::$integration_vars, array_keys($data));
 
 			// Only proceed if there are any variables left to call the integration function.
-			if (count($vars_to_integrate) != 0)
-			{
+			if (count($vars_to_integrate) != 0) {
 				// Fetch a list of member_names if necessary
-				if ((!is_array($members) && $members === self::$me->id) || (is_array($members) && count($members) == 1 && in_array(self::$me->id, $members)))
-				{
-					$member_names = array(self::$me->username);
-				}
-				else
-				{
-					$member_names = array();
-
-					$request = Db::$db->query('', '
-						SELECT member_name
+				if ((!is_array($members) && $members === self::$me->id) || (is_array($members) && count($members) == 1 && in_array(self::$me->id, $members))) {
+					$member_names = [self::$me->username];
+				} else {
+					$member_names = [];
+
+					$request = Db::$db->query(
+						'',
+						'SELECT member_name
 						FROM {db_prefix}members
 						WHERE ' . $condition,
-						$parameters
+						$parameters,
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
+
+					while ($row = Db::$db->fetch_assoc($request)) {
 						$member_names[] = $row['member_name'];
 					}
 					Db::$db->free_result($request);
 				}
 
-				if (!empty($member_names))
-				{
-					foreach ($vars_to_integrate as $var)
-					{
-						IntegrationHook::call('integrate_change_member_data', array($member_names, $var, &$data[$var], &self::$knownInts, &self::$knownFloats));
+				if (!empty($member_names)) {
+					foreach ($vars_to_integrate as $var) {
+						IntegrationHook::call('integrate_change_member_data', [$member_names, $var, &$data[$var], &self::$knownInts, &self::$knownFloats]);
 					}
 				}
 			}
@@ -3098,10 +2996,8 @@ public static function updateMemberData($members, array $data): void
 
 		$setString = '';
 
-		foreach ($data as $var => $val)
-		{
-			switch ($var)
-			{
+		foreach ($data as $var => $val) {
+			switch ($var) {
 				case  'birthdate':
 					$type = 'date';
 					break;
@@ -3116,49 +3012,36 @@ public static function updateMemberData($members, array $data): void
 					break;
 			}
 
-			if (in_array($var, self::$knownInts))
-			{
+			if (in_array($var, self::$knownInts)) {
 				$type = 'int';
-			}
-			elseif (in_array($var, self::$knownFloats))
-			{
+			} elseif (in_array($var, self::$knownFloats)) {
 				$type = 'float';
 			}
 
 			// Doing an increment?
-			if ($var == 'alerts' && ($val === '+' || $val === '-'))
-			{
-				if (is_array($members))
-				{
+			if ($var == 'alerts' && ($val === '+' || $val === '-')) {
+				if (is_array($members)) {
 					$val = 'CASE ';
 
-					foreach ($members as $k => $v)
-					{
-						$val .= 'WHEN id_member = ' . $v . ' THEN '. Alert::count($v, true) . ' ';
+					foreach ($members as $k => $v) {
+						$val .= 'WHEN id_member = ' . $v . ' THEN ' . Alert::count($v, true) . ' ';
 					}
 
 					$val = $val . ' END';
 
 					$type = 'raw';
-				}
-				else
-				{
+				} else {
 					$val = Alert::count($members, true);
 				}
-			}
-			elseif ($type == 'int' && ($val === '+' || $val === '-'))
-			{
+			} elseif ($type == 'int' && ($val === '+' || $val === '-')) {
 				$val = $var . ' ' . $val . ' 1';
 				$type = 'raw';
 			}
 
 			// Ensure posts, instant_messages, and unread_messages don't overflow or underflow.
-			if (in_array($var, array('posts', 'instant_messages', 'unread_messages')))
-			{
-				if (preg_match('~^' . $var . ' (\+ |- |\+ -)(\d+)~', $val, $match))
-				{
-					if ($match[1] != '+ ')
-					{
+			if (in_array($var, ['posts', 'instant_messages', 'unread_messages'])) {
+				if (preg_match('~^' . $var . ' (\+ |- |\+ -)(\d+)~', $val, $match)) {
+					if ($match[1] != '+ ') {
 						$val = 'CASE WHEN ' . $var . ' <= ' . abs($match[2]) . ' THEN 0 ELSE ' . $val . ' END';
 					}
 
@@ -3170,25 +3053,24 @@ public static function updateMemberData($members, array $data): void
 			$parameters['p_' . $var] = $val;
 		}
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}members
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}members
 			SET' . substr($setString, 0, -1) . '
 			WHERE ' . $condition,
-			$parameters
+			$parameters,
 		);
 
 		Logging::updateStats('postgroups', $members, array_keys($data));
 
 		// Clear any caching?
-		if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2 && !empty($members))
-		{
-			if (!is_array($members))
-				$members = array($members);
-
-			foreach ($members as $member)
-			{
-				if (CacheApi::$enable >= 3)
-				{
+		if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2 && !empty($members)) {
+			if (!is_array($members)) {
+				$members = [$members];
+			}
+
+			foreach ($members as $member) {
+				if (CacheApi::$enable >= 3) {
 					CacheApi::put('member_data-profile-' . $member, null, 120);
 					CacheApi::put('member_data-normal-' . $member, null, 120);
 					CacheApi::put('member_data-basic-' . $member, null, 120);
@@ -3206,46 +3088,44 @@ public static function updateMemberData($members, array $data): void
 	 * @param int $id_member The member id to look up. If not provided, the current user's id will be used.
 	 * @return string The time zone identifier string for the user's time zone.
 	 */
-	public static function getTimezone(int $id_member = null): string
+	public static function getTimezone(?int $id_member = null): string
 	{
-		static $member_cache = array();
+		static $member_cache = [];
 
-		if (is_null($id_member))
-		{
+		if (is_null($id_member)) {
 			$id_member = empty(self::$me->id) ? 0 : self::$me->id;
-		}
-		else
-		{
+		} else {
 			$id_member = (int) $id_member;
 		}
 
 		// Check if we already have this in self::$loaded.
-		if (isset(self::$loaded[$id_member]) && !empty(self::$loaded[$id_member]->timezone))
+		if (isset(self::$loaded[$id_member]) && !empty(self::$loaded[$id_member]->timezone)) {
 			return self::$loaded[$id_member]->timezone;
+		}
 
 		// Did we already look this up?
-		if (isset($member_cache[$id_member]))
+		if (isset($member_cache[$id_member])) {
 			return $member_cache[$id_member];
+		}
 
-		if (!empty($id_member))
-		{
+		if (!empty($id_member)) {
 			// Look it up in the database.
-			$request = Db::$db->query('', '
-				SELECT timezone
+			$request = Db::$db->query(
+				'',
+				'SELECT timezone
 				FROM {db_prefix}members
 				WHERE id_member = {int:id_member}',
-				array(
+				[
 					'id_member' => $id_member,
-				)
+				],
 			);
 			list($timezone) = Db::$db->fetch_row($request);
 			Db::$db->free_result($request);
 		}
 
 		// If it is invalid, fall back to the default.
-		if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		{
-			$timezone = isset(Config::$modSettings['default_timezone']) ? Config::$modSettings['default_timezone'] : date_default_timezone_get();
+		if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$timezone = Config::$modSettings['default_timezone'] ?? date_default_timezone_get();
 		}
 
 		// Save for later.
@@ -3283,387 +3163,416 @@ public static function delete(int|array $users, bool $check_not_admin = false):
 		$users = array_unique((array) $users);
 
 		// Make sure there's no void user in here.
-		$users = array_diff($users, array(0));
+		$users = array_diff($users, [0]);
 
 		// How many are they deleting?
-		if (empty($users))
+		if (empty($users)) {
 			return;
+		}
 
-		if (count($users) == 1)
-		{
+		if (count($users) == 1) {
 			list($user) = $users;
 
-			if ($user == User::$me->id)
-			{
+			if ($user == User::$me->id) {
 				isAllowedTo('profile_remove_own');
-			}
-			else
-			{
+			} else {
 				isAllowedTo('profile_remove_any');
 			}
-		}
-		else
-		{
-			foreach ($users as $k => $v)
+		} else {
+			foreach ($users as $k => $v) {
 				$users[$k] = (int) $v;
+			}
 
 			// Deleting more than one?  You can't have more than one account...
 			isAllowedTo('profile_remove_any');
 		}
 
 		// Get their names for logging purposes.
-		$admins = array();
-		$user_log_details = array();
+		$admins = [];
+		$user_log_details = [];
 
-		$request = Db::$db->query('', '
-			SELECT id_member, member_name, CASE WHEN id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0 THEN 1 ELSE 0 END AS is_admin
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, member_name, CASE WHEN id_group = {int:admin_group} OR FIND_IN_SET({int:admin_group}, additional_groups) != 0 THEN 1 ELSE 0 END AS is_admin
 			FROM {db_prefix}members
 			WHERE id_member IN ({array_int:user_list})
 			LIMIT {int:limit}',
-			array(
+			[
 				'user_list' => $users,
 				'admin_group' => 1,
 				'limit' => count($users),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if ($row['is_admin'])
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if ($row['is_admin']) {
 				$admins[] = $row['id_member'];
+			}
 
-			$user_log_details[$row['id_member']] = array($row['id_member'], $row['member_name']);
+			$user_log_details[$row['id_member']] = [$row['id_member'], $row['member_name']];
 		}
 		Db::$db->free_result($request);
 
-		if (empty($user_log_details))
+		if (empty($user_log_details)) {
 			return;
+		}
 
 		// Make sure they aren't trying to delete administrators if they aren't one.  But don't bother checking if it's just themself.
-		if (!empty($admins) && ($check_not_admin || (!User::$me->allowedTo('admin_forum') && (count($users) != 1 || $users[0] != self::$me->id))))
-		{
+		if (!empty($admins) && ($check_not_admin || (!User::$me->allowedTo('admin_forum') && (count($users) != 1 || $users[0] != self::$me->id)))) {
 			$users = array_diff($users, $admins);
 
-			foreach ($admins as $id)
+			foreach ($admins as $id) {
 				unset($user_log_details[$id]);
+			}
 		}
 
 		// No one left?
-		if (empty($users))
+		if (empty($users)) {
 			return;
+		}
 
 		// Log the action - regardless of who is deleting it.
-		$log_changes = array();
+		$log_changes = [];
 
-		foreach ($user_log_details as $user)
-		{
-			$log_changes[] = array(
+		foreach ($user_log_details as $user) {
+			$log_changes[] = [
 				'action' => 'delete_member',
 				'log_type' => 'admin',
-				'extra' => array(
+				'extra' => [
 					'member' => $user[0],
 					'name' => $user[1],
 					'member_acted' => self::$me->name,
-				),
-			);
+				],
+			];
 
 			// Remove any cached data if enabled.
-			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2)
+			if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2) {
 				CacheApi::put('user_settings-' . $user[0], null, 60);
+			}
 		}
 
 		// Make these peoples' posts guest posts.
-		Db::$db->query('', '
-			UPDATE {db_prefix}messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}messages
 			SET id_member = {int:guest_id}' . (!empty(Config::$modSettings['deleteMembersRemovesEmail']) ? ',
 				poster_email = {string:blank_email}' : '') . '
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'blank_email' => '',
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}polls
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}polls
 			SET id_member = {int:guest_id}
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
 		// Make these peoples' posts guest first posts and last posts.
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_member_started = {int:guest_id}
 			WHERE id_member_started IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}topics
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}topics
 			SET id_member_updated = {int:guest_id}
 			WHERE id_member_updated IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_actions
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_actions
 			SET id_member = {int:guest_id}
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_banned
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_banned
 			SET id_member = {int:guest_id}
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_errors
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_errors
 			SET id_member = {int:guest_id}
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
 		// Delete the member.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}members
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}members
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// Delete any drafts...
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_drafts
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_drafts
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// Delete anything they liked.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}user_likes
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}user_likes
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// Delete their mentions
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}mentions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}mentions
 			WHERE id_member IN ({array_int:members})',
-			array(
+			[
 				'members' => $users,
-			)
+			],
 		);
 
 		// Delete the logs...
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_actions
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_actions
 			WHERE id_log = {int:log_type}
 				AND id_member IN ({array_int:users})',
-			array(
+			[
 				'log_type' => 2,
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_boards
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_boards
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_comments
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_comments
 			WHERE id_recipient IN ({array_int:users})
 				AND comment_type = {string:warntpl}',
-			array(
+			[
 				'users' => $users,
 				'warntpl' => 'warntpl',
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_group_requests
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_group_requests
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_mark_read
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_mark_read
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_notify
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_notify
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_online
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_online
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_subscribed
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_subscribed
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}log_topics
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}log_topics
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// Make their votes appear as guest votes - at least it keeps the totals right.
 		// @todo Consider adding back in cookie protection.
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_polls
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_polls
 			SET id_member = {int:guest_id}
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
 		// Delete personal messages.
 		PM::delete(null, null, $users);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}personal_messages
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}personal_messages
 			SET id_member_from = {int:guest_id}
 			WHERE id_member_from IN ({array_int:users})',
-			array(
+			[
 				'guest_id' => 0,
 				'users' => $users,
-			)
+			],
 		);
 
 		// They no longer exist, so we don't know who it was sent to.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}pm_recipients
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}pm_recipients
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// Delete avatar.
-		Attachment::remove(array('id_member' => $users));
+		Attachment::remove(['id_member' => $users]);
 
 		// It's over, no more moderation for you.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}moderators
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}moderators
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}group_moderators
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}group_moderators
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// If you don't exist we can't ban you.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}ban_items
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}ban_items
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// Remove individual theme settings.
-		Db::$db->query('', '
-			DELETE FROM {db_prefix}themes
+		Db::$db->query(
+			'',
+			'DELETE FROM {db_prefix}themes
 			WHERE id_member IN ({array_int:users})',
-			array(
+			[
 				'users' => $users,
-			)
+			],
 		);
 
 		// These users are nobody's buddy nomore.
-		$request = Db::$db->query('', '
-			SELECT id_member, pm_ignore_list, buddy_list
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, pm_ignore_list, buddy_list
 			FROM {db_prefix}members
 			WHERE FIND_IN_SET({raw:pm_ignore_list}, pm_ignore_list) != 0 OR FIND_IN_SET({raw:buddy_list}, buddy_list) != 0',
-			array(
+			[
 				'pm_ignore_list' => implode(', pm_ignore_list) != 0 OR FIND_IN_SET(', $users),
 				'buddy_list' => implode(', buddy_list) != 0 OR FIND_IN_SET(', $users),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			Db::$db->query('', '
-				UPDATE {db_prefix}members
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}members
 				SET
 					pm_ignore_list = {string:pm_ignore_list},
 					buddy_list = {string:buddy_list}
 				WHERE id_member = {int:id_member}',
-				array(
+				[
 					'id_member' => $row['id_member'],
 					'pm_ignore_list' => implode(',', array_diff(explode(',', $row['pm_ignore_list']), $users)),
 					'buddy_list' => implode(',', array_diff(explode(',', $row['buddy_list']), $users)),
-				)
+				],
 			);
 		}
 		Db::$db->free_result($request);
 
 		// Make sure no member's birthday is still sticking in the calendar...
-		Config::updateModSettings(array(
+		Config::updateModSettings([
 			'calendar_updated' => time(),
-		));
+		]);
 
 		// Integration rocks!
-		IntegrationHook::call('integrate_delete_members', array($users));
+		IntegrationHook::call('integrate_delete_members', [$users]);
 
 		Logging::updateStats('member');
 
@@ -3686,36 +3595,40 @@ public static function delete(int|array $users, bool $check_not_admin = false):
 	 *    part of the password (email address, username, etc.)
 	 * @return null|string Null if valid or a string indicating the problem.
 	 */
-	public static function validatePassword(string $password, string $username, array $restrict_in = array()): null|string
+	public static function validatePassword(string $password, string $username, array $restrict_in = []): ?string
 	{
 		// Perform basic requirements first.
-		if (Utils::entityStrlen($password) < (empty(Config::$modSettings['password_strength']) ? 4 : 8))
-		{
+		if (Utils::entityStrlen($password) < (empty(Config::$modSettings['password_strength']) ? 4 : 8)) {
 			return 'short';
 		}
 
 		// Maybe we need some more fancy password checks.
 		$pass_error = '';
 
-		IntegrationHook::call('integrate_validatePassword', array($password, $username, $restrict_in, &$pass_error));
+		IntegrationHook::call('integrate_validatePassword', [$password, $username, $restrict_in, &$pass_error]);
 
-		if (!empty($pass_error))
+		if (!empty($pass_error)) {
 			return $pass_error;
+		}
 
 		// Is this enough?
-		if (empty(Config::$modSettings['password_strength']))
+		if (empty(Config::$modSettings['password_strength'])) {
 			return null;
+		}
 
 		// Otherwise, perform the medium strength test - checking if password appears in the restricted string.
-		if (!preg_match('~\b' . preg_quote($password, '~') . '\b~', implode(' ', $restrict_in)))
+		if (!preg_match('~\b' . preg_quote($password, '~') . '\b~', implode(' ', $restrict_in))) {
 			return 'restricted_words';
+		}
 
-		if (Utils::entityStrpos($password, $username) !== false)
+		if (Utils::entityStrpos($password, $username) !== false) {
 			return 'restricted_words';
+		}
 
 		// If just medium, we're done.
-		if (Config::$modSettings['password_strength'] == 1)
+		if (Config::$modSettings['password_strength'] == 1) {
 			return null;
+		}
 
 		// Check for both numbers and letters.
 		$good = preg_match('~\p{N}~u', $password) && preg_match('~\p{L}~u', $password);
@@ -3724,8 +3637,9 @@ public static function validatePassword(string $password, string $username, arra
 		// check that there are both lowercase and uppercase letters present.
 		// Note: If the password only contains letters from a unicameral script
 		// (Arabic, Thai, etc.), this requirement is not applicable.
-		if (Utils::strtoupper($password) !== ($lower_password = Utils::strtolower($password)))
+		if (Utils::strtoupper($password) !== ($lower_password = Utils::strtolower($password))) {
 			$good &= $password !== $lower_password;
+		}
 
 		return $good ? null : 'chars';
 	}
@@ -3740,47 +3654,48 @@ public static function validatePassword(string $password, string $username, arra
 	 * @return array|null Null if there are no errors, otherwise an array of
 	 *    errors if $return_error is true.
 	 */
-	public static function validateUsername(int $memID, string $username, bool $return_error = false, bool $check_reserved_name = true): array|null
+	public static function validateUsername(int $memID, string $username, bool $return_error = false, bool $check_reserved_name = true): ?array
 	{
-		$errors = array();
+		$errors = [];
 
 		// Don't use too long a name.
-		if (Utils::entityStrlen($username) > 25)
-			$errors[] = array('lang', 'error_long_name');
+		if (Utils::entityStrlen($username) > 25) {
+			$errors[] = ['lang', 'error_long_name'];
+		}
 
 		// No name?!  How can you register with no name?
-		if ($username == '')
-			$errors[] = array('lang', 'need_username');
+		if ($username == '') {
+			$errors[] = ['lang', 'need_username'];
+		}
 
 		// Only these characters are permitted.
 		if (
-			in_array($username, array('_', '|'))
+			in_array($username, ['_', '|'])
 			|| strpos($username, '[code') !== false
 			|| strpos($username, '[/code') !== false
-			|| preg_match('~[<>&"\'=\\\\]~', preg_replace('~&#(?:\\d{1,7}|x[0-9a-fA-F]{1,6});~', '', $username))
-		)
-		{
-			$errors[] = array('lang', 'error_invalid_characters_username');
+			|| preg_match('~[<>&"\'=\\\\]~', preg_replace('~&#(?:\d{1,7}|x[0-9a-fA-F]{1,6});~', '', $username))
+		) {
+			$errors[] = ['lang', 'error_invalid_characters_username'];
 		}
 
-		if (stristr($username, Lang::$txt['guest_title']) !== false)
-		{
-			$errors[] = array('lang', 'username_reserved', 'general', array(Lang::$txt['guest_title']));
+		if (stristr($username, Lang::$txt['guest_title']) !== false) {
+			$errors[] = ['lang', 'username_reserved', 'general', [Lang::$txt['guest_title']]];
 		}
 
-		if ($check_reserved_name && User::isReservedName($username, $memID, false))
-		{
-			$errors[] = array('done', '(' . Utils::htmlspecialchars($username) . ') ' . Lang::$txt['name_in_use']);
+		if ($check_reserved_name && User::isReservedName($username, $memID, false)) {
+			$errors[] = ['done', '(' . Utils::htmlspecialchars($username) . ') ' . Lang::$txt['name_in_use']];
 		}
 
 		// Maybe a mod wants to perform more checks?
-		IntegrationHook::call('integrate_validate_username', array($username, &$errors));
+		IntegrationHook::call('integrate_validate_username', [$username, &$errors]);
 
-		if ($return_error)
+		if ($return_error) {
 			return $errors;
+		}
 
-		if (empty($errors))
+		if (empty($errors)) {
 			return null;
+		}
 
 		Lang::load('Errors');
 		$error = $errors[0];
@@ -3810,93 +3725,97 @@ public static function isReservedName(string $name, int $current_id_member = 0,
 		$checkName = Utils::strtolower($name);
 
 		// Administrators are never restricted ;).
-		if (!User::$me->allowedTo('moderate_forum') && ((!empty(Config::$modSettings['reserveName']) && $is_name) || !empty(Config::$modSettings['reserveUser']) && !$is_name))
-		{
+		if (!User::$me->allowedTo('moderate_forum') && ((!empty(Config::$modSettings['reserveName']) && $is_name) || !empty(Config::$modSettings['reserveUser']) && !$is_name)) {
 			$reservedNames = explode("\n", Config::$modSettings['reserveNames']);
 
 			// Case sensitive check?
 			$checkMe = empty(Config::$modSettings['reserveCase']) ? $checkName : $name;
 
 			// Check each name in the list...
-			foreach ($reservedNames as $reserved)
-			{
-				if ($reserved == '')
+			foreach ($reservedNames as $reserved) {
+				if ($reserved == '') {
 					continue;
+				}
 
 				// The admin might've used entities too, level the playing field.
 				$reservedCheck = Utils::entityDecode($reserved, true);
 
 				// Case sensitive name?
-				if (empty(Config::$modSettings['reserveCase']))
+				if (empty(Config::$modSettings['reserveCase'])) {
 					$reservedCheck = Utils::strtolower($reservedCheck);
+				}
 
 				// If it's not just entire word, check for it in there somewhere...
-				if ($checkMe == $reservedCheck || (Utils::entityStrpos($checkMe, $reservedCheck) !== false && empty(Config::$modSettings['reserveWord'])))
-				{
-					if ($fatal)
-						ErrorHandler::fatalLang('username_reserved', 'password', array($reserved));
+				if ($checkMe == $reservedCheck || (Utils::entityStrpos($checkMe, $reservedCheck) !== false && empty(Config::$modSettings['reserveWord']))) {
+					if ($fatal) {
+						ErrorHandler::fatalLang('username_reserved', 'password', [$reserved]);
+					}
 
 					return true;
 				}
 			}
 
 			$censor_name = $name;
-			if (Lang::censorText($censor_name) != $name)
-			{
-				if ($fatal)
-					ErrorHandler::fatalLang('name_censored', 'password', array($name));
+
+			if (Lang::censorText($censor_name) != $name) {
+				if ($fatal) {
+					ErrorHandler::fatalLang('name_censored', 'password', [$name]);
+				}
 
 				return true;
 			}
 		}
 
 		// Characters we just shouldn't allow, regardless.
-		foreach (array('*') as $char)
-		{
-			if (strpos($checkName, $char) !== false)
-			{
-				if ($fatal)
-					ErrorHandler::fatalLang('username_reserved', 'password', array($char));
+		foreach (['*'] as $char) {
+			if (strpos($checkName, $char) !== false) {
+				if ($fatal) {
+					ErrorHandler::fatalLang('username_reserved', 'password', [$char]);
+				}
 
 				return true;
 			}
 		}
 
-		$request = Db::$db->query('', '
-			SELECT id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member
 			FROM {db_prefix}members
 			WHERE ' . (empty($current_id_member) ? '' : 'id_member != {int:current_member}
 				AND ') . '({raw:real_name} {raw:operator} LOWER({string:check_name}) OR {raw:member_name} {raw:operator} LOWER({string:check_name}))
 			LIMIT 1',
-			array(
+			[
 				'real_name' => Db::$db->case_sensitive ? 'LOWER(real_name)' : 'real_name',
 				'member_name' => Db::$db->case_sensitive ? 'LOWER(member_name)' : 'member_name',
 				'current_member' => $current_id_member,
 				'check_name' => $checkName,
 				'operator' => strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=',
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) > 0)
-		{
+
+		if (Db::$db->num_rows($request) > 0) {
 			Db::$db->free_result($request);
+
 			return true;
 		}
 		Db::$db->free_result($request);
 
 		// Does name case insensitive match a member group name?
-		$request = Db::$db->query('', '
-			SELECT id_group
+		$request = Db::$db->query(
+			'',
+			'SELECT id_group
 			FROM {db_prefix}membergroups
 			WHERE {raw:group_name} LIKE {string:check_name}
 			LIMIT 1',
-			array(
+			[
 				'group_name' => Db::$db->case_sensitive ? 'LOWER(group_name)' : 'group_name',
 				'check_name' => $checkName,
-			)
+			],
 		);
-		if (Db::$db->num_rows($request) > 0)
-		{
+
+		if (Db::$db->num_rows($request) > 0) {
 			Db::$db->free_result($request);
+
 			return true;
 		}
 		Db::$db->free_result($request);
@@ -3905,7 +3824,7 @@ public static function isReservedName(string $name, int $current_id_member = 0,
 		$is_reserved = false;
 
 		// Maybe a mod wants to perform further checks?
-		IntegrationHook::call('integrate_check_name', array($checkName, &$is_reserved, $current_id_member, $is_name));
+		IntegrationHook::call('integrate_check_name', [$checkName, &$is_reserved, $current_id_member, $is_name]);
 
 		return $is_reserved;
 	}
@@ -3922,37 +3841,37 @@ public static function isReservedName(string $name, int $current_id_member = 0,
 	public static function isBannedEmail(string $email, string $restriction, string $error): void
 	{
 		// Can't ban an empty email
-		if (empty($email) || trim($email) == '')
+		if (empty($email) || trim($email) == '') {
 			return;
+		}
 
 		// Let's start with the bans based on your IP/hostname/memberID...
-		$ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array();
+		$ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : [];
 		$ban_reason = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['reason'] : '';
 
 		// ...and add to that the email address you're trying to register.
-		$request = Db::$db->query('', '
-			SELECT bi.id_ban, bg.' . $restriction . ', bg.cannot_access, bg.reason
+		$request = Db::$db->query(
+			'',
+			'SELECT bi.id_ban, bg.' . $restriction . ', bg.cannot_access, bg.reason
 			FROM {db_prefix}ban_items AS bi
 				INNER JOIN {db_prefix}ban_groups AS bg ON (bg.id_ban_group = bi.id_ban_group)
 			WHERE {string:email} LIKE bi.email_address
 				AND (bg.' . $restriction . ' = {int:cannot_access} OR bg.cannot_access = {int:cannot_access})
 				AND (bg.expire_time IS NULL OR bg.expire_time >= {int:now})',
-			array(
+			[
 				'email' => $email,
 				'cannot_access' => 1,
 				'now' => time(),
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			if (!empty($row['cannot_access']))
-			{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			if (!empty($row['cannot_access'])) {
 				$_SESSION['ban']['cannot_access']['ids'][] = $row['id_ban'];
 				$_SESSION['ban']['cannot_access']['reason'] = $row['reason'];
 			}
 
-			if (!empty($row[$restriction]))
-			{
+			if (!empty($row[$restriction])) {
 				$ban_ids[] = $row['id_ban'];
 				$ban_reason = $row['reason'];
 			}
@@ -3960,8 +3879,7 @@ public static function isBannedEmail(string $email, string $restriction, string
 		Db::$db->free_result($request);
 
 		// You're in biiig trouble.  Banned for the rest of this session!
-		if (isset($_SESSION['ban']['cannot_access']))
-		{
+		if (isset($_SESSION['ban']['cannot_access'])) {
 			$this->logBan($_SESSION['ban']['cannot_access']['ids']);
 
 			$_SESSION['ban']['last_checked'] = time();
@@ -3969,8 +3887,7 @@ public static function isBannedEmail(string $email, string $restriction, string
 			ErrorHandler::fatal(sprintf(Lang::$txt['your_ban'], Lang::$txt['guest_title']) . $_SESSION['ban']['cannot_access']['reason'], false);
 		}
 
-		if (!empty($ban_ids))
-		{
+		if (!empty($ban_ids)) {
 			// Log this ban for future reference.
 			$this->logBan($ban_ids, $email);
 
@@ -3997,26 +3914,24 @@ public static function find($names, bool $use_wildcards = false, bool $buddies_o
 	{
 
 		// If it's not already an array, make it one.
-		if (!is_array($names))
+		if (!is_array($names)) {
 			$names = explode(',', $names);
+		}
 
 		$maybe_email = false;
-		$names_list = array();
-		foreach (array_values($names) as $i => $name)
-		{
+		$names_list = [];
+
+		foreach (array_values($names) as $i => $name) {
 			// Trim, and fix wildcards for each name.
 			$names[$i] = trim(Utils::strtolower($name));
 
 			$maybe_email |= strpos($name, '@') !== false;
 
 			// Make it so standard wildcards will work. (* and ?)
-			if ($use_wildcards)
-			{
-				$names[$i] = strtr($names[$i], array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '\'' => '&#039;'));
-			}
-			else
-			{
-				$names[$i] = strtr($names[$i], array('\'' => '&#039;'));
+			if ($use_wildcards) {
+				$names[$i] = strtr($names[$i], ['%' => '\\%', '_' => '\\_', '*' => '%', '?' => '_', '\'' => '&#039;']);
+			} else {
+				$names[$i] = strtr($names[$i], ['\'' => '&#039;']);
 			}
 
 			$names_list[] = '{string:lookup_name_' . $i . '}';
@@ -4027,16 +3942,13 @@ public static function find($names, bool $use_wildcards = false, bool $buddies_o
 		$comparison = $use_wildcards ? 'LIKE' : '=';
 
 		// Nothing found yet.
-		$results = array();
+		$results = [];
 
 		// This ensures you can't search someones email address if you can't see it.
-		if (($use_wildcards || $maybe_email) && User::$me->allowedTo('moderate_forum'))
-		{
+		if (($use_wildcards || $maybe_email) && User::$me->allowedTo('moderate_forum')) {
 			$email_condition = '
 				OR (email_address ' . $comparison . ' \'' . implode('\') OR (email_address ' . $comparison . ' \'', $names) . '\')';
-		}
-		else
-		{
+		} else {
 			$email_condition = '';
 		}
 
@@ -4050,29 +3962,30 @@ public static function find($names, bool $use_wildcards = false, bool $buddies_o
 		$real_name_search = $real_name . ' ' . $comparison . ' ' . implode(' OR ' . $real_name . ' ' . $comparison . ' ', $names_list);
 
 		// Search by username, display name, and email address.
-		$request = Db::$db->query('', '
-			SELECT id_member, member_name, real_name, email_address
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, member_name, real_name, email_address
 			FROM {db_prefix}members
 			WHERE (' . $member_name_search . '
 				OR ' . $real_name_search . ' ' . $email_condition . ')
 				' . ($buddies_only ? 'AND id_member IN ({array_int:buddy_list})' : '') . '
 				AND is_activated IN (1, 11)
 			LIMIT {int:limit}',
-			array_merge($where_params, array(
+			array_merge($where_params, [
 				'buddy_list' => User::$me->buddies,
 				'limit' => $max,
-			))
+			]),
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
-			$results[$row['id_member']] = array(
+
+		while ($row = Db::$db->fetch_assoc($request)) {
+			$results[$row['id_member']] = [
 				'id' => $row['id_member'],
 				'name' => $row['real_name'],
 				'username' => $row['member_name'],
 				'email' => User::$me->allowedTo('moderate_forum') ? $row['email_address'] : '',
 				'href' => Config::$scripturl . '?action=profile;u=' . $row['id_member'],
-				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>'
-			);
+				'link' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
+			];
 		}
 		Db::$db->free_result($request);
 
@@ -4092,34 +4005,35 @@ public static function find($names, bool $use_wildcards = false, bool $buddies_o
 	 * @param int $board_id If set, checks permission for that specific board.
 	 * @return array IDs of the members who have that permission.
 	 */
-	public static function membersAllowedTo(string $permission, int $board_id = null): array
+	public static function membersAllowedTo(string $permission, ?int $board_id = null): array
 	{
-		$members = array();
+		$members = [];
 
 		$member_groups = self::groupsAllowedTo($permission, $board_id);
 
 		$all_groups = array_merge($member_groups['allowed'], $member_groups['denied']);
 
 		$include_moderators = in_array(3, $member_groups['allowed']) && $board_id !== null;
-		$member_groups['allowed'] = array_diff($member_groups['allowed'], array(3));
+		$member_groups['allowed'] = array_diff($member_groups['allowed'], [3]);
 
 		$exclude_moderators = in_array(3, $member_groups['denied']) && $board_id !== null;
-		$member_groups['denied'] = array_diff($member_groups['denied'], array(3));
+		$member_groups['denied'] = array_diff($member_groups['denied'], [3]);
 
-		$request = Db::$db->query('', '
-			SELECT mem.id_member
+		$request = Db::$db->query(
+			'',
+			'SELECT mem.id_member
 			FROM {db_prefix}members AS mem' . ($include_moderators || $exclude_moderators ? '
 				LEFT JOIN {db_prefix}moderators AS mods ON (mods.id_member = mem.id_member AND mods.id_board = {int:board_id})' : '') . '
 			WHERE (' . ($include_moderators ? 'mods.id_member IS NOT NULL OR ' : '') . 'mem.id_group IN ({array_int:member_groups_allowed}) OR FIND_IN_SET({raw:member_group_allowed_implode}, mem.additional_groups) != 0 OR mem.id_post_group IN ({array_int:member_groups_allowed}))' . (empty($member_groups['denied']) ? '' : '
 				AND NOT (' . ($exclude_moderators ? 'mods.id_member IS NOT NULL OR ' : '') . 'mem.id_group IN ({array_int:member_groups_denied}) OR FIND_IN_SET({raw:member_group_denied_implode}, mem.additional_groups) != 0 OR mem.id_post_group IN ({array_int:member_groups_denied}))'),
-			array(
+			[
 				'member_groups_allowed' => $member_groups['allowed'],
 				'member_groups_denied' => $member_groups['denied'],
 				'all_member_groups' => $all_groups,
 				'board_id' => $board_id,
 				'member_group_allowed_implode' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $member_groups['allowed']),
 				'member_group_denied_implode' => implode(', mem.additional_groups) != 0 OR FIND_IN_SET(', $member_groups['denied']),
-			)
+			],
 		);
 		$members = Db::$db->fetch_all($request);
 		Db::$db->free_result($request);
@@ -4147,35 +4061,34 @@ public static function membersAllowedTo(string $permission, int $board_id = null
 	 *    and only one permission was asked for, the returned value will contain
 	 *    only the relevant sub-array for that permission.
 	 */
-	public static function groupsAllowedTo(array|string $permissions, ?int $board_id = null, bool $simple = true, int $profile_id = null): array
+	public static function groupsAllowedTo(array|string $permissions, ?int $board_id = null, bool $simple = true, ?int $profile_id = null): array
 	{
 		$permissions = (array) $permissions;
 
-		$group_permissions = array();
-		$board_permissions = array();
+		$group_permissions = [];
+		$board_permissions = [];
 
-		foreach ($permissions as $permission)
-		{
+		foreach ($permissions as $permission) {
 			// Admins are allowed to do anything.
-			$member_groups[$permission] = array(
-				'allowed' => array(1),
-				'denied' => array(),
-			);
+			$member_groups[$permission] = [
+				'allowed' => [1],
+				'denied' => [],
+			];
 		}
 
 		// No board means we're dealing with general permissions.
-		if (!isset($board_id))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_group, permission, add_deny
+		if (!isset($board_id)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group, permission, add_deny
 				FROM {db_prefix}permissions
 				WHERE permission IN ({array_string:permissions})',
-				array(
+				[
 					'permissions' => $permissions,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$group_permissions[] = $row['permission'];
 
 				$member_groups[$row['permission']][$row['add_deny'] ? 'allowed' : 'denied'][] = $row['id_group'];
@@ -4186,54 +4099,49 @@ public static function groupsAllowedTo(array|string $permissions, ?int $board_id
 		}
 
 		// If given a board, we need its permission profile.
-		if (!isset($profile_id) && isset($board_id))
-		{
+		if (!isset($profile_id) && isset($board_id)) {
 			$board_id = (int) $board_id;
 
 			// First get the profile of the given board.
-			if (isset(Board::$info->id) && Board::$info->id == $board_id)
-			{
+			if (isset(Board::$info->id) && Board::$info->id == $board_id) {
 				$profile_id = Board::$info->profile;
-			}
-			elseif ($board_id !== 0)
-			{
-				$request = Db::$db->query('', '
-					SELECT id_profile
+			} elseif ($board_id !== 0) {
+				$request = Db::$db->query(
+					'',
+					'SELECT id_profile
 					FROM {db_prefix}boards
 					WHERE id_board = {int:id_board}
 					LIMIT 1',
-					array(
+					[
 						'id_board' => $board_id,
-					)
+					],
 				);
-				if (Db::$db->num_rows($request) == 0)
-				{
+
+				if (Db::$db->num_rows($request) == 0) {
 					Db::$db->free_result($request);
 					ErrorHandler::fatalLang('no_board');
 				}
 				list($profile_id) = Db::$db->fetch_row($request);
 				Db::$db->free_result($request);
-			}
-			else
-			{
+			} else {
 				$profile_id = 1;
 			}
 		}
 
-		if (isset($profile_id))
-		{
-			$request = Db::$db->query('', '
-				SELECT id_group, permission, add_deny
+		if (isset($profile_id)) {
+			$request = Db::$db->query(
+				'',
+				'SELECT id_group, permission, add_deny
 				FROM {db_prefix}board_permissions
 				WHERE permission IN ({array_string:permissions})
 					AND id_profile = {int:profile_id}',
-				array(
+				[
 					'profile_id' => $profile_id,
 					'permissions' => $permissions,
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$board_permissions[] = $row['permission'];
 
 				$member_groups[$row['permission']][$row['add_deny'] ? 'allowed' : 'denied'][] = $row['id_group'];
@@ -4243,45 +4151,39 @@ public static function groupsAllowedTo(array|string $permissions, ?int $board_id
 			$board_permissions = array_unique($board_permissions);
 
 			// Inherit any moderator permissions as needed.
-			$moderator_groups = array();
+			$moderator_groups = [];
 
-			if (isset(Board::$info->id, Board::$info->moderator_groups) && $board_id == Board::$info->id)
-			{
+			if (isset(Board::$info->id, Board::$info->moderator_groups) && $board_id == Board::$info->id) {
 				$moderator_groups = array_keys(Board::$info->moderator_groups);
-			}
-			elseif (isset($board_id) && $board_id !== 0)
-			{
+			} elseif (isset($board_id) && $board_id !== 0) {
 				// Get the groups that can moderate this board
-				$request = Db::$db->query('', '
-					SELECT id_group
+				$request = Db::$db->query(
+					'',
+					'SELECT id_group
 					FROM {db_prefix}moderator_groups
 					WHERE id_board = {int:board_id}',
-					array(
+					[
 						'board_id' => $board_id,
-					)
+					],
 				);
-				while ($row = Db::$db->fetch_assoc($request))
-				{
+
+				while ($row = Db::$db->fetch_assoc($request)) {
 					$moderator_groups[] = $row['id_group'];
 				}
 				Db::$db->free_result($request);
 			}
 
 			// Inherit any additional permissions from the moderators group.
-			foreach ($moderator_groups as $mod_group)
-			{
-				foreach ($board_permissions as $permission)
-				{
+			foreach ($moderator_groups as $mod_group) {
+				foreach ($board_permissions as $permission) {
 					// If they're not specifically allowed, but the moderator group is,
 					// then allow it.
-					if (in_array(3, $member_groups[$permission]['allowed']) && !in_array($mod_group, $member_groups[$permission]['allowed']))
-					{
+					if (in_array(3, $member_groups[$permission]['allowed']) && !in_array($mod_group, $member_groups[$permission]['allowed'])) {
 						$member_groups[$permission]['allowed'][] = $mod_group;
 					}
 
 					// They're not denied, but the moderator group is, so deny it.
-					if (in_array(3, $member_groups[$permission]['denied']) && !in_array($mod_group, $member_groups[$permission]['denied']))
-					{
+					if (in_array(3, $member_groups[$permission]['denied']) && !in_array($mod_group, $member_groups[$permission]['denied'])) {
 						$member_groups[$permission]['denied'][] = $mod_group;
 					}
 				}
@@ -4289,20 +4191,21 @@ public static function groupsAllowedTo(array|string $permissions, ?int $board_id
 		}
 
 		// Finalize the data.
-		foreach ($permissions as $permission)
-		{
-			foreach (array('allowed', 'denied') as $k)
+		foreach ($permissions as $permission) {
+			foreach (['allowed', 'denied'] as $k) {
 				$member_groups[$permission][$k] = array_unique($member_groups[$permission][$k]);
+			}
 
 			// Maybe a mod needs to tweak the list of allowed groups on the fly?
-			IntegrationHook::call('integrate_groups_allowed_to', array(&$member_groups[$permission], $permission, $board_id));
+			IntegrationHook::call('integrate_groups_allowed_to', [&$member_groups[$permission], $permission, $board_id]);
 
 			// Denied is never allowed.
 			$member_groups[$permission]['allowed'] = array_diff($member_groups[$permission]['allowed'], $member_groups[$permission]['denied']);
 		}
 
-		if ($simple && count($member_groups) === 1)
+		if ($simple && count($member_groups) === 1) {
 			return reset($member_groups);
+		}
 
 		return $member_groups;
 	}
@@ -4327,17 +4230,15 @@ public static function groupsAllowedTo(array|string $permissions, ?int $board_id
 	 *    lists the groups that have the permission, and 'denied', which lists
 	 *    the groups that are denied the permission.
 	 */
-	public static function getGroupsWithPermissions(array $general_permissions = array(), array $board_permissions = array(), int $profile_id = 1)
+	public static function getGroupsWithPermissions(array $general_permissions = [], array $board_permissions = [], int $profile_id = 1)
 	{
-		$member_groups = array();
+		$member_groups = [];
 
-		if (!empty($general_permissions))
-		{
+		if (!empty($general_permissions)) {
 			$member_groups = self::groupsAllowedTo($general_permissions, null, false);
 		}
 
-		if (!empty($board_permissions))
-		{
+		if (!empty($board_permissions)) {
 			$member_groups = array_merge($member_groups, self::groupsAllowedTo($board_permissions, null, false, $profile_id));
 		}
 
@@ -4359,57 +4260,57 @@ public static function generateValidationCode(): string
 	 */
 	public static function logSpider(): void
 	{
-		if (empty(Config::$modSettings['spider_mode']) || empty($_SESSION['id_robot']))
+		if (empty(Config::$modSettings['spider_mode']) || empty($_SESSION['id_robot'])) {
 			return;
+		}
 
 		// Attempt to update today's entry.
-		if (Config::$modSettings['spider_mode'] == 1)
-		{
+		if (Config::$modSettings['spider_mode'] == 1) {
 			$date = Time::strftime('%Y-%m-%d', time());
-			Db::$db->query('', '
-				UPDATE {db_prefix}log_spider_stats
+			Db::$db->query(
+				'',
+				'UPDATE {db_prefix}log_spider_stats
 				SET last_seen = {int:current_time}, page_hits = page_hits + 1
 				WHERE id_spider = {int:current_spider}
 					AND stat_date = {date:current_date}',
-				array(
+				[
 					'current_date' => $date,
 					'current_time' => time(),
 					'current_spider' => $_SESSION['id_robot'],
-				)
+				],
 			);
 
 			// Nothing updated?
-			if (Db::$db->affected_rows() == 0)
-			{
-				Db::$db->insert('ignore',
+			if (Db::$db->affected_rows() == 0) {
+				Db::$db->insert(
+					'ignore',
 					'{db_prefix}log_spider_stats',
-					array(
+					[
 						'id_spider' => 'int', 'last_seen' => 'int', 'stat_date' => 'date', 'page_hits' => 'int',
-					),
-					array(
+					],
+					[
 						$_SESSION['id_robot'], time(), $date, 1,
-					),
-					array('id_spider', 'stat_date')
+					],
+					['id_spider', 'stat_date'],
 				);
 			}
 		}
 		// If we're tracking better stats than track, better stats - we sort out the today thing later.
-		else
-		{
-			if (Config::$modSettings['spider_mode'] > 2)
-			{
-				$url = $_GET + array('USER_AGENT' => $_SERVER['HTTP_USER_AGENT']);
+		else {
+			if (Config::$modSettings['spider_mode'] > 2) {
+				$url = $_GET + ['USER_AGENT' => $_SERVER['HTTP_USER_AGENT']];
 				unset($url['sesc'], $url[Utils::$context['session_var']]);
 				$url = Utils::jsonEncode($url);
-			}
-			else
+			} else {
 				$url = '';
+			}
 
-			Db::$db->insert('insert',
+			Db::$db->insert(
+				'insert',
 				'{db_prefix}log_spider_hits',
-				array('id_spider' => 'int', 'log_time' => 'int', 'url' => 'string'),
-				array($_SESSION['id_robot'], time(), $url),
-				array()
+				['id_spider' => 'int', 'log_time' => 'int', 'url' => 'string'],
+				[$_SESSION['id_robot'], time(), $url],
+				[],
 			);
 		}
 	}
@@ -4426,10 +4327,11 @@ public static function logSpider(): void
 	 *    'basic', 'minimal'. Leave null for a dynamically determined default.
 	 * @return array The IDs of the loaded members.
 	 */
-	public static function loadMemberData($users = array(), int $type = self::LOAD_BY_ID, string $dataset = null): array
+	public static function loadMemberData($users = [], int $type = self::LOAD_BY_ID, ?string $dataset = null): array
 	{
 		$loaded = self::load($users, $type, $dataset);
-		return array_map(fn($user) => $user->id, $loaded);
+
+		return array_map(fn ($user) => $user->id, $loaded);
 	}
 
 	/**
@@ -4467,12 +4369,14 @@ public static function loadMemberContext(int $id, bool $display_custom_fields =
 		// The old procedural version of this function returned false if asked
 		// to work on a guest. Since it is possible that old mods might rely on
 		// that behaviour, we replicate it here.
-		if (empty($id))
+		if (empty($id)) {
 			return false;
+		}
 
 		// If the user's data is not already loaded, load it now.
-		if (!isset(self::$loaded[$id]))
+		if (!isset(self::$loaded[$id])) {
 			self::load((array) $id, self::LOAD_BY_ID, 'profile');
+		}
 
 		return self::$loaded[$id]->format($display_custom_fields);
 	}
@@ -4520,7 +4424,7 @@ public static function banPermissions(): void
 	 * @param string $email The email address associated with the user that
 	 *    triggered this hit. If not set, use the current user's email address.
 	 */
-	public static function log_ban(array $ban_ids = array(), string $email = null): void
+	public static function log_ban(array $ban_ids = [], ?string $email = null): void
 	{
 		self::$me->logBan($ban_ids, $email);
 	}
@@ -4535,7 +4439,7 @@ public static function log_ban(array $ban_ids = array(), string $email = null):
 	 * @return string|null Returns 'session_verify_fail' if verification failed,
 	 *    or null if it passed.
 	 */
-	public static function sessionValidate(string $type = 'admin', bool $force = false): string|null
+	public static function sessionValidate(string $type = 'admin', bool $force = false): ?string
 	{
 		return self::$me->validateSession($type, $force);
 	}
@@ -4568,11 +4472,12 @@ public static function sessionCheck(string $type = 'post', string $from_action =
 	 *    instead of all the passed boards.
 	 * @return bool Whether the user has the specified permission.
 	 */
-	public static function hasPermission(string|array $permission, int|array $boards = null, bool $any = false): bool
+	public static function hasPermission(string|array $permission, int|array|null $boards = null, bool $any = false): bool
 	{
 		// You're never allowed to do something if your data hasn't been loaded yet!
-		if (!isset(self::$me))
+		if (!isset(self::$me)) {
 			return false;
+		}
 
 		return self::$me->allowedTo($permission, $boards, $any);
 	}
@@ -4590,11 +4495,12 @@ public static function hasPermission(string|array $permission, int|array $boards
 	 *    instead of all the passed boards.
 	 * @return bool Whether the user has the specified permission.
 	 */
-	public static function mustHavePermission(string|array $permission, int|array $boards = null, bool $any = false): bool
+	public static function mustHavePermission(string|array $permission, int|array|null $boards = null, bool $any = false): bool
 	{
 		// You're never allowed to do something if your data hasn't been loaded yet!
-		if (!isset(self::$me))
+		if (!isset(self::$me)) {
 			return false;
+		}
 
 		self::$me->isAllowedTo($permission, $boards, $any);
 
@@ -4616,11 +4522,12 @@ public static function mustHavePermission(string|array $permission, int|array $b
 	 * @return array An array of board IDs if $simple is true. Otherwise, an
 	 *    array containing 'permission' => array(id, id, id...) pairs.
 	 */
-	public static function hasPermissionInBoards(string|array $permission, int|array $boards = null, bool $any = false): array
+	public static function hasPermissionInBoards(string|array $permission, int|array|null $boards = null, bool $any = false): array
 	{
 		// You're never allowed to do something if your data hasn't been loaded yet!
-		if (!isset(self::$me))
+		if (!isset(self::$me)) {
 			return false;
+		}
 
 		return self::$me->boardsAllowedTo($permission, $boards, $any);
 	}
@@ -4641,14 +4548,12 @@ public static function hasPermissionInBoards(string|array $permission, int|array
 	 *       $dataset will be determined automatically based on what the user is
 	 *       doing on the forum.
 	 */
-	protected function __construct(int $id = null, string|null $dataset = null)
+	protected function __construct(?int $id = null, ?string $dataset = null)
 	{
 		// No ID given, so load current user.
-		if (!isset($id))
-		{
+		if (!isset($id)) {
 			// Only do this once.
-			if (!isset(self::$my_id))
-			{
+			if (!isset(self::$my_id)) {
 				// This is the special $me instance.
 				self::$me = $this;
 
@@ -4674,11 +4579,13 @@ protected function __construct(int $id = null, string|null $dataset = null)
 				self::$loaded[$this->id] = $this;
 
 				// If the user is a guest, initialize all the critical user settings.
-				if (empty($this->id))
+				if (empty($this->id)) {
 					$this->initializeGuest();
+				}
 				// Otherwise, update the user's last visit time.
-				else
+				else {
 					$this->setLastVisit();
+				}
 
 				// Fix up the timezone and time_offset values.
 				$this->fixTimezoneSetting();
@@ -4699,15 +4606,13 @@ protected function __construct(int $id = null, string|null $dataset = null)
 			}
 		}
 		// Reloading the current user requires special handling.
-		elseif (isset(self::$my_id) && $id == self::$my_id)
-		{
+		elseif (isset(self::$my_id) && $id == self::$my_id) {
 			// Copy over the existing data.
 			$this->set(get_object_vars(self::$me));
 
 			$dataset = $dataset ?? $this->chooseMyDataset();
 
-			if (self::$dataset_levels[self::$me->dataset] < self::$dataset_levels[$dataset])
-			{
+			if (self::$dataset_levels[self::$me->dataset] < self::$dataset_levels[$dataset]) {
 				self::loadUserData((array) $id, self::LOAD_BY_ID, $dataset);
 			}
 
@@ -4718,14 +4623,12 @@ protected function __construct(int $id = null, string|null $dataset = null)
 			self::setMe($id);
 		}
 		// Load the specified member.
-		else
-		{
+		else {
 			$this->id = $id;
 
 			self::$loaded[$id] = $this;
 
-			if (!isset(self::$profiles[$id]) || self::$dataset_levels[self::$profiles[$id]['dataset']] < self::$dataset_levels[$dataset ?? 'normal'])
-			{
+			if (!isset(self::$profiles[$id]) || self::$dataset_levels[self::$profiles[$id]['dataset']] < self::$dataset_levels[$dataset ?? 'normal']) {
 				self::loadUserData((array) $id, self::LOAD_BY_ID, $dataset ?? 'normal');
 			}
 
@@ -4789,7 +4692,7 @@ protected function setProperties(): void
 
 		// Presentation preferences.
 		$this->theme = $profile['id_theme'] ?? 0;
-		$this->options = $profile['options'] ?? array();
+		$this->options = $profile['options'] ?? [];
 		$this->smiley_set = $profile['smiley_set'] ?? '';
 
 		// Localization.
@@ -4799,8 +4702,8 @@ protected function setProperties(): void
 		$this->time_offset = $profile['time_offset'] ?? 0;
 
 		// Buddies and personal messages.
-		$this->buddies = !empty(Config::$modSettings['enable_buddylist']) && !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
-		$this->ignoreusers = !empty($profile['pm_ignore_list']) ? explode(',', $profile['pm_ignore_list']) : array();
+		$this->buddies = !empty(Config::$modSettings['enable_buddylist']) && !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : [];
+		$this->ignoreusers = !empty($profile['pm_ignore_list']) ? explode(',', $profile['pm_ignore_list']) : [];
 		$this->pm_receive_from = $profile['pm_receive_from'] ?? 0;
 		$this->pm_prefs = $profile['pm_prefs'] ?? 0;
 		$this->messages = $profile['instant_messages'] ?? 0;
@@ -4809,7 +4712,7 @@ protected function setProperties(): void
 
 		// What does the user want to see or know about?
 		$this->alerts = $profile['alerts'] ?? 0;
-		$this->ignoreboards = !empty($profile['ignore_boards']) && !empty(Config::$modSettings['allow_ignore_boards']) ? explode(',', $profile['ignore_boards']) : array();
+		$this->ignoreboards = !empty($profile['ignore_boards']) && !empty(Config::$modSettings['allow_ignore_boards']) ? explode(',', $profile['ignore_boards']) : [];
 
 		// Extended membergroup info.
 		$this->group_name = $profile['member_group'] ?? '';
@@ -4817,12 +4720,12 @@ protected function setProperties(): void
 		$this->post_group_name = $profile['post_group'] ?? '';
 		$this->group_color = $profile['member_group_color'] ?? '';
 		$this->post_group_color = $profile['post_group_color'] ?? '';
-		$this->icons = empty($profile['icons']) ? array('', '') : explode('#', $profile['icons']);
+		$this->icons = empty($profile['icons']) ? ['', ''] : explode('#', $profile['icons']);
 
 		// The avatar is a complicated thing, and historically had multiple
 		// representations in the code. This supports everything.
 		$this->avatar = array_merge(
-			array(
+			[
 				'original_url' => $profile['avatar_original'] ?? '',
 				'url' => $profile['avatar'] ?? '',
 				'filename' => $profile['filename'] ?? '',
@@ -4830,12 +4733,12 @@ protected function setProperties(): void
 				'id_attach' => $profile['id_attach'] ?? 0,
 				'width' => $profile['attachment_width'] ?? null,
 				'height' => $profile['attachment_height'] ?? null,
-			),
-			self::setAvatarData(array(
+			],
+			self::setAvatarData([
 				'avatar' => $profile['avatar'] ?? '',
 				'email' => $profile['email_address'] ?? '',
 				'filename' => $profile['filename'] ?? '',
-			)),
+			]),
 		);
 
 		// Info about stuff related to permissions.
@@ -4843,14 +4746,15 @@ protected function setProperties(): void
 		$this->warning = $profile['warning'] ?? 0;
 		$this->can_manage_boards = !empty($this->is_admin) || (!empty(Config::$modSettings['board_manager_groups']) && !empty($this->groups) && count(array_intersect($this->groups, explode(',', Config::$modSettings['board_manager_groups']))) > 0);
 
-		foreach (self::buildQueryBoard($this->id) as $key => $value)
+		foreach (self::buildQueryBoard($this->id) as $key => $value) {
 			$this->{$key} = $value;
+		}
 
 		// What dataset did we load for this user?
 		$this->dataset = $profile['dataset'];
 
 		// An easy way for mods to add or adjust properties.
-		IntegrationHook::call('integrate_user_properties', array($this));
+		IntegrationHook::call('integrate_user_properties', [$this]);
 	}
 
 	/**
@@ -4859,13 +4763,12 @@ protected function setProperties(): void
 	 */
 	protected function integrateVerifyUser(): void
 	{
-		if (count($integration_ids = IntegrationHook::call('integrate_verify_user')) === 0)
+		if (count($integration_ids = IntegrationHook::call('integrate_verify_user')) === 0) {
 			return;
+		}
 
-		foreach ($integration_ids as $integration_id)
-		{
-			if (intval($integration_id) > 0)
-			{
+		foreach ($integration_ids as $integration_id) {
+			if (intval($integration_id) > 0) {
 				self::$my_id = (int) $integration_id;
 				$this->already_verified = true;
 				break;
@@ -4884,35 +4787,34 @@ protected function integrateVerifyUser(): void
 	protected function setMyId(): void
 	{
 		// No need to check if this has already been set.
-		if (!empty(self::$my_id))
+		if (!empty(self::$my_id)) {
 			return;
+		}
 
-		if (isset($_COOKIE[Config::$cookiename]))
-		{
+		if (isset($_COOKIE[Config::$cookiename])) {
 			// First try 2.1 json-format cookie
 			$cookie_data = Utils::jsonDecode($_COOKIE[Config::$cookiename], true, false);
 
 			// Legacy format (for recent 2.0 --> 2.1 upgrades)
-			if (empty($cookie_data))
+			if (empty($cookie_data)) {
 				$cookie_data = Utils::safeUnserialize($_COOKIE[Config::$cookiename]);
+			}
 
 			list(self::$my_id, $this->passwd, $login_span, $cookie_domain, $cookie_path) = array_pad((array) $cookie_data, 5, '');
 
 			self::$my_id = !empty(self::$my_id) && strlen($this->passwd) > 0 ? (int) self::$my_id : 0;
 
 			// Make sure the cookie is set to the correct domain and path
-			if (array($cookie_domain, $cookie_path) !== Cookie::urlParts(!empty(Config::$modSettings['localCookies']), !empty(Config::$modSettings['globalCookies'])))
-			{
+			if ([$cookie_domain, $cookie_path] !== Cookie::urlParts(!empty(Config::$modSettings['localCookies']), !empty(Config::$modSettings['globalCookies']))) {
 				Cookie::setLoginCookie((int) $login_span - time(), self::$my_id);
 			}
-		}
-		elseif (isset($_SESSION['login_' . Config::$cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty(Config::$modSettings['disableCheckUA'])))
-		{
+		} elseif (isset($_SESSION['login_' . Config::$cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty(Config::$modSettings['disableCheckUA']))) {
 			// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
 			$cookie_data = Utils::jsonDecode($_SESSION['login_' . Config::$cookiename], true);
 
-			if (empty($cookie_data))
+			if (empty($cookie_data)) {
 				$cookie_data = Utils::safeUnserialize($_SESSION['login_' . Config::$cookiename]);
+			}
 
 			list(self::$my_id, $this->passwd, $login_span) = array_pad((array) $cookie_data, 3, '');
 
@@ -4928,28 +4830,23 @@ protected function setMyId(): void
 	protected function chooseMyDataset(): string
 	{
 		// Board index, message index, or topic.
-		if (!isset($_REQUEST['action']))
-		{
+		if (!isset($_REQUEST['action'])) {
 			$dataset = 'normal';
 		}
 		// Popups, AJAX, etc.
-		elseif (QueryString::isFilteredRequest(Forum::$unlogged_actions, 'action'))
-		{
+		elseif (QueryString::isFilteredRequest(Forum::$unlogged_actions, 'action')) {
 			$dataset = 'basic';
 		}
 		// Profile and personal messages (except the popups)
-		elseif (in_array($_REQUEST['action'], array('profile', 'pm')))
-		{
+		elseif (in_array($_REQUEST['action'], ['profile', 'pm'])) {
 			$dataset = 'profile';
 		}
 		// Who's Online
-		elseif (in_array($_REQUEST['action'], array('who')))
-		{
+		elseif (in_array($_REQUEST['action'], ['who'])) {
 			$dataset = 'normal';
 		}
 		// Everything else.
-		else
-		{
+		else {
 			$dataset = 'basic';
 		}
 
@@ -4964,43 +4861,36 @@ protected function chooseMyDataset(): string
 	 */
 	protected function verifyPassword(): void
 	{
-		if (empty(self::$my_id))
+		if (empty(self::$my_id)) {
 			return;
+		}
 
 		// Did we find 'im?  If not, junk it.
-		if (!empty(self::$profiles[self::$my_id]))
-		{
+		if (!empty(self::$profiles[self::$my_id])) {
 			// As much as the password should be right, we can assume the integration set things up.
-			if (!empty($this->already_verified) && $this->already_verified === true)
-			{
+			if (!empty($this->already_verified) && $this->already_verified === true) {
 				$check = true;
 			}
 			// SHA-512 hash should be 128 characters long.
-			elseif (strlen($this->passwd) == 128)
-			{
+			elseif (strlen($this->passwd) == 128) {
 				$check = hash_equals(Cookie::encrypt(self::$profiles[self::$my_id]['passwd'], self::$profiles[self::$my_id]['password_salt']), $this->passwd);
-			}
-			else
-			{
+			} else {
 				$check = false;
 			}
 
 			// Wrong password or not activated - either way, you're going nowhere.
 			self::$my_id = $check && (self::$profiles[self::$my_id]['is_activated'] == 1 || self::$profiles[self::$my_id]['is_activated'] == 11) ? (int) self::$profiles[self::$my_id]['id_member'] : 0;
-		}
-		else
-		{
+		} else {
 			self::$my_id = 0;
 		}
 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
-		if (empty(self::$my_id))
-		{
+		if (empty(self::$my_id)) {
 			Login2::validatePasswordFlood(
 				!empty(self::$profiles[self::$my_id]['id_member']) ? self::$profiles[self::$my_id]['id_member'] : self::$my_id,
 				!empty(self::$profiles[self::$my_id]['member_name']) ? self::$profiles[self::$my_id]['member_name'] : '',
 				!empty(self::$profiles[self::$my_id]['passwd_flood']) ? self::$profiles[self::$my_id]['passwd_flood'] : false,
-				self::$my_id != 0
+				self::$my_id != 0,
 			);
 		}
 	}
@@ -5010,89 +4900,80 @@ protected function verifyPassword(): void
 	 */
 	protected function verifyTfa(): void
 	{
-		if (empty(self::$my_id) || empty(Config::$modSettings['tfa_mode']))
+		if (empty(self::$my_id) || empty(Config::$modSettings['tfa_mode'])) {
 			return;
+		}
 
 		// Check if we are forcing TFA
 		$force_tfasetup = Config::$modSettings['tfa_mode'] >= 2 && empty(self::$profiles[self::$my_id]['tfa_secret']) && SMF != 'SSI' && !isset($_REQUEST['xml']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != '.xml');
 
 		// Don't force TFA on popups
-		if ($force_tfasetup)
-		{
-			if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'profile' && isset($_REQUEST['area']) && in_array($_REQUEST['area'], array('popup', 'alerts_popup')))
-			{
+		if ($force_tfasetup) {
+			if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'profile' && isset($_REQUEST['area']) && in_array($_REQUEST['area'], ['popup', 'alerts_popup'])) {
 				$force_tfasetup = false;
-			}
-			elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'pm' && (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'popup'))
-			{
+			} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'pm' && (isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'popup')) {
 				$force_tfasetup = false;
 			}
 
-			IntegrationHook::call('integrate_force_tfasetup', array(&$force_tfasetup));
+			IntegrationHook::call('integrate_force_tfasetup', [&$force_tfasetup]);
 		}
 
 		// Validate for Two Factor Authentication
-		if (!empty(self::$profiles[self::$my_id]['tfa_secret']) && (empty($_REQUEST['action']) || !in_array($_REQUEST['action'], array('login2', 'logintfa'))))
-		{
+		if (!empty(self::$profiles[self::$my_id]['tfa_secret']) && (empty($_REQUEST['action']) || !in_array($_REQUEST['action'], ['login2', 'logintfa']))) {
 			$tfacookie = Config::$cookiename . '_tfa';
 			$tfasecret = null;
 
-			$verified = IntegrationHook::call('integrate_verify_tfa', array(self::$my_id, self::$profiles[self::$my_id]));
+			$verified = IntegrationHook::call('integrate_verify_tfa', [self::$my_id, self::$profiles[self::$my_id]]);
 
-			if (empty($verified) || !in_array(true, $verified))
-			{
-				if (!empty($_COOKIE[$tfacookie]))
-				{
+			if (empty($verified) || !in_array(true, $verified)) {
+				if (!empty($_COOKIE[$tfacookie])) {
 					$tfa_data = Utils::jsonDecode($_COOKIE[$tfacookie], true);
 
 					list($tfamember, $tfasecret) = array_pad((array) $tfa_data, 2, '');
 
-					if (!isset($tfamember, $tfasecret) || (int) $tfamember != self::$my_id)
+					if (!isset($tfamember, $tfasecret) || (int) $tfamember != self::$my_id) {
 						$tfasecret = null;
+					}
 				}
 
 				// They didn't finish logging in before coming here? Then they're no one to us.
-				if (empty($tfasecret) || !hash_equals(Cookie::encrypt(self::$profiles[self::$my_id]['tfa_backup'], self::$profiles[self::$my_id]['password_salt']), $tfasecret))
-				{
+				if (empty($tfasecret) || !hash_equals(Cookie::encrypt(self::$profiles[self::$my_id]['tfa_backup'], self::$profiles[self::$my_id]['password_salt']), $tfasecret)) {
 					Cookie::setLoginCookie(-3600, self::$my_id);
-					self::$profiles[self::$my_id] = array();
+					self::$profiles[self::$my_id] = [];
 					self::$my_id = 0;
 				}
 			}
 		}
 		// When authenticating their two factor code, make sure to reset their ID for security
-		elseif (!empty(self::$profiles[self::$my_id]['tfa_secret']) && $_REQUEST['action'] == 'logintfa')
-		{
+		elseif (!empty(self::$profiles[self::$my_id]['tfa_secret']) && $_REQUEST['action'] == 'logintfa') {
 			Utils::$context['tfa_member'] = self::$profiles[self::$my_id];
-			self::$profiles[self::$my_id] = array();
+			self::$profiles[self::$my_id] = [];
 			self::$my_id = 0;
 		}
 		// Are we forcing 2FA? Need to check if the user groups actually require 2FA
-		elseif ($force_tfasetup)
-		{
+		elseif ($force_tfasetup) {
 			// Only do this if we are just forcing SOME membergroups
-			if (Config::$modSettings['tfa_mode'] == 2)
-			{
-				//Build an array of ALL user membergroups.
+			if (Config::$modSettings['tfa_mode'] == 2) {
+				// Build an array of ALL user membergroups.
 				$this->setGroups();
 
-				//Find out if any group requires 2FA
-				$request = Db::$db->query('', '
-					SELECT COUNT(id_group) AS total
+				// Find out if any group requires 2FA
+				$request = Db::$db->query(
+					'',
+					'SELECT COUNT(id_group) AS total
 					FROM {db_prefix}membergroups
 					WHERE tfa_required = {int:tfa_required}
 						AND id_group IN ({array_int:full_groups})',
-					array(
+					[
 						'tfa_required' => 1,
 						'full_groups' => $this->groups,
-					)
+					],
 				);
 				$row = Db::$db->fetch_assoc($request);
 				Db::$db->free_result($request);
 			}
 			// Simplifies logic in the next "if"
-			else
-			{
+			else {
 				$row['total'] = 1;
 			}
 
@@ -5102,14 +4983,13 @@ protected function verifyTfa(): void
 			if (
 				$row['total'] > 0
 				&& (
-					!in_array($action, array('profile', 'logout'))
+					!in_array($action, ['profile', 'logout'])
 					|| (
 						$action == 'profile'
 						&& $area != 'tfasetup'
 					)
 				)
-			)
-			{
+			) {
 				Utils::redirectexit('action=profile;area=tfasetup;forced');
 			}
 		}
@@ -5132,25 +5012,25 @@ protected function setLastVisit(): void
 			&& !isset($_REQUEST['xml'])
 			&& (
 				!isset($_REQUEST['action'])
-				|| !in_array($_REQUEST['action'], array('.xml', 'login2', 'logintfa'))
+				|| !in_array($_REQUEST['action'], ['.xml', 'login2', 'logintfa'])
 			)
 			&& empty($_SESSION['id_msg_last_visit'])
 			&& (
 				empty(CacheApi::$enable)
 				|| ($_SESSION['id_msg_last_visit'] = CacheApi::get('user_last_visit-' . self::$my_id, 5 * 3600)) === null
 			)
-		)
-		{
+		) {
 			// @todo can this be cached?
 			// Do a quick query to make sure this isn't a mistake.
-			$result = Db::$db->query('', '
-				SELECT poster_time
+			$result = Db::$db->query(
+				'',
+				'SELECT poster_time
 				FROM {db_prefix}messages
 				WHERE id_msg = {int:id_msg}
 				LIMIT 1',
-				array(
+				[
 					'id_msg' => self::$profiles[self::$my_id]['id_msg_last_visit'],
-				)
+				],
 			);
 			list($visitTime) = Db::$db->fetch_row($result);
 			Db::$db->free_result($result);
@@ -5158,25 +5038,20 @@ protected function setLastVisit(): void
 			$_SESSION['id_msg_last_visit'] = self::$profiles[self::$my_id]['id_msg_last_visit'];
 
 			// If it was *at least* five hours ago...
-			if ($visitTime < time() - 5 * 3600)
-			{
-				self::updateMemberData(self::$my_id, array('id_msg_last_visit' => (int) Config::$modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']));
+			if ($visitTime < time() - 5 * 3600) {
+				self::updateMemberData(self::$my_id, ['id_msg_last_visit' => (int) Config::$modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']]);
 
 				self::$profiles[self::$my_id]['last_login'] = time();
 
-				if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2)
-				{
+				if (!empty(CacheApi::$enable) && CacheApi::$enable >= 2) {
 					CacheApi::put('user_settings-' . self::$my_id, self::$profiles[self::$my_id], 60);
 				}
 
-				if (!empty(CacheApi::$enable))
-				{
+				if (!empty(CacheApi::$enable)) {
 					CacheApi::put('user_last_visit-' . self::$my_id, $_SESSION['id_msg_last_visit'], 5 * 3600);
 				}
 			}
-		}
-		elseif (empty($_SESSION['id_msg_last_visit']))
-		{
+		} elseif (empty($_SESSION['id_msg_last_visit'])) {
 			$_SESSION['id_msg_last_visit'] = self::$profiles[self::$my_id]['id_msg_last_visit'];
 		}
 	}
@@ -5187,34 +5062,30 @@ protected function setLastVisit(): void
 	protected function initializeGuest(): void
 	{
 		// This is what a guest's variables should be.
-		self::$profiles[0] = array(
+		self::$profiles[0] = [
 			'dataset' => 'basic',
-		);
+		];
 
-		if (isset($_COOKIE[Config::$cookiename]) && empty(Utils::$context['tfa_member']))
+		if (isset($_COOKIE[Config::$cookiename]) && empty(Utils::$context['tfa_member'])) {
 			$_COOKIE[Config::$cookiename] = '';
+		}
 
 		// Expire the 2FA cookie
-		if (isset($_COOKIE[Config::$cookiename . '_tfa']) && empty(Utils::$context['tfa_member']))
-		{
+		if (isset($_COOKIE[Config::$cookiename . '_tfa']) && empty(Utils::$context['tfa_member'])) {
 			$tfa_data = Utils::jsonDecode($_COOKIE[Config::$cookiename . '_tfa'], true);
 
-			list(,, $exp) = array_pad((array) $tfa_data, 3, 0);
+			list(, , $exp) = array_pad((array) $tfa_data, 3, 0);
 
-			if (time() > $exp)
-			{
+			if (time() > $exp) {
 				$_COOKIE[Config::$cookiename . '_tfa'] = '';
 				Cookie::setTFACookie(-3600, 0, '');
 			}
 		}
 
 		// Create a login token if it doesn't exist yet.
-		if (!isset($_SESSION['token']['post-login']))
-		{
+		if (!isset($_SESSION['token']['post-login'])) {
 			SecurityToken::create('login');
-		}
-		else
-		{
+		} else {
 			Utils::$context['login_token_var'] = $_SESSION['token']['post-login']->var;
 			Utils::$context['login_token'] = $_SESSION['token']['post-login']->val;
 		}
@@ -5225,11 +5096,9 @@ protected function initializeGuest(): void
 	 */
 	protected function fixTimezoneSetting(): void
 	{
-		if (!empty($this->id))
-		{
+		if (!empty($this->id)) {
 			// Figure out the new time offset.
-			if (!empty(self::$profiles[$this->id]['timezone']))
-			{
+			if (!empty(self::$profiles[$this->id]['timezone'])) {
 				// Get the offsets from UTC for the server, then for the user.
 				$tz_system = new \DateTimeZone(Config::$modSettings['default_timezone']);
 				$tz_user = new \DateTimeZone(self::$profiles[$this->id]['timezone']);
@@ -5238,26 +5107,22 @@ protected function fixTimezoneSetting(): void
 				self::$profiles[$this->id]['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
 			}
 			// We need a time zone.
-			else
-			{
-				if (!empty(self::$profiles[$this->id]['time_offset']))
-				{
+			else {
+				if (!empty(self::$profiles[$this->id]['time_offset'])) {
 					$tz_system = new \DateTimeZone(Config::$modSettings['default_timezone']);
 					$time_system = new \DateTime('now', $tz_system);
 
 					self::$profiles[$this->id]['timezone'] = @timezone_name_from_abbr('', $tz_system->getOffset($time_system) + self::$profiles[$this->id]['time_offset'] * 3600, (int) $time_system->format('I'));
 				}
 
-				if (empty(self::$profiles[$this->id]['timezone']))
-				{
+				if (empty(self::$profiles[$this->id]['timezone'])) {
 					self::$profiles[$this->id]['timezone'] = Config::$modSettings['default_timezone'];
 					self::$profiles[$this->id]['time_offset'] = 0;
 				}
 			}
 		}
 		// Guests use the forum default.
-		else
-		{
+		else {
 			self::$profiles[$this->id]['timezone'] = Config::$modSettings['default_timezone'];
 			self::$profiles[$this->id]['time_offset'] = 0;
 		}
@@ -5268,20 +5133,18 @@ protected function fixTimezoneSetting(): void
 	 */
 	protected function setGroups(): void
 	{
-		if (!empty($this->id))
-		{
+		if (!empty($this->id)) {
 			$this->group_id = (int) self::$profiles[$this->id]['id_group'];
 			$this->post_group_id = (int) self::$profiles[$this->id]['id_post_group'];
 			$this->additional_groups = array_map('intval', array_filter(explode(',', self::$profiles[$this->id]['additional_groups'])));
-			$this->groups = array_merge(array($this->group_id, $this->post_group_id), $this->additional_groups);
+			$this->groups = array_merge([$this->group_id, $this->post_group_id], $this->additional_groups);
 		}
 		// Guests are only part of the guest group.
-		else
-		{
+		else {
 			$this->group_id = -1;
 			$this->post_group_id = -1;
-			$this->additional_groups = array();
-			$this->groups = array(-1);
+			$this->additional_groups = [];
+			$this->groups = [-1];
 		}
 	}
 
@@ -5291,35 +5154,33 @@ protected function setGroups(): void
 	protected function setPossiblyRobot(): void
 	{
 		// This is a logged in user, so definitely not a spider.
-		if (!empty($this->id))
-		{
+		if (!empty($this->id)) {
 			$this->possibly_robot = false;
 		}
 		// A guest, so check further...
-		else
-		{
+		else {
 			// Check every five minutes just in case...
-			if ((!empty(Config::$modSettings['spider_mode']) || !empty(Config::$modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
-			{
-				if (isset($_SESSION['id_robot']))
+			if ((!empty(Config::$modSettings['spider_mode']) || !empty(Config::$modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300)) {
+				if (isset($_SESSION['id_robot'])) {
 					unset($_SESSION['id_robot']);
+				}
 
 				$_SESSION['robot_check'] = time();
 
 				// We cache the spider data for ten minutes if we can.
-				if (($spider_data = CacheApi::get('spider_search', 600)) === null)
-				{
-					$spider_data = array();
+				if (($spider_data = CacheApi::get('spider_search', 600)) === null) {
+					$spider_data = [];
 
-					$request = Db::$db->query('', '
-						SELECT id_spider, user_agent, ip_info
+					$request = Db::$db->query(
+						'',
+						'SELECT id_spider, user_agent, ip_info
 						FROM {db_prefix}spiders
 						ORDER BY LENGTH(user_agent) DESC',
-						array(
-						)
+						[
+						],
 					);
-					while ($row = Db::$db->fetch_assoc($request))
-					{
+
+					while ($row = Db::$db->fetch_assoc($request)) {
 						$spider_data[] = $row;
 					}
 					Db::$db->free_result($request);
@@ -5327,66 +5188,55 @@ protected function setPossiblyRobot(): void
 					CacheApi::put('spider_search', $spider_data, 600);
 				}
 
-				if (empty($spider_data))
-				{
+				if (empty($spider_data)) {
 					$this->possibly_robot = false;
-				}
-				else
-				{
+				} else {
 					// Only do these bits once.
 					$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
 
-					foreach ($spider_data as $spider)
-					{
+					foreach ($spider_data as $spider) {
 						// User agent is easy.
-						if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false)
-						{
+						if (!empty($spider['user_agent']) && strpos($ci_user_agent, strtolower($spider['user_agent'])) !== false) {
 							$_SESSION['id_robot'] = $spider['id_spider'];
 						}
 						// IP stuff is harder.
-						elseif ($_SERVER['REMOTE_ADDR'])
-						{
+						elseif ($_SERVER['REMOTE_ADDR']) {
 							$ips = explode(',', $spider['ip_info']);
 
-							foreach ($ips as $ip)
-							{
-								if ($ip === '')
+							foreach ($ips as $ip) {
+								if ($ip === '') {
 									continue;
+								}
 
 								$ip_range = IP::ip2range($ip);
 
 								$remote_ip = new IP($_SERVER['REMOTE_ADDR']);
 
-								if (!empty($ip_range))
-								{
-									if ($ip_range['low']->toBinary() <= $remote_ip->toBinary() && $ip_range['high']->toBinary() >= $remote_ip->toBinary())
-									{
+								if (!empty($ip_range)) {
+									if ($ip_range['low']->toBinary() <= $remote_ip->toBinary() && $ip_range['high']->toBinary() >= $remote_ip->toBinary()) {
 										$_SESSION['id_robot'] = $spider['id_spider'];
 									}
 								}
 							}
 						}
 
-						if (isset($_SESSION['id_robot']))
+						if (isset($_SESSION['id_robot'])) {
 							break;
+						}
 					}
 
 					// If this is low server tracking then log the spider here as opposed to the main logging function.
-					if (!empty(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot']))
-					{
+					if (!empty(Config::$modSettings['spider_mode']) && Config::$modSettings['spider_mode'] == 1 && !empty($_SESSION['id_robot'])) {
 						self::logSpider();
 					}
 
 					$this->possibly_robot = !empty($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 				}
-			}
-			elseif (!empty(Config::$modSettings['spider_mode']))
-			{
+			} elseif (!empty(Config::$modSettings['spider_mode'])) {
 				$this->possibly_robot = $_SESSION['id_robot'] ?? 0;
 			}
 			// If we haven't turned on proper spider hunts then have a guess!
-			else
-			{
+			else {
 				$ci_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
 
 				$this->possibly_robot = (strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla') === false && strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') === false) || strpos($ci_user_agent, 'googlebot') !== false || strpos($ci_user_agent, 'slurp') !== false || strpos($ci_user_agent, 'crawl') !== false || strpos($ci_user_agent, 'bingbot') !== false || strpos($ci_user_agent, 'bingpreview') !== false || strpos($ci_user_agent, 'adidxbot') !== false || strpos($ci_user_agent, 'msnbot') !== false;
@@ -5402,9 +5252,9 @@ protected function setPossiblyRobot(): void
 	protected function setLanguage(): void
 	{
 		// Is everyone forced to use the default language?
-		if (empty(Config::$modSettings['userLanguage']))
-		{
+		if (empty(Config::$modSettings['userLanguage'])) {
 			$this->language = Config::$language;
+
 			return;
 		}
 
@@ -5415,27 +5265,23 @@ protected function setLanguage(): void
 		$languages = Lang::get();
 
 		// Change was requested in URL parameters.
-		if (!empty($_GET['language']) && isset($languages[strtr($_GET['language'], './\\:', '____')]))
-		{
+		if (!empty($_GET['language']) && isset($languages[strtr($_GET['language'], './\\:', '____')])) {
 			$this->language = strtr($_GET['language'], './\\:', '____');
 
 			// Make it permanent for members.
-			if (!empty($this->id))
-			{
-				self::updateMemberData($this->id, array('lngfile' => $this->language));
-			}
-			else
-			{
+			if (!empty($this->id)) {
+				self::updateMemberData($this->id, ['lngfile' => $this->language]);
+			} else {
 				$_SESSION['language'] = $this->language;
 			}
 
 			// Reload same URL with new language, if applicable.
-			if (isset($_SESSION['old_url']))
+			if (isset($_SESSION['old_url'])) {
 				Utils::redirectexit($_SESSION['old_url']);
+			}
 		}
 		// Carry forward the last language request in this session, if any.
-		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
-		{
+		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')])) {
 			$this->language = strtr($_SESSION['language'], './\\:', '____');
 		}
 	}
@@ -5458,40 +5304,40 @@ protected function setLanguage(): void
 	protected static function loadUserData(array $users, int $type = self::LOAD_BY_ID, string $dataset = 'normal'): array
 	{
 		// Keep track of which IDs we load during this run.
-		$loaded_ids = array();
+		$loaded_ids = [];
 
 		// If $users is supposed to contain ID numbers, accept only integers.
-		if ($type === self::LOAD_BY_ID)
+		if ($type === self::LOAD_BY_ID) {
 			$users = array_map('intval', $users);
+		}
 
 		// Avoid duplication.
 		$users = array_unique($users);
 
 		// For guests, there is no data to load, so just fake it.
-		if (in_array(0, $users))
-		{
-			self::$profiles[0] = array('dataset' => $dataset);
+		if (in_array(0, $users)) {
+			self::$profiles[0] = ['dataset' => $dataset];
 			$loaded_ids[] = 0;
 			$users = array_filter($users);
 		}
 
 		// If there is no one to load, bail out now.
-		if (empty($users))
+		if (empty($users)) {
 			return $loaded_ids;
+		}
 
 		// Is the member data already loaded?
-		if ($type === self::LOAD_BY_ID)
-		{
-			foreach ($users as $key => $id)
-			{
-				if (!isset(self::$profiles[$id]))
+		if ($type === self::LOAD_BY_ID) {
+			foreach ($users as $key => $id) {
+				if (!isset(self::$profiles[$id])) {
 					continue;
+				}
 
-				if (!isset(self::$profiles[$id]['dataset']))
+				if (!isset(self::$profiles[$id]['dataset'])) {
 					continue;
+				}
 
-				if (self::$dataset_levels[self::$profiles[$id]['dataset']] >= self::$dataset_levels[$dataset])
-				{
+				if (self::$dataset_levels[self::$profiles[$id]['dataset']] >= self::$dataset_levels[$dataset]) {
 					$loaded_ids[] = $id;
 					unset($users[$key]);
 				}
@@ -5499,30 +5345,28 @@ protected static function loadUserData(array $users, int $type = self::LOAD_BY_I
 		}
 
 		// Is the member data cached?
-		if ($type === self::LOAD_BY_ID && !empty(CacheApi::$enable))
-		{
-			foreach ($users as $key => $id)
-			{
-				if ($id === (self::$my_id ?? NAN))
-				{
-					if (CacheApi::$enable < 2)
+		if ($type === self::LOAD_BY_ID && !empty(CacheApi::$enable)) {
+			foreach ($users as $key => $id) {
+				if ($id === (self::$my_id ?? NAN)) {
+					if (CacheApi::$enable < 2) {
 						continue;
+					}
 
-					if (($data = CacheApi::get('user_settings-' . $id, 60) == null))
+					if (($data = CacheApi::get('user_settings-' . $id, 60) == null)) {
 						continue;
-				}
-				else
-				{
-					if (CacheApi::$enable < 3)
+					}
+				} else {
+					if (CacheApi::$enable < 3) {
 						continue;
+					}
 
-					if (($data = CacheApi::get('member_data-' . $dataset . '-' . $id, 240)) == null)
+					if (($data = CacheApi::get('member_data-' . $dataset . '-' . $id, 240)) == null) {
 						continue;
+					}
 				}
 
 				// Does the cached data have everything we need?
-				if (self::$dataset_levels[$data['dataset']] >= self::$dataset_levels[$dataset])
-				{
+				if (self::$dataset_levels[$data['dataset']] >= self::$dataset_levels[$dataset]) {
 					self::$profiles[$id] = $data;
 					$loaded_ids[] = $id;
 					unset($users[$key]);
@@ -5531,13 +5375,11 @@ protected static function loadUserData(array $users, int $type = self::LOAD_BY_I
 		}
 
 		// Look up any un-cached member data.
-		if (!empty($users))
-		{
-			$select_columns = array('mem.*');
-			$select_tables = array('{db_prefix}members AS mem');
+		if (!empty($users)) {
+			$select_columns = ['mem.*'];
+			$select_tables = ['{db_prefix}members AS mem'];
 
-			switch ($dataset)
-			{
+			switch ($dataset) {
 				case 'profile':
 					$select_columns[] = 'lo.url';
 					// no break
@@ -5570,24 +5412,21 @@ protected static function loadUserData(array $users, int $type = self::LOAD_BY_I
 					break;
 			}
 
-			switch ($type)
-			{
+			switch ($type) {
 				case self::LOAD_BY_EMAIL:
 					$where = 'mem.email_address' . (count($users) > 1 ? ' IN ({array_string:users})' : ' = {string:users}');
 					break;
 
 				case self::LOAD_BY_NAME:
-					if (Db::$db->case_sensitive)
-					{
+					if (Db::$db->case_sensitive) {
 						$where = 'LOWER(mem.member_name)';
 						$users = array_map('strtolower', $users);
-					}
-					else
-					{
+					} else {
 						$where = 'mem.member_name';
 					}
 
 					$where .= count($users) > 1 ? ' IN ({array_string:users})' : ' = {string:users}';
+
 					break;
 
 				default:
@@ -5596,29 +5435,31 @@ protected static function loadUserData(array $users, int $type = self::LOAD_BY_I
 			}
 
 			// Allow mods to easily add to the selected member data
-			IntegrationHook::call('integrate_load_member_data', array(&$select_columns, &$select_tables, &$dataset));
+			IntegrationHook::call('integrate_load_member_data', [&$select_columns, &$select_tables, &$dataset]);
 
 			// Load the members' data.
-			$request = Db::$db->query('', '
-				SELECT ' . implode(",\n\t\t\t\t\t", $select_columns) . '
+			$request = Db::$db->query(
+				'',
+				'SELECT ' . implode(",\n\t\t\t\t\t", $select_columns) . '
 				FROM ' . implode("\n\t\t\t\t\t", $select_tables) . '
 				WHERE ' . $where . (count($users) > 1 ? '' : '
 				LIMIT 1'),
-				array(
+				[
 					'blank_string' => '',
 					'users' => count($users) > 1 ? $users : reset($users),
-				)
+				],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$row['id_member'] = (int) $row['id_member'];
 
 				// If the image proxy is enabled, we still want the original URL when they're editing the profile...
 				$row['avatar_original'] = $row['avatar'] ?? '';
 
 				// Take care of proxying the avatar if required.
-				if (!empty($row['avatar']))
+				if (!empty($row['avatar'])) {
 					$row['avatar'] = Url::create($row['avatar'])->proxied();
+				}
 
 				// Keep track of the member's normal member group.
 				$row['primary_group'] = $row['member_group'] ?? '';
@@ -5631,58 +5472,60 @@ protected static function loadUserData(array $users, int $type = self::LOAD_BY_I
 				$row['ignore_boards'] = rtrim($row['ignore_boards'], ',');
 
 				// Unpack the IP addresses.
-				if (isset($row['member_ip']))
+				if (isset($row['member_ip'])) {
 					$row['member_ip'] = new IP($row['member_ip']);
+				}
 
-				if (isset($row['member_ip2']))
+				if (isset($row['member_ip2'])) {
 					$row['member_ip2'] = new IP($row['member_ip2']);
+				}
 
 				$row['is_online'] = $row['is_online'] ?? $row['id_member'] === (self::$my_id ?? NAN);
 
 				// Declare this for now. We'll fill it in later.
-				$row['options'] = array();
+				$row['options'] = [];
 
 				// Save it.
-				if (!isset(self::$profiles[$row['id_member']]))
-					self::$profiles[$row['id_member']] = array();
+				if (!isset(self::$profiles[$row['id_member']])) {
+					self::$profiles[$row['id_member']] = [];
+				}
 
 				// Use array_merge here to avoid data loss if we somehow call
 				// this twice for the same member but with different datasets.
 				self::$profiles[$row['id_member']] = array_merge(self::$profiles[$row['id_member']], $row);
 
 				// If this is the current user's data, alias it to User::$settings.
-				if ($row['id_member'] === (self::$my_id ?? NAN))
+				if ($row['id_member'] === (self::$my_id ?? NAN)) {
 					self::$settings = &self::$profiles[$row['id_member']];
+				}
 
 				$loaded_ids[] = $row['id_member'];
 			}
 			Db::$db->free_result($request);
 
-			if (!empty($loaded_ids) && $dataset !== 'minimal')
+			if (!empty($loaded_ids) && $dataset !== 'minimal') {
 				self::loadOptions($loaded_ids);
+			}
 
 			// This hook's name is due to historical reasons.
-			IntegrationHook::call('integrate_load_min_user_settings', array(&self::$profiles));
-
-			if ($type === self::LOAD_BY_ID && !empty(CacheApi::$enable))
-			{
-				foreach ($users as $id)
-				{
-					if ($id === (self::$my_id ?? NAN))
-					{
-						if (CacheApi::$enable >= 2)
+			IntegrationHook::call('integrate_load_min_user_settings', [&self::$profiles]);
+
+			if ($type === self::LOAD_BY_ID && !empty(CacheApi::$enable)) {
+				foreach ($users as $id) {
+					if ($id === (self::$my_id ?? NAN)) {
+						if (CacheApi::$enable >= 2) {
 							CacheApi::put('user_settings-' . $id, self::$profiles[$id], 60);
-					}
-					elseif (CacheApi::$enable >= 3)
-					{
+						}
+					} elseif (CacheApi::$enable >= 3) {
 						CacheApi::put('member_data-' . $dataset . '-' . $id, self::$profiles[$id], 240);
 					}
 				}
 			}
 		}
 
-		foreach ($loaded_ids as $id)
+		foreach ($loaded_ids as $id) {
 			self::$profiles[$id]['dataset'] = $dataset;
+		}
 
 		return $loaded_ids;
 	}
@@ -5696,16 +5539,17 @@ protected static function loadOptions(array|int $ids): void
 	{
 		$ids = (array) $ids;
 
-		$request = Db::$db->query('', '
-			SELECT id_member, id_theme, variable, value
+		$request = Db::$db->query(
+			'',
+			'SELECT id_member, id_theme, variable, value
 			FROM {db_prefix}themes
 			WHERE id_member IN ({array_int:ids})',
-			array(
+			[
 				'ids' => $ids,
-			)
+			],
 		);
-		while ($row = Db::$db->fetch_assoc($request))
-		{
+
+		while ($row = Db::$db->fetch_assoc($request)) {
 			self::$profiles[$row['id_member']]['options'][$row['variable']] = $row['value'];
 		}
 		Db::$db->free_result($request);
@@ -5727,25 +5571,21 @@ protected static function getGravatarUrl(string $email_address): string
 	{
 		static $url_params = null;
 
-		if ($url_params === null)
-		{
-			$ratings = array('G', 'PG', 'R', 'X');
-			$defaults = array('mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank');
+		if ($url_params === null) {
+			$ratings = ['G', 'PG', 'R', 'X'];
+			$defaults = ['mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'];
 
-			$url_params = array();
+			$url_params = [];
 
-			if (!empty(Config::$modSettings['gravatarMaxRating']) && in_array(Config::$modSettings['gravatarMaxRating'], $ratings))
-			{
+			if (!empty(Config::$modSettings['gravatarMaxRating']) && in_array(Config::$modSettings['gravatarMaxRating'], $ratings)) {
 				$url_params[] = 'rating=' . Config::$modSettings['gravatarMaxRating'];
 			}
 
-			if (!empty(Config::$modSettings['gravatarDefault']) && in_array(Config::$modSettings['gravatarDefault'], $defaults))
-			{
+			if (!empty(Config::$modSettings['gravatarDefault']) && in_array(Config::$modSettings['gravatarDefault'], $defaults)) {
 				$url_params[] = 'default=' . Config::$modSettings['gravatarDefault'];
 			}
 
-			if (!empty(Config::$modSettings['avatar_max_width_external']))
-			{
+			if (!empty(Config::$modSettings['avatar_max_width_external'])) {
 				$size_string = (int) Config::$modSettings['avatar_max_width_external'];
 			}
 
@@ -5753,13 +5593,13 @@ protected static function getGravatarUrl(string $email_address): string
 				!empty(Config::$modSettings['avatar_max_height_external'])
 				&& !empty($size_string)
 				&& (int) Config::$modSettings['avatar_max_height_external'] < $size_string
-			)
-			{
-					$size_string = Config::$modSettings['avatar_max_height_external'];
+			) {
+				$size_string = Config::$modSettings['avatar_max_height_external'];
 			}
 
-			if (!empty($size_string))
+			if (!empty($size_string)) {
 				$url_params[] = 's=' . $size_string;
+			}
 		}
 
 		return 'https://secure.gravatar.com/avatar/' . md5(Utils::strtolower($email_address)) . '?' . implode('&', $url_params);
@@ -5767,7 +5607,8 @@ protected static function getGravatarUrl(string $email_address): string
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\User::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\User::exportStatic')) {
 	User::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Utils.php b/Sources/Utils.php
index 2ba64b6cf6..e2e5865602 100644
--- a/Sources/Utils.php
+++ b/Sources/Utils.php
@@ -25,33 +25,18 @@ class Utils
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
-			'load' => false,
-			'entityDecode' => false,
-			'entityFix' => false,
-			'sanitizeEntities' => false,
+	private static $backcompat = [
+		'func_names' => [
 			'sanitizeChars' => 'sanitize_chars',
 			'normalizeSpaces' => 'normalize_spaces',
-			'htmlspecialchars' => false,
 			'htmlspecialcharsRecursive' => 'htmlspecialchars__recursive',
 			'htmlspecialcharsDecode' => 'un_htmlspecialchars',
-			'htmlTrim' => false,
 			'htmlTrimRecursive' => 'htmltrim__recursive',
-			'entityStrlen' => false,
-			'entityStrpos' => false,
-			'entitySubstr' => false,
-			'truncate' => false,
 			'shorten' => 'shorten_subject',
-			'normalize' => false,
-			'convertCase' => false,
-			'strtoupper' => false,
-			'strtolower' => false,
-			'casefold' => false,
-			'strtotitle' => false,
-			'ucfirst' => false,
-			'ucwords' => false,
+			'text2words' => 'text2words',
 			'buildRegex' => 'build_regex',
+			'cleanXml' => 'cleanXml',
+			'JavaScriptEscape' => 'JavaScriptEscape',
 			'stripslashesRecursive' => 'stripslashes__recursive',
 			'urldecodeRecursive' => 'urldecode__recursive',
 			'escapestringRecursive' => 'escapestring__recursive',
@@ -59,23 +44,26 @@ class Utils
 			'truncateArray' => 'truncate_array',
 			'arrayLength' => 'array_length',
 			'jsonDecode' => 'smf_json_decode',
-			'jsonEncode' => false,
 			'safeSerialize' => 'safe_serialize',
 			'safeUnserialize' => 'safe_unserialize',
-			'randomInt' => false,
-			'randomBytes' => false,
 			'getMimeType' => 'get_mime_type',
 			'checkMimeType' => 'check_mime_type',
 			'makeWritable' => 'smf_chmod',
-			'emitFile' => false,
 			'sendHttpStatus' => 'send_http_status',
 			'serverResponse' => 'smf_serverResponse',
-		),
-		'prop_names' => array(
+			'redirectexit' => 'redirectexit',
+			'obExit' => 'obExit',
+			'getCallable' => 'getCallable',
+			'call_helper' => 'call_helper',
+			'replaceEntities__callback' => 'replaceEntities__callback',
+			'fixchar__callback' => 'fixchar__callback',
+			'entity_fix__callback' => 'entity_fix__callback',
+		],
+		'prop_names' => [
 			'context' => 'context',
 			'smcFunc' => 'smcFunc',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -85,12 +73,12 @@ class Utils
 	 * Regular expression to match named entities for HTML special characters
 	 * and any numeric entities.
 	 */
-	const ENT_LIST = '&(?' . '>nbsp|quot|gt|lt|a(?' . '>pos|mp)|#(?' . '>\d+|x[0-9a-fA-F]+));';
+	public const ENT_LIST = '&(?' . '>nbsp|quot|gt|lt|a(?' . '>pos|mp)|#(?' . '>\d+|x[0-9a-fA-F]+));';
 
 	/**
 	 * Regular expression to match all forms of the non-breaking space entity.
 	 */
-	const ENT_NBSP = '&(?' . '>nbsp|#(?' . '>x0*A0|0*160));';
+	public const ENT_NBSP = '&(?' . '>nbsp|#(?' . '>x0*A0|0*160));';
 
 	/**************************
 	 * Public static properties
@@ -101,18 +89,18 @@ class Utils
 	 *
 	 * SMF's venerable $context variable, now available as Utils::$context.
 	 */
-	public static $context = array(
+	public static $context = [
 		// Assume UTF-8 until proven otherwise.
 		'utf8' => true,
 		'character_set' => 'UTF-8',
 		// Define a list of icons used across multiple places.
-		'stable_icons' => array(
+		'stable_icons' => [
 			'xx', 'thumbup', 'thumbdown', 'exclamation', 'question', 'lamp',
 			'smiley', 'angry', 'cheesy', 'grin', 'sad', 'wink', 'poll', 'moved',
 			'recycled', 'clip',
-		),
+		],
 		// Define an array for custom profile fields placements.
-		'cust_profile_fields_placement' => array(
+		'cust_profile_fields_placement' => [
 			'standard',
 			'icons',
 			'above_signature',
@@ -122,48 +110,48 @@ class Utils
 			'bottom_poster',
 			'before_member',
 			'after_member',
-		),
+		],
 		// Define an array for content-related <meta> elements (e.g. description,
 		// keywords, Open Graph) for the HTML head.
-		'meta_tags' => array(),
+		'meta_tags' => [],
 		// Define an array of allowed HTML tags.
-		'allowed_html_tags' => array(
+		'allowed_html_tags' => [
 			'<img>',
 			'<div>',
-		),
+		],
 		// Define a list of allowed tags for descriptions.
-		'description_allowed_tags' => array(
+		'description_allowed_tags' => [
 			'abbr', 'anchor', 'b', 'br', 'center', 'color', 'font', 'hr', 'i',
 			'img', 'iurl', 'left', 'li', 'list', 'ltr', 'pre', 'right', 's',
 			'sub', 'sup', 'table', 'td', 'tr', 'u', 'url',
-		),
+		],
 		// Define a list of deprecated BBC tags.
 		// Even when enabled, they'll only work in old posts and not new ones.
-		'legacy_bbc' => array(
+		'legacy_bbc' => [
 			'acronym', 'bdo', 'black', 'blue', 'flash', 'ftp', 'glow',
 			'green', 'move', 'red', 'shadow', 'tt', 'white',
-		),
+		],
 		// Define a list of BBC tags that require permissions to use.
-		'restricted_bbc' => array(
+		'restricted_bbc' => [
 			'html',
-		),
+		],
 		// Login Cookie times. Format: time => txt
-		'login_cookie_times' => array(
+		'login_cookie_times' => [
 			3153600 => 'always_logged_in',
 			60 => 'one_hour',
 			1440 => 'one_day',
 			10080 => 'one_week',
 			43200 => 'one_month',
-		),
+		],
 		'show_spellchecking' => false,
-	);
+	];
 
 	/**
 	 * @var array
 	 *
 	 * Backward compatibility aliases of various utility functions.
 	 */
-	public static $smcFunc = array(
+	public static $smcFunc = [
 		'entity_decode' => __CLASS__ . '::entityDecode',
 		'sanitize_entities' => __CLASS__ . '::sanitizeEntities',
 		'entity_fix' => __CLASS__ . '::entityFix',
@@ -183,7 +171,7 @@ class Utils
 		'json_decode' => __CLASS__ . '::jsonDecode',
 		'random_int' => __CLASS__ . '::randomInt',
 		'random_bytes' => __CLASS__ . '::randomBytes',
-	);
+	];
 
 	/***********************
 	 * Public static methods
@@ -195,20 +183,18 @@ class Utils
 	public static function load(): void
 	{
 		// Used to force browsers to download fresh CSS and JavaScript when necessary
-		if (isset(Config::$modSettings['browser_cache']))
-		{
+		if (isset(Config::$modSettings['browser_cache'])) {
 			self::$context['browser_cache'] = '?' . preg_replace('~\W~', '', strtolower(SMF_FULL_VERSION)) . '_' . Config::$modSettings['browser_cache'];
 		}
 
 		// UTF-8?
-		if (isset(Config::$modSettings['global_character_set']))
-		{
+		if (isset(Config::$modSettings['global_character_set'])) {
 			self::$context['character_set'] = Config::$modSettings['global_character_set'];
 			self::$context['utf8'] = self::$context['character_set'] === 'UTF-8';
 		}
 
 		// This determines the server... not used in many places, except for login fixing.
-		self::$context['server'] = array(
+		self::$context['server'] = [
 			'is_iis' => isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false,
 			'is_apache' => isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false,
 			'is_litespeed' => isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false,
@@ -218,7 +204,7 @@ public static function load(): void
 			'is_windows' => DIRECTORY_SEPARATOR === '\\',
 			'is_mac' => PHP_OS === 'Darwin',
 			'iso_case_folding' => ord(strtolower(chr(138))) === 154,
-		);
+		];
 
 		// A bug in some versions of IIS under CGI (older ones) makes cookie setting not work with Location: headers.
 		self::$context['server']['needs_login_fix'] = self::$context['server']['is_cgi'] && self::$context['server']['is_iis'];
@@ -233,7 +219,7 @@ public static function load(): void
 	 * @param string $string The string in which to decode entities.
 	 * @param bool $mb4 If true, always decode 4-byte UTF-8 characters.
 	 *      Default: false.
-	 * @param integer $flags Flags to pass to html_entity_decode.
+	 * @param int $flags Flags to pass to html_entity_decode.
 	 * 		Default: ENT_QUOTES | ENT_HTML5.
 	 * @param bool $nbsp_to_space If true, decode '&nbsp;' to space character.
 	 * 		Default: false.
@@ -242,26 +228,23 @@ public static function load(): void
 	public static function entityDecode(string $string, bool $mb4 = false, int $flags = ENT_QUOTES | ENT_HTML5, bool $nbsp_to_space = false): string
 	{
 		// Don't waste time on empty strings.
-		if (trim($string) === '')
+		if (trim($string) === '') {
 			return $string;
+		}
 
 		// In theory this is always UTF-8, but...
-		if (empty(self::$context['character_set']))
-		{
+		if (empty(self::$context['character_set'])) {
 			$charset = is_callable('mb_detect_encoding') ? mb_detect_encoding($string) : 'UTF-8';
-		}
-		elseif (strpos(self::$context['character_set'], 'ISO-8859-') !== false && !in_array(self::$context['character_set'], array('ISO-8859-5', 'ISO-8859-15')))
-		{
+		} elseif (strpos(self::$context['character_set'], 'ISO-8859-') !== false && !in_array(self::$context['character_set'], ['ISO-8859-5', 'ISO-8859-15'])) {
 			$charset = 'ISO-8859-1';
-		}
-		else
-		{
+		} else {
 			$charset = self::$context['character_set'];
 		}
 
 		// Enables consistency with the behaviour of un_htmlspecialchars.
-		if ($nbsp_to_space)
+		if ($nbsp_to_space) {
 			$string = preg_replace('~' . self::ENT_NBSP . '~u', ' ', $string);
+		}
 
 		// Do the deed.
 		$string = html_entity_decode($string, $flags, $charset);
@@ -270,8 +253,9 @@ public static function entityDecode(string $string, bool $mb4 = false, int $flag
 		$string = self::sanitizeEntities($string);
 
 		// Finally, make sure we don't break the database.
-		if (!$mb4)
+		if (!$mb4) {
 			$string = self::fixUtf8mb4($string);
+		}
 
 		return $string;
 	}
@@ -305,14 +289,14 @@ public static function entityFix(string $string): string
 	 */
 	public static function sanitizeEntities(string $string, string $substitute = '&#65533;'): string
 	{
-		if (strpos($string, '&#') === false)
+		if (strpos($string, '&#') === false) {
 			return $string;
+		}
 
 		// Disallow entities for control characters, non-characters, etc.
 		return preg_replace_callback(
 			'~(&#(0*\d{1,7}|x0*[0-9a-fA-F]{1,6});)~',
-			function($matches) use ($substitute)
-			{
+			function ($matches) use ($substitute) {
 				$num = $matches[2][0] === 'x' ? hexdec(substr($matches[2], 1)) : (int) $matches[2];
 
 				if (
@@ -325,20 +309,17 @@ function($matches) use ($substitute)
 
 					// Code points that are guaranteed never to be characters.
 					|| ($num >= 0xFDD0 && $num <= 0xFDEF)
-					|| (in_array($num % 0x10000, array(0xFFFE, 0xFFFF)))
+					|| (in_array($num % 0x10000, [0xFFFE, 0xFFFF]))
 
 					// Out of range.
 					|| $num > 0x10FFFF
-				)
-				{
+				) {
 					return $substitute;
 				}
-				else
-				{
-					return '&#' . $num . ';';
-				}
+
+				return '&#' . $num . ';';
 			},
-			(string) $string
+			(string) $string,
 		);
 	}
 
@@ -368,38 +349,29 @@ public static function sanitizeChars($string, $level = 0, $substitute = null)
 		$level = min(max((int) $level, 0), 2);
 
 		// What substitute character should we use?
-		if (isset($substitute))
-		{
+		if (isset($substitute)) {
 			$substitute = strval($substitute);
-		}
-		elseif (!empty(Utils::$context['utf8']))
-		{
+		} elseif (!empty(Utils::$context['utf8'])) {
 			// Raw UTF-8 bytes for U+FFFD.
 			$substitute = "\xEF\xBF\xBD";
-		}
-		elseif (!empty(Utils::$context['character_set']) && is_callable('mb_decode_numericentity'))
-		{
+		} elseif (!empty(Utils::$context['character_set']) && is_callable('mb_decode_numericentity')) {
 			// Get whatever the default replacement character is for this encoding.
-			$substitute = mb_decode_numericentity('&#xFFFD;', array(0xFFFD,0xFFFD,0,0xFFFF), Utils::$context['character_set']);
-		}
-		else
-		{
+			$substitute = mb_decode_numericentity('&#xFFFD;', [0xFFFD, 0xFFFD, 0, 0xFFFF], Utils::$context['character_set']);
+		} else {
 			$substitute = '?';
 		}
 
 		// Fix any invalid byte sequences.
-		if (!empty(Utils::$context['character_set']))
-		{
+		if (!empty(Utils::$context['character_set'])) {
 			// For UTF-8, this preg_match test is much faster than mb_check_encoding.
 			$malformed = !empty(Utils::$context['utf8']) ? @preg_match('//u', $string) === false && preg_last_error() === PREG_BAD_UTF8_ERROR : (!is_callable('mb_check_encoding') || !mb_check_encoding($string, Utils::$context['character_set']));
 
-			if ($malformed)
-			{
+			if ($malformed) {
 				// mb_convert_encoding will replace invalid byte sequences with our substitute.
-				if (is_callable('mb_convert_encoding'))
-				{
-					if (!is_callable('mb_ord'))
-						require_once(Config::$sourcedir . '/Subs-Compat.php');
+				if (is_callable('mb_convert_encoding')) {
+					if (!is_callable('mb_ord')) {
+						require_once Config::$sourcedir . '/Subs-Compat.php';
+					}
 
 					$substitute_ord = $substitute === '' ? 'none' : mb_ord($substitute, Utils::$context['character_set']);
 
@@ -409,9 +381,7 @@ public static function sanitizeChars($string, $level = 0, $substitute = null)
 					$string = mb_convert_encoding($string, Utils::$context['character_set'], Utils::$context['character_set']);
 
 					mb_substitute_character($mb_substitute_character);
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 			}
@@ -421,12 +391,9 @@ public static function sanitizeChars($string, $level = 0, $substitute = null)
 		$string = Utils::normalizeSpaces($string, true);
 
 		// Deal with unwanted control characters, invisible formatting characters, and other creepy-crawlies.
-		if (!empty(Utils::$context['utf8']))
-		{
+		if (!empty(Utils::$context['utf8'])) {
 			$string = (string) Unicode\Utf8String::create($string)->sanitizeInvisibles($level, $substitute);
-		}
-		else
-		{
+		} else {
 			$string = preg_replace('/[^\P{Cc}\t\r\n]/', $substitute, $string);
 		}
 
@@ -448,31 +415,30 @@ public static function sanitizeChars($string, $level = 0, $substitute = null)
 	 *      - collapse_hspace: If true, removes extra horizontal spaces.
 	 * @return string The sanitized string.
 	 */
-	public static function normalizeSpaces($string, $vspace = true, $hspace = false, $options = array())
+	public static function normalizeSpaces($string, $vspace = true, $hspace = false, $options = [])
 	{
 		$string = (string) $string;
 		$vspace = !empty($vspace);
 		$hspace = !empty($hspace);
 
-		if (!$vspace && !$hspace)
+		if (!$vspace && !$hspace) {
 			return $string;
+		}
 
 		$options['no_breaks'] = !empty($options['no_breaks']);
 		$options['collapse_hspace'] = !empty($options['collapse_hspace']);
 		$options['replace_tabs'] = !empty($options['replace_tabs']);
 
-		$patterns = array();
-		$replacements = array();
+		$patterns = [];
+		$replacements = [];
 
-		if ($vspace)
-		{
+		if ($vspace) {
 			// \R is like \v, except it handles "\r\n" as a single unit.
 			$patterns[] = '/\R/' . (Utils::$context['utf8'] ? 'u' : '');
 			$replacements[] = $options['no_breaks'] ? ' ' : "\n";
 		}
 
-		if ($hspace)
-		{
+		if ($hspace) {
 			// Interesting fact: Unicode properties like \p{Zs} work even when not in UTF-8 mode.
 			$patterns[] = '/' . ($options['replace_tabs'] ? '\h' : '\p{Zs}') . ($options['collapse_hspace'] ? '+' : '') . '/' . (Utils::$context['utf8'] ? 'u' : '');
 			$replacements[] = ' ';
@@ -513,18 +479,15 @@ public static function htmlspecialcharsRecursive(array|string $var, int $flags =
 	{
 		static $level = 0;
 
-		if (!is_array($var))
+		if (!is_array($var)) {
 			return self::htmlspecialchars($var, $flags, $encoding);
+		}
 
 		// Add the htmlspecialchars to every element.
-		foreach ($var as $k => $v)
-		{
-			if ($level > 25)
-			{
+		foreach ($var as $k => $v) {
+			if ($level > 25) {
 				$var[$k] = null;
-			}
-			else
-			{
+			} else {
 				$level++;
 				$var[$k] = self::htmlspecialcharsRecursive($v, $flags, $encoding);
 				$level--;
@@ -560,7 +523,7 @@ public static function htmlspecialcharsDecode(string $string, int $flags = ENT_Q
 	 */
 	public static function htmlTrim(string $string): string
 	{
-		return preg_replace('~^(?'.'>[\p{Z}\p{C}]|' . self::ENT_NBSP . ')+|(?'.'>[\p{Z}\p{C}]|' . self::ENT_NBSP . ')+$~u', '', self::sanitizeEntities($string));
+		return preg_replace('~^(?' . '>[\p{Z}\p{C}]|' . self::ENT_NBSP . ')+|(?' . '>[\p{Z}\p{C}]|' . self::ENT_NBSP . ')+$~u', '', self::sanitizeEntities($string));
 	}
 
 	/**
@@ -576,18 +539,15 @@ public static function htmlTrimRecursive(array|string $var): array|string
 		static $level = 0;
 
 		// Remove spaces (32), tabs (9), returns (13, 10, and 11), nulls (0), and hard spaces. (160)
-		if (!is_array($var))
+		if (!is_array($var)) {
 			return self::htmlTrim($var);
+		}
 
 		// Go through all the elements and remove the whitespace.
-		foreach ($var as $k => $v)
-		{
-			if ($level > 25)
-			{
+		foreach ($var as $k => $v) {
+			if ($level > 25) {
 				$var[$k] = null;
-			}
-			else
-			{
+			} else {
 				$level++;
 				$var[$k] = self::htmlTrimRecursive($v);
 				$level--;
@@ -623,32 +583,29 @@ public static function entityStrpos(string $haystack, string $needle, int $offse
 	{
 		$haystack_arr = preg_split('~(' . self::ENT_LIST . '|\X)~u', self::sanitizeEntities($haystack), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		if (strlen($needle) === 1)
-		{
+		if (strlen($needle) === 1) {
 			$result = array_search($needle, array_slice($haystack_arr, $offset));
 
 			return is_int($result) ? $result + $offset : false;
 		}
-		else
-		{
-			$needle_arr = preg_split('~(' . self::ENT_LIST . '|\X)~u', self::sanitizeEntities($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-			$needle_size = count($needle_arr);
+		$needle_arr = preg_split('~(' . self::ENT_LIST . '|\X)~u', self::sanitizeEntities($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-			$result = array_search($needle_arr[0], array_slice($haystack_arr, $offset));
+		$needle_size = count($needle_arr);
 
-			while ((int) $result === $result)
-			{
-				$offset += $result;
+		$result = array_search($needle_arr[0], array_slice($haystack_arr, $offset));
 
-				if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
-					return $offset;
+		while ((int) $result === $result) {
+			$offset += $result;
 
-				$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
+			if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr) {
+				return $offset;
 			}
 
-			return false;
+			$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
 		}
+
+		return false;
 	}
 
 	/**
@@ -660,7 +617,7 @@ public static function entityStrpos(string $haystack, string $needle, int $offse
 	 * @param int $length Maximum length, in characters, of the substring.
 	 * @return string The substring.
 	 */
-	public static function entitySubstr(string $string, int $offset, int $length = null): string
+	public static function entitySubstr(string $string, int $offset, ?int $length = null): string
 	{
 		$ent_arr = preg_split('~(' . self::ENT_LIST . '|\X)~u', self::sanitizeEntities($string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -684,8 +641,7 @@ public static function truncate(string $string, int $length): string
 	{
 		$string = self::sanitizeEntities($string);
 
-		while (strlen($string) > $length)
-		{
+		while (strlen($string) > $length) {
 			$string = preg_replace('~(?:' . self::ENT_LIST . '|\X)$~u', '', $string);
 		}
 
@@ -704,8 +660,9 @@ public static function truncate(string $string, int $length): string
 	public static function shorten(string $subject, int $len): string
 	{
 		// It was already short enough!
-		if (self::entityStrlen($subject) <= $len)
+		if (self::entityStrlen($subject) <= $len) {
 			return $subject;
+		}
 
 		// Truncate it and append an ellipsis.
 		return self::entitySubstr($subject, 0, $len) . '...';
@@ -756,28 +713,25 @@ public static function normalize(string $string, string $form = 'c'): string
 	public static function convertCase(string $string, string $case, bool $simple = false, string $form = 'c'): string
 	{
 		// Convert numeric entities to characters, except special ones.
-		if (strpos($string, '&#') !== false)
-		{
-			$string = strtr(self::sanitizeEntities($string), array(
+		if (strpos($string, '&#') !== false) {
+			$string = strtr(self::sanitizeEntities($string), [
 				'&#34;' => '&quot;',
 				'&#38;' => '&amp;',
 				'&#39;' => '&apos;',
 				'&#60;' => '&lt;',
 				'&#62;' => '&gt;',
 				'&#160;' => '&nbsp;',
-			));
+			]);
 
-			$string = mb_decode_numericentity($string, array(0, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
+			$string = mb_decode_numericentity($string, [0, 0x10FFFF, 0, 0xFFFFFF], 'UTF-8');
 		}
 
 		// Use optimized function for compatibility casefolding.
-		if ($form === 'kc_casefold')
-		{
+		if ($form === 'kc_casefold') {
 			$string = (string) Unicode\Utf8String::create($string)->normalize('kc_casefold');
 		}
 		// Everything else.
-		else
-		{
+		else {
 			$string = (string) Unicode\Utf8String::create($string)->convertCase($case, $simple)->normalize($form);
 		}
 
@@ -861,35 +815,35 @@ public static function ucwords(string $string): string
 	 */
 	public static function text2words(string $string, ?int $max_length = 20, bool $encrypt = false): array
 	{
-		if (empty($max_length))
+		if (empty($max_length)) {
 			$max_length = PHP_INT_MAX;
+		}
 
 		$words = Unicode\Utf8String::create($string)->extractWords(2);
 
-		if (!$encrypt)
-		{
-			foreach ($words as &$word)
+		if (!$encrypt) {
+			foreach ($words as &$word) {
 				$word = self::truncate($word, $max_length);
+			}
 
 			return array_unique($words);
 		}
 
 		// We want to "encrypt" the words, which basically just means getting a
 		// unique number for each one...
-		$returned_ints = array();
+		$returned_ints = [];
 
 		$possible_chars = array_flip(array_merge(range(46, 57), range(65, 90), range(97, 122)));
 
-		foreach ($words as $word)
-		{
-			if (($word = trim($word, '-_\'')) !== '')
-			{
+		foreach ($words as $word) {
+			if (($word = trim($word, '-_\'')) !== '') {
 				$encrypted = substr(crypt($word, 'uk'), 2, $max_length);
 
 				$total = 0;
 
-				for ($i = 0; $i < $max_length; $i++)
+				for ($i = 0; $i < $max_length; $i++) {
 					$total += $possible_chars[ord($encrypted[$i])] * pow(63, $i);
+				}
 
 				$returned_ints[] = $max_length == 4 ? min($total, 16777215) : $total;
 			}
@@ -924,120 +878,102 @@ public static function text2words(string $string, ?int $max_length = 20, bool $e
 	 * @return string|array One or more regular expressions to match any of the
 	 *    input strings.
 	 */
-	public static function buildRegex(array $strings, string $delim = null, bool $return_array = false): string|array
+	public static function buildRegex(array $strings, ?string $delim = null, bool $return_array = false): string|array
 	{
-		static $regexes = array();
+		static $regexes = [];
 
 		// If it's not an array, there's not much to do. ;)
-		if (!is_array($strings))
+		if (!is_array($strings)) {
 			return preg_quote(@strval($strings), $delim);
+		}
 
-		$regex_key = md5(json_encode(array($strings, $delim, $return_array)));
+		$regex_key = md5(json_encode([$strings, $delim, $return_array]));
 
-		if (isset($regexes[$regex_key]))
+		if (isset($regexes[$regex_key])) {
 			return $regexes[$regex_key];
+		}
 
-		if (($string_encoding = mb_detect_encoding(implode(' ', $strings))) !== false)
-		{
+		if (($string_encoding = mb_detect_encoding(implode(' ', $strings))) !== false) {
 			$current_encoding = mb_internal_encoding();
 			mb_internal_encoding($string_encoding);
 		}
 
 		// This recursive closure creates the trie from the strings.
-		$add_string_to_trie = function($string, $trie) use (&$add_string_to_trie)
-		{
+		$add_string_to_trie = function ($string, $trie) use (&$add_string_to_trie) {
 			static $depth = 0;
 			$depth++;
 
 			$first = (string) @mb_substr($string, 0, 1);
 
 			// No first character? That's no good.
-			if ($first === '')
-			{
+			if ($first === '') {
 				// A nested array? Really? Ugh. Fine.
-				if (is_array($string) && $depth < 20)
-				{
-					foreach ($string as $str)
+				if (is_array($string) && $depth < 20) {
+					foreach ($string as $str) {
 						$trie = $add_string_to_trie($str, $trie);
+					}
 				}
 
 				$depth--;
+
 				return $trie;
 			}
 
-			if (empty($trie[$first]))
-				$trie[$first] = array();
+			if (empty($trie[$first])) {
+				$trie[$first] = [];
+			}
 
-			if (mb_strlen($string) > 1)
-			{
+			if (mb_strlen($string) > 1) {
 				// Sanity check on recursion
-				if ($depth > 99)
-				{
+				if ($depth > 99) {
 					$trie[$first][mb_substr($string, 1)] = '';
-				}
-				else
-				{
+				} else {
 					$trie[$first] = $add_string_to_trie(mb_substr($string, 1), $trie[$first]);
 				}
-			}
-			else
-			{
+			} else {
 				$trie[$first][''] = '';
 			}
 
 			$depth--;
+
 			return $trie;
 		};
 
 		// This recursive closure turns the trie into a regular expression.
-		$trie_to_regex = function(&$trie, $delim) use (&$trie_to_regex)
-		{
+		$trie_to_regex = function (&$trie, $delim) use (&$trie_to_regex) {
 			static $depth = 0;
 			$depth++;
 
 			// Absolute max length for a regex is 32768, but we might need wiggle room
 			$max_length = 30000;
 
-			$regex = array();
+			$regex = [];
 			$length = 0;
 
-			foreach ($trie as $key => $value)
-			{
+			foreach ($trie as $key => $value) {
 				$key_regex = preg_quote($key, $delim);
 				$new_key = $key;
 
-				if (empty($value))
-				{
+				if (empty($value)) {
 					$sub_regex = '';
-				}
-				else
-				{
+				} else {
 					$sub_regex = $trie_to_regex($value, $delim);
 
-					if (count(array_keys($value)) == 1)
-					{
+					if (count(array_keys($value)) == 1) {
 						$new_key_array = explode('(?' . '>', $sub_regex);
 						$new_key .= $new_key_array[0];
-					}
-					else
-					{
+					} else {
 						$sub_regex = '(?' . '>' . $sub_regex . ')';
 					}
 				}
 
-				if ($depth > 1)
-				{
+				if ($depth > 1) {
 					$regex[$new_key] = $key_regex . $sub_regex;
-				}
-				else
-				{
-					if (($length += strlen($key_regex . $sub_regex) + 1) < $max_length || empty($regex))
-					{
+				} else {
+					if (($length += strlen($key_regex . $sub_regex) + 1) < $max_length || empty($regex)) {
 						$regex[$new_key] = $key_regex . $sub_regex;
 						unset($trie[$key]);
-					}
-					else
-					{
+					} else {
 						break;
 					}
 				}
@@ -1046,44 +982,45 @@ public static function buildRegex(array $strings, string $delim = null, bool $re
 			// Sort by key length and then alphabetically
 			uksort(
 				$regex,
-				function($k1, $k2)
-				{
+				function ($k1, $k2) {
 					$l1 = mb_strlen($k1);
 					$l2 = mb_strlen($k2);
 
-					if ($l1 == $l2)
+					if ($l1 == $l2) {
 						return strcmp($k1, $k2) > 0 ? 1 : -1;
+					}
 
 					return $l1 > $l2 ? -1 : 1;
-				}
+				},
 			);
 
 			$depth--;
+
 			return implode('|', $regex);
 		};
 
 		// Now that the closures are defined, let's do this thing.
-		$trie = array();
+		$trie = [];
 		$regex = '';
 
-		foreach ($strings as $string)
+		foreach ($strings as $string) {
 			$trie = $add_string_to_trie($string, $trie);
+		}
 
-		if ($return_array === true)
-		{
-			$regex = array();
+		if ($return_array === true) {
+			$regex = [];
 
-			while (!empty($trie))
+			while (!empty($trie)) {
 				$regex[] = '(?' . '>' . $trie_to_regex($trie, $delim) . ')';
-		}
-		else
-		{
+			}
+		} else {
 			$regex = '(?' . '>' . $trie_to_regex($trie, $delim) . ')';
 		}
 
 		// Restore PHP's internal character encoding to whatever it was originally.
-		if (!empty($current_encoding))
+		if (!empty($current_encoding)) {
 			mb_internal_encoding($current_encoding);
+		}
 
 		// Save for later.
 		$regexes[$regex_key] = $regex;
@@ -1101,7 +1038,7 @@ function($k1, $k2)
 	 */
 	public static function cleanXml(string $string): string
 	{
-		$illegal_chars = array(
+		$illegal_chars = [
 			// Remove all ASCII control characters except \t, \n, and \r.
 			"\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08",
 			"\x0B", "\x0C", "\x0E", "\x0F", "\x10", "\x11", "\x12", "\x13", "\x14",
@@ -1109,14 +1046,15 @@ public static function cleanXml(string $string): string
 			"\x1E", "\x1F",
 			// Remove \xFFFE and \xFFFF
 			"\xEF\xBF\xBE", "\xEF\xBF\xBF",
-		);
+		];
 
 		$string = str_replace($illegal_chars, '', $string);
 
 		// The Unicode surrogate pair code points should never be present in our
 		// strings to begin with, but if any snuck in, they need to be removed.
-		if (!empty(Utils::$context['utf8']) && strpos($string, "\xED") !== false)
+		if (!empty(Utils::$context['utf8']) && strpos($string, "\xED") !== false) {
 			$string = preg_replace('/\xED[\xA0-\xBF][\x80-\xBF]/', '', $string);
+		}
 
 		return $string;
 	}
@@ -1132,7 +1070,7 @@ public static function JavaScriptEscape(string $string, bool $as_json = false):
 	{
 		$q = !empty($as_json) ? '"' : '\'';
 
-		return $q . strtr($string, array(
+		return $q . strtr($string, [
 			"\r" => '',
 			"\n" => '\\n',
 			"\t" => '\\t',
@@ -1143,7 +1081,7 @@ public static function JavaScriptEscape(string $string, bool $as_json = false):
 			'<body>' => '<bo' . $q . '+' . $q . 'dy>',
 			'<a href' => '<a hr' . $q . '+' . $q . 'ef',
 			Config::$scripturl => $q . ' + smf_scripturl + ' . $q,
-		)) . $q;
+		]) . $q;
 	}
 
 	/**
@@ -1157,15 +1095,15 @@ public static function JavaScriptEscape(string $string, bool $as_json = false):
 	 */
 	public static function stripslashesRecursive($var, $level = 0)
 	{
-		if (!is_array($var))
+		if (!is_array($var)) {
 			return stripslashes($var);
+		}
 
 		// Reindex the array without slashes, this time.
-		$new_var = array();
+		$new_var = [];
 
 		// Strip the slashes from every element.
-		foreach ($var as $k => $v)
-		{
+		foreach ($var as $k => $v) {
 			$new_var[stripslashes($k)] = $level > 25 ? null : self::stripslashesRecursive($v, $level + 1);
 		}
 
@@ -1183,15 +1121,15 @@ public static function stripslashesRecursive($var, $level = 0)
 	 */
 	public static function urldecodeRecursive($var, $level = 0)
 	{
-		if (!is_array($var))
+		if (!is_array($var)) {
 			return urldecode($var);
+		}
 
 		// Reindex the array...
-		$new_var = array();
+		$new_var = [];
 
 		// urldecode() every element.
-		foreach ($var as $k => $v)
-		{
+		foreach ($var as $k => $v) {
 			$new_var[urldecode($k)] = $level > 25 ? null : self::urldecodeRecursive($v, $level + 1);
 		}
 
@@ -1208,15 +1146,17 @@ public static function urldecodeRecursive($var, $level = 0)
 	 */
 	public static function escapestringRecursive(array|string $var): array|string
 	{
-		if (!is_array($var))
+		if (!is_array($var)) {
 			return Db::$db->escape_string($var);
+		}
 
 		// Reindex the array with slashes.
-		$new_var = array();
+		$new_var = [];
 
 		// Escape every element, even the keys!
-		foreach ($var as $k => $v)
+		foreach ($var as $k => $v) {
 			$new_var[Db::$db->escape_string($k)] = self::escapestringRecursive($v);
+		}
 
 		return $new_var;
 	}
@@ -1231,15 +1171,17 @@ public static function escapestringRecursive(array|string $var): array|string
 	 */
 	public static function unescapestringRecursive(array|string $var): array|string
 	{
-		if (!is_array($var))
+		if (!is_array($var)) {
 			return Db::$db->unescape_string($var);
+		}
 
 		// Reindex the array without slashes, this time.
-		$new_var = array();
+		$new_var = [];
 
 		// Unescape every element, even the keys!
-		foreach ($var as $k => $v)
+		foreach ($var as $k => $v) {
 			$new_var[Db::$db->unescape_string($k)] = self::unescapestringRecursive($v);
+		}
 
 		return $new_var;
 	}
@@ -1260,26 +1202,23 @@ public static function truncateArray(array $array, int $max_length = 1900): arra
 
 		array_walk_recursive(
 			$array,
-			function ($value) use (&$num_elements)
-			{
+			function ($value) use (&$num_elements) {
 				$num_elements++;
-			}
+			},
 		);
 
 		$temp = $array;
 		$current_length = self::arrayLength($array);
 		$param_length = floor($current_length / $num_elements);
 
-		while ($current_length > $max_length)
-		{
+		while ($current_length > $max_length) {
 			$temp = $array;
 
 			array_walk_recursive(
 				$temp,
-				function (&$value) use ($param_length)
-				{
+				function (&$value) use ($param_length) {
 					$value = truncate(strval($value), $param_length);
-				}
+				},
 			);
 
 			$current_length = self::arrayLength($temp);
@@ -1303,10 +1242,9 @@ public static function arrayLength(array $array): int
 
 		array_walk_recursive(
 			$array,
-			function ($value, $key) use (&$length)
-			{
+			function ($value, $key) use (&$length) {
 				$length += strlen($value);
-			}
+			},
 		);
 
 		return $length;
@@ -1325,15 +1263,15 @@ function ($value, $key) use (&$length)
 	public static function jsonDecode(string $json, bool $associative = false, bool $should_log = true)
 	{
 		// Come on...
-		if (empty($json) || !is_string($json))
-			return array();
+		if (empty($json) || !is_string($json)) {
+			return [];
+		}
 
 		$return_value = @json_decode($json, $associative);
 
 		// Use this instead of json_last_error_msg() so that we can translate
 		// the error messages for the admin.
-		switch (json_last_error())
-		{
+		switch (json_last_error()) {
 			case JSON_ERROR_NONE:
 				$json_error = false;
 				break;
@@ -1364,25 +1302,21 @@ public static function jsonDecode(string $json, bool $associative = false, bool
 		}
 
 		// Something went wrong!
-		if (!empty($json_error) && $should_log)
-		{
+		if (!empty($json_error) && $should_log) {
 			// Being a wrapper means we lost our smf_error_handler() privileges :(
 			$json_debug = debug_backtrace();
 			$json_debug = $json_debug[0];
 
 			Lang::load('Errors');
 
-			if (!empty($json_debug))
-			{
+			if (!empty($json_debug)) {
 				ErrorHandler::log(Lang::$txt['json_' . $json_error], 'critical', $json_debug['file'], $json_debug['line']);
-			}
-			else
-			{
+			} else {
 				ErrorHandler::log(Lang::$txt['json_' . $json_error], 'critical');
 			}
 
 			// Everyone expects an array.
-			return array();
+			return [];
 		}
 
 		return $return_value;
@@ -1418,15 +1352,13 @@ public static function jsonEncode($value, int $flags = 0, int $depth = 512)
 	public static function safeSerialize(mixed $value): string
 	{
 		// Make sure we use the byte count for strings even when strlen() is overloaded by mb_strlen()
-		if (function_exists('mb_internal_encoding') &&
-			(((int) ini_get('mbstring.func_overload')) & 2))
-		{
+		if (function_exists('mb_internal_encoding')
+			&& (((int) ini_get('mbstring.func_overload')) & 2)) {
 			$mb_int_enc = mb_internal_encoding();
 			mb_internal_encoding('ASCII');
 		}
 
-		switch (gettype($value))
-		{
+		switch (gettype($value)) {
 			case 'NULL':
 				$out = 'N;';
 				break;
@@ -1453,27 +1385,24 @@ public static function safeSerialize(mixed $value): string
 
 				array_walk_recursive(
 					$value,
-					function($v) use (&$contains_invalid)
-					{
-						if (is_object($v) || is_resource($v))
+					function ($v) use (&$contains_invalid) {
+						if (is_object($v) || is_resource($v)) {
 							$contains_invalid = true;
-					}
+						}
+					},
 				);
 
-				if ($contains_invalid)
-				{
+				if ($contains_invalid) {
 					$out = false;
-				}
-				else
-				{
+				} else {
 					$out = '';
 
-					foreach ($value as $k => $v)
+					foreach ($value as $k => $v) {
 						$out .= self::safe_serialize($k) . self::safe_serialize($v);
+					}
 
 					$out = 'a:' . count($value) . ':{' . $out . '}';
 				}
-
 				break;
 
 			default:
@@ -1481,8 +1410,9 @@ function($v) use (&$contains_invalid)
 				break;
 		}
 
-		if (isset($mb_int_enc))
+		if (isset($mb_int_enc)) {
 			mb_internal_encoding($mb_int_enc);
+		}
 
 		return $out;
 	}
@@ -1499,30 +1429,26 @@ function($v) use (&$contains_invalid)
 	public static function safeUnserialize(string $str): mixed
 	{
 		// Make sure we use the byte count for strings even when strlen() is overloaded by mb_strlen()
-		if (function_exists('mb_internal_encoding') &&
-			(((int) ini_get('mbstring.func_overload')) & 0x02))
-		{
+		if (function_exists('mb_internal_encoding')
+			&& (((int) ini_get('mbstring.func_overload')) & 0x02)) {
 			$mb_int_enc = mb_internal_encoding();
 			mb_internal_encoding('ASCII');
 		}
 
 		// Input is not a string.
-		if (empty($str) || !is_string($str))
-		{
+		if (empty($str) || !is_string($str)) {
 			$out = false;
 		}
-		// The substring 'O:' is used to serialize objects.
-		// If it is not present, then there are none in the serialized data.
-		elseif (strpos($str, 'O:') === false)
-		{
+		// The substrings 'O:' and 'C:' are used to serialize objects.
+		// If they are not present, then there are none in the serialized data.
+		elseif (strpos($str, 'O:') === false && strpos($str, 'C:') === false) {
 			$out = unserialize($str);
 		}
 		// It looks like there might be an object in the serialized data,
 		// but we won't know for sure until we check more closely.
-		else
-		{
-			$stack = array();
-			$expected = array();
+		else {
+			$stack = [];
+			$expected = [];
 
 			/*
 			 * states:
@@ -1533,67 +1459,49 @@ public static function safeUnserialize(string $str): mixed
 			 */
 			$state = 0;
 
-			while ($state != 1)
-			{
-				$type = isset($str[0]) ? $str[0] : '';
+			while ($state != 1) {
+				$type = $str[0] ?? '';
 
-				if ($type == '}')
-				{
+				if ($type == '}') {
 					$str = substr($str, 1);
-				}
-				elseif ($type == 'N' && $str[1] == ';')
-				{
+				} elseif ($type == 'N' && $str[1] == ';') {
 					$value = null;
 					$str = substr($str, 2);
-				}
-				elseif ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
-				{
+				} elseif ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches)) {
 					$value = $matches[1] == '1' ? true : false;
 					$str = substr($str, 4);
-				}
-				elseif ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
-				{
+				} elseif ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches)) {
 					$value = (int) $matches[1];
 					$str = $matches[2];
-				}
-				elseif ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
-				{
+				} elseif ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches)) {
 					$value = (float) $matches[1];
 					$str = $matches[3];
-				}
-				elseif ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";')
-				{
+				} elseif ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";') {
 					$value = substr($matches[2], 0, (int) $matches[1]);
 					$str = substr($matches[2], (int) $matches[1] + 2);
-				}
-				elseif ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
-				{
+				} elseif ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches)) {
 					$expectedLength = (int) $matches[1];
 					$str = $matches[2];
 				}
 				// Object or unknown/malformed type.
-				else
-				{
+				else {
 					$out = false;
 					break;
 				}
 
-				switch ($state)
-				{
+				switch ($state) {
 					// In array, expecting value or another array.
 					case 3:
-						if ($type == 'a')
-						{
+						if ($type == 'a') {
 							$stack[] = &$list;
-							$list[$key] = array();
+							$list[$key] = [];
 							$list = &$list[$key];
 							$expected[] = $expectedLength;
 							$state = 2;
 							break;
 						}
 
-						if ($type != '}')
-						{
+						if ($type != '}') {
 							$list[$key] = $value;
 							$state = 2;
 							break;
@@ -1605,11 +1513,11 @@ public static function safeUnserialize(string $str): mixed
 
 					// In array, expecting end of array or a key.
 					case 2:
-						if ($type == '}')
-						{
+						if ($type == '}') {
 							// Array size is less than expected.
-							if (count($list) < end($expected))
+							if (count($list) < end($expected)) {
 								return false;
+							}
 
 							unset($list);
 							$list = &$stack[count($stack) - 1];
@@ -1618,20 +1526,22 @@ public static function safeUnserialize(string $str): mixed
 							// Go to terminal state if we're at the end of the root array.
 							array_pop($expected);
 
-							if (count($expected) == 0)
+							if (count($expected) == 0) {
 								$state = 1;
+							}
 
 							break;
 						}
 
-						if ($type == 'i' || $type == 's')
-						{
+						if ($type == 'i' || $type == 's') {
 							// Array size exceeds expected length.
-							if (count($list) >= end($expected))
+							if (count($list) >= end($expected)) {
 								return false;
+							}
 
 							$key = $value;
 							$state = 3;
+
 							break;
 						}
 
@@ -1641,17 +1551,15 @@ public static function safeUnserialize(string $str): mixed
 
 					// Expecting array or value.
 					case 0:
-						if ($type == 'a')
-						{
-							$data = array();
+						if ($type == 'a') {
+							$data = [];
 							$list = &$data;
 							$expected[] = $expectedLength;
 							$state = 2;
 							break;
 						}
 
-						if ($type != '}')
-						{
+						if ($type != '}') {
 							$data = $value;
 							$state = 1;
 							break;
@@ -1667,8 +1575,9 @@ public static function safeUnserialize(string $str): mixed
 			$out = !empty($str) ? false : $data;
 		}
 
-		if (isset($mb_int_enc))
+		if (isset($mb_int_enc)) {
 			mb_internal_encoding($mb_int_enc);
+		}
 
 		return $out;
 	}
@@ -1687,8 +1596,9 @@ public static function safeUnserialize(string $str): mixed
 	public static function randomInt(int $min = 0, int $max = PHP_INT_MAX): int
 	{
 		// Oh, wouldn't it be great if I *was* crazy? Then the world would be okay.
-		if (!is_callable('random_int'))
-			require_once(Config::$sourcedir . '/random_compat/random.php');
+		if (!is_callable('random_int')) {
+			require_once Config::$sourcedir . '/random_compat/random.php';
+		}
 
 		return random_int($min, $max);
 	}
@@ -1705,8 +1615,9 @@ public static function randomInt(int $min = 0, int $max = PHP_INT_MAX): int
 	 */
 	public static function randomBytes(int $length = 64): string
 	{
-		if (!is_callable('random_bytes'))
-			require_once(Config::$sourcedir . '/random_compat/random.php');
+		if (!is_callable('random_bytes')) {
+			require_once Config::$sourcedir . '/random_compat/random.php';
+		}
 
 		// Make sure length is valid
 		$length = max(1, $length);
@@ -1727,63 +1638,57 @@ public static function getMimeType(string $data, bool $is_path = false): string|
 		$exif_loaded = extension_loaded('exif') && function_exists('image_type_to_mime_type');
 
 		// Oh well. We tried.
-		if (!$finfo_loaded && !$exif_loaded)
+		if (!$finfo_loaded && !$exif_loaded) {
 			return false;
+		}
 
 		// Start with the 'empty' MIME type.
 		$mime_type = 'application/x-empty';
 
-		if ($finfo_loaded)
-		{
+		if ($finfo_loaded) {
 			// Just some nice, simple data to analyze.
-			if (empty($is_path))
-			{
+			if (empty($is_path)) {
 				$mime_type = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data);
 			}
 			// A file, or maybe a URL?
-			else
-			{
+			else {
 				$path = $data;
 
 				// Local file.
-				if (file_exists($path))
-				{
+				if (file_exists($path)) {
 					$mime_type = mime_content_type($path);
 				}
 				// URL.
-				elseif ($data = WebFetch\WebFetchApi::fetch($path))
-				{
+				elseif ($data = WebFetch\WebFetchApi::fetch($path)) {
 					$mime_type = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data);
 
 					// SVG sometimes needs a little extra help.
-					if ($mime_type === 'text/html' && strtolower(pathinfo($path, PATHINFO_EXTENSION)) === 'svg')
-					{
+					if ($mime_type === 'text/html' && strtolower(pathinfo($path, PATHINFO_EXTENSION)) === 'svg') {
 						// Detection sometimes fails if the <svg> element isn't first.
 						$data = preg_replace('/^([^<]|<(?!svg\b))*/i', '', $data);
 
-						if (finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data) == 'image/svg+xml')
+						if (finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $data) == 'image/svg+xml') {
 							$mime_type = 'image/svg+xml';
+						}
 					}
 				}
 			}
 		}
 		// Workaround using Exif requires a local file.
-		else
-		{
+		else {
 			// If $data is a URL to fetch, do so.
-			if (!empty($is_path) && !file_exists($data))
-			{
+			if (!empty($is_path) && !file_exists($data)) {
 				$data = WebFetch\WebFetchApi::fetch($data);
 
-				if ($data === false)
+				if ($data === false) {
 					return false;
+				}
 
 				$is_path = false;
 			}
 
 			// If we don't have a local file, create one and use it.
-			if (empty($is_path))
-			{
+			if (empty($is_path)) {
 				$temp_file = tempnam(Config::$cachedir, md5($data));
 				file_put_contents($temp_file, $data);
 				$is_path = true;
@@ -1792,12 +1697,14 @@ public static function getMimeType(string $data, bool $is_path = false): string|
 
 			$imagetype = @exif_imagetype($data);
 
-			if (isset($temp_file))
+			if (isset($temp_file)) {
 				unlink($temp_file);
+			}
 
 			// Unfortunately, this workaround only works for image files.
-			if ($imagetype !== false)
+			if ($imagetype !== false) {
 				$mime_type = image_type_to_mime_type($imagetype);
+			}
 		}
 
 		return $mime_type;
@@ -1817,8 +1724,9 @@ public static function checkMimeType(string $data, string $type_pattern, bool $i
 		$mime_type = self::getMimeType($data, $is_path);
 
 		// Couldn't determine it.
-		if ($mime_type === false)
+		if ($mime_type === false) {
 			return 2;
+		}
 
 		// Check whether the MIME type matches expectations.
 		return (int) @preg_match('~' . $type_pattern . '~', $mime_type);
@@ -1835,21 +1743,23 @@ public static function checkMimeType(string $data, string $type_pattern, bool $i
 	public static function makeWritable(string $path): bool
 	{
 		// No file? no checks!
-		if (empty($path))
+		if (empty($path)) {
 			return false;
+		}
 
 		// Already writable?
-		if (is_writable($path))
+		if (is_writable($path)) {
 			return true;
+		}
 
 		// Set different modes.
-		$chmod_values = is_dir($path) ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
+		$chmod_values = is_dir($path) ? [0750, 0755, 0775, 0777] : [0644, 0664, 0666];
 
-		foreach ($chmod_values as $val)
-		{
+		foreach ($chmod_values as $val) {
 			// If it's writable now, we're done.
-			if (is_writable($path))
+			if (is_writable($path)) {
 				return true;
+			}
 
 			@chmod($path, $val);
 		}
@@ -1869,18 +1779,18 @@ public static function makeWritable(string $path): bool
 	public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = false): void
 	{
 		// If headers were already sent, anything we send now will be corrupted.
-		if (headers_sent())
+		if (headers_sent()) {
 			exit;
+		}
 
 		// Do we want to send an embedded thumbnail image?
-		if ($show_thumb && $file instanceof Attachment && $file->embedded_thumb && function_exists('exif_thumbnail'))
-		{
-			$thumb = array(
+		if ($show_thumb && $file instanceof Attachment && $file->embedded_thumb && function_exists('exif_thumbnail')) {
+			$thumb = [
 				'content' => exif_thumbnail($file->path, $width, $height, $type),
 				'filename' => $file->filename ?? null,
 				'mtime' => $file->mtime ?? null,
 				'disposition' => $file->disposition ?? 'attachment',
-			);
+			];
 			$thumb['size'] = strlen($thumb['content']);
 			$thumb['width'] = $width;
 			$thumb['height'] = $height;
@@ -1892,25 +1802,18 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 		}
 
 		// We always need a file size.
-		if (!isset($file['size']))
-		{
-			if (isset($file['content']))
-			{
+		if (!isset($file['size'])) {
+			if (isset($file['content'])) {
 				$file['size'] = strlen($file['content']);
-			}
-			elseif (isset($file['path']) && file_exists($file['path']))
-			{
+			} elseif (isset($file['path']) && file_exists($file['path'])) {
 				$file['size'] = filesize($file['path']);
-			}
-			else
-			{
+			} else {
 				exit;
 			}
 		}
 
 		// The file needs some sort of name.
-		if (!isset($file['filename']))
-		{
+		if (!isset($file['filename'])) {
 			$file['filename'] = hash_hmac('md5', var_export($file, true), Config::$image_proxy_secret) . '.' . ltrim($file['fileext'] ?? 'dat', '.');
 		}
 
@@ -1921,16 +1824,16 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 		$file['asciiname'] = preg_replace('/[\x{80}-\x{10FFFF}]+/u', '?', Utils::entityDecode($file['filename'], true));
 
 		// Replace ASCII names like ??????.jpg with something more unique.
-		if (strspn($file['asciiname'], '?') === strpos($file['asciiname'], '.'))
-		{
+		if (strspn($file['asciiname'], '?') === strpos($file['asciiname'], '.')) {
 			$file['asciiname'] = md5($file['filename']) . substr($file['asciiname'], strpos($file['asciiname'], '.'));
 		}
 
 		// Clear any output that was made before now.
 		header_remove();
 
-		while (@ob_get_level() > 0)
+		while (@ob_get_level() > 0) {
 			@ob_end_clean();
+		}
 
 		// Start a new output buffer.
 		$output_already_compressed = @ini_get('zlib.output_compression') > 0 || @ini_get('output_handler') == 'ob_gzhandler';
@@ -1946,22 +1849,19 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 		header('Content-Type: ' . ($file['content_type'] ?? ($file['mime_type'] ?? 'application/octet-stream')));
 		header('Content-Disposition: ' . ($file['disposition'] ?? 'attachment') . '; filename*=UTF-8\'\'' . rawurlencode($file['filename']) . '; filename="' . $file['asciiname'] . '"');
 
-		if (isset($file['etag']))
+		if (isset($file['etag'])) {
 			header('ETag: "' . $file['etag'] . '"');
+		}
 
 		// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-		if (isset($file['mime_type'], $file['fileext']) && strpos($file['mime_type'], 'image/') !== 0 && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		{
+		if (isset($file['mime_type'], $file['fileext']) && strpos($file['mime_type'], 'image/') !== 0 && in_array($file['fileext'], ['gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'])) {
 			header('Cache-Control: no-cache');
-		}
-		else
-		{
+		} else {
 			header('Cache-Control: max-age=' . (525600 * 60) . ', private');
 		}
 
 		// Multipart and resuming support
-		if (isset($_SERVER['HTTP_RANGE']))
-		{
+		if (isset($_SERVER['HTTP_RANGE'])) {
 			list($a, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2);
 			list($range) = explode(',', $range, 2);
 			list($range, $range_end) = explode('-', $range);
@@ -1972,9 +1872,7 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 			self::sendHttpStatus(206);
 			header('Content-Length: ' . $length);
 			header('Content-Range: bytes ' . $range . '-' . $range_end . '/' . $file['size']);
-		}
-		else
-		{
+		} else {
 			header('Content-Length: ' . $file['size']);
 		}
 
@@ -1986,33 +1884,27 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 		@set_time_limit(600);
 
 		// For multipart/resumable downloads, send the requested chunk(s) of the file
-		if (isset($_SERVER['HTTP_RANGE']))
-		{
+		if (isset($_SERVER['HTTP_RANGE'])) {
 			// 40 kilobytes is a good-ish amount
 			$chunksize = 40 * 1024;
 			$bytes_sent = 0;
 
-			if (isset($file['content']))
-			{
+			if (isset($file['content'])) {
 				$offset = $range;
 
-				while ($offset < $file['size'] && !connection_aborted() && $bytes_sent < $length)
-				{
+				while ($offset < $file['size'] && !connection_aborted() && $bytes_sent < $length) {
 					$buffer = substr($file['content'], $offset, $chunksize);
 					echo $buffer;
 					flush();
 					$bytes_sent += strlen($buffer);
 					$offset += strlen($buffer);
 				}
-			}
-			else
-			{
+			} else {
 				$fp = fopen($file['path'], 'rb');
 
 				fseek($fp, $range);
 
-				while (!feof($fp) && !connection_aborted() && $bytes_sent < $length)
-				{
+				while (!feof($fp) && !connection_aborted() && $bytes_sent < $length) {
 					$buffer = fread($fp, $chunksize);
 					echo $buffer;
 					flush();
@@ -2020,25 +1912,20 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 				}
 				fclose($fp);
 			}
-		}
-		else
-		{
+		} else {
 			// Since we don't do output compression for files this large...
-			if (!is_null($ob_handler) && $file['size'] > 4194304)
-			{
+			if (!is_null($ob_handler) && $file['size'] > 4194304) {
 				header_remove('Content-Encoding');
 
-				while (@ob_get_level() > 0)
+				while (@ob_get_level() > 0) {
 					@ob_end_clean();
+				}
 			}
 
 			// We were given the file content directly.
-			if (isset($file['content']))
-			{
+			if (isset($file['content'])) {
 				echo $file['content'];
-			}
-			else
-			{
+			} else {
 				$fp = fopen($file['path'], 'rb');
 				fpassthru($fp);
 				fclose($fp);
@@ -2057,10 +1944,11 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 	public static function sendHttpStatus(int $code, string $status = ''): void
 	{
 		// This will fail anyways if headers have been sent.
-		if (headers_sent())
+		if (headers_sent()) {
 			return;
+		}
 
-		$statuses = array(
+		$statuses = [
 			204 => 'No Content',
 			206 => 'Partial Content',
 			304 => 'Not Modified',
@@ -2070,7 +1958,7 @@ public static function sendHttpStatus(int $code, string $status = ''): void
 			410 => 'Gone',
 			500 => 'Internal Server Error',
 			503 => 'Service Unavailable',
-		);
+		];
 
 		$protocol = !empty($_SERVER['SERVER_PROTOCOL']) && preg_match('~^\s*(HTTP/[12]\.\d)\s*$~i', $_SERVER['SERVER_PROTOCOL'], $matches) ? $matches[1] : 'HTTP/1.0';
 
@@ -2078,12 +1966,9 @@ public static function sendHttpStatus(int $code, string $status = ''): void
 		Security::frameOptionsHeader();
 		Security::corsPolicyHeader();
 
-		if (!isset($statuses[$code]))
-		{
+		if (!isset($statuses[$code])) {
 			header($protocol . ' 500 Internal Server Error');
-		}
-		else
-		{
+		} else {
 			header($protocol . ' ' . $code . ' ' . (!empty($status) ? $status : $statuses[$code]));
 		}
 	}
@@ -2094,13 +1979,13 @@ public static function sendHttpStatus(int $code, string $status = ''): void
 	 *
 	 * @param string $data The data to print
 	 * @param string $type The content type. Defaults to JSON.
-	 * @return void
 	 */
 	public static function serverResponse($data = '', $type = 'Content-Type: application/json')
 	{
 		// Defensive programming anyone?
-		if (empty($data))
+		if (empty($data)) {
 			return false;
+		}
 
 		// Don't need extra stuff...
 		Config::$db_show_debug = false;
@@ -2108,12 +1993,9 @@ public static function serverResponse($data = '', $type = 'Content-Type: applica
 		// Kill anything else.
 		ob_end_clean();
 
-		if (!empty(Config::$modSettings['enableCompressedOutput']))
-		{
+		if (!empty(Config::$modSettings['enableCompressedOutput'])) {
 			@ob_start('ob_gzhandler');
-		}
-		else
-		{
+		} else {
 			ob_start();
 		}
 
@@ -2139,23 +2021,23 @@ public static function redirectexit(string $setLocation = '', bool $refresh = fa
 	{
 		// In case we have mail to send, better do that - as obExit doesn't always quite make it...
 		// @todo this relies on 'flush_mail' being only set in Mail::addToQueue itself... :\
-		if (!empty(Utils::$context['flush_mail']))
+		if (!empty(Utils::$context['flush_mail'])) {
 			Mail::addToQueue(true);
+		}
 
 		$add = preg_match('~^(ftp|http)s?://~', $setLocation) == 0 && substr($setLocation, 0, 6) != 'about:';
 
-		if ($add)
+		if ($add) {
 			$setLocation = Config::$scripturl . ($setLocation != '' ? '?' . $setLocation : '');
+		}
 
 		// Put the session ID in.
-		if (defined('SID') && SID != '')
-		{
-			$setLocation = preg_replace('/^' . preg_quote(Config::$scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', Config::$scripturl . '?' . SID . ';', $setLocation);
+		if (defined('SID') && SID != '') {
+			$setLocation = preg_replace('/^' . preg_quote(Config::$scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\??/', Config::$scripturl . '?' . SID . ';', $setLocation);
 		}
 		// Keep that debug in their for template debugging!
-		elseif (isset($_GET['debug']))
-		{
-			$setLocation = preg_replace('/^' . preg_quote(Config::$scripturl, '/') . '\\??/', Config::$scripturl . '?debug;', $setLocation);
+		elseif (isset($_GET['debug'])) {
+			$setLocation = preg_replace('/^' . preg_quote(Config::$scripturl, '/') . '\??/', Config::$scripturl . '?debug;', $setLocation);
 		}
 
 		if (
@@ -2170,41 +2052,36 @@ public static function redirectexit(string $setLocation = '', bool $refresh = fa
 				|| !empty(Utils::$context['server']['is_lighttpd'])
 				|| !empty(Utils::$context['server']['is_litespeed'])
 			)
-		)
-		{
-			if (defined('SID') && SID != '')
-			{
+		) {
+			if (defined('SID') && SID != '') {
 				$setLocation = preg_replace_callback(
 					'~^' . preg_quote(Config::$scripturl, '~') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
-					function($m)
-					{
-						return Config::$scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID . (isset($m[2]) ? "$m[2]" : "");
+					function ($m) {
+						return Config::$scripturl . '/' . strtr("{$m[1]}", '&;=', '//,') . '.html?' . SID . (isset($m[2]) ? "{$m[2]}" : '');
 					},
-					$setLocation
+					$setLocation,
 				);
-			}
-			else
-			{
+			} else {
 				$setLocation = preg_replace_callback(
 					'~^' . preg_quote(Config::$scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
-					function($m)
-					{
-						return Config::$scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
+					function ($m) {
+						return Config::$scripturl . '/' . strtr("{$m[1]}", '&;=', '//,') . '.html' . (isset($m[2]) ? "{$m[2]}" : '');
 					},
-					$setLocation
+					$setLocation,
 				);
 			}
 		}
 
 		// Maybe integrations want to change where we are heading?
-		IntegrationHook::call('integrate_redirect', array(&$setLocation, &$refresh, &$permanent));
+		IntegrationHook::call('integrate_redirect', [&$setLocation, &$refresh, &$permanent]);
 
 		// Set the header.
 		header('location: ' . str_replace(' ', '%20', $setLocation), true, $permanent ? 301 : 302);
 
 		// Debugging.
-		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true)
+		if (isset(Config::$db_show_debug) && Config::$db_show_debug === true) {
 			$_SESSION['debug_redirect'] = Db::$cache;
+		}
 
 		self::obExit(false);
 	}
@@ -2217,71 +2094,66 @@ function($m)
 	 * @param bool $from_index Whether we're coming from the board index
 	 * @param bool $from_fatal_error Whether we're coming from a fatal error
 	 */
-	public static function obExit(bool $header = null, bool $do_footer = null, bool $from_index = false, bool $from_fatal_error = false): void
+	public static function obExit(?bool $header = null, ?bool $do_footer = null, bool $from_index = false, bool $from_fatal_error = false): void
 	{
 		static $header_done = false, $footer_done = false, $level = 0, $has_fatal_error = false;
 
 		// Attempt to prevent a recursive loop.
 		++$level;
 
-		if ($level > 1 && !$from_fatal_error && !$has_fatal_error)
+		if ($level > 1 && !$from_fatal_error && !$has_fatal_error) {
 			exit;
+		}
 
-		if ($from_fatal_error)
+		if ($from_fatal_error) {
 			$has_fatal_error = true;
+		}
 
 		// Clear out the stat cache.
 		Logging::trackStats();
 
 		// If we have mail to send, send it.
 		// @todo this relies on 'flush_mail' being only set in Mail::addToQueue itself... :\
-		if (!empty(Utils::$context['flush_mail']))
+		if (!empty(Utils::$context['flush_mail'])) {
 			Mail::addToQueue(true);
+		}
 
 		$do_header = $header === null ? !$header_done : $header;
 
-		if ($do_footer === null)
+		if ($do_footer === null) {
 			$do_footer = $do_header;
+		}
 
 		// Has the template/header been done yet?
-		if ($do_header)
-		{
+		if ($do_header) {
 			// Was the page title set last minute? Also update the HTML safe one.
-			if (!empty(Utils::$context['page_title']) && empty(Utils::$context['page_title_html_safe']))
-			{
+			if (!empty(Utils::$context['page_title']) && empty(Utils::$context['page_title_html_safe'])) {
 				Utils::$context['page_title_html_safe'] = Utils::htmlspecialchars(html_entity_decode(Utils::$context['page_title'])) . (!empty(Utils::$context['current_page']) ? ' - ' . Lang::$txt['page'] . ' ' . (Utils::$context['current_page'] + 1) : '');
 			}
 
 			// Start up the session URL fixer.
 			ob_start('SMF\\QueryString::ob_sessrewrite');
 
-			if (!empty(Theme::$current->settings['output_buffers']) && is_string(Theme::$current->settings['output_buffers']))
-			{
+			if (!empty(Theme::$current->settings['output_buffers']) && is_string(Theme::$current->settings['output_buffers'])) {
 				$buffers = explode(',', Theme::$current->settings['output_buffers']);
-			}
-			elseif (!empty(Theme::$current->settings['output_buffers']))
-			{
+			} elseif (!empty(Theme::$current->settings['output_buffers'])) {
 				$buffers = Theme::$current->settings['output_buffers'];
-			}
-			else
-			{
-				$buffers = array();
+			} else {
+				$buffers = [];
 			}
 
-			if (isset(Config::$modSettings['integrate_buffer']))
-			{
+			if (isset(Config::$modSettings['integrate_buffer'])) {
 				$buffers = array_merge(explode(',', Config::$modSettings['integrate_buffer']), $buffers);
 			}
 
-			if (!empty($buffers))
-			{
-				foreach ($buffers as $function)
-				{
+			if (!empty($buffers)) {
+				foreach ($buffers as $function) {
 					$call = Utils::getCallable($function);
 
 					// Is it valid?
-					if (!empty($call))
+					if (!empty($call)) {
 						ob_start($call);
+					}
 				}
 			}
 
@@ -2290,41 +2162,41 @@ public static function obExit(bool $header = null, bool $do_footer = null, bool
 			$header_done = true;
 		}
 
-		if ($do_footer)
-		{
-			Theme::loadSubTemplate(isset(Utils::$context['sub_template']) ? Utils::$context['sub_template'] : 'main');
+		if ($do_footer) {
+			Theme::loadSubTemplate(Utils::$context['sub_template'] ?? 'main');
 
 			// Anything special to put out?
-			if (!empty(Utils::$context['insert_after_template']) && !isset($_REQUEST['xml']))
-			{
+			if (!empty(Utils::$context['insert_after_template']) && !isset($_REQUEST['xml'])) {
 				echo Utils::$context['insert_after_template'];
 			}
 
 			// Just so we don't get caught in an endless loop of errors from the footer...
-			if (!$footer_done)
-			{
+			if (!$footer_done) {
 				$footer_done = true;
 				Theme::template_footer();
 
 				// (since this is just debugging... it's okay that it's after </html>.)
-				if (!isset($_REQUEST['xml']))
+				if (!isset($_REQUEST['xml'])) {
 					Logging::displayDebug();
+				}
 			}
 		}
 
 		// Remember this URL in case someone doesn't like sending HTTP_REFERER.
-		if (!QueryString::isFilteredRequest(Forum::$unlogged_actions, 'action'))
+		if (!QueryString::isFilteredRequest(Forum::$unlogged_actions, 'action')) {
 			$_SESSION['old_url'] = $_SERVER['REQUEST_URL'];
+		}
 
 		// For session check verification.... don't switch browsers...
 		$_SESSION['USER_AGENT'] = empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'];
 
 		// Hand off the output to the portal, etc. we're integrated with.
-		IntegrationHook::call('integrate_exit', array($do_footer));
+		IntegrationHook::call('integrate_exit', [$do_footer]);
 
 		// Don't exit if we're coming from index.php; that will pass through normally.
-		if (!$from_index)
+		if (!$from_index) {
 			exit;
+		}
 	}
 
 	/**
@@ -2338,24 +2210,25 @@ public static function obExit(bool $header = null, bool $do_footer = null, bool
 	 * @param mixed $input Input to parse to find a callable.
 	 * @return string|array|bool Either a callable, or false on failure.
 	 */
-	public static function getCallable(mixed $input, bool $ignore_errors = null): mixed
+	public static function getCallable(mixed $input, ?bool $ignore_errors = null): mixed
 	{
 		$ignore_errors = $ignore_errors ?? !empty(Utils::$context['ignore_hook_errors']);
 
 		// Really?
-		if (empty($input))
+		if (empty($input)) {
 			return false;
+		}
 
 		// An array? should be a "callable" array IE array(object/class, valid_callable).
 		// A closure? should be a callable one.
-		if (is_array($input) || $input instanceof Closure)
-		{
+		if (is_array($input) || $input instanceof Closure) {
 			return is_callable($input) ? $input : false;
 		}
 
 		// No full objects, sorry! pass a method or a property instead!
-		if (is_object($input))
+		if (is_object($input)) {
 			return false;
+		}
 
 		// Stay vitaminized my friends...
 		$input = Utils::htmlspecialchars(Utils::htmlTrim($input));
@@ -2364,58 +2237,55 @@ public static function getCallable(mixed $input, bool $ignore_errors = null): mi
 		$input = self::loadFile($input);
 
 		// Loaded file failed
-		if (empty($input))
+		if (empty($input)) {
 			return false;
+		}
 
 		// Found a method.
-		if (strpos($input, '::') !== false)
-		{
+		if (strpos($input, '::') !== false) {
 			list($class, $method) = explode('::', $input);
 
 			// Check if a new object will be created.
-			if (strpos($method, '#') !== false)
-			{
-				if (!isset(Utils::$context['instances']))
-					Utils::$context['instances'] = array();
+			if (strpos($method, '#') !== false) {
+				if (!isset(Utils::$context['instances'])) {
+					Utils::$context['instances'] = [];
+				}
 
 				// Need to remove the # thing.
 				$method = str_replace('#', '', $method);
 
 				// Don't need to create a new instance for every method.
-				if (empty(Utils::$context['instances'][$class]) || !(Utils::$context['instances'][$class] instanceof $class))
-				{
-					Utils::$context['instances'][$class] = new $class;
+				if (empty(Utils::$context['instances'][$class]) || !(Utils::$context['instances'][$class] instanceof $class)) {
+					Utils::$context['instances'][$class] = new $class();
 
 					// Add another one to the list.
-					if (Config::$db_show_debug === true)
-					{
-						if (!isset(Utils::$context['debug']['instances']))
-							Utils::$context['debug']['instances'] = array();
+					if (Config::$db_show_debug === true) {
+						if (!isset(Utils::$context['debug']['instances'])) {
+							Utils::$context['debug']['instances'] = [];
+						}
 
 						Utils::$context['debug']['instances'][$class] = $class;
 					}
 				}
 
-				$callable = array(Utils::$context['instances'][$class], $method);
+				$callable = [Utils::$context['instances'][$class], $method];
 			}
 			// Right then. This is a call to a static method.
-			else
-			{
-				$callable = array($class, $method);
+			else {
+				$callable = [$class, $method];
 			}
 		}
 		// Nope! just a plain regular function.
-		else
-		{
+		else {
 			$callable = $input;
 		}
 
 		// Right, we got what we need, time to do some checks.
-		if (!is_callable($callable, false, $callable_name) && $ignore_errors)
-		{
+		if (!is_callable($callable, false, $callable_name) && $ignore_errors) {
 			// We can't call this helper, but we want to silently ignore this.
-			if ($ignore_errors)
+			if ($ignore_errors) {
 				return false;
+			}
 
 			// Gotta tell everybody.
 			Lang::load('Errors');
@@ -2435,7 +2305,7 @@ public static function getCallable(mixed $input, bool $ignore_errors = null): mi
 	 * this method..
 	 *
 	 * @param mixed $input Input to parse to find a callable.
-	 * @param boolean $return If true, just return the callable instead of
+	 * @param bool $return If true, just return the callable instead of
 	 *    calling it. Default: false.
 	 * @return mixed If $return is false, nothing. Otherwise, either a callable
 	 *    or false if no callable was found.
@@ -2445,8 +2315,9 @@ public static function call_helper(mixed $input, bool $return = false): mixed
 		$callable = self::getCallable($input);
 
 		// Just return the callable if that's all we were asked to do.
-		if ($return)
+		if ($return) {
 			return $callable;
+		}
 
 		call_user_func($func);
 	}
@@ -2470,12 +2341,12 @@ public static function replaceEntities__callback($matches)
 	{
 		return strtr(
 			htmlspecialchars(Utils::entityDecode($matches[1], true), ENT_QUOTES),
-			array(
+			[
 				'&amp;' => '&#038;',
 				'&quot;' => '&#034;',
 				'&lt;' => '&#060;',
 				'&gt;' => '&#062;',
-			)
+			],
 		);
 	}
 
@@ -2529,12 +2400,11 @@ public static function entity_fix__callback($matches)
 	 */
 	final protected static function fixUtf8mb4(string $string): string
 	{
-		if (class_exists('SMF\\Db\\DatabaseApi', false) && isset(Db\DatabaseApi::$db) && Db\DatabaseApi::$db->mb4)
-		{
+		if (class_exists('SMF\\Db\\DatabaseApi', false) && isset(Db\DatabaseApi::$db) && Db\DatabaseApi::$db->mb4) {
 			return $string;
 		}
 
-		return mb_encode_numericentity($string, array(0x010000, 0x10FFFF, 0, 0xFFFFFF), 'UTF-8');
+		return mb_encode_numericentity($string, [0x010000, 0x10FFFF, 0, 0xFFFFFF], 'UTF-8');
 	}
 
 	/**
@@ -2558,42 +2428,37 @@ final protected static function fixUtf8mb4(string $string): string
 	 */
 	final protected static function loadFile(string $string): string|bool
 	{
-		if (empty($string))
+		if (empty($string)) {
 			return false;
+		}
 
-		if (strpos($string, '|') !== false)
-		{
+		if (strpos($string, '|') !== false) {
 			list($file, $string) = explode('|', $string);
 
-			$path = strtr($file, array(
+			$path = strtr($file, [
 				'$boarddir' => Config::$boarddir,
 				'$sourcedir' => Config::$sourcedir,
-			));
+			]);
 
-			if (strpos($path, '$themedir') !== false && class_exists('SMF\\Theme', false) && !empty(Theme::$current->settings['theme_dir']))
-			{
-				$path = strtr($path, array(
+			if (strpos($path, '$themedir') !== false && class_exists('SMF\\Theme', false) && !empty(Theme::$current->settings['theme_dir'])) {
+				$path = strtr($path, [
 					'$themedir' => Theme::$current->settings['theme_dir'],
-				));
+				]);
 			}
 
 			// Load the file if it can be loaded.
-			if (is_file($path))
-			{
-				require_once($path);
+			if (is_file($path)) {
+				require_once $path;
 			}
 			// No? Try a fallback to Config::$sourcedir.
-			else
-			{
+			else {
 				$path = Config::$sourcedir . '/' . $file;
 
-				if (is_file($path))
-				{
-					require_once($path);
+				if (is_file($path)) {
+					require_once $path;
 				}
 				// Sorry, can't do much for you at this point.
-				elseif (empty(Utils::$context['uninstalling']))
-				{
+				elseif (empty(Utils::$context['uninstalling'])) {
 					Lang::load('Errors');
 					ErrorHandler::log(sprintf(Lang::$txt['hook_fail_loading_file'], $path), 'general');
 
@@ -2608,7 +2473,8 @@ final protected static function loadFile(string $string): string|bool
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Utils::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Utils::exportStatic')) {
 	Utils::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/Verifier.php b/Sources/Verifier.php
index 00d14e9036..84da07d74d 100644
--- a/Sources/Verifier.php
+++ b/Sources/Verifier.php
@@ -23,18 +23,19 @@
  */
 class Verifier implements \ArrayAccess
 {
-	use BackwardCompatibility, ArrayAccessHelper;
+	use BackwardCompatibility;
+	use ArrayAccessHelper;
 
 	/**
 	 * @var array
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'create' => 'create_control_verification',
-		),
-	);
+		],
+	];
 
 	/*****************
 	 * Class constants
@@ -42,7 +43,7 @@ class Verifier implements \ArrayAccess
 
 	// Force a refresh after this many failed attempts.
 	// This helps prevent bots from solving via brute force attacks.
-	const MAX_ATTEMPTS = 3;
+	public const MAX_ATTEMPTS = 3;
 
 	/*******************
 	 * Public properties
@@ -130,7 +131,7 @@ class Verifier implements \ArrayAccess
 	 *
 	 * Error messages about any problems encountered during setup.
 	 */
-	public array $errors = array();
+	public array $errors = [];
 
 	/**
 	 * @var bool
@@ -156,7 +157,7 @@ class Verifier implements \ArrayAccess
 	 *
 	 * All loaded instances of this class.
 	 */
-	public static array $loaded = array();
+	public static array $loaded = [];
 
 	/**
 	 * @var string
@@ -194,7 +195,7 @@ class Verifier implements \ArrayAccess
 	public function __construct(array $options, bool $do_test = false)
 	{
 		// Add a verification hook, pre-setup.
-		IntegrationHook::call('integrate_create_control_verification_pre', array(&$options, $do_test));
+		IntegrationHook::call('integrate_create_control_verification_pre', [&$options, $do_test]);
 
 		// Always need an ID. If someone forgot to provide it, fall back to the
 		// current action (but trim off any trailing '2' in the action name).
@@ -203,8 +204,7 @@ public function __construct(array $options, bool $do_test = false)
 		self::$vid = $this->id;
 
 		// Make sure that we don't overwrite previous values.
-		if (isset(self::$loaded[$this->id]))
-		{
+		if (isset(self::$loaded[$this->id])) {
 			$this->show_visual = self::$loaded[$this->id]->show_visual;
 			$this->image_href = self::$loaded[$this->id]->image_href;
 			$this->text_value = self::$loaded[$this->id]->text_value;
@@ -213,14 +213,12 @@ public function __construct(array $options, bool $do_test = false)
 			$this->can_recaptcha = self::$loaded[$this->id]->can_recaptcha;
 			$this->empty_field = self::$loaded[$this->id]->empty_field;
 			$this->max_errors = self::$loaded[$this->id]->max_errors;
-		}
-		else
-		{
+		} else {
 			$this->show_visual = !empty($options['override_visual']) || (!empty(Config::$modSettings['visual_verification_type']) && !isset($options['override_visual']));
 			$this->image_href = Config::$scripturl . '?action=verificationcode;vid=' . $this->id . ';rand=' . bin2hex(Utils::randomBytes(16));
 			$this->text_value = '';
 			$this->number_questions = $options['override_qs'] ?? (!empty(Config::$modSettings['qa_verification_number']) ? Config::$modSettings['qa_verification_number'] : 0);
-			$this->questions = array();
+			$this->questions = [];
 			$this->can_recaptcha = !empty(Config::$modSettings['recaptcha_enabled']) && !empty(Config::$modSettings['recaptcha_site_key']) && !empty(Config::$modSettings['recaptcha_secret_key']);
 			$this->empty_field = empty($options['no_empty_field']);
 			$this->max_errors = $options['max_errors'] ?? 3;
@@ -229,49 +227,46 @@ public function __construct(array $options, bool $do_test = false)
 		$this->init($this->show_visual);
 
 		// Is there actually going to be anything?
-		if (empty($this->show_visual) && empty($this->number_questions) && empty($this->can_recaptcha))
-		{
+		if (empty($this->show_visual) && empty($this->number_questions) && empty($this->can_recaptcha)) {
 			$this->result = false;
 		}
 		// Already loaded and not checking answers, so we are done.
-		elseif (isset(self::$loaded[$this->id]) && !$this->do_test)
-		{
+		elseif (isset(self::$loaded[$this->id]) && !$this->do_test) {
 			$this->result = true;
 		}
 		// This is new one, or we are updating it, or we are checking answers.
-		else
-		{
+		else {
 			self::$loaded[$this->id] = $this;
 
 			$this->sanitizeReCaptcha();
 			$this->addCaptchaJavaScript();
 			$this->loadQuestionCache();
 
-			if (!isset($_SESSION[$this->id . '_vv']))
-				$_SESSION[$this->id . '_vv'] = array();
+			if (!isset($_SESSION[$this->id . '_vv'])) {
+				$_SESSION[$this->id . '_vv'] = [];
+			}
 
 			// Start with any testing.
-			if ($do_test)
+			if ($do_test) {
 				$this->test();
+			}
 
 			// Are we refreshing then?
 			// (We might need to even if 'dont_refresh' was requested.)
-			if ($this->shouldRefresh(!empty($options['dont_refresh']), $do_test))
-			{
+			if ($this->shouldRefresh(!empty($options['dont_refresh']), $do_test)) {
 				$this->refresh();
-			}
-			else
-			{
+			} else {
 				// Same questions as before.
-				$this->question_ids = !empty($_SESSION[$this->id . '_vv']['q']) ? $_SESSION[$this->id . '_vv']['q'] : array();
+				$this->question_ids = !empty($_SESSION[$this->id . '_vv']['q']) ? $_SESSION[$this->id . '_vv']['q'] : [];
 
 				$this->text_value = !empty($_REQUEST[$this->id . '_vv']['code']) ? Utils::htmlspecialchars($_REQUEST[$this->id . '_vv']['code']) : '';
 			}
 
 			// If we do have an empty field, it would be nice to hide it from
 			// legitimate users who shouldn't be populating it anyway.
-			if (!empty($_SESSION[$this->id . '_vv']['empty_field']))
+			if (!empty($_SESSION[$this->id . '_vv']['empty_field'])) {
 				Theme::addInlineCss('.vv_special { display: none; }');
+			}
 
 			// Do we have some questions to load?
 			$this->setQuestions();
@@ -280,23 +275,24 @@ public function __construct(array $options, bool $do_test = false)
 			$_SESSION[$this->id . '_vv']['count']++;
 
 			// Let our hooks know that we are done with the verification process.
-			IntegrationHook::call('integrate_create_control_verification_post', array(&$this->errors, $do_test));
+			IntegrationHook::call('integrate_create_control_verification_post', [&$this->errors, $do_test]);
 
 			// Return errors if we have them.
-			if (!empty($this->errors))
-			{
+			if (!empty($this->errors)) {
 				// Backward compatibility.
 				Utils::$context['require_verification'] = $this->errors;
 				Utils::$context['visual_verification'] = $this->result;
 				Utils::$context['visual_verification_id'] = $this->id;
 
 				$this->result = true;
+
 				return;
 			}
 
 			// If they passed the test, make a note.
-			if ($do_test)
+			if ($do_test) {
 				$_SESSION[$this->id . '_vv']['did_pass'] = true;
+			}
 
 			// Say that everything went well, chaps.
 			$this->result = true;
@@ -322,8 +318,9 @@ public static function create(&$options, $do_test = false)
 	{
 		$obj = new self($options, $do_test);
 
-		foreach ($options as $key => $value)
+		foreach ($options as $key => $value) {
 			$options[$key] = $obj->$key;
+		}
 
 		return !empty($obj->errors) ? $obj->errors : $obj->result;
 	}
@@ -341,13 +338,14 @@ protected function init(): void
 		Theme::loadTemplate('GenericControls');
 
 		// Some javascript ma'am?
-		if ($this->show_visual && !in_array('smf_captcha', Utils::$context['javascript_files']))
-			Theme::loadJavaScriptFile('captcha.js', array('minimize' => true), 'smf_captcha');
+		if ($this->show_visual && !in_array('smf_captcha', Utils::$context['javascript_files'])) {
+			Theme::loadJavaScriptFile('captcha.js', ['minimize' => true], 'smf_captcha');
+		}
 
 		Utils::$context['use_graphic_library'] = extension_loaded('gd');
 
 		// Skip I, J, L, O, Q, S and Z.
-		Utils::$context['standard_captcha_range'] = array_merge(range('A', 'H'), array('K', 'M', 'N', 'P', 'R'), range('T', 'Y'));
+		Utils::$context['standard_captcha_range'] = array_merge(range('A', 'H'), ['K', 'M', 'N', 'P', 'R'], range('T', 'Y'));
 
 		// Backward compatibility.
 		Utils::$context['controls']['verification'] = &self::$loaded;
@@ -358,8 +356,9 @@ protected function init(): void
 	 */
 	protected function sanitizeReCaptcha(): void
 	{
-		if (!$this->can_recaptcha)
+		if (!$this->can_recaptcha) {
 			return;
+		}
 
 		// Only allow 40 alphanumeric, underscore, and dash characters.
 		$this->recaptcha_site_key = substr(preg_replace('/\W/', '', Config::$modSettings['recaptcha_site_key']), 0, 40);
@@ -373,14 +372,14 @@ protected function sanitizeReCaptcha(): void
 	 */
 	protected function addCaptchaJavaScript(): void
 	{
-		if (!$this->show_visual)
+		if (!$this->show_visual) {
 			return;
+		}
 
 		Utils::$context['insert_after_template'] .= '
 		<script>
 			var verification' . $this->id . 'Handle = new smfCaptcha("' . $this->image_href . '", "' . $this->id . '", ' . (Utils::$context['use_graphic_library'] ? 1 : 0) . ');
 		</script>';
-
 	}
 
 	/**
@@ -388,31 +387,33 @@ protected function addCaptchaJavaScript(): void
 	 */
 	protected function loadQuestionCache(): void
 	{
-		if (empty($this->number_questions) || !empty(Config::$modSettings['question_id_cache']))
+		if (empty($this->number_questions) || !empty(Config::$modSettings['question_id_cache'])) {
 			return;
+		}
 
-		if ((Config::$modSettings['question_id_cache'] = CacheApi::get('verificationQuestions', 300)) == null)
-		{
-			Config::$modSettings['question_id_cache'] = array(
-				'questions' => array(),
-				'langs' => array(),
-			);
+		if ((Config::$modSettings['question_id_cache'] = CacheApi::get('verificationQuestions', 300)) == null) {
+			Config::$modSettings['question_id_cache'] = [
+				'questions' => [],
+				'langs' => [],
+			];
 
-			$request = Db::$db->query('', '
-				SELECT id_question, lngfile, question, answers
+			$request = Db::$db->query(
+				'',
+				'SELECT id_question, lngfile, question, answers
 				FROM {db_prefix}qanda',
-				array()
+				[],
 			);
-			while ($row = Db::$db->fetch_assoc($request))
-			{
+
+			while ($row = Db::$db->fetch_assoc($request)) {
 				$id_question = $row['id_question'];
 
 				unset($row['id_question']);
 
 				$row['answers'] = (array) Utils::jsonDecode($row['answers'], true);
 
-				foreach ($row['answers'] as $k => $v)
+				foreach ($row['answers'] as $k => $v) {
 					$row['answers'][$k] = Utils::convertCase($v, 'fold');
+				}
 
 				Config::$modSettings['question_id_cache']['questions'][$id_question] = $row;
 				Config::$modSettings['question_id_cache']['langs'][$row['lngfile']][] = $id_question;
@@ -429,75 +430,71 @@ protected function loadQuestionCache(): void
 	protected function test(): void
 	{
 		// This cannot happen!
-		if (!isset($_SESSION[$this->id . '_vv']['count']))
+		if (!isset($_SESSION[$this->id . '_vv']['count'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// Hmm, it's requested but not actually declared. This shouldn't happen.
-		if ($this->empty_field && empty($_SESSION[$this->id . '_vv']['empty_field']))
+		if ($this->empty_field && empty($_SESSION[$this->id . '_vv']['empty_field'])) {
 			ErrorHandler::fatalLang('no_access', false);
+		}
 
 		// While we're here, did the user do something bad?
-		if ($this->empty_field && !empty($_SESSION[$this->id . '_vv']['empty_field']) && !empty($_REQUEST[$_SESSION[$this->id . '_vv']['empty_field']]))
-		{
+		if ($this->empty_field && !empty($_SESSION[$this->id . '_vv']['empty_field']) && !empty($_REQUEST[$_SESSION[$this->id . '_vv']['empty_field']])) {
 			$this->errors[] = 'wrong_verification_answer';
 		}
 
-		if ($this->can_recaptcha)
-		{
+		if ($this->can_recaptcha) {
 			$reCaptcha = new \ReCaptcha\ReCaptcha(Config::$modSettings['recaptcha_secret_key'], new \ReCaptcha\RequestMethod\SocketPost());
 
 			// Was there a reCAPTCHA response?
-			if (isset($_POST['g-recaptcha-response']))
-			{
+			if (isset($_POST['g-recaptcha-response'])) {
 				$resp = $reCaptcha->verify($_POST['g-recaptcha-response'], User::$me->ip);
 
-				if (!$resp->isSuccess())
+				if (!$resp->isSuccess()) {
 					$this->errors[] = 'wrong_verification_recaptcha';
-			}
-			else
-			{
+				}
+			} else {
 				$this->errors[] = 'wrong_verification_code';
 			}
 		}
 
-		if ($this->show_visual && (empty($_REQUEST[$this->id . '_vv']['code']) || empty($_SESSION[$this->id . '_vv']['code']) || strtoupper($_REQUEST[$this->id . '_vv']['code']) !== $_SESSION[$this->id . '_vv']['code']))
-		{
+		if ($this->show_visual && (empty($_REQUEST[$this->id . '_vv']['code']) || empty($_SESSION[$this->id . '_vv']['code']) || strtoupper($_REQUEST[$this->id . '_vv']['code']) !== $_SESSION[$this->id . '_vv']['code'])) {
 			$this->errors[] = 'wrong_verification_code';
 		}
 
-		if ($this->number_questions > 0)
-		{
-			$incorrectQuestions = array();
+		if ($this->number_questions > 0) {
+			$incorrectQuestions = [];
 
-			foreach ($_SESSION[$this->id . '_vv']['q'] as $q)
-			{
+			foreach ($_SESSION[$this->id . '_vv']['q'] as $q) {
 				// We don't have this question any more, thus no answers.
-				if (!isset(Config::$modSettings['question_id_cache']['questions'][$q]))
+				if (!isset(Config::$modSettings['question_id_cache']['questions'][$q])) {
 					continue;
+				}
 
 				// We have our question but it might have multiple answers.
 				// First, did they actually answer this question?
-				if (!isset($_REQUEST[$this->id . '_vv']['q'][$q]) || trim($_REQUEST[$this->id . '_vv']['q'][$q]) == '')
-				{
+				if (!isset($_REQUEST[$this->id . '_vv']['q'][$q]) || trim($_REQUEST[$this->id . '_vv']['q'][$q]) == '') {
 					$incorrectQuestions[] = $q;
+
 					continue;
 				}
 
 				// Second, is their answer in the list of possible answers?
 				$given_answer = trim(Utils::htmlspecialchars(Utils::convertCase($_REQUEST[$this->id . '_vv']['q'][$q], 'fold')));
 
-				if (!in_array($given_answer, Config::$modSettings['question_id_cache']['questions'][$q]['answers']))
-				{
+				if (!in_array($given_answer, Config::$modSettings['question_id_cache']['questions'][$q]['answers'])) {
 					$incorrectQuestions[] = $q;
 				}
 			}
 
-			if (!empty($incorrectQuestions))
+			if (!empty($incorrectQuestions)) {
 				$this->errors[] = 'wrong_verification_answer';
+			}
 		}
 
 		// Do ay hooks have something to say about this verification?
-		IntegrationHook::call('integrate_create_control_verification_test', array($this, &$this->errors));
+		IntegrationHook::call('integrate_create_control_verification_test', [$this, &$this->errors]);
 	}
 
 	/**
@@ -518,21 +515,17 @@ protected function shouldRefresh(bool $only_if_necessary, bool $do_test): bool
 		$should_refresh = !$only_if_necessary && !$do_test && (!empty($_SESSION[$this->id . '_vv']['did_pass']) || empty($_SESSION[$this->id . '_vv']['count']) || $_SESSION[$this->id . '_vv']['count'] > self::MAX_ATTEMPTS);
 
 		// This can also force a fresh, although unlikely.
-		if (($this->show_visual && empty($_SESSION[$this->id . '_vv']['code'])) || ($this->number_questions > 0 && empty($_SESSION[$this->id . '_vv']['q'])))
-		{
+		if (($this->show_visual && empty($_SESSION[$this->id . '_vv']['code'])) || ($this->number_questions > 0 && empty($_SESSION[$this->id . '_vv']['q']))) {
 			$should_refresh = true;
 		}
 
 		// Any errors means we refresh potentially.
-		if (!empty($this->errors))
-		{
-			if (empty($_SESSION[$this->id . '_vv']['errors']))
-			{
+		if (!empty($this->errors)) {
+			if (empty($_SESSION[$this->id . '_vv']['errors'])) {
 				$_SESSION[$this->id . '_vv']['errors'] = 0;
 			}
 			// Too many errors?
-			elseif ($_SESSION[$this->id . '_vv']['errors'] > $this->max_errors)
-			{
+			elseif ($_SESSION[$this->id . '_vv']['errors'] > $this->max_errors) {
 				$should_refresh = true;
 			}
 
@@ -552,16 +545,15 @@ protected function refresh(): void
 		$_SESSION[$this->id . '_vv']['count'] = 0;
 		$_SESSION[$this->id . '_vv']['errors'] = 0;
 		$_SESSION[$this->id . '_vv']['did_pass'] = false;
-		$_SESSION[$this->id . '_vv']['q'] = array();
+		$_SESSION[$this->id . '_vv']['q'] = [];
 		$_SESSION[$this->id . '_vv']['code'] = '';
 
 		// Make our magic empty field.
-		if ($this->empty_field)
-		{
+		if ($this->empty_field) {
 			// We're building a field that lives in the template, that we hope to be empty later. But at least we give it a believable name.
-			$terms = array('gadget', 'device', 'uid', 'gid', 'guid', 'uuid', 'unique', 'identifier');
+			$terms = ['gadget', 'device', 'uid', 'gid', 'guid', 'uuid', 'unique', 'identifier'];
 
-			$second_terms = array('hash', 'cipher', 'code', 'key', 'unlock', 'bit', 'value');
+			$second_terms = ['hash', 'cipher', 'code', 'key', 'unlock', 'bit', 'value'];
 
 			$start = Utils::randomInt(0, 27);
 
@@ -571,39 +563,36 @@ protected function refresh(): void
 		}
 
 		// Generating a new image.
-		if ($this->show_visual)
-		{
+		if ($this->show_visual) {
 			// Are we overriding the range?
 			$character_range = !empty($options['override_range']) ? $options['override_range'] : Utils::$context['standard_captcha_range'];
 
-			for ($i = 0; $i < 6; $i++)
-			{
+			for ($i = 0; $i < 6; $i++) {
 				$_SESSION[$this->id . '_vv']['code'] .= $character_range[array_rand($character_range)];
 			}
 		}
 
 		// Getting some new questions?
-		if ($this->number_questions)
-		{
+		if ($this->number_questions) {
 			// Attempt to try the current page's language, followed by the user's preference, followed by the site default.
-			$possible_langs = array();
+			$possible_langs = [];
 
-			if (isset($_SESSION['language']))
-				$possible_langs[] = strtr($_SESSION['language'], array('-utf8' => ''));
+			if (isset($_SESSION['language'])) {
+				$possible_langs[] = strtr($_SESSION['language'], ['-utf8' => '']);
+			}
 
-			if (!empty(User::$me->language))
+			if (!empty(User::$me->language)) {
 				$possible_langs[] = User::$me->language;
+			}
 
 			$possible_langs[] = Lang::$default;
 
-			$this->question_ids = array();
+			$this->question_ids = [];
 
-			foreach ($possible_langs as $lang)
-			{
-				$lang = strtr($lang, array('-utf8' => ''));
+			foreach ($possible_langs as $lang) {
+				$lang = strtr($lang, ['-utf8' => '']);
 
-				if (isset(Config::$modSettings['question_id_cache']['langs'][$lang]))
-				{
+				if (isset(Config::$modSettings['question_id_cache']['langs'][$lang])) {
 					// If we find questions for this, grab the ids from this language's ones, randomize the array and take just the number we need.
 					$this->question_ids = Config::$modSettings['question_id_cache']['langs'][$lang];
 
@@ -617,7 +606,7 @@ protected function refresh(): void
 		}
 
 		// Hooks may need to know about this.
-		IntegrationHook::call('integrate_create_control_verification_refresh', array($this));
+		IntegrationHook::call('integrate_create_control_verification_refresh', [$this]);
 	}
 
 	/**
@@ -626,23 +615,23 @@ protected function refresh(): void
 	protected function setQuestions(): void
 	{
 		// Have we got some questions to load?
-		if (empty($this->question_ids))
+		if (empty($this->question_ids)) {
 			return;
+		}
 
-		$_SESSION[$this->id . '_vv']['q'] = array();
+		$_SESSION[$this->id . '_vv']['q'] = [];
 
-		foreach ($this->question_ids as $q)
-		{
+		foreach ($this->question_ids as $q) {
 			// Bit of a shortcut this.
 			$row = &Config::$modSettings['question_id_cache']['questions'][$q];
 
-			$this->questions[] = array(
+			$this->questions[] = [
 				'id' => $q,
 				'q' => BBCodeParser::load()->parse($row['question']),
 				'is_error' => !empty($incorrectQuestions) && in_array($q, $incorrectQuestions),
 				// Remember a previous submission?
 				'a' => isset($_REQUEST[$this->id . '_vv'], $_REQUEST[$this->id . '_vv']['q'], $_REQUEST[$this->id . '_vv']['q'][$q]) ? Utils::htmlspecialchars($_REQUEST[$this->id . '_vv']['q'][$q]) : '',
-			);
+			];
 
 			$_SESSION[$this->id . '_vv']['q'][] = $q;
 		}
@@ -650,7 +639,8 @@ protected function setQuestions(): void
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\Verifier::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\Verifier::exportStatic')) {
 	Verifier::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/WebFetch/APIs/CurlFetcher.php b/Sources/WebFetch/APIs/CurlFetcher.php
index 5fb37487ee..bce9611c01 100644
--- a/Sources/WebFetch/APIs/CurlFetcher.php
+++ b/Sources/WebFetch/APIs/CurlFetcher.php
@@ -83,7 +83,7 @@ class CurlFetcher extends WebFetchApi
 	 *
 	 * An array of curl options.
 	 */
-	public $user_options = array();
+	public $user_options = [];
 
 	/**
 	 * @var string
@@ -111,7 +111,7 @@ class CurlFetcher extends WebFetchApi
 	 *
 	 * Stores responses (url, code, error, headers, body, size).
 	 */
-	public $response = array();
+	public $response = [];
 
 	/**
 	 * @var string
@@ -129,7 +129,7 @@ class CurlFetcher extends WebFetchApi
 	 *
 	 * The default curl options to use.
 	 */
-	private $default_options = array(
+	private $default_options = [
 		// Get returned value as a string (don't output it).
 		CURLOPT_RETURNTRANSFER  => 1,
 
@@ -163,7 +163,7 @@ class CurlFetcher extends WebFetchApi
 
 		// No post data. This will change if some is passed to request().
 		CURLOPT_POST            => 0,
-	);
+	];
 
 	/****************
 	 * Public methods
@@ -177,7 +177,7 @@ class CurlFetcher extends WebFetchApi
 	 * @param array $options An array of curl options.
 	 * @param int $max_redirect Maximum number of redirects.
 	 */
-	public function __construct(array $options = array(), int $max_redirect = 3)
+	public function __construct(array $options = [], int $max_redirect = 3)
 	{
 		// Initialize class variables
 		$this->max_redirect = intval($max_redirect);
@@ -197,38 +197,38 @@ public function __construct(array $options = array(), int $max_redirect = 3)
 	 * @param array|string $post_data any post data as form name => value
 	 * @return object A reference to the object for method chaining.
 	 */
-	public function request(string $url, array|string $post_data = array()): object
+	public function request(string $url, array|string $post_data = []): object
 	{
 		$url = new Url($url, true);
 		$url->toAscii();
 
 		// If we can't do it, bail out.
-		if (!function_exists('curl_init'))
-		{
-			$this->response[] = array(
+		if (!function_exists('curl_init')) {
+			$this->response[] = [
 				'url' => (string) $url,
 				'success' => false,
 				'code' => null,
 				'error' => null,
-				'headers' => array(),
+				'headers' => [],
 				'body' => null,
 				'size' => 0,
-			);
+			];
 
 			return $this;
 		}
 
 		// Umm, this shouldn't happen?
-		if (empty($url->scheme) || !in_array($url->scheme, array('http', 'https')))
-		{
+		if (empty($url->scheme) || !in_array($url->scheme, ['http', 'https'])) {
 			Lang::load('Errors');
 			trigger_error(sprintf(Lang::$txt['fetch_web_data_bad_url'], __METHOD__), E_USER_NOTICE);
+
 			return $this;
 		}
 
 		// POSTing some data perhaps?
-		if (!empty($post_data))
+		if (!empty($post_data)) {
 			$this->post_data = $this->buildPostData($post_data);
+		}
 
 		// Set the options and get it.
 		$this->setOptions();
@@ -246,15 +246,16 @@ public function request(string $url, array|string $post_data = array()): object
 	 * @param string $area Used to return an area such as body, header, error.
 	 * @return mixed The response
 	 */
-	public function result(string $area = null): mixed
+	public function result(?string $area = null): mixed
 	{
 		$max_result = count($this->response) - 1;
 
 		// Just return a specifed area or the entire result?
-		if (empty($area))
+		if (empty($area)) {
 			return $this->response[$max_result];
+		}
 
-		return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		return $this->response[$max_result][$area] ?? $this->response[$max_result];
 	}
 
 	/**
@@ -266,17 +267,15 @@ public function result(string $area = null): mixed
 	 * @param int $response_number Which response to get, or null for all.
 	 * @return array The specified response or all the responses.
 	 */
-	public function resultRaw(int $response_number = null): array
+	public function resultRaw(?int $response_number = null): array
 	{
-		if (!isset($response_number))
-		{
+		if (!isset($response_number)) {
 			return $this->response;
 		}
-		else
-		{
-			$response_number = min($response_number, count($this->response) - 1);
-			return $this->response[$response_number];
-		}
+
+		$response_number = min($response_number, count($this->response) - 1);
+
+		return $this->response[$response_number];
 	}
 
 	/******************
@@ -297,16 +296,16 @@ public function resultRaw(int $response_number = null): array
 	private function sendRequest(string $url, bool $redirect = false): void
 	{
 		// We do have a url, I hope.
-		if ($url == '')
+		if ($url == '') {
 			return;
+		}
 
 		$this->options[CURLOPT_URL] = $url;
 
 		// If we have not already been redirected, set it up so we can if needed.
-		if (!$redirect)
-		{
+		if (!$redirect) {
 			$this->current_redirect = 1;
-			$this->response = array();
+			$this->response = [];
 		}
 
 		// Initialize the curl object and make the call.
@@ -326,19 +325,18 @@ private function sendRequest(string $url, bool $redirect = false): void
 		curl_close($cr);
 
 		// Store this loop's data, someone may want all of these. :O
-		$this->response[] = array(
+		$this->response[] = [
 			'url' => $url,
 			'success' => $error === false && $body !== false,
 			'code' => $http_code,
 			'error' => $error,
-			'headers' => isset($this->headers) ? $this->headers : array(),
+			'headers' => $this->headers ?? [],
 			'body' => $body,
 			'size' => $curl_info['download_content_length'],
-		);
+		];
 
 		// If this a redirect with a location header and we have not given up, then do it again.
-		if (preg_match('~30[127]~i', $http_code) === 1 && $this->headers['location'] != '' && $this->current_redirect <= $this->max_redirect)
-		{
+		if (preg_match('~30[127]~i', $http_code) === 1 && $this->headers['location'] != '' && $this->current_redirect <= $this->max_redirect) {
 			$this->current_redirect++;
 			$header_location = $this->getRedirectUrl($url, $this->headers['location']);
 			$this->redirect($header_location, $url);
@@ -359,10 +357,10 @@ private function getRedirectUrl(string $last_url = '', string $new_url = ''): st
 		$new_url_parse = parse_url($new_url);
 
 		// Redirect headers are often incomplete or relative so we need to make sure they are fully qualified.
-		$new_url_parse['scheme'] = isset($new_url_parse['scheme']) ? $new_url_parse['scheme'] : $last_url_parse['scheme'];
-		$new_url_parse['host'] = isset($new_url_parse['host']) ? $new_url_parse['host'] : $last_url_parse['host'];
-		$new_url_parse['path'] = isset($new_url_parse['path']) ? $new_url_parse['path'] : $last_url_parse['path'];
-		$new_url_parse['query'] = isset($new_url_parse['query']) ? $new_url_parse['query'] : '';
+		$new_url_parse['scheme'] = $new_url_parse['scheme'] ?? $last_url_parse['scheme'];
+		$new_url_parse['host'] = $new_url_parse['host'] ?? $last_url_parse['host'];
+		$new_url_parse['path'] = $new_url_parse['path'] ?? $last_url_parse['path'];
+		$new_url_parse['query'] = $new_url_parse['query'] ?? '';
 
 		// Build the new URL that was in the http header.
 		return $new_url_parse['scheme'] . '://' . $new_url_parse['host'] . $new_url_parse['path'] . (!empty($new_url_parse['query']) ? '?' . $new_url_parse['query'] : '');
@@ -378,23 +376,19 @@ private function getRedirectUrl(string $last_url = '', string $new_url = ''): st
 	private function setOptions(): void
 	{
 		// Callback to parse the returned headers, if any.
-		$this->default_options[CURLOPT_HEADERFUNCTION] = array($this, 'headerCallback');
+		$this->default_options[CURLOPT_HEADERFUNCTION] = [$this, 'headerCallback'];
 
 		// Any user options to account for.
-		if (is_array($this->user_options))
-		{
+		if (is_array($this->user_options)) {
 			$keys = array_merge(array_keys($this->default_options), array_keys($this->user_options));
 			$vals = array_merge($this->default_options, $this->user_options);
 			$this->options = array_combine($keys, $vals);
-		}
-		else
-		{
+		} else {
 			$this->options = $this->default_options;
 		}
 
 		// POST data options, here we don't allow any override.
-		if (isset($this->post_data))
-		{
+		if (isset($this->post_data)) {
 			$this->options[CURLOPT_POST] = 1;
 			$this->options[CURLOPT_POSTFIELDS] = $this->post_data;
 		}
@@ -430,8 +424,9 @@ private function headerCallback(\CurlHandle $cr, string $header): int
 		$temp = explode(': ', trim($header), 2);
 
 		// Set proper headers only.
-		if (isset($temp[0]) && isset($temp[1]))
+		if (isset($temp[0], $temp[1])) {
 			$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
+		}
 
 		// Return the length of what was passed unless you want a Failed writing header error ;)
 		return strlen($header);
diff --git a/Sources/WebFetch/APIs/FtpFetcher.php b/Sources/WebFetch/APIs/FtpFetcher.php
index 9e403c0211..8ad34687ca 100644
--- a/Sources/WebFetch/APIs/FtpFetcher.php
+++ b/Sources/WebFetch/APIs/FtpFetcher.php
@@ -15,9 +15,9 @@
 
 use SMF\Config;
 use SMF\Lang;
+use SMF\PackageManager\FtpConnection;
 use SMF\Url;
 use SMF\WebFetch\WebFetchApi;
-use SMF\PackageManager\FtpConnection;
 
 /**
  * Fetches data from FTP URLs.
@@ -75,7 +75,7 @@ class FtpFetcher extends WebFetchApi
 	 *
 	 * Stores responses (url, code, error, headers, body, size).
 	 */
-	public $response = array();
+	public $response = [];
 
 	/****************
 	 * Public methods
@@ -104,16 +104,16 @@ public function __construct(?string $user = null, ?string $email = null)
 	 * @param string $url the site we are going to fetch
 	 * @return object A reference to the object for method chaining.
 	 */
-	public function request(string $url, array|string $post_data = array()): object
+	public function request(string $url, array|string $post_data = []): object
 	{
 		$url = new Url($url, true);
 		$url->toAscii();
 
 		// Umm, this shouldn't happen?
-		if (empty($url->scheme) || !in_array($url->scheme, array('ftp', 'ftps')))
-		{
+		if (empty($url->scheme) || !in_array($url->scheme, ['ftp', 'ftps'])) {
 			Lang::load('Errors');
 			trigger_error(sprintf(Lang::$txt['fetch_web_data_bad_url'], __METHOD__), E_USER_NOTICE);
+
 			return $this;
 		}
 
@@ -121,16 +121,17 @@ public function request(string $url, array|string $post_data = array()): object
 		$this->port = !empty($url->port) ? $url->port : 21;
 
 		// Establish a connection and attempt to enable passive mode.
-		$ftp = new SMF\PackageManager\FtpConnection($this->host, $this->port, $this->user, $this->email);
+		$ftp = new FtpConnection($this->host, $this->port, $this->user, $this->email);
 
 		$this->error_message = !empty($ftp->error) ? (string) ($ftp->last_message ?? $ftp->error) : '';
 
-		if ($ftp->error !== false)
+		if ($ftp->error !== false) {
 			return $this;
+		}
 
-		if (!$ftp->passive())
-		{
+		if (!$ftp->passive()) {
 			$this->error_message = (string) ($ftp->last_message ?? $ftp->error);
+
 			return $this;
 		}
 
@@ -141,18 +142,19 @@ public function request(string $url, array|string $post_data = array()): object
 		$fp = @fsockopen($ftp->pasv['ip'], $ftp->pasv['port'], $this->error_code, $this->error_message, 5);
 
 		// We can start building our response data now.
-		$this->response[0] = array(
+		$this->response[0] = [
 			'url' => (string) $url,
 			'success' => false,
 			'code' => null,
 			'error' => $this->error_message ?? null,
-			'headers' => array(),
+			'headers' => [],
 			'body' => null,
 			'size' => 0,
-		);
+		];
 
-		if (!$fp)
+		if (!$fp) {
 			return $this;
+		}
 
 		// The server should now say something in acknowledgement.
 		$ftp->check_response(150);
@@ -160,8 +162,9 @@ public function request(string $url, array|string $post_data = array()): object
 
 		$body = '';
 
-		while (!feof($fp))
+		while (!feof($fp)) {
 			$body .= fread($fp, 4096);
+		}
 
 		fclose($fp);
 
@@ -183,13 +186,14 @@ public function request(string $url, array|string $post_data = array()): object
 	 * @param string $area Used to return an area such as body, header, error.
 	 * @return mixed The response
 	 */
-	public function result(string $area = null): mixed
+	public function result(?string $area = null): mixed
 	{
 		// Just return a specifed area or the entire result?
-		if (empty($area))
+		if (empty($area)) {
 			return $this->response[0];
+		}
 
-		return isset($this->response[0][$area]) ? $this->response[0][$area] : $this->response[0];
+		return $this->response[0][$area] ?? $this->response[0];
 	}
 
 	/**
@@ -199,16 +203,13 @@ public function result(string $area = null): mixed
 	 * @param int $response_number Which response to get, or null for all.
 	 * @return array The specified response or all the responses.
 	 */
-	public function resultRaw(int $response_number = null): array
+	public function resultRaw(?int $response_number = null): array
 	{
-		if (!isset($response_number))
-		{
+		if (!isset($response_number)) {
 			return $this->response;
 		}
-		else
-		{
-			return $this->response[0];
-		}
+
+		return $this->response[0];
 	}
 }
 
diff --git a/Sources/WebFetch/APIs/SocketFetcher.php b/Sources/WebFetch/APIs/SocketFetcher.php
index baa71f0e24..a387c7b216 100644
--- a/Sources/WebFetch/APIs/SocketFetcher.php
+++ b/Sources/WebFetch/APIs/SocketFetcher.php
@@ -80,7 +80,7 @@ class SocketFetcher extends WebFetchApi
 	 *
 	 * Stores responses (url, code, error, headers, body, size).
 	 */
-	public $response = array();
+	public $response = [];
 
 	/*********************
 	 * Internal properties
@@ -139,16 +139,16 @@ public function __destruct()
 	 * @param array|string $post_data any post data as form name => value
 	 * @return object A reference to the object for method chaining.
 	 */
-	public function request(string $url, array|string $post_data = array()): object
+	public function request(string $url, array|string $post_data = []): object
 	{
 		$url = new Url($url, true);
 		$url->toAscii();
 
 		// Umm, this shouldn't happen?
-		if (empty($url->scheme) || !in_array($url->scheme, array('http', 'https')))
-		{
+		if (empty($url->scheme) || !in_array($url->scheme, ['http', 'https'])) {
 			Lang::load('Errors');
 			trigger_error(sprintf(Lang::$txt['fetch_web_data_bad_url'], __METHOD__), E_USER_NOTICE);
+
 			return $this;
 		}
 
@@ -161,19 +161,18 @@ public function request(string $url, array|string $post_data = array()): object
 		$post_data = $this->buildPostData($post_data);
 
 		// We can start building our response data now.
-		$this->response[$this->current_redirect] = array(
+		$this->response[$this->current_redirect] = [
 			'url' => (string) $url,
 			'success' => false,
 			'code' => null,
 			'error' => null,
-			'headers' => array(),
+			'headers' => [],
 			'body' => null,
 			'size' => 0,
-		);
+		];
 
 		// Do we already have an open connection to the socket? If not, open one.
-		if (!is_resource($this->fp ?? null) || !$this->keep_alive || $this->host != $host || $this->port != $port)
-		{
+		if (!is_resource($this->fp ?? null) || !$this->keep_alive || $this->host != $host || $this->port != $port) {
 			$this->host = $host;
 			$this->port = $port;
 
@@ -181,23 +180,20 @@ public function request(string $url, array|string $post_data = array()): object
 		}
 
 		// Uh-oh...
-		if (!is_resource($this->fp))
-		{
+		if (!is_resource($this->fp)) {
 			$this->closeConnection();
+
 			return $this;
 		}
 
 		// I want this, from there, and I may or may not bother you for more later.
-		if (empty($post_data))
-		{
+		if (empty($post_data)) {
 			fwrite($this->fp, 'GET ' . $path_and_query . ' HTTP/1.1' . "\r\n");
 			fwrite($this->fp, 'Host: ' . $url->host . "\r\n");
 			fwrite($this->fp, 'User-Agent: ' . SMF_USER_AGENT . "\r\n");
 			fwrite($this->fp, 'Connection: ' . ($this->keep_alive ? 'keep-alive' : 'close') . "\r\n");
 			fwrite($this->fp, "\r\n");
-		}
-		else
-		{
+		} else {
 			fwrite($this->fp, 'POST ' . $path_and_query . ' HTTP/1.1' . "\r\n");
 			fwrite($this->fp, 'Host: ' . $url->host . "\r\n");
 			fwrite($this->fp, 'User-Agent: ' . SMF_USER_AGENT . "\r\n");
@@ -211,62 +207,57 @@ public function request(string $url, array|string $post_data = array()): object
 		$response = fgets($this->fp, 768);
 
 		// What response code was sent?
-		if (preg_match('~^HTTP/\S+\s+(\d+)~i', $response, $matches))
-		{
+		if (preg_match('~^HTTP/\S+\s+(\d+)~i', $response, $matches)) {
 			$http_code = (int) $matches[1];
 			$this->response[$this->current_redirect]['code'] = $http_code;
 		}
 		// No response code? Bail out.
-		else
-		{
+		else {
 			$this->closeConnection();
+
 			return $this;
 		}
 
 		// Redirect if the resource has been permanently or temporarily moved.
-		if ($this->current_redirect < $this->max_redirect && in_array($http_code, array(301, 302, 307)))
-		{
-			while (!feof($this->fp) && trim($header = fgets($this->fp, 4096)) != '')
-			{
+		if ($this->current_redirect < $this->max_redirect && in_array($http_code, [301, 302, 307])) {
+			while (!feof($this->fp) && trim($header = fgets($this->fp, 4096)) != '') {
 				$this->response[$this->current_redirect]['headers'][] = $header;
 
-				if (stripos($header, 'location:') !== false)
+				if (stripos($header, 'location:') !== false) {
 					$location = trim(substr($header, strpos($header, ':') + 1));
+				}
 			}
 
 			$location = new Url($location ?? '');
 
-			if (!$location->isValid())
-			{
+			if (!$location->isValid()) {
 				$this->closeConnection();
+
 				return $this;
 			}
 
 			// Close if it moved to a different host.
-			if ($location->$host !== $url->host)
+			if ($location->$host !== $url->host) {
 				$this->closeConnection();
+			}
 
 			$this->current_redirect++;
 
 			return $this->request($location, $post_data);
 		}
+
 		// Make sure we get a 200 OK.
-		elseif (!in_array($http_code, array(200, 201)))
-		{
+		if (!in_array($http_code, [200, 201])) {
 			return $this;
 		}
 
 		// Skip the headers...
-		while (!feof($this->fp) && trim($header = fgets($this->fp, 4096)) != '')
-		{
+		while (!feof($this->fp) && trim($header = fgets($this->fp, 4096)) != '') {
 			$this->response[$this->current_redirect]['headers'][] = $header;
 
-			if (preg_match('~Content-Length:\s*(\d+)~i', $header, $match))
-			{
+			if (preg_match('~Content-Length:\s*(\d+)~i', $header, $match)) {
 				$content_length = $match[1];
-			}
-			elseif (preg_match('~Connection:\s*Close~i', $header))
-			{
+			} elseif (preg_match('~Connection:\s*Close~i', $header)) {
 				$this->keep_alive = false;
 			}
 
@@ -275,23 +266,23 @@ public function request(string $url, array|string $post_data = array()): object
 
 		$body = '';
 
-		if (isset($content_length))
-		{
-			while (!feof($this->fp) && strlen($body) < $content_length)
+		if (isset($content_length)) {
+			while (!feof($this->fp) && strlen($body) < $content_length) {
 				$body .= fread($this->fp, $content_length - strlen($body));
-		}
-		else
-		{
-			while (!feof($this->fp))
+			}
+		} else {
+			while (!feof($this->fp)) {
 				$body .= fread($this->fp, 4096);
+			}
 		}
 
 		$this->response[$this->current_redirect]['success'] = true;
 		$this->response[$this->current_redirect]['body'] = $body;
 		$this->response[$this->current_redirect]['size'] = strlen($body);
 
-		if (!$this->keep_alive)
+		if (!$this->keep_alive) {
 			$this->closeConnection();
+		}
 
 		return $this;
 	}
@@ -305,15 +296,16 @@ public function request(string $url, array|string $post_data = array()): object
 	 * @param string $area Used to return an area such as body, header, error.
 	 * @return mixed The response.
 	 */
-	public function result(string $area = null): mixed
+	public function result(?string $area = null): mixed
 	{
 		$max_result = count($this->response) - 1;
 
 		// Just return a specifed area or the entire result?
-		if (is_null($area))
+		if (is_null($area)) {
 			return $this->response[$max_result];
+		}
 
-		return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
+		return $this->response[$max_result][$area] ?? $this->response[$max_result];
 	}
 
 	/**
@@ -325,17 +317,15 @@ public function result(string $area = null): mixed
 	 * @param int $response_number Which response to get, or null for all.
 	 * @return array The specified response or all the responses.
 	 */
-	public function resultRaw(int $response_number = null): array
+	public function resultRaw(?int $response_number = null): array
 	{
-		if (!isset($response_number))
-		{
+		if (!isset($response_number)) {
 			return $this->response;
 		}
-		else
-		{
-			$response_number = min($response_number, count($this->response) - 1);
-			return $this->response[$response_number];
-		}
+
+		$response_number = min($response_number, count($this->response) - 1);
+
+		return $this->response[$response_number];
 	}
 
 	/**
@@ -343,11 +333,13 @@ public function resultRaw(int $response_number = null): array
 	 */
 	public function closeConnection(): void
 	{
-		if (!isset($this->fp))
+		if (!isset($this->fp)) {
 			return;
+		}
 
-		if (is_resource($this->fp))
+		if (is_resource($this->fp)) {
 			fclose($this->fp);
+		}
 
 		unset($this->fp);
 	}
diff --git a/Sources/WebFetch/APIs/index.php b/Sources/WebFetch/APIs/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/WebFetch/APIs/index.php
+++ b/Sources/WebFetch/APIs/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/WebFetch/WebFetchApi.php b/Sources/WebFetch/WebFetchApi.php
index 2034cfed7d..6eba083912 100644
--- a/Sources/WebFetch/WebFetchApi.php
+++ b/Sources/WebFetch/WebFetchApi.php
@@ -14,7 +14,6 @@
 namespace SMF\WebFetch;
 
 use SMF\BackwardCompatibility;
-
 use SMF\Lang;
 use SMF\Url;
 
@@ -30,11 +29,11 @@ abstract class WebFetchApi implements WebFetchApiInterface
 	 *
 	 * BackwardCompatibility settings for this class.
 	 */
-	private static $backcompat = array(
-		'func_names' => array(
+	private static $backcompat = [
+		'func_names' => [
 			'fetch' => 'fetch_web_data',
-		),
-	);
+		],
+	];
 
 	/*******************
 	 * Public properties
@@ -52,7 +51,7 @@ abstract class WebFetchApi implements WebFetchApiInterface
 	 *
 	 * Stores responses (url, code, error, headers, body, size).
 	 */
-	public $response = array();
+	public $response = [];
 
 	/**************************
 	 * Public static properties
@@ -67,12 +66,12 @@ abstract class WebFetchApi implements WebFetchApiInterface
 	 *
 	 * Class names will be prepended with __NAMESPACE__ . '\APIs\'.
 	 */
-	public static $scheme_handlers = array(
-		'ftp' => array('FtpFetcher'),
-		'ftps' => array('FtpFetcher'),
-		'http' => array('SocketFetcher', 'CurlFetcher'),
-		'https' => array('SocketFetcher', 'CurlFetcher'),
-	);
+	public static $scheme_handlers = [
+		'ftp' => ['FtpFetcher'],
+		'ftps' => ['FtpFetcher'],
+		'http' => ['SocketFetcher', 'CurlFetcher'],
+		'https' => ['SocketFetcher', 'CurlFetcher'],
+	];
 
 	/****************
 	 * Public methods
@@ -81,21 +80,21 @@ abstract class WebFetchApi implements WebFetchApiInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function request(string $url, array|string $post_data = array()): object
+	public function request(string $url, array|string $post_data = []): object
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function result(string $area = null): mixed
+	public function result(?string $area = null): mixed
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function resultRaw(int $response_number = null): array
+	public function resultRaw(?int $response_number = null): array
 	{
 	}
 
@@ -118,31 +117,31 @@ public function resultRaw(int $response_number = null): array
 	 *    requests. Not applicable to FTP requests.
 	 * @return string|false The fetched data or false on failure.
 	 */
-	public static function fetch(string $url, string|array $post_data = array(), bool $keep_alive = false): string|false
+	public static function fetch(string $url, string|array $post_data = [], bool $keep_alive = false): string|false
 	{
 		$url = Url::create($url, true)->validate()->toAscii();
 
 		// No scheme? No data for you!
-		if (empty($url->scheme) || !isset(self::$scheme_handlers[$url->scheme]))
-		{
+		if (empty($url->scheme) || !isset(self::$scheme_handlers[$url->scheme])) {
 			Lang::load('Errors');
 			trigger_error(sprintf(Lang::$txt['fetch_web_data_bad_url'], __METHOD__), E_USER_NOTICE);
 			$data = false;
 		}
 
-		foreach (self::$scheme_handlers[$url->scheme] as $class)
-		{
+		foreach (self::$scheme_handlers[$url->scheme] as $class) {
 			$class = __NAMESPACE__ . '\\APIs\\' . $class;
 
 			$fetcher = new $class();
 			$fetcher->request($url);
 
-			if ($fetcher->result('success'))
+			if ($fetcher->result('success')) {
 				break;
+			}
 		}
 
-		if (!$fetcher->result('success'))
+		if (!$fetcher->result('success')) {
 			return false;
+		}
 
 		return $fetcher->result('body');
 	}
@@ -162,27 +161,25 @@ public static function fetch(string $url, string|array $post_data = array(), boo
 	 */
 	protected function buildPostData(array|string $post_data): string
 	{
-		if (is_array($post_data))
-		{
+		if (is_array($post_data)) {
 			// Drop ones with leading @'s since those can be used to send files
 			// and we don't support that.
-			foreach ($post_data as $name => $value)
-			{
-				if (strpos($value, '@') === 0)
+			foreach ($post_data as $name => $value) {
+				if (strpos($value, '@') === 0) {
 					$post_data[$name] = null;
+				}
 			}
 
 			return http_build_query($post_data, '', '&');
 		}
-		else
-		{
-			return trim($post_data);
-		}
+
+		return trim($post_data);
 	}
 }
 
 // Export public static functions and properties to global namespace for backward compatibility.
-if (is_callable(__NAMESPACE__ . '\WebFetchApi::exportStatic'))
+if (is_callable(__NAMESPACE__ . '\\WebFetchApi::exportStatic')) {
 	WebFetchApi::exportStatic();
+}
 
 ?>
\ No newline at end of file
diff --git a/Sources/WebFetch/WebFetchApiInterface.php b/Sources/WebFetch/WebFetchApiInterface.php
index d79110eee6..2780f8ef90 100644
--- a/Sources/WebFetch/WebFetchApiInterface.php
+++ b/Sources/WebFetch/WebFetchApiInterface.php
@@ -29,7 +29,7 @@ interface WebFetchApiInterface
 	 * @param array|string $post_data any post data as form name => value
 	 * @return object A reference to the object for method chaining.
 	 */
-	public function request(string $url, array $post_data = array()): object;
+	public function request(string $url, array $post_data = []): object;
 
 	/**
 	 * Used to return the results to the caller.
@@ -40,7 +40,7 @@ public function request(string $url, array $post_data = array()): object;
 	 * @param string $area Used to return an area such as body, header, error.
 	 * @return mixed The response.
 	 */
-	public function result(string $area = null): mixed;
+	public function result(?string $area = null): mixed;
 
 	/**
 	 * Will return all results from all loops (redirects)
@@ -51,7 +51,7 @@ public function result(string $area = null): mixed;
 	 * @param int $response_number Which response to get, or null for all.
 	 * @return array The specified response or all the responses.
 	 */
-	public function resultRaw(int $response_number = null): array;
+	public function resultRaw(?int $response_number = null): array;
 }
 
 ?>
\ No newline at end of file
diff --git a/Sources/WebFetch/index.php b/Sources/WebFetch/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/WebFetch/index.php
+++ b/Sources/WebFetch/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/index.php b/Sources/index.php
index 01bf5c30ca..976d292448 100644
--- a/Sources/index.php
+++ b/Sources/index.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Sources directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/data/index.php b/Sources/minify/data/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/data/index.php
+++ b/Sources/minify/data/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/data/js/index.php b/Sources/minify/data/js/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/data/js/index.php
+++ b/Sources/minify/data/js/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/index.php b/Sources/minify/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/index.php
+++ b/Sources/minify/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/path-converter/index.php b/Sources/minify/path-converter/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/path-converter/index.php
+++ b/Sources/minify/path-converter/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/path-converter/src/index.php b/Sources/minify/path-converter/src/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/path-converter/src/index.php
+++ b/Sources/minify/path-converter/src/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/src/Exceptions/index.php b/Sources/minify/src/Exceptions/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/src/Exceptions/index.php
+++ b/Sources/minify/src/Exceptions/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/minify/src/index.php b/Sources/minify/src/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/minify/src/index.php
+++ b/Sources/minify/src/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/random_compat/index.php b/Sources/random_compat/index.php
index 69278ce68e..976d292448 100644
--- a/Sources/random_compat/index.php
+++ b/Sources/random_compat/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Sources/tasks/index.php b/Sources/tasks/index.php
deleted file mode 100644
index 69278ce68e..0000000000
--- a/Sources/tasks/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
-else
-	exit;
-
-?>
\ No newline at end of file
diff --git a/Themes/default/Admin.template.php b/Themes/default/Admin.template.php
index 86e1c0691d..f65a612ad2 100644
--- a/Themes/default/Admin.template.php
+++ b/Themes/default/Admin.template.php
@@ -10,6 +10,7 @@
  * @version 3.0 Alpha 1
  */
 
+use SMF\Actions\Admin\Permissions;
 use SMF\Config;
 use SMF\Lang;
 use SMF\Theme;
@@ -928,7 +929,7 @@ function ($v)
 										<textarea rows="', (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)), '" cols="', (!empty($config_var['cols']) ? $config_var['cols'] : 30), '" ', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '">', $config_var['value'], '</textarea>';
 				// Permission group?
 				elseif ($config_var['type'] == 'permissions')
-					theme_inline_permissions($config_var['name']);
+					Permissions::theme_inline_permissions($config_var['name']);
 
 				// BBC selection?
 				elseif ($config_var['type'] == 'bbc')
diff --git a/Themes/default/css/index.php b/Themes/default/css/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/css/index.php
+++ b/Themes/default/css/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/fonts/AnonymousPro/index.php b/Themes/default/fonts/AnonymousPro/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Themes/default/fonts/AnonymousPro/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Themes/default/fonts/ConsolaMono/index.php b/Themes/default/fonts/ConsolaMono/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/Themes/default/fonts/ConsolaMono/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/Themes/default/fonts/index.php b/Themes/default/fonts/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/fonts/index.php
+++ b/Themes/default/fonts/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/fonts/sound/index.php b/Themes/default/fonts/sound/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/fonts/sound/index.php
+++ b/Themes/default/fonts/sound/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/images/bbc/index.php b/Themes/default/images/bbc/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/images/bbc/index.php
+++ b/Themes/default/images/bbc/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/images/icons/index.php b/Themes/default/images/icons/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/images/icons/index.php
+++ b/Themes/default/images/icons/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/images/index.php b/Themes/default/images/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/images/index.php
+++ b/Themes/default/images/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/images/membericons/index.php b/Themes/default/images/membericons/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/images/membericons/index.php
+++ b/Themes/default/images/membericons/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/images/post/index.php b/Themes/default/images/post/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/images/post/index.php
+++ b/Themes/default/images/post/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/images/topic/index.php b/Themes/default/images/topic/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/images/topic/index.php
+++ b/Themes/default/images/topic/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/index.php b/Themes/default/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/index.php
+++ b/Themes/default/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/languages/index.php b/Themes/default/languages/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/languages/index.php
+++ b/Themes/default/languages/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/default/scripts/index.php b/Themes/default/scripts/index.php
index 2cf5d33d8a..976d292448 100644
--- a/Themes/default/scripts/index.php
+++ b/Themes/default/scripts/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include(dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/Themes/index.php b/Themes/index.php
index 32dec42961..976d292448 100644
--- a/Themes/index.php
+++ b/Themes/index.php
@@ -1,15 +1,8 @@
 <?php
 
-// This file is here solely to protect your Themes directory.
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/attachments/index.php b/attachments/index.php
index 41ec1a1733..976d292448 100644
--- a/attachments/index.php
+++ b/attachments/index.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your attachments directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/avatars/Oxygen/index.php b/avatars/Oxygen/index.php
index 69278ce68e..976d292448 100644
--- a/avatars/Oxygen/index.php
+++ b/avatars/Oxygen/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/avatars/index.php b/avatars/index.php
index 3b9cfdb8f5..976d292448 100644
--- a/avatars/index.php
+++ b/avatars/index.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your avatars directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/cache/images/index.php b/cache/images/index.php
new file mode 100644
index 0000000000..976d292448
--- /dev/null
+++ b/cache/images/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
+else
+	exit;
+
+?>
\ No newline at end of file
diff --git a/cache/index.php b/cache/index.php
index ac65b5dff9..976d292448 100644
--- a/cache/index.php
+++ b/cache/index.php
@@ -1,15 +1,8 @@
 <?php
 
-// This file is here solely to protect your cache directory.
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/composer.json b/composer.json
index ad4434b2b1..ec625f43f0 100644
--- a/composer.json
+++ b/composer.json
@@ -9,11 +9,11 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require-dev": {
-        "simplemachines/build-tools": "dev-master"
+        "simplemachines/build-tools": "dev-release-3.0"
     },
     "config": {
         "platform": {
-            "php": "7.0.2"
+            "php": "8.0.0"
         }
     }
 }
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 3bc597e22e..b950725181 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,76 +4,39 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "459367aef15bf2177bfed3beaacbe838",
+    "content-hash": "778d29e7a87d45406110d0feb5b39780",
     "packages": [],
     "packages-dev": [
-        {
-            "name": "n98/junit-xml",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cmuench/junit-xml.git",
-                "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cmuench/junit-xml/zipball/0017dd92ac8cb619f02e32f4cffd768cfe327c73",
-                "reference": "0017dd92ac8cb619f02e32f4cffd768cfe327c73",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "N98\\JUnitXml\\": "src/N98/JUnitXml"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Münch",
-                    "email": "c.muench@netz98.de"
-                }
-            ],
-            "description": "JUnit XML Document generation library",
-            "support": {
-                "issues": "https://github.com/cmuench/junit-xml/issues",
-                "source": "https://github.com/cmuench/junit-xml/tree/1.1.0"
-            },
-            "time": "2020-12-25T09:08:58+00:00"
-        },
         {
             "name": "overtrue/phplint",
-            "version": "3.0.0",
+            "version": "9.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/phplint.git",
-                "reference": "2d68ee8ab9083041a297cb6897ccec6290814c88"
+                "reference": "da8aa332372fbbf9aed174ed45ad190aed848b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/phplint/zipball/2d68ee8ab9083041a297cb6897ccec6290814c88",
-                "reference": "2d68ee8ab9083041a297cb6897ccec6290814c88",
+                "url": "https://api.github.com/repos/overtrue/phplint/zipball/da8aa332372fbbf9aed174ed45ad190aed848b9a",
+                "reference": "da8aa332372fbbf9aed174ed45ad190aed848b9a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "n98/junit-xml": "1.1.0",
-                "php": ">=5.5.9",
-                "symfony/console": "^3.2|^4.0|^5.0",
-                "symfony/finder": "^3.0|^4.0|^5.0",
-                "symfony/process": "^3.3|^4.0|^5.0",
-                "symfony/yaml": "^3.0|^4.0|^5.0"
+                "php": "^8.0",
+                "symfony/cache": "^5.4 || ^6.0",
+                "symfony/console": "^5.4 || ^6.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0",
+                "symfony/finder": "^5.4 || ^6.0",
+                "symfony/options-resolver": "^5.4 || ^6.0",
+                "symfony/process": "^5.4 || ^6.0",
+                "symfony/yaml": "^5.4 || ^6.0"
             },
             "require-dev": {
-                "brainmaestro/composer-git-hooks": "^2.7",
-                "friendsofphp/php-cs-fixer": "^2.16",
-                "jakub-onderka/php-console-highlighter": "^0.3.2 || ^0.4"
+                "bamarni/composer-bin-plugin": "^1.4",
+                "brainmaestro/composer-git-hooks": "^2.8.5 || 3.0.0-alpha.1",
+                "jetbrains/phpstorm-stubs": "^2021.3 || ^2022.3",
+                "php-parallel-lint/php-console-highlighter": "^1.0"
             },
             "bin": [
                 "bin/phplint"
@@ -83,10 +46,10 @@
                 "hooks": {
                     "pre-commit": [
                         "composer fix-style"
-                    ],
-                    "pre-push": [
-                        "composer check-style"
                     ]
+                },
+                "branch-alias": {
+                    "dev-main": "9.0.x-dev"
                 }
             },
             "autoload": {
@@ -102,6 +65,10 @@
                 {
                     "name": "overtrue",
                     "email": "anzhengchao@gmail.com"
+                },
+                {
+                    "name": "Laurent Laville",
+                    "homepage": "https://github.com/llaville"
                 }
             ],
             "description": "`phplint` is a tool that can speed up linting of php files by running several lint processes at once.",
@@ -113,36 +80,42 @@
             ],
             "support": {
                 "issues": "https://github.com/overtrue/phplint/issues",
-                "source": "https://github.com/overtrue/phplint/tree/3.0.0"
+                "source": "https://github.com/overtrue/phplint/tree/9.0.4"
             },
-            "time": "2021-06-02T13:27:41+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/overtrue",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-23T15:46:09+00:00"
         },
         {
-            "name": "psr/log",
-            "version": "1.1.4",
+            "name": "psr/cache",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/213f9dbc5b9bfbc4f8db86d2838dc968752ce13b",
+                "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
+                    "Psr\\Cache\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -155,93 +128,92 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
+            "description": "Common interface for caching libraries",
             "keywords": [
-                "log",
+                "cache",
                 "psr",
-                "psr-3"
+                "psr-6"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
+                "source": "https://github.com/php-fig/cache/tree/2.0.0"
             },
-            "time": "2021-05-03T11:20:27+00:00"
+            "time": "2021-02-03T23:23:37+00:00"
         },
         {
-            "name": "simplemachines/build-tools",
-            "version": "dev-master",
+            "name": "psr/container",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/SimpleMachines/BuildTools.git",
-                "reference": "405df8656accc8c00a6574fc9ed55d9e3463cb0e"
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SimpleMachines/BuildTools/zipball/405df8656accc8c00a6574fc9ed55d9e3463cb0e",
-                "reference": "405df8656accc8c00a6574fc9ed55d9e3463cb0e",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "overtrue/phplint": "3.0"
+                "php": ">=7.4.0"
             },
-            "default-branch": true,
             "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
             "support": {
-                "source": "https://github.com/SimpleMachines/BuildTools/tree/master",
-                "issues": "https://github.com/SimpleMachines/BuildTools/issues"
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2023-11-04T21:07:58+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v3.3.6",
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "b0878233cb5c4391347e5495089c7af11b8e6201"
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201",
-                "reference": "b0878233cb5c4391347e5495089c7af11b8e6201",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "symfony/debug": "~2.8|~3.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.3",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/filesystem": "~2.8|~3.0",
-                "symfony/http-kernel": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
-                "symfony/process": ""
+                "php": ">=7.2.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Psr\\EventDispatcher\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -249,58 +221,49 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/3.3"
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
             },
-            "time": "2017-07-29T21:27:59+00:00"
+            "time": "2019-01-08T18:20:26+00:00"
         },
         {
-            "name": "symfony/debug",
-            "version": "v3.3.6",
+            "name": "psr/log",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13"
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
-                "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
+                    "Psr\\Log\\": "src"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -308,48 +271,101 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
             "support": {
-                "source": "https://github.com/symfony/debug/tree/3.3"
+                "source": "https://github.com/php-fig/log/tree/2.0.0"
             },
-            "abandoned": "symfony/error-handler",
-            "time": "2017-07-28T15:27:31+00:00"
+            "time": "2021-07-14T16:41:46+00:00"
         },
         {
-            "name": "symfony/finder",
-            "version": "v3.3.6",
+            "name": "simplemachines/build-tools",
+            "version": "dev-release-3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4"
+                "url": "https://github.com/SimpleMachines/BuildTools.git",
+                "reference": "d183f2d31b0e3aacb8683b281c911212e269587a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4",
-                "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4",
+                "url": "https://api.github.com/repos/SimpleMachines/BuildTools/zipball/d183f2d31b0e3aacb8683b281c911212e269587a",
+                "reference": "d183f2d31b0e3aacb8683b281c911212e269587a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "overtrue/phplint": "9.0.4",
+                "php": ">=8.0"
             },
+            "default-branch": true,
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                }
+            "support": {
+                "source": "https://github.com/SimpleMachines/BuildTools/tree/release-3.0",
+                "issues": "https://github.com/SimpleMachines/BuildTools/issues"
+            },
+            "time": "2023-11-22T02:09:55+00:00"
+        },
+        {
+            "name": "symfony/cache",
+            "version": "v5.4.31",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/cache.git",
+                "reference": "9c0a3a5d0718e51ff81e0605be38fe1acbee9eeb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/9c0a3a5d0718e51ff81e0605be38fe1acbee9eeb",
+                "reference": "9c0a3a5d0718e51ff81e0605be38fe1acbee9eeb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0",
+                "psr/log": "^1.1|^2|^3",
+                "symfony/cache-contracts": "^1.1.7|^2",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<2.13.1",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/http-kernel": "<4.4",
+                "symfony/var-dumper": "<4.4"
+            },
+            "provide": {
+                "psr/cache-implementation": "1.0|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0",
+                "symfony/cache-implementation": "1.0|2.0"
             },
+            "require-dev": {
+                "cache/integration-tests": "dev-master",
+                "doctrine/cache": "^1.6|^2.0",
+                "doctrine/dbal": "^2.13.1|^3|^4",
+                "predis/predis": "^1.1",
+                "psr/simple-cache": "^1.0|^2.0",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/filesystem": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0",
+                "symfony/messenger": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
+                    "Symfony\\Component\\Cache\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -361,57 +377,73 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Finder Component",
+            "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "caching",
+                "psr6"
+            ],
             "support": {
-                "source": "https://github.com/symfony/finder/tree/3.3"
+                "source": "https://github.com/symfony/cache/tree/v5.4.31"
             },
-            "time": "2017-06-01T21:01:25+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-06T17:37:55+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.19.0",
+            "name": "symfony/cache-contracts",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce"
+                "url": "https://github.com/symfony/cache-contracts.git",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b5f7b932ee6fa802fc792eabd77c4c88084517ce",
-                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.2.5",
+                "psr/cache": "^1.0|^2.0|^3.0"
             },
             "suggest": {
-                "ext-mbstring": "For best performance"
+                "symfony/cache-implementation": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.19-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
+                    "Symfony\\Contracts\\Cache\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -428,17 +460,18 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for the Mbstring extension",
+            "description": "Generic abstractions related to caching",
             "homepage": "https://symfony.com",
             "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2"
             },
             "funding": [
                 {
@@ -454,34 +487,61 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-10-23T09:01:57+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v3.3.6",
+            "name": "symfony/console",
+            "version": "v5.4.31",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a"
+                "url": "https://github.com/symfony/console.git",
+                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a",
-                "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a",
+                "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a",
+                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php73": "^1.9",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.1|^6.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                }
+            "conflict": {
+                "psr/log": ">=3",
+                "symfony/dependency-injection": "<4.4",
+                "symfony/dotenv": "<5.1",
+                "symfony/event-dispatcher": "<4.4",
+                "symfony/lock": "<4.4",
+                "symfony/process": "<4.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
+                    "Symfony\\Component\\Console\\": ""
                 },
                 "exclude-from-classmap": [
                     "/Tests/"
@@ -501,48 +561,63 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Process Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
             "support": {
-                "source": "https://github.com/symfony/process/tree/3.3"
+                "source": "https://github.com/symfony/console/tree/v5.4.31"
             },
-            "time": "2017-07-13T13:05:09+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-31T07:58:33+00:00"
         },
         {
-            "name": "symfony/yaml",
-            "version": "v3.3.6",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed",
-                "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "symfony/console": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "files": [
+                    "function.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -551,20 +626,1201 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Yaml Component",
+            "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/3.3"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v5.4.26",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac"
             },
-            "time": "2017-07-23T12:43:26+00:00"
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac",
+                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/event-dispatcher-contracts": "^2|^3",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<4.4"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/stopwatch": "^4.4|^5.0|^6.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-06T06:34:20+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/event-dispatcher": "^1"
+            },
+            "suggest": {
+                "symfony/event-dispatcher-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v5.4.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d",
+                "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v5.4.27"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-31T08:02:31+00:00"
+        },
+        {
+            "name": "symfony/options-resolver",
+            "version": "v5.4.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9",
+                "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php73": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an improved replacement for the array_replace PHP function",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.21"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-02-14T08:03:56+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "875e90aeea2777b6f135677f618529449334a612"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
+                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-28T09:04:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php73",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+                "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v5.4.28",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b",
+                "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Executes commands in sub-processes",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v5.4.28"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-08-07T10:36:04+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-30T19:17:29+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v5.4.31",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "2765096c03f39ddf54f6af532166e42aaa05b24b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/2765096c03f39ddf54f6af532166e42aaa05b24b",
+                "reference": "2765096c03f39ddf54f6af532166e42aaa05b24b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
+            },
+            "conflict": {
+                "symfony/translation-contracts": ">=3.0"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.4.31"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-09T08:19:44+00:00"
+        },
+        {
+            "name": "symfony/var-exporter",
+            "version": "v5.4.26",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-exporter.git",
+                "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/11401fe94f960249b3c63a488c63ba73091c1e4a",
+                "reference": "11401fe94f960249b3c63a488c63ba73091c1e4a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
+            },
+            "require-dev": {
+                "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\VarExporter\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clone",
+                "construct",
+                "export",
+                "hydrate",
+                "instantiate",
+                "serialize"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-exporter/tree/v5.4.26"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-07-20T07:21:16+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v5.4.31",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "f387675d7f5fc4231f7554baa70681f222f73563"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/f387675d7f5fc4231f7554baa70681f222f73563",
+                "reference": "f387675d7f5fc4231f7554baa70681f222f73563",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "symfony/console": "<5.3"
+            },
+            "require-dev": {
+                "symfony/console": "^5.3|^6.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Loads and dumps YAML files",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v5.4.31"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-03T14:41:28+00:00"
         }
     ],
     "aliases": [],
@@ -577,7 +1833,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.0.2"
+        "php": "8.0.0"
     },
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/cron.php b/cron.php
index bb56a56871..b06cb7a680 100644
--- a/cron.php
+++ b/cron.php
@@ -17,13 +17,14 @@
  */
 
 // Don't do anything if SMF is already loaded.
-if (defined('SMF'))
+if (defined('SMF')) {
 	return true;
+}
 
 define('SMF', 'BACKGROUND');
 
 // Initialize.
-require_once(__DIR__ . '/index.php');
+require_once __DIR__ . '/index.php';
 
 $task_runner = new SMF\TaskRunner();
 $task_runner->execute();
diff --git a/custom_avatar/index.php b/custom_avatar/index.php
index 3b9cfdb8f5..976d292448 100644
--- a/custom_avatar/index.php
+++ b/custom_avatar/index.php
@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your avatars directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// Try to handle it with the upper level index.php. (it should know what to do.)
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 
diff --git a/index.php b/index.php
index ab1e5c9006..9b3ceab616 100644
--- a/index.php
+++ b/index.php
@@ -29,104 +29,118 @@
  * 1. Define some constants we need.
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	define('SMF', 1);
+}
 
-if (!defined('SMF_VERSION'))
+if (!defined('SMF_VERSION')) {
 	define('SMF_VERSION', '3.0 Alpha 1');
+}
 
-if (!defined('SMF_FULL_VERSION'))
+if (!defined('SMF_FULL_VERSION')) {
 	define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
+}
 
-if (!defined('SMF_SOFTWARE_YEAR'))
+if (!defined('SMF_SOFTWARE_YEAR')) {
 	define('SMF_SOFTWARE_YEAR', '2023');
+}
 
-if (!defined('JQUERY_VERSION'))
+if (!defined('JQUERY_VERSION')) {
 	define('JQUERY_VERSION', '3.6.3');
+}
 
-if (!defined('POSTGRE_TITLE'))
+if (!defined('POSTGRE_TITLE')) {
 	define('POSTGRE_TITLE', 'PostgreSQL');
+}
 
-if (!defined('MYSQL_TITLE'))
+if (!defined('MYSQL_TITLE')) {
 	define('MYSQL_TITLE', 'MySQL');
+}
 
-if (!defined('SMF_USER_AGENT'))
+if (!defined('SMF_USER_AGENT')) {
 	define('SMF_USER_AGENT', 'Mozilla/5.0 (' . php_uname('s') . ' ' . php_uname('m') . ') AppleWebKit/605.1.15 (KHTML, like Gecko)  SMF/' . strtr(SMF_VERSION, ' ', '.'));
+}
 
-if (!defined('TIME_START'))
+if (!defined('TIME_START')) {
 	define('TIME_START', microtime(true));
+}
 
-if (!defined('SMF_SETTINGS_FILE'))
+if (!defined('SMF_SETTINGS_FILE')) {
 	define('SMF_SETTINGS_FILE', __DIR__ . '/Settings.php');
+}
 
-if (!defined('SMF_SETTINGS_BACKUP_FILE'))
+if (!defined('SMF_SETTINGS_BACKUP_FILE')) {
 	define('SMF_SETTINGS_BACKUP_FILE', dirname(SMF_SETTINGS_FILE) . '/' . pathinfo(SMF_SETTINGS_FILE, PATHINFO_FILENAME) . '_bak.php');
+}
 
 /*
  * 2. Load the Settings.php file.
  */
 
-if (!is_file(SMF_SETTINGS_FILE) || !is_readable(SMF_SETTINGS_FILE))
+if (!is_file(SMF_SETTINGS_FILE) || !is_readable(SMF_SETTINGS_FILE)) {
 	die('File not readable: ' . basename(SMF_SETTINGS_FILE));
+}
 
 // Don't load it twice.
-if (in_array(SMF_SETTINGS_FILE, get_included_files()))
+if (in_array(SMF_SETTINGS_FILE, get_included_files())) {
 	return;
+}
 
 // If anything goes wrong loading Settings.php, make sure the admin knows it.
-if (SMF === 1)
-{
+if (SMF === 1) {
 	error_reporting(E_ALL);
 	ob_start();
 }
 
 // This is wrapped in a closure to keep the global namespace clean.
-call_user_func(function()
-{
-	require_once(SMF_SETTINGS_FILE);
+call_user_func(function () {
+	require_once SMF_SETTINGS_FILE;
 
 	// Ensure $sourcedir is valid.
-	$sourcedir = rtrim($sourcedir, "\\/");
-	if ((empty($sourcedir) || !is_dir(realpath($sourcedir))))
-	{
-		$boarddir = rtrim($boarddir, "\\/");
+	$sourcedir = rtrim($sourcedir, '\\/');
+
+	if ((empty($sourcedir) || !is_dir(realpath($sourcedir)))) {
+		$boarddir = rtrim($boarddir, '\\/');
 
-		if (empty($boarddir) || !is_dir(realpath($boarddir)))
+		if (empty($boarddir) || !is_dir(realpath($boarddir))) {
 			$boarddir = __DIR__;
+		}
 
-		if (is_dir($boarddir . '/Sources'))
+		if (is_dir($boarddir . '/Sources')) {
 			$sourcedir = $boarddir . '/Sources';
+		}
 	}
 
 	// We need this class, or nothing works.
-	if (!is_file($sourcedir . '/Config.php') || !is_readable($sourcedir . '/Config.php'))
+	if (!is_file($sourcedir . '/Config.php') || !is_readable($sourcedir . '/Config.php')) {
 		die('File not readable: (Sources)/Config.php');
+	}
 
 	// Pass all the settings to SMF\Config.
-	require_once($sourcedir . '/Config.php');
+	require_once $sourcedir . '/Config.php';
 	SMF\Config::set(get_defined_vars());
 });
 
 // Devs want all error messages, but others don't.
-if (SMF === 1)
+if (SMF === 1) {
 	error_reporting(!empty(SMF\Config::$db_show_debug) ? E_ALL : E_ALL & ~E_DEPRECATED);
+}
 
 /*
  * 3. Load some other essential includes.
  */
 
-require_once(SMF\Config::$sourcedir . '/Autoloader.php');
+require_once SMF\Config::$sourcedir . '/Autoloader.php';
 
 // Ensure we don't trip over disabled internal functions
-require_once(SMF\Config::$sourcedir . '/Subs-Compat.php');
+require_once SMF\Config::$sourcedir . '/Subs-Compat.php';
 
 
 /*********************************************************************
  * From this point forward, do stuff specific to normal forum loading.
  *********************************************************************/
 
-if (SMF === 1)
-{
+if (SMF === 1) {
 	(new SMF\Forum())->execute();
 }
 
diff --git a/other/Settings.php b/other/Settings.php
index fea27bcf47..970186b11d 100644
--- a/other/Settings.php
+++ b/other/Settings.php
@@ -220,15 +220,15 @@
  *
  * Path to the tasks directory.
  */
-$tasksdir = $sourcedir . '/tasks';
+$tasksdir = $sourcedir . '/Tasks';
 
 # Make sure the paths are correct... at least try to fix them.
 if (!is_dir(realpath($boarddir)) && file_exists(dirname(__FILE__) . '/agreement.txt'))
 	$boarddir = dirname(__FILE__);
 if (!is_dir(realpath($sourcedir)) && is_dir($boarddir . '/Sources'))
 	$sourcedir = $boarddir . '/Sources';
-if (!is_dir(realpath($tasksdir)) && is_dir($sourcedir . '/tasks'))
-	$tasksdir = $sourcedir . '/tasks';
+if (!is_dir(realpath($tasksdir)) && is_dir($sourcedir . '/Tasks'))
+	$tasksdir = $sourcedir . '/Tasks';
 if (!is_dir(realpath($packagesdir)) && is_dir($boarddir . '/Packages'))
 	$packagesdir = $boarddir . '/Packages';
 if (!is_dir(realpath($cachedir)) && is_dir($boarddir . '/cache'))
diff --git a/other/Settings_bak.php b/other/Settings_bak.php
index fea27bcf47..970186b11d 100644
--- a/other/Settings_bak.php
+++ b/other/Settings_bak.php
@@ -220,15 +220,15 @@
  *
  * Path to the tasks directory.
  */
-$tasksdir = $sourcedir . '/tasks';
+$tasksdir = $sourcedir . '/Tasks';
 
 # Make sure the paths are correct... at least try to fix them.
 if (!is_dir(realpath($boarddir)) && file_exists(dirname(__FILE__) . '/agreement.txt'))
 	$boarddir = dirname(__FILE__);
 if (!is_dir(realpath($sourcedir)) && is_dir($boarddir . '/Sources'))
 	$sourcedir = $boarddir . '/Sources';
-if (!is_dir(realpath($tasksdir)) && is_dir($sourcedir . '/tasks'))
-	$tasksdir = $sourcedir . '/tasks';
+if (!is_dir(realpath($tasksdir)) && is_dir($sourcedir . '/Tasks'))
+	$tasksdir = $sourcedir . '/Tasks';
 if (!is_dir(realpath($packagesdir)) && is_dir($boarddir . '/Packages'))
 	$packagesdir = $boarddir . '/Packages';
 if (!is_dir(realpath($cachedir)) && is_dir($boarddir . '/cache'))
diff --git a/other/install.php b/other/install.php
index b603e15cfb..1ec1e8a1b2 100644
--- a/other/install.php
+++ b/other/install.php
@@ -254,7 +254,7 @@ function initialize_inputs()
 			foreach ($databases as $key => $dummy)
 			{
 				$type = ($key == 'mysqli') ? 'mysql' : $key;
-				$ftp->unlink('install_' . DB_SCRIPT_VERSION . '_' . $type . '.sql');
+				$ftp->unlink('install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql');
 			}
 
 			$ftp->close();
@@ -268,7 +268,7 @@ function initialize_inputs()
 			foreach ($databases as $key => $dummy)
 			{
 				$type = ($key == 'mysqli') ? 'mysql' : $key;
-				@unlink(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . $type . '.sql');
+				@unlink(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql');
 			}
 		}
 
@@ -479,11 +479,11 @@ function Welcome()
 		if ($db['supported'])
 		{
 			$type = ($key == 'mysqli') ? 'mysql' : $key;
-			if (!file_exists(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . $type . '.sql'))
+			if (!file_exists(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql'))
 			{
 				$databases[$key]['supported'] = false;
 				$notFoundSQLFile = true;
-				Lang::$txt['error_db_script_missing'] = sprintf(Lang::$txt['error_db_script_missing'], 'install_' . DB_SCRIPT_VERSION . '_' . $type . '.sql');
+				Lang::$txt['error_db_script_missing'] = sprintf(Lang::$txt['error_db_script_missing'], 'install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql');
 			}
 			else
 				$incontext['supported_databases'][] = $db;
@@ -868,9 +868,9 @@ function DatabaseSettings()
 		Config::load();
 
 		// Better find the database file!
-		if (!file_exists(Config::$sourcedir . '/Db/APIs/' . Config::$db_type . '.php'))
+		if (!file_exists(Config::$sourcedir . '/Db/APIs/' . Db::getClass(Config::$db_type) . '.php'))
 		{
-			$incontext['error'] = sprintf(Lang::$txt['error_db_file'], 'Db/APIs/' . Config::$db_type . '.php');
+			$incontext['error'] = sprintf(Lang::$txt['error_db_file'], 'Db/APIs/' . Db::getClass(Config::$db_type) . '.php');
 			return false;
 		}
 
@@ -1063,7 +1063,7 @@ function ForumSettings()
 			'sourcedir' => $path . '/Sources',
 			'cachedir' => $path . '/cache',
 			'packagesdir' => $path . '/Packages',
-			'tasksdir' => $path . '/Sources/tasks',
+			'tasksdir' => $path . '/Sources/Tasks',
 			'mbname' => strtr($_POST['mbname'], array('\"' => '"')),
 			'language' => substr($_SESSION['installer_temp_lang'], 8, -4),
 			'image_proxy_secret' => bin2hex(random_bytes(10)),
@@ -1222,7 +1222,7 @@ function DatabasePopulation()
 
 	// Read in the SQL.  Turn this on and that off... internationalize... etc.
 	$type = (Config::$db_type == 'mysqli' ? 'mysql' : Config::$db_type);
-	$sql_lines = explode("\n", strtr(implode(' ', file(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . $type . '.sql')), $replaces));
+	$sql_lines = explode("\n", strtr(implode(' ', file(Config::$boarddir . '/install_' . DB_SCRIPT_VERSION . '_' . Db::getClass($type) . '.sql')), $replaces));
 
 	// Execute the SQL.
 	$current_statement = '';
diff --git a/other/install_2-1_mysql.sql b/other/install_2-1_MySQL.sql
similarity index 100%
rename from other/install_2-1_mysql.sql
rename to other/install_2-1_MySQL.sql
diff --git a/other/install_2-1_postgresql.sql b/other/install_2-1_PostgreSQL.sql
similarity index 100%
rename from other/install_2-1_postgresql.sql
rename to other/install_2-1_PostgreSQL.sql
diff --git a/other/upgrade.php b/other/upgrade.php
index 2defe17506..c8837de2b6 100644
--- a/other/upgrade.php
+++ b/other/upgrade.php
@@ -733,7 +733,7 @@ function loadEssentialData()
 
 	require_once(Config::$sourcedir . '/Autoloader.php');
 
-	if (class_exists('SMF\\Db\\APIs\\' . Config::$db_type))
+	if (class_exists('SMF\\Db\\APIs\\' . Db::getClass(Config::$db_type)))
 	{
 		// Make the connection...
 		if (empty(Db::$db_connection))
@@ -782,10 +782,10 @@ function loadEssentialData()
 		Db::$db->free_result($request);
 	}
 	else
-		return throw_error(sprintf(Lang::$txt['error_sourcefile_missing'], 'Db/APIs/' . Config::$db_type . '.php'));
+		return die(sprintf(Lang::$txt['error_sourcefile_missing'], 'Db/APIs/' . Db::getClass(Config::$db_type) . '.php'));
 
 	// If they don't have the file, they're going to get a warning anyway so we won't need to clean request vars.
-	if (class_exists('SMF\\QueryString', false) && php_version_check())
+	if (class_exists('SMF\\QueryString') && php_version_check())
 	{
 		QueryString::cleanRequest();
 	}
@@ -815,8 +815,8 @@ function initialize_inputs()
 		// And the extra little files ;).
 		deleteFile(dirname(__FILE__) . '/upgrade_1-0.sql');
 		deleteFile(dirname(__FILE__) . '/upgrade_1-1.sql');
-		deleteFile(dirname(__FILE__) . '/upgrade_2-0_' . Config::$db_type . '.sql');
-		deleteFile(dirname(__FILE__) . '/upgrade_2-1_' . Config::$db_type . '.sql');
+		deleteFile(dirname(__FILE__) . '/upgrade_2-0_' . Db::getClass(Config::$db_type) . '.sql');
+		deleteFile(dirname(__FILE__) . '/upgrade_2-1_' . Db::getClass(Config::$db_type) . '.sql');
 		deleteFile(dirname(__FILE__) . '/upgrade-helper.php');
 
 		$dh = opendir(dirname(__FILE__));
@@ -873,12 +873,12 @@ function WelcomeLogin()
 	// Check for some key files - one template, one language, and a new and an old source file.
 	$check = @file_exists(Config::$modSettings['theme_dir'] . '/index.template.php')
 		&& @file_exists(Config::$sourcedir . '/QueryString.php')
-		&& @file_exists(Config::$sourcedir . '/Db/APIs/' . Config::$db_type . '.php')
-		&& @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . Config::$db_type . '.sql');
+		&& @file_exists(Config::$sourcedir . '/Db/APIs/' . Db::getClass(Config::$db_type) . '.php')
+		&& @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . Db::getClass(Config::$db_type) . '.sql');
 
 	// Need legacy scripts?
 	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 2.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . Config::$db_type . '.sql');
+		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . Db::getClass(Config::$db_type) . '.sql');
 	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 2.0)
 		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
 	if (!isset(Config::$modSettings['smfVersion']) || Config::$modSettings['smfVersion'] < 1.1)
@@ -1523,7 +1523,7 @@ function UpgradeOptions()
 
 	// Add support for $tasksdir var.
 	if (empty(Config::$tasksdir))
-		$changes['tasksdir'] = fixRelativePath(Config::$sourcedir) . '/tasks';
+		$changes['tasksdir'] = fixRelativePath(Config::$sourcedir) . '/Tasks';
 
 	// Make sure we fix the language as well.
 	if (stristr(Config::$language, '-utf8'))
@@ -1677,8 +1677,8 @@ function DatabaseChanges()
 	$files = array(
 		array('upgrade_1-0.sql', '1.1', '1.1 RC0', false),
 		array('upgrade_1-1.sql', '2.0', '2.0 a', false),
-		array('upgrade_2-0_' . Config::$db_type . '.sql', '2.1', '2.1 dev0', false),
-		array('upgrade_2-1_' . Config::$db_type . '.sql', '3.0', SMF_VERSION, true),
+		array('upgrade_2-0_' . Db::getClass(Config::$db_type) . '.sql', '2.1', '2.1 dev0', false),
+		array('upgrade_2-1_' . Db::getClass(Config::$db_type) . '.sql', '3.0', SMF_VERSION, true),
 	);
 
 	// How many files are there in total?
@@ -4098,13 +4098,13 @@ function template_welcome_message()
 	{
 		$ago = time() - $upcontext['started'];
 		$ago_hours = floor($ago / 3600);
-		$ago_minutes = intval(($ago / 60) % 60);
+		$ago_minutes = (int) (((int) ($ago / 60)) % 60);
 		$ago_seconds = intval($ago % 60);
 		$agoTxt = $ago < 60 ? 'upgrade_time_s' : ($ago < 3600 ? 'upgrade_time_ms' : 'upgrade_time_hms');
 
 		$updated = time() - $upcontext['updated'];
 		$updated_hours = floor($updated / 3600);
-		$updated_minutes = intval(($updated / 60) % 60);
+		$updated_minutes = intval(((int) ($updated / 60)) % 60);
 		$updated_seconds = intval($updated % 60);
 		$updatedTxt = $updated < 60 ? 'upgrade_time_updated_s' : ($updated < 3600 ? 'upgrade_time_updated_hm' : 'upgrade_time_updated_hms');
 
diff --git a/other/upgrade_2-0_mysql.sql b/other/upgrade_2-0_MySQL.sql
similarity index 100%
rename from other/upgrade_2-0_mysql.sql
rename to other/upgrade_2-0_MySQL.sql
diff --git a/other/upgrade_2-0_postgresql.sql b/other/upgrade_2-0_PostgreSQL.sql
similarity index 100%
rename from other/upgrade_2-0_postgresql.sql
rename to other/upgrade_2-0_PostgreSQL.sql
diff --git a/other/upgrade_2-1_mysql.sql b/other/upgrade_2-1_MySQL.sql
similarity index 99%
rename from other/upgrade_2-1_mysql.sql
rename to other/upgrade_2-1_MySQL.sql
index 1d35c1c0b6..c7675628e5 100644
--- a/other/upgrade_2-1_mysql.sql
+++ b/other/upgrade_2-1_MySQL.sql
@@ -321,7 +321,7 @@ INSERT INTO {$db_prefix}settings (variable, value) VALUES ('defaultMaxListItems'
 	Db::$db->insert('replace',
 		'{db_prefix}settings',
 		array('variable' => 'string', 'value' => 'string'),
-		array('bcrypt_hash_cost', Security::hashVerifyPassword()),
+		array('bcrypt_hash_cost', Security::hashBenchmark()),
 		array('variable')
 	);
 ---}
diff --git a/other/upgrade_2-1_postgresql.sql b/other/upgrade_2-1_PostgreSQL.sql
similarity index 99%
rename from other/upgrade_2-1_postgresql.sql
rename to other/upgrade_2-1_PostgreSQL.sql
index 3285e2fa2e..e40d913292 100644
--- a/other/upgrade_2-1_postgresql.sql
+++ b/other/upgrade_2-1_PostgreSQL.sql
@@ -2089,7 +2089,7 @@ WHERE variable IN ('show_board_desc', 'display_quick_reply', 'show_mark_read', '
 	Db::$db->insert('replace',
 		'{db_prefix}settings',
 		array('variable' => 'string', 'value' => 'string'),
-		array('bcrypt_hash_cost', Security::hashVerifyPassword()),
+		array('bcrypt_hash_cost', Security::hashBenchmark()),
 		array('variable')
 	);
 ---}
diff --git a/proxy.php b/proxy.php
index ce408b4623..38cd46ef5d 100644
--- a/proxy.php
+++ b/proxy.php
@@ -13,20 +13,19 @@
  * @version 3.0 Alpha 1
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	define('SMF', 'PROXY');
+}
 
-if (SMF == 'PROXY')
-{
+if (SMF == 'PROXY') {
 	// Initialize.
-	require_once(__DIR__ . '/index.php');
+	require_once __DIR__ . '/index.php';
 
 	$proxy = new SMF\ProxyServer();
 	$proxy->serve();
 }
 // In case a old mod included this file in order to load the ProxyServer class.
-else
-{
+else {
 	class_exists('SMF\\ProxyServer');
 }
 
diff --git a/ssi_examples.php b/ssi_examples.php
index 12e8628d80..079cd27839 100644
--- a/ssi_examples.php
+++ b/ssi_examples.php
@@ -20,12 +20,12 @@
 $ssi_guest_access = false;
 
 // Include the SSI file.
-require(dirname(__FILE__) . '/SSI.php');
+require __DIR__ . '/SSI.php';
 
 // Viewing the homepage sample?
-if (isset($_GET['view']) && $_GET['view'] == 'home1')
-{
+if (isset($_GET['view']) && $_GET['view'] == 'home1') {
 	template_homepage_sample1('output');
+
 	exit;
 }
 
@@ -408,8 +408,6 @@
 
 /**
  * Displays the header for this file
- *
- * @return void
  */
 function template_ssi_above()
 {
@@ -515,8 +513,6 @@ function toggleVisibleByClass(sClassName, bHide)
 
 /**
  * Displays the footer for this file
- *
- * @return void
  */
 function template_ssi_below()
 {
@@ -590,32 +586,28 @@ function template_homepage_sample1($method = 'source')
 </body>
 </html>';
 
-	if ($method == 'source')
-	{
+	if ($method == 'source') {
 		$header = '<?php require("' . (SMF\User::$me->is_admin ? addslashes(realpath(SMF\Config::$boarddir . '/SSI.php')) : 'SSI.php') . '"); ?>' . "\n" . $header;
+
 		return $header . template_homepage_sample1_html() . $footer;
 	}
-	else
-	{
-		echo $header;
-		template_homepage_sample1_php();
-		echo $footer;
-	}
 
+	echo $header;
+	template_homepage_sample1_php();
+	echo $footer;
 }
 
 /**
  * Generates the sample homepage. Used with template_homepage_sample1 if $method isn't 'source'.
- *
- * @return void
  */
 function template_homepage_sample1_php()
 {
 	$topics = SMF\ServerSideIncludes::recentTopics(8, null, null, 'array');
 
-	foreach ($topics as $topic)
+	foreach ($topics as $topic) {
 		echo '
 			<li><a href="', $topic['href'], '">', $topic['subject'], '</a> ', SMF\Lang::$txt['by'], ' ', $topic['poster']['link'], '</li>';
+	}
 
 	unset($topics);
 
@@ -641,7 +633,6 @@ function template_homepage_sample1_php()
 
 	echo '
 	</div>';
-
 }
 
 /**
@@ -654,7 +645,7 @@ function template_homepage_sample1_html()
 	$result = '
 <?php
 // Using array method to show shorter display style.
-$topics = SMF\ServerSideIncludes::recentTopics(8, null, null, \'array\');
+$topics = SMF\\ServerSideIncludes::recentTopics(8, null, null, \'array\');
 
 foreach ($topics as $topic)
 {
@@ -662,19 +653,19 @@ function template_homepage_sample1_html()
 	// echo \'<pre>\', print_r($topic), \'</pre>\';
 
 	echo \'
-			<li><a href=\"\', $topic[\'href\'], \'\">\', $topic[\'subject\'], \'</a> \', SMF\Lang::$txt[\'by\'], \' \', $topics[$i][\'poster\'][\'link\'], \'</li>\';
+			<li><a href=\\"\', $topic[\'href\'], \'\\">\', $topic[\'subject\'], \'</a> \', SMF\\Lang::$txt[\'by\'], \' \', $topics[$i][\'poster\'][\'link\'], \'</li>\';
 }
 
 unset($topics);
 ?>
 		</ul><br>
 		<h3>Online Users</h3>
-		<?php SMF\ServerSideIncludes::logOnline(); ?>
+		<?php SMF\\ServerSideIncludes::logOnline(); ?>
 	</div>
 	<div id="content">
-		<?php SMF\ServerSideIncludes::welcome(); ?><br><br>
+		<?php SMF\\ServerSideIncludes::welcome(); ?><br><br>
 		<h2>News</h2>
-		<?php SMF\ServerSideIncludes::boardNews(); ?>
+		<?php SMF\\ServerSideIncludes::boardNews(); ?>
 	</div>';
 
 	return $result;
diff --git a/subscriptions.php b/subscriptions.php
index 6ef8305fea..fd0ef92091 100644
--- a/subscriptions.php
+++ b/subscriptions.php
@@ -14,51 +14,55 @@
  * @version 3.0 Alpha 1
  */
 
+use SMF\Actions\Admin\ACP;
+use SMF\Actions\Admin\Subscriptions;
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Lang;
 use SMF\Time;
 use SMF\Utils;
-use SMF\Actions\Admin\ACP;
-use SMF\Actions\Admin\Subscriptions;
-use SMF\Db\DatabaseApi as Db;
 
 // Set this to true to always log $_POST info received from payment gateways.
 $paid_debug = false;
 
 // Start things rolling by getting SMF alive...
 $ssi_guest_access = true;
-if (!file_exists(dirname(__FILE__) . '/SSI.php'))
+
+if (!file_exists(__DIR__ . '/SSI.php')) {
 	die('Cannot find SSI.php');
+}
 
-require_once(dirname(__FILE__) . '/SSI.php');
+require_once __DIR__ . '/SSI.php';
 
 // Ensure we don't trip over disabled internal functions
-require_once(Config::$sourcedir . '/Subs-Compat.php');
+require_once Config::$sourcedir . '/Subs-Compat.php';
 
 Lang::load('ManagePaid');
 
 // If there's literally nothing coming in, let's take flight!
-if (empty($_POST))
-{
+if (empty($_POST)) {
 	header('content-type: text/html; charset=' . (empty(Config::$modSettings['global_character_set']) ? (empty(Lang::$txt['lang_character_set']) ? 'ISO-8859-1' : Lang::$txt['lang_character_set']) : Config::$modSettings['global_character_set']));
+
 	die(Lang::$txt['paid_no_data']);
 }
 
 // I assume we're even active?
-if (empty(Config::$modSettings['paid_enabled']))
+if (empty(Config::$modSettings['paid_enabled'])) {
 	exit;
+}
 
 // If we have some custom people who find out about problems load them here.
-$notify_users = array();
-if (!empty(Config::$modSettings['paid_email_to']))
-{
-	foreach (explode(',', Config::$modSettings['paid_email_to']) as $email)
-		$notify_users[] = array(
+$notify_users = [];
+
+if (!empty(Config::$modSettings['paid_email_to'])) {
+	foreach (explode(',', Config::$modSettings['paid_email_to']) as $email) {
+		$notify_users[] = [
 			'email' => $email,
 			'name' => Lang::$txt['who_member'],
 			'id' => 0,
-		);
+		];
+	}
 }
 
 // We need to see whether we can find the correct payment gateway,
@@ -66,18 +70,19 @@
 // if they are happy with what we have.
 $txnType = '';
 $gatewayHandles = Subscriptions::loadPaymentGateways();
-foreach ($gatewayHandles as $gateway)
-{
+
+foreach ($gatewayHandles as $gateway) {
 	$gatewayClass = new $gateway['payment_class']();
-	if ($gatewayClass->isValid())
-	{
+
+	if ($gatewayClass->isValid()) {
 		$txnType = $gateway['code'];
 		break;
 	}
 }
 
-if (empty($txnType))
+if (empty($txnType)) {
 	generateSubscriptionError(Lang::$txt['paid_unknown_transaction_type']);
+}
 
 // Get the subscription and member ID, amongst others...
 @list($subscription_id, $member_id) = $gatewayClass->precheck();
@@ -87,173 +92,177 @@
 $member_id = (int) $member_id;
 
 // This would be bad...
-if (empty($member_id))
+if (empty($member_id)) {
 	generateSubscriptionError(Lang::$txt['paid_empty_member']);
+}
 
 // Verify the member.
-$request = Db::$db->query('', '
-	SELECT id_member, member_name, real_name, email_address
+$request = Db::$db->query(
+	'',
+	'SELECT id_member, member_name, real_name, email_address
 	FROM {db_prefix}members
 	WHERE id_member = {int:current_member}',
-	array(
+	[
 		'current_member' => $member_id,
-	)
+	],
 );
+
 // Didn't find them?
-if (Db::$db->num_rows($request) === 0)
+if (Db::$db->num_rows($request) === 0) {
 	generateSubscriptionError(sprintf(Lang::$txt['paid_could_not_find_member'], $member_id));
+}
 $member_info = Db::$db->fetch_assoc($request);
 Db::$db->free_result($request);
 
 // Get the subscription details.
-$request = Db::$db->query('', '
-	SELECT cost, length, name
+$request = Db::$db->query(
+	'',
+	'SELECT cost, length, name
 	FROM {db_prefix}subscriptions
 	WHERE id_subscribe = {int:current_subscription}',
-	array(
+	[
 		'current_subscription' => $subscription_id,
-	)
+	],
 );
 
 // Didn't find it?
-if (Db::$db->num_rows($request) === 0)
+if (Db::$db->num_rows($request) === 0) {
 	generateSubscriptionError(sprintf(Lang::$txt['paid_count_not_find_subscription'], $member_id, $subscription_id));
+}
 
 $subscription_info = Db::$db->fetch_assoc($request);
 Db::$db->free_result($request);
 
 // We wish to check the pending payments to make sure we are expecting this.
-$request = Db::$db->query('', '
-	SELECT id_sublog, payments_pending, pending_details, end_time
+$request = Db::$db->query(
+	'',
+	'SELECT id_sublog, payments_pending, pending_details, end_time
 	FROM {db_prefix}log_subscribed
 	WHERE id_subscribe = {int:current_subscription}
 		AND id_member = {int:current_member}
 	LIMIT 1',
-	array(
+	[
 		'current_subscription' => $subscription_id,
 		'current_member' => $member_id,
-	)
+	],
 );
-if (Db::$db->num_rows($request) === 0)
+
+if (Db::$db->num_rows($request) === 0) {
 	generateSubscriptionError(sprintf(Lang::$txt['paid_count_not_find_subscription_log'], $member_id, $subscription_id));
+}
 $subscription_info += Db::$db->fetch_assoc($request);
 Db::$db->free_result($request);
 
 // Is this a refund etc?
-if ($gatewayClass->isRefund())
-{
+if ($gatewayClass->isRefund()) {
 	// If the end time subtracted by current time, is not greater
 	// than the duration (ie length of subscription), then we close it.
-	if ($subscription_info['end_time'] - time() < $subscription_info['length'])
-	{
+	if ($subscription_info['end_time'] - time() < $subscription_info['length']) {
 		// Delete user subscription.
 		Subscriptions::remove($subscription_id, $member_id);
 		$subscription_act = time();
 		$status = 0;
-	}
-	else
-	{
+	} else {
 		Subscriptions::getAll();
 		$subscription_act = $subscription_info['end_time'] - Subscriptions::$all[$subscription_id]['num_length'];
 		$status = 1;
 	}
 
 	// Mark it as complete so we have a record.
-	Db::$db->query('', '
-		UPDATE {db_prefix}log_subscribed
+	Db::$db->query(
+		'',
+		'UPDATE {db_prefix}log_subscribed
 		SET end_time = {int:current_time}
 		WHERE id_subscribe = {int:current_subscription}
 			AND id_member = {int:current_member}
 			AND status = {int:status}',
-		array(
+		[
 			'current_time' => $subscription_act,
 			'current_subscription' => $subscription_id,
 			'current_member' => $member_id,
 			'status' => $status,
-		)
+		],
 	);
 
 	// Receipt?
-	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2)
-	{
-		$replacements = array(
+	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2) {
+		$replacements = [
 			'NAME' => $subscription_info['name'],
 			'REFUNDNAME' => $member_info['member_name'],
 			'REFUNDUSER' => $member_info['real_name'],
 			'PROFILELINK' => Config::$scripturl . '?action=profile;u=' . $member_id,
 			'DATE' => Time::create('now')->format(null, false),
-		);
+		];
 
 		ACP::emailAdmins('paid_subscription_refund', $replacements, $notify_users);
 	}
 
 }
 // Otherwise is it what we want, a purchase?
-elseif ($gatewayClass->isPayment() || $gatewayClass->isSubscription())
-{
+elseif ($gatewayClass->isPayment() || $gatewayClass->isSubscription()) {
 	$cost = Utils::jsonDecode($subscription_info['cost'], true);
 	$total_cost = $gatewayClass->getCost();
 	$notify = false;
 
 	// For one off's we want to only capture them once!
-	if (!$gatewayClass->isSubscription())
-	{
+	if (!$gatewayClass->isSubscription()) {
 		$real_details = Utils::jsonDecode($subscription_info['pending_details'], true);
-		if (empty($real_details))
+
+		if (empty($real_details)) {
 			generateSubscriptionError(sprintf(Lang::$txt['paid_count_not_find_outstanding_payment'], $member_id, $subscription_id));
+		}
 
 		// Now we just try to find anything pending.
 		// We don't really care which it is as security happens later.
-		foreach ($real_details as $id => $detail)
-		{
+		foreach ($real_details as $id => $detail) {
 			unset($real_details[$id]);
-			if ($detail[3] == 'payback' && $subscription_info['payments_pending'])
+
+			if ($detail[3] == 'payback' && $subscription_info['payments_pending']) {
 				$subscription_info['payments_pending']--;
+			}
 			break;
 		}
 
 		$subscription_info['pending_details'] = empty($real_details) ? '' : Utils::jsonEncode($real_details);
 
-		Db::$db->query('', '
-			UPDATE {db_prefix}log_subscribed
+		Db::$db->query(
+			'',
+			'UPDATE {db_prefix}log_subscribed
 			SET payments_pending = {int:payments_pending}, pending_details = {string:pending_details}
 			WHERE id_sublog = {int:current_subscription_item}',
-			array(
+			[
 				'payments_pending' => $subscription_info['payments_pending'],
 				'current_subscription_item' => $subscription_info['id_sublog'],
 				'pending_details' => $subscription_info['pending_details'],
-			)
+			],
 		);
 	}
 
 	// Is this flexible?
-	if ($subscription_info['length'] == 'F')
-	{
+	if ($subscription_info['length'] == 'F') {
 		$found_duration = 0;
 
 		// This is a little harder, can we find the right duration?
-		foreach ($cost as $duration => $value)
-		{
-			if ($duration == 'fixed')
+		foreach ($cost as $duration => $value) {
+			if ($duration == 'fixed') {
 				continue;
-			elseif ((float) $value == (float) $total_cost)
+			}
+
+			if ((float) $value == (float) $total_cost) {
 				$found_duration = strtoupper(substr($duration, 0, 1));
+			}
 		}
 
 		// If we have the duration then we're done.
-		if ($found_duration !== 0)
-		{
+		if ($found_duration !== 0) {
 			$notify = true;
 			Subscriptions::add($subscription_id, $member_id, $found_duration);
 		}
-	}
-	else
-	{
+	} else {
 		$actual_cost = $cost['fixed'];
 
 		// It must be at least the right amount.
-		if ($total_cost != 0 && $total_cost >= $actual_cost)
-		{
+		if ($total_cost != 0 && $total_cost >= $actual_cost) {
 			// Add the subscription.
 			$notify = true;
 			Subscriptions::add($subscription_id, $member_id);
@@ -261,9 +270,8 @@
 	}
 
 	// Send a receipt?
-	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2 && $notify)
-	{
-		$replacements = array(
+	if (!empty(Config::$modSettings['paid_email']) && Config::$modSettings['paid_email'] == 2 && $notify) {
+		$replacements = [
 			'NAME' => $subscription_info['name'],
 			'SUBNAME' => $member_info['member_name'],
 			'SUBUSER' => $member_info['real_name'],
@@ -271,61 +279,58 @@
 			'PRICE' => sprintf(Config::$modSettings['paid_currency_symbol'], $total_cost),
 			'PROFILELINK' => Config::$scripturl . '?action=profile;u=' . $member_id,
 			'DATE' => Time::create('now')->format(null, false),
-		);
+		];
 
 		ACP::emailAdmins('paid_subscription_new', $replacements, $notify_users);
 	}
 }
 // Maybe they're cancelling. Some subscriptions may require actively doing something, but PayPal doesn't, for example.
-elseif ($gatewayClass->isCancellation())
-{
-	if (method_exists($gatewayClass, 'performCancel'))
+elseif ($gatewayClass->isCancellation()) {
+	if (method_exists($gatewayClass, 'performCancel')) {
 		$gatewayClass->performCancel($subscription_id, $member_id, $subscription_info);
+	}
 }
-else
-{
-	// Some other "valid" transaction such as:
-	//
-	// subscr_signup: This IPN response (txn_type) is sent only the first time the user signs up for a subscription.
-	// It then does not fire in any event later. This response is received somewhere before or after the first payment of
-	// subscription is received (txn_type=subscr_payment) which is what we do process
-	//
-	// Should we log any of these ...
-}
+
+// Some other "valid" transaction such as:
+//
+// subscr_signup: This IPN response (txn_type) is sent only the first time the user signs up for a subscription.
+// It then does not fire in any event later. This response is received somewhere before or after the first payment of
+// subscription is received (txn_type=subscr_payment) which is what we do process
+//
+// Should we log any of these ...
 
 // In case we have anything specific to do.
 $gatewayClass->close();
 
 // Hidden setting to log the IPN info for debugging purposes.
-if ($paid_debug === true)
+if ($paid_debug === true) {
 	generateSubscriptionError(Lang::$txt['subscription'], true);
+}
 
 /**
  * Log an error then exit
  *
  * @param string $text The error to log
  * @param bool $debug If true, won't send an email if Config::$modSettings['paid_email'] isn't set
- * @return void
  */
 function generateSubscriptionError($text, $debug = false)
 {
 	global $notify_users;
 
 	// Send an email?
-	if (!empty(Config::$modSettings['paid_email']) && !$debug)
-	{
-		$replacements = array(
+	if (!empty(Config::$modSettings['paid_email']) && !$debug) {
+		$replacements = [
 			'ERROR' => $text,
-		);
+		];
 
 		ACP::emailAdmins('paid_subscription_error', $replacements, $notify_users);
 	}
 
 	// Maybe we can try to give them the post data?
-	if (!empty($_POST))
-	{
-		foreach ($_POST as $key => $val)
+	if (!empty($_POST)) {
+		foreach ($_POST as $key => $val) {
 			$text .= '<br>' . Utils::htmlspecialchars($key) . ': ' . Utils::htmlspecialchars($val);
+		}
 	}
 
 	// Then just log and die.