[3.0] Rewrites installer and upgrader

.editorconfig

@@ -9,6 +9,9 @@ tab_width = 4
 trim_trailing_whitespace = true
 charset = utf-8
 
+[*.lock]
+indent_style = space
+
 [*.yml]
 indent_style = space
-indent_size = 2
+indent_size = 2

.github/crowdin.yml

@@ -59,8 +59,8 @@ files: [
   translation: "Languages/%locale_with_underscore%/Help.php",
  },
  {
-  source: "Languages/en_US/Install.php",
-  translation: "Languages/%locale_with_underscore%/Install.php",
+  source: "Languages/en_US/Maintenance.php",
+  translation: "Languages/%locale_with_underscore%/Maintenance.php",
  },
  {
   source: "Languages/en_US/Login.php",

.github/phpcs/SectionComments.php

@@ -8,7 +8,7 @@
  * @copyright 2025 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
- * @version 3.0 Alpha 2
+ * @version 3.0 Alpha 3
  */
 
 declare(strict_types=1);

.gitignore

@@ -7,6 +7,7 @@
 Settings.php
 Settings_bak.php
 Settings_org.php
+!Sources/Db/Schema/*/Settings.php
 db_last_error.php
 cache/*
 Packages/backups/*
@@ -81,4 +82,4 @@ upgrade-helper.php
 .php-cs-fixer.cache
 vendor/
 .phplint-cache
-.phplint.cache
+.phplint.cache

.php-cs-fixer.dist.php

@@ -8,7 +8,7 @@
  * @copyright 2025 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
- * @version 3.0 Alpha 2
+ * @version 3.0 Alpha 3
  */
 $finder = (new PhpCsFixer\Finder())
 	->in(__DIR__)

Sources/Config.php

@@ -808,12 +808,18 @@ class Config
 			'auto_delete' => 2,
 			'type' => 'boolean',
 		],
-		// Temporary variable used during the upgrade process.
-		'upgradeData' => [
+		// Temporary variable used during install, upgrade, etc.
+		'maintenance_tool_progress' => [
 			'default' => '',
 			'auto_delete' => 1,
 			'type' => 'string',
 		],
+		// Temporary variable used while installing or uninstalling packages.
+		'package_installing' => [
+			'default' => false,
+			'auto_delete' => 1,
+			'type' => 'boolean',
+		],
 		// These should be removed if found.
 		'tasksdir' => [
 			'default' => '',
@@ -835,6 +841,11 @@ class Config
 			'auto_delete' => 3,
 			'type' => 'integer',
 		],
+		'upgradeData' => [
+			'default' => '',
+			'auto_delete' => 3,
+			'type' => 'string',
+		],
 	];
 
 	/**
@@ -1417,11 +1428,6 @@ public static function updateSettingsFile(array $config_vars, ?bool $keep_quotes
 			$config_vars['db_last_error'] = 0;
 		}
 
-		// Rebuilding should not be undertaken lightly, so we're picky about the parameter.
-		if (!is_bool($rebuild)) {
-			$rebuild = false;
-		}
-
 		$mtime = isset($mtime) ? (int) $mtime : (defined('TIME_START') ? TIME_START : $_SERVER['REQUEST_TIME']);
 
 		/*****************
@@ -1454,6 +1460,7 @@ public static function updateSettingsFile(array $config_vars, ?bool $keep_quotes
 		}
 
 		// When was Settings.php last changed?
+		clearstatcache();
 		$last_settings_change = filemtime($settingsFile);
 
 		// Get the current values of everything in Settings.php.
@@ -1553,7 +1560,7 @@ public static function updateSettingsFile(array $config_vars, ?bool $keep_quotes
 			],
 			// Remove the code that redirects to the installer.
 			$neg_index-- => [
-				'search_pattern' => '~^if\s*\(file_exists\(dirname\(__FILE__\)\s*\.\s*\'/install\.php\'\)\)\s*(?:({(?' . '>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
+				'search_pattern' => '~^if\s*\(file_exists\((?:dirname\(__FILE__\)|__DIR__)\s*\.\s*\'/install\.php\'\)(?:\s+&&\s+basename\(\$_SERVER\[\'PHP_SELF\'\]\) != \'install.php\')?\)\s*(?:({(?' . '>[^{}]|(?1))*})\h*|header(\((?' . '>[^()]|(?2))*\));\n)~m',
 				'placeholder' => '',
 			],
 			// Remove the old path correction code. Config::set() now handles that.
@@ -1919,7 +1926,7 @@ function ($a, $b) {
 						}
 						// 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 && !isset($settings_defs[$var])) {
 							$new_settings_vars[$var] = $config_vars[$var];
 						}
 
@@ -2230,7 +2237,7 @@ function ($a, $b) {
 		$success = self::safeFileWrite($settingsFile, $settingsText, $backupFile, $last_settings_change);
 
 		// Remember this in case updateSettingsFile is called twice.
-		$mtime = filemtime($settingsFile);
+		$mtime = microtime(true);
 
 		return $success;
 	}

Sources/Cookie.php

@@ -428,7 +428,7 @@ public static function setLoginCookie(int $cookie_length, int $id, string $passw
 			// Backup and remove the old session.
 			$oldSessionData = $_SESSION;
 			$_SESSION = [];
-			session_destroy();
+			@session_destroy();
 
 			// Recreate and restore the new session.
 			Session::load();