[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",

Sources/Config.php

@@ -1420,11 +1420,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']);
 
 		/*****************
@@ -1457,6 +1452,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.
@@ -2233,7 +2229,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();

Sources/Db/APIs/MySQL.php

@@ -886,10 +886,14 @@ public function connect_errno(): int
 	/**
 	 *
 	 */
-	public function detect_charset(?string $table = null, ?string $column = null): string
+	public function detect_charset(?string $table = null, ?string $column = null, bool $reset = false): string
 	{
 		static $detected;
 
+		if ($reset) {
+			$detected = null;
+		}
+
 		// MySQL has a default character set for the database, but tables can
 		// use different character sets, and even columns within those tables
 		// can use different character sets again. So figuring out the actual
@@ -908,11 +912,9 @@ public function detect_charset(?string $table = null, ?string $column = null): s
 					INNER JOIN information_schema.COLUMNS AS c ON (c.TABLE_SCHEMA = t.TABLE_SCHEMA AND c.TABLE_NAME = t.TABLE_NAME)
 					INNER JOIN information_schema.COLLATION_CHARACTER_SET_APPLICABILITY AS a ON (t.TABLE_COLLATION = a.COLLATION_NAME)
 				WHERE t.TABLE_SCHEMA = {string:db_name}
-					AND c.DATA_TYPE IN ({array_string:types})
 				ORDER BY t.TABLE_SCHEMA, t.TABLE_NAME, c.COLUMN_NAME',
 				[
 					'db_name' => $this->name,
-					'types' => ['enum', 'varchar', 'char', 'tinytext', 'text', 'mediumtext', 'longtext'],
 				],
 			);
 
@@ -1245,7 +1247,7 @@ public function table_sql(string $tableName): string
 		$this->free_result($result);
 
 		// Probably InnoDB.... and it might have a comment.
-		$schema_create .= $crlf . ') ENGINE=' . $row['Engine'] . ($row['Comment'] != '' ? ' COMMENT="' . $row['Comment'] . '"' : '');
+		$schema_create .= $crlf . ') ENGINE=' . $row['Engine'] . ' ROW_FORMAT=' . $row['Row_format'] . ' COLLATE=' . $row['Collation'] . ($row['Comment'] != '' ? ' COMMENT="' . $row['Comment'] . '"' : '');
 
 		return $schema_create;
 	}
@@ -1722,7 +1724,7 @@ public function create_table(string $table_name, array $columns, array $indexes
 		$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 (!defined('SMF_INSTALLING') && in_array(strtolower($short_table_name), $this->reservedTables)) {
 			return false;
 		}
 
@@ -1824,6 +1826,29 @@ public function create_table(string $table_name, array $columns, array $indexes
 			}
 		}
 
+		// Which row format (if any) should be specified?
+		switch ($parameters['engine']) {
+			case 'InnoDB':
+				if (!in_array(strtoupper($parameters['row_format'] ?? ''), ['REDUNDANT', 'COMPACT', 'DYNAMIC', 'COMPRESSED'])) {
+					$parameters['row_format'] = 'DYNAMIC';
+				}
+				break;
+
+			case 'MyISAM':
+				if (!in_array(strtoupper($parameters['row_format'] ?? ''), ['FIXED', 'DYNAMIC', 'COMPRESSED'])) {
+					unset($parameters['row_format']);
+				}
+				break;
+
+			default:
+				unset($parameters['row_format']);
+				break;
+		}
+
+		if (isset($parameters['row_format'])) {
+			$table_query .= ' ROW_FORMAT=' . $parameters['row_format'];
+		}
+
 		// Create the table!
 		$this->query(
 			'',
@@ -2142,20 +2167,230 @@ public function remove_index(string $table_name, string $index_name, array $para
 		return false;
 	}
 
+	/**************************************
+	 * Methods used during installion, etc.
+	 **************************************/
+
+	/**
+	 *
+	 */
+	public function getMinimumVersion(): string
+	{
+		return '8.0.35';
+	}
+
+	/**
+	 *
+	 */
+	public function isSupported(): bool
+	{
+		return function_exists('mysqli_connect');
+	}
+
+	/**
+	 *
+	 */
+	public function skipSelectDatabase(): bool
+	{
+		return false;
+	}
+
+	/**
+	 *
+	 */
+	public function getDefaultUser(): string
+	{
+		return ini_get('mysql.default_user') === false ? '' : ini_get('mysql.default_user');
+	}
+
+	/**
+	 *
+	 */
+	public function getDefaultPassword(): string
+	{
+		return ini_get('mysql.default_password') === false ? '' : ini_get('mysql.default_password');
+	}
+
+	/**
+	 *
+	 */
+	public function getDefaultHost(): string
+	{
+		return ini_get('mysql.default_host') === false ? '' : ini_get('mysql.default_host');
+	}
+
+	/**
+	 *
+	 */
+	public function getDefaultPort(): int
+	{
+		return ini_get('mysql.default_port') === false ? 3306 : (int) ini_get('mysql.default_port');
+	}
+
+	/**
+	 *
+	 */
+	public function getDefaultName(): string
+	{
+		return 'smf';
+	}
+
+	/**
+	 *
+	 */
+	public function checkConfiguration(): bool
+	{
+		return true;
+	}
+
+	/**
+	 *
+	 */
+	public function hasPermissions(): bool
+	{
+		// Find database user privileges.
+		$privs = [];
+		$get_privs = self::$db->query('', 'SHOW PRIVILEGES', []);
+
+		while ($row = self::$db->fetch_assoc($get_privs)) {
+			if ($row['Privilege'] == 'Alter') {
+				$privs[] = $row['Privilege'];
+			}
+		}
+		self::$db->free_result($get_privs);
+
+		// Check for the ALTER privilege.
+		return !(!in_array('Alter', $privs));
+	}
+
+	/**
+	 *
+	 */
+	public function validatePrefix(&$value): bool
+	{
+		$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
+
+		return true;
+	}
+
+	/**
+	 *
+	 */
+	public function alwaysHasDb(): bool
+	{
+		return false;
+	}
+
+	/**
+	 *
+	 */
+	public function setSqlMode(string $mode = 'default'): bool
+	{
+		$sql_mode = '';
+
+		if ($mode === 'strict') {
+			$sql_mode = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION,PIPES_AS_CONCAT';
+		}
+
+		$this->query('', 'SET SESSION sql_mode = {string:sql_mode}', [
+			'sql_mode' => $sql_mode,
+		]);
+
+		return true;
+	}
+
+	/**
+	 *
+	 */
+	public function processError(string $error_msg, string $query): mixed
+	{
+		$mysqli_errno = mysqli_errno($this->connection);
+
+		$error_query = in_array(substr(trim($query), 0, 11), ['INSERT INTO', 'UPDATE IGNO', 'ALTER TABLE', 'DROP TABLE ', 'ALTER IGNOR', 'INSERT IGNO']);
+
+		// Error numbers:
+		//    1016: Can't open file '....MYI'
+		//    1050: Table already exists.
+		//    1054: Unknown column name.
+		//    1060: Duplicate column name.
+		//    1061: Duplicate key name.
+		//    1062: Duplicate entry for unique key.
+		//    1068: Multiple primary keys.
+		//    1072: Key column '%s' doesn't exist in table.
+		//    1091: Can't drop key, doesn't exist.
+		//    1146: Table doesn't exist.
+		//    2013: Lost connection to server during query.
+
+		if ($mysqli_errno == 1016) {
+			if (preg_match('~\'([^\.\']+)~', $error_msg, $match) != 0 && !empty($match[1])) {
+				mysqli_query($this->connection, 'REPAIR TABLE `' . $match[1] . '`');
+				$result = mysqli_query($this->connection, $query);
+
+				if ($result !== false) {
+					return $result;
+				}
+			}
+		} elseif ($mysqli_errno == 2013) {
+			$this->connection = mysqli_connect($this->server, $this->user, $this->passwd);
+			mysqli_select_db($this->connection, $this->name);
+
+			if ($this->connection) {
+				$result = mysqli_query($this->connection, $query);
+
+				if ($result !== false) {
+					return $result;
+				}
+			}
+		}
+		// Duplicate column name... should be okay ;).
+		elseif (in_array($mysqli_errno, [1060, 1061, 1068, 1091])) {
+			return false;
+		}
+		// Duplicate insert... make sure it's the proper type of query ;).
+		elseif (in_array($mysqli_errno, [1054, 1062, 1146]) && $error_query) {
+			return false;
+		}
+		// Creating an index on a non-existent column.
+		elseif ($mysqli_errno == 1072) {
+			return false;
+		} elseif ($mysqli_errno == 1050 && substr(trim($query), 0, 12) == 'RENAME TABLE') {
+			return false;
+		}
+		// Testing for legacy tables or columns? Needed for 1.0 & 1.1 scripts.
+		elseif (in_array($mysqli_errno, [1054, 1146]) && in_array(substr(trim($query), 0, 7), ['SELECT ', 'SHOW CO'])) {
+			return false;
+		}
+
+		// If a table already exists don't go potty.
+		if (in_array(substr(trim($query), 0, 8), ['CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U'])) {
+			if (strpos($error_msg, 'exist') !== false) {
+				return false;
+			}
+		} elseif (strpos(trim($query), 'INSERT ') !== false) {
+			if (strpos($error_msg, 'duplicate') !== false) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/******************
 	 * Internal methods
 	 ******************/
 
 	/**
-	 * Constructor.
+	 * Prepares this instance for use.
 	 *
 	 * If $options is empty, correct settings will be determined automatically.
 	 *
 	 * @param array $options An array of database options.
 	 */
-	protected function __construct(array $options = [])
+	protected function initialize(array $options = []): void
 	{
-		parent::__construct();
+		if ($this !== DatabaseApi::$db) {
+			return;
+		}
 
 		// If caller was explicit about non_fatal, respect that.
 		$non_fatal = !empty($options['non_fatal']);
@@ -2166,7 +2401,7 @@ protected function __construct(array $options = [])
 				$options = ['non_fatal' => true, 'dont_select_db' => true];
 			}
 
-			$this->initiate(Config::$ssi_db_user, Config::$ssi_db_passwd, $options);
+			$this->connect(Config::$ssi_db_user, Config::$ssi_db_passwd, $options);
 		}
 
 		// Either we aren't in SSI mode, or it failed.
@@ -2175,7 +2410,7 @@ protected function __construct(array $options = [])
 				$options = ['dont_select_db' => SMF == 'SSI'];
 			}
 
-			$this->initiate(Config::$db_user, Config::$db_passwd, $options);
+			$this->connect(Config::$db_user, Config::$db_passwd, $options);
 		}
 
 		// Safe guard here, if there isn't a valid connection let's put a stop to it.
@@ -2229,7 +2464,7 @@ protected function __construct(array $options = [])
 	 * @param string $passwd The database password
 	 * @param array $options An array of database options
 	 */
-	protected function initiate(string $user, string $passwd, array $options = []): void
+	protected function connect(string $user, string $passwd, array $options = []): void
 	{
 		$server = ($this->persist ? 'p:' : '') . $this->server;